diff --git a/.cpyskip.txt b/.cpyskip.txt index 561f347bc696..5305d995ece2 100644 --- a/.cpyskip.txt +++ b/.cpyskip.txt @@ -104,6 +104,7 @@ icu4j/perf-tests/data/collation/ulyss10.txt icu4j/perf-tests/data/collation/2drvb10.txt icu4j/perf-tests/data/collation/vfear11a.txt icu4j/perf-tests/data/collation/nvsbl10.txt +icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/sorttable.js # # docs # diff --git a/.gitattributes b/.gitattributes index 4525d093ca85..23bd456f639d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -76,10 +76,6 @@ config* text !eol zos-working-tree-encoding=IBM-1047 *.otf -text zos-working-tree-encoding=UTF-8 *.utf16be -text zos-working-tree-encoding=UTF-8 -# The following file types are stored in Git-LFS. -# Only .jars -*.jar filter=lfs diff=lfs merge=lfs -text zos-working-tree-encoding=UTF-8 - # Enable syntax highlighting on GitHub.com .cpyskip.txt linguist-language=Ignore-List diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 96d7635fa05e..cf8516f7c644 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ TODO: Please describe your changes here. TODO: Please read the following on ICU Contributing, and then delete these instructions. -Thank you for your pull request! +Thank you for your pull request! * For general info on contributing: https://github.com/unicode-org/icu/blob/main/CONTRIBUTING.md * Associating PRs with Jira issues @@ -13,7 +13,7 @@ Thank you for your pull request! * Contributors license agreement (CLA): - You will be automatically asked to sign the CLA before the PR is accepted. - To sign the CLA: https://cla-assistant.io/unicode-org/icu - - For terms of use and license, see https://www.unicode.org/terms_of_use.html + - For terms of use and license, see https://www.unicode.org/copyright.html TODO: Fill out the checklist below. diff --git a/.github/workflows/cache_retain.yml b/.github/workflows/cache_retain.yml index ca3693616b5c..82bff33cee33 100644 --- a/.github/workflows/cache_retain.yml +++ b/.github/workflows/cache_retain.yml @@ -43,10 +43,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 928316092302..91ba66931340 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -55,7 +55,7 @@ jobs: path: ./out/artifacts - name: Upload Sarif if: always() && steps.build.outcome == 'success' - uses: github/codeql-action/upload-sarif@v3.28.10 + uses: github/codeql-action/upload-sarif@v3.28.16 with: # Path to SARIF file relative to the root of the repository sarif_file: cifuzz-sarif/results.sarif diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml index 7b187491fae0..4fe8f38c2e4a 100644 --- a/.github/workflows/icu4c.yml +++ b/.github/workflows/icu4c.yml @@ -25,7 +25,10 @@ on: # https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow inputs: gitReleaseTag: - description: 'Release tag to upload to. Must start with "release-"' + description: 'Release tag to upload to. Must start with "release-" or "icu4x/"' + type: string + gitReleaseFilename: + description: 'Release tag with no slashes, to be used in file names' type: string # For non-release branches (namely: PRs), only run CI on the most recent commit. Cancel @@ -926,15 +929,21 @@ jobs: - name: Zip run: | cd icu4c/source/icuexportdata - zip -r ../../../icuexportdata_${{ inputs.gitReleaseTag }}.zip . + zip -r ../../../icuexportdata_${{ inputs.gitReleaseFilename }}.zip . - name: Publish Artifact uses: actions/upload-artifact@v4 with: name: icuexportdata_output path: icuexportdata_*.zip - - name: Upload to release + - name: Upload to release tag if: ${{ inputs.gitReleaseTag && startsWith(inputs.gitReleaseTag, 'release-') }} run: | gh release upload ${{ inputs.gitReleaseTag }} icuexportdata_*.zip --clobber env: GH_TOKEN: ${{ github.token }} + - name: Upload to icu4x tag + if: ${{ inputs.gitReleaseTag && startsWith(inputs.gitReleaseTag, 'icu4x/') }} + run: | + gh release upload ${{ inputs.gitReleaseTag }} icuexportdata_*.zip --clobber + env: + GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/icu4j.yml b/.github/workflows/icu4j.yml index 8086dc8bff66..16b8fdbd0bf0 100644 --- a/.github/workflows/icu4j.yml +++ b/.github/workflows/icu4j.yml @@ -48,10 +48,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Cache local Maven repository uses: actions/cache@v4 with: @@ -60,7 +56,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '8' + java-version: '11' # Download all of the artifacts needed for the code and build plugins, but # exclude any needed by profiles depending on system artifacts - name: Download all artifacts @@ -75,15 +71,11 @@ jobs: strategy: fail-fast: false matrix: - java-version: [ '8', '11', '17', '21' ] + java-version: [ '11', '17', '21' ] runs-on: ubuntu-22.04 # Updated in BRS steps: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Restore read-only cache of local Maven repository uses: actions/cache/restore@v4 id: cache @@ -113,10 +105,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Restore read-only cache of local Maven repository uses: actions/cache/restore@v4 id: cache @@ -154,10 +142,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Restore read-only cache of local Maven repository uses: actions/cache/restore@v4 id: cache diff --git a/.github/workflows/icu_common.yml b/.github/workflows/icu_common.yml index e8b548fbe7ed..50ab2b1c35f4 100644 --- a/.github/workflows/icu_common.yml +++ b/.github/workflows/icu_common.yml @@ -54,10 +54,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Cache local Maven repository uses: actions/cache@v4 with: @@ -66,7 +62,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '8' + java-version: '11' # Download all of the artifacts needed for the code and build plugins, but # exclude any needed by profiles depending on system artifacts - name: Download all artifacts diff --git a/.github/workflows/icu_merge_ci.yml b/.github/workflows/icu_merge_ci.yml index 6e401b891e8e..59f397c51529 100644 --- a/.github/workflows/icu_merge_ci.yml +++ b/.github/workflows/icu_merge_ci.yml @@ -30,8 +30,8 @@ permissions: jobs: # Initialize the Maven artifact cache - # Uses Java 8 because Java version not deemed significant for downloading - # artifacts + # Using Java 11 because Java version is not deemed significant for downloading artifacts, + # and is the lowest version we support, so the cached artifacts can be used by any other version. # # This job is created according to the cache strategy of reuse from a single job: # https://github.com/actions/cache/blob/main/caching-strategies.md#make-cache-read-only--reuse-cache-from-centralized-job @@ -40,10 +40,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Cache local Maven repository uses: actions/cache@v4.2.0 with: @@ -52,7 +48,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' # Download all of the artifacts needed for the code and build plugins - name: Download all artifacts run: | @@ -66,10 +62,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -144,7 +136,7 @@ jobs: - name: Create directory for lib files run: mkdir icu4c/source/perflib - name: Get ICU libs - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: icu-perf-libs path: icu4c/source/lib @@ -218,7 +210,7 @@ jobs: - name: Create directory for lib files run: mkdir icu4c/source/perflib - name: Get ICU libs - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: icu-perf-libs path: icu4c/source/lib @@ -283,7 +275,7 @@ jobs: - name: Create directory for lib files run: mkdir icu4c/source/perflib - name: Get ICU libs - uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9 + uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 with: name: icu-perf-libs path: icu4c/source/lib @@ -330,10 +322,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -345,7 +333,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Build and run unicodesetperf test run: | @@ -354,7 +342,7 @@ jobs: git status cd perf-tests; mkdir -p perf/results/j_unicodesetperf/${{ matrix.perf }}; - mvn dependency:copy-dependencies + mvn dependency:copy-dependencies java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.UnicodeSetPerf ${{ matrix.perf }} -a -t 2 -p 4 [:Lt:] | tee perf/results/j_unicodesetperf/${{ matrix.perf }}/output.txt - name: Store performance test results @@ -388,10 +376,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -403,7 +387,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Build and run ucharacterperf test run: | @@ -411,7 +395,7 @@ jobs: mvn ${SHARED_MVN_ARGS} install -DskipITs -DskipTests; cd perf-tests; mkdir -p perf/results/j_ucharacterperf; - mvn dependency:copy-dependencies + mvn dependency:copy-dependencies java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.UCharacterPerf -a -t 2 -p 4 0 ffff | tee perf/results/j_ucharacterperf/output.txt - name: Store performance test results @@ -448,10 +432,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -463,7 +443,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Build and run decimalformatperf run: | @@ -475,7 +455,7 @@ jobs: # tests over 180 secs. minimizes the possibility of push conflicts when storing # tests results in the data branch. sleep $(($RANDOM % 180)); - mvn dependency:copy-dependencies + mvn dependency:copy-dependencies java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.DecimalFormatPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -L ${{ matrix.locale }} "#,###.##" "1.234,56" -r 1 | tee perf/results/j_decimalformatperf/${{ matrix.locale }}/${{ matrix.perf }}/output.txt - name: Store performance test results @@ -513,10 +493,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -528,7 +504,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Build and run normperf env: @@ -542,7 +518,7 @@ jobs: # tests over 180 secs. minimizes the possibility of push conflicts when storing # tests results in the data branch. sleep $(($RANDOM % 180)); - mvn dependency:copy-dependencies + mvn dependency:copy-dependencies java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.NormalizerPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -f $DATA_FILE_PATH/${{ matrix.source_text }}.txt -e UTF-8 ${{ matrix.mode }} | tee perf/results/j_normperf/${{ matrix.source_text }}/${{ matrix.perf }}/output.txt cat perf/results/j_normperf/${{ matrix.source_text }}/${{ matrix.perf }}/output.txt @@ -648,10 +624,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -663,7 +635,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Build and run converterperf env: @@ -677,7 +649,7 @@ jobs: # tests over 180 secs. minimizes the possibility of push conflicts when storing # tests results in the data branch. sleep $(($RANDOM % 180)); - mvn dependency:copy-dependencies + mvn dependency:copy-dependencies java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.ConverterPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -f $DATA_FILE_PATH/${{ matrix.source_text }}.txt -e UTF-8 -T ${{ matrix.test_enc }} | tee perf/results/j_converterperf/${{ matrix.source_text }}/${{ matrix.test_enc }}/${{ matrix.perf }}/output.txt - name: Store performance test results @@ -727,10 +699,6 @@ jobs: steps: - name: Checkout and setup uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - - name: Checkout lfs objects - run: git lfs pull - name: Lookup read-only cache of local Maven repository uses: actions/cache@v4.2.0 with: @@ -742,7 +710,7 @@ jobs: - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - java-version: '8' + java-version: '11' - name: Extract identifying digit and parameter. run: | @@ -759,7 +727,7 @@ jobs: # tests over 180 secs. minimizes the possibility of push conflicts when storing # tests results in the data branch. sleep $(($RANDOM % 180)); - mvn dependency:copy-dependencies + mvn dependency:copy-dependencies java -cp ./target/*:./target/dependency/* com.ibm.icu.dev.test.perf.DateFormatPerformanceTest ${{ matrix.perf }} -a -t 2 -p 4 -L ${{ matrix.locale }} ${{ env.PARM }} -r 1 | tee perf/results/j_dateformatperf/${{ matrix.locale }}/${{ matrix.perf }}/${{ env.DDIR }}/output.txt - name: Store performance test results diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 8f1b1c116aa5..ce4043b26f99 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -22,8 +22,6 @@ jobs: version-type: ${{ steps.mvn-proj-version-type.outputs.version-type }} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - lfs: true - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' diff --git a/.github/workflows/release-check-sign.yml b/.github/workflows/release-check-sign.yml index 6ed0da2eddd5..196b431d4395 100644 --- a/.github/workflows/release-check-sign.yml +++ b/.github/workflows/release-check-sign.yml @@ -23,8 +23,6 @@ jobs: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - name: Set up JDK uses: actions/setup-java@v4 diff --git a/.github/workflows/release-icu4c-fedora.yml b/.github/workflows/release-icu4c-fedora.yml index b64729377ba1..ca6727d64422 100644 --- a/.github/workflows/release-icu4c-fedora.yml +++ b/.github/workflows/release-icu4c-fedora.yml @@ -37,8 +37,6 @@ jobs: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - name: Config and build ICU4C proper run: | diff --git a/.github/workflows/release-icu4c-ubuntu.yml b/.github/workflows/release-icu4c-ubuntu.yml index b778ef42c1e9..de340209c8ad 100644 --- a/.github/workflows/release-icu4c-ubuntu.yml +++ b/.github/workflows/release-icu4c-ubuntu.yml @@ -30,8 +30,6 @@ jobs: - name: Checkout and setup uses: actions/checkout@v4 - with: - lfs: true - name: Config and build ICU4C proper run: | diff --git a/.github/workflows/release-icu4j-maven.yml b/.github/workflows/release-icu4j-maven.yml index 33c6fa40e1dd..4be73a8685f4 100644 --- a/.github/workflows/release-icu4j-maven.yml +++ b/.github/workflows/release-icu4j-maven.yml @@ -49,13 +49,11 @@ jobs: - name: Checkout repo files uses: actions/checkout@v4.1.7 - with: - lfs: true - name: Set up JDK uses: actions/setup-java@v4.2.2 with: - java-version: '8' # The custom Taglets for javadoc (tools/build) are still Java 8. They need updating to use a different JDK version. + java-version: '11' distribution: 'temurin' server-id: icu4j-maven-repo # Value of the distributionManagement/repository/id field of the pom.xml server-username: MAVEN_USERNAME # env variable for username in deploy diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 8c4d7d715904..fe280f583121 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,6 +59,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@83923549f688e42b34d0b90ee94725f7c30532fc # v2.25.15 + uses: github/codeql-action/upload-sarif@97a2bfd2a3d26d458da69e548f7f859d6fca634d # v2.25.15 with: sarif_file: results.sarif diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 888a530f54a4..cf67af898e7d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,7 +99,8 @@ _… and thanks for contributing!_ ### Copyright & Licenses -Copyright © 2016-2024 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries. +Copyright © 2016 and later: Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries. +License & terms of use: https://www.unicode.org/copyright.html The project is released under [LICENSE](./LICENSE). @@ -109,7 +110,7 @@ The project is released under [LICENSE](./LICENSE). [coding-guidelines]: docs/userguide/dev/codingguidelines.md [com.ibm.icu.dev.test]: ./icu4j/main/framework/src/test/java/com/ibm/icu/dev/test/ [contacts]: https://icu.unicode.org/contacts -[copyright]: http://www.unicode.org/copyright.html +[copyright]: https://www.unicode.org/copyright.html [design]: docs/userguide/icu/design.md [git4icu]: https://unicode-org.github.io/icu/userguide/dev/gitdev [howtouse]: docs/userguide/icu/howtouseicu.md @@ -127,7 +128,7 @@ The project is released under [LICENSE](./LICENSE). [signing]: https://www.unicode.org/policies/licensing_policy.html#signing [ticket-lifecycle]: https://icu.unicode.org/processes/ticket-lifecycle [tips]: https://unicode-org.github.io/icu/devsetup/cpp/ -[unicode-announcement]: http://blog.unicode.org/2016/05/icu-joins-unicode-consortium.html +[unicode-announcement]: https://blog.unicode.org/2016/05/icu-joins-unicode-consortium.html [unicode-corporate-clas]: https://www.unicode.org/policies/corporate-cla-list/ [unicode-license]: https://www.unicode.org/license.txt [unicode-org/icu]: https://github.com/unicode.org/icu diff --git a/LICENSE b/LICENSE index 0b9efcd9092f..5a2eda629500 100644 --- a/LICENSE +++ b/LICENSE @@ -540,3 +540,29 @@ publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. + +---------------------------------------------------------------------- + +File: sorttable.js (only for ICU4J) + +The MIT Licence, for code from kryogenix.org + +Code downloaded from the Browser Experiments section of kryogenix.org is +licenced under the so-called MIT licence. The licence is below. + +Copyright (c) 1997-date Stuart Langridge + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 2297f6ec25ee..a221c132f4b5 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,8 @@ OpenSSF Scorecard | [![OpenSSF Scorecard](https://api.securityscorecards.dev/pro ### Copyright & Licenses -Copyright © 2016-2024 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries. +Copyright © 2016 and later: Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries. +License & terms of use: https://www.unicode.org/copyright.html A CLA is required to contribute to this project - please refer to the [CONTRIBUTING.md](./CONTRIBUTING.md) file (or start a Pull Request) for more information. diff --git a/docs/devsetup/source/index.md b/docs/devsetup/source/index.md index f645344e3b00..5aeca71f0808 100644 --- a/docs/devsetup/source/index.md +++ b/docs/devsetup/source/index.md @@ -29,7 +29,7 @@ License & terms of use: http://www.unicode.org/copyright.html You can view ICU source code online: -***Make sure you have git lfs installed.*** See the following section. +> :point_right: **Note**: If you are working with ICU 76 and previous, then you will need to install and use git-lfs. See the following section. For read-only usage, create a local clone: @@ -81,7 +81,7 @@ contribute to ICU.) * Install a **git client** * * Linux: `sudo apt install git` -* Install **git-lfs** if your git client does not already have LFS support +* For ICU 76 and previous versions: install **git-lfs** if your git client does not already have LFS support (ICU uses git Large File Storage to store large binary content such as \*.jar files.) * @@ -90,8 +90,8 @@ contribute to ICU.) * Linux: `sudo apt install git-lfs` * MacOS: Consider using Homebrew or MacPorts. * The command `git lfs version` will indicate if LFS is installed. -* Setup git LFS for your local user account once on each machine: - * `git lfs install --skip-repo` + * Setup git LFS for your local user account once on each machine: + * `git lfs install --skip-repo` ### Working with git diff --git a/docs/processes/cldr-icu.md b/docs/processes/cldr-icu.md index 0f9031d9f8d0..6d2ae02cb5fd 100644 --- a/docs/processes/cldr-icu.md +++ b/docs/processes/cldr-icu.md @@ -217,7 +217,7 @@ cp -p $CLDR_DIR/common/dtd/ldmlICU.dtd $ICU4C_DIR/source/data/dtd/cldr/common/dt ```sh open $ICU_DIR/tools/cldr/cldr-to-icu/pom.xml ``` -(search for `icu4j-for-cldr` and update to the latest tagged version per instructions) +(search for `` and update to the latest tagged version per instructions) 3c. Update the build for any new icu version, added locales, etc. ```sh @@ -280,6 +280,19 @@ already present in the ICU4C sources. This process uses the `LdmlConverter` in `coll/de__PHONEBOOK.txt`, `coll/de_.txt`, etc. * Before running the tool to regenerate the data, make any necessary changes to the `config.xml` file, such as adding new locales etc. +* **Temporary note 2025-04-07:** There are some steps mentioned in `$ICU_DIR/tools/cldr/cldr-to-icu/README.md` + that were not mentioned in these instructions but seem to be necessary for the next step to + work properly, these are: + * Build ICU4J: + ``` + cd "$ICU_DIR" + mvn clean install -f icu4j -DskipTests -DskipITs + ``` + * Build the conversion tool: + ``` + cd "$ICU_DIR/tools/cldr/cldr-to-icu/" + mvn clean package -DskipTests -DskipITs + ``` ```sh cd $ICU_DIR/tools/cldr/cldr-to-icu diff --git a/docs/userguide/dev/gitdev.md b/docs/userguide/dev/gitdev.md index a247d8896b4c..3b7f8a88317a 100644 --- a/docs/userguide/dev/gitdev.md +++ b/docs/userguide/dev/gitdev.md @@ -21,7 +21,7 @@ License & terms of use: http://www.unicode.org/copyright.html --- -For git & git lfs installation see the [Source Code Setup](../../devsetup/source/) +For git & related tools installation see the [Source Code Setup](../../devsetup/source/) page. For setup with language compilers and IDEs, see the [Setup for Contributors](../../devsetup/source/) page diff --git a/docs/userguide/icu/howtouseicu.md b/docs/userguide/icu/howtouseicu.md index 3d4111d16192..25003093b184 100644 --- a/docs/userguide/icu/howtouseicu.md +++ b/docs/userguide/icu/howtouseicu.md @@ -30,13 +30,13 @@ In addition, ICU4C installs several scripts and makefile fragments that help build other code using ICU. For C++, note that there are [Recommended Build -Options](icu4c/build#recommended-build-options) +Options](../icu4c/build#recommended-build-options) (both for normal use and for ICU as system-level libraries) which are not default simply for compatibility with older ICU-using code. Starting with ICU 49, the ICU4C Readme has a short section about [User-Configurable -Settings](icu4c/build#user-configurable-settings). +Settings](../icu4c/build#user-configurable-settings). ## C++ Makefiles @@ -154,13 +154,13 @@ ICU C++ APIs are normally defined in a versioned namespace, for example "icu_50". There is a stable "icu" alias which should be used instead. (Entry point versioning is only to allow for multiple ICU versions linked into one program. [It is optional and should be off for system -libraries.](icu4c/build#recommended-build-options)) +libraries.](../icu4c/build#recommended-build-options)) By default, and only for backward compatibility, the ICU headers contain a line `using namespace icu_50;` which makes all ICU APIs visible in/with the global namespace (and potentially collide with non-ICU APIs there). One of the [Recommended Build -Options](icu4c/build#recommended-build-options) +Options](../icu4c/build#recommended-build-options) is to turn this off. To write forward declarations, use @@ -189,7 +189,7 @@ samples. Their paths are given in the installed `Makefile.inc` (see above). ### Data Packaging Settings -The `pkgdata` tool (see [Packaging ICU4C](packaging/index.md) ) makes use of the +The `pkgdata` tool (see [Packaging ICU4C](../icu4c/packaging/index.md) ) makes use of the installed file `**$(prefix)/lib/icu/pkgdata.inc**` to set parameters for data packaging operations that require use of platform compilers and linkers ( in `static` or `dll` mode). `pkgdata` uses the icu-config script in order to locate diff --git a/docs/userguide/icu4c/faq.md b/docs/userguide/icu4c/faq.md index 9152718a2894..3fbe433cfc22 100644 --- a/docs/userguide/icu4c/faq.md +++ b/docs/userguide/icu4c/faq.md @@ -42,7 +42,7 @@ versions of ICU, but we will assist in building other versions from source. **Why don't you provide project files for my MSVC version (MSVC 2008, etc)?** You can use the Cygwin build environment to build ICU from source against the -MSVC compiler. See the [Building ICU4C](./icu4c/build) page. +MSVC compiler. See the [Building ICU4C](./build) page. #### How do I install the binary versions of ICU? @@ -69,7 +69,7 @@ MSVC compiler. See the [Building ICU4C](./icu4c/build) page. #### Can you help me build ICU4C for ... -We can try ... make sure you read the [Building ICU4C](./icu4c/build) section and also the [ICU +We can try ... make sure you read the [Building ICU4C](./build) section and also the [ICU Data](../icudata.md) section. You might also [searching the icu-support archives](https://icu.unicode.org/contacts), and then posting a question there. Additionally, sites such as @@ -146,7 +146,7 @@ upgrade-friendly. #### How do I build ICU? -See the [Building ICU4C](./icu4c/build) section. +See the [Building ICU4C](./build) section. #### How do I get 32- or 64-bit versions of the ICU libraries? diff --git a/docs/userguide/icu4j/locale-service-provider.md b/docs/userguide/icu4j/locale-service-provider.md index 480ba85fe01a..e836b0644b73 100644 --- a/docs/userguide/icu4j/locale-service-provider.md +++ b/docs/userguide/icu4j/locale-service-provider.md @@ -20,6 +20,8 @@ License & terms of use: http://www.unicode.org/copyright.html --- +# WARNING: Please note that for ICU 78 (2025-oct) we are planning to remove the ICU4J Locale Service Provider. See the [ICU 77 page](https://unicode-org.github.io/icu/download/77.html) for details. + ## Overview Java SE 6 introduced a new feature which allows Java user code to extend locale diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in index ac11a6a75e8e..9e15b6a01695 100644 --- a/icu4c/source/Makefile.in +++ b/icu4c/source/Makefile.in @@ -240,7 +240,7 @@ xcheck-local: $(top_builddir)/config/icu-config $(top_builddir)/config/Makefile. @echo verifying that icu-config --selfcheck can operate @test "passed" = "$(shell $(top_builddir)/config/icu-config --selfcheck 2>&1)" || (echo "FAIL: icu-config could not run properly." ; exit 1) @echo verifying that $(MAKE) -f Makefile.inc selfcheck can operate - @test "passed" = "$(shell $(MAKE) --no-print-directory -f $(top_builddir)/config/Makefile.inc SELFCHECK=1 selfcheck)" || (echo "FAIL: Makefile.inc could not run properly." ; exit 1 ) + @test "passed" = "$(shell MAKEFLAGS= $(MAKE) --no-print-directory -f $(top_builddir)/config/Makefile.inc SELFCHECK=1 selfcheck)" || (echo "FAIL: Makefile.inc could not run properly." ; exit 1 ) @echo "PASS: config selfcheck OK" #$(srcdir)/configure : $(srcdir)/configure.ac $(top_srcdir)/aclocal.m4 diff --git a/icu4c/source/common/common.vcxproj.filters b/icu4c/source/common/common.vcxproj.filters index 1faff8765d33..8d1746d54c9d 100644 --- a/icu4c/source/common/common.vcxproj.filters +++ b/icu4c/source/common/common.vcxproj.filters @@ -1267,6 +1267,9 @@ strings + + strings + collections diff --git a/icu4c/source/common/localefallback_data.h b/icu4c/source/common/localefallback_data.h index 3b8ad8a3f398..144ab1c1faf9 100644 --- a/icu4c/source/common/localefallback_data.h +++ b/icu4c/source/common/localefallback_data.h @@ -11,17 +11,17 @@ //====================================================================== // Default script table const char scriptCodeChars[] = - "Aghb\0Ahom\0Arab\0Armi\0Armn\0Avst\0Bali\0Bamu\0Bass\0Batk\0Beng\0" - "Bopo\0Brah\0Cakm\0Cans\0Cari\0Cham\0Cher\0Chrs\0Copt\0Cprt\0Cyrl\0" - "Deva\0Egyp\0Elym\0Ethi\0Geor\0Gong\0Gonm\0Goth\0Gran\0Grek\0Gujr\0" - "Guru\0Hang\0Hani\0Hans\0Hant\0Hebr\0Hluw\0Hmnp\0Ital\0Java\0Jpan\0" - "Kali\0Kana\0Khar\0Khmr\0Kits\0Knda\0Kore\0Lana\0Laoo\0Latf\0Latg\0" - "Lepc\0Lina\0Linb\0Lisu\0Lyci\0Lydi\0Mand\0Mani\0Marc\0Medf\0Merc\0" - "Mlym\0Modi\0Mong\0Mroo\0Mtei\0Mymr\0Narb\0Newa\0Nkoo\0Nshu\0Ogam\0" - "Olck\0Orkh\0Orya\0Osge\0Ougr\0Pauc\0Phli\0Phnx\0Plrd\0Prti\0Rjng\0" - "Rohg\0Runr\0Samr\0Sarb\0Saur\0Sgnw\0Sinh\0Sogd\0Sora\0Soyo\0Sunu\0" - "Syrc\0Tagb\0Takr\0Tale\0Talu\0Taml\0Tang\0Tavt\0Telu\0Tfng\0Thaa\0" - "Thai\0Tibt\0Tnsa\0Toto\0Ugar\0Vaii\0Wcho\0Xpeo\0Xsux\0Yiii\0"; + "Aghb\0Ahom\0Arab\0Armi\0Armn\0Avst\0Bali\0Bamu\0Batk\0Beng\0Bopo\0" + "Brah\0Cakm\0Cans\0Cari\0Cham\0Cher\0Chrs\0Copt\0Cprt\0Cyrl\0Deva\0" + "Egyp\0Elym\0Ethi\0Geor\0Gong\0Gonm\0Goth\0Gran\0Grek\0Gujr\0Guru\0" + "Hang\0Hani\0Hans\0Hant\0Hebr\0Hluw\0Hmnp\0Ital\0Java\0Jpan\0Kali\0" + "Kana\0Khar\0Khmr\0Kits\0Knda\0Kore\0Lana\0Laoo\0Latf\0Latg\0Lepc\0" + "Lina\0Linb\0Lisu\0Lyci\0Lydi\0Mand\0Mani\0Marc\0Medf\0Merc\0Mlym\0" + "Modi\0Mong\0Mroo\0Mtei\0Mymr\0Narb\0Newa\0Nkoo\0Ogam\0Olck\0Orkh\0" + "Orya\0Osge\0Ougr\0Pauc\0Phli\0Phnx\0Plrd\0Prti\0Rjng\0Rohg\0Runr\0" + "Samr\0Sarb\0Saur\0Sgnw\0Sinh\0Sogd\0Sora\0Soyo\0Sunu\0Syrc\0Tagb\0" + "Takr\0Tale\0Talu\0Taml\0Tang\0Tavt\0Telu\0Tfng\0Thaa\0Thai\0Tibt\0" + "Tnsa\0Toto\0Ugar\0Vaii\0Wcho\0Xpeo\0Xsux\0Yiii\0"; const char dsLocaleIDChars[] = "aaf\0aao\0aat\0ab\0abh\0abl\0abv\0acm\0acq\0acw\0acx\0adf\0adx\0" @@ -35,19 +35,19 @@ const char dsLocaleIDChars[] = "bgp\0bgq\0bgw\0bgx\0bha\0bhb\0bhd\0bhe\0bhh\0bhi\0bhj\0bhm\0bhn\0" "bho\0bht\0bhu\0biy\0bjf\0bjj\0bjm\0bkk\0blk\0blt\0bmj\0bn\0bns\0" "bo\0bph\0bpx\0bpy\0bqi\0bra\0brb\0brd\0brh\0brk\0bro\0brv\0brw\0" - "brx\0bsh\0bsk\0bsq\0bst\0btd\0btm\0btv\0bua\0bwe\0bxm\0bxu\0byh\0" - "byn\0byw\0bzi\0cbn\0ccp\0cde\0cdh\0cdi\0cdj\0cdm\0cdo\0cdz\0ce\0" - "cgk\0chg\0chm\0chr\0chx\0cih\0cja\0cji\0cjm\0cjy\0ckb\0ckt\0clh\0" - "clw\0cmg\0cna\0cnp\0cog\0cop\0cpg\0cr\0crh\0crj\0crk\0crl\0crm\0" - "csh\0csp\0csw\0ctd\0ctg\0ctn\0ctt\0cty\0cu\0cuu\0cv\0czh\0czk\0" - "daq\0dar\0dcc\0ddo\0def\0deh\0der\0dgl\0dhi\0dhn\0dho\0dhw\0dka\0" - "dlg\0dmf\0dmk\0dml\0dng\0dnu\0dnv\0doi\0dox\0dre\0drq\0drs\0dry\0" - "dso\0dty\0dub\0duh\0dus\0dv\0dwk\0dwz\0dz\0dzl\0ecr\0ecy\0egy\0" - "eky\0el\0emg\0emu\0enf\0enh\0era\0esg\0esh\0ett\0eve\0evn\0fa\0" - "fay\0faz\0fia\0fmu\0fub\0gan\0gaq\0gas\0gau\0gbj\0gbk\0gbl\0gbm\0" - "gbz\0gdb\0gdo\0gdx\0gez\0ggg\0gha\0ghe\0gho\0ghr\0ght\0gig\0gin\0" - "gjk\0gju\0gld\0glh\0glk\0gml\0gmv\0gmy\0goe\0gof\0goj\0gok\0gon\0" - "got\0gra\0grc\0grt\0gru\0gu\0gvr\0gwc\0gwf\0gwt\0gyo\0gzi\0ha_CM\0" + "brx\0bsh\0bsk\0bst\0btd\0btm\0btv\0bua\0bwe\0bxm\0bxu\0byh\0byn\0" + "byw\0bzi\0cbn\0ccp\0cde\0cdh\0cdi\0cdj\0cdm\0cdo\0cdz\0ce\0cgk\0" + "chg\0chm\0chr\0chx\0cih\0cja\0cji\0cjm\0cjy\0ckb\0ckt\0clh\0clw\0" + "cmg\0cna\0cnp\0cog\0cop\0cpg\0cr\0crh\0crj\0crk\0crl\0crm\0csh\0" + "csp\0csw\0ctd\0ctg\0ctn\0ctt\0cty\0cu\0cuu\0cv\0czh\0czk\0daq\0" + "dar\0dcc\0ddo\0def\0deh\0der\0dgl\0dhi\0dhn\0dho\0dhw\0dka\0dlg\0" + "dmf\0dmk\0dml\0dng\0dnu\0dnv\0doi\0dox\0dre\0drq\0drs\0dry\0dso\0" + "dty\0dub\0duh\0dus\0dv\0dwk\0dwz\0dz\0dzl\0ecr\0ecy\0egy\0eky\0" + "el\0emg\0emu\0enf\0enh\0era\0esg\0esh\0ett\0eve\0evn\0fa\0fay\0" + "faz\0fia\0fmu\0fub\0gan\0gaq\0gas\0gau\0gbj\0gbk\0gbl\0gbm\0gbz\0" + "gdb\0gdo\0gdx\0gez\0ggg\0gha\0ghe\0gho\0ghr\0ght\0gig\0gin\0gjk\0" + "gju\0gld\0glh\0glk\0gml\0gmv\0gmy\0goe\0gof\0goj\0gok\0gon\0got\0" + "gra\0grc\0grt\0gru\0gu\0gvr\0gwc\0gwf\0gwt\0gyo\0gzi\0ha_CM\0" "ha_SD\0hac\0hak\0hak_TW\0har\0haz\0hbo\0hdy\0he\0hi\0hif\0hii\0" "hit\0hkh\0hlb\0hlu\0hmd\0hmj\0hmq\0hnd\0hne\0hnj\0hno\0hoc\0hoh\0" "hoj\0how\0hoy\0hpo\0hrt\0hrz\0hsn\0hss\0htx\0hut\0huy\0huz\0hy\0" @@ -61,125 +61,125 @@ const char dsLocaleIDChars[] = "kjt\0kjz\0kk\0kk_AF\0kk_CN\0kk_IR\0kk_MN\0kkf\0kkh\0kkt\0kle\0" "klj\0klr\0km\0kmj\0kmz\0kn\0knn\0ko\0koi\0kok\0kpt\0kpy\0kqd\0" "kqy\0kra\0krc\0krk\0krr\0kru\0krv\0ks\0ksu\0ksw\0ksz\0ktb\0kte\0" - "ktl\0ktp\0ku_LB\0kuf\0kum\0kv\0kva\0kvq\0kvt\0kvx\0kvy\0kxf\0" - "kxk\0kxm\0kxp\0ky\0ky_CN\0kyu\0kyv\0kyw\0lab\0lad\0lae\0lah\0" - "lbe\0lbf\0lbj\0lbm\0lbo\0lbr\0lcp\0lep\0lez\0lhm\0lhs\0lif\0lis\0" - "lkh\0lki\0lmh\0lmn\0lo\0loy\0lpo\0lrc\0lrk\0lrl\0lsa\0lsd\0lss\0" - "ltc\0luk\0luu\0luv\0luz\0lwl\0lwm\0lya\0lzh\0lzz_GE\0mag\0mai\0" - "mby\0mde\0mdf\0mdx\0mdy\0mfa\0mfi\0mga\0mgp\0mhj\0mid\0mjl\0mjq\0" - "mjr\0mjt\0mju\0mjv\0mjz\0mk\0mkb\0mke\0mki\0mkm\0ml\0mlf\0mn\0" - "mn_CN\0mnc\0mni\0mnj\0mns\0mnw\0mpz\0mr\0mra\0mrd\0mrj\0mro\0" - "mrr\0ms_CC\0mtm\0mtr\0mud\0muk\0mut\0muv\0muz\0mve\0mvf\0mvy\0" - "mvz\0mwr\0mwt\0mww\0my\0mym\0myv\0myz\0mzn\0nan\0nan_TW\0nao\0" - "ncd\0ncq\0ndf\0ne\0neg\0neh\0nei\0new\0ngt\0nio\0nit\0niv\0nli\0" - "nlm\0nlx\0nmm\0nnp\0nod\0noe\0nog\0noi\0non\0nos\0npb\0nqo\0nrn\0" - "nsd\0nsf\0nsk\0nst\0nsv\0nty\0ntz\0nwc\0nwx\0nyl\0nyq\0nyw\0oaa\0" - "oac\0oar\0oav\0obm\0obr\0odk\0oht\0oj\0ojs\0okm\0oko\0okz\0ola\0" - "ole\0omk\0omp\0omr\0omx\0oon\0or\0ort\0oru\0orv\0os\0osa\0osc\0" - "osi\0ota\0otb\0otk\0oty\0oui\0pa\0pa_PK\0pal\0paq\0pbt\0pcb\0" - "pce\0pcf\0pcg\0pch\0pci\0pcj\0peg\0peo\0pgd\0pgg\0pgl\0pgn\0phd\0" - "phk\0phl\0phn\0pho\0phr\0pht\0phu\0phv\0phw\0pi\0pka\0pkr\0plk\0" - "pll\0pmh\0pnt\0pnt_RU\0pra\0prc\0prd\0prt\0prx\0ps\0psh\0psi\0" - "pst\0psu\0pum\0pwo\0pwr\0pww\0pyx\0qxq\0raa\0rab\0raf\0rah\0raj\0" - "rav\0rbb\0rdb\0rei\0rhg\0rji\0rjs\0rka\0rki\0rkt\0rmi\0rmt\0rmz\0" - "rsk\0rtw\0ru\0rue\0rut\0rwr\0ryu\0sa\0sah\0sam\0sat\0saz\0sbn\0" - "sbu\0sck\0scl\0scp\0sct\0scu\0scx\0sd\0sd_IN\0sdb\0sdf\0sdg\0" - "sdh\0sdr\0sds\0sel\0sfm\0sgh\0sgj\0sgr\0sgt\0sgw\0sgy\0shd\0shi\0" - "shm\0shn\0shu\0shv\0si\0sia\0sip\0siy\0siz\0sjd\0sjp\0sjt\0skb\0" - "skj\0skr\0smh\0smp\0smu\0smy\0soa\0sog\0soi\0sou\0spt\0spv\0sqo\0" - "sqq\0sqt\0sr\0srb\0srh\0srx\0srz\0ssh\0sss\0sts\0stv\0sty\0suz\0" - "sva\0swb\0swi\0swv\0sxu\0syc\0syl\0syn\0syr\0syw\0ta\0tab\0taj\0" - "tbk\0tcn\0tco\0tcx\0tcy\0tda\0tdb\0tdd\0tdg\0tdh\0te\0tes\0tg\0" - "tg_PK\0tge\0tgf\0th\0the\0thf\0thi\0thl\0thm\0thq\0thr\0ths\0" - "ti\0tig\0tij\0tin\0tjl\0tjo\0tkb\0tks\0tkt\0tmr\0tnv\0tov\0tpu\0" - "tra\0trg\0trm\0trw\0tsd\0tsj\0tt\0tth\0tto\0tts\0ttz\0tvn\0twm\0" - "txg\0txo\0tyr\0tyv\0ude\0udg\0udi\0udm\0ug\0ug_KZ\0ug_MN\0uga\0" - "ugh\0ugo\0uk\0uki\0ulc\0unr\0unr_NP\0unx\0ur\0urk\0ush\0uum\0" - "uz_AF\0uz_CN\0uzs\0vaa\0vaf\0vah\0vai\0vas\0vav\0vay\0vgr\0vjk\0" - "vmd\0vmh\0wal\0wbk\0wbq\0wbr\0wle\0wlo\0wme\0wne\0wni\0wsg\0wsv\0" - "wtm\0wuu\0xag\0xal\0xan\0xas\0xco\0xcr\0xdq\0xhe\0xhm\0xis\0xka\0" - "xkc\0xkf\0xkj\0xkp\0xlc\0xld\0xly\0xmf\0xmn\0xmr\0xna\0xnr\0xpg\0" - "xpi\0xpm\0xpr\0xrm\0xrn\0xsa\0xsr\0xtq\0xub\0xuj\0xve\0xvi\0xwo\0" - "xzh\0yai\0ybh\0ybi\0ydg\0yea\0yej\0yeu\0ygp\0yhd\0yi\0yig\0yih\0" - "yiv\0ykg\0ykh\0yna\0ynk\0yoi\0yoy\0yrk\0ysd\0ysn\0ysp\0ysr\0ysy\0" - "yud\0yue\0yue_CN\0yug\0yux\0ywq\0ywu\0zau\0zba\0zch\0zdj\0zeh\0" - "zen\0zgb\0zgh\0zgm\0zgn\0zh\0zh_AU\0zh_BN\0zh_GB\0zh_GF\0zh_HK\0" - "zh_ID\0zh_MO\0zh_PA\0zh_PF\0zh_PH\0zh_SR\0zh_TH\0zh_TW\0zh_US\0" - "zh_VN\0zhd\0zhx\0zko\0zkt\0zkz\0zlj\0zln\0zlq\0zqe\0zrg\0zrp\0" - "zum\0zwa\0zyg\0zyn\0zzj\0"; + "ktl\0ktp\0ku_AM\0ku_AZ\0ku_GE\0ku_IQ\0ku_IR\0ku_LB\0ku_TM\0kuf\0" + "kum\0kv\0kva\0kvq\0kvt\0kvx\0kvy\0kxf\0kxk\0kxm\0kxp\0ky\0ky_CN\0" + "kyu\0kyv\0kyw\0lab\0lad\0lae\0lah\0lbe\0lbf\0lbj\0lbm\0lbo\0lbr\0" + "lcp\0lep\0lez\0lhm\0lhs\0lif\0lis\0lkh\0lki\0lmh\0lmn\0lo\0loy\0" + "lpo\0lrc\0lrk\0lrl\0lsa\0lsd\0lss\0ltc\0luk\0luu\0luv\0luz\0lwl\0" + "lwm\0lya\0lzh\0lzz_GE\0mag\0mai\0mby\0mde\0mdf\0mdx\0mdy\0mey\0" + "mfa\0mfi\0mga\0mgp\0mhj\0mid\0mjl\0mjq\0mjr\0mjt\0mju\0mjv\0mjz\0" + "mk\0mkb\0mke\0mki\0mkm\0ml\0mlf\0mn\0mn_CN\0mnc\0mni\0mnj\0mns\0" + "mnw\0mpz\0mr\0mra\0mrd\0mrj\0mro\0mrr\0ms_CC\0mtm\0mtr\0mud\0" + "muk\0mut\0muv\0muz\0mve\0mvf\0mvy\0mvz\0mwr\0mwt\0mww\0my\0mym\0" + "myv\0myz\0mzn\0nan\0nan_MO\0nan_TW\0nao\0ncd\0ncq\0ndf\0ne\0neg\0" + "neh\0nei\0new\0ngt\0nio\0nit\0niv\0nli\0nlm\0nlx\0nmm\0nnp\0nod\0" + "noe\0nog\0noi\0non\0nos\0npb\0nqo\0nrn\0nsd\0nsf\0nsk\0nst\0nsv\0" + "nty\0ntz\0nwc\0nwx\0nyl\0nyq\0nyw\0oaa\0oac\0oar\0oav\0obm\0obr\0" + "odk\0oht\0oj\0ojs\0okm\0oko\0okz\0ola\0ole\0omk\0omp\0omr\0omx\0" + "oon\0or\0ort\0oru\0orv\0os\0osa\0osc\0osi\0ota\0otb\0otk\0oty\0" + "oui\0pa\0pa_PK\0pal\0paq\0pbt\0pcb\0pce\0pcf\0pcg\0pch\0pci\0" + "pcj\0peg\0peo\0pgd\0pgg\0pgl\0pgn\0phd\0phk\0phl\0phn\0pho\0phr\0" + "pht\0phu\0phv\0phw\0pi_IN\0pi_LK\0pi_MM\0pi_TH\0pka\0pkr\0plk\0" + "pll\0pmh\0pnt\0pnt_RU\0prc\0prd\0prt\0prx\0ps\0psh\0psi\0pst\0" + "psu\0pum\0pwo\0pwr\0pww\0pyx\0qxq\0raa\0rab\0raf\0rah\0raj\0rav\0" + "rbb\0rdb\0rei\0rhg\0rji\0rjs\0rka\0rki\0rkt\0rmi\0rmt\0rmz\0rsk\0" + "rtw\0ru\0rue\0rut\0rwr\0ryu\0sa\0sah\0sam\0sat\0saz\0sbn\0sbu\0" + "sck\0scl\0scp\0sct\0scu\0scx\0sd\0sd_IN\0sdb\0sdf\0sdg\0sdh\0" + "sdr\0sds\0sel\0sfm\0sgh\0sgj\0sgr\0sgt\0sgw\0sgy\0shd\0shi\0shm\0" + "shn\0shu\0shv\0si\0sia\0sip\0siy\0siz\0sjd\0sjp\0sjt\0skb\0skj\0" + "skr\0smh\0smp\0smu\0smy\0soa\0sog\0soi\0sou\0spt\0spv\0sqo\0sqq\0" + "sqt\0sr\0srb\0srh\0srx\0srz\0ssh\0sss\0sts\0stv\0sty\0suz\0sva\0" + "swb\0swi\0swv\0sxu\0syc\0syl\0syn\0syr\0syw\0ta\0tab\0taj\0tbk\0" + "tcn\0tco\0tcx\0tcy\0tda\0tdb\0tdd\0tdg\0tdh\0te\0tes\0tg\0tg_PK\0" + "tge\0tgf\0th\0the\0thf\0thi\0thl\0thm\0thq\0thr\0ths\0ti\0tig\0" + "tij\0tin\0tjl\0tjo\0tkb\0tks\0tkt\0tmr\0tnv\0tov\0tpu\0tra\0trg\0" + "trm\0trw\0tsd\0tsj\0tt\0tth\0tto\0tts\0ttz\0tvn\0twm\0txg\0txo\0" + "tyr\0tyv\0ude\0udg\0udi\0udm\0ug\0ug_KZ\0ug_MN\0uga\0ugh\0ugo\0" + "uk\0uki\0ulc\0unr\0unr_NP\0unx\0ur\0urk\0ush\0uum\0uz_AF\0uz_CN\0" + "uzs\0vaa\0vaf\0vah\0vai\0vas\0vav\0vay\0vgr\0vjk\0vmd\0vmh\0wal\0" + "wbk\0wbq\0wbr\0wle\0wlo\0wme\0wne\0wni\0wsg\0wsv\0wtm\0wuu\0xag\0" + "xal\0xan\0xas\0xco\0xcr\0xdq\0xhe\0xhm\0xis\0xka\0xkc\0xkf\0xkj\0" + "xkp\0xlc\0xld\0xly\0xmf\0xmn\0xmr\0xna\0xnr\0xpg\0xpi\0xpm\0xpr\0" + "xrm\0xrn\0xsa\0xsr\0xtq\0xub\0xuj\0xve\0xvi\0xwo\0xzh\0yai\0ybh\0" + "ybi\0ydg\0yea\0yej\0yeu\0ygp\0yhd\0yi\0yig\0yih\0yiv\0ykg\0ykh\0" + "yna\0ynk\0yoi\0yoy\0yrk\0ysd\0ysn\0ysp\0ysr\0ysy\0yud\0yue\0yue_CN\0" + "yug\0yux\0ywq\0ywu\0zau\0zba\0zch\0zdj\0zeh\0zen\0zgb\0zgh\0zgm\0" + "zgn\0zh\0zh_AU\0zh_BN\0zh_GB\0zh_GF\0zh_HK\0zh_ID\0zh_MO\0zh_PA\0" + "zh_PF\0zh_PH\0zh_SR\0zh_TH\0zh_TW\0zh_US\0zh_VN\0zhd\0zko\0zkt\0" + "zkz\0zlj\0zln\0zlq\0zqe\0zrg\0zrp\0zum\0zwa\0zyg\0zyn\0zzj\0"; const int32_t defaultScriptTable[] = { - 0, 330, // aaf -> Mlym + 0, 325, // aaf -> Mlym 4, 10, // aao -> Arab - 8, 155, // aat -> Grek - 12, 105, // ab -> Cyrl + 8, 150, // aat -> Grek + 12, 100, // ab -> Cyrl 15, 10, // abh -> Arab - 19, 435, // abl -> Rjng + 19, 425, // abl -> Rjng 23, 10, // abv -> Arab 27, 10, // acm -> Arab 31, 10, // acq -> Arab 35, 10, // acw -> Arab 39, 10, // acx -> Arab 43, 10, // adf -> Arab - 47, 555, // adx -> Tibt - 51, 105, // ady -> Cyrl + 47, 545, // adx -> Tibt + 51, 100, // ady -> Cyrl 55, 25, // ae -> Avst 58, 10, // aeb -> Arab 62, 10, // aec -> Arab 66, 10, // aee -> Arab 70, 10, // aeq -> Arab 74, 10, // afb -> Arab - 78, 110, // agi -> Deva - 82, 125, // agj -> Ethi - 86, 105, // agx -> Cyrl - 90, 125, // ahg -> Ethi + 78, 105, // agi -> Deva + 82, 120, // agj -> Ethi + 86, 100, // agx -> Cyrl + 90, 120, // ahg -> Ethi 94, 5, // aho -> Ahom - 98, 110, // ahr -> Deva + 98, 105, // ahr -> Deva 102, 10, // aib -> Arab - 106, 495, // aii -> Syrc - 110, 190, // aij -> Hebr - 114, 225, // ain -> Kana - 118, 355, // aio -> Mymr + 106, 485, // aii -> Syrc + 110, 185, // aij -> Hebr + 114, 220, // ain -> Kana + 118, 350, // aio -> Mymr 122, 10, // aiq -> Arab - 126, 590, // akk -> Xsux - 130, 105, // akv -> Cyrl - 134, 260, // alk -> Laoo - 138, 330, // all -> Mlym - 142, 105, // alr -> Cyrl - 146, 105, // alt -> Cyrl - 150, 125, // alw -> Ethi - 154, 125, // am -> Ethi - 157, 215, // ams -> Jpan - 161, 495, // amw -> Syrc - 165, 105, // ani -> Cyrl - 169, 110, // anp -> Deva - 173, 110, // anq -> Deva - 177, 110, // anr -> Deva - 181, 125, // anu -> Ethi - 185, 50, // aot -> Beng + 126, 580, // akk -> Xsux + 130, 100, // akv -> Cyrl + 134, 255, // alk -> Laoo + 138, 325, // all -> Mlym + 142, 100, // alr -> Cyrl + 146, 100, // alt -> Cyrl + 150, 120, // alw -> Ethi + 154, 120, // am -> Ethi + 157, 210, // ams -> Jpan + 161, 485, // amw -> Syrc + 165, 100, // ani -> Cyrl + 169, 105, // anp -> Deva + 173, 105, // anq -> Deva + 177, 105, // anr -> Deva + 181, 120, // anu -> Ethi + 185, 45, // aot -> Beng 189, 10, // apc -> Arab 193, 10, // apd -> Arab - 197, 110, // aph -> Deva - 201, 105, // aqc -> Cyrl + 197, 105, // aph -> Deva + 201, 100, // aqc -> Cyrl 205, 10, // ar -> Arab 208, 15, // arc -> Armi 212, 10, // arq -> Arab 216, 10, // ars -> Arab 220, 10, // ary -> Arab 224, 10, // arz -> Arab - 228, 50, // as -> Beng - 231, 465, // ase -> Sgnw + 228, 45, // as -> Beng + 231, 455, // ase -> Sgnw 235, 10, // ask -> Arab - 239, 110, // asr -> Deva + 239, 105, // asr -> Deva 243, 10, // atn -> Arab - 247, 105, // atv -> Cyrl + 247, 100, // atv -> Cyrl 251, 10, // auj -> Arab 255, 10, // auz -> Arab - 259, 105, // av -> Cyrl + 259, 100, // av -> Cyrl 262, 10, // avd -> Arab 266, 10, // avl -> Arab - 270, 110, // awa -> Deva - 274, 125, // awn -> Ethi + 270, 105, // awa -> Deva + 274, 120, // awn -> Ethi 278, 20, // axm -> Armn 282, 10, // ayh -> Arab 286, 10, // ayl -> Arab @@ -187,973 +187,981 @@ const int32_t defaultScriptTable[] = { 294, 10, // ayp -> Arab 298, 10, // az_IQ -> Arab 304, 10, // az_IR -> Arab - 310, 105, // az_RU -> Cyrl + 310, 100, // az_RU -> Cyrl 316, 10, // azb -> Arab - 320, 105, // ba -> Cyrl + 320, 100, // ba -> Cyrl 323, 10, // bal -> Arab - 327, 110, // bap -> Deva + 327, 105, // bap -> Deva 331, 35, // bax -> Bamu - 335, 130, // bbl -> Geor - 339, 125, // bcq -> Ethi - 343, 395, // bdv -> Orya + 335, 125, // bbl -> Geor + 339, 120, // bcq -> Ethi + 343, 385, // bdv -> Orya 347, 10, // bdz -> Arab - 351, 105, // be -> Cyrl - 354, 110, // bee -> Deva + 351, 100, // be -> Cyrl + 354, 105, // bee -> Deva 358, 10, // bej -> Arab - 362, 110, // bfb -> Deva - 366, 520, // bfq -> Taml + 362, 105, // bfb -> Deva + 366, 510, // bfq -> Taml 370, 10, // bft -> Arab - 374, 555, // bfu -> Tibt - 378, 395, // bfw -> Orya - 382, 110, // bfy -> Deva - 386, 110, // bfz -> Deva - 390, 105, // bg -> Cyrl - 393, 110, // bgc -> Deva - 397, 110, // bgd -> Deva + 374, 545, // bfu -> Tibt + 378, 385, // bfw -> Orya + 382, 105, // bfy -> Deva + 386, 105, // bfz -> Deva + 390, 100, // bg -> Cyrl + 393, 105, // bgc -> Deva + 397, 105, // bgd -> Deva 401, 10, // bgn -> Arab 405, 10, // bgp -> Arab - 409, 110, // bgq -> Deva - 413, 110, // bgw -> Deva - 417, 155, // bgx -> Grek - 421, 110, // bha -> Deva - 425, 110, // bhb -> Deva - 429, 110, // bhd -> Deva + 409, 105, // bgq -> Deva + 413, 105, // bgw -> Deva + 417, 150, // bgx -> Grek + 421, 105, // bha -> Deva + 425, 105, // bhb -> Deva + 429, 105, // bhd -> Deva 433, 10, // bhe -> Arab - 437, 105, // bhh -> Cyrl - 441, 110, // bhi -> Deva - 445, 110, // bhj -> Deva + 437, 100, // bhh -> Cyrl + 441, 105, // bhi -> Deva + 445, 105, // bhj -> Deva 449, 10, // bhm -> Arab - 453, 495, // bhn -> Syrc - 457, 110, // bho -> Deva - 461, 110, // bht -> Deva - 465, 110, // bhu -> Deva - 469, 110, // biy -> Deva - 473, 495, // bjf -> Syrc - 477, 110, // bjj -> Deva + 453, 485, // bhn -> Syrc + 457, 105, // bho -> Deva + 461, 105, // bht -> Deva + 465, 105, // bhu -> Deva + 469, 105, // biy -> Deva + 473, 485, // bjf -> Syrc + 477, 105, // bjj -> Deva 481, 10, // bjm -> Arab - 485, 555, // bkk -> Tibt - 489, 355, // blk -> Mymr - 493, 530, // blt -> Tavt - 497, 110, // bmj -> Deva - 501, 50, // bn -> Beng - 504, 110, // bns -> Deva - 508, 555, // bo -> Tibt - 511, 105, // bph -> Cyrl - 515, 110, // bpx -> Deva - 519, 50, // bpy -> Beng + 485, 545, // bkk -> Tibt + 489, 350, // blk -> Mymr + 493, 520, // blt -> Tavt + 497, 105, // bmj -> Deva + 501, 45, // bn -> Beng + 504, 105, // bns -> Deva + 508, 545, // bo -> Tibt + 511, 100, // bph -> Cyrl + 515, 105, // bpx -> Deva + 519, 45, // bpy -> Beng 523, 10, // bqi -> Arab - 527, 110, // bra -> Deva - 531, 235, // brb -> Khmr - 535, 110, // brd -> Deva + 527, 105, // bra -> Deva + 531, 230, // brb -> Khmr + 535, 105, // brd -> Deva 539, 10, // brh -> Arab 543, 10, // brk -> Arab - 547, 555, // bro -> Tibt - 551, 260, // brv -> Laoo - 555, 245, // brw -> Knda - 559, 110, // brx -> Deva + 547, 545, // bro -> Tibt + 551, 255, // brv -> Laoo + 555, 240, // brw -> Knda + 559, 105, // brx -> Deva 563, 10, // bsh -> Arab 567, 10, // bsk -> Arab - 571, 40, // bsq -> Bass - 575, 125, // bst -> Ethi - 579, 45, // btd -> Batk - 583, 45, // btm -> Batk - 587, 110, // btv -> Deva - 591, 105, // bua -> Cyrl - 595, 355, // bwe -> Mymr - 599, 105, // bxm -> Cyrl - 603, 340, // bxu -> Mong - 607, 110, // byh -> Deva - 611, 125, // byn -> Ethi - 615, 110, // byw -> Deva - 619, 550, // bzi -> Thai - 623, 550, // cbn -> Thai - 627, 65, // ccp -> Cakm - 631, 535, // cde -> Telu - 635, 110, // cdh -> Deva - 639, 160, // cdi -> Gujr - 643, 110, // cdj -> Deva - 647, 110, // cdm -> Deva - 651, 180, // cdo -> Hans - 655, 50, // cdz -> Beng - 659, 105, // ce -> Cyrl - 662, 555, // cgk -> Tibt - 666, 10, // chg -> Arab - 670, 105, // chm -> Cyrl - 674, 85, // chr -> Cher - 678, 110, // chx -> Deva - 682, 110, // cih -> Deva - 686, 10, // cja -> Arab - 690, 105, // cji -> Cyrl - 694, 80, // cjm -> Cham - 698, 180, // cjy -> Hans - 702, 10, // ckb -> Arab - 706, 105, // ckt -> Cyrl - 710, 10, // clh -> Arab - 714, 105, // clw -> Cyrl - 718, 485, // cmg -> Soyo - 722, 555, // cna -> Tibt - 726, 180, // cnp -> Hans - 730, 550, // cog -> Thai - 734, 95, // cop -> Copt - 738, 155, // cpg -> Grek - 742, 70, // cr -> Cans - 745, 105, // crh -> Cyrl - 749, 70, // crj -> Cans - 753, 70, // crk -> Cans - 757, 70, // crl -> Cans - 761, 70, // crm -> Cans - 765, 355, // csh -> Mymr - 769, 180, // csp -> Hans - 773, 70, // csw -> Cans - 777, 410, // ctd -> Pauc - 781, 50, // ctg -> Beng - 785, 110, // ctn -> Deva - 789, 520, // ctt -> Taml - 793, 520, // cty -> Taml - 797, 105, // cu -> Cyrl - 800, 255, // cuu -> Lana - 804, 105, // cv -> Cyrl - 807, 180, // czh -> Hans - 811, 190, // czk -> Hebr - 815, 110, // daq -> Deva - 819, 105, // dar -> Cyrl - 823, 10, // dcc -> Arab - 827, 105, // ddo -> Cyrl - 831, 10, // def -> Arab - 835, 10, // deh -> Arab - 839, 50, // der -> Beng - 843, 10, // dgl -> Arab - 847, 110, // dhi -> Deva - 851, 160, // dhn -> Gujr - 855, 110, // dho -> Deva - 859, 110, // dhw -> Deva - 863, 555, // dka -> Tibt - 867, 105, // dlg -> Cyrl - 871, 320, // dmf -> Medf - 875, 10, // dmk -> Arab - 879, 10, // dml -> Arab - 883, 105, // dng -> Cyrl - 887, 355, // dnu -> Mymr - 891, 355, // dnv -> Mymr - 895, 110, // doi -> Deva - 899, 125, // dox -> Ethi - 903, 555, // dre -> Tibt - 907, 110, // drq -> Deva - 911, 125, // drs -> Ethi - 915, 110, // dry -> Deva - 919, 395, // dso -> Orya - 923, 110, // dty -> Deva - 927, 160, // dub -> Gujr - 931, 110, // duh -> Deva - 935, 110, // dus -> Deva - 939, 545, // dv -> Thaa - 942, 395, // dwk -> Orya - 946, 110, // dwz -> Deva - 950, 555, // dz -> Tibt - 953, 555, // dzl -> Tibt - 957, 155, // ecr -> Grek - 961, 100, // ecy -> Cprt - 965, 115, // egy -> Egyp - 969, 220, // eky -> Kali - 973, 155, // el -> Grek - 976, 110, // emg -> Deva - 980, 110, // emu -> Deva - 984, 105, // enf -> Cyrl - 988, 105, // enh -> Cyrl - 992, 520, // era -> Taml - 996, 140, // esg -> Gonm - 1000, 10, // esh -> Arab - 1004, 205, // ett -> Ital - 1008, 105, // eve -> Cyrl - 1012, 105, // evn -> Cyrl - 1016, 10, // fa -> Arab - 1019, 10, // fay -> Arab - 1023, 10, // faz -> Arab - 1027, 10, // fia -> Arab - 1031, 110, // fmu -> Deva - 1035, 10, // fub -> Arab - 1039, 180, // gan -> Hans - 1043, 395, // gaq -> Orya - 1047, 160, // gas -> Gujr - 1051, 535, // gau -> Telu - 1055, 395, // gbj -> Orya - 1059, 110, // gbk -> Deva - 1063, 160, // gbl -> Gujr - 1067, 110, // gbm -> Deva - 1071, 10, // gbz -> Arab - 1075, 395, // gdb -> Orya - 1079, 105, // gdo -> Cyrl - 1083, 110, // gdx -> Deva - 1087, 125, // gez -> Ethi - 1091, 10, // ggg -> Arab - 1095, 10, // gha -> Arab - 1099, 110, // ghe -> Deva - 1103, 540, // gho -> Tfng - 1107, 10, // ghr -> Arab - 1111, 555, // ght -> Tibt - 1115, 10, // gig -> Arab - 1119, 105, // gin -> Cyrl - 1123, 10, // gjk -> Arab - 1127, 10, // gju -> Arab - 1131, 105, // gld -> Cyrl - 1135, 10, // glh -> Arab - 1139, 10, // glk -> Arab - 1143, 265, // gml -> Latf - 1147, 125, // gmv -> Ethi - 1151, 285, // gmy -> Linb - 1155, 555, // goe -> Tibt - 1159, 125, // gof -> Ethi - 1163, 110, // goj -> Deva - 1167, 110, // gok -> Deva - 1171, 110, // gon -> Deva - 1175, 145, // got -> Goth - 1179, 110, // gra -> Deva - 1183, 155, // grc -> Grek - 1187, 50, // grt -> Beng - 1191, 125, // gru -> Ethi - 1195, 160, // gu -> Gujr - 1198, 110, // gvr -> Deva - 1202, 10, // gwc -> Arab - 1206, 10, // gwf -> Arab - 1210, 10, // gwt -> Arab - 1214, 110, // gyo -> Deva - 1218, 10, // gzi -> Arab - 1222, 10, // ha_CM -> Arab - 1228, 10, // ha_SD -> Arab - 1234, 10, // hac -> Arab - 1238, 180, // hak -> Hans - 1242, 185, // hak_TW -> Hant - 1249, 125, // har -> Ethi - 1253, 10, // haz -> Arab - 1257, 190, // hbo -> Hebr - 1261, 125, // hdy -> Ethi - 1265, 190, // he -> Hebr - 1268, 110, // hi -> Deva - 1271, 110, // hif -> Deva - 1275, 505, // hii -> Takr - 1279, 590, // hit -> Xsux - 1283, 10, // hkh -> Arab - 1287, 110, // hlb -> Deva - 1291, 195, // hlu -> Hluw - 1295, 425, // hmd -> Plrd - 1299, 55, // hmj -> Bopo - 1303, 55, // hmq -> Bopo - 1307, 10, // hnd -> Arab - 1311, 110, // hne -> Deva - 1315, 200, // hnj -> Hmnp - 1319, 10, // hno -> Arab - 1323, 110, // hoc -> Deva - 1327, 10, // hoh -> Arab - 1331, 110, // hoj -> Deva - 1335, 175, // how -> Hani - 1339, 110, // hoy -> Deva - 1343, 355, // hpo -> Mymr - 1347, 495, // hrt -> Syrc - 1351, 10, // hrz -> Arab - 1355, 180, // hsn -> Hans - 1359, 10, // hss -> Arab - 1363, 590, // htx -> Xsux - 1367, 110, // hut -> Deva - 1371, 190, // huy -> Hebr - 1375, 105, // huz -> Cyrl - 1379, 20, // hy -> Armn - 1382, 20, // hyw -> Armn - 1386, 595, // ii -> Yiii - 1389, 295, // imy -> Lyci - 1393, 105, // inh -> Cyrl - 1397, 355, // int -> Mymr - 1401, 125, // ior -> Ethi - 1405, 520, // iru -> Taml - 1409, 10, // isk -> Arab - 1413, 190, // itk -> Hebr - 1417, 105, // itl -> Cyrl - 1421, 70, // iu -> Cans - 1424, 190, // iw -> Hebr - 1427, 215, // ja -> Jpan - 1430, 10, // jad -> Arab - 1434, 10, // jat -> Arab - 1438, 190, // jbe -> Hebr - 1442, 10, // jbn -> Arab - 1446, 105, // jct -> Cyrl - 1450, 555, // jda -> Tibt - 1454, 10, // jdg -> Arab - 1458, 105, // jdt -> Cyrl - 1462, 110, // jee -> Deva - 1466, 130, // jge -> Geor - 1470, 190, // ji -> Hebr - 1473, 170, // jje -> Hang - 1477, 355, // jkm -> Mymr - 1481, 110, // jml -> Deva - 1485, 505, // jna -> Takr - 1489, 10, // jnd -> Arab - 1493, 110, // jnl -> Deva - 1497, 110, // jns -> Deva - 1501, 10, // jog -> Arab - 1505, 190, // jpa -> Hebr - 1509, 190, // jpr -> Hebr - 1513, 190, // jrb -> Hebr - 1517, 110, // jul -> Deva - 1521, 395, // jun -> Orya - 1525, 395, // juy -> Orya - 1529, 555, // jya -> Tibt - 1533, 190, // jye -> Hebr - 1537, 130, // ka -> Geor - 1540, 105, // kaa -> Cyrl - 1544, 105, // kap -> Cyrl - 1548, 30, // kaw -> Bali - 1552, 105, // kbd -> Cyrl - 1556, 555, // kbg -> Tibt - 1560, 10, // kbu -> Arab - 1564, 10, // kby -> Arab - 1568, 105, // kca -> Cyrl - 1572, 10, // kcy -> Arab - 1576, 50, // kdq -> Beng - 1580, 550, // kdt -> Thai - 1584, 105, // ket -> Cyrl - 1588, 330, // kev -> Mlym - 1592, 110, // kex -> Deva - 1596, 535, // key -> Telu - 1600, 245, // kfa -> Knda - 1604, 110, // kfb -> Deva - 1608, 535, // kfc -> Telu - 1612, 245, // kfd -> Knda - 1616, 520, // kfe -> Taml - 1620, 245, // kfg -> Knda - 1624, 330, // kfh -> Mlym - 1628, 520, // kfi -> Taml - 1632, 110, // kfk -> Deva - 1636, 10, // kfm -> Arab - 1640, 110, // kfp -> Deva - 1644, 110, // kfq -> Deva - 1648, 110, // kfr -> Deva - 1652, 110, // kfs -> Deva - 1656, 110, // kfu -> Deva - 1660, 110, // kfx -> Deva - 1664, 110, // kfy -> Deva - 1668, 110, // kgj -> Deva - 1672, 110, // kgy -> Deva - 1676, 515, // khb -> Talu - 1680, 550, // khf -> Thai - 1684, 555, // khg -> Tibt - 1688, 110, // khn -> Deva - 1692, 60, // kho -> Brah - 1696, 355, // kht -> Mymr - 1700, 105, // khv -> Cyrl - 1704, 10, // khw -> Arab - 1708, 110, // kif -> Deva - 1712, 105, // kim -> Cyrl - 1716, 110, // kip -> Deva - 1720, 260, // kjg -> Laoo - 1724, 105, // kjh -> Cyrl - 1728, 110, // kjl -> Deva - 1732, 110, // kjo -> Deva - 1736, 355, // kjp -> Mymr - 1740, 550, // kjt -> Thai - 1744, 555, // kjz -> Tibt - 1748, 105, // kk -> Cyrl - 1751, 10, // kk_AF -> Arab - 1757, 10, // kk_CN -> Arab - 1763, 10, // kk_IR -> Arab - 1769, 10, // kk_MN -> Arab - 1775, 555, // kkf -> Tibt - 1779, 255, // kkh -> Lana - 1783, 110, // kkt -> Deva - 1787, 110, // kle -> Deva - 1791, 10, // klj -> Arab - 1795, 110, // klr -> Deva - 1799, 235, // km -> Khmr - 1802, 110, // kmj -> Deva - 1806, 10, // kmz -> Arab - 1810, 245, // kn -> Knda - 1813, 110, // knn -> Deva - 1817, 250, // ko -> Kore - 1820, 105, // koi -> Cyrl - 1824, 110, // kok -> Deva - 1828, 105, // kpt -> Cyrl - 1832, 105, // kpy -> Cyrl - 1836, 495, // kqd -> Syrc - 1840, 125, // kqy -> Ethi - 1844, 110, // kra -> Deva - 1848, 105, // krc -> Cyrl - 1852, 105, // krk -> Cyrl - 1856, 235, // krr -> Khmr - 1860, 110, // kru -> Deva - 1864, 235, // krv -> Khmr - 1868, 10, // ks -> Arab - 1871, 355, // ksu -> Mymr - 1875, 355, // ksw -> Mymr - 1879, 110, // ksz -> Deva - 1883, 125, // ktb -> Ethi - 1887, 110, // kte -> Deva - 1891, 10, // ktl -> Arab - 1895, 425, // ktp -> Plrd - 1899, 10, // ku_LB -> Arab - 1905, 260, // kuf -> Laoo - 1909, 105, // kum -> Cyrl - 1913, 105, // kv -> Cyrl - 1916, 105, // kva -> Cyrl - 1920, 355, // kvq -> Mymr - 1924, 355, // kvt -> Mymr - 1928, 10, // kvx -> Arab - 1932, 220, // kvy -> Kali - 1936, 355, // kxf -> Mymr - 1940, 355, // kxk -> Mymr - 1944, 550, // kxm -> Thai - 1948, 10, // kxp -> Arab - 1952, 105, // ky -> Cyrl - 1955, 10, // ky_CN -> Arab - 1961, 220, // kyu -> Kali - 1965, 110, // kyv -> Deva - 1969, 110, // kyw -> Deva - 1973, 280, // lab -> Lina - 1977, 190, // lad -> Hebr - 1981, 110, // lae -> Deva - 1985, 10, // lah -> Arab - 1989, 105, // lbe -> Cyrl - 1993, 110, // lbf -> Deva - 1997, 555, // lbj -> Tibt - 2001, 110, // lbm -> Deva - 2005, 260, // lbo -> Laoo - 2009, 110, // lbr -> Deva - 2013, 550, // lcp -> Thai - 2017, 275, // lep -> Lepc - 2021, 105, // lez -> Cyrl - 2025, 110, // lhm -> Deva - 2029, 495, // lhs -> Syrc - 2033, 110, // lif -> Deva - 2037, 290, // lis -> Lisu - 2041, 555, // lkh -> Tibt - 2045, 10, // lki -> Arab - 2049, 110, // lmh -> Deva - 2053, 535, // lmn -> Telu - 2057, 260, // lo -> Laoo - 2060, 110, // loy -> Deva - 2064, 425, // lpo -> Plrd - 2068, 10, // lrc -> Arab - 2072, 10, // lrk -> Arab - 2076, 10, // lrl -> Arab - 2080, 10, // lsa -> Arab - 2084, 190, // lsd -> Hebr - 2088, 10, // lss -> Arab - 2092, 185, // ltc -> Hant - 2096, 555, // luk -> Tibt - 2100, 110, // luu -> Deva - 2104, 10, // luv -> Arab - 2108, 10, // luz -> Arab - 2112, 550, // lwl -> Thai - 2116, 550, // lwm -> Thai - 2120, 555, // lya -> Tibt - 2124, 180, // lzh -> Hans - 2128, 130, // lzz_GE -> Geor - 2135, 110, // mag -> Deva - 2139, 110, // mai -> Deva - 2143, 10, // mby -> Arab - 2147, 10, // mde -> Arab - 2151, 105, // mdf -> Cyrl - 2155, 125, // mdx -> Ethi - 2159, 125, // mdy -> Ethi - 2163, 10, // mfa -> Arab - 2167, 10, // mfi -> Arab - 2171, 270, // mga -> Latg - 2175, 110, // mgp -> Deva - 2179, 10, // mhj -> Arab - 2183, 305, // mid -> Mand - 2187, 110, // mjl -> Deva - 2191, 330, // mjq -> Mlym - 2195, 330, // mjr -> Mlym - 2199, 110, // mjt -> Deva - 2203, 535, // mju -> Telu - 2207, 330, // mjv -> Mlym - 2211, 110, // mjz -> Deva - 2215, 105, // mk -> Cyrl - 2218, 110, // mkb -> Deva - 2222, 110, // mke -> Deva - 2226, 10, // mki -> Arab - 2230, 550, // mkm -> Thai - 2234, 330, // ml -> Mlym - 2237, 550, // mlf -> Thai - 2241, 105, // mn -> Cyrl - 2244, 340, // mn_CN -> Mong - 2250, 340, // mnc -> Mong - 2254, 50, // mni -> Beng - 2258, 10, // mnj -> Arab - 2262, 105, // mns -> Cyrl - 2266, 355, // mnw -> Mymr - 2270, 550, // mpz -> Thai - 2274, 110, // mr -> Deva - 2277, 550, // mra -> Thai - 2281, 110, // mrd -> Deva - 2285, 105, // mrj -> Cyrl - 2289, 345, // mro -> Mroo - 2293, 110, // mrr -> Deva - 2297, 10, // ms_CC -> Arab - 2303, 105, // mtm -> Cyrl - 2307, 110, // mtr -> Deva - 2311, 105, // mud -> Cyrl - 2315, 555, // muk -> Tibt - 2319, 110, // mut -> Deva - 2323, 520, // muv -> Taml - 2327, 125, // muz -> Ethi - 2331, 10, // mve -> Arab - 2335, 340, // mvf -> Mong - 2339, 10, // mvy -> Arab - 2343, 125, // mvz -> Ethi - 2347, 110, // mwr -> Deva - 2351, 355, // mwt -> Mymr - 2355, 200, // mww -> Hmnp - 2359, 355, // my -> Mymr - 2362, 125, // mym -> Ethi - 2366, 105, // myv -> Cyrl - 2370, 305, // myz -> Mand - 2374, 10, // mzn -> Arab - 2378, 180, // nan -> Hans - 2382, 185, // nan_TW -> Hant - 2389, 110, // nao -> Deva - 2393, 110, // ncd -> Deva - 2397, 260, // ncq -> Laoo - 2401, 105, // ndf -> Cyrl - 2405, 110, // ne -> Deva - 2408, 105, // neg -> Cyrl - 2412, 555, // neh -> Tibt - 2416, 590, // nei -> Xsux - 2420, 110, // new -> Deva - 2424, 260, // ngt -> Laoo - 2428, 105, // nio -> Cyrl - 2432, 535, // nit -> Telu - 2436, 105, // niv -> Cyrl - 2440, 10, // nli -> Arab - 2444, 10, // nlm -> Arab - 2448, 110, // nlx -> Deva - 2452, 110, // nmm -> Deva - 2456, 580, // nnp -> Wcho - 2460, 255, // nod -> Lana - 2464, 110, // noe -> Deva - 2468, 105, // nog -> Cyrl - 2472, 110, // noi -> Deva - 2476, 445, // non -> Runr - 2480, 595, // nos -> Yiii - 2484, 555, // npb -> Tibt - 2488, 370, // nqo -> Nkoo - 2492, 445, // nrn -> Runr - 2496, 595, // nsd -> Yiii - 2500, 595, // nsf -> Yiii - 2504, 70, // nsk -> Cans - 2508, 560, // nst -> Tnsa - 2512, 595, // nsv -> Yiii - 2516, 595, // nty -> Yiii - 2520, 10, // ntz -> Arab - 2524, 365, // nwc -> Newa - 2528, 110, // nwx -> Deva - 2532, 550, // nyl -> Thai - 2536, 10, // nyq -> Arab - 2540, 550, // nyw -> Thai - 2544, 105, // oaa -> Cyrl - 2548, 105, // oac -> Cyrl - 2552, 495, // oar -> Syrc - 2556, 130, // oav -> Geor - 2560, 420, // obm -> Phnx - 2564, 355, // obr -> Mymr - 2568, 10, // odk -> Arab - 2572, 590, // oht -> Xsux - 2576, 70, // oj -> Cans - 2579, 70, // ojs -> Cans - 2583, 170, // okm -> Hang - 2587, 175, // oko -> Hani - 2591, 235, // okz -> Khmr - 2595, 110, // ola -> Deva - 2599, 555, // ole -> Tibt - 2603, 105, // omk -> Cyrl - 2607, 350, // omp -> Mtei - 2611, 335, // omr -> Modi - 2615, 355, // omx -> Mymr - 2619, 110, // oon -> Deva - 2623, 395, // or -> Orya - 2626, 535, // ort -> Telu - 2630, 10, // oru -> Arab - 2634, 105, // orv -> Cyrl - 2638, 105, // os -> Cyrl - 2641, 400, // osa -> Osge - 2645, 205, // osc -> Ital - 2649, 210, // osi -> Java - 2653, 10, // ota -> Arab - 2657, 555, // otb -> Tibt - 2661, 390, // otk -> Orkh - 2665, 150, // oty -> Gran - 2669, 405, // oui -> Ougr - 2673, 165, // pa -> Guru - 2676, 10, // pa_PK -> Arab - 2682, 415, // pal -> Phli - 2686, 105, // paq -> Cyrl - 2690, 10, // pbt -> Arab - 2694, 235, // pcb -> Khmr - 2698, 355, // pce -> Mymr - 2702, 330, // pcf -> Mlym - 2706, 330, // pcg -> Mlym - 2710, 110, // pch -> Deva - 2714, 110, // pci -> Deva - 2718, 535, // pcj -> Telu - 2722, 395, // peg -> Orya - 2726, 585, // peo -> Xpeo - 2730, 230, // pgd -> Khar - 2734, 110, // pgg -> Deva - 2738, 380, // pgl -> Ogam - 2742, 205, // pgn -> Ital - 2746, 110, // phd -> Deva - 2750, 355, // phk -> Mymr - 2754, 10, // phl -> Arab - 2758, 420, // phn -> Phnx - 2762, 260, // pho -> Laoo - 2766, 10, // phr -> Arab - 2770, 550, // pht -> Thai - 2774, 550, // phu -> Thai - 2778, 10, // phv -> Arab - 2782, 110, // phw -> Deva - 2786, 470, // pi -> Sinh - 2789, 60, // pka -> Brah - 2793, 330, // pkr -> Mlym - 2797, 10, // plk -> Arab - 2801, 355, // pll -> Mymr - 2805, 60, // pmh -> Brah - 2809, 155, // pnt -> Grek - 2813, 105, // pnt_RU -> Cyrl - 2820, 230, // pra -> Khar - 2824, 10, // prc -> Arab - 2828, 10, // prd -> Arab - 2832, 550, // prt -> Thai - 2836, 10, // prx -> Arab - 2840, 10, // ps -> Arab - 2843, 10, // psh -> Arab - 2847, 10, // psi -> Arab - 2851, 10, // pst -> Arab - 2855, 60, // psu -> Brah - 2859, 110, // pum -> Deva - 2863, 355, // pwo -> Mymr - 2867, 110, // pwr -> Deva - 2871, 550, // pww -> Thai - 2875, 355, // pyx -> Mymr - 2879, 10, // qxq -> Arab - 2883, 110, // raa -> Deva - 2887, 110, // rab -> Deva - 2891, 110, // raf -> Deva - 2895, 50, // rah -> Beng - 2899, 110, // raj -> Deva - 2903, 110, // rav -> Deva - 2907, 355, // rbb -> Mymr - 2911, 10, // rdb -> Arab - 2915, 395, // rei -> Orya - 2919, 440, // rhg -> Rohg - 2923, 110, // rji -> Deva - 2927, 110, // rjs -> Deva - 2931, 235, // rka -> Khmr - 2935, 355, // rki -> Mymr - 2939, 50, // rkt -> Beng - 2943, 20, // rmi -> Armn - 2947, 10, // rmt -> Arab - 2951, 355, // rmz -> Mymr - 2955, 105, // rsk -> Cyrl - 2959, 110, // rtw -> Deva - 2963, 105, // ru -> Cyrl - 2966, 105, // rue -> Cyrl - 2970, 105, // rut -> Cyrl - 2974, 110, // rwr -> Deva - 2978, 225, // ryu -> Kana - 2982, 110, // sa -> Deva - 2985, 105, // sah -> Cyrl - 2989, 450, // sam -> Samr - 2993, 385, // sat -> Olck - 2997, 460, // saz -> Saur - 3001, 10, // sbn -> Arab - 3005, 555, // sbu -> Tibt - 3009, 110, // sck -> Deva - 3013, 10, // scl -> Arab - 3017, 110, // scp -> Deva - 3021, 260, // sct -> Laoo - 3025, 505, // scu -> Takr - 3029, 155, // scx -> Grek - 3033, 10, // sd -> Arab - 3036, 110, // sd_IN -> Deva - 3042, 10, // sdb -> Arab - 3046, 10, // sdf -> Arab - 3050, 10, // sdg -> Arab - 3054, 10, // sdh -> Arab - 3058, 50, // sdr -> Beng - 3062, 10, // sds -> Arab - 3066, 105, // sel -> Cyrl - 3070, 425, // sfm -> Plrd - 3074, 105, // sgh -> Cyrl - 3078, 110, // sgj -> Deva - 3082, 10, // sgr -> Arab - 3086, 555, // sgt -> Tibt - 3090, 125, // sgw -> Ethi - 3094, 10, // sgy -> Arab - 3098, 10, // shd -> Arab - 3102, 540, // shi -> Tfng - 3106, 10, // shm -> Arab - 3110, 355, // shn -> Mymr - 3114, 10, // shu -> Arab - 3118, 10, // shv -> Arab - 3122, 470, // si -> Sinh - 3125, 105, // sia -> Cyrl - 3129, 555, // sip -> Tibt - 3133, 10, // siy -> Arab - 3137, 10, // siz -> Arab - 3141, 105, // sjd -> Cyrl - 3145, 110, // sjp -> Deva - 3149, 105, // sjt -> Cyrl - 3153, 550, // skb -> Thai - 3157, 110, // skj -> Deva - 3161, 10, // skr -> Arab - 3165, 595, // smh -> Yiii - 3169, 450, // smp -> Samr - 3173, 235, // smu -> Khmr - 3177, 10, // smy -> Arab - 3181, 530, // soa -> Tavt - 3185, 475, // sog -> Sogd - 3189, 110, // soi -> Deva - 3193, 550, // sou -> Thai - 3197, 555, // spt -> Tibt - 3201, 395, // spv -> Orya - 3205, 10, // sqo -> Arab - 3209, 260, // sqq -> Laoo - 3213, 10, // sqt -> Arab - 3217, 105, // sr -> Cyrl - 3220, 480, // srb -> Sora - 3224, 10, // srh -> Arab - 3228, 110, // srx -> Deva - 3232, 10, // srz -> Arab - 3236, 10, // ssh -> Arab - 3240, 260, // sss -> Laoo - 3244, 10, // sts -> Arab - 3248, 125, // stv -> Ethi - 3252, 105, // sty -> Cyrl - 3256, 490, // suz -> Sunu - 3260, 130, // sva -> Geor - 3264, 10, // swb -> Arab - 3268, 175, // swi -> Hani - 3272, 110, // swv -> Deva - 3276, 445, // sxu -> Runr - 3280, 495, // syc -> Syrc - 3284, 50, // syl -> Beng - 3288, 495, // syn -> Syrc - 3292, 495, // syr -> Syrc - 3296, 110, // syw -> Deva - 3300, 520, // ta -> Taml - 3303, 105, // tab -> Cyrl - 3307, 110, // taj -> Deva - 3311, 500, // tbk -> Tagb - 3315, 555, // tcn -> Tibt - 3319, 355, // tco -> Mymr - 3323, 520, // tcx -> Taml - 3327, 245, // tcy -> Knda - 3331, 540, // tda -> Tfng - 3335, 110, // tdb -> Deva - 3339, 510, // tdd -> Tale - 3343, 110, // tdg -> Deva - 3347, 110, // tdh -> Deva - 3351, 535, // te -> Telu - 3354, 210, // tes -> Java - 3358, 105, // tg -> Cyrl - 3361, 10, // tg_PK -> Arab - 3367, 110, // tge -> Deva - 3371, 555, // tgf -> Tibt - 3375, 550, // th -> Thai - 3378, 110, // the -> Deva - 3382, 110, // thf -> Deva - 3386, 510, // thi -> Tale - 3390, 110, // thl -> Deva - 3394, 550, // thm -> Thai - 3398, 110, // thq -> Deva - 3402, 110, // thr -> Deva - 3406, 110, // ths -> Deva - 3410, 125, // ti -> Ethi - 3413, 125, // tig -> Ethi - 3417, 110, // tij -> Deva - 3421, 105, // tin -> Cyrl - 3425, 355, // tjl -> Mymr - 3429, 10, // tjo -> Arab - 3433, 110, // tkb -> Deva - 3437, 10, // tks -> Arab - 3441, 110, // tkt -> Deva - 3445, 495, // tmr -> Syrc - 3449, 65, // tnv -> Cakm - 3453, 10, // tov -> Arab - 3457, 235, // tpu -> Khmr - 3461, 10, // tra -> Arab - 3465, 190, // trg -> Hebr - 3469, 10, // trm -> Arab - 3473, 10, // trw -> Arab - 3477, 155, // tsd -> Grek - 3481, 555, // tsj -> Tibt - 3485, 105, // tt -> Cyrl - 3488, 260, // tth -> Laoo - 3492, 260, // tto -> Laoo - 3496, 550, // tts -> Thai - 3500, 110, // ttz -> Deva - 3504, 355, // tvn -> Mymr - 3508, 110, // twm -> Deva - 3512, 525, // txg -> Tang - 3516, 565, // txo -> Toto - 3520, 530, // tyr -> Tavt - 3524, 105, // tyv -> Cyrl - 3528, 105, // ude -> Cyrl - 3532, 330, // udg -> Mlym - 3536, 105, // udi -> Cyrl - 3540, 105, // udm -> Cyrl - 3544, 10, // ug -> Arab - 3547, 105, // ug_KZ -> Cyrl - 3553, 105, // ug_MN -> Cyrl - 3559, 570, // uga -> Ugar - 3563, 105, // ugh -> Cyrl - 3567, 550, // ugo -> Thai - 3571, 105, // uk -> Cyrl - 3574, 395, // uki -> Orya - 3578, 105, // ulc -> Cyrl - 3582, 50, // unr -> Beng - 3586, 110, // unr_NP -> Deva - 3593, 50, // unx -> Beng - 3597, 10, // ur -> Arab - 3600, 550, // urk -> Thai - 3604, 10, // ush -> Arab - 3608, 155, // uum -> Grek - 3612, 10, // uz_AF -> Arab - 3618, 105, // uz_CN -> Cyrl - 3624, 10, // uzs -> Arab - 3628, 520, // vaa -> Taml - 3632, 10, // vaf -> Arab - 3636, 110, // vah -> Deva - 3640, 575, // vai -> Vaii - 3644, 110, // vas -> Deva - 3648, 110, // vav -> Deva - 3652, 110, // vay -> Deva - 3656, 10, // vgr -> Arab - 3660, 110, // vjk -> Deva - 3664, 245, // vmd -> Knda - 3668, 10, // vmh -> Arab - 3672, 125, // wal -> Ethi - 3676, 10, // wbk -> Arab - 3680, 535, // wbq -> Telu - 3684, 110, // wbr -> Deva - 3688, 125, // wle -> Ethi - 3692, 10, // wlo -> Arab - 3696, 110, // wme -> Deva - 3700, 10, // wne -> Arab - 3704, 10, // wni -> Arab - 3708, 135, // wsg -> Gong - 3712, 10, // wsv -> Arab - 3716, 110, // wtm -> Deva - 3720, 180, // wuu -> Hans - 3724, 0, // xag -> Aghb - 3728, 105, // xal -> Cyrl - 3732, 125, // xan -> Ethi - 3736, 105, // xas -> Cyrl - 3740, 90, // xco -> Chrs - 3744, 75, // xcr -> Cari - 3748, 105, // xdq -> Cyrl - 3752, 10, // xhe -> Arab - 3756, 235, // xhm -> Khmr - 3760, 395, // xis -> Orya - 3764, 10, // xka -> Arab - 3768, 10, // xkc -> Arab - 3772, 555, // xkf -> Tibt - 3776, 10, // xkj -> Arab - 3780, 10, // xkp -> Arab - 3784, 295, // xlc -> Lyci - 3788, 300, // xld -> Lydi - 3792, 120, // xly -> Elym - 3796, 130, // xmf -> Geor - 3800, 310, // xmn -> Mani - 3804, 325, // xmr -> Merc - 3808, 360, // xna -> Narb - 3812, 110, // xnr -> Deva - 3816, 155, // xpg -> Grek - 3820, 380, // xpi -> Ogam - 3824, 105, // xpm -> Cyrl - 3828, 430, // xpr -> Prti - 3832, 105, // xrm -> Cyrl - 3836, 105, // xrn -> Cyrl - 3840, 455, // xsa -> Sarb - 3844, 110, // xsr -> Deva - 3848, 60, // xtq -> Brah - 3852, 520, // xub -> Taml - 3856, 520, // xuj -> Taml - 3860, 205, // xve -> Ital - 3864, 10, // xvi -> Arab - 3868, 105, // xwo -> Cyrl - 3872, 315, // xzh -> Marc - 3876, 105, // yai -> Cyrl - 3880, 110, // ybh -> Deva - 3884, 110, // ybi -> Deva - 3888, 10, // ydg -> Arab - 3892, 330, // yea -> Mlym - 3896, 155, // yej -> Grek - 3900, 535, // yeu -> Telu - 3904, 425, // ygp -> Plrd - 3908, 190, // yhd -> Hebr - 3912, 190, // yi -> Hebr - 3915, 595, // yig -> Yiii - 3919, 190, // yih -> Hebr - 3923, 595, // yiv -> Yiii - 3927, 105, // ykg -> Cyrl - 3931, 105, // ykh -> Cyrl - 3935, 425, // yna -> Plrd - 3939, 105, // ynk -> Cyrl - 3943, 215, // yoi -> Jpan - 3947, 550, // yoy -> Thai - 3951, 105, // yrk -> Cyrl - 3955, 595, // ysd -> Yiii - 3959, 595, // ysn -> Yiii - 3963, 595, // ysp -> Yiii - 3967, 105, // ysr -> Cyrl - 3971, 425, // ysy -> Plrd - 3975, 190, // yud -> Hebr - 3979, 185, // yue -> Hant - 3983, 180, // yue_CN -> Hans - 3990, 105, // yug -> Cyrl - 3994, 105, // yux -> Cyrl - 3998, 425, // ywq -> Plrd - 4002, 425, // ywu -> Plrd - 4006, 555, // zau -> Tibt - 4010, 10, // zba -> Arab - 4014, 175, // zch -> Hani - 4018, 10, // zdj -> Arab - 4022, 175, // zeh -> Hani - 4026, 540, // zen -> Tfng - 4030, 175, // zgb -> Hani - 4034, 540, // zgh -> Tfng - 4038, 175, // zgm -> Hani - 4042, 175, // zgn -> Hani - 4046, 180, // zh -> Hans - 4049, 185, // zh_AU -> Hant - 4055, 185, // zh_BN -> Hant - 4061, 185, // zh_GB -> Hant - 4067, 185, // zh_GF -> Hant - 4073, 185, // zh_HK -> Hant - 4079, 185, // zh_ID -> Hant - 4085, 185, // zh_MO -> Hant - 4091, 185, // zh_PA -> Hant - 4097, 185, // zh_PF -> Hant - 4103, 185, // zh_PH -> Hant - 4109, 185, // zh_SR -> Hant - 4115, 185, // zh_TH -> Hant - 4121, 185, // zh_TW -> Hant - 4127, 185, // zh_US -> Hant - 4133, 185, // zh_VN -> Hant - 4139, 175, // zhd -> Hani - 4143, 375, // zhx -> Nshu - 4147, 105, // zko -> Cyrl - 4151, 240, // zkt -> Kits - 4155, 105, // zkz -> Cyrl - 4159, 175, // zlj -> Hani - 4163, 175, // zln -> Hani - 4167, 175, // zlq -> Hani - 4171, 175, // zqe -> Hani - 4175, 395, // zrg -> Orya - 4179, 190, // zrp -> Hebr - 4183, 10, // zum -> Arab - 4187, 125, // zwa -> Ethi - 4191, 175, // zyg -> Hani - 4195, 175, // zyn -> Hani - 4199, 175, // zzj -> Hani + 571, 120, // bst -> Ethi + 575, 40, // btd -> Batk + 579, 40, // btm -> Batk + 583, 105, // btv -> Deva + 587, 100, // bua -> Cyrl + 591, 350, // bwe -> Mymr + 595, 100, // bxm -> Cyrl + 599, 335, // bxu -> Mong + 603, 105, // byh -> Deva + 607, 120, // byn -> Ethi + 611, 105, // byw -> Deva + 615, 540, // bzi -> Thai + 619, 540, // cbn -> Thai + 623, 60, // ccp -> Cakm + 627, 525, // cde -> Telu + 631, 105, // cdh -> Deva + 635, 155, // cdi -> Gujr + 639, 105, // cdj -> Deva + 643, 105, // cdm -> Deva + 647, 175, // cdo -> Hans + 651, 45, // cdz -> Beng + 655, 100, // ce -> Cyrl + 658, 545, // cgk -> Tibt + 662, 10, // chg -> Arab + 666, 100, // chm -> Cyrl + 670, 80, // chr -> Cher + 674, 105, // chx -> Deva + 678, 105, // cih -> Deva + 682, 10, // cja -> Arab + 686, 100, // cji -> Cyrl + 690, 75, // cjm -> Cham + 694, 175, // cjy -> Hans + 698, 10, // ckb -> Arab + 702, 100, // ckt -> Cyrl + 706, 10, // clh -> Arab + 710, 100, // clw -> Cyrl + 714, 475, // cmg -> Soyo + 718, 545, // cna -> Tibt + 722, 175, // cnp -> Hans + 726, 540, // cog -> Thai + 730, 90, // cop -> Copt + 734, 150, // cpg -> Grek + 738, 65, // cr -> Cans + 741, 100, // crh -> Cyrl + 745, 65, // crj -> Cans + 749, 65, // crk -> Cans + 753, 65, // crl -> Cans + 757, 65, // crm -> Cans + 761, 350, // csh -> Mymr + 765, 175, // csp -> Hans + 769, 65, // csw -> Cans + 773, 400, // ctd -> Pauc + 777, 45, // ctg -> Beng + 781, 105, // ctn -> Deva + 785, 510, // ctt -> Taml + 789, 510, // cty -> Taml + 793, 100, // cu -> Cyrl + 796, 250, // cuu -> Lana + 800, 100, // cv -> Cyrl + 803, 175, // czh -> Hans + 807, 185, // czk -> Hebr + 811, 105, // daq -> Deva + 815, 100, // dar -> Cyrl + 819, 10, // dcc -> Arab + 823, 100, // ddo -> Cyrl + 827, 10, // def -> Arab + 831, 10, // deh -> Arab + 835, 45, // der -> Beng + 839, 10, // dgl -> Arab + 843, 105, // dhi -> Deva + 847, 155, // dhn -> Gujr + 851, 105, // dho -> Deva + 855, 105, // dhw -> Deva + 859, 545, // dka -> Tibt + 863, 100, // dlg -> Cyrl + 867, 315, // dmf -> Medf + 871, 10, // dmk -> Arab + 875, 10, // dml -> Arab + 879, 100, // dng -> Cyrl + 883, 350, // dnu -> Mymr + 887, 350, // dnv -> Mymr + 891, 105, // doi -> Deva + 895, 120, // dox -> Ethi + 899, 545, // dre -> Tibt + 903, 105, // drq -> Deva + 907, 120, // drs -> Ethi + 911, 105, // dry -> Deva + 915, 385, // dso -> Orya + 919, 105, // dty -> Deva + 923, 155, // dub -> Gujr + 927, 105, // duh -> Deva + 931, 105, // dus -> Deva + 935, 535, // dv -> Thaa + 938, 385, // dwk -> Orya + 942, 105, // dwz -> Deva + 946, 545, // dz -> Tibt + 949, 545, // dzl -> Tibt + 953, 150, // ecr -> Grek + 957, 95, // ecy -> Cprt + 961, 110, // egy -> Egyp + 965, 215, // eky -> Kali + 969, 150, // el -> Grek + 972, 105, // emg -> Deva + 976, 105, // emu -> Deva + 980, 100, // enf -> Cyrl + 984, 100, // enh -> Cyrl + 988, 510, // era -> Taml + 992, 135, // esg -> Gonm + 996, 10, // esh -> Arab + 1000, 200, // ett -> Ital + 1004, 100, // eve -> Cyrl + 1008, 100, // evn -> Cyrl + 1012, 10, // fa -> Arab + 1015, 10, // fay -> Arab + 1019, 10, // faz -> Arab + 1023, 10, // fia -> Arab + 1027, 105, // fmu -> Deva + 1031, 10, // fub -> Arab + 1035, 175, // gan -> Hans + 1039, 385, // gaq -> Orya + 1043, 155, // gas -> Gujr + 1047, 525, // gau -> Telu + 1051, 385, // gbj -> Orya + 1055, 105, // gbk -> Deva + 1059, 155, // gbl -> Gujr + 1063, 105, // gbm -> Deva + 1067, 10, // gbz -> Arab + 1071, 385, // gdb -> Orya + 1075, 100, // gdo -> Cyrl + 1079, 105, // gdx -> Deva + 1083, 120, // gez -> Ethi + 1087, 10, // ggg -> Arab + 1091, 10, // gha -> Arab + 1095, 105, // ghe -> Deva + 1099, 530, // gho -> Tfng + 1103, 10, // ghr -> Arab + 1107, 545, // ght -> Tibt + 1111, 10, // gig -> Arab + 1115, 100, // gin -> Cyrl + 1119, 10, // gjk -> Arab + 1123, 10, // gju -> Arab + 1127, 100, // gld -> Cyrl + 1131, 10, // glh -> Arab + 1135, 10, // glk -> Arab + 1139, 260, // gml -> Latf + 1143, 120, // gmv -> Ethi + 1147, 280, // gmy -> Linb + 1151, 545, // goe -> Tibt + 1155, 120, // gof -> Ethi + 1159, 105, // goj -> Deva + 1163, 105, // gok -> Deva + 1167, 105, // gon -> Deva + 1171, 140, // got -> Goth + 1175, 105, // gra -> Deva + 1179, 150, // grc -> Grek + 1183, 45, // grt -> Beng + 1187, 120, // gru -> Ethi + 1191, 155, // gu -> Gujr + 1194, 105, // gvr -> Deva + 1198, 10, // gwc -> Arab + 1202, 10, // gwf -> Arab + 1206, 10, // gwt -> Arab + 1210, 105, // gyo -> Deva + 1214, 10, // gzi -> Arab + 1218, 10, // ha_CM -> Arab + 1224, 10, // ha_SD -> Arab + 1230, 10, // hac -> Arab + 1234, 175, // hak -> Hans + 1238, 180, // hak_TW -> Hant + 1245, 120, // har -> Ethi + 1249, 10, // haz -> Arab + 1253, 185, // hbo -> Hebr + 1257, 120, // hdy -> Ethi + 1261, 185, // he -> Hebr + 1264, 105, // hi -> Deva + 1267, 105, // hif -> Deva + 1271, 495, // hii -> Takr + 1275, 580, // hit -> Xsux + 1279, 10, // hkh -> Arab + 1283, 105, // hlb -> Deva + 1287, 190, // hlu -> Hluw + 1291, 415, // hmd -> Plrd + 1295, 50, // hmj -> Bopo + 1299, 50, // hmq -> Bopo + 1303, 10, // hnd -> Arab + 1307, 105, // hne -> Deva + 1311, 195, // hnj -> Hmnp + 1315, 10, // hno -> Arab + 1319, 105, // hoc -> Deva + 1323, 10, // hoh -> Arab + 1327, 105, // hoj -> Deva + 1331, 170, // how -> Hani + 1335, 105, // hoy -> Deva + 1339, 350, // hpo -> Mymr + 1343, 485, // hrt -> Syrc + 1347, 10, // hrz -> Arab + 1351, 175, // hsn -> Hans + 1355, 10, // hss -> Arab + 1359, 580, // htx -> Xsux + 1363, 105, // hut -> Deva + 1367, 185, // huy -> Hebr + 1371, 100, // huz -> Cyrl + 1375, 20, // hy -> Armn + 1378, 20, // hyw -> Armn + 1382, 585, // ii -> Yiii + 1385, 290, // imy -> Lyci + 1389, 100, // inh -> Cyrl + 1393, 350, // int -> Mymr + 1397, 120, // ior -> Ethi + 1401, 510, // iru -> Taml + 1405, 10, // isk -> Arab + 1409, 185, // itk -> Hebr + 1413, 100, // itl -> Cyrl + 1417, 65, // iu -> Cans + 1420, 185, // iw -> Hebr + 1423, 210, // ja -> Jpan + 1426, 10, // jad -> Arab + 1430, 10, // jat -> Arab + 1434, 185, // jbe -> Hebr + 1438, 10, // jbn -> Arab + 1442, 100, // jct -> Cyrl + 1446, 545, // jda -> Tibt + 1450, 10, // jdg -> Arab + 1454, 100, // jdt -> Cyrl + 1458, 105, // jee -> Deva + 1462, 125, // jge -> Geor + 1466, 185, // ji -> Hebr + 1469, 165, // jje -> Hang + 1473, 350, // jkm -> Mymr + 1477, 105, // jml -> Deva + 1481, 495, // jna -> Takr + 1485, 10, // jnd -> Arab + 1489, 105, // jnl -> Deva + 1493, 105, // jns -> Deva + 1497, 10, // jog -> Arab + 1501, 185, // jpa -> Hebr + 1505, 185, // jpr -> Hebr + 1509, 185, // jrb -> Hebr + 1513, 105, // jul -> Deva + 1517, 385, // jun -> Orya + 1521, 385, // juy -> Orya + 1525, 545, // jya -> Tibt + 1529, 185, // jye -> Hebr + 1533, 125, // ka -> Geor + 1536, 100, // kaa -> Cyrl + 1540, 100, // kap -> Cyrl + 1544, 30, // kaw -> Bali + 1548, 100, // kbd -> Cyrl + 1552, 545, // kbg -> Tibt + 1556, 10, // kbu -> Arab + 1560, 10, // kby -> Arab + 1564, 100, // kca -> Cyrl + 1568, 10, // kcy -> Arab + 1572, 45, // kdq -> Beng + 1576, 540, // kdt -> Thai + 1580, 100, // ket -> Cyrl + 1584, 325, // kev -> Mlym + 1588, 105, // kex -> Deva + 1592, 525, // key -> Telu + 1596, 240, // kfa -> Knda + 1600, 105, // kfb -> Deva + 1604, 525, // kfc -> Telu + 1608, 240, // kfd -> Knda + 1612, 510, // kfe -> Taml + 1616, 240, // kfg -> Knda + 1620, 325, // kfh -> Mlym + 1624, 510, // kfi -> Taml + 1628, 105, // kfk -> Deva + 1632, 10, // kfm -> Arab + 1636, 105, // kfp -> Deva + 1640, 105, // kfq -> Deva + 1644, 105, // kfr -> Deva + 1648, 105, // kfs -> Deva + 1652, 105, // kfu -> Deva + 1656, 105, // kfx -> Deva + 1660, 105, // kfy -> Deva + 1664, 105, // kgj -> Deva + 1668, 105, // kgy -> Deva + 1672, 505, // khb -> Talu + 1676, 540, // khf -> Thai + 1680, 545, // khg -> Tibt + 1684, 105, // khn -> Deva + 1688, 55, // kho -> Brah + 1692, 350, // kht -> Mymr + 1696, 100, // khv -> Cyrl + 1700, 10, // khw -> Arab + 1704, 105, // kif -> Deva + 1708, 100, // kim -> Cyrl + 1712, 105, // kip -> Deva + 1716, 255, // kjg -> Laoo + 1720, 100, // kjh -> Cyrl + 1724, 105, // kjl -> Deva + 1728, 105, // kjo -> Deva + 1732, 350, // kjp -> Mymr + 1736, 540, // kjt -> Thai + 1740, 545, // kjz -> Tibt + 1744, 100, // kk -> Cyrl + 1747, 10, // kk_AF -> Arab + 1753, 10, // kk_CN -> Arab + 1759, 10, // kk_IR -> Arab + 1765, 10, // kk_MN -> Arab + 1771, 545, // kkf -> Tibt + 1775, 250, // kkh -> Lana + 1779, 105, // kkt -> Deva + 1783, 105, // kle -> Deva + 1787, 10, // klj -> Arab + 1791, 105, // klr -> Deva + 1795, 230, // km -> Khmr + 1798, 105, // kmj -> Deva + 1802, 10, // kmz -> Arab + 1806, 240, // kn -> Knda + 1809, 105, // knn -> Deva + 1813, 245, // ko -> Kore + 1816, 100, // koi -> Cyrl + 1820, 105, // kok -> Deva + 1824, 100, // kpt -> Cyrl + 1828, 100, // kpy -> Cyrl + 1832, 485, // kqd -> Syrc + 1836, 120, // kqy -> Ethi + 1840, 105, // kra -> Deva + 1844, 100, // krc -> Cyrl + 1848, 100, // krk -> Cyrl + 1852, 230, // krr -> Khmr + 1856, 105, // kru -> Deva + 1860, 230, // krv -> Khmr + 1864, 10, // ks -> Arab + 1867, 350, // ksu -> Mymr + 1871, 350, // ksw -> Mymr + 1875, 105, // ksz -> Deva + 1879, 120, // ktb -> Ethi + 1883, 105, // kte -> Deva + 1887, 10, // ktl -> Arab + 1891, 415, // ktp -> Plrd + 1895, 100, // ku_AM -> Cyrl + 1901, 100, // ku_AZ -> Cyrl + 1907, 100, // ku_GE -> Cyrl + 1913, 10, // ku_IQ -> Arab + 1919, 10, // ku_IR -> Arab + 1925, 10, // ku_LB -> Arab + 1931, 100, // ku_TM -> Cyrl + 1937, 255, // kuf -> Laoo + 1941, 100, // kum -> Cyrl + 1945, 100, // kv -> Cyrl + 1948, 100, // kva -> Cyrl + 1952, 350, // kvq -> Mymr + 1956, 350, // kvt -> Mymr + 1960, 10, // kvx -> Arab + 1964, 215, // kvy -> Kali + 1968, 350, // kxf -> Mymr + 1972, 350, // kxk -> Mymr + 1976, 540, // kxm -> Thai + 1980, 10, // kxp -> Arab + 1984, 100, // ky -> Cyrl + 1987, 10, // ky_CN -> Arab + 1993, 215, // kyu -> Kali + 1997, 105, // kyv -> Deva + 2001, 105, // kyw -> Deva + 2005, 275, // lab -> Lina + 2009, 185, // lad -> Hebr + 2013, 105, // lae -> Deva + 2017, 10, // lah -> Arab + 2021, 100, // lbe -> Cyrl + 2025, 105, // lbf -> Deva + 2029, 545, // lbj -> Tibt + 2033, 105, // lbm -> Deva + 2037, 255, // lbo -> Laoo + 2041, 105, // lbr -> Deva + 2045, 540, // lcp -> Thai + 2049, 270, // lep -> Lepc + 2053, 100, // lez -> Cyrl + 2057, 105, // lhm -> Deva + 2061, 485, // lhs -> Syrc + 2065, 105, // lif -> Deva + 2069, 285, // lis -> Lisu + 2073, 545, // lkh -> Tibt + 2077, 10, // lki -> Arab + 2081, 105, // lmh -> Deva + 2085, 525, // lmn -> Telu + 2089, 255, // lo -> Laoo + 2092, 105, // loy -> Deva + 2096, 415, // lpo -> Plrd + 2100, 10, // lrc -> Arab + 2104, 10, // lrk -> Arab + 2108, 10, // lrl -> Arab + 2112, 10, // lsa -> Arab + 2116, 185, // lsd -> Hebr + 2120, 10, // lss -> Arab + 2124, 180, // ltc -> Hant + 2128, 545, // luk -> Tibt + 2132, 105, // luu -> Deva + 2136, 10, // luv -> Arab + 2140, 10, // luz -> Arab + 2144, 540, // lwl -> Thai + 2148, 540, // lwm -> Thai + 2152, 545, // lya -> Tibt + 2156, 180, // lzh -> Hant + 2160, 125, // lzz_GE -> Geor + 2167, 105, // mag -> Deva + 2171, 105, // mai -> Deva + 2175, 10, // mby -> Arab + 2179, 10, // mde -> Arab + 2183, 100, // mdf -> Cyrl + 2187, 120, // mdx -> Ethi + 2191, 120, // mdy -> Ethi + 2195, 10, // mey -> Arab + 2199, 10, // mfa -> Arab + 2203, 10, // mfi -> Arab + 2207, 265, // mga -> Latg + 2211, 105, // mgp -> Deva + 2215, 10, // mhj -> Arab + 2219, 300, // mid -> Mand + 2223, 105, // mjl -> Deva + 2227, 325, // mjq -> Mlym + 2231, 325, // mjr -> Mlym + 2235, 105, // mjt -> Deva + 2239, 525, // mju -> Telu + 2243, 325, // mjv -> Mlym + 2247, 105, // mjz -> Deva + 2251, 100, // mk -> Cyrl + 2254, 105, // mkb -> Deva + 2258, 105, // mke -> Deva + 2262, 10, // mki -> Arab + 2266, 540, // mkm -> Thai + 2270, 325, // ml -> Mlym + 2273, 540, // mlf -> Thai + 2277, 100, // mn -> Cyrl + 2280, 335, // mn_CN -> Mong + 2286, 335, // mnc -> Mong + 2290, 45, // mni -> Beng + 2294, 10, // mnj -> Arab + 2298, 100, // mns -> Cyrl + 2302, 350, // mnw -> Mymr + 2306, 540, // mpz -> Thai + 2310, 105, // mr -> Deva + 2313, 540, // mra -> Thai + 2317, 105, // mrd -> Deva + 2321, 100, // mrj -> Cyrl + 2325, 340, // mro -> Mroo + 2329, 105, // mrr -> Deva + 2333, 10, // ms_CC -> Arab + 2339, 100, // mtm -> Cyrl + 2343, 105, // mtr -> Deva + 2347, 100, // mud -> Cyrl + 2351, 545, // muk -> Tibt + 2355, 105, // mut -> Deva + 2359, 510, // muv -> Taml + 2363, 120, // muz -> Ethi + 2367, 10, // mve -> Arab + 2371, 335, // mvf -> Mong + 2375, 10, // mvy -> Arab + 2379, 120, // mvz -> Ethi + 2383, 105, // mwr -> Deva + 2387, 350, // mwt -> Mymr + 2391, 195, // mww -> Hmnp + 2395, 350, // my -> Mymr + 2398, 120, // mym -> Ethi + 2402, 100, // myv -> Cyrl + 2406, 300, // myz -> Mand + 2410, 10, // mzn -> Arab + 2414, 175, // nan -> Hans + 2418, 180, // nan_MO -> Hant + 2425, 180, // nan_TW -> Hant + 2432, 105, // nao -> Deva + 2436, 105, // ncd -> Deva + 2440, 255, // ncq -> Laoo + 2444, 100, // ndf -> Cyrl + 2448, 105, // ne -> Deva + 2451, 100, // neg -> Cyrl + 2455, 545, // neh -> Tibt + 2459, 580, // nei -> Xsux + 2463, 105, // new -> Deva + 2467, 255, // ngt -> Laoo + 2471, 100, // nio -> Cyrl + 2475, 525, // nit -> Telu + 2479, 100, // niv -> Cyrl + 2483, 10, // nli -> Arab + 2487, 10, // nlm -> Arab + 2491, 105, // nlx -> Deva + 2495, 105, // nmm -> Deva + 2499, 570, // nnp -> Wcho + 2503, 250, // nod -> Lana + 2507, 105, // noe -> Deva + 2511, 100, // nog -> Cyrl + 2515, 105, // noi -> Deva + 2519, 435, // non -> Runr + 2523, 585, // nos -> Yiii + 2527, 545, // npb -> Tibt + 2531, 365, // nqo -> Nkoo + 2535, 435, // nrn -> Runr + 2539, 585, // nsd -> Yiii + 2543, 585, // nsf -> Yiii + 2547, 65, // nsk -> Cans + 2551, 550, // nst -> Tnsa + 2555, 585, // nsv -> Yiii + 2559, 585, // nty -> Yiii + 2563, 10, // ntz -> Arab + 2567, 360, // nwc -> Newa + 2571, 105, // nwx -> Deva + 2575, 540, // nyl -> Thai + 2579, 10, // nyq -> Arab + 2583, 540, // nyw -> Thai + 2587, 100, // oaa -> Cyrl + 2591, 100, // oac -> Cyrl + 2595, 485, // oar -> Syrc + 2599, 125, // oav -> Geor + 2603, 410, // obm -> Phnx + 2607, 350, // obr -> Mymr + 2611, 10, // odk -> Arab + 2615, 580, // oht -> Xsux + 2619, 65, // oj -> Cans + 2622, 65, // ojs -> Cans + 2626, 165, // okm -> Hang + 2630, 170, // oko -> Hani + 2634, 230, // okz -> Khmr + 2638, 105, // ola -> Deva + 2642, 545, // ole -> Tibt + 2646, 100, // omk -> Cyrl + 2650, 345, // omp -> Mtei + 2654, 330, // omr -> Modi + 2658, 350, // omx -> Mymr + 2662, 105, // oon -> Deva + 2666, 385, // or -> Orya + 2669, 525, // ort -> Telu + 2673, 10, // oru -> Arab + 2677, 100, // orv -> Cyrl + 2681, 100, // os -> Cyrl + 2684, 390, // osa -> Osge + 2688, 200, // osc -> Ital + 2692, 205, // osi -> Java + 2696, 10, // ota -> Arab + 2700, 545, // otb -> Tibt + 2704, 380, // otk -> Orkh + 2708, 145, // oty -> Gran + 2712, 395, // oui -> Ougr + 2716, 160, // pa -> Guru + 2719, 10, // pa_PK -> Arab + 2725, 405, // pal -> Phli + 2729, 100, // paq -> Cyrl + 2733, 10, // pbt -> Arab + 2737, 230, // pcb -> Khmr + 2741, 350, // pce -> Mymr + 2745, 325, // pcf -> Mlym + 2749, 325, // pcg -> Mlym + 2753, 105, // pch -> Deva + 2757, 105, // pci -> Deva + 2761, 525, // pcj -> Telu + 2765, 385, // peg -> Orya + 2769, 575, // peo -> Xpeo + 2773, 225, // pgd -> Khar + 2777, 105, // pgg -> Deva + 2781, 370, // pgl -> Ogam + 2785, 200, // pgn -> Ital + 2789, 105, // phd -> Deva + 2793, 350, // phk -> Mymr + 2797, 10, // phl -> Arab + 2801, 410, // phn -> Phnx + 2805, 255, // pho -> Laoo + 2809, 10, // phr -> Arab + 2813, 540, // pht -> Thai + 2817, 540, // phu -> Thai + 2821, 10, // phv -> Arab + 2825, 105, // phw -> Deva + 2829, 105, // pi_IN -> Deva + 2835, 460, // pi_LK -> Sinh + 2841, 350, // pi_MM -> Mymr + 2847, 540, // pi_TH -> Thai + 2853, 55, // pka -> Brah + 2857, 325, // pkr -> Mlym + 2861, 10, // plk -> Arab + 2865, 350, // pll -> Mymr + 2869, 55, // pmh -> Brah + 2873, 150, // pnt -> Grek + 2877, 100, // pnt_RU -> Cyrl + 2884, 10, // prc -> Arab + 2888, 10, // prd -> Arab + 2892, 540, // prt -> Thai + 2896, 10, // prx -> Arab + 2900, 10, // ps -> Arab + 2903, 10, // psh -> Arab + 2907, 10, // psi -> Arab + 2911, 10, // pst -> Arab + 2915, 55, // psu -> Brah + 2919, 105, // pum -> Deva + 2923, 350, // pwo -> Mymr + 2927, 105, // pwr -> Deva + 2931, 540, // pww -> Thai + 2935, 350, // pyx -> Mymr + 2939, 10, // qxq -> Arab + 2943, 105, // raa -> Deva + 2947, 105, // rab -> Deva + 2951, 105, // raf -> Deva + 2955, 45, // rah -> Beng + 2959, 105, // raj -> Deva + 2963, 105, // rav -> Deva + 2967, 350, // rbb -> Mymr + 2971, 10, // rdb -> Arab + 2975, 385, // rei -> Orya + 2979, 430, // rhg -> Rohg + 2983, 105, // rji -> Deva + 2987, 105, // rjs -> Deva + 2991, 230, // rka -> Khmr + 2995, 350, // rki -> Mymr + 2999, 45, // rkt -> Beng + 3003, 20, // rmi -> Armn + 3007, 10, // rmt -> Arab + 3011, 350, // rmz -> Mymr + 3015, 100, // rsk -> Cyrl + 3019, 105, // rtw -> Deva + 3023, 100, // ru -> Cyrl + 3026, 100, // rue -> Cyrl + 3030, 100, // rut -> Cyrl + 3034, 105, // rwr -> Deva + 3038, 220, // ryu -> Kana + 3042, 105, // sa -> Deva + 3045, 100, // sah -> Cyrl + 3049, 440, // sam -> Samr + 3053, 375, // sat -> Olck + 3057, 450, // saz -> Saur + 3061, 10, // sbn -> Arab + 3065, 545, // sbu -> Tibt + 3069, 105, // sck -> Deva + 3073, 10, // scl -> Arab + 3077, 105, // scp -> Deva + 3081, 255, // sct -> Laoo + 3085, 495, // scu -> Takr + 3089, 150, // scx -> Grek + 3093, 10, // sd -> Arab + 3096, 105, // sd_IN -> Deva + 3102, 10, // sdb -> Arab + 3106, 10, // sdf -> Arab + 3110, 10, // sdg -> Arab + 3114, 10, // sdh -> Arab + 3118, 45, // sdr -> Beng + 3122, 10, // sds -> Arab + 3126, 100, // sel -> Cyrl + 3130, 415, // sfm -> Plrd + 3134, 100, // sgh -> Cyrl + 3138, 105, // sgj -> Deva + 3142, 10, // sgr -> Arab + 3146, 545, // sgt -> Tibt + 3150, 120, // sgw -> Ethi + 3154, 10, // sgy -> Arab + 3158, 10, // shd -> Arab + 3162, 530, // shi -> Tfng + 3166, 10, // shm -> Arab + 3170, 350, // shn -> Mymr + 3174, 10, // shu -> Arab + 3178, 10, // shv -> Arab + 3182, 460, // si -> Sinh + 3185, 100, // sia -> Cyrl + 3189, 545, // sip -> Tibt + 3193, 10, // siy -> Arab + 3197, 10, // siz -> Arab + 3201, 100, // sjd -> Cyrl + 3205, 105, // sjp -> Deva + 3209, 100, // sjt -> Cyrl + 3213, 540, // skb -> Thai + 3217, 105, // skj -> Deva + 3221, 10, // skr -> Arab + 3225, 585, // smh -> Yiii + 3229, 440, // smp -> Samr + 3233, 230, // smu -> Khmr + 3237, 10, // smy -> Arab + 3241, 520, // soa -> Tavt + 3245, 465, // sog -> Sogd + 3249, 105, // soi -> Deva + 3253, 540, // sou -> Thai + 3257, 545, // spt -> Tibt + 3261, 385, // spv -> Orya + 3265, 10, // sqo -> Arab + 3269, 255, // sqq -> Laoo + 3273, 10, // sqt -> Arab + 3277, 100, // sr -> Cyrl + 3280, 470, // srb -> Sora + 3284, 10, // srh -> Arab + 3288, 105, // srx -> Deva + 3292, 10, // srz -> Arab + 3296, 10, // ssh -> Arab + 3300, 255, // sss -> Laoo + 3304, 10, // sts -> Arab + 3308, 120, // stv -> Ethi + 3312, 100, // sty -> Cyrl + 3316, 480, // suz -> Sunu + 3320, 125, // sva -> Geor + 3324, 10, // swb -> Arab + 3328, 170, // swi -> Hani + 3332, 105, // swv -> Deva + 3336, 435, // sxu -> Runr + 3340, 485, // syc -> Syrc + 3344, 45, // syl -> Beng + 3348, 485, // syn -> Syrc + 3352, 485, // syr -> Syrc + 3356, 105, // syw -> Deva + 3360, 510, // ta -> Taml + 3363, 100, // tab -> Cyrl + 3367, 105, // taj -> Deva + 3371, 490, // tbk -> Tagb + 3375, 545, // tcn -> Tibt + 3379, 350, // tco -> Mymr + 3383, 510, // tcx -> Taml + 3387, 240, // tcy -> Knda + 3391, 530, // tda -> Tfng + 3395, 105, // tdb -> Deva + 3399, 500, // tdd -> Tale + 3403, 105, // tdg -> Deva + 3407, 105, // tdh -> Deva + 3411, 525, // te -> Telu + 3414, 205, // tes -> Java + 3418, 100, // tg -> Cyrl + 3421, 10, // tg_PK -> Arab + 3427, 105, // tge -> Deva + 3431, 545, // tgf -> Tibt + 3435, 540, // th -> Thai + 3438, 105, // the -> Deva + 3442, 105, // thf -> Deva + 3446, 500, // thi -> Tale + 3450, 105, // thl -> Deva + 3454, 540, // thm -> Thai + 3458, 105, // thq -> Deva + 3462, 105, // thr -> Deva + 3466, 105, // ths -> Deva + 3470, 120, // ti -> Ethi + 3473, 120, // tig -> Ethi + 3477, 105, // tij -> Deva + 3481, 100, // tin -> Cyrl + 3485, 350, // tjl -> Mymr + 3489, 10, // tjo -> Arab + 3493, 105, // tkb -> Deva + 3497, 10, // tks -> Arab + 3501, 105, // tkt -> Deva + 3505, 485, // tmr -> Syrc + 3509, 60, // tnv -> Cakm + 3513, 10, // tov -> Arab + 3517, 230, // tpu -> Khmr + 3521, 10, // tra -> Arab + 3525, 185, // trg -> Hebr + 3529, 10, // trm -> Arab + 3533, 10, // trw -> Arab + 3537, 150, // tsd -> Grek + 3541, 545, // tsj -> Tibt + 3545, 100, // tt -> Cyrl + 3548, 255, // tth -> Laoo + 3552, 255, // tto -> Laoo + 3556, 540, // tts -> Thai + 3560, 105, // ttz -> Deva + 3564, 350, // tvn -> Mymr + 3568, 105, // twm -> Deva + 3572, 515, // txg -> Tang + 3576, 555, // txo -> Toto + 3580, 520, // tyr -> Tavt + 3584, 100, // tyv -> Cyrl + 3588, 100, // ude -> Cyrl + 3592, 325, // udg -> Mlym + 3596, 100, // udi -> Cyrl + 3600, 100, // udm -> Cyrl + 3604, 10, // ug -> Arab + 3607, 100, // ug_KZ -> Cyrl + 3613, 100, // ug_MN -> Cyrl + 3619, 560, // uga -> Ugar + 3623, 100, // ugh -> Cyrl + 3627, 540, // ugo -> Thai + 3631, 100, // uk -> Cyrl + 3634, 385, // uki -> Orya + 3638, 100, // ulc -> Cyrl + 3642, 45, // unr -> Beng + 3646, 105, // unr_NP -> Deva + 3653, 45, // unx -> Beng + 3657, 10, // ur -> Arab + 3660, 540, // urk -> Thai + 3664, 10, // ush -> Arab + 3668, 150, // uum -> Grek + 3672, 10, // uz_AF -> Arab + 3678, 100, // uz_CN -> Cyrl + 3684, 10, // uzs -> Arab + 3688, 510, // vaa -> Taml + 3692, 10, // vaf -> Arab + 3696, 105, // vah -> Deva + 3700, 565, // vai -> Vaii + 3704, 105, // vas -> Deva + 3708, 105, // vav -> Deva + 3712, 105, // vay -> Deva + 3716, 10, // vgr -> Arab + 3720, 105, // vjk -> Deva + 3724, 240, // vmd -> Knda + 3728, 10, // vmh -> Arab + 3732, 120, // wal -> Ethi + 3736, 10, // wbk -> Arab + 3740, 525, // wbq -> Telu + 3744, 105, // wbr -> Deva + 3748, 120, // wle -> Ethi + 3752, 10, // wlo -> Arab + 3756, 105, // wme -> Deva + 3760, 10, // wne -> Arab + 3764, 10, // wni -> Arab + 3768, 130, // wsg -> Gong + 3772, 10, // wsv -> Arab + 3776, 105, // wtm -> Deva + 3780, 175, // wuu -> Hans + 3784, 0, // xag -> Aghb + 3788, 100, // xal -> Cyrl + 3792, 120, // xan -> Ethi + 3796, 100, // xas -> Cyrl + 3800, 85, // xco -> Chrs + 3804, 70, // xcr -> Cari + 3808, 100, // xdq -> Cyrl + 3812, 10, // xhe -> Arab + 3816, 230, // xhm -> Khmr + 3820, 385, // xis -> Orya + 3824, 10, // xka -> Arab + 3828, 10, // xkc -> Arab + 3832, 545, // xkf -> Tibt + 3836, 10, // xkj -> Arab + 3840, 10, // xkp -> Arab + 3844, 290, // xlc -> Lyci + 3848, 295, // xld -> Lydi + 3852, 115, // xly -> Elym + 3856, 125, // xmf -> Geor + 3860, 305, // xmn -> Mani + 3864, 320, // xmr -> Merc + 3868, 355, // xna -> Narb + 3872, 105, // xnr -> Deva + 3876, 150, // xpg -> Grek + 3880, 370, // xpi -> Ogam + 3884, 100, // xpm -> Cyrl + 3888, 420, // xpr -> Prti + 3892, 100, // xrm -> Cyrl + 3896, 100, // xrn -> Cyrl + 3900, 445, // xsa -> Sarb + 3904, 105, // xsr -> Deva + 3908, 55, // xtq -> Brah + 3912, 510, // xub -> Taml + 3916, 510, // xuj -> Taml + 3920, 200, // xve -> Ital + 3924, 10, // xvi -> Arab + 3928, 100, // xwo -> Cyrl + 3932, 310, // xzh -> Marc + 3936, 100, // yai -> Cyrl + 3940, 105, // ybh -> Deva + 3944, 105, // ybi -> Deva + 3948, 10, // ydg -> Arab + 3952, 325, // yea -> Mlym + 3956, 150, // yej -> Grek + 3960, 525, // yeu -> Telu + 3964, 415, // ygp -> Plrd + 3968, 185, // yhd -> Hebr + 3972, 185, // yi -> Hebr + 3975, 585, // yig -> Yiii + 3979, 185, // yih -> Hebr + 3983, 585, // yiv -> Yiii + 3987, 100, // ykg -> Cyrl + 3991, 100, // ykh -> Cyrl + 3995, 415, // yna -> Plrd + 3999, 100, // ynk -> Cyrl + 4003, 210, // yoi -> Jpan + 4007, 540, // yoy -> Thai + 4011, 100, // yrk -> Cyrl + 4015, 585, // ysd -> Yiii + 4019, 585, // ysn -> Yiii + 4023, 585, // ysp -> Yiii + 4027, 100, // ysr -> Cyrl + 4031, 415, // ysy -> Plrd + 4035, 185, // yud -> Hebr + 4039, 180, // yue -> Hant + 4043, 175, // yue_CN -> Hans + 4050, 100, // yug -> Cyrl + 4054, 100, // yux -> Cyrl + 4058, 415, // ywq -> Plrd + 4062, 415, // ywu -> Plrd + 4066, 545, // zau -> Tibt + 4070, 10, // zba -> Arab + 4074, 170, // zch -> Hani + 4078, 10, // zdj -> Arab + 4082, 170, // zeh -> Hani + 4086, 530, // zen -> Tfng + 4090, 170, // zgb -> Hani + 4094, 530, // zgh -> Tfng + 4098, 170, // zgm -> Hani + 4102, 170, // zgn -> Hani + 4106, 175, // zh -> Hans + 4109, 180, // zh_AU -> Hant + 4115, 180, // zh_BN -> Hant + 4121, 180, // zh_GB -> Hant + 4127, 180, // zh_GF -> Hant + 4133, 180, // zh_HK -> Hant + 4139, 180, // zh_ID -> Hant + 4145, 180, // zh_MO -> Hant + 4151, 180, // zh_PA -> Hant + 4157, 180, // zh_PF -> Hant + 4163, 180, // zh_PH -> Hant + 4169, 180, // zh_SR -> Hant + 4175, 180, // zh_TH -> Hant + 4181, 180, // zh_TW -> Hant + 4187, 180, // zh_US -> Hant + 4193, 180, // zh_VN -> Hant + 4199, 170, // zhd -> Hani + 4203, 100, // zko -> Cyrl + 4207, 235, // zkt -> Kits + 4211, 100, // zkz -> Cyrl + 4215, 170, // zlj -> Hani + 4219, 170, // zln -> Hani + 4223, 170, // zlq -> Hani + 4227, 170, // zqe -> Hani + 4231, 385, // zrg -> Orya + 4235, 185, // zrp -> Hebr + 4239, 10, // zum -> Arab + 4243, 120, // zwa -> Ethi + 4247, 170, // zyg -> Hani + 4251, 170, // zyn -> Hani + 4255, 170, // zzj -> Hani }; //====================================================================== diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp index e7e86079ae91..f802c5735406 100644 --- a/icu4c/source/common/locid.cpp +++ b/icu4c/source/common/locid.cpp @@ -2674,14 +2674,15 @@ Locale::setKeywordValue(StringPiece keywordName, // Remove -1 from the capacity so that this function can guarantee NUL termination. CheckedArrayByteSink sink(fullName + offset, capacity - offset - 1); + UErrorCode bufferStatus = U_ZERO_ERROR; int32_t reslen = ulocimp_setKeywordValue( {fullName + offset, static_cast(length - offset)}, keywordName, keywordValue, sink, - status); + bufferStatus); - if (status == U_BUFFER_OVERFLOW_ERROR) { + if (bufferStatus == U_BUFFER_OVERFLOW_ERROR) { capacity = reslen + offset + 1; char* newFullName = static_cast(uprv_malloc(capacity)); if (newFullName == nullptr) { @@ -2697,11 +2698,13 @@ Locale::setKeywordValue(StringPiece keywordName, uprv_free(fullName); } fullName = newFullName; - status = U_ZERO_ERROR; continue; } - if (U_FAILURE(status)) { return; } + if (U_FAILURE(bufferStatus)) { + status = bufferStatus; + return; + } u_terminateChars(fullName, capacity, reslen + offset, &status); break; } diff --git a/icu4c/source/common/loclikelysubtags.cpp b/icu4c/source/common/loclikelysubtags.cpp index 7245a779816c..b37aaeec718e 100644 --- a/icu4c/source/common/loclikelysubtags.cpp +++ b/icu4c/source/common/loclikelysubtags.cpp @@ -715,13 +715,29 @@ LSR LikelySubtags::maximize(StringPiece language, StringPiece script, StringPiec } else { iter.resetToState64(state); value = trieNext(iter, "", 0); - U_ASSERT(value > 0); + U_ASSERT(value != 0); + // For the case of und_Latn + if (value < 0) { + retainLanguage = !language.empty(); + retainScript = !script.empty(); + retainRegion = !region.empty(); + // Fallback to und_$region => + iter.resetToState64(trieUndState); // "und" ("*") + value = trieNext(iter, "", 0); + U_ASSERT(value == 0); + int64_t trieUndEmptyState = iter.getState64(); + value = trieNext(iter, region, 0); + // Fallback to und => + if (value < 0) { + iter.resetToState64(trieUndEmptyState); + value = trieNext(iter, "", 0); + U_ASSERT(value > 0); + } + } } } } U_ASSERT(value < lsrsLength); - const LSR &matched = lsrs[value]; - if (returnInputIfUnmatch && (!(matchLanguage || matchScript || (matchRegion && language.empty())))) { return LSR("", "", "", LSR::EXPLICIT_LSR, errorCode); // no matching. @@ -731,18 +747,23 @@ LSR LikelySubtags::maximize(StringPiece language, StringPiece script, StringPiec } if (!(retainLanguage || retainScript || retainRegion)) { + U_ASSERT(value >= 0); // Quickly return a copy of the lookup-result LSR // without new allocation of the subtags. + const LSR &matched = lsrs[value]; return LSR(matched.language, matched.script, matched.region, matched.flags); } if (!retainLanguage) { - language = matched.language; + U_ASSERT(value >= 0); + language = lsrs[value].language; } if (!retainScript) { - script = matched.script; + U_ASSERT(value >= 0); + script = lsrs[value].script; } if (!retainRegion) { - region = matched.region; + U_ASSERT(value >= 0); + region = lsrs[value].region; } int32_t retainMask = (retainLanguage ? 4 : 0) + (retainScript ? 2 : 0) + (retainRegion ? 1 : 0); // retainOldMask flags = LSR explicit-subtag flags diff --git a/icu4c/source/common/lstmbe.cpp b/icu4c/source/common/lstmbe.cpp index c1a142469c44..470e939ab02a 100644 --- a/icu4c/source/common/lstmbe.cpp +++ b/icu4c/source/common/lstmbe.cpp @@ -809,7 +809,15 @@ U_CAPI const LSTMData* U_EXPORT2 CreateLSTMDataForScript(UScriptCode script, UEr U_CAPI const LSTMData* U_EXPORT2 CreateLSTMData(UResourceBundle* rb, UErrorCode& status) { - return new LSTMData(rb, status); + if (U_FAILURE(status)) { + return nullptr; + } + const LSTMData* result = new LSTMData(rb, status); + if (U_FAILURE(status)) { + delete result; + return nullptr; + } + return result; } U_CAPI const LanguageBreakEngine* U_EXPORT2 diff --git a/icu4c/source/common/rbbisetb.cpp b/icu4c/source/common/rbbisetb.cpp index df94fc8bc4fb..b6e9f745e4f1 100644 --- a/icu4c/source/common/rbbisetb.cpp +++ b/icu4c/source/common/rbbisetb.cpp @@ -328,9 +328,10 @@ int32_t RBBISetBuilder::getTrieSize() { UCPTRIE_TYPE_FAST, use8Bits ? UCPTRIE_VALUE_BITS_8 : UCPTRIE_VALUE_BITS_16, fStatus); - fTrieSize = ucptrie_toBinary(fTrie, nullptr, 0, fStatus); - if (*fStatus == U_BUFFER_OVERFLOW_ERROR) { - *fStatus = U_ZERO_ERROR; + UErrorCode bufferStatus = *fStatus; + fTrieSize = ucptrie_toBinary(fTrie, nullptr, 0, &bufferStatus); + if (bufferStatus != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(bufferStatus)) { + *fStatus = bufferStatus; } } return fTrieSize; diff --git a/icu4c/source/common/ucasemap.cpp b/icu4c/source/common/ucasemap.cpp index 928c52421537..82e37714c464 100644 --- a/icu4c/source/common/ucasemap.cpp +++ b/icu4c/source/common/ucasemap.cpp @@ -102,9 +102,9 @@ ucasemap_setLocale(UCaseMap *csm, const char *locale, UErrorCode *pErrorCode) { return; } - int32_t length=uloc_getName(locale, csm->locale, (int32_t)sizeof(csm->locale), pErrorCode); - if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR || length==sizeof(csm->locale)) { - *pErrorCode=U_ZERO_ERROR; + UErrorCode bufferStatus = U_ZERO_ERROR; + int32_t length=uloc_getName(locale, csm->locale, (int32_t)sizeof(csm->locale), &bufferStatus); + if(bufferStatus==U_BUFFER_OVERFLOW_ERROR || length==sizeof(csm->locale)) { /* we only really need the language code for case mappings */ length=uloc_getLanguage(locale, csm->locale, (int32_t)sizeof(csm->locale), pErrorCode); } diff --git a/icu4c/source/common/ucnv.cpp b/icu4c/source/common/ucnv.cpp index c66200b79323..c7926d2ea717 100644 --- a/icu4c/source/common/ucnv.cpp +++ b/icu4c/source/common/ucnv.cpp @@ -1752,20 +1752,24 @@ ucnv_fromUChars(UConverter *cnv, destLimit=dest+destCapacity; /* perform the conversion */ - ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, pErrorCode); + UErrorCode bufferStatus = U_ZERO_ERROR; + ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &bufferStatus); destLength=(int32_t)(dest-originalDest); /* if an overflow occurs, then get the preflighting length */ - if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) { + if(bufferStatus==U_BUFFER_OVERFLOW_ERROR) { char buffer[1024]; destLimit=buffer+sizeof(buffer); do { dest=buffer; - *pErrorCode=U_ZERO_ERROR; - ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, pErrorCode); + bufferStatus=U_ZERO_ERROR; + ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &bufferStatus); destLength+=(int32_t)(dest-buffer); - } while(*pErrorCode==U_BUFFER_OVERFLOW_ERROR); + } while(bufferStatus==U_BUFFER_OVERFLOW_ERROR); + } + if (U_FAILURE(bufferStatus)) { + *pErrorCode = bufferStatus; } } else { destLength=0; @@ -1808,22 +1812,26 @@ ucnv_toUChars(UConverter *cnv, destLimit=dest+destCapacity; /* perform the conversion */ - ucnv_toUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, pErrorCode); + UErrorCode bufferStatus = U_ZERO_ERROR; + ucnv_toUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &bufferStatus); destLength=(int32_t)(dest-originalDest); /* if an overflow occurs, then get the preflighting length */ - if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR) + if(bufferStatus==U_BUFFER_OVERFLOW_ERROR) { char16_t buffer[1024]; destLimit=buffer+UPRV_LENGTHOF(buffer); do { dest=buffer; - *pErrorCode=U_ZERO_ERROR; - ucnv_toUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, pErrorCode); + bufferStatus=U_ZERO_ERROR; + ucnv_toUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &bufferStatus); destLength+=(int32_t)(dest-buffer); } - while(*pErrorCode==U_BUFFER_OVERFLOW_ERROR); + while(bufferStatus==U_BUFFER_OVERFLOW_ERROR); + } + if (U_FAILURE(bufferStatus)) { + *pErrorCode = bufferStatus; } } else { destLength=0; diff --git a/icu4c/source/common/uidna.cpp b/icu4c/source/common/uidna.cpp index 48b3d0eb7060..b47edefe1167 100644 --- a/icu4c/source/common/uidna.cpp +++ b/icu4c/source/common/uidna.cpp @@ -248,9 +248,10 @@ _internal_toASCII(const char16_t* src, int32_t srcLength, if(srcIsASCII == false){ // step 2 - b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Capacity, namePrepOptions, parseError, status); + UErrorCode bufferStatus = U_ZERO_ERROR; + b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Capacity, namePrepOptions, parseError, &bufferStatus); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string // we do not have enough room so grow the buffer if(b1 != b1Stack){ @@ -262,9 +263,12 @@ _internal_toASCII(const char16_t* src, int32_t srcLength, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error - - b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Len, namePrepOptions, parseError, status); + bufferStatus = U_ZERO_ERROR; // reset error + + b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Len, namePrepOptions, parseError, &bufferStatus); + } + if (U_FAILURE(bufferStatus)) { + *status = bufferStatus; } } // error bail out @@ -333,9 +337,10 @@ _internal_toASCII(const char16_t* src, int32_t srcLength, // caseFlags = (UBool*) uprv_malloc(b1Len * sizeof(UBool)); // uprv_memset(caseFlags,true,b1Len); - b2Len = u_strToPunycode(b1,b1Len,b2,b2Capacity,caseFlags, status); + UErrorCode bufferStatus = U_ZERO_ERROR; + b2Len = u_strToPunycode(b1,b1Len,b2,b2Capacity,caseFlags,&bufferStatus); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string /* we do not have enough room so grow the buffer*/ b2 = static_cast(uprv_malloc(b2Len * U_SIZEOF_UCHAR)); @@ -344,12 +349,13 @@ _internal_toASCII(const char16_t* src, int32_t srcLength, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error - - b2Len = u_strToPunycode(b1,b1Len,b2,b2Len,caseFlags, status); + bufferStatus = U_ZERO_ERROR; // reset error + + b2Len = u_strToPunycode(b1,b1Len,b2,b2Len,caseFlags,&bufferStatus); } //error bail out - if(U_FAILURE(*status)){ + if(U_FAILURE(bufferStatus)){ + *status = bufferStatus; goto CLEANUP; } // TODO : Reconsider while implementing the case preserve RFE @@ -454,8 +460,9 @@ _internal_toUnicode(const char16_t* src, int32_t srcLength, if(srcIsASCII == false){ // step 2: process the string - b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Capacity, namePrepOptions, parseError, status); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + UErrorCode bufferStatus = U_ZERO_ERROR; + b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Capacity, namePrepOptions, parseError, &bufferStatus); + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string /* we do not have enough room so grow the buffer*/ b1 = static_cast(uprv_malloc(b1Len * U_SIZEOF_UCHAR)); @@ -464,12 +471,13 @@ _internal_toUnicode(const char16_t* src, int32_t srcLength, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error - - b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Len, namePrepOptions, parseError, status); + bufferStatus = U_ZERO_ERROR; // reset error + + b1Len = usprep_prepare(nameprep, src, srcLength, b1, b1Len, namePrepOptions, parseError, &bufferStatus); } //bail out on error - if(U_FAILURE(*status)){ + if(U_FAILURE(bufferStatus)){ + *status = bufferStatus; goto CLEANUP; } }else{ @@ -493,9 +501,10 @@ _internal_toUnicode(const char16_t* src, int32_t srcLength, b1PrimeLen = b1Len - ACE_PREFIX_LENGTH; //step 5: Decode using punycode - b2Len = u_strFromPunycode(b1Prime, b1PrimeLen, b2, b2Capacity, caseFlags,status); + UErrorCode bufferStatus = U_ZERO_ERROR; + b2Len = u_strFromPunycode(b1Prime, b1PrimeLen, b2, b2Capacity, caseFlags, &bufferStatus); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string /* we do not have enough room so grow the buffer*/ b2 = static_cast(uprv_malloc(b2Len * U_SIZEOF_UCHAR)); @@ -504,16 +513,16 @@ _internal_toUnicode(const char16_t* src, int32_t srcLength, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error + bufferStatus = U_ZERO_ERROR; // reset error - b2Len = u_strFromPunycode(b1Prime, b1PrimeLen, b2, b2Len, caseFlags, status); + b2Len = u_strFromPunycode(b1Prime, b1PrimeLen, b2, b2Len, caseFlags, &bufferStatus); } //step 6:Apply toASCII - b3Len = uidna_toASCII(b2, b2Len, b3, b3Capacity, options, parseError, status); + b3Len = uidna_toASCII(b2, b2Len, b3, b3Capacity, options, parseError, &bufferStatus); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string /* we do not have enough room so grow the buffer*/ b3 = static_cast(uprv_malloc(b3Len * U_SIZEOF_UCHAR)); @@ -522,13 +531,14 @@ _internal_toUnicode(const char16_t* src, int32_t srcLength, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error + bufferStatus = U_ZERO_ERROR; // reset error - b3Len = uidna_toASCII(b2,b2Len,b3,b3Len,options,parseError, status); + b3Len = uidna_toASCII(b2,b2Len,b3,b3Len,options,parseError,&bufferStatus); } //bail out on error - if(U_FAILURE(*status)){ + if(U_FAILURE(bufferStatus)){ + *status = bufferStatus; goto CLEANUP; } @@ -706,24 +716,21 @@ uidna_IDNToASCII( const char16_t *src, int32_t srcLength, labelLen = getNextSeparator(labelStart,remainingLen, &delimiter,&done); labelReqLength = 0; if(!(labelLen==0 && done)){// make sure this is not a root label separator. - - labelReqLength = _internal_toASCII( labelStart, labelLen, - currentDest, remainingDestCapacity, - options, nameprep, - parseError, status); - - if(*status == U_BUFFER_OVERFLOW_ERROR){ - - *status = U_ZERO_ERROR; // reset error + + UErrorCode bufferStatus = U_ZERO_ERROR; + labelReqLength = _internal_toASCII( labelStart, labelLen, + currentDest, remainingDestCapacity, + options, nameprep, + parseError, &bufferStatus); + + if (bufferStatus == U_BUFFER_OVERFLOW_ERROR) { remainingDestCapacity = 0; + } else if (U_FAILURE(bufferStatus)) { + *status = bufferStatus; + break; } } - - if(U_FAILURE(*status)){ - break; - } - reqLength +=labelReqLength; // adjust the destination pointer if(labelReqLength < remainingDestCapacity){ @@ -877,8 +884,9 @@ uidna_compare( const char16_t *s1, int32_t length1, UParseError parseError; - b1Len = uidna_IDNToASCII(s1, length1, b1, b1Capacity, options, &parseError, status); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + UErrorCode bufferStatus = U_ZERO_ERROR; + b1Len = uidna_IDNToASCII(s1, length1, b1, b1Capacity, options, &parseError, &bufferStatus); + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string b1 = (char16_t*) uprv_malloc(b1Len * U_SIZEOF_UCHAR); if(b1==nullptr){ @@ -886,14 +894,13 @@ uidna_compare( const char16_t *s1, int32_t length1, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error - - b1Len = uidna_IDNToASCII(s1,length1,b1,b1Len, options, &parseError, status); - + bufferStatus = U_ZERO_ERROR; // reset error + + b1Len = uidna_IDNToASCII(s1,length1,b1,b1Len, options, &parseError, &bufferStatus); } - b2Len = uidna_IDNToASCII(s2,length2, b2,b2Capacity, options, &parseError, status); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + b2Len = uidna_IDNToASCII(s2,length2, b2,b2Capacity, options, &parseError, &bufferStatus); + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string b2 = (char16_t*) uprv_malloc(b2Len * U_SIZEOF_UCHAR); if(b2==nullptr){ @@ -901,11 +908,15 @@ uidna_compare( const char16_t *s1, int32_t length1, goto CLEANUP; } - *status = U_ZERO_ERROR; // reset error - - b2Len = uidna_IDNToASCII(s2, length2, b2, b2Len, options, &parseError, status); - + bufferStatus = U_ZERO_ERROR; // reset error + + b2Len = uidna_IDNToASCII(s2, length2, b2, b2Len, options, &parseError, &bufferStatus); + } + + if (U_FAILURE(bufferStatus)) { + *status = bufferStatus; } + // when toASCII is applied all label separators are replaced with FULL_STOP result = compareCaseInsensitiveASCII(b1,b1Len,b2,b2Len); diff --git a/icu4c/source/common/unicode/platform.h b/icu4c/source/common/unicode/platform.h index b2fcb21ef130..45741a83deb3 100644 --- a/icu4c/source/common/unicode/platform.h +++ b/icu4c/source/common/unicode/platform.h @@ -479,6 +479,8 @@ /* Otherwise use the predefined value. */ #elif !defined(__cplusplus) # define U_CPLUSPLUS_VERSION 0 +#elif __cplusplus >= 202002L || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) +# define U_CPLUSPLUS_VERSION 20 #elif __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) # define U_CPLUSPLUS_VERSION 17 #elif __cplusplus >= 201402L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L) diff --git a/icu4c/source/common/unicode/umachine.h b/icu4c/source/common/unicode/umachine.h index c501b253b019..afa7c6afde83 100644 --- a/icu4c/source/common/unicode/umachine.h +++ b/icu4c/source/common/unicode/umachine.h @@ -119,6 +119,28 @@ /** Obsolete/same as U_CAPI; was used to declare a function as an internal ICU C API */ #define U_INTERNAL U_CAPI +/** + * \def U_FORCE_INLINE + * Forces function inlining on compilers that are known to support it. + * Place this before specifiers like "static" and "explicit". + * + * This does not replace the "inline" keyword which suspends the One Definition Rule (ODR) + * in addition to optionally serving as an inlining hint to the compiler. + * + * @internal + */ +#ifdef U_FORCE_INLINE + // already defined +#elif defined(U_IN_DOXYGEN) +# define U_FORCE_INLINE inline +#elif (defined(__clang__) && __clang__) || U_GCC_MAJOR_MINOR != 0 +# define U_FORCE_INLINE [[gnu::always_inline]] +#elif defined(U_REAL_MSVC) +# define U_FORCE_INLINE __forceinline +#else +# define U_FORCE_INLINE inline +#endif + // Before ICU 65, function-like, multi-statement ICU macros were just defined as // series of statements wrapped in { } blocks and the caller could choose to // either treat them as if they were actual functions and end the invocation diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h index 6b1ac9ba2620..01ac901e3ba1 100644 --- a/icu4c/source/common/unicode/uniset.h +++ b/icu4c/source/common/unicode/uniset.h @@ -495,7 +495,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @return true if the specified set is equal to this set. * @stable ICU 2.0 */ - virtual bool operator==(const UnicodeSet& o) const; + bool operator==(const UnicodeSet& o) const; /** * Compares the specified object with this set for equality. Returns @@ -522,7 +522,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @see Object#hashCode() * @stable ICU 2.0 */ - virtual int32_t hashCode() const; + int32_t hashCode() const; /** * Get a UnicodeSet pointer from a USet @@ -792,7 +792,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @stable ICU 2.0 * @see getRangeCount */ - virtual int32_t size() const; + int32_t size() const; /** * Returns true if this set contains no elements. @@ -800,7 +800,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @return true if this set contains no elements. * @stable ICU 2.0 */ - virtual UBool isEmpty() const; + UBool isEmpty() const; /** * @return true if this set contains multi-character strings or the empty string. @@ -825,7 +825,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @return true if the test condition is met * @stable ICU 2.0 */ - virtual UBool contains(UChar32 start, UChar32 end) const; + UBool contains(UChar32 start, UChar32 end) const; /** * Returns true if this set contains the given @@ -843,7 +843,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @return true if the test condition is met * @stable ICU 2.4 */ - virtual UBool containsAll(const UnicodeSet& c) const; + UBool containsAll(const UnicodeSet& c) const; /** * Returns true if this set contains all the characters @@ -1021,7 +1021,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * Implement UnicodeMatcher::matches() * @stable ICU 2.4 */ - virtual UMatchDegree matches(const Replaceable& text, + UMatchDegree matches(const Replaceable& text, int32_t& offset, int32_t limit, UBool incremental) override; @@ -1231,7 +1231,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * to this set. * @stable ICU 2.0 */ - virtual UnicodeSet& add(UChar32 start, UChar32 end); + UnicodeSet& add(UChar32 start, UChar32 end); /** * Adds the specified character to this set if it is not already @@ -1337,7 +1337,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @param end last character, inclusive, of range * @stable ICU 2.0 */ - virtual UnicodeSet& retain(UChar32 start, UChar32 end); + UnicodeSet& retain(UChar32 start, UChar32 end); /** @@ -1375,7 +1375,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * from this set. * @stable ICU 2.0 */ - virtual UnicodeSet& remove(UChar32 start, UChar32 end); + UnicodeSet& remove(UChar32 start, UChar32 end); /** * Removes the specified character from this set if it is present. @@ -1412,7 +1412,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * A frozen set will not be modified. * @stable ICU 2.0 */ - virtual UnicodeSet& complement(); + UnicodeSet& complement(); /** * Complements the specified range in this set. Any character in @@ -1426,7 +1426,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @param end last character, inclusive, of range * @stable ICU 2.0 */ - virtual UnicodeSet& complement(UChar32 start, UChar32 end); + UnicodeSet& complement(UChar32 start, UChar32 end); /** * Complements the specified character in this set. The character @@ -1463,7 +1463,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @see #add(UChar32, UChar32) * @stable ICU 2.0 */ - virtual UnicodeSet& addAll(const UnicodeSet& c); + UnicodeSet& addAll(const UnicodeSet& c); /** * Retains only the elements in this set that are contained in the @@ -1476,7 +1476,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @param c set that defines which elements this set will retain. * @stable ICU 2.0 */ - virtual UnicodeSet& retainAll(const UnicodeSet& c); + UnicodeSet& retainAll(const UnicodeSet& c); /** * Removes from this set all of its elements that are contained in the @@ -1489,7 +1489,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * this set. * @stable ICU 2.0 */ - virtual UnicodeSet& removeAll(const UnicodeSet& c); + UnicodeSet& removeAll(const UnicodeSet& c); /** * Complements in this set all elements contained in the specified @@ -1501,7 +1501,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * this set. * @stable ICU 2.4 */ - virtual UnicodeSet& complementAll(const UnicodeSet& c); + UnicodeSet& complementAll(const UnicodeSet& c); /** * Removes all of the elements from this set. This set will be @@ -1509,7 +1509,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * A frozen set will not be modified. * @stable ICU 2.0 */ - virtual UnicodeSet& clear(); + UnicodeSet& clear(); /** * Close this set over the given attribute. For the attribute @@ -1546,7 +1546,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @return a reference to this set. * @stable ICU 4.2 */ - virtual UnicodeSet &removeAllStrings(); + UnicodeSet &removeAllStrings(); /** * Iteration method that returns the number of ranges contained in @@ -1555,7 +1555,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @see #getRangeEnd * @stable ICU 2.4 */ - virtual int32_t getRangeCount() const; + int32_t getRangeCount() const; /** * Iteration method that returns the first character in the @@ -1564,7 +1564,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @see #getRangeEnd * @stable ICU 2.4 */ - virtual UChar32 getRangeStart(int32_t index) const; + UChar32 getRangeStart(int32_t index) const; /** * Iteration method that returns the last character in the @@ -1573,7 +1573,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * @see #getRangeEnd * @stable ICU 2.4 */ - virtual UChar32 getRangeEnd(int32_t index) const; + UChar32 getRangeEnd(int32_t index) const; /** * Serializes this set into an array of 16-bit integers. Serialization @@ -1631,7 +1631,7 @@ class U_COMMON_API UnicodeSet final : public UnicodeFilter { * A frozen set will not be modified. * @stable ICU 2.4 */ - virtual UnicodeSet& compact(); + UnicodeSet& compact(); /** * Return the class ID for this class. This is useful only for diff --git a/icu4c/source/common/unicode/utf8.h b/icu4c/source/common/unicode/utf8.h index 96ad46161aa1..ec7c2fb63c19 100644 --- a/icu4c/source/common/unicode/utf8.h +++ b/icu4c/source/common/unicode/utf8.h @@ -517,7 +517,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); if(U8_IS_TRAIL(__t1)) { \ ++(i); \ } \ - } else /* c>=0xf0 */ { \ + } else /* b>=0xf0 */ { \ if(U8_IS_VALID_LEAD4_AND_T1(__b, __t1) && \ ++(i)!=(length) && U8_IS_TRAIL((s)[i]) && \ ++(i)!=(length) && U8_IS_TRAIL((s)[i])) { \ @@ -683,7 +683,7 @@ utf8_back1SafeBody(const uint8_t *s, int32_t start, int32_t i); */ #define U8_PREV_UNSAFE(s, i, c) UPRV_BLOCK_MACRO_BEGIN { \ (c)=(uint8_t)(s)[--(i)]; \ - if(U8_IS_TRAIL(c)) { \ + if(!U8_IS_SINGLE(c)) { \ uint8_t __b, __count=1, __shift=6; \ \ /* c is a trail byte */ \ diff --git a/icu4c/source/common/unicode/utfiterator.h b/icu4c/source/common/unicode/utfiterator.h new file mode 100644 index 000000000000..ca31fbeee9fc --- /dev/null +++ b/icu4c/source/common/unicode/utfiterator.h @@ -0,0 +1,2294 @@ +// © 2024 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +// utfiterator.h +// created: 2024aug12 Markus W. Scherer + +#ifndef __UTFITERATOR_H__ +#define __UTFITERATOR_H__ + +#include "unicode/utypes.h" + +#if U_SHOW_CPLUSPLUS_API || U_SHOW_CPLUSPLUS_HEADER_API || !defined(UTYPES_H) + +#include +#include +#include +#include +#include "unicode/utf16.h" +#include "unicode/utf8.h" +#include "unicode/uversion.h" + +/** + * \file + * \brief C++ header-only API: C++ iterators over Unicode strings (=UTF-8/16/32 if well-formed). + * + * Sample code: + * \code + * #include + * #include + * #include "unicode/utypes.h" + * #include "unicode/utfiterator.h" + * + * using U_HEADER_ONLY_NAMESPACE::utfIterator; + * using U_HEADER_ONLY_NAMESPACE::utfStringCodePoints; + * using U_HEADER_ONLY_NAMESPACE::unsafeUTFIterator; + * using U_HEADER_ONLY_NAMESPACE::unsafeUTFStringCodePoints; + * + * int32_t rangeLoop16(std::u16string_view s) { + * // We are just adding up the code points for minimal-code demonstration purposes. + * int32_t sum = 0; + * for (auto units : utfStringCodePoints(s)) { + * sum += units.codePoint(); // < 0 if ill-formed + * } + * return sum; + * } + * + * int32_t loopIterPlusPlus16(std::u16string_view s) { + * auto range = utfStringCodePoints(s); + * int32_t sum = 0; + * for (auto iter = range.begin(), limit = range.end(); iter != limit;) { + * sum += (*iter++).codePoint(); // U+FFFD if ill-formed + * } + * return sum; + * } + * + * int32_t backwardLoop16(std::u16string_view s) { + * auto range = utfStringCodePoints(s); + * int32_t sum = 0; + * for (auto start = range.begin(), iter = range.end(); start != iter;) { + * sum += (*--iter).codePoint(); // surrogate code point if unpaired / ill-formed + * } + * return sum; + * } + * + * int32_t reverseLoop8(std::string_view s) { + * auto range = utfStringCodePoints(s); + * int32_t sum = 0; + * for (auto iter = range.rbegin(), limit = range.rend(); iter != limit; ++iter) { + * sum += iter->codePoint(); // U+FFFD if ill-formed + * } + * return sum; + * } + * + * int32_t countCodePoints16(std::u16string_view s) { + * auto range = utfStringCodePoints(s); + * return std::distance(range.begin(), range.end()); + * } + * + * int32_t unsafeRangeLoop16(std::u16string_view s) { + * int32_t sum = 0; + * for (auto units : unsafeUTFStringCodePoints(s)) { + * sum += units.codePoint(); + * } + * return sum; + * } + * + * int32_t unsafeReverseLoop8(std::string_view s) { + * auto range = unsafeUTFStringCodePoints(s); + * int32_t sum = 0; + * for (auto iter = range.rbegin(), limit = range.rend(); iter != limit; ++iter) { + * sum += iter->codePoint(); + * } + * return sum; + * } + * + * char32_t firstCodePointOrFFFD16(std::u16string_view s) { + * if (s.empty()) { return 0xfffd; } + * auto range = utfStringCodePoints(s); + * return range.begin()->codePoint(); + * } + * + * std::string_view firstSequence8(std::string_view s) { + * if (s.empty()) { return {}; } + * auto range = utfStringCodePoints(s); + * auto units = *(range.begin()); + * if (units.wellFormed()) { + * return units.stringView(); + * } else { + * return {}; + * } + * } + * + * template // some istream or streambuf + * std::u32string cpFromInput(InputStream &in) { + * // This is a single-pass input_iterator. + * std::istreambuf_iterator bufIter(in); + * std::istreambuf_iterator bufLimit; + * auto iter = utfIterator(bufIter); + * auto limit = utfIterator(bufLimit); + * std::u32string s32; + * for (; iter != limit; ++iter) { + * s32.push_back(iter->codePoint()); + * } + * return s32; + * } + * + * std::u32string cpFromStdin() { return cpFromInput(std::cin); } + * std::u32string cpFromWideStdin() { return cpFromInput(std::wcin); } + * \endcode + */ + +#ifndef U_HIDE_DRAFT_API + +/** + * Some defined behaviors for handling ill-formed Unicode strings. + * This is a template parameter for UTFIterator and related classes. + * + * When a validating UTFIterator encounters an ill-formed code unit sequence, + * then CodeUnits.codePoint() is a value according to this parameter. + * + * @draft ICU 78 + * @see CodeUnits + * @see UTFIterator + * @see UTFStringCodePoints + */ +typedef enum UTFIllFormedBehavior { + /** + * Returns a negative value (-1=U_SENTINEL) instead of a code point. + * If the CP32 template parameter for the relevant classes is an unsigned type, + * then the negative value becomes 0xffffffff=UINT32_MAX. + * + * @draft ICU 78 + */ + UTF_BEHAVIOR_NEGATIVE, + /** Returns U+FFFD Replacement Character. @draft ICU 78 */ + UTF_BEHAVIOR_FFFD, + /** + * UTF-8: Not allowed; + * UTF-16: returns the unpaired surrogate; + * UTF-32: returns the surrogate code point, or U+FFFD if out of range. + * + * @draft ICU 78 + */ + UTF_BEHAVIOR_SURROGATE +} UTFIllFormedBehavior; + +namespace U_HEADER_ONLY_NAMESPACE { + +/** + * Result of decoding a code unit sequence for one code point. + * Returned from non-validating Unicode string code point iterators. + * Base class for class CodeUnits which is returned from validating iterators. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam UnitIter An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @see UnsafeUTFIterator + * @see UnsafeUTFStringCodePoints + * @draft ICU 78 + */ +template +class UnsafeCodeUnits { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Unit = typename std::iterator_traits::value_type; +public: + /** @internal */ + UnsafeCodeUnits(CP32 codePoint, uint8_t length, UnitIter start, UnitIter limit) : + c_(codePoint), len_(length), start_(start), limit_(limit) {} + + /** Copy constructor. @draft ICU 78 */ + UnsafeCodeUnits(const UnsafeCodeUnits &other) = default; + /** Copy assignment operator. @draft ICU 78 */ + UnsafeCodeUnits &operator=(const UnsafeCodeUnits &other) = default; + + /** + * @return the Unicode code point decoded from the code unit sequence. + * If the sequence is ill-formed and the iterator validates, + * then this is a replacement value according to the iterator‘s + * UTFIllFormedBehavior template parameter. + * @draft ICU 78 + */ + UChar32 codePoint() const { return c_; } + + /** + * @return the start of the code unit sequence for one code point. + * Only enabled if UnitIter is a (multi-pass) forward_iterator or better. + * @draft ICU 78 + */ + UnitIter begin() const { return start_; } + + /** + * @return the limit (exclusive end) of the code unit sequence for one code point. + * Only enabled if UnitIter is a (multi-pass) forward_iterator or better. + * @draft ICU 78 + */ + UnitIter end() const { return limit_; } + + /** + * @return the length of the code unit sequence for one code point. + * @draft ICU 78 + */ + uint8_t length() const { return len_; } + + // C++17: There is no test for contiguous_iterator, so we just work with pointers + // and with string and string_view iterators. + /** + * @return a string_view of the code unit sequence for one code point. + * Only enabled if UnitIter is a pointer, a string_view::iterator, or a string::iterator. + * @draft ICU 78 + */ + template + std::enable_if_t< + std::is_pointer_v || + std::is_same_v::iterator> || + std::is_same_v::iterator>, + std::basic_string_view> + stringView() const { + // C++20: + // - require https://en.cppreference.com/w/cpp/iterator/contiguous_iterator + // - return string_view(begin(), end()) + return std::basic_string_view(&*start_, len_); + } + +private: + // Order of fields with padding and access frequency in mind. + CP32 c_; + uint8_t len_; + UnitIter start_; + UnitIter limit_; +}; + +#ifndef U_IN_DOXYGEN +// Partial template specialization for single-pass input iterator. +// No UnitIter field, no getter for it, no stringView(). +template +class UnsafeCodeUnits< + CP32, + UnitIter, + std::enable_if_t< + !std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); +public: + UnsafeCodeUnits(CP32 codePoint, uint8_t length) : c_(codePoint), len_(length) {} + + UnsafeCodeUnits(const UnsafeCodeUnits &other) = default; + UnsafeCodeUnits &operator=(const UnsafeCodeUnits &other) = default; + + UChar32 codePoint() const { return c_; } + + uint8_t length() const { return len_; } + +private: + // Order of fields with padding and access frequency in mind. + CP32 c_; + uint8_t len_; +}; +#endif // U_IN_DOXYGEN + +/** + * Result of validating and decoding a code unit sequence for one code point. + * Returned from validating Unicode string code point iterators. + * Adds function wellFormed() to base class UnsafeCodeUnits. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam UnitIter An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @see UTFIterator + * @see UTFStringCodePoints + * @draft ICU 78 + */ +template +class CodeUnits : public UnsafeCodeUnits { +public: + /** @internal */ + CodeUnits(CP32 codePoint, uint8_t length, bool wellFormed, UnitIter start, UnitIter limit) : + UnsafeCodeUnits(codePoint, length, start, limit), ok_(wellFormed) {} + + /** Copy constructor. @draft ICU 78 */ + CodeUnits(const CodeUnits &other) = default; + /** Copy assignment operator. @draft ICU 78 */ + CodeUnits &operator=(const CodeUnits &other) = default; + + /** + * @return true if the decoded code unit sequence is well-formed. + * @draft ICU 78 + */ + bool wellFormed() const { return ok_; } + +private: + bool ok_; +}; + +#ifndef U_IN_DOXYGEN +// Partial template specialization for single-pass input iterator. +// No UnitIter field, no getter for it, no stringView(). +template +class CodeUnits< + CP32, + UnitIter, + std::enable_if_t< + !std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>>> : + public UnsafeCodeUnits { +public: + CodeUnits(CP32 codePoint, uint8_t length, bool wellFormed) : + UnsafeCodeUnits(codePoint, length), ok_(wellFormed) {} + + CodeUnits(const CodeUnits &other) = default; + CodeUnits &operator=(const CodeUnits &other) = default; + + bool wellFormed() const { return ok_; } + +private: + bool ok_; +}; +#endif // U_IN_DOXYGEN + +// Validating implementations ---------------------------------------------- *** + +#ifndef U_IN_DOXYGEN +template +class UTFImpl; + +// Note: readAndInc() functions take both a p0 and a p iterator. +// They must have the same value. +// For a multi-pass UnitIter, the caller must copy its p into a local variable p0, +// and readAndInc() copies p0 and the incremented p into the CodeUnits. +// For a single-pass UnitIter, which may not be default-constructible nor coypable, +// the caller can pass p into both references, and readAndInc() does not use p0 +// and constructs CodeUnits without them. +// Moving the p0 variable into the call site avoids having to declare it inside readAndInc() +// which may not be possible for a single-pass iterator. + +// UTF-8 +template +class UTFImpl< + CP32, + behavior, + UnitIter, + std::enable_if_t< + sizeof(typename std::iterator_traits::value_type) == 1>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + static_assert(behavior != UTF_BEHAVIOR_SURROGATE, + "For 8-bit strings, the SURROGATE option does not have an equivalent."); +public: + // Handle ill-formed UTF-8 + U_FORCE_INLINE static CP32 sub() { + switch (behavior) { + case UTF_BEHAVIOR_NEGATIVE: return U_SENTINEL; + case UTF_BEHAVIOR_FFFD: return 0xfffd; + } + } + + U_FORCE_INLINE static void inc(UnitIter &p, const UnitIter &limit) { + // Very similar to U8_FWD_1(). + uint8_t b = *p; + ++p; + if (U8_IS_LEAD(b) && p != limit) { + uint8_t t1 = *p; + if ((0xe0 <= b && b < 0xf0)) { + if (U8_IS_VALID_LEAD3_AND_T1(b, t1) && + ++p != limit && U8_IS_TRAIL(*p)) { + ++p; + } + } else if (b < 0xe0) { + if (U8_IS_TRAIL(t1)) { + ++p; + } + } else /* b >= 0xf0 */ { + if (U8_IS_VALID_LEAD4_AND_T1(b, t1) && + ++p != limit && U8_IS_TRAIL(*p) && + ++p != limit && U8_IS_TRAIL(*p)) { + ++p; + } + } + } + } + + U_FORCE_INLINE static void dec(UnitIter start, UnitIter &p) { + // Very similar to U8_BACK_1(). + uint8_t c = *--p; + if (U8_IS_TRAIL(c) && p != start) { + UnitIter p1 = p; + uint8_t b1 = *--p1; + if (U8_IS_LEAD(b1)) { + if (b1 < 0xe0 || + (b1 < 0xf0 ? + U8_IS_VALID_LEAD3_AND_T1(b1, c) : + U8_IS_VALID_LEAD4_AND_T1(b1, c))) { + p = p1; + return; + } + } else if (U8_IS_TRAIL(b1) && p1 != start) { + uint8_t b2 = *--p1; + if (0xe0 <= b2 && b2 <= 0xf4) { + if (b2 < 0xf0 ? + U8_IS_VALID_LEAD3_AND_T1(b2, b1) : + U8_IS_VALID_LEAD4_AND_T1(b2, b1)) { + p = p1; + return; + } + } else if (U8_IS_TRAIL(b2) && p1 != start) { + uint8_t b3 = *--p1; + if (0xf0 <= b3 && b3 <= 0xf4 && U8_IS_VALID_LEAD4_AND_T1(b3, b2)) { + p = p1; + return; + } + } + } + } + } + + U_FORCE_INLINE static CodeUnits readAndInc( + UnitIter &p0, UnitIter &p, const UnitIter &limit) { + constexpr bool isMultiPass = + std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>; + // Very similar to U8_NEXT_OR_FFFD(). + CP32 c = uint8_t(*p); + ++p; + if (U8_IS_SINGLE(c)) { + if constexpr (isMultiPass) { + return {c, 1, true, p0, p}; + } else { + return {c, 1, true}; + } + } + uint8_t length = 1; + uint8_t t = 0; + if (p != limit && + // fetch/validate/assemble all but last trail byte + (c >= 0xe0 ? + (c < 0xf0 ? // U+0800..U+FFFF except surrogates + U8_LEAD3_T1_BITS[c &= 0xf] & (1 << ((t = *p) >> 5)) && + (t &= 0x3f, 1) + : // U+10000..U+10FFFF + (c -= 0xf0) <= 4 && + U8_LEAD4_T1_BITS[(t = *p) >> 4] & (1 << c) && + (c = (c << 6) | (t & 0x3f), ++length, ++p != limit) && + (t = *p - 0x80) <= 0x3f) && + // valid second-to-last trail byte + (c = (c << 6) | t, ++length, ++p != limit) + : // U+0080..U+07FF + c >= 0xc2 && (c &= 0x1f, 1)) && + // last trail byte + (t = *p - 0x80) <= 0x3f) { + c = (c << 6) | t; + ++length; + ++p; + if constexpr (isMultiPass) { + return {c, length, true, p0, p}; + } else { + return {c, length, true}; + } + } + if constexpr (isMultiPass) { + return {sub(), length, false, p0, p}; + } else { + return {sub(), length, false}; + } + } + + U_FORCE_INLINE static CodeUnits decAndRead(UnitIter start, UnitIter &p) { + // Very similar to U8_PREV_OR_FFFD(). + UnitIter p0 = p; + CP32 c = uint8_t(*--p); + if (U8_IS_SINGLE(c)) { + return {c, 1, true, p, p0}; + } + if (U8_IS_TRAIL(c) && p != start) { + UnitIter p1 = p; + uint8_t b1 = *--p1; + if (U8_IS_LEAD(b1)) { + if (b1 < 0xe0) { + p = p1; + c = ((b1 - 0xc0) << 6) | (c & 0x3f); + return {c, 2, true, p, p0}; + } else if (b1 < 0xf0 ? + U8_IS_VALID_LEAD3_AND_T1(b1, c) : + U8_IS_VALID_LEAD4_AND_T1(b1, c)) { + // Truncated 3- or 4-byte sequence. + p = p1; + return {sub(), 2, false, p, p0}; + } + } else if (U8_IS_TRAIL(b1) && p1 != start) { + // Extract the value bits from the last trail byte. + c &= 0x3f; + uint8_t b2 = *--p1; + if (0xe0 <= b2 && b2 <= 0xf4) { + if (b2 < 0xf0) { + b2 &= 0xf; + if (U8_IS_VALID_LEAD3_AND_T1(b2, b1)) { + p = p1; + c = (b2 << 12) | ((b1 & 0x3f) << 6) | c; + return {c, 3, true, p, p0}; + } + } else if (U8_IS_VALID_LEAD4_AND_T1(b2, b1)) { + // Truncated 4-byte sequence. + p = p1; + return {sub(), 3, false, p, p0}; + } + } else if (U8_IS_TRAIL(b2) && p1 != start) { + uint8_t b3 = *--p1; + if (0xf0 <= b3 && b3 <= 0xf4) { + b3 &= 7; + if (U8_IS_VALID_LEAD4_AND_T1(b3, b2)) { + p = p1; + c = (b3 << 18) | ((b2 & 0x3f) << 12) | ((b1 & 0x3f) << 6) | c; + return {c, 4, true, p, p0}; + } + } + } + } + } + return {sub(), 1, false, p, p0}; + } +}; + +// UTF-16 +template +class UTFImpl< + CP32, + behavior, + UnitIter, + std::enable_if_t< + sizeof(typename std::iterator_traits::value_type) == 2>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); +public: + // Handle ill-formed UTF-16: One unpaired surrogate. + U_FORCE_INLINE static CP32 sub(CP32 surrogate) { + switch (behavior) { + case UTF_BEHAVIOR_NEGATIVE: return U_SENTINEL; + case UTF_BEHAVIOR_FFFD: return 0xfffd; + case UTF_BEHAVIOR_SURROGATE: return surrogate; + } + } + + U_FORCE_INLINE static void inc(UnitIter &p, const UnitIter &limit) { + // Very similar to U16_FWD_1(). + auto c = *p; + ++p; + if (U16_IS_LEAD(c) && p != limit && U16_IS_TRAIL(*p)) { + ++p; + } + } + + U_FORCE_INLINE static void dec(UnitIter start, UnitIter &p) { + // Very similar to U16_BACK_1(). + UnitIter p1; + if (U16_IS_TRAIL(*--p) && p != start && (p1 = p, U16_IS_LEAD(*--p1))) { + p = p1; + } + } + + U_FORCE_INLINE static CodeUnits readAndInc( + UnitIter &p0, UnitIter &p, const UnitIter &limit) { + constexpr bool isMultiPass = + std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>; + // Very similar to U16_NEXT_OR_FFFD(). + CP32 c = *p; + ++p; + if (!U16_IS_SURROGATE(c)) { + if constexpr (isMultiPass) { + return {c, 1, true, p0, p}; + } else { + return {c, 1, true}; + } + } else { + uint16_t c2; + if (U16_IS_SURROGATE_LEAD(c) && p != limit && U16_IS_TRAIL(c2 = *p)) { + ++p; + c = U16_GET_SUPPLEMENTARY(c, c2); + if constexpr (isMultiPass) { + return {c, 2, true, p0, p}; + } else { + return {c, 2, true}; + } + } else { + if constexpr (isMultiPass) { + return {sub(c), 1, false, p0, p}; + } else { + return {sub(c), 1, false}; + } + } + } + } + + U_FORCE_INLINE static CodeUnits decAndRead(UnitIter start, UnitIter &p) { + // Very similar to U16_PREV_OR_FFFD(). + UnitIter p0 = p; + CP32 c = *--p; + if (!U16_IS_SURROGATE(c)) { + return {c, 1, true, p, p0}; + } else { + UnitIter p1; + uint16_t c2; + if (U16_IS_SURROGATE_TRAIL(c) && p != start && (p1 = p, U16_IS_LEAD(c2 = *--p1))) { + p = p1; + c = U16_GET_SUPPLEMENTARY(c2, c); + return {c, 2, true, p, p0}; + } else { + return {sub(c), 1, false, p, p0}; + } + } + } +}; + +// UTF-32: trivial, but still validating +template +class UTFImpl< + CP32, + behavior, + UnitIter, + std::enable_if_t< + sizeof(typename std::iterator_traits::value_type) == 4>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); +public: + // Handle ill-formed UTF-32 + U_FORCE_INLINE static CP32 sub(bool forSurrogate, CP32 surrogate) { + switch (behavior) { + case UTF_BEHAVIOR_NEGATIVE: return U_SENTINEL; + case UTF_BEHAVIOR_FFFD: return 0xfffd; + case UTF_BEHAVIOR_SURROGATE: return forSurrogate ? surrogate : 0xfffd; + } + } + + U_FORCE_INLINE static void inc(UnitIter &p, const UnitIter &/*limit*/) { + ++p; + } + + U_FORCE_INLINE static void dec(UnitIter /*start*/, UnitIter &p) { + --p; + } + + U_FORCE_INLINE static CodeUnits readAndInc( + UnitIter &p0, UnitIter &p, const UnitIter &/*limit*/) { + constexpr bool isMultiPass = + std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>; + uint32_t uc = *p; + CP32 c = uc; + ++p; + if (uc < 0xd800 || (0xe000 <= uc && uc <= 0x10ffff)) { + if constexpr (isMultiPass) { + return {c, 1, true, p0, p}; + } else { + return {c, 1, true}; + } + } else { + if constexpr (isMultiPass) { + return {sub(uc < 0xe000, c), 1, false, p0, p}; + } else { + return {sub(uc < 0xe000, c), 1, false}; + } + } + } + + U_FORCE_INLINE static CodeUnits decAndRead(UnitIter /*start*/, UnitIter &p) { + UnitIter p0 = p; + uint32_t uc = *--p; + CP32 c = uc; + if (uc < 0xd800 || (0xe000 <= uc && uc <= 0x10ffff)) { + return {c, 1, true, p, p0}; + } else { + return {sub(uc < 0xe000, c), 1, false, p, p0}; + } + } +}; + +// Non-validating implementations ------------------------------------------ *** + +template +class UnsafeUTFImpl; + +// UTF-8 +template +class UnsafeUTFImpl< + CP32, + UnitIter, + std::enable_if_t< + sizeof(typename std::iterator_traits::value_type) == 1>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); +public: + U_FORCE_INLINE static void inc(UnitIter &p) { + // Very similar to U8_FWD_1_UNSAFE(). + uint8_t b = *p; + std::advance(p, 1 + U8_COUNT_TRAIL_BYTES_UNSAFE(b)); + } + + U_FORCE_INLINE static void dec(UnitIter &p) { + // Very similar to U8_BACK_1_UNSAFE(). + while (U8_IS_TRAIL(*--p)) {} + } + + U_FORCE_INLINE static UnsafeCodeUnits readAndInc(UnitIter &p0, UnitIter &p) { + constexpr bool isMultiPass = + std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>; + // Very similar to U8_NEXT_UNSAFE(). + CP32 c = uint8_t(*p); + ++p; + if (U8_IS_SINGLE(c)) { + if constexpr (isMultiPass) { + return {c, 1, p0, p}; + } else { + return {c, 1}; + } + } else if (c < 0xe0) { + c = ((c & 0x1f) << 6) | (*p & 0x3f); + ++p; + if constexpr (isMultiPass) { + return {c, 2, p0, p}; + } else { + return {c, 2}; + } + } else if (c < 0xf0) { + // No need for (c&0xf) because the upper bits are truncated + // after <<12 in the cast to uint16_t. + c = uint16_t(c << 12) | ((*p & 0x3f) << 6); + ++p; + c |= *p & 0x3f; + ++p; + if constexpr (isMultiPass) { + return {c, 3, p0, p}; + } else { + return {c, 3}; + } + } else { + c = ((c & 7) << 18) | ((*p & 0x3f) << 12); + ++p; + c |= (*p & 0x3f) << 6; + ++p; + c |= *p & 0x3f; + ++p; + if constexpr (isMultiPass) { + return {c, 4, p0, p}; + } else { + return {c, 4}; + } + } + } + + U_FORCE_INLINE static UnsafeCodeUnits decAndRead(UnitIter &p) { + // Very similar to U8_PREV_UNSAFE(). + UnitIter p0 = p; + CP32 c = uint8_t(*--p); + if (U8_IS_SINGLE(c)) { + return {c, 1, p, p0}; + } + // U8_IS_TRAIL(c) if well-formed + c &= 0x3f; + uint8_t count = 1; + for (uint8_t shift = 6;;) { + uint8_t b = *--p; + if (b >= 0xc0) { + U8_MASK_LEAD_BYTE(b, count); + c |= uint32_t{b} << shift; + break; + } else { + c |= (uint32_t{b} & 0x3f) << shift; + ++count; + shift += 6; + } + } + ++count; + return {c, count, p, p0}; + } +}; + +// UTF-16 +template +class UnsafeUTFImpl< + CP32, + UnitIter, + std::enable_if_t< + sizeof(typename std::iterator_traits::value_type) == 2>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); +public: + U_FORCE_INLINE static void inc(UnitIter &p) { + // Very similar to U16_FWD_1_UNSAFE(). + auto c = *p; + ++p; + if (U16_IS_LEAD(c)) { + ++p; + } + } + + U_FORCE_INLINE static void dec(UnitIter &p) { + // Very similar to U16_BACK_1_UNSAFE(). + if (U16_IS_TRAIL(*--p)) { + --p; + } + } + + U_FORCE_INLINE static UnsafeCodeUnits readAndInc(UnitIter &p0, UnitIter &p) { + constexpr bool isMultiPass = + std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>; + // Very similar to U16_NEXT_UNSAFE(). + CP32 c = *p; + ++p; + if (!U16_IS_LEAD(c)) { + if constexpr (isMultiPass) { + return {c, 1, p0, p}; + } else { + return {c, 1}; + } + } else { + uint16_t c2 = *p; + ++p; + c = U16_GET_SUPPLEMENTARY(c, c2); + if constexpr (isMultiPass) { + return {c, 2, p0, p}; + } else { + return {c, 2}; + } + } + } + + U_FORCE_INLINE static UnsafeCodeUnits decAndRead(UnitIter &p) { + // Very similar to U16_PREV_UNSAFE(). + UnitIter p0 = p; + CP32 c = *--p; + if (!U16_IS_TRAIL(c)) { + return {c, 1, p, p0}; + } else { + uint16_t c2 = *--p; + c = U16_GET_SUPPLEMENTARY(c2, c); + return {c, 2, p, p0}; + } + } +}; + +// UTF-32: trivial +template +class UnsafeUTFImpl< + CP32, + UnitIter, + std::enable_if_t< + sizeof(typename std::iterator_traits::value_type) == 4>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); +public: + U_FORCE_INLINE static void inc(UnitIter &p) { + ++p; + } + + U_FORCE_INLINE static void dec(UnitIter &p) { + --p; + } + + U_FORCE_INLINE static UnsafeCodeUnits readAndInc(UnitIter &p0, UnitIter &p) { + constexpr bool isMultiPass = + std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>; + CP32 c = *p; + ++p; + if constexpr (isMultiPass) { + return {c, 1, p0, p}; + } else { + return {c, 1}; + } + } + + U_FORCE_INLINE static UnsafeCodeUnits decAndRead(UnitIter &p) { + UnitIter p0 = p; + CP32 c = *--p; + return {c, 1, p, p0}; + } +}; + +#endif + +// Validating iterators ---------------------------------------------------- *** + +/** + * Validating iterator over the code points in a Unicode string. + * + * The UnitIter can be + * an input_iterator, a forward_iterator, or a bidirectional_iterator (including a pointer). + * The UTFIterator will have the corresponding iterator_category. + * + * Call utfIterator() to have the compiler deduce the UnitIter type. + * + * For reverse iteration, either use this iterator directly as in *--iter + * or wrap it using std::make_reverse_iterator(iter). + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @tparam UnitIter An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @draft ICU 78 + * @see utfIterator + */ +template +class UTFIterator { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Impl = UTFImpl; + + // Proxy type for operator->() (required by LegacyInputIterator) + // so that we don't promise always returning CodeUnits. + class Proxy { + public: + explicit Proxy(CodeUnits &units) : units_(units) {} + CodeUnits &operator*() { return units_; } + CodeUnits *operator->() { return &units_; } + private: + CodeUnits units_; + }; + +public: + /** C++ iterator boilerplate @internal */ + using value_type = CodeUnits; + /** C++ iterator boilerplate @internal */ + using reference = value_type; + /** C++ iterator boilerplate @internal */ + using pointer = Proxy; + /** C++ iterator boilerplate @internal */ + using difference_type = typename std::iterator_traits::difference_type; + /** C++ iterator boilerplate @internal */ + using iterator_category = std::conditional_t< + std::is_base_of_v< + std::bidirectional_iterator_tag, + typename std::iterator_traits::iterator_category>, + std::bidirectional_iterator_tag, + std::forward_iterator_tag>; + + /** + * Constructor with start <= p < limit. + * All of these iterators/pointers should be at code point boundaries. + * Only enabled if UnitIter is a (multi-pass) forward_iterator or better. + * + * @param start Start of the range + * @param p Initial position inside the range + * @param limit Limit (exclusive end) of the range + * @draft ICU 78 + */ + U_FORCE_INLINE UTFIterator(UnitIter start, UnitIter p, UnitIter limit) : + p_(p), start_(start), limit_(limit), units_(0, 0, false, p, p) {} + /** + * Constructor with start == p < limit. + * All of these iterators/pointers should be at code point boundaries. + * + * @param p Start of the range, and the initial position + * @param limit Limit (exclusive end) of the range + * @draft ICU 78 + */ + U_FORCE_INLINE UTFIterator(UnitIter p, UnitIter limit) : + p_(p), start_(p), limit_(limit), units_(0, 0, false, p, p) {} + /** + * Constructs an iterator start or limit sentinel. + * The iterator/pointer should be at a code point boundary. + * Requires UnitIter to be copyable. + * + * @param p Range start or limit + * @draft ICU 78 + */ + U_FORCE_INLINE explicit UTFIterator(UnitIter p) : p_(p), start_(p), limit_(p), units_(0, 0, false, p, p) {} + /** + * Default constructor. Makes a non-functional iterator. + * + * @draft ICU 78 + */ + U_FORCE_INLINE UTFIterator() : p_{}, start_{}, limit_{}, units_(0, 0, false, p_, p_) {} + + /** Move constructor. @draft ICU 78 */ + U_FORCE_INLINE UTFIterator(UTFIterator &&src) noexcept = default; + /** Move assignment operator. @draft ICU 78 */ + U_FORCE_INLINE UTFIterator &operator=(UTFIterator &&src) noexcept = default; + + /** Copy constructor. @draft ICU 78 */ + U_FORCE_INLINE UTFIterator(const UTFIterator &other) = default; + /** Copy assignment operator. @draft ICU 78 */ + U_FORCE_INLINE UTFIterator &operator=(const UTFIterator &other) = default; + + /** + * @param other Another iterator + * @return true if this operator is at the same position as the other one + * @draft ICU 78 + */ + U_FORCE_INLINE bool operator==(const UTFIterator &other) const { + return getLogicalPosition() == other.getLogicalPosition(); + } + /** + * @param other Another iterator + * @return true if this operator is not at the same position as the other one + * @draft ICU 78 + */ + U_FORCE_INLINE bool operator!=(const UTFIterator &other) const { return !operator==(other); } + + /** + * Decodes the code unit sequence at the current position. + * + * @return CodeUnits with the decoded code point etc. + * @draft ICU 78 + */ + U_FORCE_INLINE CodeUnits operator*() const { + if (state_ == 0) { + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_, limit_); + state_ = 1; + } + return units_; + } + + /** + * Decodes the code unit sequence at the current position. + * Used like iter->codePoint() or iter->stringView() etc. + * + * @return CodeUnits with the decoded code point etc., wrapped into + * an opaque proxy object so that iter->codePoint() etc. works. + * @draft ICU 78 + */ + U_FORCE_INLINE Proxy operator->() const { + if (state_ == 0) { + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_, limit_); + state_ = 1; + } + return Proxy(units_); + } + + /** + * Pre-increment operator. + * + * @return this iterator + * @draft ICU 78 + */ + U_FORCE_INLINE UTFIterator &operator++() { // pre-increment + if (state_ > 0) { + // operator*() called readAndInc() so p_ is already ahead. + state_ = 0; + } else if (state_ == 0) { + Impl::inc(p_, limit_); + } else /* state_ < 0 */ { + // operator--() called decAndRead() so we know how far to skip. + p_ = units_.end(); + state_ = 0; + } + return *this; + } + + /** + * Post-increment operator. + * + * @return a copy of this iterator from before the increment. + * If UnitIter is a single-pass input_iterator, then this function + * returns an opaque proxy object so that *iter++ still works. + * @draft ICU 78 + */ + U_FORCE_INLINE UTFIterator operator++(int) { // post-increment + if (state_ > 0) { + // operator*() called readAndInc() so p_ is already ahead. + UTFIterator result(*this); + state_ = 0; + return result; + } else if (state_ == 0) { + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_, limit_); + UTFIterator result(*this); + result.state_ = 1; + // keep this->state_ == 0 + return result; + } else /* state_ < 0 */ { + UTFIterator result(*this); + // operator--() called decAndRead() so we know how far to skip. + p_ = units_.end(); + state_ = 0; + return result; + } + } + + /** + * Pre-decrement operator. + * Only enabled if UnitIter is a bidirectional_iterator (including a pointer). + * + * @return this iterator + * @draft ICU 78 + */ + template + U_FORCE_INLINE + std::enable_if_t< + std::is_base_of_v< + std::bidirectional_iterator_tag, + typename std::iterator_traits::iterator_category>, + UTFIterator &> + operator--() { // pre-decrement + if (state_ > 0) { + // operator*() called readAndInc() so p_ is ahead of the logical position. + p_ = units_.begin(); + } + units_ = Impl::decAndRead(start_, p_); + state_ = -1; + return *this; + } + + /** + * Post-decrement operator. + * Only enabled if UnitIter is a bidirectional_iterator (including a pointer). + * + * @return a copy of this iterator from before the decrement. + * @draft ICU 78 + */ + template + U_FORCE_INLINE + std::enable_if_t< + std::is_base_of_v< + std::bidirectional_iterator_tag, + typename std::iterator_traits::iterator_category>, + UTFIterator> + operator--(int) { // post-decrement + UTFIterator result(*this); + operator--(); + return result; + } + +private: + friend class std::reverse_iterator>; + + U_FORCE_INLINE UnitIter getLogicalPosition() const { + return state_ <= 0 ? p_ : units_.begin(); + } + + // operator*() etc. are logically const. + mutable UnitIter p_; + // In a validating iterator, we need start_ & limit_ so that when we read a code point + // (forward or backward) we can test if there are enough code units. + UnitIter start_; + UnitIter limit_; + // Keep state so that we call readAndInc() only once for both operator*() and ++ + // to make it easy for the compiler to optimize. + mutable CodeUnits units_; + // >0: units_ = readAndInc(), p_ = units limit + // which means that p_ is ahead of its logical position + // 0: initial state + // <0: units_ = decAndRead(), p_ = units start + mutable int8_t state_ = 0; +}; + +#ifndef U_IN_DOXYGEN +// Partial template specialization for single-pass input iterator. +template +class UTFIterator< + CP32, + behavior, + UnitIter, + std::enable_if_t< + !std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Impl = UTFImpl; + + // Proxy type for post-increment return value, to make *iter++ work. + // Also for operator->() (required by LegacyInputIterator) + // so that we don't promise always returning CodeUnits. + class Proxy { + public: + explicit Proxy(CodeUnits &units) : units_(units) {} + CodeUnits &operator*() { return units_; } + CodeUnits *operator->() { return &units_; } + private: + CodeUnits units_; + }; + +public: + using value_type = CodeUnits; + using reference = value_type; + using pointer = Proxy; + using difference_type = typename std::iterator_traits::difference_type; + using iterator_category = std::input_iterator_tag; + + U_FORCE_INLINE UTFIterator(UnitIter p, UnitIter limit) : p_(std::move(p)), limit_(std::move(limit)) {} + + // Constructs an iterator start or limit sentinel. + // Requires p to be copyable. + U_FORCE_INLINE explicit UTFIterator(UnitIter p) : p_(std::move(p)), limit_(p_) {} + + U_FORCE_INLINE UTFIterator(UTFIterator &&src) noexcept = default; + U_FORCE_INLINE UTFIterator &operator=(UTFIterator &&src) noexcept = default; + + U_FORCE_INLINE UTFIterator(const UTFIterator &other) = default; + U_FORCE_INLINE UTFIterator &operator=(const UTFIterator &other) = default; + + U_FORCE_INLINE bool operator==(const UTFIterator &other) const { + return p_ == other.p_ && ahead_ == other.ahead_; + // Strictly speaking, we should check if the logical position is the same. + // However, we cannot advance, or do arithmetic with, a single-pass UnitIter. + } + U_FORCE_INLINE bool operator!=(const UTFIterator &other) const { return !operator==(other); } + + U_FORCE_INLINE CodeUnits operator*() const { + if (!ahead_) { + units_ = Impl::readAndInc(p_, p_, limit_); + ahead_ = true; + } + return units_; + } + + U_FORCE_INLINE Proxy operator->() const { + if (!ahead_) { + units_ = Impl::readAndInc(p_, p_, limit_); + ahead_ = true; + } + return Proxy(units_); + } + + U_FORCE_INLINE UTFIterator &operator++() { // pre-increment + if (ahead_) { + // operator*() called readAndInc() so p_ is already ahead. + ahead_ = false; + } else { + Impl::inc(p_, limit_); + } + return *this; + } + + U_FORCE_INLINE Proxy operator++(int) { // post-increment + if (ahead_) { + // operator*() called readAndInc() so p_ is already ahead. + ahead_ = false; + } else { + units_ = Impl::readAndInc(p_, p_, limit_); + // keep this->ahead_ == false + } + return Proxy(units_); + } + +private: + // operator*() etc. are logically const. + mutable UnitIter p_; + // In a validating iterator, we need limit_ so that when we read a code point + // we can test if there are enough code units. + UnitIter limit_; + // Keep state so that we call readAndInc() only once for both operator*() and ++ + // so that we can use a single-pass input iterator for UnitIter. + mutable CodeUnits units_ = {0, 0, false}; + // true: units_ = readAndInc(), p_ = units limit + // which means that p_ is ahead of its logical position + // false: initial state + mutable bool ahead_ = false; +}; +#endif // U_IN_DOXYGEN + +} // namespace U_HEADER_ONLY_NAMESPACE + +#ifndef U_IN_DOXYGEN +// Bespoke specialization of reverse_iterator. +// The default implementation implements reverse operator*() and ++ in a way +// that does most of the same work twice for reading variable-length sequences. +template +class std::reverse_iterator> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Impl = U_HEADER_ONLY_NAMESPACE::UTFImpl; + using CodeUnits_ = U_HEADER_ONLY_NAMESPACE::CodeUnits; + + // Proxy type for operator->() (required by LegacyInputIterator) + // so that we don't promise always returning CodeUnits. + class Proxy { + public: + explicit Proxy(CodeUnits_ units) : units_(units) {} + CodeUnits_ &operator*() { return units_; } + CodeUnits_ *operator->() { return &units_; } + private: + CodeUnits_ units_; + }; + +public: + using value_type = CodeUnits_; + using reference = value_type; + using pointer = Proxy; + using difference_type = typename std::iterator_traits::difference_type; + using iterator_category = std::bidirectional_iterator_tag; + + U_FORCE_INLINE explicit reverse_iterator(U_HEADER_ONLY_NAMESPACE::UTFIterator iter) : + p_(iter.getLogicalPosition()), start_(iter.start_), limit_(iter.limit_), + units_(0, 0, false, p_, p_) {} + U_FORCE_INLINE reverse_iterator() : p_{}, start_{}, limit_{}, units_(0, 0, false, p_, p_) {} + + U_FORCE_INLINE reverse_iterator(reverse_iterator &&src) noexcept = default; + U_FORCE_INLINE reverse_iterator &operator=(reverse_iterator &&src) noexcept = default; + + U_FORCE_INLINE reverse_iterator(const reverse_iterator &other) = default; + U_FORCE_INLINE reverse_iterator &operator=(const reverse_iterator &other) = default; + + U_FORCE_INLINE bool operator==(const reverse_iterator &other) const { + return getLogicalPosition() == other.getLogicalPosition(); + } + U_FORCE_INLINE bool operator!=(const reverse_iterator &other) const { return !operator==(other); } + + U_FORCE_INLINE CodeUnits_ operator*() const { + if (state_ == 0) { + units_ = Impl::decAndRead(start_, p_); + state_ = -1; + } + return units_; + } + + U_FORCE_INLINE Proxy operator->() const { + if (state_ == 0) { + units_ = Impl::decAndRead(start_, p_); + state_ = -1; + } + return Proxy(units_); + } + + U_FORCE_INLINE reverse_iterator &operator++() { // pre-increment + if (state_ < 0) { + // operator*() called decAndRead() so p_ is already behind. + state_ = 0; + } else if (state_ == 0) { + Impl::dec(start_, p_); + } else /* state_ > 0 */ { + // operator--() called readAndInc() so we know how far to skip. + p_ = units_.begin(); + state_ = 0; + } + return *this; + } + + U_FORCE_INLINE reverse_iterator operator++(int) { // post-increment + if (state_ < 0) { + // operator*() called decAndRead() so p_ is already behind. + reverse_iterator result(*this); + state_ = 0; + return result; + } else if (state_ == 0) { + units_ = Impl::decAndRead(start_, p_); + reverse_iterator result(*this); + result.state_ = -1; + // keep this->state_ == 0 + return result; + } else /* state_ > 0 */ { + reverse_iterator result(*this); + // operator--() called readAndInc() so we know how far to skip. + p_ = units_.begin(); + state_ = 0; + return result; + } + } + + U_FORCE_INLINE reverse_iterator &operator--() { // pre-decrement + if (state_ < 0) { + // operator*() called decAndRead() so p_ is behind the logical position. + p_ = units_.end(); + } + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_, limit_); + state_ = 1; + return *this; + } + + U_FORCE_INLINE reverse_iterator operator--(int) { // post-decrement + reverse_iterator result(*this); + operator--(); + return result; + } + +private: + U_FORCE_INLINE UnitIter getLogicalPosition() const { + return state_ >= 0 ? p_ : units_.end(); + } + + // operator*() etc. are logically const. + mutable UnitIter p_; + // In a validating iterator, we need start_ & limit_ so that when we read a code point + // (forward or backward) we can test if there are enough code units. + UnitIter start_; + UnitIter limit_; + // Keep state so that we call decAndRead() only once for both operator*() and ++ + // to make it easy for the compiler to optimize. + mutable CodeUnits_ units_; + // >0: units_ = readAndInc(), p_ = units limit + // 0: initial state + // <0: units_ = decAndRead(), p_ = units start + // which means that p_ is behind its logical position + mutable int8_t state_ = 0; +}; +#endif // U_IN_DOXYGEN + +namespace U_HEADER_ONLY_NAMESPACE { + +/** + * A C++ "range" for validating iteration over all of the code points of a Unicode string. + * + * Call utfStringCodePoints() to have the compiler deduce the Unit type. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @tparam Unit Code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @draft ICU 78 + * @see utfStringCodePoints + */ +template +class UTFStringCodePoints { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using UnitIter = typename std::basic_string_view::iterator; +public: + /** + * Constructs a C++ "range" object over the code points in the string. + * @draft ICU 78 + */ + explicit UTFStringCodePoints(std::basic_string_view s) : s(s) {} + + /** Copy constructor. @draft ICU 78 */ + UTFStringCodePoints(const UTFStringCodePoints &other) = default; + + /** Copy assignment operator. @draft ICU 78 */ + UTFStringCodePoints &operator=(const UTFStringCodePoints &other) = default; + + /** + * @return the range start iterator + * @draft ICU 78 + */ + auto begin() const { + return UTFIterator(s.begin(), s.begin(), s.end()); + } + + /** + * @return the range limit (exclusive end) iterator + * @draft ICU 78 + */ + auto end() const { + return UTFIterator(s.begin(), s.end(), s.end()); + } + + /** + * @return std::reverse_iterator(end()) + * @draft ICU 78 + */ + auto rbegin() const { + return std::make_reverse_iterator(end()); + } + + /** + * @return std::reverse_iterator(begin()) + * @draft ICU 78 + */ + auto rend() const { + return std::make_reverse_iterator(begin()); + } + +private: + std::basic_string_view s; +}; + +/** + * UTFIterator factory function for start <= p < limit. + * Deduces the UnitIter template parameter from the inputs. + * Only enabled if UnitIter is a (multi-pass) forward_iterator or better. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @tparam behavior How to handle ill-formed Unicode strings + * @tparam UnitIter Can usually be omitted/deduced: + * An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @param start start code unit iterator + * @param p current-position code unit iterator + * @param limit limit (exclusive-end) code unit iterator + * @return a UTFIterator<CP32, behavior, UnitIter> + * for the given code unit iterators or character pointers + * @draft ICU 78 + */ +template +auto utfIterator(UnitIter start, UnitIter p, UnitIter limit) { + return UTFIterator(std::move(start), std::move(p), std::move(limit)); +} + +/** + * UTFIterator factory function for start = p < limit. + * Deduces the UnitIter template parameter from the inputs. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @tparam behavior How to handle ill-formed Unicode strings + * @tparam UnitIter Can usually be omitted/deduced: + * An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @param p start and current-position code unit iterator + * @param limit limit (exclusive-end) code unit iterator + * @return a UTFIterator<CP32, behavior, UnitIter> + * for the given code unit iterators or character pointers + * @draft ICU 78 + */ +template +auto utfIterator(UnitIter p, UnitIter limit) { + return UTFIterator(std::move(p), std::move(limit)); +} + +// Note: We should only enable the following factory function for a copyable UnitIter. +// In C++17, we would have to partially specialize with enable_if_t testing for forward_iterator, +// but a function template partial specialization is not allowed. +// In C++20, we might be able to require the std::copyable concept. + +/** + * UTFIterator factory function for a start or limit sentinel. + * Deduces the UnitIter template parameter from the input. + * Requires UnitIter to be copyable. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @tparam behavior How to handle ill-formed Unicode strings + * @tparam UnitIter Can usually be omitted/deduced: + * An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @param p code unit iterator + * @return a UTFIterator<CP32, behavior, UnitIter> + * for the given code unit iterator or character pointer + * @draft ICU 78 + */ +template +auto utfIterator(UnitIter p) { + return UTFIterator(std::move(p)); +} + +/** + * UTFStringCodePoints factory function for a "range" of code points in a string, + * which validates while decoding. + * Avoids having to explicitly specify the Unit template parameter for the UTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @param s input string + * @return a UTFStringCodePoints<CP32, behavior, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto utfStringCodePoints(std::string_view s) { + return UTFStringCodePoints(s); +} + +/** + * UTFStringCodePoints factory function for a "range" of code points in a string, + * which validates while decoding. + * Avoids having to explicitly specify the Unit template parameter for the UTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @param s input string + * @return a UTFStringCodePoints<CP32, behavior, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto utfStringCodePoints(std::u16string_view s) { + return UTFStringCodePoints(s); +} + +/** + * UTFStringCodePoints factory function for a "range" of code points in a string, + * which validates while decoding. + * Avoids having to explicitly specify the Unit template parameter for the UTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @param s input string + * @return a UTFStringCodePoints<CP32, behavior, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto utfStringCodePoints(std::u32string_view s) { + return UTFStringCodePoints(s); +} + +#if U_CPLUSPLUS_VERSION >= 20 +// The new type char8_t is distinct from char. u8"literals" are now char8_t literals. +/** + * UTFStringCodePoints factory function for a "range" of code points in a string, + * which validates while decoding. + * Avoids having to explicitly specify the Unit template parameter for the UTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @param s input string + * @return a UTFStringCodePoints<CP32, behavior, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto utfStringCodePoints(std::u8string_view s) { + return UTFStringCodePoints(s); +} +#endif + +/** + * UTFStringCodePoints factory function for a "range" of code points in a string, + * which validates while decoding. + * Avoids having to explicitly specify the Unit template parameter for the UTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t; + * should be signed if UTF_BEHAVIOR_NEGATIVE + * @tparam behavior How to handle ill-formed Unicode strings + * @param s input string + * @return a UTFStringCodePoints<CP32, behavior, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto utfStringCodePoints(std::wstring_view s) { + return UTFStringCodePoints(s); +} + +// Non-validating iterators ------------------------------------------------ *** + +/** + * Non-validating iterator over the code points in a Unicode string. + * The string must be well-formed. + * + * The UnitIter can be + * an input_iterator, a forward_iterator, or a bidirectional_iterator (including a pointer). + * The UTFIterator will have the corresponding iterator_category. + * + * Call unsafeUTFIterator() to have the compiler deduce the UnitIter type. + * + * For reverse iteration, either use this iterator directly as in *--iter + * or wrap it using std::make_reverse_iterator(iter). + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @tparam UnitIter An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @draft ICU 78 + * @see unsafeUTFIterator + */ +template +class UnsafeUTFIterator { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Impl = UnsafeUTFImpl; + + // Proxy type for operator->() (required by LegacyInputIterator) + // so that we don't promise always returning UnsafeCodeUnits. + class Proxy { + public: + explicit Proxy(UnsafeCodeUnits &units) : units_(units) {} + UnsafeCodeUnits &operator*() { return units_; } + UnsafeCodeUnits *operator->() { return &units_; } + private: + UnsafeCodeUnits units_; + }; + +public: + /** C++ iterator boilerplate @internal */ + using value_type = UnsafeCodeUnits; + /** C++ iterator boilerplate @internal */ + using reference = value_type; + /** C++ iterator boilerplate @internal */ + using pointer = Proxy; + /** C++ iterator boilerplate @internal */ + using difference_type = typename std::iterator_traits::difference_type; + /** C++ iterator boilerplate @internal */ + using iterator_category = std::conditional_t< + std::is_base_of_v< + std::bidirectional_iterator_tag, + typename std::iterator_traits::iterator_category>, + std::bidirectional_iterator_tag, + std::forward_iterator_tag>; + + /** + * Constructor; the iterator/pointer should be at a code point boundary. + * + * @param p Initial position inside the range, or a range sentinel + * @draft ICU 78 + */ + U_FORCE_INLINE explicit UnsafeUTFIterator(UnitIter p) : p_(p), units_(0, 0, p, p) {} + /** + * Default constructor. Makes a non-functional iterator. + * + * @draft ICU 78 + */ + U_FORCE_INLINE UnsafeUTFIterator() : p_{}, units_(0, 0, p_, p_) {} + + /** Move constructor. @draft ICU 78 */ + U_FORCE_INLINE UnsafeUTFIterator(UnsafeUTFIterator &&src) noexcept = default; + /** Move assignment operator. @draft ICU 78 */ + U_FORCE_INLINE UnsafeUTFIterator &operator=(UnsafeUTFIterator &&src) noexcept = default; + + /** Copy constructor. @draft ICU 78 */ + U_FORCE_INLINE UnsafeUTFIterator(const UnsafeUTFIterator &other) = default; + /** Copy assignment operator. @draft ICU 78 */ + U_FORCE_INLINE UnsafeUTFIterator &operator=(const UnsafeUTFIterator &other) = default; + + /** + * @param other Another iterator + * @return true if this operator is at the same position as the other one + * @draft ICU 78 + */ + U_FORCE_INLINE bool operator==(const UnsafeUTFIterator &other) const { + return getLogicalPosition() == other.getLogicalPosition(); + } + /** + * @param other Another iterator + * @return true if this operator is not at the same position as the other one + * @draft ICU 78 + */ + U_FORCE_INLINE bool operator!=(const UnsafeUTFIterator &other) const { return !operator==(other); } + + /** + * Decodes the code unit sequence at the current position. + * + * @return CodeUnits with the decoded code point etc. + * @draft ICU 78 + */ + U_FORCE_INLINE UnsafeCodeUnits operator*() const { + if (state_ == 0) { + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_); + state_ = 1; + } + return units_; + } + + /** + * Decodes the code unit sequence at the current position. + * Used like iter->codePoint() or iter->stringView() etc. + * + * @return CodeUnits with the decoded code point etc., wrapped into + * an opaque proxy object so that iter->codePoint() etc. works. + * @draft ICU 78 + */ + U_FORCE_INLINE Proxy operator->() const { + if (state_ == 0) { + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_); + state_ = 1; + } + return Proxy(units_); + } + + /** + * Pre-increment operator. + * + * @return this iterator + * @draft ICU 78 + */ + U_FORCE_INLINE UnsafeUTFIterator &operator++() { // pre-increment + if (state_ > 0) { + // operator*() called readAndInc() so p_ is already ahead. + state_ = 0; + } else if (state_ == 0) { + Impl::inc(p_); + } else /* state_ < 0 */ { + // operator--() called decAndRead() so we know how far to skip. + p_ = units_.end(); + state_ = 0; + } + return *this; + } + + /** + * Post-increment operator. + * + * @return a copy of this iterator from before the increment. + * If UnitIter is a single-pass input_iterator, then this function + * returns an opaque proxy object so that *iter++ still works. + * @draft ICU 78 + */ + U_FORCE_INLINE UnsafeUTFIterator operator++(int) { // post-increment + if (state_ > 0) { + // operator*() called readAndInc() so p_ is already ahead. + UnsafeUTFIterator result(*this); + state_ = 0; + return result; + } else if (state_ == 0) { + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_); + UnsafeUTFIterator result(*this); + result.state_ = 1; + // keep this->state_ == 0 + return result; + } else /* state_ < 0 */ { + UnsafeUTFIterator result(*this); + // operator--() called decAndRead() so we know how far to skip. + p_ = units_.end(); + state_ = 0; + return result; + } + } + + /** + * Pre-decrement operator. + * Only enabled if UnitIter is a bidirectional_iterator (including a pointer). + * + * @return this iterator + * @draft ICU 78 + */ + template + U_FORCE_INLINE + std::enable_if_t< + std::is_base_of_v< + std::bidirectional_iterator_tag, + typename std::iterator_traits::iterator_category>, + UnsafeUTFIterator &> + operator--() { // pre-decrement + if (state_ > 0) { + // operator*() called readAndInc() so p_ is ahead of the logical position. + p_ = units_.begin(); + } + units_ = Impl::decAndRead(p_); + state_ = -1; + return *this; + } + + /** + * Post-decrement operator. + * Only enabled if UnitIter is a bidirectional_iterator (including a pointer). + * + * @return a copy of this iterator from before the decrement. + * @draft ICU 78 + */ + template + U_FORCE_INLINE + std::enable_if_t< + std::is_base_of_v< + std::bidirectional_iterator_tag, + typename std::iterator_traits::iterator_category>, + UnsafeUTFIterator> + operator--(int) { // post-decrement + UnsafeUTFIterator result(*this); + operator--(); + return result; + } + +private: + friend class std::reverse_iterator>; + + U_FORCE_INLINE UnitIter getLogicalPosition() const { + return state_ <= 0 ? p_ : units_.begin(); + } + + // operator*() etc. are logically const. + mutable UnitIter p_; + // Keep state so that we call readAndInc() only once for both operator*() and ++ + // to make it easy for the compiler to optimize. + mutable UnsafeCodeUnits units_; + // >0: units_ = readAndInc(), p_ = units limit + // which means that p_ is ahead of its logical position + // 0: initial state + // <0: units_ = decAndRead(), p_ = units start + mutable int8_t state_ = 0; +}; + +#ifndef U_IN_DOXYGEN +// Partial template specialization for single-pass input iterator. +template +class UnsafeUTFIterator< + CP32, + UnitIter, + std::enable_if_t< + !std::is_base_of_v< + std::forward_iterator_tag, + typename std::iterator_traits::iterator_category>>> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Impl = UnsafeUTFImpl; + + // Proxy type for post-increment return value, to make *iter++ work. + // Also for operator->() (required by LegacyInputIterator) + // so that we don't promise always returning UnsafeCodeUnits. + class Proxy { + public: + explicit Proxy(UnsafeCodeUnits &units) : units_(units) {} + UnsafeCodeUnits &operator*() { return units_; } + UnsafeCodeUnits *operator->() { return &units_; } + private: + UnsafeCodeUnits units_; + }; + +public: + using value_type = UnsafeCodeUnits; + using reference = value_type; + using pointer = Proxy; + using difference_type = typename std::iterator_traits::difference_type; + using iterator_category = std::input_iterator_tag; + + U_FORCE_INLINE explicit UnsafeUTFIterator(UnitIter p) : p_(std::move(p)) {} + + U_FORCE_INLINE UnsafeUTFIterator(UnsafeUTFIterator &&src) noexcept = default; + U_FORCE_INLINE UnsafeUTFIterator &operator=(UnsafeUTFIterator &&src) noexcept = default; + + U_FORCE_INLINE UnsafeUTFIterator(const UnsafeUTFIterator &other) = default; + U_FORCE_INLINE UnsafeUTFIterator &operator=(const UnsafeUTFIterator &other) = default; + + U_FORCE_INLINE bool operator==(const UnsafeUTFIterator &other) const { + return p_ == other.p_ && ahead_ == other.ahead_; + // Strictly speaking, we should check if the logical position is the same. + // However, we cannot advance, or do arithmetic with, a single-pass UnitIter. + } + U_FORCE_INLINE bool operator!=(const UnsafeUTFIterator &other) const { return !operator==(other); } + + U_FORCE_INLINE UnsafeCodeUnits operator*() const { + if (!ahead_) { + units_ = Impl::readAndInc(p_, p_); + ahead_ = true; + } + return units_; + } + + U_FORCE_INLINE Proxy operator->() const { + if (!ahead_) { + units_ = Impl::readAndInc(p_, p_); + ahead_ = true; + } + return Proxy(units_); + } + + U_FORCE_INLINE UnsafeUTFIterator &operator++() { // pre-increment + if (ahead_) { + // operator*() called readAndInc() so p_ is already ahead. + ahead_ = false; + } else { + Impl::inc(p_); + } + return *this; + } + + U_FORCE_INLINE Proxy operator++(int) { // post-increment + if (ahead_) { + // operator*() called readAndInc() so p_ is already ahead. + ahead_ = false; + } else { + units_ = Impl::readAndInc(p_, p_); + // keep this->ahead_ == false + } + return Proxy(units_); + } + +private: + // operator*() etc. are logically const. + mutable UnitIter p_; + // Keep state so that we call readAndInc() only once for both operator*() and ++ + // so that we can use a single-pass input iterator for UnitIter. + mutable UnsafeCodeUnits units_ = {0, 0}; + // true: units_ = readAndInc(), p_ = units limit + // which means that p_ is ahead of its logical position + // false: initial state + mutable bool ahead_ = false; +}; +#endif // U_IN_DOXYGEN + +} // namespace U_HEADER_ONLY_NAMESPACE + +#ifndef U_IN_DOXYGEN +// Bespoke specialization of reverse_iterator. +// The default implementation implements reverse operator*() and ++ in a way +// that does most of the same work twice for reading variable-length sequences. +template +class std::reverse_iterator> { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using Impl = U_HEADER_ONLY_NAMESPACE::UnsafeUTFImpl; + using UnsafeCodeUnits_ = U_HEADER_ONLY_NAMESPACE::UnsafeCodeUnits; + + // Proxy type for operator->() (required by LegacyInputIterator) + // so that we don't promise always returning UnsafeCodeUnits. + class Proxy { + public: + explicit Proxy(UnsafeCodeUnits_ units) : units_(units) {} + UnsafeCodeUnits_ &operator*() { return units_; } + UnsafeCodeUnits_ *operator->() { return &units_; } + private: + UnsafeCodeUnits_ units_; + }; + +public: + using value_type = UnsafeCodeUnits_; + using reference = value_type; + using pointer = Proxy; + using difference_type = typename std::iterator_traits::difference_type; + using iterator_category = std::bidirectional_iterator_tag; + + U_FORCE_INLINE explicit reverse_iterator(U_HEADER_ONLY_NAMESPACE::UnsafeUTFIterator iter) : + p_(iter.getLogicalPosition()), units_(0, 0, p_, p_) {} + U_FORCE_INLINE reverse_iterator() : p_{}, units_(0, 0, p_, p_) {} + + U_FORCE_INLINE reverse_iterator(reverse_iterator &&src) noexcept = default; + U_FORCE_INLINE reverse_iterator &operator=(reverse_iterator &&src) noexcept = default; + + U_FORCE_INLINE reverse_iterator(const reverse_iterator &other) = default; + U_FORCE_INLINE reverse_iterator &operator=(const reverse_iterator &other) = default; + + U_FORCE_INLINE bool operator==(const reverse_iterator &other) const { + return getLogicalPosition() == other.getLogicalPosition(); + } + U_FORCE_INLINE bool operator!=(const reverse_iterator &other) const { return !operator==(other); } + + U_FORCE_INLINE UnsafeCodeUnits_ operator*() const { + if (state_ == 0) { + units_ = Impl::decAndRead(p_); + state_ = -1; + } + return units_; + } + + U_FORCE_INLINE Proxy operator->() const { + if (state_ == 0) { + units_ = Impl::decAndRead(p_); + state_ = -1; + } + return Proxy(units_); + } + + U_FORCE_INLINE reverse_iterator &operator++() { // pre-increment + if (state_ < 0) { + // operator*() called decAndRead() so p_ is already behind. + state_ = 0; + } else if (state_ == 0) { + Impl::dec(p_); + } else /* state_ > 0 */ { + // operator--() called readAndInc() so we know how far to skip. + p_ = units_.begin(); + state_ = 0; + } + return *this; + } + + U_FORCE_INLINE reverse_iterator operator++(int) { // post-increment + if (state_ < 0) { + // operator*() called decAndRead() so p_ is already behind. + reverse_iterator result(*this); + state_ = 0; + return result; + } else if (state_ == 0) { + units_ = Impl::decAndRead(p_); + reverse_iterator result(*this); + result.state_ = -1; + // keep this->state_ == 0 + return result; + } else /* state_ > 0 */ { + reverse_iterator result(*this); + // operator--() called readAndInc() so we know how far to skip. + p_ = units_.begin(); + state_ = 0; + return result; + } + } + + U_FORCE_INLINE reverse_iterator &operator--() { // pre-decrement + if (state_ < 0) { + // operator*() called decAndRead() so p_ is behind the logical position. + p_ = units_.end(); + } + UnitIter p0 = p_; + units_ = Impl::readAndInc(p0, p_); + state_ = 1; + return *this; + } + + U_FORCE_INLINE reverse_iterator operator--(int) { // post-decrement + reverse_iterator result(*this); + operator--(); + return result; + } + +private: + U_FORCE_INLINE UnitIter getLogicalPosition() const { + return state_ >= 0 ? p_ : units_.end(); + } + + // operator*() etc. are logically const. + mutable UnitIter p_; + // Keep state so that we call decAndRead() only once for both operator*() and ++ + // to make it easy for the compiler to optimize. + mutable UnsafeCodeUnits_ units_; + // >0: units_ = readAndInc(), p_ = units limit + // 0: initial state + // <0: units_ = decAndRead(), p_ = units start + // which means that p_ is behind its logical position + mutable int8_t state_ = 0; +}; +#endif // U_IN_DOXYGEN + +namespace U_HEADER_ONLY_NAMESPACE { + +/** + * A C++ "range" for non-validating iteration over all of the code points of a Unicode string. + * The string must be well-formed. + * + * Call unsafeUTFStringCodePoints() to have the compiler deduce the Unit type. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @tparam Unit Code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @draft ICU 78 + * @see unsafeUTFStringCodePoints + */ +template +class UnsafeUTFStringCodePoints { + static_assert(sizeof(CP32) == 4, "CP32 must be a 32-bit type to hold a code point"); + using UnitIter = typename std::basic_string_view::iterator; +public: + /** + * Constructs a C++ "range" object over the code points in the string. + * @draft ICU 78 + */ + explicit UnsafeUTFStringCodePoints(std::basic_string_view s) : s(s) {} + + /** Copy constructor. @draft ICU 78 */ + UnsafeUTFStringCodePoints(const UnsafeUTFStringCodePoints &other) = default; + + /** Copy assignment operator. @draft ICU 78 */ + UnsafeUTFStringCodePoints &operator=(const UnsafeUTFStringCodePoints &other) = default; + + /** + * @return the range start iterator + * @draft ICU 78 + */ + auto begin() const { + return UnsafeUTFIterator(s.begin()); + } + + /** + * @return the range limit (exclusive end) iterator + * @draft ICU 78 + */ + auto end() const { + return UnsafeUTFIterator(s.end()); + } + + /** + * @return std::reverse_iterator(end()) + * @draft ICU 78 + */ + auto rbegin() const { + return std::make_reverse_iterator(end()); + } + + /** + * @return std::reverse_iterator(begin()) + * @draft ICU 78 + */ + auto rend() const { + return std::make_reverse_iterator(begin()); + } + +private: + std::basic_string_view s; +}; + +/** + * UnsafeUTFIterator factory function. + * Deduces the UnitIter template parameter from the input. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @tparam UnitIter Can usually be omitted/deduced: + * An iterator (often a pointer) that returns a code unit type: + * UTF-8: char or char8_t or uint8_t; + * UTF-16: char16_t or uint16_t or (on Windows) wchar_t + * @param iter code unit iterator + * @return an UnsafeUTFIterator<CP32, UnitIter> + * for the given code unit iterator or character pointer + * @draft ICU 78 + */ +template +auto unsafeUTFIterator(UnitIter iter) { + return UnsafeUTFIterator(std::move(iter)); +} + +/** + * UnsafeUTFStringCodePoints factory function for a "range" of code points in a string. + * The string must be well-formed. + * Avoids having to explicitly specify the Unit template parameter + * for the UnsafeUTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @param s input string + * @return an UnsafeUTFStringCodePoints<CP32, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto unsafeUTFStringCodePoints(std::string_view s) { + return UnsafeUTFStringCodePoints(s); +} + +/** + * UnsafeUTFStringCodePoints factory function for a "range" of code points in a string. + * The string must be well-formed. + * Avoids having to explicitly specify the Unit template parameter + * for the UnsafeUTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @param s input string + * @return an UnsafeUTFStringCodePoints<CP32, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto unsafeUTFStringCodePoints(std::u16string_view s) { + return UnsafeUTFStringCodePoints(s); +} + +/** + * UnsafeUTFStringCodePoints factory function for a "range" of code points in a string. + * The string must be well-formed. + * Avoids having to explicitly specify the Unit template parameter + * for the UnsafeUTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @param s input string + * @return an UnsafeUTFStringCodePoints<CP32, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto unsafeUTFStringCodePoints(std::u32string_view s) { + return UnsafeUTFStringCodePoints(s); +} + +#if U_CPLUSPLUS_VERSION >= 20 +// The new type char8_t is distinct from char. u8"literals" are now char8_t literals. +/** + * UnsafeUTFStringCodePoints factory function for a "range" of code points in a string. + * The string must be well-formed. + * Avoids having to explicitly specify the Unit template parameter + * for the UnsafeUTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @param s input string + * @return an UnsafeUTFStringCodePoints<CP32, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto unsafeUTFStringCodePoints(std::u8string_view s) { + return UnsafeUTFStringCodePoints(s); +} +#endif + +/** + * UnsafeUTFStringCodePoints factory function for a "range" of code points in a string. + * The string must be well-formed. + * Avoids having to explicitly specify the Unit template parameter + * for the UnsafeUTFStringCodePoints. + * + * @tparam CP32 Code point type: UChar32 (=int32_t) or char32_t or uint32_t + * @param s input string + * @return an UnsafeUTFStringCodePoints<CP32, Unit> + * for the given std::basic_string_view<Unit> + * @draft ICU 78 + */ +template +auto unsafeUTFStringCodePoints(std::wstring_view s) { + return UnsafeUTFStringCodePoints(s); +} + +} // namespace U_HEADER_ONLY_NAMESPACE + +#endif // U_HIDE_DRAFT_API +#endif // U_SHOW_CPLUSPLUS_API || U_SHOW_CPLUSPLUS_HEADER_API +#endif // __UTFITERATOR_H__ diff --git a/icu4c/source/common/unistr_cnv.cpp b/icu4c/source/common/unistr_cnv.cpp index bf52dd511884..0313af7fe66b 100644 --- a/icu4c/source/common/unistr_cnv.cpp +++ b/icu4c/source/common/unistr_cnv.cpp @@ -275,20 +275,24 @@ UnicodeString::doExtract(int32_t start, int32_t length, } // perform the conversion - ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &errorCode); + UErrorCode bufferStatus = U_ZERO_ERROR; + ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &bufferStatus); length = static_cast(dest - originalDest); // if an overflow occurs, then get the preflighting length - if(errorCode==U_BUFFER_OVERFLOW_ERROR) { + if(bufferStatus==U_BUFFER_OVERFLOW_ERROR) { char buffer[1024]; destLimit=buffer+sizeof(buffer); do { dest=buffer; - errorCode=U_ZERO_ERROR; - ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &errorCode); + bufferStatus=U_ZERO_ERROR; + ucnv_fromUnicode(cnv, &dest, destLimit, &src, srcLimit, nullptr, true, &bufferStatus); length += static_cast(dest - buffer); - } while(errorCode==U_BUFFER_OVERFLOW_ERROR); + } while(bufferStatus==U_BUFFER_OVERFLOW_ERROR); + } + if (U_FAILURE(bufferStatus)) { + errorCode = bufferStatus; } return u_terminateChars(originalDest, destCapacity, length, &errorCode); @@ -389,17 +393,15 @@ UnicodeString::doCodepageCreate(const char *codepageData, // perform the conversion array = getArrayStart(); myTarget = array + length(); + UErrorCode bufferStatus = U_ZERO_ERROR; ucnv_toUnicode(converter, &myTarget, array + getCapacity(), - &mySource, mySourceEnd, nullptr, true, &status); + &mySource, mySourceEnd, nullptr, true, &bufferStatus); // update the conversion parameters setLength(static_cast(myTarget - array)); // allocate more space and copy data, if needed - if(status == U_BUFFER_OVERFLOW_ERROR) { - // reset the error code - status = U_ZERO_ERROR; - + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR) { // keep the previous conversion results doCopyArray = true; @@ -407,6 +409,9 @@ UnicodeString::doCodepageCreate(const char *codepageData, // try 2 char16_t's per remaining source byte arraySize = static_cast(length() + 2 * (mySourceEnd - mySource)); } else { + if (U_FAILURE(bufferStatus)) { + status = bufferStatus; + } break; } } diff --git a/icu4c/source/common/uposixdefs.h b/icu4c/source/common/uposixdefs.h index 826c9bb47a20..ab9b109a1813 100644 --- a/icu4c/source/common/uposixdefs.h +++ b/icu4c/source/common/uposixdefs.h @@ -74,4 +74,9 @@ #define _POSIX_C_SOURCE 200809L #endif +/* Prevent _XOPEN_SOURCE from breaking build on macOS when aligned_alloc exists. */ +#if defined(__APPLE__) && !defined(_DARWIN_C_SOURCE) +# define _DARWIN_C_SOURCE +#endif + #endif /* __UPOSIXDEFS_H__ */ diff --git a/icu4c/source/common/usprep.cpp b/icu4c/source/common/usprep.cpp index 048b423645f8..e45dca1cc8d0 100644 --- a/icu4c/source/common/usprep.cpp +++ b/icu4c/source/common/usprep.cpp @@ -666,11 +666,12 @@ usprep_prepare( const UStringPrepProfile* profile, *status = U_MEMORY_ALLOCATION_ERROR; return 0; } + UErrorCode bufferStatus = U_ZERO_ERROR; int32_t b1Len = usprep_map(profile, src, srcLength, - b1, s1.getCapacity(), options, parseError, status); - s1.releaseBuffer(U_SUCCESS(*status) ? b1Len : 0); + b1, s1.getCapacity(), options, parseError, &bufferStatus); + s1.releaseBuffer(U_SUCCESS(bufferStatus) ? b1Len : 0); - if(*status == U_BUFFER_OVERFLOW_ERROR){ + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ // redo processing of string /* we do not have enough room so grow the buffer*/ b1 = s1.getBuffer(b1Len); @@ -679,12 +680,13 @@ usprep_prepare( const UStringPrepProfile* profile, return 0; } - *status = U_ZERO_ERROR; // reset error + bufferStatus = U_ZERO_ERROR; // reset error b1Len = usprep_map(profile, src, srcLength, - b1, s1.getCapacity(), options, parseError, status); - s1.releaseBuffer(U_SUCCESS(*status) ? b1Len : 0); + b1, s1.getCapacity(), options, parseError, &bufferStatus); + s1.releaseBuffer(U_SUCCESS(bufferStatus) ? b1Len : 0); } - if(U_FAILURE(*status)){ + if(U_FAILURE(bufferStatus)){ + *status = bufferStatus; return 0; } diff --git a/icu4c/source/common/ustr_wcs.cpp b/icu4c/source/common/ustr_wcs.cpp index 8ce0855226d6..395713f5cd93 100644 --- a/icu4c/source/common/ustr_wcs.cpp +++ b/icu4c/source/common/ustr_wcs.cpp @@ -95,15 +95,14 @@ _strToWCS(wchar_t *dest, pSrcLimit = pSrc + srcLength; for(;;) { - /* reset the error state */ - *pErrorCode = U_ZERO_ERROR; + UErrorCode bufferStatus = U_ZERO_ERROR; /* convert to chars using default converter */ - ucnv_fromUnicode(conv,&tempBuf,tempBufLimit,&pSrc,pSrcLimit,nullptr,(UBool)(pSrc==pSrcLimit),pErrorCode); + ucnv_fromUnicode(conv,&tempBuf,tempBufLimit,&pSrc,pSrcLimit,nullptr,(UBool)(pSrc==pSrcLimit),&bufferStatus); count =(tempBuf - saveBuf); /* This should rarely occur */ - if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR){ + if(bufferStatus==U_BUFFER_OVERFLOW_ERROR){ tempBuf = saveBuf; /* we don't have enough room on the stack grow the buffer */ @@ -119,16 +118,15 @@ _strToWCS(wchar_t *dest, saveBuf = tempBuf; tempBufLimit = tempBuf + tempBufCapacity; tempBuf = tempBuf + count; - } else { + if (U_FAILURE(bufferStatus)) { + *pErrorCode = bufferStatus; + goto cleanup; + } break; } } - if(U_FAILURE(*pErrorCode)){ - goto cleanup; - } - /* done with conversion null terminate the char buffer */ if(count>=tempBufCapacity){ tempBuf = saveBuf; @@ -441,20 +439,22 @@ _strFromWCS( char16_t *dest, } for(;;) { - - *pErrorCode = U_ZERO_ERROR; - + UErrorCode bufferStatus = U_ZERO_ERROR; + /* convert to stack buffer*/ - ucnv_toUnicode(conv,&pTarget,pTargetLimit,(const char**)&pCSrc,pCSrcLimit,nullptr,(UBool)(pCSrc==pCSrcLimit),pErrorCode); - + ucnv_toUnicode(conv,&pTarget,pTargetLimit,(const char**)&pCSrc,pCSrcLimit,nullptr,(UBool)(pCSrc==pCSrcLimit),&bufferStatus); + /* increment count to number written to stack */ count+= pTarget - target; - - if(*pErrorCode==U_BUFFER_OVERFLOW_ERROR){ + + if(bufferStatus==U_BUFFER_OVERFLOW_ERROR){ target = uStack; pTarget = uStack; pTargetLimit = uStack + _STACK_BUFFER_CAPACITY; } else { + if (U_FAILURE(bufferStatus)) { + *pErrorCode = bufferStatus; + } break; } diff --git a/icu4c/source/common/uts46.cpp b/icu4c/source/common/uts46.cpp index 018c0e19b778..16565ae0dafd 100644 --- a/icu4c/source/common/uts46.cpp +++ b/icu4c/source/common/uts46.cpp @@ -872,11 +872,12 @@ UTS46::processLabel(UnicodeString &dest, buffer[1]=0x6e; buffer[2]=0x2d; buffer[3]=0x2d; + UErrorCode punycodeErrorCode=U_ZERO_ERROR; int32_t punycodeLength=u_strToPunycode(label, labelLength, buffer+4, punycode.getCapacity()-4, - nullptr, &errorCode); - if(errorCode==U_BUFFER_OVERFLOW_ERROR) { - errorCode=U_ZERO_ERROR; + nullptr, &punycodeErrorCode); + if(punycodeErrorCode==U_BUFFER_OVERFLOW_ERROR) { + punycodeErrorCode=U_ZERO_ERROR; punycode.releaseBuffer(4); buffer=punycode.getBuffer(4+punycodeLength); if(buffer==nullptr) { @@ -885,11 +886,12 @@ UTS46::processLabel(UnicodeString &dest, } punycodeLength=u_strToPunycode(label, labelLength, buffer+4, punycode.getCapacity()-4, - nullptr, &errorCode); + nullptr, &punycodeErrorCode); } punycodeLength+=4; punycode.releaseBuffer(punycodeLength); - if(U_FAILURE(errorCode)) { + if(U_FAILURE(punycodeErrorCode)) { + errorCode = punycodeErrorCode; return destLabelLength; } if(punycodeLength>63) { diff --git a/icu4c/source/config/dist-data.sh b/icu4c/source/config/dist-data.sh index 9406ebb3a634..bfc673471829 100755 --- a/icu4c/source/config/dist-data.sh +++ b/icu4c/source/config/dist-data.sh @@ -1,5 +1,6 @@ #!/bin/bash # Copyright (C) 2020 and later: Unicode, Inc. and others. +# License & terms of use: https://www.unicode.org/copyright.html # set VERSION to the ICU version. set top_srcdir to the parent of icurc # Note: You need to set LD_LIBRARY_PATH/etc before calling this script. @@ -75,7 +76,7 @@ do cat >> ${DISTY_DIR}/tmp/${README} < Copyright © 2016 and later Unicode, Inc. and others. All Rights Reserved. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -[Terms of Use and License](http://www.unicode.org/copyright.html) +[Terms of Use and License](https://www.unicode.org/copyright.html) EOF zip -v -j ${DISTY_DIR}/${base} \ diff --git a/icu4c/source/data/brkitr/LOCALE_DEPS.json b/icu4c/source/data/brkitr/LOCALE_DEPS.json index dc416705ac89..e0a4297617cb 100644 --- a/icu4c/source/data/brkitr/LOCALE_DEPS.json +++ b/icu4c/source/data/brkitr/LOCALE_DEPS.json @@ -3,5 +3,5 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47" + "cldrVersion": "48" } diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt index 0c5beb3f0a62..8b7b91a126a4 100644 --- a/icu4c/source/data/brkitr/root.txt +++ b/icu4c/source/data/brkitr/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/ root{ - Version{"47"} + Version{"48"} boundaries{ grapheme:process(dependency){"char.brk"} line:process(dependency){"line.brk"} diff --git a/icu4c/source/data/coll/LOCALE_DEPS.json b/icu4c/source/data/coll/LOCALE_DEPS.json index a4da68f7ed58..04a967557f78 100644 --- a/icu4c/source/data/coll/LOCALE_DEPS.json +++ b/icu4c/source/data/coll/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "in": "id", diff --git a/icu4c/source/data/coll/af.txt b/icu4c/source/data/coll/af.txt index 9794f0ec825e..48ad06b4cbbe 100644 --- a/icu4c/source/data/coll/af.txt +++ b/icu4c/source/data/coll/af.txt @@ -5,7 +5,7 @@ af{ collations{ standard{ Sequence{"&N<<<ʼn"} - Version{"47"} + Version{"48"} } } } diff --git a/icu4c/source/data/coll/am.txt b/icu4c/source/data/coll/am.txt index 83d63673bea9..21f1f2afe678 100644 --- a/icu4c/source/data/coll/am.txt +++ b/icu4c/source/data/coll/am.txt @@ -5,7 +5,7 @@ am{ collations{ standard{ Sequence{"[reorder Ethi]"} - Version{"47"} + Version{"48"} } } } diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt index 6ab829ff784f..1c48d7e85866 100644 --- a/icu4c/source/data/coll/ar.txt +++ b/icu4c/source/data/coll/ar.txt @@ -9,7 +9,7 @@ ar{ "&ت<<ة<<<ﺔ<<<ﺓ" "&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ" } - Version{"47"} + Version{"48"} } standard{ Sequence{ @@ -397,7 +397,7 @@ ar{ "‎&ۓ‎=ﮰ‎=ﮱ" "‎&ۀ‎=ﮤ‎=ﮥ" } - Version{"47"} + Version{"48"} } } } diff --git a/icu4c/source/data/coll/as.txt b/icu4c/source/data/coll/as.txt index 2833ed88b8b0..78e2676f6ae3 100644 --- a/icu4c/source/data/coll/as.txt +++ b/icu4c/source/data/coll/as.txt @@ -11,7 +11,7 @@ as{ "&[before 1]ত<ৎ=ত্\u200D" "&হ<ক্ষ" } - Version{"47"} + Version{"48"} } } } diff --git a/icu4c/source/data/coll/az.txt b/icu4c/source/data/coll/az.txt index 877be2299a2b..e73d36436e7c 100644 --- a/icu4c/source/data/coll/az.txt +++ b/icu4c/source/data/coll/az.txt @@ -9,7 +9,7 @@ az{ "[import az-u-co-standard]" "[reorder others]" } - Version{"47"} + Version{"48"} } standard{ Sequence{ @@ -26,7 +26,7 @@ az{ "&H - + @@ -64,6 +64,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + @@ -277,6 +279,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + @@ -456,7 +460,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1528,7 +1532,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1718,7 +1722,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -1765,6 +1769,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + @@ -1963,7 +1976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic - + @@ -2267,6 +2280,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4c/source/data/in/coll/ucadata-implicithan-icu4x.icu b/icu4c/source/data/in/coll/ucadata-implicithan-icu4x.icu index 939ba01adc6e..1ef5b37915df 100644 Binary files a/icu4c/source/data/in/coll/ucadata-implicithan-icu4x.icu and b/icu4c/source/data/in/coll/ucadata-implicithan-icu4x.icu differ diff --git a/icu4c/source/data/in/coll/ucadata-unihan-icu4x.icu b/icu4c/source/data/in/coll/ucadata-unihan-icu4x.icu index 1f5e73f03a45..a016f52f25aa 100644 Binary files a/icu4c/source/data/in/coll/ucadata-unihan-icu4x.icu and b/icu4c/source/data/in/coll/ucadata-unihan-icu4x.icu differ diff --git a/icu4c/source/data/lang/LOCALE_DEPS.json b/icu4c/source/data/lang/LOCALE_DEPS.json index fc9c4e7ab9e1..bcc11de59133 100644 --- a/icu4c/source/data/lang/LOCALE_DEPS.json +++ b/icu4c/source/data/lang/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -19,6 +19,7 @@ "iw": "he", "iw_IL": "he_IL", "ks_IN": "ks_Arab_IN", + "ku_SY": "ku_Latn_SY", "kxv_IN": "kxv_Latn_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", diff --git a/icu4c/source/data/lang/af.txt b/icu4c/source/data/lang/af.txt index 1d51fe54191c..1525f1f63905 100644 --- a/icu4c/source/data/lang/af.txt +++ b/icu4c/source/data/lang/af.txt @@ -614,10 +614,8 @@ af{ tertiary{"Sorteer aksente/kas/breedte"} } collation{ - big5han{"Tradisionele Chinese sorteervolgorde - Groot5"} dictionary{"Woordeboek-sorteervolgorde"} ducet{"Verstek Unicode-rangskikvolgorde"} - gb2312han{"Vereenvoudigde Chinese sorteervolgorde - GB2312"} phonebook{"Foonboek-sorteervolgorde"} phonetic{"Fonetiese sorteerorde"} pinyin{"Pinyin-sorteervolgorde"} diff --git a/icu4c/source/data/lang/am.txt b/icu4c/source/data/lang/am.txt index cbe025995c8d..60275e52e3d5 100644 --- a/icu4c/source/data/lang/am.txt +++ b/icu4c/source/data/lang/am.txt @@ -698,10 +698,8 @@ am{ tertiary{"የፊደል ጭረቶች/መልከፊደል/ስፋት ደርድር"} } collation{ - big5han{"የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5"} dictionary{"የመዝገበ ቃላት የድርድር ቅደም ተከተል"} ducet{"የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል"} - gb2312han{"የቀለለ የቻይንኛ የድርደራ ቅደም ተከተል - GB2312"} phonebook{"የስልክ ደብተር ድርድር ቅደም ተከተል"} phonetic{"የፎነቲክ ድርደራ ቅደም ተከተል"} pinyin{"ፒንይን የድርድር ቅደም ተከተል"} diff --git a/icu4c/source/data/lang/ar.txt b/icu4c/source/data/lang/ar.txt index fefcf80debf0..4d7e46d8ef09 100644 --- a/icu4c/source/data/lang/ar.txt +++ b/icu4c/source/data/lang/ar.txt @@ -797,11 +797,9 @@ ar{ tertiary{"تصنيف اللكنات/الحالة/العرض"} } collation{ - big5han{"الترتيب حسب اللغة الصينية التقليدية (Big5)"} compat{"ترتيب الفرز السابق: للتوافق"} dictionary{"الترتيب حسب القاموس"} ducet{"ترتيب فرز Unicode الافتراضي"} - gb2312han{"الترتيب حسب اللغة الصينية المبسّطة (GB2312)"} phonebook{"الترتيب حسب دليل الهاتف"} phonetic{"الترتيب حسب اللفظ"} pinyin{"الترتيب حسب نظام بنيين الصيني"} diff --git a/icu4c/source/data/lang/as.txt b/icu4c/source/data/lang/as.txt index 78190de1ba00..fa73153a5723 100644 --- a/icu4c/source/data/lang/as.txt +++ b/icu4c/source/data/lang/as.txt @@ -566,9 +566,7 @@ as{ standard{"মান্য মুদ্ৰা সজ্জা"} } collation{ - big5han{"পৰম্পৰাগত চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - Big5"} ducet{"ডিফ’ল্ট ইউনিকোড সজোৱা ক্ৰম"} - gb2312han{"সৰল চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - GB2312"} phonebook{"টেলিফোন বহিৰ মতেশৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম"} pinyin{"পিন্‌য়িন শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম"} search{"সাধাৰণ উদ্দেশ্যে অনুসন্ধান"} diff --git a/icu4c/source/data/lang/ast.txt b/icu4c/source/data/lang/ast.txt index bc64a2b12462..5d8d5aaa80ec 100644 --- a/icu4c/source/data/lang/ast.txt +++ b/icu4c/source/data/lang/ast.txt @@ -833,13 +833,11 @@ ast{ standard{"formatu monetariu estándar"} } collation{ - big5han{"orde de clasificación chinu tradicional - Big5"} compat{"orde de clasificación anterior, por compatibilidá"} dictionary{"orde de clasificación de diccionariu"} ducet{"orde de clasificación Unicode predetermináu"} emoji{"orde de clasificación Emoji"} eor{"regles d’ordenamientu europees"} - gb2312han{"orde de clasificación chinu simplificáu - GB2312"} phonebook{"orde de clasificación de llista telefónica"} pinyin{"orde de clasificación pinyin"} search{"gueta xeneral"} diff --git a/icu4c/source/data/lang/bg.txt b/icu4c/source/data/lang/bg.txt index 993f2621abac..bb8c27499c3f 100644 --- a/icu4c/source/data/lang/bg.txt +++ b/icu4c/source/data/lang/bg.txt @@ -783,11 +783,9 @@ bg{ tertiary{"Сортиране по диакритични знаци/регистър/ширина"} } collation{ - big5han{"Традиционен китайски (Big5)"} compat{"предишен ред на сортиране, за съвместимост"} dictionary{"Речников ред на сортиране"} ducet{"ред на сортиране в Unicode по подразбиране"} - gb2312han{"Опростен китайски (GB2312)"} phonebook{"Азбучен ред"} phonetic{"Фонетичен ред на сортиране"} pinyin{"Сортиране Пинин"} diff --git a/icu4c/source/data/lang/bn.txt b/icu4c/source/data/lang/bn.txt index 3b05b2fbd133..6314002bd45e 100644 --- a/icu4c/source/data/lang/bn.txt +++ b/icu4c/source/data/lang/bn.txt @@ -795,13 +795,11 @@ bn{ tertiary{"স্বরাঘাত/কেস/প্রস্থ বাছাই করুন"} } collation{ - big5han{"প্রথাগত চীনা সজ্জাক্রম - বিগ৫"} compat{"আগের বাছাইয়ের ক্রম, সামঞ্জস্যের জন্য"} dictionary{"অভিধান বাছাই বিন্যাস"} ducet{"ডিফল্ট ইউনিকোড বাছাই বিন্যাস"} emoji{"ইমোজি বাছাই ক্রম"} eor{"ইউরোপীয় ক্রম বিন্যাসের নিয়মাবলী"} - gb2312han{"সাধারণ চীনা সজ্জাক্রম - জিবি২৩১২"} phonebook{"ফোনবুক সজ্জাক্রম"} phonetic{"ধ্বনি নির্দেশক বাছাই ক্রম"} pinyin{"পিনিন সজ্জাক্রম"} diff --git a/icu4c/source/data/lang/br.txt b/icu4c/source/data/lang/br.txt index e5f5033e08e3..592b0b420329 100644 --- a/icu4c/source/data/lang/br.txt +++ b/icu4c/source/data/lang/br.txt @@ -717,12 +717,10 @@ br{ standard{"furmad moneiz standart"} } collation{ - big5han{"urzh rummañ sinaek hengounel - Big5"} dictionary{"urzh rummañ ar geriadur"} ducet{"urzh rummañ Unicode dre ziouer"} emoji{"urzh rummañ ar fromlunioù"} eor{"reolennoù urzhiañ europat"} - gb2312han{"urzh rummañ sinaek eeunaet - GB2312"} phonebook{"urzh rummañ al levr-pellgomz"} pinyin{"urzh rummañ pinyin"} search{"enklask hollek"} diff --git a/icu4c/source/data/lang/brx.txt b/icu4c/source/data/lang/brx.txt index 81164b5d911a..223925b79e41 100644 --- a/icu4c/source/data/lang/brx.txt +++ b/icu4c/source/data/lang/brx.txt @@ -729,9 +729,7 @@ brx{ standard{"थाखोआरि मुद्रानि नुथाय"} } collation{ - big5han{"पारम्पारिक चीनी वर्गीकरण बीग फ़ाईव"} ducet{"गरहाजिर इउनिकड रान्नायनि फारि"} - gb2312han{"सरलीकृत चीनी वर्गीकरण जीबी2312"} phonebook{"दूरभाष निर्देशिका वर्गीकरण"} pinyin{"पिनयीन वर्गीकरण"} search{"सादारन-जाहोननि नायगिरनाय"} diff --git a/icu4c/source/data/lang/bs.txt b/icu4c/source/data/lang/bs.txt index 744db5345177..53e868882f66 100644 --- a/icu4c/source/data/lang/bs.txt +++ b/icu4c/source/data/lang/bs.txt @@ -866,13 +866,11 @@ bs{ tertiary{"Poredaj po naglascima/veličini/širini"} } collation{ - big5han{"Tradicionalno kinesko sortiranje"} compat{"Prethodno sortiranje radi usklađenosti"} dictionary{"Rječničko sortiranje"} ducet{"standardno Unicode sortiranje"} emoji{"Sortiranje po emoji sličicama"} eor{"Evropska pravila sortiranja"} - gb2312han{"Pojednostavljeno kinesko sortiranje - GB2312"} phonebook{"Sortiranje kao telefonski imenik"} phonetic{"Fonetsko sortiranje"} pinyin{"Pinjin sortiranje"} diff --git a/icu4c/source/data/lang/bs_Cyrl.txt b/icu4c/source/data/lang/bs_Cyrl.txt index 8c3635eea55c..68b8378bf4aa 100644 --- a/icu4c/source/data/lang/bs_Cyrl.txt +++ b/icu4c/source/data/lang/bs_Cyrl.txt @@ -785,10 +785,8 @@ bs_Cyrl{ standard{"стандардни формат валуте"} } collation{ - big5han{"Традиционално кинеско сортирање"} dictionary{"Редослед сортирања у речнику"} ducet{"задани Unicode редослијед сортирања"} - gb2312han{"Поједностављено кинеско сортирање"} phonebook{"Сортирање као телефонски именик"} pinyin{"Пињин сортирање"} reformed{"Реформисани редослед сортирања"} diff --git a/icu4c/source/data/lang/ca.txt b/icu4c/source/data/lang/ca.txt index ad5c7b991962..3e06d6d5b33f 100644 --- a/icu4c/source/data/lang/ca.txt +++ b/icu4c/source/data/lang/ca.txt @@ -892,12 +892,10 @@ ca{ tertiary{"Ordena per accent/majúscules/amplada"} } collation{ - big5han{"ordre del xinès tradicional - Big5"} compat{"ordre anterior, per a compatibilitat"} dictionary{"ordre de diccionari"} ducet{"ordre Unicode predeterminat"} eor{"normes europees d’ordenació"} - gb2312han{"ordre del xinès simplificat - GB2312"} phonebook{"ordre de la guia telefònica"} phonetic{"ordre fonètic"} pinyin{"ordre pinyin"} diff --git a/icu4c/source/data/lang/ccp.txt b/icu4c/source/data/lang/ccp.txt index 4e057fef6e0d..cee78aaaac3e 100644 --- a/icu4c/source/data/lang/ccp.txt +++ b/icu4c/source/data/lang/ccp.txt @@ -745,10 +745,8 @@ ccp{ tertiary{"𑄢𑄳𑄦𑄧/𑄇𑄬𑄥𑄴/𑄃𑄮𑄏𑄢𑄴 𑄝𑄬𑄭𑄣𑄧𑄚"} } collation{ - big5han{"𑄛𑄳𑄢𑄧𑄗𑄉𑄧𑄖𑄧 𑄌𑄩𑄚 𑄥𑄧𑄎𑄴𑄎𑄇𑄳𑄢𑄟𑄴-𑄝𑄨𑄉𑄴𑄻"} dictionary{"𑄇𑄧𑄙𑄖𑄢 𑄝𑄬𑄭𑄣𑄧𑄚𑄢𑄴 𑄚𑄨𑄠𑄮𑄟𑄴"} ducet{"𑄓𑄨𑄜𑄧𑄣𑄴𑄑𑄴 𑄃𑄨𑄃𑄪𑄚𑄨𑄇𑄮𑄓𑄴 𑄝𑄬𑄭𑄣𑄧𑄚"} - gb2312han{"𑄃𑄧𑄎𑄬𑄃𑄧𑄌𑄴 𑄌𑄩𑄚 𑄥𑄎𑄚-𑄎𑄨𑄝𑄨𑄸𑄹𑄷𑄸"} phonebook{"𑄜𑄮𑄚𑄴𑄝𑄪𑄇𑄴 𑄥𑄎𑄚"} phonetic{"𑄢𑄳𑄦𑄧 𑄝𑄬𑄭𑄣𑄧𑄚"} pinyin{"𑄛𑄨𑄚𑄨𑄚𑄴 𑄥𑄎𑄚"} diff --git a/icu4c/source/data/lang/cs.txt b/icu4c/source/data/lang/cs.txt index d1f0ef93c669..8433a72d5146 100644 --- a/icu4c/source/data/lang/cs.txt +++ b/icu4c/source/data/lang/cs.txt @@ -921,12 +921,10 @@ cs{ tertiary{"Řadit akcenty/velká a malá písmena/šířku"} } collation{ - big5han{"Řazení pro tradiční čínštinu – Big5"} compat{"Předchozí řazení, kompatibilita"} dictionary{"Slovníkové řazení"} ducet{"Výchozí řazení Unicode"} eor{"Evropské řazení"} - gb2312han{"Řazení pro zjednodušenou čínštinu – GB2312"} phonebook{"Řazení telefonního seznamu"} phonetic{"Fonetické řazení"} pinyin{"Řazení podle pchin-jinu"} diff --git a/icu4c/source/data/lang/cy.txt b/icu4c/source/data/lang/cy.txt index d37c0cac6184..d9cd6ed486be 100644 --- a/icu4c/source/data/lang/cy.txt +++ b/icu4c/source/data/lang/cy.txt @@ -696,11 +696,9 @@ cy{ standard{"Fformat Arian Safonol"} } collation{ - big5han{"Trefn Traddodiadol Tsieina - Big5"} dictionary{"Trefn Geiriadur"} ducet{"Trefn Rhagosodedig Unicode"} eor{"Rheolau trefnu Ewropeaidd"} - gb2312han{"Trefn Symledig Tsieina - GB2312"} phonebook{"Trefn Llyfr Ffôn"} pinyin{"Trefn Pinyin"} search{"Chwilio at Ddibenion Cyffredinol"} diff --git a/icu4c/source/data/lang/da.txt b/icu4c/source/data/lang/da.txt index 5686c9817fc6..5b7d90fc9e93 100644 --- a/icu4c/source/data/lang/da.txt +++ b/icu4c/source/data/lang/da.txt @@ -842,12 +842,10 @@ da{ tertiary{"Sortér efter accenter/store og små bogstaver/bredde"} } collation{ - big5han{"sorteringsrækkefølge uforkortet kinesisk - Big5"} compat{"tidligere sorteringsrækkefølge, kompatibilitet"} dictionary{"sorteringsrækkefølge for ordbog"} ducet{"Unicode-standardsorteringsrækkefølge"} eor{"europæisk sorteringsrækkefølge"} - gb2312han{"sorteringsrækkefølge forkortet kinesisk - GB2312"} phonebook{"sorteringsrækkefølge i telefonbøger"} phonetic{"fonetisk sorteringsrækkefølge"} pinyin{"pinyin-baseret sorteringsrækkefølge"} diff --git a/icu4c/source/data/lang/de.txt b/icu4c/source/data/lang/de.txt index dae2d31bb4d4..5e13bde761d9 100644 --- a/icu4c/source/data/lang/de.txt +++ b/icu4c/source/data/lang/de.txt @@ -913,12 +913,10 @@ de{ tertiary{"Akzente/Fall/Breite sortieren"} } collation{ - big5han{"Traditionelle chinesische Sortierung (Big5)"} compat{"Vorherige Sortierung, Kompatibilität"} dictionary{"Lexikografische Sortierung"} ducet{"Unicode-Sortierung"} eor{"Europäische Sortierregeln"} - gb2312han{"Vereinfachte chinesische Sortierung (GB2312)"} phonebook{"Telefonbuch-Sortierung"} phonetic{"Phonetische Sortierung"} pinyin{"Pinyin-Sortierung"} diff --git a/icu4c/source/data/lang/ee.txt b/icu4c/source/data/lang/ee.txt index fa90b8615e92..48dc0011cae5 100644 --- a/icu4c/source/data/lang/ee.txt +++ b/icu4c/source/data/lang/ee.txt @@ -247,10 +247,8 @@ ee{ roc{"china repɔbliktɔwo ƒe kalenda tso 1912"} } collation{ - big5han{"blema chinatɔwo ƒe ɖoɖomɔ nu"} dictionary{"nuɖoɖo ɖe nyagɔmeɖegbalẽ ƒe ɖoɖomɔ nu"} ducet{"nuɖoɖo ɖe unicode ƒe ɖoɖo nu"} - gb2312han{"chinagbe yeye ƒe ɖoɖomɔ nu"} phonebook{"fonegbalẽ me ɖoɖomɔ nu"} pinyin{"pinyin ɖoɖomɔ nu"} search{"nudidi hena zazã gbadza"} diff --git a/icu4c/source/data/lang/el.txt b/icu4c/source/data/lang/el.txt index 3c7bf4a9f4f2..393b6b3aa8a9 100644 --- a/icu4c/source/data/lang/el.txt +++ b/icu4c/source/data/lang/el.txt @@ -819,12 +819,10 @@ el{ tertiary{"Ταξινόμηση τόνων/χαρακτήρων διάκρισης/χαρακτήρων μεγάλου μεγέθους"} } collation{ - big5han{"Σειρά ταξινόμησης Παραδοσιακών Κινεζικών - Big5"} compat{"Προηγούμενη σειρά ταξινόμησης, για συμβατότητα"} dictionary{"Σειρά ταξινόμησης λεξικού"} ducet{"Προεπιλεγμένη σειρά ταξινόμησης Unicode"} eor{"Ευρωπαϊκοί κανόνες ταξινόμησης"} - gb2312han{"Σειρά ταξινόμησης Απλοποιημένων Κινεζικών - GB2312"} phonebook{"Σειρά ταξινόμησης τηλεφωνικού καταλόγου"} phonetic{"Φωνητική σειρά ταξινόμησης"} pinyin{"Σειρά ταξινόμησης Πινγίν"} diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index 4069644e6fe9..e20011cd00fc 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -17,14 +17,14 @@ en{ currency{"Currency"} d0{"Transform Destination"} dx{"Dictionary Break Exclusions"} - em{"Emoji Presentation Style"} + em{"Emoji Presentation"} fw{"First day of week"} h0{"Mixed-in"} hc{"Hour Cycle (12 vs 24)"} i0{"Input Method"} k0{"Keyboard"} kv{"Highest Ignored"} - lb{"Line Break Style"} + lb{"Line Break Strictness"} lw{"Line Breaks In Words Setting"} m0{"Transform Rules"} ms{"Measurement System"} @@ -33,7 +33,7 @@ en{ rg{"Region For Supplemental Data"} s0{"Transform Source"} sd{"Region Subdivision"} - ss{"Sentence Break Suppressions Type"} + ss{"Sentence Break After Abbr."} t{"Transform"} t0{"Machine Translated"} timezone{"Time Zone"} @@ -324,6 +324,7 @@ en{ kcg{"Tyap"} kde{"Makonde"} kea{"Kabuverdianu"} + kek{"Qʼeqchiʼ"} ken{"Kenyang"} kfo{"Koro"} kg{"Kongo"} @@ -618,7 +619,7 @@ en{ tig{"Tigre"} tiv{"Tiv"} tk{"Turkmen"} - tkl{"Tokelau"} + tkl{"Tokelauan"} tkr{"Tsakhur"} tl{"Tagalog"} tlh{"Klingon"} @@ -702,6 +703,16 @@ en{ zxx{"No linguistic content"} zza{"Zaza"} } + Languages%core{ + ckb{"Kurdish"} + ku{"Kurdish"} + sdh{"Kurdish"} + } + Languages%extension{ + ckb{"Central"} + ku{"Kurmanji"} + sdh{"Southern"} + } Languages%long{ cr{"Woods Cree"} zh{"Mandarin Chinese"} @@ -728,10 +739,12 @@ en{ en_US{"US English"} } Languages%variant{ + bqi{"Luri Bakhtiari"} ckb{"Kurdish, Sorani"} hi_Latn{"Hinglish"} ky{"Kirghiz"} my{"Myanmar Language"} + pi{"Pāli"} ps{"Pushto"} ug{"Uighur"} } @@ -750,6 +763,7 @@ en{ Bass{"Bassa Vah"} Batk{"Batak"} Beng{"Bangla"} + Berf{"Beria Erfe"} Bhks{"Bhaiksuki"} Blis{"Blissymbols"} Bopo{"Bopomofo"} @@ -762,6 +776,7 @@ en{ Cari{"Carian"} Cham{"Cham"} Cher{"Cherokee"} + Chis{"Chisoi"} Chrs{"Chorasmian"} Cirt{"Cirth"} Copt{"Coptic"} @@ -894,6 +909,7 @@ en{ Shaw{"Shavian"} Shrd{"Sharada"} Sidd{"Siddham"} + Sidt{"Sidetic"} Sind{"Khudawadi"} Sinh{"Sinhala"} Sogd{"Sogdian"} @@ -914,6 +930,7 @@ en{ Taml{"Tamil"} Tang{"Tangut"} Tavt{"Tai Viet"} + Tayo{"Tai Yo"} Telu{"Telugu"} Teng{"Tengwar"} Tfng{"Tifinagh"} @@ -924,6 +941,7 @@ en{ Tirh{"Tirhuta"} Tnsa{"Tangsa"} Todr{"Todhri"} + Tols{"Tolong Siki"} Toto{"Toto"} Tutg{"Tulu-Tigalari"} Ugar{"Ugaritic"} @@ -974,15 +992,37 @@ en{ islamic-rgsa{"Hijri Calendar (Saudi Arabia, sighting)"} islamic-tbla{"Hijri Calendar (tabular, astronomical epoch)"} islamic-umalqura{"Hijri Calendar (Umm al-Qura)"} - iso8601{"ISO-8601 Calendar"} + iso8601{"Gregorian Calendar (Year First)"} japanese{"Japanese Calendar"} persian{"Persian Calendar"} roc{"Minguo Calendar"} } + calendar%core{ + buddhist{"Buddhist"} + chinese{"Chinese"} + coptic{"Coptic"} + dangi{"Dangi"} + ethiopic{"Ethiopic"} + ethiopic-amete-alem{"Ethiopic Amete Alem"} + gregorian{"Gregorian"} + hebrew{"Hebrew"} + indian{"Indian National"} + islamic{"Hijri"} + islamic-civil{"Hijri (tabular, civil epoch)"} + islamic-tbla{"Hijri (tabular, astronomical epoch)"} + islamic-umalqura{"Hijri (Umm al-Qura)"} + japanese{"Japanese"} + persian{"Persian"} + roc{"Minguo"} + } cf{ account{"Accounting Currency Format"} standard{"Standard Currency Format"} } + cf%core{ + account{"Accounting"} + standard{"Standard"} + } colAlternate{ non-ignorable{"Sort Symbols"} shifted{"Sort Ignoring Symbols"} @@ -1023,13 +1063,11 @@ en{ tertiary{"Sort Accents/Case/Width"} } collation{ - big5han{"Traditional Chinese Sort Order - Big5"} compat{"Previous Sort Order, for compatibility"} dictionary{"Dictionary Sort Order"} ducet{"Default Unicode Sort Order"} emoji{"Emoji Sort Order"} eor{"European Ordering Rules"} - gb2312han{"Simplified Chinese Sort Order - GB2312"} phonebook{"Phonebook Sort Order"} phonetic{"Phonetic Sort Order"} pinyin{"Pinyin Sort Order"} @@ -1041,6 +1079,20 @@ en{ unihan{"Radical-Stroke Sort Order"} zhuyin{"Zhuyin Sort Order"} } + collation%core{ + compat{"Compatibility"} + dictionary{"Dictionary"} + ducet{"Default Unicode"} + phonebook{"Phonebook"} + phonetic{"Phonetic"} + pinyin{"Pinyin"} + search{"Search"} + standard{"Standard"} + stroke{"Stroke"} + traditional{"Traditional"} + unihan{"Radical-Stroke"} + zhuyin{"Zhuyin"} + } d0{ accents{"To Accented Characters From ASCII Sequence"} ascii{"To ASCII"} @@ -1071,6 +1123,11 @@ en{ emoji{"Prefer Emoji Presentation For Emoji Characters"} text{"Prefer Text Presentation For Emoji Characters"} } + em%core{ + default{"Default"} + emoji{"Emoji"} + text{"Text"} + } fw{ fri{"First Day of Week Is Friday"} mon{"First Day of Week Is Monday"} @@ -1089,6 +1146,12 @@ en{ h23{"24 Hour System (0–23)"} h24{"24 Hour System (1–24)"} } + hc%core{ + h11{"12 (0–11)"} + h12{"12 (1–12)"} + h23{"24 (0–23)"} + h24{"24 (1–24)"} + } i0{ handwrit{"Handwriting Input Method"} pinyin{"Pinyin Input Method"} @@ -1137,12 +1200,23 @@ en{ normal{"Normal Line Break Style"} strict{"Strict Line Break Style"} } + lb%core{ + loose{"Loose"} + normal{"Normal"} + strict{"Strict"} + } lw{ breakall{"Allow Line Breaks In All Words"} keepall{"Prevent Line Breaks In All Words"} normal{"Normal Line Breaks For Words"} phrase{"Prevent Line Breaks In Phrases"} } + lw%core{ + breakall{"Break all"} + keepall{"Keep all"} + normal{"Normal"} + phrase{"Keep in phrases"} + } m0{ aethiopi{"Encylopedia Aethiopica Transliteration"} alaloc{"US ALA-LOC Transliteration"} @@ -1185,6 +1259,11 @@ en{ uksystem{"Imperial Measurement System"} ussystem{"US Measurement System"} } + ms%core{ + metric{"Metric"} + uksystem{"UK"} + ussystem{"US"} + } mu{ celsius{"Celsius"} fahrenhe{"Fahrenheit"} @@ -1304,6 +1383,10 @@ en{ none{"Sentence Breaks Without Abbreviation Handling"} standard{"Suppress Sentence Breaks After Standard Abbreviations"} } + ss%core{ + none{"Off"} + standard{"On"} + } t0{ und{"Unspecified Machine Translation"} } @@ -1316,6 +1399,11 @@ en{ arabext{"X Arabic-Indic Digits"} } } + Types%variant{ + calendar{ + iso8601{"ISO 8601 Order"} + } + } Variants{ 1606NICT{"Late Middle French to 1606"} 1694ACAD{"Early Modern French"} diff --git a/icu4c/source/data/lang/es.txt b/icu4c/source/data/lang/es.txt index bf05ad0abba8..89b2f2903704 100644 --- a/icu4c/source/data/lang/es.txt +++ b/icu4c/source/data/lang/es.txt @@ -810,12 +810,10 @@ es{ tertiary{"Ordenar acentos/mayúsculas y minúsculas/ancho"} } collation{ - big5han{"orden del chino tradicional - Big5"} compat{"orden anterior, para compatibilidad"} dictionary{"orden de diccionario"} ducet{"orden predeterminado de Unicode"} eor{"reglas de ordenación europeas"} - gb2312han{"orden del chino simplificado - GB2312"} phonebook{"orden de listín telefónico"} phonetic{"orden fonético"} pinyin{"orden pinyin"} diff --git a/icu4c/source/data/lang/et.txt b/icu4c/source/data/lang/et.txt index bd11a47629ae..d552a91ea37d 100644 --- a/icu4c/source/data/lang/et.txt +++ b/icu4c/source/data/lang/et.txt @@ -955,13 +955,11 @@ et{ tertiary{"järjesta diakriitikud, algustähed ja laius"} } collation{ - big5han{"hiina traditsiooniline sortimisjärjestus (Big5)"} compat{"varasem sortimisjärjestus (ühilduvuse jaoks)"} dictionary{"sõnastiku sortimisjärjestus"} ducet{"Unicode’i vaikejärjestus"} emoji{"emoji sortimisjärjestus"} eor{"Euroopa järjestusreeglid"} - gb2312han{"hiina lihtsustatud sortimisjärjestus (GB2312)"} phonebook{"telefoniraamatu sortimisjärjestus"} phonetic{"foneetiline sortimisjärjestus"} pinyin{"pinyin’i sortimisjärjestus"} diff --git a/icu4c/source/data/lang/eu.txt b/icu4c/source/data/lang/eu.txt index 7d8fa1604bd6..2fa76a5783b7 100644 --- a/icu4c/source/data/lang/eu.txt +++ b/icu4c/source/data/lang/eu.txt @@ -740,13 +740,11 @@ eu{ tertiary{"Ordenatu azentuak / maiuskula eta minuskulak / zabalera"} } collation{ - big5han{"Txinera tradizionalaren alfabetoa-Big5"} compat{"Aurreko hurrenkera, bateragarria izateko"} dictionary{"Hurrenkera alfabetikoa"} ducet{"Unicode hurrenkera lehenetsia"} emoji{"Emojien hurrenkera"} eor{"Europako ordenatzeko arauak"} - gb2312han{"Txinera sinplifikatuaren alfabetoa -GB2312"} phonebook{"Telefonoen zerrenda"} phonetic{"Ordenatzeko irizpide fonetikoa"} pinyin{"Pinyin hurrenkera"} diff --git a/icu4c/source/data/lang/fa.txt b/icu4c/source/data/lang/fa.txt index 782169155dc7..3271f3a2d12b 100644 --- a/icu4c/source/data/lang/fa.txt +++ b/icu4c/source/data/lang/fa.txt @@ -814,13 +814,11 @@ fa{ tertiary{"مرتب‌سازی بر اساس آکسان/اندازه حرف/عرض"} } collation{ - big5han{"ترتیب چینی سنتی - Big5"} compat{"ترتیب پیشین، برای سازگاری"} dictionary{"ترتیب فرهنگ لغت"} ducet{"ترتیب پیش‌فرض یونی‌کد"} emoji{"ترتیب ایموجی"} eor{"قوانین ترتیب اروپایی"} - gb2312han{"ترتیب چینی ساده‌شده - GB2312"} phonebook{"ترتیب دفتر تلفن"} phonetic{"مرتب کردن بر اساس آوایی"} pinyin{"ترتیب پین‌یین"} diff --git a/icu4c/source/data/lang/fi.txt b/icu4c/source/data/lang/fi.txt index f3085a6905c9..22443469ffef 100644 --- a/icu4c/source/data/lang/fi.txt +++ b/icu4c/source/data/lang/fi.txt @@ -980,13 +980,11 @@ fi{ tertiary{"painomerkit ja aakkoslajit tai merkkileveydet huomioiva lajittelu"} } collation{ - big5han{"perinteinen kiinalainen järjestys Big5"} compat{"aiempi lajittelujärjestys yhteensopivuutta varten"} dictionary{"sanakirjajärjestys"} ducet{"Unicoden oletusjärjestys"} emoji{"emojien lajittelujärjestys"} eor{"yleiseurooppalainen lajittelujärjestys"} - gb2312han{"yksinkertaistettu kiinalainen järjestys GB2312"} phonebook{"puhelinluettelojärjestys"} phonetic{"äänteellinen järjestys"} pinyin{"pinyin-järjestys"} diff --git a/icu4c/source/data/lang/fil.txt b/icu4c/source/data/lang/fil.txt index 534bf9d7d07d..5e3c491372db 100644 --- a/icu4c/source/data/lang/fil.txt +++ b/icu4c/source/data/lang/fil.txt @@ -622,13 +622,11 @@ fil{ tertiary{"Pag-uri-uriin ang Mga Accent/Case/Lapad"} } collation{ - big5han{"Pagkakasunod-sunod ng Pag-uuri ng Tradisyunal na Chinese - Big5"} compat{"Nakaraang Pagkakasunud-sunod ng Pag-uuri, para sa compatibility"} dictionary{"Pagkakasunud-sunod ng Pag-uuri ng Diksyunaryo"} ducet{"Default na Pagkakasunud-sunod ng Ayos ng Unicode"} emoji{"Pagkakasunud-sunod ng Pag-uuri ng Emoji"} eor{"Mga Tuntunin ng European na Pagkakasunud-sunod"} - gb2312han{"Pagkakasunud-sunod ng Pag-uuri ng Pinasimpleng Chinese - GB2312"} phonebook{"Pagkakasunud-sunod ng Pag-uuri ng Phonebook"} phonetic{"Phonetic na Ayos ng Pag-uuri-uri"} pinyin{"Pagkakasunud-sunod ng Pag-uuri ng Pinyin"} diff --git a/icu4c/source/data/lang/fr.txt b/icu4c/source/data/lang/fr.txt index 05048988bdff..bc7eea7e1779 100644 --- a/icu4c/source/data/lang/fr.txt +++ b/icu4c/source/data/lang/fr.txt @@ -906,12 +906,10 @@ fr{ } } collation{ - big5han{"ordre chinois traditionnel - Big5"} compat{"ancien ordre de tri pour compatibilité"} dictionary{"ordre du dictionnaire"} ducet{"ordre de tri Unicode par défaut"} eor{"règles de classement européen"} - gb2312han{"ordre chinois simplifié - GB2312"} phonebook{"ordre de l’annuaire"} phonetic{"ordre de tri phonétique"} pinyin{"ordre pinyin"} diff --git a/icu4c/source/data/lang/fr_CA.txt b/icu4c/source/data/lang/fr_CA.txt index 6f6a0c890df6..169d517fa108 100644 --- a/icu4c/source/data/lang/fr_CA.txt +++ b/icu4c/source/data/lang/fr_CA.txt @@ -98,10 +98,8 @@ fr_CA{ } Types{ collation{ - big5han{"ordre de tri chinois traditionnel - Big5"} dictionary{"ordre de tri du dictionnaire"} eor{"ordre multilingue européen"} - gb2312han{"ordre de tri chinois simplifié - GB2312"} phonebook{"ordre de tri de l’annuaire"} pinyin{"ordre de tri pinyin"} searchjl{"Rechercher par consonne initiale en hangeul"} diff --git a/icu4c/source/data/lang/fur.txt b/icu4c/source/data/lang/fur.txt index da29b021f677..d0fc28424250 100644 --- a/icu4c/source/data/lang/fur.txt +++ b/icu4c/source/data/lang/fur.txt @@ -268,9 +268,7 @@ fur{ roc{"calendari de Republiche di Cine"} } collation{ - big5han{"ordin cinês tradizionâl - Big5"} ducet{"ordenament predeterminât Unicode"} - gb2312han{"ordin cinês semplificât - GB2312"} phonebook{"ordin elenc telefonic"} pinyin{"ordin pinyin"} search{"ricercje par fins gjenerâi"} diff --git a/icu4c/source/data/lang/fy.txt b/icu4c/source/data/lang/fy.txt index 1842ce90226a..ce8a46b6cb50 100644 --- a/icu4c/source/data/lang/fy.txt +++ b/icu4c/source/data/lang/fy.txt @@ -752,10 +752,8 @@ fy{ tertiary{"sortearje neffens aksinten/haadletterbrûkme/breedte"} } collation{ - big5han{"Tradisjonele-Sineeske soartear oarder - Big5"} dictionary{"Wurdboeksortearfolgorde"} ducet{"Standert Unikoade-sortearfolgorde"} - gb2312han{"Ferienfâldigde-Sineeske sortearfolgorde - GB2312"} phonebook{"Telefoanboeksortearfolgorde"} phonetic{"Fonetyske sortearfolgorde"} pinyin{"Pinyinvolgorde"} diff --git a/icu4c/source/data/lang/ga.txt b/icu4c/source/data/lang/ga.txt index ff9b600de9f2..c3cc668beded 100644 --- a/icu4c/source/data/lang/ga.txt +++ b/icu4c/source/data/lang/ga.txt @@ -711,13 +711,11 @@ ga{ standard{"Formáid Airgeadra Caighdeánach"} } collation{ - big5han{"Ord sórtála Síneach traidisiúnta - Big5"} compat{"Ord Sórtála Roimhe Seo, ar son na comhoiriúnachta"} dictionary{"Ord Sórtála Foclóirí"} ducet{"Ord Sórtála Réamhshocraithe Unicode"} emoji{"Ord Sórtála Emoji"} eor{"Rialacha Ordaithe Eorpacha"} - gb2312han{"Ord sórtála Síneach simplithe - GB 2312"} phonebook{"Ord sórtála an eolaire teileafóin"} pinyin{"Ord sórtála pinyin"} search{"Cuardach Ilfhóinteach"} diff --git a/icu4c/source/data/lang/gd.txt b/icu4c/source/data/lang/gd.txt index 8f1c68ac1edb..ae6dc0474edd 100644 --- a/icu4c/source/data/lang/gd.txt +++ b/icu4c/source/data/lang/gd.txt @@ -901,13 +901,11 @@ gd{ standard{"Fòrmat stannardach an airgeadra"} } collation{ - big5han{"Òrdugh seòrsachaidh na Sìnise Tradaiseanta - Big5"} compat{"Òrdugh seòrsachaidh roimhe a chum co-chòrdalachd"} dictionary{"Òrdugh seòrsachaidh an fhaclair"} ducet{"Òrdugh seòrsachaidh Unicode bunaiteach"} emoji{"Òrdugh seòrsachaidh Emoji"} eor{"Òrdugh seòrsachaidh Eòrpach"} - gb2312han{"Òrdugh seòrsachaidh na Sìnise Simplichte - GB2312"} phonebook{"Òrdugh seòrsachaidh nan leabhraichean-fòn"} pinyin{"Òrdugh seòrsachaidh Pinyin"} search{"Lorg coitcheann"} diff --git a/icu4c/source/data/lang/gl.txt b/icu4c/source/data/lang/gl.txt index 1a4bc315630e..78dae0a126ba 100644 --- a/icu4c/source/data/lang/gl.txt +++ b/icu4c/source/data/lang/gl.txt @@ -625,10 +625,8 @@ gl{ tertiary{"Clasificar acentos/maiúsculas e minúsculas/ancho"} } collation{ - big5han{"Orde de clasificación chinesa tradicional - Big5"} dictionary{"Criterio de ordenación do dicionario"} ducet{"criterio de ordenación Unicode predeterminado"} - gb2312han{"orde de clasifcación chinesa simplificada - GB2312"} phonebook{"orde de clasificación da guía telefónica"} phonetic{"Orde de clasificación fonética"} pinyin{"Orde de clasificación pinyin"} diff --git a/icu4c/source/data/lang/gsw.txt b/icu4c/source/data/lang/gsw.txt index 586320d644cd..b6bd7017ae0a 100644 --- a/icu4c/source/data/lang/gsw.txt +++ b/icu4c/source/data/lang/gsw.txt @@ -580,8 +580,6 @@ gsw{ roc{"Kaländer vor Republik Chiina"} } collation{ - big5han{"Tradizionells Chineesisch - Big5"} - gb2312han{"Veräifachts Chineesisch - GB2312"} phonebook{"Telifonbuech-Sortiirregle"} pinyin{"Pinyin-Sortiirregle"} stroke{"Strichfolg"} diff --git a/icu4c/source/data/lang/gu.txt b/icu4c/source/data/lang/gu.txt index cd0d8b752317..f8ca0d8ec19c 100644 --- a/icu4c/source/data/lang/gu.txt +++ b/icu4c/source/data/lang/gu.txt @@ -815,12 +815,10 @@ gu{ tertiary{"ઉચ્ચારો/કેસ/પહોળાઈ સૉર્ટ કરો"} } collation{ - big5han{"પરંપરાગત ચાઇનિઝ સોર્ટ ક્રમબદ્ધ"} compat{"અગાઉનો સોર્ટ ક્રમ, સુસંગતતા માટે"} dictionary{"શબ્દકોશ અનુક્મ"} ducet{"ડિફોલ્ટ યુનિકોડ સૉર્ટ ક્રમ"} eor{"યુરોપીયન ક્રમ આપવાના નિયમો"} - gb2312han{"સરળીકૃત ચાઇનીઝ સૉર્ટ ક્રમ - GB2312"} phonebook{"ફોનબુક અનુક્મ"} phonetic{"ધ્વન્યાત્મક સૉર્ટ ક્રમ"} pinyin{"પિનયિન અનુક્મ"} diff --git a/icu4c/source/data/lang/he.txt b/icu4c/source/data/lang/he.txt index edfc45cf62ee..ae67384f25a5 100644 --- a/icu4c/source/data/lang/he.txt +++ b/icu4c/source/data/lang/he.txt @@ -848,13 +848,11 @@ he{ tertiary{"מיין הטעמות/רישיות/רוחב"} } collation{ - big5han{"מיון סינית מסורתית"} compat{"סדר מיון קודם, עבור תאימות"} dictionary{"סדר מיון במילון"} ducet{"סדר מיון Unicode המוגדר כברירת מחדל"} emoji{"סדר מיון אימוג׳י"} eor{"חוקי סדר אירופיים"} - gb2312han{"סדר מיון סיני פשוט - GB2312"} phonebook{"מיון ספר טלפונים"} phonetic{"סדר מיון פונטי"} pinyin{"מיון פיניין"} diff --git a/icu4c/source/data/lang/hi.txt b/icu4c/source/data/lang/hi.txt index c9095d2692c3..f344925a199e 100644 --- a/icu4c/source/data/lang/hi.txt +++ b/icu4c/source/data/lang/hi.txt @@ -809,12 +809,10 @@ hi{ tertiary{"उच्‍चारणों/केस/चौड़ाई क्रमित करें"} } collation{ - big5han{"पारम्परिक चीनी वर्गीकरण क्रम"} compat{"संगतता के लिए पिछला वर्गीकरण क्रम"} dictionary{"शब्दकोश वर्गीकरण क्रम"} ducet{"डिफ़ॉल्ट यूनिकोड वर्गीकरण क्रम"} eor{"यूरोपीय क्रमण नियम"} - gb2312han{"सरलीकृत चीनी वर्गीकरण क्रम"} phonebook{"फ़ोनबुक वर्गीकरण क्रम"} phonetic{"ध्वन्यात्मक वर्गीकरण क्रम"} pinyin{"पिनयिन वर्गीकरण क्रम"} diff --git a/icu4c/source/data/lang/hr.txt b/icu4c/source/data/lang/hr.txt index f0a48c7e021a..9e00d8499372 100644 --- a/icu4c/source/data/lang/hr.txt +++ b/icu4c/source/data/lang/hr.txt @@ -848,12 +848,10 @@ hr{ tertiary{"Poredaj po naglascima/veličini/širini"} } collation{ - big5han{"razvrstavanje prema tradicionalnom kineskom - Big5"} compat{"prethodni redoslijed razvrstavanja, radi kompatibilnosti"} dictionary{"rječničko razvrstavanje"} ducet{"standardno unicode razvrstavanje"} eor{"Europska pravila razvrstavanja"} - gb2312han{"razvrstavanje prema pojednostavljenom kineskom - GB2312"} phonebook{"razvrstavanje po abecedi"} phonetic{"fonetsko razvrstavanje"} pinyin{"pinyin razvrstavanje"} diff --git a/icu4c/source/data/lang/hu.txt b/icu4c/source/data/lang/hu.txt index c18d476e70eb..641d18120135 100644 --- a/icu4c/source/data/lang/hu.txt +++ b/icu4c/source/data/lang/hu.txt @@ -823,13 +823,11 @@ hu{ tertiary{"Ékezetek/kisbetű-nagybetű/szélesség rendezése"} } collation{ - big5han{"Hagyományos kínai sorrend - Big5"} compat{"Előző rendezési sorrend a kompatibilitás érdekében"} dictionary{"Szótári rendezési sorrend"} ducet{"Alapértelmezett Unicode rendezési sorrend"} emoji{"Emodzsi rendezési sorrend"} eor{"Európai rendezési szabályok"} - gb2312han{"Egyszerűsített kínai sorrend - GB2312"} phonebook{"Telefonkönyv sorrend"} phonetic{"Fonetikus rendezési sorrend"} pinyin{"Pinyin sorrend"} diff --git a/icu4c/source/data/lang/ia.txt b/icu4c/source/data/lang/ia.txt index 963ca0b1c70e..14a15d617027 100644 --- a/icu4c/source/data/lang/ia.txt +++ b/icu4c/source/data/lang/ia.txt @@ -578,13 +578,11 @@ ia{ standard{"formato de moneta standard"} } collation{ - big5han{"ordinamento traditional chinese - Big5"} compat{"ordinamento previe, pro compatibilitate"} dictionary{"ordinamento de dictionario"} ducet{"ordinamento Unicode predefinite"} emoji{"ordinamento de emoji"} eor{"regulas europee de ordinamento"} - gb2312han{"ordinamento chinese simplificate - GB2312"} phonebook{"ordinamento de annuario telephonic"} pinyin{"ordinamento pinyin"} search{"recerca generic"} diff --git a/icu4c/source/data/lang/id.txt b/icu4c/source/data/lang/id.txt index 4d61360a014a..53c6d8b69b6b 100644 --- a/icu4c/source/data/lang/id.txt +++ b/icu4c/source/data/lang/id.txt @@ -885,13 +885,11 @@ id{ tertiary{"Sortir Aksen/Ukuran Huruf/Lebar"} } collation{ - big5han{"Aturan Pengurutan Tionghoa Tradisional - Big5"} compat{"Aturan Pengurutan Sebelumnya, untuk kompatibilitas"} dictionary{"Aturan Pengurutan Kamus"} ducet{"Aturan Pengurutan Unicode Default"} emoji{"Urutan Sortir Emoji"} eor{"Aturan Pengurutan Eropa"} - gb2312han{"Aturan Pengurutan Tionghoa (Sederhana) - GB2312"} phonebook{"Aturan Pengurutan Buku Telepon"} phonetic{"Aturan Pengurutan Fonetik"} pinyin{"Aturan Pengurutan Pinyin"} diff --git a/icu4c/source/data/lang/is.txt b/icu4c/source/data/lang/is.txt index fdeb63ccd667..a5489b3978a2 100644 --- a/icu4c/source/data/lang/is.txt +++ b/icu4c/source/data/lang/is.txt @@ -730,12 +730,10 @@ is{ tertiary{"Raða áherslum/hástaf eða lágstaf/breidd"} } collation{ - big5han{"hefðbundin kínversk röðun - Big5"} compat{"Fyrri röðun, til samræmis"} dictionary{"Orðabókarröð"} ducet{"Sjálfgefin Unicode-röðun"} eor{"Evrópskar reglur um röðun"} - gb2312han{"einfölduð kínversk röðun - GB2312"} phonebook{"Símaskráarröðun"} phonetic{"Hljóðfræðileg röð"} pinyin{"Pinyin-röðun"} diff --git a/icu4c/source/data/lang/it.txt b/icu4c/source/data/lang/it.txt index 3391cf07d79d..09fe47b21278 100644 --- a/icu4c/source/data/lang/it.txt +++ b/icu4c/source/data/lang/it.txt @@ -919,11 +919,9 @@ it{ tertiary{"Ordina accenti/lettere/larghezza"} } collation{ - big5han{"Ordinamento Cinese tradizionale - Big5"} compat{"Ordinamento precedente, per compatibilità"} dictionary{"Ordinamento dizionario"} ducet{"Ordinamento Unicode predefinito"} - gb2312han{"Ordinamento Cinese semplificato - GB2312"} phonebook{"Ordinamento Elenco telefonico"} phonetic{"Ordinamento fonetico"} pinyin{"Ordinamento pinyin"} diff --git a/icu4c/source/data/lang/ja.txt b/icu4c/source/data/lang/ja.txt index 79d2c1f6bf00..7c82756e24fa 100644 --- a/icu4c/source/data/lang/ja.txt +++ b/icu4c/source/data/lang/ja.txt @@ -926,12 +926,10 @@ ja{ tertiary{"アクセント/大文字小文字/全角半角で並べ替え"} } collation{ - big5han{"繁体字中国語順(Big5)"} compat{"以前の順序（互換性）"} dictionary{"辞書順"} ducet{"ユニコード照合順"} eor{"ヨーロッパ言語文字の並べ替え規則"} - gb2312han{"簡体字中国語順(GB2312)"} phonebook{"電話帳順"} phonetic{"音声順による並べ替え"} pinyin{"ピンイン順"} diff --git a/icu4c/source/data/lang/ka.txt b/icu4c/source/data/lang/ka.txt index e1b6f1928aaf..6f762a7b6461 100644 --- a/icu4c/source/data/lang/ka.txt +++ b/icu4c/source/data/lang/ka.txt @@ -739,9 +739,7 @@ ka{ standard{"ვალუტის სტანდარტული ფორმატი"} } collation{ - big5han{"ტრადიციული ჩინური"} ducet{"უნიკოდის ნაგულისხმევი დახარისხების თანმიმდევრობა"} - gb2312han{"გამარტივებული ჩინური"} search{"ზოგადი დანიშნულების ძიება"} standard{"სტანდარტული დახარისხების თანმიმდევრობა"} traditional{"ტრადიციული"} diff --git a/icu4c/source/data/lang/kgp.txt b/icu4c/source/data/lang/kgp.txt index ce24d597977b..6bf7cc30539d 100644 --- a/icu4c/source/data/lang/kgp.txt +++ b/icu4c/source/data/lang/kgp.txt @@ -757,12 +757,10 @@ kgp{ tertiary{"Ti kri vir/vẽnhrá mág mré vẽnhrá kẽsir/tãpér to kuprẽg"} } collation{ - big5han{"Sĩnẽj Vỹsa ke to ke pẽ - Big5"} compat{"Ẽgno tá jẽnẽ já kỹ ta ki já"} dictionary{"Vẽnhrá Nỹtĩj-fẽ nỹtĩ há"} ducet{"Unicode to ke pẽ"} eor{"Orópa tá vẽnhvin han to ke"} - gb2312han{"Sĩnẽj ke to ke (sĩmpri há) - GB2312"} phonebook{"Terefonĩ Risita to ke"} phonetic{"Fonẽtika to ke kuprãg"} pinyin{"Pin-yin to nỹtĩ"} diff --git a/icu4c/source/data/lang/kk.txt b/icu4c/source/data/lang/kk.txt index 06aa82387c9c..e142b50060c0 100644 --- a/icu4c/source/data/lang/kk.txt +++ b/icu4c/source/data/lang/kk.txt @@ -681,13 +681,11 @@ kk{ standard{"Стандартты валюта форматы"} } collation{ - big5han{"Дәстүрлі қытай тілінің сұрыптау реті - Big5"} compat{"Сәйкестікке арналған алдыңғы сұрыптау реті"} dictionary{"Сөздік бойынша сұрыптау реті"} ducet{"Әдепкі уникод сұрыптау реті"} emoji{"Эмоджи сұрыптау реті"} eor{"Еуропалық реттеу ережелері"} - gb2312han{"Жеңілдетілген қытай тілінің сұрыптау реті - GB2312"} phonebook{"Телефон кітапшасының сұрыптау реті"} pinyin{"Пиньинь сұрыптау реті"} reformed{"Қайта қарастырылған сұрыптау реті"} diff --git a/icu4c/source/data/lang/kn.txt b/icu4c/source/data/lang/kn.txt index 1d74be1e1534..77ed7d698447 100644 --- a/icu4c/source/data/lang/kn.txt +++ b/icu4c/source/data/lang/kn.txt @@ -808,12 +808,10 @@ kn{ tertiary{"ಉಚ್ಛಾರಣೆ/ಕೇಸ್/ಅಳತೆ ವಿಂಗಡಿಸಿ"} } collation{ - big5han{"ಸಾಂಪ್ರದಾಯಿಕ ಚೀನಾದ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ - ದೊಡ್ಡ ಐದು"} compat{"ಹೊಂದಾಣಿಕೆಯ ಸಲುವಾಗಿ ಹಿಂದಿನ ವಿಂಗಡಣಾ ಕ್ರಮ"} dictionary{"ಡಿಕ್ಷನರಿ ಅನುಕ್ರಮ ವಿನ್ಯಾಸ"} ducet{"ಡೀಫಾಲ್ಟ್ ಯೂನಿಕೋಡ್ ವಿಂಗಡಣೆ ಕ್ರಮ"} eor{"ಯುರೋಪಿನ ಅನುಕ್ರಮ ನಿಯಮಗಳು"} - gb2312han{"ಸರಳೀಕೃತ ಚೈನೀಸ್ ವಿಂಗಡಣೆ ಕ್ರಮ - GB2312"} phonebook{"ಫೋನ್‌ಬುಕ್ ವಿಂಗಡಣೆ ಕ್ರಮ"} phonetic{"ಉಚ್ಛಾರಣಾನುರೂಪವಾಗಿ ವಿಂಗಡಣೆ ಕ್ರಮ"} pinyin{"ಪಿನ್‌ಯಿನ್ ವಿಂಗಡಣೆ ಕ್ರಮ"} diff --git a/icu4c/source/data/lang/ko.txt b/icu4c/source/data/lang/ko.txt index a36d96c32463..1298129e9c63 100644 --- a/icu4c/source/data/lang/ko.txt +++ b/icu4c/source/data/lang/ko.txt @@ -853,12 +853,10 @@ ko{ tertiary{"악센트/대소문자/전반각 정렬"} } collation{ - big5han{"중국어 번체 정렬 순서 (Big5)"} compat{"호환성을 위해 이전 정렬 순서"} dictionary{"사전 정렬순"} ducet{"기본 유니코드 정렬 순서"} eor{"유럽 정렬 규칙"} - gb2312han{"중국어 간체 정렬 순서 (GB2312)"} phonebook{"전화번호부순"} phonetic{"소리나는 대로 정렬 순서"} pinyin{"병음순"} diff --git a/icu4c/source/data/lang/ks.txt b/icu4c/source/data/lang/ks.txt index cff6a47195fd..47d16f35c46b 100644 --- a/icu4c/source/data/lang/ks.txt +++ b/icu4c/source/data/lang/ks.txt @@ -607,7 +607,6 @@ ks{ roc{"جموٗریٲتی چیٖنی کیلَنڑَر"} } collation{ - big5han{"رؠوٲتی چیٖنی تِرتیٖب"} phonebook{"فون بُک تَرتیٖب"} pinyin{"آسان بَناونہٕ آمُت چیٖنی پیٖنیَن تَرتیٖب"} standard{"معیٲری ترتیٖب آڈر"} diff --git a/icu4c/source/data/lang/ksh.txt b/icu4c/source/data/lang/ksh.txt index aefcd6ac9b3f..fa88a5928cf5 100644 --- a/icu4c/source/data/lang/ksh.txt +++ b/icu4c/source/data/lang/ksh.txt @@ -422,10 +422,8 @@ ksh{ roc{"rotschineesesche Kaländer"} } collation{ - big5han{"zoteert nohm tradizjonäll schineesesch Big5"} dictionary{"zotehrt wi em Wööterbohch"} ducet{"standattmähßesch zotehrt nohm Unicode"} - gb2312han{"zoteert nohm eijfacher schineesesch GB2312"} phonebook{"zoteert wi em Tollefoonbooch"} pinyin{"zoteert noh de Pinjin Ömschreff vum Schineesesch"} search{"Söhke"} diff --git a/icu4c/source/data/brkitr/sv.txt b/icu4c/source/data/lang/ku_Latn.txt similarity index 94% rename from icu4c/source/data/brkitr/sv.txt rename to icu4c/source/data/lang/ku_Latn.txt index 17a7556149b5..9db3fb301c7a 100644 --- a/icu4c/source/data/brkitr/sv.txt +++ b/icu4c/source/data/lang/ku_Latn.txt @@ -1,5 +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/ -sv{ +ku_Latn{ } diff --git a/icu4c/source/data/lang/ku_Latn_SY.txt b/icu4c/source/data/lang/ku_Latn_SY.txt new file mode 100644 index 000000000000..eb494ab3895e --- /dev/null +++ b/icu4c/source/data/lang/ku_Latn_SY.txt @@ -0,0 +1,9 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/ +/** + * generated alias target + */ +ku_Latn_SY{ + ___{""} +} diff --git a/icu4c/source/data/lang/ku_SY.txt b/icu4c/source/data/lang/ku_SY.txt new file mode 100644 index 000000000000..5e528bebbb51 --- /dev/null +++ b/icu4c/source/data/lang/ku_SY.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/ +ku_SY{ + "%%ALIAS"{"ku_Latn_SY"} +} diff --git a/icu4c/source/data/lang/lb.txt b/icu4c/source/data/lang/lb.txt index 71d35eb5265e..403a8642ad19 100644 --- a/icu4c/source/data/lang/lb.txt +++ b/icu4c/source/data/lang/lb.txt @@ -762,11 +762,9 @@ lb{ roc{"Kalenner vun der Republik China"} } collation{ - big5han{"Traditionellt Chinesesch - Big5"} dictionary{"Lexikographesch Zortéierreiefolleg"} ducet{"Unicode-Zortéierung"} eor{"Europäesch Zortéierregelen"} - gb2312han{"Vereinfacht Chinesesch - GB2312"} phonebook{"Telefonsbuch-Zortéierung"} pinyin{"Pinyin-Zortéierregelen"} search{"Allgemeng Sich"} diff --git a/icu4c/source/data/lang/lo.txt b/icu4c/source/data/lang/lo.txt index 9833a4f99838..e5dc87b5d87c 100644 --- a/icu4c/source/data/lang/lo.txt +++ b/icu4c/source/data/lang/lo.txt @@ -791,10 +791,8 @@ lo{ standard{"ຮູບແບບສະກຸນເງິນມາດຕະຖານ"} } collation{ - big5han{"ລຽງຕາມອັກສອນຈີນດັ້ງເດີມ"} dictionary{"ລຽງຕາມພົດຈະນານຸກົມ"} ducet{"ຮຽງຕາມລຳດັບຢູນິໂຄດເລີ່ມຕົ້ນ"} - gb2312han{"ລຽງຕາມອັກສອນຈີນປະຍຸກ"} phonebook{"ລຽງຕາມສະໝຸດໂທລະສັບ"} pinyin{"ລຽງຕາມການອອກສຽງພາສາຈີນ"} search{"ການຊອກຫາທົ່ວໄປ"} diff --git a/icu4c/source/data/lang/lt.txt b/icu4c/source/data/lang/lt.txt index d13dde72eeef..d4b4c866b7f3 100644 --- a/icu4c/source/data/lang/lt.txt +++ b/icu4c/source/data/lang/lt.txt @@ -923,12 +923,10 @@ lt{ } } collation{ - big5han{"įprasta kiniška rūšiavimo tvarka - Big5"} compat{"ankstesnė rūšiavimo tvarka, skirta suderinamumui"} dictionary{"žodyno rūšiavimo tvarka"} ducet{"numatytasis unikodo rikiavimas"} eor{"rūšiavimo tvarka daugiakalbės Europos dokumentų"} - gb2312han{"supaprastinta kiniška rūšiavimo tvarka - GB2312"} phonebook{"telefonų knygos rūšiavimo tvarka"} phonetic{"Fonetinė rikiavimo tvarka"} pinyin{"supaprastinta kiniškų hieroglifų rūšiavimo tvarka"} diff --git a/icu4c/source/data/lang/lv.txt b/icu4c/source/data/lang/lv.txt index 20e9f2457d88..9fd05da2c3f7 100644 --- a/icu4c/source/data/lang/lv.txt +++ b/icu4c/source/data/lang/lv.txt @@ -755,12 +755,10 @@ lv{ } } collation{ - big5han{"tradicionālās ķīniešu valodas kārtošanas secība - Big5"} compat{"saderīgā kārtošanas secība"} dictionary{"Vārdnīcas kārtošanas secība"} ducet{"noklusējuma unikoda kārtošanas secība"} eor{"Eiropas rakstību kārtošanas secīa"} - gb2312han{"vienkāršotās ķīniešu valodas kārtošanas secība - GB2312"} phonebook{"tālruņu grāmatas kārtošanas secība"} phonetic{"Fonētiskā kārtošanas secība"} pinyin{"piņjiņa kārtošanas secība"} diff --git a/icu4c/source/data/lang/mk.txt b/icu4c/source/data/lang/mk.txt index 838651438eb1..238ee37f194b 100644 --- a/icu4c/source/data/lang/mk.txt +++ b/icu4c/source/data/lang/mk.txt @@ -886,13 +886,11 @@ mk{ standard{"Стандарден формат на валута"} } collation{ - big5han{"Традиционално кинеско сортирање"} compat{"Претходно подредување"} dictionary{"Подредување по азбучен редослед"} ducet{"Стандардно подредување во уникод"} emoji{"Подредување емотикони"} eor{"Европски правила за подредување"} - gb2312han{"Поедноставено кинеско сортирање"} phonebook{"Азбучен редослед"} pinyin{"Сортирање Pinyin"} reformed{"Реформирано подредување"} diff --git a/icu4c/source/data/lang/ml.txt b/icu4c/source/data/lang/ml.txt index b4f541a6a574..c7ea5a9a0f5d 100644 --- a/icu4c/source/data/lang/ml.txt +++ b/icu4c/source/data/lang/ml.txt @@ -822,13 +822,11 @@ ml{ tertiary{"ആക്‌സന്റുകൾ/കേസ്/വീതി അടുക്കുക"} } collation{ - big5han{"പരമ്പരാഗത ചൈനീസ് ക്രമീകരണം - ബിഗ്5"} compat{"അനുയോജ്യതയ്‌ക്കായുള്ള മുൻ അടുക്കൽ ക്രമം"} dictionary{"നിഘണ്ടു അടുക്കൽ ക്രമം"} ducet{"സ്ഥിര യൂണികോഡ് അടുക്കൽ ക്രമം"} emoji{"ഇമോജി അടുക്കൽ ക്രമം"} eor{"യൂറോപ്യൻ അടുക്കൽ നിയമങ്ങൾ"} - gb2312han{"ലളിതമായ ചൈനീസ് ക്രമീകരണം - ജീബി2312"} phonebook{"ഫോൺബുക്കിലെ ക്രമീകരണം"} phonetic{"സ്വരസൂചക അടുക്കൽ ക്രമം"} pinyin{"പിൻ‌യിൻ ക്രമീകരണം"} diff --git a/icu4c/source/data/lang/mn.txt b/icu4c/source/data/lang/mn.txt index d293e52df188..6ed36d46b0f6 100644 --- a/icu4c/source/data/lang/mn.txt +++ b/icu4c/source/data/lang/mn.txt @@ -688,13 +688,11 @@ mn{ standard{"мөнгөн тэмдэгтийн стандарт хэлбэр"} } collation{ - big5han{"Хуучин хятад Эрэмбэлэх дараалал - Том5"} compat{"Нийцлийн үүднээс өмнөх эрэмбэлэх дараалал"} dictionary{"Тольны эрэмбэлэх дараалал"} ducet{"юникодын үндсэн эрэмбэлэх дараалал"} emoji{"Эможи эрэмбэлэх дараалал"} eor{"Европийн эрэмбэлэх дүрэм"} - gb2312han{"Хялбаршуулсан хятад Эрэмбэлэх дараалал - GB2312"} phonebook{"Утасны дэвтрийн эрэмбэлэх дараалал"} pinyin{"Пиньян эрэмбэлэх дараалал"} search{"ерөнхий хайлт"} diff --git a/icu4c/source/data/lang/mr.txt b/icu4c/source/data/lang/mr.txt index fdef6644c849..77daf2c708bf 100644 --- a/icu4c/source/data/lang/mr.txt +++ b/icu4c/source/data/lang/mr.txt @@ -807,12 +807,10 @@ mr{ tertiary{"उच्चार/केस/रुंदीची क्रमवारी लावा"} } collation{ - big5han{"पारंपारिक चिनी क्रमवारी क्रम - Big5"} compat{"अनुकूलतेसाठी आधीची क्रमवारी"} dictionary{"शब्दकोश अनुक्रम"} ducet{"डीफॉल्ट युनिकोड क्रमवारी क्रम"} eor{"युरोपियन क्रमवारी नियम"} - gb2312han{"सरलीकृत चिनी क्रमवारी क्रम - GB2312"} phonebook{"फोनबुक अनुक्रम"} phonetic{"ध्वनीविचार क्रमवारी क्रम"} pinyin{"पिनयिन अनुक्रम"} diff --git a/icu4c/source/data/lang/ms.txt b/icu4c/source/data/lang/ms.txt index c510d2e102e2..7636d3c0b7a0 100644 --- a/icu4c/source/data/lang/ms.txt +++ b/icu4c/source/data/lang/ms.txt @@ -765,13 +765,11 @@ ms{ tertiary{"Isih Aksen/Atur/Lebar"} } collation{ - big5han{"Aturan Isih Cina Tradisional - Big5"} compat{"Tertib Isihan Sebelumnya"} dictionary{"Aturan Isih Kamus"} ducet{"Tertib Isih Unikod Lalai"} emoji{"Aturan Isih Emoji"} eor{"Peraturan Isihan Eropah"} - gb2312han{"Aturan Isih Bahasa Cina Ringkas - GB2312"} phonebook{"Aturan Isih Buku Telefon"} phonetic{"Urutan Isih Fonetik"} pinyin{"Aturan Isih Pinyin"} diff --git a/icu4c/source/data/lang/mt.txt b/icu4c/source/data/lang/mt.txt index 5b83e7757402..fd598f643c24 100644 --- a/icu4c/source/data/lang/mt.txt +++ b/icu4c/source/data/lang/mt.txt @@ -544,8 +544,6 @@ mt{ japanese{"Kalendarju Ġappuniż"} } collation{ - big5han{"Ordni Ċiniż Tradizzjonali (Big5)"} - gb2312han{"Ordni Ċiniż Sempliċi (GB2312)"} phonebook{"Ordni Telefonika"} pinyin{"Ordni tal-Pinjin"} standard{"Ordni Standard"} diff --git a/icu4c/source/data/lang/ne.txt b/icu4c/source/data/lang/ne.txt index 35eb2be907f7..d472cfda7b1c 100644 --- a/icu4c/source/data/lang/ne.txt +++ b/icu4c/source/data/lang/ne.txt @@ -794,9 +794,7 @@ ne{ standard{"मानक मुद्राको ढाँचा"} } collation{ - big5han{"परम्परागत चिनिँया क्रमबद्धता पद्दति - बिग फाइभ"} ducet{"पूर्वनिर्धारित युनिकोडको क्रमबद्धता सूची"} - gb2312han{"सरलिकृत चिनियाँ क्रमबद्धता पद्दति-गीबीटुथ्रीवानटु"} phonebook{"टेलिफोन पुस्तिका क्रमबद्धतापद्दति"} pinyin{"पिनयिन क्रमबद्धता पद्दति"} search{"सामान्य उद्देशीय खोजी"} diff --git a/icu4c/source/data/lang/nl.txt b/icu4c/source/data/lang/nl.txt index 2efaf2bfdad6..cdafc6775614 100644 --- a/icu4c/source/data/lang/nl.txt +++ b/icu4c/source/data/lang/nl.txt @@ -942,13 +942,11 @@ nl{ tertiary{"Sorteren op accenten/hoofdlettergebruik/breedte"} } collation{ - big5han{"Traditioneel-Chinese sorteervolgorde - Big5"} compat{"vorige sorteervolgorde, voor compatibiliteit"} dictionary{"Woordenboeksorteervolgorde"} ducet{"standaard Unicode-sorteervolgorde"} emoji{"emojisorteervolgorde"} eor{"Europese sorteerregels"} - gb2312han{"Vereenvoudigd-Chinese sorteervolgorde - GB2312"} phonebook{"Telefoonboeksorteervolgorde"} phonetic{"Fonetische sorteervolgorde"} pinyin{"Pinyinsorteervolgorde"} diff --git a/icu4c/source/data/lang/nn.txt b/icu4c/source/data/lang/nn.txt index 58c23bf75ffa..45a7e38c1fb1 100644 --- a/icu4c/source/data/lang/nn.txt +++ b/icu4c/source/data/lang/nn.txt @@ -139,9 +139,7 @@ nn{ account{"valutaformat for rekneskapsføring"} } collation{ - big5han{"tradisjonell kinesisk sortering"} ducet{"standard Unicode-sorteringsrekkjefølgje"} - gb2312han{"forenkla kinesisk sortering"} pinyin{"pinyin-sortering"} standard{"standard sorteringsrekkjefølgje"} } diff --git a/icu4c/source/data/lang/no.txt b/icu4c/source/data/lang/no.txt index adb90d0ef49a..4330f9c07fde 100644 --- a/icu4c/source/data/lang/no.txt +++ b/icu4c/source/data/lang/no.txt @@ -921,13 +921,11 @@ no{ tertiary{"Sortér aksenttegn / små og store bokstaver / bredde"} } collation{ - big5han{"tradisjonell kinesisk sortering - Big 5"} compat{"forrige sorteringsrekkefølge (for kompatibilitet)"} dictionary{"ordlistesortering"} ducet{"standard Unicode-sorteringsrekkefølge"} emoji{"emoji-sorteringsrekkefølge"} eor{"sorteringsrekkefølge for flerspråklige europeiske dokumenter"} - gb2312han{"forenklet kinesisk sortering - GB2312"} phonebook{"telefonkatalogsortering"} phonetic{"fonetisk sortering"} pinyin{"pinyinsortering"} diff --git a/icu4c/source/data/lang/pl.txt b/icu4c/source/data/lang/pl.txt index 4702638d0d92..180762286689 100644 --- a/icu4c/source/data/lang/pl.txt +++ b/icu4c/source/data/lang/pl.txt @@ -900,12 +900,10 @@ pl{ tertiary{"Sortowanie znaków akcentowanych/wielkości liter/szerokości"} } collation{ - big5han{"chiński tradycyjny porządek sortowania - Big5"} compat{"poprzedni porządek sortowania, dla zgodności"} dictionary{"sortowanie słownikowe"} ducet{"domyślna kolejność sortowania Unicode"} eor{"europejskie reguły określania kolejności"} - gb2312han{"chiński uproszczony porządek sortowania - GB2312"} phonebook{"porządek sortowania książki telefonicznej"} phonetic{"sortowanie fonetyczne"} pinyin{"porządek sortowania pinyin"} diff --git a/icu4c/source/data/lang/pt.txt b/icu4c/source/data/lang/pt.txt index 1a510e88501d..60cd86a76729 100644 --- a/icu4c/source/data/lang/pt.txt +++ b/icu4c/source/data/lang/pt.txt @@ -806,12 +806,10 @@ pt{ tertiary{"Classificar acentos/maiúsculas e minúsculas/largura"} } collation{ - big5han{"Ordem do Chinês Tradicional - Big5"} compat{"Ordem anterior, para compatibilidade"} dictionary{"Ordem do dicionário"} ducet{"Ordem padrão do Unicode"} eor{"Regras europeias de ordenação"} - gb2312han{"Ordem do Chinês Simplificado - GB2312"} phonebook{"Ordem de lista telefônica"} phonetic{"Ordem de classificação fonética"} pinyin{"Ordem Pin-yin"} diff --git a/icu4c/source/data/lang/pt_PT.txt b/icu4c/source/data/lang/pt_PT.txt index fb24ce98ab01..d671b2e3ea6f 100644 --- a/icu4c/source/data/lang/pt_PT.txt +++ b/icu4c/source/data/lang/pt_PT.txt @@ -211,9 +211,7 @@ pt_PT{ tertiary{"Ordenar acentos/tipo de letra/largura"} } collation{ - big5han{"Ordem do chinês tradicional - Big5"} eor{"Regras de ordenação europeias"} - gb2312han{"Ordem do chinês simplificado - GB2312"} phonebook{"Ordem da lista telefónica"} pinyin{"Ordem de pinyin"} standard{"Ordenação padrão"} diff --git a/icu4c/source/data/lang/rm.txt b/icu4c/source/data/lang/rm.txt index 07fd2e4f6f9a..01879e6829fb 100644 --- a/icu4c/source/data/lang/rm.txt +++ b/icu4c/source/data/lang/rm.txt @@ -687,9 +687,7 @@ rm{ standard{"format da valuta da standard"} } collation{ - big5han{"chinaisa tradiziunala - Big5"} ducet{"zavrada unicode standard"} - gb2312han{"chinaisa simplifitgada - GB2312"} phonebook{"cudesch da telefon"} pinyin{"Pinyin"} search{"tschertga generala"} diff --git a/icu4c/source/data/lang/ro.txt b/icu4c/source/data/lang/ro.txt index 7b0ceab0b965..e2aba8165e34 100644 --- a/icu4c/source/data/lang/ro.txt +++ b/icu4c/source/data/lang/ro.txt @@ -856,13 +856,11 @@ ro{ tertiary{"Ordonați după accente/dimensiunea literei/lățime"} } collation{ - big5han{"ordine de sortare a chinezei tradiționale - Big5"} compat{"ordine de sortare anterioară, pentru compatibilitate"} dictionary{"ordine de sortare a dicționarului"} ducet{"ordine de sortare Unicode implicită"} emoji{"ordine de sortare a emojiurilor"} eor{"regulile europene de sortare"} - gb2312han{"ordine de sortare a chinezei simplificate - GB2312"} phonebook{"ordine de sortare după cartea de telefon"} phonetic{"ordine de sortare fonetică"} pinyin{"ordine de sortare pinyin"} diff --git a/icu4c/source/data/lang/root.txt b/icu4c/source/data/lang/root.txt index 87e5c9c33d6c..6380a2492cc9 100644 --- a/icu4c/source/data/lang/root.txt +++ b/icu4c/source/data/lang/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/ root{ - Version{"47"} + Version{"48"} characterLabelPattern{ all{"{0} — all"} category-list{"{0}: {1}"} diff --git a/icu4c/source/data/lang/ru.txt b/icu4c/source/data/lang/ru.txt index 6a56c9355c67..ee9b7941908c 100644 --- a/icu4c/source/data/lang/ru.txt +++ b/icu4c/source/data/lang/ru.txt @@ -845,13 +845,11 @@ ru{ tertiary{"Сортировка по акцентам/регистру/длине строки"} } collation{ - big5han{"традиционный китайский - Big5"} compat{"совместимый порядок сортировки"} dictionary{"словарный порядок сортировки"} ducet{"cтандартная сортировка Unicode"} emoji{"эмодзи"} eor{"европейские правила сортировки"} - gb2312han{"упрощенный китайский - GB2312"} phonebook{"порядок телефонной книги"} phonetic{"фонетический порядок сортировки"} pinyin{"пиньинь"} diff --git a/icu4c/source/data/lang/sc.txt b/icu4c/source/data/lang/sc.txt index fbb3aa50ca52..2346467ddd65 100644 --- a/icu4c/source/data/lang/sc.txt +++ b/icu4c/source/data/lang/sc.txt @@ -685,13 +685,11 @@ sc{ standard{"formadu de valuta istandard"} } collation{ - big5han{"ordinamentu de su tzinesu traditzionale - Big5"} compat{"ordinamentu antepostu, pro cumpatibilitade"} dictionary{"ordinamentu de su ditzionàriu"} ducet{"ordinamentu Unicode predefinidu"} emoji{"ordinamentu de sas emoji"} eor{"règulas de ordinamentu europeas"} - gb2312han{"ordinamentu de su tzinesu semplificadu - GB2312"} phonebook{"ordinamentu de s’elencu telefònicu"} pinyin{"ordinamentu pinyin"} search{"chirca genèrica"} diff --git a/icu4c/source/data/lang/sk.txt b/icu4c/source/data/lang/sk.txt index f2830ec97c92..05152737506b 100644 --- a/icu4c/source/data/lang/sk.txt +++ b/icu4c/source/data/lang/sk.txt @@ -739,12 +739,10 @@ sk{ tertiary{"Radiť akcenty/veľké a malé písmená/šírku"} } collation{ - big5han{"tradičné čínske zoradenie – Big5"} compat{"predchádzajúce zoradenie, kompatibilita"} dictionary{"slovníkové zoradenie"} ducet{"predvolené zoradenie unicode"} eor{"európske zoradenie"} - gb2312han{"zjednodušené čínske zoradenie – GB2312"} phonebook{"lexikografické zoradenie"} phonetic{"fonetické zoradenie"} pinyin{"zoradenie pchin-jin"} diff --git a/icu4c/source/data/lang/sl.txt b/icu4c/source/data/lang/sl.txt index a8a9abd8f768..d0e876e48f88 100644 --- a/icu4c/source/data/lang/sl.txt +++ b/icu4c/source/data/lang/sl.txt @@ -791,13 +791,11 @@ sl{ tertiary{"Razvrščanje po naglasih/velikih črkah/malih črkah/širini"} } collation{ - big5han{"razvrščanje po sistemu tradicionalne kitajščine - Big5"} compat{"prej uporabljeno razvrščanje za združljivost"} dictionary{"slovarsko razvrščanje"} ducet{"Privzeto razvrščanje Unicode"} emoji{"razvrščanje čustvenčkov"} eor{"evropska pravila razvrščanja"} - gb2312han{"razvrščanje po sistemu poenostavljene kitajščine - GB2312"} phonebook{"razvrščanje po sistemu telefonskega imenika"} phonetic{"fonetično razvrščanje"} pinyin{"razvrščanje po sistemu pinjin"} diff --git a/icu4c/source/data/lang/so.txt b/icu4c/source/data/lang/so.txt index 703765361c18..1d8cda260f89 100644 --- a/icu4c/source/data/lang/so.txt +++ b/icu4c/source/data/lang/so.txt @@ -672,13 +672,11 @@ so{ standard{"Habka Heerka Lacagta"} } collation{ - big5han{"Isku hagaajinta Shiineeskii Hore - Big5"} compat{"Iswaafajinta Isku hajintii hore"} dictionary{"Isku hagaajinta Qaamuuska"} ducet{"Lambar Sireedka Caalamiga ee Kala Soocidda Dalabka"} emoji{"Isku hagaajinta Emojiga"} eor{"Xeerarka Dalabka Yurub"} - gb2312han{"Isku hagaajinta Farta shiineeska"} phonebook{"Isku hagaajinta foonbuuga"} pinyin{"Isku hagaajinta Pinyin"} search{"Raadinta Guud"} diff --git a/icu4c/source/data/lang/sq.txt b/icu4c/source/data/lang/sq.txt index 47c368c95fce..d11eab62ba5c 100644 --- a/icu4c/source/data/lang/sq.txt +++ b/icu4c/source/data/lang/sq.txt @@ -696,13 +696,11 @@ sq{ standard{"format valutor standard"} } collation{ - big5han{"Radhitje e kinezishtes tradicionale - Big5"} compat{"Radhitja e mëparshme, për pajtueshmëri"} dictionary{"Radhitje fjalori"} ducet{"radhitje unikode e parazgjedhur"} emoji{"Radhitje Emoji"} eor{"Rregulla evropiane radhitjeje"} - gb2312han{"Radhitje e kinezishtes së thjeshtësuar - GB2312"} phonebook{"Radhitje libri telefonik"} pinyin{"Radhitje pinini"} search{"kërkim i përgjithshëm"} diff --git a/icu4c/source/data/lang/sr.txt b/icu4c/source/data/lang/sr.txt index d3a7eccafa54..24557d7542f5 100644 --- a/icu4c/source/data/lang/sr.txt +++ b/icu4c/source/data/lang/sr.txt @@ -800,12 +800,10 @@ sr{ tertiary{"Сортирај акценте/мала и велика слова/ширину"} } collation{ - big5han{"традиционално кинеско сортирање"} compat{"претходни редослед сортирања, због компатибилности"} dictionary{"редослед сортирања у речнику"} ducet{"подразумевани Unicode редослед сортирања"} eor{"европска правила редоследа"} - gb2312han{"поједностављено кинеско сортирање"} phonebook{"сортирање као телефонски именик"} phonetic{"фонетски редослед сортирања"} pinyin{"пинјин сортирање"} diff --git a/icu4c/source/data/lang/sr_Latn.txt b/icu4c/source/data/lang/sr_Latn.txt index ecc2a03ac747..91f4e639d85b 100644 --- a/icu4c/source/data/lang/sr_Latn.txt +++ b/icu4c/source/data/lang/sr_Latn.txt @@ -801,12 +801,10 @@ sr_Latn{ tertiary{"Sortiraj akcente/mala i velika slova/širinu"} } collation{ - big5han{"tradicionalno kinesko sortiranje"} compat{"prethodni redosled sortiranja, zbog kompatibilnosti"} dictionary{"redosled sortiranja u rečniku"} ducet{"podrazumevani Unicode redosled sortiranja"} eor{"evropska pravila redosleda"} - gb2312han{"pojednostavljeno kinesko sortiranje"} phonebook{"sortiranje kao telefonski imenik"} phonetic{"fonetski redosled sortiranja"} pinyin{"pinjin sortiranje"} diff --git a/icu4c/source/data/lang/sv.txt b/icu4c/source/data/lang/sv.txt index b38f65268d7b..cf3ab02ad8b9 100644 --- a/icu4c/source/data/lang/sv.txt +++ b/icu4c/source/data/lang/sv.txt @@ -951,13 +951,11 @@ sv{ tertiary{"Sortera accenter/skiftläge/bredd"} } collation{ - big5han{"big5-sorteringsordning"} compat{"bakåtkompatibel sorteringsordning"} dictionary{"ordbokssorteringsordning"} ducet{"grundläggande Unicode-sorteringsordning"} emoji{"emojisorteringsordning"} eor{"sorteringsordning för flerspråkliga europeiska dokument"} - gb2312han{"gb2312-sorteringsordning"} phonebook{"telefonkatalogssorteringsordning"} phonetic{"fonetisk sorteringsordning"} pinyin{"pinyin-sorteringsordning"} diff --git a/icu4c/source/data/lang/sw.txt b/icu4c/source/data/lang/sw.txt index 57b28b49ac3d..bdcc462f5a5c 100644 --- a/icu4c/source/data/lang/sw.txt +++ b/icu4c/source/data/lang/sw.txt @@ -645,10 +645,8 @@ sw{ tertiary{"Panga Viinitoni/Herufi/Upana"} } collation{ - big5han{"Mpangilio wa Kichina cha Jadi - Big5"} dictionary{"Mpangilio wa Kamusi"} ducet{"Mpangilio Chaguo-Msingi wa Unicode"} - gb2312han{"Mpangilio wa Kichina Rahisi - GB2312"} phonebook{"Mpangilio wa Orodha za Nambari za Simu"} phonetic{"Utaratibu wa Kupanga Fonetiki"} pinyin{"Mpangilio wa Kipinyin"} diff --git a/icu4c/source/data/lang/ta.txt b/icu4c/source/data/lang/ta.txt index 7c00f2206526..0929e87aa1fd 100644 --- a/icu4c/source/data/lang/ta.txt +++ b/icu4c/source/data/lang/ta.txt @@ -812,12 +812,10 @@ ta{ tertiary{"உச்சரிப்புகள்/எழுத்து/அகலத்தை வரிசைப்படுத்து"} } collation{ - big5han{"பாரம்பரிய சீன வரிசை வடிவம் - Big5"} compat{"முந்தைய வரிசை வடிவம், இணக்கத்தன்மைக்கு"} dictionary{"அகராதி வரிசை முறை"} ducet{"இயல்புநிலை யுனிகோட் வரிசை முறை"} eor{"ஐரோப்பிய வரிசைப்படுத்தல் விதிகள்"} - gb2312han{"எளிமையாக்கப்பட்ட சீன வரிசை வடிவம் - GB2312"} phonebook{"தொலைபேசி புத்தக வரிசை முறை"} phonetic{"ஒலியியல் வரிசைப்படுத்தல் முறை"} pinyin{"பின்யின் வரிசை முறை"} diff --git a/icu4c/source/data/lang/te.txt b/icu4c/source/data/lang/te.txt index 882849fca89b..cc46b26b203f 100644 --- a/icu4c/source/data/lang/te.txt +++ b/icu4c/source/data/lang/te.txt @@ -813,12 +813,10 @@ te{ tertiary{"ఉచ్ఛారణలని/కేస్‌ని/వెడల్పుని క్రమబద్ధీకరించు"} } collation{ - big5han{"సాంప్రదాయ చైనీస్ క్రమబద్ధీకరణ క్రమం - Big5"} compat{"మునుపటి క్రమబద్ధీకరణ క్రమం, అనుకూలం"} dictionary{"నిఘంటువు క్రమబద్ధీకరణ క్రమం"} ducet{"డిఫాల్ట్ యూనీకోడ్ క్రమబద్ధీకరణ క్రమం"} eor{"యురోపియన్ క్రమబద్ధీకరణ నిబంధనలు"} - gb2312han{"సరళీకృత చైనీస్ క్రమబద్ధీకరణ క్రమం - GB2312"} phonebook{"ఫోన్‌బుక్ క్రమబద్ధీకరణ క్రమం"} phonetic{"ధ్వని ఉచ్ఛారిత క్రమబద్ధీకరణ క్రమం"} pinyin{"పిన్‌యిన్ క్రమబద్ధీకరణ క్రమం"} diff --git a/icu4c/source/data/lang/th.txt b/icu4c/source/data/lang/th.txt index 445ec740e2dc..e8f451e5c54a 100644 --- a/icu4c/source/data/lang/th.txt +++ b/icu4c/source/data/lang/th.txt @@ -930,12 +930,10 @@ th{ tertiary{"จัดเรียงเสียงหนักเบา/ตัวพิมพ์/ความกว้าง"} } collation{ - big5han{"ลำดับการจัดเรียงตามอักษรจีนดั้งเดิม"} compat{"ลำดับการจัดเรียงก่อนหน้านี้ ตามความเหมาะสม"} dictionary{"ลำดับการจัดเรียงตามพจนานุกรม"} ducet{"ลำดับการจัดเรียงตาม Unicode เริ่มต้น"} eor{"กฎการเรียงลำดับตามแบบยุโรป"} - gb2312han{"ลำดับการจัดเรียงตามอักษรจีนประยุกต์"} phonebook{"ลำดับการจัดเรียงตามสมุดโทรศัพท์"} phonetic{"ลำดับการจัดเรียงตามการออกเสียง"} pinyin{"ลำดับการจัดเรียงตามการถอดเสียงภาษาจีน"} diff --git a/icu4c/source/data/lang/tr.txt b/icu4c/source/data/lang/tr.txt index 2900f4b84152..bf92e6c990ad 100644 --- a/icu4c/source/data/lang/tr.txt +++ b/icu4c/source/data/lang/tr.txt @@ -931,13 +931,11 @@ tr{ tertiary{"Aksanları/Büyük-Küçük Harfleri/Genişliği Sıralama"} } collation{ - big5han{"Geleneksel Çince Sıralama Düzeni - Big5"} compat{"Önceki Sıralama Düzeni (uyumluluk için)"} dictionary{"Sözlük Sıralama Düzeni"} ducet{"Saptanmış Unicode Sıralama Düzeni"} emoji{"Emoji Sıralama Düzeni"} eor{"Avrupa Sıralama Kuralları"} - gb2312han{"Basitleştirilmiş Çince Sıralama Düzeni - GB2312"} phonebook{"Telefon Defteri Sıralama Düzeni"} phonetic{"Fonetik Sıralama Düzeni"} pinyin{"Pinyin Sıralama Düzeni"} diff --git a/icu4c/source/data/lang/ug.txt b/icu4c/source/data/lang/ug.txt index 1d7564604971..0d13d908ad6e 100644 --- a/icu4c/source/data/lang/ug.txt +++ b/icu4c/source/data/lang/ug.txt @@ -693,11 +693,9 @@ ug{ roc{"مىنگو يىلنامەسى"} } collation{ - big5han{"مۇرەككەپ خەنچە تىزىش تەرتىپى - Big5"} dictionary{"لۇغەت تىزىش تەرتىپى"} ducet{"كۆڭۈلدىكى يۇنىكود تىزىش تەرتىپى"} eor{"ياۋروپا تەرتىپلەش قائىدىسى"} - gb2312han{"ئاددىي خەنچە تىزىش تەرتىپى - GB2312"} phonebook{"تېلېفون نومۇر تىزىش تەرتىپى"} pinyin{"پىنيىن تىزىش تەرتىپى"} reformed{"ياخشىلانغان تەرتىپلەش تەرتىپى"} diff --git a/icu4c/source/data/lang/uk.txt b/icu4c/source/data/lang/uk.txt index c9391e3d81db..fcbd3c481259 100644 --- a/icu4c/source/data/lang/uk.txt +++ b/icu4c/source/data/lang/uk.txt @@ -836,13 +836,11 @@ uk{ tertiary{"сортувати за діактричними знаками/регістром/шириною"} } collation{ - big5han{"китайський традиційний порядок сортування Big5"} compat{"попередній порядок сортування, для сумісності"} dictionary{"порядок сортування за словником"} ducet{"типовий порядок сортування Юнікод"} emoji{"порядок сортування за емодзі"} eor{"європейські правила упорядкування"} - gb2312han{"китайський спрощений порядок сортування - GB2312"} phonebook{"порядок сортування за телефонним довідником"} phonetic{"фонетичний порядок сортування"} pinyin{"порядок сортування піньїнь"} diff --git a/icu4c/source/data/lang/ur.txt b/icu4c/source/data/lang/ur.txt index 8b621b9e0dd3..97962724b43d 100644 --- a/icu4c/source/data/lang/ur.txt +++ b/icu4c/source/data/lang/ur.txt @@ -625,12 +625,10 @@ ur{ tertiary{"لہجوں/حروف/چوڑائی کی چھٹائی کریں"} } collation{ - big5han{"روایتی چینی کی چھٹائی کی ترتیب - Big5"} compat{"سابقہ چھٹائی کی ترتیب، مطابقت کیلئے"} dictionary{"لغت کی چھٹنی کی ترتیب"} ducet{"ڈیفالٹ یونی کوڈ چھانٹی کی ترتیب"} eor{"یورپی ترتیبی قوانین"} - gb2312han{"آسان چینی کی چھٹائی کی ترتیب - GB2312"} phonebook{"فون بک کی چھٹنی کی ترتیب"} phonetic{"صوتی چھٹائی کی ترتیب"} pinyin{"پن ین کی چھٹنی کی ترتیب"} diff --git a/icu4c/source/data/lang/vi.txt b/icu4c/source/data/lang/vi.txt index 6f38b97c416b..d049972790be 100644 --- a/icu4c/source/data/lang/vi.txt +++ b/icu4c/source/data/lang/vi.txt @@ -864,13 +864,11 @@ vi{ tertiary{"Sắp xếp dấu trọng âm/chữ cái/độ rộng"} } collation{ - big5han{"Thứ tự sắp xếp theo tiếng Trung phồn thể - Big5"} compat{"Thứ tự sắp xếp trước đây, để tương thích"} dictionary{"Thứ tự sắp xếp theo từ điển"} ducet{"Thứ tự sắp xếp unicode mặc định"} emoji{"Thứ tự sắp xếp biểu tượng"} eor{"Quy tắc sắp xếp Châu Âu"} - gb2312han{"Thứ tự sắp xếp theo tiếng Trung giản thể - GB2312"} phonebook{"Thứ tự sắp xếp theo danh bạ điện thoại"} phonetic{"Thứ tự sắp xếp theo ngữ âm"} pinyin{"Thứ tự sắp xếp theo bính âm"} diff --git a/icu4c/source/data/lang/xnr.txt b/icu4c/source/data/lang/xnr.txt index dc84f3676458..e7d4f09a6159 100644 --- a/icu4c/source/data/lang/xnr.txt +++ b/icu4c/source/data/lang/xnr.txt @@ -581,9 +581,7 @@ xnr{ standard{"मानक मुद्रा प्रारूप"} } collation{ - big5han{"पारम्पारिक चीनी वर्गीकरण"} ducet{"डिफ़ॉल्ट यूनिकोड सॉर्ट क्रम"} - gb2312han{"सरलीकृत चीनी वर्गीकरण"} phonebook{"फोनबुक छंटाई क्रम"} pinyin{"पिनयीन वर्गीकरण"} search{"सामान्य-उद्देश्य खोज"} diff --git a/icu4c/source/data/lang/yrl.txt b/icu4c/source/data/lang/yrl.txt index 729d35064610..45c812f62d60 100644 --- a/icu4c/source/data/lang/yrl.txt +++ b/icu4c/source/data/lang/yrl.txt @@ -757,12 +757,10 @@ yrl{ tertiary{"Reyupurawaka asẽtu-ita/turusuwa-ita yuí mirĩwa-ita/turususawa"} } collation{ - big5han{"Xinanhẽẽga rikusawarupí muakaresawa - Big5"} compat{"Muakaresawa rinũdewa nũgarásawa"} dictionary{"Disiunariu muakaresawa"} ducet{"Unicode muakaresawa retewa"} eor{"Tekô eurupawara muakarésawa supé"} - gb2312han{"Xinanheẽga iwasuĩma muakarewa - GB2312"} phonebook{"Terefuni sesewara muakaresawa"} phonetic{"Yupurawakasawa terefuniara mukaresawa"} pinyin{"Pin-yin mukaresawa"} diff --git a/icu4c/source/data/lang/yrl_CO.txt b/icu4c/source/data/lang/yrl_CO.txt index ebd94d59f787..92f0d3d0b6f8 100644 --- a/icu4c/source/data/lang/yrl_CO.txt +++ b/icu4c/source/data/lang/yrl_CO.txt @@ -37,8 +37,6 @@ yrl_CO{ primary{"Reyupurawaka letera básika ñũtú"} } collation{ - big5han{"Xinañẽẽga rikusawarupí muakaresawa - Big5"} - gb2312han{"Xinañeẽga iwasuĩma muakarewa - GB2312"} search{"Sikaisá purusawa pañérupí"} } } diff --git a/icu4c/source/data/lang/yrl_VE.txt b/icu4c/source/data/lang/yrl_VE.txt index a88d3f50998c..5fc550259f86 100644 --- a/icu4c/source/data/lang/yrl_VE.txt +++ b/icu4c/source/data/lang/yrl_VE.txt @@ -37,8 +37,6 @@ yrl_VE{ primary{"Reyupurawaka letera básika ñũtú"} } collation{ - big5han{"Xinañẽẽga rikusawarupí muakaresawa - Big5"} - gb2312han{"Xinañeẽga iwasuĩma muakarewa - GB2312"} search{"Sikaisá purusawa pañérupí"} } } diff --git a/icu4c/source/data/lang/yue.txt b/icu4c/source/data/lang/yue.txt index fe407a9a383e..3deaa6932fa2 100644 --- a/icu4c/source/data/lang/yue.txt +++ b/icu4c/source/data/lang/yue.txt @@ -905,11 +905,9 @@ yue{ tertiary{"排序重音/大小寫/全半形"} } collation{ - big5han{"繁體中文排序 - Big5"} dictionary{"字典排序"} ducet{"預設 Unicode 排序"} eor{"歐洲排序規則"} - gb2312han{"簡體中文排序 - GB2312"} phonebook{"電話簿排序"} phonetic{"發音排序"} pinyin{"拼音排序"} diff --git a/icu4c/source/data/lang/yue_Hans.txt b/icu4c/source/data/lang/yue_Hans.txt index ef82c8a5e59b..8398d6832b77 100644 --- a/icu4c/source/data/lang/yue_Hans.txt +++ b/icu4c/source/data/lang/yue_Hans.txt @@ -906,11 +906,9 @@ yue_Hans{ tertiary{"排序重音/大小写/全半形"} } collation{ - big5han{"繁体中文排序 - Big5"} dictionary{"字典排序"} ducet{"预设 Unicode 排序"} eor{"欧洲排序规则"} - gb2312han{"简体中文排序 - GB2312"} phonebook{"电话簿排序"} phonetic{"发音排序"} pinyin{"拼音排序"} diff --git a/icu4c/source/data/lang/zh.txt b/icu4c/source/data/lang/zh.txt index 3469e24e565a..5bb7b204ce92 100644 --- a/icu4c/source/data/lang/zh.txt +++ b/icu4c/source/data/lang/zh.txt @@ -890,13 +890,11 @@ zh{ tertiary{"对重音/大小写/长度进行排序"} } collation{ - big5han{"繁体中文排序 - Big5"} compat{"基于兼容性沿用既往排序"} dictionary{"字典排序"} ducet{"默认 Unicode 排序"} emoji{"表情符号排序"} eor{"欧洲排序规则"} - gb2312han{"简体中文排序 - GB2312"} phonebook{"电话簿排序"} phonetic{"语音排序"} pinyin{"拼音排序"} diff --git a/icu4c/source/data/lang/zh_Hant.txt b/icu4c/source/data/lang/zh_Hant.txt index f6367510ff70..2935c8915cd9 100644 --- a/icu4c/source/data/lang/zh_Hant.txt +++ b/icu4c/source/data/lang/zh_Hant.txt @@ -924,13 +924,11 @@ zh_Hant{ tertiary{"排序重音/大小寫/全半形"} } collation{ - big5han{"繁體中文排序 - Big5"} compat{"舊制排序"} dictionary{"字典排序"} ducet{"預設 Unicode 排序"} emoji{"表情符號"} eor{"歐洲排序規則"} - gb2312han{"簡體中文排序 - GB2312"} phonebook{"電話簿排序"} phonetic{"發音排序"} pinyin{"拼音排序"} diff --git a/icu4c/source/data/lang/zh_Hant_HK.txt b/icu4c/source/data/lang/zh_Hant_HK.txt index 978b4f4af34c..67e0812da49f 100644 --- a/icu4c/source/data/lang/zh_Hant_HK.txt +++ b/icu4c/source/data/lang/zh_Hant_HK.txt @@ -98,9 +98,7 @@ zh_Hant_HK{ ethiopic-amete-alem{"埃塞俄比亞阿美德阿萊姆曆"} } collation{ - big5han{"繁體中文排序 (Big5)"} dictionary{"詞典排序"} - gb2312han{"簡體中文排序 (GB2312)"} } ms{ uksystem{"英制"} diff --git a/icu4c/source/data/lang/zu.txt b/icu4c/source/data/lang/zu.txt index ebaa19bd142d..ca3c23ec12a3 100644 --- a/icu4c/source/data/lang/zu.txt +++ b/icu4c/source/data/lang/zu.txt @@ -736,13 +736,11 @@ zu{ tertiary{"Hlela Ukuphimisela/Ukuma kwezinhlamvu/Ububanzi"} } collation{ - big5han{"Ukuhlunga kwe-Traditional Chinese - Big5"} compat{"Ukuhlunga Kwangaphambilini, ngokusebenzisana"} dictionary{"Uhlelo Lokuhlunga Lesichazamazwi"} ducet{"Ukuhlunga okuzenzakalelayo kwe-Unicode"} emoji{"Uhlelo Lokuhlunga le-Emoji"} eor{"Imithetho Yokuhlunga ye-European"} - gb2312han{"Ukuhlunga kwe-Simplified Chinese - GB2312"} phonebook{"Ukuhlunga kwebhuku lefoni"} phonetic{"Hlela Ngokwefonetiki"} pinyin{"Ukuhlunga nge-Pinyin"} diff --git a/icu4c/source/data/locales/LOCALE_DEPS.json b/icu4c/source/data/locales/LOCALE_DEPS.json index fc9c4e7ab9e1..bcc11de59133 100644 --- a/icu4c/source/data/locales/LOCALE_DEPS.json +++ b/icu4c/source/data/locales/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -19,6 +19,7 @@ "iw": "he", "iw_IL": "he_IL", "ks_IN": "ks_Arab_IN", + "ku_SY": "ku_Latn_SY", "kxv_IN": "kxv_Latn_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", diff --git a/icu4c/source/data/locales/ar.txt b/icu4c/source/data/locales/ar.txt index fca6b88c7318..20d6870e5f3e 100644 --- a/icu4c/source/data/locales/ar.txt +++ b/icu4c/source/data/locales/ar.txt @@ -949,6 +949,7 @@ ar{ eras{ abbreviated{ "هـ", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/as.txt b/icu4c/source/data/locales/as.txt index ba0a13a0697e..f4579918c849 100644 --- a/icu4c/source/data/locales/as.txt +++ b/icu4c/source/data/locales/as.txt @@ -298,13 +298,9 @@ as{ } } gregorian{ - AmPmMarkers{ - "AM", - "PM", - } - AmPmMarkersNarrow{ - "am", - "pm", + AmPmMarkersAbbr{ + "পূৰ্বাহ্ন", + "অপৰাহ্ন", } DateTimePatterns{ "a h.mm.ss zzzz", @@ -408,22 +404,6 @@ as{ } } } - dayPeriod{ - stand-alone{ - abbreviated{ - am{"AM"} - pm{"PM"} - } - narrow{ - am{"AM"} - pm{"PM"} - } - wide{ - am{"AM"} - pm{"PM"} - } - } - } eras{ abbreviated{ "খ্ৰীঃ পূঃ", diff --git a/icu4c/source/data/locales/blo.txt b/icu4c/source/data/locales/blo.txt index f587e2337b8a..0b7bc53503d1 100644 --- a/icu4c/source/data/locales/blo.txt +++ b/icu4c/source/data/locales/blo.txt @@ -3,12 +3,12 @@ // Generated using tools/cldr/cldr-to-icu/ blo{ AuxExemplarCharacters{ - "[ăǎåäãā{a̰} æ ɓ ćç d ɗ ĕěëẽēḛ {ǝ̃}{ǝ̄}{ǝ̰} {ə̌} {ɛ̌}{ɛ̃}{ɛ̄}{ɛ̰} ƒ ɣ {hw} ĭǐ" + "[ăǎåäãā{a̰} æ {ǝ̃}{ǝ̄}{ǝ̰} ɓ ćç d ɗ ĕěëẽēḛ {ə̌} {ɛ̌}{ɛ̃}{ɛ̄}{ɛ̰} ƒ ɣ {hw} ĭǐ" "ïĩīḭ ij {ɩ̃}{ɩ̄}{ɩ̰} {m̌}{m̄} ňñ{n̄} {ŋw} ŏǒöõøō{o̰} œ {ɔ̌}{ɔ̃}{ɔ̄}{ɔ̰} ř šſ " "ß ŭǔüūṵ {̃ũ} {ʊ̌}{ʊ̃}{ʊ̄}{ʊ̰} v ʋ x {xw} ÿ ƴ z ʒ {̃ʼ}]" } ExemplarCharacters{ - "[aáàâ b c ɖ eéèê ǝ{ǝ́}{ǝ̀}{ǝ̂} ɛ{ɛ́}{ɛ̀}{ɛ̂} f g {gb} h iíìî ɩ{ɩ́}{ɩ̀}{ɩ̂} j" + "[aáàâ ǝ{ǝ́}{ǝ̀}{ǝ̂} b c ɖ eéèê ɛ{ɛ́}{ɛ̀}{ɛ̂} f g {gb} h iíìî ɩ{ɩ́}{ɩ̀}{ɩ̂} j" " k {kp} l mḿ{m̀} nńǹ {ny} ŋ{ŋ́}{ŋ̀} {ŋm} oóòô ɔ{ɔ́}{ɔ̀}{ɔ̂} p r s {sh} t uúù" "û ʊ{ʊ́}{ʊ̀}{ʊ̂} w y]" } diff --git a/icu4c/source/data/locales/bn.txt b/icu4c/source/data/locales/bn.txt index 9c70aa50bb50..ba6b650e74a3 100644 --- a/icu4c/source/data/locales/bn.txt +++ b/icu4c/source/data/locales/bn.txt @@ -919,6 +919,7 @@ bn{ eras{ abbreviated{ "যুগ", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/bs_Cyrl.txt b/icu4c/source/data/locales/bs_Cyrl.txt index 1ac54376bab0..585c106e48a0 100644 --- a/icu4c/source/data/locales/bs_Cyrl.txt +++ b/icu4c/source/data/locales/bs_Cyrl.txt @@ -749,6 +749,7 @@ bs_Cyrl{ eras{ abbreviated{ "АХ", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ccp.txt b/icu4c/source/data/locales/ccp.txt index f05b1411f174..2190e7cc7b30 100644 --- a/icu4c/source/data/locales/ccp.txt +++ b/icu4c/source/data/locales/ccp.txt @@ -473,6 +473,7 @@ ccp{ eras{ abbreviated{ "𑄡𑄪𑄇𑄴", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/el.txt b/icu4c/source/data/locales/el.txt index 438792268403..8a6c2b30cf63 100644 --- a/icu4c/source/data/locales/el.txt +++ b/icu4c/source/data/locales/el.txt @@ -822,6 +822,7 @@ el{ eras{ abbreviated{ "Ε.Ε.", + "BH", } } } diff --git a/icu4c/source/data/locales/en.txt b/icu4c/source/data/locales/en.txt index cd601b63e918..2f621e2a6e05 100644 --- a/icu4c/source/data/locales/en.txt +++ b/icu4c/source/data/locales/en.txt @@ -5,7 +5,7 @@ en{ AuxExemplarCharacters{"[áàăâåäãā æ ç éèĕêëē íìĭîïī ñ óòŏôöøō œ úùŭûüū ÿ]"} ExemplarCharacters{"[a b c d e f g h i j k l m n o p q r s t u v w x y z]"} ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]"} - ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{"[\\- ‐‑ – — , ; \\: ! ? . … '‘’ \u0022“” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″]"} NumberElements{ latn{ @@ -227,6 +227,11 @@ en{ } } } + rationalFormats{ + integerAndRationalPattern{"{0} {1}"} + rationalPattern{"{0}⁄{1}"} + rationalUsage{"sometimes"} + } symbols{ decimal{"."} exponential{"E"} @@ -284,6 +289,12 @@ en{ "{1}, {0}", "{1}, {0}", } + DateTimePatterns%relative{ + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", + } DateTimeSkeletons{ "ahmmsszzzz", "ahmmssz", @@ -569,6 +580,12 @@ en{ "{1}, {0}", "{1}, {0}", } + DateTimePatterns%relative{ + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", + } DateTimeSkeletons{ "ahmmsszzzz", "ahmmssz", @@ -821,6 +838,12 @@ en{ "{1}, {0}", "{1}, {0}", } + DateTimePatterns%relative{ + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1}, {0}", + "{1}, {0}", + } DateTimeSkeletons{ "ahmmsszzzz", "ahmmssz", @@ -1614,6 +1637,11 @@ en{ eras{ abbreviated{ "AH", + "BH", + } + wide{ + "Anno Hegirae", + "Before Hijrah", } } monthNames{ @@ -1665,6 +1693,90 @@ en{ } } } + iso8601{ + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "y MMMM d, EEEE", + "y MMMM d", + "y MMM d", + "y-MM-dd", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%atTime{ + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimePatterns%relative{ + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + availableFormats{ + Bh{"h B"} + Bhm{"h:mm B"} + Bhms{"h:mm:ss B"} + E{"ccc"} + EBhm{"E h:mm B"} + EBhms{"E h:mm:ss B"} + EHm{"E HH:mm"} + EHms{"E HH:mm:ss"} + Ed{"d, E"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"G y"} + GyMMM{"G y MMM"} + GyMMMEd{"G y MMM d, E"} + GyMMMd{"G y MMM d"} + GyMd{"G y-MM-dd"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} + Hmsv{"HH:mm:ss v"} + Hmv{"HH:mm v"} + M{"L"} + MEd{"MM-dd, E"} + MMM{"LLL"} + MMMEd{"MMM d, E"} + MMMMW{ + one{"MMMM 'week' W"} + other{"MMMM 'week' W"} + } + MMMMd{"MMMM d"} + MMMd{"MMM d"} + Md{"MM-dd"} + d{"d"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} + ms{"mm:ss"} + y{"y"} + yM{"y-MM"} + yMEd{"y-MM-dd, E"} + yMMM{"y MMM"} + yMMMEd{"y MMM d, E"} + yMMMM{"y MMMM"} + yMMMd{"y MMM d"} + yMd{"y-MM-dd"} + yQQQ{"y QQQ"} + yQQQQ{"y QQQQ"} + yw{ + one{"Y 'week' w"} + other{"Y 'week' w"} + } + } + } japanese{ DateTimePatterns{ "h:mm:ss a zzzz", diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt index 453135f06cb3..12aea4fee46b 100644 --- a/icu4c/source/data/locales/fa.txt +++ b/icu4c/source/data/locales/fa.txt @@ -1021,9 +1021,11 @@ fa{ eras{ abbreviated{ "ه‍.ق.", + "BH", } wide{ "هجری قمری", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ff_Adlm.txt b/icu4c/source/data/locales/ff_Adlm.txt index 6e761844f9e7..c1de07f20f8b 100644 --- a/icu4c/source/data/locales/ff_Adlm.txt +++ b/icu4c/source/data/locales/ff_Adlm.txt @@ -1888,6 +1888,7 @@ ff_Adlm{ eras{ abbreviated{ "𞤇𞤊", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/fi.txt b/icu4c/source/data/locales/fi.txt index ff0780e2f6f0..4c308fcf91af 100644 --- a/icu4c/source/data/locales/fi.txt +++ b/icu4c/source/data/locales/fi.txt @@ -698,7 +698,7 @@ fi{ "la", } wide{ - "sunnuntai", + "sunnuntaina", "maanantaina", "tiistaina", "keskiviikkona", @@ -1214,6 +1214,7 @@ fi{ eras{ wide{ "hidžran jälkeen", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/fr.txt b/icu4c/source/data/locales/fr.txt index 9b4a816de95d..43c6cf713d46 100644 --- a/icu4c/source/data/locales/fr.txt +++ b/icu4c/source/data/locales/fr.txt @@ -1048,9 +1048,11 @@ fr{ eras{ narrow{ "H", + "BH", } wide{ "ère de l’Hégire", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/fr_CA.txt b/icu4c/source/data/locales/fr_CA.txt index 2c4e803432ba..2fc09fd534a6 100644 --- a/icu4c/source/data/locales/fr_CA.txt +++ b/icu4c/source/data/locales/fr_CA.txt @@ -697,9 +697,11 @@ fr_CA{ eras{ narrow{ "AH", + "BH", } wide{ "Anno Hegirae", + "BH", } } intervalFormats{ diff --git a/icu4c/source/data/locales/fy.txt b/icu4c/source/data/locales/fy.txt index 4a1af68ab4e2..1904159d41ef 100644 --- a/icu4c/source/data/locales/fy.txt +++ b/icu4c/source/data/locales/fy.txt @@ -670,6 +670,7 @@ fy{ eras{ abbreviated{ "Saʻna Hizjria", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/he.txt b/icu4c/source/data/locales/he.txt index eea9742ff22c..c73d591dc510 100644 --- a/icu4c/source/data/locales/he.txt +++ b/icu4c/source/data/locales/he.txt @@ -1182,9 +1182,11 @@ he{ eras{ abbreviated{ "הג׳רה", + "BH", } wide{ "שנת היג׳רה", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/hi_Latn.txt b/icu4c/source/data/locales/hi_Latn.txt index 97dbaf111595..4e163ff3ca13 100644 --- a/icu4c/source/data/locales/hi_Latn.txt +++ b/icu4c/source/data/locales/hi_Latn.txt @@ -335,6 +335,7 @@ hi_Latn{ eras{ abbreviated{ "Hijri", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/hu.txt b/icu4c/source/data/locales/hu.txt index d493e01d9b58..dec543ad9130 100644 --- a/icu4c/source/data/locales/hu.txt +++ b/icu4c/source/data/locales/hu.txt @@ -844,6 +844,7 @@ hu{ eras{ abbreviated{ "MF", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/id.txt b/icu4c/source/data/locales/id.txt index 3b96fceae86d..63e270f01e3b 100644 --- a/icu4c/source/data/locales/id.txt +++ b/icu4c/source/data/locales/id.txt @@ -997,6 +997,7 @@ id{ eras{ abbreviated{ "H", + "BH", } } intervalFormats{ diff --git a/icu4c/source/data/locales/is.txt b/icu4c/source/data/locales/is.txt index f227d984e422..1e0879fcbb4b 100644 --- a/icu4c/source/data/locales/is.txt +++ b/icu4c/source/data/locales/is.txt @@ -889,9 +889,11 @@ is{ eras{ abbreviated{ "EH", + "BH", } wide{ "eftir Hijra", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/kk.txt b/icu4c/source/data/locales/kk.txt index 2a6595bb625a..b555e2e19b40 100644 --- a/icu4c/source/data/locales/kk.txt +++ b/icu4c/source/data/locales/kk.txt @@ -819,12 +819,15 @@ kk{ eras{ abbreviated{ "ХЖ", + "BH", } narrow{ "ХЖ", + "BH", } wide{ "ХЖ", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index 12a371b73eb1..94df8f4e31a0 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -1524,6 +1524,7 @@ ko{ eras{ wide{ "히즈라력", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ku.txt b/icu4c/source/data/locales/ku.txt index 5a3ea0a70ca2..e75413d3e7c0 100644 --- a/icu4c/source/data/locales/ku.txt +++ b/icu4c/source/data/locales/ku.txt @@ -629,6 +629,7 @@ ku{ eras{ abbreviated{ "Hicrî", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ku_Latn.txt b/icu4c/source/data/locales/ku_Latn.txt new file mode 100644 index 000000000000..9db3fb301c7a --- /dev/null +++ b/icu4c/source/data/locales/ku_Latn.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/ +ku_Latn{ +} diff --git a/icu4c/source/data/locales/ku_Latn_IQ.txt b/icu4c/source/data/locales/ku_Latn_IQ.txt new file mode 100644 index 000000000000..a55a88ab121d --- /dev/null +++ b/icu4c/source/data/locales/ku_Latn_IQ.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/ +ku_Latn_IQ{ +} diff --git a/icu4c/source/data/locales/ku_Latn_SY.txt b/icu4c/source/data/locales/ku_Latn_SY.txt new file mode 100644 index 000000000000..074770c6f5a8 --- /dev/null +++ b/icu4c/source/data/locales/ku_Latn_SY.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/ +ku_Latn_SY{ +} diff --git a/icu4c/source/data/locales/ku_Latn_TR.txt b/icu4c/source/data/locales/ku_Latn_TR.txt new file mode 100644 index 000000000000..0ada4c5efaca --- /dev/null +++ b/icu4c/source/data/locales/ku_Latn_TR.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/ +ku_Latn_TR{ +} diff --git a/icu4c/source/data/locales/ku_SY.txt b/icu4c/source/data/locales/ku_SY.txt new file mode 100644 index 000000000000..5e528bebbb51 --- /dev/null +++ b/icu4c/source/data/locales/ku_SY.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/ +ku_SY{ + "%%ALIAS"{"ku_Latn_SY"} +} diff --git a/icu4c/source/data/locales/lv.txt b/icu4c/source/data/locales/lv.txt index ea3f98c33c85..e9d73a481221 100644 --- a/icu4c/source/data/locales/lv.txt +++ b/icu4c/source/data/locales/lv.txt @@ -867,6 +867,7 @@ lv{ eras{ wide{ "pēc hidžras", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ml.txt b/icu4c/source/data/locales/ml.txt index 5623c52848dc..5fc8a42293ce 100644 --- a/icu4c/source/data/locales/ml.txt +++ b/icu4c/source/data/locales/ml.txt @@ -767,6 +767,7 @@ ml{ eras{ abbreviated{ "ഹിജറ", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 1fcfe6dfff0d..cfa59b7cde29 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.txt @@ -954,9 +954,11 @@ mr{ eras{ abbreviated{ "हि.व.", + "BH", } wide{ "हिजरी वर्ष", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ms.txt b/icu4c/source/data/locales/ms.txt index 5cd24d46b4bb..d4190dcdd56a 100644 --- a/icu4c/source/data/locales/ms.txt +++ b/icu4c/source/data/locales/ms.txt @@ -807,9 +807,11 @@ ms{ eras{ abbreviated{ "H", + "BH", } wide{ "AH", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/nl.txt b/icu4c/source/data/locales/nl.txt index d5ef7a33eda1..399106dd1810 100644 --- a/icu4c/source/data/locales/nl.txt +++ b/icu4c/source/data/locales/nl.txt @@ -1157,6 +1157,7 @@ nl{ eras{ wide{ "Saʻna Hizjria", + "BH", } } intervalFormats{ diff --git a/icu4c/source/data/locales/ro.txt b/icu4c/source/data/locales/ro.txt index 47f2a2260a0a..02468186a301 100644 --- a/icu4c/source/data/locales/ro.txt +++ b/icu4c/source/data/locales/ro.txt @@ -911,6 +911,7 @@ ro{ eras{ wide{ "A.H.", + "BH", } } } diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index f87c887fe797..d78893a8451d 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -12,8 +12,8 @@ root{ word-medial{"{0} … {1}"} } ExemplarCharacters{"[]"} - ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} - ExemplarCharactersPunctuation{"[\\- ‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"} + ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + − 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersPunctuation{"[\\- ‐‑ , ; \\: ! ? . ( ) \\[ \\] \\{ \\}]"} MoreInformation{"?"} NumberElements{ adlm{ @@ -575,6 +575,11 @@ root{ } } } + rationalFormats{ + integerAndRationalPattern{"{0} {1}"} + rationalPattern{"{0}⁄{1}"} + rationalUsage{"sometimes"} + } symbols{ approximatelySign{"~"} decimal{"."} @@ -1232,7 +1237,7 @@ root{ symbols:alias{"/LOCALE/NumberElements/latn/symbols"} } } - Version{"47"} + Version{"48"} calendar{ buddhist{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} @@ -2551,6 +2556,7 @@ root{ eras{ abbreviated{ "AH", + "BH", } narrow:alias{"/LOCALE/calendar/islamic/eras/abbreviated"} wide:alias{"/LOCALE/calendar/islamic/eras/abbreviated"} @@ -2698,7 +2704,7 @@ root{ appendItems{ Day{"{0} ({2}: {1})"} Day-Of-Week{"{0} {1}"} - Era{"{1} {0}"} + Era{"{0} {1}"} Hour{"{0} ({2}: {1})"} Minute{"{0} ({2}: {1})"} Month{"{0} ({2}: {1})"} @@ -2706,7 +2712,7 @@ root{ Second{"{0} ({2}: {1})"} Timezone{"{0} {1}"} Week{"{0} ({2}: {1})"} - Year{"{1} {0}"} + Year{"{0} {1}"} } availableFormats{ Bh{"h B"} @@ -2733,7 +2739,7 @@ root{ M{"L"} MEd{"MM-dd, E"} MMM{"LLL"} - MMMEd{"MMM d"} + MMMEd{"MMM d, E"} MMMMW{ other{"MMMM 'week' W"} } diff --git a/icu4c/source/data/locales/ru.txt b/icu4c/source/data/locales/ru.txt index 4a39890bed7e..45ced13d8491 100644 --- a/icu4c/source/data/locales/ru.txt +++ b/icu4c/source/data/locales/ru.txt @@ -1051,6 +1051,7 @@ ru{ eras{ wide{ "после хиджры", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/sc.txt b/icu4c/source/data/locales/sc.txt index e08d6fc11402..2b03ffe11281 100644 --- a/icu4c/source/data/locales/sc.txt +++ b/icu4c/source/data/locales/sc.txt @@ -1150,12 +1150,15 @@ sc{ eras{ abbreviated{ "e.E.", + "BH", } narrow{ "E", + "BH", } wide{ "era de s’Egira", + "BH", } } intervalFormats{ diff --git a/icu4c/source/data/locales/sq.txt b/icu4c/source/data/locales/sq.txt index c6c92b8c690f..eb92ff53e5e2 100644 --- a/icu4c/source/data/locales/sq.txt +++ b/icu4c/source/data/locales/sq.txt @@ -807,6 +807,7 @@ sq{ eras{ abbreviated{ "H.", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/sr.txt b/icu4c/source/data/locales/sr.txt index e143d50266c7..e1abf1590732 100644 --- a/icu4c/source/data/locales/sr.txt +++ b/icu4c/source/data/locales/sr.txt @@ -781,6 +781,7 @@ sr{ eras{ abbreviated{ "АХ", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/sr_Latn.txt b/icu4c/source/data/locales/sr_Latn.txt index 6b436c31dc0e..2ee3839bd722 100644 --- a/icu4c/source/data/locales/sr_Latn.txt +++ b/icu4c/source/data/locales/sr_Latn.txt @@ -783,6 +783,7 @@ sr_Latn{ eras{ abbreviated{ "AH", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/sv.txt b/icu4c/source/data/locales/sv.txt index e86a85d6f590..3d25a5708d9d 100644 --- a/icu4c/source/data/locales/sv.txt +++ b/icu4c/source/data/locales/sv.txt @@ -1181,6 +1181,7 @@ sv{ eras{ wide{ "efter Hirja", + "BH", } } intervalFormats{ diff --git a/icu4c/source/data/locales/tg.txt b/icu4c/source/data/locales/tg.txt index 3dc525757a5f..f9c9e4ff58de 100644 --- a/icu4c/source/data/locales/tg.txt +++ b/icu4c/source/data/locales/tg.txt @@ -676,6 +676,7 @@ tg{ eras{ abbreviated{ "САНА", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/th.txt b/icu4c/source/data/locales/th.txt index f541fafbeecf..4b5305230ef5 100644 --- a/icu4c/source/data/locales/th.txt +++ b/icu4c/source/data/locales/th.txt @@ -1166,9 +1166,11 @@ th{ eras{ abbreviated{ "ฮ.ศ.", + "BH", } wide{ "ฮิจเราะห์ศักราช", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/tk.txt b/icu4c/source/data/locales/tk.txt index d48f938cf7aa..5651af112b02 100644 --- a/icu4c/source/data/locales/tk.txt +++ b/icu4c/source/data/locales/tk.txt @@ -730,6 +730,7 @@ tk{ eras{ abbreviated{ "HS", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/tr.txt b/icu4c/source/data/locales/tr.txt index 5c7c7dae6bfc..350cf6e6f21c 100644 --- a/icu4c/source/data/locales/tr.txt +++ b/icu4c/source/data/locales/tr.txt @@ -781,6 +781,7 @@ tr{ eras{ abbreviated{ "Hicri", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ug.txt b/icu4c/source/data/locales/ug.txt index 77f94b3ac0cb..a78c9134ecb4 100644 --- a/icu4c/source/data/locales/ug.txt +++ b/icu4c/source/data/locales/ug.txt @@ -583,6 +583,7 @@ ug{ eras{ abbreviated{ "ھىجرىيە", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/ur.txt b/icu4c/source/data/locales/ur.txt index 1ed869fac655..d80ae103853d 100644 --- a/icu4c/source/data/locales/ur.txt +++ b/icu4c/source/data/locales/ur.txt @@ -782,6 +782,7 @@ ur{ eras{ abbreviated{ "ہجری", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/uz.txt b/icu4c/source/data/locales/uz.txt index 01611981fd3c..e23f0b90e15f 100644 --- a/icu4c/source/data/locales/uz.txt +++ b/icu4c/source/data/locales/uz.txt @@ -731,6 +731,7 @@ uz{ eras{ abbreviated{ "hijriy", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/yue.txt b/icu4c/source/data/locales/yue.txt index 2cbc87520bc4..9c6d3126e7ed 100644 --- a/icu4c/source/data/locales/yue.txt +++ b/icu4c/source/data/locales/yue.txt @@ -1364,6 +1364,7 @@ yue{ eras{ abbreviated{ "伊斯蘭曆", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/yue_Hans.txt b/icu4c/source/data/locales/yue_Hans.txt index 8b83810a82ce..f23835084477 100644 --- a/icu4c/source/data/locales/yue_Hans.txt +++ b/icu4c/source/data/locales/yue_Hans.txt @@ -1390,6 +1390,7 @@ yue_Hans{ eras{ abbreviated{ "伊斯兰历", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/zh.txt b/icu4c/source/data/locales/zh.txt index 061f70ec209d..4c7f02b7715d 100644 --- a/icu4c/source/data/locales/zh.txt +++ b/icu4c/source/data/locales/zh.txt @@ -1486,6 +1486,7 @@ zh{ eras{ abbreviated{ "伊斯兰历", + "BH", } } monthNames{ diff --git a/icu4c/source/data/locales/zh_Hant.txt b/icu4c/source/data/locales/zh_Hant.txt index 83ef51d07d3e..bd620c4da96e 100644 --- a/icu4c/source/data/locales/zh_Hant.txt +++ b/icu4c/source/data/locales/zh_Hant.txt @@ -1369,6 +1369,7 @@ zh_Hant{ eras{ abbreviated{ "伊斯蘭曆", + "BH", } } monthNames{ diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 1119b8559bf1..5ecc933e9766 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -8,7 +8,7 @@ // * // *************************************************************************** icuver:table(nofallback){ - CLDRVersion{"47"} + CLDRVersion{"48"} DataVersion{"78.0.1.0"} ICUVersion{"78.0.1.0"} } diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index 87f66a4fe4f3..e264e1c34452 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -50,6 +50,7 @@ langInfo:table(nofallback){ "cze","cs", "daf","dnj", "dap","njz", + "dek","sqm", "dgo","doi", "dhd","mwr", "dik","din", @@ -139,7 +140,6 @@ langInfo:table(nofallback){ "meg","cir", "mgx","jbk", "mhr","chm", - "mnk","man", "mnt","wnn", "mo","ro", "mof","xnt", @@ -160,6 +160,7 @@ langInfo:table(nofallback){ "nom","cbr", "noo","dtd", "npi","ne", + "nte","eko", "nts","pij", "nxu","bpp", "ojg","oj", @@ -1178,7 +1179,7 @@ langInfo:table(nofallback){ 427471785, 421961274, 427020534, - -2037005310, + 429245442, 423439686, 426412548, 195291706, @@ -1724,7 +1725,7 @@ langInfo:table(nofallback){ 423431291, 39721182, 421740011, - 426406340, + 422688050, 429950009, 421742927, 420031235, @@ -3227,8 +3228,13 @@ langInfo:table(nofallback){ 426410208, 430170390, 429390576, - 34854088, + 141146722, + 148055455, + 137013292, 42766654, + 43298095, + 34854088, + 141520699, -1070946260, 423479628, 421748253, @@ -3346,6 +3352,7 @@ langInfo:table(nofallback){ 145740799, 430954200, 429243237, + 429243966, 423438210, 390357628, 429916104, @@ -3863,7 +3870,7 @@ langInfo:table(nofallback){ 423475552, 664981026, 426861784, - 1232242537, + 1249019753, 431033149, 426605932, 429409666, @@ -3984,6 +3991,7 @@ langInfo:table(nofallback){ 423480872, 429248720, 423442964, + 47469003, 427262924, 429960224, 38200524, @@ -4482,6 +4490,7 @@ langInfo:table(nofallback){ 423474204, 430619862, 1232246238, + 1249751725, 1254141034, 176561754, 430248072, @@ -4835,7 +4844,6 @@ langInfo:table(nofallback){ 421752063, 429960603, 432975774, - 433507944, 430616001, 422665527, 430618188, @@ -5186,7 +5194,11 @@ langInfo:table(nofallback){ 642194937, 36779031, 176567777, - 561265708, + 420631322, + 476926919, + 175389740, + 559730434, + 642179655, 432441851, 422404250, 420102068, @@ -5309,7 +5321,6 @@ langInfo:table(nofallback){ 423480443, 423427253, 420030842, - 962463322, 36765450, 43300935, 430437344, @@ -5894,7 +5905,6 @@ langInfo:table(nofallback){ 527727506, 423427256, 423432359, - 422688050, 43308930, 403433692, 36718770, @@ -6607,6 +6617,7 @@ langInfo:table(nofallback){ 427441899, 428515970, 431161887, + 147543704, 421615705, 423210028, 423741116, @@ -6706,6 +6717,7 @@ langInfo:table(nofallback){ 39262535, 43516650, 1042500538, + -2037005310, 1059269762, -1468777641, 781436464, @@ -6768,7 +6780,6 @@ langInfo:table(nofallback){ 433327090, 423249285, 429095136, - 422225964, 429134502, 425434098, 425985222, @@ -6787,7 +6798,6 @@ langInfo:table(nofallback){ 431378364, 428209401, 425591562, - 429882578, 429902139, 433090980, 421950316, @@ -6812,7 +6822,6 @@ langInfo:table(nofallback){ -1911696075, -1434045042, 1466251316, - -1770867935, 489374553, -864784390, 847206816, @@ -7786,2036 +7795,2044 @@ langInfo:table(nofallback){ "ZR","CD", } trie:bin{ -001a6df03ab874d96a77ce9c77a88b78 -aec579b81d7a00186fc19d75957a647a -32e1d573e838f5d91d3801e1adf9ead9 -1d42022a3e42d85c024811616e01e2ab -aff4abaa0b4d26540f54d85bae552a56 -10ceabad10d3abac4dd8714d502a5310 -d2aba802c1aba7c6aba5c8aba647f05b -bc473248d8712e4910c4aba301c2abab -c6aba1754e776c7904e2d573e7d91d3e -ead91d3feed91d40f0d91d4103e8d91d -39edd91d3aeed91d3bf9d91d3c10e1d9 -1d3d7263729673a24d740bf11af50cf5 -d91d35f8d91d36f9d91d37f1d91d32f3 -d91d33f4d91d34ed0cedd91d2feed91d -30f0d91d31e5d91d2ce7d91d2decd91d -2e04e7d91d24eed91d25efd91d26f0d9 -1d27f3d91d2803e1d91d29edd831b1f2 -d91d2af5d91d2b6f30706a7110e5d91d -2306ef10efd91d05f1d91d06f2d91d07 -f3d91d08e3d91d03e8d91d04edd91c6c -0019ee3af41ef710f7d91d1ff8d91d20 -f9d91d21fad91d22f4d91d1cf5d91d1d -f6d91d1ef10cf1d91d19f2d91d1af3d9 -1d1beed91d16efd91d17f0d91d18e71e -ea10ead91d12ebd91d13ecd91d14edd9 -1d15e7d91d0fe8d91d10e9d91d11e40c -e4d91d0ce5d91d0de6d91d0ee1d91d09 -e2d91d0ae3d91d0b68c10a6cad6c506d -826e04e1d91cfee5d91cffe7d91d00eb -d91d01f3d91d0205ee0ceed91ce1f1d9 -1ce2f5d91ce3e1d91cdeead91cdfedd9 -1ce00019ee3af41ef710f7d91cfaf8d9 -1cfbf9d91cfcfad91cfdf4d91cf7f5d9 -1cf8f6d91cf9f10cf1d91cf4f2d91cf5 -f3d91cf6eed91cf1efd91cf2f0d91cf3 -e71eea10ead91cedebd91ceeecd91cef -edd91cf0e7d91ceae8d91cebe9d91cec -e40ce4d91ce7e5d91ce8e6d91ce9e1d9 -1ce4e2d91ce5e3d91ce66866698a6b07 -f00ff0d91cdbf4d567f5d91cdcfad91c -dde1d91cdae2b947e4b7c8efd91bb904 -e4d91ccfe9d91cd0eed91cd1f7d91cd2 -f8d5a407ee0feed91cd7f2cd13f7d91c -d8fad91cd9e1d91cd3ebd91cd4ecd91c -d5edd91cd66439645a65606705ed0ced -d91ccceed91ccdf2d91ccee1d91ccae2 -d91ccbe8d5b410ead91cc404e1d91cc5 -e7d91cc6e8d91cc7edd91cc8eed91cc9 -613a62a27a6301e1d91cc2e8d91cc300 -17ef36f51af80cf8d91cb9f9d91cbafa -d91cbbf5d91cb6f6d91cb7f7d91cb8f2 -0cf2d91cb3f3d91cb4f4d91cb5efd91c -b1f0d91cadf1d91cb2e71aea0cead91c -aeebd91cafedd91cb0e7d91cabe8d91c -ace9d91cade40ce4d91ca8e5d91ca9e6 -d91caae1d91ca5e2d91ca6e3d91ca705 -f40cf4d91cbff5d91cc0f7d91cc1e1d9 -1cbce3d91cbde5d91cbe00186dc19174 -96782a78307936e1d74cefd51a10f7d9 -1b1205ee0ceed91b16f2d91b17f9d91b -18e2d91b13e9d91b14edd91b15745075 -7e7704e1d91b0de2d91b0eefd91b0ff2 -d91b10f7d91b1106e90de9d7fdebd7fe -edd7fff7d91b00e2d7fae6d7fbe8d7fc -0bf21af60cf6d91b0af8d91b0bf9d91b -0cf2d91b07f4d91b08f5d91b09ec0cec -d91b04edd91b05eed91b06e1d91b01e2 -d91b02e4d91b03705b705c72607307f2 -0cf2d7f6f3d7f7f5d7f8f6d7f9e1d7f3 -e7d557e9d7f4ebd7f510e3d7e30ff01a -f60cf6d7eff7d7f0f8d7f1fad7f2f0d7 -ebf2d7ecf3d7edf5d7eeeb0cebd7e8ec -d7e9edd7eaefd5c5e2d7e4e7d7e5e8d7 -e6e9d7e76d906ea2666f0ee91aef0cef -d7dff2d7e0f3d7e1f7d7e2e9d7dbebd7 -dcedd7ddeed7dee40ce4d7d7e5d7d8e6 -d7d9e7d7dae1d7d4e2d7d5e3d7d60ded -17f30cf3d7c4f4d7c5f7d7c6f8d7c7ed -d7c1eed7c2efd7c3e40ce4d7bde5d7be -e8d7bfe9d7c0e1d7bae2d7bbe3d7bc0d -ed17f00cf0d7d1f5d7d2f7d7d3f9b186 -edd7cfeec165efd7d0e50ce5d7cbe7d7 -cce9d7cdebd7cee2d7c8e3d7c9e4d7ca -67b56a4a6a826b8c6c0cef17f50cf5d7 -b6f6d7b7f7d7b8f8d7b9efd7b3f2d7b4 -f3d7b5e809e8d7b0e9d7b1edd7b2e1d7 -ade5d7aee7d7af01e1d7a6e9d7a704e1 -d7a8e4d7a9f2d7aaf7d7abf9d7ac679e -68a257690010eb1df20ff2d7a2f5d7a3 -f6d7a4f7c718f9d7a5ebd79eecd79fed -d7a0eed7a1e70ce7d79ae8d79be9d79c -ead79de2d796e3d797e5d798e6d79907 -ef0cefd78ff5d790f7d78cf9d791e1d7 -8be2d78ce7d78de9d78e03e1d792e7d7 -93ebd794f5d7956452642e655a6610e7 -d78a06eb0cebd77af4d77bf5d77cf9d7 -7de4d777e7d778ead7790def17f30cf3 -d786f4d787f5d788f7d789efd183f0d7 -84f2d785e80ce8d781e9d782ecad7ded -d783e3d77ee4d77fe7d780613662a260 -6301e1d775e9d7760017ee2af514f809 -f8d762f9d763fad764f5d75ff6d760f7 -d761f209f2d75cf3d75df4d75eeed759 -f0d75af1d75be714ea09ead756ecd757 -edd758e7d753e8d754e9d755e409e4d7 -50e5d751e6d752e1d74de2d74ee3d74f -0fec1af20cf2d771f4d772f6d773f7d7 -74ecd76dedd76ef0d76ff1d770e80ce8 -d769e9d76aead76bebd76ce1d765e2d7 -66e5d767e6d76800186ec25875b67847 -783079567a90e8d91b4804e2d91be7eb -d91be8edd91be9f2d91beaf4d91beb06 -eb10ebd91befecd91bf0f4d91bf1f9d9 -1bf2e1d91bece2d91bedead91bee01e8 -d91bf3f0d91bf4757e76a2537709ec14 -ecd91be2efd91be3f2d91be4f4d91be5 -f7d91be6e1d91bdde4d91bdee5d91bdf -ead91be0ebd91be108ed14edd91bd3ee -d91bd4efd91bd5f4d91bd6f5d91bd7e2 -d91bcfe4d91bd0ead91bd1ecd91bd204 -e5d91bd8e9d91bd9eed91bdaefd91bdb -f3d91bdc72c0d172a25873a28b740012 -ed2af414f4d91bcaf5d91bcbf6d91bcc -f7d91bcdf9d91bceedd91bc5eed91bc6 -f0d91bc7f1d91bc8f3d91bc9e514e5d9 -1bc0e8d91bc1e9d91bc2ead91bc3ecd9 -1bc4e1d91bbce2d91bbde3d91bbee4d9 -1bbf0bed19f20cf2d91badf5d91baef7 -d91bafedd91babeed91bacf1af29e50c -e5d91ba8e7d91ba9e9d91baae1d91ba5 -e2d91ba6e4d91ba70eed22f210f2d91b -b8f3d91bb9f5d91bbaf9d91bbbedd91b -b4eed91bb5f0d91bb6f1d91bb7e80ee8 -d91bb2e9d91bb3eacf5aecadc7e1d5ac -e2d91bb0e5d91bb16ea2606fa2957000 -14ec2ff219f70cf7d91ba2f8d91ba3fa -d91ba4f2d5aaf4d91ba0f6d91ba1ecd9 -1b9bedd91b9ceed91b9defd91b9ef1d9 -1b9fe714e7d91b96e8d91b97e9d91b98 -ead91b99ebd91b9ae1d91b92e2d91b93 -e4d91b94e5b9dfe6d91b950cee1cf40e -f4c171f5d91b85f9c381fad91b86eed9 -1b82f1d91b83f2d91b84ea0cead91b7f -ebd91b80edd91b81e1d5a1e2d91b7de9 -d91b7e0aed1af00cf0d91b8ff2d91b90 -f7d91b91edd91b8ceed91b8defd91b8e -e3d91b87e4d91b88e7d91b89e9d91b8a -ebd91b8b68c10c6bc0d56ba2606ca2c0 -6d0014ef2ff51af80cf8d91b7af9d91b -7bfad91b7cf5d91b77f6d91b78f7d91b -79efd91b73f0d91b74f1d91b75f2d599 -f4d91b76e713e7d91b6fe8d91b70ead9 -1b71edd91b72eed596e1d91b6ae2d91b -6be3d91b6ce4d91b6de6d91b6e0015f0 -30f51af80cf8d91b65f9d91b66fad91b -67f5d91b62f6d91b63f7d91b64f0d91b -5df1d91b5ef2d91b5ff3d91b60f4d91b -61e619ea0cead91b5aecd91b5beed91b -5ce6d91b58e7d91b59e8d761e1d91b53 -e2d91b54e3d91b55e4d91b56e5d91b57 -03e1d91b68e3d592e4d593f9d91b6968 -38694e6a01e2d91b51f4d91b5202e5d9 -1b49edd91b4af6d91b4b05f20cf2d91b -4ef3d91b4ff9d91b50e18fe9d91b4cee -d91b4d64586464658a6706e910e9d91b -44edd91b45f5d91b46f7d91b47e2d91b -41e4d91b42e7d91b4304e1d91b35ebd9 -1b36efd91b37f1d91b38f9d91b3906f2 -10f2d91b3df3d91b3ef4d91b3ff5d91b -40e4d91b3ae7d91b3bedd91b3c613c62 -a2566302e8abf9efd540f2d53f0010ee -26f414f4d91b24f5d91b25f6d91b26f7 -d91b27f9d91b28eed91b20efd91b21f2 -d91b22f3d91b23ea10ead91b1cebd91b -1decd91b1eedd91b1fe1d91b19e2d91b -1ae7d52ee9d91b1b0cea1ef010f0d91b -31f2d91b32f7d91b33f9d91b34ead91b -2eedd91b2feed91b30e50ce5d91b2be7 -d91b2ce9d91b2de1ab5ee2d91b29e4d9 -1b2a00166ec175765c7912792ee9b72b -efd91c6401f2d91ca3f5d91ca4765c77 -6a7805ed0cedd91ca0f5d91ca1f9d91c -a2e1d91c9de7d91c9eecd91c9f01e1d9 -1c94f4d91c9506f110f1d91c99f2d91c -9af5d91c9bf7d91c9ce1d91c96e7d91c -97eed91c98739673a26f74a287750013 -ed2af414f4d91c90f5d91c87f7d91c91 -f8d91c92fad91c93edd91c8beed91c8c -f0d91c8df1d91c8ef2d91c8fe614e6d9 -1c86e7d91c87e9d91c88ead91c89ecd9 -1c8ae1d91c80e2d91c81e3d91c82e4d9 -1c83e5012a304812616ef3d91c85012a -d91c844310ced91c8505f20cf2d91c7b -f3d91c7cf9d91c7de4d91c78eed91c79 -f0d91c7a01f7d91c7ef9d91c7f6e7e6f -a24f7209ed14edd91c41efd91c74f3d9 -1c75f7d91c76f9d91c77e1d91c6fe2d9 -1c70e5d91c71ebd91c72ecd91c7307ec -10ecd91c61f1d91c27f3d91c62f5d91c -63e1d91c5de4d91c5ee7d91c5febd91c -6009ed14edd91c6aeed91c6bf3d91c6c -f4d91c6df9d91c6ee2d91c65e7d91c66 -e9d91c67ebd91c68ecd91c6967c0df6b -7e6b7c6ca2526d09ed13edd91c59eed9 -1c5aefd91c5bf0d91c5cf4c1f0e2d91c -54e5d91c55e7d91c56ebd91c57ecd91c -5808eb14ebd91c46edd91c47efd91c48 -f2d91c49f9d91c4ae1d91c42e7d91c43 -e8d91c44e9d91c4508e914e9d91c4fec -d91c50f2d91c51f5d91c52f9d91c53e1 -d91c4be2d91c4ce5d91c4de7d91c4e67 -8a68a255690aec1af30cf3d91c3ff6d9 -1c40f9d91c41ecd91c3cedd91c3df2d9 -1c3ee1d91c37e7d91c38e8d91c39e9d9 -1c3aead91c3b07f010f0d91c32f2d91c -33f5d91c34f7d91c35e1d91c2ee9d91c -2fecd91c30edd91c3110e4d91c3661a2 -4562a2b963a2f064a2fa650cee1ef410 -f4d91c2af5d91c2bf6d91c2cf9d91c2d -eed91c27f2d91c28f3d91c29e90ce9d9 -1c24ead91c25ecd91c26e1d91c21e3d9 -1c22e5d91c230019ee3af41ef710f7d9 -1c0af8d91c0bf9d91c0cfad91c0df4d9 -1c07f5d91c08f6d91c09f10cf1d91c04 -f2d91c05f3d91c06eed91c01efd91c02 -f0d91c03e71dea0fead91bfeebd91bff -ecd91c00edbb95e7d91bfbe8d91bfce9 -d91bfde40ce4d91bf8e5d91bf9e6d91b -fae1d91bf5e2d91bf6e3d91bf70cea1e -ee10eed91c16efd91c17f8d91c18f9d9 -1c19ead91c13ecd91c14edd91c15e50c -e5d91c10e8d91c11e9d91c12e1d91c0e -e2d91c0fe4ab7d02ecd91c1aeed91c1b -f2d91c1c04e1d91c1de4b72be5d91c1e -e7d91c1febd91c2074a45675b2857600 -116e46751b75367746e5d70ae9d529ef -d74002edd748eed749f4d74a10e1d74b -6e326f42724c7410efd74702ebd73ded -d73ef0d73f01f2d741f4d74203e1d743 -efd744f3d745f4d74669a769a2586aa2 -706ba2716ca2946d0015ec25f314f809 -f8d73af9d73bfad73cf3d737f5d738f7 -d739ecd732edd733f0d734f1d735f2d7 -36e614e909e9d72fead730ebd731e6d7 -2ce7d72de8d72ee1d727e2d728e3d729 -e4d72ae5d72b07ec0cecd715eed716f4 -d717f6d718e3d711e4d712e6d713e7d7 -1410ebd7190aee14f409f4d722f5d723 -fad724eed71fefd720f0d721e1d71aea -d71bebd71cecd71dedd71e01f0d725f3 -d726613662a24365a2476710f2d71000 -10ed1df20ff2d703f3d704f5d705f6d7 -06f9d707edd5ffeed700efd701f0d702 -e80ce8d5fde9d5bbeab1ccecd5fee1d5 -f9e5d5fae6d5fbe7d5fc01e2d708ebd7 -0904e3d70bedd70cefd70df0d70ef2d7 -0f002775c18ce920f20ff2d1e6f3d1ff -f4d311f7a3b9f9d36ae9d13cebd15cec -d16feed19defd1b37a387a36e1cf9ee5 -cff6e756e8d12a06ed0cedd37deed37e -efd37ff8d380e8d37aead37becd37c01 -2a2e41127261e2d114012ad1135010cb -d11475a24176a28777a2b578a2f3790f -f21af60cf6d376f8d377f9d378fad379 -f2d372f3d373f4d374f5d375ea0cead1 -94ecd36feed370f0d371e1d36be5d36c -e8d36de9d36e0014ec25f314f809f8d3 -3af9d33bfad33cf3d337f5d338f6d339 -ecd332edd333eed334efd335f1d336e6 -0fe6d32de7d32ee8d32fe9d330ead331 -e1d328e2d329e3d32ae4d32be5d32c0d -ee17f40cf4d346f5d347f7d348f8d349 -eed343efd344f3d345e90ce9d33febd3 -40ecd341edd342e1d33de4bba1e5d33e -0012ee20f40ff4d357f5d358f7d359f8 -d35af9d35beed352efd353f0d354f1d3 -55f2d356e60fe6d34ee7d34fe8d350ec -d351edd163e1d34ae2d34be4d34ce5d3 -4d0def17f40cf4d366f5d367f8d368f9 -d369efd363f1d364f3d365e90ce9d35f -ead360edd361eed362e1d35ce5d35de7 -d35e6bc2e870c15870a25d71a29e72a2 -b973a40e740016ee2af414f709f7d325 -f9d326fad327f4d322f5d323f6d324f1 -09f1d18df2d320f3d321eed31defd31e -f0d31fe814eb09ebd31aecd31bedd31c -e8d317e9d318ead319e2d312e3d313e4 -d314e5d315e6d3160013ee20f60ff6d1 -d9f7d1d4f8d1daf9d1dbfad1dceed1d4 -f0d1d5f2d1d6f4d1d7f5d1d8e90fe9d1 -cfead1d0ebd1d1ecd1d2edd1d3e1d1ca -e3d1cbe5d1cce6d1cde7d1ce08ef0fef -d1e1f0d1e2f4d1e3f5d1e4f7d1e5e2d1 -ddecd1deedd1dfeed1e00017ef2af514 -f809f8d1fcf9d1fdfad1fef5d1f9f6d1 -faf7d1fbf209f2d1f6f3d1f7f4d1f8ef -d1f3f0d1f4f1d1f5e814ec09ecd1f0ed -d1f1eed1f2e8d1ede9d1eeead1efe509 -e5d1eae6d1ebe7d1ece1d1e7e2d1e8e3 -d1e90011ec1df50ff5d30cf6d30df7d3 -0ef8d30ffad310ecd308f0d309f2d30a -f4d30be60fe6cfa6e7d304e8d305e9d3 -06ead307e1d300e2d301e3d302e4d303 -6ba2586ca2936da2de6ea4336f0015ef -25f514f809f8d1c7f9d1c8fad1c9f5d1 -c4f6d1c5f7d1c6efd1bff0d1c0f1d1c1 -f2d1c2f3d1c3e814eb09ebd1bcecd1bd -edd1bee8d1b9e9d1baead1bbe2d1b4e3 -d1b5e4d1b6e6d1b7e7d1b80011f11df5 -0ff5d16af6d16bf7d16cf8d16dfad16e -f1d166f2d167f3d168f4d169e60fe6d1 -61e7d162ebd163ecd164f0d165e1d15d -e2d15ee4d15fe5d1600015ee25f414f7 -09f7d183f8d184f9d185f4d180f5d181 -f6d182eed17bf0d17cf1d17df2d17ef3 -d17fe714eb09ebd178ecd179edd17ae7 -d175e9d176ead177e1d170e2d171e3d1 -72e4d173e6d1740017ed2af414f709f7 -d19af9d19bfad19cf4d197f5d198f6d1 -99f009f0d194f1d195f2d196edd191ee -d192efd193e714ea09ead18febcfe6ec -d190e7d18ce8d18de9d18ee409e4d189 -e5d18ae6d18be1d186e2d187e3d18800 -15ee25f314f709f7d1b0f8d1b1f9d1b2 -f3d1adf4d1aef6d1afeed1a8efd1a9f0 -d1aaf1d1abf2d1ace714eb09ebd1a5ec -d1a6edd1a7e7d1a2e8d1a3e9d1a4e1d1 -9ee2d19fe3d1a0e4d1a1e5b77d66c11b -667e679a68a28869a2c36a0aee14f309 -f3d159f5d15af7d15beed156efd157f0 -d158e1d151e7d152e9d153ead154ecd1 -5504e9d10eeed10fefd110f2d111f4d1 -120015ef25f514f809f8d127f9d128fa -d129f5d124f6d125f7d126efd11ff0d1 -20f1d121f3d122f4d123e614e909e9d1 -1cead11deed11ee6d11ae7a7c9e8d11b -e1d115e2d116e3d117e4d118e5d11900 -11f11df50ff5d138f6d139f7c77ff9d1 -3afad13bf1d134f2d135f3d136f4d137 -e90fe9d12febd130ecd131edd132f0d1 -33e4d12be5d12ce6d12de8d12e0015ee -25f414f709f7d14ef8d14ff9d150f4d1 -4bf5d14cf6d14deed146efd147f0d148 -f1d149f3d14ae814eb09ebd143ecd144 -edd145e8d140e9d141ead142e2a936e3 -d13de4b5d9e6d13ee7d13f61a25d62a2 -a863a2f864a43e650016ef2af514f809 -f8d10bf9d10cfad10df5d108f6d109f7 -d10af209f2d105f3d106f4d107efd102 -f0d103f1d104e714eb09ebcfffedd100 -eed101e7cffce8cffde9cffee1cff7e2 -cff8e3cff9e4cffae5cffb0015ef25f5 -14f809f8cfb2f9cfb3facfb4f5cfaff6 -cfb0f7cfb1efcfaaf0cfabf1cfacf2cf -adf3cfaee614eb09ebcfa7eccfa8eecf -a9e6cfa4e7cfa5eacfa6e1cf9fe2cfa0 -e3cfa1e4cfa2e5cfa30016ed2af514f8 -09f8cfc9f9cfcafacfcbf5cfc6f6cfc7 -f7cfc8f009f0cfc3f3cfc4f4cfc5edcf -c0eecfc1efcfc2e714ea09eacfbdebcf -beeccfbfe7cfbae8cfbbe9cfbce1cfb5 -e3cfb6e4cfb7e5cfb8e6cfb90014ed25 -f314f809f8cfdef9cfdffacfe0f3cfdb -f5cfdcf7cfddedcfd6eecfd7efcfd8f0 -cfd9f1cfdae60fe6cfd1e7cfd2e8cfd3 -e9cfd4ebcfd5e1cfcce2cfcde3cfcee4 -cfcfe5cfd00015ed25f314f609f6cff3 -f8cff4f9cff5f3cff1f4cff2f5af6aed -cfeceecfedefcfeef1cfeff2cff0e714 -ea09eacfe9ebcfeaeccfebe7cfe6e8cf -e7e9cfe8e1cfe1e2cfe2e3cfe3e4cfe4 -e5cfe5001a6fc101775ae72ce742ebd3 -a0f2d510fa012a8a41127261e2d5f601 -2a2e43127972ecd394022ad3934b2a4d -10ced39510dad394776479687a01ee26 -f3d5f8012a2e41127261e2d5f6022ad5 -27412a4310ced5f710c6d5f610e1d5f4 -10e1d5f57345733e746a75907602e5d5 -f1e8d5f2ecd5f306eb0cebd5e6f0d5e7 -f3d5e8f5d5e9e1d5e3e8d5e4e9d5e505 -f009f0d5ecf2d5edf5d5eee1d5eae5d5 -ebe8af7301edd5eff2d5f06fa24d70a2 -51720014ee25f514f809f8d5e0f9d5e1 -fad5e2f5d5ddf6d5def7d5dfeed5d8ef -d5d9f0d5daf2d5dbf4d5dce70fe7d5d3 -e8d5d4e9d5d5ebd5d6edd5d7e1d5cee2 -d5cfe3d5d0e5d5d1e6d5d201ebafcaee -d5cb01e9d5ccf6d5cd68c0dc6bc0c26b -a2436ca2666da28e6e0bee25f509f5d5 -c8f8d5c9fad5caeed5c4f0d5c5f2012a -2e44126576e1d5c7012ad5c64e10d0d5 -c7e909e9d5c1ebd5c2edd5c3e1d3c1e5 -d5bfe7d5c00af014f609f6d3a9f7d3aa -f9d3abf0d3a6f1d3a7f5d3a8e1d3a1e7 -d3a2e8d3a3e9d3a4ebd3a50beb14f509 -f5d3b5f7cf5cf9d3b6ebd3b2edd3b3ee -d3b4e509e5d3afe6d3b0e9d3b1e1d3ac -e2d3ade3d3ae0bee14f209f2d3bff3d3 -c0f5adc5eed3bcefd3bdf0d3bee709e7 -d3bae9cf96edd3bbe1d3b7e2d3b8e4d3 -b9682e69386a10e9d39f01e1d39beed3 -9c01f3d39df6d39e651d6546664a6704 -e1d396e2d397e5d398e8d399efd39a10 -f3d39110e9d392615c62666407ea0cea -d38decd38eedd38ff5d390e1d389e5d3 -8ae7d38be9d38c01edd381f2d38205f2 -09f2d386f5d387f9d388e1d383e9d384 -ecd38570cedc70b00571b8d972baa273 -002b77c11aec25f214f509f5cf53f6cf -66f7cf6df2ae9af3cf28f4cf3deccdab -edcdbceecdd1efcde6f1a3cfe336e709 -e7cd46e9cd6febcd92e3cd00e426e5cd -2a032a3644444b4c5312696ee4cd1901 -2acd164910cecd17126576e1cd171268 -6feacd18773878a24a79a25f7aa28ae1 -abf00012f020f50ff5cf7bf6cf7cf7cf -7df8cf7ef9cf7ff0cf76f1cf77f2cf78 -f3cf79f4cf7ae90fe9cf71eacf72ebcf -73edcf74efcf75e2cf6ee6cf6fe7cf70 -e8cf6d06f20cf2cf83f3cf84f5cf85f7 -cf86e2cf80e5cf81eecf820ced17f20c -f2abe7f3cf90f7cf91f8cf92edcf8dee -cf8eefcf8fe909e9cf8aebcf8beccf8c -e1cf87e2cf88e3cf890aec14f609f6cf -9bf7cf9cf9cf9deccf98eecf99f0cf9a -e1cf93e2cf94e3cf95e4cf96e7cf976c -c2c171c15d74a5745275a25f7605e509 -e5cf6aedcf6bf3cf6ce1cf67e2cf68e3 -cf690014ed25f214f609f6cf50f7cf51 -f9cf52f2cf4df3cf4ef4cf4fedcf48ee -cf49efcf4af0cf4bf1cf4ce80fe8cf43 -e9cf44eacf45ebcf46eccf47e1cf3ee2 -cf3fe5cf40e6cf41e7cf420012ed20f4 -0ff4cf61f6cf62f7cf63f9cf64facf65 -edcf5cefcf5df1cf5ef2cf5ff3cf60e7 -0fe7cf58e9cf59eacf5aebcf5beccd4a -e1cf54e2cf55e3cf56e5cf5771a24872 -a25d730013ee20f50ff5cf38f6cf39f8 -cf3af9cf3bfacf3ceecf33efcf34f1cf -35f3cf36f4cf37e70fe7cf2ee8cf2fea -cf30eccf31edcf32e2cf29e3cf2ae4cf -2be5cf2ce6cf2d06ef0cefcf0ff1cf10 -f4cf11f5cf12e1cf0ce8cf0dedcf0e00 -16ee2af514f809f8b3e1f9cf26facf27 -f5cf23f6cf24f7cf25f209f2cf20f3cf -21f4cf22eecf1defcf1ef1cf1fe714eb -09ebcf1aeccf1bedcf1ce7cf17e8cf18 -e9cf19e1cf13e2cf14e3cd00e5cf15e6 -cf166ca2486da2806ea2c66fa4117000 -11ee1df20ff2cf08f3cf09f4cf0af6cf -0bf9b984eecf04efcf05f0cf06f1cf07 -e70fe7cdffe9cf00ebcf01eccf02edcf -03e2cdfbe3cdfce4cdfde5cdfe0010ee -1df50ff5cdb7f7cdb8f8cdb9f9cdbafa -cdbbeecdb4efcd92f0cdb5f2cdb6e90c -e9cdb0eacdb1eccdb2edcdb3e3cdace4 -cdade7cdaee8cdaf0014ee25f414f809 -f8cdcef9cdcffacdd0f4cdcbf5cdccf7 -cdcdeecdc6f0cdc7f1cdc8f2cdc9f3cd -cae70fe7cdc1e8cdc2eacdc3ebcdc4ec -cdc5e1cdbde2cdbee3cdbfe4b993e6cd -c00015ef25f514f809f8cde4f9cde5fa -a564f5cde1f6cde2f7cde3efcddcf0cd -ddf1cddef2cddff3cde0e914ec09eccd -d9edcddaeecddbe9cdd6eacdd7ebcdd8 -e2a7f3e3cdd2e5cdd3e6cdd4e7cdd500 -13f020f60ff6cdf6f7cdf7f8cdf8f9cd -f9facdfaf0cdf1f1cdf2f2cdf3f3cdf4 -f5cdf5e70fe7cdece9cdedebcdeeeccd -efefcdf0e1cde7e2cde8e3cde9e4cdea -e5cdeb66c17d69c0d869a25c6aa2a76b -0017ef2af514f809f8cda8f9cda9facd -aaf5cda5f6cda6f7cda7f209f2cda2f3 -cda3f4cda4efcd9ff0cda0f1cda1e714 -ea09eacd9cedcd9deecd9ee7cd99e8cd -9ae9cd9be409e4cd96e5cd97e6cd98e1 -cd93e2cd94e3cd950015ed25f514f809 -f8cd83f9cd84facd85f5cd80f6cd81f7 -cd82edcd7bf0cd7cf1cd7df2cd7ef3cd -7fe714ea09eacd78ebcd79eccd7ae7cd -75e8cd76e9cd77e1cd70e2cd71e4cd72 -e5cd73e6cd740bed14f409f4cd8ff5cd -90f7cd91edcd8cf0cd8df2cd8ee509e5 -cd89e7cd8aeccd8be1cd86e2cd87e4cd -8866a25767a25e680016ee2af414f709 -f7cd6cf9cd6dfacd6ef4cd69f5cd6af6 -cd6bf109f1cd66f2cd67f3cd68eecd63 -efcd64f0cd65e714ea09eacd60ebcd61 -edcd62e7cd5de8cd5ee9cd5fe1cd58e2 -cd59e3cd5ae4cd5be5cd5c02e5cd43ed -cd44f7cd450011ed1df40ff4cd53f5cd -54f7cd55f9cd56facd57edcd4ff0cd50 -f2cd51f3cd52e50fe5cd4be8cd4ce9cd -4deacd4eecb5d1e1cd47e2cd48e3cd49 -e4cd4a61a26262a2ad63a40564a45865 -0017ee2af414f709f7cd40f9cd41facd -42f4cd3df5cd3ef6cd3ff109f1cd3af2 -cd3bf3cd3ceecd37efcd38f0cd39e714 -ea09eacd34ebcd35eccd36e7cd31e8cd -32e9cd33e409e4cd2ee5cd2fe6cd30e1 -cd2be2cd2ce3cd2d0015f025f514f809 -f8cbe4f9cbe5facbe6f5cbe1f6cbe2f7 -cbe3f0a546f1cbddf2cbdef3cbdff4cb -e0e614eb09ebcbdaedcbdbefcbdce6cb -d7e8cbd8eacbd9e1cbd2e2cbd3e3cbd4 -e4cbd5e5cbd60018ee2df417f70cf7cb -fcf8cbfdf9cbfefacbfff4cbf9f5cbfa -f6cbfbf109f1cbf6f2cbf7f3cbf8eecb -f3efcbf4f0cbf5e814eb09ebcbf0eccb -f1edcbf2e8cbede9cbeeeacbefe409e4 -cbeae5cbebe7cbece1cbe7e2cbe8e3cb -e90012ee20f40ff4cd11f5cd12f6cd13 -f7cd14f8cd15eecd0defcd0ef0cd0ff2 -b51ff3cd10e70fe7cd08e8cd09e9cd0a -ebcd0beccd0ce2cd01e32ce5cd06e6cd -0722032acd024d2e52325410d2cd0510 -c5cd0310cfcd040feb1af20cf2cd26f3 -cd27f5cd28f8cd29ebcd22eecd23efcd -24f1cd25e60ce6cd1ee7cd1fe8cd20ea -cd21e1cd1ae2cd1be3cd1ce5cd1d001d -70c17b784be90ce9c94aecc96af3c909 -f4c9e1785079547a7ae1012a2e411272 -61e2c7e2012ac7e15010cbc7e210edcb -0705f509f5cb0bf8cb0cf9cb0de5cb08 -edcb09eecb0a02e5cb0ee8cb0feecb10 -73af736474a24575a2637707ee0ceecb -03efcb04f2cb05f7cb06e1c9ffe2cb00 -e7cb01edcb020aee14f409f4c9def5c9 -dff7c9e0eec9dbf1c9dcf3c9dde1c9d6 -e5c9d7e8c9d8e9c9d9edc9da09f00ff0 -c9e7f2c9e8f4c9e9f5c9eaf6c9ebe1c9 -e2e8c9e3e9c9e4eec9e5efc9e60013ef -20f50ff5c9fbf7c9fcf8c9fdf9c9fefa -c9edefc9f6f0c9f7f1c9f8f2c9f9f4c9 -fae60fe6c9f1e7c9f2e9c9f3eac9f4ed -c9f5e1c9ece2c9ede3c9eee4c9efe5c9 -f070a24571a270720012ed20f40ff4c9 -d2f5c9d3f7c9d4f8c9d5f9c9d2edc9ce -efc9cff0b365f1c9d0f2c9d1e60fe6c9 -c9e7c9cae8c9cbe9c9ccebc9cde1c9c5 -e3c9c6e4c9c7e5c9c80cee17f10cf1c9 -c0f2bd12f3c9c1f4c9c2eec9bdefc9be -f0c9bfeb09ebc9baecc9bbedc9bce1a7 -76e5c9b8e9c9b901e1c9c3edc9c468c1 -f76cc14d6ca2426da27d6ea2c86f0010 -ee1df30ff3c9b3f4c9b4f6c9b5f7c9b6 -f9c9b7eec9afefc9b0f0c9b1f1c9b2e8 -0ce8c9abe9c9acebc9adedc9aee3c9a7 -e5c9a8e6c9a9e7c9aa0011ee1df40ff4 -bfb3f5b906f6c978f7c979fac97aeec9 -74efc975f2c976f3c977e50fe5c96fe7 -c970e8c971ebc972ecc973e1c96be2c9 -6ce3c96de4c96e0015ee25f414f809f8 -c98cf9c98dfac98ef4c98af5c945f7c9 -8beec985efc986f1c987f2c988f3c989 -e614ea09eac982ecc983edc984e6c97f -e8c980e9c981e1c97be2c97ce3b548e4 -c97de5c97e0016ed53f33df709f7c9a4 -f9c9a5fac9a6f3c99ff426f6c9a3022a -32435e4c126174eec9a2042ac9a03132 -523853345410d2c9a21137b2c9a110d5 -c9a1127972ecc9a1f009f0c99cf1c99d -f2c99eedc999eec99aefc99be714ea09 -eac996ebc997ecc998e7c993e8c994e9 -c995e1c98fe2bbe9e3c990e4c991e5c9 -92686a69a2506aa29b6b08ee0feec965 -efc966f0c967f2c968f5c969e1c961e2 -c962e7c963e8c9640cee17f40cf4c946 -f5c947f6c948f7c949eec943efc944f2 -c945eb09ebc940ecc941edc942e4c93d -e7c93ee8c93f0015ef25f514f809f8c9 -5df9c95efac95ff5c95af6c95bf7c95c -efc955f0c956f2c957f3c958f4c959e7 -14ec09ecc952edc953eec954e7c950e8 -c951eaad1fe1c94be2c94ce3c94de4c9 -4ee6c94f10f4c96064836468658e66a2 -726708eb0febc938ecc939eec93af3c9 -3bf5c93ce1c934e4c935e7c936e9c937 -05ef09efc91ef4c91ff5c920e1c91be3 -c91ceec91d0011ef1df30ff3b113f6c9 -2df8c92ef9c92ffac930efc92af0c92b -f1c92cf2b113e70fe7c925e9c926ebc9 -27ecc928edc929e1c921e2c922e4c923 -e5c92402e1c931e5c932ecc933619662 -a295630fe91aee0ceec918f0c919f2a3 -55f7c91ae9c914eac915ebc916edc917 -e50ce5c910e6c911e7c912e8c913e1c9 -0ce2c90de3c90ee4c90f0016ef2af514 -f809f8c7f7f9c7f8fac7f9f5c7f4f6c7 -f5f7c7f6f209f2c7f2f3c7f3f4bbabef -c7eff0c7f0f1c7f1e71eeb13ebc7ebec -26edc7ee012ac7ec5012686cf0c7ede7 -c7e8e8c7e9e9c7eae2c7e3e3c7e4e4c7 -e5e5c7e6e6c7e70011ee1df30ff3c907 -f4c908f5c909f6c90af9c90beec903ef -c904f0c905f2c906e70fe7c7fee8c7ff -e9c900ecc901edc902e2c7fae3c7fbe5 -c7fce6c7fd057839782a797cf5cb110b -f014f409f4cb42f5cb43f7cb44f0cb3f -f1cb40f2cb41ec09eccb3ceecb3defcb -3ee1cb39e3cb3ae8cb3b01e1cb45f0cb -46755276a25a7705ed09edcb36f3cb37 -f4cb38e1cb33e3cb34e8cb350013ee20 -f60ff6cb21f7cb22f8cb23f9cb24facb -11eecb1cf0cb1df1cb1ef2cb1ff3cb20 -e70fe7cb17e9cb18ebcb19eccb1aedcb -1be1cb12e2cb13e3cb14e4cb15e6cb16 -0ded17f00cf0cb2ff3cb30f7cb31facb -32edcb2ceecb2defcb2ee80ce8cb28e9 -cb29eacb2aeccb2be1cb25e3cb26e5cb -270019709f7820ee0ceecb9aefc16cf5 -cbb9f7cbc8782a7934edcb8401e4cbcf -f7cbd010f5cbd1745b745075667705ed -09edcbccefcbcdf2cbcee1cbc9ebcbca -eccbcb03e3cbb5e8cbb6edcbb7f7cbb8 -0eed1af40cf4cbc4f5cbc5f9cbc6facb -c7edc16cefcbc1f0cbc2f1cbc3e60ce6 -cbbde7cbbee9cbbfebcbc0e2cbbae3cb -bbe5cbbc7034723e7301ebcbb3f7cbb4 -01eecbadf4cbae03e9cbafedcbb0efcb -b1f4cbb268c0ea6bb76b8a6da24a6ea2 -9a6f0cec17f00cf0cba9f2cbaaf5cbab -f7cbaceccba7edcb98efcba8e509e5cb -a4e6cba5e7cba6e2cba1e3cba2e4cba3 -06e90ce9ab7dedcb81f4cb82f7cb83e1 -cb7ee2cb7fe8cb800016ed2af414f809 -f8bda3f9cb98facb99f4cb95f5cb96f7 -cb97f009f0cb93f1cb94f2afd7edcb90 -eecb91efcb92e614e909e9cb8debcb8e -eccb8fe6cb8ae7cb8be8cb8ce1cb85e2 -cb86e3cb87e4cb88e5cb8905ee09eecb -9ef2cb9ff7cba0e4cb9be7cb9ceccb9d -683a69446a02e7cb7be9cb7cf3cb7d01 -e7cb71f0cb7207ee0ceecb77f2cb78f4 -cb79f5cb7ae1cb73e6cb74eccb75edcb -7664446446654a6704e1cb6ceecb6df2 -cb6ef3cb6ff5cb7010e2cb5f0bec14f3 -09f3cb69f4cb6af9cb6beccb66edcb67 -eecb68e709e7cb63e9cb64eacb65e1cb -60e2cb61e5cb62613062a2496310e6cb -5e0013ed20f60ff6cb55f7cb56f8cb57 -f9cb58facb59edcb50eecb51efcb52f0 -cb53f2cb54e70fe7cb4ce8cb4de9cb4e -eac309ebcb4fe1cb47e2cb48e3cb49e4 -cb4ae6cb4b03e2cb5aebcb5beccb5cf0 -cb5d6da6596eb8666f001b70c0f27923 -ea0ceac769edb183f2c7acf3c7bb792a -7a3ae3c75502e4c7ddedc7def9c7df10 -edc7e07462743c75a24976a2567701e9 -c7dbecc7dc0011f11df50ff5c7d1f7c7 -d2f8c7d3f9c7d4fac7d5f1c7cdf2c7ce -f3c7cff4c7d0e90fe9c7c8ebc7c9ecc7 -caedc7cbeec7cce1c7c4e2c7c5e4c7c6 -e5c7c704e2c7d6e5c7d7e9c7d8edc7d9 -eeb1cc10e4c7da705c72827307f00cf0 -c7c0f4c7c1f5c7c2f8c7c3e1c7bce3c7 -bde9c7beefc7bf05ef09efc7a9f4c7aa -f9c7abe1b560ebc7a7edc7a80ef31af7 -0cf7c7b8f8c7b9f9c7acfac7baf3c7b4 -f4c7b5f5c7b6f6c7b7e70ce7c7b0eec7 -b1efc7b2f2c7b3e1c7ade3c7aee5c7af -69c0f06c926c406d786ea25a6f02e4c7 -a4eec7a5f2c7a608ed0fedc783efc784 -f2c785f4c786f5c787e1c77fe4c780e5 -c781ebc7820def17f40cf4c792f5c793 -f7c794f8c795efc78ff0c790f2c791e7 -0ce7c78be9c78cebc78decc78ee1c788 -e2c789e3c78a0def17f30cf3c7a0f4c7 -a1f5c7a2f8c7a3efc79df0c79ef2c79f -e90ce9c799eac79aebc79beec79ce1c7 -96e5c797e7c79869966aa2426b0fed1a -f50cf5c77bf6c77cf8c77dfac77eedc7 -77efc778f2c779f3c77ae50ce5c773e7 -c774e9c775ebc776e1c76fe2c770e3c7 -71e4c77202e1c766e5c767eec76805f3 -09f3c76cf6c76df7c76ee2c76ae3c76b -e7c76964326438664e67586801f4c764 -f5c76503e1c759ebc75af4c75bf5c75c -01f3c75df5c75e04e2c75fe3c760e7c7 -61efc762f5c763613a62506302e1c756 -efc757f5c75803e1c749e3c74af2c74b -f6c74c07ef0cefc751f2c752f4c753f5 -c754e9c74debc74eecc74fedc7500024 -73c2cae82aef0fefc16cf2c1b4f3b200 -f4c1e3f9a9d2e8bfcde9bf2febbf26ec -c128ee012ad833ed4d126f6ee7af5177 -c14c773878a26179a2bc7aa2fde7bfb3 -0017ed2af314f609f6c33af7c33bfac3 -3cf3c337f4c338f5c339f009f0c335f1 -c336f2addfedc332eec333efc334e714 -ea09eab1ccebc330ecc331e7c32de8c3 -2ee9c32fe409e4af29e5c32be6c32ce1 -c328e2c329e3c32a0019ee2df417f70c -f7c353f8c354f9c355fac356f4c350f5 -c351f6c352f109f1c34df2c34ef3c34f -eec34aefc34bf0c34ce717ea0ceac346 -ebc347ecc348edc349e7c343e8c344e9 -c345e409e4c340e5c341e6c342e1c33d -e2c33ee3c33f0013ed20f60ff6c364f7 -c365f8c366f9c367fac368edc360f0c3 -61f2c362f4c1cbf5c363e70fe7c35be8 -c35ceac35debc35eecc35fe2c357e3c3 -58e4a51de5c359e6c35a0013ef20f50f -f5c378f6c379f7c37af8c37bfac37cef -c373f0c374f1c375f2c376f4c377ea0f -eac36eebc36fecc370edc371eec372e1 -c369e4c36ae5c36be8c36ce9c36d73a2 -5074a2a075a2f8760014f025f514f809 -f8c325f9c326fac327f5c322f6c323f7 -c324f0c31df1c31ef2c31ff3c320f4c3 -21e80fe8c318ebc319ecc31aeec31bef -c31ce1c313e4c314e5c315e6c316e7c3 -170016ee2af514f809f8c1e0f9c1e1fa -c1e2f5c1ddf6c1def7c1dff109f1c1db -f3c1dcf4c1cbeec1d8efc1d9f0c1dae8 -14eb09ebc1d5ecc1d6edc1d7e8c1d2e9 -c1d3eac1d4e2c1cde3c1cee5c1cfe6c1 -d0e7c1d10018ed2df317f60cf6c1f9f7 -c1faf8c1fbf9c1fcf3c1f6f4c1f7f5c1 -f8f009f0c1f3f1c1f4f2c1f5edc1f0ee -c1f1efc1f2e714ea09eac1edebc1eeec -c1efe7c1eae8c1ebe9c1ece409e4c1e7 -e5c1e8e6c1e9e1c1e4e2c1e5e3c1e600 -15ef25f414f809f8c310f9c311fac312 -f4c30df5c30ef6c30fefc308f0c309f1 -c30af2c30bf3c30ce714ea09eac305eb -c306edc307e7c302e8c303e9c304e1c1 -fde2c1fee3c1ffe4c300e5c3016ac307 -6ec1c76ea2626fa2bb70a40b71a46372 -0017ef2af514f809f8c1caf9c1cbfac1 -ccf5c1c7f6c1c8f7c1c9f209f2c1c4f3 -c1c5f4c1c6efc1c1f0c1c2f1c1c3e814 -ec09ecc1beedc1bfeec1c0e8c1bbeac1 -bcebc1bde409e4c1b8e6c1b9e7c1bae1 -c1b5e2c1b6e3c1b70018ed2df417f70c -f7c168f8c169f9c16afac16bf4c165f5 -c166f6c167f109f1c162f2c163f3c164 -edc15feec160f0c161e715ea0aeac15d -ebd829caecc15ee7c15ae8c15be9c15c -e409e4c157e5c158e6c159e1c154e2c1 -55e3c1560016ef2af514f809f8c180f9 -c181fac182f5c17df6c17ef7c17ff209 -f2c17af3c17bf4c17cefc177f0c178f1 -c179e714ea09eac175ebc176edabd2e7 -c172e8c173e9c174e1c16de3c16ee4c1 -6fe5c170e6c1710018ee2df417f70cf7 -c198f8c199f9c19afac19bf4c195f5c1 -96f6c197f109f1c192f2c193f3c194ee -c18fefc190f0c191e814eb09ebc18cec -c18dedc18ee8c189e9c18aeac18be409 -e4c186e5c187e7c188e1c183e2c184e3 -c1850017ee2af514f809f8c1b1f9c1b2 -fac1b3f5c1aef6c1aff7c1b0f109f1c1 -abf2c1acf3c1adeec1a8efc1a9f0c1aa -e814eb09ebc1a5ecc1a6edc1a7e8c1a2 -e9c1a3eac1a4e509e5c19fe6c1a0e7c1 -a1e1c19ce2c19de3c19e6aa2556ba2a0 -6ca2eb6d0015ef25f514f809f8c151f9 -c152fac153f5c14ef6c14ff7c150efc1 -49f0c14af1c14bf2c14cf4c14de614e9 -09e9c146edc147eec148e6c143e7c144 -e8c145e1c13ee2c13fe3c140e4c141e5 -c1420015ee25f514f809f8c10ff9c110 -fac111f5c10cf6c10df7c10eeec107f1 -c108f2c109f3c10af4c10be814eb09eb -c104ecc105edc106e8c101e9c102eac1 -03e2bffce3bffde4bffee5bfffe7c100 -0015ef25f514f809f8c125f9c126fac1 -27f5c122f6c123f7c124efc11df0c11e -f2c11ff3c120f4c121e914ec09ecc11a -edc11beec11ce9c117eac118ebc119e1 -c112e2c113e3c114e5c115e6c1160014 -ee25f314f709f7c13bf8c13cfac13df3 -c138f5c139f6c13aeec133efc134f0c1 -35f1c136f2c137e80fe8c12ee9c12fea -c130ebc131ecc132e1c129e2c12ae3c1 -2be5c12ce6c12d65c1c465a26266a2b2 -67a40a68a465690017ed2af414f809f8 -bff9f9bffafabffbf4bff6f5bff7f7bf -f8f009f0bff3f1bff4f2bff5edbff0ee -bff1efbff2e714ea09eabfedebbfeeec -bfefe7bfeae8bfebe9bfece409e4bfe7 -e5bfe8e6bfe9e1bfe4e2bfe5e3bfe600 -16ee2af414f709f7bf97f9bf98fabf99 -f4bf94f5bf95f6bf96f109f1bf91f2bf -92f3bf93eebf8eefbf8ff0bf90e714eb -09ebbf8becbf8cedbf8de7abc6e8bf89 -eabf8ae1bf84e2bf85e3bf86e4bf87e5 -bf880018ed2df417f70cf7bfaff8bfb0 -f9bfb1fabfb2f4bfacf5bfadf6bfaef0 -09f0bfa9f1bfaaf2bfabedbfa6eebfa7 -efbfa8e714ea09eabfa3ebbfa4ecbfa5 -e7bfa0e8bfa1e9bfa2e409e4bf9de5bf -9ee6bf9fe1bf9ae2bf9be3bf9c0019ee -2df417f70cf7bfcaf8b711f9bfcbfabf -ccf4bfc7f5bfc8f6bfc9f109f1bfc4f2 -bfc5f3bfc6eebfc1efbfc2f0bfc3e717 -ea0ceabfbdebbfbeecbfbfedbfc0e7bf -bae8bfbbe9bfbce409e4bfb7e5bfb8e6 -bfb9e1bfb4e2bfb5e3bfb60016ee2af4 -14f809f8bfe1f9bfe2fabfe3f4bfdef5 -bfdff7bfe0f109f1bfdcf2abb3f3bfdd -eebfd9efbfdaf0bfdbe714eb09ebbfd6 -ecbfd7edbfd8e7bfd3e9bfd4eabfd5e2 -bfcee3bfcfe4bfd0e5bfd1e6bfd261a2 -5f62a2b463a409640017ee2af514f809 -f8bf81f9bf82fabf83f5bf7ef6bf7ff7 -bf80f209f2bf7bf3bf7cf4bf7deebf78 -f0bf79f1bf7ae714ea09eabf75ebbf76 -edbf77e7bf72e8bf73e9bf74e409e4bf -6fe5bf70e6bf71e1bf6ce2bf6de3bf6e -0015ee2ff51df812f8bf36f926fabf39 -22012abf374310c3bf38f5bf33f6bf34 -f7bf35eed82517efbf2ff1bf30f3bf31 -f4bf32e614ea09eabf2cebbf2dedbf2e -e6bf29e7bf2ae9bf2be1bf24e2bf25e3 -bf26e4bf27e5bf280017ef2af514f809 -f8bf4ff9bf50fabf51f5bf4cf6bf4df7 -bf4ef209f2bf49f3bf4af4bf4befbf46 -f0bf47f1bf48e914ec09ecbf43edbf44 -eebf45e9bf40eabf41ebbf42e409e4bf -3de6bf3ee8bf3fe1bf3ae2bf3be3bf3c -0019ee2df417f70cf7bf68f8bf69f9bf -6afabf6bf4bf65f5bf66f6bf67f109f1 -bf62f2bf63f3bf64eebf5fefbf60f0bf -61e717ea0ceabf5bebbf5cecbf5dedbf -5ee7bf58e8bf59e9bf5ae409e4bf55e5 -bf56e6bf57e1bf52e2bf53e3bf540024 -73c1dfe220ee0feec589efc5a1f2c5c8 -f6c70ff9c727e2c395e4c3bfe5c3d8e7 -c3f3ecaf8377c0d27736787479a2527a -a2a7e1c37d09ed0fedc717efc718f2c7 -19f7c71af8c71be2c712e3c713e5c714 -e7c715e9c7160bee14f209f2c725f5a9 -58f8c726eec722efc723f1c724e709e7 -c71fe9c720ecc721e1c71ce4c71de5c7 -1e0017ee2af414f709f7c73cf8c73df9 -c73ef4c739f5c73af6c73bf109f1c736 -f2c737f3c738eec733efc734f0c735e8 -14eb09ebc730ecc731edc732e8c72de9 -c72eeac72fe509e5c72ae6c72be7c72c -e2c728e3b364e4c72909ed0fedc744f2 -c745f5c746f9c747fac748e1c73fe2c7 -40e4c741e9c742ebc743734274a25775 -a2887602e8c710edc711efa7000014ee -25f514f809f8c5e7f9c5e8fac5e9f5c5 -e4f6c5e5f7c5e6eec5dfefc5e0f1c5e1 -f3c5e2f4c5e3e60fe6c5dae7c5dbe8c5 -dcebc5ddedc5dee1c5d5e2c5d6e3c5d7 -e4c5d8e5c5d90eef1af50cf5c5f4f8c5 -f5f9c5f6fac5f7efc5f1f0c5f2f2c5f3 -f3ad1fe90ce9c5edeac5eeebc5efedc5 -f0e4c5eae5c5ebe7c5ec0017ef2af514 -f809f8c70cf9c70dfac70ef5c709f6c7 -0af7c70bf209f2c706f3c707f4c708ef -c703f0c704f1c705e814eb09ebc701ed -c702eea5dce8c5fee9c5ffeac700e509 -e5c5fbe6c5fce7c5fde1c5f8e3c5f9e4 -c5fa6ac2596ec1256e966fa29370a2d9 -71a2fc720dec17f00cf0c5d2f5c39bf8 -c5d3fac5d4ecc5cfedc5d0eec5d1e60c -e6c5cce7c5cde9c5ceebc569e1c5c9e2 -c5cae5c5cb0018ed2df417f70cf7c59e -f8c506f9c59ffac5a0f4c59bf5c59cf6 -c59df109f1c599f2c59af3c3a5edc596 -eec597f0c598e714ea09eac593ebc594 -ecc595e7c590e8c591e9c592e409e4c5 -8de5c58ee6c58fe1c58ae2c58be3c58c -0014ed25f314f609f6c5b2f7c5b3f9c5 -b4f3c5aff4c5b0f5c5b1edab6ceec5ac -efaf64f0c5adf1c5aee70fe7c5a7e8c5 -a8e9c5a9eac5aaebc5abe1c5a2e3c5a3 -e4c5a4e5c5a5e6c5a60aee14f509f5c5 -bcf8c5bdf9c5beeec5b9efc5baf3c5bb -e2c5b5e7c5b6e8c5b7e9c3d8ecc5b808 -ee0feec5c3efc5c4f1c5c5f4c5c6f9c5 -c7e7c5bfebc5c0ecc5c1edc5c26aa262 -6ba29a6ca2ea6d0018ed2df317f60cf6 -c585f7c586f8c587fac588f3c582f4c5 -83f5c584f009f0c57ff1c580f2c581ed -c57ceec57defc57ee714ea09eac579eb -c57aecc57be7c576e8c577e9c578e409 -e4c573e5c574e6c575e1c570e2c571e3 -c5720010ee1df40ff4c544f5c545f8c5 -46f9c547faad93eec540efc541f2c542 -f3c543e90ce9c53ceac53decc53eedc5 -3fe1c538e2c539e4c53ae8c53b0016ed -2af414f709f7c55cf8c55dfac55ef4c5 -59f5c55af6c55bf109f1c556f2c557f3 -c558edc553eec554efc555e614e909e9 -c550eac551ebc552e6c54de7c54ee8c5 -4fe1c548e2c549e3c54ae4c54be5c54c -0011ef1df60ff6c56bf7c56cf8c56df9 -c56efac56fefc567f1c568f2c569f5c5 -6ae90fe9c563eac564ebc565edc566ee -a5e3e1c55fe3c560e5c561e7c56265c1 -5f65a25d66a2a367a2b068a405690016 -ee2af514f809f8c535f9c536fac537f5 -c532f6c533f7c534f209f2c52ff3c530 -f4c531eec52cefc52df1c52ee714ea09 -eac529ecc52aedc52be7c526e8c527e9 -c528e1c521e2c522e4c523e5c524e6c5 -250014ed25f414f809f8c3ebf9c3ecfa -c3edf4c3e8f5c3e9f7c3eaedc3e3eec3 -e4efc3e5f1c3e6f2c3e7e70fe7c3dee8 -c3dfe9c3e0eac3e1ebc3e2e1c3d9e2c3 -dae3c3dbe4c3dce5c3dd04e1c3eee4c3 -efecc3f0f2c3f1f5c3f20017ee2af514 -f809f8c508f9c509fac50af5c505f6c5 -06f7c507f209f2c503f3c504f4bd92ee -c500f0c501f1c502e814eb09ebc3fdec -c3feedc3ffe8c3fae9c3fbeac3fce409 -e4c3f7e5c3f8e7c3f9e1c3f4e2c3f5e3 -c3f60015ef25f514f809f8c51ef9c51f -fac520f5c51bf6c51cf7c51defc516f0 -c517f1c518f2c519f4c51ae614eb09eb -c513edc514eec515e6c510e7c511e9c5 -12e1c50be2c50ce3c50de4c50ee5c50f -61a25f62a2bc63a407640017ee2af514 -f809f8c3d5f9c3d6fac3d7f5c3d2f6c3 -d3f7c3d4f209f2c3cff3c3d0f4c3d1ee -c3ccf0c3cdf1c3cee814eb09ebc3c9ec -c3caedc3cbe8c3c6e9c3c7eac3c8e409 -e4c3c3e6c3c4e7c3c5e1c3c0e2c3c1e3 -c3c20015ee37f314f809f8c392f9c393 -fac394f3c38ff4c390f7c391ee38efc3 -8bf0c38cf1c38df2c38e012a2e481261 -6ef4c38a012ac3895410d7c38ae614eb -09ebc386ecc387edc388e6c383e7c384 -eac385e1c37ee2c37fe3c380e4c381e5 -c3820015ee25f414f709f7c3a9f8b307 -f9c3aaf4c3a6f5c3a7f6c3a8eec3a1ef -c3a2f0c3a3f1c3a4f2c3a5e614ea09ea -c39eebc39fedc3a0e6c39be8c39ce9c3 -9de1c396e2c397e3c398e4c399e5c39a -0015ec25f114f509f5c3bcf8c3bdfac3 -bef1b7fff2c3baf4c3bbecc3b6edc3b7 -eec3b8efc3b9f0b7cce614e909e9c3b3 -eac3b4ebc3b5e6c3b0e7c3b1e8c3b2e1 -c3abe2c3ace3c3ade4c3aee5c3af66db -f469d2ea69aade6ab05c6bb4406c0022 -72c13ee11dee0feebdaeefbdbdf4bdee -f5bdf7f6bf0de1bbe2e2bbf7e7bd3de9 -bd557667766e779478a25579a2567a03 -e8bf1fecbf20eebf21fa012a2e471265 -6ff2bf23012abf224710c5bf2305ec09 -ecbf11f3bf0df5bf12e1bf0ee9bf0feb -bf1008ec0fecbf17edbf18efbf19f4bf -1af7bf1be1bf13e5bf14e7bf15e8bf16 -10edbf1c01e1bf1deebf1e72a25573a2 -7d74a292750015ef25f414f709f7bf0b -f9ab12fabf0cf4bf08f5bf09f6bf0aef -bf03f0bf04f1bf05f2bf06f3bf07e914 -ec09ecbf00edbf01eebf02e9bdfdeabd -feebbdffe1bdf8e3bdf9e4bdfae5bdfb -e6bdfc0bed14f409f4bde4f6bde5fabd -e6edbde1eebde2efbde3e909e9bddeeb -bddfecbde0e1bddbe3bddce7bddd06e9 -0ce9bdeaedbdebf2bdecf3bdede1bde7 -e4bde8e5bde907ee0ceebdf3efbdf4f3 -bdf5f5bdf6e3bdefe7bdf0e8bdf1e9bd -f269c1ed6dc0f76d3c6ea25e6fa28c70 -a2dc7110f2bdda0016ec2af214f709f7 -bdabf8bdacf9bdadf2bda8f5bda9f6bd -aaef09efbda5f0bda6f1bda7ecbda2ed -bda3eebda4e614e909e9bd9feabda0eb -bda1e6bd9ce7bd9de8bd9ee1bd97e2bd -98e3bd99e4bd9ae5bd9b0dec17f30cf3 -bdb9f5bdbaf7bdbbfabdbcecbdb6edbd -b7eebdb8e70ce7bdb2e8bdb3e9bdb4ea -bdb5e1bdafe2bdb0e4bdb10016ee2af4 -14f809f8bdd2f9bdd3fabdd4f4bdcff5 -bdd0f7bdd1f109f1bdccf2bdcdf3bdce -eebdc9efbdcaf0bdcbe814eb09ebbdc6 -ecbdc7edbdc8e8bdc3e9bdc4eabdc5e1 -bdbee2bdbfe3bdc0e5bdc1e7bdc204e1 -bdd5e5bdd6eebdd7efbdd8f8bdd969a2 -456aa29a6ba2af6c0011eb1def0fefbd -92f0bd93f1bd94f5bd95f8bd96ebbd8e -ecbd8fedbd90eebd91e50fe5bd89e6bd -8ae7bd8be9bd8ceabd8de1bd85e2bd86 -e3bd87e4bd880015ef25f514f809f8bd -6af9bd6bfabd6cf5bd67f6bd68f7bd69 -efbd62f0bd63f1bd64f2bd65f3bd66e6 -1eea09eabd5febbd60ecbd61e62ce7bd -5de8bd5e012abd5b4c12696de2bd5ce1 -bd56e2bd57e3bd58e4bd59e5bd5a06ec -0cecbd70f0bd71f7bd72f8bd73e1bd6d -e5bd6ee9bd6f0010ec1df20ff2bd80f3 -bd81f4bd82f5bd83f9bd84ecbd7cedbd -7deebd7eefbd7fe50ce5bd78e8bd79e9 -bd7aeabd7be1bd74e2bd75e3bd76e4bd -7765bd656466a27d67a2816807ee0cee -bd51f3bd52f4bd53f5bd54e1bd4de8bd -4ee9bd4fedbd500019ee2df417f70cf7 -bd37f8bd38f9bd39fabd3af4bd34f5bd -35f6bd36f109f1bd31f2bd32f3bd33ee -bd2eefbd2ff0bd30e717ea0ceabd2aeb -bd2becbd2cedbd2de7afe1e8bd28e9bd -29e409e4bd25e5bd26e6bd27e1bd22e2 -bd23e3bd2401e1bd3beebd3c0eed1af2 -0cf2bd49f4bd4af5bd4bfabd4cedbd45 -eebd46efbd47f1bd48e80ce8bd41e9bd -42ebbd43ecbd44e1bd3ee2bd3fe7bd40 -619062a27e63a2bc640deb17ee0ceebd -1eefbd1ff0bd20f1bd21ebbd1becbd1c -edbd1de70ce7bd17e8bd18e9bd19eabd -1ae1bd14e2bd15e4bd160014ec25f214 -f709f7bbf4f8bbf5fabbf6f2bbf1f3bb -f2f5bbf3ecbbecedbbedeebbeef0bbef -f1bbf0e70fe7bbe8e8bbe9e9bbeaeabb -ebebbb33e1bbe3e2bbe4e3bbe5e4bbe6 -e5bbe70012ef20f60ff6bd05f7bd06f8 -bd07f9bd08fabd09efbd00f1bd01f2bd -02f4bd03f5bd04ea0feabbfceba921ec -bbfdedbbfeeebbffe2bbf8e5bbf9e6bb -fae9bbfb09ec0fecbd0fedbd10f0bd11 -f1bd12f3bd13e3bd0ae4bd0be5bd0ce6 -bd0de8bd0e002474a9e520ef0fefb5bc -f3b568f4b5d7f5b594f7b5ebe5b576e7 -b57fe9b58debaffbeeb5b3782d783479 -3e7a4ee1b557e4b56b01e3b5f0ecb5f1 -02e1b5f2efb5f3f8b5f404e8b5f5e9b1 -11edb5f6f2b5f7fab5f8744875a24876 -a2497703ebb5ecedb5edefb5eef3b5ef -0ff21af70cf7b5e4f8b5e5f9b5e6fab5 -e7f2b5e0f3b5e1f4b5e2f6b5e3eb0ceb -b5dcecb5ddedb5deefb5dfe2b5d8e4b5 -d9e5b5dae9b5db10edb5e801e2b5e9f6 -b5ea6bc0fc6f626f7a708a7194729e73 -0aeb14ef09efb5d4f4b5d5f5b5d6ebb5 -d1edb5d2eeb5d3e1b5cce3b5cde4b5ce -e8b5cfe9b5d002f2b5bdf5b5bef7b5bf -01e9b5c0efb5c101f5b5c2f7b5c307ee -0ceeb5c8f5b5c9f8b5caf9b5cbe5b5c4 -e8b5c5e9b5c6ebb5c76b646ca24d6da2 -756e07ee0ceeb5b8efb5b9f0b5baf4b5 -bbe2b5b4e7b5b5e8b5b6eab5b70cf017 -f60cf6b59df7b59ef8b59ffab5a0f0b5 -9af2b59bf4b59ceb09ebb597ecb598ef -b599e5b594e8b595e9b5960bed14f509 -f5b5a9f6b5aaf7b176edb5a6efb5a7f0 -b5a8e909e9b5a4ebb5a5ecb5a6e1b5a1 -e2b5a2e7b5a307f20cf2b5aff3b5b0f4 -b5b1f9b5b2e9b5abecb5aceeb5adefb5 -ae66656652678468a24d69a2576a04e3 -b58fe5b590eab591eeb592f3b59307eb -0cebb57bedb57cf5b57df9b57ee1b577 -e2b578e5b579e6b57a08ed0fedb584ee -b585efb586f3b587f7b588e2b580e5b5 -81e7b582ecb58303e2b589e9b58af0b5 -8bf7b58c10eeb58e616e627e63a25a64 -09e90fe9b571f2b572f3b573f4b574f5 -b575e1b56ce2b56de3b56ee4b56fe5b5 -7002e9b558eeb559f2b55a0ce917ee0c -eeb563f2b564f5b565f9b566e9b560ec -b561edb562e509e5b55de7b55ee8b55f -e1a7f3e2b55be4b55c03e1b567e5b568 -e8b569f2b56a00186eb07628e10ce1b5 -f9e9b72bf6b76df7b770763a77447902 -e1b772e5b773f9b77401e4b76eeeb76f -10e9b771715071947298750fee1af40c -f4b769f5b76af7b76bf9b76ceeb765ef -b766f0b767f2b768e90ce9b761ebb762 -ecb763edb764e1b75de2b75ee4b75fe8 -b76010f2b75804e1b759e2a3b6f2b75a -f4b75bf5b75c6e346f607001e1b756f2 -b75706e90ce9b74deab74eecb74ff3b7 -50e1b74ae4b74be7b74c04e2b751e4b7 -52e7b753f2b754f7b75568796b3c6b72 -6c886d0aec14f309f3b747f7b748f8b7 -49ecb744eeb745f2b746e1b73fe2b740 -e3b741e4b742e9b74303e1b73aedb73b -efb73cf5b73d10e5b73e683469386a01 -e5b738f2b73910e9b72a0bec14f509f5 -b735f6b736f9b737ecb732edb733f4b7 -34e409e4b72fe5b730e7b731e1b72ce2 -b72de3b72e643d644065506703e2b727 -e5b728ebb707efb72902e1b71ae7b71b -f4b71c09ec0fecb722eeb723f2b724f4 -b725f5b726e2b71de5b71ee8b71fe9b7 -20ebb721613062a24e6310f4b7190014 -ed25f314f809f8b70bf9b70cfab70df3 -b708f4b709f5b70aedb703eeb704efb7 -05f1b706f2b707e60fe6b5ffe8b700ea -b701ebb702ecb527e1b5fae2b5fbe3b5 -fce4b5fde5b5fe0aee14f409f4b716f5 -b717f7b718eeb713efb714f2b715e5b7 -0ee9b70feab710ebb711edb712002875 -c29feb74f23ff628f6b9eff7bb84f902 -2a32414c4c126174eebbb4022abbb243 -2a5410d2bbb410cebbb3127261e2bbb3 -f2b9b1f3bb24f5022aac7d41ac835912 -657ae9b9a5eb38ecb976edb991eeb9ae -efb9c7012a2e41127261e2b95a042ab9 -5841324336493a4d10ceb95c10c6b959 -10ceb95a10d2b95b7a667a38e1b1c3e7 -b7fce9b929eab9400017ee2af514f809 -f8bbdff9bbe0fabbe1f5bbdcf6bbddf7 -bbdef209f2bbdaf3bbdbf4af6aeebbd7 -efbbd8f0bbd9e814eb09ebaf56ecbbd5 -edbbd6e8add6e9bbd4eaaf6ae409e4bb -d1e5bbd2e6bbd3e1bbcee2bbcfe3bbd0 -75a26576a2ba77a40f78a467790018ed -2df417f70cf7bbcaf8bbcbf9bbccfabb -cdf4bbc7f5bbc8f6bbc9f109f1bbc4f2 -bbc5f3bbc6edbbc1eebbc2efbbc3e714 -ea09eabbbeebbbbfecbbc0e7bbbbe8bb -bce9bbbde409e4bbb8e5bbb9e6bbbae1 -bbb5e2bbb6e3bbb70017ee2af514f809 -f8bb6af9bb6bfabb6cf5bb67f6bb68f7 -bb69f109f1bb64f3bb65f4bb66eebb61 -efbb62f0bb63e814eb09ebbb5eecbb5f -edbb60e8bb5be9bb5ceabb5de509e5bb -58e6bb59e7bb5ae2bb55e3bb56e4bb57 -0017ee2af414f809f8bb81f9bb82fabb -83f4bb7ef6bb7ff7bb80f109f1bb7cf2 -bb7df3b1adeebb79efbb7af0bb7be714 -ea09eabb76ecbb77edbb78e7bb73e8bb -74e9bb75e409e4bb70e5bb71e6bb72e1 -bb6de2bb6ee3bb6f0018ed2df317f60c -f6b9d0f7bb9af9bb9bfabb9cf3bb97f4 -bb98f5bb99f009f0bb94f1bb95f2bb96 -edbb91eebb92efbb93e714ea09eabb8e -ebbb8fecbb90e7bb8be8bb8ce9bb8de4 -09e4bb88e5bb89e6bb8ae1bb85e2bb86 -e3bb870015ee25f414f809f8bbaff9bb -b0fabbb1f4bbacf6bbadf7bbaeeebba7 -efbba8f0bba9f1bbaaf2bbabe614eb09 -ebbba5ecbb1eedbba6e6bba2e9bba3ea -bba4e1bb9de2bb9ee3bb9fe4bba0e5bb -a16bc3b470c1cf70a26871a2c072a41b -73a46b740019ee2df417f70cf7bb52f8 -bb53f9bb54faa591f4bb4ff5bb50f6bb -51f109f1bb4df2af6af3bb4eeebb4aef -bb4bf0bb4ce717ea0ceabb46ebbb47ec -bb48edbb49e7bb43e8bb44e9bb45e409 -e4bb40e5bb41e6bb42e1bb3de2bb3ee3 -bb3f0018ee2df417f70cf7b9f0f8b9f1 -f9b9f2fab9f3f4b9edf5b9eef6b9eff1 -09f1b9eaf2b9ebf3b9eceeb9e8efb9e9 -f0b73be814eb09ebb9e5ecb9e6edb9e7 -e8b9e2e9b9e3eab9e4e509e5b9dfe6b9 -e0e7b9e1e1b9dce3b9dde4b9de0019ee -2df417f70cf7bb0af8bb0bf9bb0cfabb -0df4bb07f5bb08f6bb09f109f1bb04f2 -bb05f3bb06eebb01efbb02f0bb03e717 -ea0ceab9fdebb9feecb9ffedbb00e7b9 -fae8b9fbe9b9fce409e4b9f7e5b9f8e6 -b9f9e1b9f4e2b9f5e3b9f60016ed2af5 -14f809f8bb21f9bb22fabb23f5bb1ef6 -bb1ff7bb20f209f2bb1bf3bb1cf4bb1d -eda90beebb19f0bb1ae614ea09eabb16 -ebbb17ecbb18e6bb13e8bb14e9bb15e1 -bb0ee2bb0fe3bb10e4bb11e5bb120017 -ee2af414f709f7bb3af8bb3bfabb3cf4 -bb37f5bb38f6bb39f109f1bb34f2bb35 -f3bb36eebb31efbb32f0bb33e814eb09 -ebbb2eecbb2fedbb30e8bb2be9bb2cea -bb2de509e5bb28e6bb29e7bb2ae2bb25 -e3bb26e4bb276ba2536ca2ab6da4066e -a47b6f0014ec25f414f709f7b9d9f9b9 -dafab9dbf4b9d6f5b9d7f6b9d8ecb9d1 -efb9d2f0b9d3f1b9d4f3b9d5e70fe7b9 -cde8b9cee9b9cfeab9d0ebb33be1b9c8 -e3b9c9e4b9cae5b9cbe6b9cc0018ed2d -f417f70cf7b972f8b973f9b974fab975 -f4b96ff5b970f6b971f109f1b96cf2b9 -6df3b96eedb969efb96af0b96be714ea -09eab966ebb967ecb968e7b963e8b964 -e9b965e409e4b960e5b961e6b962e1b9 -5de2b95ee3b95f0019ee2df417f70cf7 -b98df8b98ef9b98ffab990f4b98af5b9 -8bf6b98cf109f1b987f2b988f3b989ee -b984efb985f0b986e717ea0ceab980eb -b981ecb982edb983e7b97de8b97ee9b9 -7fe409e4b97ae5b97be6b97ce1b977e2 -b978e3b9790019ee47f417f70cf7b9aa -f8b9abf9b9acfab9adf4b9a7f5b9a8f6 -b9a9f123f1b9a1f226f3b9a6022a3241 -405912657ae9b9a5012ab9a24c10c2b9 -a3127261e2b9a4eeb99eefb99ff0b9a0 -e717ea0ceab99bebb99cecb902edb99d -e7b998e8b999e9b99ae409e4b995e5b9 -96e6b997e1b992e2b993e3b9940018ee -2df417f70cf7b9c3f8b9c4f9b9c5fab9 -c6f4b9c0f5b9c1f6b9c2f109f1b9bdf2 -b9bef3b9bfeeb9baefb9bbf0b9bce714 -eb09ebb9b7ecb9b8edb9b9e7b7fce9b9 -b5eab9b6e409e4b9b2e5b9b3e6b9b4e1 -b9afe2b9b0e3b9b166c1a766a25d67a2 -b268a2f869a44d6a0016ed2af314f809 -f8b955f9b956fab957f3b952f4b953f5 -b954f009f0b94ff1b950f2b951edb94c -eeb94defb94ee714ea09eab949ebb94a -ecb94be7b946e8b947e9b948e1b941e2 -b942e3b943e4b944e5b9450017ee2af5 -14f809f8b7f9f9b7fafab7fbf5b7f6f6 -b7f7f7b7f8f109f1b7f3f2b7f4f3b7f5 -eeb7f0efb7f1f0b7f2e714eb09ebb7ed -ecb7eeedb7efe7b7eae8b7ebe9b7ece4 -09e4b7e7e5b7e8e6b7e9e1b7e4e2b7e5 -e3b7e60014ef25f414f709f7b90ff8b9 -10f9b911f4b90cf5b90df6b90eefb907 -f0b908f1b909f2b90af3b90be80fe8b9 -02eab903ebb904ecb905edb906e1b7fd -e2b7fee4b7ffe5b900e6b9010017ef2a -f514f809f8b926f9b927fab928f5b923 -f6b924f7b925f209f2b920f3b921f4b9 -22efb91df0b91ef1b91fe714eb09ebc8 -1aecb91beeb91ce7b918e8b919eab91a -e409e4b915e5b916e6b917e1b912e2b9 -13e3b9140015ef25f514f809f8b93df9 -b93efab93ff5b93af6b93bf7b93cefb9 -35f0b936f1b937f3b938f4b939e614ea -09eab932ecb933edb934e6b92fe7b930 -e8b931e1b92ae2b92be3b92ce4b92de5 -b92e61a25d62a29563a2ed64a4426500 -16ed2af514f809f8b7e1f9b7e2fab7e3 -f5b7def6b7dff7b7e0f209f2b7dbf3b7 -dcf4b7ddedb7d8eeb7d9efb7dae614e9 -09e9b7d5ebb7d6ecb7d7e6b7d2e7b7d3 -e8b7d4e1b7cde2b7cee3b7cfe4b7d0e5 -b7d10010eb1df10ff1b781f6b782f7b7 -83f8b784f9b785ebb77dedb77eefb77f -f0b780e70ce7b779e8b77ae9b77beab7 -7ce1b775e2b776e3b777e4b7780018ee -2df417f70cf7b79bf8b79cf9b79dfab7 -9ef4b798f5b799f6b79af109f1b795f2 -b796f3b797eeb792efb793f0b794e814 -eb09ebb78fecb790edb791e8b78ce9b7 -8deab78ee409e4b789e5b78ae7b78be1 -b786e2b787e3b7880017ed2af414f709 -f7b7b4f9b7b5fab7b6f4b7b1f5b7b2f6 -b7b3f009f0b7aef1b7aff3b7b0edb7ab -eeb7acefb7ade714ea09eab7a8ebb7a9 -ecb7aae7b7a5e8b7a6e9b7a7e409e4b7 -a2e5b7a3e6b7a4e1b79fe2b7a0e3b7a1 -0015ed25f414f809f8b7caf9b7cbfab7 -ccf4b7c7f6b7c8f7b7c9edb7c2eeb7c3 -f0b7c4f1b7c5f2b7c6e714ea09eab7bf -ebb7c0ecb7c1e7b7bce8b7bde9b7bee1 -b7b7e3b7b8e4b7b9e5b7bae6b7bb66a6 -c567aa3268001e72c0f8e51af40cf4b5 -30f5b536f9a554fab556e5b3cae9b3d6 -efb50cf2b51f763f765877747984e122 -032ab3a9372e43345310c4b3aa1133b6 -b3aa10cdb3ab04e3b54ce5b54debb54e -eeb54ff6b55002e1b551e3b552efb553 -01e1b554f7b55572a25073a27b74a282 -750014ed25f514f809f8b549f9b54afa -b54bf5b546f6b547f7b548edb541f0b5 -42f2b543f3b544f4b545e70fe7b53ce8 -b53de9b53eebb53fecb540e2b537e3b5 -38e4b539e5b53ae6b53b0cf017f50cf5 -b529f7b52af8b52bfab52cf0b526f2b5 -27f4b528eb09ebb523edb524efb525e1 -b520e3b521e5b52202e2b52deeb52ef3 -b52f04e9b531efb532f3b533f5b534f8 -b53569c1116dae6d366ea2436fa26b70 -10efb51e0010f11df50ff5b3fcf6b3fd -f7b3fef9b3fffab500f1b3f8f2b3f9f3 -b3faf4b3fbea0ceab3f5edb3f6eeb3cb -f0b3f7e1b3f1e2b3f2e4b3f3e6b3f409 -e919e9b506ea32eeb509efb50af3b50b -012ab50748126d6ee7b508e1b501e4b5 -02e5b503e7b504e8b5050010ec1df20f -f2b519f4b51af6b51bf7b51cf9b51dec -b515edb516efb517f0b518e50ce5b511 -e8b512e9b513eab514e1b50de2b50ee3 -b50fe4b510694e6aa24b6ba24c6c04e1 -b3ece2b3ede4b3eef4b3eff5b3f00feb -1af20cf2b3e3f4b3e4f7b3e5f8b3e6eb -b3dfecb3e0edb3e1efb3e2e70ce7b3db -e8b3dce9b3ddeab3dee1b3d7e2b3d8e4 -b3d9e6b3da10e9b3e703e1b3e8e5b3e9 -e8b3eaebb3eb6434643e6548676e6802 -e9b3d3f2b3d4f9b3d501eeb3b2f9b3c9 -05e809e8b3cee9b3cfedb3d0e1b3cbe4 -b3cce7b3cd01edb3d1f7b3d2613062a2 -656310e8b3c80015ee25f314f809f8b3 -c0f9b3c1fab3c2f3b3bdf6b3bef7b3bf -eeb3b8efb3b9f0b3baf1b3bbf2b3bce8 -26eb1beb2cecb3b6edb3b7012a2e4812 -616ef4b3b5012ab3b45410d7b3b5e8b3 -b1e9b3b2eab3b3e1b3ace3b3ade4b3ae -e5b3afe7b3b004e1b3c3e2b3c4eeb3c5 -efb3c6f5b3c700177199e614ef09efb1 -44f2b14df9b169e6a254e9b12ceab135 -7612762a772ee1b11310f2b16601e1b1 -67e5b16871a24272a243750eed1af40c -f4b162f5b163f6b164f9b165edb15eee -b15ff1b160f2b161e50ce5b15ae6b15b -e8b15ce9b15de2b158e326e4b159012a -b1274112646cedb12810f3b14c0aef14 -f209f2b155f3b156f4b157efb152f0b1 -53f1b154e3b14ee4b14fe5b14debb150 -edb1516b556e286e2e6f3e7010e5b14b -02e2b141e7b142e9b14305ee09eeb148 -f2b149f3b14ae4b145e9b146edb1476b -346c3e6d01f0b13ff5b14001ebb136f6 -b13706ec0cecb13beeb13cf2b13df9b1 -3ee1b138e8b139e9b13a662b665c6766 -6907f00cf0b131f2b132f4b133f7b134 -e1b12de5b12ee6b12fecb13001e9b129 -edb12a10f2b12b613062a2466510f2b1 -260012ec20f40ff4a3b9f5b122f8b123 -f9b124fab125ecb11dedb11eeeb11ff0 -b120f2b121e70fe7b118e8b119e9b11a -eab11bebb11ce1b114e2b115e4b116e6 -b11710eca799001f71c18a7953ec0cec -b300eeb31af5b365f6b37b79307a8ee1 -b16ae4b1a40dec17ef0cefb3a2f2b3a3 -f9b3a4fab3a5ecb39fedb3a0eeb3a1e5 -0ce5b39be6b39ce7b39de9b39ee1b184 -e2b399e4b39a02e1b3a6e9b3a7eeb3a8 -75c0c5753676a25b77a2867810f8b398 -0016ed2af414f709f7b378f8b379fab3 -7af4b376f5b377f6af89f009f0b373f1 -b374f2b375edb370eeb371efb372e614 -e909e9b36debb36eecb36fe6b36be7b3 -1ae8b36ce1b366e2b367e3b368e4b369 -e5b36a0ced17f00cf0b385f2b1d4f3b3 -86f9b387edb382eeb383efb384e609e6 -b37feab380ecb381e1b37ce3b37de5b3 -7e0fea1af40cf4b394f5b395f7b396f8 -b397eab390edb391eeb392f2b393e50c -e5b38ce6b38de7b38ee9b38fe1b388e2 -b389e3b38ae4b38b7140725073a25674 -02e1b363e9b364f5b1d502e1b34aeeb3 -4bf2b34c0012ed20f60ff6b359f7b35a -f8b35bf9b35cfab35dedb354f1b355f3 -b356f4b357f5b358e50fe5afc4e7b350 -e8b351e9b352eab353e1b34de2b192e3 -b34ee4b34f04ecb35eeeb35fefb360f0 -b361f7b36269c17f6dc0e26d406e9e6f -a2807002e1b347e5b348eeb3490dee17 -f60cf6b316f8b317f9b318fab319eeb3 -13f2b314f5b315e70ce7b30fe8b310ec -b311edb312e1b30ce2b30de4b30e0013 -ec20f20ff2b32af4b32bf5b32cf7b32d -fab32eecb325edb326eeb327efb328f1 -b329e70fe7b320e8b321e9b322eab323 -ebb324e1b31be2b31ce3b31de4b31ee5 -b31f0018ed2df317f60cf6b343f7b344 -f8b345f9b346f3b340f4b341f5b342f0 -09f0b33df1b33ef2b33fedb33beeb328 -efb33ce714ea09eab338ebb339ecb33a -e7b335e8b336e9b337e409e4b332e5b3 -33e6b334e1b32fe2b330e3b33169846a -a26d6ba27a6c0beb14f209f2b309f5b3 -0af7b30bebb306ecb307efb308e809e8 -b304e9af56eab305e2b301e3b302e4b3 -030011ee1df30ff3b1eff4b1f0f8b1f1 -f9b1f2fab1f3eeb1ebf0b1ecf1b1edf2 -b1eee50fe5b1e6e7b1e7e8b1e8ecb1e9 -edb1eae1b1e2e2b1e3e3b1e4e4b1e504 -ebb1f4edb1f5eeb1f6f2b1f7f5b1f806 -ee0ceeb1fcefb1fdf0b1fef5b1ffe1b1 -f9e4b1fae5b1fb65a0656a66a26667a2 -6a6808ee0feeb1ddefb1def2b1dff3b1 -e0f4b1e1e1b1d9e3b1dae5b1dbebb1dc -0013ec20f60ff6b1c6f7b1c7f8b1c8f9 -b1c9fab1caecb1c2efb1c3f1b1c4f2ad -bcf3b1c5e70fe7b1bde8b1bee9b1bfea -b1c0ebb1c1e1b1b8e2b1b9e3b1bae4b1 -bbe6b1bc01ebb1cbf8b1cc0cec17f20c -f2b1d5f4b1d6f5b1d7f7b1d8ecb1d3ee -b1d4efaff8e509e5b1d0e7b1d1ebb1d2 -e1b1cde2b1cee4b1cf61a24862a2a363 -a2fb640012eb20f10ff1b1b3f2b1b4f4 -b1b5f5b1b6f8b1b7ebb1aeecb1afedb1 -b0eeb1b1efb1b2e60fe6b1a9e7b1aae8 -b1abe9b1aceab1ade2b1a5e3b1a6e4b1 -a7e5b1a80019ee2df417f70cf7b180f8 -b181f9b182fab183f4b17ef5b17ff6ad -cbf109f1b17bf2b17cf3b17deeb178ef -b179f0b17ae717ea0ceab174ebb175ec -b176edb177e7b171e8b172e9b173e409 -e4b16ee5b16fe6b170e1b16be2b16ce3 -b16d0018ed2df317f70cf7b199f8b19a -f9b19bfab19cf3b196f5b197f6b198f0 -09f0b193f1b194f2b195edb190eeb191 -efb192e714ea09eab18debb18eecb18f -e7b18ae8b18be9b18ce409e4b187e5b1 -88e6b189e1b184e2b185e3b18606ec0c -ecb1a0eeb1a1f2b1a2f4b1a3e3b19de4 -b19ee6b19f63cb0463a4dc64aea76500 -1d73927a29ef0cefafeaf3aff6f4afbd -f5a5f87a44e5afabecafc4ee012aafd9 -53126861f7afda01e1b111e5b1127620 -76387748784c7901e1b10fefb11002e5 -b10ae8b10beeb10c10efb10d10f4b10e -732e74667510e4b10908eb0febaffbed -affcf3affdf5affef9afffe5aff7e7af -f8e8aff9e9affa08f30ff3b104f4b105 -f5b106f8b107fab108e2b100eeb101ef -b102f2b1036ac0e96e636e6a6fa25670 -a2577208eb0febaff1f2aff2f3aff3f4 -aff4f7aff5e1afede7afeee8afefe9af -f00eed1af20cf2afe6f6afe7f7afe8f8 -afe9edafe2eeafe3efafe4f1afe5e40c -e4afdee6afdfe8afe0ecafe1e1afdbe2 -afdce3afdd10f4afeb10e9afec6aa242 -6ba2436ca2666d0dee17f50cf5afd5f7 -afd6f8afd7faafd8eeafd2f0afd3f3af -d4e716e7afcde9afceeb26edafd1012a -afcf4e126b6fefafd0e1afcae2afcbe5 -afcc10e1afb80aec14f009f0afc1f2af -c2f9afc3ecafbeedafbfefafc0e1afb9 -e5afbae7afbbe9afbcebafbd05ef09ef -afc8f0a3f2f5afc9e5afc5ebafc6edaf -c7662f663e674e686a6902f0afb5f4af -b6f6afb702e1aface5afade9afae04e1 -afafecafb0edafb1efafb2f9afb310f5 -afb4613462386301f2afa9f9afaa10e1 -afa305ef09efafa6f2afa7f5afa8e3af -a4e7afa5eba7d5002272c161e127f219 -f2ad2df3ad44f52cf6ad74f9ad7d012a -ad6347126c61e7ad64e1ab49e5ab88e8 -ab98efad0c7643764e7758787e79827a -04e5ad44e8ad81ebad82eead83f4ad84 -01e7ad75eead7605e509e5ad79e7ad7a -f4ad7be1ad77e2ad78e4ad2d10e8ad7c -02e1ad7ee2ad7fefad80729673a28674 -a2b4750eec1af50cf5ad70f6ad71f8ad -72f9ad73ecad6cefad6df0ad6ef4ad6f -e80ce8ad68e9ad69eaad6aebad6be1ad -65e2ad66e3ad670015ed25f414f809f8 -ad41f9ad42faad43f4ad3ef6ad3ff7ad -40edad39eead3aefad3bf1ad3cf3ad3d -e714ea09eaad36ebad37ecad38e7ad33 -e8ad34e9ad35e1ad2ee2ad2fe3ad30e4 -ad31e6ad320df017f60cf6ad4ff7ad50 -f9ad51faad52f0ad4cf3ad4df4ad4eea -0ceaad48ebad49edad4aefad4be1ad45 -e2ad46e8ad470fee1af40cf4ad5ff5ad -60f9ad61faad62eead5befad5cf0ad5d -f3ad5ee70ce7ad57e8ad58ecad59edad -5ae1ad53e3ad54e4ad55e5ad5669c19b -6dc0d06d3a6e826fa25f70a2a07110e4 -ad2c0aec14f209f2abd6f3abfcf4abfd -ecabfaeea4b6efabfbe1abf5e5abf6e7 -abf7e9abf8ebabf90dec17f30cf3ad08 -f4ad09f7ad0af8ad0becad05f0ad06f1 -ad07e70ce7ad01e8ad02e9ad03ebad04 -e1abfee2abffe3ad000013ec20f40ff4 -ad1cf5ad1df8ad1ef9ad1ffaad20ecad -17edad18efad19f0ad1af1ad1be60fe6 -ad12e7ad13e8ad14eaad15ebad16e1ad -0de2ad0ee3ad0fe4ad10e5ad110aee14 -f509f5ad29f8ad2af9ad2beead26efad -27f3ad28e1ad21e2ad22e3ad23e7ad24 -e9ad25699c6aa2616ba28c6c0fec1af4 -0cf4abf1f5abf2f7abf3f9abf4ecabed -edabeeefabeff3abf0e80ce8abe9e9ab -eaeaabebebabece1abe5e3abe6e4abe7 -e5abe80aed14f209f2abc6f7abc7f9ab -c8edabc3eeabc4f0abc5e1abbee2abbf -e3abc0e5abc1e8abc20cee17f20cf2ab -d2f3abd3f6abd4f9abd5eeabcfefabd0 -f0abd1e909e9abccebabcdedabcee1ab -c9e5abcae8abcb0ef21af60cf6abe1f8 -abe2f9abe3faabe4f2abddf3abdef4ab -dff5abe0ed0cedabd9eeabdaefabdbf1 -abdce1abd6e2abd7ecabd865c0e465a2 -af66a2c467a2ce680013ee20f40ff4ab -b9f7abbaf8abbbf9abbcfaabbdeeabb4 -efabb5f0abb6f1abb7f2abb8e973e938 -eaabb0ebabb1ecabb2edabb3022a3c42 -a2594811616e01e2abaff4abaa0b4d2d -5417542e55385610c4abad01c8aba9d7 -abaa01cbababd3abac4dcc9d502a5310 -d2aba802c6aba5c8aba6daaba7470e47 -3048cc814910c4aba310c6aba12aab9e -412a4210ceaba010d5ab9f126f70efab -aee2ab99e4ab9ae6ab9be7ab9ce8ab9d -06eb0cebab8ceeab8df4ab8ef9ab8fe1 -ab89e2ab8ae7ab8b03e1ab90e4ab91e7 -ab92edab9303e1ab94e3ab95e7ab96eb -ab97616a62a27563a2b06408ea0feaab -83edab84efab85f2ab86faab87e5ab7f -e6ab80e8ab81e9ab820016ed2af314f8 -09f8ab5ef9ab5ffaab60f3ab5bf6ab5c -f7ab5df009f0ab58f1ab59f2ab5aedab -55eeab56efab57e614ea09eaab52ebab -53ecab54e6ab4fe7ab50e8ab51e1ab4a -e2ab4be3ab4ce4ab4de5ab4e0011ef1d -f40ff4ab6ef5ab6ff6ab70f7ab71f9ab -72efab6af1ab6bf2ab6cf3ab6de90fe9 -ab65eaab66ebab67ecab68eeab69e2ab -61e3ab62e4ab63e7ab640bec14f009f0 -ab7cf1ab7df2ab7eecab79edab7aefab -7be709e7ab76e8ab77eaab78e3ab73e4 -ab74e5ab75001a6fc1b2776ce10ce1ad -85e5adbcf6af8afaa34f775079887a05 -e709e7afa0ecafa1eeafa2e1af9ee4af -9fe5af0a08f30ff3af8ff5af79f7af90 -f9af91faaf92e1af8cebaf8decadaaf2 -af8e0aed14f209f2af9bf5af9cf9af9d -edaf98eeaf99efaf9ae1af93e2af94e4 -af95e7af96e9af9773b37334746075a2 -4e7610e1af8b06eb0cebaf5eeeaf5fef -af60f1af61e2af5be8af5ce9af5d0def -17f30cf3af6cf4af6df5af6ef9af6fef -af69f0af6af2af6be80ce8af65e9af66 -ebaf67edaf68e1af62e2af63e4af6400 -19ee2df417f70cf7af86f8af87f9af88 -faaf89f4af83f5af84f6af85f109f1af -80f2af81f3af82eeaf7defaf7ef0af7f -e717ea0ceaaf79ebaf7aecaf7bedaf7c -e7af76e8af77e9af78e409e4af73e5af -74e6af75e1af70e2af71e3af726fa247 -70a285720def17f30cf3af57f4af58f5 -af59f9af5aefaf54f1af55f2af56e81e -e832e9af52eca7beeeaf53012a2e4d12 -6f6ee7af51012aaf504310ceaf51e3af -4de5af4ee7af4f0012ee20f40ff4af47 -f6af48f7af49f8af4af9af4beeaf42ef -af43f0af44f2af45f3af46e60fe6af3e -e8af3fe9add8ebaf40ecaf41e1af3ae2 -af3be3af3ce5af3d10f0af4c68c15d6b -9d6b966ca2506da2576e0eee1af50cf5 -af36f6af37f7af38f9af39eeaf32efaf -33f2af34f4af35e70ce7af2fe9af30ea -ad8aebaf31e1af2ce4af2de5af2e06ec -0ceca540f2af14f3af15f8af16e1af11 -e7af12ebaf1302e7af17edaf18eeaf19 -0011ed1df50ff5af27f6af28f7af29f8 -af2af9af2bedaf23efaf24f2af25f3af -26e50fe5af1ee6af1fe7af20ebaf21ec -af22e1af1ae2af1be3af1ce4af1d6896 -69a2666a0feb1aef0cefaf0df2af0ef5 -af0ff7af10ebaf09ecaf0aedaf0beeaf -0ce50ce5af05e6af06e9af07eaaf08e1 -af01e2af02e3af03e4af040cef17f50c -f5ade8f6ade9f7adeaf8adebefade5f2 -ade6f3ade7ec09ecade2edade3eeade4 -e4addfe7ade0e9ade10016ee2af414f8 -09f8adfef9adfffaaf00f4adf0f5adfc -f7adfdf109f1adf9f2adfaf3adfbeead -f5efadf7f0adf8e714ea09eaadf4ebad -f5ecadf6e7adf1e8adf2e9adf3e1adec -e2adede3adeee4adefe6adf064a264a2 -4265a265670011ec1df30ff3addaf4ad -dbf7addcf8adddfaaddeecadd6eeadd7 -efadd8f2add9e50fe5add1e7add2e8ad -d3e9add4ebadd5e1adcde2adcee3adcf -e4add00aea14f209f2adb9f3adbaf7ad -bbeaadb6eeadb7efadb8e1adb1e4adb2 -e5adb3e7adb4e9adb50fec1af20cf2ad -c9f3adcaf6adcbfaadccecadc5edadc6 -eeadc7f1adc8e70ce7adc1e8adc2e9ad -c3ebadc4e3adbde4adbee5adbfe6adc0 -613662a2566301e3adaff2adb00015ed -25f314f709f7ad99f8ad9afaad9bf3ad -96f5ad97f6ad98edad91efad92f0ad93 -f1ad94f2ad95e714ea09eaad8eebad8f -ecad90e7ad8be8ad8ce9ad8de1ad86e3 -ad87e4ad88e5ad89e6ad8a0012ed20f4 -0ff4adaaf5adabf6adacf7adadf9adae -edada5eeada6efada7f0ada8f1ada9e6 -0fe6ada0e7ada1e9ada2eaada3ecada4 -e1ad9ce2ad9de4ad9ee5ad9f2ab40061 -ccef62002373c2d0e51ded0feda905ee -a91eefa936f2a979f3a993e5a74be7a7 -78e8a78ee9a7a777c14b773878a26179 -a2a77aa2e8e1a5ea0017ed2af414f809 -f8ab07f9ab08faab09f4ab04f5ab05f7 -ab06f109f1ab01f2ab02f3ab03eda9fe -efa9fff0ab00e714ea09eaa9fbeba9fc -eca9fde7a9f8e8a9f9e9a9fae409e4a9 -f5e5a9f6e6a9f7e1a9f2e2a9f3e3a9f4 -0014ed25f214f609f6ab1bf7ab1cfaab -1df2a9c2f3ab19f5ab1aedab14eeab15 -efab16f0ab17f1ab18e80fe8ab0fe9ab -10eaab11ebab12ecab13e1ab0ae2ab0b -e3ab0ce6ab0de7ab0e0013ec20f30ff3 -ab2df6ab2ef7ab2ff8ab30faab31ecab -28edab29eeab2af0ab2bf2ab2ce60fe6 -ab23e8ab24e9ab25eaab26ebab27e1ab -1ee2ab1fe3ab20e4ab21e5ab220017ee -2af514f809f8ab46f9ab47faab48f5ab -43f6ab44f7ab45f109f1ab40f2ab41f4 -ab42eeab3defab3ef0ab3fe814eb09eb -ab3aecab3bedab3ce8ab37e9ab38eaab -39e409e4ab34e5ab35e6ab36e1ab32e2 -ab33e3a7ca73a25a74a2aa75a2ff7600 -16ed2af514f809f8a9eff9a9f0faa9f1 -f5a9ecf6a9edf7a9eef109f1a9e9f2a9 -eaf4a9ebeda9e6eea9e7efa9e8e614e9 -09e9a9e3eaa9e4eba9e5e6a9e0e7a9e1 -e8a9e2e1a9dbe2a9dce3a9dde4a9dee5 -a9df0016ee2af414f709f7a9a8f8a9a9 -f9a9aaf4a9a5f5a9a6f6a9a7f109f1a9 -a2f2a9a3f3a9a4eea99fefa9a0f0a9a1 -e814eb09eba99ceca99deda99ee8a999 -e9a99aeaa99be1a994e2a995e3a996e5 -a997e6a9980017ef2af514f809f8a9bf -f9a9c0faa9c1f5a9bcf6a9bdf7a9bef2 -09f2a9b9f3a9baf4a9bbefa9b6f0a9b7 -f1a9b8e714ea09eaa9b3eda9b4eea9b5 -e7a9b0e8a9b1e9a9b2e409e4a9ade5a9 -aee6a9afe1a9abe2a74de3a9ac0018ee -2df417f70cf7a9d7f8a9d8f9a9d9faa9 -daf4a9d4f5a9d5f6a9d6f109f1a9d1f2 -a9d2f3a9d3eea9ceefa9cff0a9d0e714 -ea09eaa9cbeba9cceda9cde7a9c8e8a9 -c9e9a9cae409e4a9c5e5a9c6e6a9c7e1 -a9c2e2a9c3e3a9c46ac3186ec1a56ea2 -656fa2b570a2fb71a44b720018ee2df4 -17f70cf7a98ff8a990f9a991faa992f4 -a98cf5a98df6a98ef109f1a989f2a98a -f3a98beea986efa987f0a988e814eb09 -eba983eca984eda985e8a980e9a981ea -a982e409e4a97de6a97ee7a97fe1a97a -e2a97be3a97c0016ee2af514f809f8a9 -33f9a934faa935f5a930f6a931f7a932 -f109f1a92df2a92ef3a92feea92aefa9 -2bf0a92ce614ea09eaa927eba928eda9 -29e6a924e7a925e9a926e1a91fe2a920 -e3a921e4a922e5a9230014ef25f514f8 -09f8a949f9a94afaa94bf5a946f6a947 -f7a948efa941f0a942f1a943f2a944f4 -a945ea0feaa93ceba93deca93eeda93f -eea940e1a937e2a938e5a939e6a93ae8 -a93b0016ef2af514f809f8a960f9a961 -faa962f5a95df6a95ef7a95ff209f2a9 -5af3a95bf4a95cefa957f0a958f1a959 -e814eb09eba954eca955eda956e8a951 -e9a952eaa953e1a94ce3a94de4a94ee5 -a94fe7a9500015ef25f414f709f7a976 -f8a977faa978f4a973f5a974f6a975ef -a96ef0a96ff1a970f2a971f3a972e714 -eb09eba96beca96ceda96de7a968e9a9 -69eaa96ae1a963e2a964e3a965e4a966 -e6a9676aa25f6ba2b76ca40f6d0017ed -2af314f709f7a91bf8a91cfaa91df3a9 -18f5a919f6a91af009f0a915f1a916f2 -a917eda912eea913efa914e714ea09ea -a90feba910eca911e7a90ce8a90de9a9 -0ee409e4a909e5a90ae6a90be1a906e2 -a907e3a9080018ee2df417f70cf7a7d0 -f8a7d1f9a7d2faa7d3f4a7cdf5a7cef6 -a7cff109f1a7caf2a7cbf3a7cceea7c7 -efa7c8f0a7c9e814eb09eba7c4eca7c5 -eda7c6e8a7c1e9a7c2eaa7c3e409e4a7 -bee6a7bfe7a7c0e1a7bbe2a7bce3a7bd -0018ee2df417f70cf7a7e9f8a7eaf9a7 -ebfaa7ecf4a7e6f5a7e7f6a7e8f109f1 -a7e3f2a7e4f3a7e5eea7e0efa7e1f0a7 -e2e814eb09eba7ddeca7deeda7dfe8a7 -dae9a7dbeaa7dce409e4a7d7e6a7d8e7 -a7d9e1a7d4e2a7d5e3a7d60017ee2af4 -14f809f8a902f9a903faa904f4a7fff6 -a900f7a901f109f1a7fcf2a7fdf3a7fe -eea7f9efa7faf0a7fbe714ea09eaa7f6 -eba7f7eda7f8e7a7f3e8a7f4e9a7f5e4 -09e4a7f0e5a7f1e6a7f2e1a7ede2a7ee -e3a7ef65c19b65a25366a29e67a2e968 -a434690014ee25f414f709f7a7b8f9a7 -b9faa7baf4a7b5f5a7b6f6a7b7eea7b1 -efa7b2f0a7b3f1a7b4f2a7aae60fe6a7 -ade7a7aeeba723eca7afeda7b0e1a7a8 -e2a7a9e3a7aae4a7abe5a7ac0015ef25 -f514f809f8a75ff9a760faa761f5a75c -f6a75df7a75eefa757f0a758f1a759f3 -a75af4a75be614ea09eaa754eba755ed -a756e6a751e8a752e9a753e1a74ce2a7 -4de3a74ee4a74fe5a7500015ee25f414 -f809f8a775f9a776faa777f4a772f5a7 -73f7a774eea76defa76ef0a76ff1a770 -f3a771e614ea09eaa76aeca76beda76c -e6a767e7a768e8a769e1a762e2a763e3 -a764e4a765e5a7660015f025f514f809 -f8a78bf9a78cfaa78df5a788f6a789f7 -a78af0a783f1a784f2a785f3a786f4a7 -87e714ed09eda71eeea781efa782e7a7 -7ee9a77feaa780e1a779e2a77ae3a77b -e4a77ce6a77d0018ed2df317f60cf6a7 -a3f7a7a4f9a7a5faa7a6f3a7a0f4a7a1 -f5a7a2f009f0a79df1a79ef2a79feda7 -9beea79cefa78ee714ea09eaa798eba7 -99eca79ae7a795e8a796e9a797e409e4 -a792e5a793e6a794e1a78fe2a790e3a7 -9161a26562a2b563a40a640019ee2df4 -17f70cf7a747f8a748f9a749faa74af4 -a744f5a745f6a746f109f1a741f2a742 -f3a743eea73eefa73ff0a740e717ea0c -eaa73aeba73beca73ceda73de7a737e8 -a738e9a739e409e4a734e5a735e6a736 -e1a731e2a732e3a7330014ef2ff514f8 -09f8a5fef9a5fffaa700f5a5fbf6a5fc -f7a5fdefa5f5f032f1a5f8f2a5f9f3a5 -fa012aa5f64b127261e9a5f7e70fe7a5 -f0e8a5f1eaa5f2eca5f3eea5f4e1a5eb -e2a5ece3a5ede5a5eee6a5ef0017ee2a -f414f709f7a716f8a717f9a718f4a713 -f5a714f6a715f109f1a710f2a711f3a7 -12eea70defa70ef0a70fe714eb09eba7 -0aeca70beda70ce7a707e9a708eaa709 -e409e4a704e5a705e6a706e1a701e2a7 -02e3a7030018ed2df317f60cf6a72df7 -a72ef9a72ffaa730f3a72af4a72bf5a7 -2cf009f0a727f1a728f2a729eda724ee -a725efa726e714ea09eaa721eba722ec -a723e7a71ee8a71fe9a720e409e4a71b -e5a71ce6a71de1a719e2a71ae3a5f300 -184dc2af54c0f257375736584e59665a -12616ee2d5be01612c631168efc59811 -72e1d5bd01702c731175f8a3c21165ef -c92a01652c691169e9b58d117ae9b9a5 -544455a2ae5601612c691174e8d5bc11 -69e9d5bb08685e683c698c6ea2466fa2 -48751174e7d5ba106101e158e9042ad1 -2a43324b364c3a5410c8d12a10cebd11 -10c8d5b610c1d5b7012aaf8a4d10d6af -8a01622a7210e8d5b810f4012aa93642 -10d4a34f1173e1c5e301642a7410efd3 -6310f2d5b961346580668667116ce7d5 -b5056d116d2e6e327610f4a7ff10eccf -9e10e7d35e67346b386c01e5cfe4f5b9 -1310e2d5b210f2d5b3116cf5cff6116e -e7d5b4126761f2d39650c0c850a27652 -a2ad5306694769426f6a759079016c2a -7210e3abe710efd5b101643e6e01e4cd -19e8012acd6f4c10cbcd6f10e4d5ae02 -672e72387910efabf701e4cdecefd5af -10e1cf14106e01e4d5b0f5cf65613e67 -5e6801612a7210e4d5ad10f7afda026d -2e72327510f2cbe610f2cdc710e2d5ac -116ef7a565046138654c68526c787211 -74e9d5aa016c2a7510e3ad5510eda54c -1172edd5a802612e6c326e10f8c94310 -e7d5a901e9c7ecf0c7ed1172e4b3f302 -6a306f3675116ef2c5ac116ee7d5ab11 -68e7cb714d9a4ea2b34f057222723073 -44751167f2c7d8016b2a7910e1c7ac10 -e8c7c901672a6d10e1d5a710e5c7bc67 -306c366e1161efd5a61161edd5a51163 -ebcbe007722e725a7460756679116df2 -032aa9d2492e4d325410c8d59e10ceb9 -2210cda9d2116fefc1c11165e9d59c11 -6cf4d59d614265746c9a6f01642a6e10 -e7af5110e9d59b0368326b366e3a7210 -e3d59710ead59410e1d59501e4c368e9 -d5960264346e387201e3d599efd59a10 -e6af1f10e4d5981179edc12804613862 -58655e6b64731168f5d5a402672e6e32 -7210e2d5a110edd59f10e4d5a01161f4 -a54b1177e1d5a2116fef012aafd04d10 -ccd5a347c4644ac3704aa6f44ba80d4c -03614665a6d069a6d27901632a6410e9 -d59310e9d592026ea6ad6fa6ae7410ee -001d4ac16253a1571757ace758aceb59 -2a5a10d7cdd102c4d56bc5d56bd4d52d -534854a24555a2705603c1d528c5d52a -ced529d5a7a70ece1ad40cd4d51dd5bb -18d6d51ed9d58dced51acfcde6d2d51b -d3d58cc90cc9cdabcad518cbcd92cdd5 -19c3d517c4d56ac5cf660ccd17d20cd2 -d1e6d6d341d7d1fadacf6dcdd15cced5 -90cfd1b3c809c8d58fcbd164ccd523c4 -d58ec6d521c7d52204c1d591c7d525d3 -afd9d9d526dad5274d924d4e4ea25250 -a2675204c5d516cfc16cd3d58bd5bb18 -d7cbc80011cf1dd50fd5d504d6d588d8 -d505d9bf37dad506cfd586d1d502d2d5 -87d4c1e3c60fc6d501c7bfb3cbd585cc -a905cdb777c1d584c3d3ffc4d500c5cd -0306c90cc9d50accaf83cfc395d0d589 -c1d507c3d508c5d5090bcc14d409d4d5 -14d7c7f4d9b31accc96acdd511d2d512 -c7c5c1c7d1cfc8b130cbd58a4a564b5a -4c06d30cd3d3fbd4bdeed5d3fcd6bf0d -c2d582c9d3facbd58310cfd57f02c5d3 -f4cdd580dad58142c0ee465b46624772 -48a2444907d10cd1d57dd2d57ed3b568 -d4b5d7c3d3f1c4b56bccd57bced57c02 -c9b12ccfb144d2b14d0ace0cd2c62cd2 -d579d4d3eed7d3efc1d3e9c5d578c6d3 -eac8a3b9ccb97604cbd57aced3f0d2b5 -1fd4b530d5b536425e43a24544a27945 -06c70cc7d576d2d577d3aff6d4d569c1 -d3e5c3d3e6c5afbd0ecc0fd2c643d2c9 -e1d4d571d5b777d6d3d6c60cc6d3cfc7 -d570c9cb9acad3d1c1a993c4d56fc5d3 -ce0fce1ad60cd6d3e0d7c7f0d9d574da -ad44ced573cfd3ddd2d3ded5d3dfc80c -c8d3d9c9d3daccd3dbcdd3dcc3d572c4 -d3d7c6cd46c7d3d804c5adbccad3e2cb -ad85cfd3e3dad575343d34aea2377c38 -82410bd214d709d7d3ccd8d3cddaa5de -d2d3c9d3d3cad4d3cbcc09cca3cfcdd5 -6ecfd3c8c4d3c5c5d56cc6d56d1133b6 -d56a1138b6d56b2aafd9312c321133b0 -d5691137b2bb1810e1c5a410ef012abd -bd4c10c1bdbd1170e3bd30026d2e6e32 -7310f5bd6610e2bd5c01e1bbe4e2b318 -01613a701161ee012ab5f94a10d0b5f9 -016d2a7610e1d56410efd563066e256e -346f3a7254741168e9d5681164e1b9ae -1172e5012ab9c74b01d0d3f6d2b9c711 -61e9a5f761306850691174f3d567026c -2e6e327710e9d56610e9afc310e1d565 -02612e6d326f10eacd1810f2c9c510f2 -012ab9914b10c8b991473448a26a4912 -7461ecb105056f456f4a726475026a2e -6b327210f5c7e110f2b36510e8d55901 -6e2a7410e8b34101e7d557edaff80161 -506510eb032aafc4432e47325410d2a7 -8b10d9d3e110d2afc410eed558613065 -366c1161e7ad641172e1d556116ff201 -2ab1c34710c5b1c3056c186c306d3675 -116ee7d5621175f7b3f0106e01e7b508 -f0b507613265a247691172e1d561016e -2a7410f2a54a05ef2defd55cf35ef404 -2aabaa4332483c4d405410d7abaa01c1 -d55dced55e10cbaba210cfaba4012aab -9e4310ceab9ee2abafe7d55ae9d55b11 -62f2032ab3ca493453385501c1b72bd3 -d56010ccb3ca10c5d55f43c135437444 -a2ee450267446c4a741168e9012aa3e5 -4501d2d3e8d4a3e51179f0afb301622a -7910edd55510e1d5540461a28e68a29d -6fa2ac70a2ae791172ec0e4b48541d54 -32553c58465910d5cd0201cad113d2d5 -4c01c1d3a0dad54d10cbd54e4b324d3c -52525310cbd54b01c7bbb2dad3f803c4 -d548c5d549cbbf26ceaf5002cfd54ad3 -cd02d5cbb9421f4232434247464910d2 -d54702c1d545c7a778d9a74b10d3cd02 -01c551d2d5462acbb938364102c6d542 -ccd543dad5441139b0cd02026b2e6e32 -7210e9d53f10edab7c10f3b59402612e -65327210f3d54010edabce10f2abb811 -70f4ad1a016d2a7210f4afaa10eed541 -03653469866f8c751170ecd5531176e1 -06491749324d364e3a5010cba9bd10ce -b3d610d5d55010d0c3d82ab3d6422a46 -10cab3da10d4d54f1161ebd5511167f2 -d5522aa25441a8a342056f1f6f3e7244 -7501672a6810e4d53e10e9d53d1170ef -abae106101e8c961e9d53c6130655c68 -116bf3d53b036c326d36733a7410ebd5 -3a10e9d53910f5a5fe10f3a9a2116ee7 -012aa91e4210c4a91e00204ac1ba52c0 -cf5638563c5758586259665a01d2d3d7 -d7cdd104c1d528c4d529c5d52aced529 -d5a7a701c6d52bd3cdbc10cbd52c03c4 -d3c4c5d3c4d4d52dd5cd025246536c54 -a25a5503c1d3a0c7d525d9d526dad527 -05d309d3cd02d5cbb9d7cbc8c5d516c8 -cdd1cfc16c0fce1ad40cd4d51dd5cbb9 -d6d51ed9d51fced51acfcde6d2d51bd3 -d51cc90cc9cdabcad518cbcd92cdd519 -c1d50bc3d517c4d3c3c5cf660ecd1ad2 -0cd2d1e6d6d341d7abaadacf6dcdd15c -ced524cfd1b3d0d523c80cc8d12acad1 -13cbd164ccd523c4d520c6d521c7d522 -4e5b4e344fa80c50665110c1d51508c9 -0fc9d50accaf83cfc395d0c3d8d4d50b -c1d507c3d508c5d509c8a7a70dcd17d4 -0cd4d514d7c7f4d9b31adad50dcdd511 -d2d512d3d513c70cc7d1cfc8b130cbd5 -10ccc96ac1d50dc5d50ec6d50f4aa248 -4ba24c4ca2644d0012ce20d50fd5d504 -d6af8ad8d505d9bf37dad506ceaf50cf -aba4d1d502d2d503d4c1e3c60fc6d501 -c7bfb3cbbf26cca905cda9d2c1d3fec3 -d3ffc4d500c5cd0301cfd3f3d0b5f907 -d00cd0d3f6d2b9c7d7d3f7dad3f8c5d3 -f4c7bbb2c8b991cdd3f508d30fd3d3fb -d4bdeed5d3fcd6bf0dd9d3fdc1bdbdc2 -d3f9c9d3facbcd6f42c11f466b466247 -7848a24f4907d10cd1d3f2d2b113d3b5 -68d4b5d7c3d3f1c4b56bccb3caceb3d6 -03c9b12ccfb144d2b14dd8b14d0ace14 -d209d2afc4d4d3eed7d3efced3ebd0d3 -ecd1d3edc1d3e9c5b1c3c6d3eac8a3b9 -ccb97605d409d4b530d5b536d6d3cfcb -aba2ced3f0d2b51f426443a25a44a292 -4507c80cc8d3e7d2d3e8d3aff6d4a3e5 -c1d3e5c3d3e6c5afbdc7a5480010cc1d -d20fd2c9e1d4a34fd5a9d2d6d3d6d9a7 -4bccd3d2ced3d3cfd3d4d1d3d5c70cc7 -a778c8d3d0c9cb9acad3d1c1a993c4a9 -1ec5d3cec6d3cf0010ce1dd50fd5d3df -d6d3e0d7c7f0d9d3e1daad44ceab9ecf -d3ddd2d3ded3cd02c80cc8d3d9c9d3da -ccd3dbcdd3dcc3bf38c4d3d7c6cd46c7 -d3d806cb0ccbad85cfd3e3d9d3d1dad3 -e4c4adbcc5adbccad3e2354b3586378c -3892410ccf17d40cd4d3cbd7d3ccd8d3 -cddaa5decfd3c8d2d3c9d3d3cacc09cc -a3cfcda554cec7f0c4d3c5c5d3c6c6d3 -c71133b2c7f01133b6d3c301382a3910 -b0cd0210b6d3c42aafd9313032363411 -31b9d3c21137b2cbb902302e33323810 -b0adbc10b0ad4410b0a3e5046438673e -6844724a761173f4a358116cedb12811 -68e2d52e116feda39601613e6d01e9a5 -49ee012aa5544110cda55410e200134c -665135513c5340545655725901c5d3c4 -d4cf6e10c1d51503c1d50bc4d3c3d3d5 -1cd9d51f04c4d520c8bf9acad537ced5 -24d2d53810cbd5324c3c4d464e624f66 -5001cbd510d3d51301c2d3f9d9d3fd04 -c1d3fecdd531ceb95cd2d503d5d53510 -c7d53610cdd50c452f4542474c49504a -664b02c8abc9cdd3f5d7d3f701c7a548 -c8d3e710c2d53203c4d533ced534d1d3 -f2d2b11310cfd3f32aa5484132424243 -524410dad3e402c5d3c6c6d3c7dad52f -02c8d3d0ced530d5d53101c3bf38ced3 -93002574c1f5e534f223f2a548f3a560 -f6a5a3f9a5cafa012a2e41127261e2a5 -e0022aa5de49a2b55210d5a5e1e5a358 -e6a366eba3b9eda3e5eea3fc78a67832 -795e7aa260e125e25106eb0ceba5c6ec -a5c7eda5c8f8a5c9e2a5c3e5a5c4e7a5 -c50013ee20f30ff3a5d9f4a5daf5a5db -f8a5dcfaa5ddeea5d5efa5d6f0a5d7f1 -a5d8f2a5cae70fe7a5d0e8a5d1e9a5d2 -eba5d3eca5d4e1a5cbe2a5cce3a5cde4 -a5cee5a5cf08ed0feda5e5eea5e6efa5 -e7f4a5e8faa5e9e2a5e2e4a5e3e7a5e4 -ea012a2e41127261e2a5e0032aa5de31 -2e49345310d5a5e11137b2a5e101d1a5 -dfd2a5e074a24875a29d76a2e3770012 -ee20f50ff5a5bef6a5bff7a5c0f8a5c1 -f9a5c2eea5b9efa5baf2a5bbf3a5bcf4 -a5bde70fe7a5b4e8a5b5e9a5b6eba5b7 -eda5b8e1a5b0e2a5b1e3a5b2e5a5b300 -17ef2af514f809f8a58bf9a58cfaa58d -f5a588f6a589f7a58af209f2a585f3a5 -86f4a587efa582f0a583f1a584e914ec -09eca57feda580eea581e9a57ceaa57d -eba57ee409e4a579e5a57ae7a57be1a5 -76e2a577e3a5780014ed25f214f709f7 -a5a0f9a5a1faa5a2f2a59df4a59ef5a5 -9feda598eea599efa59af0a59bf1a59c -e80fe8a593e9a594eaa595eba596eca5 -97e1a58ee3a58fe4a590e5a591e7a592 -0bee14f409f4a5adf5a5aef6a5afeea5 -aaefa5abf3a5aceb09eba5a7eca5a8ed -a5a9e2a5a4e4a5a5e9a5a66ac2e86fc1 -6d6fa25370a28e71a2e372a2fe730014 -ec25f414f809f8a573f9a574faa575f4 -a570f5a571f6a572eca56beea56cefa5 -6df2a56ef3a56fe70fe7a566e8a567e9 -a568eaa569eba56ae1a561e2a562e3a5 -63e4a564e5a5650011eb1df20ff2a524 -f3a525f4a526f8a527faa528eba520ec -a521eda522eea523e50fe5a51be6a51c -e7a51de9a51eeaa51fe1a517e2a518e3 -a519e4a51a0017ee2af514f809f8a53c -f9a53dfaa53ef5a539f6a53af7a53bf2 -09f2a536f3a537f4a538eea533efa534 -f0a535e814eb09eba530eca531eda532 -e8a52de9a52eeaa52fe509e5a52be6a3 -82e7a52ce2a529e3a3b5e4a52a08ed0f -eda543eea544f2a545f4a546faa547e3 -a53fe4a540e7a541eba5420014ee25f3 -14f809f8a55df9a55efaa55ff3a55af5 -a55bf7a55ceea555efa556f0a557f1a5 -58f2a559e90fe9a550eaa551eba552ec -a553eda554e2a548e332e4a54de5a54e -e8a54f032aa54948324e3a5012616ced -a54c126174f2a54a126261f4a54b6aa2 -686ba2836ca2c46da4196e0019ee2df4 -17f70cf7a513f8a514f9a515faa516f4 -a510f5a511f6a512f109f1a50df2a50e -f3a50feea50aefa50bf0a50ce717ea0c -eaa506eba507eca508eda509e7a503e8 -a504e9a505e409e4a500e5a501e6a502 -e1a3fde2a3fee3a3ff08f00ff0a3b5f4 -a35af5a3b6f7a3b7faa3b8e1a3b1e7a3 -b2e9a3b3eea3b40013ef20f40ff4a3c9 -f5a3caf6a3cbf7a3ccfaa3cdefa3c4f0 -a3c5f1a3c6f2a3c7f3a3c8e70fe7a3bf -e8a3c0e9a3c1eba3c2eca3c3e2a3bae3 -a3bbe4a3bce5a3bde6a3be0017ee2af4 -14f809f8a3e2f9a3e3faa3e4f4a3dff5 -a3e0f7a3e1f109f1a3ddf2a3def3a3cf -eea3daefa3dbf0a3dce814eb09eba3d7 -eca3d8eda3d9e8a3d4e9a3d5eaa3d6e4 -09e4a3d1e5a3d2e6a3d3e1a3cee2a3cf -e3a3d00016ef2af514f809f8a3f9f9a3 -fafaa3fbf5a3f6f6a3f7f7a3f8f209f2 -a3f3f3a3f4f4a3f5efa3f0f0a3f1f1a3 -f2e714eb09eba3ededa3eeeea3efe7a3 -ebe9a3aceaa3ece1a3e6e2a3e7e3a3e8 -e5a3e9e6a3ea65c14365a25866a28367 -a2ab68a406690015ed25f214f709f7a3 -aef8a3aff9a3b0f2a3abf3a3acf4a3ad -eda3a6eea3a7efa3a8f0a3a9f1a3aae6 -14ea09eaa3a3eba3a4eca3a5e6a3a0e7 -a3a1e9a3a2e1a39be2a39ce3a39de4a3 -9ee5a39f0ced17f50cf5a362f7a363f9 -a364faa365eda35ff1a360f2a361e509 -e5a35ceba35deca35ee1a359e2a35ae3 -a35b0bee14f309f3a370f5a371faa372 -eea36defa36ef0a36fe809e8a36ae9a3 -6beba36ce2a367e4a368e5a3690019ee -2df417f70cf7a389f8a38af9a38bfaa3 -8cf4a386f5a387f6a388f109f1a383f2 -a384f3a385eea380efa381f0a382e717 -ea0ceaa37ceba37deca37eeda37fe7a3 -79e8a37ae9a37be409e4a376e5a377e6 -a378e1a373e2a374e3a3750ded17f00c -f0a397f2a398f3a399f4a39aeda394ee -a395efa396e80ce8a390e9a391eba392 -eca393e1a38de2a38ee7a38f61a25062 -a28563a2be640014ee25f414f809f8a3 -55f9a356faa357f4a352f5a353f7a354 -eea34defa34ef0a34ff1a350f2a351e7 -0fe7a348e8a349e9a34aeaa34beca34c -e1a343e2a344e4a345e5a346e6a34700 -15ed1af30ef706f74bf84dfa4ff33df4 -47f549ed3dee3fef41f043f145e60ee9 -06e937eb39ec3be631e733e835e127e2 -29e32be42de52f0016ee1ef50ef806f8 -7bf97dfa7ff575f677f779f206f26ff3 -71f473ee69ef6bf06de60ee906e963ec -65ed67e65de75fe861e153e255e357e4 -59e55b0012f118f60cf69df79ff8a1f9 -a341faa342f193f295f397f499f59be6 -0ae689e88bed8dee8ff091e181e283e4 -85e587 +001a6df03b1174d96f77cea177a88878 +aeca79b8227a00186fc19d75957a647a +32e1d57ee838f5d91d4001e1adf9ead9 +1d4a022a3e42d85c8a4811616e01e2ab +aff4abaa0b4d26540f54d85c36552a56 +10ceabad10d3abac4dd871ce502a5310 +d2aba802c1aba7c6aba5c8aba647f05c +44473248d871af4910c4aba301c2abab +c6aba1754e776c7904e2d57ee7d91d46 +ead91d47eed91d48f0d91d4903e8d91d +41edd91d42eed91d43f9d91d4410e1d9 +1d457263729673a24d740bf11af50cf5 +d91d3df8d91d3ef9d91d3ff1d91d3af3 +d91d3bf4d91d3ced0cedd91d37eed91d +38f0d91d39e5d91d34e7d91d35ecd91d +3604e7d91d2ceed91d2defd91d2ef0d9 +1d2ff3d91d3003e1d91d31edd83204f2 +d91d32f5d91d336f30706a7110e5d91d +2b06ef10efd91d0df1d91d0ef2d91d0f +f3d91d10e3d91d0be8d91d0cedd91c74 +0019ee3af41ef710f7d91d27f8d91d28 +f9d91d29fad91d2af4d91d24f5d91d25 +f6d91d26f10cf1d91d21f2d91d22f3d9 +1d23eed91d1eefd91d1ff0d91d20e71e +ea10ead91d1aebd91d1becd91d1cedd9 +1d1de7d91d17e8d91d18e9d91d19e40c +e4d91d14e5d91d15e6d91d16e1d91d11 +e2d91d12e3d91d1368c1076cad6c506d +826e04e1d91d06e5d91d07e7d91d08eb +d91d09f3d91d0a05ee0ceed91ce9f1d9 +1ceaf5d91cebe1d91ce6ead91ce7edd9 +1ce80019ee3af41ef710f7d91d02f8d9 +1d03f9d91d04fad91d05f4d91cfff5d9 +1d00f6d91d01f10cf1d91cfcf2d91cfd +f3d91cfeeed91cf9efd91cfaf0d91cfb +e71eea10ead91cf5ebd91cf6ecd91cf7 +edd91cf8e7d91cf2e8d91cf3e9d91cf4 +e40ce4d91cefe5d91cf0e6d91cf1e1d9 +1cece2d91cede3d91cee686669846b07 +f00ff0d91ce3f4d572f5d91ce4fad91c +e5e1d91ce2e2b947e4b7c8efd91bc103 +e4d91cd7e9d91cd8eed91cd9f7d91cda +07ee0feed91cdff2cd1df7d91ce0fad9 +1ce1e1d91cdbebd91cdcecd91cddedd9 +1cde6439645a65606705ed0cedd91cd4 +eed91cd5f2d91cd6e1d91cd2e2d91cd3 +e8d5bc10ead91ccc04e1d91ccde7d91c +cee8d91ccfedd91cd0eed91cd1613a62 +a27a6301e1d91ccae8d91ccb0017ef36 +f51af80cf8d91cc1f9d91cc2fad91cc3 +f5d91cbef6d91cbff7d91cc0f20cf2d9 +1cbbf3d91cbcf4d91cbdefd91cb9f0d9 +1cb5f1d91cbae71aea0cead91cb6ebd9 +1cb7edd91cb8e7d91cb3e8d91cb4e9d9 +1cb5e40ce4d91cb0e5d91cb1e6d91cb2 +e1d91cade2d91caee3d91caf05f40cf4 +d91cc7f5d91cc8f7d91cc9e1d91cc4e3 +d91cc5e5d91cc600186dc199749c782a +78307936e1d754efd52410f7d91b1a05 +ee0ceed91b1ef2d91b1ff9d91b20e2d9 +1b1be9d91b1cedd91b1d7450758a7704 +e1d91b15e2d91b16efd91b17f2d91b18 +f7d91b1906e910e9d91b05ebd91b06ed +d91b07f7d91b08e2d91b02e6d91b03e8 +d91b040bf21af60cf6d91b12f8d91b13 +f9d91b14f2d91b0ff4d91b10f5d91b11 +ec0cecd91b0cedd91b0deed91b0ee1d9 +1b09e2d91b0ae4d91b0b705d70607264 +7307f20ef2d7fef3d7fff5d91b00f6d9 +1b01e1d7fbe7d562e9d7fcebd7fd10e3 +d7eb0ff01af60cf6d7f7f7d7f8f8d7f9 +fad7faf0d7f3f2d7f4f3d7f5f5d7f6eb +0cebd7f0ecd7f1edd7f2efd5cde2d7ec +e7d7ede8d7eee9d7ef6d906ea2666f0e +e91aef0cefd7e7f2d7e8f3d7e9f7d7ea +e9d7e3ebd7e4edd7e5eed7e6e40ce4d7 +dfe5d7e0e6d7e1e7d7e2e1d7dce2d7dd +e3d7de0ded17f30cf3d7ccf4d7cdf7d7 +cef8d7cfedd7c9eed7caefd7cbe40ce4 +d7c5e5d7c6e8d7c7e9d7c8e1d7c2e2d7 +c3e3d7c40ded17f00cf0d7d9f5d7daf7 +d7dbf9b186edd7d7eec16cefd7d8e50c +e5d7d3e7d7d4e9d7d5ebd7d6e2d7d0e3 +d7d1e4d7d267b56a4a6a826b8c6c0cef +17f50cf5d7bef6d7bff7d7c0f8d7c1ef +d7bbf2d7bcf3d7bde809e8d7b8e9d7b9 +edd7bae1d7b5e5d7b6e7d7b701e1d7ae +e9d7af04e1d7b0e4d7b1f2d7b2f7d7b3 +f9d7b4679e68a257690010eb1df20ff2 +d7aaf5d7abf6d7acf7c71ff9d7adebd7 +a6ecd7a7edd7a8eed7a9e70ce7d7a2e8 +d7a3e9d7a4ead7a5e2d79ee3d79fe5d7 +a0e6d7a107ef0cefd797f5d798f7d794 +f9d799e1d793e2d794e7d795e9d79603 +e1d79ae7d79bebd79cf5d79d6452642e +655a6610e7d79206eb0cebd782f4d783 +f5d784f9d785e4d77fe7d780ead7810d +ef17f30cf3d78ef4d78ff5d790f7d791 +efd18cf0d78cf2d78de80ce8d789e9d7 +8aecad7dedd78be3d786e4d787e7d788 +613662a2606301e1d77de9d77e0017ee +2af514f809f8d76af9d76bfad76cf5d7 +67f6d768f7d769f209f2d764f3d765f4 +d766eed761f0d762f1d763e714ea09ea +d75eecd75fedd760e7d75be8d75ce9d7 +5de409e4d758e5d759e6d75ae1d755e2 +d756e3d7570fec1af20cf2d779f4d77a +f6d77bf7d77cecd775edd776f0d777f1 +d778e80ce8d771e9d772ead773ebd774 +e1d76de2d76ee5d76fe6d77000186ec2 +5875b67847783079567a90e8d91b5004 +e2d91befebd91bf0edd91bf1f2d91bf2 +f4d91bf306eb10ebd91bf7ecd91bf8f4 +d91bf9f9d91bfae1d91bf4e2d91bf5ea +d91bf601e8d91bfbf0d91bfc757e76a2 +537709ec14ecd91beaefd91bebf2d91b +ecf4d91bedf7d91beee1d91be5e4d91b +e6e5d91be7ead91be8ebd91be908ed14 +edd91bdbeed91bdcefd91bddf4d91bde +f5d91bdfe2d91bd7e4d91bd8ead91bd9 +ecd91bda04e5d91be0e9d91be1eed91b +e2efd91be3f3d91be472c0d172a25873 +a28b740012ed2af414f4d91bd2f5d91b +d3f6d91bd4f7d91bd5f9d91bd6edd91b +cdeed91bcef0d91bcff1d91bd0f3d91b +d1e514e5d91bc8e8d91bc9e9d91bcaea +d91bcbecd91bcce1d91bc4e2d91bc5e3 +d91bc6e4d91bc70bed19f20cf2d91bb5 +f5d91bb6f7d91bb7edd91bb3eed91bb4 +f1af29e50ce5d91bb0e7d91bb1e9d91b +b2e1d91bade2d91baee4d91baf0eed22 +f210f2d91bc0f3d91bc1f5d91bc2f9d9 +1bc3edd91bbceed91bbdf0d91bbef1d9 +1bbfe80ee8d91bbae9d91bbbeacf63ec +adc7e1d5b4e2d91bb8e5d91bb96ea260 +6fa295700014ec2ff219f70cf7d91baa +f8d91babfad91bacf2d5b2f4d91ba8f6 +d91ba9ecd91ba3edd91ba4eed91ba5ef +d91ba6f1d91ba7e714e7d91b9ee8d91b +9fe9d91ba0ead91ba1ebd91ba2e1d91b +9ae2d91b9be4d91b9ce5b9e4e6d91b9d +0cee1cf40ef4c178f5d91b8df9c388fa +d91b8eeed91b8af1d91b8bf2d91b8cea +0cead91b87ebd91b88edd91b89e1d5aa +e2d91b85e9d91b860aed1af00cf0d91b +97f2d91b98f7d91b99edd91b94eed91b +95efd91b96e3d91b8fe4d91b90e7d91b +91e9d91b92ebd91b9368c10c6bc0d56b +a2606ca2c06d0014ef2ff51af80cf8d9 +1b82f9d91b83fad91b84f5d91b7ff6d9 +1b80f7d91b81efd91b7bf0d91b7cf1d9 +1b7df2d5a2f4d91b7ee713e7d91b77e8 +d91b78ead91b79edd91b7aeed59fe1d9 +1b72e2d91b73e3d91b74e4d91b75e6d9 +1b760015f030f51af80cf8d91b6df9d9 +1b6efad91b6ff5d91b6af6d91b6bf7d9 +1b6cf0d91b65f1d91b66f2d91b67f3d9 +1b68f4d91b69e619ea0cead91b62ecd9 +1b63eed91b64e6d91b60e7d91b61e8d7 +69e1d91b5be2d91b5ce3d91b5de4d91b +5ee5d91b5f03e1d91b70e3d59be4d59c +f9d91b716838694e6a01e2d91b59f4d9 +1b5a02e5d91b51edd91b52f6d91b5305 +f20cf2d91b56f3d91b57f9d91b58e18f +e9d91b54eed91b5564586464658a6706 +e910e9d91b4cedd91b4df5d91b4ef7d9 +1b4fe2d91b49e4d91b4ae7d91b4b04e1 +d91b3debd91b3eefd91b3ff1d91b40f9 +d91b4106f210f2d91b45f3d91b46f4d9 +1b47f5d91b48e4d91b42e7d91b43edd9 +1b44613c62a2566302e8abf9efd54bf2 +d54a0010ee26f414f4d91b2cf5d91b2d +f6d91b2ef7d91b2ff9d91b30eed91b28 +efd91b29f2d91b2af3d91b2bea10ead9 +1b24ebd91b25ecd91b26edd91b27e1d9 +1b21e2d91b22e7d538e9d91b230cea1e +f010f0d91b39f2d91b3af7d91b3bf9d9 +1b3cead91b36edd91b37eed91b38e50c +e5d91b33e7d91b34e9d91b35e1ab5ee2 +d91b31e4d91b3200166ec175765c7912 +792ee9b72befd91c6c01f2d91cabf5d9 +1cac765c776a7805ed0cedd91ca8f5d9 +1ca9f9d91caae1d91ca5e7d91ca6ecd9 +1ca701e1d91c9cf4d91c9d06f110f1d9 +1ca1f2d91ca2f5d91ca3f7d91ca4e1d9 +1c9ee7d91c9feed91ca0739673a26f74 +a287750013ed2af414f4d91c98f5d91c +8ff7d91c99f8d91c9afad91c9bedd91c +93eed91c94f0d91c95f1d91c96f2d91c +97e614e6d91c8ee7d91c8fe9d91c90ea +d91c91ecd91c92e1d91c88e2d91c89e3 +d91c8ae4d91c8be5012a304812616ef3 +d91c8d012ad91c8c4310ced91c8d05f2 +0cf2d91c83f3d91c84f9d91c85e4d91c +80eed91c81f0d91c8201f7d91c86f9d9 +1c876e7e6fa24f7209ed14edd91c49ef +d91c7cf3d91c7df7d91c7ef9d91c7fe1 +d91c77e2d91c78e5d91c79ebd91c7aec +d91c7b07ec10ecd91c69f1d91c2ff3d9 +1c6af5d91c6be1d91c65e4d91c66e7d9 +1c67ebd91c6809ed14edd91c72eed91c +73f3d91c74f4d91c75f9d91c76e2d91c +6de7d91c6ee9d91c6febd91c70ecd91c +7167c0df6b7e6b7c6ca2526d09ed13ed +d91c61eed91c62efd91c63f0d91c64f4 +c1f7e2d91c5ce5d91c5de7d91c5eebd9 +1c5fecd91c6008eb14ebd91c4eedd91c +4fefd91c50f2d91c51f9d91c52e1d91c +4ae7d91c4be8d91c4ce9d91c4d08e914 +e9d91c57ecd91c58f2d91c59f5d91c5a +f9d91c5be1d91c53e2d91c54e5d91c55 +e7d91c56678a68a255690aec1af30cf3 +d91c47f6d91c48f9d91c49ecd91c44ed +d91c45f2d91c46e1d91c3fe7d91c40e8 +d91c41e9d91c42ead91c4307f010f0d9 +1c3af2d91c3bf5d91c3cf7d91c3de1d9 +1c36e9d91c37ecd91c38edd91c3910e4 +d91c3e61a24562a2b963a2f064a2fa65 +0cee1ef410f4d91c32f5d91c33f6d91c +34f9d91c35eed91c2ff2d91c30f3d91c +31e90ce9d91c2cead91c2decd91c2ee1 +d91c29e3d91c2ae5d91c2b0019ee3af4 +1ef710f7d91c12f8d91c13f9d91c14fa +d91c15f4d91c0ff5d91c10f6d91c11f1 +0cf1d91c0cf2d91c0df3d91c0eeed91c +09efd91c0af0d91c0be71dea0fead91c +06ebd91c07ecd91c08edbb9be7d91c03 +e8d91c04e9d91c05e40ce4d91c00e5d9 +1c01e6d91c02e1d91bfde2d91bfee3d9 +1bff0cea1eee10eed91c1eefd91c1ff8 +d91c20f9d91c21ead91c1becd91c1ced +d91c1de50ce5d91c18e8d91c19e9d91c +1ae1d91c16e2d91c17e4ab7d02ecd91c +22eed91c23f2d91c2404e1d91c25e4b7 +2be5d91c26e7d91c27ebd91c2874a456 +75b2857600116e46751b75367746e5d7 +12e9d533efd74802edd750eed751f4d7 +5210e1d7536e326f42724c7410efd74f +02ebd745edd746f0d74701f2d749f4d7 +4a03e1d74befd74cf3d74df4d74e69a7 +69a2586aa2706ba2716ca2946d0015ec +25f314f809f8d742f9d743fad744f3d7 +3ff5d740f7d741ecd73aedd73bf0d73c +f1d73df2d73ee614e909e9d737ead738 +ebd739e6d734e7d735e8d736e1d72fe2 +d730e3d731e4d732e5d73307ec0cecd7 +1deed71ef4d71ff6d720e3d719e4d71a +e6d71be7d71c10ebd7210aee14f409f4 +d72af5d72bfad72ceed727efd728f0d7 +29e1d722ead723ebd724ecd725edd726 +01f0d72df3d72e613662a24365a24767 +10f2d7180010ed1df20ff2d70bf3d70c +f5d70df6d70ef9d70fedd707eed708ef +d709f0d70ae80ce8d705e9d5c3eab1cc +ecd706e1d701e5d702e6d703e7d70401 +e2d710ebd71104e3d713edd714efd715 +f0d716f2d717002775c18ce920f20ff2 +d1eff3d308f4d31af7a3b9f9d373e9d1 +45ebd165ecd178eed1a6efd1bc7a387a +36e1cfa7e5cfffe756e8d13306ed0ced +d386eed387efd388f8d389e8d383ead3 +84ecd385012a2e41127261e2d11d012a +d11c5010cbd11d75a24176a28777a2b5 +78a2f3790ff21af60cf6d37ff8d380f9 +d381fad382f2d37bf3d37cf4d37df5d3 +7eea0cead19decd378eed379f0d37ae1 +d374e5d375e8d376e9d3770014ec25f3 +14f809f8d343f9d344fad345f3d340f5 +d341f6d342ecd33bedd33ceed33defd3 +3ef1d33fe60fe6d336e7d337e8d338e9 +d339ead33ae1d331e2d332e3d333e4d3 +34e5d3350dee17f40cf4d34ff5d350f7 +d351f8d352eed34cefd34df3d34ee90c +e9d348ebd349ecd34aedd34be1d346e4 +bba7e5d3470012ee20f40ff4d360f5d3 +61f7d362f8d363f9d364eed35befd35c +f0d35df1d35ef2d35fe60fe6d357e7d3 +58e8d359ecd35aedd16ce1d353e2d354 +e4d355e5d3560def17f40cf4d36ff5d3 +70f8d371f9d372efd36cf1d36df3d36e +e90ce9d368ead369edd36aeed36be1d3 +65e5d366e7d3676bc2e870c15870a25d +71a29e72a2b973a40e740016ee2af414 +f709f7d32ef9d32ffad330f4d32bf5d3 +2cf6d32df109f1d196f2d329f3d32aee +d326efd327f0d328e814eb09ebd323ec +d324edd325e8d320e9d321ead322e2d3 +1be3d31ce4d31de5d31ee6d31f0013ee +20f60ff6d1e2f7d1ddf8d1e3f9d1e4fa +d1e5eed1ddf0d1def2d1dff4d1e0f5d1 +e1e90fe9d1d8ead1d9ebd1daecd1dbed +d1dce1d1d3e3d1d4e5d1d5e6d1d6e7d1 +d708ef0fefd1eaf0d1ebf4d1ecf5d1ed +f7d1eee2d1e6ecd1e7edd1e8eed1e900 +17ef2af514f809f8d305f9d306fad307 +f5d302f6d303f7d304f209f2d1fff3d3 +00f4d301efd1fcf0d1fdf1d1fee814ec +09ecd1f9edd1faeed1fbe8d1f6e9d1f7 +ead1f8e509e5d1f3e6d1f4e7d1f5e1d1 +f0e2d1f1e3d1f20011ec1df50ff5d315 +f6d316f7d317f8d318fad319ecd311f0 +d312f2d313f4d314e60fe6cfafe7d30d +e8d30ee9d30fead310e1d309e2d30ae3 +d30be4d30c6ba2586ca2936da2de6ea4 +336f0015ef25f514f809f8d1d0f9d1d1 +fad1d2f5d1cdf6d1cef7d1cfefd1c8f0 +d1c9f1d1caf2d1cbf3d1cce814eb09eb +d1c5ecd1c6edd1c7e8d1c2e9d1c3ead1 +c4e2d1bde3d1bee4d1bfe6d1c0e7d1c1 +0011f11df50ff5d173f6d174f7d175f8 +d176fad177f1d16ff2d170f3d171f4d1 +72e60fe6d16ae7d16bebd16cecd16df0 +d16ee1d166e2d167e4d168e5d1690015 +ee25f414f709f7d18cf8d18df9d18ef4 +d189f5d18af6d18beed184f0d185f1d1 +86f2d187f3d188e714eb09ebd181ecd1 +82edd183e7d17ee9d17fead180e1d179 +e2d17ae3d17be4d17ce6d17d0017ed2a +f414f709f7d1a3f9d1a4fad1a5f4d1a0 +f5d1a1f6d1a2f009f0d19df1d19ef2d1 +9fedd19aeed19befd19ce714ea09ead1 +98ebcfefecd199e7d195e8d196e9d197 +e409e4d192e5d193e6d194e1d18fe2d1 +90e3d1910015ee25f314f709f7d1b9f8 +d1baf9d1bbf3d1b6f4d1b7f6d1b8eed1 +b1efd1b2f0d1b3f1d1b4f2d1b5e714eb +09ebd1aeecd1afedd1b0e7d1abe8d1ac +e9d1ade1d1a7e2d1a8e3d1a9e4d1aae5 +b77d66c11b667e679a68a28869a2c36a +0aee14f309f3d162f5d163f7d164eed1 +5fefd160f0d161e1d15ae7d15be9d15c +ead15decd15e04e9d117eed118efd119 +f2d11af4d11b0015ef25f514f809f8d1 +30f9d131fad132f5d12df6d12ef7d12f +efd128f0d129f1d12af3d12bf4d12ce6 +14e909e9d125ead126eed127e6d123e7 +a7c9e8d124e1d11ee2d11fe3d120e4d1 +21e5d1220011f11df50ff5d141f6d142 +f7c786f9d143fad144f1d13df2d13ef3 +d13ff4d140e90fe9d138ebd139ecd13a +edd13bf0d13ce4d134e5d135e6d136e8 +d1370015ee25f414f709f7d157f8d158 +f9d159f4d154f5d155f6d156eed14fef +d150f0d151f1d152f3d153e814eb09eb +d14cecd14dedd14ee8d149e9d14aead1 +4be2a936e3d146e4b5d9e6d147e7d148 +61a25d62a2a863a2f864a43e650016ef +2af514f809f8d114f9d115fad116f5d1 +11f6d112f7d113f209f2d10ef3d10ff4 +d110efd10bf0d10cf1d10de714eb09eb +d108edd109eed10ae7d105e8d106e9d1 +07e1d100e2d101e3d102e4d103e5d104 +0015ef25f514f809f8cfbbf9cfbcfacf +bdf5cfb8f6cfb9f7cfbaefcfb3f0cfb4 +f1cfb5f2cfb6f3cfb7e614eb09ebcfb0 +eccfb1eecfb2e6cfade7cfaeeacfafe1 +cfa8e2cfa9e3cfaae4cfabe5cfac0016 +ed2af514f809f8cfd2f9cfd3facfd4f5 +cfcff6cfd0f7cfd1f009f0cfccf3cfcd +f4cfceedcfc9eecfcaefcfcbe714ea09 +eacfc6ebcfc7eccfc8e7cfc3e8cfc4e9 +cfc5e1cfbee3cfbfe4cfc0e5cfc1e6cf +c20014ed25f314f809f8cfe7f9cfe8fa +cfe9f3cfe4f5cfe5f7cfe6edcfdfeecf +e0efcfe1f0cfe2f1cfe3e60fe6cfdae7 +cfdbe8cfdce9cfddebcfdee1cfd5e2cf +d6e3cfd7e4cfd8e5cfd90015ed25f314 +f609f6cffcf8cffdf9cffef3cffaf4cf +fbf5af6aedcff5eecff6efcff7f1cff8 +f2cff9e714ea09eacff2ebcff3eccff4 +e7cfefe8cff0e9cff1e1cfeae2cfebe3 +cfece4cfede5cfee001a6fc101775ae7 +2ce742ebd3a9f2d51afa012a8a411272 +61e2d5fe012a2e43127972ecd39d022a +d39c4b2a4d10ced39e10dad39d776479 +687a01ee26f3d700012a2e41127261e2 +d5fe022ad531412a4310ced5ff10c6d5 +fe10e1d5fc10e1d5fd7345733e746a75 +907602e5d5f9e8d5faecd5fb06eb0ceb +d5eef0d5eff3d5f0f5d5f1e1d5ebe8d5 +ece9d5ed05f009f0d5f4f2d5f5f5d5f6 +e1d5f2e5d5f3e8af7301edd5f7f2d5f8 +6fa24d70a251720014ee25f514f809f8 +d5e8f9d5e9fad5eaf5d5e5f6d5e6f7d5 +e7eed5e0efd5e1f0d5e2f2d5e3f4d5e4 +e70fe7d5dbe8d5dce9d5ddebd5deedd5 +dfe1d5d6e2d5d7e3d5d8e5d5d9e6d5da +01ebafcaeed5d301e9d5d4f6d5d568c0 +dc6bc0c26ba2436ca2666da28e6e0bee +25f509f5d5d0f8d5d1fad5d2eed5ccf0 +d5cdf2012a2e44126576e1d5cf012ad5 +ce4e10d0d5cfe909e9d5c9ebd5caedd5 +cbe1d3cae5d5c7e7d5c80af014f609f6 +d3b2f7d3b3f9d3b4f0d3aff1d3b0f5d3 +b1e1d3aae7d3abe8d3ace9d3adebd3ae +0beb14f509f5d3bef7cf65f9d3bfebd3 +bbedd3bceed3bde509e5d3b8e6d3b9e9 +d3bae1d3b5e2d3b6e3d3b70bee14f209 +f2d3c8f3d3c9f5adc5eed3c5efd3c6f0 +d3c7e709e7d3c3e9cf9fedd3c4e1d3c0 +e2d3c1e4d3c2682e69386a10e9d3a801 +e1d3a4eed3a501f3d3a6f6d3a7651d65 +46664a6704e1d39fe2d3a0e5d3a1e8d3 +a2efd3a310f3d39a10e9d39b615c6266 +6407ea0cead396ecd397edd398f5d399 +e1d392e5d393e7d394e9d39501edd38a +f2d38b05f209f2d38ff5d390f9d391e1 +d38ce9d38decd38e70cf1c70b00571ba +1972bae273002b77c11aec25f214f509 +f5cf5cf6cf6ff7cf76f2ae9af3cf31f4 +cf46eccdb5edcdc6eecddbefcdf0f1a3 +cfe336e709e7cd50e9cd79ebcd9ce3cd +0ae426e5cd34032a3644444b4c531269 +6ee4cd23012acd204910cecd21126576 +e1cd2112686feacd22773878a24a79a2 +5f7aa28ae1abf00012f020f50ff5cf84 +f6cf85f7cf86f8cf87f9cf88f0cf7ff1 +cf80f2cf81f3cf82f4cf83e90fe9cf7a +eacf7bebcf7cedcf7defcf7ee2cf77e6 +cf78e7cf79e8cf7606f20cf2cf8cf3cf +8df5cf8ef7cf8fe2cf89e5cf8aeecf8b +0ced17f20cf2abe7f3cf99f7cf9af8cf +9bedcf96eecf97efcf98e909e9cf93eb +cf94eccf95e1cf90e2cf91e3cf920aec +14f609f6cfa4f7cfa5f9cfa6eccfa1ee +cfa2f0cfa3e1cf9ce2cf9de3cf9ee4cf +9fe7cfa06cc2c171c15d74a5745275a2 +5f7605e509e5cf73edcf74f3cf75e1cf +70e2cf71e3cf720014ed25f214f609f6 +cf59f7cf5af9cf5bf2cf56f3cf57f4cf +58edcf51eecf52efcf53f0cf54f1cf55 +e80fe8cf4ce9cf4deacf4eebcf4feccf +50e1cf47e2cf48e5cf49e6cf4ae7cf4b +0012ed20f40ff4cf6af6cf6bf7cf6cf9 +cf6dfacf6eedcf65efcf66f1cf67f2cf +68f3cf69e70fe7cf61e9cf62eacf63eb +cf64eccd54e1cf5de2cf5ee3cf5fe5cf +6071a24872a25d730013ee20f50ff5cf +41f6cf42f8cf43f9cf44facf45eecf3c +efcf3df1cf3ef3cf3ff4cf40e70fe7cf +37e8cf38eacf39eccf3aedcf3be2cf32 +e3cf33e4cf34e5cf35e6cf3606ef0cef +cf18f1cf19f4cf1af5cf1be1cf16e8cf +17edadc40016ee2af514f809f8b3e1f9 +cf2ffacf30f5cf2cf6cf2df7cf2ef209 +f2cf29f3cf2af4cf2beecf26efcf27f1 +cf28e714eb09ebcf23eccf24edcf25e7 +cf20e8cf21e9cf22e1cf1ce2cf1de3cd +0ae5cf1ee6cf1f6ca2486da2806ea2c6 +6fa411700011ee1df20ff2cf12f3cf13 +f4cf14f6cf15f9b984eecf0eefcf0ff0 +cf10f1cf11e70fe7cf09e9cf0aebcf0b +eccf0cedcf0de2cf05e3cf06e4cf07e5 +cf080010ee1df50ff5cdc1f7cdc2f8cd +c3f9cdc4facdc5eecdbeefcd9cf0cdbf +f2cdc0e90ce9cdbaeacdbbeccdbcedcd +bde3cdb6e4cdb7e7cdb8e8cdb90014ee +25f414f809f8cdd8f9cdd9facddaf4cd +d5f5cdd6f7cdd7eecdd0f0cdd1f1cdd2 +f2cdd3f3cdd4e70fe7cdcbe8cdcceacd +cdebcdceeccdcfe1cdc7e2cdc8e3cdc9 +e4b993e6cdca0015ef25f514f809f8cd +eef9cdeffaa564f5cdebf6cdecf7cded +efcde6f0cde7f1cde8f2cde9f3cdeae9 +14ec09eccde3edcde4eecde5e9cde0ea +cde1ebcde2e2a7f3e3cddce5cddde6cd +dee7cddf0013f020f60ff6cf00f7cf01 +f8cf02f9cf03facf04f0cdfbf1cdfcf2 +cdfdf3cdfef5cdffe70fe7cdf6e9cdf7 +ebcdf8eccdf9efcdfae1cdf1e2cdf2e3 +cdf3e4cdf4e5cdf566c17d69c0d869a2 +5c6aa2a76b0017ef2af514f809f8cdb2 +f9cdb3facdb4f5cdaff6cdb0f7cdb1f2 +09f2cdacf3cdadf4cdaeefcda9f0cdaa +f1cdabe714ea09eacda6edcda7eecda8 +e7cda3e8cda4e9cda5e409e4cda0e5cd +a1e6cda2e1cd9de2cd9ee3cd9f0015ed +25f514f809f8cd8df9cd8efacd8ff5cd +8af6cd8bf7cd8cedcd85f0cd86f1cd87 +f2cd88f3cd89e714ea09eacd82ebcd83 +eccd84e7cd7fe8cd80e9cd81e1cd7ae2 +cd7be4cd7ce5cd7de6cd7e0bed14f409 +f4cd99f5cd9af7cd9bedcd96f0cd97f2 +cd98e509e5cd93e7cd94eccd95e1cd90 +e2cd91e4cd9266a25767a25e680016ee +2af414f709f7cd76f9cd77facd78f4cd +73f5cd74f6cd75f109f1cd70f2cd71f3 +cd72eecd6defcd6ef0cd6fe714ea09ea +cd6aebcd6bedcd6ce7cd67e8cd68e9cd +69e1cd62e2cd63e3cd64e4cd65e5cd66 +02e5cd4dedcd4ef7cd4f0011ed1df40f +f4cd5df5cd5ef7cd5ff9cd60facd61ed +cd59f0cd5af2cd5bf3cd5ce50fe5cd55 +e8cd56e9cd57eacd58ecb5d1e1cd51e2 +cd52e3cd53e4cd5461a26262a2ad63a4 +0564a458650017ee2af414f709f7cd4a +f9cd4bfacd4cf4cd47f5cd48f6cd49f1 +09f1cd44f2cd45f3cd46eecd41efcd42 +f0cd43e714ea09eacd3eebcd3feccd40 +e7cd3be8cd3ce9cd3de409e4cd38e5cd +39e6cd3ae1cd35e2cd36e3cd370015f0 +25f514f809f8cbeef9cbeffacbf0f5cb +ebf6cbecf7cbedf0a546f1cbe7f2cbe8 +f3cbe9f4cbeae614eb09ebcbe4edcbe5 +efcbe6e6cbe1e8cbe2eacbe3e1cbdce2 +cbdde3cbdee4cbdfe5cbe00018ee2df4 +17f70cf7cd06f8cd07f9cd08facd09f4 +cd03f5cd04f6cd05f109f1cd00f2cd01 +f3cd02eecbfdefcbfef0cbffe814eb09 +ebcbfaeccbfbedcbfce8cbf7e9cbf8ea +cbf9e409e4cbf4e5cbf5e7cbf6e1cbf1 +e2cbf2e3cbf30012ee20f40ff4cd1bf5 +cd1cf6cd1df7cd1ef8cd1feecd17efcd +18f0cd19f2b51ff3cd1ae70fe7cd12e8 +cd13e9cd14ebcd15eccd16e2cd0be32c +e5cd10e6cd1122032acd0c4d2e523254 +10d2cd0f10c5cd0d10cfcd0e0feb1af2 +0cf2cd30f3cd31f5cd32f8cd33ebcd2c +eecd2defcd2ef1cd2fe60ce6cd28e7cd +29e8cd2aeacd2be1cd24e2cd25e3cd26 +e5cd27001d70c1bb788ee94fe932ecc9 +75f3c910f4c9eb042a3a447a4d82538a +54126861e9c955054c114c2e4d325410 +c8c95510cbc95410cdc9522ac951422a +4910cec95310d5c952126576e1c95312 +796df2c95212696ee8c954785079547a +7ae1012a2e41127261e2c7e9012ac7e8 +5010cbc7e910edcb1105f509f5cb15f8 +cb16f9cb17e5cb12edcb13eecb1402e5 +cb18e8cb19eecb1a73af736474a24575 +a2637707ee0ceecb0defcb0ef2cb0ff7 +cb10e1cb09e2cb0ae7cb0bedcb0c0aee +14f409f4c9e8f5c9e9f7c9eaeec9e5f1 +c9e6f3c9e7e1c9e0e5c9e1e8c9e2e9c9 +e3edc9e409f00ff0c9f1f2c9f2f4c9f3 +f5c9f4f6c9f5e1c9ece8c9ede9c9eeee +c9efefc9f00013ef20f50ff5cb05f7cb +06f8cb07f9cb08fac9f7efcb00f0cb01 +f1cb02f2cb03f4cb04e60fe6c9fbe7c9 +fce9c9fdeac9feedc9ffe1c9f6e2c9f7 +e3c9f8e4c9f9e5c9fa70a24271a26d72 +0011ef1df40ff4c9dcf5c9ddf7c9def8 +c9dff9c9dcefc9d9f0b365f1c9daf2c9 +dbe70fe7c9d4e8c9d5e9c9d6ebc9d7ed +c9d8e3c9d0e4c9d1e5c9d2e6c9d30cee +17f10cf1c9cbf2bd18f3c9ccf4c9cdee +c9c8efc9c9f0c9caeb09ebc9c5ecc9c6 +edc9c7e1a776e5c9c3e9c9c401e1c9ce +edc9cf68c1f76cc14d6ca2426da27d6e +a2c86f0010ee1df30ff3c9bef4c9bff6 +c9c0f7c9c1f9c9c2eec9baefc9bbf0c9 +bcf1c9bde80ce8c9b6e9c9b7ebc9b8ed +c9b9e3c9b2e5c9b3e6c9b4e7c9b50011 +ee1df40ff4bfbaf5b906f6c983f7c984 +fac985eec97fefc980f2c981f3c982e5 +0fe5c97ae7c97be8c97cebc97decc97e +e1c976e2c977e3c978e4c9790015ee25 +f414f809f8c997f9c998fac999f4c995 +f5c94cf7c996eec990efc991f1c992f2 +c993f3c994e614ea09eac98decc98eed +c98fe6c98ae8c98be9c98ce1c986e2c9 +87e3b548e4c988e5c9890016ed53f33d +f709f7c9aff9c9b0fac9b1f3c9aaf426 +f6c9ae022a32435e4c126174eec9ad04 +2ac9ab3132523853345410d2c9ad1137 +b2c9ac10d5c9ac127972ecc9acf009f0 +c9a7f1c9a8f2c9a9edc9a4eec9a5efc9 +a6e714ea09eac9a1ebc9a2ecc9a3e7c9 +9ee8c99fe9c9a0e1c99ae2bbefe3c99b +e4c99ce5c99d686a69a2506aa29b6b08 +ee0feec970efc971f0c972f2c973f5c9 +74e1c96ce2c96de7c96ee8c96f0cee17 +f40cf4c94df5c94ef6c94ff7c950eec9 +4aefc94bf2c94ceb09ebc947ecc948ed +c949e4c944e7c945e8c9460015ef25f5 +14f809f8c968f9c969fac96af5c965f6 +c966f7c967efc960f0c961f2c962f3c9 +63f4c964e714ec09ecc95dedc95eeec9 +5fe7c95be8c95ceaad1fe1c956e2c957 +e3c958e4c959e6c95a10f4c96b648364 +68658e66a2726708eb0febc93fecc940 +eec941f3c942f5c943e1c93be4c93ce7 +c93de9c93e05ef09efc925f4c926f5c9 +27e1c922e3c923eec9240011ef1df30f +f3b113f6c934f8c935f9c936fac937ef +c931f0c932f1c933f2b113e70fe7c92c +e9c92debc92eecc92fedc930e1c928e2 +c929e4c92ae5c92b02e1c938e5c939ec +c93a619662a295630fe91aee0ceec91f +f0c920f2a355f7c921e9c91beac91ceb +c91dedc91ee50ce5c917e6c918e7c919 +e8c91ae1c913e2c914e3c915e4c91600 +16ef2af514f809f8c7fef9c7fffac900 +f5c7fbf6c7fcf7c7fdf209f2c7f9f3c7 +faf4bbb1efc7f6f0c7f7f1c7f8e71eeb +13ebc7f2ec26edc7f5012ac7f3501268 +6cf0c7f4e7c7efe8c7f0e9c7f1e2c7ea +e3c7ebe4c7ece5c7ede6c7ee0011ee1d +f30ff3c90ef4c90ff5c910f6c911f9c9 +12eec90aefc90bf0c90cf2c90de70fe7 +c905e8c906e9c907ecc908edc909e2c9 +01e3c902e5c903e6c904057839782a79 +7cf5cb1b0bf014f409f4cb4cf5cb4df7 +cb4ef0cb49f1cb4af2cb4bec09eccb46 +eecb47efcb48e1cb43e3cb44e8cb4501 +e1cb4ff0cb50755276a25a7705ed09ed +cb40f3cb41f4cb42e1cb3de3cb3ee8cb +3f0013ee20f60ff6cb2bf7cb2cf8cb2d +f9cb2efacb1beecb26f0cb27f1cb28f2 +cb29f3cb2ae70fe7cb21e9cb22ebcb23 +eccb24edcb25e1cb1ce2cb1de3cb1ee4 +cb1fe6cb200ded17f00cf0cb39f3cb3a +f7cb3bfacb3cedcb36eecb37efcb38e8 +0ce8cb32e9cb33eacb34eccb35e1cb2f +e3cb30e5cb310019709f7820ee0ceecb +a4efc173f5cbc3f7cbd2782a7934edcb +8e01e4cbd9f7cbda10f5cbdb745b7450 +75667705ed09edcbd6efcbd7f2cbd8e1 +cbd3ebcbd4eccbd503e3cbbfe8cbc0ed +cbc1f7cbc20eed1af40cf4cbcef5cbcf +f9cbd0facbd1edc173efcbcbf0cbccf1 +cbcde60ce6cbc7e7cbc8e9cbc9ebcbca +e2cbc4e3cbc5e5cbc67034723e7301eb +cbbdf7cbbe01eecbb7f4cbb803e9cbb9 +edcbbaefcbbbf4cbbc68c0ea6bb76b8a +6da24a6ea29a6f0cec17f00cf0cbb3f2 +cbb4f5cbb5f7cbb6eccbb1edcba2efcb +b2e509e5cbaee6cbafe7cbb0e2cbabe3 +cbace4cbad06e90ce9ab7dedcb8bf4cb +8cf7cb8de1cb88e2cb89e8cb8a0016ed +2af414f809f8bda9f9cba2facba3f4cb +9ff5cba0f7cba1f009f0cb9df1cb9ef2 +afd7edcb9aeecb9befcb9ce614e909e9 +cb97ebcb98eccb99e6cb94e7cb95e8cb +96e1cb8fe2cb90e3cb91e4cb92e5cb93 +05ee09eecba8f2cba9f7cbaae4cba5e7 +cba6eccba7683a69446a02e7cb85e9cb +86f3cb8701e7cb7bf0cb7c07ee0ceecb +81f2cb82f4cb83f5cb84e1cb7de6cb7e +eccb7fedcb8064446446654a6704e1cb +76eecb77f2cb78f3cb79f5cb7a10e2cb +690bec14f309f3cb73f4cb74f9cb75ec +cb70edcb71eecb72e709e7cb6de9cb6e +eacb6fe1cb6ae2cb6be5cb6c613062a2 +496310e6cb680013ed20f60ff6cb5ff7 +cb60f8cb61f9cb62facb63edcb5aeecb +5befcb5cf0cb5df2cb5ee70fe7cb56e8 +cb57e9cb58eac310ebcb59e1cb51e2cb +52e3cb53e4cb54e6cb5503e2cb64ebcb +65eccb66f0cb676da6596eb8746f001b +70c0f27923ea0ceac770edb183f2c7b3 +f3c7c2792a7a3ae3c75c02e4c7e4edc7 +e5f9c7e610edc7e77462743c75a24976 +a2567701e9c7e2ecc7e30011f11df50f +f5c7d8f7c7d9f8c7daf9c7dbfac7dcf1 +c7d4f2c7d5f3c7d6f4c7d7e90fe9c7cf +ebc7d0ecc7d1edc7d2eec7d3e1c7cbe2 +c7cce4c7cde5c7ce04e2c7dde5c7dee9 +c7dfedc7e0eeb1cc10e4c7e1705c7282 +7307f00cf0c7c7f4c7c8f5c7c9f8c7ca +e1c7c3e3c7c4e9c7c5efc7c605ef09ef +c7b0f4c7b1f9c7b2e1b560ebc7aeedc7 +af0ef31af70cf7c7bff8c7c0f9c7b3fa +c7c1f3c7bbf4c7bcf5c7bdf6c7bee70c +e7c7b7eec7b8efc7b9f2c7bae1c7b4e3 +c7b5e5c7b669c0f06c926c406d786ea2 +5a6f02e4c7abeec7acf2c7ad08ed0fed +c78aefc78bf2c78cf4c78df5c78ee1c7 +86e4c787e5c788ebc7890def17f40cf4 +c799f5c79af7c79bf8c79cefc796f0c7 +97f2c798e70ce7c792e9c793ebc794ec +c795e1c78fe2c790e3c7910def17f30c +f3c7a7f4c7a8f5c7a9f8c7aaefc7a4f0 +c7a5f2c7a6e90ce9c7a0eac7a1ebc7a2 +eec7a3e1c79de5c79ee7c79f69966aa2 +426b0fed1af50cf5c782f6c783f8c784 +fac785edc77eefc77ff2c780f3c781e5 +0ce5c77ae7c77be9c77cebc77de1c776 +e2c777e3c778e4c77902e1c76de5c76e +eec76f05f309f3c773f6c774f7c775e2 +c771e3c772e7c77064326438664e6758 +6801f4c76bf5c76c03e1c760ebc761f4 +c762f5c76301f3c764f5c76504e2c766 +e3c767e7c768efc769f5c76a613a6250 +6302e1c75defc75ef5c75f03e1c750e3 +c751f2c752f6c75307ef0cefc758f2c7 +59f4c75af5c75be9c754ebc755ecc756 +edc757002473c2cae82aef0fefc173f2 +c1bbf3b20ef4c1eaf9a9d2e8bfd4e9bf +35ebbf2cecc12fee012ad834304d126f +6ee7af5177c14c773878a26179a2bc7a +a2fde7bfba0017ed2af314f609f6c341 +f7c342fac343f3c33ef4c33ff5c340f0 +09f0c33cf1c33df2addfedc339eec33a +efc33be714ea09eab1ccebc337ecc338 +e7c334e8c335e9c336e409e4af29e5c3 +32e6c333e1c32fe2c330e3c3310019ee +2df417f70cf7c35af8c35bf9c35cfac3 +5df4c357f5c358f6c359f109f1c354f2 +c355f3c356eec351efc352f0c353e717 +ea0ceac34debc34eecc34fedc350e7c3 +4ae8c34be9c34ce409e4c347e5c348e6 +c349e1c344e2c345e3c3460013ed20f6 +0ff6c36bf7c36cf8c36df9c36efac36f +edc367f0c368f2c369f4c1d2f5c36ae7 +0fe7c362e8c363eac364ebc365ecc366 +e2c35ee3c35fe4a51de5c360e6c36100 +13ef20f50ff5c37ff6c380f7c381f8c3 +82fac383efc37af0c37bf1c37cf2c37d +f4c37eea0feac375ebc376ecc377edc3 +78eec379e1c370e4c371e5c372e8c373 +e9c37473a25074a2a075a2f8760014f0 +25f514f809f8c32cf9c32dfac32ef5c3 +29f6c32af7c32bf0c324f1c325f2c326 +f3c327f4c328e80fe8c31febc320ecc3 +21eec322efc323e1c31ae4c31be5c31c +e6c31de7c31e0016ee2af514f809f8c1 +e7f9c1e8fac1e9f5c1e4f6c1e5f7c1e6 +f109f1c1e2f3c1e3f4c1d2eec1dfefc1 +e0f0c1e1e814eb09ebc1dcecc1ddedc1 +dee8c1d9e9c1daeac1dbe2c1d4e3c1d5 +e5c1d6e6c1d7e7c1d80018ed2df317f6 +0cf6c300f7c301f8c302f9c303f3c1fd +f4c1fef5c1fff009f0c1faf1c1fbf2c1 +fcedc1f7eec1f8efc1f9e714ea09eac1 +f4ebc1f5ecc1f6e7c1f1e8c1f2e9c1f3 +e409e4c1eee5c1efe6c1f0e1c1ebe2c1 +ece3c1ed0015ef25f414f809f8c317f9 +c318fac319f4c314f5c315f6c316efc3 +0ff0c310f1c311f2c312f3c313e714ea +09eac30cebc30dedc30ee7c309e8c30a +e9c30be1c304e2c305e3c306e4c307e5 +c3086ac3036ec1c36ea2626fa2b770a4 +0771a45f720017ef2af514f809f8c1d1 +f9c1d2fac1d3f5c1cef6c1cff7c1d0f2 +09f2c1cbf3c1ccf4c1cdefc1c8f0c1c9 +f1c1cae814ec09ecc1c5edc1c6eec1c7 +e8c1c2eac1c3ebc1c4e409e4c1bfe6c1 +c0e7c1c1e1c1bce2c1bde3c1be0017ee +2af514f809f8c170f9c171fac172f5c1 +6df6c16ef7c16ff209f2c16af3c16bf4 +c16ceec167f0c168f1c169e714ea09ea +c164ecc165edc166e7c161e8c162e9c1 +63e409e4c15ee5c15fe6c160e1c15be2 +c15ce3c15d0016ef2af514f809f8c187 +f9c188fac189f5c184f6c185f7c186f2 +09f2c181f3c182f4c183efc17ef0c17f +f1c180e714ea09eac17cebc17dedabd2 +e7c179e8c17ae9c17be1c174e3c175e4 +c176e5c177e6c1780018ee2df417f70c +f7c19ff8c1a0f9c1a1fac1a2f4c19cf5 +c19df6c19ef109f1c199f2c19af3c19b +eec196efc197f0c198e814eb09ebc193 +ecc194edc195e8c190e9c191eac192e4 +09e4c18de5c18ee7c18fe1c18ae2c18b +e3c18c0017ee2af514f809f8c1b8f9c1 +b9fac1baf5c1b5f6c1b6f7c1b7f109f1 +c1b2f2c1b3f3c1b4eec1afefc1b0f0c1 +b1e814eb09ebc1acecc1adedc1aee8c1 +a9e9c1aaeac1abe509e5c1a6e6c1a7e7 +c1a8e1c1a3e2c1a4e3c1a56aa2556ba2 +a06ca2eb6d0015ef25f514f809f8c158 +f9c159fac15af5c155f6c156f7c157ef +c150f0c151f1c152f2c153f4c154e614 +e909e9c14dedc14eeec14fe6c14ae7c1 +4be8c14ce1c145e2c146e3c147e4c148 +e5c1490015ee25f514f809f8c116f9c1 +17fac118f5c113f6c114f7c115eec10e +f1c10ff2c110f3c111f4c112e814eb09 +ebc10becc10cedc10de8c108e9c109ea +c10ae2c103e3c104e4c105e5c106e7c1 +070015ef25f514f809f8c12cf9c12dfa +c12ef5c129f6c12af7c12befc124f0c1 +25f2c126f3c127f4c128e914ec09ecc1 +21edc122eec123e9c11eeac11febc120 +e1c119e2c11ae3c11be5c11ce6c11d00 +14ee25f314f709f7c142f8c143fac144 +f3c13ff5c140f6c141eec13aefc13bf0 +c13cf1c13df2c13ee80fe8c135e9c136 +eac137ebc138ecc139e1c130e2c131e3 +c132e5c133e6c13465c1d665a26266a2 +c467a41c68a477690017ed2af414f809 +f8c100f9c101fac102f4bffdf5bffef7 +bffff009f0bffaf1bffbf2bffcedbff7 +eebff8efbff9e714ea09eabff4ebbff5 +ecbff6e7bff1e8bff2e9bff3e409e4bf +eee5bfefe6bff0e1bfebe2bfece3bfed +0016ee3cf426f71bf7bf9df926fabfa0 +012a2e4c126174eebf9f012abf9e5310 +cebf9ff4bf9af5bf9bf6bf9cf109f1bf +97f2bf98f3bf99eebf94efbf95f0bf96 +e714eb09ebbf91ecbf92edbf93e7abc6 +e8bf8feabf90e1bf8ae2bf8be3bf8ce4 +bf8de5bf8e0018ed2df417f70cf7bfb6 +f8bfb7f9bfb8fabfb9f4bfb3f5bfb4f6 +bfb5f009f0bfb0f1bfb1f2bfb2edbfad +eebfaeefbfafe714ea09eabfaaebbfab +ecbface7bfa7e8bfa8e9bfa9e409e4bf +a4e5bfa5e6bfa6e1bfa1e2bfa2e3bfa3 +0019ee2df417f70cf7bfd1f8b711f9bf +d2fabfd3f4bfcef5bfcff6bfd0f109f1 +bfcbf2bfccf3bfcdeebfc8efbfc9f0bf +cae717ea0ceabfc4ebbfc5ecbfc6edbf +c7e7bfc1e8bfc2e9bfc3e409e4bfbee5 +bfbfe6bfc0e1bfbbe2bfbce3bfbd0016 +ee2af414f809f8bfe8f9bfe9fabfeaf4 +bfe5f5bfe6f7bfe7f109f1bfe3f2abb3 +f3bfe4eebfe0efbfe1f0bfe2e714eb09 +ebbfddecbfdeedbfdfe7bfdae9bfdbea +bfdce2bfd5e3bfd6e4bfd7e5bfd8e6bf +d961a25f62a2b463a409640017ee2af5 +14f809f8bf87f9bf88fabf89f5bf84f6 +bf85f7bf86f209f2bf81f3bf82f4bf83 +eebf7ef0bf7ff1bf80e714ea09eabf7b +ebbf7cedbf7de7bf78e8bf79e9bf7ae4 +09e4bf75e5bf76e6bf77e1bf72e2bf73 +e3bf740015ee2ff51df812f8bf3cf926 +fabf3f22012abf3d4310c3bf3ef5bf39 +f6bf3af7bf3beed8254cefbf35f1bf36 +f3bf37f4bf38e614ea09eabf32ebbf33 +edbf34e6bf2fe7bf30e9bf31e1bf2ae2 +bf2be3bf2ce4bf2de5bf2e0017ef2af5 +14f809f8bf55f9bf56fabf57f5bf52f6 +bf53f7bf54f209f2bf4ff3bf50f4bf51 +efbf4cf0bf4df1bf4ee914ec09ecbf49 +edbf4aeebf4be9bf46eabf47ebbf48e4 +09e4bf43e6bf44e8bf45e1bf40e2bf41 +e3bf420019ee2df417f70cf7bf6ef8bf +6ff9bf70fabf71f4bf6bf5bf6cf6bf6d +f109f1bf68f2bf69f3bf6aeebf65efbf +66f0bf67e717ea0ceabf61ebbf62ecbf +63edbf64e7bf5ee8bf5fe9bf60e409e4 +bf5be5bf5ce6bf5de1bf58e2bf59e3bf +5a002473c1dfe220ee0feec591efc5a9 +f2c5d0f6c716f9c72ee2c39de4c3c7e5 +c3e0e7c3fbecaf8377c0d27736787479 +a2527aa2a7e1c38409ed0fedc71eefc7 +1ff2c720f7c721f8c722e2c719e3c71a +e5c71be7c71ce9c71d0bee14f209f2c7 +2cf5a958f8c72deec729efc72af1c72b +e709e7c726e9c727ecc728e1c723e4c7 +24e5c7250017ee2af414f709f7c743f8 +c744f9c745f4c740f5c741f6c742f109 +f1c73df2c73ef3c73feec73aefc73bf0 +c73ce814eb09ebc737ecc738edc739e8 +c734e9c735eac736e509e5c731e6c732 +e7c733e2c72fe3b364e4c73009ed0fed +c74bf2c74cf5c74df9c74efac74fe1c7 +46e2c747e4c748e9c749ebc74a734274 +a25775a2887602e8c717edc718efa700 +0014ee25f514f809f8c5eff9c5f0fac5 +f1f5c5ecf6c5edf7c5eeeec5e7efc5e8 +f1c5e9f3c5eaf4c5ebe60fe6c5e2e7c5 +e3e8c5e4ebc5e5edc5e6e1c5dde2c5de +e3c5dfe4c5e0e5c5e10eef1af50cf5c5 +fbf8c5fcf9c5fdfac5feefc5f8f0c5f9 +f2c5faf3ad1fe90ce9c5f4eac5f5ebc5 +f6edc5f7e4c5f2e5afc0e7c5f30017ef +2af514f809f8c713f9c714fac715f5c7 +10f6c711f7c712f209f2c70df3c70ef4 +c70fefc70af0c70bf1c70ce814eb09eb +c708edc709eea5dce8c705e9c706eac7 +07e509e5c702e6c703e7c704e1c5ffe3 +c700e4c7016ac2596ec1256e966fa293 +70a2d971a2fc720dec17f00cf0c5daf5 +c3a3f8c5dbfac5dcecc5d7edc5d8eec5 +d9e60ce6c5d4e7c5d5e9c5d6ebc571e1 +c5d1e2c5d2e5c5d30018ed2df417f70c +f7c5a6f8c50ef9c5a7fac5a8f4c5a3f5 +c5a4f6c5a5f109f1c5a1f2c5a2f3c3ad +edc59eeec59ff0c5a0e714ea09eac59b +ebc59cecc59de7c598e8c599e9c59ae4 +09e4c595e5c596e6c597e1c592e2c593 +e3c5940014ed25f314f609f6c5baf7c5 +bbf9c5bcf3c5b7f4c5b8f5c5b9edab6c +eec5b4efaf64f0c5b5f1c5b6e70fe7c5 +afe8c5b0e9c5b1eac5b2ebc5b3e1c5aa +e3c5abe4c5ace5c5ade6c5ae0aee14f5 +09f5c5c4f8c5c5f9c5c6eec5c1efc5c2 +f3c5c3e2c5bde7c5bee8c5bfe9c3e0ec +c5c008ee0feec5cbefc5ccf1c5cdf4c5 +cef9c5cfe7c5c7ebc5c8ecc5c9edc5ca +6aa2626ba29a6ca2ea6d0018ed2df317 +f60cf6c58df7c58ef8c58ffac590f3c5 +8af4c58bf5c58cf009f0c587f1c588f2 +c589edc584eec585efc586e714ea09ea +c581ebc582ecc583e7c57ee8c57fe9c5 +80e409e4c57be5c57ce6c57de1c578e2 +c579e3c57a0010ee1df40ff4c54cf5c5 +4df8c54ef9c54ffaad93eec548efc549 +f2c54af3c54be90ce9c544eac545ecc5 +46edc547e1c540e2c541e4c542e8c543 +0016ed2af414f709f7c564f8c565fac5 +66f4c561f5c562f6c563f109f1c55ef2 +c55ff3c560edc55beec55cefc55de614 +e909e9c558eac559ebc55ae6c555e7c5 +56e8c557e1c550e2c551e3c552e4c553 +e5c5540011ef1df60ff6c573f7c574f8 +c575f9c576fac577efc56ff1c570f2c5 +71f5c572e90fe9c56beac56cebc56ded +c56eeea5e3e1c567e3c568e5c569e7c5 +6a65c15f65a25d66a2a367a2b068a405 +690016ee2af514f809f8c53df9c53efa +c53ff5c53af6c53bf7c53cf209f2c537 +f3c538f4c539eec534efc535f1c536e7 +14ea09eac531ecc532edc533e7c52ee8 +c52fe9c530e1c529e2c52ae4c52be5c5 +2ce6c52d0014ed25f414f809f8c3f3f9 +c3f4fac3f5f4c3f0f5c3f1f7c3f2edc3 +ebeec3ecefc3edf1c3eef2c3efe70fe7 +c3e6e8c3e7e9c3e8eac3e9ebc3eae1c3 +e1e2c3e2e3c3e3e4c3e4e5c3e504e1c3 +f6e4c3f7ecc3f8f2c3f9f5c3fa0017ee +2af514f809f8c510f9c511fac512f5c5 +0df6c50ef7c50ff209f2c50bf3c50cf4 +bd98eec508f0c509f1c50ae814eb09eb +c505ecc506edc507e8c502e9c503eac5 +04e409e4c3ffe5c500e7c501e1c3fce2 +c3fde3c3fe0015ef25f514f809f8c526 +f9c527fac528f5c523f6c524f7c525ef +c51ef0c51ff1c520f2c521f4c522e614 +eb09ebc51bedc51ceec51de6c518e7c5 +19e9c51ae1c513e2c514e3c515e4c516 +e5c51761a25f62a2c263a40d640017ee +2af514f809f8c3ddf9c3defac3dff5c3 +daf6c3dbf7c3dcf209f2c3d7f3c3d8f4 +c3d9eec3d4f0c3d5f1c3d6e814eb09eb +c3d1ecc3d2edc3d3e8c3cee9c3cfeac3 +d0e409e4c3cbe6c3cce7c3cde1c3c8e2 +c3c9e3c3ca0015ee3df314f809f8c39a +f9c39bfac39cf3c397f4c398f7c399ee +38efc393f0c394f1c395f2c396012a2e +4812616ef4c392022ac3904d2a5410d7 +c39210cfc391e614eb09ebc38decc38e +edc38fe6c38ae7c38beac38ce1c385e2 +c386e3c387e4c388e5c3890015ee25f4 +14f709f7c3b1f8b307f9c3b2f4c3aef5 +c3aff6c3b0eec3a9efc3aaf0c3abf1c3 +acf2c3ade614ea09eac3a6ebc3a7edc3 +a8e6c3a3e8c3a4e9c3a5e1c39ee2c39f +e3c3a0e4c3a1e5c3a20015ec25f114f5 +09f5c3c4f8c3c5fac3c6f1b7fff2c3c2 +f4c3c3ecc3beedc3bfeec3c0efc3c1f0 +b7cce614e909e9c3bbeac3bcebc3bde6 +c3b8e7c3b9e8c3bae1c3b3e2c3b4e3c3 +b5e4c3b6e5c3b766dc2369d31969aade +6ab05c6bb4406c002272c13ee11dee0f +eebdb4efbdc3f4bdf4f5bdfdf6bf13e1 +bbe8e2bbfde7bd43e9bd5b7667766e77 +9478a25579a2567a03e8bf25ecbf26ee +bf27fa012a2e4712656ff2bf29012abf +284710c5bf2905ec09ecbf17f3bf13f5 +bf18e1bf14e9bf15ebbf1608ec0fecbf +1dedbf1eefbf1ff4bf20f7bf21e1bf19 +e5bf1ae7bf1be8bf1c10edbf2201e1bf +23eebf2472a25573a27d74a292750015 +ef25f414f709f7bf11f9ab12fabf12f4 +bf0ef5bf0ff6bf10efbf09f0bf0af1bf +0bf2bf0cf3bf0de914ec09ecbf06edbf +07eebf08e9bf03eabf04ebbf05e1bdfe +e3bdffe4bf00e5bf01e6bf020bed14f4 +09f4bdeaf6bdebfabdecedbde7eebde8 +efbde9e909e9bde4ebbde5ecbde6e1bd +e1e3bde2e7bde306e90ce9bdf0edbdf1 +f2bdf2f3bdf3e1bdede4bdeee5bdef07 +ee0ceebdf9efbdfaf3bdfbf5bdfce3bd +f5e7bdf6e8bdf7e9bdf869c1ed6dc0f7 +6d3c6ea25e6fa28c70a2dc7110f2bde0 +0016ec2af214f709f7bdb1f8bdb2f9bd +b3f2bdaef5bdaff6bdb0ef09efbdabf0 +bdacf1bdadecbda8edbda9eebdaae614 +e909e9bda5eabda6ebbda7e6bda2e7bd +a3e8bda4e1bd9de2bd9ee3bd9fe4bda0 +e5bda10dec17f30cf3bdbff5bdc0f7bd +c1fabdc2ecbdbcedbdbdeebdbee70ce7 +bdb8e8bdb9e9bdbaeabdbbe1bdb5e2bd +b6e4bdb70016ee2af414f809f8bdd8f9 +bdd9fabddaf4bdd5f5bdd6f7bdd7f109 +f1bdd2f2bdd3f3bdd4eebdcfefbdd0f0 +bdd1e814eb09ebbdccecbdcdedbdcee8 +bdc9e9bdcaeabdcbe1bdc4e2bdc5e3bd +c6e5bdc7e7bdc804e1bddbe5bddceebd +ddefbddef8bddf69a2456aa29a6ba2af +6c0011eb1def0fefbd98f0bd99f1bd9a +f5bd9bf8bd9cebbd94ecbd95edbd96ee +bd97e50fe5bd8fe6bd90e7bd91e9bd92 +eabd93e1bd8be2bd8ce3bd8de4bd8e00 +15ef25f514f809f8bd70f9bd71fabd72 +f5bd6df6bd6ef7bd6fefbd68f0bd69f1 +bd6af2bd6bf3bd6ce61eea09eabd65eb +bd66ecbd67e62ce7bd63e8bd64012abd +614c12696de2bd62e1bd5ce2bd5de3bd +5ee4bd5fe5bd6006ec0cecbd76f0bd77 +f7bd78f8bd79e1bd73e5bd74e9bd7500 +10ec1df20ff2bd86f3bd87f4bd88f5bd +89f9bd8aecbd82edbd83eebd84efbd85 +e50ce5bd7ee8bd7fe9bd80eabd81e1bd +7ae2bd7be3bd7ce4bd7d65bd656466a2 +7d67a2816807ee0ceebd57f3bd58f4bd +59f5bd5ae1bd53e8bd54e9bd55edbd56 +0019ee2df417f70cf7bd3df8bd3ef9bd +3ffabd40f4bd3af5bd3bf6bd3cf109f1 +bd37f2bd38f3bd39eebd34efbd35f0bd +36e717ea0ceabd30ebbd31ecbd32edbd +33e7afe1e8bd2ee9bd2fe409e4bd2be5 +bd2ce6bd2de1bd28e2bd29e3bd2a01e1 +bd41eebd420eed1af20cf2bd4ff4bd50 +f5bd51fabd52edbd4beebd4cefbd4df1 +bd4ee80ce8bd47e9bd48ebbd49ecbd4a +e1bd44e2bd45e7bd46619062a27e63a2 +bc640deb17ee0ceebd24efbd25f0bd26 +f1bd27ebbd21ecbd22edbd23e70ce7bd +1de8bd1ee9bd1feabd20e1bd1ae2bd1b +e4bd1c0014ec25f214f709f7bbfaf8bb +fbfabbfcf2bbf7f3bbf8f5bbf9ecbbf2 +edbbf3eebbf4f0bbf5f1bbf6e70fe7bb +eee8bbefe9bbf0eabbf1ebbb39e1bbe9 +e2bbeae3bbebe4bbece5bbed0012ef20 +f60ff6bd0bf7bd0cf8bd0df9bd0efabd +0fefbd06f1bd07f2bd08f4bd09f5bd0a +ea0feabd02eba921ecbd03edbd04eebd +05e2bbfee5bbffe6bd00e9bd0109ec0f +ecbd15edbd16f0bd17f1bd18f3bd19e3 +bd10e4bd11e5bd12e6bd13e8bd140024 +74a9e520ef0fefb5bcf3b568f4b5d7f5 +b594f7b5ebe5b576e7b57fe9b58debaf +fbeeb5b3782d7834793e7a4ee1b557e4 +b56b01e3b5f0ecb5f102e1b5f2efb5f3 +f8b5f404e8b5f5e9b111edb5f6f2b5f7 +fab5f8744875a24876a2497703ebb5ec +edb5edefb5eef3b5ef0ff21af70cf7b5 +e4f8b5e5f9b5e6fab5e7f2b5e0f3b5e1 +f4b5e2f6b5e3eb0cebb5dcecb5ddedb5 +deefb5dfe2b5d8e4b5d9e5b5dae9b5db +10edb5e801e2b5e9f6b5ea6bc0fc6f62 +6f7a708a7194729e730aeb14ef09efb5 +d4f4b5d5f5b5d6ebb5d1edb5d2eeb5d3 +e1b5cce3b5cde4b5cee8b5cfe9b5d002 +f2b5bdf5b5bef7b5bf01e9b5c0efb5c1 +01f5b5c2f7b5c307ee0ceeb5c8f5b5c9 +f8b5caf9b5cbe5b5c4e8b5c5e9b5c6eb +b5c76b646ca24d6da2756e07ee0ceeb5 +b8efb5b9f0b5baf4b5bbe2b5b4e7b5b5 +e8b5b6eab5b70cf017f60cf6b59df7b5 +9ef8b59ffab5a0f0b59af2b59bf4b59c +eb09ebb597ecb598efb599e5b594e8b5 +95e9b5960bed14f509f5b5a9f6b5aaf7 +b176edb5a6efb5a7f0b5a8e909e9b5a4 +ebb5a5ecb5a6e1b5a1e2b5a2e7b5a307 +f20cf2b5aff3b5b0f4b5b1f9b5b2e9b5 +abecb5aceeb5adefb5ae666566526784 +68a24d69a2576a04e3b58fe5b590eab5 +91eeb592f3b59307eb0cebb57bedb57c +f5b57df9b57ee1b577e2b578e5b579e6 +b57a08ed0fedb584eeb585efb586f3b5 +87f7b588e2b580e5b581e7b582ecb583 +03e2b589e9b58af0b58bf7b58c10eeb5 +8e616e627e63a25a6409e90fe9b571f2 +b572f3b573f4b574f5b575e1b56ce2b5 +6de3b56ee4b56fe5b57002e9b558eeb5 +59f2b55a0ce917ee0ceeb563f2b564f5 +b565f9b566e9b560ecb561edb562e509 +e5b55de7b55ee8b55fe1a7f3e2b55be4 +b55c03e1b567e5b568e8b569f2b56a00 +186eb07628e10ce1b5f9e9b72bf6b76d +f7b770763a77447902e1b772e5b773f9 +b77401e4b76eeeb76f10e9b771715071 +947298750fee1af40cf4b769f5b76af7 +b76bf9b76ceeb765efb766f0b767f2b7 +68e90ce9b761ebb762ecb763edb764e1 +b75de2b75ee4b75fe8b76010f2b75804 +e1b759e2a3b6f2b75af4b75bf5b75c6e +346f607001e1b756f2b75706e90ce9b7 +4deab74eecb74ff3b750e1b74ae4b74b +e7b74c04e2b751e4b752e7b753f2b754 +f7b75568796b3c6b726c886d0aec14f3 +09f3b747f7b748f8b749ecb744eeb745 +f2b746e1b73fe2b740e3b741e4b742e9 +b74303e1b73aedb73befb73cf5b73d10 +e5b73e683469386a01e5b738f2b73910 +e9b72a0bec14f509f5b735f6b736f9b7 +37ecb732edb733f4b734e409e4b72fe5 +b730e7b731e1b72ce2b72de3b72e643d +644065506703e2b727e5b728ebb707ef +b72902e1b71ae7b71bf4b71c09ec0fec +b722eeb723f2b724f4b725f5b726e2b7 +1de5b71ee8b71fe9b720ebb721613062 +a24e6310f4b7190014ed25f314f809f8 +b70bf9b70cfab70df3b708f4b709f5b7 +0aedb703eeb704efb705f1b706f2b707 +e60fe6b5ffe8b700eab701ebb702ecb5 +27e1b5fae2b5fbe3b5fce4b5fde5b5fe +0aee14f409f4b716f5b717f7b718eeb7 +13efb714f2b715e5b70ee9b70feab710 +ebb711edb712002875c2a2eb77f242f6 +28f6b9f4f7bb8af9022a32414c4c1261 +74eebbba022abbb8432a5410d2bbba10 +cebbb9127261e2bbb9f2b9b6f3bb2af5 +032aac8741acac43acaf5912657ae9b9 +aaeb38ecb976edb991eeb9b3efb9cc01 +2a2e41127261e2b95a042ab958413243 +36493a4d10ceb95c10c6b95910ceb95a +10d2b95b7a667a38e1b1c3e7b7fce9b9 +29eab9400017ee2af514f809f8bbe5f9 +bbe6fabbe7f5bbe2f6bbe3f7bbe4f209 +f2bbe0f3bbe1f4af6aeebbddefbbdef0 +bbdfe814eb09ebaf56ecbbdbedbbdce8 +add6e9bbdaeaaf6ae409e4bbd7e5bbd8 +e6bbd9e1bbd4e2bbd5e3bbd675a26576 +a2ba77a40f78a467790018ed2df417f7 +0cf7bbd0f8bbd1f9bbd2fabbd3f4bbcd +f5bbcef6bbcff109f1bbcaf2bbcbf3bb +ccedbbc7eebbc8efbbc9e714ea09eabb +c4ebbbc5ecbbc6e7bbc1e8bbc2e9bbc3 +e409e4bbbee5bbbfe6bbc0e1bbbbe2bb +bce3bbbd0017ee2af514f809f8bb70f9 +bb71fabb72f5bb6df6bb6ef7bb6ff109 +f1bb6af3bb6bf4bb6ceebb67efbb68f0 +bb69e814eb09ebbb64ecbb65edbb66e8 +bb61e9bb62eabb63e509e5bb5ee6bb5f +e7bb60e2bb5be3bb5ce4bb5d0017ee2a +f414f809f8bb87f9bb88fabb89f4bb84 +f6bb85f7bb86f109f1bb82f2bb83f3b1 +adeebb7fefbb80f0bb81e714ea09eabb +7cecbb7dedbb7ee7bb79e8bb7ae9bb7b +e409e4bb76e5bb77e6bb78e1bb73e2bb +74e3bb750018ed2df317f60cf6b9d5f7 +bba0f9bba1fabba2f3bb9df4bb9ef5bb +9ff009f0bb9af1bb9bf2bb9cedbb97ee +bb98efbb99e714ea09eabb94ebbb95ec +bb96e7bb91e8bb92e9bb93e409e4bb8e +e5bb8fe6bb90e1bb8be2bb8ce3bb8d00 +15ee25f414f809f8bbb5f9bbb6fabbb7 +f4bbb2f6bbb3f7bbb4eebbadefbbaef0 +bbaff1bbb0f2bbb1e614eb09ebbbabec +bb24edbbace6bba8e9bba9eabbaae1bb +a3e2bba4e3bba5e4bba6e5bba76bc3e0 +70c1d470a26871a2c072a41b73a47074 +0019ee2df417f70cf7bb58f8bb59f9bb +5afaa591f4bb55f5bb56f6bb57f109f1 +bb53f2af6af3bb54eebb50efbb51f0bb +52e717ea0ceabb4cebbb4decbb4eedbb +4fe7bb49e8bb4ae9bb4be409e4bb46e5 +bb47e6bb48e1bb43e2bb44e3bb450018 +ee2df417f70cf7b9f5f8b9f6f9b9f7fa +b9f8f4b9f2f5b9f3f6b9f4f109f1b9ef +f2b9f0f3b9f1eeb9edefb9eef0b73be8 +14eb09ebb9eaecb9ebedb9ece8b9e7e9 +b9e8eab9e9e509e5b9e4e6b9e5e7b9e6 +e1b9e1e3b9e2e4b9e30019ee2df417f7 +0cf7bb0ff8bb10f9bb11fabb12f4bb0c +f5bb0df6bb0ef109f1bb09f2bb0af3bb +0beebb06efbb07f0bb08e717ea0ceabb +02ebbb03ecbb04edbb05e7b9ffe8bb00 +e9bb01e409e4b9fce5b9fde6b9fee1b9 +f9e2b9fae3b9fb0017ee2af514f809f8 +bb27f9bb28fabb29f5bb24f6bb25f7bb +26f209f2bb21f3bb22f4bb23eebb1eef +bb1ff0bb20e814eb09ebbb1cecbb1ded +a90be8bb19e9bb1aeabb1be409e4bb16 +e5bb17e6bb18e1bb13e2bb14e3bb1500 +17ee2af414f709f7bb40f8bb41fabb42 +f4bb3df5bb3ef6bb3ff109f1bb3af2bb +3bf3bb3ceebb37efbb38f0bb39e814eb +09ebbb34ecbb35edbb36e8bb31e9bb32 +eabb33e509e5bb2ee6bb2fe7bb30e2bb +2be3bb2ce4bb2d6ba2536ca2ab6da406 +6ea4a26f0014ec25f414f709f7b9def9 +b9dffab9e0f4b9dbf5b9dcf6b9ddecb9 +d6efb9d7f0b9d8f1b9d9f3b9dae70fe7 +b9d2e8b9d3e9b9d4eab9d5ebb33be1b9 +cde3b9cee4b9cfe5b9d0e6b9d10018ed +2df417f70cf7b972f8b973f9b974fab9 +75f4b96ff5b970f6b971f109f1b96cf2 +b96df3b96eedb969efb96af0b96be714 +ea09eab966ebb967ecb968e7b963e8b9 +64e9b965e409e4b960e5b961e6b962e1 +b95de2b95ee3b95f0019ee2df417f70c +f7b98df8b98ef9b98ffab990f4b98af5 +b98bf6b98cf109f1b987f2b988f3b989 +eeb984efb985f0b986e717ea0ceab980 +ebb981ecb982edb983e7b97de8b97ee9 +b97fe409e4b97ae5b97be6b97ce1b977 +e2b978e3b9790019ee6ef417f70cf7b9 +aff8b9b0f9b9b1fab9b2f4b9acf5b9ad +f6b9aef14af1b9a1f226f3b9ab032a36 +4182438a5912657ae9b9aa054914492e +4c385410cdb9a901d1b9a6d2b9a710c2 +b9a82ab9a2412a4710c5b9a501cdb9a3 +dab9a4127261e2b9a6127972ecb9a3ee +b99eefb99ff0b9a0e717ea0ceab99beb +b99cecb902edb99de7b998e8b999e9b9 +9ae409e4b995e5b996e6b997e1b992e2 +b993e3b9940018ee2df417f70cf7b9c8 +f8b9c9f9b9cafab9cbf4b9c5f5b9c6f6 +b9c7f109f1b9c2f2b9c3f3b9c4eeb9bf +efb9c0f0b9c1e714eb09ebb9bcecb9bd +edb9bee7b7fce9b9baeab9bbe409e4b9 +b7e5b9b8e6b9b9e1b9b4e2b9b5e3b9b6 +66c1a766a25d67a2b268a2f869a44d6a +0016ed2af314f809f8b955f9b956fab9 +57f3b952f4b953f5b954f009f0b94ff1 +b950f2b951edb94ceeb94defb94ee714 +ea09eab949ebb94aecb94be7b946e8b9 +47e9b948e1b941e2b942e3b943e4b944 +e5b9450017ee2af514f809f8b7f9f9b7 +fafab7fbf5b7f6f6b7f7f7b7f8f109f1 +b7f3f2b7f4f3b7f5eeb7f0efb7f1f0b7 +f2e714eb09ebb7edecb7eeedb7efe7b7 +eae8b7ebe9b7ece409e4b7e7e5b7e8e6 +b7e9e1b7e4e2b7e5e3b7e60014ef25f4 +14f709f7b90ff8b910f9b911f4b90cf5 +b90df6b90eefb907f0b908f1b909f2b9 +0af3b90be80fe8b902eab903ebb904ec +b905edb906e1b7fde2b7fee4b7ffe5b9 +00e6b9010017ef2af514f809f8b926f9 +b927fab928f5b923f6b924f7b925f209 +f2b920f3b921f4b922efb91df0b91ef1 +b91fe714eb09ebc81aecb91beeb91ce7 +b918e8b919eab91ae409e4b915e5b916 +e6b917e1b912e2b913e3b9140015ef25 +f514f809f8b93df9b93efab93ff5b93a +f6b93bf7b93cefb935f0b936f1b937f3 +b938f4b939e614ea09eab932ecb933ed +b934e6b92fe7b930e8b931e1b92ae2b9 +2be3b92ce4b92de5b92e61a25d62a295 +63a2ed64a442650016ed2af514f809f8 +b7e1f9b7e2fab7e3f5b7def6b7dff7b7 +e0f209f2b7dbf3b7dcf4b7ddedb7d8ee +b7d9efb7dae614e909e9b7d5ebb7d6ec +b7d7e6b7d2e7b7d3e8b7d4e1b7cde2b7 +cee3b7cfe4b7d0e5b7d10010eb1df10f +f1b781f6b782f7b783f8b784f9b785eb +b77dedb77eefb77ff0b780e70ce7b779 +e8b77ae9b77beab77ce1b775e2b776e3 +b777e4b7780018ee2df417f70cf7b79b +f8b79cf9b79dfab79ef4b798f5b799f6 +b79af109f1b795f2b796f3b797eeb792 +efb793f0b794e814eb09ebb78fecb790 +edb791e8b78ce9b78deab78ee409e4b7 +89e5b78ae7b78be1b786e2b787e3b788 +0017ed2af414f709f7b7b4f9b7b5fab7 +b6f4b7b1f5b7b2f6b7b3f009f0b7aef1 +b7aff3b7b0edb7abeeb7acefb7ade714 +ea09eab7a8ebb7a9ecb7aae7b7a5e8b7 +a6e9b7a7e409e4b7a2e5b7a3e6b7a4e1 +b79fe2b7a0e3b7a10015ed25f414f809 +f8b7caf9b7cbfab7ccf4b7c7f6b7c8f7 +b7c9edb7c2eeb7c3f0b7c4f1b7c5f2b7 +c6e714ea09eab7bfebb7c0ecb7c1e7b7 +bce8b7bde9b7bee1b7b7e3b7b8e4b7b9 +e5b7bae6b7bb66a6c567aa3268001e72 +c0f8e51af40cf4b530f5b536f9a554fa +b556e5b3cae9b3d6efb50cf2b51f763f +765877747984e122032ab3a9372e4334 +5310c4b3aa1133b6b3aa10cdb3ab04e3 +b54ce5b54debb54eeeb54ff6b55002e1 +b551e3b552efb55301e1b554f7b55572 +a25073a27b74a282750014ed25f514f8 +09f8b549f9b54afab54bf5b546f6b547 +f7b548edb541f0b542f2b543f3b544f4 +b545e70fe7b53ce8b53de9b53eebb53f +ecb540e2b537e3b538e4b539e5b53ae6 +b53b0cf017f50cf5b529f7b52af8b52b +fab52cf0b526f2b527f4b528eb09ebb5 +23edb524efb525e1b520e3b521e5b522 +02e2b52deeb52ef3b52f04e9b531efb5 +32f3b533f5b534f8b53569c1116dae6d +366ea2436fa26b7010efb51e0010f11d +f50ff5b3fcf6b3fdf7b3fef9b3fffab5 +00f1b3f8f2b3f9f3b3faf4b3fbea0cea +b3f5edb3f6eeb3cbf0b3f7e1b3f1e2b3 +f2e4b3f3e6b3f409e919e9b506ea32ee +b509efb50af3b50b012ab50748126d6e +e7b508e1b501e4b502e5b503e7b504e8 +b5050010ec1df20ff2b519f4b51af6b5 +1bf7b51cf9b51decb515edb516efb517 +f0b518e50ce5b511e8b512e9b513eab5 +14e1b50de2b50ee3b50fe4b510694e6a +a24b6ba24c6c04e1b3ece2b3ede4b3ee +f4b3eff5b3f00feb1af20cf2b3e3f4b3 +e4f7b3e5f8b3e6ebb3dfecb3e0edb3e1 +efb3e2e70ce7b3dbe8b3dce9b3ddeab3 +dee1b3d7e2b3d8e4b3d9e6b3da10e9b3 +e703e1b3e8e5b3e9e8b3eaebb3eb6434 +643e6548676e6802e9b3d3f2b3d4f9b3 +d501eeb3b2f9b3c905e809e8b3cee9b3 +cfedb3d0e1b3cbe4b3cce7b3cd01edb3 +d1f7b3d2613062a2656310e8b3c80015 +ee25f314f809f8b3c0f9b3c1fab3c2f3 +b3bdf6b3bef7b3bfeeb3b8efb3b9f0b3 +baf1b3bbf2b3bce826eb1beb2cecb3b6 +edb3b7012a2e4812616ef4b3b5012ab3 +b45410d7b3b5e8b3b1e9b3b2eab3b3e1 +b3ace3b3ade4b3aee5b3afe7b3b004e1 +b3c3e2b3c4eeb3c5efb3c6f5b3c70017 +7199e614ef09efb144f2b14df9b169e6 +a254e9b12ceab1357612762a772ee1b1 +1310f2b16601e1b167e5b16871a24272 +a243750eed1af40cf4b162f5b163f6b1 +64f9b165edb15eeeb15ff1b160f2b161 +e50ce5b15ae6b15be8b15ce9b15de2b1 +58e326e4b159012ab1274112646cedb1 +2810f3b14c0aef14f209f2b155f3b156 +f4b157efb152f0b153f1b154e3b14ee4 +b14fe5b14debb150edb1516b556e286e +2e6f3e7010e5b14b02e2b141e7b142e9 +b14305ee09eeb148f2b149f3b14ae4b1 +45e9b146edb1476b346c3e6d01f0b13f +f5b14001ebb136f6b13706ec0cecb13b +eeb13cf2b13df9b13ee1b138e8b139e9 +b13a662b665c67666907f00cf0b131f2 +b132f4b133f7b134e1b12de5b12ee6b1 +2fecb13001e9b129edb12a10f2b12b61 +3062a2466510f2b1260012ec20f40ff4 +a3b9f5b122f8b123f9b124fab125ecb1 +1dedb11eeeb11ff0b120f2b121e70fe7 +b118e8b119e9b11aeab11bebb11ce1b1 +14e2b115e4b116e6b11710eca799001f +71c18a7953ec0cecb300eeb31af5b365 +f6b37b79307a8ee1b16ae4b1a40dec17 +ef0cefb3a2f2b3a3f9b3a4fab3a5ecb3 +9fedb3a0eeb3a1e50ce5b39be6b39ce7 +b39de9b39ee1b184e2b399e4b39a02e1 +b3a6e9b3a7eeb3a875c0c5753676a25b +77a2867810f8b3980016ed2af414f709 +f7b378f8b379fab37af4b376f5b377f6 +af89f009f0b373f1b374f2b375edb370 +eeb371efb372e614e909e9b36debb36e +ecb36fe6b36be7b31ae8b36ce1b366e2 +b367e3b368e4b369e5b36a0ced17f00c +f0b385f2b1d4f3b386f9b387edb382ee +b383efb384e609e6b37feab380ecb381 +e1b37ce3b37de5b37e0fea1af40cf4b3 +94f5b395f7b396f8b397eab390edb391 +eeb392f2b393e50ce5b38ce6b38de7b3 +8ee9b38fe1b388e2b389e3b38ae4b38b +7140725073a2567402e1b363e9b364f5 +b1d502e1b34aeeb34bf2b34c0012ed20 +f60ff6b359f7b35af8b35bf9b35cfab3 +5dedb354f1b355f3b356f4b357f5b358 +e50fe5afc4e7b350e8b351e9b352eab3 +53e1b34de2b192e3b34ee4b34f04ecb3 +5eeeb35fefb360f0b361f7b36269c17f +6dc0e26d406e9e6fa2807002e1b347e5 +b348eeb3490dee17f60cf6b316f8b317 +f9b318fab319eeb313f2b314f5b315e7 +0ce7b30fe8b310ecb311edb312e1b30c +e2b30de4b30e0013ec20f20ff2b32af4 +b32bf5b32cf7b32dfab32eecb325edb3 +26eeb327efb328f1b329e70fe7b320e8 +b321e9b322eab323ebb324e1b31be2b3 +1ce3b31de4b31ee5b31f0018ed2df317 +f60cf6b343f7b344f8b345f9b346f3b3 +40f4b341f5b342f009f0b33df1b33ef2 +b33fedb33beeb328efb33ce714ea09ea +b338ebb339ecb33ae7b335e8b336e9b3 +37e409e4b332e5b333e6b334e1b32fe2 +b330e3b33169846aa26d6ba27a6c0beb +14f209f2b309f5b30af7b30bebb306ec +b307efb308e809e8b304e9af56eab305 +e2b301e3b302e4b3030011ee1df30ff3 +b1eff4b1f0f8b1f1f9b1f2fab1f3eeb1 +ebf0b1ecf1b1edf2b1eee50fe5b1e6e7 +b1e7e8b1e8ecb1e9edb1eae1b1e2e2b1 +e3e3b1e4e4b1e504ebb1f4edb1f5eeb1 +f6f2b1f7f5b1f806ee0ceeb1fcefb1fd +f0b1fef5b1ffe1b1f9e4b1fae5b1fb65 +a0656a66a26667a26a6808ee0feeb1dd +efb1def2b1dff3b1e0f4b1e1e1b1d9e3 +b1dae5b1dbebb1dc0013ec20f60ff6b1 +c6f7b1c7f8b1c8f9b1c9fab1caecb1c2 +efb1c3f1b1c4f2adbcf3b1c5e70fe7b1 +bde8b1bee9b1bfeab1c0ebb1c1e1b1b8 +e2b1b9e3b1bae4b1bbe6b1bc01ebb1cb +f8b1cc0cec17f20cf2b1d5f4b1d6f5b1 +d7f7b1d8ecb1d3eeb1d4efaff8e509e5 +b1d0e7b1d1ebb1d2e1b1cde2b1cee4b1 +cf61a24862a2a363a2fb640012eb20f1 +0ff1b1b3f2b1b4f4b1b5f5b1b6f8b1b7 +ebb1aeecb1afedb1b0eeb1b1efb1b2e6 +0fe6b1a9e7b1aae8b1abe9b1aceab1ad +e2b1a5e3b1a6e4b1a7e5b1a80019ee2d +f417f70cf7b180f8b181f9b182fab183 +f4b17ef5b17ff6adcbf109f1b17bf2b1 +7cf3b17deeb178efb179f0b17ae717ea +0ceab174ebb175ecb176edb177e7b171 +e8b172e9b173e409e4b16ee5b16fe6b1 +70e1b16be2b16ce3b16d0018ed2df317 +f70cf7b199f8b19af9b19bfab19cf3b1 +96f5b197f6b198f009f0b193f1b194f2 +b195edb190eeb191efb192e714ea09ea +b18debb18eecb18fe7b18ae8b18be9b1 +8ce409e4b187e5b188e6b189e1b184e2 +b185e3b18606ec0cecb1a0eeb1a1f2b1 +a2f4b1a3e3b19de4b19ee6b19f63cb04 +63a4dc64aea765001d73927a29ef0cef +afeaf3aff6f4afbdf5a5f87a44e5afab +ecafc4ee012aafd953126861f7afda01 +e1b111e5b112762076387748784c7901 +e1b10fefb11002e5b10ae8b10beeb10c +10efb10d10f4b10e732e74667510e4b1 +0908eb0febaffbedaffcf3affdf5affe +f9afffe5aff7e7aff8e8aff9e9affa08 +f30ff3b104f4b105f5b106f8b107fab1 +08e2b100eeb101efb102f2b1036ac0e9 +6e636e6a6fa25670a2577208eb0febaf +f1f2aff2f3aff3f4aff4f7aff5e1afed +e7afeee8afefe9aff00eed1af20cf2af +e6f6afe7f7afe8f8afe9edafe2eeafe3 +efafe4f1afe5e40ce4afdee6afdfe8af +e0ecafe1e1afdbe2afdce3afdd10f4af +eb10e9afec6aa2426ba2436ca2666d0d +ee17f50cf5afd5f7afd6f8afd7faafd8 +eeafd2f0afd3f3afd4e716e7afcde9af +ceeb26edafd1012aafcf4e126b6fefaf +d0e1afcae2afcbe5afcc10e1afb80aec +14f009f0afc1f2afc2f9afc3ecafbeed +afbfefafc0e1afb9e5afbae7afbbe9af +bcebafbd05ef09efafc8f0a3f2f5afc9 +e5afc5ebafc6edafc7662f663e674e68 +6a6902f0afb5f4afb6f6afb702e1afac +e5afade9afae04e1afafecafb0edafb1 +efafb2f9afb310f5afb4613462386301 +f2afa9f9afaa10e1afa305ef09efafa6 +f2afa7f5afa8e3afa4e7afa5eba7d500 +2272c161e127f219f2ad2df3ad44f52c +f6ad74f9ad7d012aad6347126c61e7ad +64e1ab49e5ab88e8ab98efad0c764376 +4e7758787e79827a04e5ad44e8ad81eb +ad82eead83f4ad8401e7ad75eead7605 +e509e5ad79e7ad7af4ad7be1ad77e2ad +78e4ad2d10e8ad7c02e1ad7ee2ad7fef +ad80729673a28674a2b4750eec1af50c +f5ad70f6ad71f8ad72f9ad73ecad6cef +ad6df0ad6ef4ad6fe80ce8ad68e9ad69 +eaad6aebad6be1ad65e2ad66e3ad6700 +15ed25f414f809f8ad41f9ad42faad43 +f4ad3ef6ad3ff7ad40edad39eead3aef +ad3bf1ad3cf3ad3de714ea09eaad36eb +ad37ecad38e7ad33e8ad34e9ad35e1ad +2ee2ad2fe3ad30e4ad31e6ad320df017 +f60cf6ad4ff7ad50f9ad51faad52f0ad +4cf3ad4df4ad4eea0ceaad48ebad49ed +ad4aefad4be1ad45e2ad46e8ad470fee +1af40cf4ad5ff5ad60f9ad61faad62ee +ad5befad5cf0ad5df3ad5ee70ce7ad57 +e8ad58ecad59edad5ae1ad53e3ad54e4 +ad55e5ad5669c19b6dc0d06d3a6e826f +a25f70a2a07110e4ad2c0aec14f209f2 +abd6f3abfcf4abfdecabfaeea4b6efab +fbe1abf5e5abf6e7abf7e9abf8ebabf9 +0dec17f30cf3ad08f4ad09f7ad0af8ad +0becad05f0ad06f1ad07e70ce7ad01e8 +ad02e9ad03ebad04e1abfee2abffe3ad +000013ec20f40ff4ad1cf5ad1df8ad1e +f9ad1ffaad20ecad17edad18efad19f0 +ad1af1ad1be60fe6ad12e7ad13e8ad14 +eaad15ebad16e1ad0de2ad0ee3ad0fe4 +ad10e5ad110aee14f509f5ad29f8ad2a +f9ad2beead26efad27f3ad28e1ad21e2 +ad22e3ad23e7ad24e9ad25699c6aa261 +6ba28c6c0fec1af40cf4abf1f5abf2f7 +abf3f9abf4ecabededabeeefabeff3ab +f0e80ce8abe9e9abeaeaabebebabece1 +abe5e3abe6e4abe7e5abe80aed14f209 +f2abc6f7abc7f9abc8edabc3eeabc4f0 +abc5e1abbee2abbfe3abc0e5abc1e8ab +c20cee17f20cf2abd2f3abd3f6abd4f9 +abd5eeabcfefabd0f0abd1e909e9abcc +ebabcdedabcee1abc9e5abcae8abcb0e +f21af60cf6abe1f8abe2f9abe3faabe4 +f2abddf3abdef4abdff5abe0ed0cedab +d9eeabdaefabdbf1abdce1abd6e2abd7 +ecabd865c0e465a2af66a2c467a2ce68 +0013ee20f40ff4abb9f7abbaf8abbbf9 +abbcfaabbdeeabb4efabb5f0abb6f1ab +b7f2abb8e973e938eaabb0ebabb1ecab +b2edabb3022a3c42a2594811616e01e2 +abaff4abaa0b4d2d5417542e55385610 +c4abad01c8aba9d7abaa01cbababd3ab +ac4dcc96502a5310d2aba802c6aba5c8 +aba6daaba7470e473048cc7a4910c4ab +a310c6aba12aab9e412a4210ceaba010 +d5ab9f126f70efabaee2ab99e4ab9ae6 +ab9be7ab9ce8ab9d06eb0cebab8ceeab +8df4ab8ef9ab8fe1ab89e2ab8ae7ab8b +03e1ab90e4ab91e7ab92edab9303e1ab +94e3ab95e7ab96ebab97616a62a27563 +a2b06408ea0feaab83edab84efab85f2 +ab86faab87e5ab7fe6ab80e8ab81e9ab +820016ed2af314f809f8ab5ef9ab5ffa +ab60f3ab5bf6ab5cf7ab5df009f0ab58 +f1ab59f2ab5aedab55eeab56efab57e6 +14ea09eaab52ebab53ecab54e6ab4fe7 +ab50e8ab51e1ab4ae2ab4be3ab4ce4ab +4de5ab4e0011ef1df40ff4ab6ef5ab6f +f6ab70f7ab71f9ab72efab6af1ab6bf2 +ab6cf3ab6de90fe9ab65eaab66ebab67 +ecab68eeab69e2ab61e3ab62e4ab63e7 +ab640bec14f009f0ab7cf1ab7df2ab7e +ecab79edab7aefab7be709e7ab76e8ab +77eaab78e3ab73e4ab74e5ab75001a6f +c1b2776ce10ce1ad85e5adbcf6af8afa +a34f775079887a05e709e7afa0ecafa1 +eeafa2e1af9ee4af9fe5af0a08f30ff3 +af8ff5af79f7af90f9af91faaf92e1af +8cebaf8decadaaf2af8e0aed14f209f2 +af9bf5af9cf9af9dedaf98eeaf99efaf +9ae1af93e2af94e4af95e7af96e9af97 +73b37334746075a24e7610e1af8b06eb +0cebaf5eeeaf5fefaf60f1af61e2af5b +e8af5ce9af5d0def17f30cf3af6cf4af +6df5af6ef9af6fefaf69f0af6af2af6b +e80ce8af65e9af66ebaf67edaf68e1af +62e2af63e4af640019ee2df417f70cf7 +af86f8af87f9af88faaf89f4af83f5af +84f6af85f109f1af80f2af81f3af82ee +af7defaf7ef0af7fe717ea0ceaaf79eb +af7aecaf7bedaf7ce7af76e8af77e9af +78e409e4af73e5af74e6af75e1af70e2 +af71e3af726fa24770a285720def17f3 +0cf3af57f4af58f5af59f9af5aefaf54 +f1af55f2af56e81ee832e9af52eca7be +eeaf53012a2e4d126f6ee7af51012aaf +504310ceaf51e3af4de5af4ee7af4f00 +12ee20f40ff4af47f6af48f7af49f8af +4af9af4beeaf42efaf43f0af44f2af45 +f3af46e60fe6af3ee8af3fe9add8ebaf +40ecaf41e1af3ae2af3be3af3ce5af3d +10f0af4c68c15d6b9d6b966ca2506da2 +576e0eee1af50cf5af36f6af37f7af38 +f9af39eeaf32efaf33f2af34f4af35e7 +0ce7af2fe9af30eaad8aebaf31e1af2c +e4af2de5af2e06ec0ceca540f2af14f3 +af15f8af16e1af11e7af12ebaf1302e7 +af17edaf18eeaf190011ed1df50ff5af +27f6af28f7af29f8af2af9af2bedaf23 +efaf24f2af25f3af26e50fe5af1ee6af +1fe7af20ebaf21ecaf22e1af1ae2af1b +e3af1ce4af1d689669a2666a0feb1aef +0cefaf0df2af0ef5af0ff7af10ebaf09 +ecaf0aedaf0beeaf0ce50ce5af05e6af +06e9af07eaaf08e1af01e2af02e3af03 +e4af040cef17f50cf5ade8f6ade9f7ad +eaf8adebefade5f2ade6f3ade7ec09ec +ade2edade3eeade4e4addfe7ade0e9ad +e10016ee2af414f809f8adfef9adfffa +af00f4adf0f5adfcf7adfdf109f1adf9 +f2adfaf3adfbeeadf5efadf7f0adf8e7 +14ea09eaadf4ebadf5ecadf6e7adf1e8 +adf2e9adf3e1adece2adede3adeee4ad +efe6adf064a264a24265a265670011ec +1df30ff3addaf4addbf7addcf8adddfa +addeecadd6eeadd7efadd8f2add9e50f +e5add1e7add2e8add3e9add4ebadd5e1 +adcde2adcee3adcfe4add00aea14f209 +f2adb9f3adbaf7adbbeaadb6eeadb7ef +adb8e1adb1e4adb2e5adb3e7adb4e9ad +b50fec1af20cf2adc9f3adcaf6adcbfa +adccecadc5edadc6eeadc7f1adc8e70c +e7adc1e8adc2e9adc3ebadc4e3adbde4 +adbee5adbfe6adc0613662a2566301e3 +adaff2adb00015ed25f314f709f7ad99 +f8ad9afaad9bf3ad96f5ad97f6ad98ed +ad91efad92f0ad93f1ad94f2ad95e714 +ea09eaad8eebad8fecad90e7ad8be8ad +8ce9ad8de1ad86e3ad87e4ad88e5ad89 +e6ad8a0012ed20f40ff4adaaf5adabf6 +adacf7adadf9adaeedada5eeada6efad +a7f0ada8f1ada9e60fe6ada0e7ada1e9 +ada2eaada3ecada4e1ad9ce2ad9de4ad +9ee5ad9f2ab40061cce862002373c2d0 +e51ded0feda905eea91eefa936f2a979 +f3a993e5a74be7a778e8a78ee9a7a777 +c14b773878a26179a2a77aa2e8e1a5ea +0017ed2af414f809f8ab07f9ab08faab +09f4ab04f5ab05f7ab06f109f1ab01f2 +ab02f3ab03eda9feefa9fff0ab00e714 +ea09eaa9fbeba9fceca9fde7a9f8e8a9 +f9e9a9fae409e4a9f5e5a9f6e6a9f7e1 +a9f2e2a9f3e3a9f40014ed25f214f609 +f6ab1bf7ab1cfaab1df2a9c2f3ab19f5 +ab1aedab14eeab15efab16f0ab17f1ab +18e80fe8ab0fe9ab10eaab11ebab12ec +ab13e1ab0ae2ab0be3ab0ce6ab0de7ab +0e0013ec20f30ff3ab2df6ab2ef7ab2f +f8ab30faab31ecab28edab29eeab2af0 +ab2bf2ab2ce60fe6ab23e8ab24e9ab25 +eaab26ebab27e1ab1ee2ab1fe3ab20e4 +ab21e5ab220017ee2af514f809f8ab46 +f9ab47faab48f5ab43f6ab44f7ab45f1 +09f1ab40f2ab41f4ab42eeab3defab3e +f0ab3fe814eb09ebab3aecab3bedab3c +e8ab37e9ab38eaab39e409e4ab34e5ab +35e6ab36e1ab32e2ab33e3a7ca73a25a +74a2aa75a2ff760016ed2af514f809f8 +a9eff9a9f0faa9f1f5a9ecf6a9edf7a9 +eef109f1a9e9f2a9eaf4a9ebeda9e6ee +a9e7efa9e8e614e909e9a9e3eaa9e4eb +a9e5e6a9e0e7a9e1e8a9e2e1a9dbe2a9 +dce3a9dde4a9dee5a9df0016ee2af414 +f709f7a9a8f8a9a9f9a9aaf4a9a5f5a9 +a6f6a9a7f109f1a9a2f2a9a3f3a9a4ee +a99fefa9a0f0a9a1e814eb09eba99cec +a99deda99ee8a999e9a99aeaa99be1a9 +94e2a995e3a996e5a997e6a9980017ef +2af514f809f8a9bff9a9c0faa9c1f5a9 +bcf6a9bdf7a9bef209f2a9b9f3a9baf4 +a9bbefa9b6f0a9b7f1a9b8e714ea09ea +a9b3eda9b4eea9b5e7a9b0e8a9b1e9a9 +b2e409e4a9ade5a9aee6a9afe1a9abe2 +a74de3a9ac0018ee2df417f70cf7a9d7 +f8a9d8f9a9d9faa9daf4a9d4f5a9d5f6 +a9d6f109f1a9d1f2a9d2f3a9d3eea9ce +efa9cff0a9d0e714ea09eaa9cbeba9cc +eda9cde7a9c8e8a9c9e9a9cae409e4a9 +c5e5a9c6e6a9c7e1a9c2e2a9c3e3a9c4 +6ac3186ec1a56ea2656fa2b570a2fb71 +a44b720018ee2df417f70cf7a98ff8a9 +90f9a991faa992f4a98cf5a98df6a98e +f109f1a989f2a98af3a98beea986efa9 +87f0a988e814eb09eba983eca984eda9 +85e8a980e9a981eaa982e409e4a97de6 +a97ee7a97fe1a97ae2a97be3a97c0016 +ee2af514f809f8a933f9a934faa935f5 +a930f6a931f7a932f109f1a92df2a92e +f3a92feea92aefa92bf0a92ce614ea09 +eaa927eba928eda929e6a924e7a925e9 +a926e1a91fe2a920e3a921e4a922e5a9 +230014ef25f514f809f8a949f9a94afa +a94bf5a946f6a947f7a948efa941f0a9 +42f1a943f2a944f4a945ea0feaa93ceb +a93deca93eeda93feea940e1a937e2a9 +38e5a939e6a93ae8a93b0016ef2af514 +f809f8a960f9a961faa962f5a95df6a9 +5ef7a95ff209f2a95af3a95bf4a95cef +a957f0a958f1a959e814eb09eba954ec +a955eda956e8a951e9a952eaa953e1a9 +4ce3a94de4a94ee5a94fe7a9500015ef +25f414f709f7a976f8a977faa978f4a9 +73f5a974f6a975efa96ef0a96ff1a970 +f2a971f3a972e714eb09eba96beca96c +eda96de7a968e9a969eaa96ae1a963e2 +a964e3a965e4a966e6a9676aa25f6ba2 +b76ca40f6d0017ed2af314f709f7a91b +f8a91cfaa91df3a918f5a919f6a91af0 +09f0a915f1a916f2a917eda912eea913 +efa914e714ea09eaa90feba910eca911 +e7a90ce8a90de9a90ee409e4a909e5a9 +0ae6a90be1a906e2a907e3a9080018ee +2df417f70cf7a7d0f8a7d1f9a7d2faa7 +d3f4a7cdf5a7cef6a7cff109f1a7caf2 +a7cbf3a7cceea7c7efa7c8f0a7c9e814 +eb09eba7c4eca7c5eda7c6e8a7c1e9a7 +c2eaa7c3e409e4a7bee6a7bfe7a7c0e1 +a7bbe2a7bce3a7bd0018ee2df417f70c +f7a7e9f8a7eaf9a7ebfaa7ecf4a7e6f5 +a7e7f6a7e8f109f1a7e3f2a7e4f3a7e5 +eea7e0efa7e1f0a7e2e814eb09eba7dd +eca7deeda7dfe8a7dae9a7dbeaa7dce4 +09e4a7d7e6a7d8e7a7d9e1a7d4e2a7d5 +e3a7d60017ee2af414f809f8a902f9a9 +03faa904f4a7fff6a900f7a901f109f1 +a7fcf2a7fdf3a7feeea7f9efa7faf0a7 +fbe714ea09eaa7f6eba7f7eda7f8e7a7 +f3e8a7f4e9a7f5e409e4a7f0e5a7f1e6 +a7f2e1a7ede2a7eee3a7ef65c19b65a2 +5366a29e67a2e968a434690014ee25f4 +14f709f7a7b8f9a7b9faa7baf4a7b5f5 +a7b6f6a7b7eea7b1efa7b2f0a7b3f1a7 +b4f2a7aae60fe6a7ade7a7aeeba723ec +a7afeda7b0e1a7a8e2a7a9e3a7aae4a7 +abe5a7ac0015ef25f514f809f8a75ff9 +a760faa761f5a75cf6a75df7a75eefa7 +57f0a758f1a759f3a75af4a75be614ea +09eaa754eba755eda756e6a751e8a752 +e9a753e1a74ce2a74de3a74ee4a74fe5 +a7500015ee25f414f809f8a775f9a776 +faa777f4a772f5a773f7a774eea76def +a76ef0a76ff1a770f3a771e614ea09ea +a76aeca76beda76ce6a767e7a768e8a7 +69e1a762e2a763e3a764e4a765e5a766 +0015f025f514f809f8a78bf9a78cfaa7 +8df5a788f6a789f7a78af0a783f1a784 +f2a785f3a786f4a787e714ed09eda71e +eea781efa782e7a77ee9a77feaa780e1 +a779e2a77ae3a77be4a77ce6a77d0018 +ed2df317f60cf6a7a3f7a7a4f9a7a5fa +a7a6f3a7a0f4a7a1f5a7a2f009f0a79d +f1a79ef2a79feda79beea79cefa78ee7 +14ea09eaa798eba799eca79ae7a795e8 +a796e9a797e409e4a792e5a793e6a794 +e1a78fe2a790e3a79161a26562a2b563 +a40a640019ee2df417f70cf7a747f8a7 +48f9a749faa74af4a744f5a745f6a746 +f109f1a741f2a742f3a743eea73eefa7 +3ff0a740e717ea0ceaa73aeba73beca7 +3ceda73de7a737e8a738e9a739e409e4 +a734e5a735e6a736e1a731e2a732e3a7 +330014ef2ff514f809f8a5fef9a5fffa +a700f5a5fbf6a5fcf7a5fdefa5f5f032 +f1a5f8f2a5f9f3a5fa012aa5f64b1272 +61e9a5f7e70fe7a5f0e8a5f1eaa5f2ec +a5f3eea5f4e1a5ebe2a5ece3a5ede5a5 +eee6a5ef0017ee2af414f709f7a716f8 +a717f9a718f4a713f5a714f6a715f109 +f1a710f2a711f3a712eea70defa70ef0 +a70fe714eb09eba70aeca70beda70ce7 +a707e9a708eaa709e409e4a704e5a705 +e6a706e1a701e2a702e3a7030018ed2d +f317f60cf6a72df7a72ef9a72ffaa730 +f3a72af4a72bf5a72cf009f0a727f1a7 +28f2a729eda724eea725efa726e714ea +09eaa721eba722eca723e7a71ee8a71f +e9a720e409e4a71be5a71ce6a71de1a7 +19e2a71ae3a5f300184dc2a854c0f257 +375736584e59665a12616ee2d5c60161 +2c631168efc5a01172e1d5c501702c73 +1175f8a3c21165efc93101652c691169 +e9b58d117ae9b9aa544455a2ae560161 +2c691174e8d5c41169e9d5c308685e68 +3c698c6ea2466fa248751174e7d5c210 +6101e158e9042ad13343324b364c3a54 +10c8d13310cebd1710c8d5be10c1d5bf +012aaf8a4d10d6af8a01622a7210e8d5 +c010f4012aa9364210d4a34f1173e1c5 +eb01642a7410efd36c10f2d5c1613465 +80668667116ce7d5bd056d116d2e6e32 +7610f4a7ff10eccfa710e7d36767346b +386c01e5cfedf5b91310e2d5ba10f2d5 +bb116cf5cfff116ee7d5bc126761f2d3 +9f50c0c850a27652a2ad530669476942 +6f6a759079016c2a7210e3abe710efd5 +b901643e6e01e4cd23e8012acd794c10 +cbcd7910e4d5b602672e72387910efab +f701e4cdf6efd5b710e1cf1d106e01e4 +d5b8f5cf6e613e675e6801612a7210e4 +d5b510f7afda026d2e72327510f2cbf0 +10f2cdd110e2d5b4116ef7a565046138 +654c68526c78721174e9d5b2016c2a75 +10e3ad5510eda54c1172edd5b002612e +6c326e10f8c94a10e7d5b101e9c7f3f0 +c7f41172e4b3f3026a306f3675116ef2 +c5b4116ee7d5b31168e7cb7b4d9a4ea2 +b34f05722272307344751167f2c7df01 +6b2a7910e1c7b310e8c7d001672a6d10 +e1d5af10e5c7c367306c366e1161efd5 +ae1161edd5ad1163ebcbea07722e725a +7460756679116df2032aa9d2492e4d32 +5410c8d5a710ceb92210cda9d2116fef +c1c81165e9d5a5116cf4d5a661426574 +6c9a6f01642a6e10e7af5110e9d5a403 +68326b366e3a7210e3d5a010ead59d10 +e1d59e01e4c36fe9d59f0264346e3872 +01e3d5a2efd5a310e6af1f10e4d5a111 +79edc12f036142626265686b116fef01 +2aafd04d10ccd5ac02672e6e327210e2 +d5aa10edd5a810e4d5a91161f4a54b11 +77e1d5ab47c4644ac3704aa6f44ba80d +4c03614665a6d069a6d27901632a6410 +e9d59c10e9d59b026ea6ad6fa6ae7410 +ee001c4ac15f53a1571757ace758aceb +592a5a10d7cddb02c4d576c5d576d4d5 +37534854a24555a2705603c1d532c5d5 +34ced533d5a7a70ece1ad40cd4d527d5 +bb1dd6d528d9d596ced524cfcdf0d2d5 +25d3d595c90cc9cdb5cad522cbcd9ccd +d523c3d521c4d575c5cf6f0ccd17d20c +d2d1efd6d34ad7d303dacf76cdd165ce +d599cfd1bcc809c8d598cbd16dccd52d +c4d597c6d52bc7d52c04c1d59ac7d52f +d3afd9d9d530dad5314d8f4d484ea24f +50a2645203c5d520cfc173d5bb1dd7cb +d20011cf1dd50fd5d50ed6d592d8d50f +d9bf3ddad510cfd590d1d50cd2d591d4 +c1eac60fc6d50bc7bfbacbd58fcca905 +cdb777c1d58ec3d509c4d50ac5cd0d06 +c90cc9d514ccaf83cfc39dd0d593c1d5 +11c3d512c5d5130bcc14d409d4d51ed7 +c7fbd9b31accc975cdd51bd2d51cc7c5 +c4c7d1d8c8b130cbd5944a564b5a4c06 +d30cd3d505d4bdf4d5d506d6bf13c2d5 +8cc9d504cbd58d10cfd58902c5d3fecd +d58adad58b43c0c5465e4662477248a2 +474907d10cd1d587d2d588d3b568d4b5 +d7c3d3fbc4b56bccd585ced58602c9b1 +2ccfb144d2b14d09d00fd0d3f6d1d3f7 +d2d583d4d3f8d7d3f9c1d3f3c6d3f4c8 +a3b9ccb976ced3f504cbd584ced3fad2 +b51fd4b530d5b536435844a2504506c7 +0cc7d581d2d582d3aff6d4d574c1d3ef +c3d3f0c5afbd0fce1ad60cd6d3ead7c7 +f7d9d57fdaad44ced57ecfd3e7d2d3e8 +d5d3e9c80cc8d3e3c9d3e4ccd3e5cdd3 +e6c3d57dc4d3e1c6cd50c7d3e204c5ad +bccad3eccbad85cfd3eddad580376537 +7c38824188420ecc0fd2c5f6d2c9ebd4 +d57cd5b777d6d3dfc60cc6d3d8c7d57b +c9cba4cad3dac1a993c4d57ac5d3d711 +33b6d5751138b6d5760bd214d709d7d3 +d5d8d3d6daa5ded2d3d2d3d3d3d4d3d4 +cc09cca3cfcdd579cfd3d1c4d3cec5d5 +77c6d57831303236341131b9d3cb1137 +b2bb1d1133b0d57410e1c5ac10ef012a +bdc34c10c1bdc31170e3bd36026d2e6e +327310f5bd6c10e2bd6201e1bbeae2b3 +1801613a701161ee012ab5f94a10d0b5 +f9016d2a7610e1d56f10efd56e066e25 +6e346f3a7254741168e9d5731164e1b9 +b31172e5012ab9cc4b01d0d500d2b9cc +1161e9a5f761306850691174f3d57202 +6c2e6e327710e9d57110e9afc310e1d5 +7002612e6d326f10eacd2210f2c93c10 +f2012ab9914b10c8b991473448a26a49 +127461ecb105056f456f4a726475026a +2e6b327210f5c7e810f2b36510e8d564 +016e2a7410e8b34101e7d562edaff801 +61506510eb032aafc4432e47325410d2 +a78b10d9d3eb10d2afc410eed5636130 +65366c1161e7ad641172e1d561116ff2 +012ab1c34710c5b1c3056c186c306d36 +75116ee7d56d1175f7b3f0106e01e7b5 +08f0b507613265a247691172e1d56c01 +6e2a7410f2a54a05ef2defd567f35ef4 +042aabaa4332483c4d405410d7abaa01 +c1d568ced56910cbaba210cfaba4012a +ab9e4310ceab9ee2abafe7d565e9d566 +1162f2032ab3ca493453385501c1b72b +d3d56b10ccb3ca10c5d56a43c1354374 +44a2ee450267446c4a741168e9012aa3 +e54501d2d3f2d4a3e51179f0afb30162 +2a7910edd56010e1d55f0461a28e68a2 +9d6fa2ac70a2ae791172ec0e4b48541d +5432553c58465910d5cd0c01cad11cd2 +d55701c1d3a9dad55810cbd5594b324d +3c52525310cbd55601c7bbb8dad50203 +c4d553c5d554cbbf2cceaf5002cfd555 +d3cd0cd5cbc3421f4232434247464910 +d2d55202c1d550c7a778d9d3e010d3cd +0c01c551d2d5512acbc338364102c6d5 +4dccd54edad54f1139b0cd0c026b2e6e +327210e9d54a10edab7c10f3b5940261 +2e65327210f3d54b10edabce10f2abb8 +1170f4ad1a016d2a7210f4afaa10eed5 +4c03653469866f8c751170ecd55e1176 +e106491749324d364e3a5010cba9bd10 +ceb3d610d5d55b10d0c3e02ab3d6422a +4610cab3da10d4d55a1161ebd55c1167 +f2d55d2aa25441a8a342056f1f6f3e72 +447501672a6810e4d54910e9d5481170 +efabae106101e8c96ce9d5476130655c +68116bf3d546036c326d36733a7410eb +d54510e9d54310f5a5fe10f3d544116e +e7012aa91e4210c4a91e00204ac1ba52 +c0cf5638563c5758586259665a01d2d3 +e1d7cddb04c1d532c4d533c5d534ced5 +33d5a7a701c6d535d3cdc610cbd53603 +c4d3cdc5d3cdd4d537d5cd0c5246536c +54a25a5503c1d3a9c7d52fd9d530dad5 +3105d309d3cd0cd5cbc3d7cbd2c5d520 +c8cddbcfc1730fce1ad40cd4d527d5cb +c3d6d528d9d529ced524cfcdf0d2d525 +d3d526c90cc9cdb5cad522cbcd9ccdd5 +23c1d515c3d521c4d3ccc5cf6f0ecd1a +d20cd2d1efd6d34ad7abaadacf76cdd1 +65ced52ecfd1bcd0d52dc80cc8d133ca +d11ccbd16dccd52dc4d52ac6d52bc7d5 +2c4e5b4e344fa80c50665110c1d51f08 +c90fc9d514ccaf83cfc39dd0c3e0d4d5 +15c1d511c3d512c5d513c8a7a70dcd17 +d40cd4d51ed7c7fbd9b31adad517cdd5 +1bd2d51cd3d51dc70cc7d1d8c8b130cb +d51accc975c1d517c5d518c6d5194aa2 +484ba24c4ca2644d0012ce20d50fd5d5 +0ed6af8ad8d50fd9bf3ddad510ceaf50 +cfaba4d1d50cd2d50dd4c1eac60fc6d5 +0bc7bfbacbbf2ccca905cda9d2c1d508 +c3d509c4d50ac5cd0d01cfd3fdd0b5f9 +07d00cd0d500d2b9ccd7d501dad502c5 +d3fec7bbb8c8b991cdd3ff08d30fd3d5 +05d4bdf4d5d506d6bf13d9d507c1bdc3 +c2d503c9d504cbcd7942c11f466b4662 +477848a24f4907d10cd1d3fcd2b113d3 +b568d4b5d7c3d3fbc4b56bccb3caceb3 +d603c9b12ccfb144d2b14dd8b14d0ace +14d209d2afc4d4d3f8d7d3f9ced3f5d0 +d3f6d1d3f7c1d3f3c5b1c3c6d3f4c8a3 +b9ccb97605d409d4b530d5b536d6d3d8 +cbaba2ced3fad2b51f426443a25a44a2 +924507c80cc8d3f1d2d3f2d3aff6d4a3 +e5c1d3efc3d3f0c5afbdc7a5480010cc +1dd20fd2c9ebd4a34fd5a9d2d6d3dfd9 +d3e0ccd3dbced3dccfd3ddd1d3dec70c +c7a778c8d3d9c9cba4cad3dac1a993c4 +a91ec5d3d7c6d3d80010ce1dd50fd5d3 +e9d6d3ead7c7f7d9d3ebdaad44ceab9e +cfd3e7d2d3e8d3cd0cc80cc8d3e3c9d3 +e4ccd3e5cdd3e6c3bf3ec4d3e1c6cd50 +c7d3e206cb0ccbad85cfd3edd9d3dada +d3eec4adbcc5adbccad3ec354b358637 +8c3892410ccf17d40cd4d3d4d7d3d5d8 +d3d6daa5decfd3d1d2d3d2d3d3d3cc09 +cca3cfcda554cec7f7c4d3cec5d3cfc6 +d3d01133b2c7f71133b6d3cc01382a39 +10b0cd0c10b6d3cd2aafd93130323634 +1131b9d3cb1137b2cbc302302e333238 +10b0adbc10b0ad4410b0a3e504643867 +3e6844724a761173f4a358116cedb128 +1168e2d538116feda39601613e6d01e9 +a549ee012aa5544110cda55410e20013 +4c665135513c5340545655725901c5d3 +cdd4cf7710c1d51f03c1d515c4d3ccd3 +d526d9d52904c4d52ac8bfa1cad541ce +d52ed2d54210cbd53c4c3c4d464e624f +665001cbd51ad3d51d01c2d503d9d507 +04c1d508cdd53bceb95cd2d50dd5d53f +10c7d54010cdd516452f4542474c4950 +4a664b02c8abc9cdd3ffd7d50101c7a5 +48c8d3f110c2d53c03c4d53dced53ed1 +d3fcd2b11310cfd3fd2aa54841324242 +43524410dad3ee02c5d3cfc6d3d0dad5 +3902c8d3d9ced53ad5d53b01c3bf3ece +d39c002574c1f5e534f223f2a548f3a5 +60f6a5a3f9a5cafa012a2e41127261e2 +a5e0022aa5de49a2b55210d5a5e1e5a3 +58e6a366eba3b9eda3e5eea3fc78a678 +32795e7aa260e125e25106eb0ceba5c6 +eca5c7eda5c8f8a5c9e2a5c3e5a5c4e7 +a5c50013ee20f30ff3a5d9f4a5daf5a5 +dbf8a5dcfaa5ddeea5d5efa5d6f0a5d7 +f1a5d8f2a5cae70fe7a5d0e8a5d1e9a5 +d2eba5d3eca5d4e1a5cbe2a5cce3a5cd +e4a5cee5a5cf08ed0feda5e5eea5e6ef +a5e7f4a5e8faa5e9e2a5e2e4a5e3e7a5 +e4ea012a2e41127261e2a5e0032aa5de +312e49345310d5a5e11137b2a5e101d1 +a5dfd2a5e074a24875a29d76a2e37700 +12ee20f50ff5a5bef6a5bff7a5c0f8a5 +c1f9a5c2eea5b9efa5baf2a5bbf3a5bc +f4a5bde70fe7a5b4e8a5b5e9a5b6eba5 +b7eda5b8e1a5b0e2a5b1e3a5b2e5a5b3 +0017ef2af514f809f8a58bf9a58cfaa5 +8df5a588f6a589f7a58af209f2a585f3 +a586f4a587efa582f0a583f1a584e914 +ec09eca57feda580eea581e9a57ceaa5 +7deba57ee409e4a579e5a57ae7a57be1 +a576e2a577e3a5780014ed25f214f709 +f7a5a0f9a5a1faa5a2f2a59df4a59ef5 +a59feda598eea599efa59af0a59bf1a5 +9ce80fe8a593e9a594eaa595eba596ec +a597e1a58ee3a58fe4a590e5a591e7a5 +920bee14f409f4a5adf5a5aef6a5afee +a5aaefa5abf3a5aceb09eba5a7eca5a8 +eda5a9e2a5a4e4a5a5e9a5a66ac2e86f +c16d6fa25370a28e71a2e372a2fe7300 +14ec25f414f809f8a573f9a574faa575 +f4a570f5a571f6a572eca56beea56cef +a56df2a56ef3a56fe70fe7a566e8a567 +e9a568eaa569eba56ae1a561e2a562e3 +a563e4a564e5a5650011eb1df20ff2a5 +24f3a525f4a526f8a527faa528eba520 +eca521eda522eea523e50fe5a51be6a5 +1ce7a51de9a51eeaa51fe1a517e2a518 +e3a519e4a51a0017ee2af514f809f8a5 +3cf9a53dfaa53ef5a539f6a53af7a53b +f209f2a536f3a537f4a538eea533efa5 +34f0a535e814eb09eba530eca531eda5 +32e8a52de9a52eeaa52fe509e5a52be6 +a382e7a52ce2a529e3a3b5e4a52a08ed +0feda543eea544f2a545f4a546faa547 +e3a53fe4a540e7a541eba5420014ee25 +f314f809f8a55df9a55efaa55ff3a55a +f5a55bf7a55ceea555efa556f0a557f1 +a558f2a559e90fe9a550eaa551eba552 +eca553eda554e2a548e332e4a54de5a5 +4ee8a54f032aa54948324e3a5012616c +eda54c126174f2a54a126261f4a54b6a +a2686ba2836ca2c46da4196e0019ee2d +f417f70cf7a513f8a514f9a515faa516 +f4a510f5a511f6a512f109f1a50df2a5 +0ef3a50feea50aefa50bf0a50ce717ea +0ceaa506eba507eca508eda509e7a503 +e8a504e9a505e409e4a500e5a501e6a5 +02e1a3fde2a3fee3a3ff08f00ff0a3b5 +f4a35af5a3b6f7a3b7faa3b8e1a3b1e7 +a3b2e9a3b3eea3b40013ef20f40ff4a3 +c9f5a3caf6a3cbf7a3ccfaa3cdefa3c4 +f0a3c5f1a3c6f2a3c7f3a3c8e70fe7a3 +bfe8a3c0e9a3c1eba3c2eca3c3e2a3ba +e3a3bbe4a3bce5a3bde6a3be0017ee2a +f414f809f8a3e2f9a3e3faa3e4f4a3df +f5a3e0f7a3e1f109f1a3ddf2a3def3a3 +cfeea3daefa3dbf0a3dce814eb09eba3 +d7eca3d8eda3d9e8a3d4e9a3d5eaa3d6 +e409e4a3d1e5a3d2e6a3d3e1a3cee2a3 +cfe3a3d00016ef2af514f809f8a3f9f9 +a3fafaa3fbf5a3f6f6a3f7f7a3f8f209 +f2a3f3f3a3f4f4a3f5efa3f0f0a3f1f1 +a3f2e714eb09eba3ededa3eeeea3efe7 +a3ebe9a3aceaa3ece1a3e6e2a3e7e3a3 +e8e5a3e9e6a3ea65c14365a25866a283 +67a2ab68a406690015ed25f214f709f7 +a3aef8a3aff9a3b0f2a3abf3a3acf4a3 +adeda3a6eea3a7efa3a8f0a3a9f1a3aa +e614ea09eaa3a3eba3a4eca3a5e6a3a0 +e7a3a1e9a3a2e1a39be2a39ce3a39de4 +a39ee5a39f0ced17f50cf5a362f7a363 +f9a364faa365eda35ff1a360f2a361e5 +09e5a35ceba35deca35ee1a359e2a35a +e3a35b0bee14f309f3a370f5a371faa3 +72eea36defa36ef0a36fe809e8a36ae9 +a36beba36ce2a367e4a368e5a3690019 +ee2df417f70cf7a389f8a38af9a38bfa +a38cf4a386f5a387f6a388f109f1a383 +f2a384f3a385eea380efa381f0a382e7 +17ea0ceaa37ceba37deca37eeda37fe7 +a379e8a37ae9a37be409e4a376e5a377 +e6a378e1a373e2a374e3a3750ded17f0 +0cf0a397f2a398f3a399f4a39aeda394 +eea395efa396e80ce8a390e9a391eba3 +92eca393e1a38de2a38ee7a38f61a250 +62a28563a2be640014ee25f414f809f8 +a355f9a356faa357f4a352f5a353f7a3 +54eea34defa34ef0a34ff1a350f2a351 +e70fe7a348e8a349e9a34aeaa34beca3 +4ce1a343e2a344e4a345e5a346e6a347 +0015ed1af30ef706f74bf84dfa4ff33d +f447f549ed3dee3fef41f043f145e60e +e906e937eb39ec3be631e733e835e127 +e229e32be42de52f0016ee1ef50ef806 +f87bf97dfa7ff575f677f779f206f26f +f371f473ee69ef6bf06de60ee906e963 +ec65ed67e65de75fe861e153e255e357 +e459e55b0012f118f60cf69df79ff8a1 +f9a341faa342f193f295f397f499f59b +e60ae689e88bed8dee8ff091e181e283 +e485e587 } } match{ @@ -9959,14 +9976,14 @@ a341faa342f193f295f397f499f59be6 00000000010000000001000000 } trie:bin{ -00196ec42e74c1ad77c0c777a27d78a2 -8779a2977a046c386daa9ee138e856f5 +00196ec42974c1ad77c0c777a27d78a2 +8779a2977a046c386daa9ae138e856f5 1165ee5d12ed6df335117ae848012a85 4c166174ee48616ef335117ae820022a 8548344c166174ee48616ef34911616e 01e97ef41348616ef42007b30ab33eb4 3ab536b610b6292a2bb026b122b205b3 -c8b8b329b429b52905b3c8aeb329b429 +c8bfb329b429b52905b3c8b5b329b429 b5291248616e01f349f44901752aef11 66f25d12f57ae835016d2ae81165ee5d 02eda241f622f7116de7350369327538 @@ -9974,161 +9991,161 @@ e93eef1165ee5d12e879e93512e57ae8 351165ee5c012a8548166562f24c6174 ee35744a75a2b476016b2c7212ef65f4 3501eb22f4116df3350ee171eb0eeba2 -a5eea2dbefa2d8f41172f55de14ee592 -e7aa5ae91165ee5c012a8545167468e9 +a5eea2d9efa2d6f41172f55de14ee592 +e7aa51e91165ee5c012a8545167468e9 4c6174ee350165427410e120012a854c 166174ee54616dec4910ee5c012a8554 16616dec4c6174ee350165427410e520 012a854c166174ee54656cf54910ee5c 012a855416656cf54c6174ee356c1c6c -366dac2875367812f96de73512e865ee -5d01eda25af9126b6cee35643265a2e9 +366dac2275367812f96de73512e865ee +5d01eda258f9126b6cee35643265a2e4 6b12e76de73512f86de7350472527a58 -e75ef2a295fa1172f55c012a854c1661 +e75ef2a4d6fa1172f55c012a854c1661 74ee437972ec3512eb6df33512f375fa -35117ae84971c16e71a2b972a4567300 -13e85bf12df130f234f428f5a830f711 -65ee5d107301e829f220022a8543344c -166174ee437972ec2b167972ec4c6174 -ee2be836e946eb64ee22ef1165ee5d02 -62ac3d68227310f2291165ee5c012a85 -5316696ee84c6174ee351163f349702e -70527258735ee1b220e41165ee5c012a -8541167261e24c6174ee3512f66ff235 -12ef73e33501e8b020f91161e1296338 -643e674a68526b12e76de73512ee69f4 -4901e322ee1173e33513e36b6cee3512 -f561f23504753a769077a26478a26df5 -1165f35d0cec16f30bf32af726f822f9 -1171f535ec26f022f21171f535e709e7 -26e822eb1171f535e226e422e61171f5 -350ded16f00bf02af326f722fa1171f5 -35ed26ee22ef1171f535e80be82ae926 -ea22ec1171f535e126e322e51171f535 -03e12ae326e822f31171f5350aef14f4 -09f426f522f71171f535ef26f022f211 -71f535e12ee32ae826ec22ee1171f535 -1171f5350361a820ed30eea289f71166 -f25d1164e5496ea2736fa2d970086b51 -6bac1b7362e170f38ef41170f4a28007 -b3c4dab3aaf4b426b522b604b029b229 -b429b529b62901e5a2d5f41170f33511 -65ee5c012a8547167572f54c6174ee35 -1165ee5c012a8541167261e24c6174ee -356234633a65406712e161f23512f470 -f33512ed65ee4912ec6df3350a7946ee -19ee2eef38f91165ee5d106e01e249ef -4901647c6e01e223ee497948e256e511 -65ee5c012a8544166576e14c6174ee35 -01e4a67eee1165ee5d01642c6e01ee49 -ef2310e13161a87a6834693a6c427312 -ef65ee5d12e467ee3513f16b6cee3513 -e56c75f935046b54725ce3ae31eda2e4 -f21165ee5c012a854f167279e14c6174 -ee3513e96b6cee3502e3a6ccee22f311 -6df33567c3316ac2586aa2bc6ba4146c -a4c06d00107669ee35eea411f24ef374 -f4a2a1f91165ee5c012a854d16796df2 -4c6174ee350168a6636d10f220012a85 -4c166174ee446576e1491169e45d7676 -e7a44de9a61aec0165426d10ec20012a -854c166174ee4d6c79ed4910ee5c012a -854d166c79ed4c6174ee3512e66dee35 -6e1f6e34713a73407512e96df33512f0 -7ae83512e76df33501e8aca9e9116df3 -3561346548664e6912ee6df33501e92a -f8116df3351168e94912ef6df33502e1 -4ae246e51165ee5d02612ee13af61169 -e44901eb22f8116df335116ae120032a -8548384b784c166174ee4a7061ee2b02 -6136694272156bf44a7061ee2b156ee9 -4a7061ee2b1172e10148464a127061ee -2b12616ee101482c4a127061ee2b1272 -6bf42b0beb73ef36ef2ef57cf91172f5 -5d116bef20022a8548464a12616def01 -482c4b126f72e52b12616ee72b11616e -01e722e9134b6f72e52b1174f25deba8 -c7ed6aee0165426b10ee20012a854c16 -6174ee4b6e64e14910ee5c012a854b16 -6e64e14c6174ee351165ee5c012a854b -16686df24c6174ee35781f782ee134e7 -1166f25d12e46df3351165ee5c012a85 -4716656ff24c6174ee356e36723e7601 -e222f2116df33513ee6b6feb3512e965 -ee5d0e753ee221e24ee7a29dee4cef11 -65ee5c012a854c16616fef4c6174ee35 -1164e5291166f25d753277387a40e111 -69f44912e166f25d13e76c75f93512e8 -7ae8356f2a6f48724e735c7402e730ef -22f3126c75f935116cf63512fa65ee5d -01e922ed126c75f93513ed6c75f93563 -4669526b02e226ef22f3126c75f93512 -6c75f93501e522e6116df33512f76df3 -35676a68a2766905e40ae4a8b4e734f3 -1165ee49642e6b36e11165ee5d13e16c -75f93512f469f53509e124e1a297e4a2 -94eca2ffeea2fcf50167286810e95d10 -f520012a854c166174ee47756af24961 -3e6b526e5a73607501e922ee1167ee35 -02e1a256eea483f8116fed3513f06b70 -e53512f767ee3512f764e52907e934e9 -4ef26cf4a828f91172f55c012a854116 -726dee437972ec351168e920012a854c -166174ee446576e1490162287310e829 -10f32961326a4c7352e11165ee5d02e5 -30eba426f71165ee49116fed3512e96d -f33512ee7ae83564c0ea648865a24866 -0366327538ef6af9116eec4912ed66e6 -3506e80be82ae926f122f61166e635e2 -26e522e61166e6351166e6351164e149 -027434753ae1106e01e231ef3112f96e -e53512f06df33506ee85ee36efa285f3 -a241f51165f3491165eea28007b31db3 -64b426b538b604b029b129b429b527b6 -2904b027b127b427b527b6272a2bb030 -b12cb201b229b32904b029b129b429b5 -27b6291165f3a28007b312b37ab426b5 -22b604b029b229b429b529b6292a2bb0 -26b14eb204b029b229b429b529b62904 -b029b229b429b529b62901b129b3296e -2e7936e51165ee5d13e26b6cee3513ef -6b6cee3561a26062a499630c702ee111 -e1a2cdefa4d8f32af91165ee491173eb -49703e72447a01e822ef117ae835117a -e83512f87ae83512f366f2496a146a30 -6b366f12e16df33512f97ae83512e261 -f25d643065366812f265ee4912ef7ae8 -3513e26669ec5d001576bce692f275f2 -4af9a26cfa1172f55c012a854c166174 -ee437972ec351161f220012a5a4c1661 -74ee417261e24807b327b32ab460b522 -b605b336b329b529b6298407b313b32a -b438b522b605b322b329b529b62910b4 -292a2bb026b122b205b30fb329b529b6 -2905b306b329b529b629b029b129b229 -1165f349e64aeba2aded1165ee5c012a -8545167468e94c6174ee351165ee4976 -36793c7a50e156e21172f55d12ec61f2 -3503e82aec26ee22f01161f23512e261 -fa35127373f9296635701e7030723c75 -12fa61f23501e322e41161f23503f12a -f326f922fa1161f235663069366c12ee -73f13512e261f23513e97379f235613e -624e635a64906501e222e31161f23502 -e526ef32f41173f13501e822f61161f2 -3505f709f726f822f91161f235e82eed -22f11161f2351165ee5d1161f23512e6 -61f2350e7668ee4aee3eef82f2a0f301 -68287310e82910f2290162426510ee5c -012a854216656ee74c6174ee3510ee20 -012a854c166174ee42656ee749117ae8 -48012a8554166962f448616ef3351166 -f24976327a3ee544e81168e95d01e522 -f5116df33512e36de7351172f5496822 -68346a3a6d4e7412ea6df33512f26de7 -3501ee2af1116de735116df33512ed6d -e735613062366512ed65ee5d12ec75f2 -4912fa61f235 +35117ae84971c16971a2b472a4517300 +14e45fef30f40af428f5a829f71165ee +5def78f174f2107301e829f220022a85 +43344c166174ee437972ec2b167972ec +4c6174ee2be4a473e832e942eb60ee11 +65ee5d0262ac3668227310f2291165ee +5c012a855316696ee84c6174ee351163 +f3496b256b36703c72427348e11168e9 +5d12e76de73512f66ff23512ef73e335 +01e8b02cf91161e1296338643e674a68 +526a12e37ae83512ee69f44901e322ee +1173e33513e36b6cee3512f561f23504 +753a769077a26478a26df51165f35d0c +ec16f30bf32af726f822f91171f535ec +26f022f21171f535e709e726e822eb11 +71f535e226e422e61171f5350ded16f0 +0bf02af326f722fa1171f535ed26ee22 +ef1171f535e80be82ae926ea22ec1171 +f535e126e322e51171f53503e12ae326 +e822f31171f5350aef14f409f426f522 +f71171f535ef26f022f21171f535e12e +e32ae826ec22ee1171f5351171f53503 +61a81fed30eea289f71166f25d1164e5 +496ea2736fa2d970086b516bac1e7362 +e170f38ef41170f4a28007b3c4ddb3aa +f7b426b522b604b029b229b429b529b6 +2901e5a2d5f41170f3351165ee5c012a +8547167572f54c6174ee351165ee5c01 +2a8541167261e24c6174ee356234633a +65406712e161f23512f470f33512ed65 +ee4912ec6df3350a7946ee19ee2eef38 +f91165ee5d106e01e249ef4901647c6e +01e223ee497948e256e51165ee5c012a +8544166576e14c6174ee3501e4a67dee +1165ee5d01642c6e01ee49ef2310e131 +61a8646834693a6c427312ef65ee5d12 +e467ee3513f16b6cee3513e56c75f935 +046b54725ce3ae3deda2e0f21165ee5c +012a854f167279e14c6174ee3513e96b +6cee3502e3a6cbee22f3116df33567c3 +346ac2576aa2b86ba4106ca4bc6d0010 +7669ee35eea40df24ef374f4a29df911 +65ee5c012a854d16796df24c6174ee35 +0168a6626d10f220012a854c166174ee +446576e1491169e45d7676e7a449e9a6 +19ec0165426d10ec20012a854c166174 +ee4d6c79ed4910ee5c012a854d166c79 +ed4c6174ee3512e66dee356e1b6ea8f4 +713073367512e96df33512e76df33501 +e8acb9e9116df33561346548664e6912 +ee6df33501e92af8116df3351168e949 +12ef6df33502e14ae246e51165ee5d02 +612ee13af61169e44901eb22f8116df3 +35116ae120032a8548384b784c166174 +ee4a7061ee2b026136694272156bf44a +7061ee2b156ee94a7061ee2b1172e101 +48464a127061ee2b12616ee101482c4a +127061ee2b12726bf42b0beb73ef36ef +2ef57cf91172f55d116bef20022a8548 +464a12616def01482c4b126f72e52b12 +616ee72b11616e01e722e9134b6f72e5 +2b1174f25deba8d7ed6aee0165426b10 +ee20012a854c166174ee4b6e64e14910 +ee5c012a854b166e64e14c6174ee3511 +65ee5c012a854b16686df24c6174ee35 +781f782ee134e71166f25d12e46df335 +1165ee5c012a854716656ff24c6174ee +356e36723e7601e222f2116df33513ee +6b6feb3512e965ee5d0e7541e21de24e +e7a2a0ee72ef1165ee5c012a854c1661 +6fef4c6174ee351164e529753277467a +4ee11169f44901e12ae8117ae8351166 +f25d13e76c75f93512e87ae8356f2a6f +48724e735c7402e730ef22f3126c75f9 +35116cf63512fa65ee5d01e922ed126c +75f93513ed6c75f935634669526b02e2 +26ef22f3126c75f935126c75f93501e5 +22e6116df33512f76df335676a68a276 +6905e40ae4a8c1e734f31165ee49642e +6b36e11165ee5d13e16c75f93512f469 +f53509e124e1a29be4a298eca403eea4 +00f50167286810e95d10f520012a854c +166174ee47756af249613e6b526e5a73 +607501e922ee1167ee3502e1a454eea4 +89f8116fed3513f06b70e53512f767ee +3512f764e52908e137e1a436e94ef26c +f4a832f91172f55c012a854116726dee +437972ec351168e920012a854c166174 +ee446576e1490162287310e82910f329 +61346a4e6e547312ee7ae83502e530eb +a428f71165ee49116fed3512e96df335 +12ed7ae83564c0ea648865a248660366 +327538ef6af9116eec4912ed66e63506 +e80be82ae926f122f61166e635e226e5 +22e61166e6351166e6351164e1490274 +34753ae1106e01e231ef3112f96ee535 +12f06df33506ee85ee36efa285f3a241 +f51165f3491165eea28007b31db364b4 +26b538b604b029b129b429b527b62904 +b027b127b427b527b6272a2bb030b12c +b201b229b32904b029b129b429b527b6 +291165f3a28007b312b37ab426b522b6 +04b029b229b429b529b6292a2bb026b1 +4eb204b029b229b429b529b62904b029 +b229b429b529b62901b129b3296e2e79 +36e51165ee5d13e26b6cee3513ef6b6c +ee3561a26962a4a2630e7030e111e1a2 +d6efa4e1f32af91165ee491173eb4970 +427248737e7a01e822ef117ae835117a +e83512f87ae83512f366f2496a1b6a34 +6b3a6e406f12e16df33512f97ae83512 +e261f25d12f07ae835643065366812f2 +65ee4912ef7ae83513e26669ec5d0015 +76bce692f275f24af9a26cfa1172f55c +012a854c166174ee437972ec351161f2 +20012a5a4c166174ee417261e24807b3 +27b32ab460b522b605b336b329b529b6 +298407b313b32ab438b522b605b322b3 +29b529b62910b4292a2bb026b122b205 +b30fb329b529b62905b306b329b529b6 +29b029b129b2291165f349e64aeba2ad +ed1165ee5c012a8545167468e94c6174 +ee351165ee497636793c7a50e156e211 +72f55d12ec61f23503e82aec26ee22f0 +1161f23512e261fa35127373f9296635 +701e7030723c7512fa61f23501e322e4 +1161f23503f12af326f922fa1161f235 +663069366c12ee73f13512e261f23513 +e97379f235613e624e635a64906501e2 +22e31161f23502e526ef32f41173f135 +01e822f61161f23505f709f726f822f9 +1161f235e82eed22f11161f2351165ee +5d1161f23512e661f2350e7668ee4aee +3eef82f2a0f30168287310e82910f229 +0162426510ee5c012a854216656ee74c +6174ee3510ee20012a854c166174ee42 +656ee749117ae848012a8554166962f4 +48616ef3351166f24976327a3ee544e8 +1168e95d01e522f5116df33512e36de7 +351172f549682268346a3a6d4e7412ea +6df33512f26de73501ee2af1116de735 +116df33512ed6de735613062366512ed +65ee5d12ec75f24912fa61f235 } } } diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 177a62d49f97..93fd931206d4 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -1705,6 +1705,13 @@ metaZones:table(nofallback){ "America_Central", } } + "America:Coyhaique"{ + { + "Chile", + "1970-01-01 00:00", + "2025-03-19 21:00", + } + } "America:Creston"{ { "America_Mountain", diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index 9026aada5ac6..36637033310d 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -336,6 +336,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"njz"} } + dek{ + reason{"deprecated"} + replacement{"sqm"} + } deu{ reason{"overlong"} replacement{"de"} @@ -1052,10 +1056,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"mt"} } - mnk{ - reason{"macrolanguage"} - replacement{"man"} - } mnt{ reason{"deprecated"} replacement{"wnn"} @@ -1212,6 +1212,10 @@ metadata:table(nofallback){ reason{"macrolanguage"} replacement{"ne"} } + nte{ + reason{"deprecated"} + replacement{"eko"} + } nts{ reason{"deprecated"} replacement{"pij"} @@ -5186,7 +5190,15 @@ metadata:table(nofallback){ } part-per-million{ reason{"deprecated"} - replacement{"permillion"} + replacement{"part-per-1e6"} + } + permillion{ + reason{"deprecated"} + replacement{"part-per-1e6"} + } + portion-per-1e9{ + reason{"deprecated"} + replacement{"part-per-1e9"} } pound-foot{ reason{"deprecated"} @@ -5256,12 +5268,14 @@ metadata:table(nofallback){ "bm_Nkoo_ML", "bn_BD", "bo_CN", + "bqi_IR", "br_FR", "brx_IN", "bs_Cyrl_BA", "bs_Latn", "bs_Latn_BA", "bss_CM", + "bua_RU", "byn_ER", "ca_ES", "cad_US", @@ -5362,6 +5376,7 @@ metadata:table(nofallback){ "kcg_NG", "kde_TZ", "kea_CV", + "kek_GT", "ken_CM", "kgp_BR", "khq_ML", @@ -5385,7 +5400,9 @@ metadata:table(nofallback){ "ksb_TZ", "ksf_CM", "ksh_DE", - "ku_TR", + "ku_Arab_IQ", + "ku_Latn", + "ku_Latn_TR", "kw_GB", "kxv_Deva_IN", "kxv_Latn", @@ -5410,6 +5427,7 @@ metadata:table(nofallback){ "luo_KE", "luy_KE", "lv_LV", + "lzz_TR", "mai_IN", "mas_KE", "mdf_RU", @@ -5465,8 +5483,11 @@ metadata:table(nofallback){ "pa_Guru_IN", "pap_CW", "pcm_NG", + "pi_Latn", + "pi_Latn_GB", "pis_SB", "pl_PL", + "pms_IT", "prg_PL", "ps_AF", "pt_BR", @@ -5500,6 +5521,7 @@ metadata:table(nofallback){ "seh_MZ", "ses_ML", "sg_CF", + "sgs_LT", "shi_Latn_MA", "shi_Tfng", "shi_Tfng_MA", diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index a95f79e8aaa5..360d1b5bea89 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -139,6 +139,13 @@ supplementalData:table(nofallback){ 15, } } + 1{ + end:intvector{ + 622, + 7, + 14, + } + } } system{"lunar"} } @@ -151,6 +158,13 @@ supplementalData:table(nofallback){ 16, } } + 1{ + end:intvector{ + 622, + 7, + 15, + } + } } system{"lunar"} } @@ -163,6 +177,13 @@ supplementalData:table(nofallback){ 15, } } + 1{ + end:intvector{ + 622, + 7, + 14, + } + } } system{"lunar"} } @@ -175,6 +196,13 @@ supplementalData:table(nofallback){ 15, } } + 1{ + end:intvector{ + 622, + 7, + 14, + } + } } system{"lunar"} } @@ -187,6 +215,13 @@ supplementalData:table(nofallback){ 15, } } + 1{ + end:intvector{ + 622, + 7, + 14, + } + } } system{"lunar"} } @@ -2176,7 +2211,7 @@ supplementalData:table(nofallback){ "islamic-tbla", } } - cldrVersion{"47"} + cldrVersion{"48"} codeMappings{ { "AA", @@ -4789,6 +4824,7 @@ supplementalData:table(nofallback){ "cwd", "daf", "dap", + "dek", "dgo", "dgu", "dha", @@ -4887,7 +4923,6 @@ supplementalData:table(nofallback){ "mhr", "mja", "mld", - "mnk", "mnt", "mo", "mof", @@ -4913,6 +4948,7 @@ supplementalData:table(nofallback){ "nom", "noo", "npi", + "nte", "nts", "nxu", "ojg", @@ -5390,7 +5426,7 @@ supplementalData:table(nofallback){ "ddw", "de", "dec~i", - "dek~n", + "del~n", "dep~s", "dev", "dez", @@ -5814,7 +5850,7 @@ supplementalData:table(nofallback){ "hna", "hnd~e", "hng~j", - "hnn~o", + "hnm~o", "hns", "hnu", "ho", @@ -6250,7 +6286,7 @@ supplementalData:table(nofallback){ "lu", "lua", "luc~f", - "lui~w", + "luh~w", "luy~z", "lv", "lva", @@ -6314,8 +6350,7 @@ supplementalData:table(nofallback){ "mma~r", "mmt~z", "mn", - "mna~j", - "mnl~s", + "mna~s", "mnu~z", "moa", "moc~e", @@ -6446,7 +6481,7 @@ supplementalData:table(nofallback){ "nrz", "nsa~i", "nsk~z", - "ntd~e", + "ntd", "ntg", "nti~k", "ntm", @@ -6867,8 +6902,7 @@ supplementalData:table(nofallback){ "sia~b", "sid~m", "sio~z", - "sja~b", - "sjd~e", + "sja~e", "sjg", "sjk~p", "sjr~u", @@ -7516,7 +7550,7 @@ supplementalData:table(nofallback){ "ymk~s", "ymx", "ymz", - "yna", + "yna~b", "ynd~e", "yng", "ynk~l", @@ -7872,6 +7906,7 @@ supplementalData:table(nofallback){ "Bass", "Batk", "Beng", + "Berf", "Bhks", "Bopo", "Brah~i", @@ -7882,6 +7917,7 @@ supplementalData:table(nofallback){ "Cari", "Cham", "Cher", + "Chis", "Chrs", "Copt", "Cpmn", @@ -7996,6 +8032,7 @@ supplementalData:table(nofallback){ "Shaw", "Shrd", "Sidd", + "Sidt", "Sind", "Sinh", "Sogd", @@ -8016,6 +8053,7 @@ supplementalData:table(nofallback){ "Taml", "Tang", "Tavt", + "Tayo", "Telu", "Tfng", "Tglg", @@ -8025,6 +8063,7 @@ supplementalData:table(nofallback){ "Tirh", "Tnsa", "Todr", + "Tols", "Toto", "Tutg", "Ugar", @@ -11709,6 +11748,10 @@ supplementalData:table(nofallback){ "torque-pound-foot", "concentr-milligram-per-deciliter", "mass-metric-ton", + "length-100-kilometer", + "concentr-permillion", + "concentr-portion", + "concentr-portion-per-1e9", } regular{ "acceleration-g-force", @@ -11732,7 +11775,7 @@ supplementalData:table(nofallback){ "concentr-milligram-ofglucose-per-deciliter", "concentr-millimole-per-liter", "concentr-item", - "concentr-permillion", + "concentr-part-per-1e6", "concentr-percent", "concentr-permille", "concentr-permyriad", @@ -11899,7 +11942,7 @@ supplementalData:table(nofallback){ "volume-pinch", "volume-quart-imperial", "angle-steradian", - "concentr-portion", + "concentr-part", "concentr-ofglucose", "concentr-katal", "duration-fortnight", @@ -11913,7 +11956,6 @@ supplementalData:table(nofallback){ "energy-sievert", "energy-gray", "force-kilogram-force", - "length-100-kilometer", "length-rod", "length-chain", "magnetic-tesla", @@ -11941,10 +11983,12 @@ supplementalData:table(nofallback){ "volume-sai", "volume-to-jp", "volume-koku", - "concentr-portion-per-1e9", + "concentr-part-per-1e9", "mass-fun", "duration-night", "speed-light-speed", + "volume-fluid-ounce-metric", + "volume-cup-imperial", } } variant{ @@ -12005,23 +12049,29 @@ supplementalData:table(nofallback){ "grclass", "grital", "grmistr", + "hanoi", "hepburn", "hognorsk", "hsistemo", + "huett", "ijekavsk", "itihasa", "ivanchov", "jauer", "jyutping", "kkcor", + "kleinsch", "kociewie", "kscor", + "leidentr", "lemosin", "lengadoc", "lipaw", "ltg1929", "ltg2007", "luna1918", + "mdcegyp", + "mdctrans", "metelko", "monoton", "ndyuka", @@ -12044,6 +12094,7 @@ supplementalData:table(nofallback){ "rigik", "rozaj", "rumgr", + "saigon", "scotland", "scouse", "simple", @@ -12077,20 +12128,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{ - "DJ", - "ET", - } - } } ab{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"GE"} - } } abq{ primary{ @@ -12101,41 +12143,26 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"GH"} - } } ace{ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } ach{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } ada{ primary{ scripts{"Latn"} } - secondary{ - territories{"GH"} - } } ady{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } ae{ primary{ @@ -12146,20 +12173,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"TN"} - } } af{ primary{ scripts{"Latn"} } - secondary{ - territories{ - "NA", - "ZA", - } - } } agq{ primary{ @@ -12186,9 +12204,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"GH"} - } } akk{ primary{ @@ -12209,9 +12224,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"XK"} - } } alt{ primary{ @@ -12221,7 +12233,6 @@ supplementalData:table(nofallback){ am{ primary{ scripts{"Ethi"} - territories{"ET"} } } amo{ @@ -12258,63 +12269,18 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{ - "IL", - "JO", - "LB", - "PS", - "SY", - "TR", - } - } } apd{ primary{ scripts{"Arab"} } - secondary{ - territories{"SD"} - } } ar{ primary{ scripts{"Arab"} - territories{ - "AE", - "BH", - "DJ", - "DZ", - "EG", - "EH", - "ER", - "IL", - "IQ", - "JO", - "KM", - "KW", - "LB", - "LY", - "MA", - "MR", - "OM", - "PS", - "QA", - "SA", - "SD", - "SO", - "SY", - "TD", - "TN", - "YE", - } } secondary{ scripts{"Syrc"} - territories{ - "IR", - "SS", - } } } arc{ @@ -12345,17 +12311,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"DZ"} - } } ars{ primary{ scripts{"Arab"} } - secondary{ - territories{"SA"} - } } arw{ primary{ @@ -12366,25 +12326,16 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"MA"} - } } arz{ primary{ scripts{"Arab"} } - secondary{ - territories{"EG"} - } } as{ primary{ scripts{"Beng"} } - secondary{ - territories{"IN"} - } } asa{ primary{ @@ -12395,9 +12346,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ES"} - } } atj{ primary{ @@ -12408,9 +12356,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } avk{ primary{ @@ -12421,40 +12366,27 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } ay{ primary{ scripts{"Latn"} - territories{"BO"} } } az{ primary{ + scripts{"Latn"} + } + secondary{ scripts{ - "Latn", "Arab", "Cyrl", } - territories{"AZ"} - } - secondary{ - territories{ - "IQ", - "IR", - "RU", - } } } ba{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } bal{ primary{ @@ -12462,10 +12394,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Latn"} - territories{ - "IR", - "PK", - } } } ban{ @@ -12474,7 +12402,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Bali"} - territories{"ID"} } } bap{ @@ -12486,12 +12413,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{ - "AT", - "DE", - } - } } bas{ primary{ @@ -12509,7 +12430,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Batk"} - territories{"ID"} } } bbj{ @@ -12521,47 +12441,31 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"CI"} - } } be{ primary{ scripts{"Cyrl"} - territories{"BY"} } } bej{ primary{ scripts{"Arab"} } - secondary{ - territories{"SD"} - } } bem{ primary{ scripts{"Latn"} } - secondary{ - territories{"ZM"} - } } bew{ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } bez{ primary{ scripts{"Latn"} } - secondary{ - territories{"TZ"} - } } bfd{ primary{ @@ -12589,24 +12493,17 @@ supplementalData:table(nofallback){ bg{ primary{ scripts{"Cyrl"} - territories{"BG"} } } bgc{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } bgn{ primary{ scripts{"Arab"} } - secondary{ - territories{"PK"} - } } bgx{ primary{ @@ -12617,74 +12514,46 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } bhi{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } bho{ primary{ scripts{"Deva"} } - secondary{ - territories{ - "IN", - "NP", - } - } } bi{ primary{ scripts{"Latn"} - territories{"VU"} } } bik{ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } bin{ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } bjj{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } bjn{ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } bjt{ primary{ scripts{"Latn"} } - secondary{ - territories{"SN"} - } } bkm{ primary{ @@ -12721,9 +12590,6 @@ supplementalData:table(nofallback){ "Nkoo", } } - secondary{ - territories{"ML"} - } } bmq{ primary{ @@ -12733,19 +12599,12 @@ supplementalData:table(nofallback){ bn{ primary{ scripts{"Beng"} - territories{"BD"} - } - secondary{ - territories{"IN"} } } bo{ primary{ scripts{"Tibt"} } - secondary{ - territories{"CN"} - } } bpy{ primary{ @@ -12756,9 +12615,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } bqv{ primary{ @@ -12781,16 +12637,12 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Latn"} - territories{"PK"} } } brx{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } bs{ primary{ @@ -12798,15 +12650,19 @@ supplementalData:table(nofallback){ "Latn", "Cyrl", } - territories{"BA"} } } bsc{ primary{ scripts{"Latn"} } + } + bsq{ + primary{ + scripts{"Latn"} + } secondary{ - territories{"SN"} + scripts{"Bass"} } } bss{ @@ -12833,9 +12689,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"YT"} - } } bug{ primary{ @@ -12843,16 +12696,12 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Bugi"} - territories{"ID"} } } bum{ primary{ scripts{"Latn"} } - secondary{ - territories{"CM"} - } } bvb{ primary{ @@ -12882,10 +12731,6 @@ supplementalData:table(nofallback){ ca{ primary{ scripts{"Latn"} - territories{"AD"} - } - secondary{ - territories{"ES"} } } cad{ @@ -12925,39 +12770,26 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } ceb{ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } cgg{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } ch{ primary{ scripts{"Latn"} - territories{"GU"} } } chk{ primary{ scripts{"Latn"} } - secondary{ - territories{"FM"} - } } chm{ primary{ @@ -12980,7 +12812,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Cans"} - territories{"CA"} } } chr{ @@ -13023,12 +12854,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{ - "IQ", - "IR", - } - } } ckt{ primary{ @@ -13052,7 +12877,6 @@ supplementalData:table(nofallback){ "Arab", "Grek", } - territories{"EG"} } } cps{ @@ -13090,9 +12914,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Cans"} } - secondary{ - territories{"CA"} - } } crl{ primary{ @@ -13111,26 +12932,16 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"SC"} - } } cs{ primary{ scripts{"Latn"} - territories{"CZ"} - } - secondary{ - territories{"SK"} } } csb{ primary{ scripts{"Latn"} } - secondary{ - territories{"PL"} - } } csw{ primary{ @@ -13151,25 +12962,15 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } cy{ primary{ scripts{"Latn"} } - secondary{ - territories{"GB"} - } } da{ primary{ scripts{"Latn"} - territories{"DK"} - } - secondary{ - territories{"DE"} } } dak{ @@ -13191,39 +12992,13 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"IN"} - } } de{ primary{ scripts{"Latn"} - territories{ - "AT", - "BE", - "CH", - "DE", - "LI", - "LU", - } } secondary{ scripts{"Runr"} - territories{ - "BR", - "CZ", - "DK", - "FI", - "FR", - "GB", - "HU", - "KZ", - "NL", - "PL", - "SI", - "SK", - "US", - } } } del{ @@ -13237,16 +13012,12 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Cans"} - territories{"CA"} } } dgr{ primary{ scripts{"Latn"} } - secondary{ - territories{"CA"} - } } din{ primary{ @@ -13257,9 +13028,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"NE"} - } } dng{ primary{ @@ -13270,9 +13038,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"CI"} - } } doi{ primary{ @@ -13283,7 +13048,6 @@ supplementalData:table(nofallback){ "Arab", "Takr", } - territories{"IN"} } } dsb{ @@ -13319,7 +13083,6 @@ supplementalData:table(nofallback){ dv{ primary{ scripts{"Thaa"} - territories{"MV"} } } dyo{ @@ -13328,21 +13091,16 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Arab"} - territories{"SN"} } } dyu{ primary{ scripts{"Latn"} } - secondary{ - territories{"BF"} - } } dz{ primary{ scripts{"Tibt"} - territories{"BT"} } } ebu{ @@ -13359,20 +13117,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{ - "GH", - "TG", - } - } } efi{ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } egl{ primary{ @@ -13397,167 +13146,17 @@ supplementalData:table(nofallback){ el{ primary{ scripts{"Grek"} - territories{ - "CY", - "GR", - } } } en{ primary{ scripts{"Latn"} - territories{ - "AG", - "AI", - "AS", - "AU", - "BB", - "BI", - "BM", - "BS", - "BW", - "BZ", - "CA", - "CC", - "CK", - "CM", - "CQ", - "CX", - "DG", - "DM", - "ER", - "FJ", - "FK", - "FM", - "GB", - "GD", - "GG", - "GH", - "GI", - "GM", - "GS", - "GU", - "GY", - "HK", - "IE", - "IM", - "IN", - "IO", - "JE", - "JM", - "KE", - "KI", - "KN", - "KY", - "LC", - "LR", - "LS", - "MG", - "MH", - "MP", - "MS", - "MT", - "MU", - "MW", - "NA", - "NF", - "NG", - "NR", - "NU", - "NZ", - "PG", - "PH", - "PK", - "PN", - "PR", - "PW", - "RW", - "SB", - "SC", - "SD", - "SG", - "SH", - "SL", - "SS", - "SX", - "SZ", - "TC", - "TK", - "TO", - "TT", - "TV", - "TZ", - "UG", - "UM", - "US", - "VC", - "VG", - "VI", - "VU", - "WS", - "ZA", - "ZM", - "ZW", - } } secondary{ scripts{ "Dsrt", "Shaw", } - territories{ - "AC", - "AE", - "AR", - "AT", - "BA", - "BD", - "BE", - "BG", - "BR", - "CH", - "CL", - "CY", - "CZ", - "DE", - "DK", - "DZ", - "EE", - "EG", - "ES", - "ET", - "FI", - "FR", - "GR", - "HR", - "HU", - "IL", - "IQ", - "IT", - "JO", - "KZ", - "LB", - "LK", - "LT", - "LU", - "LV", - "MA", - "MO", - "MV", - "MX", - "MY", - "NL", - "PL", - "PT", - "RO", - "SE", - "SI", - "SK", - "TA", - "TH", - "TR", - "YE", - } } } enm{ @@ -13573,46 +13172,6 @@ supplementalData:table(nofallback){ es{ primary{ scripts{"Latn"} - territories{ - "AR", - "BO", - "CL", - "CO", - "CR", - "CU", - "DO", - "EA", - "EC", - "ES", - "GQ", - "GT", - "HN", - "IC", - "MX", - "NI", - "PA", - "PE", - "PR", - "PY", - "SV", - "UY", - "VE", - } - } - secondary{ - territories{ - "AD", - "BZ", - "CA", - "DE", - "FR", - "GB", - "GI", - "PH", - "PT", - "RO", - "US", - } } } esu{ @@ -13623,7 +13182,6 @@ supplementalData:table(nofallback){ et{ primary{ scripts{"Latn"} - territories{"EE"} } } ett{ @@ -13638,9 +13196,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ES"} - } } evn{ primary{ @@ -13660,27 +13215,12 @@ supplementalData:table(nofallback){ fa{ primary{ scripts{"Arab"} - territories{ - "AF", - "IR", - } - } - secondary{ - territories{"PK"} } } fan{ primary{ scripts{"Latn"} } - secondary{ - territories{"GQ"} - } - } - fbl{ - secondary{ - territories{"PH"} - } } ff{ primary{ @@ -13688,31 +13228,16 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Adlm"} - territories{ - "CM", - "GN", - "SN", - } } } ffm{ primary{ scripts{"Latn"} } - secondary{ - territories{"ML"} - } } fi{ primary{ scripts{"Latn"} - territories{"FI"} - } - secondary{ - territories{ - "EE", - "SE", - } } } fia{ @@ -13723,11 +13248,9 @@ supplementalData:table(nofallback){ fil{ primary{ scripts{"Latn"} - territories{"PH"} } secondary{ scripts{"Tglg"} - territories{"US"} } } fit{ @@ -13738,89 +13261,24 @@ supplementalData:table(nofallback){ fj{ primary{ scripts{"Latn"} - territories{"FJ"} } } fo{ primary{ scripts{"Latn"} - territories{"FO"} } } fon{ primary{ scripts{"Latn"} } - secondary{ - territories{"BJ"} - } } fr{ primary{ scripts{"Latn"} - territories{ - "BE", - "BF", - "BI", - "BJ", - "BL", - "CA", - "CD", - "CF", - "CG", - "CH", - "CI", - "CM", - "DJ", - "DZ", - "FR", - "GA", - "GF", - "GN", - "GP", - "GQ", - "HT", - "KM", - "LU", - "MA", - "MC", - "MF", - "MG", - "ML", - "MQ", - "MU", - "NC", - "NE", - "PF", - "PM", - "RE", - "RW", - "SC", - "SN", - "TD", - "TG", - "TN", - "VU", - "WF", - "YT", - } } secondary{ scripts{"Dupl"} - territories{ - "AT", - "DE", - "GB", - "IT", - "LB", - "NL", - "PT", - "RO", - "ST", - "SY", - "TF", - "US", - } } } frc{ @@ -13847,9 +13305,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"DE"} - } } frs{ primary{ @@ -13860,17 +13315,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"WF"} - } } fuq{ primary{ scripts{"Latn"} } - secondary{ - territories{"NE"} - } } fur{ primary{ @@ -13881,42 +13330,26 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } fvr{ primary{ scripts{"Latn"} } - secondary{ - territories{"SD"} - } } fy{ primary{ scripts{"Latn"} } - secondary{ - territories{"NL"} - } } ga{ primary{ scripts{"Latn"} - territories{"IE"} - } - secondary{ - territories{"GB"} } } gaa{ primary{ scripts{"Latn"} } - secondary{ - territories{"GH"} - } } gag{ primary{ @@ -13930,9 +13363,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Hans"} } - secondary{ - territories{"CN"} - } } gay{ primary{ @@ -13948,9 +13378,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } gbz{ primary{ @@ -13961,17 +13388,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"GF"} - } } gd{ primary{ scripts{"Latn"} } - secondary{ - territories{"GB"} - } } gez{ primary{ @@ -13981,7 +13402,6 @@ supplementalData:table(nofallback){ gil{ primary{ scripts{"Latn"} - territories{"KI"} } } gjk{ @@ -13998,9 +13418,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ES"} - } } gld{ primary{ @@ -14011,9 +13428,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } gmh{ primary{ @@ -14028,7 +13442,6 @@ supplementalData:table(nofallback){ gn{ primary{ scripts{"Latn"} - territories{"PY"} } } goh{ @@ -14043,17 +13456,11 @@ supplementalData:table(nofallback){ "Telu", } } - secondary{ - territories{"IN"} - } } gor{ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } gos{ primary{ @@ -14083,25 +13490,12 @@ supplementalData:table(nofallback){ gsw{ primary{ scripts{"Latn"} - territories{ - "CH", - "LI", - } - } - secondary{ - territories{"DE"} } } gu{ primary{ scripts{"Gujr"} } - secondary{ - territories{ - "GB", - "IN", - } - } } gub{ primary{ @@ -14117,22 +13511,15 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"GH"} - } } guz{ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } gv{ primary{ scripts{"Latn"} - territories{"IM"} } } gvr{ @@ -14144,9 +13531,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"CA"} - } } ha{ primary{ @@ -14155,12 +13539,6 @@ supplementalData:table(nofallback){ "Arab", } } - secondary{ - territories{ - "NE", - "NG", - } - } } hai{ primary{ @@ -14169,53 +13547,36 @@ supplementalData:table(nofallback){ } hak{ primary{ - scripts{ - "Hans", - "Hant", - } - territories{"TW"} + scripts{"Hans"} } secondary{ - territories{"CN"} + scripts{"Hant"} } } haw{ primary{ scripts{"Latn"} } - secondary{ - territories{"US"} - } } haz{ primary{ scripts{"Arab"} } - secondary{ - territories{"AF"} - } } he{ primary{ scripts{"Hebr"} - territories{"IL"} } } hi{ primary{ scripts{"Deva"} - territories{"IN"} } secondary{ scripts{ "Latn", "Mahj", } - territories{ - "FJ", - "IN", - "ZA", - } } } hif{ @@ -14224,16 +13585,12 @@ supplementalData:table(nofallback){ "Deva", "Latn", } - territories{"FJ"} } } hil{ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } hit{ primary{ @@ -14257,17 +13614,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"PK"} - } } hne{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } hnj{ primary{ @@ -14286,14 +13637,10 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"PK"} - } } ho{ primary{ scripts{"Latn"} - territories{"PG"} } } hoc{ @@ -14302,16 +13649,12 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Wara"} - territories{"IN"} } } hoj{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } hop{ primary{ @@ -14321,17 +13664,6 @@ supplementalData:table(nofallback){ hr{ primary{ scripts{"Latn"} - territories{ - "BA", - "HR", - } - } - secondary{ - territories{ - "AT", - "RS", - "SI", - } } } hsb{ @@ -14343,27 +13675,15 @@ supplementalData:table(nofallback){ primary{ scripts{"Hans"} } - secondary{ - territories{"CN"} - } } ht{ primary{ scripts{"Latn"} - territories{"HT"} } } hu{ primary{ scripts{"Latn"} - territories{"HU"} - } - secondary{ - territories{ - "AT", - "RO", - "RS", - } } } hup{ @@ -14379,10 +13699,6 @@ supplementalData:table(nofallback){ hy{ primary{ scripts{"Armn"} - territories{"AM"} - } - secondary{ - territories{"RU"} } } hz{ @@ -14404,14 +13720,10 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } id{ primary{ scripts{"Latn"} - territories{"ID"} } secondary{ scripts{"Arab"} @@ -14431,9 +13743,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } ii{ primary{ @@ -14441,7 +13750,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Latn"} - territories{"CN"} } } ik{ @@ -14458,9 +13766,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } inh{ primary{ @@ -14471,7 +13776,6 @@ supplementalData:table(nofallback){ "Arab", "Latn", } - territories{"RU"} } } io{ @@ -14482,27 +13786,11 @@ supplementalData:table(nofallback){ is{ primary{ scripts{"Latn"} - territories{"IS"} } } it{ primary{ scripts{"Latn"} - territories{ - "CH", - "IT", - "SM", - "VA", - } - } - secondary{ - territories{ - "DE", - "FR", - "HR", - "MT", - "US", - } } } iu{ @@ -14512,9 +13800,6 @@ supplementalData:table(nofallback){ "Latn", } } - secondary{ - territories{"CA"} - } } izh{ primary{ @@ -14524,16 +13809,12 @@ supplementalData:table(nofallback){ ja{ primary{ scripts{"Jpan"} - territories{"JP"} } } jam{ primary{ scripts{"Latn"} } - secondary{ - territories{"JM"} - } } jbo{ primary{ @@ -14576,13 +13857,11 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Java"} - territories{"ID"} } } ka{ primary{ scripts{"Geor"} - territories{"GE"} } } kaa{ @@ -14597,9 +13876,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"DZ"} - } } kac{ primary{ @@ -14615,9 +13891,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } kao{ primary{ @@ -14639,9 +13912,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } kca{ primary{ @@ -14662,9 +13932,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"TZ"} - } } kdt{ primary{ @@ -14675,9 +13942,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"CV"} - } } ken{ primary{ @@ -14693,25 +13957,16 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } kfy{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } kg{ primary{ scripts{"Latn"} } - secondary{ - territories{"CD"} - } } kge{ primary{ @@ -14729,7 +13984,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Beng"} - territories{"IN"} } } khb{ @@ -14741,9 +13995,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } khq{ primary{ @@ -14764,9 +14015,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } kiu{ primary{ @@ -14777,9 +14025,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"NA"} - } } kjg{ primary{ @@ -14800,10 +14045,6 @@ supplementalData:table(nofallback){ "Cyrl", "Arab", } - territories{"KZ"} - } - secondary{ - territories{"CN"} } } kkj{ @@ -14814,80 +14055,47 @@ supplementalData:table(nofallback){ kl{ primary{ scripts{"Latn"} - territories{"GL"} - } - secondary{ - territories{"DK"} } } kln{ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } km{ primary{ scripts{"Khmr"} - territories{"KH"} } } kmb{ primary{ scripts{"Latn"} } - secondary{ - territories{"AO"} - } } kn{ primary{ scripts{"Knda"} } - secondary{ - territories{"IN"} - } } knf{ primary{ scripts{"Latn"} } - secondary{ - territories{"SN"} - } } knn{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } ko{ primary{ scripts{"Kore"} - territories{ - "KP", - "KR", - } - } - secondary{ - territories{ - "CN", - "US", - } } } koi{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } kok{ primary{ @@ -14896,9 +14104,6 @@ supplementalData:table(nofallback){ "Latn", } } - secondary{ - territories{"IN"} - } } kos{ primary{ @@ -14924,17 +14129,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } kri{ primary{ scripts{"Latn"} } - secondary{ - territories{"SL"} - } } krj{ primary{ @@ -14946,13 +14145,15 @@ supplementalData:table(nofallback){ scripts{"Latn"} } } + kro{ + primary{ + scripts{"Latn"} + } + } kru{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } ks{ primary{ @@ -14961,17 +14162,11 @@ supplementalData:table(nofallback){ "Deva", } } - secondary{ - territories{"IN"} - } } ksb{ primary{ scripts{"Latn"} } - secondary{ - territories{"TZ"} - } } ksf{ primary{ @@ -14985,26 +14180,19 @@ supplementalData:table(nofallback){ } ku{ primary{ + scripts{"Latn"} + } + secondary{ scripts{ - "Latn", "Arab", "Cyrl", } } - secondary{ - territories{ - "SY", - "TR", - } - } } kum{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } kut{ primary{ @@ -15017,7 +14205,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Perm"} - territories{"RU"} } } kvr{ @@ -15044,9 +14231,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Thai"} } - secondary{ - territories{"TH"} - } } kxp{ primary{ @@ -15072,7 +14256,6 @@ supplementalData:table(nofallback){ "Arab", "Latn", } - territories{"KG"} } } kyu{ @@ -15084,9 +14267,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"VA"} - } } lab{ primary{ @@ -15107,17 +14287,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"PK"} - } } laj{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } lam{ primary{ @@ -15127,16 +14301,12 @@ supplementalData:table(nofallback){ lb{ primary{ scripts{"Latn"} - territories{"LU"} } } lbe{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } lbw{ primary{ @@ -15164,7 +14334,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Aghb"} - territories{"RU"} } } lfn{ @@ -15179,9 +14348,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } li{ primary{ @@ -15220,9 +14386,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } lki{ primary{ @@ -15243,30 +14406,20 @@ supplementalData:table(nofallback){ primary{ scripts{"Telu"} } - secondary{ - territories{"IN"} - } } lmo{ primary{ scripts{"Latn"} } - secondary{ - territories{"IT"} - } } ln{ primary{ scripts{"Latn"} } - secondary{ - territories{"CD"} - } } lo{ primary{ scripts{"Laoo"} - territories{"LA"} } } lol{ @@ -15278,25 +14431,15 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZM"} - } } lrc{ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } lt{ primary{ scripts{"Latn"} - territories{"LT"} - } - secondary{ - territories{"PL"} } } ltg{ @@ -15308,17 +14451,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"CD"} - } } lua{ primary{ scripts{"Latn"} } - secondary{ - territories{"CD"} - } } lui{ primary{ @@ -15334,9 +14471,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } lus{ primary{ @@ -15352,22 +14486,15 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } luz{ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } lv{ primary{ scripts{"Latn"} - territories{"LV"} } } lwl{ @@ -15377,7 +14504,7 @@ supplementalData:table(nofallback){ } lzh{ primary{ - scripts{"Hans"} + scripts{"Hant"} } } lzz{ @@ -15392,9 +14519,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } maf{ primary{ @@ -15405,9 +14529,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } mai{ primary{ @@ -15415,10 +14536,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Tirh"} - territories{ - "IN", - "NP", - } } } mak{ @@ -15427,7 +14544,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Bugi"} - territories{"ID"} } } man{ @@ -15437,12 +14553,6 @@ supplementalData:table(nofallback){ "Nkoo", } } - secondary{ - territories{ - "GM", - "GN", - } - } } mas{ primary{ @@ -15458,17 +14568,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } mdh{ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } mdr{ primary{ @@ -15489,59 +14593,45 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Mend"} - territories{"SL"} } } mer{ primary{ scripts{"Latn"} } - secondary{ - territories{"KE"} - } } mey{ + primary{ + scripts{"Arab"} + } secondary{ - territories{"SN"} + scripts{"Latn"} } } mfa{ primary{ scripts{"Arab"} } - secondary{ - territories{"TH"} - } } mfe{ primary{ scripts{"Latn"} } - secondary{ - territories{"MU"} - } } mfv{ primary{ scripts{"Latn"} } - secondary{ - territories{"SN"} - } } mg{ primary{ scripts{"Latn"} - territories{"MG"} } } mgh{ primary{ scripts{"Latn"} } - secondary{ - territories{"MZ"} - } } mgo{ primary{ @@ -15561,7 +14651,6 @@ supplementalData:table(nofallback){ mh{ primary{ scripts{"Latn"} - territories{"MH"} } } mhn{ @@ -15572,7 +14661,6 @@ supplementalData:table(nofallback){ mi{ primary{ scripts{"Latn"} - territories{"NZ"} } } mic{ @@ -15584,23 +14672,16 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } mk{ primary{ scripts{"Cyrl"} - territories{"MK"} } } ml{ primary{ scripts{"Mlym"} } - secondary{ - territories{"IN"} - } } mls{ primary{ @@ -15610,14 +14691,12 @@ supplementalData:table(nofallback){ mn{ primary{ scripts{"Cyrl"} - territories{"MN"} } secondary{ scripts{ "Mong", "Phag", } - territories{"CN"} } } mnc{ @@ -15631,7 +14710,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Mtei"} - territories{"IN"} } } mns{ @@ -15658,9 +14736,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"BF"} - } } mr{ primary{ @@ -15668,7 +14743,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Modi"} - territories{"IN"} } } mrd{ @@ -15695,32 +14769,17 @@ supplementalData:table(nofallback){ "Latn", "Arab", } - territories{ - "BN", - "MY", - "SG", - } - } - secondary{ - territories{ - "CC", - "ID", - } } } mt{ primary{ scripts{"Latn"} - territories{"MT"} } } mtr{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } mua{ primary{ @@ -15741,9 +14800,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ML"} - } } mwl{ primary{ @@ -15754,9 +14810,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } mwv{ primary{ @@ -15767,31 +14820,21 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZW"} - } } my{ primary{ scripts{"Mymr"} - territories{"MM"} } } myv{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } myx{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } myz{ primary{ @@ -15802,26 +14845,18 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } na{ primary{ scripts{"Latn"} - territories{"NR"} } } nan{ primary{ - scripts{ - "Hans", - "Hant", - } - territories{"TW"} + scripts{"Hans"} } secondary{ - territories{"CN"} + scripts{"Hant"} } } nap{ @@ -15837,10 +14872,6 @@ supplementalData:table(nofallback){ nb{ primary{ scripts{"Latn"} - territories{ - "NO", - "SJ", - } } } nch{ @@ -15851,63 +14882,37 @@ supplementalData:table(nofallback){ nd{ primary{ scripts{"Latn"} - territories{"ZW"} } } ndc{ primary{ scripts{"Latn"} } - secondary{ - territories{ - "MZ", - "ZW", - } - } } nds{ primary{ scripts{"Latn"} } - secondary{ - territories{ - "DE", - "NL", - } - } } ne{ primary{ scripts{"Deva"} - territories{"NP"} - } - secondary{ - territories{"IN"} } } new{ primary{ scripts{"Deva"} } - secondary{ - territories{"NP"} - } } ng{ primary{ scripts{"Latn"} } - secondary{ - territories{"NA"} - } } ngl{ primary{ scripts{"Latn"} } - secondary{ - territories{"MZ"} - } } nhe{ primary{ @@ -15928,14 +14933,10 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } niu{ primary{ scripts{"Latn"} - territories{"NU"} } } njo{ @@ -15946,18 +14947,6 @@ supplementalData:table(nofallback){ nl{ primary{ scripts{"Latn"} - territories{ - "AW", - "BE", - "BQ", - "CW", - "NL", - "SR", - "SX", - } - } - secondary{ - territories{"DE"} } } nmg{ @@ -15968,7 +14957,6 @@ supplementalData:table(nofallback){ nn{ primary{ scripts{"Latn"} - territories{"NO"} } } nnh{ @@ -15979,27 +14967,17 @@ supplementalData:table(nofallback){ no{ primary{ scripts{"Latn"} - territories{"NO"} - } - secondary{ - territories{"BV"} } } nod{ primary{ scripts{"Lana"} } - secondary{ - territories{"TH"} - } } noe{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } nog{ primary{ @@ -16025,9 +15003,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZA"} - } } nsk{ primary{ @@ -16041,9 +15016,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZA"} - } } nus{ primary{ @@ -16063,27 +15035,17 @@ supplementalData:table(nofallback){ ny{ primary{ scripts{"Latn"} - territories{"MW"} - } - secondary{ - territories{"ZM"} } } nym{ primary{ scripts{"Latn"} } - secondary{ - territories{"TZ"} - } } nyn{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } nyo{ primary{ @@ -16099,12 +15061,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{ - "ES", - "FR", - } - } } oj{ primary{ @@ -16135,24 +15091,17 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Ethi"} - territories{"ET"} } } or{ primary{ scripts{"Orya"} } - secondary{ - territories{"IN"} - } } os{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"GE"} - } } osa{ primary{ @@ -16177,27 +15126,16 @@ supplementalData:table(nofallback){ } pa{ primary{ - scripts{ - "Guru", - "Arab", - } + scripts{"Guru"} } secondary{ - territories{ - "CA", - "GB", - "IN", - "PK", - } + scripts{"Arab"} } } pag{ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } pal{ secondary{ @@ -16211,26 +15149,15 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } pap{ primary{ scripts{"Latn"} - territories{ - "AW", - "CW", - } - } - secondary{ - territories{"BQ"} } } pau{ primary{ scripts{"Latn"} - territories{"PW"} } } pcd{ @@ -16242,9 +15169,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } pdc{ primary{ @@ -16273,12 +15197,13 @@ supplementalData:table(nofallback){ } pi{ primary{ - scripts{"Mymr"} + scripts{"Latn"} } secondary{ scripts{ - "Sinh", "Deva", + "Mymr", + "Sinh", "Thai", } } @@ -16287,9 +15212,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"SB"} - } } pko{ primary{ @@ -16299,10 +15221,6 @@ supplementalData:table(nofallback){ pl{ primary{ scripts{"Latn"} - territories{"PL"} - } - secondary{ - territories{"GB"} } } pms{ @@ -16325,9 +15243,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"FM"} - } } ppl{ primary{ @@ -16357,27 +15272,11 @@ supplementalData:table(nofallback){ ps{ primary{ scripts{"Arab"} - territories{"AF"} - } - secondary{ - territories{"PK"} } } pt{ primary{ scripts{"Latn"} - territories{ - "AO", - "BR", - "CV", - "GQ", - "GW", - "MO", - "MZ", - "PT", - "ST", - "TL", - } } } puu{ @@ -16388,36 +15287,22 @@ supplementalData:table(nofallback){ qu{ primary{ scripts{"Latn"} - territories{ - "BO", - "EC", - "PE", - } } } quc{ primary{ scripts{"Latn"} } - secondary{ - territories{"GT"} - } } qug{ primary{ scripts{"Latn"} } - secondary{ - territories{"EC"} - } } raj{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } rap{ primary{ @@ -16433,9 +15318,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"RE"} - } } rej{ primary{ @@ -16443,7 +15325,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Rjng"} - territories{"ID"} } } rgn{ @@ -16474,9 +15355,6 @@ supplementalData:table(nofallback){ "Tfng", } } - secondary{ - territories{"MA"} - } } rjs{ primary{ @@ -16487,20 +15365,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Beng"} } - secondary{ - territories{ - "BD", - "IN", - } - } } rm{ primary{ scripts{"Latn"} } - secondary{ - territories{"CH"} - } } rmf{ primary{ @@ -16516,9 +15385,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } rmu{ primary{ @@ -16528,28 +15394,19 @@ supplementalData:table(nofallback){ rn{ primary{ scripts{"Latn"} - territories{"BI"} } } rng{ primary{ scripts{"Latn"} } - secondary{ - territories{"MZ"} - } } ro{ primary{ scripts{"Latn"} - territories{ - "MD", - "RO", - } } secondary{ scripts{"Cyrl"} - territories{"RS"} } } rob{ @@ -16578,27 +15435,6 @@ supplementalData:table(nofallback){ ru{ primary{ scripts{"Cyrl"} - territories{ - "BY", - "KG", - "KZ", - "RU", - "UA", - } - } - secondary{ - territories{ - "BG", - "DE", - "EE", - "IL", - "LT", - "LV", - "PL", - "SJ", - "TJ", - "UZ", - } } } rue{ @@ -16619,10 +15455,6 @@ supplementalData:table(nofallback){ rw{ primary{ scripts{"Latn"} - territories{"RW"} - } - secondary{ - territories{"UG"} } } rwk{ @@ -16644,7 +15476,6 @@ supplementalData:table(nofallback){ "Sidd", "Sinh", } - territories{"IN"} } } sad{ @@ -16661,9 +15492,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } sam{ secondary{ @@ -16682,9 +15510,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ID"} - } } sat{ primary{ @@ -16697,12 +15522,6 @@ supplementalData:table(nofallback){ "Latn", "Orya", } - territories{"IN"} - } - } - sav{ - secondary{ - territories{"SN"} } } saz{ @@ -16719,17 +15538,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"IT"} - } } sck{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } scn{ primary{ @@ -16740,9 +15553,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"GB"} - } } scs{ primary{ @@ -16761,10 +15571,6 @@ supplementalData:table(nofallback){ "Khoj", "Sind", } - territories{ - "IN", - "PK", - } } } sdc{ @@ -16776,9 +15582,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Arab"} } - secondary{ - territories{"IR"} - } } se{ primary{ @@ -16786,7 +15589,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Cyrl"} - territories{"NO"} } } see{ @@ -16798,17 +15600,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"CI"} - } } seh{ primary{ scripts{"Latn"} } - secondary{ - territories{"MZ"} - } } sei{ primary{ @@ -16828,7 +15624,6 @@ supplementalData:table(nofallback){ sg{ primary{ scripts{"Latn"} - territories{"CF"} } } sga{ @@ -16852,59 +15647,35 @@ supplementalData:table(nofallback){ "Arab", } } - secondary{ - territories{"MA"} - } } shn{ primary{ scripts{"Mymr"} } - secondary{ - territories{"MM"} - } } si{ primary{ scripts{"Sinh"} - territories{"LK"} } } sid{ primary{ scripts{"Latn"} } - secondary{ - territories{"ET"} - } } sk{ primary{ scripts{"Latn"} - territories{"SK"} - } - secondary{ - territories{ - "CZ", - "RS", - } } } skr{ primary{ scripts{"Arab"} } - secondary{ - territories{"PK"} - } } sl{ primary{ scripts{"Latn"} - territories{"SI"} - } - secondary{ - territories{"AT"} } } sli{ @@ -16920,13 +15691,6 @@ supplementalData:table(nofallback){ sm{ primary{ scripts{"Latn"} - territories{ - "AS", - "WS", - } - } - secondary{ - territories{"TK"} } } sma{ @@ -16953,70 +15717,44 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"FI"} - } } sn{ primary{ scripts{"Latn"} - territories{"ZW"} } } snf{ primary{ scripts{"Latn"} } - secondary{ - territories{"SN"} - } } snk{ primary{ scripts{"Latn"} } - secondary{ - territories{"ML"} - } } so{ primary{ scripts{"Latn"} - territories{"SO"} } secondary{ scripts{ "Arab", "Osma", } - territories{ - "DJ", - "ET", - } } } sou{ primary{ scripts{"Thai"} } - secondary{ - territories{"TH"} - } } sq{ primary{ scripts{"Latn"} - territories{ - "AL", - "XK", - } } secondary{ scripts{"Elba"} - territories{ - "MK", - "RS", - } } } sr{ @@ -17025,12 +15763,6 @@ supplementalData:table(nofallback){ "Cyrl", "Latn", } - territories{ - "BA", - "ME", - "RS", - "XK", - } } } srb{ @@ -17045,17 +15777,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"SR"} - } } srr{ primary{ scripts{"Latn"} } - secondary{ - territories{"SN"} - } } srx{ primary{ @@ -17065,10 +15791,6 @@ supplementalData:table(nofallback){ ss{ primary{ scripts{"Latn"} - territories{"SZ"} - } - secondary{ - territories{"ZA"} } } ssy{ @@ -17079,10 +15801,6 @@ supplementalData:table(nofallback){ st{ primary{ scripts{"Latn"} - territories{"LS"} - } - secondary{ - territories{"ZA"} } } stq{ @@ -17096,16 +15814,12 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Sund"} - territories{"ID"} } } suk{ primary{ scripts{"Latn"} } - secondary{ - territories{"TZ"} - } } sus{ primary{ @@ -17113,30 +15827,16 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Arab"} - territories{"GN"} } } sv{ primary{ scripts{"Latn"} - territories{ - "AX", - "FI", - "SE", - } } } sw{ primary{ scripts{"Latn"} - territories{ - "KE", - "TZ", - "UG", - } - } - secondary{ - territories{"CD"} } } swb{ @@ -17145,7 +15845,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Latn"} - territories{"YT"} } } swg{ @@ -17157,9 +15856,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } sxn{ primary{ @@ -17177,7 +15873,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Sylo"} - territories{"BD"} } } syr{ @@ -17193,17 +15888,6 @@ supplementalData:table(nofallback){ ta{ primary{ scripts{"Taml"} - territories{ - "LK", - "SG", - } - } - secondary{ - territories{ - "GB", - "IN", - "MY", - } } } tab{ @@ -17231,9 +15915,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Knda"} } - secondary{ - territories{"IN"} - } } tdd{ primary{ @@ -17257,25 +15938,16 @@ supplementalData:table(nofallback){ primary{ scripts{"Telu"} } - secondary{ - territories{"IN"} - } } tem{ primary{ scripts{"Latn"} } - secondary{ - territories{"SL"} - } } teo{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } ter{ primary{ @@ -17285,7 +15957,6 @@ supplementalData:table(nofallback){ tet{ primary{ scripts{"Latn"} - territories{"TL"} } } tg{ @@ -17295,13 +15966,11 @@ supplementalData:table(nofallback){ "Arab", "Latn", } - territories{"TJ"} } } th{ primary{ scripts{"Thai"} - territories{"TH"} } } thl{ @@ -17322,27 +15991,17 @@ supplementalData:table(nofallback){ ti{ primary{ scripts{"Ethi"} - territories{"ER"} - } - secondary{ - territories{"ET"} } } tig{ primary{ scripts{"Ethi"} } - secondary{ - territories{"ER"} - } } tiv{ primary{ scripts{"Latn"} } - secondary{ - territories{"NG"} - } } tk{ primary{ @@ -17351,19 +16010,11 @@ supplementalData:table(nofallback){ "Arab", "Cyrl", } - territories{"TM"} - } - secondary{ - territories{ - "AF", - "IR", - } } } tkl{ primary{ scripts{"Latn"} - territories{"TK"} } } tkr{ @@ -17393,38 +16044,26 @@ supplementalData:table(nofallback){ "Arab", "Cyrl", } - territories{"AZ"} } } tmh{ primary{ scripts{"Latn"} } - secondary{ - territories{"NE"} - } } tn{ primary{ scripts{"Latn"} - territories{"BW"} - } - secondary{ - territories{"ZA"} } } tnr{ primary{ scripts{"Latn"} } - secondary{ - territories{"SN"} - } } to{ primary{ scripts{"Latn"} - territories{"TO"} } } tog{ @@ -17432,11 +16071,6 @@ supplementalData:table(nofallback){ scripts{"Latn"} } } - toi{ - secondary{ - territories{"ZM"} - } - } tok{ primary{ scripts{"Latn"} @@ -17445,20 +16079,14 @@ supplementalData:table(nofallback){ tpi{ primary{ scripts{"Latn"} - territories{"PG"} } } tr{ primary{ scripts{"Latn"} - territories{ - "CY", - "TR", - } } secondary{ scripts{"Arab"} - territories{"DE"} } } tru{ @@ -17483,12 +16111,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{ - "MZ", - "ZA", - } - } } tsd{ primary{ @@ -17499,9 +16121,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } tsi{ primary{ @@ -17517,9 +16136,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } ttj{ primary{ @@ -17530,9 +16146,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Thai"} } - secondary{ - territories{"TH"} - } } ttt{ primary{ @@ -17549,14 +16162,10 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"MW"} - } } tvl{ primary{ scripts{"Latn"} - territories{"TV"} } } twq{ @@ -17567,16 +16176,12 @@ supplementalData:table(nofallback){ ty{ primary{ scripts{"Latn"} - territories{"PF"} } } tyv{ primary{ scripts{"Cyrl"} } - secondary{ - territories{"RU"} - } } tzm{ primary{ @@ -17584,7 +16189,6 @@ supplementalData:table(nofallback){ "Latn", "Tfng", } - territories{"MA"} } } ude{ @@ -17598,7 +16202,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Latn"} - territories{"RU"} } } ug{ @@ -17610,7 +16213,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Latn"} - territories{"CN"} } } uga{ @@ -17621,10 +16223,6 @@ supplementalData:table(nofallback){ uk{ primary{ scripts{"Cyrl"} - territories{"UA"} - } - secondary{ - territories{"RS"} } } uli{ @@ -17636,18 +16234,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"AO"} - } - } - und{ - secondary{ - territories{ - "AQ", - "CP", - "HM", - } - } } unr{ primary{ @@ -17656,9 +16242,6 @@ supplementalData:table(nofallback){ "Deva", } } - secondary{ - territories{"IN"} - } } unx{ primary{ @@ -17671,13 +16254,6 @@ supplementalData:table(nofallback){ ur{ primary{ scripts{"Arab"} - territories{"PK"} - } - secondary{ - territories{ - "GB", - "IN", - } } } uz{ @@ -17687,10 +16263,6 @@ supplementalData:table(nofallback){ "Cyrl", "Arab", } - territories{"UZ"} - } - secondary{ - territories{"AF"} } } vai{ @@ -17705,22 +16277,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZA"} - } } vec{ primary{ scripts{"Latn"} } - secondary{ - territories{ - "BR", - "HR", - "IT", - "SI", - } - } } vep{ primary{ @@ -17730,11 +16291,9 @@ supplementalData:table(nofallback){ vi{ primary{ scripts{"Latn"} - territories{"VN"} } secondary{ scripts{"Hani"} - territories{"US"} } } vic{ @@ -17746,25 +16305,16 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"BE"} - } } vmf{ primary{ scripts{"Latn"} } - secondary{ - territories{"DE"} - } } vmw{ primary{ scripts{"Latn"} } - secondary{ - territories{"MZ"} - } } vo{ primary{ @@ -17800,17 +16350,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Ethi"} } - secondary{ - territories{"ET"} - } } war{ primary{ scripts{"Latn"} } - secondary{ - territories{"PH"} - } } was{ primary{ @@ -17826,36 +16370,25 @@ supplementalData:table(nofallback){ primary{ scripts{"Telu"} } - secondary{ - territories{"IN"} - } } wbr{ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } wls{ primary{ scripts{"Latn"} } - secondary{ - territories{"WF"} - } } wni{ primary{ scripts{"Arab"} - territories{"KM"} } } wo{ primary{ scripts{"Latn"} - territories{"SN"} } secondary{ scripts{"Arab"} @@ -17865,17 +16398,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } wuu{ primary{ scripts{"Hans"} } - secondary{ - territories{"CN"} - } } xal{ primary{ @@ -17896,9 +16423,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZA"} - } } xlc{ primary{ @@ -17934,17 +16458,11 @@ supplementalData:table(nofallback){ primary{ scripts{"Deva"} } - secondary{ - territories{"IN"} - } } xog{ primary{ scripts{"Latn"} } - secondary{ - territories{"UG"} - } } xpr{ primary{ @@ -17997,7 +16515,6 @@ supplementalData:table(nofallback){ yo{ primary{ scripts{"Latn"} - territories{"NG"} } } yrk{ @@ -18017,17 +16534,10 @@ supplementalData:table(nofallback){ } yue{ primary{ - scripts{ - "Hant", - "Hans", - } - territories{"MO"} + scripts{"Hant"} } secondary{ - territories{ - "CN", - "HK", - } + scripts{"Hans"} } } za{ @@ -18036,7 +16546,6 @@ supplementalData:table(nofallback){ } secondary{ scripts{"Hans"} - territories{"CN"} } } zag{ @@ -18052,7 +16561,6 @@ supplementalData:table(nofallback){ zdj{ primary{ scripts{"Arab"} - territories{"KM"} } } zea{ @@ -18069,38 +16577,18 @@ supplementalData:table(nofallback){ primary{ scripts{"Tfng"} } - secondary{ - territories{"MA"} - } } zh{ primary{ - scripts{ - "Hans", - "Hant", - } - territories{ - "CN", - "HK", - "MO", - "SG", - "TW", - } + scripts{"Hans"} } secondary{ scripts{ + "Hant", "Bopo", "Latn", "Phag", } - territories{ - "CA", - "ID", - "MY", - "TH", - "US", - "VN", - } } } zmi{ @@ -18112,9 +16600,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"ZA"} - } } zun{ primary{ @@ -18125,9 +16610,6 @@ supplementalData:table(nofallback){ primary{ scripts{"Latn"} } - secondary{ - territories{"TR"} - } } } languageMatchingInfo{ @@ -19914,12 +18396,24 @@ supplementalData:table(nofallback){ "10", "1", } + { + "cnp", + "zh", + "10", + "1", + } { "cpx", "zh", "10", "1", } + { + "csp", + "zh", + "10", + "1", + } { "czh", "zh", @@ -19944,12 +18438,24 @@ supplementalData:table(nofallback){ "10", "1", } + { + "hnm", + "zh", + "10", + "1", + } { "hsn", "zh", "10", "1", } + { + "luh", + "zh", + "10", + "1", + } { "lzh", "zh", @@ -19968,6 +18474,12 @@ supplementalData:table(nofallback){ "10", "1", } + { + "sjc", + "zh", + "10", + "1", + } { "wuu", "zh", @@ -27337,10 +25849,17 @@ supplementalData:table(nofallback){ } hy{ officialStatus{"official"} - populationShareF:int{49980000} + populationShareF:int{49990000} } ku{ populationShareF:int{48330000} + writingShareF:int{48500000} + } + ku_Cyrl{ + populationShareF:int{48330000} + } + ru{ + populationShareF:int{49650000} } territoryF:intvector{ 60577300, @@ -27512,6 +26031,10 @@ supplementalData:table(nofallback){ } ku{ populationShareF:int{47240000} + writingShareF:int{48500000} + } + ku_Cyrl{ + populationShareF:int{47240000} } territoryF:intvector{ 61215900, @@ -27934,11 +26457,11 @@ supplementalData:table(nofallback){ BY{ be{ officialStatus{"official"} - populationShareF:int{50100000} + populationShareF:int{49260000} } ru{ officialStatus{"official"} - populationShareF:int{49120000} + populationShareF:int{49710000} } territoryF:intvector{ 61254400, @@ -27947,12 +26470,24 @@ supplementalData:table(nofallback){ } } BZ{ + bzj{ + populationShareF:int{49500000} + } + cab{ + populationShareF:int{48190000} + } en{ officialStatus{"official"} - populationShareF:int{50100000} + populationShareF:int{49770000} } es{ - populationShareF:int{49280000} + populationShareF:int{49550000} + } + kek{ + populationShareF:int{48650000} + } + mop{ + populationShareF:int{48400000} } territoryF:intvector{ 59525700, @@ -28899,6 +27434,9 @@ supplementalData:table(nofallback){ literacyShareF:int{49100000} populationShareF:int{48780000} } + mey{ + populationShareF:int{49110000} + } territoryF:intvector{ 61699900, 49726000, @@ -28989,6 +27527,9 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{50100000} } + mey{ + populationShareF:int{44200000} + } territoryF:intvector{ 58906500, 49500000, @@ -29343,6 +27884,9 @@ supplementalData:table(nofallback){ pa{ populationShareF:int{48360000} } + pi{ + populationShareF:int{44200000} + } pl{ populationShareF:int{48400000} } @@ -29400,7 +27944,7 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{49860000} } - ku{ + ku_Cyrl{ populationShareF:int{47890000} } lzz_Geor{ @@ -29677,19 +28221,97 @@ supplementalData:table(nofallback){ } } GT{ + acr{ + populationShareF:int{48110000} + } + agu{ + populationShareF:int{47260000} + } + caa{ + officialStatus{"official_regional"} + populationShareF:int{47130000} + } + cab{ + populationShareF:int{46270000} + } + cac{ + populationShareF:int{47430000} + } + cak{ + officialStatus{"official_regional"} + populationShareF:int{48880000} + } + ckz{ + populationShareF:int{46180000} + } + en{ + populationShareF:int{48310000} + } es{ officialStatus{"official"} - populationShareF:int{49930000} + populationShareF:int{49880000} + } + itz{ + populationShareF:int{45910000} + } + ixl{ + officialStatus{"official_regional"} + populationShareF:int{47890000} + } + jac{ + populationShareF:int{47310000} + } + kek{ + populationShareF:int{48880000} + } + kjb{ + populationShareF:int{48120000} + } + knj{ + populationShareF:int{47580000} + } + mam{ + populationShareF:int{48460000} + } + mop{ + populationShareF:int{46180000} + } + poc{ + populationShareF:int{46900000} + } + poh{ + populationShareF:int{48120000} } quc{ officialStatus{"official_regional"} - populationShareF:int{48700000} + populationShareF:int{48860000} + } + qum{ + populationShareF:int{46360000} + } + quv{ + officialStatus{"official_regional"} + populationShareF:int{46540000} } territoryF:intvector{ 61223200, 49759000, 57182552, } + ttc{ + populationShareF:int{46270000} + } + tzj{ + populationShareF:int{47610000} + } + usp{ + officialStatus{"official_regional"} + populationShareF:int{46450000} + } + xin{ + officialStatus{"official_regional"} + populationShareF:int{46270000} + } } GU{ ch{ @@ -29773,12 +28395,15 @@ supplementalData:table(nofallback){ } } HN{ + cab{ + populationShareF:int{47470000} + } en{ populationShareF:int{47440000} } es{ officialStatus{"official"} - populationShareF:int{49780000} + populationShareF:int{49910000} } territoryF:intvector{ 60688500, @@ -30253,6 +28878,9 @@ supplementalData:table(nofallback){ officialStatus{"official_regional"} populationShareF:int{48280000} } + pi_Deva{ + populationShareF:int{0} + } raj{ populationShareF:int{47100000} } @@ -30354,7 +28982,7 @@ supplementalData:table(nofallback){ } ckb{ officialStatus{"official_regional"} - populationShareF:int{49200000} + populationShareF:int{49120000} } en{ populationShareF:int{49350000} @@ -30362,6 +28990,9 @@ supplementalData:table(nofallback){ fa{ populationShareF:int{47870000} } + ku_Arab{ + populationShareF:int{49100000} + } lrc{ populationShareF:int{47610000} } @@ -30392,7 +29023,7 @@ supplementalData:table(nofallback){ populationShareF:int{48140000} } ckb{ - populationShareF:int{48390000} + populationShareF:int{47630000} } fa{ officialStatus{"official"} @@ -30416,6 +29047,9 @@ supplementalData:table(nofallback){ kk_Arab{ populationShareF:int{45340000} } + ku_Arab{ + populationShareF:int{47560000} + } lki{ populationShareF:int{47760000} } @@ -30440,7 +29074,7 @@ supplementalData:table(nofallback){ populationShareF:int{48190000} } sdh{ - populationShareF:int{48370000} + populationShareF:int{48450000} } territoryF:intvector{ 62144000, @@ -30513,7 +29147,7 @@ supplementalData:table(nofallback){ writingShareF:int{48500000} } pms{ - populationShareF:int{46100000} + populationShareF:int{48110000} } rgn{ populationShareF:int{0} @@ -30910,6 +29544,9 @@ supplementalData:table(nofallback){ en{ populationShareF:int{49100000} } + pi_Sinh{ + populationShareF:int{0} + } si{ officialStatus{"official"} populationShareF:int{49680000} @@ -30925,6 +29562,16 @@ supplementalData:table(nofallback){ } } LR{ + bsq{ + populationShareF:int{49140000} + } + bza{ + populationShareF:int{48290000} + } + dnj{ + literacyShareF:int{48100000} + populationShareF:int{48790000} + } en{ officialStatus{"official"} populationShareF:int{49830000} @@ -30935,11 +29582,26 @@ supplementalData:table(nofallback){ ff_Adlm{ populationShareF:int{0} } + grb{ + populationShareF:int{48990000} + } kpe{ - populationShareF:int{49140000} + populationShareF:int{49200000} + } + kro{ + populationShareF:int{49100000} + } + kss{ + populationShareF:int{48430000} + } + lir{ + populationShareF:int{49740000} } men{ - populationShareF:int{47480000} + populationShareF:int{48170000} + } + mev{ + populationShareF:int{48720000} } territoryF:intvector{ 59888400, @@ -30947,7 +29609,7 @@ supplementalData:table(nofallback){ 56543725, } vai{ - populationShareF:int{48260000} + populationShareF:int{48380000} } vai_Latn{ populationShareF:int{0} @@ -31075,6 +29737,9 @@ supplementalData:table(nofallback){ officialStatus{"de_facto_official"} populationShareF:int{49360000} } + mey{ + populationShareF:int{47820000} + } rif{ populationShareF:int{48490000} writingShareF:int{48500000} @@ -31285,6 +29950,9 @@ supplementalData:table(nofallback){ officialStatus{"official"} populationShareF:int{49640000} } + pi_Mymr{ + populationShareF:int{0} + } rhg{ populationShareF:int{48170000} } @@ -31327,7 +29995,7 @@ supplementalData:table(nofallback){ fil{ populationShareF:int{48310000} } - nan{ + nan_Hant{ populationShareF:int{48370000} } pt{ @@ -31390,6 +30058,9 @@ supplementalData:table(nofallback){ fr{ populationShareF:int{49130000} } + mey{ + populationShareF:int{49870000} + } territoryF:intvector{ 60304000, 49586000, @@ -32537,6 +31208,7 @@ supplementalData:table(nofallback){ populationShareF:int{48130000} } bua{ + officialStatus{"official_regional"} populationShareF:int{47220000} } ce{ @@ -32990,7 +31662,7 @@ supplementalData:table(nofallback){ officialStatus{"official_regional"} populationShareF:int{47210000} } - mey{ + mey_Latn{ literacyShareF:int{49100000} officialStatus{"official_regional"} populationShareF:int{46380000} @@ -33290,6 +31962,9 @@ supplementalData:table(nofallback){ populationShareF:int{48960000} writingShareF:int{48500000} } + pi_Thai{ + populationShareF:int{0} + } shn{ populationShareF:int{46960000} } @@ -33375,7 +32050,7 @@ supplementalData:table(nofallback){ kaa{ populationShareF:int{47100000} } - ku{ + ku_Cyrl{ populationShareF:int{47400000} } ru{ @@ -33483,7 +32158,8 @@ supplementalData:table(nofallback){ populationShareF:int{45140000} } lzz{ - populationShareF:int{46280000} + literacyShareF:int{49730000} + populationShareF:int{46250000} } pnt_Latn{ populationShareF:int{45610000} @@ -36372,6 +35048,13 @@ supplementalData:table(nofallback){ } preferred{"h"} } + ku_SY{ + allowed{ + "H", + "hB", + } + preferred{"H"} + } ml_IN{ allowed{ "hB", @@ -37003,7 +35686,7 @@ supplementalData:table(nofallback){ 86400000, } IS:intvector{ - 2, + 1, 4, 7, 0, diff --git a/icu4c/source/data/misc/timezoneTypes.txt b/icu4c/source/data/misc/timezoneTypes.txt index 7759a2aaa189..03724013d6a2 100644 --- a/icu4c/source/data/misc/timezoneTypes.txt +++ b/icu4c/source/data/misc/timezoneTypes.txt @@ -4,7 +4,7 @@ timezoneTypes:table(nofallback){ bcpTypeAlias{ tz{ - aqams{"nzakl"} + aqams{"aqmcm"} aukns{"auhba"} caffs{"cawnp"} camtr{"cator"} @@ -80,7 +80,7 @@ timezoneTypes:table(nofallback){ "America:Thunder_Bay"{"America/Toronto"} "America:Virgin"{"America/St_Thomas"} "America:Yellowknife"{"America/Edmonton"} - "Antarctica:South_Pole"{"Pacific/Auckland"} + "Antarctica:South_Pole"{"Antarctica/McMurdo"} "Asia:Ashkhabad"{"Asia/Ashgabat"} "Asia:Choibalsan"{"Asia/Ulaanbaatar"} "Asia:Chongqing"{"Asia/Shanghai"} @@ -300,6 +300,7 @@ timezoneTypes:table(nofallback){ "America:Coral_Harbour"{"cayzs"} "America:Cordoba"{"arcor"} "America:Costa_Rica"{"crsjo"} + "America:Coyhaique"{"clcxq"} "America:Creston"{"cacfq"} "America:Cuiaba"{"brcgb"} "America:Curacao"{"ancur"} diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt index 76a66abbf547..c081669b981f 100644 --- a/icu4c/source/data/misc/units.txt +++ b/icu4c/source/data/misc/units.txt @@ -2,13 +2,8 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/ units:table(nofallback){ - cldrVersion{"47"} + cldrVersion{"48"} convertUnits{ - 100-kilometer{ - factor{"100000"} - systems{"si metric"} - target{"meter"} - } acre{ factor{"ft2_to_m2 * 43560"} systems{"ussystem uksystem"} @@ -140,6 +135,11 @@ units:table(nofallback){ systems{"ussystem"} target{"cubic-meter"} } + cup-imperial{ + factor{"gal_imp_to_m3/16"} + systems{"uksystem"} + target{"cubic-meter"} + } cup-jp{ factor{"1*100*0.000001"} systems{"jpsystem"} @@ -254,6 +254,11 @@ units:table(nofallback){ systems{"uksystem"} target{"cubic-meter"} } + fluid-ounce-metric{ + factor{"0.03*0.001"} + systems{"metric_adjacent"} + target{"cubic-meter"} + } foodcalorie{ factor{"4184"} systems{"ussystem uksystem"} @@ -370,7 +375,7 @@ units:table(nofallback){ karat{ factor{"1/24"} systems{"metric_adjacent ussystem uksystem"} - target{"portion"} + target{"part"} } katal{ factor{"item_per_mole"} @@ -525,6 +530,11 @@ units:table(nofallback){ systems{"astronomical prefixable"} target{"meter"} } + part{ + factor{"1"} + systems{"metric_adjacent ussystem uksystem"} + target{"part"} + } pascal{ factor{"1"} systems{"si metric prefixable"} @@ -533,22 +543,17 @@ units:table(nofallback){ percent{ factor{"1/100"} systems{"metric_adjacent ussystem uksystem"} - target{"portion"} + target{"part"} } permille{ factor{"1/1000"} systems{"metric_adjacent ussystem uksystem"} - target{"portion"} - } - permillion{ - factor{"1/1000000"} - systems{"metric_adjacent ussystem uksystem"} - target{"portion"} + target{"part"} } permyriad{ factor{"1/10000"} systems{"metric_adjacent ussystem uksystem"} - target{"portion"} + target{"part"} } pinch{ factor{"gal_to_m3/128*128"} @@ -580,11 +585,6 @@ units:table(nofallback){ systems{"metric_adjacent ussystem uksystem"} target{"meter"} } - portion{ - factor{"1"} - systems{"metric_adjacent ussystem uksystem"} - target{"portion"} - } pound{ factor{"lb_to_kg"} systems{"ussystem uksystem"} @@ -812,6 +812,58 @@ units:table(nofallback){ speed_of_light_meters_per_second{"299792458"} tsubo_to_m2{"400/121"} } + unitIdComponents{ + and{"and"} + per{"per"} + power{ + "square", + "cubic", + "pow2", + "pow3", + "pow4", + "pow5", + "pow6", + "pow7", + "pow8", + "pow9", + "pow10", + "pow11", + "pow12", + "pow13", + "pow14", + "pow15", + } + prefix{ + "arc", + "british", + "dessert", + "fluid", + "light", + "nautical", + "xxx", + "x", + "curr", + } + suffix{ + "force", + "imperial", + "luminosity", + "mass", + "metric", + "person", + "radius", + "scandinavian", + "troy", + "unit", + "it", + "us", + "energy", + "density", + "cloth", + "length", + "jp", + } + } unitPreferenceData{ "area"{ "default"{ @@ -2494,7 +2546,7 @@ units:table(nofallback){ per-second{"radioactivity"} } { - portion{"portion"} + part{"portion"} } { bit{"digital"} diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index de4f972352c9..34c0baa36a47 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -362,7 +362,7 @@ windowsZones:table(nofallback){ } "Magallanes Standard Time"{ 001{"America/Punta_Arenas"} - CL{"America/Punta_Arenas"} + CL{"America/Punta_Arenas America/Coyhaique"} } "Marquesas Standard Time"{ 001{"Pacific/Marquesas"} diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 4cbc05851315..3054a03b788e 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,20 +3,20 @@ // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Thu Jan 30 14:17:55 2025 +// Build date: Wed Apr 9 14:46:22 2025 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2025a -// ICU version: 77.0.1 +// tz version: 2025b +// ICU version: 78.0.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2025a" } + TZVersion { "2025b" } Zones:array { - /* ACT */ :int { 357 } //Z#0 - /* AET */ :int { 369 } //Z#1 + /* ACT */ :int { 358 } //Z#0 + /* AET */ :int { 370 } //Z#1 /* AGT */ :int { 64 } //Z#2 /* ART */ :int { 18 } //Z#3 /* AST */ :int { 60 } //Z#4 @@ -24,7 +24,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1830383032 } typeOffsets:intvector { -968, 0, 0, 0 } typeMap:bin { "01" } - links:intvector { 5, 6, 11, 13, 21, 22, 27, 38, 51, 52, 55, 347, 349, 517 } + links:intvector { 5, 6, 11, 13, 21, 22, 27, 38, 51, 52, 55, 348, 350, 518 } } //Z#5 /* Africa/Accra */ :int { 5 } //Z#6 /* Africa/Addis_Ababa */ :int { 48 } //Z#7 @@ -55,7 +55,7 @@ zoneinfo64:table(nofallback) { finalRule { "Egypt" } finalRaw:int { 7200 } finalYear:int { 2024 } - links:intvector { 3, 18, 403 } + links:intvector { 3, 18, 404 } } //Z#18 /* Africa/Casablanca */ :table { trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434247200, 1437271200, 1445738400, 1459044000, 1465092000, 1468116000, 1477792800, 1490493600, 1495332000, 1498960800, 1509242400, 1521943200, 1526176800, 1529200800, 1557021600, 1560045600, 1587261600, 1590890400, 1618106400, 1621130400, 1648346400, 1651975200, 1679191200, 1682215200, 1710036000, 1713060000, 1740276000, 1743904800, 1771120800, 1774144800, 1801965600, 1804989600, 1832205600, 1835834400, 1863050400, 1866074400, 1893290400, 1896919200, 1924135200, 1927159200, 1954980000, 1958004000, 1985220000, 1988848800, 2016064800, 2019088800, 2046304800, 2049933600, 2077149600, 2080778400, 2107994400, 2111018400, 2138234400, 2141863200 } @@ -122,7 +122,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1924999818 } typeOffsets:intvector { 7818, 0, 7200, 0 } typeMap:bin { "01" } - links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 380 } + links:intvector { 15, 17, 28, 29, 34, 40, 41, 43, 381 } } //Z#43 /* Africa/Maseru */ :int { 30 } //Z#44 /* Africa/Mbabane */ :int { 30 } //Z#45 @@ -136,7 +136,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1946168836, -1309746600, -1261969200, -1041388200, -865305900 } typeOffsets:intvector { 8836, 0, 9000, 0, 9900, 0, 10800, 0 } typeMap:bin { "0103010203" } - links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 398, 518, 522, 527 } + links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 399, 519, 523, 528 } } //Z#48 /* Africa/Ndjamena */ :table { trans:intvector { -1830387612, 308703600, 321314400 } @@ -158,7 +158,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1577926364, -574902000, -568087200, -512175600, -504928800, -449888400, -441856800, -347158800, 378684000, 386463600, 402271200, 417999600, 433807200, 449622000, 465429600, 481590000, 496965600, 512953200, 528674400, 544230000, 560037600, 575852400, 591660000, 607388400, 623196000, 641775600, 844034400, 860108400, 875916000, 1352505600, 1364515200, 1382659200 } typeOffsets:intvector { 3164, 0, 3600, 0, 3600, 3600, 7200, 0 } typeMap:bin { "0102010201020103010201020102010201020102010201020103010203010203" } - links:intvector { 56, 535 } + links:intvector { 56, 536 } } //Z#56 /* Africa/Tunis */ :table { transPre32:intvector { -1, 1497764852 } @@ -180,7 +180,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -36000 } finalYear:int { 2008 } - links:intvector { 59, 80, 620 } + links:intvector { 59, 80, 621 } } //Z#59 /* America/Anchorage */ :table { transPre32:intvector { -1, 1069743569, -1, 2106016072 } @@ -190,10 +190,10 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - links:intvector { 4, 60, 619 } + links:intvector { 4, 60, 620 } } //Z#60 - /* America/Anguilla */ :int { 191 } //Z#61 - /* America/Antigua */ :int { 191 } //Z#62 + /* America/Anguilla */ :int { 192 } //Z#61 + /* America/Antigua */ :int { 192 } //Z#62 /* America/Araguaina */ :table { trans:intvector { -1767214032, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 813726000, 824004000, 844570800, 856058400, 876106800, 888717600, 908074800, 919562400, 938919600, 951616800, 970974000, 982461600, 1003028400, 1013911200, 1036292400, 1045360800, 1350788400, 1361066400 } typeOffsets:intvector { -11568, 0, -10800, 0, -10800, 3600 } @@ -218,14 +218,14 @@ zoneinfo64:table(nofallback) { trans:intvector { -1567453392, -1233432000, -1222981200, -1205956800, -1194037200, -1172865600, -1162501200, -1141329600, -1130965200, -1109793600, -1099429200, -1078257600, -1067806800, -1046635200, -1036270800, -1015099200, -1004734800, -983563200, -973198800, -952027200, -941576400, -931032000, -900882000, -890337600, -833749200, -827265600, -752274000, -733780800, -197326800, -190843200, -184194000, -164491200, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 596948400, 605066400, 624423600, 636516000, 656478000, 667965600, 687931200, 699415200, 719377200, 731469600, 938919600, 952052400, 1198983600, 1205632800, 1224385200, 1237082400 } typeOffsets:intvector { -15408, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020103040304030403040104030403020304030403" } - links:intvector { 67, 102, 199 } + links:intvector { 67, 102, 200 } } //Z#67 /* America/Argentina/Jujuy */ :table { transPre32:intvector { -1, 1922870968 } trans:intvector { -1567453392, -1233432000, -1222981200, -1205956800, -1194037200, -1172865600, -1162501200, -1141329600, -1130965200, -1109793600, -1099429200, -1078257600, -1067806800, -1046635200, -1036270800, -1015099200, -1004734800, -983563200, -973198800, -952027200, -941576400, -931032000, -900882000, -890337600, -833749200, -827265600, -752274000, -733780800, -197326800, -190843200, -184194000, -164491200, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 596948400, 605066400, 624423600, 636516000, 657086400, 669178800, 686721600, 699415200, 719377200, 731469600, 938919600, 952052400, 1198983600, 1205632800 } typeOffsets:intvector { -15672, 0, -15408, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020405040504050203020504050403040504" } - links:intvector { 68, 144 } + links:intvector { 68, 145 } } //Z#68 /* America/Argentina/La_Rioja */ :table { transPre32:intvector { -1, 1922871340 } @@ -238,7 +238,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1567453392, -1233432000, -1222981200, -1205956800, -1194037200, -1172865600, -1162501200, -1141329600, -1130965200, -1109793600, -1099429200, -1078257600, -1067806800, -1046635200, -1036270800, -1015099200, -1004734800, -983563200, -973198800, -952027200, -941576400, -931032000, -900882000, -890337600, -833749200, -827265600, -752274000, -733780800, -197326800, -190843200, -184194000, -164491200, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 596948400, 605066400, 624423600, 636516000, 655963200, 667796400, 687499200, 699418800, 719380800, 731469600, 938919600, 952052400, 1085281200, 1096171200, 1198983600, 1205632800 } typeOffsets:intvector { -16516, 0, -15408, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030204050405040502030203020504030402040504" } - links:intvector { 70, 162 } + links:intvector { 70, 163 } } //Z#70 /* America/Argentina/Rio_Gallegos */ :table { transPre32:intvector { -1, 1922871908 } @@ -276,13 +276,13 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -16392, 0, -15408, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030204050405040504050405040504030402040504" } } //Z#76 - /* America/Aruba */ :int { 191 } //Z#77 + /* America/Aruba */ :int { 192 } //Z#77 /* America/Asuncion */ :table { trans:intvector { -1206389360, 86760000, 134017200, 181368000, 194497200, 212990400, 226033200, 244526400, 257569200, 276062400, 291783600, 307598400, 323406000, 339220800, 354942000, 370756800, 386478000, 402292800, 418014000, 433828800, 449636400, 465451200, 481172400, 496987200, 512708400, 528523200, 544244400, 560059200, 575866800, 591681600, 607402800, 625032000, 638938800, 654753600, 670474800, 686721600, 699418800, 718257600, 733546800, 749448000, 762318000, 780984000, 793767600, 812520000, 825649200, 844574400, 856666800, 876024000, 888721200, 907473600, 920775600, 938923200, 952225200, 970372800, 983674800, 1002427200, 1018148400, 1030852800, 1049598000, 1062907200, 1081047600, 1097985600, 1110682800, 1129435200, 1142132400, 1160884800, 1173582000, 1192939200, 1205031600, 1224388800, 1236481200, 1255838400, 1270954800, 1286078400, 1302404400, 1317528000, 1333854000, 1349582400, 1364094000, 1381032000, 1395543600, 1412481600, 1426993200, 1443931200, 1459047600, 1475380800, 1490497200, 1506830400, 1521946800, 1538884800, 1553396400, 1570334400, 1584846000, 1601784000, 1616900400, 1633233600, 1648350000, 1664683200, 1679799600, 1696132800, 1711249200, 1728187200, 1728961200 } typeOffsets:intvector { -13840, 0, -14400, 0, -14400, 3600, -10800, 0 } typeMap:bin { "01030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } } //Z#78 - /* America/Atikokan */ :int { 183 } //Z#79 + /* America/Atikokan */ :int { 184 } //Z#79 /* America/Atka */ :int { 59 } //Z#80 /* America/Bahia */ :table { trans:intvector { -1767216356, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 656478000, 666756000, 687927600, 697600800, 719982000, 728445600, 750826800, 761709600, 782276400, 793159200, 813726000, 824004000, 844570800, 856058400, 876106800, 888717600, 908074800, 919562400, 938919600, 951616800, 970974000, 982461600, 1003028400, 1013911200, 1036292400, 1045360800, 1318734000, 1330221600 } @@ -309,7 +309,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -21168, 0, -21600, 0, -21600, 1800, -21600, 3600 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201030102010201020102010201020102010201020102010201020102010201020102010201020102010201020103010301" } } //Z#85 - /* America/Blanc-Sablon */ :int { 191 } //Z#86 + /* America/Blanc-Sablon */ :int { 192 } //Z#86 /* America/Boa_Vista */ :table { trans:intvector { -1767211040, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 938923200, 951620400, 970977600, 971578800 } typeOffsets:intvector { -14560, 0, -14400, 0, -14400, 3600 } @@ -360,7 +360,7 @@ zoneinfo64:table(nofallback) { typeOffsets:intvector { -12560, 0, -14400, 0, -10800, 0 } typeMap:bin { "0102" } } //Z#96 - /* America/Cayman */ :int { 183 } //Z#97 + /* America/Cayman */ :int { 184 } //Z#97 /* America/Chicago */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -1563724800, -1551632400, -1538928000, -1520182800, -1504454400, -1491757200, -1473004800, -1459702800, -1441555200, -1428253200, -1410105600, -1396803600, -1378656000, -1365354000, -1347206400, -1333904400, -1315152000, -1301850000, -1283702400, -1270400400, -1252252800, -1238950800, -1220803200, -1207501200, -1189353600, -1176051600, -1157299200, -1144602000, -1125849600, -1112547600, -1094400000, -1081098000, -1067788800, -1045414800, -1031500800, -1018198800, -1000051200, -986749200, -967996800, -955299600, -936547200, -923245200, -905097600, -891795600, -880214400, -765392400, -747244800, -733942800, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } @@ -369,7 +369,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 98, 383, 384, 622 } + links:intvector { 98, 384, 385, 623 } } //Z#98 /* America/Chihuahua */ :table { trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288512000, 1301821200, 1319961600, 1333270800, 1351411200, 1365325200, 1382860800, 1396774800, 1414310400, 1428224400, 1445760000, 1459674000, 1477814400, 1491123600, 1509264000, 1522573200, 1540713600, 1554627600, 1572163200, 1586077200, 1603612800, 1617526800, 1635667200, 1648976400, 1667116800 } @@ -384,37 +384,43 @@ zoneinfo64:table(nofallback) { finalRaw:int { -25200 } finalYear:int { 2024 } } //Z#100 - /* America/Coral_Harbour */ :int { 183 } //Z#101 + /* America/Coral_Harbour */ :int { 184 } //Z#101 /* America/Cordoba */ :int { 67 } //Z#102 /* America/Costa_Rica */ :table { trans:intvector { -1545071027, 288770400, 297234000, 320220000, 328683600, 664264800, 678344400, 695714400, 700635600 } typeOffsets:intvector { -20173, 0, -21600, 0, -21600, 3600 } typeMap:bin { "010201020102010201" } } //Z#103 - /* America/Creston */ :int { 186 } //Z#104 + /* America/Coyhaique */ :table { + transPre32:intvector { -1, 1770462992 } + trans:intvector { -1892661435, -1688410800, -1619205435, -1593806400, -1335986235, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -736632000, -718056000, -713649600, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 592372800, 605674800, 624427200, 637124400, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1494730800, 1502596800, 1526180400, 1534046400, 1554606000, 1567915200, 1586055600, 1599364800, 1617505200, 1630814400, 1648954800, 1662868800, 1680404400, 1693713600, 1712458800, 1725768000, 1742439600 } + typeOffsets:intvector { -17296, 0, -18000, 0, -18000, 3600, -16965, 0, -14400, 0, -14400, 3600, -10800, 0 } + typeMap:bin { "03010304030201020102010201020104010402010405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } + } //Z#104 + /* America/Creston */ :int { 187 } //Z#105 /* America/Cuiaba */ :table { trans:intvector { -1767212140, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 592977600, 602046000, 624427200, 634705200, 656481600, 666759600, 687931200, 697604400, 719985600, 728449200, 750830400, 761713200, 782280000, 793162800, 813729600, 824007600, 844574400, 856062000, 876110400, 888721200, 908078400, 919566000, 938923200, 951620400, 970977600, 982465200, 1003032000, 1013914800, 1036296000, 1045364400, 1099368000, 1108868400, 1129435200, 1140318000, 1162699200, 1172372400, 1192334400, 1203217200, 1224388800, 1234666800, 1255838400, 1266721200, 1287288000, 1298170800, 1318737600, 1330225200, 1350792000, 1361070000, 1382241600, 1392519600, 1413691200, 1424574000, 1445140800, 1456023600, 1476590400, 1487473200, 1508040000, 1518922800, 1541304000, 1550372400 } typeOffsets:intvector { -13460, 0, -14400, 0, -14400, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - } //Z#105 - /* America/Curacao */ :int { 191 } //Z#106 + } //Z#106 + /* America/Curacao */ :int { 192 } //Z#107 /* America/Danmarkshavn */ :table { trans:intvector { -1686091520, 323845200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 820465200 } typeOffsets:intvector { -4480, 0, -10800, 0, -10800, 3600, 0, 0 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020103" } - } //Z#107 + } //Z#108 /* America/Dawson */ :table { transPre32:intvector { -1, 2105970356 } trans:intvector { -1632056400, -1615125600, -1596978000, -1583164800, -880203600, -765381600, -147884400, -131554800, 120646800, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800, 1205056800, 1225616400, 1236506400, 1257066000, 1268560800, 1289120400, 1300010400, 1320570000, 1331460000, 1352019600, 1362909600, 1383469200, 1394359200, 1414918800, 1425808800, 1446368400, 1457863200, 1478422800, 1489312800, 1509872400, 1520762400, 1541322000, 1552212000, 1572771600, 1583661600, 1604214000 } typeOffsets:intvector { -33460, 0, -32400, 0, -32400, 3600, -32400, 7200, -28800, 0, -28800, 3600, -25200, 0 } typeMap:bin { "0102010201020103010405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } - } //Z#108 + } //Z#109 /* America/Dawson_Creek */ :table { transPre32:intvector { -1, 1581085752 } trans:intvector { -1632060000, -1615129200, -880207200, -765385200, -715788000, -702486000, -684338400, -671036400, -652888800, -639586800, -620834400, -608137200, -589384800, -576082800, -557935200, -544633200, -526485600, -513183600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, -273679200, -260982000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 84013200 } typeOffsets:intvector { -28856, 0, -28800, 0, -28800, 3600, -25200, 0 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } - } //Z#109 + } //Z#110 /* America/Denver */ :table { transPre32:intvector { -1, 1577323696 } trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -1570374000, -1551628800, -1538924400, -1534089600, -880210800, -765388800, -147884400, -131558400, -116434800, -100108800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 152092800, 162378000, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1173603600, 1194163200 } @@ -423,8 +429,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -25200 } finalYear:int { 2008 } - links:intvector { 110, 206, 539, 547, 628 } - } //Z#110 + links:intvector { 111, 207, 540, 548, 629 } + } //Z#111 /* America/Detroit */ :table { trans:intvector { -2051202469, -1724083200, -880218000, -765396000, -684349200, -671047200, -80506740, -68666400, -52938000, -37216800, 104914800, 120636000, 126687600, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } typeOffsets:intvector { -19931, 0, -21600, 0, -18000, 0, -18000, 3600 } @@ -432,9 +438,9 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 111, 627 } - } //Z#111 - /* America/Dominica */ :int { 191 } //Z#112 + links:intvector { 112, 628 } + } //Z#112 + /* America/Dominica */ :int { 192 } //Z#113 /* America/Edmonton */ :table { trans:intvector { -1998663968, -1632063600, -1615132800, -1600614000, -1596816000, -1567954800, -1551628800, -1536505200, -1523203200, -1504450800, -1491753600, -1473001200, -1459699200, -880210800, -765388800, -715791600, -702489600, 73472400, 89193600, 104922000, 120643200, 136371600, 152092800, 167821200, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1173603600, 1194163200 } typeOffsets:intvector { -27232, 0, -25200, 0, -25200, 3600 } @@ -442,31 +448,31 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -25200 } finalYear:int { 2008 } - links:intvector { 113, 226, 390 } - } //Z#113 + links:intvector { 114, 227, 391 } + } //Z#114 /* America/Eirunepe */ :table { trans:intvector { -1767208832, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 750834000, 761716800, 1214283600, 1384056000 } typeOffsets:intvector { -16768, 0, -18000, 0, -18000, 3600, -14400, 0 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010301" } - } //Z#114 + } //Z#115 /* America/El_Salvador */ :table { trans:intvector { -1546279392, 547020000, 559717200, 578469600, 591166800 } typeOffsets:intvector { -21408, 0, -21600, 0, -21600, 3600 } typeMap:bin { "0102010201" } - } //Z#115 - /* America/Ensenada */ :int { 218 } //Z#116 + } //Z#116 + /* America/Ensenada */ :int { 219 } //Z#117 /* America/Fort_Nelson */ :table { transPre32:intvector { -1, 1581086343 } trans:intvector { -1632060000, -1615129200, -880207200, -765385200, -715788000, -702486000, -684338400, -671036400, -652888800, -639586800, -620834400, -608137200, -589384800, -576082800, -557935200, -544633200, -526485600, -513183600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, -273679200, -260982000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 136375200, 152096400, 167824800, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800, 1205056800, 1225616400, 1236506400, 1257066000, 1268560800, 1289120400, 1300010400, 1320570000, 1331460000, 1352019600, 1362909600, 1383469200, 1394359200, 1414918800, 1425808800 } typeOffsets:intvector { -29447, 0, -28800, 0, -28800, 3600, -25200, 0 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" } - } //Z#117 - /* America/Fort_Wayne */ :int { 132 } //Z#118 + } //Z#118 + /* America/Fort_Wayne */ :int { 133 } //Z#119 /* America/Fortaleza */ :table { trans:intvector { -1767216360, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 938919600, 951616800, 970974000, 972180000, 1003028400, 1013911200 } typeOffsets:intvector { -9240, 0, -10800, 0, -10800, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201" } - } //Z#119 + } //Z#120 /* America/Glace_Bay */ :table { trans:intvector { -2131646412, -1632074400, -1615143600, -880221600, -765399600, -526500000, -513198000, 73461600, 89182800, 104911200, 120632400, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 } typeOffsets:intvector { -14388, 0, -14400, 0, -14400, 3600 } @@ -474,8 +480,8 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -14400 } finalYear:int { 2008 } - } //Z#120 - /* America/Godthab */ :int { 181 } //Z#121 + } //Z#121 + /* America/Godthab */ :int { 182 } //Z#122 /* America/Goose_Bay */ :table { transPre32:intvector { -1, 1581071396 } trans:intvector { -1632076148, -1615145348, -1096921748, -1061670600, -1048973400, -1030221000, -1017523800, -998771400, -986074200, -966717000, -954624600, -935267400, -922570200, -903817800, -891120600, -872368200, -765401400, -746044200, -733347000, -714594600, -701897400, -683145000, -670447800, -651695400, -638998200, -619641000, -606943800, -589401000, -576099000, -557951400, -544649400, -526501800, -513199800, -495052200, -481750200, -463602600, -450300600, -431548200, -418246200, -400098600, -386796600, -368649000, -355347000, -337199400, -323897400, -305749800, -289423800, -273695400, -257974200, -242245800, -226524600, -210796200, -195075000, -179346600, -163625400, -147897000, -131571000, -119903400, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544593660, 562129260, 576043260, 594180060, 607492860, 625633260, 638942460, 657082860, 670996860, 688532460, 702446460, 719982060, 733896060, 752036460, 765345660, 783486060, 796795260, 814935660, 828849660, 846385260, 860299260, 877834860, 891748860, 909284460, 923198460, 941338860, 954648060, 972788460, 986097660, 1004238060, 1018152060, 1035687660, 1049601660, 1067137260, 1081051260, 1099191660, 1112500860, 1130641260, 1143950460, 1162090860, 1173585660, 1194145260, 1205035260, 1225594860, 1236484860, 1257044460, 1268539260, 1289098860, 1299988860, 1320555600, 1331445600, 1352005200 } @@ -484,7 +490,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -14400 } finalYear:int { 2013 } - } //Z#122 + } //Z#123 /* America/Grand_Turk */ :table { transPre32:intvector { -1, 1770462768 } trans:intvector { -1827687170, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1520751600, 1541311200 } @@ -493,25 +499,25 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2019 } - } //Z#123 - /* America/Grenada */ :int { 191 } //Z#124 - /* America/Guadeloupe */ :int { 191 } //Z#125 + } //Z#124 + /* America/Grenada */ :int { 192 } //Z#125 + /* America/Guadeloupe */ :int { 192 } //Z#126 /* America/Guatemala */ :table { trans:intvector { -1617040676, 123055200, 130914000, 422344800, 433054800, 669708000, 684219600, 1146376800, 1159678800 } typeOffsets:intvector { -21724, 0, -21600, 0, -21600, 3600 } typeMap:bin { "010201020102010201" } - } //Z#126 + } //Z#127 /* America/Guayaquil */ :table { transPre32:intvector { -1, 1770464856 } trans:intvector { -1230749160, 722926800, 728884800 } typeOffsets:intvector { -19160, 0, -18840, 0, -18000, 0, -18000, 3600 } typeMap:bin { "01020302" } - } //Z#127 + } //Z#128 /* America/Guyana */ :table { trans:intvector { -1843589241, -1730577600, 176096700, 701841600 } typeOffsets:intvector { -13959, 0, -14400, 0, -13500, 0, -10800, 0 } typeMap:bin { "01020301" } - } //Z#128 + } //Z#129 /* America/Halifax */ :table { trans:intvector { -2131645536, -1696276800, -1680469200, -1632074400, -1615143600, -1566763200, -1557090000, -1535486400, -1524949200, -1504468800, -1493413200, -1472414400, -1461963600, -1440964800, -1429390800, -1409515200, -1396731600, -1376856000, -1366491600, -1346616000, -1333832400, -1313956800, -1303678800, -1282507200, -1272661200, -1251057600, -1240088400, -1219608000, -1207429200, -1188763200, -1175979600, -1157313600, -1143925200, -1124049600, -1113771600, -1091390400, -1081026000, -1059854400, -1050786000, -1030910400, -1018126800, -999460800, -986677200, -965592000, -955227600, -935956800, -923173200, -904507200, -891723600, -880221600, -765399600, -747252000, -733950000, -715802400, -702500400, -684352800, -671050800, -652903200, -639601200, -589399200, -576097200, -557949600, -544647600, -526500000, -513198000, -495050400, -481748400, -431546400, -418244400, -400096800, -386794800, -368647200, -355345200, -337197600, -323895600, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 } typeOffsets:intvector { -15264, 0, -14400, 0, -14400, 3600 } @@ -519,8 +525,8 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -14400 } finalYear:int { 2008 } - links:intvector { 129, 386 } - } //Z#129 + links:intvector { 130, 387 } + } //Z#130 /* America/Havana */ :table { transPre32:intvector { -1, 1770465464 } trans:intvector { -1402813824, -1311534000, -1300996800, -933534000, -925675200, -902084400, -893620800, -870030000, -862171200, -775681200, -767822400, -744231600, -736372800, -144702000, -134251200, -113425200, -102542400, -86295600, -72907200, -54154800, -41457600, -21495600, -5774400, 9954000, 25675200, 41403600, 57729600, 73458000, 87364800, 104907600, 118900800, 136357200, 150436800, 167806800, 183528000, 199256400, 215582400, 230706000, 247032000, 263365200, 276667200, 290581200, 308721600, 322030800, 340171200, 358318800, 371620800, 389768400, 403070400, 421218000, 434520000, 452667600, 466574400, 484117200, 498024000, 511333200, 529473600, 542782800, 560923200, 574837200, 592372800, 606286800, 623822400, 638946000, 655876800, 671000400, 687330000, 702450000, 718779600, 733899600, 750229200, 765349200, 781678800, 796798800, 813128400, 828853200, 844578000, 860302800, 876632400, 891147600, 909291600, 922597200, 941346000, 954651600, 972795600, 986101200, 1004245200, 1018155600, 1035694800, 1049605200, 1067144400, 1080450000, 1162098000, 1173589200, 1193547600, 1205643600, 1224997200, 1236488400, 1256446800, 1268542800, 1288501200, 1300597200, 1321160400, 1333256400, 1352005200, 1362891600, 1383454800 } @@ -529,13 +535,13 @@ zoneinfo64:table(nofallback) { finalRule { "Cuba" } finalRaw:int { -18000 } finalYear:int { 2014 } - links:intvector { 130, 397 } - } //Z#130 + links:intvector { 131, 398 } + } //Z#131 /* America/Hermosillo */ :table { trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -873828000, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400 } typeOffsets:intvector { -26632, 0, -25200, 0, -25200, 3600, -21600, 0 } typeMap:bin { "01030102010301020102010201" } - } //Z#131 + } //Z#132 /* America/Indiana/Indianapolis */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -900259200, -891795600, -880214400, -765392400, -747244800, -733942800, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -386787600, -368640000, -21488400, -5767200, 9961200, 25682400, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -544,8 +550,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 118, 132, 140, 515, 623 } - } //Z#132 + links:intvector { 119, 133, 141, 516, 624 } + } //Z#133 /* America/Indiana/Knox */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -447267600, -431539200, -415818000, -400089600, -386787600, -368640000, -355338000, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -195066000, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 1143961200, 1162105200, 1173600000, 1194159600 } @@ -554,8 +560,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 133, 148, 626 } - } //Z#133 + links:intvector { 134, 149, 627 } + } //Z#134 /* America/Indiana/Marengo */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -589392000, -576090000, -495043200, -481741200, -463593600, -450291600, -431539200, -418237200, -400089600, -386787600, -368640000, -355338000, -337190400, -323888400, -305740800, -292438800, -273686400, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 152089200, 162370800, 183535200, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -564,7 +570,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - } //Z#134 + } //Z#135 /* America/Indiana/Petersburg */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -462996000, -450291600, -431539200, -418237200, -400089600, -386787600, -368640000, -355338000, -337190400, -323888400, -305740800, -292438800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 1143961200, 1162105200, 1173600000, 1194159600, 1205046000, 1225605600 } @@ -573,7 +579,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2009 } - } //Z#135 + } //Z#136 /* America/Indiana/Tell_City */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -462996000, -450291600, -431539200, -418237200, -400089600, -386787600, -368640000, -355338000, -337190400, -323888400, -305740800, -292438800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -68662800, -52934400, -37213200, -21484800, -5767200, 9961200, 25682400, 1143961200, 1162105200, 1173600000, 1194159600 } @@ -582,7 +588,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#136 + } //Z#137 /* America/Indiana/Vevay */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -495043200, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -591,7 +597,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - } //Z#137 + } //Z#138 /* America/Indiana/Vincennes */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -747244800, -733942800, -526492800, -513190800, -495043200, -481741200, -462996000, -450291600, -431539200, -418237200, -400089600, -386787600, -368640000, -355338000, -337190400, -323888400, -305740800, -289414800, -273686400, -260989200, -242236800, -226515600, -210787200, -195066000, -179337600, -21488400, -5767200, 9961200, 25682400, 1143961200, 1162105200, 1173600000, 1194159600, 1205046000, 1225605600 } @@ -600,7 +606,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2009 } - } //Z#138 + } //Z#139 /* America/Indiana/Winamac */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -747244800, -733942800, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -447267600, -431539200, -415818000, -400089600, -386787600, -368640000, -355338000, -337190400, -323888400, -305740800, -292438800, -273686400, -21488400, -5767200, 9961200, 25682400, 1143961200, 1162105200, 1173600000, 1194156000, 1205046000, 1225605600 } @@ -609,8 +615,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2009 } - } //Z#139 - /* America/Indianapolis */ :int { 132 } //Z#140 + } //Z#140 + /* America/Indianapolis */ :int { 133 } //Z#141 /* America/Inuvik */ :table { trans:intvector { -536457600, 73476000, 89197200, 104925600, 120646800, 136375200, 152096400, 167824800, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1173603600, 1194163200 } typeOffsets:intvector { 0, 0, -28800, 0, -28800, 3600, -25200, 0, -25200, 3600 } @@ -618,7 +624,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -25200 } finalYear:int { 2008 } - } //Z#141 + } //Z#142 /* America/Iqaluit */ :table { trans:intvector { -865296000, -765396000, 73465200, 89186400, 104914800, 120636000, 136364400, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954662400, 972802800, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } typeOffsets:intvector { 0, 0, -21600, 0, -21600, 3600, -18000, 0, -18000, 3600 } @@ -626,15 +632,15 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 142, 184 } - } //Z#142 + links:intvector { 143, 185 } + } //Z#143 /* America/Jamaica */ :table { trans:intvector { -1827687170, 126687600, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600 } typeOffsets:intvector { -18430, 0, -18000, 0, -18000, 3600 } typeMap:bin { "010201020102010201020102010201020102010201" } - links:intvector { 143, 532 } - } //Z#143 - /* America/Jujuy */ :int { 68 } //Z#144 + links:intvector { 144, 533 } + } //Z#144 + /* America/Jujuy */ :int { 68 } //Z#145 /* America/Juneau */ :table { transPre32:intvector { -1, 1069743569, -1, 2106012357 } trans:intvector { -880207200, -765385200, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341402400, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452084400, 467805600, 483534000, 499255200, 514983600, 530704800, 544618800, 562154400, 576068400, 594208800, 607518000, 625658400, 638967600, 657108000, 671022000, 688557600, 702471600, 720007200, 733921200, 752061600, 765370800, 783511200, 796820400, 814960800, 828874800, 846410400, 860324400, 877860000, 891774000, 909309600, 923223600, 941364000, 954673200, 972813600, 986122800, 1004263200, 1018177200, 1035712800, 1049626800, 1067162400, 1081076400, 1099216800, 1112526000, 1130666400, 1143975600, 1162116000, 1173610800, 1194170400 } @@ -643,7 +649,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - } //Z#145 + } //Z#146 /* America/Kentucky/Louisville */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -1535904000, -1525280400, -905097600, -891795600, -880214400, -765392400, -747251940, -744224400, -620841600, -608144400, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -450291600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -266432400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 152089200, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -652,8 +658,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 146, 153 } - } //Z#146 + links:intvector { 147, 154 } + } //Z#147 /* America/Kentucky/Monticello */ :table { transPre32:intvector { -1, 1577320096 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -662,20 +668,20 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - } //Z#147 - /* America/Knox_IN */ :int { 133 } //Z#148 - /* America/Kralendijk */ :int { 191 } //Z#149 + } //Z#148 + /* America/Knox_IN */ :int { 134 } //Z#149 + /* America/Kralendijk */ :int { 192 } //Z#150 /* America/La_Paz */ :table { trans:intvector { -1205954844, -1192307244 } typeOffsets:intvector { -16356, 0, -16356, 3600, -14400, 0 } typeMap:bin { "0102" } - } //Z#150 + } //Z#151 /* America/Lima */ :table { transPre32:intvector { -1, 1770464188 } trans:intvector { -1938538284, -1009825200, -1002052800, -986756400, -971035200, -955306800, -939585600, 504939600, 512712000, 536475600, 544248000, 631170000, 638942400, 757400400, 765172800 } typeOffsets:intvector { -18492, 0, -18516, 0, -18000, 0, -18000, 3600 } typeMap:bin { "01020302030203020302030203020302" } - } //Z#151 + } //Z#152 /* America/Los_Angeles */ :table { transPre32:intvector { -1, 1577327296 } trans:intvector { -1633269600, -1615129200, -1601820000, -1583679600, -880207200, -765385200, -687967140, -662655600, -620838000, -608137200, -589388400, -576082800, -557938800, -544633200, -526489200, -513183600, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, -273682800, -260982000, -242233200, -226508400, -210783600, -195058800, -179334000, -163609200, -147884400, -131554800, -116434800, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800 } @@ -684,33 +690,33 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 152, 552, 553, 629, 630 } - } //Z#152 - /* America/Louisville */ :int { 146 } //Z#153 - /* America/Lower_Princes */ :int { 191 } //Z#154 + links:intvector { 153, 553, 554, 630, 631 } + } //Z#153 + /* America/Louisville */ :int { 147 } //Z#154 + /* America/Lower_Princes */ :int { 192 } //Z#155 /* America/Maceio */ :table { trans:intvector { -1767217028, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 813726000, 824004000, 938919600, 951616800, 970974000, 972180000, 1003028400, 1013911200 } typeOffsets:intvector { -8572, 0, -10800, 0, -10800, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - } //Z#155 + } //Z#156 /* America/Managua */ :table { transPre32:intvector { -1, 1770466404 } trans:intvector { -1121105688, 105084000, 161758800, 290584800, 299134800, 322034400, 330584400, 694260000, 717310800, 725868000, 852094800, 1113112800, 1128229200, 1146384000, 1159682400 } typeOffsets:intvector { -20708, 0, -21600, 0, -21600, 3600, -20712, 0, -18000, 0 } typeMap:bin { "03010401020102010401040102010201" } - } //Z#156 + } //Z#157 /* America/Manaus */ :table { trans:intvector { -1767211196, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 750830400, 761713200 } typeOffsets:intvector { -14404, 0, -14400, 0, -14400, 3600 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 157, 379 } - } //Z#157 - /* America/Marigot */ :int { 191 } //Z#158 + links:intvector { 158, 380 } + } //Z#158 + /* America/Marigot */ :int { 192 } //Z#159 /* America/Martinique */ :table { trans:intvector { -1851537340, 323841600, 338958000 } typeOffsets:intvector { -14660, 0, -14400, 0, -14400, 3600 } typeMap:bin { "010201" } - } //Z#159 + } //Z#160 /* America/Matamoros */ :table { trans:intvector { -1514743200, 576057600, 594198000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1175414400, 1193554800, 1207468800, 1225004400, 1238918400, 1256454000, 1268553600, 1289113200 } typeOffsets:intvector { -23400, 0, -21600, 0, -21600, 3600 } @@ -718,14 +724,14 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2011 } - } //Z#160 + } //Z#161 /* America/Mazatlan */ :table { trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -873828000, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1270371600, 1288512000, 1301821200, 1319961600, 1333270800, 1351411200, 1365325200, 1382860800, 1396774800, 1414310400, 1428224400, 1445760000, 1459674000, 1477814400, 1491123600, 1509264000, 1522573200, 1540713600, 1554627600, 1572163200, 1586077200, 1603612800, 1617526800, 1635667200, 1648976400, 1667116800 } typeOffsets:intvector { -25540, 0, -25200, 0, -25200, 3600, -21600, 0 } typeMap:bin { "01030102010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 161, 541 } - } //Z#161 - /* America/Mendoza */ :int { 70 } //Z#162 + links:intvector { 162, 542 } + } //Z#162 + /* America/Mendoza */ :int { 70 } //Z#163 /* America/Menominee */ :table { transPre32:intvector { -1, 1635207523 } trans:intvector { -1633276800, -1615136400, -1601827200, -1583686800, -880214400, -765392400, -747244800, -733942800, -116438400, -100112400, -21484800, 104914800, 120639600, 126691200, 152089200, 162374400, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } @@ -734,12 +740,12 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#163 + } //Z#164 /* America/Merida */ :table { trans:intvector { -1514743200, 378201600, 405068400, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1175414400, 1193554800, 1207468800, 1225004400, 1238918400, 1256454000, 1270368000, 1288508400, 1301817600, 1319958000, 1333267200, 1351407600, 1365321600, 1382857200, 1396771200, 1414306800, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } typeOffsets:intvector { -21508, 0, -21600, 0, -21600, 3600, -18000, 0 } typeMap:bin { "010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - } //Z#164 + } //Z#165 /* America/Metlakatla */ :table { transPre32:intvector { -1, 1069743569, -1, 2106011674 } trans:intvector { -880207200, -765385200, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 1446372000, 1457866800, 1478426400, 1489316400, 1509876000, 1520766000, 1541325600, 1547978400, 1552215600, 1572775200 } @@ -748,13 +754,13 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2020 } - } //Z#165 + } //Z#166 /* America/Mexico_City */ :table { trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, -975261600, -963169200, -917114400, -907354800, -821901600, -810068400, -627501600, -612990000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1175414400, 1193554800, 1207468800, 1225004400, 1238918400, 1256454000, 1270368000, 1288508400, 1301817600, 1319958000, 1333267200, 1351407600, 1365321600, 1382857200, 1396771200, 1414306800, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } typeOffsets:intvector { -23796, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } typeMap:bin { "0103010201030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" } - links:intvector { 166, 542 } - } //Z#166 + links:intvector { 167, 543 } + } //Z#167 /* America/Miquelon */ :table { trans:intvector { -1847650520, 326001600, 544597200, 562132800, 576046800, 594187200, 607496400, 625636800, 638946000, 657086400, 671000400, 688536000, 702450000, 719985600, 733899600, 752040000, 765349200, 783489600, 796798800, 814939200, 828853200, 846388800, 860302800, 877838400, 891752400, 909288000, 923202000, 941342400, 954651600, 972792000, 986101200, 1004241600, 1018155600, 1035691200, 1049605200, 1067140800, 1081054800, 1099195200, 1112504400, 1130644800, 1143954000, 1162094400, 1173589200, 1194148800 } typeOffsets:intvector { -13480, 0, -14400, 0, -10800, 0, -10800, 3600 } @@ -762,7 +768,7 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -10800 } finalYear:int { 2008 } - } //Z#167 + } //Z#168 /* America/Moncton */ :table { transPre32:intvector { -1, 1579085244 } trans:intvector { -2131642800, -1632074400, -1615143600, -1153681200, -1145822400, -1122231600, -1114372800, -1090782000, -1082923200, -1059332400, -1051473600, -1027882800, -1020024000, -996433200, -988574400, -965674800, -955396800, -934743600, -923947200, -904503600, -891892800, -880221600, -765399600, -747252000, -733950000, -715802400, -702500400, -684352800, -671050800, -652903200, -639601200, -620848800, -608151600, -589399200, -576097200, -557949600, -544647600, -526500000, -513198000, -495050400, -481748400, -463600800, -450298800, -431546400, -418244400, -400096800, -384375600, -368647200, -352926000, -337197600, -321476400, -305748000, -289422000, -273693600, -257972400, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733896060, 752036460, 765345660, 783486060, 796795260, 814935660, 828849660, 846385260, 860299260, 877834860, 891748860, 909284460, 923198460, 941338860, 954648060, 972788460, 986097660, 1004238060, 1018152060, 1035687660, 1049601660, 1067137260, 1081051260, 1099191660, 1112500860, 1130641260, 1143950460, 1162090860, 1173592800, 1194152400 } @@ -771,20 +777,20 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -14400 } finalYear:int { 2008 } - } //Z#168 + } //Z#169 /* America/Monterrey */ :table { trans:intvector { -1514743200, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 576057600, 594198000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 989136000, 1001833200, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1175414400, 1193554800, 1207468800, 1225004400, 1238918400, 1256454000, 1270368000, 1288508400, 1301817600, 1319958000, 1333267200, 1351407600, 1365321600, 1382857200, 1396771200, 1414306800, 1428220800, 1445756400, 1459670400, 1477810800, 1491120000, 1509260400, 1522569600, 1540710000, 1554624000, 1572159600, 1586073600, 1603609200, 1617523200, 1635663600, 1648972800, 1667113200 } typeOffsets:intvector { -24076, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } typeMap:bin { "0103010201030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" } - } //Z#169 + } //Z#170 /* America/Montevideo */ :table { trans:intvector { -1567455309, -1459627200, -1443819600, -1428006600, -1412283600, -1396470600, -1380747600, -1141590600, -1128286800, -1110141000, -1096837200, -1078691400, -1065387600, -1047241800, -1033938000, -1015187400, -1002488400, -983737800, -971038800, -954707400, -938984400, -920838600, -907534800, -896819400, -853621200, -845847000, -334789200, -319671000, -314226000, -309996000, -149720400, -134604000, -50446800, -34205400, 9860400, 14176800, 72846000, 80100000, 127278000, 132111000, 147234600, 156913200, 165376800, 219812400, 226461600, 250052400, 257911200, 282711600, 289360800, 294202800, 322020000, 566449200, 573012000, 597812400, 605066400, 625633200, 635911200, 656478000, 667965600, 688532400, 699415200, 719377200, 730864800, 1095562800, 1111896000, 1128834000, 1142136000, 1159678800, 1173585600, 1191733200, 1205035200, 1223182800, 1236484800, 1254632400, 1268539200, 1286082000, 1299988800, 1317531600, 1331438400, 1349586000, 1362888000, 1381035600, 1394337600, 1412485200, 1425787200 } typeOffsets:intvector { -13491, 0, -14400, 0, -12600, 0, -12600, 1800, -10800, 0, -10800, 1800, -10800, 3600, -10800, 5400 } typeMap:bin { "01030203020302030203020302030203020302030203020305040504060406040504060406040705040604060406040604060406040604060406040604060406040604060406040604060406040604060406040604" } - } //Z#170 - /* America/Montreal */ :int { 219 } //Z#171 - /* America/Montserrat */ :int { 191 } //Z#172 - /* America/Nassau */ :int { 219 } //Z#173 + } //Z#171 + /* America/Montreal */ :int { 220 } //Z#172 + /* America/Montserrat */ :int { 192 } //Z#173 + /* America/Nassau */ :int { 220 } //Z#174 /* America/New_York */ :table { transPre32:intvector { -1, 1577316496 } trans:intvector { -1633280400, -1615140000, -1601830800, -1583690400, -1570381200, -1551636000, -1536512400, -1523210400, -1504458000, -1491760800, -1473008400, -1459706400, -1441558800, -1428256800, -1410109200, -1396807200, -1378659600, -1365357600, -1347210000, -1333908000, -1315155600, -1301853600, -1283706000, -1270404000, -1252256400, -1238954400, -1220806800, -1207504800, -1189357200, -1176055200, -1157302800, -1144605600, -1125853200, -1112551200, -1094403600, -1081101600, -1062954000, -1049652000, -1031504400, -1018202400, -1000054800, -986752800, -968000400, -955303200, -936550800, -923248800, -905101200, -891799200, -880218000, -765396000, -747248400, -733946400, -715798800, -702496800, -684349200, -671047200, -652899600, -639597600, -620845200, -608148000, -589395600, -576093600, -557946000, -544644000, -526496400, -513194400, -495046800, -481744800, -463597200, -447271200, -431542800, -415821600, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 152085600, 162370800, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -793,9 +799,9 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 174, 402, 624 } - } //Z#174 - /* America/Nipigon */ :int { 219 } //Z#175 + links:intvector { 175, 403, 625 } + } //Z#175 + /* America/Nipigon */ :int { 220 } //Z#176 /* America/Nome */ :table { transPre32:intvector { -1, 1069743569, -1, 2106019794 } trans:intvector { -880196400, -765374400, -21466800, -5745600, 9982800, 25704000, 41432400, 57758400, 73486800, 89208000, 104936400, 120657600, 126709200, 152107200, 162392400, 183556800, 199285200, 215611200, 230734800, 247060800, 262789200, 278510400, 294238800, 309960000, 325688400, 341409600, 357138000, 372859200, 388587600, 404913600, 420037200, 436363200, 452084400, 467805600, 483534000, 499255200, 514983600, 530704800, 544618800, 562154400, 576068400, 594208800, 607518000, 625658400, 638967600, 657108000, 671022000, 688557600, 702471600, 720007200, 733921200, 752061600, 765370800, 783511200, 796820400, 814960800, 828874800, 846410400, 860324400, 877860000, 891774000, 909309600, 923223600, 941364000, 954673200, 972813600, 986122800, 1004263200, 1018177200, 1035712800, 1049626800, 1067162400, 1081076400, 1099216800, 1112526000, 1130666400, 1143975600, 1162116000, 1173610800, 1194170400 } @@ -804,13 +810,13 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - } //Z#176 + } //Z#177 /* America/Noronha */ :table { trans:intvector { -1767217820, -1206961200, -1191366000, -1175378400, -1159830000, -633823200, -622072800, -602287200, -591836400, -570751200, -560214000, -539128800, -531356400, -191368800, -184201200, -155167200, -150073200, -128901600, -121129200, -99957600, -89593200, -68421600, -57970800, 499744800, 511232400, 530589600, 540262800, 562125600, 571194000, 592970400, 602038800, 624420000, 634698000, 938916000, 951613200, 970970400, 971571600, 1003024800, 1013907600 } typeOffsets:intvector { -7780, 0, -7200, 0, -7200, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 177, 377 } - } //Z#177 + links:intvector { 178, 378 } + } //Z#178 /* America/North_Dakota/Beulah */ :table { transPre32:intvector { -1, 1577323696 } trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -765388800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 152092800, 162378000, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1173603600, 1194163200, 1205053200, 1225612800, 1236502800, 1257062400, 1268557200, 1289116800, 1300003200, 1320562800 } @@ -819,7 +825,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2012 } - } //Z#178 + } //Z#179 /* America/North_Dakota/Center */ :table { transPre32:intvector { -1, 1577323696 } trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -765388800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 152092800, 162378000, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } @@ -828,7 +834,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#179 + } //Z#180 /* America/North_Dakota/New_Salem */ :table { transPre32:intvector { -1, 1577323696 } trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -765388800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 152092800, 162378000, 183542400, 199270800, 215596800, 230720400, 247046400, 262774800, 278496000, 294224400, 309945600, 325674000, 341395200, 357123600, 372844800, 388573200, 404899200, 420022800, 436348800, 452077200, 467798400, 483526800, 499248000, 514976400, 530697600, 544611600, 562147200, 576061200, 594201600, 607510800, 625651200, 638960400, 657100800, 671014800, 688550400, 702464400, 720000000, 733914000, 752054400, 765363600, 783504000, 796813200, 814953600, 828867600, 846403200, 860317200, 877852800, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 986115600, 1004256000, 1018170000, 1035705600, 1049619600, 1067155200, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } @@ -837,7 +843,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#180 + } //Z#181 /* America/Nuuk */ :table { trans:intvector { -1686083584, 323845200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1477789200, 1490490000, 1509238800, 1521939600, 1540688400, 1553994000, 1572138000, 1585443600, 1603587600, 1616893200, 1635642000, 1648342800, 1667091600, 1679792400, 1711846800, 1729990800 } typeOffsets:intvector { -12416, 0, -10800, 0, -10800, 3600, -7200, 0, -7200, 3600 } @@ -845,8 +851,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { -7200 } finalYear:int { 2025 } - links:intvector { 121, 181 } - } //Z#181 + links:intvector { 122, 182 } + } //Z#182 /* America/Ojinaga */ :table { trans:intvector { -1514739600, -1343149200, -1234807200, -1220461200, -1207159200, -1191344400, 828864000, 846399600, 860313600, 877849200, 891766800, 909302400, 923216400, 941356800, 954666000, 972806400, 989139600, 1001836800, 1018170000, 1035705600, 1049619600, 1067155200, 1081069200, 1099209600, 1112518800, 1130659200, 1143968400, 1162108800, 1175418000, 1193558400, 1207472400, 1225008000, 1238922000, 1256457600, 1268557200, 1289116800, 1300006800, 1320566400, 1331456400, 1352016000, 1362906000, 1383465600, 1394355600, 1414915200, 1425805200, 1446364800, 1457859600, 1478419200, 1489309200, 1509868800, 1520758800, 1541318400, 1552208400, 1572768000, 1583658000, 1604217600, 1615712400, 1636272000, 1647162000, 1667116800, 1678608000, 1699167600 } typeOffsets:intvector { -25060, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } @@ -854,27 +860,27 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -21600 } finalYear:int { 2024 } - } //Z#182 + } //Z#183 /* America/Panama */ :table { transPre32:intvector { -1, 1770464784 } trans:intvector { -1946918424 } typeOffsets:intvector { -19088, 0, -19176, 0, -18000, 0 } typeMap:bin { "0102" } - links:intvector { 79, 97, 101, 183, 401 } - } //Z#183 - /* America/Pangnirtung */ :int { 142 } //Z#184 + links:intvector { 79, 97, 101, 184, 402 } + } //Z#184 + /* America/Pangnirtung */ :int { 143 } //Z#185 /* America/Paramaribo */ :table { trans:intvector { -1861906760, -1104524348, -765317964, 465449400 } typeOffsets:intvector { -13240, 0, -13252, 0, -13236, 0, -12600, 0, -10800, 0 } typeMap:bin { "01020304" } - } //Z#185 + } //Z#186 /* America/Phoenix */ :table { transPre32:intvector { -1, 1577323696 } trans:intvector { -1633273200, -1615132800, -1601823600, -1583683200, -880210800, -820519140, -812653140, -796845540, -84380400, -68659200 } typeOffsets:intvector { -26898, 0, -25200, 0, -25200, 3600 } typeMap:bin { "0102010201020102010201" } - links:intvector { 104, 186, 538, 549, 621 } - } //Z#186 + links:intvector { 105, 187, 539, 550, 622 } + } //Z#187 /* America/Port-au-Prince */ :table { transPre32:intvector { -1, 1770463056 } trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600, 1489302000, 1509861600 } @@ -883,28 +889,28 @@ zoneinfo64:table(nofallback) { finalRule { "Haiti" } finalRaw:int { -18000 } finalYear:int { 2018 } - } //Z#187 - /* America/Port_of_Spain */ :int { 191 } //Z#188 - /* America/Porto_Acre */ :int { 198 } //Z#189 + } //Z#188 + /* America/Port_of_Spain */ :int { 192 } //Z#189 + /* America/Porto_Acre */ :int { 199 } //Z#190 /* America/Porto_Velho */ :table { trans:intvector { -1767210264, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200 } typeOffsets:intvector { -15336, 0, -14400, 0, -14400, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201" } - } //Z#190 + } //Z#191 /* America/Puerto_Rico */ :table { transPre32:intvector { -1, 2061931961 } trans:intvector { -873057600, -765399600 } typeOffsets:intvector { -15865, 0, -14400, 0, -14400, 3600 } typeMap:bin { "010201" } - links:intvector { 61, 62, 77, 86, 106, 112, 124, 125, 149, 154, 158, 172, 188, 191, 208, 210, 211, 212, 213, 220, 222, 551 } - } //Z#191 + links:intvector { 61, 62, 77, 86, 107, 113, 125, 126, 150, 155, 159, 173, 189, 192, 209, 211, 212, 213, 214, 221, 223, 552 } + } //Z#192 /* America/Punta_Arenas */ :table { transPre32:intvector { -1, 1770462716 } trans:intvector { -1892661435, -1688410800, -1619205435, -1593806400, -1335986235, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -736632000, -718056000, -713649600, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 592372800, 605674800, 624427200, 637124400, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1480820400 } typeOffsets:intvector { -17020, 0, -18000, 0, -18000, 3600, -16965, 0, -14400, 0, -14400, 3600, -10800, 0 } typeMap:bin { "030103040302010201020102010201040104020104050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } - } //Z#192 - /* America/Rainy_River */ :int { 224 } //Z#193 + } //Z#193 + /* America/Rainy_River */ :int { 225 } //Z#194 /* America/Rankin_Inlet */ :table { trans:intvector { -410227200, 73468800, 89190000, 104918400, 120639600, 136368000, 152089200, 167817600, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } typeOffsets:intvector { 0, 0, -21600, 0, -21600, 3600, -18000, 0 } @@ -912,18 +918,18 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#194 + } //Z#195 /* America/Recife */ :table { trans:intvector { -1767217224, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -191365200, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 938919600, 951616800, 970974000, 971575200, 1003028400, 1013911200 } typeOffsets:intvector { -8376, 0, -10800, 0, -10800, 3600 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201" } - } //Z#195 + } //Z#196 /* America/Regina */ :table { trans:intvector { -2030202084, -1632063600, -1615132800, -1251651600, -1238349600, -1220202000, -1206900000, -1188752400, -1175450400, -1156698000, -1144000800, -1125248400, -1111946400, -1032714000, -1016992800, -1001264400, -986148000, -969814800, -954093600, -937760400, -922039200, -906310800, -890589600, -880210800, -765388800, -748450800, -732729600, -715791600, -702489600, -684342000, -671040000, -652892400, -639590400, -620838000, -608140800, -589388400, -576086400, -557938800, -544636800, -526489200, -513187200, -495039600, -481737600, -463590000, -450288000, -431535600, -418233600, -400086000, -386784000, -337186800, -321465600, -305737200 } typeOffsets:intvector { -25116, 0, -25200, 0, -25200, 3600, -21600, 0 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" } - links:intvector { 196, 388, 393 } - } //Z#196 + links:intvector { 197, 389, 394 } + } //Z#197 /* America/Resolute */ :table { trans:intvector { -704937600, 73468800, 89190000, 104918400, 120639600, 136368000, 152089200, 167817600, 183538800, 199267200, 215593200, 230716800, 247042800, 262771200, 278492400, 294220800, 309942000, 325670400, 341391600, 357120000, 372841200, 388569600, 404895600, 420019200, 436345200, 452073600, 467794800, 483523200, 499244400, 514972800, 530694000, 544608000, 562143600, 576057600, 594198000, 607507200, 625647600, 638956800, 657097200, 671011200, 688546800, 702460800, 719996400, 733910400, 752050800, 765360000, 783500400, 796809600, 814950000, 828864000, 846399600, 860313600, 877849200, 891763200, 909298800, 923212800, 941353200, 954662400, 972802800, 986112000, 1004252400, 1018166400, 1035702000, 1049616000, 1067151600, 1081065600, 1099206000, 1112515200, 1130655600, 1143964800, 1162105200, 1173600000, 1194159600 } typeOffsets:intvector { 0, 0, -21600, 0, -21600, 3600, -18000, 0 } @@ -931,20 +937,20 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - } //Z#197 + } //Z#198 /* America/Rio_Branco */ :table { trans:intvector { -1767209328, -1206950400, -1191355200, -1175367600, -1159819200, -633812400, -622062000, -602276400, -591825600, -570740400, -560203200, -539118000, -531345600, -191358000, -184190400, -155156400, -150062400, -128890800, -121118400, -99946800, -89582400, -68410800, -57960000, 499755600, 511243200, 530600400, 540273600, 562136400, 571204800, 1214283600, 1384056000 } typeOffsets:intvector { -16272, 0, -18000, 0, -18000, 3600, -14400, 0 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010301" } - links:intvector { 189, 198, 376 } - } //Z#198 - /* America/Rosario */ :int { 67 } //Z#199 - /* America/Santa_Isabel */ :int { 218 } //Z#200 + links:intvector { 190, 199, 377 } + } //Z#199 + /* America/Rosario */ :int { 67 } //Z#200 + /* America/Santa_Isabel */ :int { 219 } //Z#201 /* America/Santarem */ :table { trans:intvector { -1767212472, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 1214280000 } typeOffsets:intvector { -13128, 0, -14400, 0, -14400, 3600, -10800, 0 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020103" } - } //Z#201 + } //Z#202 /* America/Santiago */ :table { trans:intvector { -1892661435, -1688410800, -1619205435, -1593806400, -1335986235, -1317585600, -1304362800, -1286049600, -1272826800, -1254513600, -1241290800, -1222977600, -1209754800, -1191355200, -1178132400, -870552000, -865278000, -740520000, -736635600, -718056000, -713649600, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 592372800, 605674800, 624427200, 637124400, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1494730800, 1502596800, 1526180400, 1534046400, 1554606000, 1567915200, 1586055600, 1599364800, 1617505200, 1630814400, 1648954800, 1662868800, 1680404400, 1693713600 } typeOffsets:intvector { -16965, 0, -18000, 0, -18000, 3600, -14400, 0, -14400, 3600 } @@ -952,20 +958,20 @@ zoneinfo64:table(nofallback) { finalRule { "Chile" } finalRaw:int { -14400 } finalYear:int { 2024 } - links:intvector { 202, 395 } - } //Z#202 + links:intvector { 203, 396 } + } //Z#203 /* America/Santo_Domingo */ :table { transPre32:intvector { -1, 1770462472 } trans:intvector { -1159773600, -100119600, -89668800, -5770800, 4422600, 25678800, 33193800, 57733200, 64816200, 89182800, 96438600, 120632400, 127974600, 152082000, 972799200, 975823200 } typeOffsets:intvector { -16776, 0, -18000, 0, -18000, 1800, -18000, 3600, -16800, 0, -14400, 0 } typeMap:bin { "0401030102010201020102010201050105" } - } //Z#203 + } //Z#204 /* America/Sao_Paulo */ :table { trans:intvector { -1767214412, -1206957600, -1191362400, -1175374800, -1159826400, -633819600, -622069200, -602283600, -591832800, -570747600, -560210400, -539125200, -531352800, -195426000, -184197600, -155163600, -150069600, -128898000, -121125600, -99954000, -89589600, -68418000, -57967200, 499748400, 511236000, 530593200, 540266400, 562129200, 571197600, 592974000, 602042400, 624423600, 634701600, 656478000, 666756000, 687927600, 697600800, 719982000, 728445600, 750826800, 761709600, 782276400, 793159200, 813726000, 824004000, 844570800, 856058400, 876106800, 888717600, 908074800, 919562400, 938919600, 951616800, 970974000, 982461600, 1003028400, 1013911200, 1036292400, 1045360800, 1066532400, 1076810400, 1099364400, 1108864800, 1129431600, 1140314400, 1162695600, 1172368800, 1192330800, 1203213600, 1224385200, 1234663200, 1255834800, 1266717600, 1287284400, 1298167200, 1318734000, 1330221600, 1350788400, 1361066400, 1382238000, 1392516000, 1413687600, 1424570400, 1445137200, 1456020000, 1476586800, 1487469600, 1508036400, 1518919200, 1541300400, 1550368800 } typeOffsets:intvector { -11188, 0, -10800, 0, -10800, 3600 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 204, 374, 378 } - } //Z#204 + links:intvector { 205, 375, 379 } + } //Z#205 /* America/Scoresbysund */ :table { trans:intvector { -1686090728, 323841600, 338961600, 354679200, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1477789200, 1490490000, 1509238800, 1521939600, 1540688400, 1553994000, 1572138000, 1585443600, 1603587600, 1616893200, 1635642000, 1648342800, 1667091600, 1679792400, 1698541200, 1711846800, 1729990800 } typeOffsets:intvector { -5272, 0, -7200, 0, -7200, 3600, -3600, 0, -3600, 3600 } @@ -973,8 +979,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { -7200 } finalYear:int { 2025 } - } //Z#205 - /* America/Shiprock */ :int { 110 } //Z#206 + } //Z#206 + /* America/Shiprock */ :int { 111 } //Z#207 /* America/Sitka */ :table { transPre32:intvector { -1, 1069743569, -1, 2106012569 } trans:intvector { -880207200, -765385200, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 152096400, 162381600, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452084400, 467805600, 483534000, 499255200, 514983600, 530704800, 544618800, 562154400, 576068400, 594208800, 607518000, 625658400, 638967600, 657108000, 671022000, 688557600, 702471600, 720007200, 733921200, 752061600, 765370800, 783511200, 796820400, 814960800, 828874800, 846410400, 860324400, 877860000, 891774000, 909309600, 923223600, 941364000, 954673200, 972813600, 986122800, 1004263200, 1018177200, 1035712800, 1049626800, 1067162400, 1081076400, 1099216800, 1112526000, 1130666400, 1143975600, 1162116000, 1173610800, 1194170400 } @@ -983,8 +989,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - } //Z#207 - /* America/St_Barthelemy */ :int { 191 } //Z#208 + } //Z#208 + /* America/St_Barthelemy */ :int { 192 } //Z#209 /* America/St_Johns */ :table { trans:intvector { -1664130548, -1650137348, -1632076148, -1615145348, -1598650148, -1590100148, -1567286948, -1551565748, -1535837348, -1520116148, -1503782948, -1488666548, -1472333348, -1457216948, -1440883748, -1425767348, -1409434148, -1394317748, -1377984548, -1362263348, -1346534948, -1330813748, -1314480548, -1299364148, -1283030948, -1267914548, -1251581348, -1236464948, -1220131748, -1205015348, -1188682148, -1172960948, -1156627748, -1141511348, -1125178148, -1110061748, -1096921748, -1093728600, -1078612200, -1061670600, -1048973400, -1030221000, -1017523800, -998771400, -986074200, -966717000, -954624600, -935267400, -922570200, -903817800, -891120600, -872368200, -765401400, -746044200, -733347000, -714594600, -701897400, -683145000, -670447800, -651695400, -638998200, -619641000, -606943800, -589401000, -576099000, -557951400, -544649400, -526501800, -513199800, -495052200, -481750200, -463602600, -450300600, -431548200, -418246200, -400098600, -386796600, -368649000, -355347000, -337199400, -323897400, -305749800, -289423800, -273695400, -257974200, -242245800, -226524600, -210796200, -195075000, -179346600, -163625400, -147897000, -131571000, -116447400, -100121400, -84393000, -68671800, -52943400, -37222200, -21493800, -5772600, 9955800, 25677000, 41405400, 57731400, 73459800, 89181000, 104909400, 120630600, 136359000, 152080200, 167808600, 183529800, 199258200, 215584200, 230707800, 247033800, 262762200, 278483400, 294211800, 309933000, 325661400, 341382600, 357111000, 372832200, 388560600, 404886600, 420010200, 436336200, 452064600, 467785800, 483514200, 499235400, 514963800, 530685000, 544591860, 562127460, 576041460, 594178260, 607491060, 625631460, 638940660, 657081060, 670995060, 688530660, 702444660, 719980260, 733894260, 752034660, 765343860, 783484260, 796793460, 814933860, 828847860, 846383460, 860297460, 877833060, 891747060, 909282660, 923196660, 941337060, 954646260, 972786660, 986095860, 1004236260, 1018150260, 1035685860, 1049599860, 1067135460, 1081049460, 1099189860, 1112499060, 1130639460, 1143948660, 1162089060, 1173583860, 1194143460, 1205033460, 1225593060, 1236483060, 1257042660, 1268537460, 1289097060, 1299987060, 1320553800, 1331443800, 1352003400 } typeOffsets:intvector { -12652, 0, -12652, 3600, -12600, 0, -12600, 3600, -12600, 7200 } @@ -992,22 +998,22 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -12600 } finalYear:int { 2013 } - links:intvector { 209, 382, 391 } - } //Z#209 - /* America/St_Kitts */ :int { 191 } //Z#210 - /* America/St_Lucia */ :int { 191 } //Z#211 - /* America/St_Thomas */ :int { 191 } //Z#212 - /* America/St_Vincent */ :int { 191 } //Z#213 + links:intvector { 210, 383, 392 } + } //Z#210 + /* America/St_Kitts */ :int { 192 } //Z#211 + /* America/St_Lucia */ :int { 192 } //Z#212 + /* America/St_Thomas */ :int { 192 } //Z#213 + /* America/St_Vincent */ :int { 192 } //Z#214 /* America/Swift_Current */ :table { trans:intvector { -2030201320, -1632063600, -1615132800, -880210800, -765388800, -747241200, -732729600, -715791600, -702489600, -684342000, -671040000, -652892400, -639590400, -400086000, -384364800, -337186800, -321465600, -305737200, -292435200, -273682800, -260985600, 73472400 } typeOffsets:intvector { -25880, 0, -25200, 0, -25200, 3600, -21600, 0 } typeMap:bin { "01020102010201020102010201020102010201020103" } - } //Z#214 + } //Z#215 /* America/Tegucigalpa */ :table { trans:intvector { -1538503868, 547020000, 559717200, 578469600, 591166800, 1146981600, 1154926800 } typeOffsets:intvector { -20932, 0, -21600, 0, -21600, 3600 } typeMap:bin { "01020102010201" } - } //Z#215 + } //Z#216 /* America/Thule */ :table { trans:intvector { -1686079492, 670399200, 686120400, 701848800, 717570000, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 } typeOffsets:intvector { -16508, 0, -14400, 0, -14400, 3600 } @@ -1015,8 +1021,8 @@ zoneinfo64:table(nofallback) { finalRule { "Thule" } finalRaw:int { -14400 } finalYear:int { 2008 } - } //Z#216 - /* America/Thunder_Bay */ :int { 219 } //Z#217 + } //Z#217 + /* America/Thunder_Bay */ :int { 220 } //Z#218 /* America/Tijuana */ :table { trans:intvector { -1514739600, -1451667600, -1343145600, -1234803600, -1222963200, -1207242000, -873820800, -761418000, -686073600, -661539600, -620755200, -608144400, -589384800, -576082800, -557935200, -544633200, -495039600, -481734000, -463590000, -450284400, -431535600, -418230000, -400086000, -386780400, -368636400, -355330800, -337186800, -323881200, -305737200, -292431600, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1175421600, 1193562000, 1207476000, 1225011600, 1238925600, 1256461200, 1268560800, 1289120400 } typeOffsets:intvector { -28084, 0, -28800, 0, -28800, 3600, -25200, 0 } @@ -1024,8 +1030,8 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2011 } - links:intvector { 116, 200, 218, 540 } - } //Z#218 + links:intvector { 117, 201, 219, 541 } + } //Z#219 /* America/Toronto */ :table { transPre32:intvector { -1, 1928231148 } trans:intvector { -1632070800, -1615140000, -1601753400, -1583697600, -1567357200, -1554667200, -1534698000, -1524074400, -1503248400, -1492365600, -1471798800, -1460916000, -1440954000, -1428861600, -1409504400, -1397412000, -1378054800, -1365962400, -1346605200, -1333908000, -1315155600, -1301853600, -1283706000, -1270404000, -1252256400, -1238954400, -1220806800, -1207504800, -1188752400, -1176055200, -1157302800, -1144000800, -1125853200, -1112551200, -1094403600, -1081101600, -1062954000, -1049652000, -1031504400, -1018202400, -1000054800, -986752800, -968000400, -955303200, -936550800, -765396000, -747248400, -733946400, -715798800, -702496800, -684349200, -671047200, -652899600, -634154400, -620845200, -602704800, -589395600, -576093600, -557946000, -544644000, -526496400, -513194400, -495046800, -481744800, -463597200, -450295200, -431542800, -418240800, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 136364400, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 } @@ -1034,9 +1040,9 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -18000 } finalYear:int { 2008 } - links:intvector { 171, 173, 175, 217, 219, 389 } - } //Z#219 - /* America/Tortola */ :int { 191 } //Z#220 + links:intvector { 172, 174, 176, 218, 220, 390 } + } //Z#220 + /* America/Tortola */ :int { 192 } //Z#221 /* America/Vancouver */ :table { transPre32:intvector { -1, 1581086444 } trans:intvector { -1632060000, -1615129200, -880207200, -765385200, -747237600, -733935600, -715788000, -702486000, -684338400, -671036400, -652888800, -639586800, -620834400, -608137200, -589384800, -576082800, -557935200, -544633200, -526485600, -513183600, -495036000, -481734000, -463586400, -450284400, -431532000, -418230000, -400082400, -386780400, -368632800, -355330800, -337183200, -323881200, -305733600, -292431600, -273679200, -260982000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 136375200, 152096400, 167824800, 183546000, 199274400, 215600400, 230724000, 247050000, 262778400, 278499600, 294228000, 309949200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800 } @@ -1045,16 +1051,16 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 221, 392 } - } //Z#221 - /* America/Virgin */ :int { 191 } //Z#222 + links:intvector { 222, 393 } + } //Z#222 + /* America/Virgin */ :int { 192 } //Z#223 /* America/Whitehorse */ :table { transPre32:intvector { -1, 2105969308 } trans:intvector { -1632056400, -1615125600, -1596978000, -1583164800, -880203600, -765381600, -147884400, -131554800, -121273200, 325677600, 341398800, 357127200, 372848400, 388576800, 404902800, 420026400, 436352400, 452080800, 467802000, 483530400, 499251600, 514980000, 530701200, 544615200, 562150800, 576064800, 594205200, 607514400, 625654800, 638964000, 657104400, 671018400, 688554000, 702468000, 720003600, 733917600, 752058000, 765367200, 783507600, 796816800, 814957200, 828871200, 846406800, 860320800, 877856400, 891770400, 909306000, 923220000, 941360400, 954669600, 972810000, 986119200, 1004259600, 1018173600, 1035709200, 1049623200, 1067158800, 1081072800, 1099213200, 1112522400, 1130662800, 1143972000, 1162112400, 1173607200, 1194166800, 1205056800, 1225616400, 1236506400, 1257066000, 1268560800, 1289120400, 1300010400, 1320570000, 1331460000, 1352019600, 1362909600, 1383469200, 1394359200, 1414918800, 1425808800, 1446368400, 1457863200, 1478422800, 1489312800, 1509872400, 1520762400, 1541322000, 1552212000, 1572771600, 1583661600, 1604214000 } typeOffsets:intvector { -32412, 0, -32400, 0, -32400, 3600, -32400, 7200, -28800, 0, -28800, 3600, -25200, 0 } typeMap:bin { "0102010201020103010405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040504050405040506" } - links:intvector { 223, 394 } - } //Z#223 + links:intvector { 224, 395 } + } //Z#224 /* America/Winnipeg */ :table { transPre32:intvector { -1, 1692709012 } trans:intvector { -1694368800, -1681671600, -1632067200, -1615136400, -1029686400, -1018198800, -880214400, -765392400, -746035200, -732733200, -715795200, -702493200, -684345600, -671043600, -652896000, -639594000, -620755200, -607626000, -589392000, -576090000, -557942400, -544640400, -526492800, -513190800, -495043200, -481741200, -463593600, -450291600, -431539200, -418237200, -400089600, -386787600, -368640000, -355338000, -337190400, -321469200, -305740800, -292438800, -210787200, -198090000, -116438400, -100108800, -84384000, -68659200, -52934400, -37209600, -21484800, -5760000, 9964800, 25689600, 41414400, 57744000, 73468800, 89193600, 104918400, 120643200, 136368000, 152092800, 167817600, 183542400, 199267200, 215596800, 230716800, 247046400, 262771200, 278496000, 294220800, 309945600, 325670400, 341395200, 357120000, 372844800, 388569600, 404899200, 420019200, 436348800, 452073600, 467798400, 483523200, 499248000, 514972800, 530697600, 544608000, 562147200, 576057600, 594201600, 607507200, 625651200, 638956800, 657100800, 671011200, 688550400, 702460800, 720000000, 733910400, 752054400, 765360000, 783504000, 796809600, 814953600, 828864000, 846403200, 860313600, 877852800, 891763200, 909302400, 923212800, 941356800, 954662400, 972806400, 986112000, 1004256000, 1018166400, 1035705600, 1049616000, 1067155200, 1081065600, 1099209600, 1112515200, 1130659200, 1143964800, 1162105200, 1173600000, 1194159600 } @@ -1063,8 +1069,8 @@ zoneinfo64:table(nofallback) { finalRule { "Canada" } finalRaw:int { -21600 } finalYear:int { 2008 } - links:intvector { 193, 224, 387 } - } //Z#224 + links:intvector { 194, 225, 388 } + } //Z#225 /* America/Yakutat */ :table { transPre32:intvector { -1, 1069743569, -1, 2106013631 } trans:intvector { -880203600, -765381600, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 152100000, 162385200, 183549600, 199278000, 215604000, 230727600, 247053600, 262782000, 278503200, 294231600, 309952800, 325681200, 341402400, 357130800, 372852000, 388580400, 404906400, 420030000, 436356000, 452084400, 467805600, 483534000, 499255200, 514983600, 530704800, 544618800, 562154400, 576068400, 594208800, 607518000, 625658400, 638967600, 657108000, 671022000, 688557600, 702471600, 720007200, 733921200, 752061600, 765370800, 783511200, 796820400, 814960800, 828874800, 846410400, 860324400, 877860000, 891774000, 909309600, 923223600, 941364000, 954673200, 972813600, 986122800, 1004263200, 1018177200, 1035712800, 1049626800, 1067162400, 1081076400, 1099216800, 1112526000, 1130666400, 1143975600, 1162116000, 1173610800, 1194170400 } @@ -1073,19 +1079,19 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -32400 } finalYear:int { 2008 } - } //Z#225 - /* America/Yellowknife */ :int { 113 } //Z#226 + } //Z#226 + /* America/Yellowknife */ :int { 114 } //Z#227 /* Antarctica/Casey */ :table { trans:intvector { -31536000, 1255802400, 1267714800, 1319738400, 1329843600, 1477065600, 1520701200, 1538856000, 1552752000, 1570129200, 1583596800, 1601740860, 1615640400, 1633190460, 1647090000, 1664640060, 1678291200 } typeOffsets:intvector { 0, 0, 28800, 0, 39600, 0 } typeMap:bin { "0102010201020102010201020102010201" } - } //Z#227 + } //Z#228 /* Antarctica/Davis */ :table { trans:intvector { -409190400, -163062000, -28857600, 1255806000, 1268251200, 1319742000, 1329854400 } typeOffsets:intvector { 0, 0, 18000, 0, 25200, 0 } typeMap:bin { "02000201020102" } - } //Z#228 - /* Antarctica/DumontDUrville */ :int { 587 } //Z#229 + } //Z#229 + /* Antarctica/DumontDUrville */ :int { 588 } //Z#230 /* Antarctica/Macquarie */ :table { transPre32:intvector { -1, 2080708096 } trans:intvector { -1680508800, -1665388800, -1601719200, -687052800, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000, 1238860800, 1254585600, 1301760000, 1317484800 } @@ -1094,25 +1100,25 @@ zoneinfo64:table(nofallback) { finalRule { "AT" } finalRaw:int { 36000 } finalYear:int { 2012 } - } //Z#230 + } //Z#231 /* Antarctica/Mawson */ :table { trans:intvector { -501206400, 1255809600 } typeOffsets:intvector { 0, 0, 18000, 0, 21600, 0 } typeMap:bin { "0201" } - } //Z#231 - /* Antarctica/McMurdo */ :int { 555 } //Z#232 + } //Z#232 + /* Antarctica/McMurdo */ :int { 556 } //Z#233 /* Antarctica/Palmer */ :table { trans:intvector { -157766400, -152658000, -132955200, -121122000, -101419200, -86821200, -71092800, -54766800, -39038400, -23317200, -7588800, 128142000, 136605600, 389070000, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 592372800, 605674800, 624427200, 637124400, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1480820400 } typeOffsets:intvector { 0, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "02010201020102010201030403010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } - } //Z#233 + } //Z#234 /* Antarctica/Rothera */ :table { trans:intvector { 218246400 } typeOffsets:intvector { 0, 0, -10800, 0 } typeMap:bin { "01" } - } //Z#234 - /* Antarctica/South_Pole */ :int { 555 } //Z#235 - /* Antarctica/Syowa */ :int { 311 } //Z#236 + } //Z#235 + /* Antarctica/South_Pole */ :int { 556 } //Z#236 + /* Antarctica/Syowa */ :int { 312 } //Z#237 /* Antarctica/Troll */ :table { trans:intvector { 1111885200, 1130634000 } typeOffsets:intvector { 0, 0, 0, 7200 } @@ -1120,74 +1126,74 @@ zoneinfo64:table(nofallback) { finalRule { "Troll" } finalRaw:int { 0 } finalYear:int { 2006 } - } //Z#237 + } //Z#238 /* Antarctica/Vostok */ :table { trans:intvector { -380073600, 760035600, 783648000, 1702839600 } typeOffsets:intvector { 0, 0, 18000, 0, 25200, 0 } typeMap:bin { "02000201" } - } //Z#238 - /* Arctic/Longyearbyen */ :int { 447 } //Z#239 - /* Asia/Aden */ :int { 311 } //Z#240 + } //Z#239 + /* Arctic/Longyearbyen */ :int { 448 } //Z#240 + /* Asia/Aden */ :int { 312 } //Z#241 /* Asia/Almaty */ :table { trans:intvector { -1441170468, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600, 695768400, 701812800, 717537600, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1709229600 } typeOffsets:intvector { 18468, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040301" } - } //Z#241 + } //Z#242 /* Asia/Amman */ :table { trans:intvector { -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1112306400, 1128031200, 1143756000, 1161900000, 1175205600, 1193349600, 1206655200, 1225404000, 1238104800, 1256853600, 1269554400, 1288303200, 1301608800, 1319752800, 1333058400, 1387486800, 1395957600, 1414706400, 1427407200, 1446156000, 1459461600, 1477605600, 1490911200, 1509055200, 1522360800, 1540504800, 1553810400, 1571954400, 1585260000, 1604008800, 1616709600, 1635458400, 1645740000, 1666908000 } typeOffsets:intvector { 8624, 0, 7200, 0, 7200, 3600, 10800, 0 } typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } - } //Z#242 + } //Z#243 /* Asia/Anadyr */ :table { trans:intvector { -1441194596, -1247572800, 354884400, 370692000, 386420400, 402231600, 417960000, 433767600, 449582400, 465314400, 481039200, 496764000, 512488800, 528213600, 543938400, 559663200, 575388000, 591112800, 606837600, 622562400, 638287200, 654616800, 670341600, 686070000, 695746800, 701791200, 717516000, 733240800, 748965600, 764690400, 780415200, 796140000, 811864800, 828194400, 846338400, 859644000, 877788000, 891093600, 909237600, 922543200, 941292000, 953992800, 972741600, 985442400, 1004191200, 1017496800, 1035640800, 1048946400, 1067090400, 1080396000, 1099144800, 1111845600, 1130594400, 1143295200, 1162044000, 1174744800, 1193493600, 1206799200, 1224943200, 1238248800, 1256392800, 1269698400, 1288450800, 1301151600 } typeOffsets:intvector { 42596, 0, 39600, 0, 39600, 3600, 43200, 0, 43200, 3600, 46800, 0, 46800, 3600 } typeMap:bin { "03050605040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" } - } //Z#243 + } //Z#244 /* Asia/Aqtau */ :table { trans:intvector { -1441164064, -1247544000, 370724400, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600 } typeOffsets:intvector { 12064, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "0103050403040304030403040304030403040304030201030403040304010201020102010201020102010201020102010203" } - } //Z#244 + } //Z#245 /* Asia/Aqtobe */ :table { trans:intvector { -1441165720, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000 } typeOffsets:intvector { 13720, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010304050403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403" } - } //Z#245 + } //Z#246 /* Asia/Ashgabat */ :table { trans:intvector { -1441166012, -1247544000, 354913200, 370720800, 386449200, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000 } typeOffsets:intvector { 14012, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103" } - links:intvector { 246, 247 } - } //Z#246 - /* Asia/Ashkhabad */ :int { 246 } //Z#247 + links:intvector { 247, 248 } + } //Z#247 + /* Asia/Ashkhabad */ :int { 247 } //Z#248 /* Asia/Atyrau */ :table { trans:intvector { -1441164464, -1247540400, 370724400, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600 } typeOffsets:intvector { 12464, 0, 10800, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "0104060504050405040504050405040504050405040302040504050405040504050405040504030203020302030203020304" } - } //Z#248 + } //Z#249 /* Asia/Baghdad */ :table { transPre32:intvector { -1, 1770435036 } trans:intvector { -1641005856, 389048400, 402264000, 417906000, 433800000, 449614800, 465422400, 481150800, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670464000, 686275200, 702086400, 717897600, 733622400, 749433600, 765158400, 780969600, 796694400, 812505600, 828316800, 844128000, 859852800, 875664000, 891388800, 907200000, 922924800, 938736000, 954547200, 970358400, 986083200, 1001894400, 1017619200, 1033430400, 1049155200, 1064966400, 1080777600, 1096588800, 1112313600, 1128124800, 1143849600, 1159660800, 1175385600, 1191196800 } typeOffsets:intvector { 10660, 0, 10656, 0, 10800, 0, 10800, 3600 } typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - } //Z#249 - /* Asia/Bahrain */ :int { 307 } //Z#250 + } //Z#250 + /* Asia/Bahrain */ :int { 308 } //Z#251 /* Asia/Baku */ :table { trans:intvector { -1441163964, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701823600, 717548400, 828234000, 846378000, 859680000, 877824000, 891129600, 909273600, 922579200, 941328000, 954028800, 972777600, 985478400, 1004227200, 1017532800, 1035676800, 1048982400, 1067126400, 1080432000, 1099180800, 1111881600, 1130630400, 1143331200, 1162080000, 1174780800, 1193529600, 1206835200, 1224979200, 1238284800, 1256428800, 1269734400, 1288483200, 1301184000, 1319932800, 1332633600, 1351382400, 1364688000, 1382832000, 1396137600, 1414281600, 1427587200, 1445731200 } typeOffsets:intvector { 11964, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201020304030403040304030403040304030403040304030403040304030403040304030403040304030403" } - } //Z#251 + } //Z#252 /* Asia/Bangkok */ :table { trans:intvector { -1570084924 } typeOffsets:intvector { 24124, 0, 25200, 0 } typeMap:bin { "01" } - links:intvector { 252, 304, 333, 520 } - } //Z#252 + links:intvector { 253, 305, 334, 521 } + } //Z#253 /* Asia/Barnaul */ :table { trans:intvector { -1579844100, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 748983600, 764708400, 780433200, 796158000, 801590400, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600, 1414263600, 1459022400 } typeOffsets:intvector { 20100, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#253 + } //Z#254 /* Asia/Beirut */ :table { transPre32:intvector { -1, 1454817976 } trans:intvector { -1570413600, -1552186800, -1538359200, -1522551600, -1507514400, -1490583600, -1473645600, -1460948400, -399866400, -386650800, -368330400, -355114800, -336794400, -323578800, -305172000, -291956400, -273636000, -260420400, 78012000, 86734800, 105055200, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 212965200, 231285600, 244501200, 262735200, 275950800, 452210400, 466722000, 483746400, 498258000, 515282400, 529794000, 546818400, 561330000, 581119200, 592952400, 610754400, 624488400, 641512800, 656024400, 673048800, 687560400, 704671200, 718146000, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 843944400, 859672800, 875394000, 891122400, 906843600, 922572000, 941317200 } @@ -1196,57 +1202,57 @@ zoneinfo64:table(nofallback) { finalRule { "Lebanon" } finalRaw:int { 7200 } finalYear:int { 2000 } - } //Z#254 + } //Z#255 /* Asia/Bishkek */ :table { trans:intvector { -1441169904, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 683582400, 703018800, 717530400, 734468400, 748980000, 765918000, 780429600, 797367600, 811879200, 828817200, 843933600, 859671000, 877811400, 891120600, 909261000, 922570200, 941315400, 954019800, 972765000, 985469400, 1004214600, 1017523800, 1035664200, 1048973400, 1067113800, 1080423000, 1099168200, 1111872600, 1123783200 } typeOffsets:intvector { 17904, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020102010201020102010201020102010201020102010201020102010203" } - } //Z#255 - /* Asia/Brunei */ :int { 291 } //Z#256 - /* Asia/Calcutta */ :int { 288 } //Z#257 + } //Z#256 + /* Asia/Brunei */ :int { 292 } //Z#257 + /* Asia/Calcutta */ :int { 289 } //Z#258 /* Asia/Chita */ :table { trans:intvector { -1579419232, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701802000, 717526800, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1080406800, 1099155600, 1111856400, 1130605200, 1143306000, 1162054800, 1174755600, 1193504400, 1206810000, 1224954000, 1238259600, 1256403600, 1269709200, 1288458000, 1301158800, 1414252800, 1459015200 } typeOffsets:intvector { 27232, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 } typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" } - } //Z#258 - /* Asia/Choibalsan */ :int { 329 } //Z#259 - /* Asia/Chongqing */ :int { 316 } //Z#260 - /* Asia/Chungking */ :int { 316 } //Z#261 + } //Z#259 + /* Asia/Choibalsan */ :int { 330 } //Z#260 + /* Asia/Chongqing */ :int { 317 } //Z#261 + /* Asia/Chungking */ :int { 317 } //Z#262 /* Asia/Colombo */ :table { transPre32:intvector { -1, 1454807332 } trans:intvector { -2019705572, -883287000, -862639200, -764051400, 832962600, 846266400, 1145039400 } typeOffsets:intvector { 19164, 0, 19172, 0, 19800, 0, 19800, 1800, 19800, 3600, 21600, 0, 23400, 0 } typeMap:bin { "0102030402060502" } - } //Z#262 - /* Asia/Dacca */ :int { 265 } //Z#263 + } //Z#263 + /* Asia/Dacca */ :int { 266 } //Z#264 /* Asia/Damascus */ :table { trans:intvector { -1577931912, -1568592000, -1554080400, -1537142400, -1522630800, -1505692800, -1491181200, -1474243200, -1459126800, -242265600, -228877200, -210556800, -197427600, -178934400, -165718800, -147398400, -134269200, -116467200, -102646800, -84326400, -71110800, -52704000, -39488400, -21168000, -7952400, 10368000, 23583600, 41904000, 55119600, 73526400, 86742000, 105062400, 118278000, 136598400, 149814000, 168134400, 181350000, 199756800, 212972400, 231292800, 241916400, 262828800, 273452400, 418694400, 433810800, 450316800, 465433200, 508896000, 529196400, 541555200, 562633200, 574387200, 594255600, 607305600, 623199600, 638928000, 654649200, 670456800, 686264400, 702684000, 717886800, 733096800, 748904400, 765151200, 780958800, 796687200, 812494800, 828309600, 844117200, 859759200, 875653200, 891208800, 907189200, 922917600, 938725200, 954540000, 970347600, 986076000, 1001883600, 1017612000, 1033419600, 1049148000, 1064955600, 1080770400, 1096578000, 1112306400, 1128114000, 1143842400, 1158872400, 1175205600, 1193950800, 1207260000, 1225486800, 1238104800, 1256850000, 1270159200, 1288299600, 1301608800, 1319749200, 1333058400, 1351198800, 1364508000, 1382648400, 1395957600, 1414702800, 1427407200, 1446152400, 1458856800, 1477602000, 1490911200, 1509051600, 1522360800, 1540501200, 1553810400, 1571950800, 1585260000, 1604005200, 1616709600, 1635454800, 1648159200, 1666904400 } typeOffsets:intvector { 8712, 0, 7200, 0, 7200, 3600, 10800, 0 } typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" } - } //Z#264 + } //Z#265 /* Asia/Dhaka */ :table { transPre32:intvector { -1, 1770423996 } trans:intvector { -891582800, -872058600, -862637400, -576138600, 1245430800, 1262278800 } typeOffsets:intvector { 21700, 0, 19800, 0, 21200, 0, 21600, 0, 21600, 3600, 23400, 0 } typeMap:bin { "02050105030403" } - links:intvector { 263, 265, 375 } - } //Z#265 + links:intvector { 264, 266, 376 } + } //Z#266 /* Asia/Dili */ :table { trans:intvector { -1830412800, -879152400, 199897200, 969120000 } typeOffsets:intvector { 30140, 0, 28800, 0, 32400, 0 } typeMap:bin { "01020102" } - } //Z#266 + } //Z#267 /* Asia/Dubai */ :table { trans:intvector { -1577936472 } typeOffsets:intvector { 13272, 0, 14400, 0 } typeMap:bin { "01" } - links:intvector { 267, 298, 524, 528 } - } //Z#267 + links:intvector { 268, 299, 525, 529 } + } //Z#268 /* Asia/Dushanbe */ :table { trans:intvector { -1441168512, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 684363600 } typeOffsets:intvector { 16512, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201" } - } //Z#268 + } //Z#269 /* Asia/Famagusta */ :table { trans:intvector { -1518920148, 166572000, 182293200, 200959200, 213829200, 228866400, 243982800, 260316000, 276123600, 291765600, 307486800, 323820000, 338936400, 354664800, 370386000, 386114400, 401835600, 417564000, 433285200, 449013600, 465339600, 481068000, 496789200, 512517600, 528238800, 543967200, 559688400, 575416800, 591138000, 606866400, 622587600, 638316000, 654642000, 670370400, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 843944400, 859672800, 875394000, 891122400, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396141200, 1414285200, 1427590800, 1445734800, 1459040400, 1473282000, 1509238800, 1521939600, 1540688400 } typeOffsets:intvector { 8148, 0, 7200, 0, 7200, 3600, 10800, 0 } @@ -1254,7 +1260,7 @@ zoneinfo64:table(nofallback) { finalRule { "EUAsia" } finalRaw:int { 7200 } finalYear:int { 2019 } - } //Z#269 + } //Z#270 /* Asia/Gaza */ :table { transPre32:intvector { -1, 2109557424 } trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666998000, 1682726400, 1698447600, 1713571200, 1729897200, 1744416000, 1761346800, 1774656000, 1792796400, 1806105600, 1824850800, 1837555200, 1856300400, 1869004800, 1887750000, 1901059200, 1919199600, 1932508800, 1950649200, 1963958400, 1982703600, 1995408000, 2014153200, 2026857600, 2045602800, 2058307200, 2077052400, 2090361600, 2107897200, 2121811200, 2138742000 } @@ -1264,8 +1270,8 @@ zoneinfo64:table(nofallback) { finalRule { "Palestine" } finalRaw:int { 7200 } finalYear:int { 2088 } - } //Z#270 - /* Asia/Harbin */ :int { 316 } //Z#271 + } //Z#271 + /* Asia/Harbin */ :int { 317 } //Z#272 /* Asia/Hebron */ :table { transPre32:intvector { -1, 2109557273 } trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400, 1616796000, 1635458400, 1648332000, 1666998000, 1682726400, 1698447600, 1713571200, 1729897200, 1744416000, 1761346800, 1774656000, 1792796400, 1806105600, 1824850800, 1837555200, 1856300400, 1869004800, 1887750000, 1901059200, 1919199600, 1932508800, 1950649200, 1963958400, 1982703600, 1995408000, 2014153200, 2026857600, 2045602800, 2058307200, 2077052400, 2090361600, 2107897200, 2121811200, 2138742000 } @@ -1275,40 +1281,40 @@ zoneinfo64:table(nofallback) { finalRule { "Palestine" } finalRaw:int { 7200 } finalYear:int { 2088 } - } //Z#272 + } //Z#273 /* Asia/Ho_Chi_Minh */ :table { trans:intvector { -1851577590, -852105600, -782643600, -767869200, -718095600, -457772400, -315648000, 171820800 } typeOffsets:intvector { 25590, 0, 25200, 0, 28800, 0, 32400, 0 } typeMap:bin { "0102030102010201" } - links:intvector { 273, 312, 634 } - } //Z#273 + links:intvector { 274, 313, 635 } + } //Z#274 /* Asia/Hong_Kong */ :table { trans:intvector { -2056690800, -900910800, -891579600, -884248200, -761209200, -747907200, -728541000, -717049800, -697091400, -683785800, -668061000, -654755400, -636611400, -623305800, -605161800, -591856200, -573712200, -559801800, -541657800, -528352200, -510211800, -498112200, -478762200, -466662600, -446707800, -435213000, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132816600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 } typeOffsets:intvector { 27402, 0, 28800, 0, 28800, 1800, 28800, 3600, 32400, 0 } typeMap:bin { "010302040103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301030103010301" } - links:intvector { 274, 514 } - } //Z#274 + links:intvector { 275, 515 } + } //Z#275 /* Asia/Hovd */ :table { trans:intvector { -2032927596, 252439200, 417978000, 433785600, 449600400, 465321600, 481050000, 496771200, 512499600, 528220800, 543949200, 559670400, 575398800, 591120000, 606848400, 622569600, 638298000, 654624000, 670352400, 686073600, 701802000, 717523200, 733251600, 748972800, 764701200, 780422400, 796150800, 811872000, 828205200, 843926400, 859654800, 875376000, 891104400, 906825600, 988398000, 1001700000, 1017428400, 1033149600, 1048878000, 1064599200, 1080327600, 1096048800, 1111777200, 1127498400, 1143226800, 1159552800, 1427482800, 1443196800, 1458932400, 1474646400 } typeOffsets:intvector { 21996, 0, 21600, 0, 25200, 0, 25200, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - } //Z#275 + } //Z#276 /* Asia/Irkutsk */ :table { trans:intvector { -1575874625, -1247554800, 354902400, 370710000, 386438400, 402246000, 417974400, 433782000, 449596800, 465328800, 481053600, 496778400, 512503200, 528228000, 543952800, 559677600, 575402400, 591127200, 606852000, 622576800, 638301600, 654631200, 670356000, 686084400, 695761200, 701805600, 717530400, 733255200, 748980000, 764704800, 780429600, 796154400, 811879200, 828208800, 846352800, 859658400, 877802400, 891108000, 909252000, 922557600, 941306400, 954007200, 972756000, 985456800, 1004205600, 1017511200, 1035655200, 1048960800, 1067104800, 1080410400, 1099159200, 1111860000, 1130608800, 1143309600, 1162058400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200, 1256407200, 1269712800, 1288461600, 1301162400, 1414256400 } typeOffsets:intvector { 25025, 0, 25200, 0, 25200, 3600, 28800, 0, 28800, 3600, 32400, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#276 - /* Asia/Istanbul */ :int { 460 } //Z#277 + } //Z#277 + /* Asia/Istanbul */ :int { 461 } //Z#278 /* Asia/Jakarta */ :table { trans:intvector { -1451719200, -1172906400, -876641400, -766054800, -683883000, -620812800, -189415800 } typeOffsets:intvector { 25632, 0, 25200, 0, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } typeMap:bin { "02030503040301" } - } //Z#278 + } //Z#279 /* Asia/Jayapura */ :table { trans:intvector { -1172913768, -799491600, -189423000 } typeOffsets:intvector { 33768, 0, 32400, 0, 34200, 0 } typeMap:bin { "010201" } - } //Z#279 + } //Z#280 /* Asia/Jerusalem */ :table { transPre32:intvector { -1, 1454818042 } trans:intvector { -1641003640, -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -681955200, -673228800, -667958400, -652320000, -636422400, -622080000, -608947200, -591840000, -572486400, -558576000, -542851200, -527731200, -514425600, -490838400, -482976000, -459388800, -451526400, -428544000, -418262400, -400118400, -387417600, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 826840800, 842821200, 858895200, 874184400, 890344800, 905029200, 923011200, 936313200, 955670400, 970783200, 986770800, 1001282400, 1017356400, 1033941600, 1048806000, 1065132000, 1081292400, 1095804000, 1112313600, 1128812400, 1143763200, 1159657200, 1175212800, 1189897200, 1206662400, 1223161200, 1238112000, 1254006000, 1269561600, 1284246000, 1301616000, 1317510000, 1333065600, 1348354800, 1364515200, 1382828400 } @@ -1317,83 +1323,83 @@ zoneinfo64:table(nofallback) { finalRule { "Zion" } finalRaw:int { 7200 } finalYear:int { 2014 } - links:intvector { 280, 323, 530 } - } //Z#280 + links:intvector { 281, 324, 531 } + } //Z#281 /* Asia/Kabul */ :table { transPre32:intvector { -1, 1770429088 } trans:intvector { -788932800 } typeOffsets:intvector { 16608, 0, 14400, 0, 16200, 0 } typeMap:bin { "0102" } - } //Z#281 + } //Z#282 /* Asia/Kamchatka */ :table { trans:intvector { -1487759676, -1247569200, 354888000, 370695600, 386424000, 402231600, 417960000, 433767600, 449582400, 465314400, 481039200, 496764000, 512488800, 528213600, 543938400, 559663200, 575388000, 591112800, 606837600, 622562400, 638287200, 654616800, 670341600, 686070000, 695746800, 701791200, 717516000, 733240800, 748965600, 764690400, 780415200, 796140000, 811864800, 828194400, 846338400, 859644000, 877788000, 891093600, 909237600, 922543200, 941292000, 953992800, 972741600, 985442400, 1004191200, 1017496800, 1035640800, 1048946400, 1067090400, 1080396000, 1099144800, 1111845600, 1130594400, 1143295200, 1162044000, 1174744800, 1193493600, 1206799200, 1224943200, 1238248800, 1256392800, 1269698400, 1288450800, 1301151600 } typeOffsets:intvector { 38076, 0, 39600, 0, 39600, 3600, 43200, 0, 43200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" } - } //Z#282 + } //Z#283 /* Asia/Karachi */ :table { trans:intvector { -1988166492, -862637400, -764145000, -576135000, 1018119600, 1033840800, 1212260400, 1225476000, 1239735600, 1257012000 } typeOffsets:intvector { 16092, 0, 18000, 0, 18000, 3600, 19800, 0, 19800, 3600 } typeMap:bin { "03040301020102010201" } - links:intvector { 283, 548 } - } //Z#283 - /* Asia/Kashgar */ :int { 331 } //Z#284 + links:intvector { 284, 549 } + } //Z#284 + /* Asia/Kashgar */ :int { 332 } //Z#285 /* Asia/Kathmandu */ :table { trans:intvector { -1577943676, 504901800 } typeOffsets:intvector { 20476, 0, 19800, 0, 20700, 0 } typeMap:bin { "0102" } - links:intvector { 285, 286 } - } //Z#285 - /* Asia/Katmandu */ :int { 285 } //Z#286 + links:intvector { 286, 287 } + } //Z#286 + /* Asia/Katmandu */ :int { 286 } //Z#287 /* Asia/Khandyga */ :table { trans:intvector { -1579424533, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701802000, 717526800, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1072882800, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200, 1315832400, 1414252800 } typeOffsets:intvector { 32533, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403050605060506050605060506050605070503" } - } //Z#287 + } //Z#288 /* Asia/Kolkata */ :table { transPre32:intvector { -1, 649730088, -1, 1139272496 } trans:intvector { -2019705670, -891581400, -872058600, -862637400, -764145000 } typeOffsets:intvector { 21208, 0, 19270, 0, 19800, 0, 19800, 3600, 21200, 0 } typeMap:bin { "04010203020302" } - links:intvector { 257, 288, 516 } - } //Z#288 + links:intvector { 258, 289, 517 } + } //Z#289 /* Asia/Krasnoyarsk */ :table { trans:intvector { -1577513486, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288465200, 1301166000, 1414260000 } typeOffsets:intvector { 22286, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600, 28800, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#289 - /* Asia/Kuala_Lumpur */ :int { 317 } //Z#290 + } //Z#290 + /* Asia/Kuala_Lumpur */ :int { 318 } //Z#291 /* Asia/Kuching */ :table { trans:intvector { -1383463280, -1167636600, -1082448000, -1074586800, -1050825600, -1042964400, -1019289600, -1011428400, -987753600, -979892400, -956217600, -948356400, -924595200, -916734000, -893059200, -885198000, -879667200, -767005200 } typeOffsets:intvector { 26480, 0, 27000, 0, 28800, 0, 28800, 1200, 32400, 0 } typeMap:bin { "010203020302030203020302030203020402" } - links:intvector { 256, 291 } - } //Z#291 - /* Asia/Kuwait */ :int { 311 } //Z#292 - /* Asia/Macao */ :int { 294 } //Z#293 + links:intvector { 257, 292 } + } //Z#292 + /* Asia/Kuwait */ :int { 312 } //Z#293 + /* Asia/Macao */ :int { 295 } //Z#294 /* Asia/Macau */ :table { trans:intvector { -2056692850, -884509200, -873280800, -855918000, -841744800, -828529200, -765363600, -747046800, -733827600, -716461200, -697021200, -683715600, -667990800, -654771600, -636627600, -623322000, -605178000, -591872400, -573642000, -559818000, -541674000, -528368400, -510224400, -498128400, -478774800, -466678800, -446720400, -435229200, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132820200, -117088200, -101370600, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 } typeOffsets:intvector { 27250, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600 } typeMap:bin { "0103040304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 293, 294 } - } //Z#294 + links:intvector { 294, 295 } + } //Z#295 /* Asia/Magadan */ :table { trans:intvector { -1441188192, -1247565600, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701794800, 717519600, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1414245600, 1461427200 } typeOffsets:intvector { 36192, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" } - } //Z#295 + } //Z#296 /* Asia/Makassar */ :table { trans:intvector { -1172908656, -880272000, -766054800 } typeOffsets:intvector { 28656, 0, 28800, 0, 32400, 0 } typeMap:bin { "010201" } - links:intvector { 296, 328 } - } //Z#296 + links:intvector { 297, 329 } + } //Z#297 /* Asia/Manila */ :table { transPre32:intvector { -1, 350346264, -1, 2075884096 } trans:intvector { -1046678400, -1040115600, -885024000, -880016400, -783594000, -760093200, -496224000, -491562000, 228326400, 243702000, 643219200, 649177200 } typeOffsets:intvector { -57368, 0, 28800, 0, 28800, 3600, 29032, 0, 32400, 0 } typeMap:bin { "0301020102040201020102010201" } - } //Z#297 - /* Asia/Muscat */ :int { 267 } //Z#298 + } //Z#298 + /* Asia/Muscat */ :int { 268 } //Z#299 /* Asia/Nicosia */ :table { trans:intvector { -1518920008, 166572000, 182293200, 200959200, 213829200, 228866400, 243982800, 260316000, 276123600, 291765600, 307486800, 323820000, 338936400, 354664800, 370386000, 386114400, 401835600, 417564000, 433285200, 449013600, 465339600, 481068000, 496789200, 512517600, 528238800, 543967200, 559688400, 575416800, 591138000, 606866400, 622587600, 638316000, 654642000, 670370400, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 843944400, 859672800, 875394000, 891122400, 909277200, 922582800, 941331600 } typeOffsets:intvector { 8008, 0, 7200, 0, 7200, 3600 } @@ -1401,187 +1407,187 @@ zoneinfo64:table(nofallback) { finalRule { "EUAsia" } finalRaw:int { 7200 } finalYear:int { 2000 } - links:intvector { 299, 476 } - } //Z#299 + links:intvector { 300, 477 } + } //Z#300 /* Asia/Novokuznetsk */ :table { trans:intvector { -1441259328, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1035658800, 1048964400, 1067108400, 1080414000, 1099162800, 1111863600, 1130612400, 1143313200, 1162062000, 1174762800, 1193511600, 1206817200, 1224961200, 1238266800, 1256410800, 1269716400, 1288468800, 1301169600 } typeOffsets:intvector { 20928, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040304030403040304030403020103" } - } //Z#300 + } //Z#301 /* Asia/Novosibirsk */ :table { trans:intvector { -1579476700, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 738086400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600, 1414263600, 1469304000 } typeOffsets:intvector { 19900, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#301 + } //Z#302 /* Asia/Omsk */ :table { trans:intvector { -1582088010, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600, 695768400, 701812800, 717537600, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600, 1414263600 } typeOffsets:intvector { 17610, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600, 25200, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#302 + } //Z#303 /* Asia/Oral */ :table { trans:intvector { -1441164324, -1247540400, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622591200, 638316000, 654645600, 670370400, 686095200, 695772000, 701816400, 717544800, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600 } typeOffsets:intvector { 12324, 0, 10800, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010405060504050405040504050405040504030203020302040302030203020302030203020302030203020302030203020304" } - } //Z#303 - /* Asia/Phnom_Penh */ :int { 252 } //Z#304 + } //Z#304 + /* Asia/Phnom_Penh */ :int { 253 } //Z#305 /* Asia/Pontianak */ :table { trans:intvector { -1172906240, -881220600, -766054800, -683883000, -620812800, -189415800, 567964800 } typeOffsets:intvector { 26240, 0, 25200, 0, 27000, 0, 28800, 0, 32400, 0 } typeMap:bin { "02040203020301" } - } //Z#305 + } //Z#306 /* Asia/Pyongyang */ :table { trans:intvector { -1948782180, -1830414600, 1439564400, 1525446000 } typeOffsets:intvector { 30180, 0, 30600, 0, 32400, 0 } typeMap:bin { "01020102" } - } //Z#306 + } //Z#307 /* Asia/Qatar */ :table { trans:intvector { -1577935568, 76190400 } typeOffsets:intvector { 12368, 0, 10800, 0, 14400, 0 } typeMap:bin { "0201" } - links:intvector { 250, 307 } - } //Z#307 + links:intvector { 251, 308 } + } //Z#308 /* Asia/Qostanay */ :table { trans:intvector { -1441167268, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000, 1709229600 } typeOffsets:intvector { 15268, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "01030405040304030403040304030403040304030403020103040304030403040304030403040304030403040304030403040503" } - } //Z#308 + } //Z#309 /* Asia/Qyzylorda */ :table { trans:intvector { -1441167712, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695768400, 701812800, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000, 1545328800 } typeOffsets:intvector { 15712, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "01030405040304030403040304030403040304030403020305040304030403040304030403040304030403040304030403040503" } - } //Z#309 - /* Asia/Rangoon */ :int { 336 } //Z#310 + } //Z#310 + /* Asia/Rangoon */ :int { 337 } //Z#311 /* Asia/Riyadh */ :table { trans:intvector { -719636812 } typeOffsets:intvector { 11212, 0, 10800, 0 } typeMap:bin { "01" } - links:intvector { 236, 240, 292, 311 } - } //Z#311 - /* Asia/Saigon */ :int { 273 } //Z#312 + links:intvector { 237, 241, 293, 312 } + } //Z#312 + /* Asia/Saigon */ :int { 274 } //Z#313 /* Asia/Sakhalin */ :table { trans:intvector { -2031039048, -768560400, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701794800, 717519600, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 972748800, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200, 1414249200, 1459008000 } typeOffsets:intvector { 34248, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600 } typeMap:bin { "010405040504050405040504050405040504050405040302040504050405040504050403020302030203020302030203020302030203020302030203020302040204" } - } //Z#313 + } //Z#314 /* Asia/Samarkand */ :table { trans:intvector { -1441168073, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686091600 } typeOffsets:intvector { 16073, 0, 14400, 0, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010203040302030203020302030203020302030203020302" } - } //Z#314 + } //Z#315 /* Asia/Seoul */ :table { trans:intvector { -1948782472, -1830414600, -681210000, -672228000, -654771600, -640864800, -623408400, -609415200, -588848400, -577965600, -498128400, -462702600, -451733400, -429784200, -418296600, -399544200, -387451800, -368094600, -356002200, -336645000, -324552600, -305195400, -293103000, -264933000, 547578000, 560883600, 579027600, 592333200 } typeOffsets:intvector { 30472, 0, 30600, 0, 30600, 3600, 32400, 0, 32400, 3600 } typeMap:bin { "01030403040304030403010201020102010201020102010304030403" } - links:intvector { 315, 601 } - } //Z#315 + links:intvector { 316, 602 } + } //Z#316 /* Asia/Shanghai */ :table { transPre32:intvector { -1, 2117485353 } trans:intvector { -1600675200, -1585904400, -933667200, -922093200, -908870400, -888829200, -881049600, -767869200, -745833600, -733827600, -716889600, -699613200, -683884800, -670669200, -652348800, -650019600, 515527200, 527014800, 545162400, 558464400, 577216800, 589914000, 608666400, 621968400, 640116000, 653418000, 671565600, 684867600 } typeOffsets:intvector { 29143, 0, 28800, 0, 28800, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201" } - links:intvector { 260, 261, 271, 316, 385, 550 } - } //Z#316 + links:intvector { 261, 262, 272, 317, 386, 551 } + } //Z#317 /* Asia/Singapore */ :table { trans:intvector { -2038200925, -1167634800, -1073028000, -894180000, -879665400, -767005200, 378662400 } typeOffsets:intvector { 24925, 0, 25200, 0, 25200, 1200, 26400, 0, 27000, 0, 28800, 0, 32400, 0 } typeMap:bin { "01020304060405" } - links:intvector { 290, 317, 603 } - } //Z#317 + links:intvector { 291, 318, 604 } + } //Z#318 /* Asia/Srednekolymsk */ :table { trans:intvector { -1441188892, -1247565600, 354891600, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701794800, 717519600, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1414245600 } typeOffsets:intvector { 36892, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#318 + } //Z#319 /* Asia/Taipei */ :table { transPre32:intvector { -1, 1959718936 } trans:intvector { -1017820800, -766224000, -745833600, -733827600, -716889600, -699613200, -683884800, -670669200, -652348800, -639133200, -620812800, -607597200, -589276800, -576061200, -562924800, -541760400, -528710400, -510224400, -497174400, -478688400, -465638400, -449830800, -434016000, -418208400, -402480000, -386672400, -370944000, -355136400, -339408000, -323600400, -302515200, -291978000, -270979200, -260442000, 133977600, 149785200, 165513600, 181321200, 299606400, 307551600 } typeOffsets:intvector { 29160, 0, 28800, 0, 28800, 3600, 32400, 0 } typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 319, 600 } - } //Z#319 + links:intvector { 320, 601 } + } //Z#320 /* Asia/Tashkent */ :table { trans:intvector { -1441168631, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 670363200, 686091600 } typeOffsets:intvector { 16631, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 } typeMap:bin { "010304030403040304030403040304030403040304030201" } - } //Z#320 + } //Z#321 /* Asia/Tbilisi */ :table { trans:intvector { -1441162751, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701816400, 717537600, 733266000, 748987200, 764715600, 780436800, 796161600, 811882800, 828216000, 877806000, 891115200, 909255600, 922564800, 941310000, 954014400, 972759600, 985464000, 1004209200, 1017518400, 1035658800, 1048968000, 1067108400, 1080417600, 1088276400, 1099177200, 1111878000 } typeOffsets:intvector { 10751, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "0103040304030403040304030403040304030403040302010201020102030403040304030403040304030403040304020103" } - } //Z#321 + } //Z#322 /* Asia/Tehran */ :table { - trans:intvector { -1090466744, 227820600, 246223800, 259617600, 271108800, 283982400, 296598600, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600 } + trans:intvector { -1090466744, 227820600, 246223800, 259617600, 271108800, 279576000, 296598600, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600 } typeOffsets:intvector { 12344, 0, 12600, 0, 12600, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "01020304030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } - links:intvector { 322, 529 } - } //Z#322 - /* Asia/Tel_Aviv */ :int { 280 } //Z#323 - /* Asia/Thimbu */ :int { 325 } //Z#324 + links:intvector { 323, 530 } + } //Z#323 + /* Asia/Tel_Aviv */ :int { 281 } //Z#324 + /* Asia/Thimbu */ :int { 326 } //Z#325 /* Asia/Thimphu */ :table { trans:intvector { -706341516, 560025000 } typeOffsets:intvector { 21516, 0, 19800, 0, 21600, 0 } typeMap:bin { "0102" } - links:intvector { 324, 325 } - } //Z#325 + links:intvector { 325, 326 } + } //Z#326 /* Asia/Tokyo */ :table { transPre32:intvector { -1, 1707254896 } trans:intvector { -683802000, -672310800, -654771600, -640861200, -620298000, -609411600, -588848400, -577962000 } typeOffsets:intvector { 33539, 0, 32400, 0, 32400, 3600 } typeMap:bin { "010201020102010201" } - links:intvector { 326, 531, 533 } - } //Z#326 + links:intvector { 327, 532, 534 } + } //Z#327 /* Asia/Tomsk */ :table { trans:intvector { -1578807591, -1247551200, 354906000, 370713600, 386442000, 402249600, 417978000, 433785600, 449600400, 465332400, 481057200, 496782000, 512506800, 528231600, 543956400, 559681200, 575406000, 591130800, 606855600, 622580400, 638305200, 654634800, 670359600, 686088000, 695764800, 701809200, 717534000, 733258800, 748983600, 764708400, 780433200, 796158000, 811882800, 828212400, 846356400, 859662000, 877806000, 891111600, 909255600, 922561200, 941310000, 954010800, 972759600, 985460400, 1004209200, 1017514800, 1020193200, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1111867200, 1130616000, 1143316800, 1162065600, 1174766400, 1193515200, 1206820800, 1224964800, 1238270400, 1256414400, 1269720000, 1288468800, 1301169600, 1414263600, 1464465600 } typeOffsets:intvector { 20391, 0, 21600, 0, 21600, 3600, 25200, 0, 25200, 3600 } typeMap:bin { "01030403040304030403040304030403040304030403020103040304030403040304030403040304030403040304020102010201020102010201020102010201030103" } - } //Z#327 - /* Asia/Ujung_Pandang */ :int { 296 } //Z#328 + } //Z#328 + /* Asia/Ujung_Pandang */ :int { 297 } //Z#329 /* Asia/Ulaanbaatar */ :table { trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200, 1427479200, 1443193200, 1458928800, 1474642800 } typeOffsets:intvector { 25652, 0, 25200, 0, 28800, 0, 28800, 3600 } typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - links:intvector { 259, 329, 330 } - } //Z#329 - /* Asia/Ulan_Bator */ :int { 329 } //Z#330 + links:intvector { 260, 330, 331 } + } //Z#330 + /* Asia/Ulan_Bator */ :int { 330 } //Z#331 /* Asia/Urumqi */ :table { trans:intvector { -1325483420 } typeOffsets:intvector { 21020, 0, 21600, 0 } typeMap:bin { "01" } - links:intvector { 284, 331 } - } //Z#331 + links:intvector { 285, 332 } + } //Z#332 /* Asia/Ust-Nera */ :table { trans:intvector { -1579426374, -1247558400, 354898800, 370699200, 386427600, 402235200, 417963600, 433771200, 449586000, 465318000, 481042800, 496767600, 512492400, 528217200, 543942000, 559666800, 575391600, 591116400, 606841200, 622566000, 638290800, 654620400, 670345200, 686073600, 695750400, 701794800, 717519600, 733244400, 748969200, 764694000, 780418800, 796143600, 811868400, 828198000, 846342000, 859647600, 877791600, 891097200, 909241200, 922546800, 941295600, 953996400, 972745200, 985446000, 1004194800, 1017500400, 1035644400, 1048950000, 1067094000, 1080399600, 1099148400, 1111849200, 1130598000, 1143298800, 1162047600, 1174748400, 1193497200, 1206802800, 1224946800, 1238252400, 1256396400, 1269702000, 1288450800, 1301151600, 1315828800, 1414249200 } typeOffsets:intvector { 34374, 0, 28800, 0, 32400, 0, 36000, 0, 36000, 3600, 39600, 0, 39600, 3600, 43200, 0 } typeMap:bin { "010206050605060506050605060506050605060506050403050605060506050605060506050605060506050605060506050605060506050605060506050605070503" } - } //Z#332 - /* Asia/Vientiane */ :int { 252 } //Z#333 + } //Z#333 + /* Asia/Vientiane */ :int { 253 } //Z#334 /* Asia/Vladivostok */ :table { trans:intvector { -1487321251, -1247562000, 354895200, 370702800, 386431200, 402238800, 417967200, 433774800, 449589600, 465321600, 481046400, 496771200, 512496000, 528220800, 543945600, 559670400, 575395200, 591120000, 606844800, 622569600, 638294400, 654624000, 670348800, 686077200, 695754000, 701798400, 717523200, 733248000, 748972800, 764697600, 780422400, 796147200, 811872000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 972748800, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143302400, 1162051200, 1174752000, 1193500800, 1206806400, 1224950400, 1238256000, 1256400000, 1269705600, 1288454400, 1301155200, 1414249200 } typeOffsets:intvector { 31651, 0, 32400, 0, 32400, 3600, 36000, 0, 36000, 3600, 39600, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#334 + } //Z#335 /* Asia/Yakutsk */ :table { trans:intvector { -1579423138, -1247558400, 354898800, 370706400, 386434800, 402242400, 417970800, 433778400, 449593200, 465325200, 481050000, 496774800, 512499600, 528224400, 543949200, 559674000, 575398800, 591123600, 606848400, 622573200, 638298000, 654627600, 670352400, 686080800, 695757600, 701802000, 717526800, 733251600, 748976400, 764701200, 780426000, 796150800, 811875600, 828205200, 846349200, 859654800, 877798800, 891104400, 909248400, 922554000, 941302800, 954003600, 972752400, 985453200, 1004202000, 1017507600, 1035651600, 1048957200, 1067101200, 1080406800, 1099155600, 1111856400, 1130605200, 1143306000, 1162054800, 1174755600, 1193504400, 1206810000, 1224954000, 1238259600, 1256403600, 1269709200, 1288458000, 1301158800, 1414252800 } typeOffsets:intvector { 31138, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600, 36000, 0 } typeMap:bin { "0103040304030403040304030403040304030403040302010304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#335 + } //Z#336 /* Asia/Yangon */ :table { trans:intvector { -1577946287, -873268200, -778410000 } typeOffsets:intvector { 23087, 0, 23400, 0, 32400, 0 } typeMap:bin { "010201" } - links:intvector { 310, 336, 521 } - } //Z#336 + links:intvector { 311, 337, 522 } + } //Z#337 /* Asia/Yekaterinburg */ :table { trans:intvector { -1688270553, -1592610305, -1247544000, 354913200, 370720800, 386449200, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 695772000, 701816400, 717541200, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000, 1111870800, 1130619600, 1143320400, 1162069200, 1174770000, 1193518800, 1206824400, 1224968400, 1238274000, 1256418000, 1269723600, 1288472400, 1301173200, 1414267200 } typeOffsets:intvector { 14553, 0, 13505, 0, 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 } typeMap:bin { "010204050405040504050405040504050405040504050403020405040504050405040504050405040504050405040504050405040504050405040504050405040604" } - } //Z#337 + } //Z#338 /* Asia/Yerevan */ :table { trans:intvector { -1441162680, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 686098800, 701823600, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1111874400, 1130623200, 1143324000, 1162072800, 1174773600, 1193522400, 1206828000, 1224972000, 1238277600, 1256421600, 1269727200, 1288476000, 1301176800, 1319925600 } typeOffsets:intvector { 10680, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "0103040304030403040304030403040304030403040302010201020102010203040304030403040304030403040304030403040304030403040304030403" } - links:intvector { 338, 543 } - } //Z#338 + links:intvector { 339, 544 } + } //Z#339 /* Atlantic/Azores */ :table { transPre32:intvector { -1, 1581063056 } trans:intvector { -1830376800, -1689548400, -1677794400, -1667426400, -1647730800, -1635890400, -1616194800, -1604354400, -1584658800, -1572732000, -1553036400, -1541196000, -1521500400, -1442444400, -1427670000, -1379286000, -1364770800, -1348441200, -1333321200, -1316386800, -1301266800, -1284332400, -1269817200, -1221433200, -1206918000, -1191193200, -1175468400, -1127689200, -1111964400, -1096844400, -1080514800, -1063580400, -1049065200, -1033340400, -1017615600, -1002495600, -986166000, -969231600, -950482800, -942015600, -922489200, -906937200, -891126000, -877302000, -873676800, -864000000, -857948400, -845852400, -842832000, -831340800, -825894000, -814402800, -810777600, -799891200, -794444400, -782953200, -779328000, -768441600, -762994800, -749084400, -733359600, -717624000, -701899200, -686174400, -670449600, -654724800, -639000000, -623275200, -607550400, -591825600, -575496000, -559771200, -544046400, -528321600, -512596800, -496872000, -481147200, -465422400, -449697600, -433972800, -417643200, -401918400, -386193600, -370468800, -354744000, -339019200, -323294400, -307569600, -291844800, -276120000, -260395200, -244670400, -228340800, -212616000, -196891200, -181166400, -165441600, -149716800, -133992000, -118267200, -102542400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 725421600, 733280400, 740278800, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1590,7 +1596,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { -3600 } finalYear:int { 1997 } - } //Z#339 + } //Z#340 /* Atlantic/Bermuda */ :table { trans:intvector { -1664307642, -1648932042, -1632080442, -1618692042, -1262281242, -882727200, -858538800, -845229600, -825879600, -814384800, -793825200, -782935200, -762375600, -713988000, -703710000, -681933600, -672865200, -650484000, -641415600, -618429600, -609966000, -586980000, -578516400, -555530400, -546462000, -429127200, -415825200, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 } typeOffsets:intvector { -15558, 0, -15558, 3600, -14400, 0, -14400, 3600 } @@ -1598,7 +1604,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -14400 } finalYear:int { 2008 } - } //Z#340 + } //Z#341 /* Atlantic/Canary */ :table { trans:intvector { -1509663504, -733874400, 323827200, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -3696, 0, -3600, 0, 0, 0, 0, 3600 } @@ -1606,13 +1612,13 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#341 + } //Z#342 /* Atlantic/Cape_Verde */ :table { trans:intvector { -1830376800, -862610400, -764118000, 186120000 } typeOffsets:intvector { -5644, 0, -7200, 0, -7200, 3600, -3600, 0 } typeMap:bin { "01020103" } - } //Z#342 - /* Atlantic/Faeroe */ :int { 344 } //Z#343 + } //Z#343 + /* Atlantic/Faeroe */ :int { 345 } //Z#344 /* Atlantic/Faroe */ :table { trans:intvector { -1955748776, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -1624, 0, 0, 0, 0, 3600 } @@ -1620,9 +1626,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 343, 344 } - } //Z#344 - /* Atlantic/Jan_Mayen */ :int { 447 } //Z#345 + links:intvector { 344, 345 } + } //Z#345 + /* Atlantic/Jan_Mayen */ :int { 448 } //Z#346 /* Atlantic/Madeira */ :table { trans:intvector { -1830380400, -1689552000, -1677798000, -1667430000, -1647734400, -1635894000, -1616198400, -1604358000, -1584662400, -1572735600, -1553040000, -1541199600, -1521504000, -1442448000, -1427673600, -1379289600, -1364774400, -1348444800, -1333324800, -1316390400, -1301270400, -1284336000, -1269820800, -1221436800, -1206921600, -1191196800, -1175472000, -1127692800, -1111968000, -1096848000, -1080518400, -1063584000, -1049068800, -1033344000, -1017619200, -1002499200, -986169600, -969235200, -950486400, -942019200, -922492800, -906940800, -891129600, -877305600, -873680400, -864003600, -857952000, -845856000, -842835600, -831344400, -825897600, -814406400, -810781200, -799894800, -794448000, -782956800, -779331600, -768445200, -762998400, -749088000, -733363200, -717627600, -701902800, -686178000, -670453200, -654728400, -639003600, -623278800, -607554000, -591829200, -575499600, -559774800, -544050000, -528325200, -512600400, -496875600, -481150800, -465426000, -449701200, -433976400, -417646800, -401922000, -386197200, -370472400, -354747600, -339022800, -323298000, -307573200, -291848400, -276123600, -260398800, -244674000, -228344400, -212619600, -196894800, -181170000, -165445200, -149720400, -133995600, -118270800, -102546000, 386726400, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -4056, 0, -3600, 0, -3600, 3600, -3600, 7200, 0, 0, 0, 3600 } @@ -1630,20 +1636,20 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#346 - /* Atlantic/Reykjavik */ :int { 5 } //Z#347 + } //Z#347 + /* Atlantic/Reykjavik */ :int { 5 } //Z#348 /* Atlantic/South_Georgia */ :table { transPre32:intvector { -1, 1770454464 } typeOffsets:intvector { -8768, 0, -7200, 0 } typeMap:bin { "01" } - } //Z#348 - /* Atlantic/St_Helena */ :int { 5 } //Z#349 + } //Z#349 + /* Atlantic/St_Helena */ :int { 5 } //Z#350 /* Atlantic/Stanley */ :table { trans:intvector { -1824235716, -1018209600, -1003093200, -986760000, -971643600, -954705600, -939589200, -923256000, -908139600, -891806400, -876690000, -860356800, -852066000, 420609600, 433306800, 452052000, 464151600, 483501600, 495601200, 514350000, 527054400, 545799600, 558504000, 577249200, 589953600, 608698800, 621403200, 640753200, 652852800, 672202800, 684907200, 703652400, 716356800, 735102000, 747806400, 766551600, 779256000, 798001200, 810705600, 830055600, 842760000, 861505200, 874209600, 892954800, 905659200, 924404400, 937108800, 955854000, 968558400, 987310800, 999410400, 1019365200, 1030860000, 1050814800, 1062914400, 1082264400, 1094364000, 1113714000, 1125813600, 1145163600, 1157263200, 1176613200, 1188712800, 1208667600, 1220767200, 1240117200, 1252216800, 1271566800, 1283666400 } typeOffsets:intvector { -13884, 0, -14400, 0, -14400, 3600, -10800, 0, -10800, 3600 } typeMap:bin { "010201020102010201020102010304030403020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103" } - } //Z#350 - /* Australia/ACT */ :int { 369 } //Z#351 + } //Z#351 + /* Australia/ACT */ :int { 370 } //Z#352 /* Australia/Adelaide */ :table { transPre32:intvector { -1, 1930857236, -1, 2064778096 } trans:intvector { -1672558200, -1665387000, -883639800, -876123000, -860398200, -844673400, -828343800, -813223800, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 384280200, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 637691400, 657045000, 667931400, 688494600, 701195400, 719944200, 731435400, 751998600, 764094600, 783448200, 796149000, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 } @@ -1652,15 +1658,15 @@ zoneinfo64:table(nofallback) { finalRule { "AS" } finalRaw:int { 34200 } finalYear:int { 2009 } - links:intvector { 352, 368 } - } //Z#352 + links:intvector { 353, 369 } + } //Z#353 /* Australia/Brisbane */ :table { transPre32:intvector { -1, 1928175368 } trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200 } typeOffsets:intvector { 36728, 0, 36000, 0, 36000, 3600 } typeMap:bin { "0102010201020102010201020102010201" } - links:intvector { 353, 367 } - } //Z#353 + links:intvector { 354, 368 } + } //Z#354 /* Australia/Broken_Hill */ :table { transPre32:intvector { -1, 1930856548, -1, 1980016096, -1, 2064778096 } trans:intvector { -1672558200, -1665387000, -883639800, -876123000, -860398200, -844673400, -828343800, -813223800, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 386699400, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 636481800, 657045000, 667931400, 688494600, 699381000, 719944200, 731435400, 751998600, 762885000, 783448200, 794334600, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 } @@ -1669,23 +1675,23 @@ zoneinfo64:table(nofallback) { finalRule { "AS" } finalRaw:int { 34200 } finalYear:int { 2009 } - links:intvector { 354, 373 } - } //Z#354 - /* Australia/Canberra */ :int { 369 } //Z#355 - /* Australia/Currie */ :int { 359 } //Z#356 + links:intvector { 355, 374 } + } //Z#355 + /* Australia/Canberra */ :int { 370 } //Z#356 + /* Australia/Currie */ :int { 360 } //Z#357 /* Australia/Darwin */ :table { transPre32:intvector { -1, 1930859096, -1, 2064778096 } trans:intvector { -1672558200, -1665387000, -883639800, -876123000, -860398200, -844673400, -828343800, -813223800 } typeOffsets:intvector { 31400, 0, 32400, 0, 34200, 0, 34200, 3600 } typeMap:bin { "01020302030203020302" } - links:intvector { 0, 357, 365 } - } //Z#357 + links:intvector { 0, 358, 366 } + } //Z#358 /* Australia/Eucla */ :table { transPre32:intvector { -1, 1957038768 } trans:intvector { -1672555500, -1665384300, -883637100, -876120300, -860395500, -844670700, 152039700, 162926100, 436295700, 447182100, 690311700, 699383700, 1165079700, 1174756500, 1193505300, 1206810900, 1224954900, 1238260500 } typeOffsets:intvector { 30928, 0, 31500, 0, 31500, 3600 } typeMap:bin { "01020102010201020102010201020102010201" } - } //Z#358 + } //Z#359 /* Australia/Hobart */ :table { transPre32:intvector { -1, 1949171940 } trans:intvector { -1680508800, -1665388800, -1646640000, -1635753600, -1615190400, -1604304000, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000 } @@ -1694,15 +1700,15 @@ zoneinfo64:table(nofallback) { finalRule { "AT" } finalRaw:int { 36000 } finalYear:int { 2009 } - links:intvector { 356, 359, 370 } - } //Z#359 - /* Australia/LHI */ :int { 362 } //Z#360 + links:intvector { 357, 360, 371 } + } //Z#360 + /* Australia/LHI */ :int { 363 } //Z#361 /* Australia/Lindeman */ :table { transPre32:intvector { -1, 1928176340 } trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200 } typeOffsets:intvector { 35756, 0, 36000, 0, 36000, 3600 } typeMap:bin { "010201020102010201020102010201020102010201" } - } //Z#361 + } //Z#362 /* Australia/Lord_Howe */ :table { transPre32:intvector { -1, 1930852316 } trans:intvector { 352216800, 372785400, 384273000, 404839800, 415722600, 436289400, 447172200, 467739000, 478621800, 499188600, 511282800, 530033400, 542732400, 562087800, 574786800, 594142200, 606236400, 625591800, 636476400, 657041400, 667926000, 688491000, 699375600, 719940600, 731430000, 751995000, 762879600, 783444600, 794329200, 814894200, 828198000, 846343800, 859647600, 877793400, 891097200, 909243000, 922546800, 941297400, 953996400, 967303800, 985446000, 1004196600, 1017500400, 1035646200, 1048950000, 1067095800, 1080399600, 1099150200, 1111849200, 1130599800, 1143903600, 1162049400, 1174748400, 1193499000, 1207407600, 1223134200 } @@ -1711,8 +1717,8 @@ zoneinfo64:table(nofallback) { finalRule { "LH" } finalRaw:int { 37800 } finalYear:int { 2009 } - links:intvector { 360, 362 } - } //Z#362 + links:intvector { 361, 363 } + } //Z#363 /* Australia/Melbourne */ :table { transPre32:intvector { -1, 1930855704 } trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 384278400, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 561484800, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 796147200, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 } @@ -1721,19 +1727,19 @@ zoneinfo64:table(nofallback) { finalRule { "AV" } finalRaw:int { 36000 } finalYear:int { 2009 } - links:intvector { 363, 371 } - } //Z#363 - /* Australia/NSW */ :int { 369 } //Z#364 - /* Australia/North */ :int { 357 } //Z#365 + links:intvector { 364, 372 } + } //Z#364 + /* Australia/NSW */ :int { 370 } //Z#365 + /* Australia/North */ :int { 358 } //Z#366 /* Australia/Perth */ :table { transPre32:intvector { -1, 1957041892 } trans:intvector { -1672552800, -1665381600, -883634400, -876117600, -860392800, -844668000, 152042400, 162928800, 436298400, 447184800, 690314400, 699386400, 1165082400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200 } typeOffsets:intvector { 27804, 0, 28800, 0, 28800, 3600 } typeMap:bin { "01020102010201020102010201020102010201" } - links:intvector { 366, 372 } - } //Z#366 - /* Australia/Queensland */ :int { 353 } //Z#367 - /* Australia/South */ :int { 352 } //Z#368 + links:intvector { 367, 373 } + } //Z#367 + /* Australia/Queensland */ :int { 354 } //Z#368 + /* Australia/South */ :int { 353 } //Z#369 /* Australia/Sydney */ :table { transPre32:intvector { -1, 1930854204 } trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386697600, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 794332800, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 } @@ -1742,140 +1748,140 @@ zoneinfo64:table(nofallback) { finalRule { "AN" } finalRaw:int { 36000 } finalYear:int { 2009 } - links:intvector { 1, 351, 355, 364, 369 } - } //Z#369 - /* Australia/Tasmania */ :int { 359 } //Z#370 - /* Australia/Victoria */ :int { 363 } //Z#371 - /* Australia/West */ :int { 366 } //Z#372 - /* Australia/Yancowinna */ :int { 354 } //Z#373 - /* BET */ :int { 204 } //Z#374 - /* BST */ :int { 265 } //Z#375 - /* Brazil/Acre */ :int { 198 } //Z#376 - /* Brazil/DeNoronha */ :int { 177 } //Z#377 - /* Brazil/East */ :int { 204 } //Z#378 - /* Brazil/West */ :int { 157 } //Z#379 - /* CAT */ :int { 43 } //Z#380 - /* CET */ :int { 449 } //Z#381 - /* CNT */ :int { 209 } //Z#382 - /* CST */ :int { 98 } //Z#383 - /* CST6CDT */ :int { 98 } //Z#384 - /* CTT */ :int { 316 } //Z#385 - /* Canada/Atlantic */ :int { 129 } //Z#386 - /* Canada/Central */ :int { 224 } //Z#387 - /* Canada/East-Saskatchewan */ :int { 196 } //Z#388 - /* Canada/Eastern */ :int { 219 } //Z#389 - /* Canada/Mountain */ :int { 113 } //Z#390 - /* Canada/Newfoundland */ :int { 209 } //Z#391 - /* Canada/Pacific */ :int { 221 } //Z#392 - /* Canada/Saskatchewan */ :int { 196 } //Z#393 - /* Canada/Yukon */ :int { 223 } //Z#394 - /* Chile/Continental */ :int { 202 } //Z#395 - /* Chile/EasterIsland */ :int { 559 } //Z#396 - /* Cuba */ :int { 130 } //Z#397 - /* EAT */ :int { 48 } //Z#398 - /* ECT */ :int { 478 } //Z#399 - /* EET */ :int { 444 } //Z#400 - /* EST */ :int { 183 } //Z#401 - /* EST5EDT */ :int { 174 } //Z#402 - /* Egypt */ :int { 18 } //Z#403 - /* Eire */ :int { 455 } //Z#404 + links:intvector { 1, 352, 356, 365, 370 } + } //Z#370 + /* Australia/Tasmania */ :int { 360 } //Z#371 + /* Australia/Victoria */ :int { 364 } //Z#372 + /* Australia/West */ :int { 367 } //Z#373 + /* Australia/Yancowinna */ :int { 355 } //Z#374 + /* BET */ :int { 205 } //Z#375 + /* BST */ :int { 266 } //Z#376 + /* Brazil/Acre */ :int { 199 } //Z#377 + /* Brazil/DeNoronha */ :int { 178 } //Z#378 + /* Brazil/East */ :int { 205 } //Z#379 + /* Brazil/West */ :int { 158 } //Z#380 + /* CAT */ :int { 43 } //Z#381 + /* CET */ :int { 450 } //Z#382 + /* CNT */ :int { 210 } //Z#383 + /* CST */ :int { 98 } //Z#384 + /* CST6CDT */ :int { 98 } //Z#385 + /* CTT */ :int { 317 } //Z#386 + /* Canada/Atlantic */ :int { 130 } //Z#387 + /* Canada/Central */ :int { 225 } //Z#388 + /* Canada/East-Saskatchewan */ :int { 197 } //Z#389 + /* Canada/Eastern */ :int { 220 } //Z#390 + /* Canada/Mountain */ :int { 114 } //Z#391 + /* Canada/Newfoundland */ :int { 210 } //Z#392 + /* Canada/Pacific */ :int { 222 } //Z#393 + /* Canada/Saskatchewan */ :int { 197 } //Z#394 + /* Canada/Yukon */ :int { 224 } //Z#395 + /* Chile/Continental */ :int { 203 } //Z#396 + /* Chile/EasterIsland */ :int { 560 } //Z#397 + /* Cuba */ :int { 131 } //Z#398 + /* EAT */ :int { 48 } //Z#399 + /* ECT */ :int { 479 } //Z#400 + /* EET */ :int { 445 } //Z#401 + /* EST */ :int { 184 } //Z#402 + /* EST5EDT */ :int { 175 } //Z#403 + /* Egypt */ :int { 18 } //Z#404 + /* Eire */ :int { 456 } //Z#405 /* Etc/GMT */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 405, 406, 419, 434, 435, 508, 509, 510, 511, 512 } - } //Z#405 - /* Etc/GMT+0 */ :int { 405 } //Z#406 + links:intvector { 406, 407, 420, 435, 436, 509, 510, 511, 512, 513 } + } //Z#406 + /* Etc/GMT+0 */ :int { 406 } //Z#407 /* Etc/GMT+1 */ :table { typeOffsets:intvector { -3600, 0 } - } //Z#407 + } //Z#408 /* Etc/GMT+10 */ :table { typeOffsets:intvector { -36000, 0 } - } //Z#408 + } //Z#409 /* Etc/GMT+11 */ :table { typeOffsets:intvector { -39600, 0 } - } //Z#409 + } //Z#410 /* Etc/GMT+12 */ :table { typeOffsets:intvector { -43200, 0 } - } //Z#410 + } //Z#411 /* Etc/GMT+2 */ :table { typeOffsets:intvector { -7200, 0 } - } //Z#411 + } //Z#412 /* Etc/GMT+3 */ :table { typeOffsets:intvector { -10800, 0 } - } //Z#412 + } //Z#413 /* Etc/GMT+4 */ :table { typeOffsets:intvector { -14400, 0 } - } //Z#413 + } //Z#414 /* Etc/GMT+5 */ :table { typeOffsets:intvector { -18000, 0 } - } //Z#414 + } //Z#415 /* Etc/GMT+6 */ :table { typeOffsets:intvector { -21600, 0 } - } //Z#415 + } //Z#416 /* Etc/GMT+7 */ :table { typeOffsets:intvector { -25200, 0 } - } //Z#416 + } //Z#417 /* Etc/GMT+8 */ :table { typeOffsets:intvector { -28800, 0 } - } //Z#417 + } //Z#418 /* Etc/GMT+9 */ :table { typeOffsets:intvector { -32400, 0 } - } //Z#418 - /* Etc/GMT-0 */ :int { 405 } //Z#419 + } //Z#419 + /* Etc/GMT-0 */ :int { 406 } //Z#420 /* Etc/GMT-1 */ :table { typeOffsets:intvector { 3600, 0 } - } //Z#420 + } //Z#421 /* Etc/GMT-10 */ :table { typeOffsets:intvector { 36000, 0 } - } //Z#421 + } //Z#422 /* Etc/GMT-11 */ :table { typeOffsets:intvector { 39600, 0 } - } //Z#422 + } //Z#423 /* Etc/GMT-12 */ :table { typeOffsets:intvector { 43200, 0 } - } //Z#423 + } //Z#424 /* Etc/GMT-13 */ :table { typeOffsets:intvector { 46800, 0 } - } //Z#424 + } //Z#425 /* Etc/GMT-14 */ :table { typeOffsets:intvector { 50400, 0 } - } //Z#425 + } //Z#426 /* Etc/GMT-2 */ :table { typeOffsets:intvector { 7200, 0 } - } //Z#426 + } //Z#427 /* Etc/GMT-3 */ :table { typeOffsets:intvector { 10800, 0 } - } //Z#427 + } //Z#428 /* Etc/GMT-4 */ :table { typeOffsets:intvector { 14400, 0 } - } //Z#428 + } //Z#429 /* Etc/GMT-5 */ :table { typeOffsets:intvector { 18000, 0 } - } //Z#429 + } //Z#430 /* Etc/GMT-6 */ :table { typeOffsets:intvector { 21600, 0 } - } //Z#430 + } //Z#431 /* Etc/GMT-7 */ :table { typeOffsets:intvector { 25200, 0 } - } //Z#431 + } //Z#432 /* Etc/GMT-8 */ :table { typeOffsets:intvector { 28800, 0 } - } //Z#432 + } //Z#433 /* Etc/GMT-9 */ :table { typeOffsets:intvector { 32400, 0 } - } //Z#433 - /* Etc/GMT0 */ :int { 405 } //Z#434 - /* Etc/Greenwich */ :int { 405 } //Z#435 - /* Etc/UCT */ :int { 437 } //Z#436 + } //Z#434 + /* Etc/GMT0 */ :int { 406 } //Z#435 + /* Etc/Greenwich */ :int { 406 } //Z#436 + /* Etc/UCT */ :int { 438 } //Z#437 /* Etc/UTC */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 436, 437, 438, 440, 618, 632, 633, 637 } - } //Z#437 - /* Etc/Universal */ :int { 437 } //Z#438 + links:intvector { 437, 438, 439, 441, 619, 633, 634, 638 } + } //Z#438 + /* Etc/Universal */ :int { 438 } //Z#439 /* Etc/Unknown */ :table { typeOffsets:intvector { 0, 0 } - } //Z#439 - /* Etc/Zulu */ :int { 437 } //Z#440 - /* Europe/Amsterdam */ :int { 449 } //Z#441 + } //Z#440 + /* Etc/Zulu */ :int { 438 } //Z#441 + /* Europe/Amsterdam */ :int { 450 } //Z#442 /* Europe/Andorra */ :table { transPre32:intvector { -1, 2117514132 } trans:intvector { -733881600, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1884,12 +1890,12 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#442 + } //Z#443 /* Europe/Astrakhan */ :table { trans:intvector { -1441249932, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 701820000, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1459033200 } typeOffsets:intvector { 11532, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "01030403040304030403040304030403040302010201030201020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#443 + } //Z#444 /* Europe/Athens */ :table { trans:intvector { -1686101632, -1182996000, -1178161200, -906861600, -904878000, -857257200, -844477200, -828237600, -812422800, -552362400, -541652400, 166485600, 186184800, 198028800, 213753600, 228873600, 244080000, 260323200, 275446800, 291798000, 307407600, 323388000, 338936400, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 5692, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600 } @@ -1897,9 +1903,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - links:intvector { 400, 444 } - } //Z#444 - /* Europe/Belfast */ :int { 468 } //Z#445 + links:intvector { 401, 445 } + } //Z#445 + /* Europe/Belfast */ :int { 469 } //Z#446 /* Europe/Belgrade */ :table { transPre32:intvector { -1, 1581051976 } trans:intvector { -905824800, -857257200, -844556400, -828226800, -812502000, -796777200, -777942000, -766623600, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1908,8 +1914,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 446, 467, 479, 485, 488, 502 } - } //Z#446 + links:intvector { 447, 468, 480, 486, 489, 503 } + } //Z#447 /* Europe/Berlin */ :table { transPre32:intvector { -1, 1872912888 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -776563200, -765936000, -761180400, -748479600, -733273200, -717631200, -714610800, -710380800, -701910000, -684975600, -670460400, -654130800, -639010800, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1918,9 +1924,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 239, 345, 447, 454, 477, 490 } - } //Z#447 - /* Europe/Bratislava */ :int { 480 } //Z#448 + links:intvector { 240, 346, 448, 455, 478, 491 } + } //Z#448 + /* Europe/Bratislava */ :int { 481 } //Z#449 /* Europe/Brussels */ :table { transPre32:intvector { -1, 1843972096 } trans:intvector { -1740355200, -1693702800, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1613826000, -1604278800, -1585530000, -1574038800, -1552266000, -1539997200, -1520557200, -1507510800, -1490576400, -1473642000, -1459126800, -1444006800, -1427677200, -1411952400, -1396227600, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1191189600, -1175464800, -1160344800, -1143410400, -1127685600, -1111960800, -1096840800, -1080511200, -1063576800, -1049061600, -1033336800, -1017612000, -1002492000, -986162400, -969228000, -950479200, -942012000, -934668000, -857257200, -844556400, -828226800, -812502000, -798073200, -781052400, -766623600, -745455600, -733273200, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1929,8 +1935,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 381, 441, 449, 469, 536 } - } //Z#449 + links:intvector { 382, 442, 450, 470, 537 } + } //Z#450 /* Europe/Bucharest */ :table { trans:intvector { -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, 296604000, 307486800, 323816400, 338940000, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575424000, 591148800, 606873600, 622598400, 638323200, 654652800, 670370400, 686095200, 701820000, 717544800, 733269600, 748994400, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 } typeOffsets:intvector { 6264, 0, 7200, 0, 7200, 3600 } @@ -1938,7 +1944,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1998 } - } //Z#450 + } //Z#451 /* Europe/Budapest */ :table { transPre32:intvector { -1, 1796706716 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1600470000, -1587250800, -1569711600, -1555196400, -906775200, -857257200, -844556400, -828226800, -812502000, -796777200, -778471200, -762656400, -749689200, -733276800, -717634800, -701910000, -686185200, -670460400, -654130800, -639010800, -492656400, -481168800, -461199600, -449708400, -428540400, -418258800, -397090800, -386809200, 323823600, 338943600, 354668400, 370393200, 386118000, 401842800, 417567600, 433292400, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1947,8 +1953,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#451 - /* Europe/Busingen */ :int { 504 } //Z#452 + } //Z#452 + /* Europe/Busingen */ :int { 505 } //Z#453 /* Europe/Chisinau */ :table { transPre32:intvector { -1, 1454819576 } trans:intvector { -1637114100, -1213148664, -1187056800, -1175479200, -1159754400, -1144029600, -1127700000, -1111975200, -1096250400, -1080525600, -1064800800, -1049076000, -1033351200, -1017626400, -1001901600, -986176800, -970452000, -954727200, -927165600, -898138800, -857257200, -844556400, -828226800, -812502000, -800157600, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 641944800, 654652800, 670377600, 686102400, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859680000, 877824000 } @@ -1957,9 +1963,9 @@ zoneinfo64:table(nofallback) { finalRule { "Moldova" } finalRaw:int { 7200 } finalYear:int { 1998 } - links:intvector { 453, 493 } - } //Z#453 - /* Europe/Copenhagen */ :int { 447 } //Z#454 + links:intvector { 454, 494 } + } //Z#454 + /* Europe/Copenhagen */ :int { 448 } //Z#455 /* Europe/Dublin */ :table { trans:intvector { -1691962479, -1680471279, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -733356000, -719445600, -699487200, -684972000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, -386200800, -369266400, -354751200, -337816800, -323301600, -306972000, -291852000, -276732000, -257983200, -245282400, -226533600, -213228000, -195084000, -182383200, -163634400, -150933600, -132184800, -119484000, -100735200, -88034400, -68680800, -59004000, -37242000, 57722400, 69818400, 89172000, 101268000, 120621600, 132717600, 152071200, 164167200, 183520800, 196221600, 214970400, 227671200, 246420000, 259120800, 278474400, 290570400, 309924000, 322020000, 341373600, 354675600, 372819600, 386125200, 404269200, 417574800, 435718800, 449024400, 467773200, 481078800, 499222800, 512528400, 530672400, 543978000, 562122000, 575427600, 593571600, 606877200, 625626000, 638326800, 657075600, 670381200, 688525200, 701830800, 719974800, 733280400, 751424400, 764730000, 782874000, 796179600, 814323600, 828234000, 846378000 } typeOffsets:intvector { -1521, 0, -1521, 3600, 0, 0, 0, 3600, 3600, 0 } @@ -1967,8 +1973,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 404, 455 } - } //Z#455 + links:intvector { 405, 456 } + } //Z#456 /* Europe/Gibraltar */ :table { transPre32:intvector { -1, 1473317380 } trans:intvector { -1691964000, -1680472800, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -904518000, -896050800, -875487600, -864601200, -844038000, -832546800, -812588400, -798073200, -781052400, -772066800, -764805600, -748476000, -733356000, -719445600, -717030000, -706748400, -699487200, -687996000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -1977,8 +1983,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#456 - /* Europe/Guernsey */ :int { 468 } //Z#457 + } //Z#457 + /* Europe/Guernsey */ :int { 469 } //Z#458 /* Europe/Helsinki */ :table { trans:intvector { -1535938789, -875671200, -859773600, 354672000, 370396800, 386121600, 401846400, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 5989, 0, 7200, 0, 7200, 3600 } @@ -1986,29 +1992,29 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1997 } - links:intvector { 458, 472 } - } //Z#458 - /* Europe/Isle_of_Man */ :int { 468 } //Z#459 + links:intvector { 459, 473 } + } //Z#459 + /* Europe/Isle_of_Man */ :int { 469 } //Z#460 /* Europe/Istanbul */ :table { transPre32:intvector { -1, 1454819544 } trans:intvector { -1869875816, -1693706400, -1680490800, -1570413600, -1552186800, -1538359200, -1522551600, -1507514400, -1490583600, -1440208800, -1428030000, -1409709600, -1396494000, -931053600, -922676400, -917834400, -892436400, -875844000, -764737200, -744343200, -733806000, -716436000, -701924400, -684986400, -670474800, -654141600, -639025200, -622087200, -606970800, -590032800, -575521200, -235620000, -194842800, -177732000, -165726000, 107910000, 121215600, 133920000, 152665200, 164678400, 184114800, 196214400, 215564400, 228873600, 245804400, 260323200, 267915600, 428454000, 433893600, 468111600, 482799600, 496710000, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686098800, 701823600, 717548400, 733273200, 748998000, 764118000, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301274000, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396227600, 1414285200, 1427590800, 1446944400, 1459040400, 1473195600 } typeOffsets:intvector { 6952, 0, 7016, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030405040203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020304" } - links:intvector { 277, 460, 617 } - } //Z#460 - /* Europe/Jersey */ :int { 468 } //Z#461 + links:intvector { 278, 461, 618 } + } //Z#461 + /* Europe/Jersey */ :int { 469 } //Z#462 /* Europe/Kaliningrad */ :table { transPre32:intvector { -1, 1872911176 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -780372000, -778730400, -762663600, -749095200, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891129600, 909273600, 922579200, 941328000, 954028800, 972777600, 985478400, 1004227200, 1017532800, 1035676800, 1048982400, 1067126400, 1080432000, 1099180800, 1111881600, 1130630400, 1143331200, 1162080000, 1174780800, 1193529600, 1206835200, 1224979200, 1238284800, 1256428800, 1269734400, 1288483200, 1301184000, 1414278000 } typeOffsets:intvector { 4920, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } typeMap:bin { "0102010201020102010201020102030403050605060506050605060506050605060504030403040304030403040304030403040304030403040304030403040304030403040304030403040304030503" } - } //Z#462 - /* Europe/Kiev */ :int { 465 } //Z#463 + } //Z#463 + /* Europe/Kiev */ :int { 466 } //Z#464 /* Europe/Kirov */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 701820000, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 } typeOffsets:intvector { 11928, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "010304030403040304030403040304030403020102010302010201020102010201020102010201020102010201020102010201020102010201020102010301" } - } //Z#464 + } //Z#465 /* Europe/Kyiv */ :table { trans:intvector { -1441159324, -1247536800, -892522800, -857257200, -844556400, -828226800, -825382800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 646783200, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846378000, 859683600, 877827600 } typeOffsets:intvector { 7324, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } @@ -2016,8 +2022,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1998 } - links:intvector { 463, 465, 495, 503 } - } //Z#465 + links:intvector { 464, 466, 496, 504 } + } //Z#466 /* Europe/Lisbon */ :table { trans:intvector { -1830384000, -1689555600, -1677801600, -1667433600, -1647738000, -1635897600, -1616202000, -1604361600, -1584666000, -1572739200, -1553043600, -1541203200, -1521507600, -1442451600, -1427677200, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1221440400, -1206925200, -1191200400, -1175475600, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942022800, -922496400, -906944400, -891133200, -877309200, -873684000, -864007200, -857955600, -845859600, -842839200, -831348000, -825901200, -814410000, -810784800, -799898400, -794451600, -782960400, -779335200, -768448800, -763002000, -749091600, -733366800, -717631200, -701906400, -686181600, -670456800, -654732000, -639007200, -623282400, -607557600, -591832800, -575503200, -559778400, -544053600, -528328800, -512604000, -496879200, -481154400, -465429600, -449704800, -433980000, -417650400, -401925600, -386200800, -370476000, -354751200, -339026400, -323301600, -307576800, -291852000, -276127200, -260402400, -244677600, -228348000, -212623200, -196898400, -181173600, -165448800, -149724000, -133999200, -118274400, -102549600, 212544000, 228268800, 243993600, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { -2205, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 } @@ -2025,9 +2031,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 466, 599, 636 } - } //Z#466 - /* Europe/Ljubljana */ :int { 446 } //Z#467 + links:intvector { 467, 600, 637 } + } //Z#467 + /* Europe/Ljubljana */ :int { 447 } //Z#468 /* Europe/London */ :table { transPre32:intvector { -1, 442304971 } trans:intvector { -1691964000, -1680472800, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -904518000, -896050800, -875487600, -864601200, -844038000, -832546800, -812588400, -798073200, -781052400, -772066800, -764805600, -748476000, -733356000, -719445600, -717030000, -706748400, -699487200, -687996000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, -386200800, -369266400, -354751200, -337816800, -323301600, -306972000, -291852000, -276732000, -257983200, -245282400, -226533600, -213228000, -195084000, -182383200, -163634400, -150933600, -132184800, -119484000, -100735200, -88034400, -68680800, -59004000, -37242000, 57722400, 69818400, 89172000, 101268000, 120621600, 132717600, 152071200, 164167200, 183520800, 196221600, 214970400, 227671200, 246420000, 259120800, 278474400, 290570400, 309924000, 322020000, 341373600, 354675600, 372819600, 386125200, 404269200, 417574800, 435718800, 449024400, 467773200, 481078800, 499222800, 512528400, 530672400, 543978000, 562122000, 575427600, 593571600, 606877200, 625626000, 638326800, 657075600, 670381200, 688525200, 701830800, 719974800, 733280400, 751424400, 764730000, 782874000, 796179600, 814323600, 828234000, 846378000 } @@ -2036,9 +2042,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - links:intvector { 445, 457, 459, 461, 468, 506, 507 } - } //Z#468 - /* Europe/Luxembourg */ :int { 449 } //Z#469 + links:intvector { 446, 458, 460, 462, 469, 507, 508 } + } //Z#469 + /* Europe/Luxembourg */ :int { 450 } //Z#470 /* Europe/Madrid */ :table { transPre32:intvector { -1, 2117514496 } trans:intvector { -1631926800, -1616889600, -1601168400, -1585353600, -1442451600, -1427673600, -1379293200, -1364774400, -1348448400, -1333324800, -1316390400, -1301270400, -1284339600, -1269820800, -1026954000, -1017619200, -1001898000, -999482400, -986090400, -954115200, -940208400, -873079200, -862621200, -842839200, -828320400, -811389600, -796870800, -779940000, -765421200, -748490400, -733971600, -652327200, -639018000, 135122400, 150246000, 166572000, 181695600, 196812000, 212540400, 228866400, 243990000, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2047,7 +2053,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#470 + } //Z#471 /* Europe/Malta */ :table { transPre32:intvector { -1, 1891488612 } trans:intvector { -1690765200, -1680487200, -1664758800, -1648951200, -1635123600, -1616896800, -1604278800, -1585533600, -1571014800, -1555293600, -932432400, -857257200, -844556400, -828226800, -812588400, -798073200, -781052400, -766717200, -750898800, -733359600, -719456400, -701917200, -689209200, -670460400, -114051600, -103168800, -81997200, -71715600, -50547600, -40266000, -18493200, -8211600, 12956400, 23238000, 43801200, 54687600, 75855600, 86742000, 102380400, 118105200, 135730800, 148518000, 167187600, 180489600, 198637200, 211939200, 230086800, 243388800, 261536400, 274838400, 292986000, 306288000, 323312400, 338342400, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2056,23 +2062,23 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#471 - /* Europe/Mariehamn */ :int { 458 } //Z#472 + } //Z#472 + /* Europe/Mariehamn */ :int { 459 } //Z#473 /* Europe/Minsk */ :table { transPre32:intvector { -1, 1454819880 } trans:intvector { -1441158600, -1247536800, -899780400, -857257200, -844556400, -828226800, -812502000, -804650400, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 670374000, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891129600, 909273600, 922579200, 941328000, 954028800, 972777600, 985478400, 1004227200, 1017532800, 1035676800, 1048982400, 1067126400, 1080432000, 1099180800, 1111881600, 1130630400, 1143331200, 1162080000, 1174780800, 1193529600, 1206835200, 1224979200, 1238284800, 1256428800, 1269734400, 1288483200, 1301184000 } typeOffsets:intvector { 6616, 0, 3600, 0, 3600, 3600, 6600, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } typeMap:bin { "0304060201020102060706070607060706070607060706070607060504050405040504050405040504050405040504050405040504050405040504050405040504050406" } - } //Z#473 - /* Europe/Monaco */ :int { 478 } //Z#474 + } //Z#474 + /* Europe/Monaco */ :int { 479 } //Z#475 /* Europe/Moscow */ :table { trans:intvector { -1688265017, -1656819079, -1641353479, -1627965079, -1618716679, -1596429079, -1593820800, -1589860800, -1542427200, -1539493200, -1525323600, -1522728000, -1491188400, -1247536800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 701823600, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 } typeOffsets:intvector { 9017, 0, 7200, 0, 7200, 3600, 9079, 0, 9079, 3600, 9079, 7200, 10800, 0, 10800, 3600, 10800, 7200, 14400, 0 } typeMap:bin { "0304030504050706070807060106070607060706070607060706070607060706070602010607060706070607060706070607060706070607060706070607060706070607060706070607060906" } - links:intvector { 475, 635 } - } //Z#475 - /* Europe/Nicosia */ :int { 299 } //Z#476 - /* Europe/Oslo */ :int { 447 } //Z#477 + links:intvector { 476, 636 } + } //Z#476 + /* Europe/Nicosia */ :int { 300 } //Z#477 + /* Europe/Oslo */ :int { 448 } //Z#478 /* Europe/Paris */ :table { trans:intvector { -1855958961, -1689814800, -1680397200, -1665363600, -1648342800, -1635123600, -1616893200, -1604278800, -1585443600, -1574038800, -1552266000, -1539997200, -1520557200, -1507510800, -1490576400, -1470618000, -1459126800, -1444006800, -1427677200, -1411952400, -1396227600, -1379293200, -1364778000, -1348448400, -1333328400, -1316394000, -1301274000, -1284339600, -1269824400, -1253494800, -1238374800, -1221440400, -1206925200, -1191200400, -1175475600, -1160355600, -1143421200, -1127696400, -1111971600, -1096851600, -1080522000, -1063587600, -1049072400, -1033347600, -1017622800, -1002502800, -986173200, -969238800, -950490000, -942012000, -932436000, -857257200, -844556400, -828226800, -812502000, -800071200, -796266000, -781052400, -766623600, 196819200, 212540400, 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 561, 0, 0, 0, 0, 3600, 0, 7200, 3600, 0, 3600, 3600 } @@ -2080,9 +2086,9 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 399, 474, 478 } - } //Z#478 - /* Europe/Podgorica */ :int { 446 } //Z#479 + links:intvector { 400, 475, 479 } + } //Z#479 + /* Europe/Podgorica */ :int { 447 } //Z#480 /* Europe/Prague */ :table { transPre32:intvector { -1, 1825565432 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -765327600, -746578800, -733359600, -728517600, -721260000, -716425200, -701910000, -684975600, -670460400, -654217200, -639010800, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2091,8 +2097,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 448, 480 } - } //Z#480 + links:intvector { 449, 481 } + } //Z#481 /* Europe/Riga */ :table { trans:intvector { -1632008194, -1618702594, -1601681794, -1597275394, -1377308194, -928029600, -899521200, -857257200, -844556400, -828226800, -812502000, -796777200, -795834000, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 843955200, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 985482000, 1004230800 } typeOffsets:intvector { 5794, 0, 3600, 0, 3600, 3600, 5794, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } @@ -2100,7 +2106,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2002 } - } //Z#481 + } //Z#482 /* Europe/Rome */ :table { transPre32:intvector { -1, 1891402096 } trans:intvector { -1690765200, -1680487200, -1664758800, -1648951200, -1635123600, -1616896800, -1604278800, -1585533600, -1571014800, -1555293600, -932432400, -857257200, -844556400, -828226800, -812502000, -798073200, -781052400, -766717200, -750898800, -733359600, -719456400, -701917200, -689209200, -670460400, -114051600, -103168800, -81997200, -71715600, -50547600, -40266000, -18493200, -8211600, 12956400, 23238000, 43801200, 54687600, 75855600, 86742000, 107910000, 118191600, 138754800, 149641200, 170809200, 181090800, 202258800, 212540400, 233103600, 243990000, 265158000, 276044400, 296607600, 307494000, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2109,27 +2115,27 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 482, 484, 497 } - } //Z#482 + links:intvector { 483, 485, 498 } + } //Z#483 /* Europe/Samara */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 686102400, 687916800, 701820000, 717544800, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1111874400, 1130623200, 1143324000, 1162072800, 1174773600, 1193522400, 1206828000, 1224972000, 1238277600, 1256421600, 1269727200, 1288479600, 1301180400 } typeOffsets:intvector { 12020, 0, 7200, 3600, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "02040504050405040504050405040504050403020302010204050405040504050405040504050405040504050405040504050405040504050405040504030204" } - } //Z#483 - /* Europe/San_Marino */ :int { 482 } //Z#484 - /* Europe/Sarajevo */ :int { 446 } //Z#485 + } //Z#484 + /* Europe/San_Marino */ :int { 483 } //Z#485 + /* Europe/Sarajevo */ :int { 447 } //Z#486 /* Europe/Saratov */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 701820000, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1480806000 } typeOffsets:intvector { 11058, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "01030403040304030403040304030403020102010201030201020102010201020102010201020102010201020102010201020102010201020102010201030103" } - } //Z#486 + } //Z#487 /* Europe/Simferopol */ :table { transPre32:intvector { -1, 1454818312 } trans:intvector { -1441160160, -1247536800, -888894000, -857257200, -844556400, -828226800, -812502000, -811648800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 646786800, 701827200, 717552000, 733276800, 749001600, 764726400, 767739600, 780447600, 796172400, 811897200, 828219600, 846374400, 859683600, 877827600, 891133200, 909277200, 922582800, 941331600, 954032400, 972781200, 985482000, 1004230800, 1017536400, 1035680400, 1048986000, 1067130000, 1080435600, 1099184400, 1111885200, 1130634000, 1143334800, 1162083600, 1174784400, 1193533200, 1206838800, 1224982800, 1238288400, 1256432400, 1269738000, 1288486800, 1301187600, 1319936400, 1332637200, 1351386000, 1364691600, 1382835600, 1396137600, 1414274400 } typeOffsets:intvector { 8184, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 8160, 0, 10800, 0, 10800, 3600, 14400, 0 } typeMap:bin { "050306020102010206070607060706070607060706070607060706030403040304070607060706040304030403040304030403040304030403040304030403040304030403040304030806" } - } //Z#487 - /* Europe/Skopje */ :int { 446 } //Z#488 + } //Z#488 + /* Europe/Skopje */ :int { 447 } //Z#489 /* Europe/Sofia */ :table { transPre32:intvector { -1, 1454820900, -1, 1925440280 } trans:intvector { -857257200, -844556400, -828226800, -812502000, -796777200, -781048800, 291762000, 307576800, 323816400, 339026400, 355266000, 370393200, 386715600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575424000, 591148800, 606873600, 622598400, 638323200, 654652800, 670370400, 686091600, 701820000, 717541200, 733269600, 748990800, 764719200, 780440400, 796168800, 811890000, 828223200, 846363600, 859683600, 877827600 } @@ -2138,8 +2144,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 1998 } - } //Z#489 - /* Europe/Stockholm */ :int { 447 } //Z#490 + } //Z#490 + /* Europe/Stockholm */ :int { 448 } //Z#491 /* Europe/Tallinn */ :table { trans:intvector { -1638322740, -1632006000, -1618700400, -1593824400, -1535938740, -927943200, -892954800, -857257200, -844556400, -828226800, -812502000, -797652000, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891129600, 909277200, 922582800, 941331600, 1017536400, 1035680400 } typeOffsets:intvector { 5940, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600 } @@ -2147,7 +2153,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2003 } - } //Z#491 + } //Z#492 /* Europe/Tirane */ :table { trans:intvector { -1767230360, -932346000, -857257200, -844556400, -843519600, 136854000, 149896800, 168130800, 181432800, 199839600, 213141600, 231894000, 244591200, 263257200, 276040800, 294706800, 307490400, 326156400, 339458400, 357087600, 370389600, 389142000, 402444000, 419468400, 433807200, 449622000, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 4760, 0, 3600, 0, 3600, 3600 } @@ -2155,16 +2161,16 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#492 - /* Europe/Tiraspol */ :int { 453 } //Z#493 + } //Z#493 + /* Europe/Tiraspol */ :int { 454 } //Z#494 /* Europe/Ulyanovsk */ :table { trans:intvector { -1593820800, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 701823600, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1459033200 } typeOffsets:intvector { 11616, 0, 7200, 0, 7200, 3600, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "030506050605060506050605060506050605040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050305" } - } //Z#494 - /* Europe/Uzhgorod */ :int { 465 } //Z#495 - /* Europe/Vaduz */ :int { 504 } //Z#496 - /* Europe/Vatican */ :int { 482 } //Z#497 + } //Z#495 + /* Europe/Uzhgorod */ :int { 466 } //Z#496 + /* Europe/Vaduz */ :int { 505 } //Z#497 + /* Europe/Vatican */ :int { 483 } //Z#498 /* Europe/Vienna */ :table { transPre32:intvector { -1, 1872912175 } trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1569711600, -1555801200, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -780188400, -748479600, -733273200, -717634800, -701910000, -684975600, -670460400, 323823600, 338940000, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2173,7 +2179,7 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - } //Z#498 + } //Z#499 /* Europe/Vilnius */ :table { transPre32:intvector { -1, 1454820420 } trans:intvector { -1672536240, -1585100136, -1561251600, -1553565600, -928198800, -900126000, -857257200, -844556400, -828226800, -812502000, -802144800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622598400, 638323200, 654652800, 670377600, 686102400, 701827200, 717552000, 733276800, 749001600, 764726400, 780451200, 796176000, 811900800, 828230400, 846374400, 859680000, 877824000, 891133200, 909277200, 922582800, 941331600, 1048986000, 1067130000 } @@ -2182,12 +2188,12 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 7200 } finalYear:int { 2004 } - } //Z#499 + } //Z#500 /* Europe/Volgograd */ :table { trans:intvector { -1577761060, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 701820000, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1540681200, 1609020000 } typeOffsets:intvector { 10660, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 } typeMap:bin { "0103040304030403040304030403040302010201020103020102010201020102010201020102010201020102010201020102010201020102010201020103010301" } - } //Z#500 + } //Z#501 /* Europe/Warsaw */ :table { trans:intvector { -1717032240, -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1600473600, -1587168000, -1501725600, -931734000, -857257200, -844556400, -828226800, -812502000, -796608000, -778726800, -762660000, -748486800, -733273200, -715215600, -701910000, -684975600, -670460400, -654130800, -639010800, -397094400, -386812800, -371088000, -355363200, -334195200, -323308800, -307584000, -291859200, -271296000, -260409600, -239846400, -228960000, -208396800, -197510400, -176342400, -166060800, 228873600, 243993600, 260323200, 276048000, 291772800, 307497600, 323827200, 338947200, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 5040, 0, 3600, 0, 3600, 3600, 7200, 0, 7200, 3600 } @@ -2195,10 +2201,10 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 501, 598 } - } //Z#501 - /* Europe/Zagreb */ :int { 446 } //Z#502 - /* Europe/Zaporozhye */ :int { 465 } //Z#503 + links:intvector { 502, 599 } + } //Z#502 + /* Europe/Zagreb */ :int { 447 } //Z#503 + /* Europe/Zaporozhye */ :int { 466 } //Z#504 /* Europe/Zurich */ :table { transPre32:intvector { -1, 619768448, -1, 1909720710 } trans:intvector { -904435200, -891129600, -872985600, -859680000, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } @@ -2207,79 +2213,79 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 3600 } finalYear:int { 1997 } - links:intvector { 452, 496, 504 } - } //Z#504 + links:intvector { 453, 497, 505 } + } //Z#505 /* Factory */ :table { typeOffsets:intvector { 0, 0 } - } //Z#505 - /* GB */ :int { 468 } //Z#506 - /* GB-Eire */ :int { 468 } //Z#507 - /* GMT */ :int { 405 } //Z#508 - /* GMT+0 */ :int { 405 } //Z#509 - /* GMT-0 */ :int { 405 } //Z#510 - /* GMT0 */ :int { 405 } //Z#511 - /* Greenwich */ :int { 405 } //Z#512 - /* HST */ :int { 569 } //Z#513 - /* Hongkong */ :int { 274 } //Z#514 - /* IET */ :int { 132 } //Z#515 - /* IST */ :int { 288 } //Z#516 - /* Iceland */ :int { 5 } //Z#517 - /* Indian/Antananarivo */ :int { 48 } //Z#518 + } //Z#506 + /* GB */ :int { 469 } //Z#507 + /* GB-Eire */ :int { 469 } //Z#508 + /* GMT */ :int { 406 } //Z#509 + /* GMT+0 */ :int { 406 } //Z#510 + /* GMT-0 */ :int { 406 } //Z#511 + /* GMT0 */ :int { 406 } //Z#512 + /* Greenwich */ :int { 406 } //Z#513 + /* HST */ :int { 570 } //Z#514 + /* Hongkong */ :int { 275 } //Z#515 + /* IET */ :int { 133 } //Z#516 + /* IST */ :int { 289 } //Z#517 + /* Iceland */ :int { 5 } //Z#518 + /* Indian/Antananarivo */ :int { 48 } //Z#519 /* Indian/Chagos */ :table { trans:intvector { -1988167780, 820436400 } typeOffsets:intvector { 17380, 0, 18000, 0, 21600, 0 } typeMap:bin { "0102" } - } //Z#519 - /* Indian/Christmas */ :int { 252 } //Z#520 - /* Indian/Cocos */ :int { 336 } //Z#521 - /* Indian/Comoro */ :int { 48 } //Z#522 - /* Indian/Kerguelen */ :int { 525 } //Z#523 - /* Indian/Mahe */ :int { 267 } //Z#524 + } //Z#520 + /* Indian/Christmas */ :int { 253 } //Z#521 + /* Indian/Cocos */ :int { 337 } //Z#522 + /* Indian/Comoro */ :int { 48 } //Z#523 + /* Indian/Kerguelen */ :int { 526 } //Z#524 + /* Indian/Mahe */ :int { 268 } //Z#525 /* Indian/Maldives */ :table { trans:intvector { -315636840 } typeOffsets:intvector { 17640, 0, 18000, 0 } typeMap:bin { "01" } - links:intvector { 523, 525 } - } //Z#525 + links:intvector { 524, 526 } + } //Z#526 /* Indian/Mauritius */ :table { trans:intvector { -1988164200, 403041600, 417034800, 1224972000, 1238274000 } typeOffsets:intvector { 13800, 0, 14400, 0, 14400, 3600 } typeMap:bin { "0102010201" } - } //Z#526 - /* Indian/Mayotte */ :int { 48 } //Z#527 - /* Indian/Reunion */ :int { 267 } //Z#528 - /* Iran */ :int { 322 } //Z#529 - /* Israel */ :int { 280 } //Z#530 - /* JST */ :int { 326 } //Z#531 - /* Jamaica */ :int { 143 } //Z#532 - /* Japan */ :int { 326 } //Z#533 - /* Kwajalein */ :int { 574 } //Z#534 - /* Libya */ :int { 56 } //Z#535 - /* MET */ :int { 449 } //Z#536 - /* MIT */ :int { 554 } //Z#537 - /* MST */ :int { 186 } //Z#538 - /* MST7MDT */ :int { 110 } //Z#539 - /* Mexico/BajaNorte */ :int { 218 } //Z#540 - /* Mexico/BajaSur */ :int { 161 } //Z#541 - /* Mexico/General */ :int { 166 } //Z#542 - /* NET */ :int { 338 } //Z#543 - /* NST */ :int { 555 } //Z#544 - /* NZ */ :int { 555 } //Z#545 - /* NZ-CHAT */ :int { 557 } //Z#546 - /* Navajo */ :int { 110 } //Z#547 - /* PLT */ :int { 283 } //Z#548 - /* PNT */ :int { 186 } //Z#549 - /* PRC */ :int { 316 } //Z#550 - /* PRT */ :int { 191 } //Z#551 - /* PST */ :int { 152 } //Z#552 - /* PST8PDT */ :int { 152 } //Z#553 + } //Z#527 + /* Indian/Mayotte */ :int { 48 } //Z#528 + /* Indian/Reunion */ :int { 268 } //Z#529 + /* Iran */ :int { 323 } //Z#530 + /* Israel */ :int { 281 } //Z#531 + /* JST */ :int { 327 } //Z#532 + /* Jamaica */ :int { 144 } //Z#533 + /* Japan */ :int { 327 } //Z#534 + /* Kwajalein */ :int { 575 } //Z#535 + /* Libya */ :int { 56 } //Z#536 + /* MET */ :int { 450 } //Z#537 + /* MIT */ :int { 555 } //Z#538 + /* MST */ :int { 187 } //Z#539 + /* MST7MDT */ :int { 111 } //Z#540 + /* Mexico/BajaNorte */ :int { 219 } //Z#541 + /* Mexico/BajaSur */ :int { 162 } //Z#542 + /* Mexico/General */ :int { 167 } //Z#543 + /* NET */ :int { 339 } //Z#544 + /* NST */ :int { 556 } //Z#545 + /* NZ */ :int { 556 } //Z#546 + /* NZ-CHAT */ :int { 558 } //Z#547 + /* Navajo */ :int { 111 } //Z#548 + /* PLT */ :int { 284 } //Z#549 + /* PNT */ :int { 187 } //Z#550 + /* PRC */ :int { 317 } //Z#551 + /* PRT */ :int { 192 } //Z#552 + /* PST */ :int { 153 } //Z#553 + /* PST8PDT */ :int { 153 } //Z#554 /* Pacific/Apia */ :table { transPre32:intvector { -1, 1849542912 } trans:intvector { -1861878784, -631110600, 1285498800, 1301752800, 1316872800, 1325239200, 1333202400, 1348927200, 1365256800, 1380376800, 1396706400, 1411826400, 1428156000, 1443276000, 1459605600, 1474725600, 1491055200, 1506175200, 1522504800, 1538229600, 1554559200, 1569679200, 1586008800, 1601128800, 1617458400 } typeOffsets:intvector { 45184, 0, -41400, 0, -41216, 0, -39600, 0, -39600, 3600, 46800, 0, 46800, 3600 } typeMap:bin { "0201030403040605060506050605060506050605060506050605" } - links:intvector { 537, 554 } - } //Z#554 + links:intvector { 538, 555 } + } //Z#555 /* Pacific/Auckland */ :table { transPre32:intvector { -1, 1102531752 } trans:intvector { -1330335000, -1320057000, -1300699800, -1287396000, -1269250200, -1255946400, -1237800600, -1224496800, -1206351000, -1192442400, -1174901400, -1160992800, -1143451800, -1125914400, -1112607000, -1094464800, -1081157400, -1063015200, -1049707800, -1031565600, -1018258200, -1000116000, -986808600, -968061600, -955359000, -936612000, -923304600, -757425600, 152632800, 162309600, 183477600, 194968800, 215532000, 226418400, 246981600, 257868000, 278431200, 289317600, 309880800, 320767200, 341330400, 352216800, 372780000, 384271200, 404834400, 415720800, 436284000, 447170400, 467733600, 478620000, 499183200, 510069600, 530632800, 541519200, 562082400, 573573600, 594136800, 605023200, 623772000, 637682400, 655221600, 669132000, 686671200, 700581600, 718120800, 732636000, 749570400, 764085600, 781020000, 795535200, 812469600, 826984800, 844524000, 858434400, 875973600, 889884000, 907423200, 921938400, 938872800, 953388000, 970322400, 984837600, 1002376800, 1016287200, 1033826400, 1047736800, 1065276000, 1079791200, 1096725600, 1111240800, 1128175200, 1142690400, 1159624800, 1174140000, 1191074400, 1207404000, 1222524000 } @@ -2288,14 +2294,14 @@ zoneinfo64:table(nofallback) { finalRule { "NZ" } finalRaw:int { 43200 } finalYear:int { 2009 } - links:intvector { 232, 235, 544, 545, 555 } - } //Z#555 + links:intvector { 233, 236, 545, 546, 556 } + } //Z#556 /* Pacific/Bougainville */ :table { transPre32:intvector { -1, 1454789160, -1, 1928176784 } trans:intvector { -868010400, -768906000, 1419696000 } typeOffsets:intvector { 37336, 0, 32400, 0, 35312, 0, 36000, 0, 39600, 0 } typeMap:bin { "0203010304" } - } //Z#556 + } //Z#557 /* Pacific/Chatham */ :table { transPre32:intvector { -1, 1102529668 } trans:intvector { -757426500, 152632800, 162309600, 183477600, 194968800, 215532000, 226418400, 246981600, 257868000, 278431200, 289317600, 309880800, 320767200, 341330400, 352216800, 372780000, 384271200, 404834400, 415720800, 436284000, 447170400, 467733600, 478620000, 499183200, 510069600, 530632800, 541519200, 562082400, 573573600, 594136800, 605023200, 623772000, 637682400, 655221600, 669132000, 686671200, 700581600, 718120800, 732636000, 749570400, 764085600, 781020000, 795535200, 812469600, 826984800, 844524000, 858434400, 875973600, 889884000, 907423200, 921938400, 938872800, 953388000, 970322400, 984837600, 1002376800, 1016287200, 1033826400, 1047736800, 1065276000, 1079791200, 1096725600, 1111240800, 1128175200, 1142690400, 1159624800, 1174140000, 1191074400, 1207404000, 1222524000 } @@ -2304,9 +2310,9 @@ zoneinfo64:table(nofallback) { finalRule { "Chatham" } finalRaw:int { 45900 } finalYear:int { 2009 } - links:intvector { 546, 557 } - } //Z#557 - /* Pacific/Chuuk */ :int { 587 } //Z#558 + links:intvector { 547, 558 } + } //Z#558 + /* Pacific/Chuuk */ :int { 588 } //Z#559 /* Pacific/Easter */ :table { trans:intvector { -1178124152, -36619200, -23922000, -3355200, 7527600, 24465600, 37767600, 55915200, 69217200, 87969600, 100666800, 118209600, 132116400, 150868800, 163566000, 182318400, 195620400, 213768000, 227070000, 245217600, 258519600, 277272000, 289969200, 308721600, 321418800, 340171200, 353473200, 371620800, 384922800, 403070400, 416372400, 434520000, 447822000, 466574400, 479271600, 498024000, 510721200, 529473600, 545194800, 560923200, 574225200, 592372800, 605674800, 624427200, 637124400, 653457600, 668574000, 687326400, 700628400, 718776000, 732078000, 750225600, 763527600, 781675200, 794977200, 813729600, 826426800, 845179200, 859690800, 876628800, 889930800, 906868800, 923194800, 939528000, 952830000, 971582400, 984279600, 1003032000, 1015729200, 1034481600, 1047178800, 1065931200, 1079233200, 1097380800, 1110682800, 1128830400, 1142132400, 1160884800, 1173582000, 1192334400, 1206846000, 1223784000, 1237086000, 1255233600, 1270350000, 1286683200, 1304823600, 1313899200, 1335668400, 1346558400, 1367118000, 1378612800, 1398567600, 1410062400, 1463281200, 1471147200, 1494730800, 1502596800, 1526180400, 1534046400, 1554606000, 1567915200, 1586055600, 1599364800, 1617505200, 1630814400, 1648954800, 1662868800, 1680404400, 1693713600 } typeOffsets:intvector { -26248, 0, -25200, 0, -25200, 3600, -21600, 0, -21600, 3600 } @@ -2314,99 +2320,99 @@ zoneinfo64:table(nofallback) { finalRule { "Chile" } finalRaw:int { -21600 } finalYear:int { 2024 } - links:intvector { 396, 559 } - } //Z#559 + links:intvector { 397, 560 } + } //Z#560 /* Pacific/Efate */ :table { trans:intvector { -1829387596, 125409600, 133876800, 433256400, 448977600, 464706000, 480427200, 496760400, 511876800, 528210000, 543931200, 559659600, 575380800, 591109200, 606830400, 622558800, 638280000, 654008400, 669729600, 686062800, 696340800, 719931600, 727790400 } typeOffsets:intvector { 40396, 0, 39600, 0, 39600, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201" } - } //Z#560 - /* Pacific/Enderbury */ :int { 571 } //Z#561 + } //Z#561 + /* Pacific/Enderbury */ :int { 572 } //Z#562 /* Pacific/Fakaofo */ :table { transPre32:intvector { -1, 2117555592 } trans:intvector { 1325242800 } typeOffsets:intvector { -41096, 0, -39600, 0, 46800, 0 } typeMap:bin { "0102" } - } //Z#562 + } //Z#563 /* Pacific/Fiji */ :table { trans:intvector { -1709985344, 909842400, 920124000, 941896800, 951573600, 1259416800, 1269698400, 1287842400, 1299333600, 1319292000, 1327154400, 1350741600, 1358604000, 1382796000, 1390050000, 1414850400, 1421503200, 1446300000, 1452952800, 1478354400, 1484402400, 1509804000, 1515852000, 1541253600, 1547301600, 1573308000, 1578751200, 1608386400, 1610805600 } typeOffsets:intvector { 42944, 0, 43200, 0, 43200, 3600 } typeMap:bin { "0102010201020102010201020102010201020102010201020102010201" } - } //Z#563 - /* Pacific/Funafuti */ :int { 592 } //Z#564 + } //Z#564 + /* Pacific/Funafuti */ :int { 593 } //Z#565 /* Pacific/Galapagos */ :table { trans:intvector { -1230746496, 504939600, 722930400, 728888400 } typeOffsets:intvector { -21504, 0, -21600, 0, -21600, 3600, -18000, 0 } typeMap:bin { "03010201" } - } //Z#565 + } //Z#566 /* Pacific/Gambier */ :table { trans:intvector { -1806678012 } typeOffsets:intvector { -32388, 0, -32400, 0 } typeMap:bin { "01" } - } //Z#566 + } //Z#567 /* Pacific/Guadalcanal */ :table { trans:intvector { -1806748788 } typeOffsets:intvector { 38388, 0, 39600, 0 } typeMap:bin { "01" } - links:intvector { 567, 585, 586, 602 } - } //Z#567 + links:intvector { 568, 586, 587, 603 } + } //Z#568 /* Pacific/Guam */ :table { transPre32:intvector { -1, 350340556, -1, 2117479756 } trans:intvector { -885549600, -802256400, -331891200, -281610000, -73728000, -29415540, -16704000, -10659600, 9907200, 21394800, 41356800, 52844400, 124819200, 130863600, 201888000, 209487660, 230659200, 241542000 } typeOffsets:intvector { -51660, 0, 32400, 0, 34740, 0, 36000, 0, 36000, 3600 } typeMap:bin { "0203010304030403040304030403040304030403" } - links:intvector { 568, 589 } - } //Z#568 + links:intvector { 569, 590 } + } //Z#569 /* Pacific/Honolulu */ :table { transPre32:intvector { -1, 1960865982 } trans:intvector { -1157283000, -1155436200, -880198200, -765376200, -712150200 } typeOffsets:intvector { -37886, 0, -37800, 0, -37800, 3600, -36000, 0 } typeMap:bin { "010201020103" } - links:intvector { 513, 569, 570, 625 } - } //Z#569 - /* Pacific/Johnston */ :int { 569 } //Z#570 + links:intvector { 514, 570, 571, 626 } + } //Z#570 + /* Pacific/Johnston */ :int { 570 } //Z#571 /* Pacific/Kanton */ :table { trans:intvector { -1020470400, 307627200, 788871600 } typeOffsets:intvector { 0, 0, -43200, 0, -39600, 0, 46800, 0 } typeMap:bin { "010203" } - links:intvector { 561, 571 } - } //Z#571 + links:intvector { 562, 572 } + } //Z#572 /* Pacific/Kiritimati */ :table { transPre32:intvector { -1, 2117552256 } trans:intvector { 307622400, 788868000 } typeOffsets:intvector { -37760, 0, -38400, 0, -36000, 0, 50400, 0 } typeMap:bin { "010203" } - } //Z#572 + } //Z#573 /* Pacific/Kosrae */ :table { transPre32:intvector { -1, 350336180, -1, 2117475380 } trans:intvector { -1743678000, -1606813200, -1041418800, -907408800, -770634000, -7988400, 915105600 } typeOffsets:intvector { -47284, 0, 32400, 0, 36000, 0, 39116, 0, 39600, 0, 43200, 0 } typeMap:bin { "030401040201040504" } - } //Z#573 + } //Z#574 /* Pacific/Kwajalein */ :table { transPre32:intvector { -1, 2117474336 } trans:intvector { -1041418800, -907408800, -817462800, -7988400, 745934400 } typeOffsets:intvector { 40160, 0, -43200, 0, 32400, 0, 36000, 0, 39600, 0, 43200, 0 } typeMap:bin { "040302040105" } - links:intvector { 534, 574 } - } //Z#574 - /* Pacific/Majuro */ :int { 592 } //Z#575 + links:intvector { 535, 575 } + } //Z#575 + /* Pacific/Majuro */ :int { 593 } //Z#576 /* Pacific/Marquesas */ :table { trans:intvector { -1806676920 } typeOffsets:intvector { -33480, 0, -34200, 0 } typeMap:bin { "01" } - } //Z#576 - /* Pacific/Midway */ :int { 582 } //Z#577 + } //Z#577 + /* Pacific/Midway */ :int { 583 } //Z#578 /* Pacific/Nauru */ :table { trans:intvector { -1545131260, -862918200, -767350800, 287418600 } typeOffsets:intvector { 40060, 0, 32400, 0, 41400, 0, 43200, 0 } typeMap:bin { "02010203" } - } //Z#578 + } //Z#579 /* Pacific/Niue */ :table { trans:intvector { -543069620, -173623200 } typeOffsets:intvector { -40780, 0, -40800, 0, -39600, 0 } typeMap:bin { "0102" } - } //Z#579 + } //Z#580 /* Pacific/Norfolk */ :table { transPre32:intvector { -1, 2117474184 } trans:intvector { -599656320, 152029800, 162916200, 1443882600, 1570287600, 1586012400, 1601737200 } @@ -2415,75 +2421,75 @@ zoneinfo64:table(nofallback) { finalRule { "AN" } finalRaw:int { 39600 } finalYear:int { 2021 } - } //Z#580 + } //Z#581 /* Pacific/Noumea */ :table { trans:intvector { -1829387148, 250002000, 257342400, 281451600, 288878400, 849366000, 857228400 } typeOffsets:intvector { 39948, 0, 39600, 0, 39600, 3600 } typeMap:bin { "01020102010201" } - } //Z#581 + } //Z#582 /* Pacific/Pago_Pago */ :table { transPre32:intvector { -1, 1849542664 } trans:intvector { -1861879032 } typeOffsets:intvector { 45432, 0, -40968, 0, -39600, 0 } typeMap:bin { "0102" } - links:intvector { 577, 582, 590, 631 } - } //Z#582 + links:intvector { 578, 583, 591, 632 } + } //Z#583 /* Pacific/Palau */ :table { transPre32:intvector { -1, 350343020, -1, 2117482220 } typeOffsets:intvector { -54124, 0, 32276, 0, 32400, 0 } typeMap:bin { "0102" } - } //Z#583 + } //Z#584 /* Pacific/Pitcairn */ :table { transPre32:intvector { -1, 2117545716 } trans:intvector { 893665800 } typeOffsets:intvector { -31220, 0, -30600, 0, -28800, 0 } typeMap:bin { "0102" } - } //Z#584 - /* Pacific/Pohnpei */ :int { 567 } //Z#585 - /* Pacific/Ponape */ :int { 567 } //Z#586 + } //Z#585 + /* Pacific/Pohnpei */ :int { 568 } //Z#586 + /* Pacific/Ponape */ :int { 568 } //Z#587 /* Pacific/Port_Moresby */ :table { transPre32:intvector { -1, 1454791176, -1, 1928176784 } typeOffsets:intvector { 35320, 0, 35312, 0, 36000, 0 } typeMap:bin { "0102" } - links:intvector { 229, 558, 587, 594, 597 } - } //Z#587 + links:intvector { 230, 559, 588, 595, 598 } + } //Z#588 /* Pacific/Rarotonga */ :table { transPre32:intvector { -1, 2085412040 } trans:intvector { -543072056, 279714600, 289387800, 309952800, 320837400, 341402400, 352287000, 372852000, 384341400, 404906400, 415791000, 436356000, 447240600, 467805600, 478690200, 499255200, 510139800, 530704800, 541589400, 562154400, 573643800, 594208800, 605093400, 625658400, 636543000, 657108000, 667992600 } typeOffsets:intvector { 48056, 0, -38344, 0, -37800, 0, -36000, 0, -36000, 1800 } typeMap:bin { "01020403040304030403040304030403040304030403040304030403" } - } //Z#588 - /* Pacific/Saipan */ :int { 568 } //Z#589 - /* Pacific/Samoa */ :int { 582 } //Z#590 + } //Z#589 + /* Pacific/Saipan */ :int { 569 } //Z#590 + /* Pacific/Samoa */ :int { 583 } //Z#591 /* Pacific/Tahiti */ :table { trans:intvector { -1806674504 } typeOffsets:intvector { -35896, 0, -36000, 0 } typeMap:bin { "01" } - } //Z#591 + } //Z#592 /* Pacific/Tarawa */ :table { transPre32:intvector { -1, 2117472972 } typeOffsets:intvector { 41524, 0, 43200, 0 } typeMap:bin { "01" } - links:intvector { 564, 575, 592, 595, 596 } - } //Z#592 + links:intvector { 565, 576, 593, 596, 597 } + } //Z#593 /* Pacific/Tongatapu */ :table { trans:intvector { -767189952, -284041200, 939214800, 953384400, 973342800, 980596800, 1004792400, 1012046400, 1478350800, 1484398800 } typeOffsets:intvector { 44352, 0, 44400, 0, 46800, 0, 46800, 3600 } typeMap:bin { "01020302030203020302" } - } //Z#593 - /* Pacific/Truk */ :int { 587 } //Z#594 - /* Pacific/Wake */ :int { 592 } //Z#595 - /* Pacific/Wallis */ :int { 592 } //Z#596 - /* Pacific/Yap */ :int { 587 } //Z#597 - /* Poland */ :int { 501 } //Z#598 - /* Portugal */ :int { 466 } //Z#599 - /* ROC */ :int { 319 } //Z#600 - /* ROK */ :int { 315 } //Z#601 - /* SST */ :int { 567 } //Z#602 - /* Singapore */ :int { 317 } //Z#603 + } //Z#594 + /* Pacific/Truk */ :int { 588 } //Z#595 + /* Pacific/Wake */ :int { 593 } //Z#596 + /* Pacific/Wallis */ :int { 593 } //Z#597 + /* Pacific/Yap */ :int { 588 } //Z#598 + /* Poland */ :int { 502 } //Z#599 + /* Portugal */ :int { 467 } //Z#600 + /* ROC */ :int { 320 } //Z#601 + /* ROK */ :int { 316 } //Z#602 + /* SST */ :int { 568 } //Z#603 + /* Singapore */ :int { 318 } //Z#604 /* SystemV/AST4 */ :table { typeOffsets:intvector { -14400, 0 } - } //Z#604 + } //Z#605 /* SystemV/AST4ADT */ :table { trans:intvector { -2135872800, -2120151600, -2104423200, -2088702000, -2072973600, -2056647600, -2040919200, -2025198000, -2009469600, -1993748400, -1978020000, -1962298800, -1946570400, -1930849200, -1915120800, -1898794800, -1883671200, -1867345200, -1851616800, -1835895600, -1820167200, -1804446000, -1788717600, -1772996400, -1757268000, -1741546800, -1725818400, -1709492400, -1693764000, -1678042800, -1662314400, -1646593200, -1630864800, -1615143600, -1599415200, -1583694000, -1567965600, -1551639600, -1536516000, -1520190000, -1504461600, -1488740400, -1473012000, -1457290800, -1441562400, -1425841200, -1410112800, -1394391600, -1378663200, -1362337200, -1347213600, -1330887600, -1315159200, -1299438000, -1283709600, -1267988400, -1252260000, -1236538800, -1220810400, -1205089200, -1189360800, -1173034800, -1157306400, -1141585200, -1125856800, -1110135600, -1094407200, -1078686000, -1062957600, -1047236400, -1031508000, -1015182000, -1000058400, -983732400, -968004000, -952282800, -936554400, -920833200, -905104800, -889383600, -873655200, -857934000, -842205600, -825879600, -810151200, -794430000, -778701600, -762980400, -747252000, -731530800, -715802400, -700081200, -684352800, -668026800, -652903200, -636577200, -620848800, -605127600, -589399200, -573678000, -557949600, -542228400, -526500000, -510778800, -495050400, -478724400, -463600800, -447274800, -431546400, -415825200, -400096800, -384375600, -368647200, -352926000, -337197600, -321476400, -305748000, -289422000, -273693600, -257972400, -242244000, -226522800, -210794400, -195073200, -179344800, -163623600, -147895200, -131569200, -116445600, -100119600, -84391200, -68670000, -52941600, -37220400, -21492000, -5770800, 9957600, 25678800, 41407200, 57733200, 73461600, 89182800, 104911200, 120632400, 126684000, 154501200, 162367200, 183531600, 199260000, 215586000 } typeOffsets:intvector { -14400, 0, -14400, 3600 } @@ -2491,10 +2497,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -14400 } finalYear:int { 1977 } - } //Z#605 + } //Z#606 /* SystemV/CST6 */ :table { typeOffsets:intvector { -21600, 0 } - } //Z#606 + } //Z#607 /* SystemV/CST6CDT */ :table { trans:intvector { -2135865600, -2120144400, -2104416000, -2088694800, -2072966400, -2056640400, -2040912000, -2025190800, -2009462400, -1993741200, -1978012800, -1962291600, -1946563200, -1930842000, -1915113600, -1898787600, -1883664000, -1867338000, -1851609600, -1835888400, -1820160000, -1804438800, -1788710400, -1772989200, -1757260800, -1741539600, -1725811200, -1709485200, -1693756800, -1678035600, -1662307200, -1646586000, -1630857600, -1615136400, -1599408000, -1583686800, -1567958400, -1551632400, -1536508800, -1520182800, -1504454400, -1488733200, -1473004800, -1457283600, -1441555200, -1425834000, -1410105600, -1394384400, -1378656000, -1362330000, -1347206400, -1330880400, -1315152000, -1299430800, -1283702400, -1267981200, -1252252800, -1236531600, -1220803200, -1205082000, -1189353600, -1173027600, -1157299200, -1141578000, -1125849600, -1110128400, -1094400000, -1078678800, -1062950400, -1047229200, -1031500800, -1015174800, -1000051200, -983725200, -967996800, -952275600, -936547200, -920826000, -905097600, -889376400, -873648000, -857926800, -842198400, -825872400, -810144000, -794422800, -778694400, -762973200, -747244800, -731523600, -715795200, -700074000, -684345600, -668019600, -652896000, -636570000, -620841600, -605120400, -589392000, -573670800, -557942400, -542221200, -526492800, -510771600, -495043200, -478717200, -463593600, -447267600, -431539200, -415818000, -400089600, -384368400, -368640000, -352918800, -337190400, -321469200, -305740800, -289414800, -273686400, -257965200, -242236800, -226515600, -210787200, -195066000, -179337600, -163616400, -147888000, -131562000, -116438400, -100112400, -84384000, -68662800, -52934400, -37213200, -21484800, -5763600, 9964800, 25686000, 41414400, 57740400, 73468800, 89190000, 104918400, 120639600, 126691200, 154508400, 162374400, 183538800, 199267200, 215593200 } typeOffsets:intvector { -21600, 0, -21600, 3600 } @@ -2502,10 +2508,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -21600 } finalYear:int { 1977 } - } //Z#607 + } //Z#608 /* SystemV/EST5 */ :table { typeOffsets:intvector { -18000, 0 } - } //Z#608 + } //Z#609 /* SystemV/EST5EDT */ :table { trans:intvector { -2135869200, -2120148000, -2104419600, -2088698400, -2072970000, -2056644000, -2040915600, -2025194400, -2009466000, -1993744800, -1978016400, -1962295200, -1946566800, -1930845600, -1915117200, -1898791200, -1883667600, -1867341600, -1851613200, -1835892000, -1820163600, -1804442400, -1788714000, -1772992800, -1757264400, -1741543200, -1725814800, -1709488800, -1693760400, -1678039200, -1662310800, -1646589600, -1630861200, -1615140000, -1599411600, -1583690400, -1567962000, -1551636000, -1536512400, -1520186400, -1504458000, -1488736800, -1473008400, -1457287200, -1441558800, -1425837600, -1410109200, -1394388000, -1378659600, -1362333600, -1347210000, -1330884000, -1315155600, -1299434400, -1283706000, -1267984800, -1252256400, -1236535200, -1220806800, -1205085600, -1189357200, -1173031200, -1157302800, -1141581600, -1125853200, -1110132000, -1094403600, -1078682400, -1062954000, -1047232800, -1031504400, -1015178400, -1000054800, -983728800, -968000400, -952279200, -936550800, -920829600, -905101200, -889380000, -873651600, -857930400, -842202000, -825876000, -810147600, -794426400, -778698000, -762976800, -747248400, -731527200, -715798800, -700077600, -684349200, -668023200, -652899600, -636573600, -620845200, -605124000, -589395600, -573674400, -557946000, -542224800, -526496400, -510775200, -495046800, -478720800, -463597200, -447271200, -431542800, -415821600, -400093200, -384372000, -368643600, -352922400, -337194000, -321472800, -305744400, -289418400, -273690000, -257968800, -242240400, -226519200, -210790800, -195069600, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 126687600, 154504800, 162370800, 183535200, 199263600, 215589600 } typeOffsets:intvector { -18000, 0, -18000, 3600 } @@ -2513,13 +2519,13 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -18000 } finalYear:int { 1977 } - } //Z#609 + } //Z#610 /* SystemV/HST10 */ :table { typeOffsets:intvector { -36000, 0 } - } //Z#610 + } //Z#611 /* SystemV/MST7 */ :table { typeOffsets:intvector { -25200, 0 } - } //Z#611 + } //Z#612 /* SystemV/MST7MDT */ :table { trans:intvector { -2135862000, -2120140800, -2104412400, -2088691200, -2072962800, -2056636800, -2040908400, -2025187200, -2009458800, -1993737600, -1978009200, -1962288000, -1946559600, -1930838400, -1915110000, -1898784000, -1883660400, -1867334400, -1851606000, -1835884800, -1820156400, -1804435200, -1788706800, -1772985600, -1757257200, -1741536000, -1725807600, -1709481600, -1693753200, -1678032000, -1662303600, -1646582400, -1630854000, -1615132800, -1599404400, -1583683200, -1567954800, -1551628800, -1536505200, -1520179200, -1504450800, -1488729600, -1473001200, -1457280000, -1441551600, -1425830400, -1410102000, -1394380800, -1378652400, -1362326400, -1347202800, -1330876800, -1315148400, -1299427200, -1283698800, -1267977600, -1252249200, -1236528000, -1220799600, -1205078400, -1189350000, -1173024000, -1157295600, -1141574400, -1125846000, -1110124800, -1094396400, -1078675200, -1062946800, -1047225600, -1031497200, -1015171200, -1000047600, -983721600, -967993200, -952272000, -936543600, -920822400, -905094000, -889372800, -873644400, -857923200, -842194800, -825868800, -810140400, -794419200, -778690800, -762969600, -747241200, -731520000, -715791600, -700070400, -684342000, -668016000, -652892400, -636566400, -620838000, -605116800, -589388400, -573667200, -557938800, -542217600, -526489200, -510768000, -495039600, -478713600, -463590000, -447264000, -431535600, -415814400, -400086000, -384364800, -368636400, -352915200, -337186800, -321465600, -305737200, -289411200, -273682800, -257961600, -242233200, -226512000, -210783600, -195062400, -179334000, -163612800, -147884400, -131558400, -116434800, -100108800, -84380400, -68659200, -52930800, -37209600, -21481200, -5760000, 9968400, 25689600, 41418000, 57744000, 73472400, 89193600, 104922000, 120643200, 126694800, 154512000, 162378000, 183542400, 199270800, 215596800 } typeOffsets:intvector { -25200, 0, -25200, 3600 } @@ -2527,10 +2533,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -25200 } finalYear:int { 1977 } - } //Z#612 + } //Z#613 /* SystemV/PST8 */ :table { typeOffsets:intvector { -28800, 0 } - } //Z#613 + } //Z#614 /* SystemV/PST8PDT */ :table { trans:intvector { -2135858400, -2120137200, -2104408800, -2088687600, -2072959200, -2056633200, -2040904800, -2025183600, -2009455200, -1993734000, -1978005600, -1962284400, -1946556000, -1930834800, -1915106400, -1898780400, -1883656800, -1867330800, -1851602400, -1835881200, -1820152800, -1804431600, -1788703200, -1772982000, -1757253600, -1741532400, -1725804000, -1709478000, -1693749600, -1678028400, -1662300000, -1646578800, -1630850400, -1615129200, -1599400800, -1583679600, -1567951200, -1551625200, -1536501600, -1520175600, -1504447200, -1488726000, -1472997600, -1457276400, -1441548000, -1425826800, -1410098400, -1394377200, -1378648800, -1362322800, -1347199200, -1330873200, -1315144800, -1299423600, -1283695200, -1267974000, -1252245600, -1236524400, -1220796000, -1205074800, -1189346400, -1173020400, -1157292000, -1141570800, -1125842400, -1110121200, -1094392800, -1078671600, -1062943200, -1047222000, -1031493600, -1015167600, -1000044000, -983718000, -967989600, -952268400, -936540000, -920818800, -905090400, -889369200, -873640800, -857919600, -842191200, -825865200, -810136800, -794415600, -778687200, -762966000, -747237600, -731516400, -715788000, -700066800, -684338400, -668012400, -652888800, -636562800, -620834400, -605113200, -589384800, -573663600, -557935200, -542214000, -526485600, -510764400, -495036000, -478710000, -463586400, -447260400, -431532000, -415810800, -400082400, -384361200, -368632800, -352911600, -337183200, -321462000, -305733600, -289407600, -273679200, -257958000, -242229600, -226508400, -210780000, -195058800, -179330400, -163609200, -147880800, -131554800, -116431200, -100105200, -84376800, -68655600, -52927200, -37206000, -21477600, -5756400, 9972000, 25693200, 41421600, 57747600, 73476000, 89197200, 104925600, 120646800, 126698400, 154515600, 162381600, 183546000, 199274400, 215600400 } typeOffsets:intvector { -28800, 0, -28800, 3600 } @@ -2538,10 +2544,10 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -28800 } finalYear:int { 1977 } - } //Z#614 + } //Z#615 /* SystemV/YST9 */ :table { typeOffsets:intvector { -32400, 0 } - } //Z#615 + } //Z#616 /* SystemV/YST9YDT */ :table { trans:intvector { -2135854800, -2120133600, -2104405200, -2088684000, -2072955600, -2056629600, -2040901200, -2025180000, -2009451600, -1993730400, -1978002000, -1962280800, -1946552400, -1930831200, -1915102800, -1898776800, -1883653200, -1867327200, -1851598800, -1835877600, -1820149200, -1804428000, -1788699600, -1772978400, -1757250000, -1741528800, -1725800400, -1709474400, -1693746000, -1678024800, -1662296400, -1646575200, -1630846800, -1615125600, -1599397200, -1583676000, -1567947600, -1551621600, -1536498000, -1520172000, -1504443600, -1488722400, -1472994000, -1457272800, -1441544400, -1425823200, -1410094800, -1394373600, -1378645200, -1362319200, -1347195600, -1330869600, -1315141200, -1299420000, -1283691600, -1267970400, -1252242000, -1236520800, -1220792400, -1205071200, -1189342800, -1173016800, -1157288400, -1141567200, -1125838800, -1110117600, -1094389200, -1078668000, -1062939600, -1047218400, -1031490000, -1015164000, -1000040400, -983714400, -967986000, -952264800, -936536400, -920815200, -905086800, -889365600, -873637200, -857916000, -842187600, -825861600, -810133200, -794412000, -778683600, -762962400, -747234000, -731512800, -715784400, -700063200, -684334800, -668008800, -652885200, -636559200, -620830800, -605109600, -589381200, -573660000, -557931600, -542210400, -526482000, -510760800, -495032400, -478706400, -463582800, -447256800, -431528400, -415807200, -400078800, -384357600, -368629200, -352908000, -337179600, -321458400, -305730000, -289404000, -273675600, -257954400, -242226000, -226504800, -210776400, -195055200, -179326800, -163605600, -147877200, -131551200, -116427600, -100101600, -84373200, -68652000, -52923600, -37202400, -21474000, -5752800, 9975600, 25696800, 41425200, 57751200, 73479600, 89200800, 104929200, 120650400, 126702000, 154519200, 162385200, 183549600, 199278000, 215604000 } typeOffsets:intvector { -32400, 0, -32400, 3600 } @@ -2549,28 +2555,28 @@ zoneinfo64:table(nofallback) { finalRule { "SystemV" } finalRaw:int { -32400 } finalYear:int { 1977 } - } //Z#616 - /* Turkey */ :int { 460 } //Z#617 - /* UCT */ :int { 437 } //Z#618 - /* US/Alaska */ :int { 60 } //Z#619 - /* US/Aleutian */ :int { 59 } //Z#620 - /* US/Arizona */ :int { 186 } //Z#621 - /* US/Central */ :int { 98 } //Z#622 - /* US/East-Indiana */ :int { 132 } //Z#623 - /* US/Eastern */ :int { 174 } //Z#624 - /* US/Hawaii */ :int { 569 } //Z#625 - /* US/Indiana-Starke */ :int { 133 } //Z#626 - /* US/Michigan */ :int { 111 } //Z#627 - /* US/Mountain */ :int { 110 } //Z#628 - /* US/Pacific */ :int { 152 } //Z#629 - /* US/Pacific-New */ :int { 152 } //Z#630 - /* US/Samoa */ :int { 582 } //Z#631 - /* UTC */ :int { 437 } //Z#632 - /* Universal */ :int { 437 } //Z#633 - /* VST */ :int { 273 } //Z#634 - /* W-SU */ :int { 475 } //Z#635 - /* WET */ :int { 466 } //Z#636 - /* Zulu */ :int { 437 } //Z#637 + } //Z#617 + /* Turkey */ :int { 461 } //Z#618 + /* UCT */ :int { 438 } //Z#619 + /* US/Alaska */ :int { 60 } //Z#620 + /* US/Aleutian */ :int { 59 } //Z#621 + /* US/Arizona */ :int { 187 } //Z#622 + /* US/Central */ :int { 98 } //Z#623 + /* US/East-Indiana */ :int { 133 } //Z#624 + /* US/Eastern */ :int { 175 } //Z#625 + /* US/Hawaii */ :int { 570 } //Z#626 + /* US/Indiana-Starke */ :int { 134 } //Z#627 + /* US/Michigan */ :int { 112 } //Z#628 + /* US/Mountain */ :int { 111 } //Z#629 + /* US/Pacific */ :int { 153 } //Z#630 + /* US/Pacific-New */ :int { 153 } //Z#631 + /* US/Samoa */ :int { 583 } //Z#632 + /* UTC */ :int { 438 } //Z#633 + /* Universal */ :int { 438 } //Z#634 + /* VST */ :int { 274 } //Z#635 + /* W-SU */ :int { 476 } //Z#636 + /* WET */ :int { 467 } //Z#637 + /* Zulu */ :int { 438 } //Z#638 } Names { "ACT","AET","AGT","ART","AST","Africa/Abidjan","Africa/Accra" // 6 @@ -2607,158 +2613,158 @@ zoneinfo64:table(nofallback) { ,"America/Catamarca","America/Cayenne","America/Cayman" // 97 ,"America/Chicago","America/Chihuahua","America/Ciudad_Juarez" // 100 ,"America/Coral_Harbour","America/Cordoba","America/Costa_Rica" // 103 - ,"America/Creston","America/Cuiaba","America/Curacao" // 106 - ,"America/Danmarkshavn","America/Dawson","America/Dawson_Creek" // 109 - ,"America/Denver","America/Detroit","America/Dominica" // 112 - ,"America/Edmonton","America/Eirunepe","America/El_Salvador" // 115 - ,"America/Ensenada","America/Fort_Nelson","America/Fort_Wayne" // 118 - ,"America/Fortaleza","America/Glace_Bay","America/Godthab" // 121 - ,"America/Goose_Bay","America/Grand_Turk","America/Grenada" // 124 - ,"America/Guadeloupe","America/Guatemala","America/Guayaquil" // 127 - ,"America/Guyana","America/Halifax","America/Havana" // 130 - ,"America/Hermosillo","America/Indiana/Indianapolis" // 132 - ,"America/Indiana/Knox","America/Indiana/Marengo","America/Indiana/Petersburg" // 135 - ,"America/Indiana/Tell_City","America/Indiana/Vevay" // 137 - ,"America/Indiana/Vincennes","America/Indiana/Winamac" // 139 - ,"America/Indianapolis","America/Inuvik","America/Iqaluit" // 142 - ,"America/Jamaica","America/Jujuy","America/Juneau" // 145 - ,"America/Kentucky/Louisville","America/Kentucky/Monticello" // 147 - ,"America/Knox_IN","America/Kralendijk","America/La_Paz" // 150 - ,"America/Lima","America/Los_Angeles","America/Louisville" // 153 - ,"America/Lower_Princes","America/Maceio","America/Managua" // 156 - ,"America/Manaus","America/Marigot","America/Martinique" // 159 - ,"America/Matamoros","America/Mazatlan","America/Mendoza" // 162 - ,"America/Menominee","America/Merida","America/Metlakatla" // 165 - ,"America/Mexico_City","America/Miquelon","America/Moncton" // 168 - ,"America/Monterrey","America/Montevideo","America/Montreal" // 171 - ,"America/Montserrat","America/Nassau","America/New_York" // 174 - ,"America/Nipigon","America/Nome","America/Noronha" // 177 - ,"America/North_Dakota/Beulah","America/North_Dakota/Center" // 179 - ,"America/North_Dakota/New_Salem","America/Nuuk","America/Ojinaga" // 182 - ,"America/Panama","America/Pangnirtung","America/Paramaribo" // 185 - ,"America/Phoenix","America/Port-au-Prince","America/Port_of_Spain" // 188 - ,"America/Porto_Acre","America/Porto_Velho","America/Puerto_Rico" // 191 - ,"America/Punta_Arenas","America/Rainy_River","America/Rankin_Inlet" // 194 - ,"America/Recife","America/Regina","America/Resolute" // 197 - ,"America/Rio_Branco","America/Rosario","America/Santa_Isabel" // 200 - ,"America/Santarem","America/Santiago","America/Santo_Domingo" // 203 - ,"America/Sao_Paulo","America/Scoresbysund","America/Shiprock" // 206 - ,"America/Sitka","America/St_Barthelemy","America/St_Johns" // 209 - ,"America/St_Kitts","America/St_Lucia","America/St_Thomas" // 212 - ,"America/St_Vincent","America/Swift_Current","America/Tegucigalpa" // 215 - ,"America/Thule","America/Thunder_Bay","America/Tijuana" // 218 - ,"America/Toronto","America/Tortola","America/Vancouver" // 221 - ,"America/Virgin","America/Whitehorse","America/Winnipeg" // 224 - ,"America/Yakutat","America/Yellowknife","Antarctica/Casey" // 227 - ,"Antarctica/Davis","Antarctica/DumontDUrville","Antarctica/Macquarie" // 230 - ,"Antarctica/Mawson","Antarctica/McMurdo","Antarctica/Palmer" // 233 - ,"Antarctica/Rothera","Antarctica/South_Pole","Antarctica/Syowa" // 236 - ,"Antarctica/Troll","Antarctica/Vostok","Arctic/Longyearbyen" // 239 - ,"Asia/Aden","Asia/Almaty","Asia/Amman","Asia/Anadyr" // 243 - ,"Asia/Aqtau","Asia/Aqtobe","Asia/Ashgabat","Asia/Ashkhabad" // 247 - ,"Asia/Atyrau","Asia/Baghdad","Asia/Bahrain","Asia/Baku" // 251 - ,"Asia/Bangkok","Asia/Barnaul","Asia/Beirut","Asia/Bishkek" // 255 - ,"Asia/Brunei","Asia/Calcutta","Asia/Chita","Asia/Choibalsan" // 259 - ,"Asia/Chongqing","Asia/Chungking","Asia/Colombo","Asia/Dacca" // 263 - ,"Asia/Damascus","Asia/Dhaka","Asia/Dili","Asia/Dubai" // 267 - ,"Asia/Dushanbe","Asia/Famagusta","Asia/Gaza","Asia/Harbin" // 271 - ,"Asia/Hebron","Asia/Ho_Chi_Minh","Asia/Hong_Kong" // 274 - ,"Asia/Hovd","Asia/Irkutsk","Asia/Istanbul","Asia/Jakarta" // 278 - ,"Asia/Jayapura","Asia/Jerusalem","Asia/Kabul","Asia/Kamchatka" // 282 - ,"Asia/Karachi","Asia/Kashgar","Asia/Kathmandu","Asia/Katmandu" // 286 - ,"Asia/Khandyga","Asia/Kolkata","Asia/Krasnoyarsk" // 289 - ,"Asia/Kuala_Lumpur","Asia/Kuching","Asia/Kuwait","Asia/Macao" // 293 - ,"Asia/Macau","Asia/Magadan","Asia/Makassar","Asia/Manila" // 297 - ,"Asia/Muscat","Asia/Nicosia","Asia/Novokuznetsk","Asia/Novosibirsk" // 301 - ,"Asia/Omsk","Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak" // 305 - ,"Asia/Pyongyang","Asia/Qatar","Asia/Qostanay","Asia/Qyzylorda" // 309 - ,"Asia/Rangoon","Asia/Riyadh","Asia/Saigon","Asia/Sakhalin" // 313 - ,"Asia/Samarkand","Asia/Seoul","Asia/Shanghai","Asia/Singapore" // 317 - ,"Asia/Srednekolymsk","Asia/Taipei","Asia/Tashkent" // 320 - ,"Asia/Tbilisi","Asia/Tehran","Asia/Tel_Aviv","Asia/Thimbu" // 324 - ,"Asia/Thimphu","Asia/Tokyo","Asia/Tomsk","Asia/Ujung_Pandang" // 328 - ,"Asia/Ulaanbaatar","Asia/Ulan_Bator","Asia/Urumqi" // 331 - ,"Asia/Ust-Nera","Asia/Vientiane","Asia/Vladivostok" // 334 - ,"Asia/Yakutsk","Asia/Yangon","Asia/Yekaterinburg" // 337 - ,"Asia/Yerevan","Atlantic/Azores","Atlantic/Bermuda" // 340 - ,"Atlantic/Canary","Atlantic/Cape_Verde","Atlantic/Faeroe" // 343 - ,"Atlantic/Faroe","Atlantic/Jan_Mayen","Atlantic/Madeira" // 346 - ,"Atlantic/Reykjavik","Atlantic/South_Georgia","Atlantic/St_Helena" // 349 - ,"Atlantic/Stanley","Australia/ACT","Australia/Adelaide" // 352 - ,"Australia/Brisbane","Australia/Broken_Hill","Australia/Canberra" // 355 - ,"Australia/Currie","Australia/Darwin","Australia/Eucla" // 358 - ,"Australia/Hobart","Australia/LHI","Australia/Lindeman" // 361 - ,"Australia/Lord_Howe","Australia/Melbourne","Australia/NSW" // 364 - ,"Australia/North","Australia/Perth","Australia/Queensland" // 367 - ,"Australia/South","Australia/Sydney","Australia/Tasmania" // 370 - ,"Australia/Victoria","Australia/West","Australia/Yancowinna" // 373 - ,"BET","BST","Brazil/Acre","Brazil/DeNoronha","Brazil/East" // 378 - ,"Brazil/West","CAT","CET","CNT","CST","CST6CDT","CTT" // 385 - ,"Canada/Atlantic","Canada/Central","Canada/East-Saskatchewan" // 388 - ,"Canada/Eastern","Canada/Mountain","Canada/Newfoundland" // 391 - ,"Canada/Pacific","Canada/Saskatchewan","Canada/Yukon" // 394 - ,"Chile/Continental","Chile/EasterIsland","Cuba","EAT" // 398 - ,"ECT","EET","EST","EST5EDT","Egypt","Eire","Etc/GMT" // 405 - ,"Etc/GMT+0","Etc/GMT+1","Etc/GMT+10","Etc/GMT+11" // 409 - ,"Etc/GMT+12","Etc/GMT+2","Etc/GMT+3","Etc/GMT+4","Etc/GMT+5" // 414 - ,"Etc/GMT+6","Etc/GMT+7","Etc/GMT+8","Etc/GMT+9","Etc/GMT-0" // 419 - ,"Etc/GMT-1","Etc/GMT-10","Etc/GMT-11","Etc/GMT-12" // 423 - ,"Etc/GMT-13","Etc/GMT-14","Etc/GMT-2","Etc/GMT-3" // 427 - ,"Etc/GMT-4","Etc/GMT-5","Etc/GMT-6","Etc/GMT-7","Etc/GMT-8" // 432 - ,"Etc/GMT-9","Etc/GMT0","Etc/Greenwich","Etc/UCT","Etc/UTC" // 437 - ,"Etc/Universal","Etc/Unknown","Etc/Zulu","Europe/Amsterdam" // 441 - ,"Europe/Andorra","Europe/Astrakhan","Europe/Athens" // 444 - ,"Europe/Belfast","Europe/Belgrade","Europe/Berlin" // 447 - ,"Europe/Bratislava","Europe/Brussels","Europe/Bucharest" // 450 - ,"Europe/Budapest","Europe/Busingen","Europe/Chisinau" // 453 - ,"Europe/Copenhagen","Europe/Dublin","Europe/Gibraltar" // 456 - ,"Europe/Guernsey","Europe/Helsinki","Europe/Isle_of_Man" // 459 - ,"Europe/Istanbul","Europe/Jersey","Europe/Kaliningrad" // 462 - ,"Europe/Kiev","Europe/Kirov","Europe/Kyiv","Europe/Lisbon" // 466 - ,"Europe/Ljubljana","Europe/London","Europe/Luxembourg" // 469 - ,"Europe/Madrid","Europe/Malta","Europe/Mariehamn" // 472 - ,"Europe/Minsk","Europe/Monaco","Europe/Moscow","Europe/Nicosia" // 476 - ,"Europe/Oslo","Europe/Paris","Europe/Podgorica","Europe/Prague" // 480 - ,"Europe/Riga","Europe/Rome","Europe/Samara","Europe/San_Marino" // 484 - ,"Europe/Sarajevo","Europe/Saratov","Europe/Simferopol" // 487 - ,"Europe/Skopje","Europe/Sofia","Europe/Stockholm" // 490 - ,"Europe/Tallinn","Europe/Tirane","Europe/Tiraspol" // 493 - ,"Europe/Ulyanovsk","Europe/Uzhgorod","Europe/Vaduz" // 496 - ,"Europe/Vatican","Europe/Vienna","Europe/Vilnius" // 499 - ,"Europe/Volgograd","Europe/Warsaw","Europe/Zagreb" // 502 - ,"Europe/Zaporozhye","Europe/Zurich","Factory","GB" // 506 - ,"GB-Eire","GMT","GMT+0","GMT-0","GMT0","Greenwich" // 512 - ,"HST","Hongkong","IET","IST","Iceland","Indian/Antananarivo" // 518 - ,"Indian/Chagos","Indian/Christmas","Indian/Cocos" // 521 - ,"Indian/Comoro","Indian/Kerguelen","Indian/Mahe","Indian/Maldives" // 525 - ,"Indian/Mauritius","Indian/Mayotte","Indian/Reunion" // 528 - ,"Iran","Israel","JST","Jamaica","Japan","Kwajalein" // 534 - ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 540 - ,"Mexico/BajaSur","Mexico/General","NET","NST","NZ" // 545 - ,"NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST","PST8PDT" // 553 - ,"Pacific/Apia","Pacific/Auckland","Pacific/Bougainville" // 556 - ,"Pacific/Chatham","Pacific/Chuuk","Pacific/Easter" // 559 - ,"Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo" // 562 - ,"Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos" // 565 - ,"Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam" // 568 - ,"Pacific/Honolulu","Pacific/Johnston","Pacific/Kanton" // 571 - ,"Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein" // 574 - ,"Pacific/Majuro","Pacific/Marquesas","Pacific/Midway" // 577 - ,"Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 581 - ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 584 - ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 587 - ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 590 - ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 593 - ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 597 - ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 603 - ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 607 - ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 611 - ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 614 - ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 619 - ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 623 - ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 627 - ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 631 - ,"UTC","Universal","VST","W-SU","WET","Zulu" // 637 + ,"America/Coyhaique","America/Creston","America/Cuiaba" // 106 + ,"America/Curacao","America/Danmarkshavn","America/Dawson" // 109 + ,"America/Dawson_Creek","America/Denver","America/Detroit" // 112 + ,"America/Dominica","America/Edmonton","America/Eirunepe" // 115 + ,"America/El_Salvador","America/Ensenada","America/Fort_Nelson" // 118 + ,"America/Fort_Wayne","America/Fortaleza","America/Glace_Bay" // 121 + ,"America/Godthab","America/Goose_Bay","America/Grand_Turk" // 124 + ,"America/Grenada","America/Guadeloupe","America/Guatemala" // 127 + ,"America/Guayaquil","America/Guyana","America/Halifax" // 130 + ,"America/Havana","America/Hermosillo","America/Indiana/Indianapolis" // 133 + ,"America/Indiana/Knox","America/Indiana/Marengo","America/Indiana/Petersburg" // 136 + ,"America/Indiana/Tell_City","America/Indiana/Vevay" // 138 + ,"America/Indiana/Vincennes","America/Indiana/Winamac" // 140 + ,"America/Indianapolis","America/Inuvik","America/Iqaluit" // 143 + ,"America/Jamaica","America/Jujuy","America/Juneau" // 146 + ,"America/Kentucky/Louisville","America/Kentucky/Monticello" // 148 + ,"America/Knox_IN","America/Kralendijk","America/La_Paz" // 151 + ,"America/Lima","America/Los_Angeles","America/Louisville" // 154 + ,"America/Lower_Princes","America/Maceio","America/Managua" // 157 + ,"America/Manaus","America/Marigot","America/Martinique" // 160 + ,"America/Matamoros","America/Mazatlan","America/Mendoza" // 163 + ,"America/Menominee","America/Merida","America/Metlakatla" // 166 + ,"America/Mexico_City","America/Miquelon","America/Moncton" // 169 + ,"America/Monterrey","America/Montevideo","America/Montreal" // 172 + ,"America/Montserrat","America/Nassau","America/New_York" // 175 + ,"America/Nipigon","America/Nome","America/Noronha" // 178 + ,"America/North_Dakota/Beulah","America/North_Dakota/Center" // 180 + ,"America/North_Dakota/New_Salem","America/Nuuk","America/Ojinaga" // 183 + ,"America/Panama","America/Pangnirtung","America/Paramaribo" // 186 + ,"America/Phoenix","America/Port-au-Prince","America/Port_of_Spain" // 189 + ,"America/Porto_Acre","America/Porto_Velho","America/Puerto_Rico" // 192 + ,"America/Punta_Arenas","America/Rainy_River","America/Rankin_Inlet" // 195 + ,"America/Recife","America/Regina","America/Resolute" // 198 + ,"America/Rio_Branco","America/Rosario","America/Santa_Isabel" // 201 + ,"America/Santarem","America/Santiago","America/Santo_Domingo" // 204 + ,"America/Sao_Paulo","America/Scoresbysund","America/Shiprock" // 207 + ,"America/Sitka","America/St_Barthelemy","America/St_Johns" // 210 + ,"America/St_Kitts","America/St_Lucia","America/St_Thomas" // 213 + ,"America/St_Vincent","America/Swift_Current","America/Tegucigalpa" // 216 + ,"America/Thule","America/Thunder_Bay","America/Tijuana" // 219 + ,"America/Toronto","America/Tortola","America/Vancouver" // 222 + ,"America/Virgin","America/Whitehorse","America/Winnipeg" // 225 + ,"America/Yakutat","America/Yellowknife","Antarctica/Casey" // 228 + ,"Antarctica/Davis","Antarctica/DumontDUrville","Antarctica/Macquarie" // 231 + ,"Antarctica/Mawson","Antarctica/McMurdo","Antarctica/Palmer" // 234 + ,"Antarctica/Rothera","Antarctica/South_Pole","Antarctica/Syowa" // 237 + ,"Antarctica/Troll","Antarctica/Vostok","Arctic/Longyearbyen" // 240 + ,"Asia/Aden","Asia/Almaty","Asia/Amman","Asia/Anadyr" // 244 + ,"Asia/Aqtau","Asia/Aqtobe","Asia/Ashgabat","Asia/Ashkhabad" // 248 + ,"Asia/Atyrau","Asia/Baghdad","Asia/Bahrain","Asia/Baku" // 252 + ,"Asia/Bangkok","Asia/Barnaul","Asia/Beirut","Asia/Bishkek" // 256 + ,"Asia/Brunei","Asia/Calcutta","Asia/Chita","Asia/Choibalsan" // 260 + ,"Asia/Chongqing","Asia/Chungking","Asia/Colombo","Asia/Dacca" // 264 + ,"Asia/Damascus","Asia/Dhaka","Asia/Dili","Asia/Dubai" // 268 + ,"Asia/Dushanbe","Asia/Famagusta","Asia/Gaza","Asia/Harbin" // 272 + ,"Asia/Hebron","Asia/Ho_Chi_Minh","Asia/Hong_Kong" // 275 + ,"Asia/Hovd","Asia/Irkutsk","Asia/Istanbul","Asia/Jakarta" // 279 + ,"Asia/Jayapura","Asia/Jerusalem","Asia/Kabul","Asia/Kamchatka" // 283 + ,"Asia/Karachi","Asia/Kashgar","Asia/Kathmandu","Asia/Katmandu" // 287 + ,"Asia/Khandyga","Asia/Kolkata","Asia/Krasnoyarsk" // 290 + ,"Asia/Kuala_Lumpur","Asia/Kuching","Asia/Kuwait","Asia/Macao" // 294 + ,"Asia/Macau","Asia/Magadan","Asia/Makassar","Asia/Manila" // 298 + ,"Asia/Muscat","Asia/Nicosia","Asia/Novokuznetsk","Asia/Novosibirsk" // 302 + ,"Asia/Omsk","Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak" // 306 + ,"Asia/Pyongyang","Asia/Qatar","Asia/Qostanay","Asia/Qyzylorda" // 310 + ,"Asia/Rangoon","Asia/Riyadh","Asia/Saigon","Asia/Sakhalin" // 314 + ,"Asia/Samarkand","Asia/Seoul","Asia/Shanghai","Asia/Singapore" // 318 + ,"Asia/Srednekolymsk","Asia/Taipei","Asia/Tashkent" // 321 + ,"Asia/Tbilisi","Asia/Tehran","Asia/Tel_Aviv","Asia/Thimbu" // 325 + ,"Asia/Thimphu","Asia/Tokyo","Asia/Tomsk","Asia/Ujung_Pandang" // 329 + ,"Asia/Ulaanbaatar","Asia/Ulan_Bator","Asia/Urumqi" // 332 + ,"Asia/Ust-Nera","Asia/Vientiane","Asia/Vladivostok" // 335 + ,"Asia/Yakutsk","Asia/Yangon","Asia/Yekaterinburg" // 338 + ,"Asia/Yerevan","Atlantic/Azores","Atlantic/Bermuda" // 341 + ,"Atlantic/Canary","Atlantic/Cape_Verde","Atlantic/Faeroe" // 344 + ,"Atlantic/Faroe","Atlantic/Jan_Mayen","Atlantic/Madeira" // 347 + ,"Atlantic/Reykjavik","Atlantic/South_Georgia","Atlantic/St_Helena" // 350 + ,"Atlantic/Stanley","Australia/ACT","Australia/Adelaide" // 353 + ,"Australia/Brisbane","Australia/Broken_Hill","Australia/Canberra" // 356 + ,"Australia/Currie","Australia/Darwin","Australia/Eucla" // 359 + ,"Australia/Hobart","Australia/LHI","Australia/Lindeman" // 362 + ,"Australia/Lord_Howe","Australia/Melbourne","Australia/NSW" // 365 + ,"Australia/North","Australia/Perth","Australia/Queensland" // 368 + ,"Australia/South","Australia/Sydney","Australia/Tasmania" // 371 + ,"Australia/Victoria","Australia/West","Australia/Yancowinna" // 374 + ,"BET","BST","Brazil/Acre","Brazil/DeNoronha","Brazil/East" // 379 + ,"Brazil/West","CAT","CET","CNT","CST","CST6CDT","CTT" // 386 + ,"Canada/Atlantic","Canada/Central","Canada/East-Saskatchewan" // 389 + ,"Canada/Eastern","Canada/Mountain","Canada/Newfoundland" // 392 + ,"Canada/Pacific","Canada/Saskatchewan","Canada/Yukon" // 395 + ,"Chile/Continental","Chile/EasterIsland","Cuba","EAT" // 399 + ,"ECT","EET","EST","EST5EDT","Egypt","Eire","Etc/GMT" // 406 + ,"Etc/GMT+0","Etc/GMT+1","Etc/GMT+10","Etc/GMT+11" // 410 + ,"Etc/GMT+12","Etc/GMT+2","Etc/GMT+3","Etc/GMT+4","Etc/GMT+5" // 415 + ,"Etc/GMT+6","Etc/GMT+7","Etc/GMT+8","Etc/GMT+9","Etc/GMT-0" // 420 + ,"Etc/GMT-1","Etc/GMT-10","Etc/GMT-11","Etc/GMT-12" // 424 + ,"Etc/GMT-13","Etc/GMT-14","Etc/GMT-2","Etc/GMT-3" // 428 + ,"Etc/GMT-4","Etc/GMT-5","Etc/GMT-6","Etc/GMT-7","Etc/GMT-8" // 433 + ,"Etc/GMT-9","Etc/GMT0","Etc/Greenwich","Etc/UCT","Etc/UTC" // 438 + ,"Etc/Universal","Etc/Unknown","Etc/Zulu","Europe/Amsterdam" // 442 + ,"Europe/Andorra","Europe/Astrakhan","Europe/Athens" // 445 + ,"Europe/Belfast","Europe/Belgrade","Europe/Berlin" // 448 + ,"Europe/Bratislava","Europe/Brussels","Europe/Bucharest" // 451 + ,"Europe/Budapest","Europe/Busingen","Europe/Chisinau" // 454 + ,"Europe/Copenhagen","Europe/Dublin","Europe/Gibraltar" // 457 + ,"Europe/Guernsey","Europe/Helsinki","Europe/Isle_of_Man" // 460 + ,"Europe/Istanbul","Europe/Jersey","Europe/Kaliningrad" // 463 + ,"Europe/Kiev","Europe/Kirov","Europe/Kyiv","Europe/Lisbon" // 467 + ,"Europe/Ljubljana","Europe/London","Europe/Luxembourg" // 470 + ,"Europe/Madrid","Europe/Malta","Europe/Mariehamn" // 473 + ,"Europe/Minsk","Europe/Monaco","Europe/Moscow","Europe/Nicosia" // 477 + ,"Europe/Oslo","Europe/Paris","Europe/Podgorica","Europe/Prague" // 481 + ,"Europe/Riga","Europe/Rome","Europe/Samara","Europe/San_Marino" // 485 + ,"Europe/Sarajevo","Europe/Saratov","Europe/Simferopol" // 488 + ,"Europe/Skopje","Europe/Sofia","Europe/Stockholm" // 491 + ,"Europe/Tallinn","Europe/Tirane","Europe/Tiraspol" // 494 + ,"Europe/Ulyanovsk","Europe/Uzhgorod","Europe/Vaduz" // 497 + ,"Europe/Vatican","Europe/Vienna","Europe/Vilnius" // 500 + ,"Europe/Volgograd","Europe/Warsaw","Europe/Zagreb" // 503 + ,"Europe/Zaporozhye","Europe/Zurich","Factory","GB" // 507 + ,"GB-Eire","GMT","GMT+0","GMT-0","GMT0","Greenwich" // 513 + ,"HST","Hongkong","IET","IST","Iceland","Indian/Antananarivo" // 519 + ,"Indian/Chagos","Indian/Christmas","Indian/Cocos" // 522 + ,"Indian/Comoro","Indian/Kerguelen","Indian/Mahe","Indian/Maldives" // 526 + ,"Indian/Mauritius","Indian/Mayotte","Indian/Reunion" // 529 + ,"Iran","Israel","JST","Jamaica","Japan","Kwajalein" // 535 + ,"Libya","MET","MIT","MST","MST7MDT","Mexico/BajaNorte" // 541 + ,"Mexico/BajaSur","Mexico/General","NET","NST","NZ" // 546 + ,"NZ-CHAT","Navajo","PLT","PNT","PRC","PRT","PST","PST8PDT" // 554 + ,"Pacific/Apia","Pacific/Auckland","Pacific/Bougainville" // 557 + ,"Pacific/Chatham","Pacific/Chuuk","Pacific/Easter" // 560 + ,"Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo" // 563 + ,"Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos" // 566 + ,"Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam" // 569 + ,"Pacific/Honolulu","Pacific/Johnston","Pacific/Kanton" // 572 + ,"Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein" // 575 + ,"Pacific/Majuro","Pacific/Marquesas","Pacific/Midway" // 578 + ,"Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea" // 582 + ,"Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn" // 585 + ,"Pacific/Pohnpei","Pacific/Ponape","Pacific/Port_Moresby" // 588 + ,"Pacific/Rarotonga","Pacific/Saipan","Pacific/Samoa" // 591 + ,"Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu" // 594 + ,"Pacific/Truk","Pacific/Wake","Pacific/Wallis","Pacific/Yap" // 598 + ,"Poland","Portugal","ROC","ROK","SST","Singapore" // 604 + ,"SystemV/AST4","SystemV/AST4ADT","SystemV/CST6","SystemV/CST6CDT" // 608 + ,"SystemV/EST5","SystemV/EST5EDT","SystemV/HST10","SystemV/MST7" // 612 + ,"SystemV/MST7MDT","SystemV/PST8","SystemV/PST8PDT" // 615 + ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 620 + ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 624 + ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 628 + ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 632 + ,"UTC","Universal","VST","W-SU","WET","Zulu" // 638 } Rules { AN:intvector { @@ -2933,539 +2939,540 @@ zoneinfo64:table(nofallback) { "CA", //Z#101 America/Coral_Harbour "AR", //Z#102 America/Cordoba "CR", //Z#103 America/Costa_Rica - "CA", //Z#104 America/Creston - "BR", //Z#105 America/Cuiaba - "CW", //Z#106 America/Curacao - "GL", //Z#107 America/Danmarkshavn - "CA", //Z#108 America/Dawson - "CA", //Z#109 America/Dawson_Creek - "US", //Z#110 America/Denver - "US", //Z#111 America/Detroit - "DM", //Z#112 America/Dominica - "CA", //Z#113 America/Edmonton - "BR", //Z#114 America/Eirunepe - "SV", //Z#115 America/El_Salvador - "MX", //Z#116 America/Ensenada - "CA", //Z#117 America/Fort_Nelson - "US", //Z#118 America/Fort_Wayne - "BR", //Z#119 America/Fortaleza - "CA", //Z#120 America/Glace_Bay - "GL", //Z#121 America/Godthab - "CA", //Z#122 America/Goose_Bay - "TC", //Z#123 America/Grand_Turk - "GD", //Z#124 America/Grenada - "GP", //Z#125 America/Guadeloupe - "GT", //Z#126 America/Guatemala - "EC", //Z#127 America/Guayaquil - "GY", //Z#128 America/Guyana - "CA", //Z#129 America/Halifax - "CU", //Z#130 America/Havana - "MX", //Z#131 America/Hermosillo - "US", //Z#132 America/Indiana/Indianapolis - "US", //Z#133 America/Indiana/Knox - "US", //Z#134 America/Indiana/Marengo - "US", //Z#135 America/Indiana/Petersburg - "US", //Z#136 America/Indiana/Tell_City - "US", //Z#137 America/Indiana/Vevay - "US", //Z#138 America/Indiana/Vincennes - "US", //Z#139 America/Indiana/Winamac - "US", //Z#140 America/Indianapolis - "CA", //Z#141 America/Inuvik - "CA", //Z#142 America/Iqaluit - "JM", //Z#143 America/Jamaica - "AR", //Z#144 America/Jujuy - "US", //Z#145 America/Juneau - "US", //Z#146 America/Kentucky/Louisville - "US", //Z#147 America/Kentucky/Monticello - "US", //Z#148 America/Knox_IN - "BQ", //Z#149 America/Kralendijk - "BO", //Z#150 America/La_Paz - "PE", //Z#151 America/Lima - "US", //Z#152 America/Los_Angeles - "US", //Z#153 America/Louisville - "SX", //Z#154 America/Lower_Princes - "BR", //Z#155 America/Maceio - "NI", //Z#156 America/Managua - "BR", //Z#157 America/Manaus - "MF", //Z#158 America/Marigot - "MQ", //Z#159 America/Martinique - "MX", //Z#160 America/Matamoros - "MX", //Z#161 America/Mazatlan - "AR", //Z#162 America/Mendoza - "US", //Z#163 America/Menominee - "MX", //Z#164 America/Merida - "US", //Z#165 America/Metlakatla - "MX", //Z#166 America/Mexico_City - "PM", //Z#167 America/Miquelon - "CA", //Z#168 America/Moncton - "MX", //Z#169 America/Monterrey - "UY", //Z#170 America/Montevideo - "CA", //Z#171 America/Montreal - "MS", //Z#172 America/Montserrat - "BS", //Z#173 America/Nassau - "US", //Z#174 America/New_York - "CA", //Z#175 America/Nipigon - "US", //Z#176 America/Nome - "BR", //Z#177 America/Noronha - "US", //Z#178 America/North_Dakota/Beulah - "US", //Z#179 America/North_Dakota/Center - "US", //Z#180 America/North_Dakota/New_Salem - "GL", //Z#181 America/Nuuk - "MX", //Z#182 America/Ojinaga - "PA", //Z#183 America/Panama - "CA", //Z#184 America/Pangnirtung - "SR", //Z#185 America/Paramaribo - "US", //Z#186 America/Phoenix - "HT", //Z#187 America/Port-au-Prince - "TT", //Z#188 America/Port_of_Spain - "BR", //Z#189 America/Porto_Acre - "BR", //Z#190 America/Porto_Velho - "PR", //Z#191 America/Puerto_Rico - "CL", //Z#192 America/Punta_Arenas - "CA", //Z#193 America/Rainy_River - "CA", //Z#194 America/Rankin_Inlet - "BR", //Z#195 America/Recife - "CA", //Z#196 America/Regina - "CA", //Z#197 America/Resolute - "BR", //Z#198 America/Rio_Branco - "AR", //Z#199 America/Rosario - "MX", //Z#200 America/Santa_Isabel - "BR", //Z#201 America/Santarem - "CL", //Z#202 America/Santiago - "DO", //Z#203 America/Santo_Domingo - "BR", //Z#204 America/Sao_Paulo - "GL", //Z#205 America/Scoresbysund - "US", //Z#206 America/Shiprock - "US", //Z#207 America/Sitka - "BL", //Z#208 America/St_Barthelemy - "CA", //Z#209 America/St_Johns - "KN", //Z#210 America/St_Kitts - "LC", //Z#211 America/St_Lucia - "VI", //Z#212 America/St_Thomas - "VC", //Z#213 America/St_Vincent - "CA", //Z#214 America/Swift_Current - "HN", //Z#215 America/Tegucigalpa - "GL", //Z#216 America/Thule - "CA", //Z#217 America/Thunder_Bay - "MX", //Z#218 America/Tijuana - "CA", //Z#219 America/Toronto - "VG", //Z#220 America/Tortola - "CA", //Z#221 America/Vancouver - "VI", //Z#222 America/Virgin - "CA", //Z#223 America/Whitehorse - "CA", //Z#224 America/Winnipeg - "US", //Z#225 America/Yakutat - "CA", //Z#226 America/Yellowknife - "AQ", //Z#227 Antarctica/Casey - "AQ", //Z#228 Antarctica/Davis - "AQ", //Z#229 Antarctica/DumontDUrville - "AU", //Z#230 Antarctica/Macquarie - "AQ", //Z#231 Antarctica/Mawson - "AQ", //Z#232 Antarctica/McMurdo - "AQ", //Z#233 Antarctica/Palmer - "AQ", //Z#234 Antarctica/Rothera - "AQ", //Z#235 Antarctica/South_Pole - "AQ", //Z#236 Antarctica/Syowa - "AQ", //Z#237 Antarctica/Troll - "AQ", //Z#238 Antarctica/Vostok - "SJ", //Z#239 Arctic/Longyearbyen - "YE", //Z#240 Asia/Aden - "KZ", //Z#241 Asia/Almaty - "JO", //Z#242 Asia/Amman - "RU", //Z#243 Asia/Anadyr - "KZ", //Z#244 Asia/Aqtau - "KZ", //Z#245 Asia/Aqtobe - "TM", //Z#246 Asia/Ashgabat - "TM", //Z#247 Asia/Ashkhabad - "KZ", //Z#248 Asia/Atyrau - "IQ", //Z#249 Asia/Baghdad - "BH", //Z#250 Asia/Bahrain - "AZ", //Z#251 Asia/Baku - "TH", //Z#252 Asia/Bangkok - "RU", //Z#253 Asia/Barnaul - "LB", //Z#254 Asia/Beirut - "KG", //Z#255 Asia/Bishkek - "BN", //Z#256 Asia/Brunei - "IN", //Z#257 Asia/Calcutta - "RU", //Z#258 Asia/Chita - "MN", //Z#259 Asia/Choibalsan - "CN", //Z#260 Asia/Chongqing - "CN", //Z#261 Asia/Chungking - "LK", //Z#262 Asia/Colombo - "BD", //Z#263 Asia/Dacca - "SY", //Z#264 Asia/Damascus - "BD", //Z#265 Asia/Dhaka - "TL", //Z#266 Asia/Dili - "AE", //Z#267 Asia/Dubai - "TJ", //Z#268 Asia/Dushanbe - "CY", //Z#269 Asia/Famagusta - "PS", //Z#270 Asia/Gaza - "CN", //Z#271 Asia/Harbin - "PS", //Z#272 Asia/Hebron - "VN", //Z#273 Asia/Ho_Chi_Minh - "HK", //Z#274 Asia/Hong_Kong - "MN", //Z#275 Asia/Hovd - "RU", //Z#276 Asia/Irkutsk - "TR", //Z#277 Asia/Istanbul - "ID", //Z#278 Asia/Jakarta - "ID", //Z#279 Asia/Jayapura - "IL", //Z#280 Asia/Jerusalem - "AF", //Z#281 Asia/Kabul - "RU", //Z#282 Asia/Kamchatka - "PK", //Z#283 Asia/Karachi - "CN", //Z#284 Asia/Kashgar - "NP", //Z#285 Asia/Kathmandu - "NP", //Z#286 Asia/Katmandu - "RU", //Z#287 Asia/Khandyga - "IN", //Z#288 Asia/Kolkata - "RU", //Z#289 Asia/Krasnoyarsk - "MY", //Z#290 Asia/Kuala_Lumpur - "MY", //Z#291 Asia/Kuching - "KW", //Z#292 Asia/Kuwait - "MO", //Z#293 Asia/Macao - "MO", //Z#294 Asia/Macau - "RU", //Z#295 Asia/Magadan - "ID", //Z#296 Asia/Makassar - "PH", //Z#297 Asia/Manila - "OM", //Z#298 Asia/Muscat - "CY", //Z#299 Asia/Nicosia - "RU", //Z#300 Asia/Novokuznetsk - "RU", //Z#301 Asia/Novosibirsk - "RU", //Z#302 Asia/Omsk - "KZ", //Z#303 Asia/Oral - "KH", //Z#304 Asia/Phnom_Penh - "ID", //Z#305 Asia/Pontianak - "KP", //Z#306 Asia/Pyongyang - "QA", //Z#307 Asia/Qatar - "KZ", //Z#308 Asia/Qostanay - "KZ", //Z#309 Asia/Qyzylorda - "MM", //Z#310 Asia/Rangoon - "SA", //Z#311 Asia/Riyadh - "VN", //Z#312 Asia/Saigon - "RU", //Z#313 Asia/Sakhalin - "UZ", //Z#314 Asia/Samarkand - "KR", //Z#315 Asia/Seoul - "CN", //Z#316 Asia/Shanghai - "SG", //Z#317 Asia/Singapore - "RU", //Z#318 Asia/Srednekolymsk - "TW", //Z#319 Asia/Taipei - "UZ", //Z#320 Asia/Tashkent - "GE", //Z#321 Asia/Tbilisi - "IR", //Z#322 Asia/Tehran - "IL", //Z#323 Asia/Tel_Aviv - "BT", //Z#324 Asia/Thimbu - "BT", //Z#325 Asia/Thimphu - "JP", //Z#326 Asia/Tokyo - "RU", //Z#327 Asia/Tomsk - "ID", //Z#328 Asia/Ujung_Pandang - "MN", //Z#329 Asia/Ulaanbaatar - "MN", //Z#330 Asia/Ulan_Bator - "CN", //Z#331 Asia/Urumqi - "RU", //Z#332 Asia/Ust-Nera - "LA", //Z#333 Asia/Vientiane - "RU", //Z#334 Asia/Vladivostok - "RU", //Z#335 Asia/Yakutsk - "MM", //Z#336 Asia/Yangon - "RU", //Z#337 Asia/Yekaterinburg - "AM", //Z#338 Asia/Yerevan - "PT", //Z#339 Atlantic/Azores - "BM", //Z#340 Atlantic/Bermuda - "ES", //Z#341 Atlantic/Canary - "CV", //Z#342 Atlantic/Cape_Verde - "FO", //Z#343 Atlantic/Faeroe - "FO", //Z#344 Atlantic/Faroe - "SJ", //Z#345 Atlantic/Jan_Mayen - "PT", //Z#346 Atlantic/Madeira - "IS", //Z#347 Atlantic/Reykjavik - "GS", //Z#348 Atlantic/South_Georgia - "SH", //Z#349 Atlantic/St_Helena - "FK", //Z#350 Atlantic/Stanley - "AU", //Z#351 Australia/ACT - "AU", //Z#352 Australia/Adelaide - "AU", //Z#353 Australia/Brisbane - "AU", //Z#354 Australia/Broken_Hill - "AU", //Z#355 Australia/Canberra - "AU", //Z#356 Australia/Currie - "AU", //Z#357 Australia/Darwin - "AU", //Z#358 Australia/Eucla - "AU", //Z#359 Australia/Hobart - "AU", //Z#360 Australia/LHI - "AU", //Z#361 Australia/Lindeman - "AU", //Z#362 Australia/Lord_Howe - "AU", //Z#363 Australia/Melbourne - "AU", //Z#364 Australia/NSW - "AU", //Z#365 Australia/North - "AU", //Z#366 Australia/Perth - "AU", //Z#367 Australia/Queensland - "AU", //Z#368 Australia/South - "AU", //Z#369 Australia/Sydney - "AU", //Z#370 Australia/Tasmania - "AU", //Z#371 Australia/Victoria - "AU", //Z#372 Australia/West - "AU", //Z#373 Australia/Yancowinna - "BR", //Z#374 BET - "BD", //Z#375 BST - "BR", //Z#376 Brazil/Acre - "BR", //Z#377 Brazil/DeNoronha - "BR", //Z#378 Brazil/East - "BR", //Z#379 Brazil/West - "MZ", //Z#380 CAT - "BE", //Z#381 CET - "CA", //Z#382 CNT - "US", //Z#383 CST - "US", //Z#384 CST6CDT - "CN", //Z#385 CTT - "CA", //Z#386 Canada/Atlantic - "CA", //Z#387 Canada/Central - "CA", //Z#388 Canada/East-Saskatchewan - "CA", //Z#389 Canada/Eastern - "CA", //Z#390 Canada/Mountain - "CA", //Z#391 Canada/Newfoundland - "CA", //Z#392 Canada/Pacific - "CA", //Z#393 Canada/Saskatchewan - "CA", //Z#394 Canada/Yukon - "CL", //Z#395 Chile/Continental - "CL", //Z#396 Chile/EasterIsland - "CU", //Z#397 Cuba - "KE", //Z#398 EAT - "FR", //Z#399 ECT - "GR", //Z#400 EET - "PA", //Z#401 EST - "US", //Z#402 EST5EDT - "EG", //Z#403 Egypt - "IE", //Z#404 Eire - "001",//Z#405 Etc/GMT - "001",//Z#406 Etc/GMT+0 - "001",//Z#407 Etc/GMT+1 - "001",//Z#408 Etc/GMT+10 - "001",//Z#409 Etc/GMT+11 - "001",//Z#410 Etc/GMT+12 - "001",//Z#411 Etc/GMT+2 - "001",//Z#412 Etc/GMT+3 - "001",//Z#413 Etc/GMT+4 - "001",//Z#414 Etc/GMT+5 - "001",//Z#415 Etc/GMT+6 - "001",//Z#416 Etc/GMT+7 - "001",//Z#417 Etc/GMT+8 - "001",//Z#418 Etc/GMT+9 - "001",//Z#419 Etc/GMT-0 - "001",//Z#420 Etc/GMT-1 - "001",//Z#421 Etc/GMT-10 - "001",//Z#422 Etc/GMT-11 - "001",//Z#423 Etc/GMT-12 - "001",//Z#424 Etc/GMT-13 - "001",//Z#425 Etc/GMT-14 - "001",//Z#426 Etc/GMT-2 - "001",//Z#427 Etc/GMT-3 - "001",//Z#428 Etc/GMT-4 - "001",//Z#429 Etc/GMT-5 - "001",//Z#430 Etc/GMT-6 - "001",//Z#431 Etc/GMT-7 - "001",//Z#432 Etc/GMT-8 - "001",//Z#433 Etc/GMT-9 - "001",//Z#434 Etc/GMT0 - "001",//Z#435 Etc/Greenwich - "001",//Z#436 Etc/UCT - "001",//Z#437 Etc/UTC - "001",//Z#438 Etc/Universal - "001",//Z#439 Etc/Unknown - "001",//Z#440 Etc/Zulu - "NL", //Z#441 Europe/Amsterdam - "AD", //Z#442 Europe/Andorra - "RU", //Z#443 Europe/Astrakhan - "GR", //Z#444 Europe/Athens - "GB", //Z#445 Europe/Belfast - "RS", //Z#446 Europe/Belgrade - "DE", //Z#447 Europe/Berlin - "SK", //Z#448 Europe/Bratislava - "BE", //Z#449 Europe/Brussels - "RO", //Z#450 Europe/Bucharest - "HU", //Z#451 Europe/Budapest - "DE", //Z#452 Europe/Busingen - "MD", //Z#453 Europe/Chisinau - "DK", //Z#454 Europe/Copenhagen - "IE", //Z#455 Europe/Dublin - "GI", //Z#456 Europe/Gibraltar - "GG", //Z#457 Europe/Guernsey - "FI", //Z#458 Europe/Helsinki - "IM", //Z#459 Europe/Isle_of_Man - "TR", //Z#460 Europe/Istanbul - "JE", //Z#461 Europe/Jersey - "RU", //Z#462 Europe/Kaliningrad - "UA", //Z#463 Europe/Kiev - "RU", //Z#464 Europe/Kirov - "UA", //Z#465 Europe/Kyiv - "PT", //Z#466 Europe/Lisbon - "SI", //Z#467 Europe/Ljubljana - "GB", //Z#468 Europe/London - "LU", //Z#469 Europe/Luxembourg - "ES", //Z#470 Europe/Madrid - "MT", //Z#471 Europe/Malta - "AX", //Z#472 Europe/Mariehamn - "BY", //Z#473 Europe/Minsk - "MC", //Z#474 Europe/Monaco - "RU", //Z#475 Europe/Moscow - "CY", //Z#476 Europe/Nicosia - "NO", //Z#477 Europe/Oslo - "FR", //Z#478 Europe/Paris - "ME", //Z#479 Europe/Podgorica - "CZ", //Z#480 Europe/Prague - "LV", //Z#481 Europe/Riga - "IT", //Z#482 Europe/Rome - "RU", //Z#483 Europe/Samara - "SM", //Z#484 Europe/San_Marino - "BA", //Z#485 Europe/Sarajevo - "RU", //Z#486 Europe/Saratov - "UA", //Z#487 Europe/Simferopol - "MK", //Z#488 Europe/Skopje - "BG", //Z#489 Europe/Sofia - "SE", //Z#490 Europe/Stockholm - "EE", //Z#491 Europe/Tallinn - "AL", //Z#492 Europe/Tirane - "MD", //Z#493 Europe/Tiraspol - "RU", //Z#494 Europe/Ulyanovsk - "UA", //Z#495 Europe/Uzhgorod - "LI", //Z#496 Europe/Vaduz - "VA", //Z#497 Europe/Vatican - "AT", //Z#498 Europe/Vienna - "LT", //Z#499 Europe/Vilnius - "RU", //Z#500 Europe/Volgograd - "PL", //Z#501 Europe/Warsaw - "HR", //Z#502 Europe/Zagreb - "UA", //Z#503 Europe/Zaporozhye - "CH", //Z#504 Europe/Zurich - "001",//Z#505 Factory - "GB", //Z#506 GB - "GB", //Z#507 GB-Eire - "001",//Z#508 GMT - "001",//Z#509 GMT+0 - "001",//Z#510 GMT-0 - "001",//Z#511 GMT0 - "001",//Z#512 Greenwich - "US", //Z#513 HST - "HK", //Z#514 Hongkong - "US", //Z#515 IET - "IN", //Z#516 IST - "CI", //Z#517 Iceland - "MG", //Z#518 Indian/Antananarivo - "IO", //Z#519 Indian/Chagos - "CX", //Z#520 Indian/Christmas - "CC", //Z#521 Indian/Cocos - "KM", //Z#522 Indian/Comoro - "TF", //Z#523 Indian/Kerguelen - "SC", //Z#524 Indian/Mahe - "MV", //Z#525 Indian/Maldives - "MU", //Z#526 Indian/Mauritius - "YT", //Z#527 Indian/Mayotte - "RE", //Z#528 Indian/Reunion - "IR", //Z#529 Iran - "IL", //Z#530 Israel - "JP", //Z#531 JST - "JM", //Z#532 Jamaica - "JP", //Z#533 Japan - "MH", //Z#534 Kwajalein - "LY", //Z#535 Libya - "BE", //Z#536 MET - "WS", //Z#537 MIT - "US", //Z#538 MST - "US", //Z#539 MST7MDT - "MX", //Z#540 Mexico/BajaNorte - "MX", //Z#541 Mexico/BajaSur - "MX", //Z#542 Mexico/General - "AM", //Z#543 NET - "NZ", //Z#544 NST - "NZ", //Z#545 NZ - "NZ", //Z#546 NZ-CHAT - "US", //Z#547 Navajo - "PK", //Z#548 PLT - "US", //Z#549 PNT - "CN", //Z#550 PRC - "PR", //Z#551 PRT - "US", //Z#552 PST - "US", //Z#553 PST8PDT - "WS", //Z#554 Pacific/Apia - "NZ", //Z#555 Pacific/Auckland - "PG", //Z#556 Pacific/Bougainville - "NZ", //Z#557 Pacific/Chatham - "FM", //Z#558 Pacific/Chuuk - "CL", //Z#559 Pacific/Easter - "VU", //Z#560 Pacific/Efate - "KI", //Z#561 Pacific/Enderbury - "TK", //Z#562 Pacific/Fakaofo - "FJ", //Z#563 Pacific/Fiji - "TV", //Z#564 Pacific/Funafuti - "EC", //Z#565 Pacific/Galapagos - "PF", //Z#566 Pacific/Gambier - "SB", //Z#567 Pacific/Guadalcanal - "GU", //Z#568 Pacific/Guam - "US", //Z#569 Pacific/Honolulu - "UM", //Z#570 Pacific/Johnston - "KI", //Z#571 Pacific/Kanton - "KI", //Z#572 Pacific/Kiritimati - "FM", //Z#573 Pacific/Kosrae - "MH", //Z#574 Pacific/Kwajalein - "MH", //Z#575 Pacific/Majuro - "PF", //Z#576 Pacific/Marquesas - "UM", //Z#577 Pacific/Midway - "NR", //Z#578 Pacific/Nauru - "NU", //Z#579 Pacific/Niue - "NF", //Z#580 Pacific/Norfolk - "NC", //Z#581 Pacific/Noumea - "AS", //Z#582 Pacific/Pago_Pago - "PW", //Z#583 Pacific/Palau - "PN", //Z#584 Pacific/Pitcairn - "FM", //Z#585 Pacific/Pohnpei - "FM", //Z#586 Pacific/Ponape - "PG", //Z#587 Pacific/Port_Moresby - "CK", //Z#588 Pacific/Rarotonga - "MP", //Z#589 Pacific/Saipan - "AS", //Z#590 Pacific/Samoa - "PF", //Z#591 Pacific/Tahiti - "KI", //Z#592 Pacific/Tarawa - "TO", //Z#593 Pacific/Tongatapu - "FM", //Z#594 Pacific/Truk - "UM", //Z#595 Pacific/Wake - "WF", //Z#596 Pacific/Wallis - "FM", //Z#597 Pacific/Yap - "PL", //Z#598 Poland - "PT", //Z#599 Portugal - "TW", //Z#600 ROC - "KR", //Z#601 ROK - "SB", //Z#602 SST - "SG", //Z#603 Singapore - "001",//Z#604 SystemV/AST4 - "001",//Z#605 SystemV/AST4ADT - "001",//Z#606 SystemV/CST6 - "001",//Z#607 SystemV/CST6CDT - "001",//Z#608 SystemV/EST5 - "001",//Z#609 SystemV/EST5EDT - "001",//Z#610 SystemV/HST10 - "001",//Z#611 SystemV/MST7 - "001",//Z#612 SystemV/MST7MDT - "001",//Z#613 SystemV/PST8 - "001",//Z#614 SystemV/PST8PDT - "001",//Z#615 SystemV/YST9 - "001",//Z#616 SystemV/YST9YDT - "TR", //Z#617 Turkey - "001",//Z#618 UCT - "US", //Z#619 US/Alaska - "US", //Z#620 US/Aleutian - "US", //Z#621 US/Arizona - "US", //Z#622 US/Central - "US", //Z#623 US/East-Indiana - "US", //Z#624 US/Eastern - "US", //Z#625 US/Hawaii - "US", //Z#626 US/Indiana-Starke - "US", //Z#627 US/Michigan - "US", //Z#628 US/Mountain - "US", //Z#629 US/Pacific - "US", //Z#630 US/Pacific-New - "AS", //Z#631 US/Samoa - "001",//Z#632 UTC - "001",//Z#633 Universal - "VN", //Z#634 VST - "RU", //Z#635 W-SU - "PT", //Z#636 WET - "001",//Z#637 Zulu + "CL", //Z#104 America/Coyhaique + "CA", //Z#105 America/Creston + "BR", //Z#106 America/Cuiaba + "CW", //Z#107 America/Curacao + "GL", //Z#108 America/Danmarkshavn + "CA", //Z#109 America/Dawson + "CA", //Z#110 America/Dawson_Creek + "US", //Z#111 America/Denver + "US", //Z#112 America/Detroit + "DM", //Z#113 America/Dominica + "CA", //Z#114 America/Edmonton + "BR", //Z#115 America/Eirunepe + "SV", //Z#116 America/El_Salvador + "MX", //Z#117 America/Ensenada + "CA", //Z#118 America/Fort_Nelson + "US", //Z#119 America/Fort_Wayne + "BR", //Z#120 America/Fortaleza + "CA", //Z#121 America/Glace_Bay + "GL", //Z#122 America/Godthab + "CA", //Z#123 America/Goose_Bay + "TC", //Z#124 America/Grand_Turk + "GD", //Z#125 America/Grenada + "GP", //Z#126 America/Guadeloupe + "GT", //Z#127 America/Guatemala + "EC", //Z#128 America/Guayaquil + "GY", //Z#129 America/Guyana + "CA", //Z#130 America/Halifax + "CU", //Z#131 America/Havana + "MX", //Z#132 America/Hermosillo + "US", //Z#133 America/Indiana/Indianapolis + "US", //Z#134 America/Indiana/Knox + "US", //Z#135 America/Indiana/Marengo + "US", //Z#136 America/Indiana/Petersburg + "US", //Z#137 America/Indiana/Tell_City + "US", //Z#138 America/Indiana/Vevay + "US", //Z#139 America/Indiana/Vincennes + "US", //Z#140 America/Indiana/Winamac + "US", //Z#141 America/Indianapolis + "CA", //Z#142 America/Inuvik + "CA", //Z#143 America/Iqaluit + "JM", //Z#144 America/Jamaica + "AR", //Z#145 America/Jujuy + "US", //Z#146 America/Juneau + "US", //Z#147 America/Kentucky/Louisville + "US", //Z#148 America/Kentucky/Monticello + "US", //Z#149 America/Knox_IN + "BQ", //Z#150 America/Kralendijk + "BO", //Z#151 America/La_Paz + "PE", //Z#152 America/Lima + "US", //Z#153 America/Los_Angeles + "US", //Z#154 America/Louisville + "SX", //Z#155 America/Lower_Princes + "BR", //Z#156 America/Maceio + "NI", //Z#157 America/Managua + "BR", //Z#158 America/Manaus + "MF", //Z#159 America/Marigot + "MQ", //Z#160 America/Martinique + "MX", //Z#161 America/Matamoros + "MX", //Z#162 America/Mazatlan + "AR", //Z#163 America/Mendoza + "US", //Z#164 America/Menominee + "MX", //Z#165 America/Merida + "US", //Z#166 America/Metlakatla + "MX", //Z#167 America/Mexico_City + "PM", //Z#168 America/Miquelon + "CA", //Z#169 America/Moncton + "MX", //Z#170 America/Monterrey + "UY", //Z#171 America/Montevideo + "CA", //Z#172 America/Montreal + "MS", //Z#173 America/Montserrat + "BS", //Z#174 America/Nassau + "US", //Z#175 America/New_York + "CA", //Z#176 America/Nipigon + "US", //Z#177 America/Nome + "BR", //Z#178 America/Noronha + "US", //Z#179 America/North_Dakota/Beulah + "US", //Z#180 America/North_Dakota/Center + "US", //Z#181 America/North_Dakota/New_Salem + "GL", //Z#182 America/Nuuk + "MX", //Z#183 America/Ojinaga + "PA", //Z#184 America/Panama + "CA", //Z#185 America/Pangnirtung + "SR", //Z#186 America/Paramaribo + "US", //Z#187 America/Phoenix + "HT", //Z#188 America/Port-au-Prince + "TT", //Z#189 America/Port_of_Spain + "BR", //Z#190 America/Porto_Acre + "BR", //Z#191 America/Porto_Velho + "PR", //Z#192 America/Puerto_Rico + "CL", //Z#193 America/Punta_Arenas + "CA", //Z#194 America/Rainy_River + "CA", //Z#195 America/Rankin_Inlet + "BR", //Z#196 America/Recife + "CA", //Z#197 America/Regina + "CA", //Z#198 America/Resolute + "BR", //Z#199 America/Rio_Branco + "AR", //Z#200 America/Rosario + "MX", //Z#201 America/Santa_Isabel + "BR", //Z#202 America/Santarem + "CL", //Z#203 America/Santiago + "DO", //Z#204 America/Santo_Domingo + "BR", //Z#205 America/Sao_Paulo + "GL", //Z#206 America/Scoresbysund + "US", //Z#207 America/Shiprock + "US", //Z#208 America/Sitka + "BL", //Z#209 America/St_Barthelemy + "CA", //Z#210 America/St_Johns + "KN", //Z#211 America/St_Kitts + "LC", //Z#212 America/St_Lucia + "VI", //Z#213 America/St_Thomas + "VC", //Z#214 America/St_Vincent + "CA", //Z#215 America/Swift_Current + "HN", //Z#216 America/Tegucigalpa + "GL", //Z#217 America/Thule + "CA", //Z#218 America/Thunder_Bay + "MX", //Z#219 America/Tijuana + "CA", //Z#220 America/Toronto + "VG", //Z#221 America/Tortola + "CA", //Z#222 America/Vancouver + "VI", //Z#223 America/Virgin + "CA", //Z#224 America/Whitehorse + "CA", //Z#225 America/Winnipeg + "US", //Z#226 America/Yakutat + "CA", //Z#227 America/Yellowknife + "AQ", //Z#228 Antarctica/Casey + "AQ", //Z#229 Antarctica/Davis + "AQ", //Z#230 Antarctica/DumontDUrville + "AU", //Z#231 Antarctica/Macquarie + "AQ", //Z#232 Antarctica/Mawson + "AQ", //Z#233 Antarctica/McMurdo + "AQ", //Z#234 Antarctica/Palmer + "AQ", //Z#235 Antarctica/Rothera + "AQ", //Z#236 Antarctica/South_Pole + "AQ", //Z#237 Antarctica/Syowa + "AQ", //Z#238 Antarctica/Troll + "AQ", //Z#239 Antarctica/Vostok + "SJ", //Z#240 Arctic/Longyearbyen + "YE", //Z#241 Asia/Aden + "KZ", //Z#242 Asia/Almaty + "JO", //Z#243 Asia/Amman + "RU", //Z#244 Asia/Anadyr + "KZ", //Z#245 Asia/Aqtau + "KZ", //Z#246 Asia/Aqtobe + "TM", //Z#247 Asia/Ashgabat + "TM", //Z#248 Asia/Ashkhabad + "KZ", //Z#249 Asia/Atyrau + "IQ", //Z#250 Asia/Baghdad + "BH", //Z#251 Asia/Bahrain + "AZ", //Z#252 Asia/Baku + "TH", //Z#253 Asia/Bangkok + "RU", //Z#254 Asia/Barnaul + "LB", //Z#255 Asia/Beirut + "KG", //Z#256 Asia/Bishkek + "BN", //Z#257 Asia/Brunei + "IN", //Z#258 Asia/Calcutta + "RU", //Z#259 Asia/Chita + "MN", //Z#260 Asia/Choibalsan + "CN", //Z#261 Asia/Chongqing + "CN", //Z#262 Asia/Chungking + "LK", //Z#263 Asia/Colombo + "BD", //Z#264 Asia/Dacca + "SY", //Z#265 Asia/Damascus + "BD", //Z#266 Asia/Dhaka + "TL", //Z#267 Asia/Dili + "AE", //Z#268 Asia/Dubai + "TJ", //Z#269 Asia/Dushanbe + "CY", //Z#270 Asia/Famagusta + "PS", //Z#271 Asia/Gaza + "CN", //Z#272 Asia/Harbin + "PS", //Z#273 Asia/Hebron + "VN", //Z#274 Asia/Ho_Chi_Minh + "HK", //Z#275 Asia/Hong_Kong + "MN", //Z#276 Asia/Hovd + "RU", //Z#277 Asia/Irkutsk + "TR", //Z#278 Asia/Istanbul + "ID", //Z#279 Asia/Jakarta + "ID", //Z#280 Asia/Jayapura + "IL", //Z#281 Asia/Jerusalem + "AF", //Z#282 Asia/Kabul + "RU", //Z#283 Asia/Kamchatka + "PK", //Z#284 Asia/Karachi + "CN", //Z#285 Asia/Kashgar + "NP", //Z#286 Asia/Kathmandu + "NP", //Z#287 Asia/Katmandu + "RU", //Z#288 Asia/Khandyga + "IN", //Z#289 Asia/Kolkata + "RU", //Z#290 Asia/Krasnoyarsk + "MY", //Z#291 Asia/Kuala_Lumpur + "MY", //Z#292 Asia/Kuching + "KW", //Z#293 Asia/Kuwait + "MO", //Z#294 Asia/Macao + "MO", //Z#295 Asia/Macau + "RU", //Z#296 Asia/Magadan + "ID", //Z#297 Asia/Makassar + "PH", //Z#298 Asia/Manila + "OM", //Z#299 Asia/Muscat + "CY", //Z#300 Asia/Nicosia + "RU", //Z#301 Asia/Novokuznetsk + "RU", //Z#302 Asia/Novosibirsk + "RU", //Z#303 Asia/Omsk + "KZ", //Z#304 Asia/Oral + "KH", //Z#305 Asia/Phnom_Penh + "ID", //Z#306 Asia/Pontianak + "KP", //Z#307 Asia/Pyongyang + "QA", //Z#308 Asia/Qatar + "KZ", //Z#309 Asia/Qostanay + "KZ", //Z#310 Asia/Qyzylorda + "MM", //Z#311 Asia/Rangoon + "SA", //Z#312 Asia/Riyadh + "VN", //Z#313 Asia/Saigon + "RU", //Z#314 Asia/Sakhalin + "UZ", //Z#315 Asia/Samarkand + "KR", //Z#316 Asia/Seoul + "CN", //Z#317 Asia/Shanghai + "SG", //Z#318 Asia/Singapore + "RU", //Z#319 Asia/Srednekolymsk + "TW", //Z#320 Asia/Taipei + "UZ", //Z#321 Asia/Tashkent + "GE", //Z#322 Asia/Tbilisi + "IR", //Z#323 Asia/Tehran + "IL", //Z#324 Asia/Tel_Aviv + "BT", //Z#325 Asia/Thimbu + "BT", //Z#326 Asia/Thimphu + "JP", //Z#327 Asia/Tokyo + "RU", //Z#328 Asia/Tomsk + "ID", //Z#329 Asia/Ujung_Pandang + "MN", //Z#330 Asia/Ulaanbaatar + "MN", //Z#331 Asia/Ulan_Bator + "CN", //Z#332 Asia/Urumqi + "RU", //Z#333 Asia/Ust-Nera + "LA", //Z#334 Asia/Vientiane + "RU", //Z#335 Asia/Vladivostok + "RU", //Z#336 Asia/Yakutsk + "MM", //Z#337 Asia/Yangon + "RU", //Z#338 Asia/Yekaterinburg + "AM", //Z#339 Asia/Yerevan + "PT", //Z#340 Atlantic/Azores + "BM", //Z#341 Atlantic/Bermuda + "ES", //Z#342 Atlantic/Canary + "CV", //Z#343 Atlantic/Cape_Verde + "FO", //Z#344 Atlantic/Faeroe + "FO", //Z#345 Atlantic/Faroe + "SJ", //Z#346 Atlantic/Jan_Mayen + "PT", //Z#347 Atlantic/Madeira + "IS", //Z#348 Atlantic/Reykjavik + "GS", //Z#349 Atlantic/South_Georgia + "SH", //Z#350 Atlantic/St_Helena + "FK", //Z#351 Atlantic/Stanley + "AU", //Z#352 Australia/ACT + "AU", //Z#353 Australia/Adelaide + "AU", //Z#354 Australia/Brisbane + "AU", //Z#355 Australia/Broken_Hill + "AU", //Z#356 Australia/Canberra + "AU", //Z#357 Australia/Currie + "AU", //Z#358 Australia/Darwin + "AU", //Z#359 Australia/Eucla + "AU", //Z#360 Australia/Hobart + "AU", //Z#361 Australia/LHI + "AU", //Z#362 Australia/Lindeman + "AU", //Z#363 Australia/Lord_Howe + "AU", //Z#364 Australia/Melbourne + "AU", //Z#365 Australia/NSW + "AU", //Z#366 Australia/North + "AU", //Z#367 Australia/Perth + "AU", //Z#368 Australia/Queensland + "AU", //Z#369 Australia/South + "AU", //Z#370 Australia/Sydney + "AU", //Z#371 Australia/Tasmania + "AU", //Z#372 Australia/Victoria + "AU", //Z#373 Australia/West + "AU", //Z#374 Australia/Yancowinna + "BR", //Z#375 BET + "BD", //Z#376 BST + "BR", //Z#377 Brazil/Acre + "BR", //Z#378 Brazil/DeNoronha + "BR", //Z#379 Brazil/East + "BR", //Z#380 Brazil/West + "MZ", //Z#381 CAT + "BE", //Z#382 CET + "CA", //Z#383 CNT + "US", //Z#384 CST + "US", //Z#385 CST6CDT + "CN", //Z#386 CTT + "CA", //Z#387 Canada/Atlantic + "CA", //Z#388 Canada/Central + "CA", //Z#389 Canada/East-Saskatchewan + "CA", //Z#390 Canada/Eastern + "CA", //Z#391 Canada/Mountain + "CA", //Z#392 Canada/Newfoundland + "CA", //Z#393 Canada/Pacific + "CA", //Z#394 Canada/Saskatchewan + "CA", //Z#395 Canada/Yukon + "CL", //Z#396 Chile/Continental + "CL", //Z#397 Chile/EasterIsland + "CU", //Z#398 Cuba + "KE", //Z#399 EAT + "FR", //Z#400 ECT + "GR", //Z#401 EET + "PA", //Z#402 EST + "US", //Z#403 EST5EDT + "EG", //Z#404 Egypt + "IE", //Z#405 Eire + "001",//Z#406 Etc/GMT + "001",//Z#407 Etc/GMT+0 + "001",//Z#408 Etc/GMT+1 + "001",//Z#409 Etc/GMT+10 + "001",//Z#410 Etc/GMT+11 + "001",//Z#411 Etc/GMT+12 + "001",//Z#412 Etc/GMT+2 + "001",//Z#413 Etc/GMT+3 + "001",//Z#414 Etc/GMT+4 + "001",//Z#415 Etc/GMT+5 + "001",//Z#416 Etc/GMT+6 + "001",//Z#417 Etc/GMT+7 + "001",//Z#418 Etc/GMT+8 + "001",//Z#419 Etc/GMT+9 + "001",//Z#420 Etc/GMT-0 + "001",//Z#421 Etc/GMT-1 + "001",//Z#422 Etc/GMT-10 + "001",//Z#423 Etc/GMT-11 + "001",//Z#424 Etc/GMT-12 + "001",//Z#425 Etc/GMT-13 + "001",//Z#426 Etc/GMT-14 + "001",//Z#427 Etc/GMT-2 + "001",//Z#428 Etc/GMT-3 + "001",//Z#429 Etc/GMT-4 + "001",//Z#430 Etc/GMT-5 + "001",//Z#431 Etc/GMT-6 + "001",//Z#432 Etc/GMT-7 + "001",//Z#433 Etc/GMT-8 + "001",//Z#434 Etc/GMT-9 + "001",//Z#435 Etc/GMT0 + "001",//Z#436 Etc/Greenwich + "001",//Z#437 Etc/UCT + "001",//Z#438 Etc/UTC + "001",//Z#439 Etc/Universal + "001",//Z#440 Etc/Unknown + "001",//Z#441 Etc/Zulu + "NL", //Z#442 Europe/Amsterdam + "AD", //Z#443 Europe/Andorra + "RU", //Z#444 Europe/Astrakhan + "GR", //Z#445 Europe/Athens + "GB", //Z#446 Europe/Belfast + "RS", //Z#447 Europe/Belgrade + "DE", //Z#448 Europe/Berlin + "SK", //Z#449 Europe/Bratislava + "BE", //Z#450 Europe/Brussels + "RO", //Z#451 Europe/Bucharest + "HU", //Z#452 Europe/Budapest + "DE", //Z#453 Europe/Busingen + "MD", //Z#454 Europe/Chisinau + "DK", //Z#455 Europe/Copenhagen + "IE", //Z#456 Europe/Dublin + "GI", //Z#457 Europe/Gibraltar + "GG", //Z#458 Europe/Guernsey + "FI", //Z#459 Europe/Helsinki + "IM", //Z#460 Europe/Isle_of_Man + "TR", //Z#461 Europe/Istanbul + "JE", //Z#462 Europe/Jersey + "RU", //Z#463 Europe/Kaliningrad + "UA", //Z#464 Europe/Kiev + "RU", //Z#465 Europe/Kirov + "UA", //Z#466 Europe/Kyiv + "PT", //Z#467 Europe/Lisbon + "SI", //Z#468 Europe/Ljubljana + "GB", //Z#469 Europe/London + "LU", //Z#470 Europe/Luxembourg + "ES", //Z#471 Europe/Madrid + "MT", //Z#472 Europe/Malta + "AX", //Z#473 Europe/Mariehamn + "BY", //Z#474 Europe/Minsk + "MC", //Z#475 Europe/Monaco + "RU", //Z#476 Europe/Moscow + "CY", //Z#477 Europe/Nicosia + "NO", //Z#478 Europe/Oslo + "FR", //Z#479 Europe/Paris + "ME", //Z#480 Europe/Podgorica + "CZ", //Z#481 Europe/Prague + "LV", //Z#482 Europe/Riga + "IT", //Z#483 Europe/Rome + "RU", //Z#484 Europe/Samara + "SM", //Z#485 Europe/San_Marino + "BA", //Z#486 Europe/Sarajevo + "RU", //Z#487 Europe/Saratov + "UA", //Z#488 Europe/Simferopol + "MK", //Z#489 Europe/Skopje + "BG", //Z#490 Europe/Sofia + "SE", //Z#491 Europe/Stockholm + "EE", //Z#492 Europe/Tallinn + "AL", //Z#493 Europe/Tirane + "MD", //Z#494 Europe/Tiraspol + "RU", //Z#495 Europe/Ulyanovsk + "UA", //Z#496 Europe/Uzhgorod + "LI", //Z#497 Europe/Vaduz + "VA", //Z#498 Europe/Vatican + "AT", //Z#499 Europe/Vienna + "LT", //Z#500 Europe/Vilnius + "RU", //Z#501 Europe/Volgograd + "PL", //Z#502 Europe/Warsaw + "HR", //Z#503 Europe/Zagreb + "UA", //Z#504 Europe/Zaporozhye + "CH", //Z#505 Europe/Zurich + "001",//Z#506 Factory + "GB", //Z#507 GB + "GB", //Z#508 GB-Eire + "001",//Z#509 GMT + "001",//Z#510 GMT+0 + "001",//Z#511 GMT-0 + "001",//Z#512 GMT0 + "001",//Z#513 Greenwich + "US", //Z#514 HST + "HK", //Z#515 Hongkong + "US", //Z#516 IET + "IN", //Z#517 IST + "CI", //Z#518 Iceland + "MG", //Z#519 Indian/Antananarivo + "IO", //Z#520 Indian/Chagos + "CX", //Z#521 Indian/Christmas + "CC", //Z#522 Indian/Cocos + "KM", //Z#523 Indian/Comoro + "TF", //Z#524 Indian/Kerguelen + "SC", //Z#525 Indian/Mahe + "MV", //Z#526 Indian/Maldives + "MU", //Z#527 Indian/Mauritius + "YT", //Z#528 Indian/Mayotte + "RE", //Z#529 Indian/Reunion + "IR", //Z#530 Iran + "IL", //Z#531 Israel + "JP", //Z#532 JST + "JM", //Z#533 Jamaica + "JP", //Z#534 Japan + "MH", //Z#535 Kwajalein + "LY", //Z#536 Libya + "BE", //Z#537 MET + "WS", //Z#538 MIT + "US", //Z#539 MST + "US", //Z#540 MST7MDT + "MX", //Z#541 Mexico/BajaNorte + "MX", //Z#542 Mexico/BajaSur + "MX", //Z#543 Mexico/General + "AM", //Z#544 NET + "NZ", //Z#545 NST + "NZ", //Z#546 NZ + "NZ", //Z#547 NZ-CHAT + "US", //Z#548 Navajo + "PK", //Z#549 PLT + "US", //Z#550 PNT + "CN", //Z#551 PRC + "PR", //Z#552 PRT + "US", //Z#553 PST + "US", //Z#554 PST8PDT + "WS", //Z#555 Pacific/Apia + "NZ", //Z#556 Pacific/Auckland + "PG", //Z#557 Pacific/Bougainville + "NZ", //Z#558 Pacific/Chatham + "FM", //Z#559 Pacific/Chuuk + "CL", //Z#560 Pacific/Easter + "VU", //Z#561 Pacific/Efate + "KI", //Z#562 Pacific/Enderbury + "TK", //Z#563 Pacific/Fakaofo + "FJ", //Z#564 Pacific/Fiji + "TV", //Z#565 Pacific/Funafuti + "EC", //Z#566 Pacific/Galapagos + "PF", //Z#567 Pacific/Gambier + "SB", //Z#568 Pacific/Guadalcanal + "GU", //Z#569 Pacific/Guam + "US", //Z#570 Pacific/Honolulu + "UM", //Z#571 Pacific/Johnston + "KI", //Z#572 Pacific/Kanton + "KI", //Z#573 Pacific/Kiritimati + "FM", //Z#574 Pacific/Kosrae + "MH", //Z#575 Pacific/Kwajalein + "MH", //Z#576 Pacific/Majuro + "PF", //Z#577 Pacific/Marquesas + "UM", //Z#578 Pacific/Midway + "NR", //Z#579 Pacific/Nauru + "NU", //Z#580 Pacific/Niue + "NF", //Z#581 Pacific/Norfolk + "NC", //Z#582 Pacific/Noumea + "AS", //Z#583 Pacific/Pago_Pago + "PW", //Z#584 Pacific/Palau + "PN", //Z#585 Pacific/Pitcairn + "FM", //Z#586 Pacific/Pohnpei + "FM", //Z#587 Pacific/Ponape + "PG", //Z#588 Pacific/Port_Moresby + "CK", //Z#589 Pacific/Rarotonga + "MP", //Z#590 Pacific/Saipan + "AS", //Z#591 Pacific/Samoa + "PF", //Z#592 Pacific/Tahiti + "KI", //Z#593 Pacific/Tarawa + "TO", //Z#594 Pacific/Tongatapu + "FM", //Z#595 Pacific/Truk + "UM", //Z#596 Pacific/Wake + "WF", //Z#597 Pacific/Wallis + "FM", //Z#598 Pacific/Yap + "PL", //Z#599 Poland + "PT", //Z#600 Portugal + "TW", //Z#601 ROC + "KR", //Z#602 ROK + "SB", //Z#603 SST + "SG", //Z#604 Singapore + "001",//Z#605 SystemV/AST4 + "001",//Z#606 SystemV/AST4ADT + "001",//Z#607 SystemV/CST6 + "001",//Z#608 SystemV/CST6CDT + "001",//Z#609 SystemV/EST5 + "001",//Z#610 SystemV/EST5EDT + "001",//Z#611 SystemV/HST10 + "001",//Z#612 SystemV/MST7 + "001",//Z#613 SystemV/MST7MDT + "001",//Z#614 SystemV/PST8 + "001",//Z#615 SystemV/PST8PDT + "001",//Z#616 SystemV/YST9 + "001",//Z#617 SystemV/YST9YDT + "TR", //Z#618 Turkey + "001",//Z#619 UCT + "US", //Z#620 US/Alaska + "US", //Z#621 US/Aleutian + "US", //Z#622 US/Arizona + "US", //Z#623 US/Central + "US", //Z#624 US/East-Indiana + "US", //Z#625 US/Eastern + "US", //Z#626 US/Hawaii + "US", //Z#627 US/Indiana-Starke + "US", //Z#628 US/Michigan + "US", //Z#629 US/Mountain + "US", //Z#630 US/Pacific + "US", //Z#631 US/Pacific-New + "AS", //Z#632 US/Samoa + "001",//Z#633 UTC + "001",//Z#634 Universal + "VN", //Z#635 VST + "RU", //Z#636 W-SU + "PT", //Z#637 WET + "001",//Z#638 Zulu } } diff --git a/icu4c/source/data/rbnf/LOCALE_DEPS.json b/icu4c/source/data/rbnf/LOCALE_DEPS.json index 5b84d789a2e8..a02f0bca989f 100644 --- a/icu4c/source/data/rbnf/LOCALE_DEPS.json +++ b/icu4c/source/data/rbnf/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "in": "id", diff --git a/icu4c/source/data/rbnf/root.txt b/icu4c/source/data/rbnf/root.txt index 7bdad735a503..5f486984301f 100644 --- a/icu4c/source/data/rbnf/root.txt +++ b/icu4c/source/data/rbnf/root.txt @@ -685,5 +685,5 @@ root{ "0: =#,##0.#=.;", } } - Version{"47"} + Version{"48"} } diff --git a/icu4c/source/data/region/LOCALE_DEPS.json b/icu4c/source/data/region/LOCALE_DEPS.json index fc9c4e7ab9e1..bcc11de59133 100644 --- a/icu4c/source/data/region/LOCALE_DEPS.json +++ b/icu4c/source/data/region/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -19,6 +19,7 @@ "iw": "he", "iw_IL": "he_IL", "ks_IN": "ks_Arab_IN", + "ku_SY": "ku_Latn_SY", "kxv_IN": "kxv_Latn_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", diff --git a/icu4c/source/data/region/ku_Latn.txt b/icu4c/source/data/region/ku_Latn.txt new file mode 100644 index 000000000000..9db3fb301c7a --- /dev/null +++ b/icu4c/source/data/region/ku_Latn.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/ +ku_Latn{ +} diff --git a/icu4c/source/data/region/ku_Latn_SY.txt b/icu4c/source/data/region/ku_Latn_SY.txt new file mode 100644 index 000000000000..eb494ab3895e --- /dev/null +++ b/icu4c/source/data/region/ku_Latn_SY.txt @@ -0,0 +1,9 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/ +/** + * generated alias target + */ +ku_Latn_SY{ + ___{""} +} diff --git a/icu4c/source/data/region/ku_SY.txt b/icu4c/source/data/region/ku_SY.txt new file mode 100644 index 000000000000..5e528bebbb51 --- /dev/null +++ b/icu4c/source/data/region/ku_SY.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/ +ku_SY{ + "%%ALIAS"{"ku_Latn_SY"} +} diff --git a/icu4c/source/data/region/root.txt b/icu4c/source/data/region/root.txt index 5b19c0d2188e..cb032784a252 100644 --- a/icu4c/source/data/region/root.txt +++ b/icu4c/source/data/region/root.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/ root{ - Version{"47"} + Version{"48"} } diff --git a/icu4c/source/data/unidata/CaseFolding.txt b/icu4c/source/data/unidata/CaseFolding.txt index 1b7a9c156c7c..4170744289aa 100644 --- a/icu4c/source/data/unidata/CaseFolding.txt +++ b/icu4c/source/data/unidata/CaseFolding.txt @@ -2,7 +2,7 @@ # Date: 2024-04-30, 21:48:11 GMT # © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use and license, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/copyright.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ diff --git a/icu4c/source/data/unit/LOCALE_DEPS.json b/icu4c/source/data/unit/LOCALE_DEPS.json index fc9c4e7ab9e1..bcc11de59133 100644 --- a/icu4c/source/data/unit/LOCALE_DEPS.json +++ b/icu4c/source/data/unit/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -19,6 +19,7 @@ "iw": "he", "iw_IL": "he_IL", "ks_IN": "ks_Arab_IN", + "ku_SY": "ku_Latn_SY", "kxv_IN": "kxv_Latn_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", diff --git a/icu4c/source/data/unit/af.txt b/icu4c/source/data/unit/af.txt index da5a5052bb25..7ba1791e4a8b 100644 --- a/icu4c/source/data/unit/af.txt +++ b/icu4c/source/data/unit/af.txt @@ -161,6 +161,16 @@ af{ one{"{0} millimol per liter"} other{"{0} millimol per liter"} } + part-per-1e6{ + dnam{"dele per miljoen"} + one{"{0} deel per miljoen"} + other{"{0} dele per miljoen"} + } + part-per-1e9{ + dnam{"deeltjies per miljard"} + one{"{0} deeltjie per miljard"} + other{"{0} deeltjies per miljard"} + } percent{ dnam{"persent"} one{"{0} persent"} @@ -170,20 +180,10 @@ af{ one{"{0} per duisend"} other{"{0} per duisend"} } - permillion{ - dnam{"dele per miljoen"} - one{"{0} deel per miljoen"} - other{"{0} dele per miljoen"} - } permyriad{ one{"{0} per tienduisend"} other{"{0} per tienduisend"} } - portion-per-1e9{ - dnam{"deeltjies per miljard"} - one{"{0} deeltjie per miljard"} - other{"{0} deeltjies per miljard"} - } } consumption{ liter-per-100-kilometer{ @@ -1049,25 +1049,25 @@ af{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + dnam{"d.p.m."} + one{"{0}d.p.m."} + other{"{0} d.p.m."} + } + part-per-1e9{ + dnam{"deeltjies/miljard"} + one{"{0}deeltjie/miljard"} + other{"{0}deeltjies/miljard"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"d.p.m."} - one{"{0}d.p.m."} - other{"{0} d.p.m."} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - dnam{"deeltjies/miljard"} - one{"{0}deeltjie/miljard"} - other{"{0}deeltjies/miljard"} - } } consumption{ liter-per-100-kilometer{ @@ -1806,25 +1806,25 @@ af{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"dele/miljoen"} + one{"{0} d.p.m."} + other{"{0} d.p.m."} + } + part-per-1e9{ + dnam{"deeltjies/miljard"} + one{"{0} deeltjie/miljard"} + other{"{0} deeltjies/miljard"} + } percent{ dnam{"percent"} } permille{ dnam{"per duisend"} } - permillion{ - dnam{"dele/miljoen"} - one{"{0} d.p.m."} - other{"{0} d.p.m."} - } permyriad{ dnam{"per tienduisend"} } - portion-per-1e9{ - dnam{"deeltjies/miljard"} - one{"{0} deeltjie/miljard"} - other{"{0} deeltjies/miljard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ak.txt b/icu4c/source/data/unit/ak.txt index 4220ee1abb25..4cad2f4b4d7e 100644 --- a/icu4c/source/data/unit/ak.txt +++ b/icu4c/source/data/unit/ak.txt @@ -111,6 +111,16 @@ ak{ one{"{0} mole"} other{"{0} mole"} } + part-per-1e6{ + dnam{"paat ɔpepem biara"} + one{"paat ɔpepem biara {0}"} + other{"paat ɔpepem biara {0}"} + } + part-per-1e9{ + dnam{"paat ɔpepepem biara"} + one{"paat ɔpepepem biara {0}"} + other{"paat ɔpepepem biara {0}"} + } percent{ dnam{"ɔha nkyɛmu"} one{"ɔha nkyɛmu {0}"} @@ -121,21 +131,11 @@ ak{ one{"pɛɛmile {0}"} other{"pɛɛmile {0}"} } - permillion{ - dnam{"paat ɔpepem biara"} - one{"paat ɔpepem biara {0}"} - other{"paat ɔpepem biara {0}"} - } permyriad{ dnam{"pɛɛmiride"} one{"pɛɛmiride {0}"} other{"pɛɛmiride {0}"} } - portion-per-1e9{ - dnam{"paat ɔpepepem biara"} - one{"paat ɔpepepem biara {0}"} - other{"paat ɔpepepem biara {0}"} - } } consumption{ liter-per-100-kilometer{ @@ -645,18 +645,18 @@ ak{ millimole-per-liter{ dnam{"milimol/lita"} } + part-per-1e6{ + dnam{"paat ɔpepem biara"} + } + part-per-1e9{ + dnam{"paat ɔpepepem biara"} + } percent{ dnam{"ɔha nkyɛmu"} } - permillion{ - dnam{"paat ɔpepem biara"} - } permyriad{ dnam{"pɛɛmiride"} } - portion-per-1e9{ - dnam{"paat ɔpepepem biara"} - } } consumption{ liter-per-kilometer{ @@ -878,21 +878,21 @@ ak{ mole{ dnam{"mole"} } + part-per-1e6{ + dnam{"paat ɔpepem biara"} + } + part-per-1e9{ + dnam{"paat ɔpepepem biara"} + } percent{ dnam{"ɔha nkyɛmu"} } permille{ dnam{"pɛɛmile"} } - permillion{ - dnam{"paat ɔpepem biara"} - } permyriad{ dnam{"pɛɛmiride"} } - portion-per-1e9{ - dnam{"paat ɔpepepem biara"} - } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/am.txt b/icu4c/source/data/unit/am.txt index 638c622af33f..963704706201 100644 --- a/icu4c/source/data/unit/am.txt +++ b/icu4c/source/data/unit/am.txt @@ -151,6 +151,16 @@ am{ one{"{0} mol"} other{"{0} mol"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} ክፍል በየሚሊዮን"} + other{"{0} ክፍል በየሚሊዮን"} + } + } + one{"{0} ppm"} + other{"{0} ppm"} + } percent{ case{ accusative{ @@ -171,16 +181,6 @@ am{ one{"{0} በማይል"} other{"{0}‰"} } - permillion{ - case{ - accusative{ - one{"{0} ክፍል በየሚሊዮን"} - other{"{0} ክፍል በየሚሊዮን"} - } - } - one{"{0} ppm"} - other{"{0} ppm"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ar.txt b/icu4c/source/data/unit/ar.txt index c39382703ace..14b46d60ba96 100644 --- a/icu4c/source/data/unit/ar.txt +++ b/icu4c/source/data/unit/ar.txt @@ -298,6 +298,26 @@ ar{ mole{ gender{"masculine"} } + part-per-1e6{ + dnam{"جزء في المليون"} + few{"{0} أجزاء في المليون"} + gender{"masculine"} + many{"{0} جزءًا في المليون"} + one{"{0} جزء في المليون"} + other{"{0} جزء في المليون"} + two{"جزآن في المليون"} + zero{"{0} جزء في المليون"} + } + part-per-1e9{ + dnam{"جزء بالمليار"} + few{"{0} أجزاء بالمليار"} + gender{"masculine"} + many{"{0} جزءًا بالمليار"} + one{"{0} جزء بالمليار"} + other{"{0} جزء بالمليار"} + two{"جزآن بالمليار"} + zero{"{0} جزء بالمليار"} + } percent{ few{"{0}٪"} gender{"feminine"} @@ -316,29 +336,9 @@ ar{ two{"{0} في الألف"} zero{"{0} في الألف"} } - permillion{ - dnam{"جزء في المليون"} - few{"{0} أجزاء في المليون"} - gender{"masculine"} - many{"{0} جزءًا في المليون"} - one{"{0} جزء في المليون"} - other{"{0} جزء في المليون"} - two{"جزآن في المليون"} - zero{"{0} جزء في المليون"} - } permyriad{ gender{"feminine"} } - portion-per-1e9{ - dnam{"جزء بالمليار"} - few{"{0} أجزاء بالمليار"} - gender{"masculine"} - many{"{0} جزءًا بالمليار"} - one{"{0} جزء بالمليار"} - other{"{0} جزء بالمليار"} - two{"جزآن بالمليار"} - zero{"{0} جزء بالمليار"} - } } consumption{ liter-per-100-kilometer{ @@ -1381,6 +1381,15 @@ ar{ two{"{0} مغ/ديسيل"} zero{"{0} مغ/ديسيل"} } + part-per-1e9{ + dnam{"جزء/مليار"} + few{"{0} أجزاء/مليار"} + many{"{0} جزءًا/مليار"} + one{"{0} جزء/مليار"} + other{"{0} جزء/مليار"} + two{"جزآن/مليار"} + zero{"{0} جزء/مليار"} + } percent{ dnam{"٪"} } @@ -1396,15 +1405,6 @@ ar{ two{"{0} ؊"} zero{"{0} ؊"} } - portion-per-1e9{ - dnam{"جزء/مليار"} - few{"{0} أجزاء/مليار"} - many{"{0} جزءًا/مليار"} - one{"{0} جزء/مليار"} - other{"{0} جزء/مليار"} - two{"جزآن/مليار"} - zero{"{0} جزء/مليار"} - } } consumption{ liter-per-100-kilometer{ @@ -2030,6 +2030,24 @@ ar{ two{"{0} مول"} zero{"{0} مول"} } + part-per-1e6{ + dnam{"جزء/مليون"} + few{"{0} جزء/مليون"} + many{"{0} جزء/مليون"} + one{"{0} جزء/مليون"} + other{"{0} جزء/مليون"} + two{"{0} جزء/مليون"} + zero{"{0} جزء/مليون"} + } + part-per-1e9{ + dnam{"جزء/مليار"} + few{"{0} أجزاء/مليار"} + many{"{0} جزءًا/مليار"} + one{"{0} جزء/مليار"} + other{"{0} جزء/مليار"} + two{"جزآن/مليار"} + zero{"{0} جزء/مليار"} + } percent{ dnam{"بالمائة"} few{"{0}٪"} @@ -2048,24 +2066,6 @@ ar{ two{"{0}؉"} zero{"{0}؉"} } - permillion{ - dnam{"جزء/مليون"} - few{"{0} جزء/مليون"} - many{"{0} جزء/مليون"} - one{"{0} جزء/مليون"} - other{"{0} جزء/مليون"} - two{"{0} جزء/مليون"} - zero{"{0} جزء/مليون"} - } - portion-per-1e9{ - dnam{"جزء/مليار"} - few{"{0} أجزاء/مليار"} - many{"{0} جزءًا/مليار"} - one{"{0} جزء/مليار"} - other{"{0} جزء/مليار"} - two{"جزآن/مليار"} - zero{"{0} جزء/مليار"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ar_SA.txt b/icu4c/source/data/unit/ar_SA.txt index 6393b48a269c..728ced9e3fb2 100644 --- a/icu4c/source/data/unit/ar_SA.txt +++ b/icu4c/source/data/unit/ar_SA.txt @@ -72,7 +72,7 @@ ar_SA{ } } concentr{ - permillion{ + part-per-1e6{ few{"{0} أجزاء في المليون"} many{"{0} جزءًا في المليون"} one{"{0} جزء في المليون"} @@ -363,7 +363,7 @@ ar_SA{ two{"قيراطان"} zero{"{0} قيراط"} } - permillion{ + part-per-1e6{ few{"{0} أجزاء/مليون"} many{"{0} جزءًا/مليون"} one{"{0} جزء/مليون"} diff --git a/icu4c/source/data/unit/as.txt b/icu4c/source/data/unit/as.txt index 0132e0ec0150..818f58c8f295 100644 --- a/icu4c/source/data/unit/as.txt +++ b/icu4c/source/data/unit/as.txt @@ -117,6 +117,16 @@ as{ one{"প্ৰতি লিটাৰত {0} মিলিমোল"} other{"প্ৰতি লিটাৰত {0} মিলিমোল"} } + part-per-1e6{ + dnam{"প্ৰতি মিলিয়নত ভাগ"} + one{"প্ৰতি মিলিয়নত {0} ভাগ"} + other{"প্ৰতি মিলিয়নত {0} ভাগ"} + } + part-per-1e9{ + dnam{"প্ৰতি বিলিয়নত অংশ"} + one{"{0} প্ৰতি বিলিয়নত অংশ"} + other{"{0} প্ৰতি বিলিয়নত অংশ"} + } percent{ dnam{"%"} one{"{0} শতাংশ"} @@ -126,20 +136,10 @@ as{ one{"{0} প্ৰতিমাইল"} other{"{0} প্ৰতিমাইল"} } - permillion{ - dnam{"প্ৰতি মিলিয়নত ভাগ"} - one{"প্ৰতি মিলিয়নত {0} ভাগ"} - other{"প্ৰতি মিলিয়নত {0} ভাগ"} - } permyriad{ one{"{0} পাৰমিৰেইড"} other{"{0} পাৰমিৰেইড"} } - portion-per-1e9{ - dnam{"প্ৰতি বিলিয়নত অংশ"} - one{"{0} প্ৰতি বিলিয়নত অংশ"} - other{"{0} প্ৰতি বিলিয়নত অংশ"} - } } consumption{ liter-per-100-kilometer{ @@ -799,24 +799,24 @@ as{ 10p9{"গিগা{0}"} } concentr{ + part-per-1e6{ + dnam{"ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -1124,21 +1124,21 @@ as{ one{"{0} ম’ল"} other{"{0} ম’ল"} } + part-per-1e6{ + dnam{"ভাগ/মিলিয়ন"} + } + part-per-1e9{ + dnam{"অংশ/বিলিয়ন"} + } percent{ dnam{"শতাংশ"} } permille{ dnam{"প্ৰতিমাইল"} } - permillion{ - dnam{"ভাগ/মিলিয়ন"} - } permyriad{ dnam{"পাৰমিৰেইড"} } - portion-per-1e9{ - dnam{"অংশ/বিলিয়ন"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ast.txt b/icu4c/source/data/unit/ast.txt index 179abb3c57e5..af48fbcdb2be 100644 --- a/icu4c/source/data/unit/ast.txt +++ b/icu4c/source/data/unit/ast.txt @@ -108,7 +108,7 @@ ast{ one{"{0} milimol per llitru"} other{"{0} milimoles per llitru"} } - permillion{ + part-per-1e6{ dnam{"partes per millón"} one{"{0} parte per millón"} other{"{0} partes per millón"} @@ -774,7 +774,7 @@ ast{ one{"{0}mmol/L"} other{"{0}mmol/L"} } - permillion{ + part-per-1e6{ one{"{0}ppm"} other{"{0}ppm"} } diff --git a/icu4c/source/data/unit/az.txt b/icu4c/source/data/unit/az.txt index 0f791791f71e..2d2796eb990f 100644 --- a/icu4c/source/data/unit/az.txt +++ b/icu4c/source/data/unit/az.txt @@ -147,6 +147,16 @@ az{ one{"{0} millimol/litr"} other{"{0} millimol/litr"} } + part-per-1e6{ + dnam{"milyonda hissəcik"} + one{"{0} milyonda hissəcik"} + other{"{0} milyonda hissəcik"} + } + part-per-1e9{ + dnam{"bir milyarda düşən hissə sayı"} + one{"bir milyarda düşən {0} hissə"} + other{"bir milyarda düşən {0} hissə"} + } percent{ one{"{0} faiz"} other{"{0} faiz"} @@ -155,20 +165,10 @@ az{ one{"{0} promil"} other{"{0} promil"} } - permillion{ - dnam{"milyonda hissəcik"} - one{"{0} milyonda hissəcik"} - other{"{0} milyonda hissəcik"} - } permyriad{ one{"{0} permiriada"} other{"{0} permiriada"} } - portion-per-1e9{ - dnam{"bir milyarda düşən hissə sayı"} - one{"bir milyarda düşən {0} hissə"} - other{"bir milyarda düşən {0} hissə"} - } } consumption{ liter-per-100-kilometer{ @@ -843,16 +843,16 @@ az{ 10p3{"k{0}"} } concentr{ + part-per-1e6{ + one{"{0} hs/mln"} + other{"{0}ppm"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - one{"{0} hs/mln"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} } @@ -1194,23 +1194,23 @@ az{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"hissəcik/milyon"} + one{"{0} hs/mln"} + other{"{0} hs/mln"} + } + part-per-1e9{ + dnam{"hissə/milyard"} + } percent{ dnam{"faiz"} } permille{ dnam{"promil"} } - permillion{ - dnam{"hissəcik/milyon"} - one{"{0} hs/mln"} - other{"{0} hs/mln"} - } permyriad{ dnam{"permiriada"} } - portion-per-1e9{ - dnam{"hissə/milyard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/be.txt b/icu4c/source/data/unit/be.txt index 008291533e00..70a772c0c188 100644 --- a/icu4c/source/data/unit/be.txt +++ b/icu4c/source/data/unit/be.txt @@ -231,6 +231,20 @@ be{ mole{ dnam{"молі"} } + part-per-1e6{ + dnam{"часткі на мільён"} + few{"{0} часткі на мільён"} + many{"{0} частак на мільён"} + one{"{0} частка на мільён"} + other{"{0} часткі на мільён"} + } + part-per-1e9{ + dnam{"частак на мільярд"} + few{"{0} часткі на мільярд"} + many{"{0} частак на мільярд"} + one{"{0} частка на мільярд"} + other{"{0} часткі на мільярд"} + } percent{ dnam{"працэнтаў"} few{"{0} працэнты"} @@ -245,13 +259,6 @@ be{ one{"{0} праміле"} other{"{0} праміле"} } - permillion{ - dnam{"часткі на мільён"} - few{"{0} часткі на мільён"} - many{"{0} частак на мільён"} - one{"{0} частка на мільён"} - other{"{0} часткі на мільён"} - } permyriad{ dnam{"базісныя пункты"} few{"{0} базісныя пункты"} @@ -259,13 +266,6 @@ be{ one{"{0} базісны пункт"} other{"{0} базіснага пункта"} } - portion-per-1e9{ - dnam{"частак на мільярд"} - few{"{0} часткі на мільярд"} - many{"{0} частак на мільярд"} - one{"{0} частка на мільярд"} - other{"{0} часткі на мільярд"} - } } consumption{ liter-per-100-kilometer{ @@ -1331,19 +1331,19 @@ be{ times{"{0}{1}"} } concentr{ - percent{ - few{"{0}%"} - many{"{0}%"} - one{"{0}%"} - other{"{0}%"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"ч/млрд"} few{"{0} ч/млрд"} many{"{0} ч/млрд"} one{"{0} ч/млрд"} other{"{0} ч/млрд"} } + percent{ + few{"{0}%"} + many{"{0}%"} + one{"{0}%"} + other{"{0}%"} + } } coordinate{ east{"{0} У"} @@ -1574,6 +1574,13 @@ be{ one{"{0} моль"} other{"{0} молі"} } + part-per-1e9{ + dnam{"частак/мільярд"} + few{"{0} ч/млрд"} + many{"{0} ч/млрд"} + one{"{0} ч/млрд"} + other{"{0} ч/млрд"} + } percent{ few{"{0} %"} many{"{0} %"} @@ -1592,13 +1599,6 @@ be{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"частак/мільярд"} - few{"{0} ч/млрд"} - many{"{0} ч/млрд"} - one{"{0} ч/млрд"} - other{"{0} ч/млрд"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/bg.txt b/icu4c/source/data/unit/bg.txt index 9c800092fdc8..d1485a7fca4c 100644 --- a/icu4c/source/data/unit/bg.txt +++ b/icu4c/source/data/unit/bg.txt @@ -169,6 +169,16 @@ bg{ one{"{0} мол"} other{"{0} мола"} } + part-per-1e6{ + dnam{"части на милион"} + one{"{0} част на милион"} + other{"{0} части на милион"} + } + part-per-1e9{ + dnam{"части на милиард"} + one{"{0} част на милиард"} + other{"{0} части на милиард"} + } percent{ one{"{0} процент"} other{"{0} процента"} @@ -178,20 +188,10 @@ bg{ one{"{0} промил"} other{"{0} промила"} } - permillion{ - dnam{"части на милион"} - one{"{0} част на милион"} - other{"{0} части на милион"} - } permyriad{ one{"{0} базисен пункт"} other{"{0} базисни пункта"} } - portion-per-1e9{ - dnam{"части на милиард"} - one{"{0} част на милиард"} - other{"{0} части на милиард"} - } } consumption{ liter-per-100-kilometer{ @@ -1185,15 +1185,15 @@ bg{ one{"{0} мол"} other{"{0} мол"} } + part-per-1e9{ + dnam{"части/милиард"} + } percent{ dnam{"процент"} } permyriad{ dnam{"базисен пункт"} } - portion-per-1e9{ - dnam{"части/милиард"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/blo.txt b/icu4c/source/data/unit/blo.txt index 54affa2f0125..c2f7ca69eb12 100644 --- a/icu4c/source/data/unit/blo.txt +++ b/icu4c/source/data/unit/blo.txt @@ -1062,6 +1062,16 @@ blo{ other{"mol{0}"} zero{"mol{0}"} } + part-per-1e6{ + one{"ppm{0}"} + other{"ppm{0}"} + zero{"ppm{0}"} + } + part-per-1e9{ + one{"ppb{0}"} + other{"ppb{0}"} + zero{"ppb{0}"} + } percent{ one{"%{0}"} other{"%{0}"} @@ -1072,21 +1082,11 @@ blo{ other{"‰{0}"} zero{"‰{0}"} } - permillion{ - one{"ppm{0}"} - other{"ppm{0}"} - zero{"ppm{0}"} - } permyriad{ one{"‱{0}"} other{"‱{0}"} zero{"‱{0}"} } - portion-per-1e9{ - one{"ppb{0}"} - other{"ppb{0}"} - zero{"ppb{0}"} - } } consumption{ liter-per-100-kilometer{ @@ -1838,6 +1838,16 @@ blo{ other{"mol {0}"} zero{"mol {0}"} } + part-per-1e6{ + one{"ppm {0}"} + other{"ppm {0}"} + zero{"ppm {0}"} + } + part-per-1e9{ + one{"ppb {0}"} + other{"ppb {0}"} + zero{"ppb {0}"} + } percent{ one{"%{0}"} other{"%{0}"} @@ -1848,21 +1858,11 @@ blo{ other{"‰{0}"} zero{"‰{0}"} } - permillion{ - one{"ppm {0}"} - other{"ppm {0}"} - zero{"ppm {0}"} - } permyriad{ one{"‱{0}"} other{"‱{0}"} zero{"‱{0}"} } - portion-per-1e9{ - one{"ppb {0}"} - other{"ppb {0}"} - zero{"ppb {0}"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/bn.txt b/icu4c/source/data/unit/bn.txt index fd601fadc236..4872db0c3255 100644 --- a/icu4c/source/data/unit/bn.txt +++ b/icu4c/source/data/unit/bn.txt @@ -146,6 +146,16 @@ bn{ one{"{0} মোল"} other{"{0} মোল্স"} } + part-per-1e6{ + dnam{"ভাগ, প্রতি মিলিয়নে"} + one{"{0} ভাগ, প্রতি মিলিয়নে"} + other{"{0} ভাগ, প্রতি মিলিয়নে"} + } + part-per-1e9{ + dnam{"পার্ট প্রতি বিলিয়ন"} + one{"{0} পার্ট প্রতি বিলিয়ন"} + other{"{0} পার্ট প্রতি বিলিয়ন"} + } percent{ one{"{0}শতাংশ"} other{"{0}শতাংশ"} @@ -154,20 +164,10 @@ bn{ one{"{0} প্রতিমাইল"} other{"{0}প্রতিমাইল"} } - permillion{ - dnam{"ভাগ, প্রতি মিলিয়নে"} - one{"{0} ভাগ, প্রতি মিলিয়নে"} - other{"{0} ভাগ, প্রতি মিলিয়নে"} - } permyriad{ one{"{0} পারমিরিয়াড"} other{"{0} পারমিরিয়াড"} } - portion-per-1e9{ - dnam{"পার্ট প্রতি বিলিয়ন"} - one{"{0} পার্ট প্রতি বিলিয়ন"} - other{"{0} পার্ট প্রতি বিলিয়ন"} - } } consumption{ liter-per-100-kilometer{ @@ -886,13 +886,13 @@ bn{ 10p9{"গি{0}"} } concentr{ - permille{ - dnam{"‰"} - } - portion-per-1e9{ + part-per-1e9{ one{"{0}ppb"} other{"{0} ppb"} } + permille{ + dnam{"‰"} + } } consumption{ mile-per-gallon-imperial{ @@ -1232,6 +1232,9 @@ bn{ one{"{0} মোল"} other{"{0} মোল"} } + part-per-1e9{ + dnam{"পার্ট/ বিলিয়ন"} + } percent{ dnam{"শতাংশ"} } @@ -1241,9 +1244,6 @@ bn{ permyriad{ dnam{"পারমিরিয়াড"} } - portion-per-1e9{ - dnam{"পার্ট/ বিলিয়ন"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/br.txt b/icu4c/source/data/unit/br.txt index d7906f86f920..92130c01276c 100644 --- a/icu4c/source/data/unit/br.txt +++ b/icu4c/source/data/unit/br.txt @@ -1674,6 +1674,13 @@ br{ other{"{0}mol"} two{"{0}mol"} } + part-per-1e6{ + few{"{0}ppm"} + many{"{0}ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + two{"{0}ppm"} + } percent{ few{"{0}%"} many{"{0}%"} @@ -1688,13 +1695,6 @@ br{ other{"{0}‰"} two{"{0}‰"} } - permillion{ - few{"{0}ppm"} - many{"{0}ppm"} - one{"{0}ppm"} - other{"{0}ppm"} - two{"{0}ppm"} - } permyriad{ few{"{0}‱"} many{"{0}‱"} diff --git a/icu4c/source/data/unit/bs.txt b/icu4c/source/data/unit/bs.txt index 0124e34948e0..d150ec327ed0 100644 --- a/icu4c/source/data/unit/bs.txt +++ b/icu4c/source/data/unit/bs.txt @@ -170,6 +170,12 @@ bs{ one{"{0} mol"} other{"{0} mola"} } + part-per-1e6{ + dnam{"dijelovi na milion"} + few{"{0} dijela na milion"} + one{"{0} dio na milion"} + other{"{0} dijelova na milion"} + } percent{ dnam{"procenat"} few{"{0} procenta"} @@ -182,12 +188,6 @@ bs{ one{"{0} promil"} other{"{0} promila"} } - permillion{ - dnam{"dijelovi na milion"} - few{"{0} dijela na milion"} - one{"{0} dio na milion"} - other{"{0} dijelova na milion"} - } permyriad{ dnam{"permyriad"} few{"{0} permyriada"} @@ -1122,7 +1122,7 @@ bs{ } } concentr{ - permillion{ + part-per-1e6{ dnam{"ppm"} } } @@ -1404,7 +1404,7 @@ bs{ millimole-per-liter{ dnam{"milimol/litar"} } - permillion{ + part-per-1e6{ dnam{"dijelovi/milion"} } } diff --git a/icu4c/source/data/unit/ca.txt b/icu4c/source/data/unit/ca.txt index c6ba51ea111c..2421e6112c02 100644 --- a/icu4c/source/data/unit/ca.txt +++ b/icu4c/source/data/unit/ca.txt @@ -199,6 +199,18 @@ ca{ one{"{0} mol"} other{"{0} mols"} } + part-per-1e6{ + dnam{"parts per milió"} + gender{"masculine"} + one{"{0} part per milió"} + other{"{0} parts per milió"} + } + part-per-1e9{ + dnam{"part per mil milions"} + gender{"masculine"} + one{"{0} part per mil milions"} + other{"{0} parts per mil milions"} + } percent{ gender{"masculine"} one{"{0} per cent"} @@ -209,23 +221,11 @@ ca{ one{"{0} per mil"} other{"{0} per mil"} } - permillion{ - dnam{"parts per milió"} - gender{"masculine"} - one{"{0} part per milió"} - other{"{0} parts per milió"} - } permyriad{ gender{"masculine"} one{"{0} per deu mil"} other{"{0} per deu mil"} } - portion-per-1e9{ - dnam{"part per mil milions"} - gender{"masculine"} - one{"{0} part per mil milions"} - other{"{0} parts per mil milions"} - } } consumption{ liter-per-100-kilometer{ @@ -1187,15 +1187,15 @@ ca{ millimole-per-liter{ dnam{"mM/l"} } + part-per-1e6{ + dnam{"ppm"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } permyriad{ dnam{"‱"} } @@ -1409,6 +1409,12 @@ ca{ one{"{0} mM/l"} other{"{0} mM/l"} } + part-per-1e6{ + dnam{"parts/milió"} + } + part-per-1e9{ + dnam{"part/mil milions"} + } percent{ dnam{"per cent"} one{"{0} %"} @@ -1419,17 +1425,11 @@ ca{ one{"{0} ‰"} other{"{0} ‰"} } - permillion{ - dnam{"parts/milió"} - } permyriad{ dnam{"per deu mil"} one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"part/mil milions"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ccp.txt b/icu4c/source/data/unit/ccp.txt index 92b665d00700..0404d812f9a7 100644 --- a/icu4c/source/data/unit/ccp.txt +++ b/icu4c/source/data/unit/ccp.txt @@ -97,7 +97,7 @@ ccp{ one{"{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬"} other{"{0} 𑄟𑄨𑄣𑄨𑄟𑄮𑄣𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄣𑄨𑄑𑄢𑄬"} } - permillion{ + part-per-1e6{ dnam{"𑄞𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄬𑄉"} one{"{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬"} other{"{0} 𑄞𑄧𑄇𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄘𑄧𑄌𑄴 𑄣𑄉𑄬"} diff --git a/icu4c/source/data/unit/ceb.txt b/icu4c/source/data/unit/ceb.txt index 05f4dd234195..816a94f4f2c6 100644 --- a/icu4c/source/data/unit/ceb.txt +++ b/icu4c/source/data/unit/ceb.txt @@ -167,6 +167,11 @@ ceb{ one{"{0} ka mole"} other{"{0} ka mga mole"} } + part-per-1e6{ + dnam{"mga part per million"} + one{"{0} ka part per million"} + other{"{0} ka mga part per million"} + } percent{ one{"{0} ka porsyento"} other{"{0} ka porsyento"} @@ -175,11 +180,6 @@ ceb{ one{"{0} ka permille"} other{"{0} ka permille"} } - permillion{ - dnam{"mga part per million"} - one{"{0} ka part per million"} - other{"{0} ka mga part per million"} - } permyriad{ one{"{0} ka permyriad"} other{"{0} ka permyriad"} @@ -1098,15 +1098,15 @@ ceb{ mole{ dnam{"mole"} } + part-per-1e6{ + dnam{"mga part/million"} + } percent{ dnam{"porsyento"} } permille{ dnam{"permille"} } - permillion{ - dnam{"mga part/million"} - } permyriad{ dnam{"permyriad"} } diff --git a/icu4c/source/data/unit/chr.txt b/icu4c/source/data/unit/chr.txt index a846ab065c1e..d2abfbe1cc44 100644 --- a/icu4c/source/data/unit/chr.txt +++ b/icu4c/source/data/unit/chr.txt @@ -170,6 +170,16 @@ chr{ one{"{0} ᎼᎴ"} other{"{0} ᎼᎴᏍ"} } + part-per-1e6{ + dnam{"ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"} + one{"{0} ᎤᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"} + other{"{0} ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"} + } + part-per-1e9{ + dnam{"ᏚᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ"} + one{"{0} ᎤᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ"} + other{"{0} ᏚᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ"} + } percent{ one{"{0} ᏓᎬᏩᎶᏛ"} other{"{0} ᏓᎬᏩᎶᏛ"} @@ -178,20 +188,10 @@ chr{ one{"{0} ᏈᎻᎴ"} other{"{0} ᏈᎻᎴ"} } - permillion{ - dnam{"ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"} - one{"{0} ᎤᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"} - other{"{0} ᏚᏙᏢᏒ ᎢᏳᏆᏗᏅᏛ ᎢᏳᏓᎵ"} - } permyriad{ one{"{0} ᏋᎻᎵᎠᏗ"} other{"{0} ᏋᎻᎵᎠᏗ"} } - portion-per-1e9{ - dnam{"ᏚᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ"} - one{"{0} ᎤᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ"} - other{"{0} ᏚᏙᏢᏒ ᎢᏳᏓᎵ ᎢᏳᏔᎵᎳᏗᏅᏛ"} - } } consumption{ liter-per-100-kilometer{ @@ -1084,24 +1084,24 @@ chr{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + dnam{"ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -1933,21 +1933,21 @@ chr{ mole{ dnam{"ᎼᎴ"} } + part-per-1e6{ + dnam{"ᏚᏙᏢᏒ/ᎢᏳᏆᏗᏅᏛ"} + } + part-per-1e9{ + dnam{"ᏚᏙᏢᏒ/ᎢᏳᏔᎵᎳᏗᏅᏛ"} + } percent{ dnam{"ᏓᎬᏩᎶᏛ"} } permille{ dnam{"ᏈᎻᎴ"} } - permillion{ - dnam{"ᏚᏙᏢᏒ/ᎢᏳᏆᏗᏅᏛ"} - } permyriad{ dnam{"ᏋᎻᎵᎠᏗ"} } - portion-per-1e9{ - dnam{"ᏚᏙᏢᏒ/ᎢᏳᏔᎵᎳᏗᏅᏛ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/cs.txt b/icu4c/source/data/unit/cs.txt index 914066d17e22..d3bc45f40da2 100644 --- a/icu4c/source/data/unit/cs.txt +++ b/icu4c/source/data/unit/cs.txt @@ -942,6 +942,86 @@ cs{ one{"{0} mol"} other{"{0} molů"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} díly z milionu"} + many{"{0} dílu z milionu"} + one{"{0} díl z milionu"} + other{"{0} dílů z milionu"} + } + dative{ + few{"{0} dílům z milionu"} + many{"{0} dílu z milionu"} + one{"{0} dílu z milionu"} + other{"{0} dílům z milionu"} + } + genitive{ + few{"{0} dílů z milionu"} + many{"{0} dílu z milionu"} + one{"{0} dílu z milionu"} + other{"{0} dílů z milionu"} + } + instrumental{ + few{"{0} díly z milionu"} + many{"{0} dílu z milionu"} + one{"{0} dílem z milionu"} + other{"{0} díly z milionu"} + } + locative{ + few{"{0} dílech z milionu"} + many{"{0} dílu z milionu"} + one{"{0} dílu z milionu"} + other{"{0} dílech z milionu"} + } + } + dnam{"díly z milionu"} + few{"{0} díly z milionu"} + gender{"inanimate"} + many{"{0} dílu z milionu"} + one{"{0} díl z milionu"} + other{"{0} dílů z milionu"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} částice na miliardu"} + many{"{0} částice na miliardu"} + one{"{0} částici na miliardu"} + other{"{0} částic na miliardu"} + } + dative{ + few{"{0} částicím na miliardu"} + many{"{0} částice na miliardu"} + one{"{0} částici na miliardu"} + other{"{0} částicím na miliardu"} + } + genitive{ + few{"{0} částic na miliardu"} + many{"{0} částice na miliardu"} + one{"{0} částice na miliardu"} + other{"{0} částic na miliardu"} + } + instrumental{ + few{"{0} částicemi na miliardu"} + many{"{0} částice na miliardu"} + one{"{0} částicí na miliardu"} + other{"{0} částicemi na miliardu"} + } + locative{ + few{"{0} částicích na miliardu"} + many{"{0} částice na miliardu"} + one{"{0} částici na miliardu"} + other{"{0} částicích na miliardu"} + } + } + dnam{"částice na miliardu"} + few{"{0} částice na miliardu"} + gender{"feminine"} + many{"{0} částice na miliardu"} + one{"{0} částice na miliardu"} + other{"{0} částic na miliardu"} + } percent{ case{ accusative{ @@ -1022,46 +1102,6 @@ cs{ one{"{0} promile"} other{"{0} promile"} } - permillion{ - case{ - accusative{ - few{"{0} díly z milionu"} - many{"{0} dílu z milionu"} - one{"{0} díl z milionu"} - other{"{0} dílů z milionu"} - } - dative{ - few{"{0} dílům z milionu"} - many{"{0} dílu z milionu"} - one{"{0} dílu z milionu"} - other{"{0} dílům z milionu"} - } - genitive{ - few{"{0} dílů z milionu"} - many{"{0} dílu z milionu"} - one{"{0} dílu z milionu"} - other{"{0} dílů z milionu"} - } - instrumental{ - few{"{0} díly z milionu"} - many{"{0} dílu z milionu"} - one{"{0} dílem z milionu"} - other{"{0} díly z milionu"} - } - locative{ - few{"{0} dílech z milionu"} - many{"{0} dílu z milionu"} - one{"{0} dílu z milionu"} - other{"{0} dílech z milionu"} - } - } - dnam{"díly z milionu"} - few{"{0} díly z milionu"} - gender{"inanimate"} - many{"{0} dílu z milionu"} - one{"{0} díl z milionu"} - other{"{0} dílů z milionu"} - } permyriad{ case{ accusative{ @@ -1102,46 +1142,6 @@ cs{ one{"{0} desetina promile"} other{"{0} desetin promile"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} částice na miliardu"} - many{"{0} částice na miliardu"} - one{"{0} částici na miliardu"} - other{"{0} částic na miliardu"} - } - dative{ - few{"{0} částicím na miliardu"} - many{"{0} částice na miliardu"} - one{"{0} částici na miliardu"} - other{"{0} částicím na miliardu"} - } - genitive{ - few{"{0} částic na miliardu"} - many{"{0} částice na miliardu"} - one{"{0} částice na miliardu"} - other{"{0} částic na miliardu"} - } - instrumental{ - few{"{0} částicemi na miliardu"} - many{"{0} částice na miliardu"} - one{"{0} částicí na miliardu"} - other{"{0} částicemi na miliardu"} - } - locative{ - few{"{0} částicích na miliardu"} - many{"{0} částice na miliardu"} - one{"{0} částici na miliardu"} - other{"{0} částicích na miliardu"} - } - } - dnam{"částice na miliardu"} - few{"{0} částice na miliardu"} - gender{"feminine"} - many{"{0} částice na miliardu"} - one{"{0} částice na miliardu"} - other{"{0} částic na miliardu"} - } } consumption{ liter-per-100-kilometer{ @@ -5751,6 +5751,13 @@ cs{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"částic/mld."} + few{"{0} částice na mld"} + many{"{0} částic na mld"} + one{"{0} částice na mld"} + other{"{0} částic na mld"} + } percent{ few{"{0} %"} many{"{0} %"} @@ -5769,13 +5776,6 @@ cs{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"částic/mld."} - few{"{0} částice na mld"} - many{"{0} částic na mld"} - one{"{0} částice na mld"} - other{"{0} částic na mld"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/cy.txt b/icu4c/source/data/unit/cy.txt index 37a058d5c544..954c6dbe0bf7 100644 --- a/icu4c/source/data/unit/cy.txt +++ b/icu4c/source/data/unit/cy.txt @@ -263,6 +263,24 @@ cy{ mole{ dnam{"molau"} } + part-per-1e6{ + dnam{"rhannau pob miliwn"} + few{"{0} rhan pob miliwn"} + many{"{0} rhan pob miliwn"} + one{"{0} rhan pob miliwn"} + other{"{0} rhan pob miliwn"} + two{"{0} ran pob miliwn"} + zero{"{0} rhan pob miliwn"} + } + part-per-1e9{ + dnam{"rhannau fesul biliwn"} + few{"{0} rhan fesul biliwn"} + many{"{0} rhan fesul biliwn"} + one{"{0} rhan fesul biliwn"} + other{"{0} rhan fesul biliwn"} + two{"{0} rhan fesul biliwn"} + zero{"ppb"} + } percent{ few{"{0}%"} many{"{0}%"} @@ -279,15 +297,6 @@ cy{ two{"{0}‰"} zero{"{0}‰"} } - permillion{ - dnam{"rhannau pob miliwn"} - few{"{0} rhan pob miliwn"} - many{"{0} rhan pob miliwn"} - one{"{0} rhan pob miliwn"} - other{"{0} rhan pob miliwn"} - two{"{0} ran pob miliwn"} - zero{"{0} rhan pob miliwn"} - } permyriad{ few{"{0}‱"} many{"{0}‱"} @@ -296,15 +305,6 @@ cy{ two{"{0}‱"} zero{"{0}‱"} } - portion-per-1e9{ - dnam{"rhannau fesul biliwn"} - few{"{0} rhan fesul biliwn"} - many{"{0} rhan fesul biliwn"} - one{"{0} rhan fesul biliwn"} - other{"{0} rhan fesul biliwn"} - two{"{0} rhan fesul biliwn"} - zero{"ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -1728,10 +1728,7 @@ cy{ two{"{0} kt"} zero{"{0} kt"} } - percent{ - dnam{"%"} - } - portion-per-1e9{ + part-per-1e9{ few{"{0} ppb"} many{"{0} ppb"} one{"{0}ppb"} @@ -1739,6 +1736,9 @@ cy{ two{"{0} ppb"} zero{"{0} ppb"} } + percent{ + dnam{"%"} + } } consumption{ liter-per-100-kilometer{ @@ -2893,21 +2893,21 @@ cy{ two{"{0} môl"} zero{"{0} môl"} } + part-per-1e6{ + dnam{"rhan/miliwn"} + } + part-per-1e9{ + dnam{"rhannau/biliwn"} + } percent{ dnam{"y cant"} } permille{ dnam{"permille"} } - permillion{ - dnam{"rhan/miliwn"} - } permyriad{ dnam{"permyriad"} } - portion-per-1e9{ - dnam{"rhannau/biliwn"} - } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/da.txt b/icu4c/source/data/unit/da.txt index c02333fd0ede..64a728f4b610 100644 --- a/icu4c/source/data/unit/da.txt +++ b/icu4c/source/data/unit/da.txt @@ -308,6 +308,30 @@ da{ one{"{0} mol"} other{"{0} mol"} } + part-per-1e6{ + case{ + genitive{ + one{"{0} part per millions"} + other{"{0} parts per millions"} + } + } + dnam{"parts per million"} + gender{"common"} + one{"{0} part per million"} + other{"{0} parts per million"} + } + part-per-1e9{ + case{ + genitive{ + one{"{0} milliardtedels"} + other{"{0} milliardtedeles"} + } + } + dnam{"milliardtedele"} + gender{"common"} + one{"{0} milliardtedel"} + other{"{0} milliardtedele"} + } percent{ case{ genitive{ @@ -332,33 +356,9 @@ da{ one{"{0} promille"} other{"{0} promille"} } - permillion{ - case{ - genitive{ - one{"{0} part per millions"} - other{"{0} parts per millions"} - } - } - dnam{"parts per million"} - gender{"common"} - one{"{0} part per million"} - other{"{0} parts per million"} - } permyriad{ gender{"common"} } - portion-per-1e9{ - case{ - genitive{ - one{"{0} milliardtedels"} - other{"{0} milliardtedeles"} - } - } - dnam{"milliardtedele"} - gender{"common"} - one{"{0} milliardtedel"} - other{"{0} milliardtedele"} - } } consumption{ liter-per-100-kilometer{ @@ -2190,6 +2190,9 @@ da{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"dele/milliard"} + } percent{ dnam{"pct."} one{"{0} pct."} @@ -2203,9 +2206,6 @@ da{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"dele/milliard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/de.txt b/icu4c/source/data/unit/de.txt index dd87018debb2..6609045a45d8 100644 --- a/icu4c/source/data/unit/de.txt +++ b/icu4c/source/data/unit/de.txt @@ -506,6 +506,46 @@ de{ one{"{0} Mol"} other{"{0} Mol"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} Millionstel"} + other{"{0} Millionstel"} + } + dative{ + one{"{0} Millionstel"} + other{"{0} Millionsteln"} + } + genitive{ + one{"{0} Millionstels"} + other{"{0} Millionstel"} + } + } + dnam{"Millionstel"} + gender{"neuter"} + one{"{0} Millionstel"} + other{"{0} Millionstel"} + } + part-per-1e9{ + case{ + accusative{ + one{"{0} Milliardstel"} + other{"{0} Milliardstel"} + } + dative{ + one{"{0} Milliardstel"} + other{"{0} Milliardsteln"} + } + genitive{ + one{"{0} Milliardstels"} + other{"{0} Milliardstel"} + } + } + dnam{"Milliardstel"} + gender{"neuter"} + one{"{0} Milliardstel"} + other{"{0} Milliardstel"} + } percent{ case{ accusative{ @@ -546,26 +586,6 @@ de{ one{"{0} Promille"} other{"{0} Promille"} } - permillion{ - case{ - accusative{ - one{"{0} Millionstel"} - other{"{0} Millionstel"} - } - dative{ - one{"{0} Millionstel"} - other{"{0} Millionsteln"} - } - genitive{ - one{"{0} Millionstels"} - other{"{0} Millionstel"} - } - } - dnam{"Millionstel"} - gender{"neuter"} - one{"{0} Millionstel"} - other{"{0} Millionstel"} - } permyriad{ case{ accusative{ @@ -586,26 +606,6 @@ de{ one{"{0} pro Zehntausend"} other{"{0} pro Zehntausend"} } - portion-per-1e9{ - case{ - accusative{ - one{"{0} Milliardstel"} - other{"{0} Milliardstel"} - } - dative{ - one{"{0} Milliardstel"} - other{"{0} Milliardsteln"} - } - genitive{ - one{"{0} Milliardstels"} - other{"{0} Milliardstel"} - } - } - dnam{"Milliardstel"} - gender{"neuter"} - one{"{0} Milliardstel"} - other{"{0} Milliardstel"} - } } consumption{ liter-per-100-kilometer{ @@ -3850,6 +3850,11 @@ de{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"Milliardstel"} + one{"{0} Milliardstel"} + other{"{0} Milliardstel"} + } percent{ one{"{0} %"} other{"{0} %"} @@ -3862,11 +3867,6 @@ de{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"Milliardstel"} - one{"{0} Milliardstel"} - other{"{0} Milliardstel"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/doi.txt b/icu4c/source/data/unit/doi.txt index ea1c161c1210..a412a8f40dbf 100644 --- a/icu4c/source/data/unit/doi.txt +++ b/icu4c/source/data/unit/doi.txt @@ -73,15 +73,15 @@ doi{ mole{ dnam{"मोल"} } + part-per-1e6{ + dnam{"हिस्से फी दस लक्ख"} + } percent{ dnam{"प्रतिशत/फीसदी"} } permille{ dnam{"फी ज्हार"} } - permillion{ - dnam{"हिस्से फी दस लक्ख"} - } permyriad{ dnam{"फी दस ज्हार"} } @@ -639,7 +639,7 @@ doi{ mole{ dnam{"मोल"} } - permillion{ + part-per-1e6{ dnam{"हिफीदल"} } } @@ -1101,15 +1101,15 @@ doi{ mole{ dnam{"मोल"} } + part-per-1e6{ + dnam{"हिस्से/दस लक्ख"} + } percent{ dnam{"प्रतिशत/फीसदी"} } permille{ dnam{"फी ज्हार"} } - permillion{ - dnam{"हिस्से/दस लक्ख"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/dsb.txt b/icu4c/source/data/unit/dsb.txt index 9490698c8a1d..8594e74854f2 100644 --- a/icu4c/source/data/unit/dsb.txt +++ b/icu4c/source/data/unit/dsb.txt @@ -249,6 +249,20 @@ dsb{ other{"{0} molow"} two{"{0} mola"} } + part-per-1e6{ + dnam{"milionśiny"} + few{"{0} milionśiny"} + one{"{0} milionśina"} + other{"{0} milionśinow"} + two{"{0} milionśinje"} + } + part-per-1e9{ + dnam{"miliardnina"} + few{"{0} miliardniny"} + one{"{0} miliardnina"} + other{"{0} miliardninow"} + two{"{0} miliardninje"} + } percent{ dnam{"procenty"} few{"{0} procenty"} @@ -263,13 +277,6 @@ dsb{ other{"{0} promilow"} two{"{0} promila"} } - permillion{ - dnam{"milionśiny"} - few{"{0} milionśiny"} - one{"{0} milionśina"} - other{"{0} milionśinow"} - two{"{0} milionśinje"} - } permyriad{ dnam{"źaseśiny promila"} few{"{0} źaseśiny promila"} @@ -277,13 +284,6 @@ dsb{ other{"{0} źaseśinow promila"} two{"{0} źaseśinje promila"} } - portion-per-1e9{ - dnam{"miliardnina"} - few{"{0} miliardniny"} - one{"{0} miliardnina"} - other{"{0} miliardninow"} - two{"{0} miliardninje"} - } } consumption{ liter-per-100-kilometer{ @@ -1446,7 +1446,7 @@ dsb{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"n"} few{"{0} n"} one{"{0} n"} @@ -1584,6 +1584,13 @@ dsb{ other{"{0} mmol/l"} two{"{0} mmol/l"} } + part-per-1e9{ + dnam{"nano"} + few{"{0} nano"} + one{"{0} nano"} + other{"{0} nano"} + two{"{0} nano"} + } percent{ few{"{0} %"} one{"{0} %"} @@ -1602,13 +1609,6 @@ dsb{ other{"{0} ‱"} two{"{0} ‱"} } - portion-per-1e9{ - dnam{"nano"} - few{"{0} nano"} - one{"{0} nano"} - other{"{0} nano"} - two{"{0} nano"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/el.txt b/icu4c/source/data/unit/el.txt index 81bf04f46d1d..d8d06eba4f7e 100644 --- a/icu4c/source/data/unit/el.txt +++ b/icu4c/source/data/unit/el.txt @@ -382,6 +382,38 @@ el{ mole{ gender{"neuter"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} μέρος ανά εκατομμύριο"} + other{"{0} μέρη ανά εκατομμύριο"} + } + genitive{ + one{"{0} μέρους ανά εκατομμύριο"} + other{"{0} μερών ανά εκατομμύριο"} + } + } + dnam{"μέρη ανά εκατομμύριο"} + gender{"neuter"} + one{"{0} μέρος ανά εκατομμύριο"} + other{"{0} μέρη ανά εκατομμύριο"} + } + part-per-1e9{ + case{ + accusative{ + one{"{0} μέρος στο δισεκατομμύριο"} + other{"{0} μέρη στο δισεκατομμύριο"} + } + genitive{ + one{"{0} μέρους στο δισεκατομμύριο"} + other{"{0} μερών στο δισεκατομμύριο"} + } + } + dnam{"μέρη στο δισεκατομμύριο"} + gender{"neuter"} + one{"{0} μέρος στο δισεκατομμύριο"} + other{"{0} μέρη στο δισεκατομμύριο"} + } percent{ case{ accusative{ @@ -412,22 +444,6 @@ el{ one{"{0} τοις χιλίοις"} other{"{0} τοις χιλίοις"} } - permillion{ - case{ - accusative{ - one{"{0} μέρος ανά εκατομμύριο"} - other{"{0} μέρη ανά εκατομμύριο"} - } - genitive{ - one{"{0} μέρους ανά εκατομμύριο"} - other{"{0} μερών ανά εκατομμύριο"} - } - } - dnam{"μέρη ανά εκατομμύριο"} - gender{"neuter"} - one{"{0} μέρος ανά εκατομμύριο"} - other{"{0} μέρη ανά εκατομμύριο"} - } permyriad{ case{ accusative{ @@ -443,22 +459,6 @@ el{ one{"{0} τοις δεκάκις χιλίοις"} other{"{0} τοις δεκάκις χιλίοις"} } - portion-per-1e9{ - case{ - accusative{ - one{"{0} μέρος στο δισεκατομμύριο"} - other{"{0} μέρη στο δισεκατομμύριο"} - } - genitive{ - one{"{0} μέρους στο δισεκατομμύριο"} - other{"{0} μερών στο δισεκατομμύριο"} - } - } - dnam{"μέρη στο δισεκατομμύριο"} - gender{"neuter"} - one{"{0} μέρος στο δισεκατομμύριο"} - other{"{0} μέρη στο δισεκατομμύριο"} - } } consumption{ liter-per-100-kilometer{ @@ -2395,15 +2395,15 @@ el{ 10p9{"γιγ-{0}"} } concentr{ + part-per-1e6{ + dnam{"ppm"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } permyriad{ dnam{"‱"} } @@ -2852,21 +2852,21 @@ el{ one{"{0} μολ"} other{"{0} μολ"} } + part-per-1e6{ + dnam{"μέρη/εκατ."} + } + part-per-1e9{ + dnam{"μέρη/δισεκατομμύριο"} + } percent{ dnam{"τοις εκατό"} } permille{ dnam{"τοις χιλίοις"} } - permillion{ - dnam{"μέρη/εκατ."} - } permyriad{ dnam{"τοις δεκάκις χιλίοις"} } - portion-per-1e9{ - dnam{"μέρη/δισεκατομμύριο"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index cf9acb8ee2a2..37002e751af7 100644 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -41,6 +41,11 @@ en{ one{"{0} revolution"} other{"{0} revolutions"} } + steradian{ + dnam{"steradians"} + one{"{0} steradian"} + other{"{0} steradians"} + } } area{ acre{ @@ -48,6 +53,16 @@ en{ one{"{0} acre"} other{"{0} acres"} } + bu-jp{ + dnam{"bu [JP]"} + one{"{0} bu [JP]"} + other{"{0} bu [JP]"} + } + cho{ + dnam{"cho [JP]"} + one{"{0} cho [JP]"} + other{"{0} cho [JP]"} + } dunam{ dnam{"dunams"} one{"{0} dunam"} @@ -58,6 +73,11 @@ en{ one{"{0} hectare"} other{"{0} hectares"} } + se-jp{ + dnam{"se [JP]"} + one{"{0} se [JP]"} + other{"{0} se [JP]"} + } square-centimeter{ dnam{"square centimeters"} one{"{0} square centimeter"} @@ -170,6 +190,11 @@ en{ one{"{0} karat"} other{"{0} karats"} } + katal{ + dnam{"katals"} + one{"{0} katal"} + other{"{0} katals"} + } milligram-ofglucose-per-deciliter{ dnam{"milligrams per deciliter"} one{"{0} milligram per deciliter"} @@ -185,6 +210,26 @@ en{ one{"{0} mole"} other{"{0} moles"} } + ofglucose{ + dnam{"of glucose"} + one{"{0} of glucose"} + other{"{0} of glucose"} + } + part{ + dnam{"parts"} + one{"{0} part"} + other{"{0} parts"} + } + part-per-1e6{ + dnam{"parts per million"} + one{"{0} part per million"} + other{"{0} parts per million"} + } + part-per-1e9{ + dnam{"parts per billion"} + one{"{0} part per billion"} + other{"{0} parts per billion"} + } percent{ dnam{"percent"} one{"{0} percent"} @@ -195,21 +240,11 @@ en{ one{"{0} permille"} other{"{0} permille"} } - permillion{ - dnam{"parts per million"} - one{"{0} part per million"} - other{"{0} parts per million"} - } permyriad{ dnam{"permyriad"} one{"{0} permyriad"} other{"{0} permyriad"} } - portion-per-1e9{ - dnam{"parts per billion"} - one{"{0} part per billion"} - other{"{0} parts per billion"} - } } consumption{ liter-per-100-kilometer{ @@ -314,6 +349,11 @@ en{ one{"{0} decade"} other{"{0} decades"} } + fortnight{ + dnam{"fortnights"} + one{"{0} fortnight"} + other{"{0} fortnights"} + } hour{ dnam{"hours"} one{"{0} hour"} @@ -384,6 +424,21 @@ en{ one{"{0} ampere"} other{"{0} amperes"} } + coulomb{ + dnam{"coulombs"} + one{"{0} coulomb"} + other{"{0} coulombs"} + } + farad{ + dnam{"farads"} + one{"{0} farad"} + other{"{0} farads"} + } + henry{ + dnam{"henrys"} + one{"{0} henry"} + other{"{0} henrys"} + } milliampere{ dnam{"milliamperes"} one{"{0} milliampere"} @@ -394,6 +449,11 @@ en{ one{"{0} ohm"} other{"{0} ohms"} } + siemens{ + dnam{"siemens"} + one{"{0} siemens"} + other{"{0} siemens"} + } volt{ dnam{"volts"} one{"{0} volt"} @@ -401,16 +461,31 @@ en{ } } energy{ + becquerel{ + dnam{"becquerels"} + one{"{0} becquerel"} + other{"{0} becquerels"} + } british-thermal-unit{ dnam{"British thermal units"} one{"{0} British thermal unit"} other{"{0} British thermal units"} } + british-thermal-unit-it{ + dnam{"British thermal units [IT]"} + one{"{0} British thermal unit [IT]"} + other{"{0} British thermal units [IT]"} + } calorie{ dnam{"calories"} one{"{0} calorie"} other{"{0} calories"} } + calorie-it{ + dnam{"calories [IT]"} + one{"{0} calorie [IT]"} + other{"{0} calories [IT]"} + } electronvolt{ dnam{"electronvolts"} one{"{0} electronvolt"} @@ -421,6 +496,11 @@ en{ one{"{0} Calorie"} other{"{0} Calories"} } + gray{ + dnam{"grays"} + one{"{0} gray"} + other{"{0} grays"} + } joule{ dnam{"joules"} one{"{0} joule"} @@ -441,6 +521,11 @@ en{ one{"{0} kilowatt hour"} other{"{0} kilowatt-hours"} } + sievert{ + dnam{"sieverts"} + one{"{0} sievert"} + other{"{0} sieverts"} + } therm-us{ dnam{"US therms"} one{"{0} US therm"} @@ -448,6 +533,11 @@ en{ } } force{ + kilogram-force{ + dnam{"kilograms-force"} + one{"{0} kilogram-force"} + other{"{0} kilograms-force"} + } kilowatt-hour-per-100-kilometer{ dnam{"kilowatt-hours per 100 kilometers"} one{"{0} kilowatt-hour per 100 kilometers"} @@ -540,6 +630,11 @@ en{ other{"{0} centimeters"} per{"{0} per centimeter"} } + chain{ + dnam{"chains"} + one{"{0} chain"} + other{"{0} chains"} + } decimeter{ dnam{"decimeters"} one{"{0} decimeter"} @@ -572,6 +667,16 @@ en{ other{"{0} inches"} per{"{0} per inch"} } + jo-jp{ + dnam{"jo [JP]"} + one{"{0} jo [JP]"} + other{"{0} jo [JP]"} + } + ken{ + dnam{"ken [JP]"} + one{"{0} ken [JP]"} + other{"{0} ken [JP]"} + } kilometer{ dnam{"kilometers"} one{"{0} kilometer"} @@ -634,11 +739,41 @@ en{ one{"{0} point"} other{"{0} points"} } + ri-jp{ + dnam{"ri [JP]"} + one{"{0} ri [JP]"} + other{"{0} ri [JP]"} + } + rin{ + dnam{"rin [JP]"} + one{"{0} rin [JP]"} + other{"{0} rin [JP]"} + } + rod{ + dnam{"rods"} + one{"{0} rod"} + other{"{0} rods"} + } + shaku-cloth{ + dnam{"shaku [cloth, JP]"} + one{"{0} shaku [cloth, JP]"} + other{"{0} shaku [cloth, JP]"} + } + shaku-length{ + dnam{"shaku [JP]"} + one{"{0} shaku [JP]"} + other{"{0} shaku [JP]"} + } solar-radius{ dnam{"solar radii"} one{"{0} solar radius"} other{"{0} solar radii"} } + sun{ + dnam{"sun [JP]"} + one{"{0} sun [JP]"} + other{"{0} sun [JP]"} + } yard{ dnam{"yards"} one{"{0} yard"} @@ -667,6 +802,18 @@ en{ other{"{0} solar luminosities"} } } + magnetic{ + tesla{ + dnam{"teslas"} + one{"{0} tesla"} + other{"{0} teslas"} + } + weber{ + dnam{"webers"} + one{"{0} weber"} + other{"{0} webers"} + } + } mass{ carat{ dnam{"carats"} @@ -683,6 +830,11 @@ en{ one{"{0} Earth mass"} other{"{0} Earth masses"} } + fun{ + dnam{"fun [JP]"} + one{"{0} fun [JP]"} + other{"{0} fun [JP]"} + } grain{ dnam{"grains"} one{"{0} grain"} @@ -727,6 +879,11 @@ en{ other{"{0} pounds"} per{"{0} per pound"} } + slug{ + dnam{"slugs"} + one{"{0} slug"} + other{"{0} slugs"} + } solar-mass{ dnam{"solar masses"} one{"{0} solar mass"} @@ -826,6 +983,11 @@ en{ one{"{0} millimeter of mercury"} other{"{0} millimeters of mercury"} } + ofhg{ + dnam{"of mercury"} + one{"{0} of mercury"} + other{"{0} of mercury"} + } pascal{ dnam{"pascals"} one{"{0} pascal"} @@ -890,6 +1052,11 @@ en{ one{"{0} kelvin"} other{"{0} kelvins"} } + rankine{ + dnam{"rankines"} + one{"{0} rankine"} + other{"{0} rankines"} + } } torque{ newton-meter{ @@ -966,6 +1133,16 @@ en{ one{"{0} cup"} other{"{0} cups"} } + cup-imperial{ + dnam{"cups Imperial"} + one{"{0} cup Imperial"} + other{"{0} cups Imperial"} + } + cup-jp{ + dnam{"cup [JP]"} + one{"{0} cup [JP]"} + other{"{0} cup [JP]"} + } cup-metric{ dnam{"metric cups"} one{"{0} metric cup"} @@ -1006,6 +1183,11 @@ en{ one{"{0} Imp. fluid ounce"} other{"{0} Imp. fluid ounces"} } + fluid-ounce-metric{ + dnam{"metric fluid ounces"} + one{"{0} metric fluid ounce"} + other{"{0} metric fluid ounces"} + } gallon{ dnam{"gallons"} one{"{0} gallon"} @@ -1028,6 +1210,16 @@ en{ one{"{0} jigger"} other{"{0} jiggers"} } + koku{ + dnam{"koku [JP]"} + one{"{0} koku [JP]"} + other{"{0} koku [JP]"} + } + kosaji{ + dnam{"kosaji [JP]"} + one{"{0} kosaji [JP]"} + other{"{0} kosaji [JP]"} + } liter{ dnam{"liters"} one{"{0} liter"} @@ -1044,6 +1236,11 @@ en{ one{"{0} milliliter"} other{"{0} milliliters"} } + osaji{ + dnam{"osaji [JP]"} + one{"{0} osaji [JP]"} + other{"{0} osaji [JP]"} + } pinch{ dnam{"pinches"} one{"{0} pinch"} @@ -1054,6 +1251,11 @@ en{ one{"{0} pint"} other{"{0} pints"} } + pint-imperial{ + dnam{"pints Imperial"} + one{"{0} pint Imperial"} + other{"{0} pints Imperial"} + } pint-metric{ dnam{"metric pints"} one{"{0} metric pint"} @@ -1069,6 +1271,16 @@ en{ one{"{0} Imp. quart"} other{"{0} Imp. quarts"} } + sai{ + dnam{"sai [JP]"} + one{"{0} sai [JP]"} + other{"{0} sai [JP]"} + } + shaku{ + dnam{"shaku [volume, JP]"} + one{"{0} shaku [volume, JP]"} + other{"{0} shaku [volume, JP]"} + } tablespoon{ dnam{"tablespoons"} one{"{0} tablespoon"} @@ -1079,6 +1291,11 @@ en{ one{"{0} teaspoon"} other{"{0} teaspoons"} } + to-jp{ + dnam{"to [JP]"} + one{"{0} to [JP]"} + other{"{0} to [JP]"} + } } } unitsNarrow{ @@ -1120,6 +1337,11 @@ en{ one{"{0}rev"} other{"{0}rev"} } + steradian{ + dnam{"sr"} + one{"{0} sr"} + other{"{0} sr"} + } } area{ acre{ @@ -1127,6 +1349,16 @@ en{ one{"{0}ac"} other{"{0}ac"} } + bu-jp{ + dnam{"bu [JP]"} + one{"{0} bu [JP]"} + other{"{0} bu [JP]"} + } + cho{ + dnam{"cho [JP]"} + one{"{0} cho [JP]"} + other{"{0} cho [JP]"} + } dunam{ dnam{"dunam"} one{"{0}dunam"} @@ -1137,6 +1369,11 @@ en{ one{"{0}ha"} other{"{0}ha"} } + se-jp{ + dnam{"se [JP]"} + one{"{0} se [JP]"} + other{"{0} se [JP]"} + } square-centimeter{ dnam{"cm²"} one{"{0}cm²"} @@ -1249,6 +1486,11 @@ en{ one{"{0}kt"} other{"{0}kt"} } + katal{ + dnam{"kat"} + one{"{0} kat"} + other{"{0} kat"} + } milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} @@ -1264,6 +1506,26 @@ en{ one{"{0}mol"} other{"{0}mol"} } + ofglucose{ + dnam{"Glc"} + one{"{0} Glc"} + other{"{0} Glc"} + } + part{ + dnam{"part"} + one{"{0} part"} + other{"{0} part"} + } + part-per-1e6{ + dnam{"ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + dnam{"ppb"} + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} one{"{0}%"} @@ -1274,21 +1536,11 @@ en{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - dnam{"ppm"} - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - dnam{"ppb"} - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -1393,6 +1645,11 @@ en{ one{"{0}dec"} other{"{0}dec"} } + fortnight{ + dnam{"fw"} + one{"{0} fw"} + other{"{0} fw"} + } hour{ dnam{"hour"} one{"{0}h"} @@ -1463,6 +1720,21 @@ en{ one{"{0}A"} other{"{0}A"} } + coulomb{ + dnam{"C"} + one{"{0} C"} + other{"{0} C"} + } + farad{ + dnam{"F"} + one{"{0} F"} + other{"{0} F"} + } + henry{ + dnam{"H"} + one{"{0} H"} + other{"{0} H"} + } milliampere{ dnam{"mA"} one{"{0}mA"} @@ -1473,6 +1745,11 @@ en{ one{"{0}Ω"} other{"{0}Ω"} } + siemens{ + dnam{"S"} + one{"{0} S"} + other{"{0} S"} + } volt{ dnam{"volt"} one{"{0}V"} @@ -1480,16 +1757,31 @@ en{ } } energy{ + becquerel{ + dnam{"Bq"} + one{"{0} Bq"} + other{"{0} Bq"} + } british-thermal-unit{ dnam{"BTU"} one{"{0}Btu"} other{"{0}Btu"} } + british-thermal-unit-it{ + dnam{"BTU-IT"} + one{"{0} BTU-IT"} + other{"{0} BT-IT"} + } calorie{ dnam{"cal"} one{"{0}cal"} other{"{0}cal"} } + calorie-it{ + dnam{"cal-IT"} + one{"{0} cal-IT"} + other{"{0} cal-IT"} + } electronvolt{ dnam{"eV"} one{"{0}eV"} @@ -1500,6 +1792,11 @@ en{ one{"{0}Cal"} other{"{0}Cal"} } + gray{ + dnam{"Gy"} + one{"{0} Gy"} + other{"{0} Gy"} + } joule{ dnam{"joule"} one{"{0}J"} @@ -1520,6 +1817,11 @@ en{ one{"{0}kWh"} other{"{0}kWh"} } + sievert{ + dnam{"Sv"} + one{"{0} Sv"} + other{"{0} Sv"} + } therm-us{ dnam{"US therm"} one{"{0}US therm"} @@ -1527,6 +1829,11 @@ en{ } } force{ + kilogram-force{ + dnam{"kgf"} + one{"{0} kgf"} + other{"{0} kgf"} + } kilowatt-hour-per-100-kilometer{ dnam{"kWh/100km"} one{"{0}kWh/100km"} @@ -1619,6 +1926,11 @@ en{ other{"{0}cm"} per{"{0}/cm"} } + chain{ + dnam{"ch"} + one{"{0} ch"} + other{"{0} ch"} + } decimeter{ dnam{"dm"} one{"{0}dm"} @@ -1651,6 +1963,16 @@ en{ other{"{0}″"} per{"{0}/in"} } + jo-jp{ + dnam{"jo [JP]"} + one{"{0} jo [JP]"} + other{"{0} jo [JP]"} + } + ken{ + dnam{"ken [JP]"} + one{"{0} ken [JP]"} + other{"{0} ken [JP]"} + } kilometer{ dnam{"km"} one{"{0}km"} @@ -1713,11 +2035,41 @@ en{ one{"{0}pt"} other{"{0}pt"} } + ri-jp{ + dnam{"ri [JP]"} + one{"{0} ri [JP]"} + other{"{0} ri [JP]"} + } + rin{ + dnam{"rin [JP]"} + one{"{0} rin [JP]"} + other{"{0} rin [JP]"} + } + rod{ + dnam{"rd"} + one{"{0} rd"} + other{"{0} rd"} + } + shaku-cloth{ + dnam{"shaku [cloth, JP]"} + one{"{0} shaku [cloth, JP]"} + other{"{0} shaku [cloth, JP]"} + } + shaku-length{ + dnam{"shaku [JP]"} + one{"{0} shaku [JP]"} + other{"{0} shaku [JP]"} + } solar-radius{ dnam{"R☉"} one{"{0}R☉"} other{"{0}R☉"} } + sun{ + dnam{"sun [JP]"} + one{"{0} sun [JP]"} + other{"{0} sun [JP]"} + } yard{ dnam{"yd"} one{"{0}yd"} @@ -1746,6 +2098,18 @@ en{ other{"{0}L☉"} } } + magnetic{ + tesla{ + dnam{"T"} + one{"{0} T"} + other{"{0} T"} + } + weber{ + dnam{"Wb"} + one{"{0} Wb"} + other{"{0} Wb"} + } + } mass{ carat{ dnam{"carat"} @@ -1762,6 +2126,11 @@ en{ one{"{0}M⊕"} other{"{0}M⊕"} } + fun{ + dnam{"fun [JP]"} + one{"{0} fun [JP]"} + other{"{0} fun [JP]"} + } grain{ dnam{"gr"} one{"{0}gr"} @@ -1806,6 +2175,11 @@ en{ other{"{0}#"} per{"{0}/lb"} } + slug{ + dnam{"slug"} + one{"{0} slug"} + other{"{0} slug"} + } solar-mass{ dnam{"M☉"} one{"{0}M☉"} @@ -1905,6 +2279,11 @@ en{ one{"{0}mmHg"} other{"{0}mmHg"} } + ofhg{ + dnam{"of Hg"} + one{"{0} of Hg"} + other{"{0} of Hg"} + } pascal{ dnam{"Pa"} one{"{0}Pa"} @@ -1969,6 +2348,11 @@ en{ one{"{0}K"} other{"{0}K"} } + rankine{ + dnam{"°R"} + one{"{0} °R"} + other{"{0} °R"} + } } torque{ newton-meter{ @@ -2045,6 +2429,16 @@ en{ one{"{0}c"} other{"{0}c"} } + cup-imperial{ + dnam{"cup Imp"} + one{"{0} cup Imp."} + other{"{0} cup Imp."} + } + cup-jp{ + dnam{"cup [JP]"} + one{"{0} cup [JP]"} + other{"{0} cup [JP]"} + } cup-metric{ dnam{"mcup"} one{"{0}mc"} @@ -2085,6 +2479,11 @@ en{ one{"{0}fl oz Im"} other{"{0}fl oz Im"} } + fluid-ounce-metric{ + dnam{"fl oz m."} + one{"{0} fl oz m."} + other{"{0} fl oz m."} + } gallon{ dnam{"gal"} one{"{0}gal"} @@ -2093,8 +2492,8 @@ en{ } gallon-imperial{ dnam{"Imp gal"} - one{"{0}galIm"} - other{"{0}galIm"} + one{"{0}gal-Im"} + other{"{0}gal-Im"} per{"{0}/galIm"} } hectoliter{ @@ -2107,6 +2506,16 @@ en{ one{"{0}jigger"} other{"{0}jigger"} } + koku{ + dnam{"koku [JP]"} + one{"{0} koku [JP]"} + other{"{0} koku [JP]"} + } + kosaji{ + dnam{"kosaji [JP]"} + one{"{0} kosaji [JP]"} + other{"{0} kosaji [JP]"} + } liter{ dnam{"liter"} one{"{0}L"} @@ -2123,6 +2532,11 @@ en{ one{"{0}mL"} other{"{0}mL"} } + osaji{ + dnam{"osaji [JP]"} + one{"{0} osaji [JP]"} + other{"{0} osaji [JP]"} + } pinch{ dnam{"pn"} one{"{0}pn"} @@ -2133,6 +2547,11 @@ en{ one{"{0}pt"} other{"{0}pt"} } + pint-imperial{ + dnam{"pt Imp."} + one{"{0} pt Imp."} + other{"{0} pt Imp."} + } pint-metric{ dnam{"pt"} one{"{0}mpt"} @@ -2148,6 +2567,16 @@ en{ one{"{0}qt-Imp."} other{"{0}qt-Imp."} } + sai{ + dnam{"sai [JP]"} + one{"{0} sai [JP]"} + other{"{0} sai [JP]"} + } + shaku{ + dnam{"shaku [vol, JP]"} + one{"{0} shaku [vol, JP]"} + other{"{0} shaku [vol, JP]"} + } tablespoon{ dnam{"tbsp"} one{"{0}tbsp"} @@ -2158,6 +2587,11 @@ en{ one{"{0}tsp"} other{"{0}tsp"} } + to-jp{ + dnam{"to [JP]"} + one{"{0} to [JP]"} + other{"{0} to [JP]"} + } } } unitsShort{ @@ -2199,6 +2633,11 @@ en{ one{"{0} rev"} other{"{0} rev"} } + steradian{ + dnam{"sr"} + one{"{0} sr"} + other{"{0} sr"} + } } area{ acre{ @@ -2206,6 +2645,16 @@ en{ one{"{0} ac"} other{"{0} ac"} } + bu-jp{ + dnam{"bu [JP]"} + one{"{0} bu [JP]"} + other{"{0} bu [JP]"} + } + cho{ + dnam{"cho [JP]"} + one{"{0} cho [JP]"} + other{"{0} cho [JP]"} + } dunam{ dnam{"dunams"} one{"{0} dunam"} @@ -2216,6 +2665,11 @@ en{ one{"{0} ha"} other{"{0} ha"} } + se-jp{ + dnam{"se [JP]"} + one{"{0} se [JP]"} + other{"{0} se [JP]"} + } square-centimeter{ dnam{"cm²"} one{"{0} cm²"} @@ -2328,6 +2782,11 @@ en{ one{"{0} kt"} other{"{0} kt"} } + katal{ + dnam{"kat"} + one{"{0} kat"} + other{"{0} kat"} + } milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} @@ -2343,6 +2802,26 @@ en{ one{"{0} mol"} other{"{0} mol"} } + ofglucose{ + dnam{"Glc"} + one{"{0} Glc"} + other{"{0} Glc"} + } + part{ + dnam{"part"} + one{"{0} part"} + other{"{0} part"} + } + part-per-1e6{ + dnam{"parts/million"} + one{"{0} ppm"} + other{"{0} ppm"} + } + part-per-1e9{ + dnam{"parts/billion"} + one{"{0} ppb"} + other{"{0} ppb"} + } percent{ dnam{"percent"} one{"{0}%"} @@ -2353,21 +2832,11 @@ en{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - dnam{"parts/million"} - one{"{0} ppm"} - other{"{0} ppm"} - } permyriad{ dnam{"permyriad"} one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - dnam{"parts/billion"} - one{"{0} ppb"} - other{"{0} ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -2472,6 +2941,11 @@ en{ one{"{0} dec"} other{"{0} dec"} } + fortnight{ + dnam{"fw"} + one{"{0} fw"} + other{"{0} fw"} + } hour{ dnam{"hours"} one{"{0} hr"} @@ -2542,6 +3016,21 @@ en{ one{"{0} A"} other{"{0} A"} } + coulomb{ + dnam{"C"} + one{"{0} C"} + other{"{0} C"} + } + farad{ + dnam{"F"} + one{"{0} F"} + other{"{0} F"} + } + henry{ + dnam{"H"} + one{"{0} H"} + other{"{0} H"} + } milliampere{ dnam{"milliamps"} one{"{0} mA"} @@ -2552,6 +3041,11 @@ en{ one{"{0} Ω"} other{"{0} Ω"} } + siemens{ + dnam{"S"} + one{"{0} S"} + other{"{0} S"} + } volt{ dnam{"volts"} one{"{0} V"} @@ -2559,16 +3053,31 @@ en{ } } energy{ + becquerel{ + dnam{"Bq"} + one{"{0} Bq"} + other{"{0} Bq"} + } british-thermal-unit{ dnam{"BTU"} one{"{0} Btu"} other{"{0} Btu"} } + british-thermal-unit-it{ + dnam{"BTU-IT"} + one{"{0} BTU-IT"} + other{"{0} BT-IT"} + } calorie{ dnam{"cal"} one{"{0} cal"} other{"{0} cal"} } + calorie-it{ + dnam{"cal-IT"} + one{"{0} cal-IT"} + other{"{0} cal-IT"} + } electronvolt{ dnam{"electronvolt"} one{"{0} eV"} @@ -2579,6 +3088,11 @@ en{ one{"{0} Cal"} other{"{0} Cal"} } + gray{ + dnam{"Gy"} + one{"{0} Gy"} + other{"{0} Gy"} + } joule{ dnam{"joules"} one{"{0} J"} @@ -2599,6 +3113,11 @@ en{ one{"{0} kWh"} other{"{0} kWh"} } + sievert{ + dnam{"Sv"} + one{"{0} Sv"} + other{"{0} Sv"} + } therm-us{ dnam{"US therm"} one{"{0} US therm"} @@ -2606,6 +3125,11 @@ en{ } } force{ + kilogram-force{ + dnam{"kgf"} + one{"{0} kgf"} + other{"{0} kgf"} + } kilowatt-hour-per-100-kilometer{ dnam{"kWh/100km"} one{"{0} kWh/100km"} @@ -2698,6 +3222,11 @@ en{ other{"{0} cm"} per{"{0}/cm"} } + chain{ + dnam{"ch"} + one{"{0} ch"} + other{"{0} ch"} + } decimeter{ dnam{"dm"} one{"{0} dm"} @@ -2730,6 +3259,16 @@ en{ other{"{0} in"} per{"{0}/in"} } + jo-jp{ + dnam{"jo [JP]"} + one{"{0} jo [JP]"} + other{"{0} jo [JP]"} + } + ken{ + dnam{"ken [JP]"} + one{"{0} ken [JP]"} + other{"{0} ken [JP]"} + } kilometer{ dnam{"km"} one{"{0} km"} @@ -2792,11 +3331,41 @@ en{ one{"{0} pt"} other{"{0} pt"} } + ri-jp{ + dnam{"ri [JP]"} + one{"{0} ri [JP]"} + other{"{0} ri [JP]"} + } + rin{ + dnam{"rin [JP]"} + one{"{0} rin [JP]"} + other{"{0} rin [JP]"} + } + rod{ + dnam{"rd"} + one{"{0} rd"} + other{"{0} rd"} + } + shaku-cloth{ + dnam{"shaku [cloth, JP]"} + one{"{0} shaku [cloth, JP]"} + other{"{0} shaku [cloth, JP]"} + } + shaku-length{ + dnam{"shaku [JP]"} + one{"{0} shaku [JP]"} + other{"{0} shaku [JP]"} + } solar-radius{ dnam{"solar radii"} one{"{0} R☉"} other{"{0} R☉"} } + sun{ + dnam{"sun [JP]"} + one{"{0} sun [JP]"} + other{"{0} sun [JP]"} + } yard{ dnam{"yards"} one{"{0} yd"} @@ -2825,6 +3394,18 @@ en{ other{"{0} L☉"} } } + magnetic{ + tesla{ + dnam{"T"} + one{"{0} T"} + other{"{0} T"} + } + weber{ + dnam{"Wb"} + one{"{0} Wb"} + other{"{0} Wb"} + } + } mass{ carat{ dnam{"carats"} @@ -2841,6 +3422,11 @@ en{ one{"{0} M⊕"} other{"{0} M⊕"} } + fun{ + dnam{"fun [JP]"} + one{"{0} fun [JP]"} + other{"{0} fun [JP]"} + } grain{ dnam{"grains"} one{"{0} gr"} @@ -2885,6 +3471,11 @@ en{ other{"{0} lb"} per{"{0}/lb"} } + slug{ + dnam{"slug"} + one{"{0} slug"} + other{"{0} slug"} + } solar-mass{ dnam{"solar masses"} one{"{0} M☉"} @@ -2984,6 +3575,11 @@ en{ one{"{0} mmHg"} other{"{0} mmHg"} } + ofhg{ + dnam{"of Hg"} + one{"{0} of Hg"} + other{"{0} of Hg"} + } pascal{ dnam{"Pa"} one{"{0} Pa"} @@ -3048,6 +3644,11 @@ en{ one{"{0} K"} other{"{0} K"} } + rankine{ + dnam{"°R"} + one{"{0} °R"} + other{"{0} °R"} + } } torque{ newton-meter{ @@ -3124,6 +3725,16 @@ en{ one{"{0} c"} other{"{0} c"} } + cup-imperial{ + dnam{"cup Imp"} + one{"{0} cup Imp."} + other{"{0} cup Imp."} + } + cup-jp{ + dnam{"cup [JP]"} + one{"{0} cup [JP]"} + other{"{0} cup [JP]"} + } cup-metric{ dnam{"mcup"} one{"{0} mc"} @@ -3164,6 +3775,11 @@ en{ one{"{0} fl oz Imp."} other{"{0} fl oz Imp."} } + fluid-ounce-metric{ + dnam{"fl oz m."} + one{"{0} fl oz m."} + other{"{0} fl oz m."} + } gallon{ dnam{"gal"} one{"{0} gal"} @@ -3185,6 +3801,16 @@ en{ one{"{0} jigger"} other{"{0} jiggers"} } + koku{ + dnam{"koku [JP]"} + one{"{0} koku [JP]"} + other{"{0} koku [JP]"} + } + kosaji{ + dnam{"kosaji [JP]"} + one{"{0} kosaji [JP]"} + other{"{0} kosaji [JP]"} + } liter{ dnam{"liters"} one{"{0} L"} @@ -3201,6 +3827,11 @@ en{ one{"{0} mL"} other{"{0} mL"} } + osaji{ + dnam{"osaji [JP]"} + one{"{0} osaji [JP]"} + other{"{0} osaji [JP]"} + } pinch{ dnam{"pinches"} one{"{0} pn"} @@ -3211,6 +3842,11 @@ en{ one{"{0} pt"} other{"{0} pt"} } + pint-imperial{ + dnam{"pt Imp."} + one{"{0} pt Imp."} + other{"{0} pt Imp."} + } pint-metric{ dnam{"mpt"} one{"{0} mpt"} @@ -3226,6 +3862,16 @@ en{ one{"{0} qt-Imp."} other{"{0} qt-Imp."} } + sai{ + dnam{"sai [JP]"} + one{"{0} sai [JP]"} + other{"{0} sai [JP]"} + } + shaku{ + dnam{"shaku [vol, JP]"} + one{"{0} shaku [vol, JP]"} + other{"{0} shaku [vol, JP]"} + } tablespoon{ dnam{"tbsp"} one{"{0} tbsp"} @@ -3236,6 +3882,11 @@ en{ one{"{0} tsp"} other{"{0} tsp"} } + to-jp{ + dnam{"to [JP]"} + one{"{0} to [JP]"} + other{"{0} to [JP]"} + } } } } diff --git a/icu4c/source/data/unit/es.txt b/icu4c/source/data/unit/es.txt index 9e5098439f5a..ec39d1c261cc 100644 --- a/icu4c/source/data/unit/es.txt +++ b/icu4c/source/data/unit/es.txt @@ -208,6 +208,18 @@ es{ one{"{0} mol"} other{"{0} moles"} } + part-per-1e6{ + dnam{"partes por millón"} + gender{"feminine"} + one{"{0} parte por millón"} + other{"{0} partes por millón"} + } + part-per-1e9{ + dnam{"partes por millardo"} + gender{"feminine"} + one{"{0} parte por millardo"} + other{"{0} partes por millardo"} + } percent{ gender{"masculine"} one{"{0} por ciento"} @@ -218,23 +230,11 @@ es{ one{"{0} por mil"} other{"{0} por mil"} } - permillion{ - dnam{"partes por millón"} - gender{"feminine"} - one{"{0} parte por millón"} - other{"{0} partes por millón"} - } permyriad{ gender{"masculine"} one{"{0} por diez mil"} other{"{0} por diez mil"} } - portion-per-1e9{ - dnam{"partes por millardo"} - gender{"feminine"} - one{"{0} parte por millardo"} - other{"{0} partes por millardo"} - } } consumption{ liter-per-100-kilometer{ @@ -1331,6 +1331,14 @@ es{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} one{"{0}%"} @@ -1340,18 +1348,10 @@ es{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -2091,6 +2091,9 @@ es{ one{"{0} ct"} other{"{0} ct"} } + part-per-1e9{ + dnam{"partes/millardo"} + } percent{ dnam{"por ciento"} one{"{0} %"} @@ -2106,9 +2109,6 @@ es{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"partes/millardo"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/es_419.txt b/icu4c/source/data/unit/es_419.txt index c355cc256596..fc77480c0bcf 100644 --- a/icu4c/source/data/unit/es_419.txt +++ b/icu4c/source/data/unit/es_419.txt @@ -11,7 +11,7 @@ es_419{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"partes por mil millones"} one{"{0} parte por mil millones"} other{"{0} partes por mil millones"} diff --git a/icu4c/source/data/unit/es_US.txt b/icu4c/source/data/unit/es_US.txt index 69fdafc16410..30e03761eb88 100644 --- a/icu4c/source/data/unit/es_US.txt +++ b/icu4c/source/data/unit/es_US.txt @@ -221,15 +221,15 @@ es_US{ } unitsShort{ concentr{ + part-per-1e9{ + dnam{"partes/mil millones"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - portion-per-1e9{ - dnam{"partes/mil millones"} - } } digital{ bit{ diff --git a/icu4c/source/data/unit/et.txt b/icu4c/source/data/unit/et.txt index fc5d2073715d..e6f863812265 100644 --- a/icu4c/source/data/unit/et.txt +++ b/icu4c/source/data/unit/et.txt @@ -166,6 +166,16 @@ et{ one{"{0} mool"} other{"{0} mooli"} } + part-per-1e6{ + dnam{"osa miljoni kohta"} + one{"{0} osa miljoni kohta"} + other{"{0} osa miljoni kohta"} + } + part-per-1e9{ + dnam{"miljardikosa"} + one{"{0} miljardikosa"} + other{"{0} miljardikosa"} + } percent{ dnam{"protsent"} one{"{0} protsent"} @@ -176,20 +186,10 @@ et{ one{"{0} promill"} other{"{0} promilli"} } - permillion{ - dnam{"osa miljoni kohta"} - one{"{0} osa miljoni kohta"} - other{"{0} osa miljoni kohta"} - } permyriad{ one{"{0} promüriaad"} other{"{0} promüriaadi"} } - portion-per-1e9{ - dnam{"miljardikosa"} - one{"{0} miljardikosa"} - other{"{0} miljardikosa"} - } } consumption{ liter-per-100-kilometer{ @@ -1206,17 +1206,17 @@ et{ mole{ dnam{"mool"} } - permillion{ + part-per-1e6{ dnam{"osa/miljon"} } - permyriad{ - dnam{"promüriaad"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"osakesed/miljard"} one{"{0} miljardikosa"} other{"{0} miljardikosa"} } + permyriad{ + dnam{"promüriaad"} + } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/eu.txt b/icu4c/source/data/unit/eu.txt index 3afddd83329d..be1bca39224e 100644 --- a/icu4c/source/data/unit/eu.txt +++ b/icu4c/source/data/unit/eu.txt @@ -163,6 +163,16 @@ eu{ mole{ dnam{"molak"} } + part-per-1e6{ + dnam{"zati milioi bakoitzeko"} + one{"{0} zati milioi bakoitzeko"} + other{"{0} zati milioi bakoitzeko"} + } + part-per-1e9{ + dnam{"zati mila milioiko"} + one{"{0} zati mila milioiko"} + other{"{0} zati mila milioiko"} + } percent{ dnam{"ehuneko"} one{"ehuneko {0}"} @@ -173,16 +183,6 @@ eu{ one{"milako {0}"} other{"milako {0}"} } - permillion{ - dnam{"zati milioi bakoitzeko"} - one{"{0} zati milioi bakoitzeko"} - other{"{0} zati milioi bakoitzeko"} - } - portion-per-1e9{ - dnam{"zati mila milioiko"} - one{"{0} zati mila milioiko"} - other{"{0} zati mila milioiko"} - } } consumption{ liter-per-100-kilometer{ @@ -919,7 +919,7 @@ eu{ millimole-per-liter{ dnam{"mmol/l"} } - portion-per-1e9{ + part-per-1e9{ dnam{"zati / m. m."} one{"{0} zati / m. m."} other{"{0} zati / m. m."} @@ -1174,6 +1174,14 @@ eu{ mole{ dnam{"mola"} } + part-per-1e6{ + dnam{"zati/milioi"} + } + part-per-1e9{ + dnam{"zati / mila milioi"} + one{"{0} zati / m. m."} + other{"{0} zati / m. m."} + } percent{ one{"% {0}"} other{"% {0}"} @@ -1182,18 +1190,10 @@ eu{ one{"‰ {0}"} other{"‰ {0}"} } - permillion{ - dnam{"zati/milioi"} - } permyriad{ one{"‱ {0}"} other{"‱ {0}"} } - portion-per-1e9{ - dnam{"zati / mila milioi"} - one{"{0} zati / m. m."} - other{"{0} zati / m. m."} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/fa.txt b/icu4c/source/data/unit/fa.txt index 617554e7ad16..cfc92bff2286 100644 --- a/icu4c/source/data/unit/fa.txt +++ b/icu4c/source/data/unit/fa.txt @@ -92,6 +92,16 @@ fa{ one{"{0} میلی‌مول در لیتر"} other{"{0} میلی‌مول در لیتر"} } + part-per-1e6{ + dnam{"بخش در میلیون"} + one{"{0} بخش در میلیون"} + other{"{0} بخش در میلیون"} + } + part-per-1e9{ + dnam{"بخش در بیلیون"} + one{"{0} بخش در بیلیون"} + other{"{0} بخش در بیلیون"} + } percent{ one{"{0} درصد"} other{"{0} درصد"} @@ -100,20 +110,10 @@ fa{ one{"{0} هزارم"} other{"{0} هزارم"} } - permillion{ - dnam{"بخش در میلیون"} - one{"{0} بخش در میلیون"} - other{"{0} بخش در میلیون"} - } permyriad{ one{"{0} ده‌هزارم"} other{"{0} ده‌هزارم"} } - portion-per-1e9{ - dnam{"بخش در بیلیون"} - one{"{0} بخش در بیلیون"} - other{"{0} بخش در بیلیون"} - } } consumption{ liter-per-100-kilometer{ @@ -625,16 +625,16 @@ fa{ one{"{0}مورد"} other{"{0}مورد"} } - percent{ - dnam{"٪"} - } - permillion{ + part-per-1e6{ one{"{0}ppm"} other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ dnam{"بخش در بیلیون"} } + percent{ + dnam{"٪"} + } } consumption{ mile-per-gallon-imperial{ @@ -1348,6 +1348,12 @@ fa{ one{"{0} مول"} other{"{0} مول"} } + part-per-1e6{ + dnam{"بخش/میلیون"} + } + part-per-1e9{ + dnam{"بخش در بیلیون"} + } percent{ dnam{"درصد"} one{"{0}٪"} @@ -1356,15 +1362,9 @@ fa{ permille{ dnam{"هزارم"} } - permillion{ - dnam{"بخش/میلیون"} - } permyriad{ dnam{"ده‌هزارم"} } - portion-per-1e9{ - dnam{"بخش در بیلیون"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ff_Adlm.txt b/icu4c/source/data/unit/ff_Adlm.txt index 4711d3d00202..45991179faf2 100644 --- a/icu4c/source/data/unit/ff_Adlm.txt +++ b/icu4c/source/data/unit/ff_Adlm.txt @@ -170,6 +170,11 @@ ff_Adlm{ one{"{0} 𞤥𞤮𞤤𞤰𞤵"} other{"{0} 𞤥𞤮𞤤𞤰𞤭"} } + part-per-1e6{ + dnam{"𞤺𞤫𞤩𞤫 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} + one{"{0} 𞤺𞤫𞤩𞤢𞤤 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} + other{"{0} 𞤺𞤫𞤩𞤫 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} + } percent{ one{"{0} 𞤳𞤢𞤤𞤼𞤫𞥅𞤥𞤵"} other{"{0} 𞤳𞤢𞤤𞤼𞤫𞥅𞤥𞤵"} @@ -178,11 +183,6 @@ ff_Adlm{ one{"{0} 𞤳𞤢𞤤𞤺𞤵𞤤𞤶𞤵"} other{"{0} 𞤳𞤢𞤤𞤺𞤵𞤤𞤶𞤵"} } - permillion{ - dnam{"𞤺𞤫𞤩𞤫 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} - one{"{0} 𞤺𞤫𞤩𞤢𞤤 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} - other{"{0} 𞤺𞤫𞤩𞤫 𞤳𞤢𞤤𞤢 𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} - } permyriad{ dnam{"𞤳𞤢𞤤𞤺𞤵𞤤𞤧𞤢𞤨𞥆𞤮"} one{"{0} 𞤳𞤢𞤤𞤲𞤺𞤵𞤤𞤧𞤢𞤨𞥆𞤮"} @@ -1109,17 +1109,17 @@ ff_Adlm{ one{"{0}𞤥𞤮𞤤"} other{"{0}𞤥𞤮𞤤"} } + part-per-1e6{ + dnam{"𞤺𞤳𞤣"} + one{"{0}𞤺𞤳𞤣"} + other{"{0}𞤺𞤳𞤣"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"𞤺𞤳𞤣"} - one{"{0}𞤺𞤳𞤣"} - other{"{0}𞤺𞤳𞤣"} - } permyriad{ dnam{"‱"} } @@ -2004,17 +2004,17 @@ ff_Adlm{ one{"{0} 𞤥𞤮𞤤"} other{"{0} 𞤥𞤮𞤤"} } + part-per-1e6{ + dnam{"𞤺𞤫𞤩𞤫/𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} + one{"{0} 𞤺𞤳𞤣"} + other{"{0} 𞤺𞤳𞤣"} + } percent{ dnam{"𞤳𞤢𞤤𞤼𞤫𞥅𞤥𞤵"} } permille{ dnam{"𞤳𞤢𞤤𞤺𞤵𞤤𞤶𞤵"} } - permillion{ - dnam{"𞤺𞤫𞤩𞤫/𞤣𞤵𞤦𞤵𞥅𞤪𞤫"} - one{"{0} 𞤺𞤳𞤣"} - other{"{0} 𞤺𞤳𞤣"} - } permyriad{ dnam{"𞤳𞤢𞤤𞤲𞤺𞤵𞤤𞤧𞤢𞤨𞥆𞤮"} } diff --git a/icu4c/source/data/unit/fi.txt b/icu4c/source/data/unit/fi.txt index 7f9050c9828a..198adef9df83 100644 --- a/icu4c/source/data/unit/fi.txt +++ b/icu4c/source/data/unit/fi.txt @@ -471,6 +471,52 @@ fi{ one{"{0} mooli"} other{"{0} moolia"} } + part-per-1e6{ + case{ + elative{ + one{"{0} miljoonasosasta"} + other{"{0} miljoonasosasta"} + } + genitive{ + one{"{0} miljoonasosan"} + other{"{0} miljoonasosan"} + } + illative{ + one{"{0} miljoonasosaan"} + other{"{0} miljoonasosaan"} + } + partitive{ + one{"{0} miljoonasosaa"} + other{"{0} miljoonasosaa"} + } + } + dnam{"miljoonasosat"} + one{"{0} miljoonasosa"} + other{"{0} miljoonasosaa"} + } + part-per-1e9{ + case{ + elative{ + one{"{0} miljardisosasta"} + other{"{0} miljardisosasta"} + } + genitive{ + one{"{0} miljardisosan"} + other{"{0} miljardisosan"} + } + illative{ + one{"{0} miljardisosaan"} + other{"{0} miljardisosaan"} + } + partitive{ + one{"{0} miljardisosaa"} + other{"{0} miljardisosaa"} + } + } + dnam{"miljardisosat"} + one{"{0} miljardisosa"} + other{"{0} miljardisosaa"} + } percent{ case{ elative{ @@ -517,29 +563,6 @@ fi{ one{"{0} promille"} other{"{0} promillea"} } - permillion{ - case{ - elative{ - one{"{0} miljoonasosasta"} - other{"{0} miljoonasosasta"} - } - genitive{ - one{"{0} miljoonasosan"} - other{"{0} miljoonasosan"} - } - illative{ - one{"{0} miljoonasosaan"} - other{"{0} miljoonasosaan"} - } - partitive{ - one{"{0} miljoonasosaa"} - other{"{0} miljoonasosaa"} - } - } - dnam{"miljoonasosat"} - one{"{0} miljoonasosa"} - other{"{0} miljoonasosaa"} - } permyriad{ case{ elative{ @@ -562,29 +585,6 @@ fi{ one{"{0} peruspiste"} other{"{0} peruspistettä"} } - portion-per-1e9{ - case{ - elative{ - one{"{0} miljardisosasta"} - other{"{0} miljardisosasta"} - } - genitive{ - one{"{0} miljardisosan"} - other{"{0} miljardisosan"} - } - illative{ - one{"{0} miljardisosaan"} - other{"{0} miljardisosaan"} - } - partitive{ - one{"{0} miljardisosaa"} - other{"{0} miljardisosaa"} - } - } - dnam{"miljardisosat"} - one{"{0} miljardisosa"} - other{"{0} miljardisosaa"} - } } consumption{ liter-per-100-kilometer{ @@ -3173,14 +3173,14 @@ fi{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + one{"{0}ppm"} + other{"{0}ppm"} + } permille{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} one{"{0}‱"} diff --git a/icu4c/source/data/unit/fil.txt b/icu4c/source/data/unit/fil.txt index 094bcac103b8..fbfd956283dd 100644 --- a/icu4c/source/data/unit/fil.txt +++ b/icu4c/source/data/unit/fil.txt @@ -169,6 +169,16 @@ fil{ one{"{0} mole"} other{"{0} mole"} } + part-per-1e6{ + dnam{"parts per million"} + one{"{0} part per million"} + other{"{0} parts per million"} + } + part-per-1e9{ + dnam{"parts per billion"} + one{"{0} part per billion"} + other{"{0} parts per billion"} + } percent{ dnam{"porsyento"} one{"{0} porsyento"} @@ -179,20 +189,10 @@ fil{ one{"{0} permille"} other{"{0} na permille"} } - permillion{ - dnam{"parts per million"} - one{"{0} part per million"} - other{"{0} parts per million"} - } permyriad{ one{"{0} permyriad"} other{"{0} permyriad"} } - portion-per-1e9{ - dnam{"parts per billion"} - one{"{0} part per billion"} - other{"{0} parts per billion"} - } } consumption{ liter-per-100-kilometer{ @@ -1034,16 +1034,16 @@ fil{ mole{ dnam{"mol"} } - permillion{ + part-per-1e6{ dnam{"ppm"} } - permyriad{ - dnam{"‱"} - } - portion-per-1e9{ + part-per-1e9{ one{"{0}ppb"} other{"{0}ppb"} } + permyriad{ + dnam{"‱"} + } } consumption{ liter-per-100-kilometer{ @@ -1513,15 +1513,15 @@ fil{ mole{ dnam{"mole"} } - permillion{ + part-per-1e6{ dnam{"parts/million"} } + part-per-1e9{ + dnam{"parts/billion"} + } permyriad{ dnam{"permyriad"} } - portion-per-1e9{ - dnam{"parts/billion"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/fo.txt b/icu4c/source/data/unit/fo.txt index 3c1c1eaa074a..17e96fd72a54 100644 --- a/icu4c/source/data/unit/fo.txt +++ b/icu4c/source/data/unit/fo.txt @@ -161,6 +161,16 @@ fo{ one{"{0} millimol fyri hvønn litur"} other{"{0} millimol fyri hvønn litur"} } + part-per-1e6{ + dnam{"partar fyri hvørja millión"} + one{"{0} partur fyri hvørja millión"} + other{"{0} partar fyri hvørja millión"} + } + part-per-1e9{ + dnam{"partar fyri hvørja milliard"} + one{"{0} part fyri hvørja milliard"} + other{"{0} partar fyri hvørja milliard"} + } percent{ one{"{0} prosent"} other{"{0} prosent"} @@ -169,20 +179,10 @@ fo{ one{"{0} promilla"} other{"{0} promillur"} } - permillion{ - dnam{"partar fyri hvørja millión"} - one{"{0} partur fyri hvørja millión"} - other{"{0} partar fyri hvørja millión"} - } permyriad{ one{"{0} promyriad"} other{"{0} promyriad"} } - portion-per-1e9{ - dnam{"partar fyri hvørja milliard"} - one{"{0} part fyri hvørja milliard"} - other{"{0} partar fyri hvørja milliard"} - } } consumption{ liter-per-100-kilometer{ @@ -968,6 +968,16 @@ fo{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + dnam{"pt./mill."} + one{"{0}pt./mill"} + other{"{0}pt./mill"} + } + part-per-1e9{ + dnam{"partar/mia."} + one{"{0}part/mia."} + other{"{0}partar/mia."} + } percent{ dnam{"%"} } @@ -976,21 +986,11 @@ fo{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - dnam{"pt./mill."} - one{"{0}pt./mill"} - other{"{0}pt./mill"} - } permyriad{ dnam{"‱"} one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - dnam{"partar/mia."} - one{"{0}part/mia."} - other{"{0}partar/mia."} - } } consumption{ liter-per-100-kilometer{ @@ -1586,6 +1586,16 @@ fo{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"partar/millión"} + one{"{0} pt./mill."} + other{"{0} pt./mill."} + } + part-per-1e9{ + dnam{"partar/milliard"} + one{"{0} part/mia."} + other{"{0} partar/mia."} + } percent{ dnam{"prosent"} one{"{0} %"} @@ -1596,21 +1606,11 @@ fo{ one{"{0} ‰"} other{"{0} ‰"} } - permillion{ - dnam{"partar/millión"} - one{"{0} pt./mill."} - other{"{0} pt./mill."} - } permyriad{ dnam{"promyriad"} one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"partar/milliard"} - one{"{0} part/mia."} - other{"{0} partar/mia."} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/fr.txt b/icu4c/source/data/unit/fr.txt index 2d6ebc4292b2..1596069a144d 100644 --- a/icu4c/source/data/unit/fr.txt +++ b/icu4c/source/data/unit/fr.txt @@ -215,6 +215,18 @@ fr{ one{"{0} mole"} other{"{0} moles"} } + part-per-1e6{ + dnam{"parts par million"} + gender{"feminine"} + one{"{0} part par million"} + other{"{0} parts par million"} + } + part-per-1e9{ + dnam{"parts par milliard"} + gender{"feminine"} + one{"{0} part par milliard"} + other{"{0} parts par milliard"} + } percent{ dnam{"pour cent"} gender{"masculine"} @@ -227,24 +239,12 @@ fr{ one{"{0} pour mille"} other{"{0} pour mille"} } - permillion{ - dnam{"parts par million"} - gender{"feminine"} - one{"{0} part par million"} - other{"{0} parts par million"} - } permyriad{ dnam{"pour dix mille"} gender{"masculine"} one{"{0} pour dix mille"} other{"{0} pour dix mille"} } - portion-per-1e9{ - dnam{"parts par milliard"} - gender{"feminine"} - one{"{0} part par milliard"} - other{"{0} parts par milliard"} - } } consumption{ liter-per-100-kilometer{ @@ -1314,22 +1314,22 @@ fr{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } permille{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -2071,6 +2071,10 @@ fr{ one{"{0} mol"} other{"{0} mol"} } + part-per-1e6{ + one{"{0} ppm"} + other{"{0} ppm"} + } percent{ one{"{0} %"} other{"{0} %"} @@ -2079,10 +2083,6 @@ fr{ one{"{0} ‰"} other{"{0} ‰"} } - permillion{ - one{"{0} ppm"} - other{"{0} ppm"} - } permyriad{ one{"{0} ‱"} other{"{0} ‱"} diff --git a/icu4c/source/data/unit/fr_CA.txt b/icu4c/source/data/unit/fr_CA.txt index bbdd53964828..13c8522f87ff 100644 --- a/icu4c/source/data/unit/fr_CA.txt +++ b/icu4c/source/data/unit/fr_CA.txt @@ -63,20 +63,20 @@ fr_CA{ } } concentr{ - permille{ - one{"{0} pour mille"} - other{"{0} pour mille"} - } - permillion{ + part-per-1e6{ dnam{"parties par million"} one{"{0} partie par million"} other{"{0} parties par million"} } - portion-per-1e9{ + part-per-1e9{ dnam{"parties par milliard"} one{"{0} partie par milliard"} other{"{0} parties par milliard"} } + permille{ + one{"{0} pour mille"} + other{"{0} pour mille"} + } } consumption{ liter-per-100-kilometer{ @@ -540,7 +540,7 @@ fr_CA{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"p.p. 10⁹"} one{"{0}pp10⁹"} other{"{0}pp10⁹"} @@ -844,6 +844,11 @@ fr_CA{ karat{ dnam{"carats"} } + part-per-1e9{ + dnam{"p.p. 10⁹"} + one{"{0} p.p. 10⁹"} + other{"{0} p.p. 10⁹"} + } percent{ one{"{0} %"} other{"{0} %"} @@ -852,11 +857,6 @@ fr_CA{ one{"{0} ‰"} other{"{0} ‰"} } - portion-per-1e9{ - dnam{"p.p. 10⁹"} - one{"{0} p.p. 10⁹"} - other{"{0} p.p. 10⁹"} - } } consumption{ mile-per-gallon{ diff --git a/icu4c/source/data/unit/ga.txt b/icu4c/source/data/unit/ga.txt index e6b13549fa94..da91761b4fd6 100644 --- a/icu4c/source/data/unit/ga.txt +++ b/icu4c/source/data/unit/ga.txt @@ -244,6 +244,14 @@ ga{ mole{ dnam{"móil"} } + part-per-1e6{ + dnam{"codanna sa mhilliún"} + few{"{0} chuid sa mhilliún"} + many{"{0} gcuid sa mhilliún"} + one{"{0} chuid sa mhilliún"} + other{"{0} cuid sa mhilliún"} + two{"{0} chuid sa mhilliún"} + } percent{ few{"{0}%"} many{"{0}%"} @@ -258,14 +266,6 @@ ga{ other{"{0} faoin míle"} two{"{0}‰"} } - permillion{ - dnam{"codanna sa mhilliún"} - few{"{0} chuid sa mhilliún"} - many{"{0} gcuid sa mhilliún"} - one{"{0} chuid sa mhilliún"} - other{"{0} cuid sa mhilliún"} - two{"{0} chuid sa mhilliún"} - } permyriad{ dnam{"faoin deich míle"} few{"{0}‱"} @@ -2089,13 +2089,7 @@ ga{ other{"{0} mól"} two{"{0} mhól"} } - percent{ - dnam{"faoin gcéad"} - } - permille{ - dnam{"faoin míle"} - } - permillion{ + part-per-1e6{ dnam{"codanna/milliún"} few{"{0}/milliún"} many{"{0}/milliún"} @@ -2103,6 +2097,12 @@ ga{ other{"{0}/milliún"} two{"{0}/milliún"} } + percent{ + dnam{"faoin gcéad"} + } + permille{ + dnam{"faoin míle"} + } permyriad{ dnam{"permeiriad"} } diff --git a/icu4c/source/data/unit/gd.txt b/icu4c/source/data/unit/gd.txt index 57990c8bc9b7..cad05fd47d59 100644 --- a/icu4c/source/data/unit/gd.txt +++ b/icu4c/source/data/unit/gd.txt @@ -225,6 +225,20 @@ gd{ other{"{0} mòl"} two{"{0} mhòl"} } + part-per-1e6{ + dnam{"pàirt sa mhillean"} + few{"{0} pàirtean sa mhillean"} + one{"{0} phàirt sa mhillean"} + other{"{0} pàirt sa mhillean"} + two{"{0} phàirt sa mhillean"} + } + part-per-1e9{ + dnam{"pàirt sa bhillean"} + few{"{0} pàirtean sa bhillean"} + one{"{0} phàirt sa bhillean"} + other{"{0} pàirt sa bhillean"} + two{"{0} phàirt sa bhillean"} + } percent{ few{"{0} sa cheud"} one{"{0} sa cheud"} @@ -237,26 +251,12 @@ gd{ other{"{0} sa mhìle"} two{"{0} sa mhìle"} } - permillion{ - dnam{"pàirt sa mhillean"} - few{"{0} pàirtean sa mhillean"} - one{"{0} phàirt sa mhillean"} - other{"{0} pàirt sa mhillean"} - two{"{0} phàirt sa mhillean"} - } permyriad{ few{"{0} sna deich mìltean"} one{"{0} sna deich mìltean"} other{"{0} sna deich mìltean"} two{"{0} sna deich mìltean"} } - portion-per-1e9{ - dnam{"pàirt sa bhillean"} - few{"{0} pàirtean sa bhillean"} - one{"{0} phàirt sa bhillean"} - other{"{0} pàirt sa bhillean"} - two{"{0} phàirt sa bhillean"} - } } consumption{ liter-per-100-kilometer{ @@ -1505,27 +1505,27 @@ gd{ other{"{0}mòl"} two{"{0}mòl"} } - percent{ - dnam{"%"} - } - permille{ - dnam{"‰"} - } - permillion{ + part-per-1e6{ few{"{0}ppm"} one{"{0}ppm"} other{"{0}ppm"} two{"{0}ppm"} } - permyriad{ - dnam{"‱"} - } - portion-per-1e9{ + part-per-1e9{ few{"{0}ppb"} one{"{0}ppb"} other{"{0}ppb"} two{"{0}ppb"} } + percent{ + dnam{"%"} + } + permille{ + dnam{"‰"} + } + permyriad{ + dnam{"‱"} + } } consumption{ liter-per-100-kilometer{ @@ -2673,6 +2673,9 @@ gd{ other{"{0} mòl"} two{"{0} mòl"} } + part-per-1e9{ + dnam{"pàirt/billean"} + } percent{ dnam{"sa cheud"} } @@ -2682,9 +2685,6 @@ gd{ permyriad{ dnam{"sna deich mìltean"} } - portion-per-1e9{ - dnam{"pàirt/billean"} - } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/gl.txt b/icu4c/source/data/unit/gl.txt index a7f0c8734dd8..4dc9e1027515 100644 --- a/icu4c/source/data/unit/gl.txt +++ b/icu4c/source/data/unit/gl.txt @@ -169,25 +169,25 @@ gl{ one{"{0} mol"} other{"{0} moles"} } + part-per-1e6{ + dnam{"partes por millón"} + one{"{0} parte por millón"} + other{"{0} partes por millón"} + } + part-per-1e9{ + dnam{"partes por mil millóns"} + one{"{0} parte por mil millóns"} + other{"{0} partes por mil millóns"} + } percent{ dnam{"tanto por cento"} } permille{ dnam{"tanto por mil"} } - permillion{ - dnam{"partes por millón"} - one{"{0} parte por millón"} - other{"{0} partes por millón"} - } permyriad{ dnam{"tanto por dez mil"} } - portion-per-1e9{ - dnam{"partes por mil millóns"} - one{"{0} parte por mil millóns"} - other{"{0} partes por mil millóns"} - } } consumption{ liter-per-100-kilometer{ @@ -1041,7 +1041,7 @@ gl{ karat{ dnam{"kt"} } - portion-per-1e9{ + part-per-1e9{ dnam{"ppmm"} one{"{0} ppmm"} other{"{0} ppmm"} @@ -1288,6 +1288,11 @@ gl{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"partes/mil millóns"} + one{"{0} ppmm"} + other{"{0} ppmm"} + } percent{ one{"{0} %"} other{"{0} %"} @@ -1300,11 +1305,6 @@ gl{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"partes/mil millóns"} - one{"{0} ppmm"} - other{"{0} ppmm"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/gu.txt b/icu4c/source/data/unit/gu.txt index e29285b5346b..1545b571aba8 100644 --- a/icu4c/source/data/unit/gu.txt +++ b/icu4c/source/data/unit/gu.txt @@ -139,6 +139,17 @@ gu{ mole{ gender{"masculine"} } + part-per-1e6{ + dnam{"કણ પ્રતિ મિલિયન"} + gender{"masculine"} + one{"{0} કણ પ્રતિ મિલિયન"} + other{"{0} કણ પ્રતિ મિલિયન"} + } + part-per-1e9{ + dnam{"પ્રતિ અબજ ભાગ"} + one{"{0} પ્રતિ અબજ ભાગ"} + other{"{0} પ્રતિ અબજ ભાગ"} + } percent{ gender{"masculine"} one{"{0} ટકા"} @@ -149,22 +160,11 @@ gu{ one{"{0} પ્રતિમાઈલ"} other{"{0} પ્રતિમાઈલ"} } - permillion{ - dnam{"કણ પ્રતિ મિલિયન"} - gender{"masculine"} - one{"{0} કણ પ્રતિ મિલિયન"} - other{"{0} કણ પ્રતિ મિલિયન"} - } permyriad{ gender{"masculine"} one{"{0} પરમિરિયડ"} other{"{0} પરમિરિયડ"} } - portion-per-1e9{ - dnam{"પ્રતિ અબજ ભાગ"} - one{"{0} પ્રતિ અબજ ભાગ"} - other{"{0} પ્રતિ અબજ ભાગ"} - } } consumption{ liter-per-100-kilometer{ @@ -873,22 +873,22 @@ gu{ millimole-per-liter{ dnam{"mmol/L"} } + part-per-1e6{ + dnam{"ppm"} + } + part-per-1e9{ + one{"{0} પ્રતિ અબજ ભાગ"} + other{"{0} પ્રતિ અબજ ભાગ"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - one{"{0} પ્રતિ અબજ ભાગ"} - other{"{0} પ્રતિ અબજ ભાગ"} - } } consumption{ liter-per-100-kilometer{ @@ -1201,23 +1201,23 @@ gu{ one{"{0} મોલ"} other{"{0} મોલ"} } + part-per-1e6{ + dnam{"કણ/મિલિયન"} + } + part-per-1e9{ + dnam{"ભાગ/અબજ"} + one{"{0} પ્રતિ અબજ ભાગ"} + other{"{0} પ્રતિ અબજ ભાગ"} + } percent{ dnam{"ટકા"} } permille{ dnam{"પ્રતિમાઈલ"} } - permillion{ - dnam{"કણ/મિલિયન"} - } permyriad{ dnam{"પરમિરિયડ"} } - portion-per-1e9{ - dnam{"ભાગ/અબજ"} - one{"{0} પ્રતિ અબજ ભાગ"} - other{"{0} પ્રતિ અબજ ભાગ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ha.txt b/icu4c/source/data/unit/ha.txt index 46dfbf4bb384..147de96b141b 100644 --- a/icu4c/source/data/unit/ha.txt +++ b/icu4c/source/data/unit/ha.txt @@ -165,6 +165,16 @@ ha{ one{"mole {0}"} other{"moles {0}"} } + part-per-1e6{ + dnam{"parts per million"} + one{"part per million {0}"} + other{"parts per million {0}"} + } + part-per-1e9{ + dnam{"sashi a cikin biliyan"} + one{"sashi {0} a cikin biliyan"} + other{"sashi {0} a cikin biliyan"} + } percent{ one{"kaso {0}"} other{"Kaso {0}"} @@ -173,20 +183,10 @@ ha{ one{"permille {0}"} other{"permille {0}"} } - permillion{ - dnam{"parts per million"} - one{"part per million {0}"} - other{"parts per million {0}"} - } permyriad{ one{"permyriad {0}"} other{"permyriad {0}"} } - portion-per-1e9{ - dnam{"sashi a cikin biliyan"} - one{"sashi {0} a cikin biliyan"} - other{"sashi {0} a cikin biliyan"} - } } consumption{ liter-per-100-kilometer{ @@ -1102,6 +1102,16 @@ ha{ one{"mol{0}"} other{"mol{0}"} } + part-per-1e6{ + dnam{"ppm"} + one{"ppm{0}"} + other{"ppm{0}"} + } + part-per-1e9{ + dnam{"sashi/biliyan"} + one{"sashi {0} a cikin biliyan"} + other{"sashi {0} a cikin biliyan"} + } percent{ one{"%{0}"} other{"%{0}"} @@ -1109,19 +1119,9 @@ ha{ permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - one{"ppm{0}"} - other{"ppm{0}"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - dnam{"sashi/biliyan"} - one{"sashi {0} a cikin biliyan"} - other{"sashi {0} a cikin biliyan"} - } } consumption{ liter-per-100-kilometer{ @@ -1963,6 +1963,16 @@ ha{ one{"mol {0}"} other{"mol {0}"} } + part-per-1e6{ + dnam{"parts/million"} + one{"ppm {0}"} + other{"ppm {0}"} + } + part-per-1e9{ + dnam{"sashi/biliyan"} + one{"sashi {0} a cikin biliyan"} + other{"sashi {0} a cikin biliyan"} + } percent{ dnam{"kaso"} } @@ -1971,21 +1981,11 @@ ha{ one{"‰{0}"} other{"‰{0}"} } - permillion{ - dnam{"parts/million"} - one{"ppm {0}"} - other{"ppm {0}"} - } permyriad{ dnam{"permyriad"} one{"‱{0}"} other{"‱{0}"} } - portion-per-1e9{ - dnam{"sashi/biliyan"} - one{"sashi {0} a cikin biliyan"} - other{"sashi {0} a cikin biliyan"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/he.txt b/icu4c/source/data/unit/he.txt index ce18e5b99f5c..a9927e003a13 100644 --- a/icu4c/source/data/unit/he.txt +++ b/icu4c/source/data/unit/he.txt @@ -245,6 +245,21 @@ he{ other{"{0} מול"} two{"{0} מול"} } + part-per-1e6{ + dnam{"חלקים למיליון"} + gender{"masculine"} + many{"{0} חלקים למיליון"} + one{"{0} חלקים למיליון"} + other{"{0} חלקים למיליון"} + two{"{0} חלקים למיליון"} + } + part-per-1e9{ + dnam{"חלקים למיליארד"} + gender{"masculine"} + one{"{0} חלקים למיליארד"} + other{"{0} חלקים למיליארד"} + two{"{0} חלקים למיליארד"} + } percent{ dnam{"אחוז"} gender{"masculine"} @@ -261,14 +276,6 @@ he{ other{"{0} פרומיל"} two{"{0} פרומיל"} } - permillion{ - dnam{"חלקים למיליון"} - gender{"masculine"} - many{"{0} חלקים למיליון"} - one{"{0} חלקים למיליון"} - other{"{0} חלקים למיליון"} - two{"{0} חלקים למיליון"} - } permyriad{ dnam{"רבבית"} gender{"feminine"} @@ -277,13 +284,6 @@ he{ other{"{0} רבביות"} two{"{0} רבביות"} } - portion-per-1e9{ - dnam{"חלקים למיליארד"} - gender{"masculine"} - one{"{0} חלקים למיליארד"} - other{"{0} חלקים למיליארד"} - two{"{0} חלקים למיליארד"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/hi.txt b/icu4c/source/data/unit/hi.txt index 54ce73b3e0f9..7a9234a84bda 100644 --- a/icu4c/source/data/unit/hi.txt +++ b/icu4c/source/data/unit/hi.txt @@ -267,6 +267,29 @@ hi{ mole{ gender{"masculine"} } + part-per-1e6{ + case{ + oblique{ + one{"{0} हिस्सा प्रति दस लाख"} + other{"{0} हिस्सा प्रति दस लाख"} + } + } + gender{"masculine"} + one{"{0} हिस्सा प्रति दस लाख"} + other{"{0} हिस्सा प्रति दस लाख"} + } + part-per-1e9{ + case{ + oblique{ + one{"{0} पार्ट प्रति बिलियन"} + other{"{0} पार्ट्स प्रति बिलियन"} + } + } + dnam{"पार्ट्स प्रति बिलियन"} + gender{"masculine"} + one{"{0} पार्ट प्रति बिलियन"} + other{"{0} पार्ट्स प्रति बिलियन"} + } percent{ case{ oblique{ @@ -289,17 +312,6 @@ hi{ one{"{0} प्रति हज़ार"} other{"{0} प्रति हज़ार"} } - permillion{ - case{ - oblique{ - one{"{0} हिस्सा प्रति दस लाख"} - other{"{0} हिस्सा प्रति दस लाख"} - } - } - gender{"masculine"} - one{"{0} हिस्सा प्रति दस लाख"} - other{"{0} हिस्सा प्रति दस लाख"} - } permyriad{ case{ oblique{ @@ -312,18 +324,6 @@ hi{ one{"{0} प्रति दस हज़ार"} other{"{0} प्रति दस हज़ार"} } - portion-per-1e9{ - case{ - oblique{ - one{"{0} पार्ट प्रति बिलियन"} - other{"{0} पार्ट्स प्रति बिलियन"} - } - } - dnam{"पार्ट्स प्रति बिलियन"} - gender{"masculine"} - one{"{0} पार्ट प्रति बिलियन"} - other{"{0} पार्ट्स प्रति बिलियन"} - } } consumption{ liter-per-100-kilometer{ @@ -1888,12 +1888,12 @@ hi{ 10p9{"गी {0}"} } concentr{ + part-per-1e6{ + dnam{"ppm"} + } percent{ dnam{"%"} } - permillion{ - dnam{"ppm"} - } } consumption{ liter-per-100-kilometer{ @@ -2422,18 +2422,18 @@ hi{ one{"{0} मोल"} other{"{0} मोल"} } + part-per-1e6{ + dnam{"हिस्सा प्रति दस लाख"} + } + part-per-1e9{ + dnam{"पार्ट्स/बिलियन"} + } percent{ dnam{"प्रतिशत"} } permille{ dnam{"प्रति हज़ार"} } - permillion{ - dnam{"हिस्सा प्रति दस लाख"} - } - portion-per-1e9{ - dnam{"पार्ट्स/बिलियन"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/hr.txt b/icu4c/source/data/unit/hr.txt index 5227c34fcd79..764a2e48140d 100644 --- a/icu4c/source/data/unit/hr.txt +++ b/icu4c/source/data/unit/hr.txt @@ -564,6 +564,54 @@ hr{ one{"{0} mola"} other{"{0} mola"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} dijela na milijun"} + one{"{0} dio na milijun"} + other{"{0} dijelova na milijun"} + } + genitive{ + few{"{0} dijela na milijun"} + one{"{0} dijela na milijun"} + other{"{0} dijelova na milijun"} + } + instrumental{ + few{"{0} dijela na milijun"} + one{"{0} dijelom na milijun"} + other{"{0} dijelova na milijun"} + } + } + dnam{"dijelovi na milijun"} + few{"{0} dijela na milijun"} + gender{"inanimate"} + one{"{0} dio na milijun"} + other{"{0} dijelova na milijun"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} dijela na milijardu"} + one{"{0} dio na milijardu"} + other{"{0} dijelova na milijardu"} + } + genitive{ + few{"{0} dijela na milijardu"} + one{"{0} dijela na milijardu"} + other{"{0} dijelova na milijardu"} + } + instrumental{ + few{"{0} dijela na milijardu"} + one{"{0} dijelom na milijardu"} + other{"{0} dijelova na milijardu"} + } + } + dnam{"dijelovi na milijardu"} + few{"{0} dijela na milijardu"} + gender{"inanimate"} + one{"{0} dio na milijardu"} + other{"{0} dijelova na milijardu"} + } percent{ case{ accusative{ @@ -612,30 +660,6 @@ hr{ one{"{0} promil"} other{"{0} promila"} } - permillion{ - case{ - accusative{ - few{"{0} dijela na milijun"} - one{"{0} dio na milijun"} - other{"{0} dijelova na milijun"} - } - genitive{ - few{"{0} dijela na milijun"} - one{"{0} dijela na milijun"} - other{"{0} dijelova na milijun"} - } - instrumental{ - few{"{0} dijela na milijun"} - one{"{0} dijelom na milijun"} - other{"{0} dijelova na milijun"} - } - } - dnam{"dijelovi na milijun"} - few{"{0} dijela na milijun"} - gender{"inanimate"} - one{"{0} dio na milijun"} - other{"{0} dijelova na milijun"} - } permyriad{ case{ accusative{ @@ -660,30 +684,6 @@ hr{ one{"{0} permyriad"} other{"{0} permyriada"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} dijela na milijardu"} - one{"{0} dio na milijardu"} - other{"{0} dijelova na milijardu"} - } - genitive{ - few{"{0} dijela na milijardu"} - one{"{0} dijela na milijardu"} - other{"{0} dijelova na milijardu"} - } - instrumental{ - few{"{0} dijela na milijardu"} - one{"{0} dijelom na milijardu"} - other{"{0} dijelova na milijardu"} - } - } - dnam{"dijelovi na milijardu"} - few{"{0} dijela na milijardu"} - gender{"inanimate"} - one{"{0} dio na milijardu"} - other{"{0} dijelova na milijardu"} - } } consumption{ liter-per-100-kilometer{ @@ -3412,7 +3412,7 @@ hr{ one{"{0} mol"} other{"{0} mola"} } - portion-per-1e9{ + part-per-1e9{ dnam{"dijelovi/milijarda"} } } @@ -3607,6 +3607,9 @@ hr{ one{"{0} mola"} other{"{0} mola"} } + part-per-1e9{ + dnam{"dijelovi/milijarda"} + } percent{ few{"{0} %"} one{"{0} %"} @@ -3622,9 +3625,6 @@ hr{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"dijelovi/milijarda"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/hsb.txt b/icu4c/source/data/unit/hsb.txt index c2958626779e..b0f8d76d70c4 100644 --- a/icu4c/source/data/unit/hsb.txt +++ b/icu4c/source/data/unit/hsb.txt @@ -249,6 +249,20 @@ hsb{ other{"{0} molow"} two{"{0} molej"} } + part-per-1e6{ + dnam{"milionćiny"} + few{"{0} milionćiny"} + one{"{0} milionćina"} + other{"{0} milionćinow"} + two{"{0} milionćinje"} + } + part-per-1e9{ + dnam{"miliardćina"} + few{"{0} miliardćiny"} + one{"{0} miliardćina"} + other{"{0} miliardćinow"} + two{"{0} miliardćinje"} + } percent{ dnam{"procenty"} few{"{0} procenty"} @@ -263,13 +277,6 @@ hsb{ other{"{0} promilow"} two{"{0} promilej"} } - permillion{ - dnam{"milionćiny"} - few{"{0} milionćiny"} - one{"{0} milionćina"} - other{"{0} milionćinow"} - two{"{0} milionćinje"} - } permyriad{ dnam{"dźesaćiny promila"} few{"{0} dźesaćiny promila"} @@ -277,13 +284,6 @@ hsb{ other{"{0} dźesaćinow promila"} two{"{0} dźesaćinje promila"} } - portion-per-1e9{ - dnam{"miliardćina"} - few{"{0} miliardćiny"} - one{"{0} miliardćina"} - other{"{0} miliardćinow"} - two{"{0} miliardćinje"} - } } consumption{ liter-per-100-kilometer{ @@ -1448,7 +1448,7 @@ hsb{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"n"} few{"{0} n"} one{"{0} n"} @@ -1631,6 +1631,13 @@ hsb{ other{"{0} mmol/l"} two{"{0} mmol/l"} } + part-per-1e9{ + dnam{"nano"} + few{"{0} nano"} + one{"{0} nano"} + other{"{0} nano"} + two{"{0} nano"} + } percent{ few{"{0} %"} one{"{0} %"} @@ -1649,13 +1656,6 @@ hsb{ other{"{0} ‱"} two{"{0} ‱"} } - portion-per-1e9{ - dnam{"nano"} - few{"{0} nano"} - one{"{0} nano"} - other{"{0} nano"} - two{"{0} nano"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/hu.txt b/icu4c/source/data/unit/hu.txt index 7e84a4dfb2c4..144ed3d53999 100644 --- a/icu4c/source/data/unit/hu.txt +++ b/icu4c/source/data/unit/hu.txt @@ -460,6 +460,28 @@ hu{ one{"{0} mól"} other{"{0} mól"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} részecske/milliót"} + other{"{0} részecske/milliót"} + } + instrumental{ + one{"{0} részecske/millióval"} + other{"{0} részecske/millióval"} + } + terminative{ + one{"{0} részecske/millióig"} + other{"{0} részecske/millióig"} + } + translative{ + one{"{0} részecske/millióvá"} + other{"{0} részecske/millióvá"} + } + } + one{"{0} részecske/millió"} + other{"{0} részecske/millió"} + } percent{ case{ accusative{ @@ -504,28 +526,6 @@ hu{ one{"{0} ezrelék"} other{"{0} ezrelék"} } - permillion{ - case{ - accusative{ - one{"{0} részecske/milliót"} - other{"{0} részecske/milliót"} - } - instrumental{ - one{"{0} részecske/millióval"} - other{"{0} részecske/millióval"} - } - terminative{ - one{"{0} részecske/millióig"} - other{"{0} részecske/millióig"} - } - translative{ - one{"{0} részecske/millióvá"} - other{"{0} részecske/millióvá"} - } - } - one{"{0} részecske/millió"} - other{"{0} részecske/millió"} - } permyriad{ case{ accusative{ @@ -3074,15 +3074,15 @@ hu{ millimole-per-liter{ dnam{"mmol/l"} } + part-per-1e6{ + dnam{"ppm"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } } consumption{ liter-per-100-kilometer{ @@ -3207,15 +3207,15 @@ hu{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"részecske/millió"} + } percent{ dnam{"százalék"} } permille{ dnam{"ezrelék"} } - permillion{ - dnam{"részecske/millió"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/hy.txt b/icu4c/source/data/unit/hy.txt index 544c904daa49..63778cf273fc 100644 --- a/icu4c/source/data/unit/hy.txt +++ b/icu4c/source/data/unit/hy.txt @@ -458,6 +458,52 @@ hy{ one{"{0} մոլ"} other{"{0} մոլ"} } + part-per-1e6{ + case{ + ablative{ + one{"{0} մասից միլիոնի վրա"} + other{"{0} մասից միլիոնի վրա"} + } + dative{ + one{"{0} մասին միլիոնի վրա"} + other{"{0} մասին միլիոնի վրա"} + } + instrumental{ + one{"{0} մասով միլիոնի վրա"} + other{"{0} մասով միլիոնի վրա"} + } + locative{ + one{"{0} մասում միլիոնի վրա"} + other{"{0} մասում միլիոնի վրա"} + } + } + dnam{"մաս միլիոնի վրա"} + one{"{0} մաս միլիոնի վրա"} + other{"{0} մաս միլիոնի վրա"} + } + part-per-1e9{ + case{ + ablative{ + one{"{0} մասից միլիարդի վրա"} + other{"{0} մասից միլիարդի վրա"} + } + dative{ + one{"{0} մասին միլիարդի վրա"} + other{"{0} մասին միլիարդի վրա"} + } + instrumental{ + one{"{0} մասով միլիարդի վրա"} + other{"{0} մասով միլիարդի վրա"} + } + locative{ + one{"{0} մասում միլիարդի վրա"} + other{"{0} մասում միլիարդի վրա"} + } + } + dnam{"մաս միլիարդի վրա"} + one{"{0} մաս միլիարդի վրա"} + other{"{0} մաս միլիարդի վրա"} + } percent{ case{ ablative{ @@ -502,29 +548,6 @@ hy{ one{"{0} պրոմիլ"} other{"{0} պրոմիլ"} } - permillion{ - case{ - ablative{ - one{"{0} մասից միլիոնի վրա"} - other{"{0} մասից միլիոնի վրա"} - } - dative{ - one{"{0} մասին միլիոնի վրա"} - other{"{0} մասին միլիոնի վրա"} - } - instrumental{ - one{"{0} մասով միլիոնի վրա"} - other{"{0} մասով միլիոնի վրա"} - } - locative{ - one{"{0} մասում միլիոնի վրա"} - other{"{0} մասում միլիոնի վրա"} - } - } - dnam{"մաս միլիոնի վրա"} - one{"{0} մաս միլիոնի վրա"} - other{"{0} մաս միլիոնի վրա"} - } permyriad{ case{ ablative{ @@ -548,29 +571,6 @@ hy{ one{"{0} պերմիրիադ"} other{"{0} պերմիրիադ"} } - portion-per-1e9{ - case{ - ablative{ - one{"{0} մասից միլիարդի վրա"} - other{"{0} մասից միլիարդի վրա"} - } - dative{ - one{"{0} մասին միլիարդի վրա"} - other{"{0} մասին միլիարդի վրա"} - } - instrumental{ - one{"{0} մասով միլիարդի վրա"} - other{"{0} մասով միլիարդի վրա"} - } - locative{ - one{"{0} մասում միլիարդի վրա"} - other{"{0} մասում միլիարդի վրա"} - } - } - dnam{"մաս միլիարդի վրա"} - one{"{0} մաս միլիարդի վրա"} - other{"{0} մաս միլիարդի վրա"} - } } consumption{ liter-per-100-kilometer{ @@ -3167,22 +3167,22 @@ hy{ one{"{0}մոլ"} other{"{0}մոլ"} } - percent{ - dnam{"%"} - } - permille{ - dnam{"‰"} - } - permillion{ + part-per-1e6{ dnam{"մմվ"} one{"{0}մմվ"} other{"{0}մմվ"} } - portion-per-1e9{ + part-per-1e9{ dnam{"մմլրդվ"} one{"{0}մմլրդվ"} other{"{0}մմլրդվ"} } + percent{ + dnam{"%"} + } + permille{ + dnam{"‰"} + } } consumption{ liter-per-kilometer{ @@ -3761,22 +3761,22 @@ hy{ one{"{0} մոլ"} other{"{0} մոլ"} } - percent{ - dnam{"տոկոս"} - } - permille{ - dnam{"պրոմիլ"} - } - permillion{ + part-per-1e6{ dnam{"մաս/միլիոն"} one{"{0} մմվ"} other{"{0} մմվ"} } - portion-per-1e9{ + part-per-1e9{ dnam{"մաս/միլիարդ"} one{"{0} մմլրդվ"} other{"{0} մմլրդվ"} } + percent{ + dnam{"տոկոս"} + } + permille{ + dnam{"պրոմիլ"} + } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ia.txt b/icu4c/source/data/unit/ia.txt index f1f95165c11d..3dccdd8fc9a2 100644 --- a/icu4c/source/data/unit/ia.txt +++ b/icu4c/source/data/unit/ia.txt @@ -158,6 +158,11 @@ ia{ one{"{0} millimol per litro"} other{"{0} millimoles per litro"} } + part-per-1e6{ + dnam{"partes per million"} + one{"{0} parte per million"} + other{"{0} partes per million"} + } percent{ dnam{"per cento"} one{"{0} per cento"} @@ -168,11 +173,6 @@ ia{ one{"{0} per mille"} other{"{0} per mille"} } - permillion{ - dnam{"partes per million"} - one{"{0} parte per million"} - other{"{0} partes per million"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/id.txt b/icu4c/source/data/unit/id.txt index 0002e2e4d7f1..1ffc6e556d8c 100644 --- a/icu4c/source/data/unit/id.txt +++ b/icu4c/source/data/unit/id.txt @@ -137,23 +137,23 @@ id{ dnam{"millimol per liter"} other{"{0} millimol per liter"} } + part-per-1e6{ + dnam{"bagian per juta"} + other{"{0} bagian per juta"} + } + part-per-1e9{ + dnam{"bagian per miliar"} + other{"{0} bagian per miliar"} + } percent{ other{"{0} persen"} } permille{ other{"{0} permil"} } - permillion{ - dnam{"bagian per juta"} - other{"{0} bagian per juta"} - } permyriad{ other{"{0} permyriad"} } - portion-per-1e9{ - dnam{"bagian per miliar"} - other{"{0} bagian per miliar"} - } } consumption{ liter-per-100-kilometer{ @@ -815,15 +815,15 @@ id{ millimole-per-liter{ dnam{"mmol/L"} } + part-per-1e6{ + dnam{"ppm"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } permyriad{ dnam{"‱"} } @@ -1104,21 +1104,21 @@ id{ millimole-per-liter{ dnam{"millimol/liter"} } + part-per-1e6{ + dnam{"bagian/juta"} + } + part-per-1e9{ + dnam{"bagian/miliar"} + } percent{ dnam{"persen"} } permille{ dnam{"permil"} } - permillion{ - dnam{"bagian/juta"} - } permyriad{ dnam{"permyriad"} } - portion-per-1e9{ - dnam{"bagian/miliar"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ig.txt b/icu4c/source/data/unit/ig.txt index f28d8162e88a..797e60db5b31 100644 --- a/icu4c/source/data/unit/ig.txt +++ b/icu4c/source/data/unit/ig.txt @@ -30,7 +30,7 @@ ig{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"akụkụ kwa ijeri"} other{"{0} akụkụ kwa ijeri"} } @@ -154,10 +154,10 @@ ig{ millimole-per-liter{ other{"{0}mmol/L"} } - permillion{ + part-per-1e6{ other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ dnam{"akụkụ/ijeri"} } } @@ -238,7 +238,7 @@ ig{ dnam{"ihe"} other{"{0} ihe"} } - portion-per-1e9{ + part-per-1e9{ dnam{"akụkụ/ijeri"} } } diff --git a/icu4c/source/data/unit/is.txt b/icu4c/source/data/unit/is.txt index 3ddc25fee649..7dfe4cb8cd0e 100644 --- a/icu4c/source/data/unit/is.txt +++ b/icu4c/source/data/unit/is.txt @@ -463,6 +463,45 @@ is{ one{"{0} mól"} other{"{0} mól"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} milljónarhluta"} + other{"{0} milljónarhluta"} + } + dative{ + one{"{0} milljónarhluta"} + other{"{0} milljónarhlutum"} + } + genitive{ + one{"{0} milljónarhluta"} + other{"{0} milljónarhluta"} + } + } + gender{"masculine"} + one{"{0} milljónarhluti"} + other{"{0} milljónarhlutar"} + } + part-per-1e9{ + case{ + accusative{ + one{"{0} hluta á milljarð"} + other{"{0} hluta á milljarð"} + } + dative{ + one{"{0} hluta á milljarð"} + other{"{0} hlutum á milljarð"} + } + genitive{ + one{"{0} hluta á milljarð"} + other{"{0} hluta á milljarð"} + } + } + dnam{"hlutar á milljarð"} + gender{"masculine"} + one{"{0} hluti á milljarð"} + other{"{0} hlutar á milljarð"} + } percent{ case{ accusative{ @@ -501,25 +540,6 @@ is{ one{"{0} prómill"} other{"{0} prómill"} } - permillion{ - case{ - accusative{ - one{"{0} milljónarhluta"} - other{"{0} milljónarhluta"} - } - dative{ - one{"{0} milljónarhluta"} - other{"{0} milljónarhlutum"} - } - genitive{ - one{"{0} milljónarhluta"} - other{"{0} milljónarhluta"} - } - } - gender{"masculine"} - one{"{0} milljónarhluti"} - other{"{0} milljónarhlutar"} - } permyriad{ case{ accusative{ @@ -539,26 +559,6 @@ is{ one{"{0} permyriad"} other{"{0} permyriad"} } - portion-per-1e9{ - case{ - accusative{ - one{"{0} hluta á milljarð"} - other{"{0} hluta á milljarð"} - } - dative{ - one{"{0} hluta á milljarð"} - other{"{0} hlutum á milljarð"} - } - genitive{ - one{"{0} hluta á milljarð"} - other{"{0} hluta á milljarð"} - } - } - dnam{"hlutar á milljarð"} - gender{"masculine"} - one{"{0} hluti á milljarð"} - other{"{0} hlutar á milljarð"} - } } consumption{ liter-per-100-kilometer{ @@ -2809,16 +2809,16 @@ is{ one{"{0}mmól/l"} other{"{0}mmól/l"} } + part-per-1e6{ + dnam{"ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + } percent{ dnam{"%"} one{"{0}%"} other{"{0}%"} } - permillion{ - dnam{"ppm"} - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} } @@ -3132,6 +3132,9 @@ is{ one{"{0} mól"} other{"{0} mól"} } + part-per-1e6{ + dnam{"milljónarhlutar"} + } percent{ dnam{"prósent"} one{"{0}%"} @@ -3140,9 +3143,6 @@ is{ permille{ dnam{"prómill"} } - permillion{ - dnam{"milljónarhlutar"} - } permyriad{ dnam{"permyriad"} } diff --git a/icu4c/source/data/unit/it.txt b/icu4c/source/data/unit/it.txt index 1beb6dc39af5..9bd729029ad5 100644 --- a/icu4c/source/data/unit/it.txt +++ b/icu4c/source/data/unit/it.txt @@ -206,6 +206,18 @@ it{ one{"{0} mole"} other{"{0} moli"} } + part-per-1e6{ + dnam{"parti per milione"} + gender{"feminine"} + one{"{0} parte per milione"} + other{"{0} parti per milione"} + } + part-per-1e9{ + dnam{"parti per miliardo"} + gender{"feminine"} + one{"{0} parte per miliardo"} + other{"{0} parti per miliardo"} + } percent{ dnam{"percentuale"} gender{"masculine"} @@ -218,24 +230,12 @@ it{ one{"{0} per mille"} other{"{0} per mille"} } - permillion{ - dnam{"parti per milione"} - gender{"feminine"} - one{"{0} parte per milione"} - other{"{0} parti per milione"} - } permyriad{ dnam{"punto base"} gender{"masculine"} one{"{0} punto base"} other{"{0} punti base"} } - portion-per-1e9{ - dnam{"parti per miliardo"} - gender{"feminine"} - one{"{0} parte per miliardo"} - other{"{0} parti per miliardo"} - } } consumption{ liter-per-100-kilometer{ @@ -1286,17 +1286,17 @@ it{ one{"{0}mol"} other{"{0}mol"} } - percent{ - dnam{"%"} - } - permillion{ + part-per-1e6{ one{"{0}ppm"} other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ one{"{0}ppb"} other{"{0}ppb"} } + percent{ + dnam{"%"} + } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/ja.txt b/icu4c/source/data/unit/ja.txt index d48e09045764..6d3d20da7c51 100644 --- a/icu4c/source/data/unit/ja.txt +++ b/icu4c/source/data/unit/ja.txt @@ -726,21 +726,21 @@ ja{ dnam{"mol"} other{"{0}mol"} } + part-per-1e6{ + other{"{0}ppm"} + } + part-per-1e9{ + other{"{0}ppb"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - other{"{0}ppm"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/jv.txt b/icu4c/source/data/unit/jv.txt index 9ea8e0d28916..35de47c87065 100644 --- a/icu4c/source/data/unit/jv.txt +++ b/icu4c/source/data/unit/jv.txt @@ -121,16 +121,16 @@ jv{ dnam{"milimol saben liter"} other{"{0} milimol saben liter"} } + part-per-1e6{ + dnam{"bagean saben yuta"} + other{"{0} bagean saben yuta"} + } percent{ other{"{0} persen"} } permille{ other{"{0} permil"} } - permillion{ - dnam{"bagean saben yuta"} - other{"{0} bagean saben yuta"} - } permyriad{ other{"{0} permiriad"} } @@ -829,16 +829,16 @@ jv{ karat{ dnam{"karat"} } + part-per-1e6{ + dnam{"bagean/yuta"} + other{"{0}bpj"} + } percent{ dnam{"persen"} } permille{ dnam{"permil"} } - permillion{ - dnam{"bagean/yuta"} - other{"{0}bpj"} - } permyriad{ dnam{"permiriad"} } diff --git a/icu4c/source/data/unit/ka.txt b/icu4c/source/data/unit/ka.txt index 150619263364..09b7ce97f4c3 100644 --- a/icu4c/source/data/unit/ka.txt +++ b/icu4c/source/data/unit/ka.txt @@ -147,6 +147,16 @@ ka{ one{"{0} მილიმოლი ლიტრზე"} other{"{0} მილიმოლი ლიტრზე"} } + part-per-1e6{ + dnam{"ნაწილი მილიონზე"} + one{"{0} ნაწილი მილიონზე"} + other{"{0} ნაწილი მილიონზე"} + } + part-per-1e9{ + dnam{"ნაწილი მილიარდზე"} + one{"{0} ნაწილი მილიარდზე"} + other{"{0} ნაწილი მილიარდზე"} + } percent{ dnam{"პროცენტი"} one{"{0} პროცენტი"} @@ -157,16 +167,6 @@ ka{ one{"{0} პრომილე"} other{"{0} პრომილე"} } - permillion{ - dnam{"ნაწილი მილიონზე"} - one{"{0} ნაწილი მილიონზე"} - other{"{0} ნაწილი მილიონზე"} - } - portion-per-1e9{ - dnam{"ნაწილი მილიარდზე"} - one{"{0} ნაწილი მილიარდზე"} - other{"{0} ნაწილი მილიარდზე"} - } } consumption{ liter-per-100-kilometer{ @@ -877,7 +877,7 @@ ka{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"ნ/მ"} } } @@ -1112,10 +1112,10 @@ ka{ one{"{0} მმოლ/ლ"} other{"{0} მმოლ/ლ"} } - permillion{ + part-per-1e6{ dnam{"ნაწილი/მილიონზე"} } - portion-per-1e9{ + part-per-1e9{ dnam{"ნაწილი/მილიარდზე"} one{"{0} ნ/მ"} other{"{0} ნ/მ"} diff --git a/icu4c/source/data/unit/kea.txt b/icu4c/source/data/unit/kea.txt index 12a51644fc1a..ab8299978316 100644 --- a/icu4c/source/data/unit/kea.txt +++ b/icu4c/source/data/unit/kea.txt @@ -128,6 +128,10 @@ kea{ dnam{"milimol pur litru"} other{"{0} milimol pur litru"} } + part-per-1e6{ + dnam{"parti pur milhãu"} + other{"{0} parti pur milhãu"} + } percent{ dnam{"pursentu"} other{"{0} pursentu"} @@ -136,10 +140,6 @@ kea{ dnam{"pur mil"} other{"{0} pur mil"} } - permillion{ - dnam{"parti pur milhãu"} - other{"{0} parti pur milhãu"} - } permyriad{ dnam{"pontu bazi"} other{"{0} pontu bazi"} @@ -816,7 +816,7 @@ kea{ dnam{"milimol/litru"} other{"{0} mmol/l"} } - permillion{ + part-per-1e6{ dnam{"parti/milhãu"} } } diff --git a/icu4c/source/data/unit/kgp.txt b/icu4c/source/data/unit/kgp.txt index 86c0726c164f..e44d399ef6ff 100644 --- a/icu4c/source/data/unit/kgp.txt +++ b/icu4c/source/data/unit/kgp.txt @@ -113,6 +113,11 @@ kgp{ mole{ dnam{"mol ag"} } + part-per-1e6{ + dnam{"milhão ki kupar ‘e"} + one{"{0} kupar milhão ki"} + other{"{0} kupar 'e milhão ki"} + } percent{ one{"{0} sẽnto ki"} other{"{0} sẽnto ki"} @@ -121,11 +126,6 @@ kgp{ one{"{0} mil ki"} other{"{0} mil ki"} } - permillion{ - dnam{"milhão ki kupar ‘e"} - one{"{0} kupar milhão ki"} - other{"{0} kupar 'e milhão ki"} - } permyriad{ one{"{0} pãntu mase"} other{"{0} pãntu mase ag"} @@ -1085,15 +1085,15 @@ kgp{ dnam{"mĩrimol/ritru"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"kupar ‘e/milhão ki"} + } percent{ dnam{"sẽnto ki"} } permille{ dnam{"mil ki"} } - permillion{ - dnam{"kupar ‘e/milhão ki"} - } permyriad{ dnam{"pãntu mase"} } diff --git a/icu4c/source/data/unit/kk.txt b/icu4c/source/data/unit/kk.txt index 11612793807e..47785347653d 100644 --- a/icu4c/source/data/unit/kk.txt +++ b/icu4c/source/data/unit/kk.txt @@ -152,6 +152,16 @@ kk{ one{"{0} миллимоль/литр"} other{"{0} миллимоль/литр"} } + part-per-1e6{ + dnam{"миллиондық үлес"} + one{"{0} миллиондық үлес"} + other{"{0} миллиондық үлес"} + } + part-per-1e9{ + dnam{"миллиардтағы бөлік"} + one{"{0} б/млрд"} + other{"{0} б/млрд"} + } percent{ one{"{0} пайыз"} other{"{0} пайыз"} @@ -160,20 +170,10 @@ kk{ one{"{0} промилле"} other{"{0} промилле"} } - permillion{ - dnam{"миллиондық үлес"} - one{"{0} миллиондық үлес"} - other{"{0} миллиондық үлес"} - } permyriad{ one{"{0} промириад"} other{"{0} промириад"} } - portion-per-1e9{ - dnam{"миллиардтағы бөлік"} - one{"{0} б/млрд"} - other{"{0} б/млрд"} - } } consumption{ liter-per-100-kilometer{ @@ -892,17 +892,17 @@ kk{ } } concentr{ + part-per-1e9{ + dnam{"б/млрд"} + one{"{0} б/млрд"} + other{"{0} б/млрд"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - portion-per-1e9{ - dnam{"б/млрд"} - one{"{0} б/млрд"} - other{"{0} б/млрд"} - } } consumption{ liter-per-kilometer{ @@ -1193,6 +1193,11 @@ kk{ one{"{0} моль"} other{"{0} моль"} } + part-per-1e9{ + dnam{"бөлік/миллиард"} + one{"{0} б/млрд"} + other{"{0} б/млрд"} + } percent{ dnam{"пайыз"} } @@ -1202,11 +1207,6 @@ kk{ permyriad{ dnam{"промириад"} } - portion-per-1e9{ - dnam{"бөлік/миллиард"} - one{"{0} б/млрд"} - other{"{0} б/млрд"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/km.txt b/icu4c/source/data/unit/km.txt index 0c291fa5ebe4..f56ca6f26953 100644 --- a/icu4c/source/data/unit/km.txt +++ b/icu4c/source/data/unit/km.txt @@ -113,17 +113,17 @@ km{ dnam{"មិល្លីម៉ូលក្នុងមួយលីត្រ"} other{"{0} មិល្លីម៉ូលក្នុងមួយលីត្រ"} } - percent{ - other{"{0} ភាគរយ"} - } - permillion{ + part-per-1e6{ dnam{"ផ្នែកក្នុងមួយលាន"} other{"{0} ផ្នែកក្នុងមួយលាន"} } - portion-per-1e9{ + part-per-1e9{ dnam{"ផ្នែកក្នុងមួយប៊ីលាន"} other{"{0} ផ្នែកក្នុងមួយប៊ីលាន"} } + percent{ + other{"{0} ភាគរយ"} + } } consumption{ liter-per-100-kilometer{ @@ -716,12 +716,12 @@ km{ dnam{"ម៉ូល"} other{"{0} ម៉ូល"} } + part-per-1e9{ + other{"{0}ppb"} + } percent{ dnam{"%"} } - portion-per-1e9{ - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -888,12 +888,12 @@ km{ dnam{"មិល្លីម៉ូល/លីត្រ"} other{"{0} ម.ម៉ូល/លី"} } + part-per-1e9{ + dnam{"ផ្នែក/ប៊ីលាន"} + } percent{ dnam{"ភាគរយ"} } - portion-per-1e9{ - dnam{"ផ្នែក/ប៊ីលាន"} - } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/kn.txt b/icu4c/source/data/unit/kn.txt index 217ce516ce0b..cb6aae33ee56 100644 --- a/icu4c/source/data/unit/kn.txt +++ b/icu4c/source/data/unit/kn.txt @@ -502,6 +502,54 @@ kn{ one{"{0} ಮೋಲ್‌ಗಳು"} other{"{0} ಮೋಲ್‌ಗಳು"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗವನ್ನು"} + other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳನ್ನು"} + } + dative{ + one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಕ್ಕೆ"} + other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳಿಗೆ"} + } + genitive{ + one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗದ"} + other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳ"} + } + locative{ + one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗದಲ್ಲಿ"} + other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳಲ್ಲಿ"} + } + } + dnam{"ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"} + gender{"neuter"} + one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗವು"} + other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"} + } + part-per-1e9{ + case{ + accusative{ + one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್ ಅನ್ನು"} + other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್ ಅನ್ನು"} + } + dative{ + one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ಗೆ"} + other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ಗೆ"} + } + genitive{ + one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನ"} + other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನ"} + } + locative{ + one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನಲ್ಲಿ"} + other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನಲ್ಲಿ"} + } + } + dnam{"ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್"} + gender{"neuter"} + one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್"} + other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್"} + } percent{ case{ accusative{ @@ -551,30 +599,6 @@ kn{ one{"{0} ಪ್ರತಿ ಸಾವಿರವು"} other{"{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ"} } - permillion{ - case{ - accusative{ - one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗವನ್ನು"} - other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳನ್ನು"} - } - dative{ - one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಕ್ಕೆ"} - other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳಿಗೆ"} - } - genitive{ - one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗದ"} - other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳ"} - } - locative{ - one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗದಲ್ಲಿ"} - other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳಲ್ಲಿ"} - } - } - dnam{"ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"} - gender{"neuter"} - one{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗವು"} - other{"{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು"} - } permyriad{ case{ accusative{ @@ -599,30 +623,6 @@ kn{ one{"{0} ಪರ್‌ಮಿರಿಯಾಡ್"} other{"{0} ಪರ್‌ಮಿರಿಯಾಡ್‌"} } - portion-per-1e9{ - case{ - accusative{ - one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್ ಅನ್ನು"} - other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್ ಅನ್ನು"} - } - dative{ - one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ಗೆ"} - other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ಗೆ"} - } - genitive{ - one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನ"} - other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನ"} - } - locative{ - one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನಲ್ಲಿ"} - other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್‌ನಲ್ಲಿ"} - } - } - dnam{"ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್"} - gender{"neuter"} - one{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್"} - other{"{0} ಪಾರ್ಟ್ಸ್ ಪರ್ ಬಿಲಿಯನ್"} - } } consumption{ liter-per-100-kilometer{ @@ -3386,17 +3386,17 @@ kn{ one{"{0}ಮೋಲ್"} other{"{0}ಮೋಲ್"} } + part-per-1e6{ + dnam{"ಭಾಪ್ರಮಿ"} + one{"{0}ಭಾಪ್ರಮಿ"} + other{"{0}ಭಾಪ್ರಮಿ"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ಭಾಪ್ರಮಿ"} - one{"{0}ಭಾಪ್ರಮಿ"} - other{"{0}ಭಾಪ್ರಮಿ"} - } permyriad{ dnam{"‱"} } @@ -4196,23 +4196,23 @@ kn{ one{"{0} ಮೋಲ್"} other{"{0} ಮೋಲ್"} } + part-per-1e6{ + dnam{"ಭಾಗಗಳು/ಮಿಲಿಯನ್"} + one{"{0} ಭಾಪ್ರಮಿ"} + other{"{0} ಭಾಪ್ರಮಿ"} + } + part-per-1e9{ + dnam{"ಪಾರ್ಟ್ಸ್/ಬಿಲಿಯನ್"} + } percent{ dnam{"ಶೇಕಡಾ"} } permille{ dnam{"ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ"} } - permillion{ - dnam{"ಭಾಗಗಳು/ಮಿಲಿಯನ್"} - one{"{0} ಭಾಪ್ರಮಿ"} - other{"{0} ಭಾಪ್ರಮಿ"} - } permyriad{ dnam{"ಪರ್ಮಿರೈಡ್"} } - portion-per-1e9{ - dnam{"ಪಾರ್ಟ್ಸ್/ಬಿಲಿಯನ್"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ko.txt b/icu4c/source/data/unit/ko.txt index 1d46073da391..1654625940ce 100644 --- a/icu4c/source/data/unit/ko.txt +++ b/icu4c/source/data/unit/ko.txt @@ -144,7 +144,7 @@ ko{ dnam{"몰"} other{"{0}몰"} } - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } @@ -781,7 +781,7 @@ ko{ } unitsNarrow{ concentr{ - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } @@ -920,10 +920,10 @@ ko{ mole{ other{"{0}mol"} } - permillion{ + part-per-1e6{ other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } diff --git a/icu4c/source/data/unit/kok.txt b/icu4c/source/data/unit/kok.txt index e5ebed83f6bb..9ee8f48a785d 100644 --- a/icu4c/source/data/unit/kok.txt +++ b/icu4c/source/data/unit/kok.txt @@ -133,6 +133,10 @@ kok{ dnam{"मोल्स"} other{"{0} मोल्स"} } + part-per-1e6{ + dnam{"पार्ट पर मिलियन"} + other{"{0} पार्ट पर मिलियन"} + } percent{ dnam{"टक्को"} other{"{0} टक्को"} @@ -140,10 +144,6 @@ kok{ permille{ other{"{0} दरमायल"} } - permillion{ - dnam{"पार्ट पर मिलियन"} - other{"{0} पार्ट पर मिलियन"} - } permyriad{ other{"{0} परमिरियड"} } @@ -817,13 +817,13 @@ kok{ mole{ other{"{0}मोल"} } - permille{ - dnam{"‰"} - } - permillion{ + part-per-1e6{ dnam{"ppm"} other{"{0}ppm"} } + permille{ + dnam{"‰"} + } permyriad{ dnam{"‱"} } @@ -1454,12 +1454,12 @@ kok{ dnam{"मोल"} other{"{0} मोल"} } + part-per-1e6{ + dnam{"पार्ट/मिलियन"} + } permille{ dnam{"दरमायल"} } - permillion{ - dnam{"पार्ट/मिलियन"} - } permyriad{ dnam{"परमिरियड"} } diff --git a/icu4c/source/data/unit/ku_Latn.txt b/icu4c/source/data/unit/ku_Latn.txt new file mode 100644 index 000000000000..9db3fb301c7a --- /dev/null +++ b/icu4c/source/data/unit/ku_Latn.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/ +ku_Latn{ +} diff --git a/icu4c/source/data/unit/ku_Latn_SY.txt b/icu4c/source/data/unit/ku_Latn_SY.txt new file mode 100644 index 000000000000..eb494ab3895e --- /dev/null +++ b/icu4c/source/data/unit/ku_Latn_SY.txt @@ -0,0 +1,9 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/ +/** + * generated alias target + */ +ku_Latn_SY{ + ___{""} +} diff --git a/icu4c/source/data/unit/ku_SY.txt b/icu4c/source/data/unit/ku_SY.txt new file mode 100644 index 000000000000..5e528bebbb51 --- /dev/null +++ b/icu4c/source/data/unit/ku_SY.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/ +ku_SY{ + "%%ALIAS"{"ku_Latn_SY"} +} diff --git a/icu4c/source/data/unit/ky.txt b/icu4c/source/data/unit/ky.txt index e4f197f33915..b98618066e0e 100644 --- a/icu4c/source/data/unit/ky.txt +++ b/icu4c/source/data/unit/ky.txt @@ -143,24 +143,24 @@ ky{ mole{ dnam{"мольдор"} } - percent{ - one{"{0} пайыз"} - other{"{0} пайыз"} - } - permille{ - one{"{0} промилле"} - other{"{0} промилле"} - } - permillion{ + part-per-1e6{ dnam{"миллионго бөлүктөр"} one{"миллионго {0} бөлүк"} other{"миллионго {0} бөлүк"} } - portion-per-1e9{ + part-per-1e9{ dnam{"мкг/л"} one{"{0} мкг/л"} other{"{0} мкг/л"} } + percent{ + one{"{0} пайыз"} + other{"{0} пайыз"} + } + permille{ + one{"{0} промилле"} + other{"{0} промилле"} + } } consumption{ liter-per-100-kilometer{ @@ -845,14 +845,14 @@ ky{ one{"{0}ммоль/л"} other{"{0}ммоль/л"} } - percent{ - dnam{"%"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"мкг/л"} one{"{0} мкг/л"} other{"{0} мкг/л"} } + percent{ + dnam{"%"} + } } consumption{ liter-per-100-kilometer{ @@ -1169,20 +1169,20 @@ ky{ one{"{0} моль"} other{"{0} моль"} } - percent{ - dnam{"пайыз"} - } - permille{ - dnam{"промилле"} - } - permillion{ + part-per-1e6{ dnam{"миллионго/бөлүк"} } - portion-per-1e9{ + part-per-1e9{ dnam{"мкг/л"} one{"{0} мкг/л"} other{"{0} мкг/л"} } + percent{ + dnam{"пайыз"} + } + permille{ + dnam{"промилле"} + } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/lo.txt b/icu4c/source/data/unit/lo.txt index 2f2e602c2a08..4f423e8fca3b 100644 --- a/icu4c/source/data/unit/lo.txt +++ b/icu4c/source/data/unit/lo.txt @@ -125,24 +125,24 @@ lo{ dnam{"ໂມ​ລ"} other{"{0} ໂມ​ລ"} } + part-per-1e6{ + dnam{"ພາດຕໍ່ລ້ານ"} + other{"{0} ພາດຕໍ່ລ້ານ"} + } + part-per-1e9{ + dnam{"ສ່ວນໃນພັນລ້ານສ່ວນ"} + other{"{0} ສ່ວນໃນພັນລ້ານສ່ວນ"} + } percent{ other{"{0} ເປີເຊັນ"} } permille{ other{"{0} ຕໍ່ພັນ"} } - permillion{ - dnam{"ພາດຕໍ່ລ້ານ"} - other{"{0} ພາດຕໍ່ລ້ານ"} - } permyriad{ dnam{"ເປີ​ມີ​ຣຽດ"} other{"{0} ເປີ​ມີ​ຣຽດ"} } - portion-per-1e9{ - dnam{"ສ່ວນໃນພັນລ້ານສ່ວນ"} - other{"{0} ສ່ວນໃນພັນລ້ານສ່ວນ"} - } } consumption{ liter-per-100-kilometer{ @@ -548,16 +548,16 @@ lo{ } } concentr{ + part-per-1e9{ + dnam{"ສ່ວນ/ພັນລ້ານສ່ວນ"} + other{"{0}ppb"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - portion-per-1e9{ - dnam{"ສ່ວນ/ພັນລ້ານສ່ວນ"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -771,18 +771,18 @@ lo{ millimole-per-liter{ dnam{"ມິລິໂມນ/ລິດ"} } + part-per-1e6{ + dnam{"ພາດ/ລ້ານ"} + } + part-per-1e9{ + dnam{"ສ່ວນ/ພັນລ້ານສ່ວນ"} + } percent{ dnam{"ເປີເຊັນ"} } permille{ dnam{"ຕໍ່ພັນ"} } - permillion{ - dnam{"ພາດ/ລ້ານ"} - } - portion-per-1e9{ - dnam{"ສ່ວນ/ພັນລ້ານສ່ວນ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/lt.txt b/icu4c/source/data/unit/lt.txt index 1323a5442961..413288dd2b18 100644 --- a/icu4c/source/data/unit/lt.txt +++ b/icu4c/source/data/unit/lt.txt @@ -868,6 +868,86 @@ lt{ one{"{0} molis"} other{"{0} molių"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} milijonines dalis"} + many{"{0} milijoninės dalies"} + one{"{0} milijoninę dalį"} + other{"{0} milijoninių dalių"} + } + dative{ + few{"{0} milijoninėms dalims"} + many{"{0} milijoninės dalies"} + one{"{0} milijoninei daliai"} + other{"{0} milijoninių dalių"} + } + genitive{ + few{"{0} milijoninių dalių"} + many{"{0} milijoninės dalies"} + one{"{0} milijoninės dalies"} + other{"{0} milijoninių dalių"} + } + instrumental{ + few{"{0} milijoninėmis dalimis"} + many{"{0} milijoninės dalies"} + one{"{0} milijonine dalimi"} + other{"{0} milijoninių dalių"} + } + locative{ + few{"{0} milijoninėse dalyse"} + many{"{0} milijoninės dalies"} + one{"{0} milijoninėje dalyje"} + other{"{0} milijoninių dalių"} + } + } + dnam{"milijoninės dalys"} + few{"{0} milijoninės dalys"} + gender{"feminine"} + many{"{0} milijoninės dalies"} + one{"{0} milijoninė dalis"} + other{"{0} milijoninių dalių"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} milijonines dalelytes"} + many{"{0} milijoninės dalelytės"} + one{"{0} milijoninę dalelytę"} + other{"{0} milijoninių dalelyčių"} + } + dative{ + few{"{0} milijoninėms dalelytėms"} + many{"{0} milijoninės dalelytės"} + one{"{0} milijoninei dalelytei"} + other{"{0} milijoninių dalelyčių"} + } + genitive{ + few{"{0} milijoninių dalelyčių"} + many{"{0} milijoninės dalelytės"} + one{"{0} milijoninės dalelytės"} + other{"{0} milijoninių dalelyčių"} + } + instrumental{ + few{"{0} milijoninėmis dalelytėmis"} + many{"{0} milijoninės dalelytės"} + one{"{0} milijonine dalelyte"} + other{"{0} milijoninių dalelyčių"} + } + locative{ + few{"{0} milijoninėse dalelytėse"} + many{"{0} milijoninės dalelytės"} + one{"{0} milijoninėje dalelytėje"} + other{"{0} milijoninių dalelyčių"} + } + } + dnam{"milijoninės dalelytės"} + few{"{0} milijoninės dalelytės"} + gender{"feminine"} + many{"{0} milijoninės dalelytės"} + one{"{0} milijoninė dalelytė"} + other{"{0} milijoninių dalelyčių"} + } percent{ case{ accusative{ @@ -946,89 +1026,9 @@ lt{ one{"{0} promilė"} other{"{0} promilių"} } - permillion{ - case{ - accusative{ - few{"{0} milijonines dalis"} - many{"{0} milijoninės dalies"} - one{"{0} milijoninę dalį"} - other{"{0} milijoninių dalių"} - } - dative{ - few{"{0} milijoninėms dalims"} - many{"{0} milijoninės dalies"} - one{"{0} milijoninei daliai"} - other{"{0} milijoninių dalių"} - } - genitive{ - few{"{0} milijoninių dalių"} - many{"{0} milijoninės dalies"} - one{"{0} milijoninės dalies"} - other{"{0} milijoninių dalių"} - } - instrumental{ - few{"{0} milijoninėmis dalimis"} - many{"{0} milijoninės dalies"} - one{"{0} milijonine dalimi"} - other{"{0} milijoninių dalių"} - } - locative{ - few{"{0} milijoninėse dalyse"} - many{"{0} milijoninės dalies"} - one{"{0} milijoninėje dalyje"} - other{"{0} milijoninių dalių"} - } - } - dnam{"milijoninės dalys"} - few{"{0} milijoninės dalys"} - gender{"feminine"} - many{"{0} milijoninės dalies"} - one{"{0} milijoninė dalis"} - other{"{0} milijoninių dalių"} - } permyriad{ gender{"masculine"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} milijonines dalelytes"} - many{"{0} milijoninės dalelytės"} - one{"{0} milijoninę dalelytę"} - other{"{0} milijoninių dalelyčių"} - } - dative{ - few{"{0} milijoninėms dalelytėms"} - many{"{0} milijoninės dalelytės"} - one{"{0} milijoninei dalelytei"} - other{"{0} milijoninių dalelyčių"} - } - genitive{ - few{"{0} milijoninių dalelyčių"} - many{"{0} milijoninės dalelytės"} - one{"{0} milijoninės dalelytės"} - other{"{0} milijoninių dalelyčių"} - } - instrumental{ - few{"{0} milijoninėmis dalelytėmis"} - many{"{0} milijoninės dalelytės"} - one{"{0} milijonine dalelyte"} - other{"{0} milijoninių dalelyčių"} - } - locative{ - few{"{0} milijoninėse dalelytėse"} - many{"{0} milijoninės dalelytės"} - one{"{0} milijoninėje dalelytėje"} - other{"{0} milijoninių dalelyčių"} - } - } - dnam{"milijoninės dalelytės"} - few{"{0} milijoninės dalelytės"} - gender{"feminine"} - many{"{0} milijoninės dalelytės"} - one{"{0} milijoninė dalelytė"} - other{"{0} milijoninių dalelyčių"} - } } consumption{ liter-per-100-kilometer{ @@ -5254,16 +5254,16 @@ lt{ } } concentr{ - percent{ - dnam{"%"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"dalelytė/mln."} few{"{0} dalelytės/mln."} many{"{0} dalelytės/mln."} one{"{0} dalelytė/mln."} other{"{0} dalelyčių/mln."} } + percent{ + dnam{"%"} + } } consumption{ mile-per-gallon{ @@ -5435,6 +5435,13 @@ lt{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"dalelytė/mln."} + few{"{0} dalelytės/mln."} + many{"{0} dalelytės/mln."} + one{"{0} dalelytė/mln."} + other{"{0} dalelyčių/mln."} + } percent{ dnam{"procentas"} few{"{0} %"} @@ -5449,13 +5456,6 @@ lt{ one{"{0} ‰"} other{"{0} ‰"} } - portion-per-1e9{ - dnam{"dalelytė/mln."} - few{"{0} dalelytės/mln."} - many{"{0} dalelytės/mln."} - one{"{0} dalelytė/mln."} - other{"{0} dalelyčių/mln."} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/lv.txt b/icu4c/source/data/unit/lv.txt index cbbe16a65f94..a0a6ff7ac7c2 100644 --- a/icu4c/source/data/unit/lv.txt +++ b/icu4c/source/data/unit/lv.txt @@ -637,6 +637,63 @@ lv{ other{"{0} moli"} zero{"{0} molu"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} miljono daļu"} + other{"{0} miljonās daļas"} + zero{"{0} miljono daļu"} + } + dative{ + one{"{0} miljonajai daļai"} + other{"{0} miljonajām daļām"} + zero{"{0} miljono daļu"} + } + genitive{ + one{"{0} miljonās daļas"} + other{"{0} miljono daļu"} + zero{"{0} miljono daļu"} + } + locative{ + one{"{0} miljonajā daļā"} + other{"{0} miljonajās daļās"} + zero{"{0} miljono daļu"} + } + } + gender{"feminine"} + one{"{0} miljonā daļa"} + other{"{0} miljonās daļas"} + zero{"{0} miljono daļu"} + } + part-per-1e9{ + case{ + accusative{ + one{"{0} miljarddaļu"} + other{"{0} miljarddaļas"} + zero{"{0} miljarddaļu"} + } + dative{ + one{"{0} miljarddaļai"} + other{"{0} miljarddaļām"} + zero{"{0} miljarddaļu"} + } + genitive{ + one{"{0} miljarddaļas"} + other{"{0} miljarddaļu"} + zero{"{0} miljarddaļu"} + } + locative{ + one{"{0} miljarddaļā"} + other{"{0} miljarddaļās"} + zero{"{0} miljarddaļu"} + } + } + dnam{"miljarddaļas"} + gender{"feminine"} + one{"{0} miljarddaļa"} + other{"{0} miljarddaļas"} + zero{"{0} miljarddaļu"} + } percent{ case{ accusative{ @@ -693,34 +750,6 @@ lv{ other{"{0} promiles"} zero{"{0} promiļu"} } - permillion{ - case{ - accusative{ - one{"{0} miljono daļu"} - other{"{0} miljonās daļas"} - zero{"{0} miljono daļu"} - } - dative{ - one{"{0} miljonajai daļai"} - other{"{0} miljonajām daļām"} - zero{"{0} miljono daļu"} - } - genitive{ - one{"{0} miljonās daļas"} - other{"{0} miljono daļu"} - zero{"{0} miljono daļu"} - } - locative{ - one{"{0} miljonajā daļā"} - other{"{0} miljonajās daļās"} - zero{"{0} miljono daļu"} - } - } - gender{"feminine"} - one{"{0} miljonā daļa"} - other{"{0} miljonās daļas"} - zero{"{0} miljono daļu"} - } permyriad{ case{ accusative{ @@ -749,35 +778,6 @@ lv{ other{"{0} promiriādes"} zero{"{0}‱"} } - portion-per-1e9{ - case{ - accusative{ - one{"{0} miljarddaļu"} - other{"{0} miljarddaļas"} - zero{"{0} miljarddaļu"} - } - dative{ - one{"{0} miljarddaļai"} - other{"{0} miljarddaļām"} - zero{"{0} miljarddaļu"} - } - genitive{ - one{"{0} miljarddaļas"} - other{"{0} miljarddaļu"} - zero{"{0} miljarddaļu"} - } - locative{ - one{"{0} miljarddaļā"} - other{"{0} miljarddaļās"} - zero{"{0} miljarddaļu"} - } - } - dnam{"miljarddaļas"} - gender{"feminine"} - one{"{0} miljarddaļa"} - other{"{0} miljarddaļas"} - zero{"{0} miljarddaļu"} - } } consumption{ liter-per-100-kilometer{ @@ -3970,7 +3970,7 @@ lv{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"miljarddaļas"} } } @@ -4274,21 +4274,21 @@ lv{ mole{ dnam{"mols"} } + part-per-1e6{ + dnam{"miljonās daļas"} + } + part-per-1e9{ + dnam{"miljarddaļas"} + } percent{ dnam{"procents"} } permille{ dnam{"promile"} } - permillion{ - dnam{"miljonās daļas"} - } permyriad{ dnam{"promiriāde"} } - portion-per-1e9{ - dnam{"miljarddaļas"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/mk.txt b/icu4c/source/data/unit/mk.txt index 0f969214b97f..f43ad612ddc3 100644 --- a/icu4c/source/data/unit/mk.txt +++ b/icu4c/source/data/unit/mk.txt @@ -175,6 +175,16 @@ mk{ one{"{0} мол"} other{"{0} мола"} } + part-per-1e6{ + dnam{"делови на милион"} + one{"{0} дел на милион"} + other{"{0} дела на милион"} + } + part-per-1e9{ + dnam{"делови на милијарда"} + one{"{0} дел на милијарда"} + other{"{0} дела на милијарда"} + } percent{ dnam{"процент"} one{"{0} процент"} @@ -185,21 +195,11 @@ mk{ one{"{0} промили"} other{"{0} промили"} } - permillion{ - dnam{"делови на милион"} - one{"{0} дел на милион"} - other{"{0} дела на милион"} - } permyriad{ dnam{"десетилјадити дел"} one{"{0} десетилјадити дел"} other{"{0} десетилјадити делови"} } - portion-per-1e9{ - dnam{"делови на милијарда"} - one{"{0} дел на милијарда"} - other{"{0} дела на милијарда"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ml.txt b/icu4c/source/data/unit/ml.txt index 66032efb6add..c270196d51f3 100644 --- a/icu4c/source/data/unit/ml.txt +++ b/icu4c/source/data/unit/ml.txt @@ -426,6 +426,43 @@ ml{ } gender{"neuter"} } + part-per-1e6{ + case{ + accusative{ + one{"{0} പാർട്ട് / മില്ല്യണിനെ"} + other{"{0} പാർട്ട് / മില്ല്യണിനെ"} + } + dative{ + one{"{0} പാർട്ട് / മില്ല്യണിന്"} + other{"{0} പാർട്ട് / മില്ല്യണിന്"} + } + genitive{ + one{"{0} പാർട്ട് / മില്ല്യണിന്റെ"} + other{"{0} പാർട്ട് / മില്ല്യണിന്റെ"} + } + instrumental{ + one{"{0} പാർട്ട് / മില്ല്യണിനാൽ"} + other{"{0} പാർട്ട് / മില്ല്യണിനാൽ"} + } + locative{ + one{"{0} പാർട്ട് / മില്ല്യണിൽ"} + other{"{0} പാർട്ട് / മില്ല്യണിൽ"} + } + sociative{ + one{"{0} പാർട്ട് / മില്ല്യണിനോട്"} + other{"{0} പാർട്ട് / മില്ല്യണിനോട്"} + } + } + dnam{"പാർട്‌സ് / മില്ല്യൺ"} + gender{"neuter"} + one{"{0} പാർട്ട് / മില്ല്യൺ"} + other{"{0} പാർട്‌സ് / മില്ല്യൺ"} + } + part-per-1e9{ + dnam{"പാർട്‌സ്/ബില്ല്യൺ"} + one{"{0} പാർട്ട്/ബില്ല്യൺ"} + other{"{0} പാർട്‌സ്/ബില്ല്യൺ"} + } percent{ case{ accusative{ @@ -487,38 +524,6 @@ ml{ one{"{0} പ്രതിമില്ലി"} other{"{0} പ്രതിമില്ലി"} } - permillion{ - case{ - accusative{ - one{"{0} പാർട്ട് / മില്ല്യണിനെ"} - other{"{0} പാർട്ട് / മില്ല്യണിനെ"} - } - dative{ - one{"{0} പാർട്ട് / മില്ല്യണിന്"} - other{"{0} പാർട്ട് / മില്ല്യണിന്"} - } - genitive{ - one{"{0} പാർട്ട് / മില്ല്യണിന്റെ"} - other{"{0} പാർട്ട് / മില്ല്യണിന്റെ"} - } - instrumental{ - one{"{0} പാർട്ട് / മില്ല്യണിനാൽ"} - other{"{0} പാർട്ട് / മില്ല്യണിനാൽ"} - } - locative{ - one{"{0} പാർട്ട് / മില്ല്യണിൽ"} - other{"{0} പാർട്ട് / മില്ല്യണിൽ"} - } - sociative{ - one{"{0} പാർട്ട് / മില്ല്യണിനോട്"} - other{"{0} പാർട്ട് / മില്ല്യണിനോട്"} - } - } - dnam{"പാർട്‌സ് / മില്ല്യൺ"} - gender{"neuter"} - one{"{0} പാർട്ട് / മില്ല്യൺ"} - other{"{0} പാർട്‌സ് / മില്ല്യൺ"} - } permyriad{ case{ accusative{ @@ -550,11 +555,6 @@ ml{ one{"{0} പെ൪മിറിയാഡ്"} other{"{0} പെ൪മിറിയാഡ്"} } - portion-per-1e9{ - dnam{"പാർട്‌സ്/ബില്ല്യൺ"} - one{"{0} പാർട്ട്/ബില്ല്യൺ"} - other{"{0} പാർട്‌സ്/ബില്ല്യൺ"} - } } consumption{ liter-per-100-kilometer{ @@ -2368,14 +2368,14 @@ ml{ one{"{0} കാ."} other{"{0}കാ."} } - permyriad{ - dnam{"‱"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"പി.പി.ബി."} one{"{0}പി.പി.ബി."} other{"{0}പി.പി.ബി."} } + permyriad{ + dnam{"‱"} + } } consumption{ liter-per-100-kilometer{ @@ -2790,19 +2790,19 @@ ml{ one{"{0} മോൾ"} other{"{0} മോൾ"} } - permillion{ + part-per-1e6{ dnam{"പാർട്‌സ്/മില്ല്യൺ"} one{"{0} പാ.പെ.മി."} other{"{0} പാ.പെ.മി."} } - permyriad{ - dnam{"പെ൪മിറിയാഡ്"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"പാർട്‌സ്/ബില്ല്യൺ"} one{"{0} പി.പി.ബി."} other{"{0} പി.പി.ബി."} } + permyriad{ + dnam{"പെ൪മിറിയാഡ്"} + } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/mn.txt b/icu4c/source/data/unit/mn.txt index e2530b481a00..06947dc3d9a9 100644 --- a/icu4c/source/data/unit/mn.txt +++ b/icu4c/source/data/unit/mn.txt @@ -146,6 +146,16 @@ mn{ one{"литр тутамд {0} миллимоль"} other{"литр тутамд {0} миллимоль"} } + part-per-1e6{ + dnam{"саяны хувь"} + one{"саяны {0} хувь"} + other{"саяны {0} хувь"} + } + part-per-1e9{ + dnam{"мкг/кг"} + one{"{0} мкг/кг"} + other{"{0} мкг/кг"} + } percent{ one{"{0} хувь"} other{"{0} хувь"} @@ -154,20 +164,10 @@ mn{ one{"мянганы {0} хувь"} other{"мянганы {0} хувь"} } - permillion{ - dnam{"саяны хувь"} - one{"саяны {0} хувь"} - other{"саяны {0} хувь"} - } permyriad{ one{"арван мянганы {0} хувь"} other{"арван мянганы {0} хувь"} } - portion-per-1e9{ - dnam{"мкг/кг"} - one{"{0} мкг/кг"} - other{"{0} мкг/кг"} - } } consumption{ liter-per-100-kilometer{ @@ -879,25 +879,25 @@ mn{ } } concentr{ + part-per-1e6{ + dnam{"ppm"} + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + dnam{"мкг/кг"} + one{"{0} мкг/кг"} + other{"{0} мкг/кг"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - dnam{"мкг/кг"} - one{"{0} мкг/кг"} - other{"{0} мкг/кг"} - } } consumption{ liter-per-100-kilometer{ @@ -1235,25 +1235,25 @@ mn{ one{"{0} моль"} other{"{0} моль"} } + part-per-1e6{ + dnam{"хувь/сая"} + one{"саяны {0} хувь"} + other{"{0}x10⁻⁶"} + } + part-per-1e9{ + dnam{"мкг/кг"} + one{"{0} мкг/кг"} + other{"{0} мкг/кг"} + } percent{ dnam{"хувь"} } permille{ dnam{"мянганы хувь"} } - permillion{ - dnam{"хувь/сая"} - one{"саяны {0} хувь"} - other{"{0}x10⁻⁶"} - } permyriad{ dnam{"арван мянганы хувь"} } - portion-per-1e9{ - dnam{"мкг/кг"} - one{"{0} мкг/кг"} - other{"{0} мкг/кг"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/mr.txt b/icu4c/source/data/unit/mr.txt index 0b93958fde2d..bf46699b2c7e 100644 --- a/icu4c/source/data/unit/mr.txt +++ b/icu4c/source/data/unit/mr.txt @@ -695,6 +695,70 @@ mr{ one{"{0} मोल"} other{"{0} मोल"} } + part-per-1e6{ + case{ + ablative{ + one{"{0} भाग प्रति दशलक्षापासून"} + other{"{0} भाग प्रति दशलक्षांपासून"} + } + accusative{ + one{"{0} भाग प्रति दशलक्षास"} + other{"{0} भाग प्रति दशलक्षांना"} + } + dative{ + one{"{0} भाग प्रति दशलक्षाला"} + other{"{0} भाग प्रति दशलक्षांसाठी"} + } + ergative{ + one{"{0} भाग प्रति दशलक्षाने"} + other{"{0} भाग प्रति दशलक्षांनी"} + } + genitive{ + one{"{0} भाग प्रति दशलक्षाचा"} + other{"{0} भाग प्रति दशलक्षांचे"} + } + locative{ + one{"{0} भाग प्रति दशलक्षाशी"} + other{"{0} भाग प्रति दशलक्षांचा"} + } + } + dnam{"भाग प्रति दशलक्ष"} + gender{"neuter"} + one{"{0} भाग प्रति दशलक्ष"} + other{"{0} भाग प्रति दशलक्ष"} + } + part-per-1e9{ + case{ + ablative{ + one{"{0} भाग प्रति अब्जाहून"} + other{"{0} भाग प्रति अब्जांहून"} + } + accusative{ + one{"{0} भाग प्रति अब्जना"} + other{"{0} भाग प्रति अब्जांना"} + } + dative{ + one{"{0} भाग प्रति अब्जासाठी"} + other{"{0} भाग प्रति अब्जांसाठी"} + } + ergative{ + one{"{0} भाग प्रति अब्जाने"} + other{"{0} भाग प्रति अब्जांनी"} + } + genitive{ + one{"{0} भाग प्रति अब्जचे"} + other{"{0} भाग प्रति अब्जांचे"} + } + locative{ + one{"{0} भाग प्रति अब्जहून"} + other{"{0} भाग प्रति अब्जांहून"} + } + } + dnam{"भाग प्रति अब्ज"} + gender{"neuter"} + one{"{0} भाग प्रति अब्ज"} + other{"{0} भाग प्रति अब्ज"} + } percent{ case{ ablative{ @@ -757,38 +821,6 @@ mr{ one{"{0} प्रतिमैल"} other{"{0} प्रतिमैल"} } - permillion{ - case{ - ablative{ - one{"{0} भाग प्रति दशलक्षापासून"} - other{"{0} भाग प्रति दशलक्षांपासून"} - } - accusative{ - one{"{0} भाग प्रति दशलक्षास"} - other{"{0} भाग प्रति दशलक्षांना"} - } - dative{ - one{"{0} भाग प्रति दशलक्षाला"} - other{"{0} भाग प्रति दशलक्षांसाठी"} - } - ergative{ - one{"{0} भाग प्रति दशलक्षाने"} - other{"{0} भाग प्रति दशलक्षांनी"} - } - genitive{ - one{"{0} भाग प्रति दशलक्षाचा"} - other{"{0} भाग प्रति दशलक्षांचे"} - } - locative{ - one{"{0} भाग प्रति दशलक्षाशी"} - other{"{0} भाग प्रति दशलक्षांचा"} - } - } - dnam{"भाग प्रति दशलक्ष"} - gender{"neuter"} - one{"{0} भाग प्रति दशलक्ष"} - other{"{0} भाग प्रति दशलक्ष"} - } permyriad{ case{ ablative{ @@ -820,38 +852,6 @@ mr{ one{"{0} पर्मिरेड"} other{"{0} पर्मिरेड"} } - portion-per-1e9{ - case{ - ablative{ - one{"{0} भाग प्रति अब्जाहून"} - other{"{0} भाग प्रति अब्जांहून"} - } - accusative{ - one{"{0} भाग प्रति अब्जना"} - other{"{0} भाग प्रति अब्जांना"} - } - dative{ - one{"{0} भाग प्रति अब्जासाठी"} - other{"{0} भाग प्रति अब्जांसाठी"} - } - ergative{ - one{"{0} भाग प्रति अब्जाने"} - other{"{0} भाग प्रति अब्जांनी"} - } - genitive{ - one{"{0} भाग प्रति अब्जचे"} - other{"{0} भाग प्रति अब्जांचे"} - } - locative{ - one{"{0} भाग प्रति अब्जहून"} - other{"{0} भाग प्रति अब्जांहून"} - } - } - dnam{"भाग प्रति अब्ज"} - gender{"neuter"} - one{"{0} भाग प्रति अब्ज"} - other{"{0} भाग प्रति अब्ज"} - } } consumption{ liter-per-100-kilometer{ @@ -4279,19 +4279,19 @@ mr{ one{"{0}मिलीमो./लि."} other{"{0}मिलीमो./लि."} } - percent{ - dnam{"%"} - } - permillion{ + part-per-1e6{ dnam{"ppm"} one{"{0}ppm"} other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ dnam{"भाग/अब्ज"} one{"{0} भाग/अब्ज"} other{"{0} भाग/अब्ज"} } + percent{ + dnam{"%"} + } } consumption{ mile-per-gallon{ @@ -4752,23 +4752,23 @@ mr{ one{"{0} मोल"} other{"{0} मोल"} } + part-per-1e6{ + dnam{"भाग/दशलक्ष"} + } + part-per-1e9{ + dnam{"भाग/अब्ज"} + one{"{0} भाग प्रति अब्ज"} + other{"{0} भाप्रअ"} + } percent{ dnam{"टक्के"} } permille{ dnam{"प्रतिमैल"} } - permillion{ - dnam{"भाग/दशलक्ष"} - } permyriad{ dnam{"पर्मिरेड"} } - portion-per-1e9{ - dnam{"भाग/अब्ज"} - one{"{0} भाग प्रति अब्ज"} - other{"{0} भाप्रअ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ms.txt b/icu4c/source/data/unit/ms.txt index 6424697007eb..f232ad497c55 100644 --- a/icu4c/source/data/unit/ms.txt +++ b/icu4c/source/data/unit/ms.txt @@ -122,24 +122,24 @@ ms{ dnam{"milimol setiap liter"} other{"{0} milimol setiap liter"} } + part-per-1e6{ + dnam{"bahagian setiap juta"} + other{"{0} bahagian setiap juta"} + } + part-per-1e9{ + dnam{"bahagian per bilion"} + other{"{0} bahagian per bilion"} + } percent{ other{"{0} peratus"} } permille{ other{"{0} per seribu"} } - permillion{ - dnam{"bahagian setiap juta"} - other{"{0} bahagian setiap juta"} - } permyriad{ dnam{"permyriad"} other{"{0} permyriad"} } - portion-per-1e9{ - dnam{"bahagian per bilion"} - other{"{0} bahagian per bilion"} - } } consumption{ liter-per-100-kilometer{ @@ -1110,15 +1110,15 @@ ms{ karat{ dnam{"karat"} } + part-per-1e9{ + dnam{"bahagian/bilion"} + } percent{ dnam{"peratus"} } permille{ dnam{"per seribu"} } - portion-per-1e9{ - dnam{"bahagian/bilion"} - } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/my.txt b/icu4c/source/data/unit/my.txt index b4704b254923..863511bca7a3 100644 --- a/icu4c/source/data/unit/my.txt +++ b/icu4c/source/data/unit/my.txt @@ -124,6 +124,13 @@ my{ dnam{"တစ်လီတာရှိ မီလီမိုးလ်"} other{"တစ်လီတာရှိ {0} မီလီမိုးလ်"} } + part-per-1e6{ + other{"တစ်သန်းပုံ {0} ပုံ"} + } + part-per-1e9{ + dnam{"သန်းတစ်ထောင်ပုံ တစ်ပုံ"} + other{"သန်းတစ်ထောင်ပုံ {0} ပုံ"} + } percent{ dnam{"ရာခိုင်နှုန်း"} other{"{0} ရာခိုင်နှုန်း"} @@ -132,16 +139,9 @@ my{ dnam{"ထောင်လီစိတ်"} other{"{0} ထောင်လီစိတ်"} } - permillion{ - other{"တစ်သန်းပုံ {0} ပုံ"} - } permyriad{ other{"{0} ပါမီရိတ်"} } - portion-per-1e9{ - dnam{"သန်းတစ်ထောင်ပုံ တစ်ပုံ"} - other{"သန်းတစ်ထောင်ပုံ {0} ပုံ"} - } } consumption{ liter-per-100-kilometer{ @@ -683,7 +683,7 @@ my{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } @@ -908,15 +908,15 @@ my{ karat{ dnam{"ကာရက်"} } - permillion{ + part-per-1e6{ dnam{"တစ်သန်းပုံ တစ်ပုံ"} } + part-per-1e9{ + dnam{"သန်းတစ်ထောင်ပုံ တစ်ပုံ"} + } permyriad{ dnam{"ပါမီရိတ်"} } - portion-per-1e9{ - dnam{"သန်းတစ်ထောင်ပုံ တစ်ပုံ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ne.txt b/icu4c/source/data/unit/ne.txt index d1df7b4cebfb..7ac758b2b83a 100644 --- a/icu4c/source/data/unit/ne.txt +++ b/icu4c/source/data/unit/ne.txt @@ -121,6 +121,11 @@ ne{ one{"{0} mg/dL"} other{"{0} मिलिग्राम पति डेेसिलिटर"} } + part-per-1e9{ + dnam{"अंश प्रति बरब"} + one{"{0} अंश प्रति अरब"} + other{"{0} अंश प्रति अरब"} + } percent{ one{"{0} प्रतिशत"} other{"{0} प्रतिशत"} @@ -133,11 +138,6 @@ ne{ one{"{0} पर्माइराइड"} other{"{0} पर्माइराइड"} } - portion-per-1e9{ - dnam{"अंश प्रति बरब"} - one{"{0} अंश प्रति अरब"} - other{"{0} अंश प्रति अरब"} - } } consumption{ liter-per-100-kilometer{ @@ -819,18 +819,18 @@ ne{ one{"{0}mmol/L"} other{"{0}mmol/L"} } - permille{ - one{"{0}‰"} - other{"{0}‰"} - } - permillion{ + part-per-1e6{ one{"{0}ppm"} other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ one{"{0}ppb"} other{"{0}ppb"} } + permille{ + one{"{0}‰"} + other{"{0}‰"} + } } consumption{ liter-per-100-kilometer{ @@ -1357,6 +1357,9 @@ ne{ one{"{0} मोल"} other{"{0} मोल"} } + part-per-1e9{ + dnam{"अंश/अरब"} + } percent{ dnam{"प्रतिशत"} } @@ -1368,9 +1371,6 @@ ne{ permyriad{ dnam{"पर्माइराइड"} } - portion-per-1e9{ - dnam{"अंश/अरब"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/nl.txt b/icu4c/source/data/unit/nl.txt index 6cd242fb0b7b..cfa11e82b0e9 100644 --- a/icu4c/source/data/unit/nl.txt +++ b/icu4c/source/data/unit/nl.txt @@ -204,6 +204,12 @@ nl{ mole{ gender{"common"} } + part-per-1e6{ + gender{"common"} + } + part-per-1e9{ + gender{"common"} + } percent{ gender{"neuter"} one{"{0} procent"} @@ -214,18 +220,12 @@ nl{ one{"{0} promille"} other{"{0} promille"} } - permillion{ - gender{"common"} - } permyriad{ dnam{"basispunt"} gender{"neuter"} one{"{0} basispunt"} other{"{0} basispunten"} } - portion-per-1e9{ - gender{"common"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/nn.txt b/icu4c/source/data/unit/nn.txt index 0c837a87725b..5a0e49670830 100644 --- a/icu4c/source/data/unit/nn.txt +++ b/icu4c/source/data/unit/nn.txt @@ -101,7 +101,7 @@ nn{ millimole-per-liter{ gender{"neuter"} } - permillion{ + part-per-1e6{ case{ genitive{ one{"{0} del per millions"} @@ -688,7 +688,7 @@ nn{ millimole-per-liter{ dnam{"mmol/l"} } - portion-per-1e9{ + part-per-1e9{ dnam{"delar/milliard"} } } diff --git a/icu4c/source/data/unit/no.txt b/icu4c/source/data/unit/no.txt index c4ef8dcc6e14..d4d629391353 100644 --- a/icu4c/source/data/unit/no.txt +++ b/icu4c/source/data/unit/no.txt @@ -320,6 +320,30 @@ no{ one{"{0} mol"} other{"{0} mol"} } + part-per-1e6{ + case{ + genitive{ + one{"{0} del per millions"} + other{"{0} deler per millions"} + } + } + dnam{"deler per million"} + gender{"masculine"} + one{"{0} del per million"} + other{"{0} deler per million"} + } + part-per-1e9{ + case{ + genitive{ + one{"{0} del per milliards"} + other{"{0} deler per milliards"} + } + } + dnam{"deler per milliard"} + gender{"masculine"} + one{"{0} del per milliard"} + other{"{0} deler per milliard"} + } percent{ case{ genitive{ @@ -342,18 +366,6 @@ no{ one{"{0} promille"} other{"{0} promille"} } - permillion{ - case{ - genitive{ - one{"{0} del per millions"} - other{"{0} deler per millions"} - } - } - dnam{"deler per million"} - gender{"masculine"} - one{"{0} del per million"} - other{"{0} deler per million"} - } permyriad{ case{ genitive{ @@ -365,18 +377,6 @@ no{ one{"{0} promyriade"} other{"{0} promyriade"} } - portion-per-1e9{ - case{ - genitive{ - one{"{0} del per milliards"} - other{"{0} deler per milliards"} - } - } - dnam{"deler per milliard"} - gender{"masculine"} - one{"{0} del per milliard"} - other{"{0} deler per milliard"} - } } consumption{ liter-per-100-kilometer{ @@ -1951,6 +1951,14 @@ no{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} one{"{0}%"} @@ -1961,19 +1969,11 @@ no{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ dnam{"‱"} one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -2519,6 +2519,9 @@ no{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"deler/milliard"} + } percent{ dnam{"prosent"} one{"{0} %"} @@ -2534,9 +2537,6 @@ no{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"deler/milliard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/or.txt b/icu4c/source/data/unit/or.txt index 0814dca5f03f..d5d694f24bfc 100644 --- a/icu4c/source/data/unit/or.txt +++ b/icu4c/source/data/unit/or.txt @@ -160,6 +160,16 @@ or{ one{"{0} ମୋଲ"} other{"{0} ମୋଲସ"} } + part-per-1e6{ + dnam{"ଅଂଶ ପ୍ରତି ନିୟୁତ"} + one{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"} + other{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"} + } + part-per-1e9{ + dnam{"ବିଲିୟନ ପ୍ରତି ଅଂଶଗୁଡିକ"} + one{"{0} ପାର୍ଟ୍ସ ପ୍ରତି ବିଲିୟନ୍"} + other{"{0} ପାର୍ଟ୍ସ ପ୍ରତି ବିଲିୟନ୍"} + } percent{ one{"{0} ଶତକଡ଼ା"} other{"{0} ଶତକଡ଼ା"} @@ -168,20 +178,10 @@ or{ one{"{0} ପରମିଲ"} other{"{0} ପରମିଲ"} } - permillion{ - dnam{"ଅଂଶ ପ୍ରତି ନିୟୁତ"} - one{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"} - other{"{0} ଅଂଶ ପ୍ରତି ନିୟୁତ"} - } permyriad{ one{"{0} ପରମାଇରିଆଡ"} other{"{0} ପରମାଇରିଆଡ"} } - portion-per-1e9{ - dnam{"ବିଲିୟନ ପ୍ରତି ଅଂଶଗୁଡିକ"} - one{"{0} ପାର୍ଟ୍ସ ପ୍ରତି ବିଲିୟନ୍"} - other{"{0} ପାର୍ଟ୍ସ ପ୍ରତି ବିଲିୟନ୍"} - } } consumption{ liter-per-100-kilometer{ @@ -981,24 +981,24 @@ or{ one{"{0}ମୋଲ"} other{"{0}ମୋଲ"} } + part-per-1e6{ + dnam{"ପିପିଏମ୍"} + one{"{0}ପିପିଏମ୍"} + other{"{0}ପିପିଏମ୍"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ପିପିଏମ୍"} - one{"{0}ପିପିଏମ୍"} - other{"{0}ପିପିଏମ୍"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -1571,23 +1571,23 @@ or{ one{"ମୋଲ"} other{"{0} ମୋଲ"} } + part-per-1e6{ + dnam{"ଅଂଶ/ନିୟୁତ"} + one{"{0} ପିପିଏମ୍"} + other{"{0} ପିପିଏମ୍"} + } + part-per-1e9{ + dnam{"ପାର୍ଟ୍ସ/ବିଲିୟନ୍"} + } percent{ dnam{"ଶତକଡ଼ା"} } permille{ dnam{"ପରମିଲ"} } - permillion{ - dnam{"ଅଂଶ/ନିୟୁତ"} - one{"{0} ପିପିଏମ୍"} - other{"{0} ପିପିଏମ୍"} - } permyriad{ dnam{"ପରମାଇରିଆଡ"} } - portion-per-1e9{ - dnam{"ପାର୍ଟ୍ସ/ବିଲିୟନ୍"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/pa.txt b/icu4c/source/data/unit/pa.txt index a94882a25f26..70a1fa20ef8f 100644 --- a/icu4c/source/data/unit/pa.txt +++ b/icu4c/source/data/unit/pa.txt @@ -243,6 +243,30 @@ pa{ mole{ gender{"masculine"} } + part-per-1e6{ + case{ + oblique{ + one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} + other{"{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} + } + } + dnam{"ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} + gender{"masculine"} + one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} + other{"{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} + } + part-per-1e9{ + case{ + oblique{ + one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} + other{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} + } + } + dnam{"ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} + gender{"masculine"} + one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} + other{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} + } percent{ case{ oblique{ @@ -265,18 +289,6 @@ pa{ one{"{0} ਪਰਮਾਈਲ"} other{"{0} ਪਰਮਾਈਲ"} } - permillion{ - case{ - oblique{ - one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} - other{"{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} - } - } - dnam{"ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} - gender{"masculine"} - one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} - other{"{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ"} - } permyriad{ case{ oblique{ @@ -288,18 +300,6 @@ pa{ one{"{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ"} other{"{0} ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ"} } - portion-per-1e9{ - case{ - oblique{ - one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} - other{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} - } - } - dnam{"ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} - gender{"masculine"} - one{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} - other{"{0} ਹਿੱਸਾ ਪ੍ਰਤੀ ਅਰਬ"} - } } consumption{ liter-per-100-kilometer{ @@ -2070,21 +2070,21 @@ pa{ one{"{0} ਮੋਲ"} other{"{0} ਮੋਲ"} } + part-per-1e6{ + dnam{"ਹਿੱਸੇ/ਮਿਲੀਅਨ"} + } + part-per-1e9{ + dnam{"ਹਿੱਸਾ/ਅਰਬ"} + } percent{ dnam{"ਪ੍ਰਤੀਸ਼ਤ"} } permille{ dnam{"ਪਰਮਾਈਲ"} } - permillion{ - dnam{"ਹਿੱਸੇ/ਮਿਲੀਅਨ"} - } permyriad{ dnam{"ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ"} } - portion-per-1e9{ - dnam{"ਹਿੱਸਾ/ਅਰਬ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/pcm.txt b/icu4c/source/data/unit/pcm.txt index e4ba0d6663fd..af50fdddca0a 100644 --- a/icu4c/source/data/unit/pcm.txt +++ b/icu4c/source/data/unit/pcm.txt @@ -169,6 +169,16 @@ pcm{ one{"{0} Mol"} other{"{0} Mol"} } + part-per-1e6{ + dnam{"Pat-dẹm Fọ Ích Míliọn"} + one{"{0} Pat Fọ Ích Míliọn"} + other{"{0} Pat Fọ Ích Míliọn"} + } + part-per-1e9{ + dnam{"pat fọ ích bíliọn"} + one{"{0} pat fọ ích bíliọn"} + other{"{0} pat fọ ích bíliọn"} + } percent{ one{"{0} Pasẹnt"} other{"{0} Pasẹnt"} @@ -177,20 +187,10 @@ pcm{ one{"{0} Fọ Ích Taúzan"} other{"{0} Fọ Ích Taúzan"} } - permillion{ - dnam{"Pat-dẹm Fọ Ích Míliọn"} - one{"{0} Pat Fọ Ích Míliọn"} - other{"{0} Pat Fọ Ích Míliọn"} - } permyriad{ one{"{0} Fọ Ích Tẹ́n Taúzan"} other{"{0} Fọ Ích Tẹ́n Taúzan"} } - portion-per-1e9{ - dnam{"pat fọ ích bíliọn"} - one{"{0} pat fọ ích bíliọn"} - other{"{0} pat fọ ích bíliọn"} - } } consumption{ liter-per-100-kilometer{ @@ -1019,23 +1019,23 @@ pcm{ one{"{0} kárá"} other{"{0} kárá"} } + part-per-1e6{ + dnam{"Pfim"} + } + part-per-1e9{ + dnam{"pfib"} + one{"{0}pfib"} + other{"{0}pfib"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"Pfim"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - dnam{"pfib"} - one{"{0}pfib"} - other{"{0}pfib"} - } } consumption{ liter-per-100-kilometer{ @@ -1341,25 +1341,25 @@ pcm{ millimole-per-liter{ dnam{"Mílimol/Líta"} } + part-per-1e6{ + dnam{"Pat/Míliọn"} + one{"{0} pfim"} + other{"{0} pfim"} + } + part-per-1e9{ + dnam{"pat/bíliọn"} + one{"{0} pfib"} + other{"{0} pfib"} + } percent{ dnam{"Pasẹnt"} } permille{ dnam{"Fọ Ích Taúzan"} } - permillion{ - dnam{"Pat/Míliọn"} - one{"{0} pfim"} - other{"{0} pfim"} - } permyriad{ dnam{"Fọ Ích Tẹ́n Taúzan"} } - portion-per-1e9{ - dnam{"pat/bíliọn"} - one{"{0} pfib"} - other{"{0} pfib"} - } } consumption{ liter-per-100-kilometer{ @@ -1718,7 +1718,9 @@ pcm{ dnam{"Tọns"} } tonne{ - dnam{"T"} + dnam{"M. Tọn-dẹm"} + one{"{0} M. Tọn"} + other{"{0} M. Tọn"} } } power{ diff --git a/icu4c/source/data/unit/pl.txt b/icu4c/source/data/unit/pl.txt index a200265d958a..0fcc0e5ab2ab 100644 --- a/icu4c/source/data/unit/pl.txt +++ b/icu4c/source/data/unit/pl.txt @@ -802,6 +802,50 @@ pl{ one{"{0} mol"} other{"{0} mola"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} części na milion"} + many{"{0} części na milion"} + one{"{0} część na milion"} + other{"{0} części na milion"} + } + genitive{ + few{"{0} części na milion"} + many{"{0} części na milion"} + one{"{0} części na milion"} + other{"{0} części na milion"} + } + } + dnam{"części na milion"} + few{"{0} części na milion"} + gender{"feminine"} + many{"{0} części na milion"} + one{"{0} część na milion"} + other{"{0} części na milion"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} części na miliard"} + many{"{0} części na miliard"} + one{"{0} część na miliard"} + other{"{0} części na miliard"} + } + genitive{ + few{"{0} części na miliard"} + many{"{0} części na miliard"} + one{"{0} części na miliard"} + other{"{0} części na miliard"} + } + } + dnam{"części na miliard"} + few{"{0} części na miliard"} + gender{"feminine"} + many{"{0} części na miliard"} + one{"{0} część na miliard"} + other{"{0} części na miliard"} + } percent{ case{ accusative{ @@ -864,28 +908,6 @@ pl{ one{"{0} promil"} other{"{0} promila"} } - permillion{ - case{ - accusative{ - few{"{0} części na milion"} - many{"{0} części na milion"} - one{"{0} część na milion"} - other{"{0} części na milion"} - } - genitive{ - few{"{0} części na milion"} - many{"{0} części na milion"} - one{"{0} części na milion"} - other{"{0} części na milion"} - } - } - dnam{"części na milion"} - few{"{0} części na milion"} - gender{"feminine"} - many{"{0} części na milion"} - one{"{0} część na milion"} - other{"{0} części na milion"} - } permyriad{ case{ accusative{ @@ -908,28 +930,6 @@ pl{ one{"{0} punkt bazowy"} other{"{0} punktu bazowego"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} części na miliard"} - many{"{0} części na miliard"} - one{"{0} część na miliard"} - other{"{0} części na miliard"} - } - genitive{ - few{"{0} części na miliard"} - many{"{0} części na miliard"} - one{"{0} części na miliard"} - other{"{0} części na miliard"} - } - } - dnam{"części na miliard"} - few{"{0} części na miliard"} - gender{"feminine"} - many{"{0} części na miliard"} - one{"{0} część na miliard"} - other{"{0} części na miliard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ps.txt b/icu4c/source/data/unit/ps.txt index 6e65c1c7f3a4..e6f149be566b 100644 --- a/icu4c/source/data/unit/ps.txt +++ b/icu4c/source/data/unit/ps.txt @@ -176,6 +176,11 @@ ps{ one{"{0} مول"} other{"{0} مولز"} } + part-per-1e6{ + dnam{"پارټتس في مليون"} + one{"{0} پارټ في مليون"} + other{"{0} پارټس في مليون"} + } percent{ one{"{0} سلنه"} other{"{0} سلنه"} @@ -184,11 +189,6 @@ ps{ one{"{0} في ميل"} other{"{0} في ميل"} } - permillion{ - dnam{"پارټتس في مليون"} - one{"{0} پارټ في مليون"} - other{"{0} پارټس في مليون"} - } permyriad{ one{"{0} زرمه"} other{"{0} زرمه"} @@ -929,7 +929,7 @@ ps{ } unitsNarrow{ concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"p/b"} } } @@ -1171,21 +1171,21 @@ ps{ one{"{0} مول"} other{"{0} مول"} } + part-per-1e6{ + dnam{"پارټس/مليون"} + } + part-per-1e9{ + dnam{"p/b"} + } percent{ dnam{"سلنه"} } permille{ dnam{"في ميل"} } - permillion{ - dnam{"پارټس/مليون"} - } permyriad{ dnam{"زرمه"} } - portion-per-1e9{ - dnam{"p/b"} - } } consumption{ mile-per-gallon-imperial{ diff --git a/icu4c/source/data/unit/pt.txt b/icu4c/source/data/unit/pt.txt index ed2a8f24100e..526195b8ce04 100644 --- a/icu4c/source/data/unit/pt.txt +++ b/icu4c/source/data/unit/pt.txt @@ -203,6 +203,18 @@ pt{ one{"{0} mol"} other{"{0} mols"} } + part-per-1e6{ + dnam{"partes por milhão"} + gender{"feminine"} + one{"{0} parte por milhão"} + other{"{0} partes por milhão"} + } + part-per-1e9{ + dnam{"partes por bilhão"} + gender{"feminine"} + one{"{0} parte por bilhão"} + other{"{0} partes por bilhão"} + } percent{ gender{"masculine"} one{"{0} por cento"} @@ -213,23 +225,11 @@ pt{ one{"{0} por mil"} other{"{0} por mil"} } - permillion{ - dnam{"partes por milhão"} - gender{"feminine"} - one{"{0} parte por milhão"} - other{"{0} partes por milhão"} - } permyriad{ gender{"masculine"} one{"{0} ponto base"} other{"{0} pontos base"} } - portion-per-1e9{ - dnam{"partes por bilhão"} - gender{"feminine"} - one{"{0} parte por bilhão"} - other{"{0} partes por bilhão"} - } } consumption{ liter-per-100-kilometer{ @@ -1216,15 +1216,15 @@ pt{ millimole-per-liter{ dnam{"mmol/l"} } + part-per-1e6{ + dnam{"ppm"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } permyriad{ dnam{"‱"} } @@ -1578,21 +1578,21 @@ pt{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"partes/milhão"} + } + part-per-1e9{ + dnam{"partes/bilhão"} + } percent{ dnam{"por cento"} } permille{ dnam{"por mil"} } - permillion{ - dnam{"partes/milhão"} - } permyriad{ dnam{"ponto base"} } - portion-per-1e9{ - dnam{"partes/bilhão"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/pt_PT.txt b/icu4c/source/data/unit/pt_PT.txt index 90dad2e84960..a42f40c6458f 100644 --- a/icu4c/source/data/unit/pt_PT.txt +++ b/icu4c/source/data/unit/pt_PT.txt @@ -80,7 +80,7 @@ pt_PT{ one{"{0} milimole por litro"} other{"{0} milimoles por litro"} } - portion-per-1e9{ + part-per-1e9{ dnam{"partes por mil milhões"} one{"{0} parte por mil milhões"} other{"{0} partes por mil milhões"} @@ -269,7 +269,7 @@ pt_PT{ karat{ dnam{"quilates"} } - portion-per-1e9{ + part-per-1e9{ dnam{"ppmm"} one{"{0} ppmm"} other{"{0} ppmm"} @@ -437,7 +437,7 @@ pt_PT{ millimole-per-liter{ dnam{"milimole/litro"} } - portion-per-1e9{ + part-per-1e9{ dnam{"partes/mil milhões"} one{"{0} ppmm"} other{"{0} ppmm"} diff --git a/icu4c/source/data/unit/qu.txt b/icu4c/source/data/unit/qu.txt index 4232ff303ffb..99b2f4dd1537 100644 --- a/icu4c/source/data/unit/qu.txt +++ b/icu4c/source/data/unit/qu.txt @@ -101,7 +101,7 @@ qu{ dnam{"imakuna"} other{"{0} imakuna"} } - permillion{ + part-per-1e6{ dnam{"partes por millon"} other{"{0} partes por millon"} } @@ -540,7 +540,7 @@ qu{ dnam{"ima"} other{"{0} ima"} } - permillion{ + part-per-1e6{ dnam{"partes/millon"} } } diff --git a/icu4c/source/data/unit/ro.txt b/icu4c/source/data/unit/ro.txt index cff368a8a0e4..965a496ac723 100644 --- a/icu4c/source/data/unit/ro.txt +++ b/icu4c/source/data/unit/ro.txt @@ -394,6 +394,34 @@ ro{ one{"{0} mol"} other{"{0} de moli"} } + part-per-1e6{ + case{ + genitive{ + few{"{0} părți pe milion"} + one{"unei părți pe milion"} + other{"{0} de părți pe milion"} + } + } + dnam{"părți pe milion"} + few{"{0} părți pe milion"} + gender{"feminine"} + one{"{0} parte pe milion"} + other{"{0} de părți pe milion"} + } + part-per-1e9{ + case{ + genitive{ + few{"{0} părți pe miliard"} + one{"unei părți pe miliard"} + other{"{0} de părți pe miliard"} + } + } + dnam{"părți pe miliard"} + few{"{0} părți pe miliard"} + gender{"feminine"} + one{"{0} parte pe miliard"} + other{"{0} de părți pe miliard"} + } percent{ case{ genitive{ @@ -422,20 +450,6 @@ ro{ one{"{0} promilă"} other{"{0} de promile"} } - permillion{ - case{ - genitive{ - few{"{0} părți pe milion"} - one{"unei părți pe milion"} - other{"{0} de părți pe milion"} - } - } - dnam{"părți pe milion"} - few{"{0} părți pe milion"} - gender{"feminine"} - one{"{0} parte pe milion"} - other{"{0} de părți pe milion"} - } permyriad{ case{ genitive{ @@ -449,20 +463,6 @@ ro{ one{"{0} la zece mii"} other{"{0} la zece mii"} } - portion-per-1e9{ - case{ - genitive{ - few{"{0} părți pe miliard"} - one{"unei părți pe miliard"} - other{"{0} de părți pe miliard"} - } - } - dnam{"părți pe miliard"} - few{"{0} părți pe miliard"} - gender{"feminine"} - one{"{0} parte pe miliard"} - other{"{0} de părți pe miliard"} - } } consumption{ liter-per-100-kilometer{ @@ -2271,6 +2271,9 @@ ro{ karat{ dnam{"carat"} } + part-per-1e9{ + dnam{"părți/miliard"} + } permille{ few{"{0} ‰"} one{"{0} ‰"} @@ -2281,9 +2284,6 @@ ro{ one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"părți/miliard"} - } } consumption{ mile-per-gallon{ @@ -2521,7 +2521,7 @@ ro{ one{"{0} mol"} other{"{0} moli"} } - portion-per-1e9{ + part-per-1e9{ dnam{"părți/miliard"} } } diff --git a/icu4c/source/data/unit/root.txt b/icu4c/source/data/unit/root.txt index 8cc441426719..cd7aaa66e25e 100644 --- a/icu4c/source/data/unit/root.txt +++ b/icu4c/source/data/unit/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/ root{ - Version{"47"} + Version{"48"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -42,12 +42,24 @@ root{ dnam{"rev"} other{"{0} rev"} } + steradian{ + dnam{"sr"} + other{"{0} sr"} + } } area{ acre{ dnam{"acre"} other{"{0} ac"} } + bu-jp{ + dnam{"bu [JP]"} + other{"{0} bu [JP]"} + } + cho{ + dnam{"cho [JP]"} + other{"{0} cho [JP]"} + } dunam{ dnam{"dunam"} other{"{0} dunam"} @@ -56,6 +68,10 @@ root{ dnam{"hectare"} other{"{0} ha"} } + se-jp{ + dnam{"se [JP]"} + other{"{0} se [JP]"} + } square-centimeter{ dnam{"cm²"} other{"{0} cm²"} @@ -149,6 +165,10 @@ root{ dnam{"kt"} other{"{0} kt"} } + katal{ + dnam{"kat"} + other{"{0} kat"} + } milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} @@ -161,6 +181,22 @@ root{ dnam{"mol"} other{"{0} mol"} } + ofglucose{ + dnam{"glucose"} + other{"{0} Glc"} + } + part{ + dnam{"part"} + other{"{0} part"} + } + part-per-1e6{ + dnam{"ppm"} + other{"{0} ppm"} + } + part-per-1e9{ + dnam{"ppb"} + other{"{0} ppb"} + } percent{ dnam{"%"} other{"{0}%"} @@ -169,18 +205,10 @@ root{ dnam{"‰"} other{"{0}‰"} } - permillion{ - dnam{"ppm"} - other{"{0} ppm"} - } permyriad{ dnam{"‱"} other{"{0}‱"} } - portion-per-1e9{ - dnam{"ppb"} - other{"{0} ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -268,6 +296,10 @@ root{ dnam{"dec"} other{"{0} dec"} } + fortnight{ + dnam{"fortnight"} + other{"{0} fw"} + } hour{ dnam{"hr"} other{"{0} h"} @@ -329,6 +361,18 @@ root{ dnam{"amp"} other{"{0} A"} } + coulomb{ + dnam{"C"} + other{"{0} C"} + } + farad{ + dnam{"F"} + other{"{0} F"} + } + henry{ + dnam{"H"} + other{"{0} H"} + } milliampere{ dnam{"mA"} other{"{0} mA"} @@ -337,25 +381,45 @@ root{ dnam{"ohm"} other{"{0} Ω"} } + siemens{ + dnam{"S"} + other{"{0} S"} + } volt{ dnam{"volt"} other{"{0} V"} } } energy{ + becquerel{ + dnam{"Bq"} + other{"{0} Bq"} + } british-thermal-unit{ dnam{"Btu"} other{"{0} Btu"} } + british-thermal-unit-it{ + dnam{"BTU-IT"} + other{"{0} BTU-IT"} + } calorie{ dnam{"cal"} other{"{0} cal"} } + calorie-it{ + dnam{"calorie-IT"} + other{"{0} cal-IT"} + } electronvolt{ dnam{"eV"} other{"{0} eV"} } foodcalorie:alias{"/LOCALE/unitsShort/energy/kilocalorie"} + gray{ + dnam{"Gy"} + other{"{0} Gy"} + } joule{ dnam{"joule"} other{"{0} J"} @@ -372,12 +436,20 @@ root{ dnam{"kWh"} other{"{0} kWh"} } + sievert{ + dnam{"Sv"} + other{"{0} Sv"} + } therm-us{ dnam{"US therm"} other{"{0} US therm"} } } force{ + kilogram-force{ + dnam{"kgf"} + other{"{0} kgf"} + } kilowatt-hour-per-100-kilometer{ dnam{"kWh/100km"} other{"{0} kWh/100km"} @@ -444,6 +516,10 @@ root{ other{"{0} cm"} per{"{0}/cm"} } + chain{ + dnam{"chain"} + other{"{0} chain"} + } decimeter{ dnam{"dm"} other{"{0} dm"} @@ -470,6 +546,14 @@ root{ other{"{0} in"} per{"{0}/in"} } + jo-jp{ + dnam{"jo [JP]"} + other{"{0} jo [JP]"} + } + ken{ + dnam{"ken [JP]"} + other{"{0} ken [JP]"} + } kilometer{ dnam{"km"} other{"{0} km"} @@ -520,10 +604,34 @@ root{ dnam{"pt"} other{"{0} pt"} } + ri-jp{ + dnam{"ri [JP]"} + other{"{0} ri [JP]"} + } + rin{ + dnam{"rin [JP]"} + other{"{0} rin [JP]"} + } + rod{ + dnam{"rod"} + other{"{0} rod"} + } + shaku-cloth{ + dnam{"shaku [cloth, JP]"} + other{"{0} shaku [cloth, JP]"} + } + shaku-length{ + dnam{"shaku [JP]"} + other{"{0} shaku [JP]"} + } solar-radius{ dnam{"R☉"} other{"{0} R☉"} } + sun{ + dnam{"sun [JP]"} + other{"{0} sun [JP]"} + } yard{ dnam{"yd"} other{"{0} yd"} @@ -547,6 +655,16 @@ root{ other{"{0} L☉"} } } + magnetic{ + tesla{ + dnam{"T"} + other{"{0} T"} + } + weber{ + dnam{"Wb"} + other{"{0} Wb"} + } + } mass{ carat{ dnam{"CD"} @@ -560,6 +678,10 @@ root{ dnam{"M⊕"} other{"{0} M⊕"} } + fun{ + dnam{"fun [JP]"} + other{"{0} fun [JP]"} + } grain{ dnam{"grain"} other{"{0} grain"} @@ -596,6 +718,10 @@ root{ other{"{0} lb"} per{"{0}/lb"} } + slug{ + dnam{"slug"} + other{"{0} slug"} + } solar-mass{ dnam{"M☉"} other{"{0} M☉"} @@ -648,6 +774,10 @@ root{ dnam{"bar"} other{"{0} bar"} } + gasoline-energy-density{ + dnam{"gas E"} + other{"{0} gas E"} + } hectopascal{ dnam{"hPa"} other{"{0} hPa"} @@ -672,6 +802,10 @@ root{ dnam{"mm Hg"} other{"{0} mm Hg"} } + ofhg{ + dnam{"Hg"} + other{"{0} Hg"} + } pascal{ dnam{"Pa"} other{"{0} Pa"} @@ -724,6 +858,10 @@ root{ dnam{"K"} other{"{0} K"} } + rankine{ + dnam{"°R"} + other{"{0} °R"} + } } torque{ newton-meter{ @@ -786,6 +924,14 @@ root{ dnam{"cup"} other{"{0} c"} } + cup-imperial{ + dnam{"cup Imp."} + other{"{0} cup Imp."} + } + cup-jp{ + dnam{"cup [JP]"} + other{"{0} cup [JP]"} + } cup-metric{ dnam{"mcup"} other{"{0} mc"} @@ -818,6 +964,10 @@ root{ dnam{"Imp. fl oz"} other{"{0} fl oz Imp."} } + fluid-ounce-metric{ + dnam{"fl oz m."} + other{"{0} fl oz m."} + } gallon{ dnam{"US gal"} other{"{0} gal US"} @@ -836,6 +986,14 @@ root{ dnam{"jigger"} other{"{0} jigger"} } + koku{ + dnam{"koku [JP]"} + other{"{0} koku [JP]"} + } + kosaji{ + dnam{"kosaji [JP]"} + other{"{0} kosaji [JP]"} + } liter{ dnam{"liter"} other{"{0} l"} @@ -849,6 +1007,10 @@ root{ dnam{"mL"} other{"{0} mL"} } + osaji{ + dnam{"osaji [JP]"} + other{"{0} osaji [JP]"} + } pinch{ dnam{"pinch"} other{"{0} pinch"} @@ -857,6 +1019,10 @@ root{ dnam{"pt"} other{"{0} pt"} } + pint-imperial{ + dnam{"pint Imp."} + other{"{0} pt Imp."} + } pint-metric{ dnam{"mpt"} other{"{0} mpt"} @@ -869,6 +1035,14 @@ root{ dnam{"qt Imp"} other{"{0} qt Imp."} } + sai{ + dnam{"sai [JP]"} + other{"{0} sai [JP]"} + } + shaku{ + dnam{"shaku [vol, JP]"} + other{"{0} shaku [vol, JP]"} + } tablespoon{ dnam{"tbsp"} other{"{0} tbsp"} @@ -877,6 +1051,10 @@ root{ dnam{"tsp"} other{"{0} tsp"} } + to-jp{ + dnam{"to [JP]"} + other{"{0} to [JP]"} + } } } } diff --git a/icu4c/source/data/unit/ru.txt b/icu4c/source/data/unit/ru.txt index 915b02cf597d..244237ce81ea 100644 --- a/icu4c/source/data/unit/ru.txt +++ b/icu4c/source/data/unit/ru.txt @@ -1049,6 +1049,86 @@ ru{ one{"{0} моль"} other{"{0} моля"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} миллионные доли"} + many{"{0} миллионных долей"} + one{"{0} миллионную долю"} + other{"{0} миллионной доли"} + } + dative{ + few{"{0} миллионым долям"} + many{"{0} миллионым долям"} + one{"{0} миллионной доле"} + other{"{0} миллионной доли"} + } + genitive{ + few{"{0} миллионых долей"} + many{"{0} миллионных долей"} + one{"{0} миллионной доли"} + other{"{0} миллионной доли"} + } + instrumental{ + few{"{0} миллиоными долями"} + many{"{0} миллионными долями"} + one{"{0} миллионной долей"} + other{"{0} миллионной доли"} + } + prepositional{ + few{"{0} миллионых долях"} + many{"{0} миллионных долях"} + one{"{0} миллионной доле"} + other{"{0} миллионной доли"} + } + } + dnam{"миллионные доли"} + few{"{0} миллионные доли"} + gender{"feminine"} + many{"{0} миллионных долей"} + one{"{0} миллионная доля"} + other{"{0} миллионной доли"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} миллиардные доли"} + many{"{0} миллиардных долей"} + one{"{0} миллиардную долю"} + other{"{0} миллиардной доли"} + } + dative{ + few{"{0} миллиардным долям"} + many{"{0} миллиардным долям"} + one{"{0} миллиардной доле"} + other{"{0} миллиардной доли"} + } + genitive{ + few{"{0} миллиардных долей"} + many{"{0} миллиардных долей"} + one{"{0} миллиардной доли"} + other{"{0} миллиардной доли"} + } + instrumental{ + few{"{0} миллиардными долями"} + many{"{0} миллиардными долями"} + one{"{0} миллиардной долей"} + other{"{0} миллиардной доли"} + } + prepositional{ + few{"{0} миллиардных долях"} + many{"{0} миллиардных долях"} + one{"{0} миллиардной доле"} + other{"{0} миллиардной доли"} + } + } + dnam{"миллиардные доли"} + few{"{0} миллиардные доли"} + gender{"feminine"} + many{"{0} миллиардных долей"} + one{"{0} миллиардная доля"} + other{"{0} миллиардной доли"} + } percent{ case{ accusative{ @@ -1134,46 +1214,6 @@ ru{ one{"{0} промилле"} other{"{0} промилле"} } - permillion{ - case{ - accusative{ - few{"{0} миллионные доли"} - many{"{0} миллионных долей"} - one{"{0} миллионную долю"} - other{"{0} миллионной доли"} - } - dative{ - few{"{0} миллионым долям"} - many{"{0} миллионым долям"} - one{"{0} миллионной доле"} - other{"{0} миллионной доли"} - } - genitive{ - few{"{0} миллионых долей"} - many{"{0} миллионных долей"} - one{"{0} миллионной доли"} - other{"{0} миллионной доли"} - } - instrumental{ - few{"{0} миллиоными долями"} - many{"{0} миллионными долями"} - one{"{0} миллионной долей"} - other{"{0} миллионной доли"} - } - prepositional{ - few{"{0} миллионых долях"} - many{"{0} миллионных долях"} - one{"{0} миллионной доле"} - other{"{0} миллионной доли"} - } - } - dnam{"миллионные доли"} - few{"{0} миллионные доли"} - gender{"feminine"} - many{"{0} миллионных долей"} - one{"{0} миллионная доля"} - other{"{0} миллионной доли"} - } permyriad{ case{ accusative{ @@ -1214,46 +1254,6 @@ ru{ one{"{0} промириад"} other{"{0} промириада"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} миллиардные доли"} - many{"{0} миллиардных долей"} - one{"{0} миллиардную долю"} - other{"{0} миллиардной доли"} - } - dative{ - few{"{0} миллиардным долям"} - many{"{0} миллиардным долям"} - one{"{0} миллиардной доле"} - other{"{0} миллиардной доли"} - } - genitive{ - few{"{0} миллиардных долей"} - many{"{0} миллиардных долей"} - one{"{0} миллиардной доли"} - other{"{0} миллиардной доли"} - } - instrumental{ - few{"{0} миллиардными долями"} - many{"{0} миллиардными долями"} - one{"{0} миллиардной долей"} - other{"{0} миллиардной доли"} - } - prepositional{ - few{"{0} миллиардных долях"} - many{"{0} миллиардных долях"} - one{"{0} миллиардной доле"} - other{"{0} миллиардной доли"} - } - } - dnam{"миллиардные доли"} - few{"{0} миллиардные доли"} - gender{"feminine"} - many{"{0} миллиардных долей"} - one{"{0} миллиардная доля"} - other{"{0} миллиардной доли"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sc.txt b/icu4c/source/data/unit/sc.txt index e55fee74075b..3f620fbe4558 100644 --- a/icu4c/source/data/unit/sc.txt +++ b/icu4c/source/data/unit/sc.txt @@ -180,6 +180,16 @@ sc{ one{"{0} mole"} other{"{0} moles"} } + part-per-1e6{ + dnam{"partes pro millione"} + one{"{0} parte pro millione"} + other{"{0} partes pro millione"} + } + part-per-1e9{ + dnam{"partes pro milliardu"} + one{"{0} parte pro milliardu"} + other{"{0} partes pro milliardu"} + } percent{ dnam{"pro chentu"} one{"{0} pro chentu"} @@ -190,21 +200,11 @@ sc{ one{"{0} pro milli"} other{"{0} pro milli"} } - permillion{ - dnam{"partes pro millione"} - one{"{0} parte pro millione"} - other{"{0} partes pro millione"} - } permyriad{ dnam{"pro deghemìgia"} one{"{0} pro deghemìgia"} other{"{0} pro deghemìgia"} } - portion-per-1e9{ - dnam{"partes pro milliardu"} - one{"{0} parte pro milliardu"} - other{"{0} partes pro milliardu"} - } } consumption{ liter-per-100-kilometer{ @@ -1118,11 +1118,11 @@ sc{ one{"{0}mol"} other{"{0}mol"} } - permillion{ + part-per-1e6{ one{"{0}ppm"} other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ one{"{0}ppb"} other{"{0}ppb"} } @@ -1857,7 +1857,7 @@ sc{ one{"{0} mmol/l"} other{"{0} mmol/l"} } - portion-per-1e9{ + part-per-1e9{ dnam{"partes/milliardu"} } } diff --git a/icu4c/source/data/unit/sd.txt b/icu4c/source/data/unit/sd.txt index ab7ab16784c2..2013f9b6b1e7 100644 --- a/icu4c/source/data/unit/sd.txt +++ b/icu4c/source/data/unit/sd.txt @@ -97,20 +97,20 @@ sd{ one{"{0} مول"} other{"{0} مولز"} } - permillion{ + part-per-1e6{ dnam{"حصا في ملين"} one{"{0} حصو في ملين"} other{"{0} حصا في ملين"} } - permyriad{ - one{"{0} پيرمائيرڊ"} - other{"{0} پيرمائيرڊ"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"حصا في ارب"} one{"{0} حصو في ارب"} other{"{0} حصا في ارب"} } + permyriad{ + one{"{0} پيرمائيرڊ"} + other{"{0} پيرمائيرڊ"} + } } consumption{ liter-per-100-kilometer{ @@ -559,7 +559,7 @@ sd{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"ح ف ا"} one{"{0}ح ف ا"} other{"{0}ح ف ا"} @@ -836,14 +836,14 @@ sd{ mole{ dnam{"مول"} } - permyriad{ - dnam{"پيرمائيرڊ"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"حصا/ارب"} one{"{0} ح ف ا"} other{"{0} ح ف ا"} } + permyriad{ + dnam{"پيرمائيرڊ"} + } } consumption{ liter-per-kilometer{ diff --git a/icu4c/source/data/unit/si.txt b/icu4c/source/data/unit/si.txt index e5039baec5a0..f796f4483512 100644 --- a/icu4c/source/data/unit/si.txt +++ b/icu4c/source/data/unit/si.txt @@ -136,6 +136,16 @@ si{ one{"ලීටරයකට මිලිමෝල් {0}"} other{"ලීටරයකට මිලිමෝල් {0}"} } + part-per-1e6{ + dnam{"මිලියනයට කොටස්"} + one{"මිලියනයට කොටස් {0}"} + other{"මිලියනයට කොටස් {0}"} + } + part-per-1e9{ + dnam{"බිලියනයකට කොටස්"} + one{"බිලියනයකට කොටස් {0}"} + other{"බිලියනයකට කොටස් {0}"} + } percent{ one{"ප්‍රතිශතය {0}"} other{"ප්‍රතිශතය {0}"} @@ -145,20 +155,10 @@ si{ one{"ප්‍රතිසහශ්‍රක {0}"} other{"ප්‍රතිසහශ්‍රක {0}"} } - permillion{ - dnam{"මිලියනයට කොටස්"} - one{"මිලියනයට කොටස් {0}"} - other{"මිලියනයට කොටස් {0}"} - } permyriad{ one{"{0} පර්මැරියඩ්"} other{"{0} පර්මැරියඩ්"} } - portion-per-1e9{ - dnam{"බිලියනයකට කොටස්"} - one{"බිලියනයකට කොටස් {0}"} - other{"බිලියනයකට කොටස් {0}"} - } } consumption{ liter-per-100-kilometer{ @@ -967,20 +967,20 @@ si{ 10p9{"ගි{0}"} } concentr{ - percent{ - dnam{"%"} - } - permillion{ + part-per-1e6{ dnam{"මිලිකො"} } - permyriad{ - dnam{"‱"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"බිකො"} one{"බිකො {0}"} other{"බිකො {0}"} } + percent{ + dnam{"%"} + } + permyriad{ + dnam{"‱"} + } } consumption{ liter-per-100-kilometer{ @@ -1343,22 +1343,22 @@ si{ one{"{0} මවුල"} other{"{0} මවුල"} } - percent{ - dnam{"ප්‍රතිශතය"} - } - permillion{ + part-per-1e6{ dnam{"කොටස්/මිලියනය"} one{"{0} මිලිකො"} other{"{0} මිලිකො"} } - permyriad{ - dnam{"පර්මැරියඩ්"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"කොටස්/බිලියනය"} one{"බිකො {0}"} other{"බිකො {0}"} } + percent{ + dnam{"ප්‍රතිශතය"} + } + permyriad{ + dnam{"පර්මැරියඩ්"} + } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sk.txt b/icu4c/source/data/unit/sk.txt index c8adf5267d5b..51d678c05663 100644 --- a/icu4c/source/data/unit/sk.txt +++ b/icu4c/source/data/unit/sk.txt @@ -941,6 +941,86 @@ sk{ one{"{0} mol"} other{"{0} molov"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} milióntiny"} + many{"{0} milióntiny"} + one{"{0} milióntinu"} + other{"{0} milióntin"} + } + dative{ + few{"{0} milióntinám"} + many{"{0} milióntiny"} + one{"{0} milióntine"} + other{"{0} milióntinám"} + } + genitive{ + few{"{0} milióntin"} + many{"{0} milióntiny"} + one{"{0} milióntiny"} + other{"{0} milióntin"} + } + instrumental{ + few{"{0} milióntinami"} + many{"{0} milióntiny"} + one{"{0} milióntinou"} + other{"{0} milióntinami"} + } + locative{ + few{"{0} milióntinách"} + many{"{0} milióntiny"} + one{"{0} milióntine"} + other{"{0} milióntinách"} + } + } + dnam{"milióntiny"} + few{"{0} milióntiny"} + gender{"feminine"} + many{"{0} milióntiny"} + one{"{0} milióntina"} + other{"{0} milióntin"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} častice na miliardu"} + many{"{0} častice na miliardu"} + one{"{0} časticu na miliardu"} + other{"{0} častíc na miliardu"} + } + dative{ + few{"{0} časticiam na miliardu"} + many{"{0} častice na miliardu"} + one{"{0} častici na miliardu"} + other{"{0} časticiam na miliardu"} + } + genitive{ + few{"{0} častíc na miliardu"} + many{"{0} častice na miliardu"} + one{"{0} častice na miliardu"} + other{"{0} častíc na miliardu"} + } + instrumental{ + few{"{0} časticami na miliardu"} + many{"{0} častice na miliardu"} + one{"{0} časticou na miliardu"} + other{"{0} časticami na miliardu"} + } + locative{ + few{"{0} časticiach na miliardu"} + many{"{0} častice na miliardu"} + one{"{0} častici na miliardu"} + other{"{0} časticiach na miliardu"} + } + } + dnam{"častice na miliardu"} + few{"{0} častice na miliardu"} + gender{"feminine"} + many{"{0} častice na miliardu"} + one{"{0} častica na miliardu"} + other{"{0} častíc na miliardu"} + } percent{ case{ accusative{ @@ -1021,46 +1101,6 @@ sk{ one{"{0} promile"} other{"{0} promile"} } - permillion{ - case{ - accusative{ - few{"{0} milióntiny"} - many{"{0} milióntiny"} - one{"{0} milióntinu"} - other{"{0} milióntin"} - } - dative{ - few{"{0} milióntinám"} - many{"{0} milióntiny"} - one{"{0} milióntine"} - other{"{0} milióntinám"} - } - genitive{ - few{"{0} milióntin"} - many{"{0} milióntiny"} - one{"{0} milióntiny"} - other{"{0} milióntin"} - } - instrumental{ - few{"{0} milióntinami"} - many{"{0} milióntiny"} - one{"{0} milióntinou"} - other{"{0} milióntinami"} - } - locative{ - few{"{0} milióntinách"} - many{"{0} milióntiny"} - one{"{0} milióntine"} - other{"{0} milióntinách"} - } - } - dnam{"milióntiny"} - few{"{0} milióntiny"} - gender{"feminine"} - many{"{0} milióntiny"} - one{"{0} milióntina"} - other{"{0} milióntin"} - } permyriad{ case{ accusative{ @@ -1101,46 +1141,6 @@ sk{ one{"{0} desatina promile"} other{"{0} desatín promile"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} častice na miliardu"} - many{"{0} častice na miliardu"} - one{"{0} časticu na miliardu"} - other{"{0} častíc na miliardu"} - } - dative{ - few{"{0} časticiam na miliardu"} - many{"{0} častice na miliardu"} - one{"{0} častici na miliardu"} - other{"{0} časticiam na miliardu"} - } - genitive{ - few{"{0} častíc na miliardu"} - many{"{0} častice na miliardu"} - one{"{0} častice na miliardu"} - other{"{0} častíc na miliardu"} - } - instrumental{ - few{"{0} časticami na miliardu"} - many{"{0} častice na miliardu"} - one{"{0} časticou na miliardu"} - other{"{0} časticami na miliardu"} - } - locative{ - few{"{0} časticiach na miliardu"} - many{"{0} častice na miliardu"} - one{"{0} častici na miliardu"} - other{"{0} časticiach na miliardu"} - } - } - dnam{"častice na miliardu"} - few{"{0} častice na miliardu"} - gender{"feminine"} - many{"{0} častice na miliardu"} - one{"{0} častica na miliardu"} - other{"{0} častíc na miliardu"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sl.txt b/icu4c/source/data/unit/sl.txt index f662ced770ca..061766c74292 100644 --- a/icu4c/source/data/unit/sl.txt +++ b/icu4c/source/data/unit/sl.txt @@ -934,6 +934,86 @@ sl{ other{"{0} molov"} two{"{0} mola"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} delce na milijon"} + one{"{0} delec na milijon"} + other{"{0} delcev na milijon"} + two{"{0} delca na milijon"} + } + dative{ + few{"{0} delcem na milijon"} + one{"{0} delcu na milijon"} + other{"{0} delcem na milijon"} + two{"{0} delcema na milijon"} + } + genitive{ + few{"{0} delcev na milijon"} + one{"{0} delca na milijon"} + other{"{0} delcev na milijon"} + two{"{0} delcev na milijon"} + } + instrumental{ + few{"{0} delci na milijon"} + one{"{0} delcem na milijon"} + other{"{0} delci na milijon"} + two{"{0} delcema na milijon"} + } + locative{ + few{"{0} delcih na milijon"} + one{"{0} delcu na milijon"} + other{"{0} delcih na milijon"} + two{"{0} delcih na milijon"} + } + } + dnam{"delci na milijon"} + few{"{0} delci na milijon"} + gender{"masculine"} + one{"{0} delec na milijon"} + other{"{0} delcev na milijon"} + two{"{0} delca na milijon"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} delce na milijardo"} + one{"{0} delec na milijardo"} + other{"{0} delcev na milijardo"} + two{"{0} delca na milijardo"} + } + dative{ + few{"{0} delcem na milijardo"} + one{"{0} delcu na milijardo"} + other{"{0} delcem na milijardo"} + two{"{0} delcema na milijardo"} + } + genitive{ + few{"{0} delcev na milijardo"} + one{"{0} delca na milijardo"} + other{"{0} delcev na milijardo"} + two{"{0} delcev na milijardo"} + } + instrumental{ + few{"{0} delci na milijardo"} + one{"{0} delcem na milijardo"} + other{"{0} delci na milijardo"} + two{"{0} delcema na milijardo"} + } + locative{ + few{"{0} delcih na milijardo"} + one{"{0} delcu na milijardo"} + other{"{0} delcih na milijardo"} + two{"{0} delcih na milijardo"} + } + } + dnam{"delci na milijardo"} + few{"{0} delci na milijardo"} + gender{"masculine"} + one{"{0} delec na milijardo"} + other{"{0} delcev na milijardo"} + two{"{0} delca na milijardo"} + } percent{ case{ accusative{ @@ -1012,46 +1092,6 @@ sl{ other{"{0} promilov"} two{"{0} promila"} } - permillion{ - case{ - accusative{ - few{"{0} delce na milijon"} - one{"{0} delec na milijon"} - other{"{0} delcev na milijon"} - two{"{0} delca na milijon"} - } - dative{ - few{"{0} delcem na milijon"} - one{"{0} delcu na milijon"} - other{"{0} delcem na milijon"} - two{"{0} delcema na milijon"} - } - genitive{ - few{"{0} delcev na milijon"} - one{"{0} delca na milijon"} - other{"{0} delcev na milijon"} - two{"{0} delcev na milijon"} - } - instrumental{ - few{"{0} delci na milijon"} - one{"{0} delcem na milijon"} - other{"{0} delci na milijon"} - two{"{0} delcema na milijon"} - } - locative{ - few{"{0} delcih na milijon"} - one{"{0} delcu na milijon"} - other{"{0} delcih na milijon"} - two{"{0} delcih na milijon"} - } - } - dnam{"delci na milijon"} - few{"{0} delci na milijon"} - gender{"masculine"} - one{"{0} delec na milijon"} - other{"{0} delcev na milijon"} - two{"{0} delca na milijon"} - } permyriad{ case{ accusative{ @@ -1092,46 +1132,6 @@ sl{ other{"{0} desettisočin"} two{"{0} desettisočini"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} delce na milijardo"} - one{"{0} delec na milijardo"} - other{"{0} delcev na milijardo"} - two{"{0} delca na milijardo"} - } - dative{ - few{"{0} delcem na milijardo"} - one{"{0} delcu na milijardo"} - other{"{0} delcem na milijardo"} - two{"{0} delcema na milijardo"} - } - genitive{ - few{"{0} delcev na milijardo"} - one{"{0} delca na milijardo"} - other{"{0} delcev na milijardo"} - two{"{0} delcev na milijardo"} - } - instrumental{ - few{"{0} delci na milijardo"} - one{"{0} delcem na milijardo"} - other{"{0} delci na milijardo"} - two{"{0} delcema na milijardo"} - } - locative{ - few{"{0} delcih na milijardo"} - one{"{0} delcu na milijardo"} - other{"{0} delcih na milijardo"} - two{"{0} delcih na milijardo"} - } - } - dnam{"delci na milijardo"} - few{"{0} delci na milijardo"} - gender{"masculine"} - one{"{0} delec na milijardo"} - other{"{0} delcev na milijardo"} - two{"{0} delca na milijardo"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/so.txt b/icu4c/source/data/unit/so.txt index bc6b125b1b70..8779d50b2085 100644 --- a/icu4c/source/data/unit/so.txt +++ b/icu4c/source/data/unit/so.txt @@ -160,6 +160,16 @@ so{ one{"{0} milimool litirkiiba"} other{"{0} milimool litirkiiba"} } + part-per-1e6{ + dnam{"qeyb milyankiiba"} + one{"{0} qeyb milyankiiba"} + other{"{0} qeyb milyankiiba"} + } + part-per-1e9{ + dnam{"qeybaha bilyankiiba"} + one{"{0} qeybaha bilyankiiba"} + other{"{0} qeybaha bilyankiiba"} + } percent{ one{"boqolkiiba {0}"} other{"boqolkiiba {0}"} @@ -168,20 +178,10 @@ so{ one{"{0} baarmiil"} other{"{0} baarmiil"} } - permillion{ - dnam{"qeyb milyankiiba"} - one{"{0} qeyb milyankiiba"} - other{"{0} qeyb milyankiiba"} - } permyriad{ one{"{0} bermiraad"} other{"{0} bermiraad"} } - portion-per-1e9{ - dnam{"qeybaha bilyankiiba"} - one{"{0} qeybaha bilyankiiba"} - other{"{0} qeybaha bilyankiiba"} - } } consumption{ liter-per-100-kilometer{ @@ -952,19 +952,19 @@ so{ one{"{0}mg/dL"} other{"{0}mg/dL"} } - percent{ - dnam{"%"} - } - permillion{ + part-per-1e6{ dnam{"ppm"} one{"{0}ppm"} other{"{0}ppm#"} } - portion-per-1e9{ + part-per-1e9{ dnam{"qb"} one{"{0}qb"} other{"{0}qb"} } + percent{ + dnam{"%"} + } } consumption{ liter-per-100-kilometer{ @@ -1294,23 +1294,23 @@ so{ one{"{0} mool"} other{"{0} mool"} } + part-per-1e6{ + dnam{"qeyb/milyankiiba"} + } + part-per-1e9{ + dnam{"qeybaha/bilyan"} + one{"{0} qb"} + other{"{0} qb"} + } percent{ dnam{"boqolkiiba"} } permille{ dnam{"baarmiil"} } - permillion{ - dnam{"qeyb/milyankiiba"} - } permyriad{ dnam{"bermiraad"} } - portion-per-1e9{ - dnam{"qeybaha/bilyan"} - one{"{0} qb"} - other{"{0} qb"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sq.txt b/icu4c/source/data/unit/sq.txt index eebfe001cbb9..2b530a6556e0 100644 --- a/icu4c/source/data/unit/sq.txt +++ b/icu4c/source/data/unit/sq.txt @@ -177,6 +177,16 @@ sq{ one{"{0} mol"} other{"{0} molë"} } + part-per-1e6{ + dnam{"pjesë për milion"} + one{"{0} pjesë për milion"} + other{"{0} pjesë për milion"} + } + part-per-1e9{ + dnam{"pjesë për miliard"} + one{"{0} pjesë për miliard"} + other{"{0} pjesë për miliard"} + } percent{ dnam{"përqind"} one{"{0} përqind"} @@ -187,21 +197,11 @@ sq{ one{"{0} përmijë"} other{"{0} përmijë"} } - permillion{ - dnam{"pjesë për milion"} - one{"{0} pjesë për milion"} - other{"{0} pjesë për milion"} - } permyriad{ dnam{"përdhjetëmijë"} one{"{0} përdhjetëmijë"} other{"{0} përdhjetëmijë"} } - portion-per-1e9{ - dnam{"pjesë për miliard"} - one{"{0} pjesë për miliard"} - other{"{0} pjesë për miliard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sr.txt b/icu4c/source/data/unit/sr.txt index 1669a3ad7df1..0c9fac0ae410 100644 --- a/icu4c/source/data/unit/sr.txt +++ b/icu4c/source/data/unit/sr.txt @@ -583,6 +583,54 @@ sr{ one{"{0} мол"} other{"{0} мола"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} честице на милион"} + one{"{0} честицу на милион"} + other{"{0} честица на милион"} + } + genitive{ + few{"{0} честице на милион"} + one{"{0} честице на милион"} + other{"{0} честица на милион"} + } + instrumental{ + few{"{0} честице на милион"} + one{"{0} честицом на милион"} + other{"{0} честица на милион"} + } + } + dnam{"честица на милион"} + few{"{0} честице на милион"} + gender{"feminine"} + one{"{0} честица на милион"} + other{"{0} честица на милион"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} дела на милијарду"} + one{"{0} део на милијарду"} + other{"{0} делова на милијарду"} + } + genitive{ + few{"{0} дела на милијарду"} + one{"{0} дела на милијарду"} + other{"{0} делова на милијарду"} + } + instrumental{ + few{"{0} дела на милијарду"} + one{"{0} делом на милијарду"} + other{"{0} делова на милијарду"} + } + } + dnam{"делови на милијарду"} + few{"{0} дела на милијарду"} + gender{"inanimate"} + one{"{0} део на милијарду"} + other{"{0} делова на милијарду"} + } percent{ case{ accusative{ @@ -629,57 +677,9 @@ sr{ one{"{0} промил"} other{"{0} промила"} } - permillion{ - case{ - accusative{ - few{"{0} честице на милион"} - one{"{0} честицу на милион"} - other{"{0} честица на милион"} - } - genitive{ - few{"{0} честице на милион"} - one{"{0} честице на милион"} - other{"{0} честица на милион"} - } - instrumental{ - few{"{0} честице на милион"} - one{"{0} честицом на милион"} - other{"{0} честица на милион"} - } - } - dnam{"честица на милион"} - few{"{0} честице на милион"} - gender{"feminine"} - one{"{0} честица на милион"} - other{"{0} честица на милион"} - } permyriad{ gender{"inanimate"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} дела на милијарду"} - one{"{0} део на милијарду"} - other{"{0} делова на милијарду"} - } - genitive{ - few{"{0} дела на милијарду"} - one{"{0} дела на милијарду"} - other{"{0} делова на милијарду"} - } - instrumental{ - few{"{0} дела на милијарду"} - one{"{0} делом на милијарду"} - other{"{0} делова на милијарду"} - } - } - dnam{"делови на милијарду"} - few{"{0} дела на милијарду"} - gender{"inanimate"} - one{"{0} део на милијарду"} - other{"{0} делова на милијарду"} - } } consumption{ liter-per-100-kilometer{ @@ -3548,15 +3548,15 @@ sr{ one{"{0} ставка"} other{"{0} ставки"} } + part-per-1e9{ + dnam{"делови/милијарда"} + } percent{ dnam{"проценат"} } permille{ dnam{"промил"} } - portion-per-1e9{ - dnam{"делови/милијарда"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sr_Cyrl_BA.txt b/icu4c/source/data/unit/sr_Cyrl_BA.txt index 2108e90919bc..3dfcf4029bf9 100644 --- a/icu4c/source/data/unit/sr_Cyrl_BA.txt +++ b/icu4c/source/data/unit/sr_Cyrl_BA.txt @@ -17,7 +17,7 @@ sr_Cyrl_BA{ 10p30{"Q{0}"} } concentr{ - portion-per-1e9{ + part-per-1e9{ case{ accusative{ few{"{0} дијела на милијарду"} @@ -197,7 +197,7 @@ sr_Cyrl_BA{ } unitsNarrow{ concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"дијелови/милијарда"} } } @@ -271,7 +271,7 @@ sr_Cyrl_BA{ } unitsShort{ concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"дијелови/милијарда"} } } diff --git a/icu4c/source/data/unit/sr_Latn.txt b/icu4c/source/data/unit/sr_Latn.txt index 4fe7aea5e247..25cdb8c09f31 100644 --- a/icu4c/source/data/unit/sr_Latn.txt +++ b/icu4c/source/data/unit/sr_Latn.txt @@ -435,43 +435,7 @@ sr_Latn{ one{"{0} mol"} other{"{0} mola"} } - percent{ - case{ - genitive{ - few{"{0} procenata"} - one{"{0} procenta"} - other{"{0} procenata"} - } - instrumental{ - few{"{0} procenata"} - one{"{0} procentom"} - other{"{0} procenata"} - } - } - few{"{0} procenata"} - gender{"inanimate"} - one{"{0} procenat"} - other{"{0} procenata"} - } - permille{ - case{ - genitive{ - few{"{0} promila"} - one{"{0} promila"} - other{"{0} promila"} - } - instrumental{ - few{"{0} promila"} - one{"{0} promilom"} - other{"{0} promila"} - } - } - few{"{0} promila"} - gender{"inanimate"} - one{"{0} promil"} - other{"{0} promila"} - } - permillion{ + part-per-1e6{ case{ accusative{ few{"{0} čestice na milion"} @@ -495,10 +459,7 @@ sr_Latn{ one{"{0} čestica na milion"} other{"{0} čestica na milion"} } - permyriad{ - gender{"inanimate"} - } - portion-per-1e9{ + part-per-1e9{ case{ accusative{ few{"{0} dela na milijardu"} @@ -522,6 +483,45 @@ sr_Latn{ one{"{0} deo na milijardu"} other{"{0} delova na milijardu"} } + percent{ + case{ + genitive{ + few{"{0} procenata"} + one{"{0} procenta"} + other{"{0} procenata"} + } + instrumental{ + few{"{0} procenata"} + one{"{0} procentom"} + other{"{0} procenata"} + } + } + few{"{0} procenata"} + gender{"inanimate"} + one{"{0} procenat"} + other{"{0} procenata"} + } + permille{ + case{ + genitive{ + few{"{0} promila"} + one{"{0} promila"} + other{"{0} promila"} + } + instrumental{ + few{"{0} promila"} + one{"{0} promilom"} + other{"{0} promila"} + } + } + few{"{0} promila"} + gender{"inanimate"} + one{"{0} promil"} + other{"{0} promila"} + } + permyriad{ + gender{"inanimate"} + } } consumption{ liter-per-100-kilometer{ @@ -3019,15 +3019,15 @@ sr_Latn{ one{"{0} stavka"} other{"{0} stavki"} } + part-per-1e9{ + dnam{"delovi/milijarda"} + } percent{ dnam{"procenat"} } permille{ dnam{"promil"} } - portion-per-1e9{ - dnam{"delovi/milijarda"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/sr_Latn_BA.txt b/icu4c/source/data/unit/sr_Latn_BA.txt index a171f45ad31c..46f506d6191d 100644 --- a/icu4c/source/data/unit/sr_Latn_BA.txt +++ b/icu4c/source/data/unit/sr_Latn_BA.txt @@ -17,7 +17,7 @@ sr_Latn_BA{ 10p30{"Q{0}"} } concentr{ - portion-per-1e9{ + part-per-1e9{ case{ accusative{ few{"{0} dijela na milijardu"} @@ -197,7 +197,7 @@ sr_Latn_BA{ } unitsNarrow{ concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"dijelovi/milijarda"} } } @@ -271,7 +271,7 @@ sr_Latn_BA{ } unitsShort{ concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"dijelovi/milijarda"} } } diff --git a/icu4c/source/data/unit/sv.txt b/icu4c/source/data/unit/sv.txt index 1f4440f5f77e..6d822a0983f9 100644 --- a/icu4c/source/data/unit/sv.txt +++ b/icu4c/source/data/unit/sv.txt @@ -303,6 +303,29 @@ sv{ one{"{0} mol"} other{"{0} mol"} } + part-per-1e6{ + case{ + genitive{ + one{"{0} miljondels"} + other{"{0} miljondelars"} + } + } + gender{"common"} + one{"{0} miljondel"} + other{"{0} miljondelar"} + } + part-per-1e9{ + case{ + genitive{ + one{"{0} miljarddels"} + other{"{0} miljarddelars"} + } + } + dnam{"miljarddelar"} + gender{"common"} + one{"{0} miljarddel"} + other{"{0} miljarddelar"} + } percent{ case{ genitive{ @@ -327,17 +350,6 @@ sv{ one{"{0} promille"} other{"{0} promille"} } - permillion{ - case{ - genitive{ - one{"{0} miljondels"} - other{"{0} miljondelars"} - } - } - gender{"common"} - one{"{0} miljondel"} - other{"{0} miljondelar"} - } permyriad{ case{ genitive{ @@ -350,18 +362,6 @@ sv{ one{"{0} promyriad"} other{"{0} promyriad"} } - portion-per-1e9{ - case{ - genitive{ - one{"{0} miljarddels"} - other{"{0} miljarddelars"} - } - } - dnam{"miljarddelar"} - gender{"common"} - one{"{0} miljarddel"} - other{"{0} miljarddelar"} - } } consumption{ liter-per-100-kilometer{ @@ -1941,6 +1941,14 @@ sv{ one{"{0}mol"} other{"{0}mol"} } + part-per-1e6{ + one{"{0}ppm"} + other{"{0}ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ one{"{0}%"} other{"{0}%"} @@ -1949,18 +1957,10 @@ sv{ one{"{0}‰"} other{"{0}‰"} } - permillion{ - one{"{0}ppm"} - other{"{0}ppm"} - } permyriad{ one{"{0}‱"} other{"{0}‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -2721,6 +2721,9 @@ sv{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"miljondelar"} + } percent{ one{"{0} %"} other{"{0} %"} @@ -2729,9 +2732,6 @@ sv{ one{"{0} ‰"} other{"{0} ‰"} } - permillion{ - dnam{"miljondelar"} - } permyriad{ one{"{0} ‱"} other{"{0} ‱"} diff --git a/icu4c/source/data/unit/sw.txt b/icu4c/source/data/unit/sw.txt index e287dd5bc8e6..4aef94cb8a08 100644 --- a/icu4c/source/data/unit/sw.txt +++ b/icu4c/source/data/unit/sw.txt @@ -92,23 +92,23 @@ sw{ one{"milimoli {0} kwa kila lita"} other{"milimoli {0} kwa kila lita"} } + part-per-1e6{ + one{"sehemu {0} kwa kila milioni"} + other{"sehemu {0} kwa kila milioni"} + } + part-per-1e9{ + dnam{"sehemu kwa kila bilioni"} + one{"sehemu {0} kwa kila bilioni"} + other{"sehemu {0} kwa kila bilioni"} + } permille{ one{"{0} kwa kila elfu"} other{"{0} kwa kila elfu"} } - permillion{ - one{"sehemu {0} kwa kila milioni"} - other{"sehemu {0} kwa kila milioni"} - } permyriad{ one{"permyriadi {0}"} other{"permyriadi {0}"} } - portion-per-1e9{ - dnam{"sehemu kwa kila bilioni"} - one{"sehemu {0} kwa kila bilioni"} - other{"sehemu {0} kwa kila bilioni"} - } } consumption{ liter-per-100-kilometer{ @@ -548,10 +548,10 @@ sw{ one{"mmol {0}/L"} other{"mmol {0}/L"} } - permillion{ + part-per-1e6{ dnam{"ppm"} } - portion-per-1e9{ + part-per-1e9{ dnam{"sehemu kwa kila bilioni"} } } @@ -819,6 +819,14 @@ sw{ one{"moli {0}"} other{"moli {0}"} } + part-per-1e6{ + dnam{"sehemu kwa kila milioni"} + one{"ppm {0}"} + other{"ppm {0}"} + } + part-per-1e9{ + dnam{"sehemu kwa bilioni"} + } percent{ dnam{"asilimia"} one{"asilimia {0}"} @@ -829,17 +837,9 @@ sw{ one{"{0} kwa elfu"} other{"{0} kwa elfu"} } - permillion{ - dnam{"sehemu kwa kila milioni"} - one{"ppm {0}"} - other{"ppm {0}"} - } permyriad{ dnam{"permyriadi"} } - portion-per-1e9{ - dnam{"sehemu kwa bilioni"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/syr.txt b/icu4c/source/data/unit/syr.txt index 56fa018bff1b..745119b7e9b9 100644 --- a/icu4c/source/data/unit/syr.txt +++ b/icu4c/source/data/unit/syr.txt @@ -158,6 +158,11 @@ syr{ one{"{0} ܡܘܠ"} other{"{0} ܡܘܠ"} } + part-per-1e6{ + dnam{"ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ"} + one{"{0} ܡܢܬܐ ܒܡܠܝܘܢ"} + other{"{0} ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ"} + } percent{ dnam{"ܒܡܐܐ"} } @@ -166,11 +171,6 @@ syr{ one{"{0} ܒܐܠܦܐ"} other{"{0} ܒܐܠܦܐ"} } - permillion{ - dnam{"ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ"} - one{"{0} ܡܢܬܐ ܒܡܠܝܘܢ"} - other{"{0} ܡܢܘ̈ܬܐ ܒܡܠܝܘܢ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ta.txt b/icu4c/source/data/unit/ta.txt index 9a115b5f054a..0423c8825704 100644 --- a/icu4c/source/data/unit/ta.txt +++ b/icu4c/source/data/unit/ta.txt @@ -395,6 +395,44 @@ ta{ one{"{0} மோல்"} other{"{0} மோல்ஸ்"} } + part-per-1e6{ + case{ + ablative{ + one{"{0} பகுதி/மில்லியனில்"} + other{"{0} பகுதிகள்/மில்லியனில்"} + } + accusative{ + one{"{0} பகுதி/மில்லியனை"} + other{"{0} பகுதிகள்/மில்லியனை"} + } + dative{ + one{"{0} பகுதி/மில்லியனுக்கு"} + other{"{0} பகுதிகள்/மில்லியனுக்கு"} + } + } + dnam{"பகுதிகள்/மில்லியன்"} + one{"{0} பகுதி/மில்லியன்"} + other{"{0} பகுதிகள்/மில்லியன்"} + } + part-per-1e9{ + case{ + ablative{ + one{"{0} பார்ட்ஸ்/பில்லியனில்"} + other{"{0} பார்ட்ஸ்/பில்லியனில்"} + } + accusative{ + one{"{0} பார்ட்ஸ்/பில்லியனை"} + other{"{0} பார்ட்ஸ்/பில்லியனை"} + } + dative{ + one{"{0} பார்ட்ஸ்/பில்லியனுக்கு"} + other{"{0} பார்ட்ஸ்/பில்லியனுக்கு"} + } + } + dnam{"பார்ட்ஸ்/பில்லியன்"} + one{"{0} பார்ட்ஸ்/பில்லியன்"} + other{"{0} பார்ட்ஸ்/பில்லியன்"} + } percent{ case{ ablative{ @@ -431,25 +469,6 @@ ta{ one{"மில்லி ஒன்றுக்கு {0}"} other{"மில்லி ஒன்றுக்கு {0}"} } - permillion{ - case{ - ablative{ - one{"{0} பகுதி/மில்லியனில்"} - other{"{0} பகுதிகள்/மில்லியனில்"} - } - accusative{ - one{"{0} பகுதி/மில்லியனை"} - other{"{0} பகுதிகள்/மில்லியனை"} - } - dative{ - one{"{0} பகுதி/மில்லியனுக்கு"} - other{"{0} பகுதிகள்/மில்லியனுக்கு"} - } - } - dnam{"பகுதிகள்/மில்லியன்"} - one{"{0} பகுதி/மில்லியன்"} - other{"{0} பகுதிகள்/மில்லியன்"} - } permyriad{ case{ ablative{ @@ -468,25 +487,6 @@ ta{ one{"{0} பெர்மிரியட்"} other{"{0} பெர்மிரியட்"} } - portion-per-1e9{ - case{ - ablative{ - one{"{0} பார்ட்ஸ்/பில்லியனில்"} - other{"{0} பார்ட்ஸ்/பில்லியனில்"} - } - accusative{ - one{"{0} பார்ட்ஸ்/பில்லியனை"} - other{"{0} பார்ட்ஸ்/பில்லியனை"} - } - dative{ - one{"{0} பார்ட்ஸ்/பில்லியனுக்கு"} - other{"{0} பார்ட்ஸ்/பில்லியனுக்கு"} - } - } - dnam{"பார்ட்ஸ்/பில்லியன்"} - one{"{0} பார்ட்ஸ்/பில்லியன்"} - other{"{0} பார்ட்ஸ்/பில்லியன்"} - } } consumption{ liter-per-100-kilometer{ @@ -2775,24 +2775,24 @@ ta{ one{"{0}மோல்"} other{"{0}மோல்"} } + part-per-1e6{ + one{"{0}ப./மி."} + other{"{0}ப./மி."} + } + part-per-1e9{ + dnam{"பா/பி"} + one{"{0} பா/பி"} + other{"{0} பா/பி"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - one{"{0}ப./மி."} - other{"{0}ப./மி."} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - dnam{"பா/பி"} - one{"{0} பா/பி"} - other{"{0} பா/பி"} - } } consumption{ liter-per-100-kilometer{ @@ -3596,25 +3596,25 @@ ta{ one{"{0} மோல்"} other{"{0} மோல்"} } + part-per-1e6{ + dnam{"ப./மி."} + one{"{0} ப./மி."} + other{"{0} ப./மி."} + } + part-per-1e9{ + dnam{"பார்ட்ஸ்/பில்லியன்"} + one{"{0} பார்ட்ஸ்/பில்லியன்"} + other{"{0} பார்ட்ஸ்/பில்லியன்"} + } percent{ dnam{"சதவீதம்"} } permille{ dnam{"மில்லி ஒன்றுக்கு"} } - permillion{ - dnam{"ப./மி."} - one{"{0} ப./மி."} - other{"{0} ப./மி."} - } permyriad{ dnam{"பெர்மிரியட்"} } - portion-per-1e9{ - dnam{"பார்ட்ஸ்/பில்லியன்"} - one{"{0} பார்ட்ஸ்/பில்லியன்"} - other{"{0} பார்ட்ஸ்/பில்லியன்"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/te.txt b/icu4c/source/data/unit/te.txt index 7a951cc51464..7c863765d6c2 100644 --- a/icu4c/source/data/unit/te.txt +++ b/icu4c/source/data/unit/te.txt @@ -176,6 +176,15 @@ te{ one{"{0} మోల్"} other{"{0} మోల్‌లు"} } + part-per-1e6{ + one{"{0} భాగం/మిలియన్"} + other{"{0} భాగాలు/మిలియన్"} + } + part-per-1e9{ + dnam{"ప్రతి బిలియన్‌కి భాగాలు"} + one{"ప్రతి బిలియన్‌కి {0} భాగం"} + other{"ప్రతి బిలియన్‌కి {0} భాగాలు"} + } percent{ one{"{0} శాతం"} other{"{0} శాతం"} @@ -184,19 +193,10 @@ te{ one{"{0}/మైలుకు"} other{"{0}/మైలుకు"} } - permillion{ - one{"{0} భాగం/మిలియన్"} - other{"{0} భాగాలు/మిలియన్"} - } permyriad{ one{"{0} పెర్మేరియాడ్"} other{"{0} పెర్మేరియాడ్"} } - portion-per-1e9{ - dnam{"ప్రతి బిలియన్‌కి భాగాలు"} - one{"ప్రతి బిలియన్‌కి {0} భాగం"} - other{"ప్రతి బిలియన్‌కి {0} భాగాలు"} - } } consumption{ liter-per-100-kilometer{ @@ -1486,23 +1486,23 @@ te{ mole{ dnam{"మోల్"} } + part-per-1e6{ + dnam{"భాగాలు/మిలియన్"} + one{"{0} భా./మి."} + other{"{0} భా./మి."} + } + part-per-1e9{ + dnam{"భాగాలు/బిలియన్"} + } percent{ dnam{"శాతం"} } permille{ dnam{"మైలుకు"} } - permillion{ - dnam{"భాగాలు/మిలియన్"} - one{"{0} భా./మి."} - other{"{0} భా./మి."} - } permyriad{ dnam{"పెర్మేరియాడ్"} } - portion-per-1e9{ - dnam{"భాగాలు/బిలియన్"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/th.txt b/icu4c/source/data/unit/th.txt index 7a40278c1e41..90f7ad5cc559 100644 --- a/icu4c/source/data/unit/th.txt +++ b/icu4c/source/data/unit/th.txt @@ -77,23 +77,23 @@ th{ dnam{"มิลลิโมลต่อลิตร"} other{"{0} มิลลิโมลต่อลิตร"} } + part-per-1e6{ + dnam{"ส่วนต่อล้าน"} + other{"{0} ส่วนต่อล้าน"} + } + part-per-1e9{ + dnam{"ส่วนต่อพันล้าน"} + other{"{0} ส่วนต่อพันล้าน"} + } percent{ other{"{0} เปอร์เซ็นต์"} } permille{ other{"{0} เปอร์มิลล์"} } - permillion{ - dnam{"ส่วนต่อล้าน"} - other{"{0} ส่วนต่อล้าน"} - } permyriad{ other{"{0} เปอร์มีเรียด"} } - portion-per-1e9{ - dnam{"ส่วนต่อพันล้าน"} - other{"{0} ส่วนต่อพันล้าน"} - } } consumption{ liter-per-100-kilometer{ @@ -623,20 +623,20 @@ th{ mole{ other{"{0}โมล"} } - permille{ - dnam{"‰"} - } - permillion{ + part-per-1e6{ dnam{"สตล."} other{"{0}สตล."} } - permyriad{ - dnam{"‱"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"สตพล."} other{"{0}สตพล."} } + permille{ + dnam{"‰"} + } + permyriad{ + dnam{"‱"} + } } consumption{ liter-per-100-kilometer{ @@ -1315,23 +1315,23 @@ th{ dnam{"โมล"} other{"{0} โมล"} } + part-per-1e6{ + dnam{"ส่วน/ล้าน"} + other{"{0} สตล."} + } + part-per-1e9{ + dnam{"ส่วน/พันล้าน"} + other{"{0} สตพล."} + } percent{ dnam{"เปอร์เซ็นต์"} } permille{ dnam{"เปอร์มิลล์"} } - permillion{ - dnam{"ส่วน/ล้าน"} - other{"{0} สตล."} - } permyriad{ dnam{"เปอร์มีเรียด"} } - portion-per-1e9{ - dnam{"ส่วน/พันล้าน"} - other{"{0} สตพล."} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ti.txt b/icu4c/source/data/unit/ti.txt index 6fea9811f68c..a2fb6531e924 100644 --- a/icu4c/source/data/unit/ti.txt +++ b/icu4c/source/data/unit/ti.txt @@ -180,6 +180,16 @@ ti{ one{"{0} ሞል"} other{"{0} ሞል"} } + part-per-1e6{ + dnam{"ክፍልታት ኣብ ሚልዮን"} + one{"{0} ክፍልታት ኣብ ሚልዮን"} + other{"{0} ክፍልታት ኣብ ሚልዮን"} + } + part-per-1e9{ + dnam{"ክፍልታት ኣብ ሓደ ቢልዮን"} + one{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} + other{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} + } percent{ dnam{"ሚእታዊ"} one{"{0} ሚእታዊ"} @@ -190,21 +200,11 @@ ti{ one{"{0} አብ ሚሌ"} other{"{0} አብ ሚሌ"} } - permillion{ - dnam{"ክፍልታት ኣብ ሚልዮን"} - one{"{0} ክፍልታት ኣብ ሚልዮን"} - other{"{0} ክፍልታት ኣብ ሚልዮን"} - } permyriad{ dnam{"አብ ሚርያድ"} one{"{0} አብ ሚርያድ"} other{"{0} አብ ሚርያድ"} } - portion-per-1e9{ - dnam{"ክፍልታት ኣብ ሓደ ቢልዮን"} - one{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} - other{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} - } } consumption{ liter-per-100-kilometer{ @@ -1156,12 +1156,12 @@ ti{ one{"{0}ሞል"} other{"{0}ሞል"} } - permillion{ + part-per-1e6{ dnam{"ክፍልታት ኣብ ሚልዮን"} one{"{0}ክፍልታት ኣብ ሚልዮን"} other{"{0}ክፍልታት ኣብ ሚልዮን"} } - portion-per-1e9{ + part-per-1e9{ dnam{"ክፍልታት ኣብ ሓደ ቢልዮን"} one{"{0}ክፍልታት ኣብ ሓደ ቢልዮን"} other{"{0}ክፍልታት ኣብ ሓደ ቢልዮን"} @@ -2083,25 +2083,25 @@ ti{ one{"{0} ሞል"} other{"{0} ሞል"} } + part-per-1e6{ + dnam{"ክፍልታት/ሚልዮን"} + one{"{0} ክፍልታት ኣብ ሚልዮን"} + other{"{0} ክፍልታት ኣብ ሚልዮን"} + } + part-per-1e9{ + dnam{"ክፍልታት/ሓደ ቢልዮን"} + one{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} + other{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} + } percent{ dnam{"ሚእታዊ"} } permille{ dnam{"አብ ሚሌ"} } - permillion{ - dnam{"ክፍልታት/ሚልዮን"} - one{"{0} ክፍልታት ኣብ ሚልዮን"} - other{"{0} ክፍልታት ኣብ ሚልዮን"} - } permyriad{ dnam{"አብ ሚርያድ"} } - portion-per-1e9{ - dnam{"ክፍልታት/ሓደ ቢልዮን"} - one{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} - other{"{0} ክፍልታት ኣብ ሓደ ቢልዮን"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/tk.txt b/icu4c/source/data/unit/tk.txt index 97af3dfc2d8b..b31bcf04b2a5 100644 --- a/icu4c/source/data/unit/tk.txt +++ b/icu4c/source/data/unit/tk.txt @@ -162,6 +162,15 @@ tk{ mole{ dnam{"mollar"} } + part-per-1e6{ + one{"{0} bölejik/million"} + other{"{0} bölejik/million"} + } + part-per-1e9{ + dnam{"bölejik/milliard"} + one{"milliardda {0} bölejik"} + other{"milliardda {0} bölejik"} + } percent{ one{"{0} göterim"} other{"{0} göterim"} @@ -170,19 +179,10 @@ tk{ one{"{0} promille"} other{"{0} promille"} } - permillion{ - one{"{0} bölejik/million"} - other{"{0} bölejik/million"} - } permyriad{ one{"{0} permiriad"} other{"{0} permiriad"} } - portion-per-1e9{ - dnam{"bölejik/milliard"} - one{"milliardda {0} bölejik"} - other{"milliardda {0} bölejik"} - } } consumption{ liter-per-100-kilometer{ @@ -995,14 +995,14 @@ tk{ 10p-2{"s{0}"} } concentr{ - percent{ - dnam{"%"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"bmlrd"} one{"{0} bmlrd"} other{"{0} bmlrd"} } + percent{ + dnam{"%"} + } } consumption{ mile-per-gallon-imperial{ @@ -1263,23 +1263,23 @@ tk{ millimole-per-liter{ dnam{"millimol/litr"} } + part-per-1e6{ + dnam{"bölejik/million"} + } + part-per-1e9{ + dnam{"bölejik/milliard"} + one{"{0} bölejik/milliard"} + other{"{0} bölejik/milliard"} + } percent{ dnam{"göterim"} } permille{ dnam{"promille"} } - permillion{ - dnam{"bölejik/million"} - } permyriad{ dnam{"permiriad"} } - portion-per-1e9{ - dnam{"bölejik/milliard"} - one{"{0} bölejik/milliard"} - other{"{0} bölejik/milliard"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/to.txt b/icu4c/source/data/unit/to.txt index 97605e86be5f..69ba709e60f1 100644 --- a/icu4c/source/data/unit/to.txt +++ b/icu4c/source/data/unit/to.txt @@ -143,6 +143,10 @@ to{ dnam{"molo"} other{"molo ʻe {0}"} } + part-per-1e6{ + dnam{"konga he miliona"} + other{"konga ʻe {0} he miliona"} + } percent{ dnam{"peseti"} other{"peseti ʻe {0}"} @@ -151,10 +155,6 @@ to{ dnam{"pemili"} other{"pemili ʻe {0}"} } - permillion{ - dnam{"konga he miliona"} - other{"konga ʻe {0} he miliona"} - } permyriad{ dnam{"pemano"} other{"pemano ʻe {0}"} @@ -876,15 +876,15 @@ to{ mole{ other{"{0} mol"} } + part-per-1e6{ + other{"{0} khm"} + } percent{ other{"{0}%"} } permille{ other{"{0}‰"} } - permillion{ - other{"{0} khm"} - } permyriad{ other{"{0}‱"} } @@ -1529,16 +1529,16 @@ to{ mole{ other{"mol ʻe {0}"} } + part-per-1e6{ + dnam{"khm"} + other{"khm ʻe {0}"} + } percent{ other{"% ʻe {0}"} } permille{ other{"‰ ʻe {0}"} } - permillion{ - dnam{"khm"} - other{"khm ʻe {0}"} - } permyriad{ other{"‱ ʻe {0}"} } diff --git a/icu4c/source/data/unit/tr.txt b/icu4c/source/data/unit/tr.txt index da343ea450d1..63b493d58799 100644 --- a/icu4c/source/data/unit/tr.txt +++ b/icu4c/source/data/unit/tr.txt @@ -157,6 +157,16 @@ tr{ one{"{0} milimol/litre"} other{"{0} milimol/litre"} } + part-per-1e6{ + dnam{"parça/milyon"} + one{"{0} parça/milyon"} + other{"{0} parça/milyon"} + } + part-per-1e9{ + dnam{"parça/milyar"} + one{"{0} parça/milyar"} + other{"{0} parça/milyar"} + } percent{ dnam{"yüzde"} one{"yüzde {0}"} @@ -167,20 +177,10 @@ tr{ one{"binde {0}"} other{"binde {0}"} } - permillion{ - dnam{"parça/milyon"} - one{"{0} parça/milyon"} - other{"{0} parça/milyon"} - } permyriad{ one{"onbinde {0}"} other{"onbinde {0}"} } - portion-per-1e9{ - dnam{"parça/milyar"} - one{"{0} parça/milyar"} - other{"{0} parça/milyar"} - } } consumption{ liter-per-100-kilometer{ @@ -1153,6 +1153,9 @@ tr{ one{"{0} mmol/l"} other{"{0} mmol/l"} } + part-per-1e9{ + dnam{"parça/milyar"} + } percent{ one{"%{0}"} other{"%{0}"} @@ -1166,9 +1169,6 @@ tr{ one{"‱{0}"} other{"‱{0}"} } - portion-per-1e9{ - dnam{"parça/milyar"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/uk.txt b/icu4c/source/data/unit/uk.txt index 9f96b6747f5d..4174c2f5d45f 100644 --- a/icu4c/source/data/unit/uk.txt +++ b/icu4c/source/data/unit/uk.txt @@ -891,6 +891,85 @@ uk{ one{"{0} моль"} other{"{0} моля"} } + part-per-1e6{ + case{ + accusative{ + few{"{0} мільйонні долі"} + many{"{0} мільйонних доль"} + one{"{0} мільйонну долю"} + other{"{0} мільйонної долі"} + } + dative{ + few{"{0} мільйонним долям"} + many{"{0} мільйонним долям"} + one{"{0} мільйонній долі"} + other{"{0} мільйонної долі"} + } + genitive{ + few{"{0} мільйонних доль"} + many{"{0} мільйонних доль"} + one{"{0} мільйонної долі"} + other{"{0} мільйонної долі"} + } + instrumental{ + few{"{0} мільйонними долями"} + many{"{0} мільйонними долями"} + one{"{0} мільйонною долею"} + other{"{0} мільйонної долі"} + } + locative{ + few{"{0} мільйонних долях"} + many{"{0} мільйонних долях"} + one{"{0} мільйонній долі"} + other{"{0} мільйонної долі"} + } + } + few{"{0} мільйонні долі"} + gender{"feminine"} + many{"{0} мільйонних доль"} + one{"{0} мільйонна доля"} + other{"{0} мільйонної долі"} + } + part-per-1e9{ + case{ + accusative{ + few{"{0} частини на мільярд"} + many{"{0} частин на мільярд"} + one{"{0} частину на мільярд"} + other{"{0} частини на мільярд"} + } + dative{ + few{"{0} частинам на мільярд"} + many{"{0} частинам на мільярд"} + one{"{0} частині на мільярд"} + other{"{0} частини на мільярд"} + } + genitive{ + few{"{0} частин на мільярд"} + many{"{0} частин на мільярд"} + one{"{0} частини на мільярд"} + other{"{0} частини на мільярд"} + } + instrumental{ + few{"{0} частинами на мільярд"} + many{"{0} частинами на мільярд"} + one{"{0} частиною на мільярд"} + other{"{0} частини на мільярд"} + } + locative{ + few{"{0} частинах на мільярд"} + many{"{0} частинах на мільярд"} + one{"{0} частині на мільярд"} + other{"{0} частини на мільярд"} + } + } + dnam{"частини на мільярд"} + few{"{0} частини на мільярд"} + gender{"feminine"} + many{"{0} частин на мільярд"} + one{"{0} частина на мільярд"} + other{"{0} частини на мільярд"} + } percent{ case{ accusative{ @@ -969,45 +1048,6 @@ uk{ one{"{0} проміле"} other{"{0} проміле"} } - permillion{ - case{ - accusative{ - few{"{0} мільйонні долі"} - many{"{0} мільйонних доль"} - one{"{0} мільйонну долю"} - other{"{0} мільйонної долі"} - } - dative{ - few{"{0} мільйонним долям"} - many{"{0} мільйонним долям"} - one{"{0} мільйонній долі"} - other{"{0} мільйонної долі"} - } - genitive{ - few{"{0} мільйонних доль"} - many{"{0} мільйонних доль"} - one{"{0} мільйонної долі"} - other{"{0} мільйонної долі"} - } - instrumental{ - few{"{0} мільйонними долями"} - many{"{0} мільйонними долями"} - one{"{0} мільйонною долею"} - other{"{0} мільйонної долі"} - } - locative{ - few{"{0} мільйонних долях"} - many{"{0} мільйонних долях"} - one{"{0} мільйонній долі"} - other{"{0} мільйонної долі"} - } - } - few{"{0} мільйонні долі"} - gender{"feminine"} - many{"{0} мільйонних доль"} - one{"{0} мільйонна доля"} - other{"{0} мільйонної долі"} - } permyriad{ case{ accusative{ @@ -1048,46 +1088,6 @@ uk{ one{"{0} проміріад"} other{"{0} проміріада"} } - portion-per-1e9{ - case{ - accusative{ - few{"{0} частини на мільярд"} - many{"{0} частин на мільярд"} - one{"{0} частину на мільярд"} - other{"{0} частини на мільярд"} - } - dative{ - few{"{0} частинам на мільярд"} - many{"{0} частинам на мільярд"} - one{"{0} частині на мільярд"} - other{"{0} частини на мільярд"} - } - genitive{ - few{"{0} частин на мільярд"} - many{"{0} частин на мільярд"} - one{"{0} частини на мільярд"} - other{"{0} частини на мільярд"} - } - instrumental{ - few{"{0} частинами на мільярд"} - many{"{0} частинами на мільярд"} - one{"{0} частиною на мільярд"} - other{"{0} частини на мільярд"} - } - locative{ - few{"{0} частинах на мільярд"} - many{"{0} частинах на мільярд"} - one{"{0} частині на мільярд"} - other{"{0} частини на мільярд"} - } - } - dnam{"частини на мільярд"} - few{"{0} частини на мільярд"} - gender{"feminine"} - many{"{0} частин на мільярд"} - one{"{0} частина на мільярд"} - other{"{0} частини на мільярд"} - } } consumption{ liter-per-100-kilometer{ @@ -5479,29 +5479,29 @@ uk{ one{"{0}моль"} other{"{0}моль"} } - percent{ - dnam{"%"} - } - permille{ - dnam{"‰"} - } - permillion{ + part-per-1e6{ dnam{"м.д."} few{"{0}м.д."} many{"{0}м.д."} one{"{0}м.д."} other{"{0}м.д."} } - permyriad{ - dnam{"‱"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"ч/млрд"} few{"{0} ч/млрд"} many{"{0} ч/млрд"} one{"{0} ч/млрд"} other{"{0} ч/млрд"} } + percent{ + dnam{"%"} + } + permille{ + dnam{"‰"} + } + permyriad{ + dnam{"‱"} + } } consumption{ liter-per-100-kilometer{ @@ -6782,6 +6782,20 @@ uk{ one{"{0} моль"} other{"{0} моль"} } + part-per-1e6{ + dnam{"м. д."} + few{"{0} м. д."} + many{"{0} м. д."} + one{"{0} м. д."} + other{"{0} м. д."} + } + part-per-1e9{ + dnam{"частини/млрд"} + few{"{0} част/млрд"} + many{"{0} част/млрд"} + one{"{0} част/млрд"} + other{"{0} част/млрд"} + } percent{ few{"{0} %"} many{"{0} %"} @@ -6794,26 +6808,12 @@ uk{ one{"{0} ‰"} other{"{0} ‰"} } - permillion{ - dnam{"м. д."} - few{"{0} м. д."} - many{"{0} м. д."} - one{"{0} м. д."} - other{"{0} м. д."} - } permyriad{ few{"{0} ‱"} many{"{0} ‱"} one{"{0} ‱"} other{"{0} ‱"} } - portion-per-1e9{ - dnam{"частини/млрд"} - few{"{0} част/млрд"} - many{"{0} част/млрд"} - one{"{0} част/млрд"} - other{"{0} част/млрд"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/ur.txt b/icu4c/source/data/unit/ur.txt index 0690df0492e3..c7fcc7f1c2cc 100644 --- a/icu4c/source/data/unit/ur.txt +++ b/icu4c/source/data/unit/ur.txt @@ -183,6 +183,18 @@ ur{ one{"{0} مول"} other{"{0} مولز"} } + part-per-1e6{ + dnam{"فی ملین حصے"} + gender{"feminine"} + one{"{0} فی ملین حصے"} + other{"{0} فی ملین حصے"} + } + part-per-1e9{ + dnam{"اجزا فی بلین"} + gender{"masculine"} + one{"{0} جزو فی بلین"} + other{"{0} اجزا فی بلین"} + } percent{ gender{"feminine"} one{"{0} فیصد"} @@ -193,23 +205,11 @@ ur{ one{"{0} فی ہزار"} other{"{0} فی ہزار"} } - permillion{ - dnam{"فی ملین حصے"} - gender{"feminine"} - one{"{0} فی ملین حصے"} - other{"{0} فی ملین حصے"} - } permyriad{ gender{"feminine"} one{"{0} پرمرئیڈ"} other{"{0} پرمرئیڈ"} } - portion-per-1e9{ - dnam{"اجزا فی بلین"} - gender{"masculine"} - one{"{0} جزو فی بلین"} - other{"{0} اجزا فی بلین"} - } } consumption{ liter-per-100-kilometer{ @@ -1081,22 +1081,22 @@ ur{ 10p24{"یوٹا{0}"} } concentr{ + part-per-1e6{ + dnam{"ppm"} + } + part-per-1e9{ + one{"{0}ppb"} + other{"{0}ppb"} + } percent{ dnam{"%"} } permille{ dnam{"‰"} } - permillion{ - dnam{"ppm"} - } permyriad{ dnam{"‱"} } - portion-per-1e9{ - one{"{0}ppb"} - other{"{0}ppb"} - } } consumption{ liter-per-100-kilometer{ @@ -1467,21 +1467,21 @@ ur{ one{"{0} مول"} other{"{0} مول"} } + part-per-1e6{ + dnam{"حصے/ملین"} + } + part-per-1e9{ + dnam{"اجزا/بلین"} + } percent{ dnam{"فیصد"} } permille{ dnam{"فی ہزار"} } - permillion{ - dnam{"حصے/ملین"} - } permyriad{ dnam{"پرمرئیڈ"} } - portion-per-1e9{ - dnam{"اجزا/بلین"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/uz.txt b/icu4c/source/data/unit/uz.txt index 2c658aa64551..ef26768f4b4b 100644 --- a/icu4c/source/data/unit/uz.txt +++ b/icu4c/source/data/unit/uz.txt @@ -157,6 +157,11 @@ uz{ one{"{0} millimol/litr"} other{"{0} millimol/litr"} } + part-per-1e9{ + dnam{"qism/milliard"} + one{"{0} ta qism/milliard"} + other{"{0} ta qism/milliard"} + } percent{ one{"{0} foiz"} other{"{0} foiz"} @@ -169,11 +174,6 @@ uz{ one{"{0} promiriada"} other{"{0} promiriada"} } - portion-per-1e9{ - dnam{"qism/milliard"} - one{"{0} ta qism/milliard"} - other{"{0} ta qism/milliard"} - } } consumption{ liter-per-100-kilometer{ @@ -774,19 +774,19 @@ uz{ } } concentr{ - percent{ - dnam{"%"} - } - permillion{ + part-per-1e6{ dnam{"ppm"} one{"{0}ppm"} other{"{0}ppm"} } - portion-per-1e9{ + part-per-1e9{ dnam{"qism/milliard"} one{"{0} ta qism/mlrd"} other{"{0} ta qism/mlrd"} } + percent{ + dnam{"%"} + } } consumption{ liter-per-100-kilometer{ @@ -974,23 +974,23 @@ uz{ millimole-per-liter{ dnam{"millimol/litr"} } + part-per-1e6{ + dnam{"milliondan ulush"} + } + part-per-1e9{ + dnam{"qism/milliard"} + one{"{0} ta qism/mlrd"} + other{"{0} ta qism/mlrd"} + } percent{ dnam{"foiz"} } permille{ dnam{"promille"} } - permillion{ - dnam{"milliondan ulush"} - } permyriad{ dnam{"promiriada"} } - portion-per-1e9{ - dnam{"qism/milliard"} - one{"{0} ta qism/mlrd"} - other{"{0} ta qism/mlrd"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/vi.txt b/icu4c/source/data/unit/vi.txt index 52007709857c..1ea1f59d2990 100644 --- a/icu4c/source/data/unit/vi.txt +++ b/icu4c/source/data/unit/vi.txt @@ -115,13 +115,13 @@ vi{ dnam{"carat"} other{"{0} carat"} } - permyriad{ - other{"{0} phần vạn"} - } - portion-per-1e9{ + part-per-1e9{ dnam{"phần tỷ"} other{"{0} phần tỷ"} } + permyriad{ + other{"{0} phần vạn"} + } } consumption{ liter-per-100-kilometer{ @@ -639,12 +639,12 @@ vi{ } } concentr{ + part-per-1e9{ + other{"{0}ppb"} + } permyriad{ dnam{"‱"} } - portion-per-1e9{ - other{"{0}ppb"} - } } digital{ byte{ @@ -805,12 +805,12 @@ vi{ dnam{"mục"} other{"{0} mục"} } + part-per-1e9{ + dnam{"phần tỷ"} + } permyriad{ dnam{"phần vạn"} } - portion-per-1e9{ - dnam{"phần tỷ"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/yo.txt b/icu4c/source/data/unit/yo.txt index bfb84c3bc906..8755d9ae758c 100644 --- a/icu4c/source/data/unit/yo.txt +++ b/icu4c/source/data/unit/yo.txt @@ -64,12 +64,12 @@ yo{ dnam{"àwọ́n ohun"} other{"{0} àwon ohun"} } + part-per-1e9{ + dnam{"ẹ̀yà nínú ìdá blíọ̀nù"} + } permille{ other{"{0} ìdákan nínú ẹgbẹ̀rún"} } - portion-per-1e9{ - dnam{"ẹ̀yà nínú ìdá blíọ̀nù"} - } } consumption{ mile-per-gallon-imperial{ @@ -310,12 +310,12 @@ yo{ mole{ other{"{0}mol"} } + part-per-1e6{ + other{"{0}ppm"} + } permille{ other{"{0}‰"} } - permillion{ - other{"{0}ppm"} - } } consumption{ liter-per-kilometer{ @@ -769,13 +769,13 @@ yo{ dnam{"ohun"} other{"{0} ohun"} } + part-per-1e6{ + dnam{"ara/milíọ̀nù"} + } permille{ dnam{"ìdákan nínú ẹgbẹ̀rún"} other{"{0} pasenti"} } - permillion{ - dnam{"ara/milíọ̀nù"} - } } digital{ bit{ diff --git a/icu4c/source/data/unit/yo_BJ.txt b/icu4c/source/data/unit/yo_BJ.txt index f046bdf15af5..c28509d32867 100644 --- a/icu4c/source/data/unit/yo_BJ.txt +++ b/icu4c/source/data/unit/yo_BJ.txt @@ -14,12 +14,12 @@ yo_BJ{ item{ dnam{"àwɔ́n ohun"} } + part-per-1e9{ + dnam{"ɛ̀yà nínú ìdá blíɔ̀nù"} + } permille{ other{"{0} ìdákan nínú ɛgbɛ̀rún"} } - portion-per-1e9{ - dnam{"ɛ̀yà nínú ìdá blíɔ̀nù"} - } } consumption{ mile-per-gallon-imperial{ @@ -205,12 +205,12 @@ yo_BJ{ } unitsShort{ concentr{ + part-per-1e6{ + dnam{"ara/milíɔ̀nù"} + } permille{ dnam{"ìdákan nínú ɛgbɛ̀rún"} } - permillion{ - dnam{"ara/milíɔ̀nù"} - } } digital{ megabit{ diff --git a/icu4c/source/data/unit/yrl.txt b/icu4c/source/data/unit/yrl.txt index a92ba19a4ace..25e91b25fdde 100644 --- a/icu4c/source/data/unit/yrl.txt +++ b/icu4c/source/data/unit/yrl.txt @@ -119,6 +119,11 @@ yrl{ dnam{"mol-ita"} other{"{0} mol-ita"} } + part-per-1e6{ + dnam{"pisawera-ita miliãu rupi"} + one{"{0} pisawera miliãu rupi"} + other{"{0} pisawera-ita miliãu rupi"} + } percent{ one{"{0} sẽtu rupi"} other{"{0} sẽtu rupi"} @@ -127,11 +132,6 @@ yrl{ one{"{0} mil rupi"} other{"{0} mil rupi"} } - permillion{ - dnam{"pisawera-ita miliãu rupi"} - one{"{0} pisawera miliãu rupi"} - other{"{0} pisawera-ita miliãu rupi"} - } permyriad{ one{"{0} pitusá-pitasukasá"} other{"{0} pitusá-pitasukasá-ita"} @@ -1085,15 +1085,15 @@ yrl{ dnam{"mirimol/ritru"} other{"{0} mmol/l"} } + part-per-1e6{ + dnam{"pisawera miliãu rupi"} + } percent{ dnam{"sẽtu rupi"} } permille{ dnam{"mil rupi"} } - permillion{ - dnam{"pisawera miliãu rupi"} - } permyriad{ dnam{"pitusá-pitasukasá"} } diff --git a/icu4c/source/data/unit/yrl_CO.txt b/icu4c/source/data/unit/yrl_CO.txt index 1319901f465f..67c5f1c7a2a7 100644 --- a/icu4c/source/data/unit/yrl_CO.txt +++ b/icu4c/source/data/unit/yrl_CO.txt @@ -12,7 +12,7 @@ yrl_CO{ } } concentr{ - permillion{ + part-per-1e6{ dnam{"pisawera-ita millón rupi"} one{"{0} pisawera millón rupi"} other{"{0} pisawera-ita millón rupi"} @@ -77,7 +77,7 @@ yrl_CO{ } } concentr{ - permillion{ + part-per-1e6{ dnam{"pisawera millón rupi"} } } diff --git a/icu4c/source/data/unit/yrl_VE.txt b/icu4c/source/data/unit/yrl_VE.txt index 43629dbf0261..1a30f9045ade 100644 --- a/icu4c/source/data/unit/yrl_VE.txt +++ b/icu4c/source/data/unit/yrl_VE.txt @@ -12,7 +12,7 @@ yrl_VE{ } } concentr{ - permillion{ + part-per-1e6{ dnam{"pisawera-ita millón rupi"} one{"{0} pisawera millón rupi"} other{"{0} pisawera-ita millón rupi"} @@ -77,7 +77,7 @@ yrl_VE{ } } concentr{ - permillion{ + part-per-1e6{ dnam{"pisawera millón rupi"} } } diff --git a/icu4c/source/data/unit/yue.txt b/icu4c/source/data/unit/yue.txt index dd2fd1ea4494..cd816b3be78c 100644 --- a/icu4c/source/data/unit/yue.txt +++ b/icu4c/source/data/unit/yue.txt @@ -24,7 +24,7 @@ yue{ per{"每 {1} {0}"} } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"十億分點濃度"} other{"{0} 十億分點濃度"} } @@ -175,7 +175,7 @@ yue{ } unitsNarrow{ concentr{ - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } @@ -405,17 +405,17 @@ yue{ dnam{"摩爾"} other{"{0} 摩爾"} } - permillion{ + part-per-1e6{ dnam{"百萬分率"} other{"{0} 百萬分率"} } + part-per-1e9{ + dnam{"濃度/十億"} + } permyriad{ dnam{"點子"} other{"{0} 點子"} } - portion-per-1e9{ - dnam{"濃度/十億"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/yue_Hans.txt b/icu4c/source/data/unit/yue_Hans.txt index 5b5ad2a83569..a5111aec2039 100644 --- a/icu4c/source/data/unit/yue_Hans.txt +++ b/icu4c/source/data/unit/yue_Hans.txt @@ -31,7 +31,7 @@ yue_Hans{ per{"每 {1} {0}"} } concentr{ - portion-per-1e9{ + part-per-1e9{ dnam{"十亿分点浓度"} other{"{0} 十亿分点浓度"} } @@ -248,7 +248,7 @@ yue_Hans{ } } concentr{ - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } @@ -480,17 +480,17 @@ yue_Hans{ dnam{"摩尔"} other{"{0} 摩尔"} } - permillion{ + part-per-1e6{ dnam{"百万分率"} other{"{0} 百万分率"} } + part-per-1e9{ + dnam{"浓度/十亿"} + } permyriad{ dnam{"点子"} other{"{0} 点子"} } - portion-per-1e9{ - dnam{"浓度/十亿"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/zh.txt b/icu4c/source/data/unit/zh.txt index 016504bcbce7..d3864252c1b1 100644 --- a/icu4c/source/data/unit/zh.txt +++ b/icu4c/source/data/unit/zh.txt @@ -76,10 +76,10 @@ zh{ dnam{"摩尔"} other{"{0}摩尔"} } - permillion{ + part-per-1e6{ other{"百万分之{0}"} } - portion-per-1e9{ + part-per-1e9{ dnam{"十亿分比"} other{"十亿分之{0}"} } @@ -1091,7 +1091,7 @@ zh{ dnam{"项"} other{"{0}项"} } - permillion{ + part-per-1e6{ other{"{0}ppm"} } } diff --git a/icu4c/source/data/unit/zh_Hant.txt b/icu4c/source/data/unit/zh_Hant.txt index 3c8ba2561d25..45bd627a972d 100644 --- a/icu4c/source/data/unit/zh_Hant.txt +++ b/icu4c/source/data/unit/zh_Hant.txt @@ -62,7 +62,7 @@ zh_Hant{ dnam{"每公升毫莫耳"} other{"每公升 {0} 毫莫耳"} } - portion-per-1e9{ + part-per-1e9{ dnam{"十億分點濃度"} other{"{0} 十億分點濃度"} } @@ -363,10 +363,10 @@ zh_Hant{ mole{ other{"{0}莫耳"} } - permillion{ + part-per-1e6{ other{"{0}百萬分率"} } - portion-per-1e9{ + part-per-1e9{ other{"{0}ppb"} } } @@ -974,19 +974,19 @@ zh_Hant{ dnam{"莫耳"} other{"{0} 莫耳"} } + part-per-1e6{ + dnam{"百萬分率"} + other{"{0} 百萬分率"} + } + part-per-1e9{ + dnam{"濃度/十億"} + } percent{ dnam{"百分比"} } permille{ dnam{"千分比"} } - permillion{ - dnam{"百萬分率"} - other{"{0} 百萬分率"} - } - portion-per-1e9{ - dnam{"濃度/十億"} - } } consumption{ liter-per-100-kilometer{ diff --git a/icu4c/source/data/unit/zh_Hant_HK.txt b/icu4c/source/data/unit/zh_Hant_HK.txt index 98776c677d30..b6010f8affb8 100644 --- a/icu4c/source/data/unit/zh_Hant_HK.txt +++ b/icu4c/source/data/unit/zh_Hant_HK.txt @@ -261,10 +261,10 @@ zh_Hant_HK{ item{ other{"{0} 個項目"} } - permillion{ + part-per-1e6{ other{"{0} ppm"} } - portion-per-1e9{ + part-per-1e9{ dnam{"濃度/十億"} } } diff --git a/icu4c/source/data/unit/zu.txt b/icu4c/source/data/unit/zu.txt index 3980b6f0cf37..2a173cf918c4 100644 --- a/icu4c/source/data/unit/zu.txt +++ b/icu4c/source/data/unit/zu.txt @@ -87,12 +87,12 @@ zu{ one{"{0} i-karat"} other{"{0} ama-karats"} } + part-per-1e6{ + dnam{"ppm"} + } permille{ dnam{"permille"} } - permillion{ - dnam{"ppm"} - } } consumption{ mile-per-gallon{ @@ -314,7 +314,7 @@ zu{ one{"{0}mol"} other{"{0}mol"} } - permillion{ + part-per-1e6{ one{"{0}item"} other{"{0}ppm"} } @@ -873,7 +873,7 @@ zu{ karat{ dnam{"karats"} } - permillion{ + part-per-1e6{ dnam{"izingxenye/izigidi"} } } diff --git a/icu4c/source/data/zone/LOCALE_DEPS.json b/icu4c/source/data/zone/LOCALE_DEPS.json index fc9c4e7ab9e1..bcc11de59133 100644 --- a/icu4c/source/data/zone/LOCALE_DEPS.json +++ b/icu4c/source/data/zone/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/ { - "cldrVersion": "47", + "cldrVersion": "48", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -19,6 +19,7 @@ "iw": "he", "iw_IL": "he_IL", "ks_IN": "ks_Arab_IN", + "ku_SY": "ku_Latn_SY", "kxv_IN": "kxv_Latn_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", diff --git a/icu4c/source/data/zone/af.txt b/icu4c/source/data/zone/af.txt index 4b286f221e0b..46f817b529fe 100644 --- a/icu4c/source/data/zone/af.txt +++ b/icu4c/source/data/zone/af.txt @@ -259,9 +259,6 @@ af{ "Pacific:Easter"{ ec{"Paas"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidji"} } diff --git a/icu4c/source/data/zone/am.txt b/icu4c/source/data/zone/am.txt index fb8d743fd824..938501e431f2 100644 --- a/icu4c/source/data/zone/am.txt +++ b/icu4c/source/data/zone/am.txt @@ -1167,7 +1167,7 @@ am{ ec{"ኢፋቴ"} } "Pacific:Enderbury"{ - ec{"ኢንደርበሪ"} + ec{"ካንቶን"} } "Pacific:Fakaofo"{ ec{"ፋካኦፎ"} @@ -1193,9 +1193,6 @@ am{ "Pacific:Honolulu"{ ec{"ሆኖሉሉ"} } - "Pacific:Kanton"{ - ec{"ካንቶን"} - } "Pacific:Kiritimati"{ ec{"ኪሪቲማቲ"} } diff --git a/icu4c/source/data/zone/ar.txt b/icu4c/source/data/zone/ar.txt index 2b755c9977e5..9d354bccd2f4 100644 --- a/icu4c/source/data/zone/ar.txt +++ b/icu4c/source/data/zone/ar.txt @@ -1167,7 +1167,7 @@ ar{ ec{"إيفات"} } "Pacific:Enderbury"{ - ec{"اندربيرج"} + ec{"كانتون"} } "Pacific:Fakaofo"{ ec{"فاكاوفو"} @@ -1193,9 +1193,6 @@ ar{ "Pacific:Honolulu"{ ec{"هونولولو"} } - "Pacific:Kanton"{ - ec{"كانتون"} - } "Pacific:Kiritimati"{ ec{"كيريتي ماتي"} } diff --git a/icu4c/source/data/zone/as.txt b/icu4c/source/data/zone/as.txt index 4f347d9de78a..3f13dd2344e0 100644 --- a/icu4c/source/data/zone/as.txt +++ b/icu4c/source/data/zone/as.txt @@ -1167,7 +1167,7 @@ as{ ec{"এফেট"} } "Pacific:Enderbury"{ - ec{"এণ্ডৰবাৰী"} + ec{"কেণ্টন"} } "Pacific:Fakaofo"{ ec{"ফাকাওফো"} @@ -1190,9 +1190,6 @@ as{ "Pacific:Guam"{ ec{"গুৱাম"} } - "Pacific:Kanton"{ - ec{"কেণ্টন"} - } "Pacific:Kiritimati"{ ec{"কিৰিটিমাটি"} } diff --git a/icu4c/source/data/zone/ast.txt b/icu4c/source/data/zone/ast.txt index 99218d360ffd..a5e4f4cda9c6 100644 --- a/icu4c/source/data/zone/ast.txt +++ b/icu4c/source/data/zone/ast.txt @@ -344,9 +344,6 @@ ast{ "Pacific:Easter"{ ec{"Pascua"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fixi"} } diff --git a/icu4c/source/data/zone/az.txt b/icu4c/source/data/zone/az.txt index 69be0745f5b9..71142e155f04 100644 --- a/icu4c/source/data/zone/az.txt +++ b/icu4c/source/data/zone/az.txt @@ -849,9 +849,6 @@ az{ "Pacific:Easter"{ ec{"Pasxa"} } - "Pacific:Enderbury"{ - ec{"Enderböri"} - } "Pacific:Fiji"{ ec{"Fici"} } diff --git a/icu4c/source/data/zone/be.txt b/icu4c/source/data/zone/be.txt index 78aafd115b0b..08c4ab34ef0e 100644 --- a/icu4c/source/data/zone/be.txt +++ b/icu4c/source/data/zone/be.txt @@ -1167,7 +1167,7 @@ be{ ec{"Эфатэ"} } "Pacific:Enderbury"{ - ec{"Эндэрберы"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофа"} @@ -1193,9 +1193,6 @@ be{ "Pacific:Honolulu"{ ec{"Ганалулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Кірыцімаці"} } diff --git a/icu4c/source/data/zone/bg.txt b/icu4c/source/data/zone/bg.txt index b9e455a55ca2..965f749e3eec 100644 --- a/icu4c/source/data/zone/bg.txt +++ b/icu4c/source/data/zone/bg.txt @@ -1167,7 +1167,7 @@ bg{ ec{"Ефате"} } "Pacific:Enderbury"{ - ec{"Ендърбъри"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ bg{ "Pacific:Honolulu"{ ec{"Хонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/blo.txt b/icu4c/source/data/zone/blo.txt index cabb05121129..635f428b7223 100644 --- a/icu4c/source/data/zone/blo.txt +++ b/icu4c/source/data/zone/blo.txt @@ -1128,6 +1128,9 @@ blo{ "Pacific:Efate"{ ec{"Efatee"} } + "Pacific:Enderbury"{ + ec{"Kantɔn"} + } "Pacific:Fakaofo"{ ec{"Fakawofoo"} } @@ -1146,9 +1149,6 @@ blo{ "Pacific:Guam"{ ec{"Guwam"} } - "Pacific:Kanton"{ - ec{"Kantɔn"} - } "Pacific:Kiritimati"{ ec{"Kirimatii"} } diff --git a/icu4c/source/data/zone/bn.txt b/icu4c/source/data/zone/bn.txt index 4b5747d924cf..fa739c7bcace 100644 --- a/icu4c/source/data/zone/bn.txt +++ b/icu4c/source/data/zone/bn.txt @@ -1167,7 +1167,7 @@ bn{ ec{"ইফাতে"} } "Pacific:Enderbury"{ - ec{"এন্ডারবারি"} + ec{"ক্যান্টন"} } "Pacific:Fakaofo"{ ec{"ফ্যাকাওফো"} @@ -1193,9 +1193,6 @@ bn{ "Pacific:Honolulu"{ ec{"হনোলুলু"} } - "Pacific:Kanton"{ - ec{"ক্যান্টন"} - } "Pacific:Kiritimati"{ ec{"কিরিতিমাতি"} } diff --git a/icu4c/source/data/zone/brx.txt b/icu4c/source/data/zone/brx.txt index 24ac01d72d0d..df39e1911a27 100644 --- a/icu4c/source/data/zone/brx.txt +++ b/icu4c/source/data/zone/brx.txt @@ -1164,7 +1164,7 @@ brx{ ec{"एफाटे"} } "Pacific:Enderbury"{ - ec{"एन्डारबारी"} + ec{"केन्ट’न"} } "Pacific:Fakaofo"{ ec{"फाकाअफ’"} @@ -1190,9 +1190,6 @@ brx{ "Pacific:Honolulu"{ ec{"हनलुलु"} } - "Pacific:Kanton"{ - ec{"केन्ट’न"} - } "Pacific:Kiritimati"{ ec{"किरीतिमाति"} } diff --git a/icu4c/source/data/zone/bs.txt b/icu4c/source/data/zone/bs.txt index fa61382d1d01..1b9a5774ad76 100644 --- a/icu4c/source/data/zone/bs.txt +++ b/icu4c/source/data/zone/bs.txt @@ -370,9 +370,6 @@ bs{ "Indian:Mauritius"{ ec{"Mauricijus"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/bs_Cyrl.txt b/icu4c/source/data/zone/bs_Cyrl.txt index 47ecbaddfc49..1aea31a0947e 100644 --- a/icu4c/source/data/zone/bs_Cyrl.txt +++ b/icu4c/source/data/zone/bs_Cyrl.txt @@ -1164,9 +1164,6 @@ bs_Cyrl{ "Pacific:Efate"{ ec{"Ефат"} } - "Pacific:Enderbury"{ - ec{"Ендербери"} - } "Pacific:Fakaofo"{ ec{"Факаофо"} } diff --git a/icu4c/source/data/zone/ca.txt b/icu4c/source/data/zone/ca.txt index f9140b83debf..fd0a6da906ab 100644 --- a/icu4c/source/data/zone/ca.txt +++ b/icu4c/source/data/zone/ca.txt @@ -359,18 +359,12 @@ ca{ "Pacific:Easter"{ ec{"Illa de Pasqua"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Galapagos"{ ec{"Galápagos"} } "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Canton"} - } "Pacific:Marquesas"{ ec{"Marqueses"} } diff --git a/icu4c/source/data/zone/ce.txt b/icu4c/source/data/zone/ce.txt index b7785a84713f..27d4bd1ebbf0 100644 --- a/icu4c/source/data/zone/ce.txt +++ b/icu4c/source/data/zone/ce.txt @@ -1157,9 +1157,6 @@ ce{ "Pacific:Efate"{ ec{"Эфате"} } - "Pacific:Enderbury"{ - ec{"Эндерберин, гӀ-е"} - } "Pacific:Fakaofo"{ ec{"Факаофо"} } diff --git a/icu4c/source/data/zone/ceb.txt b/icu4c/source/data/zone/ceb.txt index 9082e83fa5f6..c7adb651d47e 100644 --- a/icu4c/source/data/zone/ceb.txt +++ b/icu4c/source/data/zone/ceb.txt @@ -18,9 +18,6 @@ ceb{ "Europe:London"{ ld{"British Summer Time"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "meta:Afghanistan"{ ls{"Oras sa Afghanistan"} } diff --git a/icu4c/source/data/zone/chr.txt b/icu4c/source/data/zone/chr.txt index a31c909c02b5..49a2a5bdcf56 100644 --- a/icu4c/source/data/zone/chr.txt +++ b/icu4c/source/data/zone/chr.txt @@ -1167,7 +1167,7 @@ chr{ ec{"ᎡᏩᏖ"} } "Pacific:Enderbury"{ - ec{"ᎡᏂᏇᎵ"} + ec{"ᎧᏛᏂ"} } "Pacific:Fakaofo"{ ec{"ᏩᎧᎣᏬ"} @@ -1196,9 +1196,6 @@ chr{ sg{"HST"} ss{"HST"} } - "Pacific:Kanton"{ - ec{"ᎧᏛᏂ"} - } "Pacific:Kiritimati"{ ec{"ᎩᎵᏘᎹᏘ"} } diff --git a/icu4c/source/data/zone/cs.txt b/icu4c/source/data/zone/cs.txt index 694bda60ad61..e65cc47869e7 100644 --- a/icu4c/source/data/zone/cs.txt +++ b/icu4c/source/data/zone/cs.txt @@ -424,9 +424,6 @@ cs{ "Pacific:Efate"{ ec{"Éfaté"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/cv.txt b/icu4c/source/data/zone/cv.txt index 46a132ea686d..17d9b99640f2 100644 --- a/icu4c/source/data/zone/cv.txt +++ b/icu4c/source/data/zone/cv.txt @@ -1163,6 +1163,9 @@ cv{ "Pacific:Efate"{ ec{"Эфате"} } + "Pacific:Enderbury"{ + ec{"Кантон"} + } "Pacific:Fakaofo"{ ec{"Факаофо"} } @@ -1184,9 +1187,6 @@ cv{ "Pacific:Guam"{ ec{"Гуам"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/cy.txt b/icu4c/source/data/zone/cy.txt index 340cafb24812..92783ed18e7f 100644 --- a/icu4c/source/data/zone/cy.txt +++ b/icu4c/source/data/zone/cy.txt @@ -134,9 +134,6 @@ cy{ "Pacific:Easter"{ ec{"Ynys y Pasg"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/da.txt b/icu4c/source/data/zone/da.txt index 9abbf72b0677..d682920e598c 100644 --- a/icu4c/source/data/zone/da.txt +++ b/icu4c/source/data/zone/da.txt @@ -180,9 +180,6 @@ da{ "Pacific:Easter"{ ec{"Påskeøen"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/de.txt b/icu4c/source/data/zone/de.txt index 31419a257fd1..bc80bb96523e 100644 --- a/icu4c/source/data/zone/de.txt +++ b/icu4c/source/data/zone/de.txt @@ -297,9 +297,6 @@ de{ "Pacific:Easter"{ ec{"Osterinsel"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidschi"} } diff --git a/icu4c/source/data/zone/dsb.txt b/icu4c/source/data/zone/dsb.txt index cf7ce08e7b0b..87145d893dc7 100644 --- a/icu4c/source/data/zone/dsb.txt +++ b/icu4c/source/data/zone/dsb.txt @@ -267,9 +267,6 @@ dsb{ "Pacific:Easter"{ ec{"Jatšowne kupy"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/ee.txt b/icu4c/source/data/zone/ee.txt index e7dd8d276159..6d0c4e603de0 100644 --- a/icu4c/source/data/zone/ee.txt +++ b/icu4c/source/data/zone/ee.txt @@ -33,9 +33,6 @@ ee{ "Europe:London"{ ld{"British dzomeŋɔli gaƒoƒo me"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/el.txt b/icu4c/source/data/zone/el.txt index d8d37f142517..4ab9ca29ff8a 100644 --- a/icu4c/source/data/zone/el.txt +++ b/icu4c/source/data/zone/el.txt @@ -1164,7 +1164,7 @@ el{ ec{"Εφάτε"} } "Pacific:Enderbury"{ - ec{"Έντερμπερι"} + ec{"Καντών"} } "Pacific:Fakaofo"{ ec{"Φακαόφο"} @@ -1190,9 +1190,6 @@ el{ "Pacific:Honolulu"{ ec{"Χονολουλού"} } - "Pacific:Kanton"{ - ec{"Καντών"} - } "Pacific:Kiritimati"{ ec{"Κιριτιμάτι"} } diff --git a/icu4c/source/data/zone/en.txt b/icu4c/source/data/zone/en.txt index fe663ddd82bd..f3ce950cc7b7 100644 --- a/icu4c/source/data/zone/en.txt +++ b/icu4c/source/data/zone/en.txt @@ -3,15 +3,57 @@ // Generated using tools/cldr/cldr-to-icu/ en{ zoneStrings{ + "America:Mexico_City"{ + ec{"Mexico City"} + } + "Antarctica:Casey"{ + ec{"Casey Station"} + } + "Antarctica:DumontDUrville"{ + ec{"Dumont d’Urville Station"} + } "Antarctica:Macquarie"{ ec{"Macquarie Island"} } + "Antarctica:Mawson"{ + ec{"Mawson Station"} + } + "Antarctica:McMurdo"{ + ec{"McMurdo Station"} + } + "Antarctica:Palmer"{ + ec{"Palmer Land"} + } + "Antarctica:Rothera"{ + ec{"Rothera Station"} + } + "Antarctica:Syowa"{ + ec{"Showa Station"} + } + "Antarctica:Troll"{ + ec{"Troll Station"} + } + "Antarctica:Vostok"{ + ec{"Vostok Station"} + } + "Asia:Aqtau"{ + ec{"Aktau"} + } "Asia:Qostanay"{ ec{"Kostanay"} } + "Asia:Qyzylorda"{ + ec{"Kyzylorda"} + } "Asia:Saigon"{ ec{"Ho Chi Minh City"} } + "Atlantic:Canary"{ + ec{"Canaries"} + } + "Atlantic:Faeroe"{ + ec{"Faroes"} + } "Australia:Lord_Howe"{ ec{"Lord Howe Island"} } @@ -19,7 +61,7 @@ en{ ls{"Coordinated Universal Time"} } "Etc:Unknown"{ - ec{"Unknown City"} + ec{"Unknown Location"} } "Europe:Dublin"{ ld{"Irish Standard Time"} @@ -27,23 +69,53 @@ en{ "Europe:London"{ ld{"British Summer Time"} } + "Indian:Chagos"{ + ec{"Chagos Archipelago"} + } "Indian:Christmas"{ ec{"Christmas Island"} } "Indian:Cocos"{ ec{"Cocos Islands"} } + "Indian:Comoro"{ + ec{"Comoros"} + } + "Indian:Kerguelen"{ + ec{"Kerguelen Islands"} + } + "Pacific:Chatham"{ + ec{"Chatham Islands"} + } "Pacific:Easter"{ ec{"Easter Island"} } + "Pacific:Enderbury"{ + ec{"Canton Island"} + } + "Pacific:Galapagos"{ + ec{"Galápagos Islands"} + } "Pacific:Honolulu"{ sd{"HDT"} sg{"HST"} ss{"HST"} } + "Pacific:Kwajalein"{ + ec{"Kwajalein Atoll"} + } + "Pacific:Marquesas"{ + ec{"Marquesas Islands"} + } + "Pacific:Midway"{ + ec{"Midway Atoll"} + } "Pacific:Norfolk"{ ec{"Norfolk Island"} } + "Pacific:Pitcairn"{ + ec{"Pitcairn Islands"} + } "Pacific:Wake"{ ec{"Wake Island"} } @@ -370,9 +442,9 @@ en{ ls{"Hong Kong Standard Time"} } "meta:Hovd"{ - ld{"Hovd Summer Time"} - lg{"Hovd Time"} - ls{"Hovd Standard Time"} + ld{"Khovd Summer Time"} + lg{"Khovd Time"} + ls{"Khovd Standard Time"} } "meta:India"{ ls{"India Standard Time"} @@ -592,9 +664,9 @@ en{ ls{"North Korea Time"} } "meta:Qyzylorda"{ - ld{"Qyzylorda Summer Time"} - lg{"Qyzylorda Time"} - ls{"Qyzylorda Standard Time"} + ld{"Kyzylorda Summer Time"} + lg{"Kyzylorda Time"} + ls{"Kyzylorda Standard Time"} } "meta:Reunion"{ ls{"Réunion Time"} diff --git a/icu4c/source/data/zone/en_001.txt b/icu4c/source/data/zone/en_001.txt index 000c46de368e..3ea8add9061b 100644 --- a/icu4c/source/data/zone/en_001.txt +++ b/icu4c/source/data/zone/en_001.txt @@ -21,15 +21,9 @@ en_001{ "America:St_Vincent"{ ec{"St Vincent"} } - "Asia:Aqtau"{ - ec{"Aktau"} - } "Atlantic:St_Helena"{ ec{"St Helena"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ sd{"∅∅∅"} sg{"∅∅∅"} diff --git a/icu4c/source/data/zone/en_GB.txt b/icu4c/source/data/zone/en_GB.txt index c14696a9648b..aa9880b27d32 100644 --- a/icu4c/source/data/zone/en_GB.txt +++ b/icu4c/source/data/zone/en_GB.txt @@ -4,15 +4,6 @@ en_GB{ %%Parent{"en_001"} zoneStrings{ - "America:Bahia_Banderas"{ - ec{"Bahia Banderas"} - } - "America:Cancun"{ - ec{"Cancun"} - } - "America:Merida"{ - ec{"Merida"} - } "Europe:London"{ sd{"BST"} } diff --git a/icu4c/source/data/zone/en_IN.txt b/icu4c/source/data/zone/en_IN.txt index d01e4a608625..a95862c3d286 100644 --- a/icu4c/source/data/zone/en_IN.txt +++ b/icu4c/source/data/zone/en_IN.txt @@ -7,17 +7,9 @@ en_IN{ "Asia:Hovd"{ ec{"Khovd"} } - "Asia:Qyzylorda"{ - ec{"Kyzylorda"} - } "meta:Gulf"{ ss{"GST"} } - "meta:Hovd"{ - ld{"Khovd Summer Time"} - lg{"Khovd Time"} - ls{"Khovd Standard Time"} - } "meta:India"{ ss{"IST"} } diff --git a/icu4c/source/data/zone/es.txt b/icu4c/source/data/zone/es.txt index 4b5e74557c30..6e361dd1d2eb 100644 --- a/icu4c/source/data/zone/es.txt +++ b/icu4c/source/data/zone/es.txt @@ -515,9 +515,6 @@ es{ "Pacific:Easter"{ ec{"Isla de Pascua"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fiyi"} } diff --git a/icu4c/source/data/zone/et.txt b/icu4c/source/data/zone/et.txt index 8319cedbeb68..deea84d8d55b 100644 --- a/icu4c/source/data/zone/et.txt +++ b/icu4c/source/data/zone/et.txt @@ -346,7 +346,7 @@ et{ ec{"Lihavõttesaar"} } "Pacific:Enderbury"{ - ec{"Enderbury"} + ec{"Abariringa"} } "Pacific:Fiji"{ ec{"Fidži"} @@ -357,9 +357,6 @@ et{ "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Abariringa"} - } "Pacific:Marquesas"{ ec{"Markiisaared"} } diff --git a/icu4c/source/data/zone/eu.txt b/icu4c/source/data/zone/eu.txt index f513556c62fe..f6922acab0ed 100644 --- a/icu4c/source/data/zone/eu.txt +++ b/icu4c/source/data/zone/eu.txt @@ -355,9 +355,6 @@ eu{ "Pacific:Efate"{ ec{"Éfaté"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Galapagos"{ ec{"Galapagoak"} } diff --git a/icu4c/source/data/zone/fa.txt b/icu4c/source/data/zone/fa.txt index 45177a21dcf0..f50ac08802c0 100644 --- a/icu4c/source/data/zone/fa.txt +++ b/icu4c/source/data/zone/fa.txt @@ -1167,7 +1167,7 @@ fa{ ec{"افاته"} } "Pacific:Enderbury"{ - ec{"اندربری"} + ec{"کانتون"} } "Pacific:Fakaofo"{ ec{"فاکائوفو"} @@ -1193,9 +1193,6 @@ fa{ "Pacific:Honolulu"{ ec{"هونولولو"} } - "Pacific:Kanton"{ - ec{"کانتون"} - } "Pacific:Kiritimati"{ ec{"کریتیماتی"} } diff --git a/icu4c/source/data/zone/ff_Adlm.txt b/icu4c/source/data/zone/ff_Adlm.txt index a5c3f9229f8d..6a2c40439f48 100644 --- a/icu4c/source/data/zone/ff_Adlm.txt +++ b/icu4c/source/data/zone/ff_Adlm.txt @@ -1166,7 +1166,7 @@ ff_Adlm{ ec{"𞤉𞤬𞤢𞤼𞤵"} } "Pacific:Enderbury"{ - ec{"𞤉𞤲𞤣𞤫𞤪𞤦𞤵𞥅𞤪𞤭"} + ec{"𞤑𞤢𞤲𞤼𞤮𞤲"} } "Pacific:Fakaofo"{ ec{"𞤊𞤢𞤳𞤢𞤱𞤬𞤮"} @@ -1194,9 +1194,6 @@ ff_Adlm{ sg{"𞤑𞤖𞤖"} ss{"𞤑𞤖𞤖"} } - "Pacific:Kanton"{ - ec{"𞤑𞤢𞤲𞤼𞤮𞤲"} - } "Pacific:Kiritimati"{ ec{"𞤑𞤭𞤪𞤭𞤼𞤭𞤥𞤢𞤼𞤭"} } diff --git a/icu4c/source/data/zone/fi.txt b/icu4c/source/data/zone/fi.txt index d066df1e9507..7d3e0f002ecc 100644 --- a/icu4c/source/data/zone/fi.txt +++ b/icu4c/source/data/zone/fi.txt @@ -341,9 +341,6 @@ fi{ "Pacific:Easter"{ ec{"Pääsiäissaari"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/fil.txt b/icu4c/source/data/zone/fil.txt index 5a641ccf2779..0e3a1889be0f 100644 --- a/icu4c/source/data/zone/fil.txt +++ b/icu4c/source/data/zone/fil.txt @@ -48,9 +48,6 @@ fil{ "Europe:London"{ ld{"Oras sa Tag-init ng Britain"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/fo.txt b/icu4c/source/data/zone/fo.txt index 0900b204b28e..1f3747da498f 100644 --- a/icu4c/source/data/zone/fo.txt +++ b/icu4c/source/data/zone/fo.txt @@ -135,9 +135,6 @@ fo{ "Indian:Mauritius"{ ec{"Móritius"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/fr.txt b/icu4c/source/data/zone/fr.txt index 6ef84fbddda2..1887ac50ba86 100644 --- a/icu4c/source/data/zone/fr.txt +++ b/icu4c/source/data/zone/fr.txt @@ -415,9 +415,6 @@ fr{ "Pacific:Efate"{ ec{"Éfaté"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidji"} } @@ -427,9 +424,6 @@ fr{ "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Canton"} - } "Pacific:Marquesas"{ ec{"Marquises"} } diff --git a/icu4c/source/data/zone/ga.txt b/icu4c/source/data/zone/ga.txt index 0f532d8168cb..fe5ff31c79a2 100644 --- a/icu4c/source/data/zone/ga.txt +++ b/icu4c/source/data/zone/ga.txt @@ -418,9 +418,6 @@ ga{ "Indian:Reunion"{ ec{"La Réunion"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidsí"} } diff --git a/icu4c/source/data/zone/gd.txt b/icu4c/source/data/zone/gd.txt index e6b85315d5aa..738a3c3972de 100644 --- a/icu4c/source/data/zone/gd.txt +++ b/icu4c/source/data/zone/gd.txt @@ -352,9 +352,6 @@ gd{ "Pacific:Easter"{ ec{"Rapa Nui"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fìdi"} } diff --git a/icu4c/source/data/zone/gl.txt b/icu4c/source/data/zone/gl.txt index c48de7b395b4..4d32542483d2 100644 --- a/icu4c/source/data/zone/gl.txt +++ b/icu4c/source/data/zone/gl.txt @@ -443,9 +443,6 @@ gl{ "Pacific:Easter"{ ec{"Illa de Pascua"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fixi"} } diff --git a/icu4c/source/data/zone/gu.txt b/icu4c/source/data/zone/gu.txt index ecfd2c093df7..bf41c0a7ea26 100644 --- a/icu4c/source/data/zone/gu.txt +++ b/icu4c/source/data/zone/gu.txt @@ -1167,7 +1167,7 @@ gu{ ec{"એફેટ"} } "Pacific:Enderbury"{ - ec{"એંડર્બરી"} + ec{"કેન્ટન"} } "Pacific:Fakaofo"{ ec{"ફાકાઓફો"} @@ -1193,9 +1193,6 @@ gu{ "Pacific:Honolulu"{ ec{"હોનોલુલુ"} } - "Pacific:Kanton"{ - ec{"કેન્ટન"} - } "Pacific:Kiritimati"{ ec{"કિરિતિમાતી"} } diff --git a/icu4c/source/data/zone/he.txt b/icu4c/source/data/zone/he.txt index 4e62f106701a..3efb3938d35f 100644 --- a/icu4c/source/data/zone/he.txt +++ b/icu4c/source/data/zone/he.txt @@ -1167,7 +1167,7 @@ he{ ec{"אפטה"} } "Pacific:Enderbury"{ - ec{"אנדרבורי"} + ec{"קנטון"} } "Pacific:Fakaofo"{ ec{"פקאופו"} @@ -1193,9 +1193,6 @@ he{ "Pacific:Honolulu"{ ec{"הונולולו"} } - "Pacific:Kanton"{ - ec{"קנטון"} - } "Pacific:Kiritimati"{ ec{"קיריטימאטי"} } diff --git a/icu4c/source/data/zone/hi.txt b/icu4c/source/data/zone/hi.txt index c97b100d5420..99530b9bea1d 100644 --- a/icu4c/source/data/zone/hi.txt +++ b/icu4c/source/data/zone/hi.txt @@ -1167,7 +1167,7 @@ hi{ ec{"एफ़ेट"} } "Pacific:Enderbury"{ - ec{"एंडरबरी"} + ec{"कैंटन"} } "Pacific:Fakaofo"{ ec{"फ़ाकाओफ़ो"} @@ -1196,9 +1196,6 @@ hi{ sg{"एचएसटी"} ss{"एचएसटी"} } - "Pacific:Kanton"{ - ec{"कैंटन"} - } "Pacific:Kiritimati"{ ec{"किरीतिमाति"} } diff --git a/icu4c/source/data/zone/hr.txt b/icu4c/source/data/zone/hr.txt index 30c45fd52f68..77a7541682b6 100644 --- a/icu4c/source/data/zone/hr.txt +++ b/icu4c/source/data/zone/hr.txt @@ -318,9 +318,6 @@ hr{ "Indian:Mauritius"{ ec{"Mauricijus"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/hsb.txt b/icu4c/source/data/zone/hsb.txt index 46baa8502507..68b0a8a16579 100644 --- a/icu4c/source/data/zone/hsb.txt +++ b/icu4c/source/data/zone/hsb.txt @@ -273,9 +273,6 @@ hsb{ "Pacific:Easter"{ ec{"Jutrowna kupa"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidźi"} } diff --git a/icu4c/source/data/zone/hu.txt b/icu4c/source/data/zone/hu.txt index 086f6dc0c547..28e57ac75917 100644 --- a/icu4c/source/data/zone/hu.txt +++ b/icu4c/source/data/zone/hu.txt @@ -453,9 +453,6 @@ hu{ "Pacific:Easter"{ ec{"Húsvét-szigetek"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidzsi"} } diff --git a/icu4c/source/data/zone/hy.txt b/icu4c/source/data/zone/hy.txt index f92e9e241692..1590959b0705 100644 --- a/icu4c/source/data/zone/hy.txt +++ b/icu4c/source/data/zone/hy.txt @@ -1167,7 +1167,7 @@ hy{ ec{"Էֆատե"} } "Pacific:Enderbury"{ - ec{"Էնդերբերի կղզի"} + ec{"Կանտոն"} } "Pacific:Fakaofo"{ ec{"Ֆակաոֆո"} @@ -1193,9 +1193,6 @@ hy{ "Pacific:Honolulu"{ ec{"Հոնոլուլու"} } - "Pacific:Kanton"{ - ec{"Կանտոն"} - } "Pacific:Kiritimati"{ ec{"Կիրիտիմատի"} } diff --git a/icu4c/source/data/zone/id.txt b/icu4c/source/data/zone/id.txt index a899b3292a97..45b32622d56b 100644 --- a/icu4c/source/data/zone/id.txt +++ b/icu4c/source/data/zone/id.txt @@ -144,9 +144,6 @@ id{ "Indian:Maldives"{ ec{"Maladewa"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Guadalcanal"{ ec{"Guadalkanal"} } diff --git a/icu4c/source/data/zone/ig.txt b/icu4c/source/data/zone/ig.txt index 7492bf543f6b..96b4463a7ef7 100644 --- a/icu4c/source/data/zone/ig.txt +++ b/icu4c/source/data/zone/ig.txt @@ -15,9 +15,6 @@ ig{ "Europe:London"{ ld{"Oge Okpomọkụ Britain"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "meta:Afghanistan"{ ls{"Oge Afghanistan"} } diff --git a/icu4c/source/data/zone/is.txt b/icu4c/source/data/zone/is.txt index 341cad7e2700..c9a3ced92f3a 100644 --- a/icu4c/source/data/zone/is.txt +++ b/icu4c/source/data/zone/is.txt @@ -331,9 +331,6 @@ is{ "Pacific:Easter"{ ec{"Páskaeyja"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fídjí"} } diff --git a/icu4c/source/data/zone/it.txt b/icu4c/source/data/zone/it.txt index 5407ed869e0b..600804f7a8a0 100644 --- a/icu4c/source/data/zone/it.txt +++ b/icu4c/source/data/zone/it.txt @@ -281,18 +281,12 @@ it{ "Pacific:Easter"{ ec{"Pasqua"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Figi"} } "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Canton"} - } "Pacific:Marquesas"{ ec{"Marchesi"} } diff --git a/icu4c/source/data/zone/ja.txt b/icu4c/source/data/zone/ja.txt index 0a82d3f869ad..d5012e40f948 100644 --- a/icu4c/source/data/zone/ja.txt +++ b/icu4c/source/data/zone/ja.txt @@ -1167,7 +1167,7 @@ ja{ ec{"エフェテ島"} } "Pacific:Enderbury"{ - ec{"エンダーベリー島"} + ec{"カントン島"} } "Pacific:Fakaofo"{ ec{"ファカオフォ"} @@ -1193,9 +1193,6 @@ ja{ "Pacific:Honolulu"{ ec{"ホノルル"} } - "Pacific:Kanton"{ - ec{"カントン島"} - } "Pacific:Kiritimati"{ ec{"キリスィマスィ島"} } diff --git a/icu4c/source/data/zone/jv.txt b/icu4c/source/data/zone/jv.txt index 001509036349..f51f22b3e725 100644 --- a/icu4c/source/data/zone/jv.txt +++ b/icu4c/source/data/zone/jv.txt @@ -228,9 +228,6 @@ jv{ "Pacific:Easter"{ ec{"Paskah"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Port_Moresby"{ ec{"Pelabuhan Moresby"} } diff --git a/icu4c/source/data/zone/ka.txt b/icu4c/source/data/zone/ka.txt index 9d154f60876c..4cc9838a50f7 100644 --- a/icu4c/source/data/zone/ka.txt +++ b/icu4c/source/data/zone/ka.txt @@ -1167,7 +1167,7 @@ ka{ ec{"ეფატე"} } "Pacific:Enderbury"{ - ec{"ენდერბური"} + ec{"კანტონი"} } "Pacific:Fakaofo"{ ec{"ფაკაოფო"} @@ -1193,9 +1193,6 @@ ka{ "Pacific:Honolulu"{ ec{"ჰონოლულუ"} } - "Pacific:Kanton"{ - ec{"კანტონი"} - } "Pacific:Kiritimati"{ ec{"კირიტიმატი"} } diff --git a/icu4c/source/data/zone/kgp.txt b/icu4c/source/data/zone/kgp.txt index a629fd32d6f1..f39094ab2188 100644 --- a/icu4c/source/data/zone/kgp.txt +++ b/icu4c/source/data/zone/kgp.txt @@ -1142,9 +1142,6 @@ kgp{ "Pacific:Efate"{ ec{"Éfaté"} } - "Pacific:Enderbury"{ - ec{"Ẽnnermuri"} - } "Pacific:Fakaofo"{ ec{"Fakaofu"} } diff --git a/icu4c/source/data/zone/kk.txt b/icu4c/source/data/zone/kk.txt index b966589f870f..ae64dcaa96ea 100644 --- a/icu4c/source/data/zone/kk.txt +++ b/icu4c/source/data/zone/kk.txt @@ -1167,7 +1167,7 @@ kk{ ec{"Эфате"} } "Pacific:Enderbury"{ - ec{"Эндербери"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ kk{ "Pacific:Honolulu"{ ec{"Гонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/km.txt b/icu4c/source/data/zone/km.txt index b26ca6526654..2b63744b11b4 100644 --- a/icu4c/source/data/zone/km.txt +++ b/icu4c/source/data/zone/km.txt @@ -1167,7 +1167,7 @@ km{ ec{"អ៊ីហ្វាតេ"} } "Pacific:Enderbury"{ - ec{"អ៊ីនដឺប៊ូរី"} + ec{"កាន់តុន"} } "Pacific:Fakaofo"{ ec{"ហ្វាកៅហ្វូ"} @@ -1193,9 +1193,6 @@ km{ "Pacific:Honolulu"{ ec{"ហូណូលូលូ"} } - "Pacific:Kanton"{ - ec{"កាន់តុន"} - } "Pacific:Kiritimati"{ ec{"គិរីទីម៉ាទិ"} } diff --git a/icu4c/source/data/zone/kn.txt b/icu4c/source/data/zone/kn.txt index d44b8f576028..1561287fd914 100644 --- a/icu4c/source/data/zone/kn.txt +++ b/icu4c/source/data/zone/kn.txt @@ -1167,7 +1167,7 @@ kn{ ec{"ಇಫೇಟ್"} } "Pacific:Enderbury"{ - ec{"ಎಂಡರ್ಬರಿ"} + ec{"ಕ್ಯಾಂಟನ್"} } "Pacific:Fakaofo"{ ec{"ಫಕೋಫೋ"} @@ -1193,9 +1193,6 @@ kn{ "Pacific:Honolulu"{ ec{"ಹೊನಲುಲು"} } - "Pacific:Kanton"{ - ec{"ಕ್ಯಾಂಟನ್"} - } "Pacific:Kiritimati"{ ec{"ಕಿರಿತಿಮತಿ"} } diff --git a/icu4c/source/data/zone/ko.txt b/icu4c/source/data/zone/ko.txt index c6e6037a8389..ae7e0d925318 100644 --- a/icu4c/source/data/zone/ko.txt +++ b/icu4c/source/data/zone/ko.txt @@ -1167,7 +1167,7 @@ ko{ ec{"에파테"} } "Pacific:Enderbury"{ - ec{"엔더베리"} + ec{"칸톤"} } "Pacific:Fakaofo"{ ec{"파카오푸"} @@ -1193,9 +1193,6 @@ ko{ "Pacific:Honolulu"{ ec{"호놀룰루"} } - "Pacific:Kanton"{ - ec{"칸톤"} - } "Pacific:Kiritimati"{ ec{"키리티마티"} } diff --git a/icu4c/source/data/zone/kok.txt b/icu4c/source/data/zone/kok.txt index 1d7be1608cf4..8afd2564598c 100644 --- a/icu4c/source/data/zone/kok.txt +++ b/icu4c/source/data/zone/kok.txt @@ -1167,7 +1167,7 @@ kok{ ec{"इफेट"} } "Pacific:Enderbury"{ - ec{"इंडरबरी"} + ec{"कांटोन"} } "Pacific:Fakaofo"{ ec{"फाकाओफो"} @@ -1190,9 +1190,6 @@ kok{ "Pacific:Guam"{ ec{"गुआम"} } - "Pacific:Kanton"{ - ec{"कांटोन"} - } "Pacific:Kiritimati"{ ec{"किरितिमाती"} } diff --git a/icu4c/source/data/zone/ks.txt b/icu4c/source/data/zone/ks.txt index bda4c0c2e8c3..5633b68a2d0a 100644 --- a/icu4c/source/data/zone/ks.txt +++ b/icu4c/source/data/zone/ks.txt @@ -1151,9 +1151,6 @@ ks{ "Pacific:Efate"{ ec{"ایفاتیے"} } - "Pacific:Enderbury"{ - ec{"اؠنڑربیری"} - } "Pacific:Fakaofo"{ ec{"فَکَوفو"} } diff --git a/icu4c/source/data/zone/ku_Latn.txt b/icu4c/source/data/zone/ku_Latn.txt new file mode 100644 index 000000000000..9db3fb301c7a --- /dev/null +++ b/icu4c/source/data/zone/ku_Latn.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/ +ku_Latn{ +} diff --git a/icu4c/source/data/zone/ku_Latn_SY.txt b/icu4c/source/data/zone/ku_Latn_SY.txt new file mode 100644 index 000000000000..eb494ab3895e --- /dev/null +++ b/icu4c/source/data/zone/ku_Latn_SY.txt @@ -0,0 +1,9 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/ +/** + * generated alias target + */ +ku_Latn_SY{ + ___{""} +} diff --git a/icu4c/source/data/zone/ku_SY.txt b/icu4c/source/data/zone/ku_SY.txt new file mode 100644 index 000000000000..5e528bebbb51 --- /dev/null +++ b/icu4c/source/data/zone/ku_SY.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/ +ku_SY{ + "%%ALIAS"{"ku_Latn_SY"} +} diff --git a/icu4c/source/data/zone/kxv.txt b/icu4c/source/data/zone/kxv.txt index cb485ec5290e..484f9d044e16 100644 --- a/icu4c/source/data/zone/kxv.txt +++ b/icu4c/source/data/zone/kxv.txt @@ -1163,6 +1163,9 @@ kxv{ "Pacific:Efate"{ ec{"ipeṭe"} } + "Pacific:Enderbury"{ + ec{"kanṭon"} + } "Pacific:Fakaofo"{ ec{"pakaopo"} } @@ -1184,9 +1187,6 @@ kxv{ "Pacific:Guam"{ ec{"guam"} } - "Pacific:Kanton"{ - ec{"kanṭon"} - } "Pacific:Kiritimati"{ ec{"kiritimati"} } diff --git a/icu4c/source/data/zone/kxv_Deva.txt b/icu4c/source/data/zone/kxv_Deva.txt index 30a0b5b17b09..6a84240fb0f1 100644 --- a/icu4c/source/data/zone/kxv_Deva.txt +++ b/icu4c/source/data/zone/kxv_Deva.txt @@ -1159,6 +1159,9 @@ kxv_Deva{ "Pacific:Efate"{ ec{"एप़ेट"} } + "Pacific:Enderbury"{ + ec{"केंटन"} + } "Pacific:Fakaofo"{ ec{"प़ाकाओप़ो"} } @@ -1180,9 +1183,6 @@ kxv_Deva{ "Pacific:Guam"{ ec{"गुआम"} } - "Pacific:Kanton"{ - ec{"केंटन"} - } "Pacific:Kiritimati"{ ec{"किरीतिमाति"} } diff --git a/icu4c/source/data/zone/kxv_Orya.txt b/icu4c/source/data/zone/kxv_Orya.txt index 66c0e3ca36d3..f7b7d6d915cc 100644 --- a/icu4c/source/data/zone/kxv_Orya.txt +++ b/icu4c/source/data/zone/kxv_Orya.txt @@ -1164,6 +1164,9 @@ kxv_Orya{ "Pacific:Efate"{ ec{"ଇଫେଟ୍‌"} } + "Pacific:Enderbury"{ + ec{"କେଣ୍ଟନ"} + } "Pacific:Fakaofo"{ ec{"ପକାଅପ"} } @@ -1185,9 +1188,6 @@ kxv_Orya{ "Pacific:Guam"{ ec{"ଗୁଆମ"} } - "Pacific:Kanton"{ - ec{"କେଣ୍ଟନ"} - } "Pacific:Kiritimati"{ ec{"କିରିତିମାଟି"} } diff --git a/icu4c/source/data/zone/kxv_Telu.txt b/icu4c/source/data/zone/kxv_Telu.txt index 5fb7bfa54430..270f7a3d4e1b 100644 --- a/icu4c/source/data/zone/kxv_Telu.txt +++ b/icu4c/source/data/zone/kxv_Telu.txt @@ -1164,6 +1164,9 @@ kxv_Telu{ "Pacific:Efate"{ ec{"ఇఫేట్"} } + "Pacific:Enderbury"{ + ec{"కాంటన్"} + } "Pacific:Fakaofo"{ ec{"ఫాకోఫో"} } @@ -1185,9 +1188,6 @@ kxv_Telu{ "Pacific:Guam"{ ec{"గ్వామ్"} } - "Pacific:Kanton"{ - ec{"కాంటన్"} - } "Pacific:Kiritimati"{ ec{"కిరీటిమాటి"} } diff --git a/icu4c/source/data/zone/ky.txt b/icu4c/source/data/zone/ky.txt index fd5910c66f91..db36b8c5ee99 100644 --- a/icu4c/source/data/zone/ky.txt +++ b/icu4c/source/data/zone/ky.txt @@ -1167,7 +1167,7 @@ ky{ ec{"Эфат"} } "Pacific:Enderbury"{ - ec{"Эндербери"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ ky{ "Pacific:Honolulu"{ ec{"Гонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/lo.txt b/icu4c/source/data/zone/lo.txt index baf77036c17a..806819bf8411 100644 --- a/icu4c/source/data/zone/lo.txt +++ b/icu4c/source/data/zone/lo.txt @@ -1167,7 +1167,7 @@ lo{ ec{"ເອຟາເຕ"} } "Pacific:Enderbury"{ - ec{"ເອັນເດີເບີລີ"} + ec{"ແຄນຕອນ"} } "Pacific:Fakaofo"{ ec{"ຟາກາວໂຟ"} @@ -1193,9 +1193,6 @@ lo{ "Pacific:Honolulu"{ ec{"ໂຮໂນລູລູ"} } - "Pacific:Kanton"{ - ec{"ແຄນຕອນ"} - } "Pacific:Kiritimati"{ ec{"ຄີຣິທີມາຕີ"} } diff --git a/icu4c/source/data/zone/lt.txt b/icu4c/source/data/zone/lt.txt index de26bf81d300..7fb0251d0cc2 100644 --- a/icu4c/source/data/zone/lt.txt +++ b/icu4c/source/data/zone/lt.txt @@ -1082,9 +1082,6 @@ lt{ "Pacific:Efate"{ ec{"Efatė"} } - "Pacific:Enderbury"{ - ec{"Enderburis"} - } "Pacific:Fakaofo"{ ec{"Fakaofas"} } diff --git a/icu4c/source/data/zone/lv.txt b/icu4c/source/data/zone/lv.txt index d16d30f9b495..2434e8d0bfb3 100644 --- a/icu4c/source/data/zone/lv.txt +++ b/icu4c/source/data/zone/lv.txt @@ -1035,7 +1035,7 @@ lv{ ec{"Lieldienu sala"} } "Pacific:Enderbury"{ - ec{"Enderberija"} + ec{"Kantona"} } "Pacific:Fiji"{ ec{"Fidži"} @@ -1055,9 +1055,6 @@ lv{ "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Kantona"} - } "Pacific:Kiritimati"{ ec{"Kirisimasi"} } diff --git a/icu4c/source/data/zone/mk.txt b/icu4c/source/data/zone/mk.txt index 1af97f0d1c84..5f9b05588564 100644 --- a/icu4c/source/data/zone/mk.txt +++ b/icu4c/source/data/zone/mk.txt @@ -1167,7 +1167,7 @@ mk{ ec{"Ефате"} } "Pacific:Enderbury"{ - ec{"Ендербери"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ mk{ "Pacific:Honolulu"{ ec{"Хонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/ml.txt b/icu4c/source/data/zone/ml.txt index 086c5dc7c02f..ab6958ef2dbf 100644 --- a/icu4c/source/data/zone/ml.txt +++ b/icu4c/source/data/zone/ml.txt @@ -1167,7 +1167,7 @@ ml{ ec{"ഇഫാതെ"} } "Pacific:Enderbury"{ - ec{"എൻഡബറി"} + ec{"കാൻട്ടൻ"} } "Pacific:Fakaofo"{ ec{"ഫക്കാവോഫോ"} @@ -1193,9 +1193,6 @@ ml{ "Pacific:Honolulu"{ ec{"ഹോണലൂലു"} } - "Pacific:Kanton"{ - ec{"കാൻട്ടൻ"} - } "Pacific:Kiritimati"{ ec{"കിരിറ്റിമാറ്റി"} } diff --git a/icu4c/source/data/zone/mn.txt b/icu4c/source/data/zone/mn.txt index 3d1c74297ac5..f0dc450b29d2 100644 --- a/icu4c/source/data/zone/mn.txt +++ b/icu4c/source/data/zone/mn.txt @@ -1167,7 +1167,7 @@ mn{ ec{"Эфате"} } "Pacific:Enderbury"{ - ec{"Эндербери"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ mn{ "Pacific:Honolulu"{ ec{"Хонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/mr.txt b/icu4c/source/data/zone/mr.txt index 48ed29548caa..2ec127789299 100644 --- a/icu4c/source/data/zone/mr.txt +++ b/icu4c/source/data/zone/mr.txt @@ -1167,7 +1167,7 @@ mr{ ec{"इफेट"} } "Pacific:Enderbury"{ - ec{"एंडरबरी"} + ec{"कँटन"} } "Pacific:Fakaofo"{ ec{"फाकाओफो"} @@ -1193,9 +1193,6 @@ mr{ "Pacific:Honolulu"{ ec{"होनोलुलू"} } - "Pacific:Kanton"{ - ec{"कँटन"} - } "Pacific:Kiritimati"{ ec{"किरितिमाती"} } diff --git a/icu4c/source/data/zone/ms.txt b/icu4c/source/data/zone/ms.txt index 1fee28be095c..a4cef9b918ce 100644 --- a/icu4c/source/data/zone/ms.txt +++ b/icu4c/source/data/zone/ms.txt @@ -57,9 +57,6 @@ ms{ "Europe:London"{ ld{"Waktu Musim Panas British"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/mt.txt b/icu4c/source/data/zone/mt.txt index da3acb4d66cd..13c967f5520e 100644 --- a/icu4c/source/data/zone/mt.txt +++ b/icu4c/source/data/zone/mt.txt @@ -96,9 +96,6 @@ mt{ "Indian:Maldives"{ ec{"il-Maldivi"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/my.txt b/icu4c/source/data/zone/my.txt index cd5f9f430e59..a51e1ac4c234 100644 --- a/icu4c/source/data/zone/my.txt +++ b/icu4c/source/data/zone/my.txt @@ -1167,7 +1167,7 @@ my{ ec{"အီဖာတီ"} } "Pacific:Enderbury"{ - ec{"အန်ဒါဘူရီ"} + ec{"ကန်တွန်"} } "Pacific:Fakaofo"{ ec{"ဖာခါအိုဖို"} @@ -1193,9 +1193,6 @@ my{ "Pacific:Honolulu"{ ec{"ဟိုနိုလူလူ"} } - "Pacific:Kanton"{ - ec{"ကန်တွန်"} - } "Pacific:Kiritimati"{ ec{"ခရိဒီမတီ"} } diff --git a/icu4c/source/data/zone/ne.txt b/icu4c/source/data/zone/ne.txt index 1f525acdc7b5..e3a37c2955aa 100644 --- a/icu4c/source/data/zone/ne.txt +++ b/icu4c/source/data/zone/ne.txt @@ -1167,7 +1167,7 @@ ne{ ec{"ईफाते"} } "Pacific:Enderbury"{ - ec{"एन्डरबरी"} + ec{"कान्टोन"} } "Pacific:Fakaofo"{ ec{"फाकाओफो"} @@ -1193,9 +1193,6 @@ ne{ "Pacific:Honolulu"{ ec{"होनोलुलु"} } - "Pacific:Kanton"{ - ec{"कान्टोन"} - } "Pacific:Kiritimati"{ ec{"किरितिमाटी"} } diff --git a/icu4c/source/data/zone/nl.txt b/icu4c/source/data/zone/nl.txt index 4a39bd6768a7..1dde544f9900 100644 --- a/icu4c/source/data/zone/nl.txt +++ b/icu4c/source/data/zone/nl.txt @@ -277,9 +277,6 @@ nl{ "Pacific:Easter"{ ec{"Paaseiland"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Gambier"{ ec{"Îles Gambier"} } diff --git a/icu4c/source/data/zone/no.txt b/icu4c/source/data/zone/no.txt index c22186863d36..13f1ceac7ccd 100644 --- a/icu4c/source/data/zone/no.txt +++ b/icu4c/source/data/zone/no.txt @@ -256,7 +256,7 @@ no{ ec{"Påskeøya"} } "Pacific:Enderbury"{ - ec{"Enderbury"} + ec{"Kantonøya"} } "Pacific:Galapagos"{ ec{"Galápagosøyene"} @@ -267,9 +267,6 @@ no{ sg{"HST"} ss{"HST"} } - "Pacific:Kanton"{ - ec{"Kantonøya"} - } "Pacific:Norfolk"{ ec{"Norfolkøya"} } diff --git a/icu4c/source/data/zone/nqo.txt b/icu4c/source/data/zone/nqo.txt index fddb4b38862c..4f64ac96d370 100644 --- a/icu4c/source/data/zone/nqo.txt +++ b/icu4c/source/data/zone/nqo.txt @@ -1166,6 +1166,9 @@ nqo{ "Pacific:Efate"{ ec{"ߋߝߊߕߋ߫"} } + "Pacific:Enderbury"{ + ec{"ߞߊ߲ߕߐ߲߫"} + } "Pacific:Fakaofo"{ ec{"ߝߞߊߏߝߏ߫"} } @@ -1187,9 +1190,6 @@ nqo{ "Pacific:Guam"{ ec{"ߜ߭ߎߥߊ߲߫"} } - "Pacific:Kanton"{ - ec{"ߞߊ߲ߕߐ߲߫"} - } "Pacific:Kiritimati"{ ec{"ߞߙߌߕߌߡߊߕߌ߫"} } diff --git a/icu4c/source/data/zone/or.txt b/icu4c/source/data/zone/or.txt index 732781c1f33f..ae3b010a93a5 100644 --- a/icu4c/source/data/zone/or.txt +++ b/icu4c/source/data/zone/or.txt @@ -1167,7 +1167,7 @@ or{ ec{"ଇଫେଟ୍‌"} } "Pacific:Enderbury"{ - ec{"ଏଣ୍ଡେରବୁରି"} + ec{"କ୍ୟାଣ୍ଟନ"} } "Pacific:Fakaofo"{ ec{"ଫାକାଓଫୋ"} @@ -1193,9 +1193,6 @@ or{ "Pacific:Honolulu"{ ec{"ହୋନୋଲୁଲୁ"} } - "Pacific:Kanton"{ - ec{"କ୍ୟାଣ୍ଟନ"} - } "Pacific:Kiritimati"{ ec{"କିରିତିମାଟି"} } diff --git a/icu4c/source/data/zone/pa.txt b/icu4c/source/data/zone/pa.txt index dcfd18169ca3..29283c8332d9 100644 --- a/icu4c/source/data/zone/pa.txt +++ b/icu4c/source/data/zone/pa.txt @@ -1167,7 +1167,7 @@ pa{ ec{"ਇਫੇਟ"} } "Pacific:Enderbury"{ - ec{"ਏਂਡਰਬਰੀ"} + ec{"ਕੈਂਟੋਨ"} } "Pacific:Fakaofo"{ ec{"ਫਕਾਉਫੋ"} @@ -1193,9 +1193,6 @@ pa{ "Pacific:Honolulu"{ ec{"ਹੋਨੋਲੁਲੂ"} } - "Pacific:Kanton"{ - ec{"ਕੈਂਟੋਨ"} - } "Pacific:Kiritimati"{ ec{"ਕਿਰਿਤਿਮਤੀ"} } diff --git a/icu4c/source/data/zone/pcm.txt b/icu4c/source/data/zone/pcm.txt index 9e0b355239c0..d721f668a8e2 100644 --- a/icu4c/source/data/zone/pcm.txt +++ b/icu4c/source/data/zone/pcm.txt @@ -1124,9 +1124,6 @@ pcm{ "Pacific:Efate"{ ec{"Ẹfátẹ"} } - "Pacific:Enderbury"{ - ec{"Ẹ́ndábẹ́ri"} - } "Pacific:Fakaofo"{ ec{"Fakáófo"} } diff --git a/icu4c/source/data/zone/pl.txt b/icu4c/source/data/zone/pl.txt index 40e358148960..4a2b17498ac4 100644 --- a/icu4c/source/data/zone/pl.txt +++ b/icu4c/source/data/zone/pl.txt @@ -529,9 +529,6 @@ pl{ "Pacific:Easter"{ ec{"Wyspa Wielkanocna"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidżi"} } diff --git a/icu4c/source/data/zone/ps.txt b/icu4c/source/data/zone/ps.txt index da507877e826..69782e83fcd5 100644 --- a/icu4c/source/data/zone/ps.txt +++ b/icu4c/source/data/zone/ps.txt @@ -1166,9 +1166,6 @@ ps{ "Pacific:Efate"{ ec{"عفات"} } - "Pacific:Enderbury"{ - ec{"انډربري"} - } "Pacific:Fakaofo"{ ec{"فوکافو"} } diff --git a/icu4c/source/data/zone/pt.txt b/icu4c/source/data/zone/pt.txt index a0820f08b6d6..f7dbae9c08cd 100644 --- a/icu4c/source/data/zone/pt.txt +++ b/icu4c/source/data/zone/pt.txt @@ -418,9 +418,6 @@ pt{ "Pacific:Efate"{ ec{"Éfaté"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Galapagos"{ ec{"Galápagos"} } diff --git a/icu4c/source/data/zone/qu.txt b/icu4c/source/data/zone/qu.txt index 09c2654d46d8..48ae1826506b 100644 --- a/icu4c/source/data/zone/qu.txt +++ b/icu4c/source/data/zone/qu.txt @@ -271,9 +271,6 @@ qu{ "Indian:Maldives"{ ec{"Maldivas"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/ro.txt b/icu4c/source/data/zone/ro.txt index ef99253ca777..32110c5a9e23 100644 --- a/icu4c/source/data/zone/ro.txt +++ b/icu4c/source/data/zone/ro.txt @@ -253,9 +253,6 @@ ro{ "Pacific:Easter"{ ec{"Insula Paștelui"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/root.txt b/icu4c/source/data/zone/root.txt index 18c051b42569..be1251de311d 100644 --- a/icu4c/source/data/zone/root.txt +++ b/icu4c/source/data/zone/root.txt @@ -2,20 +2,44 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/ root{ - Version{"47"} + Version{"48"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} } + "Africa:El_Aaiun"{ + ec{"El Aaiún"} + } + "Africa:Lome"{ + ec{"Lomé"} + } + "Africa:Ndjamena"{ + ec{"N’Djamena"} + } "Africa:Sao_Tome"{ ec{"São Tomé"} } + "America:Araguaina"{ + ec{"Araguaína"} + } + "America:Argentina:Rio_Gallegos"{ + ec{"Río Gallegos"} + } + "America:Argentina:Tucuman"{ + ec{"Tucumán"} + } "America:Asuncion"{ ec{"Asunción"} } "America:Bahia_Banderas"{ ec{"Bahía de Banderas"} } + "America:Belem"{ + ec{"Belém"} + } + "America:Bogota"{ + ec{"Bogotá"} + } "America:Cancun"{ ec{"Cancún"} } @@ -25,9 +49,18 @@ root{ "America:Coral_Harbour"{ ec{"Atikokan"} } + "America:Cordoba"{ + ec{"Córdoba"} + } + "America:Cuiaba"{ + ec{"Cuiabá"} + } "America:Curacao"{ ec{"Curaçao"} } + "America:Eirunepe"{ + ec{"Eirunepé"} + } "America:Godthab"{ ec{"Nuuk"} } @@ -58,9 +91,21 @@ root{ "America:Lower_Princes"{ ec{"Lower Prince’s Quarter"} } + "America:Maceio"{ + ec{"Maceió"} + } + "America:Mazatlan"{ + ec{"Mazatlán"} + } "America:Merida"{ ec{"Mérida"} } + "America:Mexico_City"{ + ec{"Ciudad de México"} + } + "America:Miquelon"{ + ec{"Saint-Pierre"} + } "America:Noronha"{ ec{"Fernando de Noronha"} } @@ -73,6 +118,12 @@ root{ "America:North_Dakota:New_Salem"{ ec{"New Salem, North Dakota"} } + "America:Santarem"{ + ec{"Santarém"} + } + "America:Sao_Paulo"{ + ec{"São Paulo"} + } "America:Scoresbysund"{ ec{"Ittoqqortoormiit"} } @@ -97,9 +148,15 @@ root{ "Antarctica:DumontDUrville"{ ec{"Dumont-d’Urville"} } + "Antarctica:Syowa"{ + ec{"Showa"} + } "Asia:Calcutta"{ ec{"Kolkata"} } + "Asia:Hovd"{ + ec{"Khovd"} + } "Asia:Katmandu"{ ec{"Kathmandu"} } @@ -112,6 +169,12 @@ root{ "Asia:Saigon"{ ec{"Ho Chi Minh"} } + "Asia:Urumqi"{ + ec{"Ürümqi"} + } + "Atlantic:Canary"{ + ec{"Canarias"} + } "Atlantic:Faeroe"{ ec{"Faroe"} } @@ -121,20 +184,48 @@ root{ "Etc:UTC"{ ss{"UTC"} } + "Europe:Busingen"{ + ec{"Büsingen"} + } + "Europe:Chisinau"{ + ec{"Chișinău"} + } "Europe:Kiev"{ ec{"Kyiv"} } + "Europe:Tirane"{ + ec{"Tirana"} + } + "Indian:Comoro"{ + ec{"Comores"} + } + "Indian:Mahe"{ + ec{"Mahé"} + } "Indian:Reunion"{ ec{"Réunion"} } + "Pacific:Enderbury"{ + ec{"Canton"} + } + "Pacific:Galapagos"{ + ec{"Galápagos"} + } + "Pacific:Noumea"{ + ec{"Nouméa"} + } "Pacific:Ponape"{ ec{"Pohnpei"} } "Pacific:Truk"{ ec{"Chuuk"} } + "Pacific:Wallis"{ + ec{"Wallis & Futuna"} + } fallbackFormat{"{1} ({0})"} gmtFormat{"GMT{0}"} + gmtUnknownFormat{"GMT+?"} gmtZeroFormat{"GMT"} hourFormat{"+HH:mm;-HH:mm"} regionFormat{"{0}"} diff --git a/icu4c/source/data/zone/ru.txt b/icu4c/source/data/zone/ru.txt index 5c6fac4f87d6..269b43ba0d95 100644 --- a/icu4c/source/data/zone/ru.txt +++ b/icu4c/source/data/zone/ru.txt @@ -1167,7 +1167,7 @@ ru{ ec{"Эфате"} } "Pacific:Enderbury"{ - ec{"о-в Эндербери"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ ru{ "Pacific:Honolulu"{ ec{"Гонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/sc.txt b/icu4c/source/data/zone/sc.txt index 38fb8ff8fca1..a7b08b021a7f 100644 --- a/icu4c/source/data/zone/sc.txt +++ b/icu4c/source/data/zone/sc.txt @@ -252,9 +252,6 @@ sc{ "Indian:Reunion"{ ec{"Reunione"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Guam"{ ec{"Guàm"} } @@ -263,9 +260,6 @@ sc{ sg{"OIH"} ss{"OIH"} } - "Pacific:Kanton"{ - ec{"Canton"} - } "Pacific:Marquesas"{ ec{"Marchesas"} } diff --git a/icu4c/source/data/zone/sd.txt b/icu4c/source/data/zone/sd.txt index 1194034b20f1..32d04eb45a57 100644 --- a/icu4c/source/data/zone/sd.txt +++ b/icu4c/source/data/zone/sd.txt @@ -1168,7 +1168,7 @@ sd{ ec{"افاتي"} } "Pacific:Enderbury"{ - ec{"اينڊربري"} + ec{"ڪانٽن"} } "Pacific:Fakaofo"{ ec{"فڪائوفو"} @@ -1194,9 +1194,6 @@ sd{ "Pacific:Honolulu"{ ec{"هونو لولو"} } - "Pacific:Kanton"{ - ec{"ڪانٽن"} - } "Pacific:Kiritimati"{ ec{"ڪريٽمٽي"} } diff --git a/icu4c/source/data/zone/si.txt b/icu4c/source/data/zone/si.txt index 4869af944ebb..8ff94bde96c2 100644 --- a/icu4c/source/data/zone/si.txt +++ b/icu4c/source/data/zone/si.txt @@ -1167,7 +1167,7 @@ si{ ec{"එෆාත්"} } "Pacific:Enderbury"{ - ec{"එන්ඩර්බරි"} + ec{"කැන්ටන්"} } "Pacific:Fakaofo"{ ec{"ෆාකාඕෆෝ"} @@ -1193,9 +1193,6 @@ si{ "Pacific:Honolulu"{ ec{"හොනොලුලු"} } - "Pacific:Kanton"{ - ec{"කැන්ටන්"} - } "Pacific:Kiritimati"{ ec{"කිරිමටි"} } diff --git a/icu4c/source/data/zone/sk.txt b/icu4c/source/data/zone/sk.txt index 893a4ae17f1c..b4add7ad0681 100644 --- a/icu4c/source/data/zone/sk.txt +++ b/icu4c/source/data/zone/sk.txt @@ -436,9 +436,6 @@ sk{ "Pacific:Easter"{ ec{"Veľkonočný ostrov"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/sl.txt b/icu4c/source/data/zone/sl.txt index 3e12184b90d2..1ac75bd29697 100644 --- a/icu4c/source/data/zone/sl.txt +++ b/icu4c/source/data/zone/sl.txt @@ -387,9 +387,6 @@ sl{ "Pacific:Easter"{ ec{"Velikonočni otok"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Fiji"{ ec{"Fidži"} } diff --git a/icu4c/source/data/zone/so.txt b/icu4c/source/data/zone/so.txt index c0f7e279dacb..2e0f75f80cd9 100644 --- a/icu4c/source/data/zone/so.txt +++ b/icu4c/source/data/zone/so.txt @@ -1009,7 +1009,7 @@ so{ ec{"Iistar"} } "Pacific:Enderbury"{ - ec{"Enderburi"} + ec{"Kantoon"} } "Pacific:Fakaofo"{ ec{"fakofo"} @@ -1026,9 +1026,6 @@ so{ "Pacific:Guam"{ ec{"Guwam"} } - "Pacific:Kanton"{ - ec{"Kantoon"} - } "Pacific:Kiritimati"{ ec{"Kiritimaati"} } diff --git a/icu4c/source/data/zone/sq.txt b/icu4c/source/data/zone/sq.txt index 7aa855a694e3..f2b569e72987 100644 --- a/icu4c/source/data/zone/sq.txt +++ b/icu4c/source/data/zone/sq.txt @@ -814,9 +814,6 @@ sq{ "Pacific:Easter"{ ec{"Pashkë"} } - "Pacific:Enderbury"{ - ec{"Enderbur"} - } "Pacific:Fiji"{ ec{"Fixhi"} } diff --git a/icu4c/source/data/zone/sr.txt b/icu4c/source/data/zone/sr.txt index 990d2b41ddb7..bed43e5e2a34 100644 --- a/icu4c/source/data/zone/sr.txt +++ b/icu4c/source/data/zone/sr.txt @@ -1167,7 +1167,7 @@ sr{ ec{"Ефат"} } "Pacific:Enderbury"{ - ec{"Ендербери"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ sr{ "Pacific:Honolulu"{ ec{"Хонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/sr_Latn.txt b/icu4c/source/data/zone/sr_Latn.txt index 70ef50cf6e30..5d9bbfd5add1 100644 --- a/icu4c/source/data/zone/sr_Latn.txt +++ b/icu4c/source/data/zone/sr_Latn.txt @@ -1168,7 +1168,7 @@ sr_Latn{ ec{"Efat"} } "Pacific:Enderbury"{ - ec{"Enderberi"} + ec{"Kanton"} } "Pacific:Fakaofo"{ ec{"Fakaofo"} @@ -1194,9 +1194,6 @@ sr_Latn{ "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Kanton"} - } "Pacific:Kiritimati"{ ec{"Kiritimati"} } diff --git a/icu4c/source/data/zone/sv.txt b/icu4c/source/data/zone/sv.txt index 9d02860d9d6c..6af26082a627 100644 --- a/icu4c/source/data/zone/sv.txt +++ b/icu4c/source/data/zone/sv.txt @@ -276,9 +276,6 @@ sv{ "Pacific:Easter"{ ec{"Påskön"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Galapagos"{ ec{"Galápagos"} } diff --git a/icu4c/source/data/zone/sw.txt b/icu4c/source/data/zone/sw.txt index ff3b716486a4..d9d65df0e5d3 100644 --- a/icu4c/source/data/zone/sw.txt +++ b/icu4c/source/data/zone/sw.txt @@ -45,9 +45,6 @@ sw{ "Europe:London"{ ld{"Saa za Majira ya Joto za Uingereza"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/syr.txt b/icu4c/source/data/zone/syr.txt index 329fc78016ab..5db18f9fc5f0 100644 --- a/icu4c/source/data/zone/syr.txt +++ b/icu4c/source/data/zone/syr.txt @@ -1166,6 +1166,9 @@ syr{ "Pacific:Efate"{ ec{"ܝܦܐܬ"} } + "Pacific:Enderbury"{ + ec{"ܟܐܢܬܘܢ"} + } "Pacific:Fakaofo"{ ec{"ܦܐܟܐܘܦܘ"} } @@ -1187,9 +1190,6 @@ syr{ "Pacific:Guam"{ ec{"ܓܘܐܡ"} } - "Pacific:Kanton"{ - ec{"ܟܐܢܬܘܢ"} - } "Pacific:Kiritimati"{ ec{"ܟܝܪܝܡܐܬܝ"} } diff --git a/icu4c/source/data/zone/ta.txt b/icu4c/source/data/zone/ta.txt index 0556c8cc9c12..360263f5424d 100644 --- a/icu4c/source/data/zone/ta.txt +++ b/icu4c/source/data/zone/ta.txt @@ -1167,7 +1167,7 @@ ta{ ec{"ஈஃபேட்"} } "Pacific:Enderbury"{ - ec{"எண்டர்பரி"} + ec{"கேன்டன்"} } "Pacific:Fakaofo"{ ec{"ஃபகாஃபோ"} @@ -1193,9 +1193,6 @@ ta{ "Pacific:Honolulu"{ ec{"ஹோனோலூலூ"} } - "Pacific:Kanton"{ - ec{"கேன்டன்"} - } "Pacific:Kiritimati"{ ec{"கிரிடிமாட்டி"} } diff --git a/icu4c/source/data/zone/te.txt b/icu4c/source/data/zone/te.txt index ae21a306c24b..bc99a72cc507 100644 --- a/icu4c/source/data/zone/te.txt +++ b/icu4c/source/data/zone/te.txt @@ -1167,7 +1167,7 @@ te{ ec{"ఇఫేట్"} } "Pacific:Enderbury"{ - ec{"ఎండర్బెరీ"} + ec{"కాంతోన్"} } "Pacific:Fakaofo"{ ec{"ఫాకోఫో"} @@ -1193,9 +1193,6 @@ te{ "Pacific:Honolulu"{ ec{"హోనోలులు"} } - "Pacific:Kanton"{ - ec{"కాంతోన్"} - } "Pacific:Kiritimati"{ ec{"కిరీటిమాటి"} } diff --git a/icu4c/source/data/zone/tg.txt b/icu4c/source/data/zone/tg.txt index bffa8a48717e..d89496c34b6a 100644 --- a/icu4c/source/data/zone/tg.txt +++ b/icu4c/source/data/zone/tg.txt @@ -1166,6 +1166,9 @@ tg{ "Pacific:Efate"{ ec{"Эфате"} } + "Pacific:Enderbury"{ + ec{"Кантон"} + } "Pacific:Fakaofo"{ ec{"Факаофо"} } @@ -1187,9 +1190,6 @@ tg{ "Pacific:Guam"{ ec{"Гуам"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/th.txt b/icu4c/source/data/zone/th.txt index ec321af83f7c..3c157b65bfd4 100644 --- a/icu4c/source/data/zone/th.txt +++ b/icu4c/source/data/zone/th.txt @@ -1167,7 +1167,7 @@ th{ ec{"เอฟาเต"} } "Pacific:Enderbury"{ - ec{"เอนเดอร์เบอรี"} + ec{"แคนทอน"} } "Pacific:Fakaofo"{ ec{"ฟาเคาโฟ"} @@ -1193,9 +1193,6 @@ th{ "Pacific:Honolulu"{ ec{"โฮโนลูลู"} } - "Pacific:Kanton"{ - ec{"แคนทอน"} - } "Pacific:Kiritimati"{ ec{"คิริทิมาตี"} } diff --git a/icu4c/source/data/zone/ti.txt b/icu4c/source/data/zone/ti.txt index 9602e65add99..55ccb89ef3fb 100644 --- a/icu4c/source/data/zone/ti.txt +++ b/icu4c/source/data/zone/ti.txt @@ -1167,7 +1167,7 @@ ti{ ec{"ኤፋቴ"} } "Pacific:Enderbury"{ - ec{"ኤንደርበሪ"} + ec{"ካንቶን"} } "Pacific:Fakaofo"{ ec{"ፋካኦፎ"} @@ -1193,9 +1193,6 @@ ti{ "Pacific:Honolulu"{ ec{"ሆኖሉሉ"} } - "Pacific:Kanton"{ - ec{"ካንቶን"} - } "Pacific:Kiritimati"{ ec{"ኪሪቲማቲ"} } diff --git a/icu4c/source/data/zone/tk.txt b/icu4c/source/data/zone/tk.txt index faebaaaa0648..e5eabf711b00 100644 --- a/icu4c/source/data/zone/tk.txt +++ b/icu4c/source/data/zone/tk.txt @@ -882,9 +882,6 @@ tk{ "Pacific:Easter"{ ec{"Pasha adasy"} } - "Pacific:Enderbury"{ - ec{"Enderberi"} - } "Pacific:Galapagos"{ ec{"Galapagos adalary"} } diff --git a/icu4c/source/data/zone/to.txt b/icu4c/source/data/zone/to.txt index 0718c49e7b9a..3beab8ed1261 100644 --- a/icu4c/source/data/zone/to.txt +++ b/icu4c/source/data/zone/to.txt @@ -83,7 +83,7 @@ to{ ec{"Lapanui"} } "Pacific:Enderbury"{ - ec{"ʻEnitipulī"} + ec{"Kanitoni"} } "Pacific:Fiji"{ ec{"Fisi"} @@ -100,9 +100,6 @@ to{ "Pacific:Honolulu"{ ec{"Honolulu"} } - "Pacific:Kanton"{ - ec{"Kanitoni"} - } "Pacific:Kiritimati"{ ec{"Kilisimasi"} } diff --git a/icu4c/source/data/zone/tr.txt b/icu4c/source/data/zone/tr.txt index f5b5a6a56276..49da64c10101 100644 --- a/icu4c/source/data/zone/tr.txt +++ b/icu4c/source/data/zone/tr.txt @@ -358,9 +358,6 @@ tr{ "Pacific:Easter"{ ec{"Paskalya Adası"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} } diff --git a/icu4c/source/data/zone/tt.txt b/icu4c/source/data/zone/tt.txt index fd5c9124048a..8b8107a1cbb5 100644 --- a/icu4c/source/data/zone/tt.txt +++ b/icu4c/source/data/zone/tt.txt @@ -1163,6 +1163,9 @@ tt{ "Pacific:Efate"{ ec{"Эфате"} } + "Pacific:Enderbury"{ + ec{"Кантон"} + } "Pacific:Fakaofo"{ ec{"Факаофо"} } @@ -1184,9 +1187,6 @@ tt{ "Pacific:Guam"{ ec{"Гуам"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Киритимати"} } diff --git a/icu4c/source/data/zone/uk.txt b/icu4c/source/data/zone/uk.txt index db9d0469391a..f677cd7c6652 100644 --- a/icu4c/source/data/zone/uk.txt +++ b/icu4c/source/data/zone/uk.txt @@ -1167,7 +1167,7 @@ uk{ ec{"Ефате"} } "Pacific:Enderbury"{ - ec{"Ендербері"} + ec{"Кантон"} } "Pacific:Fakaofo"{ ec{"Факаофо"} @@ -1193,9 +1193,6 @@ uk{ "Pacific:Honolulu"{ ec{"Гонолулу"} } - "Pacific:Kanton"{ - ec{"Кантон"} - } "Pacific:Kiritimati"{ ec{"Кірітіматі"} } diff --git a/icu4c/source/data/zone/ur.txt b/icu4c/source/data/zone/ur.txt index e235cca2eb59..9dee7a88ce5c 100644 --- a/icu4c/source/data/zone/ur.txt +++ b/icu4c/source/data/zone/ur.txt @@ -1167,7 +1167,7 @@ ur{ ec{"ایفیٹ"} } "Pacific:Enderbury"{ - ec{"اینڈربری"} + ec{"کانٹن"} } "Pacific:Fakaofo"{ ec{"فکاؤفو"} @@ -1193,9 +1193,6 @@ ur{ "Pacific:Honolulu"{ ec{"ہونولولو"} } - "Pacific:Kanton"{ - ec{"کانٹن"} - } "Pacific:Kiritimati"{ ec{"کریتیماٹی"} } diff --git a/icu4c/source/data/zone/uz.txt b/icu4c/source/data/zone/uz.txt index cbe3ca2f610b..9dd96a54194f 100644 --- a/icu4c/source/data/zone/uz.txt +++ b/icu4c/source/data/zone/uz.txt @@ -822,9 +822,6 @@ uz{ "Pacific:Easter"{ ec{"Pasxa oroli"} } - "Pacific:Enderbury"{ - ec{"Enderberi oroli"} - } "Pacific:Gambier"{ ec{"Gambye oroli"} } diff --git a/icu4c/source/data/zone/vec.txt b/icu4c/source/data/zone/vec.txt index 25ab1c74b242..cda76c0db165 100644 --- a/icu4c/source/data/zone/vec.txt +++ b/icu4c/source/data/zone/vec.txt @@ -595,6 +595,9 @@ vec{ "Pacific:Efate"{ ec{"Ìzola Efate"} } + "Pacific:Enderbury"{ + ec{"Atolo Canton"} + } "Pacific:Fakaofo"{ ec{"Atolo Fakaofo"} } @@ -610,9 +613,6 @@ vec{ "Pacific:Guadalcanal"{ ec{"Ìzola Guadalcanal"} } - "Pacific:Kanton"{ - ec{"Atolo Canton"} - } "Pacific:Kiritimati"{ ec{"Atolo Kiritimati"} } diff --git a/icu4c/source/data/zone/vi.txt b/icu4c/source/data/zone/vi.txt index 7707194b3a6a..e5510213a9ac 100644 --- a/icu4c/source/data/zone/vi.txt +++ b/icu4c/source/data/zone/vi.txt @@ -78,9 +78,6 @@ vi{ "Europe:Prague"{ ec{"Praha"} } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } "Pacific:Honolulu"{ ec{"Honolulu"} sd{"HDT"} diff --git a/icu4c/source/data/zone/xh.txt b/icu4c/source/data/zone/xh.txt index 70db1fc89cb1..f6e06d48fda5 100644 --- a/icu4c/source/data/zone/xh.txt +++ b/icu4c/source/data/zone/xh.txt @@ -21,9 +21,6 @@ xh{ "Etc:UTC"{ ls{"Coordinated Universal Time"} } - "Etc:Unknown"{ - ec{"Unknown City"} - } "Europe:Dublin"{ ld{"Irish Standard Time"} } diff --git a/icu4c/source/data/zone/xnr.txt b/icu4c/source/data/zone/xnr.txt index 46ec8d5ee4fd..0c4107a91f87 100644 --- a/icu4c/source/data/zone/xnr.txt +++ b/icu4c/source/data/zone/xnr.txt @@ -1163,6 +1163,9 @@ xnr{ "Pacific:Efate"{ ec{"एफ़ेट"} } + "Pacific:Enderbury"{ + ec{"कैंटन"} + } "Pacific:Fakaofo"{ ec{"फ़ाकाओफ़ो"} } @@ -1184,9 +1187,6 @@ xnr{ "Pacific:Guam"{ ec{"गुआम"} } - "Pacific:Kanton"{ - ec{"कैंटन"} - } "Pacific:Kiritimati"{ ec{"किरीतिमाति"} } diff --git a/icu4c/source/data/zone/yrl.txt b/icu4c/source/data/zone/yrl.txt index 5998e64faded..e3a836ad6767 100644 --- a/icu4c/source/data/zone/yrl.txt +++ b/icu4c/source/data/zone/yrl.txt @@ -1100,9 +1100,6 @@ yrl{ "Pacific:Efate"{ ec{"Efaté"} } - "Pacific:Enderbury"{ - ec{"Ẽdeburi"} - } "Pacific:Fakaofo"{ ec{"Fakaufu"} } diff --git a/icu4c/source/data/zone/yue.txt b/icu4c/source/data/zone/yue.txt index b3203fa17333..fef5fd3708bb 100644 --- a/icu4c/source/data/zone/yue.txt +++ b/icu4c/source/data/zone/yue.txt @@ -1167,7 +1167,7 @@ yue{ ec{"埃法特"} } "Pacific:Enderbury"{ - ec{"恩得伯理島"} + ec{"坎頓"} } "Pacific:Fakaofo"{ ec{"法考福"} @@ -1193,9 +1193,6 @@ yue{ "Pacific:Honolulu"{ ec{"檀香山"} } - "Pacific:Kanton"{ - ec{"坎頓"} - } "Pacific:Kiritimati"{ ec{"基里地馬地島"} } diff --git a/icu4c/source/data/zone/yue_Hans.txt b/icu4c/source/data/zone/yue_Hans.txt index 258051f014c9..1aaac59d9c01 100644 --- a/icu4c/source/data/zone/yue_Hans.txt +++ b/icu4c/source/data/zone/yue_Hans.txt @@ -1168,7 +1168,7 @@ yue_Hans{ ec{"埃法特"} } "Pacific:Enderbury"{ - ec{"恩得伯理岛"} + ec{"坎顿"} } "Pacific:Fakaofo"{ ec{"法考福"} @@ -1194,9 +1194,6 @@ yue_Hans{ "Pacific:Honolulu"{ ec{"檀香山"} } - "Pacific:Kanton"{ - ec{"坎顿"} - } "Pacific:Kiritimati"{ ec{"基里地马地岛"} } diff --git a/icu4c/source/data/zone/zh.txt b/icu4c/source/data/zone/zh.txt index f19299dd0711..3164f3423557 100644 --- a/icu4c/source/data/zone/zh.txt +++ b/icu4c/source/data/zone/zh.txt @@ -1167,7 +1167,7 @@ zh{ ec{"埃法特"} } "Pacific:Enderbury"{ - ec{"恩德伯里"} + ec{"坎顿岛"} } "Pacific:Fakaofo"{ ec{"法考福"} @@ -1193,9 +1193,6 @@ zh{ "Pacific:Honolulu"{ ec{"檀香山"} } - "Pacific:Kanton"{ - ec{"坎顿岛"} - } "Pacific:Kiritimati"{ ec{"基里地马地岛"} } diff --git a/icu4c/source/data/zone/zh_Hant.txt b/icu4c/source/data/zone/zh_Hant.txt index ee5138066744..9edb79b11178 100644 --- a/icu4c/source/data/zone/zh_Hant.txt +++ b/icu4c/source/data/zone/zh_Hant.txt @@ -1168,7 +1168,7 @@ zh_Hant{ ec{"埃法特"} } "Pacific:Enderbury"{ - ec{"恩得伯理島"} + ec{"坎頓島"} } "Pacific:Fakaofo"{ ec{"法考福"} @@ -1194,9 +1194,6 @@ zh_Hant{ "Pacific:Honolulu"{ ec{"檀香山"} } - "Pacific:Kanton"{ - ec{"坎頓島"} - } "Pacific:Kiritimati"{ ec{"基里地馬地島"} } diff --git a/icu4c/source/data/zone/zh_Hant_HK.txt b/icu4c/source/data/zone/zh_Hant_HK.txt index 89e42f9b64f8..c2f9cb756960 100644 --- a/icu4c/source/data/zone/zh_Hant_HK.txt +++ b/icu4c/source/data/zone/zh_Hant_HK.txt @@ -450,9 +450,6 @@ zh_Hant_HK{ "Pacific:Chatham"{ ec{"查塔姆"} } - "Pacific:Enderbury"{ - ec{"恩德伯里島"} - } "Pacific:Fakaofo"{ ec{"法考福環礁"} } diff --git a/icu4c/source/data/zone/zu.txt b/icu4c/source/data/zone/zu.txt index ef90cefb914e..4eede8ba012c 100644 --- a/icu4c/source/data/zone/zu.txt +++ b/icu4c/source/data/zone/zu.txt @@ -1157,9 +1157,6 @@ zu{ "Pacific:Efate"{ ec{"i-Efate"} } - "Pacific:Enderbury"{ - ec{"i-Enderbury"} - } "Pacific:Fakaofo"{ ec{"i-Fakaofo"} } diff --git a/icu4c/source/extra/uconv/uwmsg.c b/icu4c/source/extra/uconv/uwmsg.c index 2f611e94eb7d..9d36b10837a1 100644 --- a/icu4c/source/extra/uconv/uwmsg.c +++ b/icu4c/source/extra/uconv/uwmsg.c @@ -46,6 +46,7 @@ uprint(const UChar *s, const UChar *mySourceEnd; char *myTarget; int32_t arraySize; + UErrorCode bufferStatus; if(s == 0) return; @@ -54,6 +55,7 @@ uprint(const UChar *s, mySourceEnd = mySource + sourceLen; myTarget = buf; arraySize = BUF_SIZE; + bufferStatus = U_ZERO_ERROR; /* open a default converter */ converter = ucnv_open(0, status); @@ -64,12 +66,12 @@ uprint(const UChar *s, /* perform the conversion */ do { /* reset the error code */ - *status = U_ZERO_ERROR; + bufferStatus = U_ZERO_ERROR; /* perform the conversion */ ucnv_fromUnicode(converter, &myTarget, myTarget + arraySize, &mySource, mySourceEnd, NULL, - true, status); + true, &bufferStatus); /* Write the converted data to the FILE* */ fwrite(buf, sizeof(char), myTarget - buf, f); @@ -78,7 +80,10 @@ uprint(const UChar *s, myTarget = buf; arraySize = BUF_SIZE; } - while(*status == U_BUFFER_OVERFLOW_ERROR); + while(bufferStatus == U_BUFFER_OVERFLOW_ERROR); + if (U_FAILURE(bufferStatus)) { + *status = bufferStatus; + } finish: diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp index 52fcdb9fa504..cf7917beb9f0 100644 --- a/icu4c/source/i18n/calendar.cpp +++ b/icu4c/source/i18n/calendar.cpp @@ -1236,16 +1236,31 @@ Calendar::set(int32_t year, int32_t month, int32_t date, int32_t hour, int32_t m // ------------------------------------- int32_t Calendar::getRelatedYear(UErrorCode &status) const { - return get(UCAL_EXTENDED_YEAR, status); + int32_t year = get(UCAL_EXTENDED_YEAR, status); + if (U_FAILURE(status)) { + return 0; + } + if (uprv_add32_overflow(year, getRelatedYearDifference(), &year)) { + status = U_ILLEGAL_ARGUMENT_ERROR; + return 0; + } + return year; } // ------------------------------------- void Calendar::setRelatedYear(int32_t year) { // set extended year + if (uprv_add32_overflow(year, -getRelatedYearDifference(), &year)) { + return; + } set(UCAL_EXTENDED_YEAR, year); } +int32_t Calendar::getRelatedYearDifference() const { + return 0; +} + // ------------------------------------- void @@ -1529,9 +1544,15 @@ void Calendar::computeGregorianFields(int32_t julianDay, UErrorCode& ec) { ec = U_ILLEGAL_ARGUMENT_ERROR; return; } + int8_t dayOfWeek; Grego::dayToFields(julianDay, fGregorianYear, fGregorianMonth, fGregorianDayOfMonth, + dayOfWeek, fGregorianDayOfYear, ec); + if (U_FAILURE(ec)) { + return; + } + internalSet(UCAL_DAY_OF_WEEK, dayOfWeek); } /** @@ -1560,8 +1581,7 @@ void Calendar::computeWeekFields(UErrorCode &ec) { } // Compute day of week: JD 0 = Monday - int32_t dayOfWeek = julianDayToDayOfWeek(fFields[UCAL_JULIAN_DAY]); - internalSet(UCAL_DAY_OF_WEEK, dayOfWeek); + int32_t dayOfWeek = fFields[UCAL_DAY_OF_WEEK]; int32_t firstDayOfWeek = getFirstDayOfWeek(); // Calculate 1-based localized day of week int32_t dowLocal = dayOfWeek - firstDayOfWeek + 1; diff --git a/icu4c/source/i18n/cecal.cpp b/icu4c/source/i18n/cecal.cpp index 33d32adab731..da4c3189c579 100644 --- a/icu4c/source/i18n/cecal.cpp +++ b/icu4c/source/i18n/cecal.cpp @@ -101,8 +101,8 @@ CECalendar::handleGetLimit(UCalendarDateFields field, ELimitType limitType) cons // Calendar system Conversion methods... //------------------------------------------------------------------------- -void -CECalendar::jdToCE(int32_t julianDay, int32_t jdEpochOffset, int32_t& year, int32_t& month, int32_t& day, UErrorCode& status) +namespace { +void jdToCE(int32_t julianDay, int32_t jdEpochOffset, int32_t& year, int32_t& month, int32_t& day, int32_t& doy, UErrorCode& status) { int32_t c4; // number of 4 year cycle (1461 days) int32_t r4; // remainder of 4 year cycle, always positive @@ -115,10 +115,30 @@ CECalendar::jdToCE(int32_t julianDay, int32_t jdEpochOffset, int32_t& year, int3 year = 4 * c4 + (r4/365 - r4/1460); // 4 * + - int32_t doy = (r4 == 1460) ? 365 : (r4 % 365); // days in present year + doy = (r4 == 1460) ? 365 : (r4 % 365); // days in present year month = doy / 30; // 30 -> Coptic/Ethiopic month length up to 12th month day = (doy % 30) + 1; // 1-based days in a month + doy++; // 1-based days in a year. +} +} // namespace + +void +CECalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) +{ + int32_t eyear, month, day, doy; + jdToCE(julianDay, getJDEpochOffset(), eyear, month, day, doy, status); + if (U_FAILURE(status)) return; + int32_t era = extendedYearToEra(eyear); + int32_t year = extendedYearToYear(eyear); + + internalSet(UCAL_EXTENDED_YEAR, eyear); + internalSet(UCAL_ERA, era); + internalSet(UCAL_YEAR, year); + internalSet(UCAL_MONTH, month); + internalSet(UCAL_ORDINAL_MONTH, month); + internalSet(UCAL_DATE, day); + internalSet(UCAL_DAY_OF_YEAR, doy); } static const char* kMonthCode13 = "M13"; diff --git a/icu4c/source/i18n/cecal.h b/icu4c/source/i18n/cecal.h index e6514e18f857..0971e0e75ef3 100644 --- a/icu4c/source/i18n/cecal.h +++ b/icu4c/source/i18n/cecal.h @@ -99,6 +99,12 @@ class U_I18N_API CECalendar : public Calendar { */ virtual int32_t handleGetLimit(UCalendarDateFields field, ELimitType limitType) const override; + /** + * Compute fields from the JD + * @internal + */ + virtual void handleComputeFields(int32_t julianDay, UErrorCode &status) override; + protected: /** * The Coptic and Ethiopic calendars differ only in their epochs. @@ -109,17 +115,16 @@ class U_I18N_API CECalendar : public Calendar { virtual int32_t getJDEpochOffset() const = 0; /** - * Convert a Julian day to an Coptic/Ethiopic year, month and day - * - * @param julianDay the Julian day - * @param jdEpochOffset the epoch offset from Julian epoch - * @param year receives the extended year - * @param month receives the month - * @param date receives the day + * Compute the era from extended year. + * @internal + */ + virtual int32_t extendedYearToEra(int32_t extendedYear) const = 0; + + /** + * Compute the year from extended year. * @internal */ - static void jdToCE(int32_t julianDay, int32_t jdEpochOffset, - int32_t& year, int32_t& month, int32_t& day, UErrorCode& status); + virtual int32_t extendedYearToYear(int32_t extendedYear) const = 0; }; U_NAMESPACE_END diff --git a/icu4c/source/i18n/chnsecal.cpp b/icu4c/source/i18n/chnsecal.cpp index ff031e7727c7..388404255ee7 100644 --- a/icu4c/source/i18n/chnsecal.cpp +++ b/icu4c/source/i18n/chnsecal.cpp @@ -1074,25 +1074,8 @@ void ChineseCalendar::offsetMonth(int32_t newMoon, int32_t dayOfMonth, int32_t d } } -constexpr uint32_t kChineseRelatedYearDiff = -2637; - -int32_t ChineseCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - if (uprv_add32_overflow(year, kChineseRelatedYearDiff, &year)) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; - } - return year; -} - -void ChineseCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kChineseRelatedYearDiff); +int32_t ChineseCalendar::getRelatedYearDifference() const { + return CHINESE_EPOCH_YEAR - 1; } IMPL_SYSTEM_DEFAULT_CENTURY(ChineseCalendar, "@calendar=chinese") diff --git a/icu4c/source/i18n/chnsecal.h b/icu4c/source/i18n/chnsecal.h index 410a5a0222cf..7622c2ae2cbe 100644 --- a/icu4c/source/i18n/chnsecal.h +++ b/icu4c/source/i18n/chnsecal.h @@ -204,19 +204,11 @@ class U_I18N_API ChineseCalendar : public Calendar { virtual void roll(UCalendarDateFields field, int32_t amount, UErrorCode &status) override; virtual void roll(EDateFields field, int32_t amount, UErrorCode &status) override; + protected: /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; - - /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field * @internal */ - virtual void setRelatedYear(int32_t year) override; + int32_t getRelatedYearDifference() const override; //---------------------------------------------------------------------- // Internal methods & astronomical calculations diff --git a/icu4c/source/i18n/collationdatabuilder.cpp b/icu4c/source/i18n/collationdatabuilder.cpp index 44a108086a7b..4baea33c12eb 100644 --- a/icu4c/source/i18n/collationdatabuilder.cpp +++ b/icu4c/source/i18n/collationdatabuilder.cpp @@ -655,6 +655,20 @@ CollationDataBuilder::addCE32(const UnicodeString &prefix, const UnicodeString & return; } } + int32_t sCount = s.countChar32(); + UChar32 sUtf32[32]; + int32_t sLen = s.toUTF32(sUtf32, 32, errorCode); + if (sLen != sCount) { + // If this error is ever reached, just increase the buffer + // size above. + errorCode = U_UNSUPPORTED_ERROR; + return; + } + for (int32_t i = 1; i < sLen - 1; ++i) { + if (u_getCombiningClass(sUtf32[i]) == 0) { + contractionMiddleStarter.add(sUtf32[i]); + } + } } } @@ -697,6 +711,20 @@ CollationDataBuilder::addCE32(const UnicodeString &prefix, const UnicodeString & UnicodeString suffix(s, cLength); UnicodeString context(static_cast(prefix.length())); context.append(prefix).append(suffix); + if (icu4xMode && !suffix.isEmpty() && !prefix.isEmpty()) { + // ICU4X does not support the combination of prefix and contraction. + // This combination is supported by LDML but does not occur in the + // root or any tailorings in CLDR as of February 2025. + // If support for this case becomes necessary, a practical change + // would be allocating a flag on prefix ce32 and setting the + // flag on a prefix ce32 if any ce32 that can be found under + // the prefix ce32 (either the default or any UCharsTrie value) is + // a contraction ce32 or if the prefix ce32 is the utrie2 value + // for a character that is a starter that occurs in a middle + // (neither first nor last) position in a contraction. + errorCode = U_UNSUPPORTED_ERROR; + return; + } unsafeBackwardSet.addAll(suffix); for(;;) { // invariant: context > cond->context @@ -1391,7 +1419,69 @@ CollationDataBuilder::buildMappings(CollationData &data, UErrorCode &errorCode) setDigitTags(errorCode); setLeadSurrogates(errorCode); - if (!icu4xMode) { + if (icu4xMode) { + // Make sure that starters that occur is the middle of a + // contraction have contraction ce32 with the + // `CONTRACT_HAS_STARTER` flag set so that starters that + // can occur in a non-final position in a contraction can + // be easily recognized from having a contraction ce32 + // that has the `CONTRACT_HAS_STARTER` flag set. + + UCharsTrieBuilder contractionBuilder(errorCode); + // Intentionally unpaired low surrogate to make it never + // match well-formed UTF-16 which ICU4X feeds to the + // matcher. + UnicodeString placeholder(0xDC00); + + for (UChar32 c : contractionMiddleStarter.codePoints()) { + uint32_t ce32 = utrie2_get32(trie, c); + UBool fromBase = false; + if(ce32 == Collation::FALLBACK_CE32) { + fromBase = true; + ce32 = base->getCE32(c); + } + if (!(Collation::hasCE32Tag(ce32, Collation::CONTRACTION_TAG) && (ce32 & Collation::CONTRACT_HAS_STARTER))) { + if (fromBase) { + // This case does not actually happen as of February 2025. + ce32 = copyFromBaseCE32(c, ce32, true, errorCode); + } + if (Collation::hasCE32Tag(ce32, Collation::CONTRACTION_TAG)) { + // This middle starter is also the first character of another + // contraction, but that contraction does not have the + // CONTRACT_HAS_STARTER flag. Let's add the flag to + // mark this at the expense of pessimizing the matching + // of this contraction. + // As of February 2025, this case does not actually occur + // in CLDR. + ce32 |= Collation::CONTRACT_HAS_STARTER; + } else { + // This middle starter is not also the first character + // in another contraction. + + // The UCharsTrie needs to contain some placeholder + // because it cannot be empty. We build a trie + // that never actually matches anything that ICU4X can try to + // match, since ICU4X always passes well-formed UTF-16 to the + // matcher and we put an unpaired low surrogate into the trie. + // This pessimizes the character to CE mapping of the `c`, + // since useless trie matching will be attempted but as of + // February 2025, only two relatively rare characters are affected. + contractionBuilder.clear(); + contractionBuilder.add(placeholder, static_cast(ce32), errorCode); + + int32_t index = addContextTrie(ce32, contractionBuilder, errorCode); + if(U_FAILURE(errorCode)) { return; } + if(index > Collation::MAX_INDEX) { + errorCode = U_BUFFER_OVERFLOW_ERROR; + return; + } + // Set CONTRACT_HAS_STARTER to make identical prefix matching able to catch this. + ce32 = Collation::makeCE32FromTagAndIndex(Collation::CONTRACTION_TAG, index) | Collation::CONTRACT_HAS_STARTER; + } + utrie2_set32(trie, c, ce32, &errorCode); + } + } + } else { // For U+0000, move its normal ce32 into CE32s[0] and set U0000_TAG. ce32s.setElementAt(static_cast(utrie2_get32(trie, 0)), 0); utrie2_set32(trie, 0, Collation::makeCE32FromTagAndIndex(Collation::U0000_TAG, 0), &errorCode); diff --git a/icu4c/source/i18n/collationdatabuilder.h b/icu4c/source/i18n/collationdatabuilder.h index cbbd8f264b50..20760b59eaff 100644 --- a/icu4c/source/i18n/collationdatabuilder.h +++ b/icu4c/source/i18n/collationdatabuilder.h @@ -254,6 +254,12 @@ class U_I18N_API CollationDataBuilder : public UObject { int32_t contextsEra = 0; protected: UnicodeSet unsafeBackwardSet; + /** + * For ICU4X only: The starters that occur in some contraction + * in a position that is neither the first nor the last code point + * of the contraction. + */ + UnicodeSet contractionMiddleStarter; UBool modified; UBool icu4xMode; diff --git a/icu4c/source/i18n/collationdatawriter.cpp b/icu4c/source/i18n/collationdatawriter.cpp index fea0116fa4d4..e7857b0ea6a9 100644 --- a/icu4c/source/i18n/collationdatawriter.cpp +++ b/icu4c/source/i18n/collationdatawriter.cpp @@ -39,16 +39,20 @@ RuleBasedCollator::cloneRuleData(int32_t &length, UErrorCode &errorCode) const { errorCode = U_MEMORY_ALLOCATION_ERROR; return nullptr; } - length = cloneBinary(buffer.getAlias(), 20000, errorCode); - if(errorCode == U_BUFFER_OVERFLOW_ERROR) { + UErrorCode bufferStatus = U_ZERO_ERROR; + length = cloneBinary(buffer.getAlias(), 20000, bufferStatus); + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR) { if(buffer.allocateInsteadAndCopy(length, 0) == nullptr) { errorCode = U_MEMORY_ALLOCATION_ERROR; return nullptr; } - errorCode = U_ZERO_ERROR; - length = cloneBinary(buffer.getAlias(), length, errorCode); + bufferStatus = U_ZERO_ERROR; + length = cloneBinary(buffer.getAlias(), length, bufferStatus); + } + if(U_FAILURE(bufferStatus)) { + errorCode = bufferStatus; + return nullptr; } - if(U_FAILURE(errorCode)) { return nullptr; } return buffer.orphan(); } diff --git a/icu4c/source/i18n/coptccal.cpp b/icu4c/source/i18n/coptccal.cpp index feb9ff6d41c2..f712a2fdb20c 100644 --- a/icu4c/source/i18n/coptccal.cpp +++ b/icu4c/source/i18n/coptccal.cpp @@ -78,53 +78,30 @@ CopticCalendar::handleGetExtendedYear(UErrorCode& status) return 0; } -void -CopticCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) -{ - int32_t eyear, month, day, era, year; - jdToCE(julianDay, getJDEpochOffset(), eyear, month, day, status); - if (U_FAILURE(status)) return; - - if (eyear <= 0) { - era = BCE; - year = 1 - eyear; - } else { - era = CE; - year = eyear; - } +IMPL_SYSTEM_DEFAULT_CENTURY(CopticCalendar, "@calendar=coptic") - internalSet(UCAL_EXTENDED_YEAR, eyear); - internalSet(UCAL_ERA, era); - internalSet(UCAL_YEAR, year); - internalSet(UCAL_MONTH, month); - internalSet(UCAL_ORDINAL_MONTH, month); - internalSet(UCAL_DATE, day); - internalSet(UCAL_DAY_OF_YEAR, (30 * month) + day); +int32_t +CopticCalendar::getJDEpochOffset() const +{ + return COPTIC_JD_EPOCH_OFFSET; } -constexpr uint32_t kCopticRelatedYearDiff = 284; - -int32_t CopticCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - return year + kCopticRelatedYearDiff; +int32_t CopticCalendar::extendedYearToEra(int32_t extendedYear) const { + return extendedYear <= 0 ? BCE : CE; } -void CopticCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kCopticRelatedYearDiff); +int32_t CopticCalendar::extendedYearToYear(int32_t extendedYear) const { + return extendedYear <= 0 ? 1 - extendedYear : extendedYear; } -IMPL_SYSTEM_DEFAULT_CENTURY(CopticCalendar, "@calendar=coptic") +bool CopticCalendar::isEra0CountingBackward() const { + return true; +} int32_t -CopticCalendar::getJDEpochOffset() const -{ - return COPTIC_JD_EPOCH_OFFSET; +CopticCalendar::getRelatedYearDifference() const { + constexpr int32_t kCopticCalendarRelatedYearDifference = 284; + return kCopticCalendarRelatedYearDifference; } diff --git a/icu4c/source/i18n/coptccal.h b/icu4c/source/i18n/coptccal.h index 587bf37d0d14..2b0fad4acee3 100644 --- a/icu4c/source/i18n/coptccal.h +++ b/icu4c/source/i18n/coptccal.h @@ -154,46 +154,46 @@ class CopticCalendar : public CECalendar { */ const char * getType() const override; +protected: + //------------------------------------------------------------------------- + // Calendar framework + //------------------------------------------------------------------------- + /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field * @internal */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; + int32_t getRelatedYearDifference() const override; /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field + * Return the extended year defined by the current fields. * @internal */ - virtual void setRelatedYear(int32_t year) override; + virtual int32_t handleGetExtendedYear(UErrorCode& status) override; -protected: - //------------------------------------------------------------------------- - // Calendar framework - //------------------------------------------------------------------------- + DECLARE_OVERRIDE_SYSTEM_DEFAULT_CENTURY /** - * Return the extended year defined by the current fields. + * Return the date offset from Julian * @internal */ - virtual int32_t handleGetExtendedYear(UErrorCode& status) override; + int32_t getJDEpochOffset() const override; /** - * Compute fields from the JD + * Compute the era from extended year. * @internal */ - virtual void handleComputeFields(int32_t julianDay, UErrorCode &status) override; - - DECLARE_OVERRIDE_SYSTEM_DEFAULT_CENTURY + int32_t extendedYearToEra(int32_t extendedYear) const override; /** - * Return the date offset from Julian + * Compute the year from extended year. * @internal */ - virtual int32_t getJDEpochOffset() const override; + int32_t extendedYearToYear(int32_t extendedYear) const override; - virtual bool isEra0CountingBackward() const override { return true; } + /** + * @internal + */ + bool isEra0CountingBackward() const override; public: /** * Override Calendar Returns a unique class ID POLYMORPHICALLY. Pure virtual @@ -220,24 +220,6 @@ class CopticCalendar : public CECalendar { */ U_I18N_API static UClassID U_EXPORT2 getStaticClassID(); -#if 0 - // We do not want to introduce this API in ICU4C. - // It was accidentally introduced in ICU4J as a public API. -public: - //------------------------------------------------------------------------- - // Calendar system Conversion methods... - //------------------------------------------------------------------------- - /** - * Convert an Coptic year, month, and day to a Julian day. - * - * @param year the extended year - * @param month the month - * @param day the day - * @return Julian day - * @internal - */ - static int32_t copticToJD(int32_t year, int32_t month, int32_t day); -#endif }; U_NAMESPACE_END diff --git a/icu4c/source/i18n/dangical.cpp b/icu4c/source/i18n/dangical.cpp index 64e7e0be02f6..b3e2ff850f7b 100644 --- a/icu4c/source/i18n/dangical.cpp +++ b/icu4c/source/i18n/dangical.cpp @@ -158,25 +158,8 @@ const TimeZone* getAstronomerTimeZone(UErrorCode &status) { return gAstronomerTimeZone; } -constexpr uint32_t kDangiRelatedYearDiff = -2333; - -int32_t DangiCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - if (uprv_add32_overflow(year, kDangiRelatedYearDiff, &year)) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; - } - return year; -} - -void DangiCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kDangiRelatedYearDiff); +int32_t DangiCalendar::getRelatedYearDifference() const { + return DANGI_EPOCH_YEAR - 1; } ChineseCalendar::Setting DangiCalendar::getSetting(UErrorCode& status) const { diff --git a/icu4c/source/i18n/dangical.h b/icu4c/source/i18n/dangical.h index bc96be2a31e2..21063068d1d9 100644 --- a/icu4c/source/i18n/dangical.h +++ b/icu4c/source/i18n/dangical.h @@ -68,24 +68,6 @@ class DangiCalendar : public ChineseCalendar { */ virtual DangiCalendar* clone() const override; - //---------------------------------------------------------------------- - // Internal methods & astronomical calculations - //---------------------------------------------------------------------- - - /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; - - /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field - * @internal - */ - virtual void setRelatedYear(int32_t year) override; - private: // UObject stuff @@ -121,6 +103,11 @@ class DangiCalendar : public ChineseCalendar { protected: virtual Setting getSetting(UErrorCode& status) const override; + /* + * @internal + */ + int32_t getRelatedYearDifference() const override; + private: DangiCalendar(); // default constructor not implemented diff --git a/icu4c/source/i18n/erarules.cpp b/icu4c/source/i18n/erarules.cpp index d23d7d516c72..117734d36c38 100644 --- a/icu4c/source/i18n/erarules.cpp +++ b/icu4c/source/i18n/erarules.cpp @@ -192,13 +192,8 @@ EraRules* EraRules::createInstance(const char *calType, UBool includeTentativeEr } } else { if (hasEnd) { - if (eraIdx != 0) { - // This implementation does not support end only rule for eras other than - // the first one. - status = U_INVALID_FORMAT_ERROR; - return nullptr; - } - U_ASSERT(eraIdx == 0); + // The islamic calendars now have an end-only rule for the + // second (and final) entry; basically they are in reverse order. startDates[eraIdx] = MIN_ENCODED_START; } else { status = U_INVALID_FORMAT_ERROR; @@ -267,6 +262,15 @@ int32_t EraRules::getEraIndex(int32_t year, int32_t month, int32_t day, UErrorCo status = U_ILLEGAL_ARGUMENT_ERROR; return -1; } + if (numEras > 1 && startDates[numEras-1] == MIN_ENCODED_START) { + // Multiple eras in reverse order, linear search from beginning. + // Currently only for islamic. + for (int eraIdx = 0; eraIdx < numEras; eraIdx++) { + if (compareEncodedDateWithYMD(startDates[eraIdx], year, month, day) <= 0) { + return eraIdx; + } + } + } int32_t high = numEras; // last index + 1 int32_t low; @@ -311,14 +315,26 @@ void EraRules::initCurrentEra() { if (U_FAILURE(ec)) return; int currentEncodedDate = encodeDate(year, month0 + 1 /* changes to 1-base */, dom); int eraIdx = numEras - 1; - while (eraIdx > 0) { - if (currentEncodedDate >= startDates[eraIdx]) { - break; + if (eraIdx > 0 && startDates[eraIdx] == MIN_ENCODED_START) { + // Multiple eras in reverse order, search from beginning. + // Currently only for islamic. Here current era must be + // in the array. + for (eraIdx = 0; eraIdx < numEras; eraIdx++) { + if (currentEncodedDate >= startDates[eraIdx]) { + break; + } + } + } else { + // The usual behavior, search from end + while (eraIdx > 0) { + if (currentEncodedDate >= startDates[eraIdx]) { + break; + } + eraIdx--; } - eraIdx--; + // Note: current era could be before the first era. + // In this case, this implementation returns the first era index (0). } - // Note: current era could be before the first era. - // In this case, this implementation returns the first era index (0). currentEra = eraIdx; } diff --git a/icu4c/source/i18n/ethpccal.cpp b/icu4c/source/i18n/ethpccal.cpp index 770df614afbb..b6cb00647266 100644 --- a/icu4c/source/i18n/ethpccal.cpp +++ b/icu4c/source/i18n/ethpccal.cpp @@ -79,39 +79,6 @@ EthiopicCalendar::handleGetExtendedYear(UErrorCode& status) return year; } -void -EthiopicCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) -{ - int32_t eyear, month, day; - jdToCE(julianDay, getJDEpochOffset(), eyear, month, day, status); - if (U_FAILURE(status)) return; - - internalSet(UCAL_EXTENDED_YEAR, eyear); - internalSet(UCAL_ERA, (eyear > 0) ? AMETE_MIHRET : AMETE_ALEM); - internalSet(UCAL_YEAR, (eyear > 0) ? eyear : (eyear + AMETE_MIHRET_DELTA)); - internalSet(UCAL_MONTH, month); - internalSet(UCAL_ORDINAL_MONTH, month); - internalSet(UCAL_DATE, day); - internalSet(UCAL_DAY_OF_YEAR, (30 * month) + day); -} - -constexpr uint32_t kEthiopicRelatedYearDiff = 8; - -int32_t EthiopicCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - return year + kEthiopicRelatedYearDiff; -} - -void EthiopicCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kEthiopicRelatedYearDiff); -} - IMPL_SYSTEM_DEFAULT_CENTURY(EthiopicCalendar, "@calendar=ethiopic") int32_t @@ -120,6 +87,18 @@ EthiopicCalendar::getJDEpochOffset() const return JD_EPOCH_OFFSET_AMETE_MIHRET; } +int32_t EthiopicCalendar::extendedYearToEra(int32_t extendedYear) const { + return extendedYear <= 0 ? AMETE_ALEM : AMETE_MIHRET; +} + +int32_t EthiopicCalendar::extendedYearToYear(int32_t extendedYear) const { + return extendedYear <= 0 ? extendedYear + AMETE_MIHRET_DELTA : extendedYear; +} + +int32_t EthiopicCalendar::getRelatedYearDifference() const { + constexpr int32_t kEthiopicCalendarRelatedYearDifference = 8; + return kEthiopicCalendarRelatedYearDifference; +} //------------------------------------------------------------------------- // Constructors... @@ -171,22 +150,15 @@ EthiopicAmeteAlemCalendar::handleGetExtendedYear(UErrorCode& status) return year; } -void -EthiopicAmeteAlemCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) -{ - int32_t eyear, month, day; - jdToCE(julianDay, getJDEpochOffset(), eyear, month, day, status); - if (U_FAILURE(status)) return; +int32_t EthiopicAmeteAlemCalendar::extendedYearToEra(int32_t /* extendedYear */) const { + return AMETE_ALEM; +} - internalSet(UCAL_EXTENDED_YEAR, eyear); - internalSet(UCAL_ERA, AMETE_ALEM); - internalSet(UCAL_YEAR, eyear + AMETE_MIHRET_DELTA); - internalSet(UCAL_MONTH, month); - internalSet(UCAL_ORDINAL_MONTH, month); - internalSet(UCAL_DATE, day); - internalSet(UCAL_DAY_OF_YEAR, (30 * month) + day); +int32_t EthiopicAmeteAlemCalendar::extendedYearToYear(int32_t extendedYear) const { + return extendedYear + AMETE_MIHRET_DELTA; } + int32_t EthiopicAmeteAlemCalendar::handleGetLimit(UCalendarDateFields field, ELimitType limitType) const { @@ -196,29 +168,17 @@ EthiopicAmeteAlemCalendar::handleGetLimit(UCalendarDateFields field, ELimitType return EthiopicCalendar::handleGetLimit(field, limitType); } -constexpr uint32_t kEthiopicAmeteAlemRelatedYearDiff = -5492; - -int32_t EthiopicAmeteAlemCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - return year + kEthiopicAmeteAlemRelatedYearDiff; -} - -void EthiopicAmeteAlemCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kEthiopicAmeteAlemRelatedYearDiff); -} - int32_t EthiopicAmeteAlemCalendar::defaultCenturyStartYear() const { return EthiopicCalendar::defaultCenturyStartYear() + AMETE_MIHRET_DELTA; } + +int32_t EthiopicAmeteAlemCalendar::getRelatedYearDifference() const { + constexpr int32_t kEthiopicAmeteAlemCalendarRelatedYearDifference = -5492; + return kEthiopicAmeteAlemCalendarRelatedYearDifference; +} U_NAMESPACE_END #endif diff --git a/icu4c/source/i18n/ethpccal.h b/icu4c/source/i18n/ethpccal.h index 36a3561186cb..40b44d5e51e6 100644 --- a/icu4c/source/i18n/ethpccal.h +++ b/icu4c/source/i18n/ethpccal.h @@ -141,25 +141,16 @@ class EthiopicCalendar : public CECalendar { */ virtual const char * getType() const override; - /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; - - /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field - * @internal - */ - virtual void setRelatedYear(int32_t year) override; - protected: //------------------------------------------------------------------------- // Calendar framework //------------------------------------------------------------------------- + /** + * @internal + */ + int32_t getRelatedYearDifference() const override; + /** * Return the extended year defined by the current fields. * This calendar uses both AMETE_ALEM and AMETE_MIHRET. @@ -171,19 +162,25 @@ class EthiopicCalendar : public CECalendar { */ virtual int32_t handleGetExtendedYear(UErrorCode& status) override; + DECLARE_OVERRIDE_SYSTEM_DEFAULT_CENTURY + /** - * Compute fields from the JD + * Return the date offset from Julian * @internal */ - virtual void handleComputeFields(int32_t julianDay, UErrorCode &status) override; + int32_t getJDEpochOffset() const override; - DECLARE_OVERRIDE_SYSTEM_DEFAULT_CENTURY + /** + * Compute the era from extended year. + * @internal + */ + int32_t extendedYearToEra(int32_t extendedYear) const override; /** - * Return the date offset from Julian + * Compute the year from extended year. * @internal */ - virtual int32_t getJDEpochOffset() const override; + int32_t extendedYearToYear(int32_t extendedYear) const override; public: /** @@ -302,25 +299,16 @@ class EthiopicAmeteAlemCalendar : public EthiopicCalendar { */ U_I18N_API static UClassID U_EXPORT2 getStaticClassID(); - /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; - - /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field - * @internal - */ - virtual void setRelatedYear(int32_t year) override; - protected: //------------------------------------------------------------------------- // Calendar framework //------------------------------------------------------------------------- + /** + * @internal + */ + int32_t getRelatedYearDifference() const override; + /** * Return the extended year defined by the current fields. * This calendar use only AMETE_ALEM for the era. @@ -332,12 +320,6 @@ class EthiopicAmeteAlemCalendar : public EthiopicCalendar { */ virtual int32_t handleGetExtendedYear(UErrorCode& status) override; - /** - * Compute fields from the JD - * @internal - */ - virtual void handleComputeFields(int32_t julianDay, UErrorCode &status) override; - /** * Calculate the limit for a specified type of limit and field * @internal @@ -348,6 +330,18 @@ class EthiopicAmeteAlemCalendar : public EthiopicCalendar { * @internal */ virtual int32_t defaultCenturyStartYear() const override; + + /** + * Compute the era from extended year. + * @internal + */ + int32_t extendedYearToEra(int32_t extendedYear) const override; + + /** + * Compute the year from extended year. + * @internal + */ + int32_t extendedYearToYear(int32_t extendedYear) const override; }; U_NAMESPACE_END diff --git a/icu4c/source/i18n/gregocal.cpp b/icu4c/source/i18n/gregocal.cpp index 8a4bb15c16d6..3dc3950e274f 100644 --- a/icu4c/source/i18n/gregocal.cpp +++ b/icu4c/source/i18n/gregocal.cpp @@ -156,7 +156,7 @@ static const UDate kPapalCutover = (2299161.0 - kEpochStartAsJulianDay) * U_MILL GregorianCalendar::GregorianCalendar(UErrorCode& status) : Calendar(status), fGregorianCutover(kPapalCutover), -fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(kDefaultCutoverYear), +fCutoverJulianDay(kCutoverJulianDay), fGregorianCutoverYear(kDefaultCutoverYear), fIsGregorian(true), fInvertGregorian(false) { setTimeInMillis(getNow(), status); @@ -189,7 +189,7 @@ GregorianCalendar::GregorianCalendar(TimeZone* zone, const Locale& aLocale, UErrorCode& status) : Calendar(zone, aLocale, status), fGregorianCutover(kPapalCutover), - fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(kDefaultCutoverYear), + fCutoverJulianDay(kCutoverJulianDay), fGregorianCutoverYear(kDefaultCutoverYear), fIsGregorian(true), fInvertGregorian(false) { setTimeInMillis(getNow(), status); @@ -201,7 +201,7 @@ GregorianCalendar::GregorianCalendar(const TimeZone& zone, const Locale& aLocale UErrorCode& status) : Calendar(zone, aLocale, status), fGregorianCutover(kPapalCutover), - fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(kDefaultCutoverYear), + fCutoverJulianDay(kCutoverJulianDay), fGregorianCutoverYear(kDefaultCutoverYear), fIsGregorian(true), fInvertGregorian(false) { setTimeInMillis(getNow(), status); @@ -213,7 +213,7 @@ GregorianCalendar::GregorianCalendar(int32_t year, int32_t month, int32_t date, UErrorCode& status) : Calendar(TimeZone::createDefault(), Locale::getDefault(), status), fGregorianCutover(kPapalCutover), - fCutoverJulianDay(kCutoverJulianDay), fNormalizedGregorianCutover(fGregorianCutover), fGregorianCutoverYear(kDefaultCutoverYear), + fCutoverJulianDay(kCutoverJulianDay), fGregorianCutoverYear(kDefaultCutoverYear), fIsGregorian(true), fInvertGregorian(false) { set(UCAL_ERA, AD); @@ -253,7 +253,7 @@ GregorianCalendar::~GregorianCalendar() GregorianCalendar::GregorianCalendar(const GregorianCalendar &source) : Calendar(source), fGregorianCutover(source.fGregorianCutover), -fCutoverJulianDay(source.fCutoverJulianDay), fNormalizedGregorianCutover(source.fNormalizedGregorianCutover), fGregorianCutoverYear(source.fGregorianCutoverYear), +fCutoverJulianDay(source.fCutoverJulianDay), fGregorianCutoverYear(source.fGregorianCutoverYear), fIsGregorian(source.fIsGregorian), fInvertGregorian(source.fInvertGregorian) { } @@ -274,7 +274,6 @@ GregorianCalendar::operator=(const GregorianCalendar &right) { Calendar::operator=(right); fGregorianCutover = right.fGregorianCutover; - fNormalizedGregorianCutover = right.fNormalizedGregorianCutover; fGregorianCutoverYear = right.fGregorianCutoverYear; fCutoverJulianDay = right.fCutoverJulianDay; } @@ -311,12 +310,11 @@ GregorianCalendar::setGregorianChange(UDate date, UErrorCode& status) if (cutoverDay <= INT32_MIN) { cutoverDay = INT32_MIN; - fGregorianCutover = fNormalizedGregorianCutover = cutoverDay * kOneDay; + fGregorianCutover = cutoverDay * kOneDay; } else if (cutoverDay >= INT32_MAX) { cutoverDay = INT32_MAX; - fGregorianCutover = fNormalizedGregorianCutover = cutoverDay * kOneDay; + fGregorianCutover = cutoverDay * kOneDay; } else { - fNormalizedGregorianCutover = cutoverDay * kOneDay; fGregorianCutover = date; } diff --git a/icu4c/source/i18n/gregoimp.cpp b/icu4c/source/i18n/gregoimp.cpp index 03bf9d2c9fdf..ccb1f0be99e3 100644 --- a/icu4c/source/i18n/gregoimp.cpp +++ b/icu4c/source/i18n/gregoimp.cpp @@ -176,18 +176,6 @@ int32_t Grego::dayToYear(int32_t day, int16_t& doy, UErrorCode& status) { return year; } -void Grego::dayToFields(int32_t day, int32_t& year, int8_t& month, - int8_t& dom, int8_t& dow, UErrorCode& status) { - int16_t unusedDOY; - dayToFields(day, year, month, dom, dow, unusedDOY, status); -} - -void Grego::dayToFields(int32_t day, int32_t& year, int8_t& month, - int8_t& dom, int16_t& doy, UErrorCode& status) { - int8_t unusedDOW; - dayToFields(day, year, month, dom, unusedDOW, doy, status); -} - void Grego::timeToFields(UDate time, int32_t& year, int8_t& month, int8_t& dom, int32_t& mid, UErrorCode& status) { int8_t unusedDOW; diff --git a/icu4c/source/i18n/gregoimp.h b/icu4c/source/i18n/gregoimp.h index 39881c0eefbe..1b656d64271d 100644 --- a/icu4c/source/i18n/gregoimp.h +++ b/icu4c/source/i18n/gregoimp.h @@ -213,32 +213,6 @@ class Grego { static void dayToFields(int32_t day, int32_t& year, int8_t& month, int8_t& dom, int8_t& dow, int16_t& doy, UErrorCode& status); - /** - * Convert a 1970-epoch day number to proleptic Gregorian year, - * month, day-of-month, and day-of-week. - * @param day 1970-epoch day - * @param year output parameter to receive year - * @param month output parameter to receive month (0-based, 0==Jan) - * @param dom output parameter to receive day-of-month (1-based) - * @param doy output parameter to receive day-of-year (1-based) - * @param status error code. - */ - static void dayToFields(int32_t day, int32_t& year, int8_t& month, - int8_t& dom, int16_t& doy, UErrorCode& status); - - /** - * Convert a 1970-epoch day number to proleptic Gregorian year, - * month, day-of-month, and day-of-week. - * @param day 1970-epoch day - * @param year output parameter to receive year - * @param month output parameter to receive month (0-based, 0==Jan) - * @param dom output parameter to receive day-of-month (1-based) - * @param dow output parameter to receive day-of-week (1-based, 1==Sun) - * @param status error code. - */ - static void dayToFields(int32_t day, int32_t& year, int8_t& month, - int8_t& dom, int8_t& dow, UErrorCode& status); - /** * Convert a 1970-epoch day number to proleptic Gregorian year. * @param day 1970-epoch day diff --git a/icu4c/source/i18n/hebrwcal.cpp b/icu4c/source/i18n/hebrwcal.cpp index cf7c6f6b96f2..d612c800e77f 100644 --- a/icu4c/source/i18n/hebrwcal.cpp +++ b/icu4c/source/i18n/hebrwcal.cpp @@ -790,23 +790,6 @@ int64_t HebrewCalendar::handleComputeMonthStart( return day + 347997LL; } -constexpr uint32_t kHebrewRelatedYearDiff = -3760; - -int32_t HebrewCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - return year + kHebrewRelatedYearDiff; -} - -void HebrewCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kHebrewRelatedYearDiff); -} - IMPL_SYSTEM_DEFAULT_CENTURY(HebrewCalendar, "@calendar=hebrew") bool HebrewCalendar::inTemporalLeapYear(UErrorCode& status) const { @@ -872,6 +855,11 @@ int32_t HebrewCalendar::internalGetMonth(UErrorCode& status) const { return Calendar::internalGetMonth(status); } +int32_t HebrewCalendar::getRelatedYearDifference() const { + constexpr int32_t kHebrewCalendarRelatedYearDifference = -3760; + return kHebrewCalendarRelatedYearDifference; +} + UOBJECT_DEFINE_RTTI_IMPLEMENTATION(HebrewCalendar) U_NAMESPACE_END diff --git a/icu4c/source/i18n/hebrwcal.h b/icu4c/source/i18n/hebrwcal.h index d5c16554c3d0..a959ac307b37 100644 --- a/icu4c/source/i18n/hebrwcal.h +++ b/icu4c/source/i18n/hebrwcal.h @@ -273,21 +273,11 @@ class U_I18N_API HebrewCalendar : public Calendar { */ static UBool isLeapYear(int32_t year) ; + protected: /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; - - /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field * @internal */ - virtual void setRelatedYear(int32_t year) override; - - protected: + int32_t getRelatedYearDifference() const override; /** * Subclass API for defining limits of different types. diff --git a/icu4c/source/i18n/indiancal.cpp b/icu4c/source/i18n/indiancal.cpp index bb4b6b9939c0..8c8365b0b304 100644 --- a/icu4c/source/i18n/indiancal.cpp +++ b/icu4c/source/i18n/indiancal.cpp @@ -251,13 +251,12 @@ int32_t IndianCalendar::handleGetExtendedYear(UErrorCode& status) { * method is called. The getGregorianXxx() methods return Gregorian * calendar equivalents for the given Julian day. */ -void IndianCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) { +void IndianCalendar::handleComputeFields(int32_t julianDay, UErrorCode& /* status */) { double jdAtStartOfGregYear; int32_t leapMonth, IndianYear, yday, IndianMonth, IndianDayOfMonth, mday; // Stores gregorian date corresponding to Julian day; - int32_t gregorianYear = Grego::dayToYear(julianDay - kEpochStartAsJulianDay, status); + int32_t gregorianYear = getGregorianYear(); - if (U_FAILURE(status)) return; IndianYear = gregorianYear - INDIAN_ERA_START; // Year in Saka era jdAtStartOfGregYear = gregorianToJD(gregorianYear, 0, 1); // JD at start of Gregorian year yday = static_cast(julianDay - jdAtStartOfGregYear); // Day number in Gregorian year (starting from 0) @@ -294,33 +293,17 @@ void IndianCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) internalSet(UCAL_ORDINAL_MONTH, IndianMonth); internalSet(UCAL_DAY_OF_MONTH, IndianDayOfMonth); internalSet(UCAL_DAY_OF_YEAR, yday + 1); // yday is 0-based -} - -constexpr uint32_t kIndianRelatedYearDiff = 79; - -int32_t IndianCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - if (uprv_add32_overflow(year, kIndianRelatedYearDiff, &year)) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; - } - return year; -} - -void IndianCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kIndianRelatedYearDiff); } IMPL_SYSTEM_DEFAULT_CENTURY(IndianCalendar, "@calendar=indian") UOBJECT_DEFINE_RTTI_IMPLEMENTATION(IndianCalendar) +int32_t IndianCalendar::getRelatedYearDifference() const { + constexpr int32_t kIndianCalendarRelatedYearDifference = 79; + return kIndianCalendarRelatedYearDifference; +} + U_NAMESPACE_END #endif diff --git a/icu4c/source/i18n/indiancal.h b/icu4c/source/i18n/indiancal.h index ff067d0b3c3d..411abc638afc 100644 --- a/icu4c/source/i18n/indiancal.h +++ b/icu4c/source/i18n/indiancal.h @@ -284,27 +284,16 @@ class U_I18N_API IndianCalendar : public Calendar { */ virtual const char * getType() const override; - /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; +private: + IndianCalendar() = delete; // default constructor not implemented +protected: /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field * @internal */ - virtual void setRelatedYear(int32_t year) override; - - -private: - IndianCalendar() = delete; // default constructor not implemented + int32_t getRelatedYearDifference() const override; // Default century. -protected: - DECLARE_OVERRIDE_SYSTEM_DEFAULT_CENTURY }; diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp index 8dda799d0165..294c5128eee0 100644 --- a/icu4c/source/i18n/measunit.cpp +++ b/icu4c/source/i18n/measunit.cpp @@ -39,28 +39,29 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(MeasureUnit) static const int32_t gOffsets[] = { 0, 2, - 7, - 17, - 28, - 32, - 334, - 345, - 363, - 367, - 376, - 379, - 383, - 391, - 413, - 417, - 432, - 433, + 8, + 21, + 34, + 38, + 340, + 351, + 370, + 378, + 392, + 396, + 400, + 408, 439, - 450, - 456, - 460, + 443, + 445, 462, - 496 + 463, + 469, + 481, + 487, + 492, + 494, + 538 }; static const int32_t kCurrencyOffset = 5; @@ -82,6 +83,7 @@ static const char * const gTypes[] = { "graphics", "length", "light", + "magnetic", "mass", "none", "power", @@ -101,9 +103,13 @@ static const char * const gSubTypes[] = { "degree", "radian", "revolution", + "steradian", "acre", + "bu-jp", + "cho", "dunam", "hectare", + "se-jp", "square-centimeter", "square-foot", "square-inch", @@ -113,15 +119,17 @@ static const char * const gSubTypes[] = { "square-yard", "item", "karat", + "katal", "milligram-ofglucose-per-deciliter", - "milligram-per-deciliter", "millimole-per-liter", "mole", + "ofglucose", + "part", + "part-per-1e6", + "part-per-1e9", "percent", "permille", - "permillion", "permyriad", - "portion-per-1e9", "liter-per-100-kilometer", "liter-per-kilometer", "mile-per-gallon", @@ -443,6 +451,7 @@ static const char * const gSubTypes[] = { "day", "day-person", "decade", + "fortnight", "hour", "microsecond", "millisecond", @@ -458,18 +467,28 @@ static const char * const gSubTypes[] = { "year", "year-person", "ampere", + "coulomb", + "farad", + "henry", "milliampere", "ohm", + "siemens", "volt", + "becquerel", "british-thermal-unit", + "british-thermal-unit-it", "calorie", + "calorie-it", "electronvolt", "foodcalorie", + "gray", "joule", "kilocalorie", "kilojoule", "kilowatt-hour", + "sievert", "therm-us", + "kilogram-force", "kilowatt-hour-per-100-kilometer", "newton", "pound-force", @@ -487,12 +506,15 @@ static const char * const gSubTypes[] = { "pixel-per-inch", "astronomical-unit", "centimeter", + "chain", "decimeter", "earth-radius", "fathom", "foot", "furlong", "inch", + "jo-jp", + "ken", "kilometer", "light-year", "meter", @@ -505,15 +527,24 @@ static const char * const gSubTypes[] = { "parsec", "picometer", "point", + "ri-jp", + "rin", + "rod", + "shaku-cloth", + "shaku-length", "solar-radius", + "sun", "yard", "candela", "lumen", "lux", "solar-luminosity", + "tesla", + "weber", "carat", "dalton", "earth-mass", + "fun", "grain", "gram", "kilogram", @@ -522,6 +553,7 @@ static const char * const gSubTypes[] = { "ounce", "ounce-troy", "pound", + "slug", "solar-mass", "stone", "ton", @@ -542,6 +574,7 @@ static const char * const gSubTypes[] = { "megapascal", "millibar", "millimeter-ofhg", + "ofhg", "pascal", "pound-force-per-square-inch", "beaufort", @@ -554,6 +587,7 @@ static const char * const gSubTypes[] = { "fahrenheit", "generic", "kelvin", + "rankine", "newton-meter", "pound-force-foot", "acre-foot", @@ -568,6 +602,8 @@ static const char * const gSubTypes[] = { "cubic-mile", "cubic-yard", "cup", + "cup-imperial", + "cup-jp", "cup-metric", "deciliter", "dessert-spoon", @@ -576,24 +612,32 @@ static const char * const gSubTypes[] = { "drop", "fluid-ounce", "fluid-ounce-imperial", + "fluid-ounce-metric", "gallon", "gallon-imperial", "hectoliter", "jigger", + "koku", + "kosaji", "liter", "megaliter", "milliliter", + "osaji", "pinch", "pint", + "pint-imperial", "pint-metric", "quart", "quart-imperial", + "sai", + "shaku", "tablespoon", - "teaspoon" + "teaspoon", + "to-jp" }; // Shortcuts to the base unit in order to make the default constructor fast -static const int32_t kBaseTypeIdx = 16; +static const int32_t kBaseTypeIdx = 17; static const int32_t kBaseSubTypeIdx = 0; MeasureUnit *MeasureUnit::createGForce(UErrorCode &status) { @@ -652,6 +696,14 @@ MeasureUnit MeasureUnit::getRevolutionAngle() { return MeasureUnit(1, 4); } +MeasureUnit *MeasureUnit::createSteradian(UErrorCode &status) { + return MeasureUnit::create(1, 5, status); +} + +MeasureUnit MeasureUnit::getSteradian() { + return MeasureUnit(1, 5); +} + MeasureUnit *MeasureUnit::createAcre(UErrorCode &status) { return MeasureUnit::create(2, 0, status); } @@ -660,78 +712,102 @@ MeasureUnit MeasureUnit::getAcre() { return MeasureUnit(2, 0); } -MeasureUnit *MeasureUnit::createDunam(UErrorCode &status) { +MeasureUnit *MeasureUnit::createBuJp(UErrorCode &status) { return MeasureUnit::create(2, 1, status); } -MeasureUnit MeasureUnit::getDunam() { +MeasureUnit MeasureUnit::getBuJp() { return MeasureUnit(2, 1); } -MeasureUnit *MeasureUnit::createHectare(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCho(UErrorCode &status) { return MeasureUnit::create(2, 2, status); } -MeasureUnit MeasureUnit::getHectare() { +MeasureUnit MeasureUnit::getCho() { return MeasureUnit(2, 2); } -MeasureUnit *MeasureUnit::createSquareCentimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDunam(UErrorCode &status) { return MeasureUnit::create(2, 3, status); } -MeasureUnit MeasureUnit::getSquareCentimeter() { +MeasureUnit MeasureUnit::getDunam() { return MeasureUnit(2, 3); } -MeasureUnit *MeasureUnit::createSquareFoot(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHectare(UErrorCode &status) { return MeasureUnit::create(2, 4, status); } -MeasureUnit MeasureUnit::getSquareFoot() { +MeasureUnit MeasureUnit::getHectare() { return MeasureUnit(2, 4); } -MeasureUnit *MeasureUnit::createSquareInch(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSeJp(UErrorCode &status) { return MeasureUnit::create(2, 5, status); } -MeasureUnit MeasureUnit::getSquareInch() { +MeasureUnit MeasureUnit::getSeJp() { return MeasureUnit(2, 5); } -MeasureUnit *MeasureUnit::createSquareKilometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSquareCentimeter(UErrorCode &status) { return MeasureUnit::create(2, 6, status); } -MeasureUnit MeasureUnit::getSquareKilometer() { +MeasureUnit MeasureUnit::getSquareCentimeter() { return MeasureUnit(2, 6); } -MeasureUnit *MeasureUnit::createSquareMeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSquareFoot(UErrorCode &status) { return MeasureUnit::create(2, 7, status); } -MeasureUnit MeasureUnit::getSquareMeter() { +MeasureUnit MeasureUnit::getSquareFoot() { return MeasureUnit(2, 7); } -MeasureUnit *MeasureUnit::createSquareMile(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSquareInch(UErrorCode &status) { return MeasureUnit::create(2, 8, status); } -MeasureUnit MeasureUnit::getSquareMile() { +MeasureUnit MeasureUnit::getSquareInch() { return MeasureUnit(2, 8); } -MeasureUnit *MeasureUnit::createSquareYard(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSquareKilometer(UErrorCode &status) { return MeasureUnit::create(2, 9, status); } -MeasureUnit MeasureUnit::getSquareYard() { +MeasureUnit MeasureUnit::getSquareKilometer() { return MeasureUnit(2, 9); } +MeasureUnit *MeasureUnit::createSquareMeter(UErrorCode &status) { + return MeasureUnit::create(2, 10, status); +} + +MeasureUnit MeasureUnit::getSquareMeter() { + return MeasureUnit(2, 10); +} + +MeasureUnit *MeasureUnit::createSquareMile(UErrorCode &status) { + return MeasureUnit::create(2, 11, status); +} + +MeasureUnit MeasureUnit::getSquareMile() { + return MeasureUnit(2, 11); +} + +MeasureUnit *MeasureUnit::createSquareYard(UErrorCode &status) { + return MeasureUnit::create(2, 12, status); +} + +MeasureUnit MeasureUnit::getSquareYard() { + return MeasureUnit(2, 12); +} + MeasureUnit *MeasureUnit::createItem(UErrorCode &status) { return MeasureUnit::create(3, 0, status); } @@ -748,14 +824,22 @@ MeasureUnit MeasureUnit::getKarat() { return MeasureUnit(3, 1); } -MeasureUnit *MeasureUnit::createMilligramOfglucosePerDeciliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKatal(UErrorCode &status) { return MeasureUnit::create(3, 2, status); } -MeasureUnit MeasureUnit::getMilligramOfglucosePerDeciliter() { +MeasureUnit MeasureUnit::getKatal() { return MeasureUnit(3, 2); } +MeasureUnit *MeasureUnit::createMilligramOfglucosePerDeciliter(UErrorCode &status) { + return MeasureUnit::create(3, 3, status); +} + +MeasureUnit MeasureUnit::getMilligramOfglucosePerDeciliter() { + return MeasureUnit(3, 3); +} + MeasureUnit *MeasureUnit::createMilligramPerDeciliter(UErrorCode &status) { return MeasureUnit::create(3, 3, status); } @@ -780,22 +864,30 @@ MeasureUnit MeasureUnit::getMole() { return MeasureUnit(3, 5); } -MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) { +MeasureUnit *MeasureUnit::createOfglucose(UErrorCode &status) { return MeasureUnit::create(3, 6, status); } -MeasureUnit MeasureUnit::getPercent() { +MeasureUnit MeasureUnit::getOfglucose() { return MeasureUnit(3, 6); } -MeasureUnit *MeasureUnit::createPermille(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPart(UErrorCode &status) { return MeasureUnit::create(3, 7, status); } -MeasureUnit MeasureUnit::getPermille() { +MeasureUnit MeasureUnit::getPart() { return MeasureUnit(3, 7); } +MeasureUnit *MeasureUnit::createPartPer1E6(UErrorCode &status) { + return MeasureUnit::create(3, 8, status); +} + +MeasureUnit MeasureUnit::getPartPer1E6() { + return MeasureUnit(3, 8); +} + MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) { return MeasureUnit::create(3, 8, status); } @@ -804,22 +896,38 @@ MeasureUnit MeasureUnit::getPartPerMillion() { return MeasureUnit(3, 8); } -MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPartPer1E9(UErrorCode &status) { return MeasureUnit::create(3, 9, status); } -MeasureUnit MeasureUnit::getPermyriad() { +MeasureUnit MeasureUnit::getPartPer1E9() { return MeasureUnit(3, 9); } -MeasureUnit *MeasureUnit::createPortionPer1E9(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) { return MeasureUnit::create(3, 10, status); } -MeasureUnit MeasureUnit::getPortionPer1E9() { +MeasureUnit MeasureUnit::getPercent() { return MeasureUnit(3, 10); } +MeasureUnit *MeasureUnit::createPermille(UErrorCode &status) { + return MeasureUnit::create(3, 11, status); +} + +MeasureUnit MeasureUnit::getPermille() { + return MeasureUnit(3, 11); +} + +MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) { + return MeasureUnit::create(3, 12, status); +} + +MeasureUnit MeasureUnit::getPermyriad() { + return MeasureUnit(3, 12); +} + MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) { return MeasureUnit::create(4, 0, status); } @@ -972,118 +1080,126 @@ MeasureUnit MeasureUnit::getDecade() { return MeasureUnit(7, 3); } -MeasureUnit *MeasureUnit::createHour(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFortnight(UErrorCode &status) { return MeasureUnit::create(7, 4, status); } -MeasureUnit MeasureUnit::getHour() { +MeasureUnit MeasureUnit::getFortnight() { return MeasureUnit(7, 4); } -MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHour(UErrorCode &status) { return MeasureUnit::create(7, 5, status); } -MeasureUnit MeasureUnit::getMicrosecond() { +MeasureUnit MeasureUnit::getHour() { return MeasureUnit(7, 5); } -MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) { return MeasureUnit::create(7, 6, status); } -MeasureUnit MeasureUnit::getMillisecond() { +MeasureUnit MeasureUnit::getMicrosecond() { return MeasureUnit(7, 6); } -MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) { return MeasureUnit::create(7, 7, status); } -MeasureUnit MeasureUnit::getMinute() { +MeasureUnit MeasureUnit::getMillisecond() { return MeasureUnit(7, 7); } -MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) { return MeasureUnit::create(7, 8, status); } -MeasureUnit MeasureUnit::getMonth() { +MeasureUnit MeasureUnit::getMinute() { return MeasureUnit(7, 8); } -MeasureUnit *MeasureUnit::createMonthPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) { return MeasureUnit::create(7, 9, status); } -MeasureUnit MeasureUnit::getMonthPerson() { +MeasureUnit MeasureUnit::getMonth() { return MeasureUnit(7, 9); } -MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMonthPerson(UErrorCode &status) { return MeasureUnit::create(7, 10, status); } -MeasureUnit MeasureUnit::getNanosecond() { +MeasureUnit MeasureUnit::getMonthPerson() { return MeasureUnit(7, 10); } -MeasureUnit *MeasureUnit::createNight(UErrorCode &status) { +MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) { return MeasureUnit::create(7, 11, status); } -MeasureUnit MeasureUnit::getNight() { +MeasureUnit MeasureUnit::getNanosecond() { return MeasureUnit(7, 11); } -MeasureUnit *MeasureUnit::createQuarter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createNight(UErrorCode &status) { return MeasureUnit::create(7, 12, status); } -MeasureUnit MeasureUnit::getQuarter() { +MeasureUnit MeasureUnit::getNight() { return MeasureUnit(7, 12); } -MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createQuarter(UErrorCode &status) { return MeasureUnit::create(7, 13, status); } -MeasureUnit MeasureUnit::getSecond() { +MeasureUnit MeasureUnit::getQuarter() { return MeasureUnit(7, 13); } -MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { +MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { return MeasureUnit::create(7, 14, status); } -MeasureUnit MeasureUnit::getWeek() { +MeasureUnit MeasureUnit::getSecond() { return MeasureUnit(7, 14); } -MeasureUnit *MeasureUnit::createWeekPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { return MeasureUnit::create(7, 15, status); } -MeasureUnit MeasureUnit::getWeekPerson() { +MeasureUnit MeasureUnit::getWeek() { return MeasureUnit(7, 15); } -MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeekPerson(UErrorCode &status) { return MeasureUnit::create(7, 16, status); } -MeasureUnit MeasureUnit::getYear() { +MeasureUnit MeasureUnit::getWeekPerson() { return MeasureUnit(7, 16); } -MeasureUnit *MeasureUnit::createYearPerson(UErrorCode &status) { +MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { return MeasureUnit::create(7, 17, status); } -MeasureUnit MeasureUnit::getYearPerson() { +MeasureUnit MeasureUnit::getYear() { return MeasureUnit(7, 17); } +MeasureUnit *MeasureUnit::createYearPerson(UErrorCode &status) { + return MeasureUnit::create(7, 18, status); +} + +MeasureUnit MeasureUnit::getYearPerson() { + return MeasureUnit(7, 18); +} + MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) { return MeasureUnit::create(8, 0, status); } @@ -1092,126 +1208,206 @@ MeasureUnit MeasureUnit::getAmpere() { return MeasureUnit(8, 0); } -MeasureUnit *MeasureUnit::createMilliampere(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCoulomb(UErrorCode &status) { return MeasureUnit::create(8, 1, status); } -MeasureUnit MeasureUnit::getMilliampere() { +MeasureUnit MeasureUnit::getCoulomb() { return MeasureUnit(8, 1); } -MeasureUnit *MeasureUnit::createOhm(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFarad(UErrorCode &status) { return MeasureUnit::create(8, 2, status); } -MeasureUnit MeasureUnit::getOhm() { +MeasureUnit MeasureUnit::getFarad() { return MeasureUnit(8, 2); } -MeasureUnit *MeasureUnit::createVolt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHenry(UErrorCode &status) { return MeasureUnit::create(8, 3, status); } -MeasureUnit MeasureUnit::getVolt() { +MeasureUnit MeasureUnit::getHenry() { return MeasureUnit(8, 3); } -MeasureUnit *MeasureUnit::createBritishThermalUnit(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilliampere(UErrorCode &status) { + return MeasureUnit::create(8, 4, status); +} + +MeasureUnit MeasureUnit::getMilliampere() { + return MeasureUnit(8, 4); +} + +MeasureUnit *MeasureUnit::createOhm(UErrorCode &status) { + return MeasureUnit::create(8, 5, status); +} + +MeasureUnit MeasureUnit::getOhm() { + return MeasureUnit(8, 5); +} + +MeasureUnit *MeasureUnit::createSiemens(UErrorCode &status) { + return MeasureUnit::create(8, 6, status); +} + +MeasureUnit MeasureUnit::getSiemens() { + return MeasureUnit(8, 6); +} + +MeasureUnit *MeasureUnit::createVolt(UErrorCode &status) { + return MeasureUnit::create(8, 7, status); +} + +MeasureUnit MeasureUnit::getVolt() { + return MeasureUnit(8, 7); +} + +MeasureUnit *MeasureUnit::createBecquerel(UErrorCode &status) { return MeasureUnit::create(9, 0, status); } -MeasureUnit MeasureUnit::getBritishThermalUnit() { +MeasureUnit MeasureUnit::getBecquerel() { return MeasureUnit(9, 0); } -MeasureUnit *MeasureUnit::createCalorie(UErrorCode &status) { +MeasureUnit *MeasureUnit::createBritishThermalUnit(UErrorCode &status) { return MeasureUnit::create(9, 1, status); } -MeasureUnit MeasureUnit::getCalorie() { +MeasureUnit MeasureUnit::getBritishThermalUnit() { return MeasureUnit(9, 1); } -MeasureUnit *MeasureUnit::createElectronvolt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createBritishThermalUnitIt(UErrorCode &status) { return MeasureUnit::create(9, 2, status); } -MeasureUnit MeasureUnit::getElectronvolt() { +MeasureUnit MeasureUnit::getBritishThermalUnitIt() { return MeasureUnit(9, 2); } -MeasureUnit *MeasureUnit::createFoodcalorie(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCalorie(UErrorCode &status) { return MeasureUnit::create(9, 3, status); } -MeasureUnit MeasureUnit::getFoodcalorie() { +MeasureUnit MeasureUnit::getCalorie() { return MeasureUnit(9, 3); } -MeasureUnit *MeasureUnit::createJoule(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCalorieIt(UErrorCode &status) { return MeasureUnit::create(9, 4, status); } -MeasureUnit MeasureUnit::getJoule() { +MeasureUnit MeasureUnit::getCalorieIt() { return MeasureUnit(9, 4); } -MeasureUnit *MeasureUnit::createKilocalorie(UErrorCode &status) { +MeasureUnit *MeasureUnit::createElectronvolt(UErrorCode &status) { return MeasureUnit::create(9, 5, status); } -MeasureUnit MeasureUnit::getKilocalorie() { +MeasureUnit MeasureUnit::getElectronvolt() { return MeasureUnit(9, 5); } -MeasureUnit *MeasureUnit::createKilojoule(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFoodcalorie(UErrorCode &status) { return MeasureUnit::create(9, 6, status); } -MeasureUnit MeasureUnit::getKilojoule() { +MeasureUnit MeasureUnit::getFoodcalorie() { return MeasureUnit(9, 6); } -MeasureUnit *MeasureUnit::createKilowattHour(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGray(UErrorCode &status) { return MeasureUnit::create(9, 7, status); } -MeasureUnit MeasureUnit::getKilowattHour() { +MeasureUnit MeasureUnit::getGray() { return MeasureUnit(9, 7); } -MeasureUnit *MeasureUnit::createThermUs(UErrorCode &status) { +MeasureUnit *MeasureUnit::createJoule(UErrorCode &status) { return MeasureUnit::create(9, 8, status); } -MeasureUnit MeasureUnit::getThermUs() { +MeasureUnit MeasureUnit::getJoule() { return MeasureUnit(9, 8); } -MeasureUnit *MeasureUnit::createKilowattHourPer100Kilometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilocalorie(UErrorCode &status) { + return MeasureUnit::create(9, 9, status); +} + +MeasureUnit MeasureUnit::getKilocalorie() { + return MeasureUnit(9, 9); +} + +MeasureUnit *MeasureUnit::createKilojoule(UErrorCode &status) { + return MeasureUnit::create(9, 10, status); +} + +MeasureUnit MeasureUnit::getKilojoule() { + return MeasureUnit(9, 10); +} + +MeasureUnit *MeasureUnit::createKilowattHour(UErrorCode &status) { + return MeasureUnit::create(9, 11, status); +} + +MeasureUnit MeasureUnit::getKilowattHour() { + return MeasureUnit(9, 11); +} + +MeasureUnit *MeasureUnit::createSievert(UErrorCode &status) { + return MeasureUnit::create(9, 12, status); +} + +MeasureUnit MeasureUnit::getSievert() { + return MeasureUnit(9, 12); +} + +MeasureUnit *MeasureUnit::createThermUs(UErrorCode &status) { + return MeasureUnit::create(9, 13, status); +} + +MeasureUnit MeasureUnit::getThermUs() { + return MeasureUnit(9, 13); +} + +MeasureUnit *MeasureUnit::createKilogramForce(UErrorCode &status) { return MeasureUnit::create(10, 0, status); } -MeasureUnit MeasureUnit::getKilowattHourPer100Kilometer() { +MeasureUnit MeasureUnit::getKilogramForce() { return MeasureUnit(10, 0); } -MeasureUnit *MeasureUnit::createNewton(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilowattHourPer100Kilometer(UErrorCode &status) { return MeasureUnit::create(10, 1, status); } -MeasureUnit MeasureUnit::getNewton() { +MeasureUnit MeasureUnit::getKilowattHourPer100Kilometer() { return MeasureUnit(10, 1); } -MeasureUnit *MeasureUnit::createPoundForce(UErrorCode &status) { +MeasureUnit *MeasureUnit::createNewton(UErrorCode &status) { return MeasureUnit::create(10, 2, status); } -MeasureUnit MeasureUnit::getPoundForce() { +MeasureUnit MeasureUnit::getNewton() { return MeasureUnit(10, 2); } +MeasureUnit *MeasureUnit::createPoundForce(UErrorCode &status) { + return MeasureUnit::create(10, 3, status); +} + +MeasureUnit MeasureUnit::getPoundForce() { + return MeasureUnit(10, 3); +} + MeasureUnit *MeasureUnit::createGigahertz(UErrorCode &status) { return MeasureUnit::create(11, 0, status); } @@ -1324,164 +1520,236 @@ MeasureUnit MeasureUnit::getCentimeter() { return MeasureUnit(13, 1); } -MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createChain(UErrorCode &status) { return MeasureUnit::create(13, 2, status); } -MeasureUnit MeasureUnit::getDecimeter() { +MeasureUnit MeasureUnit::getChain() { return MeasureUnit(13, 2); } -MeasureUnit *MeasureUnit::createEarthRadius(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) { return MeasureUnit::create(13, 3, status); } +MeasureUnit MeasureUnit::getDecimeter() { + return MeasureUnit(13, 3); +} + +MeasureUnit *MeasureUnit::createEarthRadius(UErrorCode &status) { + return MeasureUnit::create(13, 4, status); +} + MeasureUnit MeasureUnit::getEarthRadius() { - return MeasureUnit(13, 3); + return MeasureUnit(13, 4); } MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { - return MeasureUnit::create(13, 4, status); + return MeasureUnit::create(13, 5, status); } MeasureUnit MeasureUnit::getFathom() { - return MeasureUnit(13, 4); + return MeasureUnit(13, 5); } MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { - return MeasureUnit::create(13, 5, status); + return MeasureUnit::create(13, 6, status); } MeasureUnit MeasureUnit::getFoot() { - return MeasureUnit(13, 5); + return MeasureUnit(13, 6); } MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { - return MeasureUnit::create(13, 6, status); + return MeasureUnit::create(13, 7, status); } MeasureUnit MeasureUnit::getFurlong() { - return MeasureUnit(13, 6); + return MeasureUnit(13, 7); } MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { - return MeasureUnit::create(13, 7, status); + return MeasureUnit::create(13, 8, status); } MeasureUnit MeasureUnit::getInch() { - return MeasureUnit(13, 7); + return MeasureUnit(13, 8); +} + +MeasureUnit *MeasureUnit::createJoJp(UErrorCode &status) { + return MeasureUnit::create(13, 9, status); +} + +MeasureUnit MeasureUnit::getJoJp() { + return MeasureUnit(13, 9); +} + +MeasureUnit *MeasureUnit::createKen(UErrorCode &status) { + return MeasureUnit::create(13, 10, status); +} + +MeasureUnit MeasureUnit::getKen() { + return MeasureUnit(13, 10); } MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) { - return MeasureUnit::create(13, 8, status); + return MeasureUnit::create(13, 11, status); } MeasureUnit MeasureUnit::getKilometer() { - return MeasureUnit(13, 8); + return MeasureUnit(13, 11); } MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) { - return MeasureUnit::create(13, 9, status); + return MeasureUnit::create(13, 12, status); } MeasureUnit MeasureUnit::getLightYear() { - return MeasureUnit(13, 9); + return MeasureUnit(13, 12); } MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) { - return MeasureUnit::create(13, 10, status); + return MeasureUnit::create(13, 13, status); } MeasureUnit MeasureUnit::getMeter() { - return MeasureUnit(13, 10); + return MeasureUnit(13, 13); } MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) { - return MeasureUnit::create(13, 11, status); + return MeasureUnit::create(13, 14, status); } MeasureUnit MeasureUnit::getMicrometer() { - return MeasureUnit(13, 11); + return MeasureUnit(13, 14); } MeasureUnit *MeasureUnit::createMile(UErrorCode &status) { - return MeasureUnit::create(13, 12, status); + return MeasureUnit::create(13, 15, status); } MeasureUnit MeasureUnit::getMile() { - return MeasureUnit(13, 12); + return MeasureUnit(13, 15); } MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) { - return MeasureUnit::create(13, 13, status); + return MeasureUnit::create(13, 16, status); } MeasureUnit MeasureUnit::getMileScandinavian() { - return MeasureUnit(13, 13); + return MeasureUnit(13, 16); } MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) { - return MeasureUnit::create(13, 14, status); + return MeasureUnit::create(13, 17, status); } MeasureUnit MeasureUnit::getMillimeter() { - return MeasureUnit(13, 14); + return MeasureUnit(13, 17); } MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) { - return MeasureUnit::create(13, 15, status); + return MeasureUnit::create(13, 18, status); } MeasureUnit MeasureUnit::getNanometer() { - return MeasureUnit(13, 15); + return MeasureUnit(13, 18); } MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) { - return MeasureUnit::create(13, 16, status); + return MeasureUnit::create(13, 19, status); } MeasureUnit MeasureUnit::getNauticalMile() { - return MeasureUnit(13, 16); + return MeasureUnit(13, 19); } MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) { - return MeasureUnit::create(13, 17, status); + return MeasureUnit::create(13, 20, status); } MeasureUnit MeasureUnit::getParsec() { - return MeasureUnit(13, 17); + return MeasureUnit(13, 20); } MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) { - return MeasureUnit::create(13, 18, status); + return MeasureUnit::create(13, 21, status); } MeasureUnit MeasureUnit::getPicometer() { - return MeasureUnit(13, 18); + return MeasureUnit(13, 21); } MeasureUnit *MeasureUnit::createPoint(UErrorCode &status) { - return MeasureUnit::create(13, 19, status); + return MeasureUnit::create(13, 22, status); } MeasureUnit MeasureUnit::getPoint() { - return MeasureUnit(13, 19); + return MeasureUnit(13, 22); +} + +MeasureUnit *MeasureUnit::createRiJp(UErrorCode &status) { + return MeasureUnit::create(13, 23, status); +} + +MeasureUnit MeasureUnit::getRiJp() { + return MeasureUnit(13, 23); +} + +MeasureUnit *MeasureUnit::createRin(UErrorCode &status) { + return MeasureUnit::create(13, 24, status); +} + +MeasureUnit MeasureUnit::getRin() { + return MeasureUnit(13, 24); +} + +MeasureUnit *MeasureUnit::createRod(UErrorCode &status) { + return MeasureUnit::create(13, 25, status); +} + +MeasureUnit MeasureUnit::getRod() { + return MeasureUnit(13, 25); +} + +MeasureUnit *MeasureUnit::createShakuCloth(UErrorCode &status) { + return MeasureUnit::create(13, 26, status); +} + +MeasureUnit MeasureUnit::getShakuCloth() { + return MeasureUnit(13, 26); +} + +MeasureUnit *MeasureUnit::createShakuLength(UErrorCode &status) { + return MeasureUnit::create(13, 27, status); +} + +MeasureUnit MeasureUnit::getShakuLength() { + return MeasureUnit(13, 27); } MeasureUnit *MeasureUnit::createSolarRadius(UErrorCode &status) { - return MeasureUnit::create(13, 20, status); + return MeasureUnit::create(13, 28, status); } MeasureUnit MeasureUnit::getSolarRadius() { - return MeasureUnit(13, 20); + return MeasureUnit(13, 28); +} + +MeasureUnit *MeasureUnit::createSun(UErrorCode &status) { + return MeasureUnit::create(13, 29, status); +} + +MeasureUnit MeasureUnit::getSun() { + return MeasureUnit(13, 29); } MeasureUnit *MeasureUnit::createYard(UErrorCode &status) { - return MeasureUnit::create(13, 21, status); + return MeasureUnit::create(13, 30, status); } MeasureUnit MeasureUnit::getYard() { - return MeasureUnit(13, 21); + return MeasureUnit(13, 30); } MeasureUnit *MeasureUnit::createCandela(UErrorCode &status) { @@ -1516,636 +1784,764 @@ MeasureUnit MeasureUnit::getSolarLuminosity() { return MeasureUnit(14, 3); } -MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) { +MeasureUnit *MeasureUnit::createTesla(UErrorCode &status) { return MeasureUnit::create(15, 0, status); } -MeasureUnit MeasureUnit::getCarat() { +MeasureUnit MeasureUnit::getTesla() { return MeasureUnit(15, 0); } -MeasureUnit *MeasureUnit::createDalton(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWeber(UErrorCode &status) { return MeasureUnit::create(15, 1, status); } -MeasureUnit MeasureUnit::getDalton() { +MeasureUnit MeasureUnit::getWeber() { return MeasureUnit(15, 1); } +MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) { + return MeasureUnit::create(16, 0, status); +} + +MeasureUnit MeasureUnit::getCarat() { + return MeasureUnit(16, 0); +} + +MeasureUnit *MeasureUnit::createDalton(UErrorCode &status) { + return MeasureUnit::create(16, 1, status); +} + +MeasureUnit MeasureUnit::getDalton() { + return MeasureUnit(16, 1); +} + MeasureUnit *MeasureUnit::createEarthMass(UErrorCode &status) { - return MeasureUnit::create(15, 2, status); + return MeasureUnit::create(16, 2, status); } MeasureUnit MeasureUnit::getEarthMass() { - return MeasureUnit(15, 2); + return MeasureUnit(16, 2); +} + +MeasureUnit *MeasureUnit::createFun(UErrorCode &status) { + return MeasureUnit::create(16, 3, status); +} + +MeasureUnit MeasureUnit::getFun() { + return MeasureUnit(16, 3); } MeasureUnit *MeasureUnit::createGrain(UErrorCode &status) { - return MeasureUnit::create(15, 3, status); + return MeasureUnit::create(16, 4, status); } MeasureUnit MeasureUnit::getGrain() { - return MeasureUnit(15, 3); + return MeasureUnit(16, 4); } MeasureUnit *MeasureUnit::createGram(UErrorCode &status) { - return MeasureUnit::create(15, 4, status); + return MeasureUnit::create(16, 5, status); } MeasureUnit MeasureUnit::getGram() { - return MeasureUnit(15, 4); + return MeasureUnit(16, 5); } MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) { - return MeasureUnit::create(15, 5, status); + return MeasureUnit::create(16, 6, status); } MeasureUnit MeasureUnit::getKilogram() { - return MeasureUnit(15, 5); + return MeasureUnit(16, 6); } MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { - return MeasureUnit::create(15, 6, status); + return MeasureUnit::create(16, 7, status); } MeasureUnit MeasureUnit::getMicrogram() { - return MeasureUnit(15, 6); + return MeasureUnit(16, 7); } MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { - return MeasureUnit::create(15, 7, status); + return MeasureUnit::create(16, 8, status); } MeasureUnit MeasureUnit::getMilligram() { - return MeasureUnit(15, 7); + return MeasureUnit(16, 8); } MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { - return MeasureUnit::create(15, 8, status); + return MeasureUnit::create(16, 9, status); } MeasureUnit MeasureUnit::getOunce() { - return MeasureUnit(15, 8); + return MeasureUnit(16, 9); } MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { - return MeasureUnit::create(15, 9, status); + return MeasureUnit::create(16, 10, status); } MeasureUnit MeasureUnit::getOunceTroy() { - return MeasureUnit(15, 9); + return MeasureUnit(16, 10); } MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { - return MeasureUnit::create(15, 10, status); + return MeasureUnit::create(16, 11, status); } MeasureUnit MeasureUnit::getPound() { - return MeasureUnit(15, 10); + return MeasureUnit(16, 11); +} + +MeasureUnit *MeasureUnit::createSlug(UErrorCode &status) { + return MeasureUnit::create(16, 12, status); +} + +MeasureUnit MeasureUnit::getSlug() { + return MeasureUnit(16, 12); } MeasureUnit *MeasureUnit::createSolarMass(UErrorCode &status) { - return MeasureUnit::create(15, 11, status); + return MeasureUnit::create(16, 13, status); } MeasureUnit MeasureUnit::getSolarMass() { - return MeasureUnit(15, 11); + return MeasureUnit(16, 13); } MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { - return MeasureUnit::create(15, 12, status); + return MeasureUnit::create(16, 14, status); } MeasureUnit MeasureUnit::getStone() { - return MeasureUnit(15, 12); + return MeasureUnit(16, 14); } MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { - return MeasureUnit::create(15, 13, status); + return MeasureUnit::create(16, 15, status); } MeasureUnit MeasureUnit::getTon() { - return MeasureUnit(15, 13); + return MeasureUnit(16, 15); } MeasureUnit *MeasureUnit::createTonne(UErrorCode &status) { - return MeasureUnit::create(15, 14, status); + return MeasureUnit::create(16, 16, status); } MeasureUnit MeasureUnit::getTonne() { - return MeasureUnit(15, 14); + return MeasureUnit(16, 16); } MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { - return MeasureUnit::create(15, 14, status); + return MeasureUnit::create(16, 16, status); } MeasureUnit MeasureUnit::getMetricTon() { - return MeasureUnit(15, 14); + return MeasureUnit(16, 16); } MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) { - return MeasureUnit::create(17, 0, status); + return MeasureUnit::create(18, 0, status); } MeasureUnit MeasureUnit::getGigawatt() { - return MeasureUnit(17, 0); + return MeasureUnit(18, 0); } MeasureUnit *MeasureUnit::createHorsepower(UErrorCode &status) { - return MeasureUnit::create(17, 1, status); + return MeasureUnit::create(18, 1, status); } MeasureUnit MeasureUnit::getHorsepower() { - return MeasureUnit(17, 1); + return MeasureUnit(18, 1); } MeasureUnit *MeasureUnit::createKilowatt(UErrorCode &status) { - return MeasureUnit::create(17, 2, status); + return MeasureUnit::create(18, 2, status); } MeasureUnit MeasureUnit::getKilowatt() { - return MeasureUnit(17, 2); + return MeasureUnit(18, 2); } MeasureUnit *MeasureUnit::createMegawatt(UErrorCode &status) { - return MeasureUnit::create(17, 3, status); + return MeasureUnit::create(18, 3, status); } MeasureUnit MeasureUnit::getMegawatt() { - return MeasureUnit(17, 3); + return MeasureUnit(18, 3); } MeasureUnit *MeasureUnit::createMilliwatt(UErrorCode &status) { - return MeasureUnit::create(17, 4, status); + return MeasureUnit::create(18, 4, status); } MeasureUnit MeasureUnit::getMilliwatt() { - return MeasureUnit(17, 4); + return MeasureUnit(18, 4); } MeasureUnit *MeasureUnit::createWatt(UErrorCode &status) { - return MeasureUnit::create(17, 5, status); + return MeasureUnit::create(18, 5, status); } MeasureUnit MeasureUnit::getWatt() { - return MeasureUnit(17, 5); + return MeasureUnit(18, 5); } MeasureUnit *MeasureUnit::createAtmosphere(UErrorCode &status) { - return MeasureUnit::create(18, 0, status); + return MeasureUnit::create(19, 0, status); } MeasureUnit MeasureUnit::getAtmosphere() { - return MeasureUnit(18, 0); + return MeasureUnit(19, 0); } MeasureUnit *MeasureUnit::createBar(UErrorCode &status) { - return MeasureUnit::create(18, 1, status); + return MeasureUnit::create(19, 1, status); } MeasureUnit MeasureUnit::getBar() { - return MeasureUnit(18, 1); + return MeasureUnit(19, 1); } MeasureUnit *MeasureUnit::createGasolineEnergyDensity(UErrorCode &status) { - return MeasureUnit::create(18, 2, status); + return MeasureUnit::create(19, 2, status); } MeasureUnit MeasureUnit::getGasolineEnergyDensity() { - return MeasureUnit(18, 2); + return MeasureUnit(19, 2); } MeasureUnit *MeasureUnit::createHectopascal(UErrorCode &status) { - return MeasureUnit::create(18, 3, status); + return MeasureUnit::create(19, 3, status); } MeasureUnit MeasureUnit::getHectopascal() { - return MeasureUnit(18, 3); + return MeasureUnit(19, 3); } MeasureUnit *MeasureUnit::createInchHg(UErrorCode &status) { - return MeasureUnit::create(18, 4, status); + return MeasureUnit::create(19, 4, status); } MeasureUnit MeasureUnit::getInchHg() { - return MeasureUnit(18, 4); + return MeasureUnit(19, 4); } MeasureUnit *MeasureUnit::createKilopascal(UErrorCode &status) { - return MeasureUnit::create(18, 5, status); + return MeasureUnit::create(19, 5, status); } MeasureUnit MeasureUnit::getKilopascal() { - return MeasureUnit(18, 5); + return MeasureUnit(19, 5); } MeasureUnit *MeasureUnit::createMegapascal(UErrorCode &status) { - return MeasureUnit::create(18, 6, status); + return MeasureUnit::create(19, 6, status); } MeasureUnit MeasureUnit::getMegapascal() { - return MeasureUnit(18, 6); + return MeasureUnit(19, 6); } MeasureUnit *MeasureUnit::createMillibar(UErrorCode &status) { - return MeasureUnit::create(18, 7, status); + return MeasureUnit::create(19, 7, status); } MeasureUnit MeasureUnit::getMillibar() { - return MeasureUnit(18, 7); + return MeasureUnit(19, 7); } MeasureUnit *MeasureUnit::createMillimeterOfMercury(UErrorCode &status) { - return MeasureUnit::create(18, 8, status); + return MeasureUnit::create(19, 8, status); } MeasureUnit MeasureUnit::getMillimeterOfMercury() { - return MeasureUnit(18, 8); + return MeasureUnit(19, 8); +} + +MeasureUnit *MeasureUnit::createOfhg(UErrorCode &status) { + return MeasureUnit::create(19, 9, status); +} + +MeasureUnit MeasureUnit::getOfhg() { + return MeasureUnit(19, 9); } MeasureUnit *MeasureUnit::createPascal(UErrorCode &status) { - return MeasureUnit::create(18, 9, status); + return MeasureUnit::create(19, 10, status); } MeasureUnit MeasureUnit::getPascal() { - return MeasureUnit(18, 9); + return MeasureUnit(19, 10); } MeasureUnit *MeasureUnit::createPoundPerSquareInch(UErrorCode &status) { - return MeasureUnit::create(18, 10, status); + return MeasureUnit::create(19, 11, status); } MeasureUnit MeasureUnit::getPoundPerSquareInch() { - return MeasureUnit(18, 10); + return MeasureUnit(19, 11); } MeasureUnit *MeasureUnit::createBeaufort(UErrorCode &status) { - return MeasureUnit::create(19, 0, status); + return MeasureUnit::create(20, 0, status); } MeasureUnit MeasureUnit::getBeaufort() { - return MeasureUnit(19, 0); + return MeasureUnit(20, 0); } MeasureUnit *MeasureUnit::createKilometerPerHour(UErrorCode &status) { - return MeasureUnit::create(19, 1, status); + return MeasureUnit::create(20, 1, status); } MeasureUnit MeasureUnit::getKilometerPerHour() { - return MeasureUnit(19, 1); + return MeasureUnit(20, 1); } MeasureUnit *MeasureUnit::createKnot(UErrorCode &status) { - return MeasureUnit::create(19, 2, status); + return MeasureUnit::create(20, 2, status); } MeasureUnit MeasureUnit::getKnot() { - return MeasureUnit(19, 2); + return MeasureUnit(20, 2); } MeasureUnit *MeasureUnit::createLightSpeed(UErrorCode &status) { - return MeasureUnit::create(19, 3, status); + return MeasureUnit::create(20, 3, status); } MeasureUnit MeasureUnit::getLightSpeed() { - return MeasureUnit(19, 3); + return MeasureUnit(20, 3); } MeasureUnit *MeasureUnit::createMeterPerSecond(UErrorCode &status) { - return MeasureUnit::create(19, 4, status); + return MeasureUnit::create(20, 4, status); } MeasureUnit MeasureUnit::getMeterPerSecond() { - return MeasureUnit(19, 4); + return MeasureUnit(20, 4); } MeasureUnit *MeasureUnit::createMilePerHour(UErrorCode &status) { - return MeasureUnit::create(19, 5, status); + return MeasureUnit::create(20, 5, status); } MeasureUnit MeasureUnit::getMilePerHour() { - return MeasureUnit(19, 5); + return MeasureUnit(20, 5); } MeasureUnit *MeasureUnit::createCelsius(UErrorCode &status) { - return MeasureUnit::create(20, 0, status); + return MeasureUnit::create(21, 0, status); } MeasureUnit MeasureUnit::getCelsius() { - return MeasureUnit(20, 0); + return MeasureUnit(21, 0); } MeasureUnit *MeasureUnit::createFahrenheit(UErrorCode &status) { - return MeasureUnit::create(20, 1, status); + return MeasureUnit::create(21, 1, status); } MeasureUnit MeasureUnit::getFahrenheit() { - return MeasureUnit(20, 1); + return MeasureUnit(21, 1); } MeasureUnit *MeasureUnit::createGenericTemperature(UErrorCode &status) { - return MeasureUnit::create(20, 2, status); + return MeasureUnit::create(21, 2, status); } MeasureUnit MeasureUnit::getGenericTemperature() { - return MeasureUnit(20, 2); + return MeasureUnit(21, 2); } MeasureUnit *MeasureUnit::createKelvin(UErrorCode &status) { - return MeasureUnit::create(20, 3, status); + return MeasureUnit::create(21, 3, status); } MeasureUnit MeasureUnit::getKelvin() { - return MeasureUnit(20, 3); + return MeasureUnit(21, 3); +} + +MeasureUnit *MeasureUnit::createRankine(UErrorCode &status) { + return MeasureUnit::create(21, 4, status); +} + +MeasureUnit MeasureUnit::getRankine() { + return MeasureUnit(21, 4); } MeasureUnit *MeasureUnit::createNewtonMeter(UErrorCode &status) { - return MeasureUnit::create(21, 0, status); + return MeasureUnit::create(22, 0, status); } MeasureUnit MeasureUnit::getNewtonMeter() { - return MeasureUnit(21, 0); + return MeasureUnit(22, 0); } MeasureUnit *MeasureUnit::createPoundFoot(UErrorCode &status) { - return MeasureUnit::create(21, 1, status); + return MeasureUnit::create(22, 1, status); } MeasureUnit MeasureUnit::getPoundFoot() { - return MeasureUnit(21, 1); + return MeasureUnit(22, 1); } MeasureUnit *MeasureUnit::createAcreFoot(UErrorCode &status) { - return MeasureUnit::create(22, 0, status); + return MeasureUnit::create(23, 0, status); } MeasureUnit MeasureUnit::getAcreFoot() { - return MeasureUnit(22, 0); + return MeasureUnit(23, 0); } MeasureUnit *MeasureUnit::createBarrel(UErrorCode &status) { - return MeasureUnit::create(22, 1, status); + return MeasureUnit::create(23, 1, status); } MeasureUnit MeasureUnit::getBarrel() { - return MeasureUnit(22, 1); + return MeasureUnit(23, 1); } MeasureUnit *MeasureUnit::createBushel(UErrorCode &status) { - return MeasureUnit::create(22, 2, status); + return MeasureUnit::create(23, 2, status); } MeasureUnit MeasureUnit::getBushel() { - return MeasureUnit(22, 2); + return MeasureUnit(23, 2); } MeasureUnit *MeasureUnit::createCentiliter(UErrorCode &status) { - return MeasureUnit::create(22, 3, status); + return MeasureUnit::create(23, 3, status); } MeasureUnit MeasureUnit::getCentiliter() { - return MeasureUnit(22, 3); + return MeasureUnit(23, 3); } MeasureUnit *MeasureUnit::createCubicCentimeter(UErrorCode &status) { - return MeasureUnit::create(22, 4, status); + return MeasureUnit::create(23, 4, status); } MeasureUnit MeasureUnit::getCubicCentimeter() { - return MeasureUnit(22, 4); + return MeasureUnit(23, 4); } MeasureUnit *MeasureUnit::createCubicFoot(UErrorCode &status) { - return MeasureUnit::create(22, 5, status); + return MeasureUnit::create(23, 5, status); } MeasureUnit MeasureUnit::getCubicFoot() { - return MeasureUnit(22, 5); + return MeasureUnit(23, 5); } MeasureUnit *MeasureUnit::createCubicInch(UErrorCode &status) { - return MeasureUnit::create(22, 6, status); + return MeasureUnit::create(23, 6, status); } MeasureUnit MeasureUnit::getCubicInch() { - return MeasureUnit(22, 6); + return MeasureUnit(23, 6); } MeasureUnit *MeasureUnit::createCubicKilometer(UErrorCode &status) { - return MeasureUnit::create(22, 7, status); + return MeasureUnit::create(23, 7, status); } MeasureUnit MeasureUnit::getCubicKilometer() { - return MeasureUnit(22, 7); + return MeasureUnit(23, 7); } MeasureUnit *MeasureUnit::createCubicMeter(UErrorCode &status) { - return MeasureUnit::create(22, 8, status); + return MeasureUnit::create(23, 8, status); } MeasureUnit MeasureUnit::getCubicMeter() { - return MeasureUnit(22, 8); + return MeasureUnit(23, 8); } MeasureUnit *MeasureUnit::createCubicMile(UErrorCode &status) { - return MeasureUnit::create(22, 9, status); + return MeasureUnit::create(23, 9, status); } MeasureUnit MeasureUnit::getCubicMile() { - return MeasureUnit(22, 9); + return MeasureUnit(23, 9); } MeasureUnit *MeasureUnit::createCubicYard(UErrorCode &status) { - return MeasureUnit::create(22, 10, status); + return MeasureUnit::create(23, 10, status); } MeasureUnit MeasureUnit::getCubicYard() { - return MeasureUnit(22, 10); + return MeasureUnit(23, 10); } MeasureUnit *MeasureUnit::createCup(UErrorCode &status) { - return MeasureUnit::create(22, 11, status); + return MeasureUnit::create(23, 11, status); } MeasureUnit MeasureUnit::getCup() { - return MeasureUnit(22, 11); + return MeasureUnit(23, 11); +} + +MeasureUnit *MeasureUnit::createCupImperial(UErrorCode &status) { + return MeasureUnit::create(23, 12, status); +} + +MeasureUnit MeasureUnit::getCupImperial() { + return MeasureUnit(23, 12); +} + +MeasureUnit *MeasureUnit::createCupJp(UErrorCode &status) { + return MeasureUnit::create(23, 13, status); +} + +MeasureUnit MeasureUnit::getCupJp() { + return MeasureUnit(23, 13); } MeasureUnit *MeasureUnit::createCupMetric(UErrorCode &status) { - return MeasureUnit::create(22, 12, status); + return MeasureUnit::create(23, 14, status); } MeasureUnit MeasureUnit::getCupMetric() { - return MeasureUnit(22, 12); + return MeasureUnit(23, 14); } MeasureUnit *MeasureUnit::createDeciliter(UErrorCode &status) { - return MeasureUnit::create(22, 13, status); + return MeasureUnit::create(23, 15, status); } MeasureUnit MeasureUnit::getDeciliter() { - return MeasureUnit(22, 13); + return MeasureUnit(23, 15); } MeasureUnit *MeasureUnit::createDessertSpoon(UErrorCode &status) { - return MeasureUnit::create(22, 14, status); + return MeasureUnit::create(23, 16, status); } MeasureUnit MeasureUnit::getDessertSpoon() { - return MeasureUnit(22, 14); + return MeasureUnit(23, 16); } MeasureUnit *MeasureUnit::createDessertSpoonImperial(UErrorCode &status) { - return MeasureUnit::create(22, 15, status); + return MeasureUnit::create(23, 17, status); } MeasureUnit MeasureUnit::getDessertSpoonImperial() { - return MeasureUnit(22, 15); + return MeasureUnit(23, 17); } MeasureUnit *MeasureUnit::createDram(UErrorCode &status) { - return MeasureUnit::create(22, 16, status); + return MeasureUnit::create(23, 18, status); } MeasureUnit MeasureUnit::getDram() { - return MeasureUnit(22, 16); + return MeasureUnit(23, 18); } MeasureUnit *MeasureUnit::createDrop(UErrorCode &status) { - return MeasureUnit::create(22, 17, status); + return MeasureUnit::create(23, 19, status); } MeasureUnit MeasureUnit::getDrop() { - return MeasureUnit(22, 17); + return MeasureUnit(23, 19); } MeasureUnit *MeasureUnit::createFluidOunce(UErrorCode &status) { - return MeasureUnit::create(22, 18, status); + return MeasureUnit::create(23, 20, status); } MeasureUnit MeasureUnit::getFluidOunce() { - return MeasureUnit(22, 18); + return MeasureUnit(23, 20); } MeasureUnit *MeasureUnit::createFluidOunceImperial(UErrorCode &status) { - return MeasureUnit::create(22, 19, status); + return MeasureUnit::create(23, 21, status); } MeasureUnit MeasureUnit::getFluidOunceImperial() { - return MeasureUnit(22, 19); + return MeasureUnit(23, 21); +} + +MeasureUnit *MeasureUnit::createFluidOunceMetric(UErrorCode &status) { + return MeasureUnit::create(23, 22, status); +} + +MeasureUnit MeasureUnit::getFluidOunceMetric() { + return MeasureUnit(23, 22); } MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) { - return MeasureUnit::create(22, 20, status); + return MeasureUnit::create(23, 23, status); } MeasureUnit MeasureUnit::getGallon() { - return MeasureUnit(22, 20); + return MeasureUnit(23, 23); } MeasureUnit *MeasureUnit::createGallonImperial(UErrorCode &status) { - return MeasureUnit::create(22, 21, status); + return MeasureUnit::create(23, 24, status); } MeasureUnit MeasureUnit::getGallonImperial() { - return MeasureUnit(22, 21); + return MeasureUnit(23, 24); } MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) { - return MeasureUnit::create(22, 22, status); + return MeasureUnit::create(23, 25, status); } MeasureUnit MeasureUnit::getHectoliter() { - return MeasureUnit(22, 22); + return MeasureUnit(23, 25); } MeasureUnit *MeasureUnit::createJigger(UErrorCode &status) { - return MeasureUnit::create(22, 23, status); + return MeasureUnit::create(23, 26, status); } MeasureUnit MeasureUnit::getJigger() { - return MeasureUnit(22, 23); + return MeasureUnit(23, 26); +} + +MeasureUnit *MeasureUnit::createKoku(UErrorCode &status) { + return MeasureUnit::create(23, 27, status); +} + +MeasureUnit MeasureUnit::getKoku() { + return MeasureUnit(23, 27); +} + +MeasureUnit *MeasureUnit::createKosaji(UErrorCode &status) { + return MeasureUnit::create(23, 28, status); +} + +MeasureUnit MeasureUnit::getKosaji() { + return MeasureUnit(23, 28); } MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) { - return MeasureUnit::create(22, 24, status); + return MeasureUnit::create(23, 29, status); } MeasureUnit MeasureUnit::getLiter() { - return MeasureUnit(22, 24); + return MeasureUnit(23, 29); } MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) { - return MeasureUnit::create(22, 25, status); + return MeasureUnit::create(23, 30, status); } MeasureUnit MeasureUnit::getMegaliter() { - return MeasureUnit(22, 25); + return MeasureUnit(23, 30); } MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) { - return MeasureUnit::create(22, 26, status); + return MeasureUnit::create(23, 31, status); } MeasureUnit MeasureUnit::getMilliliter() { - return MeasureUnit(22, 26); + return MeasureUnit(23, 31); +} + +MeasureUnit *MeasureUnit::createOsaji(UErrorCode &status) { + return MeasureUnit::create(23, 32, status); +} + +MeasureUnit MeasureUnit::getOsaji() { + return MeasureUnit(23, 32); } MeasureUnit *MeasureUnit::createPinch(UErrorCode &status) { - return MeasureUnit::create(22, 27, status); + return MeasureUnit::create(23, 33, status); } MeasureUnit MeasureUnit::getPinch() { - return MeasureUnit(22, 27); + return MeasureUnit(23, 33); } MeasureUnit *MeasureUnit::createPint(UErrorCode &status) { - return MeasureUnit::create(22, 28, status); + return MeasureUnit::create(23, 34, status); } MeasureUnit MeasureUnit::getPint() { - return MeasureUnit(22, 28); + return MeasureUnit(23, 34); +} + +MeasureUnit *MeasureUnit::createPintImperial(UErrorCode &status) { + return MeasureUnit::create(23, 35, status); +} + +MeasureUnit MeasureUnit::getPintImperial() { + return MeasureUnit(23, 35); } MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) { - return MeasureUnit::create(22, 29, status); + return MeasureUnit::create(23, 36, status); } MeasureUnit MeasureUnit::getPintMetric() { - return MeasureUnit(22, 29); + return MeasureUnit(23, 36); } MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) { - return MeasureUnit::create(22, 30, status); + return MeasureUnit::create(23, 37, status); } MeasureUnit MeasureUnit::getQuart() { - return MeasureUnit(22, 30); + return MeasureUnit(23, 37); } MeasureUnit *MeasureUnit::createQuartImperial(UErrorCode &status) { - return MeasureUnit::create(22, 31, status); + return MeasureUnit::create(23, 38, status); } MeasureUnit MeasureUnit::getQuartImperial() { - return MeasureUnit(22, 31); + return MeasureUnit(23, 38); +} + +MeasureUnit *MeasureUnit::createSai(UErrorCode &status) { + return MeasureUnit::create(23, 39, status); +} + +MeasureUnit MeasureUnit::getSai() { + return MeasureUnit(23, 39); +} + +MeasureUnit *MeasureUnit::createShaku(UErrorCode &status) { + return MeasureUnit::create(23, 40, status); +} + +MeasureUnit MeasureUnit::getShaku() { + return MeasureUnit(23, 40); } MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) { - return MeasureUnit::create(22, 32, status); + return MeasureUnit::create(23, 41, status); } MeasureUnit MeasureUnit::getTablespoon() { - return MeasureUnit(22, 32); + return MeasureUnit(23, 41); } MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) { - return MeasureUnit::create(22, 33, status); + return MeasureUnit::create(23, 42, status); } MeasureUnit MeasureUnit::getTeaspoon() { - return MeasureUnit(22, 33); + return MeasureUnit(23, 42); +} + +MeasureUnit *MeasureUnit::createToJp(UErrorCode &status) { + return MeasureUnit::create(23, 43, status); +} + +MeasureUnit MeasureUnit::getToJp() { + return MeasureUnit(23, 43); } // End generated code for measunit.cpp diff --git a/icu4c/source/i18n/nfrule.cpp b/icu4c/source/i18n/nfrule.cpp index ef7f5924c4eb..26a6e818d5a9 100644 --- a/icu4c/source/i18n/nfrule.cpp +++ b/icu4c/source/i18n/nfrule.cpp @@ -113,11 +113,17 @@ NFRule::makeRules(UnicodeString& description, NFRuleList& rules, UErrorCode& status) { + if (U_FAILURE(status)) { + return; + } // we know we're making at least one rule, so go ahead and // new it up and initialize its basevalue and divisor // (this also strips the rule descriptor, if any, off the // description string) LocalPointer rule1(new NFRule(rbnf, description, status)); + if (U_FAILURE(status)) { + return; + } /* test for nullptr */ if (rule1.isNull()) { status = U_MEMORY_ALLOCATION_ERROR; @@ -141,6 +147,9 @@ NFRule::makeRules(UnicodeString& description, || rule1->getType() == kNaNRule) { rule1->extractSubstitutions(owner, description, predecessor, status); + if (U_FAILURE(status)) { + return; + } } else { // if the description does contain a matched pair of brackets, @@ -153,6 +162,7 @@ NFRule::makeRules(UnicodeString& description, // base value is an even multiple of its divisor (or it's one // of the special rules) if ((rule1->baseValue > 0 + && (rule1->radix != 0) // ICU-23109 Ensure next line won't "% 0" && (rule1->baseValue % util64_pow(rule1->radix, rule1->exponent)) == 0) || rule1->getType() == kImproperFractionRule || rule1->getType() == kDefaultRule) { @@ -163,6 +173,9 @@ NFRule::makeRules(UnicodeString& description, // increment the original rule's base value ("rule1" actually // goes SECOND in the rule set's rule list) rule2.adoptInstead(new NFRule(rbnf, UnicodeString(), status)); + if (U_FAILURE(status)) { + return; + } /* test for nullptr */ if (rule2.isNull()) { status = U_MEMORY_ALLOCATION_ERROR; @@ -206,6 +219,9 @@ NFRule::makeRules(UnicodeString& description, sbuf.append(description, brack2 + 1, description.length() - brack2 - 1); } rule2->extractSubstitutions(owner, sbuf, predecessor, status); + if (U_FAILURE(status)) { + return; + } } // rule1's text includes the text in the brackets but omits @@ -222,6 +238,9 @@ NFRule::makeRules(UnicodeString& description, sbuf.append(description, brack2 + 1, description.length() - brack2 - 1); } rule1->extractSubstitutions(owner, sbuf, predecessor, status); + if (U_FAILURE(status)) { + return; + } // if we only have one rule, return it; if we have two, return // a two-element array containing them (notice that rule2 goes diff --git a/icu4c/source/i18n/numrange_impl.cpp b/icu4c/source/i18n/numrange_impl.cpp index 002a8b2a2101..0b1590158a4c 100644 --- a/icu4c/source/i18n/numrange_impl.cpp +++ b/icu4c/source/i18n/numrange_impl.cpp @@ -160,6 +160,8 @@ void NumberRangeFormatterImpl::format(UFormattedNumberRangeData& data, bool equa return; } + DecimalQuantity quantityBackup(data.quantity1); + MicroProps micros1; MicroProps micros2; formatterImpl1.preProcess(data.quantity1, micros1, status); @@ -216,7 +218,7 @@ void NumberRangeFormatterImpl::format(UFormattedNumberRangeData& data, bool equa UNUM_IDENTITY_RESULT_EQUAL_BEFORE_ROUNDING): case identity2d(UNUM_IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, UNUM_IDENTITY_RESULT_EQUAL_AFTER_ROUNDING): - formatApproximately(data, micros1, micros2, status); + formatApproximately(data, quantityBackup, micros1, micros2, status); break; case identity2d(UNUM_IDENTITY_FALLBACK_APPROXIMATELY_OR_SINGLE_VALUE, @@ -248,15 +250,15 @@ void NumberRangeFormatterImpl::formatSingleValue(UFormattedNumberRangeData& data void NumberRangeFormatterImpl::formatApproximately (UFormattedNumberRangeData& data, + DecimalQuantity quantity, MicroProps& micros1, MicroProps& micros2, UErrorCode& status) const { if (U_FAILURE(status)) { return; } if (fSameFormatters) { // Re-format using the approximately formatter: MicroProps microsAppx; - data.quantity1.resetExponent(); - fApproximatelyFormatter.preProcess(data.quantity1, microsAppx, status); - int32_t length = NumberFormatterImpl::writeNumber(microsAppx.simple, data.quantity1, data.getStringRef(), 0, status); + fApproximatelyFormatter.preProcess(quantity, microsAppx, status); + int32_t length = NumberFormatterImpl::writeNumber(microsAppx.simple, quantity, data.getStringRef(), 0, status); length += microsAppx.modInner->apply(data.getStringRef(), 0, length, status); length += microsAppx.modMiddle->apply(data.getStringRef(), 0, length, status); microsAppx.modOuter->apply(data.getStringRef(), 0, length, status); diff --git a/icu4c/source/i18n/numrange_impl.h b/icu4c/source/i18n/numrange_impl.h index cdee3d84ee73..7d024816c436 100644 --- a/icu4c/source/i18n/numrange_impl.h +++ b/icu4c/source/i18n/numrange_impl.h @@ -64,6 +64,7 @@ class NumberRangeFormatterImpl : public UMemory { UErrorCode& status) const; void formatApproximately(UFormattedNumberRangeData& data, + DecimalQuantity quantity, MicroProps& micros1, MicroProps& micros2, UErrorCode& status) const; diff --git a/icu4c/source/i18n/persncal.cpp b/icu4c/source/i18n/persncal.cpp index 792a88807956..3375216cca10 100644 --- a/icu4c/source/i18n/persncal.cpp +++ b/icu4c/source/i18n/persncal.cpp @@ -319,30 +319,14 @@ void PersianCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) internalSet(UCAL_DAY_OF_YEAR, dayOfYear); } -constexpr uint32_t kPersianRelatedYearDiff = 622; - -int32_t PersianCalendar::getRelatedYear(UErrorCode &status) const -{ - int32_t year = get(UCAL_EXTENDED_YEAR, status); - if (U_FAILURE(status)) { - return 0; - } - if (uprv_add32_overflow(year, kPersianRelatedYearDiff, &year)) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; - } - return year; -} - -void PersianCalendar::setRelatedYear(int32_t year) -{ - // set extended year - set(UCAL_EXTENDED_YEAR, year - kPersianRelatedYearDiff); -} - IMPL_SYSTEM_DEFAULT_CENTURY(PersianCalendar, "@calendar=persian") UOBJECT_DEFINE_RTTI_IMPLEMENTATION(PersianCalendar) +int32_t +PersianCalendar::getRelatedYearDifference() const { + constexpr int32_t kPersianCalendarRelatedYearDifference = 622; + return kPersianCalendarRelatedYearDifference; +} U_NAMESPACE_END diff --git a/icu4c/source/i18n/persncal.h b/icu4c/source/i18n/persncal.h index d5bff7b23274..8c550cd2d4c7 100644 --- a/icu4c/source/i18n/persncal.h +++ b/icu4c/source/i18n/persncal.h @@ -278,19 +278,11 @@ class PersianCalendar : public Calendar { */ virtual const char * getType() const override; + protected: /** - * @return The related Gregorian year; will be obtained by modifying the value - * obtained by get from UCAL_EXTENDED_YEAR field - * @internal - */ - virtual int32_t getRelatedYear(UErrorCode &status) const override; - - /** - * @param year The related Gregorian year to set; will be modified as necessary then - * set in UCAL_EXTENDED_YEAR field * @internal */ - virtual void setRelatedYear(int32_t year) override; + int32_t getRelatedYearDifference() const override; private: PersianCalendar(); // default constructor not implemented diff --git a/icu4c/source/i18n/rematch.cpp b/icu4c/source/i18n/rematch.cpp index 7864dffa4631..67c7875c8d8d 100644 --- a/icu4c/source/i18n/rematch.cpp +++ b/icu4c/source/i18n/rematch.cpp @@ -1218,12 +1218,15 @@ UnicodeString RegexMatcher::group(int32_t groupNum, UErrorCode &status) const { // Get the group length using a utext_extract preflight. // UText is actually pretty efficient at this when underlying encoding is UTF-16. - int32_t length = utext_extract(fInputText, groupStart, groupEnd, nullptr, 0, &status); - if (status != U_BUFFER_OVERFLOW_ERROR) { + UErrorCode bufferStatus = U_ZERO_ERROR; + int32_t length = utext_extract(fInputText, groupStart, groupEnd, nullptr, 0, &bufferStatus); + if (bufferStatus != U_BUFFER_OVERFLOW_ERROR) { + if (U_FAILURE(bufferStatus)) { + status = bufferStatus; + } return result; } - status = U_ZERO_ERROR; char16_t *buf = result.getBuffer(length); if (buf == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; @@ -1995,11 +1998,12 @@ static UText *utext_extract_replace(UText *src, UText *dest, int64_t start, int6 return utext_openUChars(nullptr, nullptr, 0, status); } } - int32_t length = utext_extract(src, start, limit, nullptr, 0, status); - if (*status != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(*status)) { + UErrorCode bufferStatus = U_ZERO_ERROR; + int32_t length = utext_extract(src, start, limit, nullptr, 0, &bufferStatus); + if (bufferStatus != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(bufferStatus)) { + *status = bufferStatus; return dest; } - *status = U_ZERO_ERROR; MaybeStackArray buffer; if (length >= buffer.getCapacity()) { char16_t *newBuf = buffer.resize(length+1); // Leave space for terminating Nul. diff --git a/icu4c/source/i18n/unicode/calendar.h b/icu4c/source/i18n/unicode/calendar.h index 4499e281f9c5..0c77f83ae33d 100644 --- a/icu4c/source/i18n/unicode/calendar.h +++ b/icu4c/source/i18n/unicode/calendar.h @@ -1555,6 +1555,14 @@ class U_I18N_API Calendar : public UObject { * @internal */ virtual bool isEra0CountingBackward() const { return false; } + + /** + * Related year difference. + * @return The difference in Related year. + * @internal + */ + virtual int32_t getRelatedYearDifference() const; + #endif /* U_HIDE_INTERNAL_API */ /** diff --git a/icu4c/source/i18n/unicode/dtitvinf.h b/icu4c/source/i18n/unicode/dtitvinf.h index 5b9a45351c26..6d93310a2ee0 100644 --- a/icu4c/source/i18n/unicode/dtitvinf.h +++ b/icu4c/source/i18n/unicode/dtitvinf.h @@ -197,14 +197,13 @@ class U_I18N_API DateIntervalInfo final : public UObject { * @return a copy of the object * @stable ICU 4.0 */ - virtual DateIntervalInfo* clone() const; + DateIntervalInfo* clone() const; /** * Destructor. - * It is virtual to be safe, but it is not designed to be subclassed. * @stable ICU 4.0 */ - virtual ~DateIntervalInfo(); + ~DateIntervalInfo(); /** @@ -214,7 +213,7 @@ class U_I18N_API DateIntervalInfo final : public UObject { * @return true if other is semantically equal to this. * @stable ICU 4.0 */ - virtual bool operator==(const DateIntervalInfo& other) const; + bool operator==(const DateIntervalInfo& other) const; /** * Return true if another object is semantically unequal to this one. diff --git a/icu4c/source/i18n/unicode/gregocal.h b/icu4c/source/i18n/unicode/gregocal.h index cd84471c9ba1..588dc9b96269 100644 --- a/icu4c/source/i18n/unicode/gregocal.h +++ b/icu4c/source/i18n/unicode/gregocal.h @@ -675,13 +675,6 @@ class U_I18N_API GregorianCalendar: public Calendar { */ int32_t fCutoverJulianDay; - /** - * Midnight, local time (using this Calendar's TimeZone) at or before the - * gregorianCutover. This is a pure date value with no time of day or - * timezone component. - */ - UDate fNormalizedGregorianCutover;// = gregorianCutover; - /** * The year of the gregorianCutover, with 0 representing * 1 BC, -1 representing 2 BC, etc. diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h index f0abd4f4f92f..7c489c9a050e 100644 --- a/icu4c/source/i18n/unicode/measunit.h +++ b/icu4c/source/i18n/unicode/measunit.h @@ -875,6 +875,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getRevolutionAngle(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of angle: steradian. + * Caller owns returned value and must free it. + * Also see {@link #getSteradian()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSteradian(UErrorCode &status); + + /** + * Returns by value, unit of angle: steradian. + * Also see {@link #createSteradian()}. + * @draft ICU 78 + */ + static MeasureUnit getSteradian(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of area: acre. * Caller owns returned value and must free it. @@ -891,6 +909,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getAcre(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of area: bu-jp. + * Caller owns returned value and must free it. + * Also see {@link #getBuJp()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createBuJp(UErrorCode &status); + + /** + * Returns by value, unit of area: bu-jp. + * Also see {@link #createBuJp()}. + * @draft ICU 78 + */ + static MeasureUnit getBuJp(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of area: cho. + * Caller owns returned value and must free it. + * Also see {@link #getCho()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createCho(UErrorCode &status); + + /** + * Returns by value, unit of area: cho. + * Also see {@link #createCho()}. + * @draft ICU 78 + */ + static MeasureUnit getCho(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of area: dunam. * Caller owns returned value and must free it. @@ -923,6 +977,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getHectare(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of area: se-jp. + * Caller owns returned value and must free it. + * Also see {@link #getSeJp()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSeJp(UErrorCode &status); + + /** + * Returns by value, unit of area: se-jp. + * Also see {@link #createSeJp()}. + * @draft ICU 78 + */ + static MeasureUnit getSeJp(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of area: square-centimeter. * Caller owns returned value and must free it. @@ -1067,6 +1139,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getKarat(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of concentr: katal. + * Caller owns returned value and must free it. + * Also see {@link #getKatal()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createKatal(UErrorCode &status); + + /** + * Returns by value, unit of concentr: katal. + * Also see {@link #createKatal()}. + * @draft ICU 78 + */ + static MeasureUnit getKatal(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of concentr: milligram-ofglucose-per-deciliter. * Caller owns returned value and must free it. @@ -1085,7 +1175,9 @@ class U_I18N_API MeasureUnit: public UObject { /** * Returns by pointer, unit of concentr: milligram-per-deciliter. + * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69). * Caller owns returned value and must free it. + * Also see {@link #createMilligramOfglucosePerDeciliter()}. * Also see {@link #getMilligramPerDeciliter()}. * @param status ICU error code. * @stable ICU 57 @@ -1094,6 +1186,8 @@ class U_I18N_API MeasureUnit: public UObject { /** * Returns by value, unit of concentr: milligram-per-deciliter. + * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69). + * Also see {@link #getMilligramOfglucosePerDeciliter()}. * Also see {@link #createMilligramPerDeciliter()}. * @stable ICU 64 */ @@ -1131,41 +1225,65 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getMole(); +#ifndef U_HIDE_DRAFT_API /** - * Returns by pointer, unit of concentr: percent. + * Returns by pointer, unit of concentr: ofglucose. * Caller owns returned value and must free it. - * Also see {@link #getPercent()}. + * Also see {@link #getOfglucose()}. * @param status ICU error code. - * @stable ICU 63 + * @draft ICU 78 */ - static MeasureUnit *createPercent(UErrorCode &status); + static MeasureUnit *createOfglucose(UErrorCode &status); /** - * Returns by value, unit of concentr: percent. - * Also see {@link #createPercent()}. - * @stable ICU 64 + * Returns by value, unit of concentr: ofglucose. + * Also see {@link #createOfglucose()}. + * @draft ICU 78 */ - static MeasureUnit getPercent(); + static MeasureUnit getOfglucose(); +#endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API /** - * Returns by pointer, unit of concentr: permille. + * Returns by pointer, unit of concentr: part. * Caller owns returned value and must free it. - * Also see {@link #getPermille()}. + * Also see {@link #getPart()}. * @param status ICU error code. - * @stable ICU 63 + * @draft ICU 78 */ - static MeasureUnit *createPermille(UErrorCode &status); + static MeasureUnit *createPart(UErrorCode &status); /** - * Returns by value, unit of concentr: permille. - * Also see {@link #createPermille()}. - * @stable ICU 64 + * Returns by value, unit of concentr: part. + * Also see {@link #createPart()}. + * @draft ICU 78 */ - static MeasureUnit getPermille(); + static MeasureUnit getPart(); +#endif /* U_HIDE_DRAFT_API */ +#ifndef U_HIDE_DRAFT_API /** - * Returns by pointer, unit of concentr: permillion. + * Returns by pointer, unit of concentr: part-per-1e6. * Caller owns returned value and must free it. + * Also see {@link #getPartPer1E6()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createPartPer1E6(UErrorCode &status); + + /** + * Returns by value, unit of concentr: part-per-1e6. + * Also see {@link #createPartPer1E6()}. + * @draft ICU 78 + */ + static MeasureUnit getPartPer1E6(); +#endif /* U_HIDE_DRAFT_API */ + + /** + * Returns by pointer, unit of concentr: part-per-million. + * (renamed to part-per-1e6 in CLDR 48 / ICU 78). + * Caller owns returned value and must free it. + * Also see {@link #createPartPer1E6()}. * Also see {@link #getPartPerMillion()}. * @param status ICU error code. * @stable ICU 57 @@ -1173,45 +1291,79 @@ class U_I18N_API MeasureUnit: public UObject { static MeasureUnit *createPartPerMillion(UErrorCode &status); /** - * Returns by value, unit of concentr: permillion. + * Returns by value, unit of concentr: part-per-million. + * (renamed to part-per-1e6 in CLDR 48 / ICU 78). + * Also see {@link #getPartPer1E6()}. * Also see {@link #createPartPerMillion()}. * @stable ICU 64 */ static MeasureUnit getPartPerMillion(); +#ifndef U_HIDE_DRAFT_API /** - * Returns by pointer, unit of concentr: permyriad. + * Returns by pointer, unit of concentr: part-per-1e9. * Caller owns returned value and must free it. - * Also see {@link #getPermyriad()}. + * Also see {@link #getPartPer1E9()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createPartPer1E9(UErrorCode &status); + + /** + * Returns by value, unit of concentr: part-per-1e9. + * Also see {@link #createPartPer1E9()}. + * @draft ICU 78 + */ + static MeasureUnit getPartPer1E9(); +#endif /* U_HIDE_DRAFT_API */ + + /** + * Returns by pointer, unit of concentr: percent. + * Caller owns returned value and must free it. + * Also see {@link #getPercent()}. * @param status ICU error code. + * @stable ICU 63 + */ + static MeasureUnit *createPercent(UErrorCode &status); + + /** + * Returns by value, unit of concentr: percent. + * Also see {@link #createPercent()}. * @stable ICU 64 */ - static MeasureUnit *createPermyriad(UErrorCode &status); + static MeasureUnit getPercent(); /** - * Returns by value, unit of concentr: permyriad. - * Also see {@link #createPermyriad()}. + * Returns by pointer, unit of concentr: permille. + * Caller owns returned value and must free it. + * Also see {@link #getPermille()}. + * @param status ICU error code. + * @stable ICU 63 + */ + static MeasureUnit *createPermille(UErrorCode &status); + + /** + * Returns by value, unit of concentr: permille. + * Also see {@link #createPermille()}. * @stable ICU 64 */ - static MeasureUnit getPermyriad(); + static MeasureUnit getPermille(); -#ifndef U_HIDE_DRAFT_API /** - * Returns by pointer, unit of concentr: portion-per-1e9. + * Returns by pointer, unit of concentr: permyriad. * Caller owns returned value and must free it. - * Also see {@link #getPortionPer1E9()}. + * Also see {@link #getPermyriad()}. * @param status ICU error code. - * @draft ICU 77 + * @stable ICU 64 */ - static MeasureUnit *createPortionPer1E9(UErrorCode &status); + static MeasureUnit *createPermyriad(UErrorCode &status); /** - * Returns by value, unit of concentr: portion-per-1e9. - * Also see {@link #createPortionPer1E9()}. - * @draft ICU 77 + * Returns by value, unit of concentr: permyriad. + * Also see {@link #createPermyriad()}. + * @stable ICU 64 */ - static MeasureUnit getPortionPer1E9(); -#endif /* U_HIDE_DRAFT_API */ + static MeasureUnit getPermyriad(); /** * Returns by pointer, unit of consumption: liter-per-100-kilometer. @@ -1517,6 +1669,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getDecade(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of duration: fortnight. + * Caller owns returned value and must free it. + * Also see {@link #getFortnight()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createFortnight(UErrorCode &status); + + /** + * Returns by value, unit of duration: fortnight. + * Also see {@link #createFortnight()}. + * @draft ICU 78 + */ + static MeasureUnit getFortnight(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of duration: hour. * Caller owns returned value and must free it. @@ -1759,6 +1929,60 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getAmpere(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of electric: coulomb. + * Caller owns returned value and must free it. + * Also see {@link #getCoulomb()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createCoulomb(UErrorCode &status); + + /** + * Returns by value, unit of electric: coulomb. + * Also see {@link #createCoulomb()}. + * @draft ICU 78 + */ + static MeasureUnit getCoulomb(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of electric: farad. + * Caller owns returned value and must free it. + * Also see {@link #getFarad()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createFarad(UErrorCode &status); + + /** + * Returns by value, unit of electric: farad. + * Also see {@link #createFarad()}. + * @draft ICU 78 + */ + static MeasureUnit getFarad(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of electric: henry. + * Caller owns returned value and must free it. + * Also see {@link #getHenry()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createHenry(UErrorCode &status); + + /** + * Returns by value, unit of electric: henry. + * Also see {@link #createHenry()}. + * @draft ICU 78 + */ + static MeasureUnit getHenry(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of electric: milliampere. * Caller owns returned value and must free it. @@ -1791,6 +2015,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getOhm(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of electric: siemens. + * Caller owns returned value and must free it. + * Also see {@link #getSiemens()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSiemens(UErrorCode &status); + + /** + * Returns by value, unit of electric: siemens. + * Also see {@link #createSiemens()}. + * @draft ICU 78 + */ + static MeasureUnit getSiemens(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of electric: volt. * Caller owns returned value and must free it. @@ -1807,6 +2049,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getVolt(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of energy: becquerel. + * Caller owns returned value and must free it. + * Also see {@link #getBecquerel()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createBecquerel(UErrorCode &status); + + /** + * Returns by value, unit of energy: becquerel. + * Also see {@link #createBecquerel()}. + * @draft ICU 78 + */ + static MeasureUnit getBecquerel(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of energy: british-thermal-unit. * Caller owns returned value and must free it. @@ -1823,6 +2083,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getBritishThermalUnit(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of energy: british-thermal-unit-it. + * Caller owns returned value and must free it. + * Also see {@link #getBritishThermalUnitIt()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createBritishThermalUnitIt(UErrorCode &status); + + /** + * Returns by value, unit of energy: british-thermal-unit-it. + * Also see {@link #createBritishThermalUnitIt()}. + * @draft ICU 78 + */ + static MeasureUnit getBritishThermalUnitIt(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of energy: calorie. * Caller owns returned value and must free it. @@ -1839,6 +2117,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getCalorie(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of energy: calorie-it. + * Caller owns returned value and must free it. + * Also see {@link #getCalorieIt()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createCalorieIt(UErrorCode &status); + + /** + * Returns by value, unit of energy: calorie-it. + * Also see {@link #createCalorieIt()}. + * @draft ICU 78 + */ + static MeasureUnit getCalorieIt(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of energy: electronvolt. * Caller owns returned value and must free it. @@ -1871,6 +2167,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getFoodcalorie(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of energy: gray. + * Caller owns returned value and must free it. + * Also see {@link #getGray()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createGray(UErrorCode &status); + + /** + * Returns by value, unit of energy: gray. + * Also see {@link #createGray()}. + * @draft ICU 78 + */ + static MeasureUnit getGray(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of energy: joule. * Caller owns returned value and must free it. @@ -1935,6 +2249,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getKilowattHour(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of energy: sievert. + * Caller owns returned value and must free it. + * Also see {@link #getSievert()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSievert(UErrorCode &status); + + /** + * Returns by value, unit of energy: sievert. + * Also see {@link #createSievert()}. + * @draft ICU 78 + */ + static MeasureUnit getSievert(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of energy: therm-us. * Caller owns returned value and must free it. @@ -1951,6 +2283,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getThermUs(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of force: kilogram-force. + * Caller owns returned value and must free it. + * Also see {@link #getKilogramForce()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createKilogramForce(UErrorCode &status); + + /** + * Returns by value, unit of force: kilogram-force. + * Also see {@link #createKilogramForce()}. + * @draft ICU 78 + */ + static MeasureUnit getKilogramForce(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of force: kilowatt-hour-per-100-kilometer. * Caller owns returned value and must free it. @@ -2223,6 +2573,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getCentimeter(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: chain. + * Caller owns returned value and must free it. + * Also see {@link #getChain()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createChain(UErrorCode &status); + + /** + * Returns by value, unit of length: chain. + * Also see {@link #createChain()}. + * @draft ICU 78 + */ + static MeasureUnit getChain(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of length: decimeter. * Caller owns returned value and must free it. @@ -2319,6 +2687,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getInch(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: jo-jp. + * Caller owns returned value and must free it. + * Also see {@link #getJoJp()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createJoJp(UErrorCode &status); + + /** + * Returns by value, unit of length: jo-jp. + * Also see {@link #createJoJp()}. + * @draft ICU 78 + */ + static MeasureUnit getJoJp(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: ken. + * Caller owns returned value and must free it. + * Also see {@link #getKen()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createKen(UErrorCode &status); + + /** + * Returns by value, unit of length: ken. + * Also see {@link #createKen()}. + * @draft ICU 78 + */ + static MeasureUnit getKen(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of length: kilometer. * Caller owns returned value and must free it. @@ -2511,6 +2915,96 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getPoint(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: ri-jp. + * Caller owns returned value and must free it. + * Also see {@link #getRiJp()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createRiJp(UErrorCode &status); + + /** + * Returns by value, unit of length: ri-jp. + * Also see {@link #createRiJp()}. + * @draft ICU 78 + */ + static MeasureUnit getRiJp(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: rin. + * Caller owns returned value and must free it. + * Also see {@link #getRin()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createRin(UErrorCode &status); + + /** + * Returns by value, unit of length: rin. + * Also see {@link #createRin()}. + * @draft ICU 78 + */ + static MeasureUnit getRin(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: rod. + * Caller owns returned value and must free it. + * Also see {@link #getRod()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createRod(UErrorCode &status); + + /** + * Returns by value, unit of length: rod. + * Also see {@link #createRod()}. + * @draft ICU 78 + */ + static MeasureUnit getRod(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: shaku-cloth. + * Caller owns returned value and must free it. + * Also see {@link #getShakuCloth()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createShakuCloth(UErrorCode &status); + + /** + * Returns by value, unit of length: shaku-cloth. + * Also see {@link #createShakuCloth()}. + * @draft ICU 78 + */ + static MeasureUnit getShakuCloth(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: shaku-length. + * Caller owns returned value and must free it. + * Also see {@link #getShakuLength()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createShakuLength(UErrorCode &status); + + /** + * Returns by value, unit of length: shaku-length. + * Also see {@link #createShakuLength()}. + * @draft ICU 78 + */ + static MeasureUnit getShakuLength(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of length: solar-radius. * Caller owns returned value and must free it. @@ -2527,6 +3021,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getSolarRadius(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of length: sun. + * Caller owns returned value and must free it. + * Also see {@link #getSun()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSun(UErrorCode &status); + + /** + * Returns by value, unit of length: sun. + * Also see {@link #createSun()}. + * @draft ICU 78 + */ + static MeasureUnit getSun(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of length: yard. * Caller owns returned value and must free it. @@ -2607,6 +3119,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getSolarLuminosity(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of magnetic: tesla. + * Caller owns returned value and must free it. + * Also see {@link #getTesla()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createTesla(UErrorCode &status); + + /** + * Returns by value, unit of magnetic: tesla. + * Also see {@link #createTesla()}. + * @draft ICU 78 + */ + static MeasureUnit getTesla(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of magnetic: weber. + * Caller owns returned value and must free it. + * Also see {@link #getWeber()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createWeber(UErrorCode &status); + + /** + * Returns by value, unit of magnetic: weber. + * Also see {@link #createWeber()}. + * @draft ICU 78 + */ + static MeasureUnit getWeber(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of mass: carat. * Caller owns returned value and must free it. @@ -2655,6 +3203,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getEarthMass(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of mass: fun. + * Caller owns returned value and must free it. + * Also see {@link #getFun()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createFun(UErrorCode &status); + + /** + * Returns by value, unit of mass: fun. + * Also see {@link #createFun()}. + * @draft ICU 78 + */ + static MeasureUnit getFun(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of mass: grain. * Caller owns returned value and must free it. @@ -2783,6 +3349,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getPound(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of mass: slug. + * Caller owns returned value and must free it. + * Also see {@link #getSlug()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSlug(UErrorCode &status); + + /** + * Returns by value, unit of mass: slug. + * Also see {@link #createSlug()}. + * @draft ICU 78 + */ + static MeasureUnit getSlug(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of mass: solar-mass. * Caller owns returned value and must free it. @@ -2847,29 +3431,25 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getTonne(); +#ifndef U_HIDE_DEPRECATED_API /** * Returns by pointer, unit of mass: metric-ton * (renamed to tonne in CLDR 42 / ICU 72). * Caller owns returned value and must free it. - * Note: In ICU 74 this will be deprecated in favor of - * createTonne(), which is currently draft but will - * become stable in ICU 74, and which uses the preferred naming. * Also see {@link #getMetricTon()} and {@link #createTonne()}. * @param status ICU error code. - * @stable ICU 54 + * @deprecated ICU 78 use createTonne(UErrorCode &status) */ static MeasureUnit *createMetricTon(UErrorCode &status); /** * Returns by value, unit of mass: metric-ton * (renamed to tonne in CLDR 42 / ICU 72). - * Note: In ICU 74 this will be deprecated in favor of - * getTonne(), which is currently draft but will - * become stable in ICU 74, and which uses the preferred naming. * Also see {@link #createMetricTon()} and {@link #getTonne()}. - * @stable ICU 64 + * @deprecated ICU 78 use getTonne() */ static MeasureUnit getMetricTon(); +#endif /* U_HIDE_DEPRECATED_API */ /** * Returns by pointer, unit of power: gigawatt. @@ -3111,6 +3691,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getMillimeterOfMercury(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of pressure: ofhg. + * Caller owns returned value and must free it. + * Also see {@link #getOfhg()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createOfhg(UErrorCode &status); + + /** + * Returns by value, unit of pressure: ofhg. + * Also see {@link #createOfhg()}. + * @draft ICU 78 + */ + static MeasureUnit getOfhg(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of pressure: pascal. * Caller owns returned value and must free it. @@ -3305,6 +3903,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getKelvin(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of temperature: rankine. + * Caller owns returned value and must free it. + * Also see {@link #getRankine()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createRankine(UErrorCode &status); + + /** + * Returns by value, unit of temperature: rankine. + * Also see {@link #createRankine()}. + * @draft ICU 78 + */ + static MeasureUnit getRankine(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of torque: newton-meter. * Caller owns returned value and must free it. @@ -3529,6 +4145,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getCup(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: cup-imperial. + * Caller owns returned value and must free it. + * Also see {@link #getCupImperial()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createCupImperial(UErrorCode &status); + + /** + * Returns by value, unit of volume: cup-imperial. + * Also see {@link #createCupImperial()}. + * @draft ICU 78 + */ + static MeasureUnit getCupImperial(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: cup-jp. + * Caller owns returned value and must free it. + * Also see {@link #getCupJp()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createCupJp(UErrorCode &status); + + /** + * Returns by value, unit of volume: cup-jp. + * Also see {@link #createCupJp()}. + * @draft ICU 78 + */ + static MeasureUnit getCupJp(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: cup-metric. * Caller owns returned value and must free it. @@ -3657,6 +4309,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getFluidOunceImperial(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: fluid-ounce-metric. + * Caller owns returned value and must free it. + * Also see {@link #getFluidOunceMetric()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createFluidOunceMetric(UErrorCode &status); + + /** + * Returns by value, unit of volume: fluid-ounce-metric. + * Also see {@link #createFluidOunceMetric()}. + * @draft ICU 78 + */ + static MeasureUnit getFluidOunceMetric(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: gallon. * Caller owns returned value and must free it. @@ -3721,6 +4391,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getJigger(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: koku. + * Caller owns returned value and must free it. + * Also see {@link #getKoku()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createKoku(UErrorCode &status); + + /** + * Returns by value, unit of volume: koku. + * Also see {@link #createKoku()}. + * @draft ICU 78 + */ + static MeasureUnit getKoku(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: kosaji. + * Caller owns returned value and must free it. + * Also see {@link #getKosaji()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createKosaji(UErrorCode &status); + + /** + * Returns by value, unit of volume: kosaji. + * Also see {@link #createKosaji()}. + * @draft ICU 78 + */ + static MeasureUnit getKosaji(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: liter. * Caller owns returned value and must free it. @@ -3769,6 +4475,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getMilliliter(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: osaji. + * Caller owns returned value and must free it. + * Also see {@link #getOsaji()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createOsaji(UErrorCode &status); + + /** + * Returns by value, unit of volume: osaji. + * Also see {@link #createOsaji()}. + * @draft ICU 78 + */ + static MeasureUnit getOsaji(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: pinch. * Caller owns returned value and must free it. @@ -3801,6 +4525,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getPint(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: pint-imperial. + * Caller owns returned value and must free it. + * Also see {@link #getPintImperial()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createPintImperial(UErrorCode &status); + + /** + * Returns by value, unit of volume: pint-imperial. + * Also see {@link #createPintImperial()}. + * @draft ICU 78 + */ + static MeasureUnit getPintImperial(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: pint-metric. * Caller owns returned value and must free it. @@ -3849,6 +4591,42 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getQuartImperial(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: sai. + * Caller owns returned value and must free it. + * Also see {@link #getSai()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createSai(UErrorCode &status); + + /** + * Returns by value, unit of volume: sai. + * Also see {@link #createSai()}. + * @draft ICU 78 + */ + static MeasureUnit getSai(); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: shaku. + * Caller owns returned value and must free it. + * Also see {@link #getShaku()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createShaku(UErrorCode &status); + + /** + * Returns by value, unit of volume: shaku. + * Also see {@link #createShaku()}. + * @draft ICU 78 + */ + static MeasureUnit getShaku(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of volume: tablespoon. * Caller owns returned value and must free it. @@ -3881,6 +4659,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getTeaspoon(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of volume: to-jp. + * Caller owns returned value and must free it. + * Also see {@link #getToJp()}. + * @param status ICU error code. + * @draft ICU 78 + */ + static MeasureUnit *createToJp(UErrorCode &status); + + /** + * Returns by value, unit of volume: to-jp. + * Also see {@link #createToJp()}. + * @draft ICU 78 + */ + static MeasureUnit getToJp(); +#endif /* U_HIDE_DRAFT_API */ + // End generated createXXX methods protected: diff --git a/icu4c/source/i18n/unicode/regex.h b/icu4c/source/i18n/unicode/regex.h index cc2f9249295e..9cb34fd02f22 100644 --- a/icu4c/source/i18n/unicode/regex.h +++ b/icu4c/source/i18n/unicode/regex.h @@ -145,7 +145,7 @@ class U_I18N_API RegexPattern final : public UObject { * @return the copy of this RegexPattern * @stable ICU 2.4 */ - virtual RegexPattern *clone() const; + RegexPattern *clone() const; /** @@ -325,7 +325,7 @@ class U_I18N_API RegexPattern final : public UObject { * @return the #URegexpFlag match mode flags * @stable ICU 2.4 */ - virtual uint32_t flags() const; + uint32_t flags() const; /** * Creates a RegexMatcher that will match the given input against this pattern. The @@ -344,7 +344,7 @@ class U_I18N_API RegexPattern final : public UObject { * * @stable ICU 2.4 */ - virtual RegexMatcher *matcher(const UnicodeString &input, + RegexMatcher *matcher(const UnicodeString &input, UErrorCode &status) const; private: @@ -376,7 +376,7 @@ class U_I18N_API RegexPattern final : public UObject { * * @stable ICU 2.6 */ - virtual RegexMatcher *matcher(UErrorCode &status) const; + RegexMatcher *matcher(UErrorCode &status) const; /** @@ -425,7 +425,7 @@ class U_I18N_API RegexPattern final : public UObject { * the returned string may no longer reflect the RegexPattern object. * @stable ICU 2.4 */ - virtual UnicodeString pattern() const; + UnicodeString pattern() const; /** @@ -438,7 +438,7 @@ class U_I18N_API RegexPattern final : public UObject { * * @stable ICU 4.6 */ - virtual UText *patternText(UErrorCode &status) const; + UText *patternText(UErrorCode &status) const; /** @@ -454,7 +454,7 @@ class U_I18N_API RegexPattern final : public UObject { * * @stable ICU 55 */ - virtual int32_t groupNumberFromName(const UnicodeString &groupName, UErrorCode &status) const; + int32_t groupNumberFromName(const UnicodeString &groupName, UErrorCode &status) const; /** @@ -473,7 +473,7 @@ class U_I18N_API RegexPattern final : public UObject { * * @stable ICU 55 */ - virtual int32_t groupNumberFromName(const char *groupName, int32_t nameLength, UErrorCode &status) const; + int32_t groupNumberFromName(const char *groupName, int32_t nameLength, UErrorCode &status) const; /** @@ -514,7 +514,7 @@ class U_I18N_API RegexPattern final : public UObject { * @return The number of fields into which the input string was split. * @stable ICU 2.4 */ - virtual int32_t split(const UnicodeString &input, + int32_t split(const UnicodeString &input, UnicodeString dest[], int32_t destCapacity, UErrorCode &status) const; @@ -558,7 +558,7 @@ class U_I18N_API RegexPattern final : public UObject { * * @stable ICU 4.6 */ - virtual int32_t split(UText *input, + int32_t split(UText *input, UText *dest[], int32_t destCapacity, UErrorCode &status) const; @@ -767,7 +767,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if there is a match * @stable ICU 2.4 */ - virtual UBool matches(UErrorCode &status); + UBool matches(UErrorCode &status); /** @@ -780,7 +780,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if there is a match * @stable ICU 2.8 */ - virtual UBool matches(int64_t startIndex, UErrorCode &status); + UBool matches(int64_t startIndex, UErrorCode &status); /** @@ -796,7 +796,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if there is a match at the start of the input string. * @stable ICU 2.4 */ - virtual UBool lookingAt(UErrorCode &status); + UBool lookingAt(UErrorCode &status); /** @@ -812,7 +812,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if there is a match. * @stable ICU 2.8 */ - virtual UBool lookingAt(int64_t startIndex, UErrorCode &status); + UBool lookingAt(int64_t startIndex, UErrorCode &status); /** @@ -827,7 +827,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if a match is found. * @stable ICU 2.4 */ - virtual UBool find(); + UBool find(); /** @@ -844,7 +844,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if a match is found. * @stable ICU 55 */ - virtual UBool find(UErrorCode &status); + UBool find(UErrorCode &status); /** * Resets this RegexMatcher and then attempts to find the next substring of the @@ -855,7 +855,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if a match is found. * @stable ICU 2.4 */ - virtual UBool find(int64_t start, UErrorCode &status); + UBool find(int64_t start, UErrorCode &status); /** @@ -867,7 +867,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return a string containing the matched input text. * @stable ICU 2.4 */ - virtual UnicodeString group(UErrorCode &status) const; + UnicodeString group(UErrorCode &status) const; /** @@ -887,14 +887,14 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the captured text * @stable ICU 2.4 */ - virtual UnicodeString group(int32_t groupNum, UErrorCode &status) const; + UnicodeString group(int32_t groupNum, UErrorCode &status) const; /** * Returns the number of capturing groups in this matcher's pattern. * @return the number of capture groups * @stable ICU 2.4 */ - virtual int32_t groupCount() const; + int32_t groupCount() const; /** @@ -911,7 +911,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *group(UText *dest, int64_t &group_len, UErrorCode &status) const; + UText *group(UText *dest, int64_t &group_len, UErrorCode &status) const; /** * Returns a shallow clone of the entire live input string with the UText current native index @@ -933,7 +933,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *group(int32_t groupNum, UText *dest, int64_t &group_len, UErrorCode &status) const; + UText *group(int32_t groupNum, UText *dest, int64_t &group_len, UErrorCode &status) const; /** * Returns the index in the input string of the start of the text matched @@ -942,7 +942,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The (native) position in the input string of the start of the last match. * @stable ICU 2.4 */ - virtual int32_t start(UErrorCode &status) const; + int32_t start(UErrorCode &status) const; /** * Returns the index in the input string of the start of the text matched @@ -951,7 +951,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The (native) position in the input string of the start of the last match. * @stable ICU 4.6 */ - virtual int64_t start64(UErrorCode &status) const; + int64_t start64(UErrorCode &status) const; /** @@ -967,7 +967,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the (native) start position of substring matched by the specified group. * @stable ICU 2.4 */ - virtual int32_t start(int32_t group, UErrorCode &status) const; + int32_t start(int32_t group, UErrorCode &status) const; /** * Returns the index in the input string of the start of the text matched by the @@ -982,7 +982,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the (native) start position of substring matched by the specified group. * @stable ICU 4.6 */ - virtual int64_t start64(int32_t group, UErrorCode &status) const; + int64_t start64(int32_t group, UErrorCode &status) const; /** * Returns the index in the input string of the first character following the @@ -997,7 +997,7 @@ class U_I18N_API RegexMatcher final : public UObject { * a byte index for UTF-8. * @stable ICU 2.4 */ - virtual int32_t end(UErrorCode &status) const; + int32_t end(UErrorCode &status) const; /** * Returns the index in the input string of the first character following the @@ -1012,7 +1012,7 @@ class U_I18N_API RegexMatcher final : public UObject { * a byte index for UTF-8. * @stable ICU 4.6 */ - virtual int64_t end64(UErrorCode &status) const; + int64_t end64(UErrorCode &status) const; /** @@ -1032,7 +1032,7 @@ class U_I18N_API RegexMatcher final : public UObject { * a byte index for UTF8. * @stable ICU 2.4 */ - virtual int32_t end(int32_t group, UErrorCode &status) const; + int32_t end(int32_t group, UErrorCode &status) const; /** * Returns the index in the input string of the character following the @@ -1051,7 +1051,7 @@ class U_I18N_API RegexMatcher final : public UObject { * a byte index for UTF8. * @stable ICU 4.6 */ - virtual int64_t end64(int32_t group, UErrorCode &status) const; + int64_t end64(int32_t group, UErrorCode &status) const; /** * Resets this matcher. The effect is to remove any memory of previous matches, @@ -1061,7 +1061,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return this RegexMatcher. * @stable ICU 2.4 */ - virtual RegexMatcher &reset(); + RegexMatcher &reset(); /** @@ -1079,7 +1079,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return this RegexMatcher. * @stable ICU 2.8 */ - virtual RegexMatcher &reset(int64_t index, UErrorCode &status); + RegexMatcher &reset(int64_t index, UErrorCode &status); /** @@ -1099,7 +1099,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return this RegexMatcher. * @stable ICU 2.4 */ - virtual RegexMatcher &reset(const UnicodeString &input); + RegexMatcher &reset(const UnicodeString &input); /** @@ -1115,7 +1115,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual RegexMatcher &reset(UText *input); + RegexMatcher &reset(UText *input); /** @@ -1142,7 +1142,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.8 */ - virtual RegexMatcher &refreshInputText(UText *input, UErrorCode &status); + RegexMatcher &refreshInputText(UText *input, UErrorCode &status); private: /** @@ -1167,7 +1167,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the input string * @stable ICU 2.4 */ - virtual const UnicodeString &input() const; + const UnicodeString &input() const; /** * Returns the input string being matched. This is the live input text; it should not be @@ -1177,7 +1177,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *inputText() const; + UText *inputText() const; /** * Returns the input string being matched, either by copying it into the provided @@ -1189,7 +1189,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *getInput(UText *dest, UErrorCode &status) const; + UText *getInput(UText *dest, UErrorCode &status) const; /** Sets the limits of this matcher's region. @@ -1210,7 +1210,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @param status A reference to a UErrorCode to receive any errors. * @stable ICU 4.0 */ - virtual RegexMatcher ®ion(int64_t start, int64_t limit, UErrorCode &status); + RegexMatcher ®ion(int64_t start, int64_t limit, UErrorCode &status); /** * Identical to region(start, limit, status) but also allows a start position without @@ -1223,7 +1223,7 @@ class U_I18N_API RegexMatcher final : public UObject { * U_INDEX_OUTOFBOUNDS_ERROR is returned. * @stable ICU 4.6 */ - virtual RegexMatcher ®ion(int64_t regionStart, int64_t regionLimit, int64_t startIndex, UErrorCode &status); + RegexMatcher ®ion(int64_t regionStart, int64_t regionLimit, int64_t startIndex, UErrorCode &status); /** * Reports the start index of this matcher's region. The searches this matcher @@ -1233,7 +1233,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The starting (native) index of this matcher's region. * @stable ICU 4.0 */ - virtual int32_t regionStart() const; + int32_t regionStart() const; /** * Reports the start index of this matcher's region. The searches this matcher @@ -1243,7 +1243,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The starting (native) index of this matcher's region. * @stable ICU 4.6 */ - virtual int64_t regionStart64() const; + int64_t regionStart64() const; /** @@ -1254,7 +1254,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The ending point (native) of this matcher's region. * @stable ICU 4.0 */ - virtual int32_t regionEnd() const; + int32_t regionEnd() const; /** * Reports the end (limit) index (exclusive) of this matcher's region. The searches @@ -1264,7 +1264,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The ending point (native) of this matcher's region. * @stable ICU 4.6 */ - virtual int64_t regionEnd64() const; + int64_t regionEnd64() const; /** * Queries the transparency of region bounds for this matcher. @@ -1274,7 +1274,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if this matcher is using opaque bounds, false if it is not. * @stable ICU 4.0 */ - virtual UBool hasTransparentBounds() const; + UBool hasTransparentBounds() const; /** * Sets the transparency of region bounds for this matcher. @@ -1294,7 +1294,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return This Matcher; * @stable ICU 4.0 **/ - virtual RegexMatcher &useTransparentBounds(UBool b); + RegexMatcher &useTransparentBounds(UBool b); /** @@ -1304,7 +1304,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if this matcher is using anchoring bounds. * @stable ICU 4.0 */ - virtual UBool hasAnchoringBounds() const; + UBool hasAnchoringBounds() const; /** @@ -1319,7 +1319,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return This Matcher * @stable ICU 4.0 */ - virtual RegexMatcher &useAnchoringBounds(UBool b); + RegexMatcher &useAnchoringBounds(UBool b); /** @@ -1334,7 +1334,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if the most recent match hit the end of input * @stable ICU 4.0 */ - virtual UBool hitEnd() const; + UBool hitEnd() const; /** * Return true the most recent match succeeded and additional input could cause @@ -1345,7 +1345,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return true if more input could cause the most recent match to no longer match. * @stable ICU 4.0 */ - virtual UBool requireEnd() const; + UBool requireEnd() const; /** @@ -1353,7 +1353,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the RegexPattern for this RegexMatcher * @stable ICU 2.4 */ - virtual const RegexPattern &pattern() const; + const RegexPattern &pattern() const; /** @@ -1372,7 +1372,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return a string containing the results of the find and replace. * @stable ICU 2.4 */ - virtual UnicodeString replaceAll(const UnicodeString &replacement, UErrorCode &status); + UnicodeString replaceAll(const UnicodeString &replacement, UErrorCode &status); /** @@ -1395,7 +1395,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *replaceAll(UText *replacement, UText *dest, UErrorCode &status); + UText *replaceAll(UText *replacement, UText *dest, UErrorCode &status); /** @@ -1418,7 +1418,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return a string containing the results of the find and replace. * @stable ICU 2.4 */ - virtual UnicodeString replaceFirst(const UnicodeString &replacement, UErrorCode &status); + UnicodeString replaceFirst(const UnicodeString &replacement, UErrorCode &status); /** @@ -1445,7 +1445,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *replaceFirst(UText *replacement, UText *dest, UErrorCode &status); + UText *replaceFirst(UText *replacement, UText *dest, UErrorCode &status); /** @@ -1475,7 +1475,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @stable ICU 2.4 * */ - virtual RegexMatcher &appendReplacement(UnicodeString &dest, + RegexMatcher &appendReplacement(UnicodeString &dest, const UnicodeString &replacement, UErrorCode &status); @@ -1506,7 +1506,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual RegexMatcher &appendReplacement(UText *dest, + RegexMatcher &appendReplacement(UText *dest, UText *replacement, UErrorCode &status); @@ -1520,7 +1520,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the destination string. * @stable ICU 2.4 */ - virtual UnicodeString &appendTail(UnicodeString &dest); + UnicodeString &appendTail(UnicodeString &dest); /** @@ -1536,7 +1536,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual UText *appendTail(UText *dest, UErrorCode &status); + UText *appendTail(UText *dest, UErrorCode &status); /** @@ -1562,7 +1562,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return The number of fields into which the input string was split. * @stable ICU 2.6 */ - virtual int32_t split(const UnicodeString &input, + int32_t split(const UnicodeString &input, UnicodeString dest[], int32_t destCapacity, UErrorCode &status); @@ -1591,7 +1591,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.6 */ - virtual int32_t split(UText *input, + int32_t split(UText *input, UText *dest[], int32_t destCapacity, UErrorCode &status); @@ -1617,7 +1617,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @param status A reference to a UErrorCode to receive any errors. * @stable ICU 4.0 */ - virtual void setTimeLimit(int32_t limit, UErrorCode &status); + void setTimeLimit(int32_t limit, UErrorCode &status); /** * Get the time limit, if any, for match operations made with this Matcher. @@ -1625,7 +1625,7 @@ class U_I18N_API RegexMatcher final : public UObject { * @return the maximum allowed time for a match, in units of processing steps. * @stable ICU 4.0 */ - virtual int32_t getTimeLimit() const; + int32_t getTimeLimit() const; /** * Set the amount of heap storage available for use by the match backtracking stack. @@ -1648,7 +1648,7 @@ class U_I18N_API RegexMatcher final : public UObject { * * @stable ICU 4.0 */ - virtual void setStackLimit(int32_t limit, UErrorCode &status); + void setStackLimit(int32_t limit, UErrorCode &status); /** * Get the size of the heap storage available for use by the back tracking stack. @@ -1657,7 +1657,7 @@ class U_I18N_API RegexMatcher final : public UObject { * stack size is unlimited. * @stable ICU 4.0 */ - virtual int32_t getStackLimit() const; + int32_t getStackLimit() const; /** @@ -1673,9 +1673,9 @@ class U_I18N_API RegexMatcher final : public UObject { * @param status A reference to a UErrorCode to receive any errors. * @stable ICU 4.0 */ - virtual void setMatchCallback(URegexMatchCallback *callback, - const void *context, - UErrorCode &status); + void setMatchCallback(URegexMatchCallback *callback, + const void *context, + UErrorCode &status); /** @@ -1688,9 +1688,9 @@ class U_I18N_API RegexMatcher final : public UObject { * @param status A reference to a UErrorCode to receive any errors. * @stable ICU 4.0 */ - virtual void getMatchCallback(URegexMatchCallback *&callback, - const void *&context, - UErrorCode &status); + void getMatchCallback(URegexMatchCallback *&callback, + const void *&context, + UErrorCode &status); /** @@ -1706,9 +1706,9 @@ class U_I18N_API RegexMatcher final : public UObject { * @param status A reference to a UErrorCode to receive any errors. * @stable ICU 4.6 */ - virtual void setFindProgressCallback(URegexFindProgressCallback *callback, - const void *context, - UErrorCode &status); + void setFindProgressCallback(URegexFindProgressCallback *callback, + const void *context, + UErrorCode &status); /** @@ -1721,9 +1721,9 @@ class U_I18N_API RegexMatcher final : public UObject { * @param status A reference to a UErrorCode to receive any errors. * @stable ICU 4.6 */ - virtual void getFindProgressCallback(URegexFindProgressCallback *&callback, - const void *&context, - UErrorCode &status); + void getFindProgressCallback(URegexFindProgressCallback *&callback, + const void *&context, + UErrorCode &status); #ifndef U_HIDE_INTERNAL_API /** diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h index 0c65e897f501..83c93a1c98c0 100644 --- a/icu4c/source/i18n/unicode/tblcoll.h +++ b/icu4c/source/i18n/unicode/tblcoll.h @@ -242,7 +242,7 @@ class U_I18N_API RuleBasedCollator final : public Collator { * the based Collator. * @stable ICU 2.2 */ - virtual CollationElementIterator* createCollationElementIterator( + CollationElementIterator* createCollationElementIterator( const UnicodeString& source) const; /** @@ -254,7 +254,7 @@ class U_I18N_API RuleBasedCollator final : public Collator { * based Collator. * @stable ICU 2.2 */ - virtual CollationElementIterator* createCollationElementIterator( + CollationElementIterator* createCollationElementIterator( const CharacterIterator& source) const; // Make deprecated versions of Collator::compare() visible. diff --git a/icu4c/source/i18n/uspoof_conf.cpp b/icu4c/source/i18n/uspoof_conf.cpp index 09e104ba5d8f..2eb812f3a8a6 100644 --- a/icu4c/source/i18n/uspoof_conf.cpp +++ b/icu4c/source/i18n/uspoof_conf.cpp @@ -232,11 +232,14 @@ void ConfusabledataBuilder::build(const char * confusables, int32_t confusablesL if (U_FAILURE(status)) { return; } - u_strFromUTF8(nullptr, 0, &inputLen, confusables, confusablesLen, &status); - if (status != U_BUFFER_OVERFLOW_ERROR) { + UErrorCode bufferStatus = U_ZERO_ERROR; + u_strFromUTF8(nullptr, 0, &inputLen, confusables, confusablesLen, &bufferStatus); + if (bufferStatus != U_BUFFER_OVERFLOW_ERROR) { + if (U_FAILURE(bufferStatus)) { + status = bufferStatus; + } return; } - status = U_ZERO_ERROR; fInput = static_cast(uprv_malloc((inputLen+1) * sizeof(char16_t))); if (fInput == nullptr) { status = U_MEMORY_ALLOCATION_ERROR; diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index e808371c909c..5cff49bd6555 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -4625,8 +4625,8 @@ const char* const full_data[][3] = { "dz" }, { "und_BY", - "be_Cyrl_BY", - "be" + "ru_Cyrl_BY", + "ru_BY" }, { "und_Beng", "bn_Beng_BD", diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 0038d0f8e4cb..71fd936e377f 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -2185,7 +2185,7 @@ static void TestFallback(void) UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err); UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err); const UChar* version = NULL; - static const UChar versionStr[] = u"47"; // 47 in nn_NO or in a parent bundle/root + static const UChar versionStr[] = u"48"; // 48 in nn_NO or in a parent bundle/root if(U_FAILURE(err)) { log_data_err("Expected success when trying to test no_NO_NY aliased to nn_NO for Version " diff --git a/icu4c/source/test/cintltst/udatpg_test.c b/icu4c/source/test/cintltst/udatpg_test.c index b9278085b205..1b53df89b43a 100644 --- a/icu4c/source/test/cintltst/udatpg_test.c +++ b/icu4c/source/test/cintltst/udatpg_test.c @@ -849,15 +849,15 @@ static void TestISO8601(void) { } TestCase; const TestCase testCases[] = { - { "en_GB@calendar=iso8601;rg=uszzzz", u"EEEEyMMMMdjmm", u"y MMMM d, EEEE 'at' h:mm a" }, - { "en_GB@calendar=iso8601;rg=uszzzz", u"EEEEyMMMMdHmm", u"y MMMM d, EEEE 'at' HH:mm" }, - { "en_GB@calendar=iso8601;rg=uszzzz", u"Edjmm", u"d, EEE, h:mm a" }, - { "en_GB@calendar=iso8601;rg=uszzzz", u"EdHmm", u"d, EEE, HH:mm" }, - - { "en_US@calendar=iso8601", u"EEEEyMMMMdjmm", u"y MMMM d, EEEE 'at' h:mm a" }, - { "en_US@calendar=iso8601", u"EEEEyMMMMdHmm", u"y MMMM d, EEEE 'at' HH:mm" }, - { "en_US@calendar=iso8601", u"Edjmm", u"d, EEE, h:mm a" }, - { "en_US@calendar=iso8601", u"EdHmm", u"d, EEE, HH:mm" }, + { "en_GB@calendar=iso8601;rg=uszzzz", u"EEEEyMMMMdjmm", u"y MMMM d, EEEE h:mm a" }, + { "en_GB@calendar=iso8601;rg=uszzzz", u"EEEEyMMMMdHmm", u"y MMMM d, EEEE HH:mm" }, + { "en_GB@calendar=iso8601;rg=uszzzz", u"Edjmm", u"d, EEE h:mm a" }, + { "en_GB@calendar=iso8601;rg=uszzzz", u"EdHmm", u"d, EEE HH:mm" }, + + { "en_US@calendar=iso8601", u"EEEEyMMMMdjmm", u"y MMMM d, EEEE h:mm a" }, + { "en_US@calendar=iso8601", u"EEEEyMMMMdHmm", u"y MMMM d, EEEE HH:mm" }, + { "en_US@calendar=iso8601", u"Edjmm", u"d, EEE h:mm a" }, + { "en_US@calendar=iso8601", u"EdHmm", u"d, EEE HH:mm" }, { "en_US", u"EEEEyMMMMdjmm", u"EEEE, MMMM d, y 'at' h:mm a" }, { "en_US", u"EEEEyMMMMdHmm", u"EEEE, MMMM d, y 'at' HH:mm" }, diff --git a/icu4c/source/test/cintltst/unumberformattertst.c b/icu4c/source/test/cintltst/unumberformattertst.c index be2dd5eb5537..282b2ca3a4cb 100644 --- a/icu4c/source/test/cintltst/unumberformattertst.c +++ b/icu4c/source/test/cintltst/unumberformattertst.c @@ -18,6 +18,7 @@ #include "unicode/ustring.h" #include "cformtst.h" #include "cintltst.h" +#include "cstring.h" #include "cmemory.h" static void TestSkeletonFormatToString(void); @@ -426,6 +427,10 @@ static void TestPerUnitInArabic(void) { log_err("FAIL u_strFromUTF8: %s = %s ( %s )\n", locale, buffer, u_errorName(status)); } + if (uprv_strncmp(simpleMeasureUnits[i], "volume-",7)==0 || uprv_strncmp(simpleMeasureUnits[j], "volume-",7)==0) { + log_knownIssue("ICU-23104", "Strange handling of part-per-1e9 & volumes in skeletons"); + continue; + } UNumberFormatter* nf = unumf_openForSkeletonAndLocale( ubuffer, outputlen, locale, &status); if (U_FAILURE(status)) { diff --git a/icu4c/source/test/fuzzer/Makefile.in b/icu4c/source/test/fuzzer/Makefile.in index 372db3ba7bad..8cd23cdf6d68 100644 --- a/icu4c/source/test/fuzzer/Makefile.in +++ b/icu4c/source/test/fuzzer/Makefile.in @@ -40,6 +40,7 @@ FUZZER_TARGETS = \ collator_rulebased_fuzzer \ converter_fuzzer date_format_fuzzer \ date_time_pattern_generator_fuzzer \ + decimal_format_symbols_fuzzer \ dtfmtsym_fuzzer \ list_format_fuzzer locale_fuzzer \ locale_morph_fuzzer \ diff --git a/icu4c/source/test/fuzzer/decimal_format_symbols_fuzzer.cpp b/icu4c/source/test/fuzzer/decimal_format_symbols_fuzzer.cpp new file mode 100644 index 000000000000..9b1f1aa13734 --- /dev/null +++ b/icu4c/source/test/fuzzer/decimal_format_symbols_fuzzer.cpp @@ -0,0 +1,95 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html + +// Fuzzer for DecimalFormatSymbols::DecimalFormatSymbols. + +#include +#include +#include +#include +#include +#include "fuzzer_utils.h" +#include "unicode/dcfmtsym.h" +#include "unicode/unum.h" +#include "uassert.h" + +IcuEnvironment* env = new IcuEnvironment(); + +void testMethods( + const icu::DecimalFormatSymbols& dfs, + icu::DecimalFormatSymbols::ENumberFormatSymbol symbol, + UCurrencySpacing spacing, + int32_t digit) { + dfs.getLocale(); + dfs.getSymbol(symbol); + dfs.getConstSymbol(symbol); + dfs.getCurrencyPattern(); + dfs.getNumberingSystemName(); + dfs.isCustomCurrencySymbol(); + dfs.isCustomIntlCurrencySymbol(); + dfs.getCodePointZero(); + dfs.getConstDigitSymbol(digit); + UErrorCode status = U_ZERO_ERROR; + dfs.getPatternForCurrencySpacing(spacing, true, status); + dfs.getPatternForCurrencySpacing(spacing, false, status); + +} +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { + UErrorCode status = U_ZERO_ERROR; + if (size < sizeof(uint16_t)) { + return 0; + } + uint16_t rnd = *(reinterpret_cast(data)); + const icu::Locale& locale = GetRandomLocale(rnd); + data = data + sizeof(uint16_t); + size = size - sizeof(uint16_t); + + if (size < sizeof(uint16_t)) { + return 0; + } + uint16_t rnd2 = *(reinterpret_cast(data)); + std::unique_ptr ns(CreateRandomNumberingSystem(rnd2, status)); + U_ASSERT(U_SUCCESS(status)); + data = data + sizeof(uint16_t); + size = size - sizeof(uint16_t); + + if (size < sizeof(int32_t)) { + return 0; + } + int32_t digit = *(reinterpret_cast(data)); + data = data + sizeof(int32_t); + size = size - sizeof(int32_t); + + if (size < sizeof(uint8_t)) { + return 0; + } + icu::DecimalFormatSymbols::ENumberFormatSymbol symbol = + static_cast( + *data % icu::DecimalFormatSymbols::ENumberFormatSymbol::kFormatSymbolCount); + data = data + sizeof(uint8_t); + size = size - sizeof(uint8_t); + + if (size < sizeof(uint8_t)) { + return 0; + } + UCurrencySpacing spacing = + static_cast( + *data % UCurrencySpacing::UNUM_CURRENCY_SPACING_COUNT); + data = data + sizeof(uint8_t); + size = size - sizeof(uint8_t); + + size_t unistr_size = size/2; + std::unique_ptr fuzzbuff(new char16_t[unistr_size]); + std::memcpy(fuzzbuff.get(), data, unistr_size * 2); + + icu::UnicodeString fuzzstr(false, fuzzbuff.get(), unistr_size); + icu::DecimalFormatSymbols dfs1(locale, status); + U_ASSERT(U_SUCCESS(status)); + testMethods(dfs1, symbol, spacing, digit); + + icu::DecimalFormatSymbols dfs2(locale, *ns, status); + U_ASSERT(U_SUCCESS(status)); + testMethods(dfs2, symbol, spacing, digit); + + return 0; +} diff --git a/icu4c/source/test/fuzzer/fuzzer_utils.h b/icu4c/source/test/fuzzer/fuzzer_utils.h index 8a4ed4714b4a..0a16f0e4054d 100644 --- a/icu4c/source/test/fuzzer/fuzzer_utils.h +++ b/icu4c/source/test/fuzzer/fuzzer_utils.h @@ -7,6 +7,8 @@ #include #include "unicode/locid.h" +#include "unicode/numsys.h" +#include "unicode/strenum.h" struct IcuEnvironment { IcuEnvironment() { @@ -21,4 +23,20 @@ const icu::Locale& GetRandomLocale(uint16_t rnd) { return locales[rnd % num_locales]; } +const icu::NumberingSystem* CreateRandomNumberingSystem(uint16_t rnd, UErrorCode &status) { + std::unique_ptr se(icu::NumberingSystem::getAvailableNames(status)); + if (U_FAILURE(status)) return nullptr; + int32_t count = se->count(status); + if (U_FAILURE(status)) return nullptr; + int32_t index = rnd % count; + se->reset(status); + for (int32_t i = 0; i < index - 1; i++, se->next(nullptr, status)) { + // empty + } + const char* name = se->next(nullptr, status); + if (U_FAILURE(status)) return nullptr; + return icu::NumberingSystem::createInstanceByName(name, status); +} + + #endif // FUZZER_UTILS_H_ diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 5d4a03bc678c..daba343d1ac9 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -75,7 +75,10 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \ static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \ formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \ units_data_test.o units_router_test.o units_test.o displayoptions_test.o \ -numbertest_simple.o cplusplus_header_api_build_test.o uchar_type_build_test.o ucolheaderonlytest.o usetheaderonlytest.o +numbertest_simple.o \ +cplusplus_header_api_build_test.o uchar_type_build_test.o \ +ucolheaderonlytest.o usetheaderonlytest.o utfiteratortest.o \ +intltesttest.o DEPS = $(OBJECTS:.o=.d) diff --git a/icu4c/source/test/intltest/alphaindextst.cpp b/icu4c/source/test/intltest/alphaindextst.cpp index d96dcb32d142..0795f6e740d2 100644 --- a/icu4c/source/test/intltest/alphaindextst.cpp +++ b/icu4c/source/test/intltest/alphaindextst.cpp @@ -601,11 +601,11 @@ void AlphabeticIndexTest::TestPinyinFirst() { index.addLabels(Locale::getChinese(), status); assertEquals("getBucketCount()", 28, index.getBucketCount(status)); // ... A-Z ... int32_t bucketIndex = index.getBucketIndex(UnicodeString(static_cast(0x897f)), status); - assertEquals("getBucketIndex(U+897F)", static_cast(static_cast(0x0058) /*X*/ - static_cast(0x0041) /*A*/ + 1), bucketIndex); + assertEquals("getBucketIndex(U+897F)", u'X' - u'A' + 1, bucketIndex); bucketIndex = index.getBucketIndex("i", status); assertEquals("getBucketIndex(i)", 9, bucketIndex); bucketIndex = index.getBucketIndex(UnicodeString(static_cast(0x03B1)), status); - assertEquals("getBucketIndex(Greek alpha)", static_cast(27), bucketIndex); + assertEquals("getBucketIndex(Greek alpha)", 27, bucketIndex); // U+50005 is an unassigned code point which sorts at the end, independent of the Hani group. bucketIndex = index.getBucketIndex(UnicodeString(static_cast(0x50005)), status); assertEquals("getBucketIndex(U+50005)", 27, bucketIndex); @@ -668,8 +668,8 @@ void AlphabeticIndexTest::TestNoLabels() { index.addRecord(UnicodeString(static_cast(0x03B1)), nullptr, status); assertEquals("getBucketCount()", 1, index.getBucketCount(status)); // ... TEST_ASSERT(index.nextBucket(status)); - assertEquals("underflow label type", static_cast(U_ALPHAINDEX_UNDERFLOW), index.getBucketLabelType()); - assertEquals("all records in the underflow bucket", static_cast(3), index.getBucketRecordCount()); + assertEquals("underflow label type", U_ALPHAINDEX_UNDERFLOW, index.getBucketLabelType()); + assertEquals("all records in the underflow bucket", 3, index.getBucketRecordCount()); } void AlphabeticIndexTest::TestChineseZhuyin() { diff --git a/icu4c/source/test/intltest/apicoll.cpp b/icu4c/source/test/intltest/apicoll.cpp index 4464266b1ad5..4ccdc373e6ce 100644 --- a/icu4c/source/test/intltest/apicoll.cpp +++ b/icu4c/source/test/intltest/apicoll.cpp @@ -1573,9 +1573,9 @@ void CollationAPITest::TestVariableTopSetting() { static_cast(newVarTop2), static_cast(newVarTop)); coll->setAttribute(UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED, status); - assertEquals("empty==dollar", static_cast(UCOL_EQUAL), static_cast(coll->compare(UnicodeString(), dollar))); - assertEquals("empty==euro", static_cast(UCOL_EQUAL), static_cast(coll->compare(UnicodeString(), euro))); - assertEquals("dollar(UCOL_LESS), static_cast(coll->compare(dollar, UnicodeString(static_cast(0x30))))); + assertEquals("empty==dollar", UCOL_EQUAL, coll->compare(UnicodeString(), dollar)); + assertEquals("empty==euro", UCOL_EQUAL, coll->compare(UnicodeString(), euro)); + assertEquals("dollarcompare(dollar, UnicodeString(static_cast(0x30)))); coll->setVariableTop(oldVarTop, status); @@ -2383,7 +2383,7 @@ void CollationAPITest::TestCloneBinary() { rbc->setAttribute(UCOL_STRENGTH, UCOL_PRIMARY, errorCode); UnicodeString uUmlaut(static_cast(0xfc)); UnicodeString ue = UNICODE_STRING_SIMPLE("ue"); - assertEquals("rbc/primary: u-umlaut==ue", static_cast(UCOL_EQUAL), rbc->compare(uUmlaut, ue, errorCode)); + assertEquals("rbc/primary: u-umlaut==ue", UCOL_EQUAL, rbc->compare(uUmlaut, ue, errorCode)); uint8_t bin[25000]; int32_t binLength = rbc->cloneBinary(bin, UPRV_LENGTHOF(bin), errorCode); if(errorCode.errDataIfFailureAndReset("rbc->cloneBinary()")) { @@ -2395,8 +2395,8 @@ void CollationAPITest::TestCloneBinary() { if(errorCode.errDataIfFailureAndReset("RuleBasedCollator(rbc binary)")) { return; } - assertEquals("rbc2.strength==primary", static_cast(UCOL_PRIMARY), rbc2.getAttribute(UCOL_STRENGTH, errorCode)); - assertEquals("rbc2: u-umlaut==ue", static_cast(UCOL_EQUAL), rbc2.compare(uUmlaut, ue, errorCode)); + assertEquals("rbc2.strength==primary", UCOL_PRIMARY, rbc2.getAttribute(UCOL_STRENGTH, errorCode)); + assertEquals("rbc2: u-umlaut==ue", UCOL_EQUAL, rbc2.compare(uUmlaut, ue, errorCode)); assertTrue("rbc==rbc2", *rbc == rbc2); uint8_t bin2[25000]; int32_t bin2Length = rbc2.cloneBinary(bin2, UPRV_LENGTHOF(bin2), errorCode); @@ -2407,8 +2407,8 @@ void CollationAPITest::TestCloneBinary() { if(errorCode.errDataIfFailureAndReset("RuleBasedCollator(rbc binary, length<0)")) { return; } - assertEquals("rbc3.strength==primary", static_cast(UCOL_PRIMARY), rbc3.getAttribute(UCOL_STRENGTH, errorCode)); - assertEquals("rbc3: u-umlaut==ue", static_cast(UCOL_EQUAL), rbc3.compare(uUmlaut, ue, errorCode)); + assertEquals("rbc3.strength==primary", UCOL_PRIMARY, rbc3.getAttribute(UCOL_STRENGTH, errorCode)); + assertEquals("rbc3: u-umlaut==ue", UCOL_EQUAL, rbc3.compare(uUmlaut, ue, errorCode)); assertTrue("rbc==rbc3", *rbc == rbc3); } @@ -2432,7 +2432,7 @@ void CollationAPITest::TestIterNumeric() { uiter_setUTF8(&iter40, "\x34\x30", 2); uiter_setUTF8(&iter72, "\x37\x32", 2); UCollationResult result = coll.compare(iter40, iter72, errorCode); - assertEquals("40<72", static_cast(UCOL_LESS), static_cast(result)); + assertEquals("40<72", UCOL_LESS, result); } void CollationAPITest::TestBadKeywords() { diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp index 198901f88179..e2b5e8b61d6b 100644 --- a/icu4c/source/test/intltest/calregts.cpp +++ b/icu4c/source/test/intltest/calregts.cpp @@ -1561,7 +1561,7 @@ void CalendarRegressionTest::Test13745() errln("%s:%d Failure setting INT32_MAX+1 change on calendar: %s\n", __FILE__, __LINE__, u_errorName(status)); return; } - assertEquals("getGregorianChange()", static_cast(INT32_MAX) * MILLIS_IN_DAY, cal->getGregorianChange()); + assertEquals("getGregorianChange()", INT32_MAX * MILLIS_IN_DAY, cal->getGregorianChange()); // test underflow cal->setGregorianChange((static_cast(INT32_MIN) - 1.0) * MILLIS_IN_DAY, status); diff --git a/icu4c/source/test/intltest/convtest.cpp b/icu4c/source/test/intltest/convtest.cpp index 981d577543d9..64add9df058a 100644 --- a/icu4c/source/test/intltest/convtest.cpp +++ b/icu4c/source/test/intltest/convtest.cpp @@ -816,7 +816,7 @@ ConversionTest::TestUTF8ToUTF8Overflow() { assertEquals("illFormed number of bytes written", 0, length); errorLength = UPRV_LENGTHOF(errorBytes); ucnv_getInvalidChars(cnv1.getAlias(), errorBytes, &errorLength, errorCode); - assertEquals("illFormed truncated errorLength", 2, static_cast(errorLength)); + assertEquals("illFormed truncated errorLength", 2, errorLength); if (errorLength == 2) { assertEquals("illFormed truncated errorBytes", 0xf191, (static_cast(static_cast(errorBytes[0])) << 8) | static_cast(errorBytes[1])); @@ -833,7 +833,7 @@ ConversionTest::TestUTF8ToUTF8Overflow() { assertEquals("illFormed trail byte number of bytes written", 0, length); errorLength = UPRV_LENGTHOF(errorBytes); ucnv_getInvalidChars(cnv1.getAlias(), errorBytes, &errorLength, errorCode); - assertEquals("illFormed trail byte errorLength", 1, static_cast(errorLength)); + assertEquals("illFormed trail byte errorLength", 1, errorLength); if (errorLength == 1) { assertEquals("illFormed trail byte errorBytes", 0x93, static_cast(static_cast(errorBytes[0]))); } diff --git a/icu4c/source/test/intltest/dcfmapts.cpp b/icu4c/source/test/intltest/dcfmapts.cpp index 9794b338209a..43a5d4e09983 100644 --- a/icu4c/source/test/intltest/dcfmapts.cpp +++ b/icu4c/source/test/intltest/dcfmapts.cpp @@ -137,7 +137,7 @@ void IntlTestDecimalFormatAPI::testAPI(/*char *par*/) DecimalFormat df("0", {"en", status}, status); UnicodeString result; assertEquals("pat 0: ", 0, df.getGroupingSize()); - assertEquals("pat 0: ", static_cast(false), df.isGroupingUsed()); + assertEquals("pat 0: ", false, df.isGroupingUsed()); df.setGroupingUsed(false); assertEquals("pat 0 then disabled: ", 0, df.getGroupingSize()); assertEquals("pat 0 then disabled: ", u"1111", df.format(1111, result.remove())); @@ -149,7 +149,7 @@ void IntlTestDecimalFormatAPI::testAPI(/*char *par*/) DecimalFormat df("#,##0", {"en", status}, status); UnicodeString result; assertEquals("pat #,##0: ", 3, df.getGroupingSize()); - assertEquals("pat #,##0: ", static_cast(true), df.isGroupingUsed()); + assertEquals("pat #,##0: ", true, df.isGroupingUsed()); df.setGroupingUsed(false); assertEquals("pat #,##0 then disabled: ", 3, df.getGroupingSize()); assertEquals("pat #,##0 then disabled: ", u"1111", df.format(1111, result.remove())); diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp index ee0dcfd4e728..a83638b7de86 100644 --- a/icu4c/source/test/intltest/dtptngts.cpp +++ b/icu4c/source/test/intltest/dtptngts.cpp @@ -1374,6 +1374,10 @@ void IntlTestDateTimePatternGeneratorAPI::testJjMapping() { errln("FAIL: DateTimePatternGenerator::staticGetSkeleton locale %s: %s", localeID, u_errorName(status)); continue; } + if (uprv_strcmp(localeID, "ku_Latn_IQ")==0) { + logKnownIssue("CLDR-18495", "ku_Latn_IQ needs either 'h' in Grego std time patterns or timeData update"); + continue; + } const char16_t* charPtr = timeCycleChars; for (; *charPtr != static_cast(0); charPtr++) { if (jPatSkeleton.indexOf(*charPtr) >= 0) { diff --git a/icu4c/source/test/intltest/intltest.cpp b/icu4c/source/test/intltest/intltest.cpp index 3806d0ff529b..a856715837e8 100644 --- a/icu4c/source/test/intltest/intltest.cpp +++ b/icu4c/source/test/intltest/intltest.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -73,12 +74,12 @@ UCharToUnicodeString(char16_t c) { return {c}; } // [rtg] Just to get things working UnicodeString operator+(const UnicodeString& left, - long num) + int64_t num) { char buffer[64]; // nos changed from 10 to 64 char danger = 'p'; // guard against overrunning the buffer (rtg) - snprintf(buffer, sizeof(buffer), "%ld", num); + snprintf(buffer, sizeof(buffer), "%" PRId64, num); assert(danger == 'p'); return left + buffer; @@ -86,12 +87,12 @@ operator+(const UnicodeString& left, UnicodeString operator+(const UnicodeString& left, - unsigned long num) + uint64_t num) { char buffer[64]; // nos changed from 10 to 64 char danger = 'p'; // guard against overrunning the buffer (rtg) - snprintf(buffer, sizeof(buffer), "%lu", num); + snprintf(buffer, sizeof(buffer), "%" PRIu64, num); assert(danger == 'p'); return left + buffer; @@ -103,11 +104,7 @@ Int64ToUnicodeString(int64_t num) char buffer[64]; // nos changed from 10 to 64 char danger = 'p'; // guard against overrunning the buffer (rtg) -#if defined(_MSC_VER) - snprintf(buffer, sizeof(buffer), "%I64d", num); -#else - snprintf(buffer, sizeof(buffer), "%lld", static_cast(num)); -#endif + snprintf(buffer, sizeof(buffer), "%" PRId64, num); assert(danger == 'p'); return buffer; @@ -143,14 +140,6 @@ operator+(const UnicodeString& left, return left + buffer; } -#if 0 -UnicodeString -operator+(const UnicodeString& left, - int64_t num) { - return left + Int64ToUnicodeString(num); -} -#endif - #if !UCONFIG_NO_FORMATTING /** @@ -232,13 +221,18 @@ UnicodeString toString(const Formattable& f) { // useful when operator+ won't cooperate UnicodeString toString(int32_t n) { - return UnicodeString() + static_cast(n); + return UnicodeString() + static_cast(n); } UnicodeString toString(UBool b) { - return b ? UnicodeString("true"):UnicodeString("false"); + return b ? b != 1 ? UnicodeString("static_cast(") + b + ")" : UnicodeString("true") + : UnicodeString("false"); +} + +UnicodeString toString(bool b) { + return b ? UnicodeString("true") : UnicodeString("false"); } UnicodeString toString(const UnicodeSet& uniset, UErrorCode& status) { @@ -249,17 +243,17 @@ UnicodeString toString(const UnicodeSet& uniset, UErrorCode& status) { // stephen - cleaned up 05/05/99 UnicodeString operator+(const UnicodeString& left, char num) -{ return left + static_cast(num); } +{ return left + static_cast(num); } UnicodeString operator+(const UnicodeString& left, short num) -{ return left + static_cast(num); } +{ return left + static_cast(num); } UnicodeString operator+(const UnicodeString& left, int num) -{ return left + static_cast(num); } +{ return left + static_cast(num); } UnicodeString operator+(const UnicodeString& left, unsigned char num) -{ return left + static_cast(num); } +{ return left + static_cast(num); } UnicodeString operator+(const UnicodeString& left, unsigned short num) -{ return left + static_cast(num); } +{ return left + static_cast(num); } UnicodeString operator+(const UnicodeString& left, unsigned int num) -{ return left + static_cast(num); } +{ return left + static_cast(num); } UnicodeString operator+(const UnicodeString& left, float num) { return left + static_cast(num); } @@ -2091,12 +2085,22 @@ UBool IntlTest::assertEquals(const char* message, std::u16string_view expected, possibleDataError); } -UBool IntlTest::assertEquals(const char* message, - int32_t expected, - int32_t actual) { +bool IntlTest::assertSigned64Equals(const char *message, int64_t expected, int64_t actual) { if (expected != actual) { - errln(UnicodeString("FAIL: ") + message + "; got " + - actual + "=0x" + toHex(actual) + + errln(UnicodeString("FAIL: ") + message + "; got " + actual + "; expected " + expected); + return false; + } +#ifdef VERBOSE_ASSERTIONS + else { + logln(UnicodeString("Ok: ") + message + "; got " + actual); + } +#endif + return true; +} + +bool IntlTest::assertSigned32Equals(const char *message, int32_t expected, int32_t actual) { + if (expected != actual) { + errln(UnicodeString("FAIL: ") + message + "; got " + actual + "=0x" + toHex(actual) + "; expected " + expected + "=0x" + toHex(expected)); return false; } @@ -2108,18 +2112,18 @@ UBool IntlTest::assertEquals(const char* message, return true; } -UBool IntlTest::assertEquals(const char* message, - int64_t expected, - int64_t actual) { +bool IntlTest::assertCodePointEquals(const char *message, char32_t expected, char32_t actual) { if (expected != actual) { - errln(UnicodeString("FAIL: ") + message + "; got int64 " + - Int64ToUnicodeString(actual) + - "; expected " + Int64ToUnicodeString(expected) ); + errln(UnicodeString("FAIL: ") + message + "; got U+" + toHex(actual, actual <= 0xFFFF ? 4 : -1) + + " " + UnicodeString(static_cast(actual)) + "; expected U+" + + toHex(expected, expected <= 0xFFFF ? 4 : -1) + +" " + + UnicodeString(static_cast(expected))); return false; } #ifdef VERBOSE_ASSERTIONS else { - logln(UnicodeString("Ok: ") + message + "; got int64 " + Int64ToUnicodeString(actual)); + logln(UnicodeString("Ok: ") + message + "; got U+" + toHex(actual, actual <= 0xFFFF ? 4 : -1) + + " " + UnicodeString(static_cast(actual))); } #endif return true; @@ -2143,18 +2147,29 @@ UBool IntlTest::assertEquals(const char* message, return true; } -UBool IntlTest::assertEquals(const char* message, - UBool expected, - UBool actual) { +bool IntlTest::assertBooleanEquals(const char *message, int8_t expected, int8_t actual) { if (expected != actual) { - errln(UnicodeString("FAIL: ") + message + "; got " + - toString(actual) + - "; expected " + toString(expected)); + errln(UnicodeString("FAIL: ") + message + "; got " + toString(actual) + "; expected " + + toString(expected)); return false; } #ifdef VERBOSE_ASSERTIONS else { - logln(UnicodeString("Ok: ") + message + "; got " + toString(actual)); + logln(UnicodeString("Ok: ") + message + "; got " + toString(actual)); + } +#endif + return true; +} + +bool IntlTest::assertBooleanNotEquals(const char *message, int8_t expected, int8_t actual) { + if (expected == actual) { + errln(UnicodeString("FAIL: ") + message + "; got " + toString(actual) + "; expected != " + + toString(expected)); + return false; + } +#ifdef VERBOSE_ASSERTIONS + else { + logln(UnicodeString("Ok: ") + message + "; got " + toString(actual)); } #endif return true; @@ -2259,9 +2274,22 @@ UBool IntlTest::assertEquals(const char* message, return true; } -UBool IntlTest::assertNotEquals(const char* message, - int32_t expectedNot, - int32_t actual) { +bool IntlTest::assertSigned64NotEquals(const char *message, int64_t expected, int64_t actual) { + if (expected == actual) { + errln(UnicodeString("FAIL: ") + message + "; got " + actual + "; expected != " + expected); + return false; + } +#ifdef VERBOSE_ASSERTIONS + else { + logln(UnicodeString("Ok: ") + message + "; got " + actual); + } +#endif + return true; +} + +bool IntlTest::assertSigned32NotEquals(const char* message, + int32_t expectedNot, + int32_t actual) { if (expectedNot == actual) { errln(UnicodeString("FAIL: ") + message + "; got " + actual + "=0x" + toHex(actual) + "; expected != " + expectedNot); @@ -2276,6 +2304,23 @@ UBool IntlTest::assertNotEquals(const char* message, return true; } +bool IntlTest::assertCodePointNotEquals(const char *message, char32_t expected, char32_t actual) { + if (expected == actual) { + errln(UnicodeString("FAIL: ") + message + "; got U+" + toHex(actual, actual <= 0xFFFF ? 4 : -1) + + " " + UnicodeString(static_cast(actual)) + "; expected != U+" + + toHex(expected, expected <= 0xFFFF ? 4 : -1) + +" " + + UnicodeString(static_cast(expected))); + return false; + } +#ifdef VERBOSE_ASSERTIONS + else { + logln(UnicodeString("Ok: ") + message + "; got U+" + toHex(actual, actual <= 0xFFFF ? 4 : -1) + + " " + UnicodeString(static_cast(actual))); + } +#endif + return true; +} + UBool IntlTest::assertEqualsNear(const char* message, double expected, double actual, @@ -2308,7 +2353,7 @@ UBool IntlTest::assertEqualsNear(const char* message, static char ASSERT_BUF[256]; -static const char* extractToAssertBuf(std::u16string_view message) { +const char* IntlTest::extractToAssertBuf(std::u16string_view message) { UnicodeString buf; escape(message, buf); buf.extract(0, 0x7FFFFFFF, ASSERT_BUF, sizeof(ASSERT_BUF) - 1, nullptr); @@ -2340,21 +2385,7 @@ UBool IntlTest::assertEquals(std::u16string_view message, const char* actual) { return assertEquals(extractToAssertBuf(message), expected, actual); } -UBool IntlTest::assertEquals(std::u16string_view message, - UBool expected, - UBool actual) { - return assertEquals(extractToAssertBuf(message), expected, actual); -} -UBool IntlTest::assertEquals(std::u16string_view message, - int32_t expected, - int32_t actual) { - return assertEquals(extractToAssertBuf(message), expected, actual); -} -UBool IntlTest::assertEquals(std::u16string_view message, - int64_t expected, - int64_t actual) { - return assertEquals(extractToAssertBuf(message), expected, actual); -} + UBool IntlTest::assertEquals(std::u16string_view message, double expected, double actual) { @@ -2375,11 +2406,6 @@ UBool IntlTest::assertEquals(std::u16string_view message, const std::vector& actual) { return assertEquals(extractToAssertBuf(message), expected, actual); } -UBool IntlTest::assertNotEquals(std::u16string_view message, - int32_t expectedNot, - int32_t actual) { - return assertNotEquals(extractToAssertBuf(message), expectedNot, actual); -} UBool IntlTest::assertEqualsNear(std::u16string_view message, double expected, double actual, diff --git a/icu4c/source/test/intltest/intltest.h b/icu4c/source/test/intltest/intltest.h index d4ecb9c0353c..6b5971bea50d 100644 --- a/icu4c/source/test/intltest/intltest.h +++ b/icu4c/source/test/intltest/intltest.h @@ -36,9 +36,8 @@ U_NAMESPACE_USE UnicodeString UCharToUnicodeString(char16_t c); UnicodeString Int64ToUnicodeString(int64_t num); UnicodeString DoubleToUnicodeString(double num); -//UnicodeString operator+(const UnicodeString& left, int64_t num); // Some compilers don't allow this because of the long type. -UnicodeString operator+(const UnicodeString& left, long num); -UnicodeString operator+(const UnicodeString& left, unsigned long num); +UnicodeString operator+(const UnicodeString& left, int64_t num); +UnicodeString operator+(const UnicodeString& left, uint64_t num); UnicodeString operator+(const UnicodeString& left, double num); UnicodeString operator+(const UnicodeString& left, char num); UnicodeString operator+(const UnicodeString& left, short num); @@ -300,9 +299,84 @@ class IntlTest : public TestLog { UBool assertEquals(const char* message, std::u16string_view expected, std::u16string_view actual, UBool possibleDataError=false); UBool assertEquals(const char* message, const char* expected, const char* actual); - UBool assertEquals(const char* message, UBool expected, UBool actual); - UBool assertEquals(const char* message, int32_t expected, int32_t actual); - UBool assertEquals(const char* message, int64_t expected, int64_t actual); + + template || std::is_same_v) && + (std::is_same_v || std::is_same_v)>> + bool assertEquals(const Message &message, T expected, U actual) { + return assertBooleanEquals(extractToAssertBuf(message), expected, actual); + } + + // Since UChar32 is int32_t, we do not know whether we are looking at code points or some other + // number. Show both the decimal and hexadecimal representations on failure. + template && std::is_same_v>, + typename = void, typename = void> + bool assertEquals(const Message &message, T expected, U actual) { + return assertSigned32Equals(extractToAssertBuf(message), expected, actual); + } + + // This overload applies when at least one of the sides of the comparison is char32_t or char16_t. + // In this case, we can be pretty sure that we are comparing code points or UTF-16 (or UTF-32) code + // units, so we do not show the decimal value, only the hex value in U+ notation, and we show the + // literal character as well. + template || std::is_same_v || + std::is_same_v || std::is_same_v>, + typename = void> + bool assertEquals(const Message& message, T expected, U actual) { + return assertCodePointEquals(extractToAssertBuf(message), expected, actual); + } + + // Otherwise, for enumeration or integral types, log only the decimal value. + template || std::is_enum_v) && + (std::is_integral_v || std::is_enum_v) && + !(std::is_same_v && std::is_same_v) && + !((std::is_same_v || std::is_same_v) && + (std::is_same_v || std::is_same_v)) && + !(std::is_same_v || std::is_same_v || + std::is_same_v || std::is_same_v)>, + typename = void, typename = void, typename = void> + bool assertEquals(const Message &message, T expected, U actual) { + return assertSigned64Equals(extractToAssertBuf(message), expected, actual); + } + + template || std::is_same_v) && + (std::is_same_v || std::is_same_v)>> + bool assertNotEquals(const Message &message, T expected, U actual) { + return assertBooleanNotEquals(extractToAssertBuf(message), expected, actual); + } + + template && std::is_same_v>, + typename = void, typename = void> + bool assertNotEquals(const Message &message, T expected, U actual) { + return assertSigned32NotEquals(extractToAssertBuf(message), expected, actual); + } + + template || std::is_same_v || + std::is_same_v || std::is_same_v>, + typename = void> + bool assertNotEquals(const Message &message, T expected, U actual) { + return assertCodePointNotEquals(extractToAssertBuf(message), expected, actual); + } + + template || std::is_enum_v) && + (std::is_integral_v || std::is_enum_v) && + !(std::is_same_v && std::is_same_v) && + !((std::is_same_v || std::is_same_v) && + (std::is_same_v || std::is_same_v)) && + !(std::is_same_v || std::is_same_v || + std::is_same_v || std::is_same_v)>, + typename = void, typename = void, typename = void> + bool assertNotEquals(const Message &message, T expected, U actual) { + return assertSigned64NotEquals(extractToAssertBuf(message), expected, actual); + } + UBool assertEquals(const char* message, double expected, double actual); // for disambiguation @@ -340,22 +414,19 @@ class IntlTest : public TestLog { const Formattable& actual); #endif #endif - UBool assertNotEquals(const char* message, int32_t expectedNot, int32_t actual); UBool assertTrue(std::u16string_view message, UBool condition, UBool quiet=false, UBool possibleDataError=false); UBool assertFalse(std::u16string_view message, UBool condition, UBool quiet=false, UBool possibleDataError=false); UBool assertSuccess(std::u16string_view message, UErrorCode ec); UBool assertEquals(std::u16string_view message, std::u16string_view expected, std::u16string_view actual, UBool possibleDataError=false); UBool assertEquals(std::u16string_view message, const char* expected, const char* actual); - UBool assertEquals(std::u16string_view message, UBool expected, UBool actual); - UBool assertEquals(std::u16string_view message, int32_t expected, int32_t actual); - UBool assertEquals(std::u16string_view message, int64_t expected, int64_t actual); UBool assertEquals(std::u16string_view message, double expected, double actual); // for disambiguation UBool assertEquals(std::u16string_view message, const char* expected, std::u16string_view actual, UBool possibleDataError=false); + /** * Asserts that two doubles are equal to within a positive delta. Returns * false if they are not. @@ -376,7 +447,6 @@ class IntlTest : public TestLog { #endif UBool assertEquals(std::u16string_view message, const std::vector& expected, const std::vector& actual); - UBool assertNotEquals(std::u16string_view message, int32_t expectedNot, int32_t actual); virtual void runIndexedTest( int32_t index, UBool exec, const char* &name, char* par = nullptr ); // override ! @@ -399,6 +469,24 @@ class IntlTest : public TestLog { int32_t threadCount; private: + // This takes int8_t (aka UBool), not bool, so that in case we actually mean to compare int8_t + // integers, the test result is at least correct. The error message will still be useless (unless one + // of the values is 0, it will say that we expected true and got true instead). + bool assertBooleanEquals(const char *message, int8_t expected, int8_t actual); + bool assertSigned32Equals(const char *message, int32_t expected, int32_t actual); + bool assertSigned64Equals(const char *message, int64_t expected, int64_t actual); + bool assertCodePointEquals(const char *message, char32_t expected, char32_t actual); + + bool assertBooleanNotEquals(const char *message, int8_t expected, int8_t actual); + bool assertSigned32NotEquals(const char *message, int32_t expected, int32_t actual); + bool assertSigned64NotEquals(const char *message, int64_t expected, int64_t actual); + bool assertCodePointNotEquals(const char *message, char32_t expected, char32_t actual); + + static const char* extractToAssertBuf(const char* message) { + return message; + } + static const char* extractToAssertBuf(std::u16string_view message); + UBool LL_linestart; int32_t LL_indentlevel; diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj index 7c0b089a36ec..472271a2a386 100644 --- a/icu4c/source/test/intltest/intltest.vcxproj +++ b/icu4c/source/test/intltest/intltest.vcxproj @@ -73,6 +73,7 @@ + @@ -223,6 +224,7 @@ + diff --git a/icu4c/source/test/intltest/intltest.vcxproj.filters b/icu4c/source/test/intltest/intltest.vcxproj.filters index cea62b786d23..32ae91e6a2dd 100644 --- a/icu4c/source/test/intltest/intltest.vcxproj.filters +++ b/icu4c/source/test/intltest/intltest.vcxproj.filters @@ -490,6 +490,9 @@ strings + + strings + strings @@ -589,6 +592,9 @@ misc + + misc + diff --git a/icu4c/source/test/intltest/intltesttest.cpp b/icu4c/source/test/intltest/intltesttest.cpp new file mode 100644 index 000000000000..607a4920f547 --- /dev/null +++ b/icu4c/source/test/intltest/intltesttest.cpp @@ -0,0 +1,258 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +#include "intltest.h" + +class IntlTestTest : public IntlTest { + public: + void runIndexedTest(int32_t index, UBool exec, const char*& name, char* /*par*/) override { + if (exec) { + logln("TestSuite IntlTestTest: "); + } + TESTCASE_AUTO_BEGIN; + + TESTCASE_AUTO(testAssertEquals); + TESTCASE_AUTO(testAssertNotEquals); + + TESTCASE_AUTO_END; + } + + protected: + class TestableIntlTest : public IntlTest { + public: + TestableIntlTest(std::u16string* const lastLogLine) : lastLogLine(lastLogLine) {} + + size_t newErrors() { + const size_t result = errors; + errors = 0; + return result; + } + + virtual int32_t IncErrorCount() override { + ++errors; + return IntlTest::IncErrorCount(); + } + + protected: + virtual void LL_message(std::u16string_view message, UBool newline) override { + currentLogLine += message; + if (newline) { + *lastLogLine = currentLogLine; + currentLogLine.clear(); + } + } + + private: + size_t errors = 0; + std::u16string* lastLogLine; + std::u16string currentLogLine; + }; + + void testAssertEquals() { + std::u16string lastLogLine; + TestableIntlTest metatest(&lastLogLine); + // Booleans: Both UBool, mixed, both bool. + metatest.assertEquals(WHERE "should fail", static_cast(true), static_cast(false)); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("boolean in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"true")); + metatest.assertEquals(WHERE "should fail", static_cast(true), false); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("boolean in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"true")); + metatest.assertEquals(WHERE "should fail", true, false); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("boolean in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"true")); + // The mysterious int32_t. + metatest.assertEquals(WHERE "should fail", -1, 66); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32", std::u16string::npos, lastLogLine.find(u"-1")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"0xFFFFFFFF")); + metatest.assertEquals(WHERE "should fail", 65, 66); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"0x41")); + metatest.assertEquals(WHERE "should fail", UnicodeString("").char32At(0), + UnicodeString("B").char32At(0)); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65535")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"0xFFFF")); + metatest.assertEquals(WHERE "should fail", UnicodeString("AB").char32At(0), + UnicodeString("AB").char32At(1)); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"0x41")); + // Definitely characters. + // char32_t. + metatest.assertEquals(WHERE "should fail", U'A', U'B'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char32_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertEquals(WHERE "should fail", UnicodeString("A").char32At(0), U'B'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char32_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertEquals(WHERE "should fail", U'A', 0x42); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char32_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + // char16_t. + metatest.assertEquals(WHERE "should fail", u'A', u'B'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char16_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertEquals(WHERE "should fail", 0x41, u'B'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char16_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertEquals(WHERE "should fail", UnicodeString("A").charAt(0), 0x42); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char16_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + // Actual numeric comparisons. + metatest.assertEquals(WHERE "should fail", static_cast(65), 66); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal uint32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65")); + assertEquals("NO hex uint32 in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"41")); + constexpr std::u16string_view s = u"𒌉 𒂍𒁾𒁀𒀀 𒌓 𒌌𒆷𒀀𒀭 𒈨𒂠 𒉌𒁺𒉈𒂗"; + metatest.assertEquals(WHERE "should fail", s.size(), 38); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal size_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"37")); + assertEquals("NO hex size_t in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"25")); + // This one is int32_t on 32-bit platforms. + metatest.assertEquals(WHERE "should fail", s.end() - s.begin(), 38); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal ptrdiff_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"37")); + if (sizeof(std::ptrdiff_t) == 4) { + assertNotEquals("hex 32-bit ptrdiff_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"25")); + } else { + assertEquals("NO hex ptrdiff_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"25")); + } + // Making the enum inherit from int8_t, which is UBool, also allows us to check that we don’t + // fall into the UBool overload (this would have been the case before this got templatized). + enum Button : int8_t { + Abort = 65, + Retry = 66, + Ignore = 67, + }; + metatest.assertEquals(WHERE "should fail", Abort, Retry); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal enum in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"65")); + assertEquals("NO hex enum in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"41")); + assertEquals("NO UBool in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"UBool")); + } + + void testAssertNotEquals() { + std::u16string lastLogLine; + TestableIntlTest metatest(&lastLogLine); + // Booleans: Both UBool, mixed, both bool. + metatest.assertNotEquals(WHERE "should fail", static_cast(true), static_cast(true)); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("boolean in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"true")); + metatest.assertNotEquals(WHERE "should fail", static_cast(true), true); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("boolean in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"true")); + metatest.assertNotEquals(WHERE "should fail", true, true); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("boolean in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"true")); + // The mysterious int32_t. + metatest.assertNotEquals(WHERE "should fail", -1, -1); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32", std::u16string::npos, lastLogLine.find(u"-1")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"0xFFFFFFFF")); + metatest.assertNotEquals(WHERE "should fail", 65, 65); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"0x41")); + metatest.assertNotEquals(WHERE "should fail", UnicodeString("").char32At(0), + UnicodeString("B").char32At(1)); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65535")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"0xFFFF")); + metatest.assertNotEquals(WHERE "should fail", UnicodeString("AB").char32At(0), + UnicodeString("BA").char32At(1)); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal int32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65")); + assertNotEquals("hex int32 in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"0x41")); + // Definitely characters. + // char32_t. + metatest.assertNotEquals(WHERE "should fail", U'A', U'A'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char32_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertNotEquals(WHERE "should fail", UnicodeString("A").char32At(0), U'A'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char32_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertNotEquals(WHERE "should fail", U'A', 0x41); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char32_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + // char16_t. + metatest.assertNotEquals(WHERE "should fail", u'A', u'A'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char16_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertNotEquals(WHERE "should fail", 0x41, u'A'); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char16_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + metatest.assertNotEquals(WHERE "should fail", UnicodeString("A").charAt(0), 0x41); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("char16_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"U+0041 A")); + // Actual numeric comparisons. + metatest.assertNotEquals(WHERE "should fail", static_cast(65), 65); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal uint32 in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"65")); + assertEquals("NO hex uint32 in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"41")); + constexpr std::u16string_view s = u"𒌉 𒂍𒁾𒁀𒀀 𒌓 𒌌𒆷𒀀𒀭 𒈨𒂠 𒉌𒁺𒉈𒂗"; + metatest.assertNotEquals(WHERE "should fail", s.size(), 37); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal size_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"37")); + assertEquals("NO hex size_t in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"25")); + // This one is int32_t on 32-bit platforms. + metatest.assertNotEquals(WHERE "should fail", s.end() - s.begin(), 37); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal ptrdiff_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"37")); + if (sizeof(std::ptrdiff_t) == 4) { + assertNotEquals("hex 32-bit ptrdiff_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"25")); + } else { + assertEquals("NO hex ptrdiff_t in " + lastLogLine, std::u16string::npos, + lastLogLine.find(u"25")); + } + // Making the enum inherit from int8_t, which is UBool, also allows us to check that we don’t + // fall into the UBool overload (this would have been the case before this got templatized). + enum Button : int8_t { + Abort = 65, + Retry = 66, + Ignore = 67, + }; + metatest.assertNotEquals(WHERE "should fail", Abort, Abort); + assertEquals(WHERE "should have failed", 1, metatest.newErrors()); + assertNotEquals("decimal enum in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"65")); + assertEquals("NO hex enum in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"41")); + assertEquals("NO UBool in " + lastLogLine, std::u16string::npos, lastLogLine.find(u"UBool")); + } +}; + +extern IntlTest *createIntlTestTest() { + return new IntlTestTest(); +} diff --git a/icu4c/source/test/intltest/itutil.cpp b/icu4c/source/test/intltest/itutil.cpp index c4319375420d..f564f4029a36 100644 --- a/icu4c/source/test/intltest/itutil.cpp +++ b/icu4c/source/test/intltest/itutil.cpp @@ -51,11 +51,14 @@ extern IntlTest *createPluralMapTest(); extern IntlTest *createStaticUnicodeSetsTest(); #endif static IntlTest *createUHashTest(); +extern IntlTest *createUTFIteratorTest(); +extern IntlTest *createIntlTestTest(); void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &name, char* par ) { if (exec) logln("TestSuite Utilities: "); TESTCASE_AUTO_BEGIN; + TESTCASE_AUTO_CREATE_CLASS(IntlTestTest); TESTCASE_AUTO_CLASS(MultithreadTest); TESTCASE_AUTO_CLASS(StringTest); TESTCASE_AUTO_CLASS(UnicodeStringTest); @@ -90,6 +93,7 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* & TESTCASE_AUTO_CREATE_CLASS(UColHeaderOnlyTest); #endif TESTCASE_AUTO_CREATE_CLASS(USetHeaderOnlyTest); + TESTCASE_AUTO_CREATE_CLASS(UTFIteratorTest); TESTCASE_AUTO_END; } diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 18887ed4fb14..3a53673bc523 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -2570,8 +2570,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "dz" }, { "und_BY", - "be_Cyrl_BY", - "be" + "ru_Cyrl_BY", + "ru_BY" }, { "und_Beng", "bn_Beng_BD", @@ -4372,7 +4372,7 @@ LocaleTest::TestCreateKeywordSet() { status); status.errIfFailureAndReset("\"%s\"", l.getName()); - assertEquals("set::size()", 2, static_cast(result.size())); + assertEquals("set::size()", 2, result.size()); assertTrue("set::find(\"calendar\")", result.find("calendar") != result.end()); assertTrue("set::find(\"collation\")", @@ -4391,7 +4391,7 @@ LocaleTest::TestCreateKeywordSetEmpty() { status); status.errIfFailureAndReset("\"%s\"", l.getName()); - assertEquals("set::size()", 0, static_cast(result.size())); + assertEquals("set::size()", 0, result.size()); } void @@ -4427,7 +4427,7 @@ LocaleTest::TestCreateUnicodeKeywordSet() { status); status.errIfFailureAndReset("\"%s\"", l.getName()); - assertEquals("set::size()", 2, static_cast(result.size())); + assertEquals("set::size()", 2, result.size()); assertTrue("set::find(\"ca\")", result.find("ca") != result.end()); assertTrue("set::find(\"co\")", @@ -4451,7 +4451,7 @@ LocaleTest::TestCreateUnicodeKeywordSetEmpty() { status); status.errIfFailureAndReset("\"%s\"", l.getName()); - assertEquals("set::size()", 0, static_cast(result.size())); + assertEquals("set::size()", 0, result.size()); LocalPointer se(l.createUnicodeKeywords(status), status); assertTrue("createUnicodeKeywords", se.isNull()); @@ -4476,7 +4476,7 @@ LocaleTest::TestCreateUnicodeKeywordSetWithPrivateUse() { result.find("x") == result.end()); assertTrue("getUnicodeKeywords set::find(\"foo\")", result.find("foo") == result.end()); - assertEquals("set::size()", 1, static_cast(result.size())); + assertEquals("set::size()", 1, result.size()); LocalPointer se(l.createUnicodeKeywords(status), status); status.errIfFailureAndReset("\"%s\" createUnicodeKeywords()", l.getName()); diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 9a6d58286783..08f587b18997 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -68,6 +68,7 @@ class MeasureFormatTest : public IntlTest { void TestCompatible73(); void TestCompatible74(); void TestCompatible77(); + void TestCompatible78(); void TestGetAvailable(); void TestExamplesInDocs(); void TestFormatPeriodEn(); @@ -4295,8 +4296,6 @@ void MeasureFormatTest::TestCompatible77() { measureUnitValue = MeasureUnit::getPartPerMillion(); measureUnit.adoptInstead(MeasureUnit::createPermyriad(status)); measureUnitValue = MeasureUnit::getPermyriad(); - measureUnit.adoptInstead(MeasureUnit::createPortionPer1E9(status)); - measureUnitValue = MeasureUnit::getPortionPer1E9(); measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status)); measureUnitValue = MeasureUnit::getLiterPer100Kilometers(); measureUnit.adoptInstead(MeasureUnit::createLiterPerKilometer(status)); @@ -4630,6 +4629,489 @@ void MeasureFormatTest::TestCompatible77() { assertSuccess("", status); } +void MeasureFormatTest::TestCompatible78() { + UErrorCode status = U_ZERO_ERROR; + LocalPointer measureUnit; + MeasureUnit measureUnitValue; + measureUnit.adoptInstead(MeasureUnit::createGForce(status)); + measureUnitValue = MeasureUnit::getGForce(); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecondSquared(status)); + measureUnitValue = MeasureUnit::getMeterPerSecondSquared(); + measureUnit.adoptInstead(MeasureUnit::createArcMinute(status)); + measureUnitValue = MeasureUnit::getArcMinute(); + measureUnit.adoptInstead(MeasureUnit::createArcSecond(status)); + measureUnitValue = MeasureUnit::getArcSecond(); + measureUnit.adoptInstead(MeasureUnit::createDegree(status)); + measureUnitValue = MeasureUnit::getDegree(); + measureUnit.adoptInstead(MeasureUnit::createRadian(status)); + measureUnitValue = MeasureUnit::getRadian(); + measureUnit.adoptInstead(MeasureUnit::createRevolutionAngle(status)); + measureUnitValue = MeasureUnit::getRevolutionAngle(); + measureUnit.adoptInstead(MeasureUnit::createSteradian(status)); + measureUnitValue = MeasureUnit::getSteradian(); + measureUnit.adoptInstead(MeasureUnit::createAcre(status)); + measureUnitValue = MeasureUnit::getAcre(); + measureUnit.adoptInstead(MeasureUnit::createBuJp(status)); + measureUnitValue = MeasureUnit::getBuJp(); + measureUnit.adoptInstead(MeasureUnit::createCho(status)); + measureUnitValue = MeasureUnit::getCho(); + measureUnit.adoptInstead(MeasureUnit::createDunam(status)); + measureUnitValue = MeasureUnit::getDunam(); + measureUnit.adoptInstead(MeasureUnit::createHectare(status)); + measureUnitValue = MeasureUnit::getHectare(); + measureUnit.adoptInstead(MeasureUnit::createSeJp(status)); + measureUnitValue = MeasureUnit::getSeJp(); + measureUnit.adoptInstead(MeasureUnit::createSquareCentimeter(status)); + measureUnitValue = MeasureUnit::getSquareCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createSquareFoot(status)); + measureUnitValue = MeasureUnit::getSquareFoot(); + measureUnit.adoptInstead(MeasureUnit::createSquareInch(status)); + measureUnitValue = MeasureUnit::getSquareInch(); + measureUnit.adoptInstead(MeasureUnit::createSquareKilometer(status)); + measureUnitValue = MeasureUnit::getSquareKilometer(); + measureUnit.adoptInstead(MeasureUnit::createSquareMeter(status)); + measureUnitValue = MeasureUnit::getSquareMeter(); + measureUnit.adoptInstead(MeasureUnit::createSquareMile(status)); + measureUnitValue = MeasureUnit::getSquareMile(); + measureUnit.adoptInstead(MeasureUnit::createSquareYard(status)); + measureUnitValue = MeasureUnit::getSquareYard(); + measureUnit.adoptInstead(MeasureUnit::createItem(status)); + measureUnitValue = MeasureUnit::getItem(); + measureUnit.adoptInstead(MeasureUnit::createKarat(status)); + measureUnitValue = MeasureUnit::getKarat(); + measureUnit.adoptInstead(MeasureUnit::createKatal(status)); + measureUnitValue = MeasureUnit::getKatal(); + measureUnit.adoptInstead(MeasureUnit::createMilligramOfglucosePerDeciliter(status)); + measureUnitValue = MeasureUnit::getMilligramOfglucosePerDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status)); // backward compatibility API + measureUnitValue = MeasureUnit::getMilligramPerDeciliter(); // backward compatibility API + measureUnit.adoptInstead(MeasureUnit::createMillimolePerLiter(status)); + measureUnitValue = MeasureUnit::getMillimolePerLiter(); + measureUnit.adoptInstead(MeasureUnit::createMole(status)); + measureUnitValue = MeasureUnit::getMole(); + measureUnit.adoptInstead(MeasureUnit::createOfglucose(status)); + measureUnitValue = MeasureUnit::getOfglucose(); + measureUnit.adoptInstead(MeasureUnit::createPart(status)); + measureUnitValue = MeasureUnit::getPart(); + measureUnit.adoptInstead(MeasureUnit::createPartPer1E6(status)); + measureUnitValue = MeasureUnit::getPartPer1E6(); + measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status)); // backward compatibility API + measureUnitValue = MeasureUnit::getPartPerMillion(); // backward compatibility API + measureUnit.adoptInstead(MeasureUnit::createPartPer1E9(status)); + measureUnitValue = MeasureUnit::getPartPer1E9(); + measureUnit.adoptInstead(MeasureUnit::createPercent(status)); + measureUnitValue = MeasureUnit::getPercent(); + measureUnit.adoptInstead(MeasureUnit::createPermille(status)); + measureUnitValue = MeasureUnit::getPermille(); + measureUnit.adoptInstead(MeasureUnit::createPermyriad(status)); + measureUnitValue = MeasureUnit::getPermyriad(); + measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status)); + measureUnitValue = MeasureUnit::getLiterPer100Kilometers(); + measureUnit.adoptInstead(MeasureUnit::createLiterPerKilometer(status)); + measureUnitValue = MeasureUnit::getLiterPerKilometer(); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallon(status)); + measureUnitValue = MeasureUnit::getMilePerGallon(); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallonImperial(status)); + measureUnitValue = MeasureUnit::getMilePerGallonImperial(); + measureUnit.adoptInstead(MeasureUnit::createBit(status)); + measureUnitValue = MeasureUnit::getBit(); + measureUnit.adoptInstead(MeasureUnit::createByte(status)); + measureUnitValue = MeasureUnit::getByte(); + measureUnit.adoptInstead(MeasureUnit::createGigabit(status)); + measureUnitValue = MeasureUnit::getGigabit(); + measureUnit.adoptInstead(MeasureUnit::createGigabyte(status)); + measureUnitValue = MeasureUnit::getGigabyte(); + measureUnit.adoptInstead(MeasureUnit::createKilobit(status)); + measureUnitValue = MeasureUnit::getKilobit(); + measureUnit.adoptInstead(MeasureUnit::createKilobyte(status)); + measureUnitValue = MeasureUnit::getKilobyte(); + measureUnit.adoptInstead(MeasureUnit::createMegabit(status)); + measureUnitValue = MeasureUnit::getMegabit(); + measureUnit.adoptInstead(MeasureUnit::createMegabyte(status)); + measureUnitValue = MeasureUnit::getMegabyte(); + measureUnit.adoptInstead(MeasureUnit::createPetabyte(status)); + measureUnitValue = MeasureUnit::getPetabyte(); + measureUnit.adoptInstead(MeasureUnit::createTerabit(status)); + measureUnitValue = MeasureUnit::getTerabit(); + measureUnit.adoptInstead(MeasureUnit::createTerabyte(status)); + measureUnitValue = MeasureUnit::getTerabyte(); + measureUnit.adoptInstead(MeasureUnit::createCentury(status)); + measureUnitValue = MeasureUnit::getCentury(); + measureUnit.adoptInstead(MeasureUnit::createDay(status)); + measureUnitValue = MeasureUnit::getDay(); + measureUnit.adoptInstead(MeasureUnit::createDayPerson(status)); + measureUnitValue = MeasureUnit::getDayPerson(); + measureUnit.adoptInstead(MeasureUnit::createDecade(status)); + measureUnitValue = MeasureUnit::getDecade(); + measureUnit.adoptInstead(MeasureUnit::createFortnight(status)); + measureUnitValue = MeasureUnit::getFortnight(); + measureUnit.adoptInstead(MeasureUnit::createHour(status)); + measureUnitValue = MeasureUnit::getHour(); + measureUnit.adoptInstead(MeasureUnit::createMicrosecond(status)); + measureUnitValue = MeasureUnit::getMicrosecond(); + measureUnit.adoptInstead(MeasureUnit::createMillisecond(status)); + measureUnitValue = MeasureUnit::getMillisecond(); + measureUnit.adoptInstead(MeasureUnit::createMinute(status)); + measureUnitValue = MeasureUnit::getMinute(); + measureUnit.adoptInstead(MeasureUnit::createMonth(status)); + measureUnitValue = MeasureUnit::getMonth(); + measureUnit.adoptInstead(MeasureUnit::createMonthPerson(status)); + measureUnitValue = MeasureUnit::getMonthPerson(); + measureUnit.adoptInstead(MeasureUnit::createNanosecond(status)); + measureUnitValue = MeasureUnit::getNanosecond(); + measureUnit.adoptInstead(MeasureUnit::createNight(status)); + measureUnitValue = MeasureUnit::getNight(); + measureUnit.adoptInstead(MeasureUnit::createQuarter(status)); + measureUnitValue = MeasureUnit::getQuarter(); + measureUnit.adoptInstead(MeasureUnit::createSecond(status)); + measureUnitValue = MeasureUnit::getSecond(); + measureUnit.adoptInstead(MeasureUnit::createWeek(status)); + measureUnitValue = MeasureUnit::getWeek(); + measureUnit.adoptInstead(MeasureUnit::createWeekPerson(status)); + measureUnitValue = MeasureUnit::getWeekPerson(); + measureUnit.adoptInstead(MeasureUnit::createYear(status)); + measureUnitValue = MeasureUnit::getYear(); + measureUnit.adoptInstead(MeasureUnit::createYearPerson(status)); + measureUnitValue = MeasureUnit::getYearPerson(); + measureUnit.adoptInstead(MeasureUnit::createAmpere(status)); + measureUnitValue = MeasureUnit::getAmpere(); + measureUnit.adoptInstead(MeasureUnit::createCoulomb(status)); + measureUnitValue = MeasureUnit::getCoulomb(); + measureUnit.adoptInstead(MeasureUnit::createFarad(status)); + measureUnitValue = MeasureUnit::getFarad(); + measureUnit.adoptInstead(MeasureUnit::createHenry(status)); + measureUnitValue = MeasureUnit::getHenry(); + measureUnit.adoptInstead(MeasureUnit::createMilliampere(status)); + measureUnitValue = MeasureUnit::getMilliampere(); + measureUnit.adoptInstead(MeasureUnit::createOhm(status)); + measureUnitValue = MeasureUnit::getOhm(); + measureUnit.adoptInstead(MeasureUnit::createSiemens(status)); + measureUnitValue = MeasureUnit::getSiemens(); + measureUnit.adoptInstead(MeasureUnit::createVolt(status)); + measureUnitValue = MeasureUnit::getVolt(); + measureUnit.adoptInstead(MeasureUnit::createBecquerel(status)); + measureUnitValue = MeasureUnit::getBecquerel(); + measureUnit.adoptInstead(MeasureUnit::createBritishThermalUnit(status)); + measureUnitValue = MeasureUnit::getBritishThermalUnit(); + measureUnit.adoptInstead(MeasureUnit::createBritishThermalUnitIt(status)); + measureUnitValue = MeasureUnit::getBritishThermalUnitIt(); + measureUnit.adoptInstead(MeasureUnit::createCalorie(status)); + measureUnitValue = MeasureUnit::getCalorie(); + measureUnit.adoptInstead(MeasureUnit::createCalorieIt(status)); + measureUnitValue = MeasureUnit::getCalorieIt(); + measureUnit.adoptInstead(MeasureUnit::createElectronvolt(status)); + measureUnitValue = MeasureUnit::getElectronvolt(); + measureUnit.adoptInstead(MeasureUnit::createFoodcalorie(status)); + measureUnitValue = MeasureUnit::getFoodcalorie(); + measureUnit.adoptInstead(MeasureUnit::createGray(status)); + measureUnitValue = MeasureUnit::getGray(); + measureUnit.adoptInstead(MeasureUnit::createJoule(status)); + measureUnitValue = MeasureUnit::getJoule(); + measureUnit.adoptInstead(MeasureUnit::createKilocalorie(status)); + measureUnitValue = MeasureUnit::getKilocalorie(); + measureUnit.adoptInstead(MeasureUnit::createKilojoule(status)); + measureUnitValue = MeasureUnit::getKilojoule(); + measureUnit.adoptInstead(MeasureUnit::createKilowattHour(status)); + measureUnitValue = MeasureUnit::getKilowattHour(); + measureUnit.adoptInstead(MeasureUnit::createSievert(status)); + measureUnitValue = MeasureUnit::getSievert(); + measureUnit.adoptInstead(MeasureUnit::createThermUs(status)); + measureUnitValue = MeasureUnit::getThermUs(); + measureUnit.adoptInstead(MeasureUnit::createKilogramForce(status)); + measureUnitValue = MeasureUnit::getKilogramForce(); + measureUnit.adoptInstead(MeasureUnit::createKilowattHourPer100Kilometer(status)); + measureUnitValue = MeasureUnit::getKilowattHourPer100Kilometer(); + measureUnit.adoptInstead(MeasureUnit::createNewton(status)); + measureUnitValue = MeasureUnit::getNewton(); + measureUnit.adoptInstead(MeasureUnit::createPoundForce(status)); + measureUnitValue = MeasureUnit::getPoundForce(); + measureUnit.adoptInstead(MeasureUnit::createGigahertz(status)); + measureUnitValue = MeasureUnit::getGigahertz(); + measureUnit.adoptInstead(MeasureUnit::createHertz(status)); + measureUnitValue = MeasureUnit::getHertz(); + measureUnit.adoptInstead(MeasureUnit::createKilohertz(status)); + measureUnitValue = MeasureUnit::getKilohertz(); + measureUnit.adoptInstead(MeasureUnit::createMegahertz(status)); + measureUnitValue = MeasureUnit::getMegahertz(); + measureUnit.adoptInstead(MeasureUnit::createDot(status)); + measureUnitValue = MeasureUnit::getDot(); + measureUnit.adoptInstead(MeasureUnit::createDotPerCentimeter(status)); + measureUnitValue = MeasureUnit::getDotPerCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createDotPerInch(status)); + measureUnitValue = MeasureUnit::getDotPerInch(); + measureUnit.adoptInstead(MeasureUnit::createEm(status)); + measureUnitValue = MeasureUnit::getEm(); + measureUnit.adoptInstead(MeasureUnit::createMegapixel(status)); + measureUnitValue = MeasureUnit::getMegapixel(); + measureUnit.adoptInstead(MeasureUnit::createPixel(status)); + measureUnitValue = MeasureUnit::getPixel(); + measureUnit.adoptInstead(MeasureUnit::createPixelPerCentimeter(status)); + measureUnitValue = MeasureUnit::getPixelPerCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createPixelPerInch(status)); + measureUnitValue = MeasureUnit::getPixelPerInch(); + measureUnit.adoptInstead(MeasureUnit::createAstronomicalUnit(status)); + measureUnitValue = MeasureUnit::getAstronomicalUnit(); + measureUnit.adoptInstead(MeasureUnit::createCentimeter(status)); + measureUnitValue = MeasureUnit::getCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createChain(status)); + measureUnitValue = MeasureUnit::getChain(); + measureUnit.adoptInstead(MeasureUnit::createDecimeter(status)); + measureUnitValue = MeasureUnit::getDecimeter(); + measureUnit.adoptInstead(MeasureUnit::createEarthRadius(status)); + measureUnitValue = MeasureUnit::getEarthRadius(); + measureUnit.adoptInstead(MeasureUnit::createFathom(status)); + measureUnitValue = MeasureUnit::getFathom(); + measureUnit.adoptInstead(MeasureUnit::createFoot(status)); + measureUnitValue = MeasureUnit::getFoot(); + measureUnit.adoptInstead(MeasureUnit::createFurlong(status)); + measureUnitValue = MeasureUnit::getFurlong(); + measureUnit.adoptInstead(MeasureUnit::createInch(status)); + measureUnitValue = MeasureUnit::getInch(); + measureUnit.adoptInstead(MeasureUnit::createJoJp(status)); + measureUnitValue = MeasureUnit::getJoJp(); + measureUnit.adoptInstead(MeasureUnit::createKen(status)); + measureUnitValue = MeasureUnit::getKen(); + measureUnit.adoptInstead(MeasureUnit::createKilometer(status)); + measureUnitValue = MeasureUnit::getKilometer(); + measureUnit.adoptInstead(MeasureUnit::createLightYear(status)); + measureUnitValue = MeasureUnit::getLightYear(); + measureUnit.adoptInstead(MeasureUnit::createMeter(status)); + measureUnitValue = MeasureUnit::getMeter(); + measureUnit.adoptInstead(MeasureUnit::createMicrometer(status)); + measureUnitValue = MeasureUnit::getMicrometer(); + measureUnit.adoptInstead(MeasureUnit::createMile(status)); + measureUnitValue = MeasureUnit::getMile(); + measureUnit.adoptInstead(MeasureUnit::createMileScandinavian(status)); + measureUnitValue = MeasureUnit::getMileScandinavian(); + measureUnit.adoptInstead(MeasureUnit::createMillimeter(status)); + measureUnitValue = MeasureUnit::getMillimeter(); + measureUnit.adoptInstead(MeasureUnit::createNanometer(status)); + measureUnitValue = MeasureUnit::getNanometer(); + measureUnit.adoptInstead(MeasureUnit::createNauticalMile(status)); + measureUnitValue = MeasureUnit::getNauticalMile(); + measureUnit.adoptInstead(MeasureUnit::createParsec(status)); + measureUnitValue = MeasureUnit::getParsec(); + measureUnit.adoptInstead(MeasureUnit::createPicometer(status)); + measureUnitValue = MeasureUnit::getPicometer(); + measureUnit.adoptInstead(MeasureUnit::createPoint(status)); + measureUnitValue = MeasureUnit::getPoint(); + measureUnit.adoptInstead(MeasureUnit::createRiJp(status)); + measureUnitValue = MeasureUnit::getRiJp(); + measureUnit.adoptInstead(MeasureUnit::createRin(status)); + measureUnitValue = MeasureUnit::getRin(); + measureUnit.adoptInstead(MeasureUnit::createRod(status)); + measureUnitValue = MeasureUnit::getRod(); + measureUnit.adoptInstead(MeasureUnit::createShakuCloth(status)); + measureUnitValue = MeasureUnit::getShakuCloth(); + measureUnit.adoptInstead(MeasureUnit::createShakuLength(status)); + measureUnitValue = MeasureUnit::getShakuLength(); + measureUnit.adoptInstead(MeasureUnit::createSolarRadius(status)); + measureUnitValue = MeasureUnit::getSolarRadius(); + measureUnit.adoptInstead(MeasureUnit::createSun(status)); + measureUnitValue = MeasureUnit::getSun(); + measureUnit.adoptInstead(MeasureUnit::createYard(status)); + measureUnitValue = MeasureUnit::getYard(); + measureUnit.adoptInstead(MeasureUnit::createCandela(status)); + measureUnitValue = MeasureUnit::getCandela(); + measureUnit.adoptInstead(MeasureUnit::createLumen(status)); + measureUnitValue = MeasureUnit::getLumen(); + measureUnit.adoptInstead(MeasureUnit::createLux(status)); + measureUnitValue = MeasureUnit::getLux(); + measureUnit.adoptInstead(MeasureUnit::createSolarLuminosity(status)); + measureUnitValue = MeasureUnit::getSolarLuminosity(); + measureUnit.adoptInstead(MeasureUnit::createTesla(status)); + measureUnitValue = MeasureUnit::getTesla(); + measureUnit.adoptInstead(MeasureUnit::createWeber(status)); + measureUnitValue = MeasureUnit::getWeber(); + measureUnit.adoptInstead(MeasureUnit::createCarat(status)); + measureUnitValue = MeasureUnit::getCarat(); + measureUnit.adoptInstead(MeasureUnit::createDalton(status)); + measureUnitValue = MeasureUnit::getDalton(); + measureUnit.adoptInstead(MeasureUnit::createEarthMass(status)); + measureUnitValue = MeasureUnit::getEarthMass(); + measureUnit.adoptInstead(MeasureUnit::createFun(status)); + measureUnitValue = MeasureUnit::getFun(); + measureUnit.adoptInstead(MeasureUnit::createGrain(status)); + measureUnitValue = MeasureUnit::getGrain(); + measureUnit.adoptInstead(MeasureUnit::createGram(status)); + measureUnitValue = MeasureUnit::getGram(); + measureUnit.adoptInstead(MeasureUnit::createKilogram(status)); + measureUnitValue = MeasureUnit::getKilogram(); + measureUnit.adoptInstead(MeasureUnit::createMicrogram(status)); + measureUnitValue = MeasureUnit::getMicrogram(); + measureUnit.adoptInstead(MeasureUnit::createMilligram(status)); + measureUnitValue = MeasureUnit::getMilligram(); + measureUnit.adoptInstead(MeasureUnit::createOunce(status)); + measureUnitValue = MeasureUnit::getOunce(); + measureUnit.adoptInstead(MeasureUnit::createOunceTroy(status)); + measureUnitValue = MeasureUnit::getOunceTroy(); + measureUnit.adoptInstead(MeasureUnit::createPound(status)); + measureUnitValue = MeasureUnit::getPound(); + measureUnit.adoptInstead(MeasureUnit::createSlug(status)); + measureUnitValue = MeasureUnit::getSlug(); + measureUnit.adoptInstead(MeasureUnit::createSolarMass(status)); + measureUnitValue = MeasureUnit::getSolarMass(); + measureUnit.adoptInstead(MeasureUnit::createStone(status)); + measureUnitValue = MeasureUnit::getStone(); + measureUnit.adoptInstead(MeasureUnit::createTon(status)); + measureUnitValue = MeasureUnit::getTon(); + measureUnit.adoptInstead(MeasureUnit::createTonne(status)); + measureUnitValue = MeasureUnit::getTonne(); + measureUnit.adoptInstead(MeasureUnit::createMetricTon(status)); // backward compatibility API + measureUnitValue = MeasureUnit::getMetricTon(); // backward compatibility API + measureUnit.adoptInstead(MeasureUnit::createGigawatt(status)); + measureUnitValue = MeasureUnit::getGigawatt(); + measureUnit.adoptInstead(MeasureUnit::createHorsepower(status)); + measureUnitValue = MeasureUnit::getHorsepower(); + measureUnit.adoptInstead(MeasureUnit::createKilowatt(status)); + measureUnitValue = MeasureUnit::getKilowatt(); + measureUnit.adoptInstead(MeasureUnit::createMegawatt(status)); + measureUnitValue = MeasureUnit::getMegawatt(); + measureUnit.adoptInstead(MeasureUnit::createMilliwatt(status)); + measureUnitValue = MeasureUnit::getMilliwatt(); + measureUnit.adoptInstead(MeasureUnit::createWatt(status)); + measureUnitValue = MeasureUnit::getWatt(); + measureUnit.adoptInstead(MeasureUnit::createAtmosphere(status)); + measureUnitValue = MeasureUnit::getAtmosphere(); + measureUnit.adoptInstead(MeasureUnit::createBar(status)); + measureUnitValue = MeasureUnit::getBar(); + measureUnit.adoptInstead(MeasureUnit::createGasolineEnergyDensity(status)); + measureUnitValue = MeasureUnit::getGasolineEnergyDensity(); + measureUnit.adoptInstead(MeasureUnit::createHectopascal(status)); + measureUnitValue = MeasureUnit::getHectopascal(); + measureUnit.adoptInstead(MeasureUnit::createInchHg(status)); + measureUnitValue = MeasureUnit::getInchHg(); + measureUnit.adoptInstead(MeasureUnit::createKilopascal(status)); + measureUnitValue = MeasureUnit::getKilopascal(); + measureUnit.adoptInstead(MeasureUnit::createMegapascal(status)); + measureUnitValue = MeasureUnit::getMegapascal(); + measureUnit.adoptInstead(MeasureUnit::createMillibar(status)); + measureUnitValue = MeasureUnit::getMillibar(); + measureUnit.adoptInstead(MeasureUnit::createMillimeterOfMercury(status)); + measureUnitValue = MeasureUnit::getMillimeterOfMercury(); + measureUnit.adoptInstead(MeasureUnit::createOfhg(status)); + measureUnitValue = MeasureUnit::getOfhg(); + measureUnit.adoptInstead(MeasureUnit::createPascal(status)); + measureUnitValue = MeasureUnit::getPascal(); + measureUnit.adoptInstead(MeasureUnit::createPoundPerSquareInch(status)); + measureUnitValue = MeasureUnit::getPoundPerSquareInch(); + measureUnit.adoptInstead(MeasureUnit::createBeaufort(status)); + measureUnitValue = MeasureUnit::getBeaufort(); + measureUnit.adoptInstead(MeasureUnit::createKilometerPerHour(status)); + measureUnitValue = MeasureUnit::getKilometerPerHour(); + measureUnit.adoptInstead(MeasureUnit::createKnot(status)); + measureUnitValue = MeasureUnit::getKnot(); + measureUnit.adoptInstead(MeasureUnit::createLightSpeed(status)); + measureUnitValue = MeasureUnit::getLightSpeed(); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecond(status)); + measureUnitValue = MeasureUnit::getMeterPerSecond(); + measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status)); + measureUnitValue = MeasureUnit::getMilePerHour(); + measureUnit.adoptInstead(MeasureUnit::createCelsius(status)); + measureUnitValue = MeasureUnit::getCelsius(); + measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status)); + measureUnitValue = MeasureUnit::getFahrenheit(); + measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status)); + measureUnitValue = MeasureUnit::getGenericTemperature(); + measureUnit.adoptInstead(MeasureUnit::createKelvin(status)); + measureUnitValue = MeasureUnit::getKelvin(); + measureUnit.adoptInstead(MeasureUnit::createRankine(status)); + measureUnitValue = MeasureUnit::getRankine(); + measureUnit.adoptInstead(MeasureUnit::createNewtonMeter(status)); + measureUnitValue = MeasureUnit::getNewtonMeter(); + measureUnit.adoptInstead(MeasureUnit::createPoundFoot(status)); + measureUnitValue = MeasureUnit::getPoundFoot(); + measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status)); + measureUnitValue = MeasureUnit::getAcreFoot(); + measureUnit.adoptInstead(MeasureUnit::createBarrel(status)); + measureUnitValue = MeasureUnit::getBarrel(); + measureUnit.adoptInstead(MeasureUnit::createBushel(status)); + measureUnitValue = MeasureUnit::getBushel(); + measureUnit.adoptInstead(MeasureUnit::createCentiliter(status)); + measureUnitValue = MeasureUnit::getCentiliter(); + measureUnit.adoptInstead(MeasureUnit::createCubicCentimeter(status)); + measureUnitValue = MeasureUnit::getCubicCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createCubicFoot(status)); + measureUnitValue = MeasureUnit::getCubicFoot(); + measureUnit.adoptInstead(MeasureUnit::createCubicInch(status)); + measureUnitValue = MeasureUnit::getCubicInch(); + measureUnit.adoptInstead(MeasureUnit::createCubicKilometer(status)); + measureUnitValue = MeasureUnit::getCubicKilometer(); + measureUnit.adoptInstead(MeasureUnit::createCubicMeter(status)); + measureUnitValue = MeasureUnit::getCubicMeter(); + measureUnit.adoptInstead(MeasureUnit::createCubicMile(status)); + measureUnitValue = MeasureUnit::getCubicMile(); + measureUnit.adoptInstead(MeasureUnit::createCubicYard(status)); + measureUnitValue = MeasureUnit::getCubicYard(); + measureUnit.adoptInstead(MeasureUnit::createCup(status)); + measureUnitValue = MeasureUnit::getCup(); + measureUnit.adoptInstead(MeasureUnit::createCupImperial(status)); + measureUnitValue = MeasureUnit::getCupImperial(); + measureUnit.adoptInstead(MeasureUnit::createCupJp(status)); + measureUnitValue = MeasureUnit::getCupJp(); + measureUnit.adoptInstead(MeasureUnit::createCupMetric(status)); + measureUnitValue = MeasureUnit::getCupMetric(); + measureUnit.adoptInstead(MeasureUnit::createDeciliter(status)); + measureUnitValue = MeasureUnit::getDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createDessertSpoon(status)); + measureUnitValue = MeasureUnit::getDessertSpoon(); + measureUnit.adoptInstead(MeasureUnit::createDessertSpoonImperial(status)); + measureUnitValue = MeasureUnit::getDessertSpoonImperial(); + measureUnit.adoptInstead(MeasureUnit::createDram(status)); + measureUnitValue = MeasureUnit::getDram(); + measureUnit.adoptInstead(MeasureUnit::createDrop(status)); + measureUnitValue = MeasureUnit::getDrop(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunce(status)); + measureUnitValue = MeasureUnit::getFluidOunce(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunceImperial(status)); + measureUnitValue = MeasureUnit::getFluidOunceImperial(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunceMetric(status)); + measureUnitValue = MeasureUnit::getFluidOunceMetric(); + measureUnit.adoptInstead(MeasureUnit::createGallon(status)); + measureUnitValue = MeasureUnit::getGallon(); + measureUnit.adoptInstead(MeasureUnit::createGallonImperial(status)); + measureUnitValue = MeasureUnit::getGallonImperial(); + measureUnit.adoptInstead(MeasureUnit::createHectoliter(status)); + measureUnitValue = MeasureUnit::getHectoliter(); + measureUnit.adoptInstead(MeasureUnit::createJigger(status)); + measureUnitValue = MeasureUnit::getJigger(); + measureUnit.adoptInstead(MeasureUnit::createKoku(status)); + measureUnitValue = MeasureUnit::getKoku(); + measureUnit.adoptInstead(MeasureUnit::createKosaji(status)); + measureUnitValue = MeasureUnit::getKosaji(); + measureUnit.adoptInstead(MeasureUnit::createLiter(status)); + measureUnitValue = MeasureUnit::getLiter(); + measureUnit.adoptInstead(MeasureUnit::createMegaliter(status)); + measureUnitValue = MeasureUnit::getMegaliter(); + measureUnit.adoptInstead(MeasureUnit::createMilliliter(status)); + measureUnitValue = MeasureUnit::getMilliliter(); + measureUnit.adoptInstead(MeasureUnit::createOsaji(status)); + measureUnitValue = MeasureUnit::getOsaji(); + measureUnit.adoptInstead(MeasureUnit::createPinch(status)); + measureUnitValue = MeasureUnit::getPinch(); + measureUnit.adoptInstead(MeasureUnit::createPint(status)); + measureUnitValue = MeasureUnit::getPint(); + measureUnit.adoptInstead(MeasureUnit::createPintImperial(status)); + measureUnitValue = MeasureUnit::getPintImperial(); + measureUnit.adoptInstead(MeasureUnit::createPintMetric(status)); + measureUnitValue = MeasureUnit::getPintMetric(); + measureUnit.adoptInstead(MeasureUnit::createQuart(status)); + measureUnitValue = MeasureUnit::getQuart(); + measureUnit.adoptInstead(MeasureUnit::createQuartImperial(status)); + measureUnitValue = MeasureUnit::getQuartImperial(); + measureUnit.adoptInstead(MeasureUnit::createSai(status)); + measureUnitValue = MeasureUnit::getSai(); + measureUnit.adoptInstead(MeasureUnit::createShaku(status)); + measureUnitValue = MeasureUnit::getShaku(); + measureUnit.adoptInstead(MeasureUnit::createTablespoon(status)); + measureUnitValue = MeasureUnit::getTablespoon(); + measureUnit.adoptInstead(MeasureUnit::createTeaspoon(status)); + measureUnitValue = MeasureUnit::getTeaspoon(); + measureUnit.adoptInstead(MeasureUnit::createToJp(status)); + measureUnitValue = MeasureUnit::getToJp(); + assertSuccess("", status); +} + void MeasureFormatTest::TestBasic() { UErrorCode status = U_ZERO_ERROR; MeasureUnit *ptr1 = MeasureUnit::createArcMinute(status); @@ -6223,8 +6705,7 @@ void MeasureFormatTest::TestParseBuiltIns() { MeasureUnit parsed = MeasureUnit::forIdentifier(unit.getIdentifier(), status); if (unit == MeasureUnit::getGenericTemperature()) { status.expectErrorAndReset(U_ILLEGAL_ARGUMENT_ERROR); - } else { - status.assertSuccess(); + } else if (!status.errIfFailureAndReset("MeasureUnit::forIdentifier: %s", unit.getIdentifier())) { CharString msg; msg.append("parsed MeasureUnit '", status); msg.append(parsed.getIdentifier(), status); @@ -6248,7 +6729,6 @@ void MeasureFormatTest::TestParseToBuiltIn() { {"centimeter-centimeter", MeasureUnit::getSquareCentimeter()}, {"square-foot", MeasureUnit::getSquareFoot()}, {"pow2-inch", MeasureUnit::getSquareInch()}, - {"milligram-per-deciliter", MeasureUnit::getMilligramPerDeciliter()}, {"pound-force-per-pow2-inch", MeasureUnit::getPoundPerSquareInch()}, {"yard-pow2-yard", MeasureUnit::getCubicYard()}, {"square-yard-yard", MeasureUnit::getCubicYard()}, diff --git a/icu4c/source/test/intltest/messageformat2test.cpp b/icu4c/source/test/intltest/messageformat2test.cpp index 5317d2c3585b..b4254dcfa1c5 100644 --- a/icu4c/source/test/intltest/messageformat2test.cpp +++ b/icu4c/source/test/intltest/messageformat2test.cpp @@ -1,4 +1,5 @@ // © 2024 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html #include "unicode/utypes.h" diff --git a/icu4c/source/test/intltest/messageformat2test_custom.cpp b/icu4c/source/test/intltest/messageformat2test_custom.cpp index c2fb69b0fa7c..da3d38eaa09d 100644 --- a/icu4c/source/test/intltest/messageformat2test_custom.cpp +++ b/icu4c/source/test/intltest/messageformat2test_custom.cpp @@ -1,4 +1,5 @@ // © 2024 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html #include "unicode/utypes.h" diff --git a/icu4c/source/test/intltest/messageformat2test_icu.cpp b/icu4c/source/test/intltest/messageformat2test_icu.cpp index 57361e3ccf44..f01b64baf512 100644 --- a/icu4c/source/test/intltest/messageformat2test_icu.cpp +++ b/icu4c/source/test/intltest/messageformat2test_icu.cpp @@ -1,4 +1,5 @@ // © 2024 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html #include "unicode/utypes.h" diff --git a/icu4c/source/test/intltest/messageformat2test_read_json.cpp b/icu4c/source/test/intltest/messageformat2test_read_json.cpp index 8384c1ade289..47a4fc29d401 100644 --- a/icu4c/source/test/intltest/messageformat2test_read_json.cpp +++ b/icu4c/source/test/intltest/messageformat2test_read_json.cpp @@ -1,4 +1,5 @@ // © 2024 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html #include "unicode/utypes.h" diff --git a/icu4c/source/test/intltest/normconf.cpp b/icu4c/source/test/intltest/normconf.cpp index cdb917c77787..3b28419e98c0 100644 --- a/icu4c/source/test/intltest/normconf.cpp +++ b/icu4c/source/test/intltest/normconf.cpp @@ -511,13 +511,14 @@ UBool NormalizerConformanceTest::checkNorm(UNormalizationMode mode, int32_t opti // Do the Edits cover the entire input & output? UBool pass = true; - pass &= assertEquals("edits.hasChanges()", static_cast(s8 != out8), edits.hasChanges()); + pass &= assertEquals("edits.hasChanges()", s8 != out8, edits.hasChanges()); pass &= assertEquals("edits.lengthDelta()", - static_cast(out8.length() - s8.length()), edits.lengthDelta()); + static_cast(out8.length()) - static_cast(s8.length()), + edits.lengthDelta()); Edits::Iterator iter = edits.getCoarseIterator(); while (iter.next(errorCode)) {} - pass &= assertEquals("edits source length", static_cast(s8.length()), iter.sourceIndex()); - pass &= assertEquals("edits destination length", static_cast(out8.length()), iter.destinationIndex()); + pass &= assertEquals("edits source length", s8.length(), iter.sourceIndex()); + pass &= assertEquals("edits destination length", out8.length(), iter.destinationIndex()); return pass; } diff --git a/icu4c/source/test/intltest/numbertest.h b/icu4c/source/test/intltest/numbertest.h index f386eb2fda52..f093c8f924e8 100644 --- a/icu4c/source/test/intltest/numbertest.h +++ b/icu4c/source/test/intltest/numbertest.h @@ -334,6 +334,7 @@ class NumberRangeFormatterTest : public IntlTestWithFieldPosition { void test21683_StateLeak(); void testCreateLNRFFromNumberingSystemInSkeleton(); void test22288_DifferentStartEndSettings(); + void test23110_PercentApproximately(); void runIndexedTest(int32_t index, UBool exec, const char*& name, char* par = nullptr) override; diff --git a/icu4c/source/test/intltest/numbertest_api.cpp b/icu4c/source/test/intltest/numbertest_api.cpp index 8b99801f47da..794e65404ace 100644 --- a/icu4c/source/test/intltest/numbertest_api.cpp +++ b/icu4c/source/test/intltest/numbertest_api.cpp @@ -6059,6 +6059,9 @@ void NumberFormatterApiTest::microPropsInternals() { void NumberFormatterApiTest::formatUnitsAliases() { IcuTestErrorCode status(*this, "formatUnitsAliases"); + if (logKnownIssue("ICU-23105", "With CLDR 48m1, C++ NumberFormatterApiTest::formatUnitsAliases fails (J passes)")) { + return; + } struct TestCase { const MeasureUnit measureUnit; const UnicodeString expectedFormat; @@ -6067,13 +6070,14 @@ void NumberFormatterApiTest::formatUnitsAliases() { {MeasureUnit::getMilligramPerDeciliter(), u"2 milligrams per deciliter"}, {MeasureUnit::getLiterPer100Kilometers(), u"2 liters per 100 kilometers"}, {MeasureUnit::getPartPerMillion(), u"2 parts per million"}, + {MeasureUnit::forIdentifier("permillion", status), u"2 parts per million"}, {MeasureUnit::getMillimeterOfMercury(), u"2 millimeters of mercury"}, - - // Replacements + + // Some replacements {MeasureUnit::getMilligramOfglucosePerDeciliter(), u"2 milligrams per deciliter"}, + {MeasureUnit::getLiterPer100Kilometers(), u"2 liters per 100 kilometers"}, + {MeasureUnit::getPartPer1E6(), u"2 parts per million"}, {MeasureUnit::forIdentifier("millimeter-ofhg", status), u"2 millimeters of mercury"}, - {MeasureUnit::forIdentifier("liter-per-100-kilometer", status), u"2 liters per 100 kilometers"}, - {MeasureUnit::forIdentifier("permillion", status), u"2 parts per million"}, }; for (const auto &testCase : testCases) { @@ -6146,32 +6150,32 @@ void NumberFormatterApiTest::TestPortionFormat() { double inputValue; UnicodeString expectedOutput; } testCases[]{ - {"portion-per-1e9", "en-US", 1, "1 part per billion"}, - {"portion-per-1e9", "en-US", 2, "2 parts per billion"}, - {"portion-per-1e9", "en-US", 1000000, "1,000,000 parts per billion"}, - {"portion-per-1e9", "de-DE", 1000000, "1.000.000 Milliardstel"}, - {"portion-per-1e1", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e2", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e3", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e4", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e5", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e6", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e7", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 - {"portion-per-1e8", "en-US", 1, "UNKNOWN"}, // Failing CLDR-18274 + {"part-per-1e9", "en-US", 1, "1 part per billion"}, + {"part-per-1e9", "en-US", 2, "2 parts per billion"}, + {"part-per-1e9", "en-US", 1000000, "1,000,000 parts per billion"}, + {"part-per-1e9", "de-DE", 1000000, "1.000.000 Milliardstel"}, + {"part-per-1e1", "en-US", 1, "1 part per 10"}, + {"part-per-1e2", "en-US", 1, "1 part per 100"}, + {"part-per-1e3", "en-US", 1, "1 part per 1000"}, + {"part-per-1e4", "en-US", 1, "1 part per 10000"}, + {"part-per-1e5", "en-US", 1, "1 part per 100000"}, + {"part-per-1e6", "en-US", 1, "1 part per million"}, + {"part-per-1e7", "en-US", 1, "1 part per 10000000"}, + {"part-per-1e8", "en-US", 1, "1 part per 100000000"}, }; for (auto testCase : testCases) { - if (uprv_strcmp(testCase.unitIdentifier, "portion-per-1e9") != 0) { - logKnownIssue("CLDR-18274", "The data for portion-per-XYZ is not determined yet."); - continue; - } + //if (uprv_strcmp(testCase.unitIdentifier, "portion-per-1e9") != 0) { + // logKnownIssue("CLDR-18274", "The data for portion-per-XYZ is not determined yet."); + // continue; + //} MeasureUnit unit = MeasureUnit::forIdentifier(testCase.unitIdentifier, status); LocalizedNumberFormatter lnf = NumberFormatter::withLocale(Locale::forLanguageTag(testCase.locale, status)) .unit(unit) .unitWidth(UNumberUnitWidth::UNUM_UNIT_WIDTH_FULL_NAME); UnicodeString actualOutput = lnf.formatDouble(testCase.inputValue, status).toString(status); - assertEquals("test portion format", testCase.expectedOutput, actualOutput); + assertEquals("test part format", testCase.expectedOutput, actualOutput); } } diff --git a/icu4c/source/test/intltest/numbertest_decimalquantity.cpp b/icu4c/source/test/intltest/numbertest_decimalquantity.cpp index 8eeef7b11365..80c3eb4daf25 100644 --- a/icu4c/source/test/intltest/numbertest_decimalquantity.cpp +++ b/icu4c/source/test/intltest/numbertest_decimalquantity.cpp @@ -431,7 +431,7 @@ void DecimalQuantityTest::testMaxDigits() { assertEquals("Should trim, toPlainString", "76.54", dq.toPlainString()); assertEquals("Should trim, toScientificString", "7.654E+1", dq.toScientificString()); assertEquals("Should trim, toLong", 76LL, dq.toLong(true)); - assertEquals("Should trim, toFractionLong", static_cast(54), static_cast(dq.toFractionLong(false))); + assertEquals("Should trim, toFractionLong", 54, dq.toFractionLong(false)); assertEquals("Should trim, toDouble", 76.54, dq.toDouble()); // To test DecNum output, check the round-trip. DecNum dn; diff --git a/icu4c/source/test/intltest/numbertest_range.cpp b/icu4c/source/test/intltest/numbertest_range.cpp index 61263d7acd17..c9d7cf18cb5a 100644 --- a/icu4c/source/test/intltest/numbertest_range.cpp +++ b/icu4c/source/test/intltest/numbertest_range.cpp @@ -60,6 +60,7 @@ void NumberRangeFormatterTest::runIndexedTest(int32_t index, UBool exec, const c TESTCASE_AUTO(test21683_StateLeak); TESTCASE_AUTO(testCreateLNRFFromNumberingSystemInSkeleton); TESTCASE_AUTO(test22288_DifferentStartEndSettings); + TESTCASE_AUTO(test23110_PercentApproximately); TESTCASE_AUTO_END; } @@ -1180,6 +1181,26 @@ void NumberRangeFormatterTest::test22288_DifferentStartEndSettings() { assertEquals("Should format successfully", u"2–3 US dollars", result.toString(status)); } +void NumberRangeFormatterTest::test23110_PercentApproximately() { + IcuTestErrorCode status(*this, "test23110_PercentApproximately"); + + assertFormatRange( + u"Approximately percentage formatting", + NumberRangeFormatter::with() + .numberFormatterBoth(NumberFormatter::forSkeleton(u"%x100", status)), + Locale("en-US"), + u"100% – 500%", + u"499.99999% – 500.00001%", + u"~500%", // was returning "~50,000%" + u"0% – 300%", + u"~0%", + u"300% – 300,000%", + u"300,000% – 500,000%", + u"499,900% – 500,100%", + u"~500,000%", + u"500,000% – 500,000,000%"); +} + void NumberRangeFormatterTest::assertFormatRange( const char16_t* message, const UnlocalizedNumberRangeFormatter& f, diff --git a/icu4c/source/test/intltest/numbertest_skeletons.cpp b/icu4c/source/test/intltest/numbertest_skeletons.cpp index 1d9259b3d50a..b894402487ae 100644 --- a/icu4c/source/test/intltest/numbertest_skeletons.cpp +++ b/icu4c/source/test/intltest/numbertest_skeletons.cpp @@ -6,6 +6,7 @@ #if !UCONFIG_NO_FORMATTING #include "unicode/dcfmtsym.h" +#include "unicode/ustring.h" #include "cstr.h" #include "numbertest.h" @@ -445,6 +446,10 @@ void NumberSkeletonTest::perUnitInArabic() { skeleton += cas2.subtype; status.setScope(skeleton); + if (u_strcmp(cas1.type, u"volume")==0 || u_strcmp(cas2.type, u"volume")==0) { + logKnownIssue("ICU-23104", "Strange handling of part-per-1e9 & volumes in skeletons"); + continue; + } UnicodeString actual = NumberFormatter::forSkeleton(skeleton, status).locale("ar") .formatDouble(5142.3, status) .toString(status); @@ -462,7 +467,7 @@ void NumberSkeletonTest::perUnitToSkeleton() { {u"area", u"acre"}, {u"concentr", u"percent"}, {u"concentr", u"permille"}, - {u"concentr", u"permillion"}, + {u"concentr", u"part-per-1e6"}, {u"concentr", u"permyriad"}, {u"digital", u"bit"}, {u"length", u"yard"}, @@ -481,7 +486,9 @@ void NumberSkeletonTest::perUnitToSkeleton() { skeleton += cas2.subtype; status.setScope(skeleton); - if (cas1.type != cas2.type && cas1.subtype != cas2.subtype) { + if (u_strcmp(cas1.subtype, u"part-per-1e6")==0 || u_strcmp(cas2.subtype, u"part-per-1e6")==0) { + logKnownIssue("ICU-23104", "Strange handling of part-per-1e9 & volumes in skeletons"); + } else if (cas1.type != cas2.type && cas1.subtype != cas2.subtype) { UnicodeString toSkeleton = NumberFormatter::forSkeleton( skeleton, status).toSkeleton(status); if (status.errIfFailureAndReset()) { diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index 2c54a696c48c..6c74689f3e3b 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -8197,7 +8197,7 @@ void NumberFormatTest::TestCurrencyUsage() { // test the getter here UCurrencyUsage curUsage = fmt->getCurrencyUsage(); - assertEquals("Test usage getter - standard", static_cast(curUsage), static_cast(UCURR_USAGE_STANDARD)); + assertEquals("Test usage getter - standard", curUsage, UCURR_USAGE_STANDARD); fmt->setCurrencyUsage(UCURR_USAGE_CASH, &status); }else{ @@ -8209,7 +8209,7 @@ void NumberFormatTest::TestCurrencyUsage() { // must be usage = cash UCurrencyUsage curUsage = fmt->getCurrencyUsage(); - assertEquals("Test usage getter - cash", static_cast(curUsage), static_cast(UCURR_USAGE_CASH)); + assertEquals("Test usage getter - cash", curUsage, UCURR_USAGE_CASH); UnicodeString cash_currency; fmt->format(agent,cash_currency); @@ -9031,9 +9031,9 @@ void NumberFormatTest::TestFormatFailIfMoreThanMaxDigits() { if (status.errDataIfFailureAndReset()) { return; } - assertEquals("Coverage for getter 1", static_cast(false), df.isFormatFailIfMoreThanMaxDigits()); + assertEquals("Coverage for getter 1", false, df.isFormatFailIfMoreThanMaxDigits()); df.setFormatFailIfMoreThanMaxDigits(true); - assertEquals("Coverage for getter 2", static_cast(true), df.isFormatFailIfMoreThanMaxDigits()); + assertEquals("Coverage for getter 2", true, df.isFormatFailIfMoreThanMaxDigits()); df.setMaximumIntegerDigits(2); UnicodeString result; df.format(1234, result, status); @@ -9047,9 +9047,9 @@ void NumberFormatTest::TestParseCaseSensitive() { if (status.errDataIfFailureAndReset()) { return; } - assertEquals("Coverage for getter 1", static_cast(false), df.isParseCaseSensitive()); + assertEquals("Coverage for getter 1", false, df.isParseCaseSensitive()); df.setParseCaseSensitive(true); - assertEquals("Coverage for getter 1", static_cast(true), df.isParseCaseSensitive()); + assertEquals("Coverage for getter 1", true, df.isParseCaseSensitive()); Formattable result; ParsePosition ppos; df.parse(u"1e2", result, ppos); @@ -9064,9 +9064,9 @@ void NumberFormatTest::TestParseNoExponent() { if (status.errDataIfFailureAndReset()) { return; } - assertEquals("Coverage for getter 1", static_cast(false), df.isParseNoExponent()); + assertEquals("Coverage for getter 1", false, df.isParseNoExponent()); df.setParseNoExponent(true); - assertEquals("Coverage for getter 1", static_cast(true), df.isParseNoExponent()); + assertEquals("Coverage for getter 1", true, df.isParseNoExponent()); Formattable result; ParsePosition ppos; df.parse(u"1E2", result, ppos); @@ -9081,9 +9081,9 @@ void NumberFormatTest::TestSignAlwaysShown() { if (status.errDataIfFailureAndReset()) { return; } - assertEquals("Coverage for getter 1", static_cast(false), df.isSignAlwaysShown()); + assertEquals("Coverage for getter 1", false, df.isSignAlwaysShown()); df.setSignAlwaysShown(true); - assertEquals("Coverage for getter 1", static_cast(true), df.isSignAlwaysShown()); + assertEquals("Coverage for getter 1", true, df.isSignAlwaysShown()); UnicodeString result; df.format(1234, result, status); status.errIfFailureAndReset(); diff --git a/icu4c/source/test/intltest/pluralmaptest.cpp b/icu4c/source/test/intltest/pluralmaptest.cpp index 4d8b745df54e..897065c2291a 100644 --- a/icu4c/source/test/intltest/pluralmaptest.cpp +++ b/icu4c/source/test/intltest/pluralmaptest.cpp @@ -56,25 +56,16 @@ void PluralMapTest::runIndexedTest(int32_t index, UBool exec, const char* &name, } void PluralMapTest::TestToCategory() { - assertEquals("", static_cast(PluralMapBase::OTHER), PluralMapBase::toCategory("other")); - assertEquals("", static_cast(PluralMapBase::ZERO), PluralMapBase::toCategory("zero")); - assertEquals("", static_cast(PluralMapBase::ONE), PluralMapBase::toCategory("one")); - assertEquals("", static_cast(PluralMapBase::TWO), PluralMapBase::toCategory("two")); - assertEquals("", static_cast(PluralMapBase::FEW), PluralMapBase::toCategory("few")); - assertEquals("", static_cast(PluralMapBase::MANY), PluralMapBase::toCategory("many")); - assertEquals("", static_cast(PluralMapBase::NONE), PluralMapBase::toCategory("Many")); - assertEquals( - "", - static_cast(PluralMapBase::FEW), - PluralMapBase::toCategory(UnicodeString("few"))); - assertEquals( - "", - static_cast(PluralMapBase::MANY), - PluralMapBase::toCategory(UnicodeString("many"))); - assertEquals( - "", - static_cast(PluralMapBase::NONE), - PluralMapBase::toCategory(UnicodeString("Many"))); + assertEquals("", PluralMapBase::OTHER, PluralMapBase::toCategory("other")); + assertEquals("", PluralMapBase::ZERO, PluralMapBase::toCategory("zero")); + assertEquals("", PluralMapBase::ONE, PluralMapBase::toCategory("one")); + assertEquals("", PluralMapBase::TWO, PluralMapBase::toCategory("two")); + assertEquals("", PluralMapBase::FEW, PluralMapBase::toCategory("few")); + assertEquals("", PluralMapBase::MANY, PluralMapBase::toCategory("many")); + assertEquals("", PluralMapBase::NONE, PluralMapBase::toCategory("Many")); + assertEquals("", PluralMapBase::FEW, PluralMapBase::toCategory(UnicodeString("few"))); + assertEquals("", PluralMapBase::MANY, PluralMapBase::toCategory(UnicodeString("many"))); + assertEquals("", PluralMapBase::NONE, PluralMapBase::toCategory(UnicodeString("Many"))); } void PluralMapTest::TestGetCategoryName() { @@ -117,24 +108,24 @@ void PluralMapTest::TestIterate() { PluralMapBase::Category index = PluralMapBase::NONE; const UnicodeString *current = map.next(index); assertEquals("", "pickles", *current); - assertEquals("", static_cast(PluralMapBase::OTHER), index); + assertEquals("", PluralMapBase::OTHER, index); current = map.next(index); assertEquals("", "pickle", *current); - assertEquals("", static_cast(PluralMapBase::ONE), index); + assertEquals("", PluralMapBase::ONE, index); current = map.next(index); assertEquals("", "picklefew", *current); - assertEquals("", static_cast(PluralMapBase::FEW), index); + assertEquals("", PluralMapBase::FEW, index); current = map.next(index); - assertEquals("", static_cast(PluralMapBase::CATEGORY_COUNT), index); + assertEquals("", PluralMapBase::CATEGORY_COUNT, index); assertTrue("", current == nullptr); PluralMapForPluralMapTest map2; index = PluralMapBase::NONE; current = map2.next(index); assertEquals("", "", *current); - assertEquals("", static_cast(PluralMapBase::OTHER), index); + assertEquals("", PluralMapBase::OTHER, index); current = map2.next(index); - assertEquals("", static_cast(PluralMapBase::CATEGORY_COUNT), index); + assertEquals("", PluralMapBase::CATEGORY_COUNT, index); assertTrue("", current == nullptr); } diff --git a/icu4c/source/test/intltest/quantityformattertest.cpp b/icu4c/source/test/intltest/quantityformattertest.cpp index 3c410bce6a01..9e4fbdf211a8 100644 --- a/icu4c/source/test/intltest/quantityformattertest.cpp +++ b/icu4c/source/test/intltest/quantityformattertest.cpp @@ -47,12 +47,12 @@ void QuantityFormatterTest::TestBasic() { assertFalse( "adding bad variant", fmt.addIfAbsent("a bad variant", "{0} pounds", status)); - assertEquals("adding bad variant status", static_cast(U_ILLEGAL_ARGUMENT_ERROR), status); + assertEquals("adding bad variant status", U_ILLEGAL_ARGUMENT_ERROR, status); status = U_ZERO_ERROR; assertFalse( "Adding bad pattern", fmt.addIfAbsent("other", "{0} {1} too many placeholders", status)); - assertEquals("adding bad pattern status", static_cast(U_ILLEGAL_ARGUMENT_ERROR), status); + assertEquals("adding bad pattern status", U_ILLEGAL_ARGUMENT_ERROR, status); status = U_ZERO_ERROR; assertFalse("isValid with no patterns", fmt.isValid()); assertTrue( diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp index ee85cba16950..c661a87b6c7a 100644 --- a/icu4c/source/test/intltest/rbbitst.cpp +++ b/icu4c/source/test/intltest/rbbitst.cpp @@ -107,6 +107,7 @@ void RBBITest::runIndexedTest( int32_t index, UBool exec, const char* &name, cha TESTCASE_AUTO(TestGetDisplayName); #if !UCONFIG_NO_FILE_IO TESTCASE_AUTO(TestEndBehaviour); + TESTCASE_AUTO(TestPreceding_NegativeIndex); TESTCASE_AUTO(TestWordBreaks); TESTCASE_AUTO(TestWordBoundary); TESTCASE_AUTO(TestLineBreaks); @@ -740,6 +741,34 @@ void RBBITest::executeTest(TestParams *t, UErrorCode &status) { } } +void RBBITest::TestPreceding_NegativeIndex() { + UErrorCode status = U_ZERO_ERROR; + Locale loc = Locale::getRoot(); + LocalPointer bi(BreakIterator::createWordInstance(loc, status)); + UnicodeString source(u"The quick brown fox jumped over the lazy dog."); + bi->setText(source); + + assertEquals("length of source string", 45, source.length()); + + struct TestCase { + const UnicodeString description; + const int32_t startIdx; + const int32_t expected; + } cases[] = { + {"negative index", -2, BreakIterator::DONE}, + {"zero", 0, BreakIterator::DONE}, + {"one", 1, 0}, + {"middle", 41, 40}, + {"end", 45, 44}, + {"after the end", source.length() + 2, source.length()} + }; + + for (const auto& cas : cases) { + int32_t actual = bi->preceding(cas.startIdx); + assertEquals(cas.description, cas.expected, actual); + } +} + void RBBITest::TestExtended() { // The expectations in this test heavily depends on the Thai dictionary. // Therefore, we skip this test under the LSTM configuration. diff --git a/icu4c/source/test/intltest/rbbitst.h b/icu4c/source/test/intltest/rbbitst.h index 9638caf6a277..ef9e4c2a5a50 100644 --- a/icu4c/source/test/intltest/rbbitst.h +++ b/icu4c/source/test/intltest/rbbitst.h @@ -58,6 +58,7 @@ class RBBITest: public IntlTest { void TestExtended(); void executeTest(TestParams *, UErrorCode &status); + void TestPreceding_NegativeIndex(); void TestWordBreaks(); void TestWordBoundary(); diff --git a/icu4c/source/test/intltest/reldatefmttest.cpp b/icu4c/source/test/intltest/reldatefmttest.cpp index cbcdeb6c325a..dcb63fe9c4dd 100644 --- a/icu4c/source/test/intltest/reldatefmttest.cpp +++ b/icu4c/source/test/intltest/reldatefmttest.cpp @@ -1109,11 +1109,9 @@ void RelativeDateTimeFormatterTest::TestGetters() { // copy and assignment. RelativeDateTimeFormatter fmt2(fmt); fmt3 = fmt2; - assertEquals("style", static_cast(UDAT_STYLE_NARROW), fmt3.getFormatStyle()); - assertEquals( - "context", - static_cast(UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE), - fmt3.getCapitalizationContext()); + assertEquals("style", UDAT_STYLE_NARROW, fmt3.getFormatStyle()); + assertEquals("context", UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE, + fmt3.getCapitalizationContext()); assertSuccess("", status); } diff --git a/icu4c/source/test/intltest/restest.cpp b/icu4c/source/test/intltest/restest.cpp index 661312ad5316..2b8800ee3cf1 100644 --- a/icu4c/source/test/intltest/restest.cpp +++ b/icu4c/source/test/intltest/restest.cpp @@ -313,7 +313,7 @@ ResourceBundleTest::TestConstruction() char *versionID1 = new char[1+strlen(version1)]; // + 1 for zero byte char *versionID2 = new char[1+ strlen(version2)]; // + 1 for zero byte - strcpy(versionID1, "45.0"); // hardcoded, please change if the default.txt file or ResourceBundle::kVersionSeparater is changed. + strcpy(versionID1, "48.0"); // hardcoded, please change if the default.txt file or ResourceBundle::kVersionSeparater is changed. strcpy(versionID2, "55.0"); // hardcoded, please change if the te_IN.txt file or ResourceBundle::kVersionSeparater is changed. diff --git a/icu4c/source/test/intltest/restsnew.cpp b/icu4c/source/test/intltest/restsnew.cpp index a8da3c437182..0fe59db8ea01 100644 --- a/icu4c/source/test/intltest/restsnew.cpp +++ b/icu4c/source/test/intltest/restsnew.cpp @@ -325,7 +325,7 @@ NewResourceBundleTest::TestConstruction() char *versionID1 = new char[1 + strlen(U_ICU_VERSION) + strlen(version1)]; // + 1 for zero byte char *versionID2 = new char[1 + strlen(U_ICU_VERSION) + strlen(version2)]; // + 1 for zero byte - strcpy(versionID1, "45.0"); // hardcoded, please change if the default.txt file or ResourceBundle::kVersionSeparater is changed. + strcpy(versionID1, "48.0"); // hardcoded, please change if the default.txt file or ResourceBundle::kVersionSeparater is changed. strcpy(versionID2, "55.0"); // hardcoded, please change if the te_IN.txt file or ResourceBundle::kVersionSeparater is changed. diff --git a/icu4c/source/test/intltest/simpleformattertest.cpp b/icu4c/source/test/intltest/simpleformattertest.cpp index fe272b1e4059..079afce705eb 100644 --- a/icu4c/source/test/intltest/simpleformattertest.cpp +++ b/icu4c/source/test/intltest/simpleformattertest.cpp @@ -91,10 +91,10 @@ void SimpleFormatterTest::TestNoArguments() { void SimpleFormatterTest::TestSyntaxErrors() { UErrorCode status = U_ZERO_ERROR; SimpleFormatter fmt("{}", status); - assertEquals("syntax error {}", static_cast(U_ILLEGAL_ARGUMENT_ERROR), status); + assertEquals("syntax error {}", U_ILLEGAL_ARGUMENT_ERROR, status); status = U_ZERO_ERROR; fmt.applyPattern("{12d", status); - assertEquals("syntax error {12d", static_cast(U_ILLEGAL_ARGUMENT_ERROR), status); + assertEquals("syntax error {12d", U_ILLEGAL_ARGUMENT_ERROR, status); } void SimpleFormatterTest::TestOneArgument() { diff --git a/icu4c/source/test/intltest/strcase.cpp b/icu4c/source/test/intltest/strcase.cpp index 70cb8a399674..1dcf63907f05 100644 --- a/icu4c/source/test/intltest/strcase.cpp +++ b/icu4c/source/test/intltest/strcase.cpp @@ -893,8 +893,7 @@ void StringCaseTest::assertGreekUpperNormalized(const UnicodeString &s16, expectedErrorCode = U_STRING_NOT_TERMINATED_WARNING; } else { expectedErrorCode = U_ZERO_ERROR; - // Casts to int32_t to avoid matching UBool. - assertEquals(msg + cap + " NUL", static_cast(0), static_cast(dest8b[length])); + assertEquals(msg + cap + " NUL", 0, dest8b[length]); } assertEquals(msg + cap + " errorCode", expectedErrorCode, errorCode); if (cap >= expected8Length) { diff --git a/icu4c/source/test/intltest/strtest.cpp b/icu4c/source/test/intltest/strtest.cpp index 7537c6f4d9ce..73c09fc4e8f1 100644 --- a/icu4c/source/test/intltest/strtest.cpp +++ b/icu4c/source/test/intltest/strtest.cpp @@ -503,7 +503,7 @@ StringTest::TestStringPieceOther() { Other other; StringPiece piece(other); - assertEquals("size()", piece.size(), static_cast(other.size())); + assertEquals("size()", piece.size(), other.size()); assertEquals("data()", piece.data(), other.data()); } @@ -876,6 +876,6 @@ void StringTest::Testctou() { const char *cs = "Fa\\u0127mu"; UnicodeString u = ctou(cs); - assertEquals("Testing unescape@0", static_cast(0x0046), u.charAt(0)); - assertEquals("Testing unescape@2", static_cast(295), u.charAt(2)); + assertEquals("Testing unescape@0", 0x0046, u.charAt(0)); + assertEquals("Testing unescape@2", 295, u.charAt(2)); } diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 968f2473135f..6a0887e46fe6 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2057,14 +2057,14 @@ void TimeZoneTest::TestCanonicalIDAPI() { UnicodeString canonicalID; UErrorCode ec = U_ZERO_ERROR; UnicodeString *pResult = &TimeZone::getCanonicalID(bogus, canonicalID, ec); - assertEquals("TimeZone::getCanonicalID(bogus) should fail", static_cast(U_ILLEGAL_ARGUMENT_ERROR), ec); + assertEquals("TimeZone::getCanonicalID(bogus) should fail", U_ILLEGAL_ARGUMENT_ERROR, ec); assertTrue("TimeZone::getCanonicalID(bogus) should return the dest string", pResult == &canonicalID); // U_FAILURE on input. UnicodeString berlin("Europe/Berlin"); ec = U_MEMORY_ALLOCATION_ERROR; pResult = &TimeZone::getCanonicalID(berlin, canonicalID, ec); - assertEquals("TimeZone::getCanonicalID(failure) should fail", static_cast(U_MEMORY_ALLOCATION_ERROR), ec); + assertEquals("TimeZone::getCanonicalID(failure) should fail", U_MEMORY_ALLOCATION_ERROR, ec); assertTrue("TimeZone::getCanonicalID(failure) should return the dest string", pResult == &canonicalID); // Valid input should un-bogus the dest string. @@ -2681,7 +2681,7 @@ void TimeZoneTest::TestGetIanaID() { TimeZone::getIanaID(inputID, ianaID, sts); if (u_strcmp(TESTDATA[i].expected, UNKNOWN) == 0) { - assertEquals(inputID + " should fail", static_cast(U_ILLEGAL_ARGUMENT_ERROR), sts); + assertEquals(inputID + " should fail", U_ILLEGAL_ARGUMENT_ERROR, sts); assertTrue(inputID + " should set bogus", ianaID.isBogus()); } else { assertEquals(inputID, UnicodeString(TESTDATA[i].expected), ianaID); diff --git a/icu4c/source/test/intltest/ucdtest.cpp b/icu4c/source/test/intltest/ucdtest.cpp index 36f40c327136..9f9c439750c0 100644 --- a/icu4c/source/test/intltest/ucdtest.cpp +++ b/icu4c/source/test/intltest/ucdtest.cpp @@ -493,7 +493,7 @@ void UnicodeTest::TestScriptMetadata() { static_cast(charScript), static_cast(uscript_getScript(firstChar, errorCode))); assertEquals("RTL vs. set", rtl.contains(firstChar), uscript_isRightToLeft(sc)); assertEquals("cased vs. set", cased.contains(firstChar), uscript_isCased(sc)); - assertEquals("encoded, has characters", static_cast(sc == charScript), static_cast(!scriptSet.isEmpty())); + assertEquals("encoded, has characters", sc == charScript, !scriptSet.isEmpty()); if(uscript_isRightToLeft(sc)) { rtl.removeAll(scriptSet); } diff --git a/icu4c/source/test/intltest/units_test.cpp b/icu4c/source/test/intltest/units_test.cpp index 695866e6929e..5211928b949c 100644 --- a/icu4c/source/test/intltest/units_test.cpp +++ b/icu4c/source/test/intltest/units_test.cpp @@ -149,7 +149,7 @@ void UnitsTest::testExtractConvertibility() { {"millimeter", "meter", CONVERTIBLE}, // {"yard", "meter", CONVERTIBLE}, // {"ounce-troy", "kilogram", CONVERTIBLE}, // - {"percent", "portion", CONVERTIBLE}, // + {"percent", "part", CONVERTIBLE}, // {"ofhg", "kilogram-per-square-meter-square-second", CONVERTIBLE}, // {"second-per-meter", "meter-per-second", RECIPROCAL}, // {"mile-per-hour", "meter-per-second", CONVERTIBLE}, // @@ -367,16 +367,16 @@ void UnitsTest::testConverter() { {"meter-per-10", "foot", 1.0, 0.328084}, {"meter", "foot-per-10", 1.0, 32.8084}, {"meter", "foot-per-100", 1.0, 328.084}, - {"portion", "portion-per-1000", 1.0, 1000}, - {"portion", "portion-per-10000", 1.0, 10000}, - {"portion", "portion-per-100000", 1.0, 100000}, - {"portion", "portion-per-1000000", 1.0, 1000000}, - {"portion-per-10", "portion", 1.0, 0.1}, - {"portion-per-100", "portion", 1.0, 0.01}, - {"portion-per-1000", "portion", 1.0, 0.001}, - {"portion-per-10000", "portion", 1.0, 0.0001}, - {"portion-per-100000", "portion", 1.0, 0.00001}, - {"portion-per-1000000", "portion", 1.0, 0.000001}, + {"part", "part-per-1000", 1.0, 1000}, + {"part", "part-per-10000", 1.0, 10000}, + {"part", "part-per-100000", 1.0, 100000}, + {"part", "part-per-1000000", 1.0, 1000000}, + {"part-per-10", "part", 1.0, 0.1}, + {"part-per-100", "part", 1.0, 0.01}, + {"part-per-1000", "part", 1.0, 0.001}, + {"part-per-10000", "part", 1.0, 0.0001}, + {"part-per-100000", "part", 1.0, 0.00001}, + {"part-per-1000000", "part", 1.0, 0.000001}, {"mile-per-hour", "meter-per-second", 1.0, 0.44704}, {"mile-per-100-hour", "meter-per-100-second", 1.0, 0.44704}, {"mile-per-hour", "meter-per-100-second", 1.0, 44.704}, @@ -1197,57 +1197,57 @@ void UnitsTest::testUnitsConstantsDenomenator() { {"second-per-1000-minute", 1000}, {"gram-per-1000-kilogram", 1000}, {"meter-per-100", 100}, - {"portion-per-1", 1}, - {"portion-per-2", 2}, - {"portion-per-3", 3}, - {"portion-per-4", 4}, - {"portion-per-5", 5}, - {"portion-per-6", 6}, - {"portion-per-7", 7}, - {"portion-per-8", 8}, - {"portion-per-9", 9}, + {"part-per-1", 1}, + {"part-per-2", 2}, + {"part-per-3", 3}, + {"part-per-4", 4}, + {"part-per-5", 5}, + {"part-per-6", 6}, + {"part-per-7", 7}, + {"part-per-8", 8}, + {"part-per-9", 9}, // Test for constant denominators that are powers of 10 - {"portion-per-10", 10}, - {"portion-per-100", 100}, - {"portion-per-1000", 1000}, - {"portion-per-10000", 10000}, - {"portion-per-100000", 100000}, - {"portion-per-1000000", 1000000}, - {"portion-per-10000000", 10000000}, - {"portion-per-100000000", 100000000}, - {"portion-per-1000000000", 1000000000}, // Failing: ICU-23045 - {"portion-per-10000000000", 10000000000}, - {"portion-per-100000000000", 100000000000}, - {"portion-per-1000000000000", 1000000000000}, - {"portion-per-10000000000000", 10000000000000}, - {"portion-per-100000000000000", 100000000000000}, - {"portion-per-1000000000000000", 1000000000000000}, - {"portion-per-10000000000000000", 10000000000000000}, - {"portion-per-100000000000000000", 100000000000000000}, - {"portion-per-1000000000000000000", 1000000000000000000}, - {"portion-per-1e3-kilometer", 1000}, + {"part-per-10", 10}, + {"part-per-100", 100}, + {"part-per-1000", 1000}, + {"part-per-10000", 10000}, + {"part-per-100000", 100000}, + {"part-per-1000000", 1000000}, // Failing: ICU-23045 + {"part-per-10000000", 10000000}, + {"part-per-100000000", 100000000}, + {"part-per-1000000000", 1000000000}, // Failing: ICU-23045 + {"part-per-10000000000", 10000000000}, + {"part-per-100000000000", 100000000000}, + {"part-per-1000000000000", 1000000000000}, + {"part-per-10000000000000", 10000000000000}, + {"part-per-100000000000000", 100000000000000}, + {"part-per-1000000000000000", 1000000000000000}, + {"part-per-10000000000000000", 10000000000000000}, + {"part-per-100000000000000000", 100000000000000000}, + {"part-per-1000000000000000000", 1000000000000000000}, + {"part-per-1e3-kilometer", 1000}, // Test for constant denominators that are represented as scientific notation // numbers. - {"portion-per-1e1", 10}, - {"portion-per-1E1", 10}, - {"portion-per-1e2", 100}, - {"portion-per-1E2", 100}, - {"portion-per-1e3", 1000}, - {"portion-per-1E3", 1000}, - {"portion-per-1e4", 10000}, - {"portion-per-1E4", 10000}, - {"portion-per-1e5", 100000}, - {"portion-per-1E5", 100000}, - {"portion-per-1e6", 1000000}, - {"portion-per-1E6", 1000000}, - {"portion-per-1e9", 1000000000}, // Failing: ICU-23045 - {"portion-per-1E9", 1000000000}, // Failing: ICU-23045 - {"portion-per-1e10", 10000000000}, - {"portion-per-1E10", 10000000000}, - {"portion-per-1e18", 1000000000000000000}, - {"portion-per-1E18", 1000000000000000000}, + {"part-per-1e1", 10}, + {"part-per-1E1", 10}, + {"part-per-1e2", 100}, + {"part-per-1E2", 100}, + {"part-per-1e3", 1000}, + {"part-per-1E3", 1000}, + {"part-per-1e4", 10000}, + {"part-per-1E4", 10000}, + {"part-per-1e5", 100000}, + {"part-per-1E5", 100000}, + {"part-per-1e6", 1000000}, // Failing: ICU-23045 + {"part-per-1E6", 1000000}, // Failing: ICU-23045 + {"part-per-1e9", 1000000000}, // Failing: ICU-23045 + {"part-per-1E9", 1000000000}, // Failing: ICU-23045 + {"part-per-1e10", 10000000000}, + {"part-per-1E10", 10000000000}, + {"part-per-1e18", 1000000000000000000}, + {"part-per-1E18", 1000000000000000000}, // Test for constant denominators that are randomly selected. {"liter-per-12345-kilometer", 12345}, @@ -1261,9 +1261,12 @@ void UnitsTest::testUnitsConstantsDenomenator() { }; for (const auto &testCase : testCases) { - if (uprv_strcmp(testCase.source, "portion-per-1000000000") == 0 || - uprv_strcmp(testCase.source, "portion-per-1e9") == 0 || - uprv_strcmp(testCase.source, "portion-per-1E9") == 0 || + if (uprv_strcmp(testCase.source, "part-per-1000000") == 0 || + uprv_strcmp(testCase.source, "part-per-1000000000") == 0 || + uprv_strcmp(testCase.source, "part-per-1e6") == 0 || + uprv_strcmp(testCase.source, "part-per-1E6") == 0 || + uprv_strcmp(testCase.source, "part-per-1e9") == 0 || + uprv_strcmp(testCase.source, "part-per-1E9") == 0 || uprv_strcmp(testCase.source, "meter-per-100-kilometer") == 0) { logKnownIssue("ICU-23045", "Incorrect constant denominator for certain unit identifiers"); continue; @@ -1285,10 +1288,21 @@ void UnitsTest::testUnitsConstantsDenomenator() { } if (constant != testCase.expectedConstant) { - assertTrue("getConstantDenominator(\"%s\")", false); + CharString msg; + msg.append("getConstantDenominator (\"", status); + msg.append(testCase.source, status); + msg.append("\")", status); + assertTrue(msg.data(), false); + status.reset(); } + if (constant != 0) { - assertEquals("getComplexity(\"%s\")", UMEASURE_UNIT_COMPOUND, complexity); + CharString msg; + msg.append("getComplexity (\"", status); + msg.append(testCase.source, status); + msg.append("\")", status); + assertEquals(msg.data(), UMEASURE_UNIT_COMPOUND, complexity); + status.reset(); } } } @@ -1304,8 +1318,8 @@ void UnitsTest::testMeasureUnit_withConstantDenominator() { } testCases[]{ {"meter-per-second", 100, UMEASURE_UNIT_COMPOUND}, {"meter-per-100-second", 0, UMEASURE_UNIT_COMPOUND}, - {"portion", 100, UMEASURE_UNIT_COMPOUND}, - {"portion-per-100", 0, UMEASURE_UNIT_SINGLE}, + {"part", 100, UMEASURE_UNIT_COMPOUND}, + {"part-per-100", 0, UMEASURE_UNIT_SINGLE}, }; @@ -1330,22 +1344,33 @@ void UnitsTest::testMeasureUnit_withConstantDenominator() { continue; } + CharString msg; if (actualConstantDenominator != testCase.constantDenominator) { - assertTrue("getConstantDenominator(\"%s\")", false); + msg.clear(); + msg.append("getConstantDenominator (\"", status); + msg.append(testCase.source, status); + msg.append("\")", status); + assertTrue(msg.data(), false); + status.reset(); } - assertEquals("getComplexity(\"%s\")", testCase.expectedComplexity, actualComplexity); + msg.clear(); + msg.append("getComplexity (\"", status); + msg.append(testCase.source, status); + msg.append("\")", status); + assertEquals(msg.data(), testCase.expectedComplexity, actualComplexity); + status.reset(); } // Test for invalid constant denominator - auto unit = MeasureUnit::forIdentifier("portion", status); - if (status.errIfFailureAndReset("forIdentifier(\"portion\")")) { + auto unit = MeasureUnit::forIdentifier("part", status); + if (status.errIfFailureAndReset("forIdentifier(\"part\")")) { return; } uint64_t denominator = LONG_MAX; denominator++; unit = unit.withConstantDenominator(denominator, status); - assertTrue("There is a failure caused by withConstantDenominator(\"portion\")", status.isFailure()); + assertTrue("There is a failure caused by withConstantDenominator(\"part\")", status.isFailure()); status.reset(); } @@ -1380,7 +1405,13 @@ void UnitsTest::testUnitsConstantsDenomenator_getIdentifier() { } auto actualIdentifier = unit.getIdentifier(); - assertEquals(" getIdentifier(\"%s\")", testCase.expectedIdentifier, actualIdentifier); + + CharString msg; + msg.append("getIdentifier (\"", status); + msg.append(testCase.source, status); + msg.append("\")", status); + assertEquals(msg.data(), testCase.expectedIdentifier, actualIdentifier); + status.reset(); } } diff --git a/icu4c/source/test/intltest/ustrtest.cpp b/icu4c/source/test/intltest/ustrtest.cpp index f0466982cff2..56976b3e3d23 100644 --- a/icu4c/source/test/intltest/ustrtest.cpp +++ b/icu4c/source/test/intltest/ustrtest.cpp @@ -2412,7 +2412,7 @@ void UnicodeStringTest::TestLargeAppend() { str2.releaseBuffer(remain); dest.append(str2); total += remain; - assertEquals("When a string of exactly the maximum size works", static_cast(kMaxCapacity), total); + assertEquals("When a string of exactly the maximum size works", kMaxCapacity, total); assertEquals("When a string of exactly the maximum size works", kMaxCapacity, dest.length()); assertFalse("dest is not bogus", dest.isBogus()); @@ -2459,11 +2459,11 @@ void UnicodeStringTest::TestU16StringView() { UnicodeString aliasFromSV = UnicodeString::readOnlyAlias(sv16); assertTrue("aliasFromSV pointer alias", aliasFromSV.getBuffer() == sv16.data()); - assertEquals("aliasFromSV length", static_cast(sv16.length()), aliasFromSV.length()); + assertEquals("aliasFromSV length", sv16.length(), aliasFromSV.length()); UnicodeString aliasFromStr = UnicodeString::readOnlyAlias(str16); assertTrue("aliasFromStr pointer alias", aliasFromStr.getBuffer() == str16.data()); - assertEquals("aliasFromStr length", static_cast(str16.length()), aliasFromStr.length()); + assertEquals("aliasFromStr length", str16.length(), aliasFromStr.length()); UnicodeString aliasFromUStr = UnicodeString::readOnlyAlias(ustr); assertTrue("aliasFromUStr pointer alias", aliasFromUStr.getBuffer() == ustr.getBuffer()); @@ -2514,7 +2514,7 @@ void UnicodeStringTest::TestU16StringView() { // Convert UnicodeString to string view. std::u16string_view sv16FromUniStr(any); assertTrue("sv16FromUniStr buffer alias", sv16FromUniStr.data() == any.getBuffer()); - assertEquals("sv16FromUniStr length", any.length(), static_cast(sv16FromUniStr.length())); + assertEquals("sv16FromUniStr length", any.length(), sv16FromUniStr.length()); // Just to show convenience: Convert UnicodeString to string view, then to std string. std::u16string str16FromUniStr(any); diff --git a/icu4c/source/test/intltest/utfiteratortest.cpp b/icu4c/source/test/intltest/utfiteratortest.cpp new file mode 100644 index 000000000000..13708206519d --- /dev/null +++ b/icu4c/source/test/intltest/utfiteratortest.cpp @@ -0,0 +1,1197 @@ +// © 2024 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +// utfiteratortest.cpp +// created: 2024aug12 Markus W. Scherer + +#include +#include +#include +#include + +// Test header-only ICU C++ APIs. Do not use other ICU C++ APIs. +// Non-default configuration: +#define U_SHOW_CPLUSPLUS_API 0 +// Default configuration: +// #define U_SHOW_CPLUSPLUS_HEADER_API 1 + +#include "unicode/utypes.h" +#include "unicode/utf8.h" +#include "unicode/utf16.h" +#include "unicode/utfiterator.h" +#include "intltest.h" + +// Makes u"literal"sv std::u16string_view literals possible. +// https://en.cppreference.com/w/cpp/string/basic_string_view/operator%22%22sv +using namespace std::string_view_literals; + +using U_HEADER_ONLY_NAMESPACE::UTFIterator; +using U_HEADER_ONLY_NAMESPACE::utfIterator; +using U_HEADER_ONLY_NAMESPACE::UTFStringCodePoints; +using U_HEADER_ONLY_NAMESPACE::utfStringCodePoints; +using U_HEADER_ONLY_NAMESPACE::UnsafeUTFIterator; +using U_HEADER_ONLY_NAMESPACE::unsafeUTFIterator; +using U_HEADER_ONLY_NAMESPACE::UnsafeUTFStringCodePoints; +using U_HEADER_ONLY_NAMESPACE::unsafeUTFStringCodePoints; + +namespace { + +template +class SinglePassIter; + +// Shared state for one or more copies of single-pass iterators. +// Similar to https://en.cppreference.com/w/cpp/iterator/istreambuf_iterator +// but the iterators only implement LegacyIterator (* and ++) without post-increment. +template +class SinglePassSource { +public: + explicit SinglePassSource(std::basic_string_view s) : p(s.data()), limit(s.data() + s.length()) {} + + SinglePassIter begin() { return SinglePassIter(*this); } + SinglePassIter end() { return SinglePassIter(); } + +private: + template + friend class SinglePassIter; + + const Unit *p; // incremented by iterators + const Unit *limit; +}; + +template +class SinglePassIter { +public: + typedef Unit value_type; + typedef Unit &reference; + typedef Unit *pointer; + typedef std::ptrdiff_t difference_type; + // This is a LegacyIterator but there is no specific category for that, + // so we claim it to be a LegacyInputIterator. It *is* single-pass. + typedef std::input_iterator_tag iterator_category; + + explicit SinglePassIter(SinglePassSource &src) : src(&src) {} + // limit sentinel + SinglePassIter() : src(nullptr) {} + + // movable + SinglePassIter(SinglePassIter &&src) noexcept = default; + SinglePassIter &operator=(SinglePassIter &&src) noexcept = default; + + // not copyable + SinglePassIter(const SinglePassIter &other) = delete; + SinglePassIter &operator=(const SinglePassIter &other) = delete; + + bool operator==(const SinglePassIter &other) const { + bool done = isDone(); + bool otherDone = other.isDone(); + return done ? otherDone : (!otherDone && src->p == other.src->p); + } + bool operator!=(const SinglePassIter &other) const { return !operator==(other); } + + Unit operator*() const { return *(src->p); } + SinglePassIter &operator++() { // pre-increment + ++(src->p); + return *this; + } + // *no* post-increment + +private: + bool isDone() const { return src == nullptr || src->p == src->limit; } + + SinglePassSource *src; +}; + +template +class FwdIter { +public: + typedef Unit value_type; + typedef Unit &reference; + typedef Unit *pointer; + typedef std::ptrdiff_t difference_type; + // https://en.cppreference.com/w/cpp/named_req/ForwardIterator#Multi-pass_guarantee + typedef std::forward_iterator_tag iterator_category; + + explicit FwdIter(const Unit *data) : p(data) {} + FwdIter() = default; + + bool operator==(const FwdIter &other) const { return p == other.p; } + bool operator!=(const FwdIter &other) const { return !operator==(other); } + + Unit operator*() const { return *p; } + FwdIter &operator++() { // pre-increment + ++p; + return *this; + } + FwdIter operator++(int) { // post-increment + FwdIter result(*this); + ++p; + return result; + } + +private: + const Unit *p; +}; + +template +std::vector split(StringView s) { + using Unit = typename StringView::value_type; + std::vector result; + while (!s.empty()) { + auto pos = s.find(static_cast(u'|')); + if (pos == StringView::npos) { break; } + result.push_back(s.substr(0, pos)); + s.remove_prefix(pos + 1); + } + result.push_back(s); + return result; +} + +template +std::basic_string join(std::vector> parts) { + std::basic_string result; + for (auto part : parts) { + result.append(part); + } + return result; +} + +// Avoids having to cast each byte value to char or uint8_t or similar. +std::string string8FromBytes(const int bytes[], size_t length) { + std::string result; + for (size_t i = 0; i < length; ++i) { + result.push_back(static_cast(bytes[i])); + } + return result; +} + +template +T reverseCopy(T x) { + T result{x}; + std::reverse(result.begin(), result.end()); + return result; +} + +// Use SAFE when we don't care about ILL_FORMED vs. WELL_FORMED. +enum TestMode { SAFE, ILL_FORMED, WELL_FORMED, UNSAFE }; +enum IterType { INPUT, FWD, CONTIG }; + +// Use this don't-care behavior value for unsafe iterators that do not use the behavior tparam. +constexpr auto ANY_B = UTF_BEHAVIOR_FFFD; + +template +struct ImplTest { + std::basic_string str; + std::vector> parts; + std::u32string codePoints; + + ImplTest reverseParts() const { + ImplTest result; + // We cannot just reverse the string. + // We need to keep the code units for each subsequence in order. + // We could join the reversed parts, but so far we don't need the reversed string. + result.parts = reverseCopy(parts); + // result.str = join(result.parts); + result.codePoints = reverseCopy(codePoints); + return result; + } +}; + +} // namespace + +class UTFIteratorTest : public IntlTest { +public: + void runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) override { + if (exec) { logln("TestSuite UTFIteratorTest: "); } + TESTCASE_AUTO_BEGIN; + + TESTCASE_AUTO(testSafe16Good); + TESTCASE_AUTO(testSafe16Negative); + TESTCASE_AUTO(testSafe16FFFD); + TESTCASE_AUTO(testSafe16Surrogate); + TESTCASE_AUTO(testUnsafe16); + + TESTCASE_AUTO(testSafe16SinglePassIterGood); + TESTCASE_AUTO(testSafe16SinglePassIterNegative); + TESTCASE_AUTO(testUnsafe16SinglePassIter); + + TESTCASE_AUTO(testSafe16FwdIter); + TESTCASE_AUTO(testUnsafe16FwdIter); + + TESTCASE_AUTO(testSafe8Good); + TESTCASE_AUTO(testSafe8Negative); + TESTCASE_AUTO(testSafe8FFFD); + TESTCASE_AUTO(testUnsafe8); + + TESTCASE_AUTO(testSafe8SinglePassIterGood); + TESTCASE_AUTO(testSafe8SinglePassIterFFFD); + TESTCASE_AUTO(testUnsafe8SinglePassIter); + + TESTCASE_AUTO(testSafe8FwdIter); + TESTCASE_AUTO(testUnsafe8FwdIter); + + TESTCASE_AUTO(testSafe32Good); + TESTCASE_AUTO(testSafe32Negative); + TESTCASE_AUTO(testSafe32FFFD); + TESTCASE_AUTO(testSafe32Surrogate); + TESTCASE_AUTO(testUnsafe32); + + TESTCASE_AUTO(testSafe32SinglePassIterGood); + TESTCASE_AUTO(testSafe32SinglePassIterSurrogate); + TESTCASE_AUTO(testUnsafe32SinglePassIter); + + TESTCASE_AUTO(testSafe32FwdIter); + TESTCASE_AUTO(testUnsafe32FwdIter); + + TESTCASE_AUTO(testSafe16LongLinearContig); + TESTCASE_AUTO(testSafe8LongLinearContig); + TESTCASE_AUTO(testSafe32LongLinearContig); + + TESTCASE_AUTO(testUnsafe16LongLinearContig); + TESTCASE_AUTO(testUnsafe8LongLinearContig); + TESTCASE_AUTO(testUnsafe32LongLinearContig); + + TESTCASE_AUTO(testSafe16LongLinearInput); + TESTCASE_AUTO(testSafe8LongLinearInput); + TESTCASE_AUTO(testSafe32LongLinearInput); + + TESTCASE_AUTO(testUnsafe16LongLinearInput); + TESTCASE_AUTO(testUnsafe8LongLinearInput); + TESTCASE_AUTO(testUnsafe32LongLinearInput); + + TESTCASE_AUTO(testSafe16LongLinearFwd); + TESTCASE_AUTO(testSafe8LongLinearFwd); + TESTCASE_AUTO(testSafe32LongLinearFwd); + + TESTCASE_AUTO(testUnsafe16LongLinearFwd); + TESTCASE_AUTO(testUnsafe8LongLinearFwd); + TESTCASE_AUTO(testUnsafe32LongLinearFwd); + + TESTCASE_AUTO(testSafe16LongBackward); + TESTCASE_AUTO(testSafe8LongBackward); + TESTCASE_AUTO(testSafe32LongBackward); + + TESTCASE_AUTO(testUnsafe16LongBackward); + TESTCASE_AUTO(testUnsafe8LongBackward); + TESTCASE_AUTO(testUnsafe32LongBackward); + + TESTCASE_AUTO(testSafe16LongReverse); + TESTCASE_AUTO(testSafe8LongReverse); + TESTCASE_AUTO(testSafe32LongReverse); + + TESTCASE_AUTO(testUnsafe16LongReverse); + TESTCASE_AUTO(testUnsafe8LongReverse); + TESTCASE_AUTO(testUnsafe32LongReverse); + + TESTCASE_AUTO(testSafe16Zigzag); + TESTCASE_AUTO(testSafe8Zigzag); + TESTCASE_AUTO(testSafe32Zigzag); + + TESTCASE_AUTO(testUnsafe16Zigzag); + TESTCASE_AUTO(testUnsafe8Zigzag); + TESTCASE_AUTO(testUnsafe32Zigzag); + + TESTCASE_AUTO(testSafe16ZigzagReverse); + TESTCASE_AUTO(testSafe8ZigzagReverse); + TESTCASE_AUTO(testSafe32ZigzagReverse); + + TESTCASE_AUTO(testUnsafe16ZigzagReverse); + TESTCASE_AUTO(testUnsafe8ZigzagReverse); + TESTCASE_AUTO(testUnsafe32ZigzagReverse); + + TESTCASE_AUTO_END; + } + + template + CP32 sub(StringView part) { + switch (behavior) { + case UTF_BEHAVIOR_NEGATIVE: return U_SENTINEL; + case UTF_BEHAVIOR_FFFD: return 0xfffd; + case UTF_BEHAVIOR_SURROGATE: { + auto c = part[0]; + return U_IS_SURROGATE(c) ? c : 0xfffd; + } + } + } + + template + void testBidiIter(StringView piped); + + template + void testBidiIter(StringView sv, const std::vector &parts, CodePoints range); + + template + void testSinglePassIter(StringView piped); + + template + void testSinglePassIter(const std::vector &parts, Iter &iter, const Iter &rangeLimit); + + template + void testFwdIter(StringView piped); + + template + void testFwdIter(const std::vector &parts, UnitIter goodLimit, + Iter iter, Iter rangeLimit); + + static constexpr std::u16string_view good16{u"a|b|ç|カ|🚴"}; + static const char *good8Chars; + static constexpr std::u32string_view good32{U"a|b|ç|カ|🚴"}; + + static constexpr char16_t badChars16[] = { + u'a', u'|', 0xd900, u'|', u'ç', u'|', 0xdc05, u'|', u"🚴"[0], u"🚴"[1] + }; + static constexpr std::u16string_view bad16{badChars16, std::size(badChars16)}; + + static constexpr int badChars8[] = { + u8'a', u8'|', 0xe0, 0xa0, u8'|', u8"ç"[0], u8"ç"[1], u8'|', + 0xf4, 0x8f, 0xbf, u8'|', u8"🚴"[0], u8"🚴"[1], u8"🚴"[2], u8"🚴"[3] + }; + + static constexpr char32_t badChars32[] = { + u'a', u'|', 0xd900, u'|', u'ç', u'|', 0x110000, u'|', U'🚴' + }; + static constexpr std::u32string_view bad32{badChars32, std::size(badChars32)}; + + void testSafe16Good() { + testBidiIter(good16); + } + void testSafe16Negative() { + testBidiIter(bad16); + } + void testSafe16FFFD() { + testBidiIter(bad16); + } + void testSafe16Surrogate() { + testBidiIter(bad16); + } + void testUnsafe16() { + testBidiIter(good16); + } + + void testSafe16SinglePassIterGood() { + testSinglePassIter(good16); + } + void testSafe16SinglePassIterNegative() { + testSinglePassIter(bad16); + } + void testUnsafe16SinglePassIter() { + testSinglePassIter(good16); + } + + void testSafe16FwdIter() { + testFwdIter(good16); + } + void testUnsafe16FwdIter() { + testFwdIter(good16); + } + + void testSafe8Good() { + testBidiIter(std::string_view{good8Chars}); + } + void testSafe8Negative() { + testBidiIter( + std::string_view(string8FromBytes(badChars8, std::size(badChars8)))); + } + void testSafe8FFFD() { + testBidiIter( + std::string_view(string8FromBytes(badChars8, std::size(badChars8)))); + } + void testUnsafe8() { + testBidiIter(std::string_view{good8Chars}); + } + + void testSafe8SinglePassIterGood() { + testSinglePassIter( + std::string_view{good8Chars}); + } + void testSafe8SinglePassIterFFFD() { + testSinglePassIter( + std::string_view(string8FromBytes(badChars8, std::size(badChars8)))); + } + void testUnsafe8SinglePassIter() { + testSinglePassIter(std::string_view{good8Chars}); + } + + void testSafe8FwdIter() { + testFwdIter(std::string_view{good8Chars}); + } + void testUnsafe8FwdIter() { + testFwdIter(std::string_view{good8Chars}); + } + + void testSafe32Good() { + testBidiIter(good32); + } + void testSafe32Negative() { + testBidiIter(bad32); + } + void testSafe32FFFD() { + testBidiIter(bad32); + } + void testSafe32Surrogate() { + testBidiIter(bad32); + } + void testUnsafe32() { + testBidiIter(good32); + } + + void testSafe32SinglePassIterGood() { + testSinglePassIter(good32); + } + void testSafe32SinglePassIterSurrogate() { + testSinglePassIter(bad32); + } + void testUnsafe32SinglePassIter() { + testSinglePassIter(good32); + } + + void testSafe32FwdIter() { + testFwdIter(good32); + } + void testUnsafe32FwdIter() { + testFwdIter(good32); + } + + // implementation code coverage ---------------------------------------- *** + + void initLong(); + + template + void checkUnits(const Units &units, std::basic_string_view part, UChar32 expectedCP); + + template + void testLongLinear(const ImplTest &test, Iter begin, Iter end) { + for (size_t i = 0; begin != end; ++i, ++begin) { + checkUnits(*begin, test.parts[i], test.codePoints[i]); + } + } + + template + void testLongLinearContig(const ImplTest &test) { + initLong(); + if constexpr (mode == UNSAFE) { + auto range = unsafeUTFStringCodePoints(test.str); + testLongLinear(test, range.begin(), range.end()); + } else { + auto range = utfStringCodePoints(test.str); + testLongLinear(test, range.begin(), range.end()); + } + } + + template + void testLongLinearInput(const ImplTest &test) { + initLong(); + SinglePassSource src(test.str); + if constexpr (mode == UNSAFE) { + testLongLinear( + test, + unsafeUTFIterator(src.begin()), + unsafeUTFIterator(src.end())); + } else { + testLongLinear( + test, + utfIterator(src.begin(), src.end()), + utfIterator(src.end(), src.end())); + } + } + + template + void testLongLinearFwd(const ImplTest &test) { + initLong(); + FwdIter srcBegin(test.str.data()); + FwdIter srcLimit(test.str.data() + test.str.length()); + if constexpr (mode == UNSAFE) { + testLongLinear( + test, + unsafeUTFIterator(srcBegin), + unsafeUTFIterator(srcLimit)); + } else { + testLongLinear( + test, + utfIterator(srcBegin, srcLimit), + utfIterator(srcLimit)); + } + } + + // backward: from end to begin with *--iter + template + void testLongBackward(const ImplTest &test, Iter begin, Iter end) { + for (size_t i = test.codePoints.length(); begin != end;) { + --i; + checkUnits(*--end, test.parts[i], test.codePoints[i]); + } + } + + template + void testLongBackward(const ImplTest &test) { + initLong(); + if constexpr (mode == UNSAFE) { + auto range = unsafeUTFStringCodePoints(test.str); + testLongBackward(test, range.begin(), range.end()); + } else { + auto range = utfStringCodePoints(test.str); + testLongBackward(test, range.begin(), range.end()); + } + } + + // reverse: from rbegin() to rend(), uses the reverse_iterator + template + void testLongReverse(const ImplTest &test) { + initLong(); + auto reverse = test.reverseParts(); + if constexpr (mode == UNSAFE) { + auto range = unsafeUTFStringCodePoints(test.str); + testLongLinear(reverse, range.rbegin(), range.rend()); + } else { + auto range = utfStringCodePoints(test.str); + testLongLinear(reverse, range.rbegin(), range.rend()); + } + } + + // Test state keeping in a bidirectional_iterator: + // Change directions, increment/decrement without reading, etc. + template + void zigzag(const ImplTest &test, size_t i, + const Iter &begin, Iter iter, const Iter &end); + + template + void testZigzag(const ImplTest &test, Iter begin, Iter end) { + size_t i = 0; + for (Iter iter = begin; iter != end; ++i, ++iter) { + zigzag(test, i, begin, iter, end); + } + } + + template + void testZigzag(const ImplTest &test) { + initLong(); + if constexpr (mode == UNSAFE) { + auto range = unsafeUTFStringCodePoints(test.str); + testZigzag(test, range.begin(), range.end()); + } else { + auto range = utfStringCodePoints(test.str); + testZigzag(test, range.begin(), range.end()); + } + } + + // Exercise the reverse_iterator as well. + template + void testZigzagReverse(const ImplTest &test) { + initLong(); + auto reverse = test.reverseParts(); + if constexpr (mode == UNSAFE) { + auto range = unsafeUTFStringCodePoints(test.str); + testZigzag(reverse, range.rbegin(), range.rend()); + } else { + auto range = utfStringCodePoints(test.str); + testZigzag(reverse, range.rbegin(), range.rend()); + } + } + + void testSafe16LongLinearContig() { + testLongLinearContig(longBad16); + } + void testSafe8LongLinearContig() { + testLongLinearContig(longBad8); + } + void testSafe32LongLinearContig() { + testLongLinearContig(longBad32); + } + + void testUnsafe16LongLinearContig() { + testLongLinearContig(longGood16); + } + void testUnsafe8LongLinearContig() { + testLongLinearContig(longGood8); + } + void testUnsafe32LongLinearContig() { + testLongLinearContig(longGood32); + } + + void testSafe16LongLinearInput() { + testLongLinearInput(longBad16); + } + void testSafe8LongLinearInput() { + testLongLinearInput(longBad8); + } + void testSafe32LongLinearInput() { + testLongLinearInput(longBad32); + } + + void testUnsafe16LongLinearInput() { + testLongLinearInput(longGood16); + } + void testUnsafe8LongLinearInput() { + testLongLinearInput(longGood8); + } + void testUnsafe32LongLinearInput() { + testLongLinearInput(longGood32); + } + + void testSafe16LongLinearFwd() { + testLongLinearFwd(longBad16); + } + void testSafe8LongLinearFwd() { + testLongLinearFwd(longBad8); + } + void testSafe32LongLinearFwd() { + testLongLinearFwd(longBad32); + } + + void testUnsafe16LongLinearFwd() { + testLongLinearFwd(longGood16); + } + void testUnsafe8LongLinearFwd() { + testLongLinearFwd(longGood8); + } + void testUnsafe32LongLinearFwd() { + testLongLinearFwd(longGood32); + } + + void testSafe16LongBackward() { + testLongBackward(longBad16); + } + void testSafe8LongBackward() { + testLongBackward(longBad8); + } + void testSafe32LongBackward() { + testLongBackward(longBad32); + } + + void testUnsafe16LongBackward() { + testLongBackward(longGood16); + } + void testUnsafe8LongBackward() { + testLongBackward(longGood8); + } + void testUnsafe32LongBackward() { + testLongBackward(longGood32); + } + + void testSafe16LongReverse() { + testLongReverse(longBad16); + } + void testSafe8LongReverse() { + testLongReverse(longBad8); + } + void testSafe32LongReverse() { + testLongReverse(longBad32); + } + + void testUnsafe16LongReverse() { + testLongReverse(longGood16); + } + void testUnsafe8LongReverse() { + testLongReverse(longGood8); + } + void testUnsafe32LongReverse() { + testLongReverse(longGood32); + } + + void testSafe16Zigzag() { + testZigzag(longBad16); + } + void testSafe8Zigzag() { + testZigzag(longBad8); + } + void testSafe32Zigzag() { + testZigzag(longBad32); + } + + void testUnsafe16Zigzag() { + testZigzag(longGood16); + } + void testUnsafe8Zigzag() { + testZigzag(longGood8); + } + void testUnsafe32Zigzag() { + testZigzag(longGood32); + } + + void testSafe16ZigzagReverse() { + testZigzagReverse(longBad16); + } + void testSafe8ZigzagReverse() { + testZigzagReverse(longBad8); + } + void testSafe32ZigzagReverse() { + testZigzagReverse(longBad32); + } + + void testUnsafe16ZigzagReverse() { + testZigzagReverse(longGood16); + } + void testUnsafe8ZigzagReverse() { + testZigzagReverse(longGood8); + } + void testUnsafe32ZigzagReverse() { + testZigzagReverse(longGood32); + } + + ImplTest longGood8; + ImplTest longGood16; + ImplTest longGood32; + ImplTest longBad8; + ImplTest longBad16; + ImplTest longBad32; +}; + +const char *UTFIteratorTest::good8Chars = reinterpret_cast(u8"a|b|ç|カ|🚴"); + +extern IntlTest *createUTFIteratorTest() { + return new UTFIteratorTest(); +} + +template +void UTFIteratorTest::testBidiIter(StringView piped) { + using Unit = typename StringView::value_type; + auto parts = split(piped); + auto joined = join(parts); + StringView sv(joined); + // "abçカ🚴" + // or + // "a?ç?🚴" where the ? sequences are ill-formed + if constexpr (mode == UNSAFE) { + auto range = unsafeUTFStringCodePoints(sv); + testBidiIter(sv, parts, range); + } else { + auto range = utfStringCodePoints(sv); + testBidiIter(sv, parts, range); + } +} + +template +void UTFIteratorTest::testBidiIter( + StringView sv, const std::vector &parts, CodePoints range) { + constexpr bool isWellFormed = mode != ILL_FORMED; + auto last = parts[4]; + auto iter = range.begin(); + assertTrue( + "bidirectional_iterator_tag", + std::is_same_v< + typename std::iterator_traits::iterator_category, + std::bidirectional_iterator_tag>); + assertEquals("iter[0] * codePoint", u'a', (*iter).codePoint()); + assertEquals("iter[0] -> codePoint", u'a', iter->codePoint()); + ++iter; // pre-increment + auto units = *iter; + CP32 expectedCP = isWellFormed ? u'b' : sub(parts[1]); + assertEquals("iter[1] * codePoint", expectedCP, units.codePoint()); + assertEquals("iter[1] * length", parts[1].length(), units.length()); + if constexpr (mode != UNSAFE) { + assertEquals("iter[1] * wellFormed", isWellFormed, units.wellFormed()); + } + assertTrue("iter[1] * stringView()", units.stringView() == parts[1]); + auto unitsIter = units.begin(); + for (auto c : parts[1]) { + assertEquals("iter[1] * begin()[i]", + static_cast(c), static_cast(*unitsIter++)); + } + assertTrue("iter[1] * end()[0]", *units.end() == parts[2][0]); + ++iter; + assertEquals("iter[2] * codePoint", u'ç', (*iter++).codePoint()); // post-increment + units = *iter++; // post-increment + expectedCP = isWellFormed ? u'カ' : sub(parts[3]); + assertEquals("iter[3] * codePoint", expectedCP, units.codePoint()); + if constexpr (mode != UNSAFE) { + assertEquals("iter[3] * wellFormed", isWellFormed, units.wellFormed()); + } + // Fetch the current code point twice. + assertEquals("iter[4.0] * codePoint", U'🚴', (*iter).codePoint()); + units = *iter++; // post-increment + assertEquals("iter[4] * codePoint", U'🚴', units.codePoint()); + assertEquals("iter[4] * length", last.length(), units.length()); + if constexpr (mode != UNSAFE) { + assertTrue("iter[4] * wellFormed", units.wellFormed()); + } + assertTrue("iter[4] * stringView()", units.stringView() == last); + unitsIter = units.begin(); + for (auto c : last) { + assertEquals("iter[back 4] * begin()[i]", + static_cast(c), static_cast(*unitsIter++)); + } + assertTrue("iter[4] * end() == endIter", units.end() == sv.end()); + assertTrue("iter == endIter", iter == range.end()); + // backwards + units = *--iter; // pre-decrement + assertEquals("iter[back 4] * codePoint", U'🚴', units.codePoint()); + assertEquals("iter[back 4] * length", last.length(), units.length()); + if constexpr (mode != UNSAFE) { + assertTrue("iter[back 4] * wellFormed", units.wellFormed()); + } + assertTrue("iter[back 4] * stringView()", units.stringView() == last); + unitsIter = units.begin(); + for (auto c : last) { + assertEquals("iter[back 4] * begin()[i]", + static_cast(c), static_cast(*unitsIter++)); + } + assertTrue("iter[back 4] * end() == endIter", units.end() == sv.end()); + --iter; + if constexpr (mode != UNSAFE) { + assertEquals("iter[back 3] -> wellFormed", isWellFormed, iter->wellFormed()); + } + assertEquals("iter[back 3] * codePoint", expectedCP, (*iter--).codePoint()); // post-decrement + assertEquals("iter[back 2] * codePoint", u'ç', (*iter).codePoint()); + assertEquals("iter[back 2] -> length", parts[2].length(), iter->length()); + if constexpr (mode != UNSAFE) { + assertTrue("iter[back 2] -> wellFormed", iter->wellFormed()); + } + units = *--iter; + expectedCP = isWellFormed ? u'b' : sub(parts[1]); + assertEquals("iter[back 1] * codePoint", expectedCP, units.codePoint()); + if constexpr (mode != UNSAFE) { + assertEquals("iter[back 1] * wellFormed", isWellFormed, units.wellFormed()); + } + assertTrue("iter[back 1] * stringView()", units.stringView() == parts[1]); + --iter; + assertEquals("iter[back 0] -> codePoint", u'a', iter->codePoint()); + assertTrue("iter[back 0] -> begin() == beginIter", iter->begin() == sv.begin()); + assertTrue("iter == beginIter", iter == range.begin()); +} + +template +void UTFIteratorTest::testSinglePassIter(StringView piped) { + using Unit = typename StringView::value_type; + auto parts = split(piped); + auto joined = join(parts); + SinglePassSource good(joined); + // "abçカ🚴" + // or + // "a?ç?🚴" where the ? sequences are ill-formed + if constexpr (mode == UNSAFE) { + auto iter = unsafeUTFIterator(good.begin()); + auto rangeLimit = unsafeUTFIterator(good.end()); + testSinglePassIter(parts, iter, rangeLimit); + } else { + auto iter = utfIterator(good.begin(), good.end()); + auto rangeLimit = utfIterator(good.end(), good.end()); + testSinglePassIter(parts, iter, rangeLimit); + } +} + +template +void UTFIteratorTest::testSinglePassIter( + const std::vector &parts, Iter &iter, const Iter &rangeLimit) { + constexpr bool isWellFormed = mode != ILL_FORMED; + assertTrue( + "input_iterator_tag", + std::is_same_v< + typename std::iterator_traits>:: + iterator_category, + std::input_iterator_tag>); + assertEquals("iter[0] * codePoint", u'a', (*iter).codePoint()); + assertEquals("iter[0] -> codePoint", u'a', iter->codePoint()); + ++iter; // pre-increment + auto units = *iter; + CP32 expectedCP = isWellFormed ? u'b' : sub(parts[1]); + assertEquals("iter[1] * codePoint", expectedCP, units.codePoint()); + assertEquals("iter[1] * length", parts[1].length(), units.length()); + if constexpr (mode != UNSAFE) { + assertEquals("iter[1] * wellFormed", isWellFormed, units.wellFormed()); + } + // No units.stringView() when the unit iterator is not a pointer. + // No begin() for a single-pass unit iterator. + ++iter; + assertEquals("iter[2] * codePoint", u'ç', (*iter++).codePoint()); // post-increment + expectedCP = isWellFormed ? u'カ' : sub(parts[3]); + assertEquals("iter[3] -> codePoint", expectedCP, iter->codePoint()); + ++iter; + // Fetch the current code point twice. + assertEquals("iter[4.0] * codePoint", U'🚴', (*iter).codePoint()); + units = *iter++; + assertEquals("iter[4] * codePoint", U'🚴', units.codePoint()); + assertEquals("iter[4] * length", parts[4].length(), units.length()); + if constexpr (mode != UNSAFE) { + assertTrue("iter[4] * wellFormed", units.wellFormed()); + } + assertTrue("iter == endIter", iter == rangeLimit); +} + +template +void UTFIteratorTest::testFwdIter(StringView piped) { + using Unit = typename StringView::value_type; + auto parts = split(piped); + auto joined = join(parts); + // "abçカ🚴" + FwdIter goodBegin(joined.data()); + FwdIter goodLimit(joined.data() + joined.length()); + if constexpr (mode == UNSAFE) { + auto iter = unsafeUTFIterator(goodBegin); + auto rangeLimit = unsafeUTFIterator(goodLimit); + testFwdIter(parts, goodLimit, iter, rangeLimit); + } else { + auto iter = utfIterator(goodBegin, goodLimit); + auto rangeLimit = utfIterator(goodLimit); + testFwdIter(parts, goodLimit, iter, rangeLimit); + } +} + +template +void UTFIteratorTest::testFwdIter(const std::vector &parts, UnitIter goodLimit, + Iter iter, Iter rangeLimit) { + assertTrue( + "forward_iterator_tag", + std::is_same_v< + typename std::iterator_traits::iterator_category, + std::forward_iterator_tag>); + assertEquals("iter[0] * codePoint", u'a', (*iter).codePoint()); + assertEquals("iter[0] -> codePoint", u'a', iter->codePoint()); + ++iter; // pre-increment + auto units = *iter; + assertEquals("iter[1] * codePoint", u'b', units.codePoint()); + assertEquals("iter[1] * length", parts[1].length(), units.length()); + if constexpr (mode != UNSAFE) { + assertTrue("iter[1] * wellFormed", units.wellFormed()); + } + // No units.stringView() when the unit iterator is not a pointer. + auto unitsIter = units.begin(); + for (auto c : parts[1]) { + assertEquals("iter[1] * begin()[i]", + static_cast(c), static_cast(*unitsIter++)); + } + assertTrue("iter[1] * end()[0]", *units.end() == parts[2][0]); + ++iter; + assertEquals("iter[2] * codePoint", u'ç', (*iter++).codePoint()); // post-increment + assertEquals("iter[3] -> codePoint", u'カ', iter->codePoint()); + ++iter; + // Fetch the current code point twice. + assertEquals("iter[4.0] * codePoint", U'🚴', (*iter).codePoint()); + units = *iter++; + assertEquals("iter[4] * codePoint", U'🚴', units.codePoint()); + assertEquals("iter[4] * length", parts[4].length(), units.length()); + if constexpr (mode != UNSAFE) { + assertTrue("iter[4] * wellFormed", units.wellFormed()); + } + unitsIter = units.begin(); + for (auto c : parts[4]) { + assertEquals("iter[back 4] * begin()[i]", + static_cast(c), static_cast(*unitsIter++)); + } + assertTrue("iter[4] * end() == endIter", units.end() == goodLimit); + assertTrue("iter == endIter", iter == rangeLimit); +} + +namespace { + +enum PartType { GOOD, BAD8, BAD16, BAD32 }; + +struct Part { + constexpr Part(char32_t c) : type_(GOOD), len_(0), c_(c) {} + constexpr Part(PartType t, int32_t u0) : type_(t), len_(1), u0_(u0) {} + constexpr Part(PartType t, int32_t u0, int32_t u1) : type_(t), len_(2), u0_(u0), u1_(u1) {} + constexpr Part(PartType t, int32_t u0, int32_t u1, int32_t u2) : + type_(t), len_(3), u0_(u0), u1_(u1), u2_(u2) {} + + PartType type_; + uint8_t len_; + char32_t c_ = U'?'; + int32_t u0_ = 0; + int32_t u1_ = 0; + int32_t u2_ = 0; +}; + +// Careful: We test with the reverse order of parts as well. +// For that to yield self-contained results, parts must not +// continue sequences across part boundaries in either order. +constexpr Part testParts[] = { + // "abçカ🚴" + u'a', + 0x7f, + 0x80, + Part(BAD8, 0xc0), + Part(BAD8, 0x80), + Part(BAD8, 0xc1), + 0, + Part(BAD8, 0xe0), + Part(BAD8, 0xe0, 0xa0), + Part(BAD8, 0xe0, 0xbf), + Part(BAD8, 0xed, 0x9f), + // ED A0 xx .. ED BF xx would be surrogate code points + Part(BAD8, 0xed), + Part(BAD8, 0xa0), + Part(BAD8, 0xed), + Part(BAD8, 0xbf), + u'ç', + Part(BAD8, 0xbf), // extra trail byte + u'カ', + Part(BAD8, 0xee, 0x80), + Part(BAD8, 0xef, 0xbf), + Part(BAD8, 0xf0), + Part(BAD8, 0x8f), + u'b', + Part(BAD8, 0xf0), + Part(BAD8, 0xf0, 0x90), + Part(BAD8, 0xf0, 0x90, 0x80), + Part(BAD8, 0xf4), + Part(BAD8, 0xf4, 0x8f), + Part(BAD8, 0xf4, 0x8f, 0xbf), + Part(BAD8, 0xf5), + Part(BAD8, 0xbf), + U'🚴', + Part(BAD8, 0x80), // extra trail byte + 0x7ff, + 0x800, + 0xfff, + 0x1000, + 0xd7ff, + Part(BAD16, 0xd800), + Part(BAD16, 0xdbff), + u'カ', + Part(BAD16, 0xdc00), + Part(BAD16, 0xdfff), + 0xe000, + 0xfffd, + 0xffff, + 0x10000, + 0x10ffff, + Part(BAD32, 0x110000), + Part(BAD32, -1) +}; + +} // namespace + +void UTFIteratorTest::initLong() { + if (!longGood32.str.empty()) { return; } + for (auto part : testParts) { + switch (part.type_) { + case GOOD: { + char u8[4]; + size_t len8 = 0; + U8_APPEND_UNSAFE(u8, len8, part.c_); + longGood8.str.append(u8, len8); + longGood8.parts.push_back({u8, len8}); + longBad8.str.append(u8, len8); + longBad8.parts.push_back({u8, len8}); + longBad8.codePoints.push_back(part.c_); + + char16_t u16[2]; + size_t len16 = 0; + U16_APPEND_UNSAFE(u16, len16, part.c_); + longGood16.str.append(u16, len16); + longGood16.parts.push_back({u16, len16}); + longBad16.str.append(u16, len16); + longBad16.parts.push_back({u16, len16}); + longBad16.codePoints.push_back(part.c_); + + longGood32.str.push_back(part.c_); + longGood32.parts.push_back({&part.c_, 1}); + longBad32.str.push_back(part.c_); + longBad32.parts.push_back({&part.c_, 1}); + longBad32.codePoints.push_back(part.c_); + break; + } + case BAD8: { + char u8[3] = { + static_cast(part.u0_), + static_cast(part.u1_), + static_cast(part.u2_) + }; + longBad8.str.append(u8, part.len_); + longBad8.parts.push_back({u8, part.len_}); + longBad8.codePoints.push_back(U'?'); + break; + } + case BAD16: { // surrogate code unit / code point + char16_t u16 = part.u0_; + longBad16.str.push_back(u16); + longBad16.parts.push_back({&u16, 1}); + longBad16.codePoints.push_back(U'?'); + char32_t u32 = part.u0_; + longBad32.str.push_back(u32); + longBad32.parts.push_back({&u32, 1}); + longBad32.codePoints.push_back(U'?'); + break; + } + case BAD32: { + char32_t u32 = part.u0_; + longBad32.str.push_back(u32); + longBad32.parts.push_back({&u32, 1}); + longBad32.codePoints.push_back(U'?'); + break; + } + } + } + longGood8.codePoints = longGood16.codePoints = longGood32.codePoints = longGood32.str; +} + +template +void UTFIteratorTest::checkUnits( + const Units &units, std::basic_string_view part, UChar32 expectedCP) { + bool expectedWellFormed = true; + if (expectedCP == u'?') { + expectedCP = sub(part); + expectedWellFormed = false; + } + assertEquals("cp[i]", expectedCP, units.codePoint()); + assertEquals("length[i]", part.length(), units.length()); + if constexpr (mode != UNSAFE) { + assertEquals("wellFormed[i]", expectedWellFormed, units.wellFormed()); + } + if constexpr (type >= FWD) { + int32_t j = 0; + for (Unit unit : units) { // begin()..end() + assertEquals("units.iter[i][j]", + static_cast(part[j]), static_cast(unit)); + ++j; + } + assertEquals("units.iter.length[i]", part.length(), j); + } + if constexpr (type >= CONTIG) { + assertTrue("stringView[i]", part == units.stringView()); + } +} + +template +void UTFIteratorTest::zigzag(const ImplTest &test, size_t i, + const Iter &begin, Iter iter, const Iter &end) { + static constexpr const char *path = "**+*+--*PPp++*p--+P+pP-*-*"; + size_t iLimit = test.codePoints.length(); + for (const char *p = path; *p != 0; ++p) { + switch(*p) { + case '*': + if (i < iLimit) { + checkUnits( + *iter, test.parts[i], test.codePoints[i]); + } + break; + case '+': // pre-increment + if (i < iLimit) { + ++i; + ++iter; + } else { + assertTrue("at limit", iter == end); + } + break; + case '-': // pre-decrement + if (i > 0) { + --i; + --iter; + } else { + assertTrue("at start", iter == begin); + } + break; + case 'P': // post-increment + if (i < iLimit) { + checkUnits( + *iter++, test.parts[i], test.codePoints[i]); + ++i; + } + break; + case 'p': // post-decrement + if (0 < i && i < iLimit) { + checkUnits( + *iter--, test.parts[i], test.codePoints[i]); + --i; + } + break; + default: + break; + } + } +} diff --git a/icu4c/source/test/intltest/utxttest.cpp b/icu4c/source/test/intltest/utxttest.cpp index 0293a6ca7170..526412400962 100644 --- a/icu4c/source/test/intltest/utxttest.cpp +++ b/icu4c/source/test/intltest/utxttest.cpp @@ -1594,18 +1594,18 @@ void UTextTest::Ticket13344() { assertSuccess("UTextTest::Ticket13344-status", status); UTEXT_SETNATIVEINDEX(ut.getAlias(), 3); - assertEquals("UTextTest::Ticket13344-lead", static_cast(3), utext_getNativeIndex(ut.getAlias())); + assertEquals("UTextTest::Ticket13344-lead", 3, utext_getNativeIndex(ut.getAlias())); UTEXT_SETNATIVEINDEX(ut.getAlias(), 4); - assertEquals("UTextTest::Ticket13344-trail", static_cast(3), utext_getNativeIndex(ut.getAlias())); + assertEquals("UTextTest::Ticket13344-trail", 3, utext_getNativeIndex(ut.getAlias())); UTEXT_SETNATIVEINDEX(ut.getAlias(), 5); - assertEquals("UTextTest::Ticket13344-bmp", static_cast(5), utext_getNativeIndex(ut.getAlias())); + assertEquals("UTextTest::Ticket13344-bmp", 5, utext_getNativeIndex(ut.getAlias())); utext_setNativeIndex(ut.getAlias(), 3); - assertEquals("UTextTest::Ticket13344-lead-2", static_cast(3), utext_getNativeIndex(ut.getAlias())); + assertEquals("UTextTest::Ticket13344-lead-2", 3, utext_getNativeIndex(ut.getAlias())); utext_setNativeIndex(ut.getAlias(), 4); - assertEquals("UTextTest::Ticket13344-trail-2", static_cast(3), utext_getNativeIndex(ut.getAlias())); + assertEquals("UTextTest::Ticket13344-trail-2", 3, utext_getNativeIndex(ut.getAlias())); utext_setNativeIndex(ut.getAlias(), 5); - assertEquals("UTextTest::Ticket13344-bmp-2", static_cast(5), utext_getNativeIndex(ut.getAlias())); + assertEquals("UTextTest::Ticket13344-bmp-2", 5, utext_getNativeIndex(ut.getAlias())); } // ICU-21653 UText does not handle access callback that changes chunk size diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt index f9f149d3cc87..b0f43a00c48b 100644 --- a/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt +++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt @@ -633,7 +633,9 @@ ks-IN ; ks-Arab-IN ; ks ; ku ; ku-Latn-TR ; ku ; ku-AQ ; ku-Latn-AQ ; ku-AQ ; ku-Egyp ; ku-Egyp-TR ; ku-Egyp ; +ku-IQ ; ku-Arab-IQ ; ku-Arab ; ku-IQ ku-Latn ; ku-Latn-TR ; ku ; +ku-SY ; ku-Latn-SY ; ku-SY ; ku-TR ; ku-Latn-TR ; ku ; kxv ; kxv-Latn-IN ; kxv ; kxv-AQ ; kxv-Latn-AQ ; kxv-AQ ; @@ -1134,7 +1136,7 @@ und-BQ ; pap-Latn-BQ ; pap-BQ ; und-BR ; pt-Latn-BR ; pt ; und-BS ; en-Latn-BS ; en-BS ; und-BW ; en-Latn-BW ; en-BW ; -und-BY ; be-Cyrl-BY ; be ; +und-BY ; ru-Cyrl-BY ; ru-BY ; und-BZ ; en-Latn-BZ ; en-BZ ; und-Beng ; bn-Beng-BD ; bn ; und-Beng-AQ ; bn-Beng-AQ ; bn-AQ ; @@ -1169,7 +1171,7 @@ und-Cyrl ; ru-Cyrl-RU ; ru ; und-Cyrl-AQ ; ru-Cyrl-AQ ; ru-AQ ; und-Cyrl-BA ; sr-Cyrl-BA ; sr-BA ; und-Cyrl-BG ; bg-Cyrl-BG ; bg ; -und-Cyrl-BY ; be-Cyrl-BY ; be ; +und-Cyrl-BY ; ru-Cyrl-BY ; ru-BY ; und-Cyrl-KG ; ky-Cyrl-KG ; ky ; und-Cyrl-KZ ; ru-Cyrl-KZ ; ru-KZ ; und-Cyrl-MD ; uk-Cyrl-MD ; uk-MD ; @@ -1423,6 +1425,7 @@ und-Latn-IL ; en-Latn-IL ; en-IL ; und-Latn-IM ; en-Latn-IM ; en-IM ; und-Latn-IN ; en-Latn-IN ; en-IN ; und-Latn-IO ; en-Latn-IO ; en-IO ; +und-Latn-IQ ; en-Latn-IQ ; en-IQ ; und-Latn-IS ; is-Latn-IS ; is ; und-Latn-IT ; it-Latn-IT ; it ; und-Latn-JE ; en-Latn-JE ; en-JE ; diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt index 18ae4443dbff..4eaa73c41b2b 100644 --- a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt +++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt @@ -125,6 +125,7 @@ cze ; cs daf ; dnj dan ; da dap ; njz +dek ; sqm deu ; de dgo ; doi dhd ; mwr @@ -289,7 +290,6 @@ mhr ; chm mkd ; mk mlg ; mg mlt ; mt -mnk ; man mnt ; wnn mo ; ro mof ; xnt @@ -327,6 +327,7 @@ nom ; cbr noo ; dtd nor ; no npi ; ne +nte ; eko nts ; pij nxu ; bpp nya ; ny @@ -1364,6 +1365,7 @@ cze_Adlm_AC_fonipa ; cs_Adlm_AC_fonipa daf_Adlm_AC_fonipa ; dnj_Adlm_AC_fonipa dan_Adlm_AC_fonipa ; da_Adlm_AC_fonipa dap_Adlm_AC_fonipa ; njz_Adlm_AC_fonipa +dek_Adlm_AC_fonipa ; sqm_Adlm_AC_fonipa deu_Adlm_AC_fonipa ; de_Adlm_AC_fonipa dgo_Adlm_AC_fonipa ; doi_Adlm_AC_fonipa dhd_Adlm_AC_fonipa ; mwr_Adlm_AC_fonipa @@ -1554,7 +1556,6 @@ mhr_Adlm_AC_fonipa ; chm_Adlm_AC_fonipa mkd_Adlm_AC_fonipa ; mk_Adlm_AC_fonipa mlg_Adlm_AC_fonipa ; mg_Adlm_AC_fonipa mlt_Adlm_AC_fonipa ; mt_Adlm_AC_fonipa -mnk_Adlm_AC_fonipa ; man_Adlm_AC_fonipa mnt_Adlm_AC_fonipa ; wnn_Adlm_AC_fonipa mo_Adlm_AC_fonipa ; ro_Adlm_AC_fonipa mof_Adlm_AC_fonipa ; xnt_Adlm_AC_fonipa @@ -1596,6 +1597,7 @@ nor_Adlm_AC_bokmal_fonipa_nynorsk ; nb_Adlm_AC_fonipa nor_Adlm_AC_fonipa ; no_Adlm_AC_fonipa nor_Adlm_AC_fonipa_nynorsk ; nn_Adlm_AC_fonipa npi_Adlm_AC_fonipa ; ne_Adlm_AC_fonipa +nte_Adlm_AC_fonipa ; eko_Adlm_AC_fonipa nts_Adlm_AC_fonipa ; pij_Adlm_AC_fonipa nxu_Adlm_AC_fonipa ; bpp_Adlm_AC_fonipa nya_Adlm_AC_fonipa ; ny_Adlm_AC_fonipa diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt index 54563a0f2663..4b0614db2e3c 100644 --- a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt +++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt @@ -56,7 +56,7 @@ en-u-ca-islamic-civil; English (Hijri Calendar [tabular, civil epoch]) en-u-ca-islamic-rgsa; English (Hijri Calendar [Saudi Arabia, sighting]) en-u-ca-islamic-tbla; English (Hijri Calendar [tabular, astronomical epoch]) en-u-ca-islamic-umalqura; English (Hijri Calendar [Umm al-Qura]) -en-u-ca-iso8601; English (ISO-8601 Calendar) +en-u-ca-iso8601; English (Gregorian Calendar [Year First]) en-u-ca-japanese; English (Japanese Calendar) en-u-ca-persian; English (Persian Calendar) en-u-ca-roc; English (Minguo Calendar) diff --git a/icu4c/source/test/testdata/cldr/units/unitsTest.txt b/icu4c/source/test/testdata/cldr/units/unitsTest.txt index a64be58bd19d..135756ced6f7 100644 --- a/icu4c/source/test/testdata/cldr/units/unitsTest.txt +++ b/icu4c/source/test/testdata/cldr/units/unitsTest.txt @@ -124,7 +124,6 @@ length ; kilometer ; meter ; 1,000 * x ; 1000000.0 length ; mile ; meter ; 1,609.344 * x ; 1609344.0 length ; nautical-mile ; meter ; 1,852 * x ; 1852000.0 length ; mile-scandinavian ; meter ; 10,000 * x ; 1.0E7 -length ; 100-kilometer ; meter ; 100,000 * x ; 1.0E8 length ; earth-radius ; meter ; 6,378,100 * x ; 6.3781E9 length ; solar-radius ; meter ; 695,700,000 * x ; 6.957E11 length ; astronomical-unit ; meter ; 149,597,870,700 * x ; 1.495979E14 @@ -152,13 +151,13 @@ mass ; tonne ; kilogram ; 1,000 * x ; 1000000.0 mass ; earth-mass ; kilogram ; 5,972,200,000,000,000,000,000,000 * x ; 5.9722E27 mass ; solar-mass ; kilogram ; 1,988,470,000,000,000,000,000,000,000,000 * x ; 1.98847E33 night-duration ; night ; night ; 1 * x ; 1,000.00 -portion ; portion-per-1e9 ; portion ; 0.000000001 * x ; 1.0E-6 -portion ; permillion ; portion ; 0.000001 * x ; 0.001 -portion ; permyriad ; portion ; 0.0001 * x ; 0.1 -portion ; permille ; portion ; 0.001 * x ; 1.0 -portion ; percent ; portion ; 0.01 * x ; 10.0 -portion ; karat ; portion ; 0.125/3 * x ; 41.66667 -portion ; portion ; portion ; 1 * x ; 1,000.00 +portion ; part-per-1e9 ; part ; 0.000000001 * x ; 1.0E-6 +portion ; part-per-1e6 ; part ; 0.000001 * x ; 0.001 +portion ; permyriad ; part ; 0.0001 * x ; 0.1 +portion ; permille ; part ; 0.001 * x ; 1.0 +portion ; percent ; part ; 0.01 * x ; 10.0 +portion ; karat ; part ; 0.125/3 * x ; 41.66667 +portion ; part ; part ; 1 * x ; 1,000.00 power ; milliwatt ; kilogram-square-meter-per-cubic-second ; 0.001 * x ; 1.0 power ; watt ; kilogram-square-meter-per-cubic-second ; 1 * x ; 1000.0 power ; horsepower ; kilogram-square-meter-per-cubic-second ; 745.69987158227022 * x ; 745699.9 @@ -215,11 +214,13 @@ volume ; cubic-inch ; cubic-meter ; 0.000016387064 * x ; 0.01638706 volume ; shaku ; cubic-meter ; 0.02401/1331 * x ; 0.01803907 volume ; fluid-ounce-imperial ; cubic-meter ; 0.0000284130625 * x ; 0.02841306 volume ; fluid-ounce ; cubic-meter ; 0.0000295735295625 * x ; 0.02957353 +volume ; fluid-ounce-metric ; cubic-meter ; 0.00003 * x ; 0.03 volume ; jigger ; cubic-meter ; 0.00004436029434375 * x ; 0.04436029 volume ; cup-jp ; cubic-meter ; 0.0001 * x ; 0.1 volume ; deciliter ; cubic-meter ; 0.0001 * x ; 0.1 volume ; cup ; cubic-meter ; 0.0002365882365 * x ; 0.2365882 volume ; cup-metric ; cubic-meter ; 0.00025 * x ; 0.25 +volume ; cup-imperial ; cubic-meter ; 0.000284130625 * x ; 0.2841306 volume ; pint ; cubic-meter ; 0.000473176473 * x ; 0.4731765 volume ; pint-metric ; cubic-meter ; 0.0005 * x ; 0.5 volume ; pint-imperial ; cubic-meter ; 0.00056826125 * x ; 0.5682612 diff --git a/icu4c/source/test/testdata/root.txt b/icu4c/source/test/testdata/root.txt index e7790ee3ade3..e856e76fa408 100644 --- a/icu4c/source/test/testdata/root.txt +++ b/icu4c/source/test/testdata/root.txt @@ -12,9 +12,9 @@ root { - Version { 45.0 } - ExpectCLDRVersionAtLeast { 45.0 } // 'base' cldr version. Allow up to version =.=.* of this - CurrentCLDRVersion { 45.0 } // Current CLDR version as of the test update. Warn if not an exact match. + Version { 48.0 } + ExpectCLDRVersionAtLeast { 48.0 } // 'base' cldr version. Allow up to version =.=.* of this + CurrentCLDRVersion { 48.0 } // Current CLDR version as of the test update. Warn if not an exact match. ShortLanguage { xxx } diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt index 6e4a18b95597..be2d93d33f3d 100644 --- a/icu4c/source/test/testdata/structLocale.txt +++ b/icu4c/source/test/testdata/structLocale.txt @@ -6735,6 +6735,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -7329,6 +7334,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -7923,6 +7933,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -8517,6 +8532,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -9111,6 +9131,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -9705,6 +9730,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -10299,6 +10329,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -10893,6 +10928,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -11489,6 +11529,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -12084,6 +12129,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -12678,6 +12728,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -13272,6 +13327,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -13866,6 +13926,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -14460,6 +14525,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -15054,6 +15124,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -15648,6 +15723,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -16242,6 +16322,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -16836,6 +16921,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -17430,6 +17520,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -18024,6 +18119,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -18618,6 +18718,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -19212,6 +19317,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -19806,6 +19916,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -20400,6 +20515,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -20994,6 +21114,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -21588,6 +21713,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -22226,6 +22356,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -22820,6 +22955,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -23414,6 +23554,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -24008,6 +24153,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -24602,6 +24752,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -25198,6 +25353,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -25792,6 +25952,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -26386,6 +26551,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -26980,6 +27150,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -27574,6 +27749,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -28168,6 +28348,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -28762,6 +28947,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -29356,6 +29546,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -29950,6 +30145,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -30544,6 +30744,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -31138,6 +31343,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -31732,6 +31942,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -32326,6 +32541,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -32920,6 +33140,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -33514,6 +33739,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -34109,6 +34339,11 @@ structLocale:table(nofallback){ } } } + rationalFormats{ + integerAndRationalPattern{""} + rationalPattern{""} + rationalUsage{""} + } symbols{ approximatelySign{""} decimal{""} @@ -34503,6 +34738,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -34775,6 +35016,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -35889,6 +36136,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -36277,6 +36530,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -37396,6 +37655,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -38116,6 +38381,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -38440,6 +38711,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -39075,6 +39352,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -39467,6 +39750,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -39821,6 +40110,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -39900,12 +40195,15 @@ structLocale:table(nofallback){ eras{ abbreviated{ "", + "", } wide{ "", + "", } narrow{ "", + "", } } intervalFormats{ @@ -40207,6 +40505,339 @@ structLocale:table(nofallback){ } } } + iso8601{ + DateTimePatterns{ + "", + "", + "", + "", + "A2", + "A2", + "A2", + "A2", + "", + "A4", + "A4", + "A4", + "A4", + } + DateTimePatterns%atTime{ + "A4", + "A4", + "A4", + "A4", + } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } + DateTimeSkeletons{ + "", + "", + "", + "", + "A2", + "A2", + "A2", + "A2", + } + availableFormats{ + Bh{""} + Bhm{""} + Bhms{""} + E{""} + EBhm{""} + EBhms{""} + EHm{""} + EHms{""} + Ed{""} + Ehm{""} + Ehms{""} + Gy{""} + GyMMM{""} + GyMMMEd{""} + GyMMMd{""} + GyMd{""} + H{""} + Hm{""} + Hms{""} + Hmsv{""} + Hmv{""} + M{""} + MEd{""} + MMM{""} + MMMEd{""} + MMMMW{ + one{""} + other{""} + } + MMMMd{""} + MMMd{""} + Md{""} + d{""} + h{""} + hm{""} + hms{""} + hmsv{""} + hmv{""} + ms{""} + y{""} + yM{""} + yMEd{""} + yMMM{""} + yMMMEd{""} + yMMMM{""} + yMMMd{""} + yMd{""} + yQQQ{""} + yQQQQ{""} + yw{ + one{""} + other{""} + } + } + intervalFormats{ + Bh{ + B{""} + h{""} + } + Bhm{ + B{""} + h{""} + m{""} + } + GGGGGyM{ + G{""} + M{""} + y{""} + } + GGGGGyMEd{ + G{""} + M{""} + d{""} + y{""} + } + GGGGGyMd{ + G{""} + M{""} + d{""} + y{""} + } + Gy{ + G{""} + y{""} + } + GyM{ + G{""} + M{""} + y{""} + } + GyMEd{ + G{""} + M{""} + d{""} + y{""} + } + GyMMM{ + G{""} + M{""} + y{""} + } + GyMMMEd{ + G{""} + M{""} + d{""} + y{""} + } + GyMMMEEEEd{ + G{""} + M{""} + d{""} + y{""} + } + GyMMMM{ + G{""} + M{""} + y{""} + } + GyMMMMEd{ + G{""} + M{""} + d{""} + y{""} + } + GyMMMMd{ + G{""} + M{""} + d{""} + y{""} + } + GyMMMd{ + G{""} + M{""} + d{""} + y{""} + } + GyMd{ + G{""} + M{""} + d{""} + y{""} + } + H{ + H{""} + } + Hm{ + H{""} + m{""} + } + Hmv{ + H{""} + m{""} + } + Hmvvvv{ + H{""} + m{""} + } + Hv{ + H{""} + } + Hvvvv{ + H{""} + } + M{ + M{""} + } + MEd{ + M{""} + d{""} + } + MMM{ + M{""} + } + MMMEd{ + M{""} + d{""} + } + MMMEEEEd{ + M{""} + d{""} + } + MMMM{ + M{""} + } + MMMMEd{ + M{""} + d{""} + } + MMMMd{ + M{""} + d{""} + } + MMMd{ + M{""} + d{""} + } + Md{ + M{""} + d{""} + } + d{ + d{""} + } + fallback{""} + h{ + B{""} + a{""} + h{""} + } + hm{ + B{""} + a{""} + h{""} + m{""} + } + hmv{ + B{""} + a{""} + h{""} + m{""} + } + hmvvvv{ + B{""} + a{""} + h{""} + m{""} + } + hv{ + B{""} + a{""} + h{""} + } + hvvvv{ + B{""} + a{""} + h{""} + } + y{ + y{""} + } + yM{ + M{""} + y{""} + } + yMEd{ + M{""} + d{""} + y{""} + } + yMMM{ + M{""} + y{""} + } + yMMMEEEEd{ + M{""} + d{""} + y{""} + } + yMMMEd{ + M{""} + d{""} + y{""} + } + yMMMM{ + M{""} + y{""} + } + yMMMMEEEEd{ + M{""} + d{""} + y{""} + } + yMMMMEd{ + M{""} + d{""} + y{""} + } + yMMMMd{ + M{""} + d{""} + y{""} + } + yMMMd{ + M{""} + d{""} + y{""} + } + yMd{ + M{""} + d{""} + y{""} + } + } + } persian{ AmPmMarkers{ "", @@ -40256,6 +40887,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -40625,6 +41262,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", @@ -41609,6 +42252,12 @@ structLocale:table(nofallback){ "A4", "A4", } + DateTimePatterns%relative{ + "A4", + "A4", + "A4", + "A4", + } DateTimeSkeletons{ "", "", diff --git a/icu4c/source/tools/ctestfw/uperf.cpp b/icu4c/source/tools/ctestfw/uperf.cpp index f5e5ae548566..cc7824e1e6b1 100644 --- a/icu4c/source/tools/ctestfw/uperf.cpp +++ b/icu4c/source/tools/ctestfw/uperf.cpp @@ -189,16 +189,20 @@ void UPerfTest::init(UOption addOptions[], int32_t addOptionsCount, int32_t len = 0; if(fileName!=nullptr){ //pre-flight - ucbuf_resolveFileName(sourceDir, fileName, nullptr, &len, &status); + UErrorCode bufferStatus = U_ZERO_ERROR; + ucbuf_resolveFileName(sourceDir, fileName, nullptr, &len, &bufferStatus); resolvedFileName = static_cast(uprv_malloc(len)); if(resolvedFileName==nullptr){ status= U_MEMORY_ALLOCATION_ERROR; return; } - if(status == U_BUFFER_OVERFLOW_ERROR){ - status = U_ZERO_ERROR; + if(bufferStatus == U_BUFFER_OVERFLOW_ERROR){ + bufferStatus = U_ZERO_ERROR; + } + ucbuf_resolveFileName(sourceDir, fileName, resolvedFileName, &len, &bufferStatus); + if (U_FAILURE(bufferStatus)) { + status = bufferStatus; } - ucbuf_resolveFileName(sourceDir, fileName, resolvedFileName, &len, &status); ucharBuf = ucbuf_open(resolvedFileName,&encoding,true,false,&status); if(U_FAILURE(status)){ diff --git a/icu4c/source/tools/genrb/genrb.cpp b/icu4c/source/tools/genrb/genrb.cpp index df3987b5819d..f386a67e0220 100644 --- a/icu4c/source/tools/genrb/genrb.cpp +++ b/icu4c/source/tools/genrb/genrb.cpp @@ -163,7 +163,7 @@ main(int argc, } if(options[FORMAT_VERSION].doesOccur) { const char *s = options[FORMAT_VERSION].value; - if(uprv_strlen(s) != 1 || (s[0] < '1' && '3' < s[0])) { + if(uprv_strlen(s) != 1 || (s[0] < '1' || '3' < s[0])) { fprintf(stderr, "%s: unsupported --formatVersion %s\n", argv[0], s); illegalArg = true; } else if(s[0] == '1' && diff --git a/icu4c/source/tools/genrb/parse.cpp b/icu4c/source/tools/genrb/parse.cpp index 3a53e999ff15..248615ad3601 100644 --- a/icu4c/source/tools/genrb/parse.cpp +++ b/icu4c/source/tools/genrb/parse.cpp @@ -1034,6 +1034,7 @@ writeCollationSpecialPrimariesTOML(const char* outputdir, const char* name, cons } usrc_writeArray(f, "last_primaries = [\n ", lastPrimaries, 16, 4, " ", "\n]\n"); + usrc_writeArray(f, "compressible_bytes = [\n ", data->compressibleBytes, 1, 256, " ", "\n]\n"); fprintf(f, "numeric_primary = 0x%X\n", numericPrimary >> 24); fclose(f); } diff --git a/icu4c/source/tools/toolutil/writesrc.cpp b/icu4c/source/tools/toolutil/writesrc.cpp index 55c2f277b33c..c53aafd6d24e 100644 --- a/icu4c/source/tools/toolutil/writesrc.cpp +++ b/icu4c/source/tools/toolutil/writesrc.cpp @@ -162,6 +162,7 @@ usrc_writeArray(FILE *f, p32=nullptr; p64=nullptr; switch(width) { + case 1: case 8: p8=(const uint8_t *)p; break; @@ -192,6 +193,7 @@ usrc_writeArray(FILE *f, } } switch(width) { + case 1: case 8: value=p8[i]; break; @@ -208,7 +210,11 @@ usrc_writeArray(FILE *f, value=0; /* unreachable */ break; } - fprintf(f, value<=9 ? "%" PRId64 : "0x%" PRIx64, value); + if (width == 1) { + fprintf(f, value ? "true" : "false"); + } else { + fprintf(f, value<=9 ? "%" PRId64 : "0x%" PRIx64, value); + } } if(postfix!=nullptr) { fputs(postfix, f); diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/cns-11643-1992.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/cns-11643-1992.cnv index 424a3b044936..fab7f23b2a24 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/cns-11643-1992.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/cns-11643-1992.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ebcdic-xml-us.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ebcdic-xml-us.cnv index ac024acd7386..3a5c00f05953 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ebcdic-xml-us.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ebcdic-xml-us.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-jp-2007.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-jp-2007.cnv index 4a25cd015e66..9e7b73d0fbb2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-jp-2007.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-jp-2007.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-tw-2014.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-tw-2014.cnv index 30a18a4d4247..e42d608a4b57 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-tw-2014.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/euc-tw-2014.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gb18030-2022.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gb18030-2022.cnv index faba6433d21f..4b48bdee17b5 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gb18030-2022.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gb18030-2022.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gsm-03.38-2009.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gsm-03.38-2009.cnv index 08da74cf4459..70d8d0d3a625 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gsm-03.38-2009.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/gsm-03.38-2009.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1006_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1006_P100-1995.cnv index 5c66e625ca15..d8c4704f2636 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1006_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1006_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1025_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1025_P100-1995.cnv index 7e8b7238e000..73606c1c5fb7 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1025_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1025_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1026_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1026_P100-1995.cnv index 34b5f8558fdf..504d6d7c112d 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1026_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1026_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1047_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1047_P100-1995.cnv index 6e9bf88dc6f0..1b41a6a39517 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1047_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1047_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1051_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1051_P100-1995.cnv index 0d9ad4cd0a5f..a0ca5a5e4582 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1051_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1051_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1089_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1089_P100-1995.cnv index 8fbbada01c74..4031d0f312d3 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1089_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1089_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1097_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1097_P100-1995.cnv index bd6294004e24..f3cb89af017b 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1097_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1097_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1098_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1098_P100-1995.cnv index 7b4cb7a7c7c3..b244a5276b27 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1098_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1098_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1112_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1112_P100-1995.cnv index b4d96eded64f..ff97e365c5cc 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1112_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1112_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1122_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1122_P100-1999.cnv index 8f81dfc7d4d7..72b0d1c795b7 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1122_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1122_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1123_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1123_P100-1995.cnv index e99c6ba9a50f..9585f17e9ece 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1123_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1123_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1124_P100-1996.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1124_P100-1996.cnv index c2ab1d2f7734..174dcf5f9a9f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1124_P100-1996.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1124_P100-1996.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1125_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1125_P100-1997.cnv index c69a691e277d..62b5083c84a5 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1125_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1125_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1129_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1129_P100-1997.cnv index 9fa0a083a0d7..81bdeb626ddb 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1129_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1129_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1130_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1130_P100-1997.cnv index ab5ecd9d9c03..644a7a386b53 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1130_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1130_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1131_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1131_P100-1997.cnv index 36c9aca3e2e0..999ae95836d0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1131_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1131_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1132_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1132_P100-1998.cnv index f5812b9dcdcc..74c1fdbea943 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1132_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1132_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1133_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1133_P100-1997.cnv index 603052897965..62765a053afd 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1133_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1133_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1137_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1137_P100-1999.cnv index 332668ab5d60..6a3c7a473d4b 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1137_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1137_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1140_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1140_P100-1997.cnv index 7cbde7556b46..f86623606bde 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1140_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1140_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1141_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1141_P100-1997.cnv index 696b7fd44ff9..a5522225347e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1141_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1141_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1142_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1142_P100-1997.cnv index 44902a4b654e..b07e31f84080 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1142_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1142_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1143_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1143_P100-1997.cnv index 05c3f19413f5..62e6c967f884 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1143_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1143_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1144_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1144_P100-1997.cnv index e74419cf4c96..f0f0c97bb089 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1144_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1144_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1145_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1145_P100-1997.cnv index 680ec22d08e4..5626df923380 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1145_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1145_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1146_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1146_P100-1997.cnv index 6e555a36e684..c551f80a03de 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1146_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1146_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1147_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1147_P100-1997.cnv index b87d0e6e7809..83c0f97803ab 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1147_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1147_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1148_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1148_P100-1997.cnv index 6952fae1ce48..0709424aff39 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1148_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1148_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1149_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1149_P100-1997.cnv index a8b9f96cad5e..124c49e36b82 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1149_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1149_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1153_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1153_P100-1999.cnv index b8d3dafc76ad..88d689bf00d2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1153_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1153_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1154_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1154_P100-1999.cnv index 67ffccaa1a10..4928856fccf0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1154_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1154_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1155_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1155_P100-1999.cnv index 67d8cf53881d..30be51691ec5 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1155_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1155_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1156_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1156_P100-1999.cnv index 01e833ed11f4..86780bb1dda0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1156_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1156_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1157_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1157_P100-1999.cnv index 698afcc99fda..b1fc553a896d 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1157_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1157_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1158_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1158_P100-1999.cnv index 38d116743c85..0ae829620f2f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1158_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1158_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1160_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1160_P100-1999.cnv index 5f77196fce85..e4d0d717a4c9 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1160_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1160_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1162_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1162_P100-1999.cnv index 943fd7440d06..0ebe60997394 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1162_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1162_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1164_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1164_P100-1999.cnv index 8d6f5c2546fa..4b6c12023987 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1164_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1164_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1168_P100-2002.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1168_P100-2002.cnv index 2f2da14b28f8..95f5c75501f9 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1168_P100-2002.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1168_P100-2002.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1250_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1250_P100-1995.cnv index e55267d75b2f..e8a7d87a1a7f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1250_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1250_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1251_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1251_P100-1995.cnv index b4ccd3b62163..6c49ecd226b5 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1251_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1251_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1252_P100-2000.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1252_P100-2000.cnv index ffc7c098b4dc..f7138a499fb7 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1252_P100-2000.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1252_P100-2000.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1253_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1253_P100-1995.cnv index d98efbf93629..56c930989746 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1253_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1253_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1254_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1254_P100-1995.cnv index c8ade9b26422..f8ba62a124ab 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1254_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1254_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1255_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1255_P100-1995.cnv index 09ca769ef81e..ecb0984906dc 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1255_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1255_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1256_P110-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1256_P110-1997.cnv index 590060503f16..13653c220df8 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1256_P110-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1256_P110-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1257_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1257_P100-1995.cnv index b48f7125a94e..34dd474e5482 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1257_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1257_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1258_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1258_P100-1997.cnv index b0a9ffcb6386..916daefaaded 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1258_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1258_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-12712_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-12712_P100-1998.cnv index 8135e74021a3..bec1a1a7d445 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-12712_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-12712_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1276_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1276_P100-1995.cnv index f8b01d88ccf0..c9bdf0d2f895 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1276_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1276_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P110-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P110-1997.cnv index a12003a8fb10..80b00111ca8c 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P110-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P110-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P11B-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P11B-1998.cnv index a75798f29b3c..c29eeefaaf67 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P11B-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1363_P11B-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1364_P110-2007.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1364_P110-2007.cnv index c338736e8ab2..4df05320bc4b 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1364_P110-2007.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1364_P110-2007.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1371_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1371_P100-1999.cnv index ff7c43c8f476..0d775e68ed6e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1371_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1371_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1373_P100-2002.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1373_P100-2002.cnv index 40e5cc8e7fe0..48f2068338cc 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1373_P100-2002.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1373_P100-2002.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1375_P100-2008.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1375_P100-2008.cnv index b5e5c7958b47..8b3f54d86774 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1375_P100-2008.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1375_P100-2008.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1383_P110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1383_P110-1999.cnv index 900728edb1be..3a6f7c9aac85 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1383_P110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1383_P110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1386_P100-2001.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1386_P100-2001.cnv index ac5a7bfe9071..295063313c90 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1386_P100-2001.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1386_P100-2001.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1388_P100-2024.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1388_P100-2024.cnv index 3e25a2bf8183..ae83c182c5eb 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1388_P100-2024.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1388_P100-2024.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1390_P110-2003.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1390_P110-2003.cnv index 5af44f1788f9..6674ba04fef6 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1390_P110-2003.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1390_P110-2003.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1399_P110-2003.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1399_P110-2003.cnv index 09281dd94040..2b46ed2b12d9 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1399_P110-2003.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-1399_P110-2003.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16684_P110-2003.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16684_P110-2003.cnv index af37e7e8b0ee..fe6d57c68524 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16684_P110-2003.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16684_P110-2003.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16804_X110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16804_X110-1999.cnv index 3fe84bbd79bf..bbd679ecab24 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16804_X110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-16804_X110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-273_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-273_P100-1995.cnv index 10adeb02bebd..60d315d0867f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-273_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-273_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-277_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-277_P100-1995.cnv index f096bd1efa20..6596f4218ee2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-277_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-277_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-278_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-278_P100-1995.cnv index 672db8cf94c2..6ac9db01bad2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-278_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-278_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-280_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-280_P100-1995.cnv index 3121458e0dac..25195775c612 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-280_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-280_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-284_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-284_P100-1995.cnv index f2b8878ed680..305a25674490 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-284_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-284_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-285_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-285_P100-1995.cnv index 751098e553a4..b384494a43ef 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-285_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-285_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-290_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-290_P100-1995.cnv index ff6ec79026da..dbd0122d5e66 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-290_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-290_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-297_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-297_P100-1995.cnv index ff577afa9052..e69e73718216 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-297_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-297_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P120-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P120-1999.cnv index 081a293c0e66..a36b9d3180b9 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P120-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P120-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2004_U2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2004_U2.cnv index c2c82e6d6e5a..f9b4124882db 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2004_U2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2004_U2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2009_U2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2009_U2.cnv index 3af93f46e636..b0173fa82ef4 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2009_U2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-33722_P12A_P12A-2009_U2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-37_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-37_P100-1995.cnv index 5fa43db5f602..2b89f85e0408 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-37_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-37_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-420_X120-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-420_X120-1999.cnv index 16e80464b458..460011eb761a 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-420_X120-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-420_X120-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-424_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-424_P100-1995.cnv index 5213e5a861ec..0989c0d0e329 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-424_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-424_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-437_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-437_P100-1995.cnv index 4e08e3f354b9..583c550bce02 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-437_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-437_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4517_P100-2005.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4517_P100-2005.cnv index 37b805a49e27..85cdfc045705 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4517_P100-2005.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4517_P100-2005.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4899_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4899_P100-1998.cnv index 8608c3356b56..ce78d4f9d35f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4899_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4899_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4909_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4909_P100-1999.cnv index c100de238730..f37dc640db38 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4909_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4909_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4971_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4971_P100-1999.cnv index 0e7c3879b74d..9220c045508e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4971_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-4971_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-500_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-500_P100-1995.cnv index 01816aed3246..db8036f9d454 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-500_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-500_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5012_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5012_P100-1999.cnv index 0899909a0e04..61a8a4adc995 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5012_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5012_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5123_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5123_P100-1999.cnv index 8ca5e3c5c035..ed6b2b1931eb 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5123_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5123_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5346_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5346_P100-1998.cnv index 8b754282e1d4..aacf758a697f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5346_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5346_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5347_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5347_P100-1998.cnv index 790de2aa33d5..8d1cd6e4f511 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5347_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5347_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5348_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5348_P100-1997.cnv index ecfc14bdc83d..244fff557083 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5348_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5348_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5349_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5349_P100-1998.cnv index ff8c2fcdd204..8080acb8740c 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5349_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5349_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5350_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5350_P100-1998.cnv index 87f820c2e2fd..bd5bc13e6487 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5350_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5350_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5351_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5351_P100-1998.cnv index a6b6b2754097..d0032b4c4d5e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5351_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5351_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5352_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5352_P100-1998.cnv index 87683cd6c824..a6b9604e2e86 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5352_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5352_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5353_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5353_P100-1998.cnv index 3b285ce485f4..e848f02fa46f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5353_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5353_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5354_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5354_P100-1998.cnv index 8ee6efc9a6b4..3d3158748bc4 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5354_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5354_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5471_P100-2006.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5471_P100-2006.cnv index 28020db54f8d..36996346a997 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5471_P100-2006.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5471_P100-2006.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5478_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5478_P100-1995.cnv index 218068ca19c1..ea7c65c80ff0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5478_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-5478_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-720_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-720_P100-1997.cnv index 852c40986a09..e29c17ab3a83 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-720_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-720_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-737_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-737_P100-1997.cnv index 5678b20df4fb..84b95c744ef7 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-737_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-737_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-775_P100-1996.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-775_P100-1996.cnv index 52377a051779..0a90400e78b8 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-775_P100-1996.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-775_P100-1996.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-803_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-803_P100-1999.cnv index e267835cd041..9560f48c0b06 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-803_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-803_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-813_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-813_P100-1995.cnv index 7666743ab541..2297037065a2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-813_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-813_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-838_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-838_P100-1995.cnv index 4459174e5f3c..3557efcd495b 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-838_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-838_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-8482_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-8482_P100-1999.cnv index 7dcd65a77d4e..04fe8a2dd1a1 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-8482_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-8482_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-850_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-850_P100-1995.cnv index fd7461c6ae92..ea1c1af27aaa 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-850_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-850_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-851_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-851_P100-1995.cnv index 5b682b105499..9be7f208c3c4 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-851_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-851_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-852_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-852_P100-1995.cnv index 5992c0c21924..00ed260be066 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-852_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-852_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-855_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-855_P100-1995.cnv index c8aa336faf98..cf17d8e9c029 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-855_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-855_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-856_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-856_P100-1995.cnv index 7475193e9b4c..7d351b9c0b3f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-856_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-856_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-857_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-857_P100-1995.cnv index f25297cf925c..4abd6b0d481f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-857_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-857_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-858_P100-1997.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-858_P100-1997.cnv index ef1384cd8ab1..77daad3959f1 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-858_P100-1997.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-858_P100-1997.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-860_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-860_P100-1995.cnv index 8c0e9ad815b8..1b0d561afa9d 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-860_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-860_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-861_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-861_P100-1995.cnv index ecc1e276ffe3..431bcefefb1e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-861_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-861_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-862_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-862_P100-1995.cnv index 21914f8417ac..1b6b27024c4b 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-862_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-862_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-863_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-863_P100-1995.cnv index 864c238c7ec5..67ed644f5af6 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-863_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-863_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-864_X110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-864_X110-1999.cnv index e51a9089d10c..236bd3f095c8 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-864_X110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-864_X110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-865_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-865_P100-1995.cnv index 5dd4a1e2f99f..f5b57c6e902a 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-865_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-865_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-866_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-866_P100-1995.cnv index dd100e4dcb75..7beaa6a15730 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-866_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-866_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-867_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-867_P100-1998.cnv index b2572f902f08..4378203b1c14 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-867_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-867_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-868_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-868_P100-1995.cnv index fb6a6ef65c2f..ed7a27ed2b65 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-868_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-868_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-869_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-869_P100-1995.cnv index 40bbc5afc3eb..4033861239c8 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-869_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-869_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-870_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-870_P100-1995.cnv index f83b7d30ca0a..b9600232c005 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-870_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-870_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-871_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-871_P100-1995.cnv index f61f49c1f5bf..119c4028707e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-871_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-871_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-874_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-874_P100-1995.cnv index 56435eeff424..a46d589600fa 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-874_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-874_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-875_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-875_P100-1995.cnv index 2f69cbc6f1e4..00b3c34ff096 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-875_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-875_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-878_P100-1996.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-878_P100-1996.cnv index ff516633b608..e54cb213b44f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-878_P100-1996.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-878_P100-1996.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9005_X110-2007.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9005_X110-2007.cnv index aeefe0c046b6..2e7c0fbce67f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9005_X110-2007.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9005_X110-2007.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-901_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-901_P100-1999.cnv index 5f7c266f1a9b..8e265062bda2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-901_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-901_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-902_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-902_P100-1999.cnv index 0a73d0a0a174..1c10314d93af 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-902_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-902_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9067_X100-2005.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9067_X100-2005.cnv index a44c8d6e9137..87a1f55cae55 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9067_X100-2005.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9067_X100-2005.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-912_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-912_P100-1995.cnv index 65150ee04be7..77458895f542 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-912_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-912_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-913_P100-2000.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-913_P100-2000.cnv index 5f1e363a06a0..217ba253af61 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-913_P100-2000.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-913_P100-2000.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-914_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-914_P100-1995.cnv index f15726589fc0..9b32113dd60a 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-914_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-914_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-915_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-915_P100-1995.cnv index 4235ff9a0361..a3ec4cbbbc7a 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-915_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-915_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-916_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-916_P100-1995.cnv index 89599314c706..d350ca1e44c0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-916_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-916_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-918_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-918_P100-1995.cnv index c34e1090de21..5f45bca62f4f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-918_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-918_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-920_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-920_P100-1995.cnv index 0fa2d890fca0..fae6c12f827f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-920_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-920_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-921_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-921_P100-1995.cnv index 84a9025fffe6..2b80aae98c80 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-921_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-921_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-922_P100-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-922_P100-1999.cnv index cf5025c7a3fd..4794cf831828 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-922_P100-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-922_P100-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-923_P100-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-923_P100-1998.cnv index 48b78178aead..dc8405f96c72 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-923_P100-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-923_P100-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-930_P120-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-930_P120-1999.cnv index a93193e07681..d1f3eff4a022 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-930_P120-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-930_P120-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-933_P110-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-933_P110-1995.cnv index 996f9b6e4b5d..a03d2b1220b9 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-933_P110-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-933_P110-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-935_P110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-935_P110-1999.cnv index 5229a4b65466..1fc72aebe813 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-935_P110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-935_P110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-937_P110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-937_P110-1999.cnv index e42fd9c5d594..55a2c9543690 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-937_P110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-937_P110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-939_P120-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-939_P120-1999.cnv index 469dfeaa51e9..a89724359bbf 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-939_P120-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-939_P120-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-942_P12A-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-942_P12A-1999.cnv index 7dc2dfe1e22c..a42a15e3abfa 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-942_P12A-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-942_P12A-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P130-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P130-1999.cnv index 6105ec4bc441..0a18803962b9 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P130-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P130-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P15A-2003.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P15A-2003.cnv index b3ac7fd56eb2..991c9d9c9002 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P15A-2003.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-943_P15A-2003.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9447_P100-2002.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9447_P100-2002.cnv index 40938ce1c1ad..399670c154be 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9447_P100-2002.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9447_P100-2002.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9448_X100-2005.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9448_X100-2005.cnv index 75b85df8982d..cd9dbe703a20 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9448_X100-2005.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9448_X100-2005.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9449_P100-2002.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9449_P100-2002.cnv index 9e1ab129d672..194243b6cbea 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9449_P100-2002.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-9449_P100-2002.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P110-1999.cnv index 00431f63f624..278324377a3f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P11A-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P11A-1999.cnv index 26a97093d17a..80e3c40eb381 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P11A-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-949_P11A-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-950_P110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-950_P110-1999.cnv index ca7a06e6d477..0714c6235840 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-950_P110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-950_P110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-954_P101-2007.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-954_P101-2007.cnv index 73d4cd70f0aa..63e3e49de1ec 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-954_P101-2007.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-954_P101-2007.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-964_P110-1999.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-964_P110-1999.cnv index 8935c7e8bb66..778a5757c750 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-964_P110-1999.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-964_P110-1999.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-970_P110_P110-2006_U2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-970_P110_P110-2006_U2.cnv index 85b401900bd4..f09aed2413f6 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-970_P110_P110-2006_U2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-970_P110_P110-2006_U2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-971_P100-1995.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-971_P100-1995.cnv index 668ac26cd5c0..04c13f1540bf 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-971_P100-1995.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/ibm-971_P100-1995.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-25546.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-25546.cnv index 26af0d69fbf4..17689bfbca64 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-25546.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-25546.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d1.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d1.cnv index e7dfb3c0c74b..e928f5cba2ef 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d1.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d1.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d2.cnv index 929ab9fce442..44387df4b080 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d3.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d3.cnv index aaa0cda2ab79..734655297ba6 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d3.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d3.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d4.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d4.cnv index 0b4931467097..16ff915fa553 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d4.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d4.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d5.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d5.cnv index a7e9e2df936b..4d140c1a1f65 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d5.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d5.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d6.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d6.cnv index 7ab09886ef67..22a81f63c382 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d6.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d6.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d7.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d7.cnv index ebf3cf867a69..665875ed64e2 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d7.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-d7.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s1.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s1.cnv index 39346c95d2ab..330914fe7951 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s1.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s1.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s2.cnv index d454c155cb2e..34627b855426 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s3.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s3.cnv index c8883c85b6c4..bd628161d832 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s3.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-s3.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-t.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-t.cnv index b5677714cdee..c6f107b91021 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-t.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/icu-internal-compound-t.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_10-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_10-1998.cnv index 511bfba673ff..a7d161cb373e 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_10-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_10-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_11-2001.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_11-2001.cnv index fae5c1b3da22..3895fda325d0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_11-2001.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_11-2001.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_14-1998.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_14-1998.cnv index 5571019a6b70..7c6288d20f26 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_14-1998.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-8859_14-1998.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-ir-165.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-ir-165.cnv index 5046681f68ee..84f0a47fa1ec 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-ir-165.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/iso-ir-165.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/jisx-212.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/jisx-212.cnv index 0d000b3b7b91..fe07c7f4e7c1 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/jisx-212.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/jisx-212.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/lmb-excp.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/lmb-excp.cnv index 8303291adea0..79c240e26c1f 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/lmb-excp.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/lmb-excp.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-0_2-10.2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-0_2-10.2.cnv index 0b67c8f447cf..ed42e9149661 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-0_2-10.2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-0_2-10.2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-29-10.2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-29-10.2.cnv index 88a5c578b81b..7583e0f97ab4 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-29-10.2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-29-10.2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-35-10.2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-35-10.2.cnv index 6dc067ab005e..26bf670304d8 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-35-10.2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-35-10.2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-6_2-10.4.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-6_2-10.4.cnv index e85dbf670819..1f76deb5aaa0 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-6_2-10.4.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-6_2-10.4.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-7_3-10.2.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-7_3-10.2.cnv index 6d1773ac410c..ccd26f1bb3bb 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-7_3-10.2.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/macos-7_3-10.2.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-874-2000.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-874-2000.cnv index c580c5a0bf57..710a643f7891 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-874-2000.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-874-2000.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-936-2000.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-936-2000.cnv index 344ed957ef78..85bc9ae2ab5a 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-936-2000.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-936-2000.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-949-2000.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-949-2000.cnv index 66801f13ce6f..1b2726a65f04 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-949-2000.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-949-2000.cnv differ diff --git a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-950-2000.cnv b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-950-2000.cnv index de11db17c708..2d47a0f4dd0a 100644 Binary files a/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-950-2000.cnv and b/icu4j/main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/windows-950-2000.cnv differ diff --git a/icu4j/main/charset/src/test/java/com/ibm/icu/dev/test/charset/TestCharset.java b/icu4j/main/charset/src/test/java/com/ibm/icu/dev/test/charset/TestCharset.java index 1f9fc626169e..cee61a058e1d 100644 --- a/icu4j/main/charset/src/test/java/com/ibm/icu/dev/test/charset/TestCharset.java +++ b/icu4j/main/charset/src/test/java/com/ibm/icu/dev/test/charset/TestCharset.java @@ -5818,7 +5818,8 @@ public void TestBufferOverflowErrorUsingJavagetBytes() { String testCase = "\u7d42"; try { - testCase.getBytes(charsetName); + // We don't expect any particular value. + var unused = testCase.getBytes(charsetName); } catch (Exception ex) { errln("Error calling getBytes(): " + ex); } diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/af.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/af.res index 166fabcd89c4..f65d6f52af18 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/af.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/af.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/am.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/am.res index 65f64be79471..d66b290d40fa 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/am.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/am.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ar.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ar.res index 31e06c9c4c46..42229eaf5822 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ar.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ar.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/as.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/as.res index 5b8b85a8b2ee..05c9ef845d38 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/as.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/as.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/az.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/az.res index fe11b8b228a4..d8633a16d828 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/az.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/az.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/be.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/be.res index 3bb48ea8d0ad..0f58a6452045 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/be.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/be.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bg.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bg.res index 9e7f7a6077d0..f90056521c2b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bg.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bg.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/blo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/blo.res new file mode 100644 index 000000000000..fc42c477422e Binary files /dev/null and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/blo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bn.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bn.res index 4eba4948ca6d..d16dedc1620e 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bn.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bn.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bo.res index 44883a997b90..f915fa112362 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bo.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/br.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/br.res index 1c1def489dcc..e8fb9692ebaf 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/br.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/br.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs.res index 47bc4d5150e3..b313cebf2f45 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs_Cyrl.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs_Cyrl.res index 54196e164f68..466f8bfe043c 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs_Cyrl.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/bs_Cyrl.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ca.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ca.res index b930a7e2224f..1931d3625609 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ca.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ca.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ceb.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ceb.res index 7f931755e3b4..7ea7b130efe7 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ceb.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ceb.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/chr.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/chr.res index 7ae5b39397ab..429b33daacbb 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/chr.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/chr.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cs.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cs.res index 7fd9a5ef0f8b..44957cae377e 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cs.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cs.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cy.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cy.res index a625d93a5b26..068d8c0a5433 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cy.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/cy.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/da.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/da.res index c27812c5afec..246e537d5c2a 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/da.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/da.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de.res index 9ffd2a84d7ba..6843f4836f8e 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de_AT.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de_AT.res index f8f8ab6b0cc4..0a4aa2a9db79 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de_AT.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/de_AT.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/dsb.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/dsb.res index 825a6e98b5be..f43a7dde522d 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/dsb.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/dsb.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ee.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ee.res index 5dd95f3c89ac..f3e4aa71b204 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ee.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ee.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/el.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/el.res index aeee680fe224..88ae9e392cc0 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/el.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/el.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/en_US_POSIX.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/en_US_POSIX.res index 43524f825e7d..218199a02a36 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/en_US_POSIX.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/en_US_POSIX.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/eo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/eo.res index 9933bd814ce4..1ff0fcb75f7c 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/eo.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/eo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/es.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/es.res index 9aadb104d005..dd9adb1689cc 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/es.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/es.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/et.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/et.res index a6ebcf8d912a..b255fa20ef2c 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/et.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/et.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa.res index ef17ce1a1c0f..798fa6a5c2bd 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa_AF.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa_AF.res index 1e29dcc92760..04303c6ad2cd 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa_AF.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fa_AF.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ff_Adlm.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ff_Adlm.res index 5d5ab4b821a9..53d53019ea0c 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ff_Adlm.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ff_Adlm.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fi.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fi.res index 2280e43ee70f..bbe0bf2b40e4 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fi.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fi.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fil.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fil.res index 7f931755e3b4..7ea7b130efe7 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fil.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fil.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fo.res index d81db229d207..9c2f9cedd64a 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fo.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fr_CA.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fr_CA.res index e0a18bf6f987..c85a4f36b5c8 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fr_CA.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fr_CA.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fy.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fy.res index 2db26d34c484..5824a8c41f20 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fy.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/fy.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gl.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gl.res index 32d291ea3c50..5b6d4e1ccff5 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gl.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gl.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gu.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gu.res index c3dab6cc5568..ad9e00287065 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gu.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/gu.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ha.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ha.res index 6b125195b931..1e0ff1810b6f 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ha.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ha.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/haw.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/haw.res index fed65b7a5212..ab123cc46456 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/haw.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/haw.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/he.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/he.res index 25703f6f5384..a4ca3805c39b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/he.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/he.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hi.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hi.res index 7e1a17b37fc2..800b49b6ea6b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hi.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hi.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hr.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hr.res index 6315693d1c98..1f6dbcdc4602 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hr.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hr.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hsb.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hsb.res index e954392344fb..1af62ad8f538 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hsb.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hsb.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hu.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hu.res index a7133e3d855b..17dc05dbca3a 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hu.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hu.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hy.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hy.res index 6a173c983cdf..c4c71b8f194c 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hy.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/hy.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ig.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ig.res index 50079f54ca20..6368ad8a130f 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ig.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ig.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/is.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/is.res index d0df45124cdc..8e66e77a7c21 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/is.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/is.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ja.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ja.res index ed9a6075fa98..f8792e006ed3 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ja.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ja.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ka.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ka.res index 9ef857f70604..f02db6b312a8 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ka.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ka.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kk.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kk.res index 27a4168d81f9..c624db819267 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kk.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kk.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kl.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kl.res index 3614d015a9b0..ae29d51b4b9f 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kl.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kl.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/km.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/km.res index a3696f1f7acc..47338c04c89e 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/km.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/km.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kn.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kn.res index b5ec2dd2cea5..158241014c2b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kn.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kn.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ko.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ko.res index b14e2fc3ecd1..591a3191c275 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ko.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ko.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kok.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kok.res index bf8b51756bf9..b0bb0f44522a 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kok.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/kok.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ku.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ku.res index 555b9018eb30..fedfd233d9a2 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ku.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ku.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ky.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ky.res index ab13d2fda590..0b8ae23b06f0 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ky.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ky.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lkt.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lkt.res index 61554a515d81..ad98260f940b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lkt.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lkt.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ln.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ln.res index bbdaaf4d26f0..5aed4ae3dcec 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ln.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ln.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lo.res index b003a37fdec6..71ef861f8e99 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lo.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lt.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lt.res index e2b156f21c54..10105daad7d7 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lt.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lt.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lv.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lv.res index f7a29e4372c0..c7a9edbafa86 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lv.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/lv.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mk.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mk.res index 6e6dc0004207..2d0da0ee52df 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mk.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mk.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ml.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ml.res index 5fbd922ab3d5..252cf5737bc4 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ml.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ml.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mn.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mn.res index 889ef06ad0e9..e9f55126b871 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mn.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mn.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mr.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mr.res index 91a61b510429..f0b02e0859fd 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mr.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mr.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mt.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mt.res index a3cf75b67945..426f544c9002 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mt.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/mt.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/my.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/my.res index 441062f47af6..5bba34e30f6a 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/my.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/my.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ne.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ne.res index b672607e21f0..e68c5fc7a94a 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ne.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ne.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/no.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/no.res index c61cede1981e..cf268704bea4 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/no.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/no.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/nso.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/nso.res index e59eb418e9ce..a227f2baced7 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/nso.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/nso.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/om.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/om.res index fa49c8aa14f3..8f77f5f31261 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/om.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/om.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/or.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/or.res index 185be92c2526..e131d87e5ba1 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/or.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/or.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pa.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pa.res index 9442ea0da1ee..cd8687a89765 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pa.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pa.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pl.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pl.res index ad3d69d6cc23..a3f6f5b11ea7 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pl.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/pl.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ps.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ps.res index 6f9c986776c6..57ea37e8fea1 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ps.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ps.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/res_index.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/res_index.res index c22c881faa7b..aa7f107ce73d 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/res_index.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/res_index.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ro.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ro.res index 7bf8527f1280..81ee4c07a75b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ro.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ro.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/root.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/root.res index c55ad6c6f1f6..33ebafbe2cbb 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/root.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/root.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ru.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ru.res index 9e7f7a6077d0..f90056521c2b 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ru.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ru.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/se.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/se.res index 330cafe4e19e..cfbb6a2122e4 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/se.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/se.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/si.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/si.res index cc71c9a8b060..c4e43ae0ea86 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/si.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/si.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sk.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sk.res index 268de7e9d0af..82d624f987da 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sk.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sk.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sl.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sl.res index 94f6fd375ccc..fc2d7dce7e14 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sl.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sl.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/smn.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/smn.res index bc7c5f86a847..521272d4428c 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/smn.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/smn.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sq.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sq.res index 555091811441..b2c70c5952af 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sq.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sq.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr.res index ef0b69721f33..7cca9a9d0bcd 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr_Latn.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr_Latn.res index 47bc4d5150e3..b313cebf2f45 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr_Latn.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sr_Latn.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sv.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sv.res index cd5b0884f87d..ffd8c2e034d2 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sv.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/sv.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ta.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ta.res index 715cdb5e42fa..1f64c258d5c2 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ta.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ta.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/te.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/te.res index a0e8d5a5e69f..d11df86dd7d9 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/te.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/te.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/th.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/th.res index 441b12d191e7..447ac1525419 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/th.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/th.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tk.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tk.res index f689b4fd4930..f92241a8ab9f 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tk.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tk.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tn.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tn.res index e59eb418e9ce..a227f2baced7 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tn.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tn.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/to.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/to.res index 1237948a4a0e..632fed50fa95 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/to.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/to.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tr.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tr.res index b8ee3f6273bb..9460bac32287 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tr.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/tr.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ug.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ug.res index a628319e2e71..f313e5c7e9b8 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ug.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ug.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uk.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uk.res index e97be3c6dbf3..d24c60ef63fa 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uk.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uk.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ur.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ur.res index 228a8fd54cf4..bb82d34d3d1d 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ur.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/ur.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uz.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uz.res index dc0bb0d0167b..7ae3a68b4e56 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uz.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/uz.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/vi.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/vi.res index aacc9ccbfd60..76551e0b6c68 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/vi.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/vi.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/wo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/wo.res index 95048c646d50..ff4d25a286be 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/wo.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/wo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yi.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yi.res index c4f3371ac22d..9915330228bb 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yi.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yi.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yo.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yo.res index 4e6e25be296c..6d3bce3dabdb 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yo.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/yo.res differ diff --git a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/zh.res b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/zh.res index 52bbd98eb045..bacd0578c66e 100644 Binary files a/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/zh.res and b/icu4j/main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll/zh.res differ diff --git a/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationAPITest.java b/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationAPITest.java index 662a353df53b..7f1d9d01c416 100644 --- a/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationAPITest.java +++ b/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationAPITest.java @@ -313,7 +313,7 @@ public void TestElemIter() { // Code coverage for dummy "not designed" hashCode() which does "assert false". try { - iterator1.hashCode(); // We don't expect any particular value. + var unused = iterator1.hashCode(); // We don't expect any particular value. } catch (AssertionError ignored) { // Expected to be thrown if assertions are enabled. } diff --git a/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasCollationTest.java b/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasCollationTest.java deleted file mode 100644 index b9428743a321..000000000000 --- a/icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasCollationTest.java +++ /dev/null @@ -1,78 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -/* - ******************************************************************************* - * Copyright (C) 2009, International Business Machines Corporation and * - * others. All Rights Reserved. * - ******************************************************************************* - */ - -package com.ibm.icu.dev.test.util; - -import java.util.HashMap; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import com.ibm.icu.text.Collator; -import com.ibm.icu.util.ULocale; - -@RunWith(JUnit4.class) -public class LocaleAliasCollationTest extends com.ibm.icu.dev.test.TestFmwk { - private static final ULocale[][] _LOCALES = { - {new ULocale("en", "RH"), new ULocale("en", "ZW")}, - {new ULocale("in"), new ULocale("id")}, - {new ULocale("in", "ID"), new ULocale("id", "ID")}, - {new ULocale("iw"), new ULocale("he")}, - {new ULocale("iw", "IL"), new ULocale("he", "IL")}, - {new ULocale("ji"), new ULocale("yi")}, - - {new ULocale("en", "BU"), new ULocale("en", "MM")}, - {new ULocale("en", "DY"), new ULocale("en", "BJ")}, - {new ULocale("en", "HV"), new ULocale("en", "BF")}, - {new ULocale("en", "NH"), new ULocale("en", "VU")}, - {new ULocale("en", "TP"), new ULocale("en", "TL")}, - {new ULocale("en", "ZR"), new ULocale("en", "CD")} - }; - - private static final int _LOCALE_NUMBER = _LOCALES.length; - private ULocale[] available = null; - private HashMap availableMap = new HashMap<>(); - private static final ULocale _DEFAULT_LOCALE = ULocale.US; - - public LocaleAliasCollationTest() { - } - - @Before - public void init() { - available = ULocale.getAvailableLocales(); - for(int i=0; i other) { } } - private static final HashSet DRAFT_VERSION_SET = new HashSet<>(); + private static final Set DRAFT_VERSION_SET = Set.of("76", "77", "78"); - private static final HashSet TIME_CODES = new HashSet<>(); + private static final Set TIME_CODES = + Set.of("year", "month", "week", "day", "hour", "minute", "second"); private static final String[][] JAVA_VERSIONS = { {"G_FORCE", "53"}, @@ -162,7 +163,7 @@ public int compareTo(OrderedPair other) { {"PARSEC", "54"}, {"LUX", "54"}, {"CARAT", "54"}, - {"METRIC_TON", "54"}, + {"METRIC_TON", "54"}, // renamed to tonne in ICU 72, deprecated in 78 {"MICROGRAM", "54"}, {"MILLIGRAM", "54"}, {"OUNCE_TROY", "54"}, @@ -202,9 +203,9 @@ public int compareTo(OrderedPair other) { {"KNOT", "56"}, {"CUP_METRIC", "56"}, {"PINT_METRIC", "56"}, - {"MILLIGRAM_PER_DECILITER", "57"}, + {"MILLIGRAM_PER_DECILITER", "57"}, // renamed to milligram-ofglucose-per-deciliter in ICU 69 {"MILLIMOLE_PER_LITER", "57"}, - {"PART_PER_MILLION", "57"}, + {"PART_PER_MILLION", "57"}, // renamed to part-per-1e6 in ICU 78 {"MILE_PER_GALLON_IMPERIAL", "57"}, {"GALLON_IMPERIAL", "57"}, {"POINT", "59"}, @@ -264,9 +265,53 @@ public int compareTo(OrderedPair other) { {"TONNE", "72"}, {"BEAUFORT", "73"}, {"GASOLINE_ENERGY_DENSITY", "74"}, - {"PORTION_PER_1E9", "77"}, - {"NIGHT", "77"}, - {"LIGHT_SPEED", "77"}, + {"NIGHT", "76"}, + {"LIGHT_SPEED", "76"}, + {"STERADIAN", "78"}, + {"BU_JP", "78"}, + {"CHO", "78"}, + {"SE_JP", "78"}, + {"KATAL", "78"}, + {"OFGLUCOSE", "78"}, + {"PART", "78"}, + {"PART_PER_1E6", "78"}, + {"PART_PER_1E9", "78"}, + {"FORTNIGHT", "78"}, + {"COULOMB", "78"}, + {"FARAD", "78"}, + {"HENRY", "78"}, + {"SIEMENS", "78"}, + {"BECQUEREL", "78"}, + {"BRITISH_THERMAL_UNIT_IT", "78"}, + {"CALORIE_IT", "78"}, + {"GRAY", "78"}, + {"SIEVERT", "78"}, + {"KILOGRAM_FORCE", "78"}, + {"CHAIN", "78"}, + {"JO_JP", "78"}, + {"KEN", "78"}, + {"RI_JP", "78"}, + {"RIN", "78"}, + {"ROD", "78"}, + {"SHAKU_CLOTH", "78"}, + {"SHAKU_LENGTH", "78"}, + {"SUN", "78"}, + {"TESLA", "78"}, + {"WEBER", "78"}, + {"FUN", "78"}, + {"SLUG", "78"}, + {"OFHG", "78"}, + {"RANKINE", "78"}, + {"CUP_IMPERIAL", "78"}, + {"CUP_JP", "78"}, + {"FLUID_OUNCE_METRIC", "78"}, + {"KOKU", "78"}, + {"KOSAJI", "78"}, + {"OSAJI", "78"}, + {"PINT_IMPERIAL", "78"}, + {"SAI", "78"}, + {"SHAKU", "78"}, + {"TO_JP", "78"}, }; private static final HashMap JAVA_VERSION_MAP = new HashMap<>(); @@ -276,13 +321,6 @@ public int compareTo(OrderedPair other) { private static final Map CLDR_NAME_REMAP = new HashMap<>(); static { - TIME_CODES.add("year"); - TIME_CODES.add("month"); - TIME_CODES.add("week"); - TIME_CODES.add("day"); - TIME_CODES.add("hour"); - TIME_CODES.add("minute"); - TIME_CODES.add("second"); for (String[] funcNameAndVersion : JAVA_VERSIONS) { JAVA_VERSION_MAP.put(funcNameAndVersion[0], funcNameAndVersion[1]); } @@ -420,11 +458,19 @@ private static void generateCXXHConstants(String thisVersion) throws IOException out.println("#endif /* U_HIDE_DRAFT_API */"); } out.println(""); - // Hack: METRIC-TON unit changed its name from "metric-ton" to "tonne" - // In order to preserve the existing APIs for "metric-ton" we need to - // add those APIs manually - if (name.equals("Tonne")) { - addCXXHForMetricTon(out); + // Add corresponding backward-compatibility API if there is one + switch (name) { + case "MilligramOfglucosePerDeciliter": + addCXXHForMilligramPerDeciliter(out); + break; + case "PartPer1E6": + addCXXHForPartPerMillion(out); + break; + case "Tonne": + addCXXHForMetricTon(out); + break; + default: + break; } } } @@ -432,32 +478,75 @@ private static void generateCXXHConstants(String thisVersion) throws IOException } } - // Add the headers for "metric-ton" - // The tool won't create them any more + // Add backward compatibility header for "milligram-per-deciliter" + private static void addCXXHForMilligramPerDeciliter(PrintStream out) { + out.println(" /**"); + out.println(" * Returns by pointer, unit of concentr: milligram-per-deciliter."); + out.println(" * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69)."); + out.println(" * Caller owns returned value and must free it."); + out.println(" * Also see {@link #createMilligramOfglucosePerDeciliter()}."); + out.println(" * Also see {@link #getMilligramPerDeciliter()}."); + out.println(" * @param status ICU error code."); + out.println(" * @stable ICU 57"); + out.println(" */"); + out.println(" static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status);"); + out.println(""); + out.println(" /**"); + out.println(" * Returns by value, unit of concentr: milligram-per-deciliter."); + out.println(" * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69)."); + out.println(" * Also see {@link #getMilligramOfglucosePerDeciliter()}."); + out.println(" * Also see {@link #createMilligramPerDeciliter()}."); + out.println(" * @stable ICU 64"); + out.println(" */"); + out.println(" static MeasureUnit getMilligramPerDeciliter();"); + out.println(""); + } + + // Add backward compatibility header for "part-per-million" + private static void addCXXHForPartPerMillion(PrintStream out) { + out.println(" /**"); + out.println(" * Returns by pointer, unit of concentr: part-per-million."); + out.println(" * (renamed to part-per-1e6 in CLDR 48 / ICU 78)."); + out.println(" * Caller owns returned value and must free it."); + out.println(" * Also see {@link #createPartPer1E6()}."); + out.println(" * Also see {@link #getPartPerMillion()}."); + out.println(" * @param status ICU error code."); + out.println(" * @stable ICU 57"); + out.println(" */"); + out.println(" static MeasureUnit *createPartPerMillion(UErrorCode &status);"); + out.println(""); + out.println(" /**"); + out.println(" * Returns by value, unit of concentr: part-per-million."); + out.println(" * (renamed to part-per-1e6 in CLDR 48 / ICU 78)."); + out.println(" * Also see {@link #getPartPer1E6()}."); + out.println(" * Also see {@link #createPartPerMillion()}."); + out.println(" * @stable ICU 64"); + out.println(" */"); + out.println(" static MeasureUnit getPartPerMillion();"); + out.println(""); + } + + // Add backward compatibility header for "metric-ton" private static void addCXXHForMetricTon(PrintStream out) { + out.println("#ifndef U_HIDE_DEPRECATED_API"); out.println(" /**"); out.println(" * Returns by pointer, unit of mass: metric-ton"); out.println(" * (renamed to tonne in CLDR 42 / ICU 72)."); out.println(" * Caller owns returned value and must free it."); - out.println(" * Note: In ICU 74 this will be deprecated in favor of"); - out.println(" * createTonne(), which is currently draft but will"); - out.println(" * become stable in ICU 74, and which uses the preferred naming."); out.println(" * Also see {@link #getMetricTon()} and {@link #createTonne()}."); out.println(" * @param status ICU error code."); - out.println(" * @stable ICU 54"); + out.println(" * @deprecated ICU 78 use createTonne(UErrorCode &status)"); out.println(" */"); out.println(" static MeasureUnit *createMetricTon(UErrorCode &status);"); out.println(""); out.println(" /**"); out.println(" * Returns by value, unit of mass: metric-ton"); out.println(" * (renamed to tonne in CLDR 42 / ICU 72)."); - out.println(" * Note: In ICU 74 this will be deprecated in favor of"); - out.println(" * getTonne(), which is currently draft but will"); - out.println(" * become stable in ICU 74, and which uses the preferred naming."); out.println(" * Also see {@link #createMetricTon()} and {@link #getTonne()}."); - out.println(" * @stable ICU 64"); + out.println(" * @deprecated ICU 78 use getTonne()"); out.println(" */"); out.println(" static MeasureUnit getMetricTon();"); + out.println("#endif /* U_HIDE_DEPRECATED_API */"); out.println(""); } @@ -630,11 +719,19 @@ private static void generateCXXConstants() throws IOException { typeSubType.first, typeSubType.second); out.println("}"); out.println(); - // Hack: METRIC-TON unit changed its name from "metric-ton" to "tonne" - // In order to preserve the existing APIs for "metric-ton" we need to - // add those APIs manually - if (name.equals("Tonne")) { - addCXXForMetricTon(typeSubType, out); + // Add entry for corresponding backward-compatibility API if there is one + switch (name) { + case "MilligramOfglucosePerDeciliter": + addCXXForBackwardCompatibility(out, "MilligramPerDeciliter", typeSubType); + break; + case "PartPer1E6": + addCXXForBackwardCompatibility(out, "PartPerMillion", typeSubType); + break; + case "Tonne": + addCXXForBackwardCompatibility(out, "MetricTon", typeSubType); + break; + default: + break; } } } @@ -644,8 +741,7 @@ private static void generateCXXConstants() throws IOException { // Add the API skeletons for "metric-ton" // The tool won't create them any more - private static void addCXXForMetricTon(Pair typeSubType, PrintStream out) { - String name = "MetricTon"; + private static void addCXXForBackwardCompatibility(PrintStream out, String name, Pair typeSubType) { out.printf("MeasureUnit *MeasureUnit::create%s(UErrorCode &status) {\n", name); out.printf(" return MeasureUnit::create(%d, %d, status);\n", typeSubType.first, typeSubType.second); @@ -709,6 +805,23 @@ private static void generateBackwardCompatibilityTest(String version) throws IOE checkForDup(seen, javaName, unit); out.printf(" MeasureUnit.%s,\n", javaName); count++; + // Add corresponding backward-compatibility API if there is one + switch (javaName) { + case "MILLIGRAM_OFGLUCOSE_PER_DECILITER": + addBackwardCompatibilityEntry(out, "MILLIGRAM_PER_DECILITER"); + count++; + break; + case "PART_PER_1E6": + addBackwardCompatibilityEntry(out, "PART_PER_MILLION"); + count++; + break; + case "TONNE": + addBackwardCompatibilityEntry(out, "METRIC_TON"); + count++; + break; + default: + break; + } } } out.println(" };"); @@ -717,6 +830,10 @@ private static void generateBackwardCompatibilityTest(String version) throws IOE } } + private static void addBackwardCompatibilityEntry(PrintStream out, String javaName) { + out.printf(" MeasureUnit.%s, // backward compatibility API\n", javaName); + } + private static void generateCXXBackwardCompatibilityTest(String version) throws IOException { String fullOutputPath = "${icuroot}/icu4c/source/test/intltest/measfmttest.cpp"; try (PrintStream out = createAndStartOutputFile(fullOutputPath)) { @@ -736,6 +853,20 @@ private static void generateCXXBackwardCompatibilityTest(String version) throws checkForDup(seen, camelCase, unit); out.printf(" measureUnit.adoptInstead(MeasureUnit::create%s(status));\n", camelCase); out.printf(" measureUnitValue = MeasureUnit::get%s();\n", camelCase); + // Add corresponding backward-compatibility API if there is one + switch (camelCase) { + case "MilligramOfglucosePerDeciliter": + addCXXBackwardCompatibilityEntry(out, "MilligramPerDeciliter"); + break; + case "PartPer1E6": + addCXXBackwardCompatibilityEntry(out, "PartPerMillion"); + break; + case "Tonne": + addCXXBackwardCompatibilityEntry(out, "MetricTon"); + break; + default: + break; + } } } out.println(" assertSuccess(\"\", status);"); @@ -743,6 +874,11 @@ private static void generateCXXBackwardCompatibilityTest(String version) throws } } + private static void addCXXBackwardCompatibilityEntry(PrintStream out, String name) { + out.printf(" measureUnit.adoptInstead(MeasureUnit::create%s(status)); // backward compatibility API\n", name); + out.printf(" measureUnitValue = MeasureUnit::get%s(); // backward compatibility API\n", name); + } + private static String toJAVAName(MeasureUnit unit) { String code = unit.getSubtype(); String type = unit.getType(); @@ -805,12 +941,64 @@ else if (isDraft(name)) { "\");"); } out.println(); + // Add corresponding backward-compatibility API if there is one + switch (name) { + case "MILLIGRAM_OFGLUCOSE_PER_DECILITER": + addJavaForMilligramPerDeciliter(out, type, code); + break; + case "PART_PER_1E6": + addJavaForPartPerMillion(out, type, code); + break; + case "TONNE": + addJavaForMetricTon(out, type, code); + break; + default: + break; + } } } out.println(" // End generated MeasureUnit constants"); } } + // Add backward compatibility header for MILLIGRAM_PER_DECILITER + private static void addJavaForMilligramPerDeciliter(PrintStream out, String type, String code) { + out.println(" /**"); + out.println(" * Constant for unit of concentr: milligram-per-deciliter"); + out.println(" * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69)."); + out.println(" * @stable ICU 57"); + out.println(" */"); + out.println(" public static final MeasureUnit MILLIGRAM_PER_DECILITER = MeasureUnit.internalGetInstance(\"" + + type + "\", \"" + code + "\");"); + out.println(""); + } + + // Add backward compatibility header for PART_PER_MILLION + private static void addJavaForPartPerMillion(PrintStream out, String type, String code) { + out.println(" /**"); + out.println(" * Constant for unit of concentr: part-per-million"); + out.println(" * (renamed to part-per-1e6 in CLDR 48 / ICU 78)."); + out.println(" * @stable ICU 57"); + out.println(" */"); + out.println(" public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance(\"" + + type + "\", \"" + code + "\");"); + out.println(""); + } + + // Add backward compatibility header for METRIC_TON + private static void addJavaForMetricTon(PrintStream out, String type, String code) { + out.println(" /**"); + out.println(" * Constant for unit of mass: metric-ton"); + out.println(" * (renamed to tonne in CLDR 42 / ICU 72)."); + out.println(" * @internal"); + out.println(" * @deprecated This API is ICU internal only."); + out.println(" */"); + out.println(" @Deprecated"); + out.println(" public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance(\"" + + type + "\", \"" + code + "\");"); + out.println(""); + } + private static String getVersion(String javaName, String thisVersion) { String version = JAVA_VERSION_MAP.get(javaName); if (version == null) { diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java index 817e0ebad21d..bad0973f0b84 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java @@ -1330,61 +1330,61 @@ class ConstantDenominatorTestCase { List testCases = Arrays.asList( new ConstantDenominatorTestCase("meter-per-1000", 1000), new ConstantDenominatorTestCase("liter-per-1000-kiloliter", 1000), - new ConstantDenominatorTestCase("meter-per-100-kilometer", 100), + new ConstantDenominatorTestCase("meter-per-100-kilometer", 100), // Failing ICU-23045 new ConstantDenominatorTestCase("liter-per-kilometer", 0), new ConstantDenominatorTestCase("second-per-1000-minute", 1000), new ConstantDenominatorTestCase("gram-per-1000-kilogram", 1000), - new ConstantDenominatorTestCase("meter-per-100", 100), // Failing ICU-23045 - new ConstantDenominatorTestCase("portion-per-1", 1), - new ConstantDenominatorTestCase("portion-per-2", 2), - new ConstantDenominatorTestCase("portion-per-3", 3), - new ConstantDenominatorTestCase("portion-per-4", 4), - new ConstantDenominatorTestCase("portion-per-5", 5), - new ConstantDenominatorTestCase("portion-per-6", 6), - new ConstantDenominatorTestCase("portion-per-7", 7), - new ConstantDenominatorTestCase("portion-per-8", 8), - new ConstantDenominatorTestCase("portion-per-9", 9), + new ConstantDenominatorTestCase("meter-per-100", 100), + new ConstantDenominatorTestCase("part-per-1", 1), + new ConstantDenominatorTestCase("part-per-2", 2), + new ConstantDenominatorTestCase("part-per-3", 3), + new ConstantDenominatorTestCase("part-per-4", 4), + new ConstantDenominatorTestCase("part-per-5", 5), + new ConstantDenominatorTestCase("part-per-6", 6), + new ConstantDenominatorTestCase("part-per-7", 7), + new ConstantDenominatorTestCase("part-per-8", 8), + new ConstantDenominatorTestCase("part-per-9", 9), // Test for constant denominators that are powers of 10 - new ConstantDenominatorTestCase("portion-per-10", 10), - new ConstantDenominatorTestCase("portion-per-100", 100), - new ConstantDenominatorTestCase("portion-per-1000", 1000), - new ConstantDenominatorTestCase("portion-per-10000", 10000), - new ConstantDenominatorTestCase("portion-per-100000", 100000), - new ConstantDenominatorTestCase("portion-per-1000000", 1000000), - new ConstantDenominatorTestCase("portion-per-10000000", 10000000), - new ConstantDenominatorTestCase("portion-per-100000000", 100000000), - new ConstantDenominatorTestCase("portion-per-1000000000", 1000000000), // Failing ICU-23045 - new ConstantDenominatorTestCase("portion-per-10000000000", 10000000000L), - new ConstantDenominatorTestCase("portion-per-100000000000", 100000000000L), - new ConstantDenominatorTestCase("portion-per-1000000000000", 1000000000000L), - new ConstantDenominatorTestCase("portion-per-10000000000000", 10000000000000L), - new ConstantDenominatorTestCase("portion-per-100000000000000", 100000000000000L), - new ConstantDenominatorTestCase("portion-per-1000000000000000", 1000000000000000L), - new ConstantDenominatorTestCase("portion-per-10000000000000000", 10000000000000000L), - new ConstantDenominatorTestCase("portion-per-100000000000000000", 100000000000000000L), - new ConstantDenominatorTestCase("portion-per-1000000000000000000", 1000000000000000000L), - new ConstantDenominatorTestCase("portion-per-1e3-kilometer", 1000), + new ConstantDenominatorTestCase("part-per-10", 10), + new ConstantDenominatorTestCase("part-per-100", 100), + new ConstantDenominatorTestCase("part-per-1000", 1000), + new ConstantDenominatorTestCase("part-per-10000", 10000), + new ConstantDenominatorTestCase("part-per-100000", 100000), + new ConstantDenominatorTestCase("part-per-1000000", 1000000), // Failing ICU-23045 + new ConstantDenominatorTestCase("part-per-10000000", 10000000), + new ConstantDenominatorTestCase("part-per-100000000", 100000000), + new ConstantDenominatorTestCase("part-per-1000000000", 1000000000), // Failing ICU-23045 + new ConstantDenominatorTestCase("part-per-10000000000", 10000000000L), + new ConstantDenominatorTestCase("part-per-100000000000", 100000000000L), + new ConstantDenominatorTestCase("part-per-1000000000000", 1000000000000L), + new ConstantDenominatorTestCase("part-per-10000000000000", 10000000000000L), + new ConstantDenominatorTestCase("part-per-100000000000000", 100000000000000L), + new ConstantDenominatorTestCase("part-per-1000000000000000", 1000000000000000L), + new ConstantDenominatorTestCase("part-per-10000000000000000", 10000000000000000L), + new ConstantDenominatorTestCase("part-per-100000000000000000", 100000000000000000L), + new ConstantDenominatorTestCase("part-per-1000000000000000000", 1000000000000000000L), + new ConstantDenominatorTestCase("part-per-1e3-kilometer", 1000), // Test for constant denominators that are represented as scientific notation numbers. - new ConstantDenominatorTestCase("portion-per-1e1", 10), - new ConstantDenominatorTestCase("portion-per-1E1", 10), - new ConstantDenominatorTestCase("portion-per-1e2", 100), - new ConstantDenominatorTestCase("portion-per-1E2", 100), - new ConstantDenominatorTestCase("portion-per-1e3", 1000), - new ConstantDenominatorTestCase("portion-per-1E3", 1000), - new ConstantDenominatorTestCase("portion-per-1e4", 10000), - new ConstantDenominatorTestCase("portion-per-1E4", 10000), - new ConstantDenominatorTestCase("portion-per-1e5", 100000), - new ConstantDenominatorTestCase("portion-per-1E5", 100000), - new ConstantDenominatorTestCase("portion-per-1e6", 1000000), - new ConstantDenominatorTestCase("portion-per-1E6", 1000000), - new ConstantDenominatorTestCase("portion-per-1e9", 1000000000), // Failing ICU-23045 - new ConstantDenominatorTestCase("portion-per-1E9", 1000000000), // Failing ICU-23045 - new ConstantDenominatorTestCase("portion-per-1e10", 10000000000L), - new ConstantDenominatorTestCase("portion-per-1E10", 10000000000L), - new ConstantDenominatorTestCase("portion-per-1e18", 1000000000000000000L), - new ConstantDenominatorTestCase("portion-per-1E18", 1000000000000000000L), + new ConstantDenominatorTestCase("part-per-1e1", 10), + new ConstantDenominatorTestCase("part-per-1E1", 10), + new ConstantDenominatorTestCase("part-per-1e2", 100), + new ConstantDenominatorTestCase("part-per-1E2", 100), + new ConstantDenominatorTestCase("part-per-1e3", 1000), + new ConstantDenominatorTestCase("part-per-1E3", 1000), + new ConstantDenominatorTestCase("part-per-1e4", 10000), + new ConstantDenominatorTestCase("part-per-1E4", 10000), + new ConstantDenominatorTestCase("part-per-1e5", 100000), + new ConstantDenominatorTestCase("part-per-1E5", 100000), + new ConstantDenominatorTestCase("part-per-1e6", 1000000), // Failing ICU-23045 + new ConstantDenominatorTestCase("part-per-1E6", 1000000), // Failing ICU-23045 + new ConstantDenominatorTestCase("part-per-1e9", 1000000000), // Failing ICU-23045 + new ConstantDenominatorTestCase("part-per-1E9", 1000000000), // Failing ICU-23045 + new ConstantDenominatorTestCase("part-per-1e10", 10000000000L), + new ConstantDenominatorTestCase("part-per-1E10", 10000000000L), + new ConstantDenominatorTestCase("part-per-1e18", 1000000000000000000L), + new ConstantDenominatorTestCase("part-per-1E18", 1000000000000000000L), // Test for constant denominators that are randomly selected. new ConstantDenominatorTestCase("liter-per-12345-kilometer", 12345), @@ -1398,9 +1398,12 @@ class ConstantDenominatorTestCase { for (ConstantDenominatorTestCase testCase : testCases) { switch (testCase.identifier) { - case "portion-per-1000000000": - case "portion-per-1e9": - case "portion-per-1E9": + case "part-per-1000000": + case "part-per-1000000000": + case "part-per-1e6": + case "part-per-1E6": + case "part-per-1e9": + case "part-per-1E9": case "meter-per-100-kilometer": logKnownIssue("ICU-23045", "Incorrect constant denominator for certain unit identifiers"); continue; @@ -1590,10 +1593,10 @@ public void TestParseBuiltIns() { continue; } - if (unit.getIdentifier().equals("portion-per-1e9")) { - logKnownIssue("ICU-22781", "Handle concentr/perbillion in ICU"); - continue; - } + //if (unit.getIdentifier().equals("part-per-1e9")) { + // logKnownIssue("ICU-22781", "Handle concentr/perbillion in ICU"); + // continue; + //} // Prove that all built-in units are parseable, except "generic" temperature // (and for now, beaufort units) @@ -1630,7 +1633,6 @@ class TestCase { new TestCase("centimeter-centimeter", MeasureUnit.SQUARE_CENTIMETER), new TestCase("square-foot", MeasureUnit.SQUARE_FOOT), new TestCase("pow2-inch", MeasureUnit.SQUARE_INCH), - new TestCase("milligram-per-deciliter", MeasureUnit.MILLIGRAM_PER_DECILITER), new TestCase("pound-force-per-pow2-inch", MeasureUnit.POUND_PER_SQUARE_INCH), new TestCase("yard-pow2-yard", MeasureUnit.CUBIC_YARD), new TestCase("square-yard-yard", MeasureUnit.CUBIC_YARD), diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java index 8b61dadc4050..576daf3bc4b6 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -7154,25 +7154,25 @@ class TestCase { } TestCase[] testCases = { - new TestCase("portion-per-1e9", "en-US", 1, "1 part per billion"), - new TestCase("portion-per-1e9", "en-US", 2, "2 parts per billion"), - new TestCase("portion-per-1e9", "en-US", 1000000, "1,000,000 parts per billion"), - new TestCase("portion-per-1e9", "de-DE", 1000000, "1.000.000 Milliardstel"), - new TestCase("portion-per-1e1", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e2", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e3", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e4", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e5", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e6", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e7", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 - new TestCase("portion-per-1e8", "en-US", 1, "UNKNOWN"), // Failing CLDR-18274 + new TestCase("part-per-1e9", "en-US", 1, "1 part per billion"), + new TestCase("part-per-1e9", "en-US", 2, "2 parts per billion"), + new TestCase("part-per-1e9", "en-US", 1000000, "1,000,000 parts per billion"), + new TestCase("part-per-1e9", "de-DE", 1000000, "1.000.000 Milliardstel"), + new TestCase("part-per-1e1", "en-US", 1, "1 part per 10"), + new TestCase("part-per-1e2", "en-US", 1, "1 part per 100"), + new TestCase("part-per-1e3", "en-US", 1, "1 part per 1000"), + new TestCase("part-per-1e4", "en-US", 1, "1 part per 10000"), + new TestCase("part-per-1e5", "en-US", 1, "1 part per 100000"), + new TestCase("part-per-1e6", "en-US", 1, "1 part per million"), + new TestCase("part-per-1e7", "en-US", 1, "1 part per 10000000"), + new TestCase("part-per-1e8", "en-US", 1, "1 part per 100000000"), }; for (TestCase testCase : testCases) { - if (testCase.unitIdentifier.compareTo("portion-per-1e9") != 0) { - logKnownIssue("CLDR-18274", "The data for portion-per-XYZ is not determined yet."); - continue; - } + //if (testCase.unitIdentifier.compareTo("portion-per-1e9") != 0) { + // logKnownIssue("CLDR-18274", "The data for portion-per-XYZ is not determined yet."); + // continue; + //} MeasureUnit unit = MeasureUnit.forIdentifier(testCase.unitIdentifier); LocalizedNumberFormatter formatter = NumberFormatter.withLocale(ULocale.forLanguageTag(testCase.locale)) .unit(unit) diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java index 746e0ebddb1b..5ea5c91194d4 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java @@ -6014,7 +6014,7 @@ class TestCase { new TestCase(MeasureUnit.MILLIGRAM_OFGLUCOSE_PER_DECILITER, "2 milligrams per deciliter"), new TestCase(MeasureUnit.forIdentifier("millimeter-ofhg"), "2 millimeters of mercury"), new TestCase(MeasureUnit.forIdentifier("liter-per-100-kilometer"), "2 liters per 100 kilometers"), - new TestCase(MeasureUnit.forIdentifier("permillion"), "2 parts per million"), + new TestCase(MeasureUnit.forIdentifier("part-per-1e6"), "2 parts per million"), }; for (TestCase testCase : testCases) { diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java index fd95fd890023..ab42c210edc8 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java @@ -1050,6 +1050,25 @@ public void test22288_DifferentStartEndSettings() { assertEquals("Should format successfully", "2–3 US dollars", result.toString()); } + @Test + public void Test23110_PercentApproximately() { + assertFormatRange( + "Approximately percentage formatting", + NumberRangeFormatter.with() + .numberFormatterBoth(NumberFormatter.forSkeleton("%x100")), + ULocale.forLanguageTag("en-US"), + "100% – 500%", + "499.99999% – 500.00001%", + "~500%", // was returning "~50,000%" + "0% – 300%", + "~0%", + "300% – 300,000%", + "300,000% – 500,000%", + "499,900% – 500,100%", + "~500,000%", + "500,000% – 500,000,000%"); + } + static void assertFormatRange( String message, UnlocalizedNumberRangeFormatter f, diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java index 3bdcb86a1318..44e28891bee5 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -2713,8 +2713,8 @@ else if (!res.toString().equals(exp)) { "dz" }, { "und_BY", - "be_Cyrl_BY", - "be" + "ru_Cyrl_BY", + "ru_BY" }, { "und_Beng", "bn_Beng_BD", diff --git a/icu4j/main/core/pom.xml b/icu4j/main/core/pom.xml index c1c90d30e50f..0edc65fb1f48 100644 --- a/icu4j/main/core/pom.xml +++ b/icu4j/main/core/pom.xml @@ -19,6 +19,12 @@ + + com.ibm.icu + tools_taglets + ${project.version} + + com.ibm.icu framework @@ -49,29 +55,6 @@ - - org.codehaus.mojo - build-helper-maven-plugin - - - - add-test-resource - - add-test-resource - - - - - ${rootlocation}/../testdata/ - - message2/** - - - - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/EraRules.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/EraRules.java index a77cf97d6194..506d2476350e 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/EraRules.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/EraRules.java @@ -95,13 +95,8 @@ public static EraRules getInstance(CalType calType, boolean includeTentativeEra) } } else { if (hasEnd) { - if (eraIdx != 0) { - // This implementation does not support end only rule for eras other than - // the first one. - throw new ICUException( - "Era data for " + eraIdxStr + " in era rule data for " + calType.getId() - + " has only end rule."); - } + // The islamic calendars now have an end-only rule for the + // second (and final) entry; basically they are in reverse order. startDates[eraIdx] = MIN_ENCODED_START; } else { throw new ICUException("Missing era start/end rule date for key:" + eraIdxStr + " in era rule data for " @@ -177,6 +172,15 @@ public int getEraIndex(int year, int month, int day) { if (month < 1 || month > 12 || day < 1 || day > 31) { throw new IllegalArgumentException("Illegal date - year:" + year + "month:" + month + "day:" + day); } + if (numEras > 1 && startDates[numEras-1] == MIN_ENCODED_START) { + // Multiple eras in reverse order, linear search from beginning. + // Currently only for islamic. + for (int eraIdx = 0; eraIdx < numEras; eraIdx++) { + if (compareEncodedDateWithYMD(startDates[eraIdx], year, month, day) <= 0) { + return eraIdx; + } + } + } int high = numEras; // last index + 1 int low; @@ -219,14 +223,26 @@ private void initCurrentEra() { int[] fields = Grego.timeToFields(localMillis, null); int currentEncodedDate = encodeDate(fields[0], fields[1] + 1 /* changes to 1-base */, fields[2]); int eraIdx = numEras - 1; - while (eraIdx > 0) { - if (currentEncodedDate >= startDates[eraIdx]) { - break; + if (eraIdx > 0 && startDates[eraIdx] == MIN_ENCODED_START) { + // Multiple eras in reverse order, search from beginning. + // Currently only for islamic. Here current era must be + // in the array. + for (eraIdx = 0; eraIdx < numEras; eraIdx++) { + if (currentEncodedDate >= startDates[eraIdx]) { + break; + } + } + } else { + // The usual behavior, search from end + while (eraIdx > 0) { + if (currentEncodedDate >= startDates[eraIdx]) { + break; + } + eraIdx--; } - eraIdx--; + // Note: current era could be before the first era. + // In this case, this implementation returns the first era index (0). } - // Note: current era could be before the first era. - // In this case, this implementation returns the first era index (0). currentEra = eraIdx; } diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/JavaTimeConverters.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/JavaTimeConverters.java index 95ef822bfbbb..832fb6ebdf4f 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/JavaTimeConverters.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/JavaTimeConverters.java @@ -91,6 +91,7 @@ public static Calendar temporalToCalendar(ZonedDateTime dateTime) { * @deprecated This API is ICU internal only. */ @Deprecated + @SuppressWarnings("JavaTimeDefaultTimeZone") public static Calendar temporalToCalendar(OffsetTime time) { return temporalToCalendar(time.atDate(LocalDate.now())); } diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java index 9fde7d32ac90..c33ff106a719 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java @@ -163,7 +163,6 @@ private static Map buildDefaultScriptTable() { t.put("brx", "Deva"); t.put("bsh", "Arab"); t.put("bsk", "Arab"); - t.put("bsq", "Bass"); t.put("bst", "Ethi"); t.put("btd", "Batk"); t.put("btm", "Batk"); @@ -497,7 +496,13 @@ private static Map buildDefaultScriptTable() { t.put("kte", "Deva"); t.put("ktl", "Arab"); t.put("ktp", "Plrd"); + t.put("ku_AM", "Cyrl"); + t.put("ku_AZ", "Cyrl"); + t.put("ku_GE", "Cyrl"); + t.put("ku_IQ", "Arab"); + t.put("ku_IR", "Arab"); t.put("ku_LB", "Arab"); + t.put("ku_TM", "Cyrl"); t.put("kuf", "Laoo"); t.put("kum", "Cyrl"); t.put("kv", "Cyrl"); @@ -553,7 +558,7 @@ private static Map buildDefaultScriptTable() { t.put("lwl", "Thai"); t.put("lwm", "Thai"); t.put("lya", "Tibt"); - t.put("lzh", "Hans"); + t.put("lzh", "Hant"); t.put("lzz_GE", "Geor"); t.put("mag", "Deva"); t.put("mai", "Deva"); @@ -562,6 +567,7 @@ private static Map buildDefaultScriptTable() { t.put("mdf", "Cyrl"); t.put("mdx", "Ethi"); t.put("mdy", "Ethi"); + t.put("mey", "Arab"); t.put("mfa", "Arab"); t.put("mfi", "Arab"); t.put("mga", "Latg"); @@ -617,6 +623,7 @@ private static Map buildDefaultScriptTable() { t.put("myz", "Mand"); t.put("mzn", "Arab"); t.put("nan", "Hans"); + t.put("nan_MO", "Hant"); t.put("nan_TW", "Hant"); t.put("nao", "Deva"); t.put("ncd", "Deva"); @@ -718,7 +725,10 @@ private static Map buildDefaultScriptTable() { t.put("phu", "Thai"); t.put("phv", "Arab"); t.put("phw", "Deva"); - t.put("pi", "Sinh"); + t.put("pi_IN", "Deva"); + t.put("pi_LK", "Sinh"); + t.put("pi_MM", "Mymr"); + t.put("pi_TH", "Thai"); t.put("pka", "Brah"); t.put("pkr", "Mlym"); t.put("plk", "Arab"); @@ -726,7 +736,6 @@ private static Map buildDefaultScriptTable() { t.put("pmh", "Brah"); t.put("pnt", "Grek"); t.put("pnt_RU", "Cyrl"); - t.put("pra", "Khar"); t.put("prc", "Arab"); t.put("prd", "Arab"); t.put("prt", "Thai"); @@ -1049,7 +1058,6 @@ private static Map buildDefaultScriptTable() { t.put("zh_US", "Hant"); t.put("zh_VN", "Hant"); t.put("zhd", "Hani"); - t.put("zhx", "Nshu"); t.put("zko", "Cyrl"); t.put("zkt", "Kits"); t.put("zkz", "Cyrl"); diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/RBBIDataWrapper.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/RBBIDataWrapper.java index e2ca784187ae..47f9b4079648 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/RBBIDataWrapper.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/RBBIDataWrapper.java @@ -14,6 +14,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Arrays; +import java.util.Objects; import com.ibm.icu.impl.ICUBinary.Authenticate; import com.ibm.icu.text.RuleBasedBreakIterator; @@ -142,6 +143,19 @@ public boolean equals (Object other) { if (fFlags != otherST.fFlags) return false; return Arrays.equals(fTable, otherST.fTable); } + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + Arrays.hashCode(fTable); + result = prime * result + + Objects.hash(fDictCategoriesStart, fFlags, fLookAheadResultsSize, fNumStates, fRowLen); + return result; + } } /** @@ -170,14 +184,14 @@ static public boolean equals(RBBIStateTable left, RBBIStateTable right) { public CodePointTrie fTrie; public String fRuleSource; - public int fStatusTable[]; + public int [] fStatusTable; public static final int DATA_FORMAT = 0x42726b20; // "Brk " public static final int FORMAT_VERSION = 0x06000000; // 6.0.0.0 private static final class IsAcceptable implements Authenticate { @Override - public boolean isDataVersionAcceptable(byte version[]) { + public boolean isDataVersionAcceptable(byte[] version) { int intVersion = (version[0] << 24) + (version[1] << 16) + (version[2] << 8) + version[3]; return intVersion == FORMAT_VERSION; } @@ -397,7 +411,6 @@ public static RBBIDataWrapper get(ByteBuffer bytes) throws IOException { throw new IOException("Break iterator Rule data corrupt"); } ICUBinary.skipBytes(bytes, This.fHeader.fRuleSource - pos); - pos = This.fHeader.fRuleSource; This.fRuleSource = new String( ICUBinary.getBytes(bytes, This.fHeader.fRuleSourceLen, 0), StandardCharsets.UTF_8); @@ -507,13 +520,13 @@ private void dumpRow(java.io.PrintStream out, RBBIStateTable table, char state private void dumpCharCategories(java.io.PrintStream out) { int n = fHeader.fCatCount; - String catStrings[] = new String[n+1]; + String[] catStrings = new String[n+1]; int rangeStart = 0; int rangeEnd = 0; int lastCat = -1; int char32; int category; - int lastNewline[] = new int[n+1]; + int[] lastNewline = new int[n+1]; for (category = 0; category <= fHeader.fCatCount; category ++) { catStrings[category] = ""; diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMap.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMap.java index 3a68705b2479..0bac28382982 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMap.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/UnicodeMap.java @@ -857,6 +857,7 @@ public UnicodeMap putAll(Map map) { * Utility for extracting map * @deprecated */ + @Deprecated public UnicodeMap putAllIn(Map map) { for (String key : keySet()) { map.put(key, get(key)); diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/InternalLocaleBuilder.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/InternalLocaleBuilder.java index a126d2afe60a..55d132de0538 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/InternalLocaleBuilder.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/InternalLocaleBuilder.java @@ -75,7 +75,7 @@ public InternalLocaleBuilder setVariant(String variant) throws LocaleSyntaxExcep _variant = ""; } else { // normalize separators to "_" - String var = variant.replaceAll(LanguageTag.SEP, BaseLocale.SEP); + String var = variant.replace(LanguageTag.SEP, BaseLocale.SEP); int errIdx = checkVariants(var, BaseLocale.SEP); if (errIdx != -1) { throw new LocaleSyntaxException("Ill-formed variant: " + variant, errIdx); @@ -121,7 +121,7 @@ public InternalLocaleBuilder setUnicodeLocaleKeyword(String key, String type) th } else { if (type.length() != 0) { // normalize separator to "-" - String tp = type.replaceAll(BaseLocale.SEP, LanguageTag.SEP); + String tp = type.replace(BaseLocale.SEP, LanguageTag.SEP); // validate StringTokenIterator itr = new StringTokenIterator(tp, LanguageTag.SEP); while (!itr.isDone()) { @@ -166,7 +166,7 @@ public InternalLocaleBuilder setExtension(char singleton, String value) throws L } } else { // validate value - String val = value.replaceAll(BaseLocale.SEP, LanguageTag.SEP); + String val = value.replace(BaseLocale.SEP, LanguageTag.SEP); StringTokenIterator itr = new StringTokenIterator(val, LanguageTag.SEP); while (!itr.isDone()) { String s = itr.current(); @@ -202,7 +202,7 @@ public InternalLocaleBuilder setExtensions(String subtags) throws LocaleSyntaxEx clearExtensions(); return this; } - subtags = subtags.replaceAll(BaseLocale.SEP, LanguageTag.SEP); + subtags = subtags.replace(BaseLocale.SEP, LanguageTag.SEP); StringTokenIterator itr = new StringTokenIterator(subtags, LanguageTag.SEP); List extensions = null; @@ -485,7 +485,7 @@ public BaseLocale getBaseLocale() { if (sb.length() != 0) { sb.append(BaseLocale.SEP); } - sb.append(privuse.substring(privVarStart).replaceAll(LanguageTag.SEP, BaseLocale.SEP)); + sb.append(privuse.substring(privVarStart).replace(LanguageTag.SEP, BaseLocale.SEP)); variant = sb.toString(); } } diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LikelySubtags.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LikelySubtags.java index 2a42c60c4753..40919e66c00b 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LikelySubtags.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LikelySubtags.java @@ -355,11 +355,27 @@ private LSR maximize(String language, String script, String region, boolean retu } else { iter.resetToState64(state); value = trieNext(iter, "", 0); - assert value > 0; + assert value != 0; + if (value < 0) { + retainLanguage = !language.isEmpty(); + retainScript = !script.isEmpty(); + retainRegion = !region.isEmpty(); + // Fallback to und_$region => + iter.resetToState64(trieUndState); // "und" ("*") + value = trieNext(iter, "", 0); + assert value == 0; + long trieUndEmptyState = iter.getState64(); + value = trieNext(iter, region, 0); + // Fallback to und => + if (value < 0) { + iter.resetToState64(trieUndEmptyState); + value = trieNext(iter, "", 0); + assert value > 0; + } + } } } } - LSR result = lsrs[value]; if (returnInputIfUnmatch && (!(matchLanguage || matchScript || (matchRegion && language.isEmpty())))) { @@ -370,17 +386,21 @@ private LSR maximize(String language, String script, String region, boolean retu } if (! (retainLanguage || retainScript || retainRegion)) { - assert result.flags == LSR.IMPLICIT_LSR; - return result; + assert value >= 0; + assert lsrs[value].flags == LSR.IMPLICIT_LSR; + return lsrs[value]; } if (!retainLanguage) { - language = result.language; + assert value >= 0; + language = lsrs[value].language; } if (!retainScript) { - script = result.script; + assert value >= 0; + script = lsrs[value].script; } if (!retainRegion) { - region = result.region; + assert value >= 0; + region = lsrs[value].region; } int retainMask = (retainLanguage ? 4 : 0) + (retainScript ? 2 : 0) + (retainRegion ? 1 : 0); // retainOldMask flags = LSR explicit-subtag flags diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/number/DecimalQuantity_AbstractBCD.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/number/DecimalQuantity_AbstractBCD.java index 415d8a82c482..4e5ab9e5f3b5 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/number/DecimalQuantity_AbstractBCD.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/number/DecimalQuantity_AbstractBCD.java @@ -6,6 +6,7 @@ import java.math.BigInteger; import java.math.MathContext; import java.text.FieldPosition; +import java.util.Objects; import com.ibm.icu.impl.StandardPlural; import com.ibm.icu.impl.Utility; @@ -1201,6 +1202,23 @@ public boolean equals(Object other) { } } + @Override + public int hashCode() { + int result = Objects.hash(scale, precision, flags, lReqPos, rReqPos, isApproximate); + + if (precision == 0) { + return result; + } + if (isApproximate) { + return Objects.hash(result, origDouble, origDelta); + } else { + for (int m = getUpperDisplayMagnitude(); m >= getLowerDisplayMagnitude(); m--) { + return Objects.hash(result, getDigit(m)); + } + } + return result; + } + /** * Returns a single digit from the BCD list. No internal state is changed by calling this method. * diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java index 4b708f2a6831..53d78fe84edb 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/personname/PersonNameFormatterImpl.java @@ -363,7 +363,7 @@ private Locale newLocaleWithScript(Locale oldLocale, String scriptCode, String r Locale.Builder builder = new Locale.Builder(); if (oldLocale != null) { workingLocale = oldLocale; - builder.setLocale(oldLocale); + var unused = builder.setLocale(oldLocale); localeScript = ULocale.addLikelySubtags(ULocale.forLocale(oldLocale)).getScript(); } else { ULocale tmpLocale = ULocale.addLikelySubtags(new ULocale("und_" + scriptCode)); @@ -372,7 +372,7 @@ private Locale newLocaleWithScript(Locale oldLocale, String scriptCode, String r localeScript = workingLocale.getScript(); if (regionCode != null) { - builder.setRegion(regionCode); + var unused = builder.setRegion(regionCode); } } diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/ConversionRates.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/ConversionRates.java index d8aae8667125..c3361db3d759 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/ConversionRates.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/units/ConversionRates.java @@ -183,7 +183,7 @@ public void put(UResource.Key key, UResource.Value value, boolean noFallback) { String keyString = key.toString(); - String valueString = value.toString().replaceAll(" ", ""); + String valueString = value.toString().replace(" ", ""); if ("target".equals(keyString)) { target = valueString; } else if ("factor".equals(keyString)) { diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberFormatterSettings.java b/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberFormatterSettings.java index d9ba6972c7a6..3d0c44e3cff9 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberFormatterSettings.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberFormatterSettings.java @@ -655,12 +655,14 @@ MacroProps resolve() { long seen = 0; NumberFormatterSettings current = this; while (current != null) { - long keyBitmask = (1L << current.key); - if (0 != (seen & keyBitmask)) { - current = current.parent; - continue; + if (current.key != KEY_MACROS) { + long keyBitmask = (1L << current.key); + if (0 != (seen & keyBitmask)) { + current = current.parent; + continue; + } + seen |= keyBitmask; } - seen |= keyBitmask; switch (current.key) { case KEY_MACROS: macros.fallback((MacroProps) current.value); diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java b/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java index a26527342ebc..4f951c3f53ca 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/number/NumberRangeFormatterImpl.java @@ -178,6 +178,8 @@ public NumberRangeFormatterImpl(RangeMacroProps macros) { } public FormattedNumberRange format(DecimalQuantity quantity1, DecimalQuantity quantity2, boolean equalBeforeRounding) { + DecimalQuantity quantityBackup = quantity1.createCopy(); + FormattedStringBuilder string = new FormattedStringBuilder(); MicroProps micros1 = formatterImpl1.preProcess(quantity1); MicroProps micros2; @@ -224,7 +226,7 @@ public FormattedNumberRange format(DecimalQuantity quantity1, DecimalQuantity qu case (2 | (1 << 4)): // APPROXIMATELY, EQUAL_AFTER_ROUNDING case (2 | (0 << 4)): // APPROXIMATELY, EQUAL_BEFORE_ROUNDING case (1 | (1 << 4)): // APPROXIMATE_OR_SINGLE_VALUE, EQUAL_AFTER_ROUNDING - formatApproximately(quantity1, quantity2, string, micros1, micros2); + formatApproximately(quantityBackup, quantity1, quantity2, string, micros1, micros2); break; case (1 | (0 << 4)): // APPROXIMATE_OR_SINGLE_VALUE, EQUAL_BEFORE_ROUNDING @@ -252,13 +254,12 @@ private void formatSingleValue(DecimalQuantity quantity1, DecimalQuantity quanti } - private void formatApproximately(DecimalQuantity quantity1, DecimalQuantity quantity2, FormattedStringBuilder string, + private void formatApproximately(DecimalQuantity quantityBackup, DecimalQuantity quantity1, DecimalQuantity quantity2, FormattedStringBuilder string, MicroProps micros1, MicroProps micros2) { if (fSameFormatters) { // Re-format using the approximately formatter: - quantity1.resetExponent(); - MicroProps microsAppx = fApproximatelyFormatter.preProcess(quantity1); - int length = NumberFormatterImpl.writeNumber(microsAppx, quantity1, string, 0); + MicroProps microsAppx = fApproximatelyFormatter.preProcess(quantityBackup); + int length = NumberFormatterImpl.writeNumber(microsAppx, quantityBackup, string, 0); // HEURISTIC: Desired modifier order: inner, middle, approximately, outer. length += microsAppx.modInner.apply(string, 0, length); length += microsAppx.modMiddle.apply(string, 0, length); diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java index 1fc0675a4f39..b4749d365f29 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/BreakIterator.java @@ -347,6 +347,10 @@ public int preceding(int offset) { // NOTE: This implementation is here solely because we can't add new // abstract methods to an existing class. There is almost ALWAYS a // better, faster way to do this. + + if (offset < 0) { + return DONE; + } int pos = following(offset); while (pos >= offset && pos != DONE) pos = previous(); diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java index f084d74e8f17..e2c777a4305a 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/DateFormatSymbols.java @@ -2244,7 +2244,7 @@ public DateFormatSymbols(Class calendarClass, ULocale locale } } if (calType == null) { - calType = className.replaceAll("Calendar", "").toLowerCase(Locale.ENGLISH); + calType = className.replace("Calendar", "").toLowerCase(Locale.ENGLISH); } initializeData(locale, calType); diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/NFSubstitution.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/NFSubstitution.java index e0e4d9db53cf..bce3beae50ee 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/NFSubstitution.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/NFSubstitution.java @@ -1651,11 +1651,10 @@ public Number doParse(String text, ParsePosition parsePosition, double baseValue if (withZeros) { String workText = text; ParsePosition workPos = new ParsePosition(1); - //int digit; while (workText.length() > 0 && workPos.getIndex() != 0) { workPos.setIndex(0); - /*digit = */ruleSet.parse(workText, workPos, 1, nonNumericalExecutedRuleMask, recursionCount).intValue(); // parse zero or nothing at all + var unused = ruleSet.parse(workText, workPos, 1, nonNumericalExecutedRuleMask, recursionCount).intValue(); // parse zero or nothing at all if (workPos.getIndex() == 0) { // we failed, either there were no more zeros, or the number was formatted with digits // either way, we're done diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java index 9d54bd1aaa4c..e8ed1169111a 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/RuleBasedBreakIterator.java @@ -511,7 +511,7 @@ public int preceding(int offset) { if (fText == null || offset > fText.getEndIndex()) { return last(); } else if (offset < fText.getBeginIndex()) { - return first(); + return DONE; } // Move requested offset to a code point start. It might be between a lead and trail surrogate. @@ -524,12 +524,12 @@ public int preceding(int offset) { /** - * Throw IllegalArgumentException unless begin <= offset < end. + * Throw IndexOutOfBoundsException unless begin <= offset < end. * @stable ICU 2.0 */ protected static final void checkOffset(int offset, CharacterIterator text) { if (offset < text.getBeginIndex() || offset > text.getEndIndex()) { - throw new IllegalArgumentException("offset out of bounds"); + throw new IndexOutOfBoundsException("offset out of bounds"); } } diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java index 0d1f957bfb63..b0da1f337abb 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSet.java @@ -3601,7 +3601,7 @@ public UnicodeSet applyPropertyAlias(String propertyAlias, } } - if (valueAlias.length() > 0) { + if (valueAlias != null && !valueAlias.isEmpty()) { p = UCharacter.getPropertyEnum(propertyAlias); // Treat gc as gcm @@ -3835,7 +3835,7 @@ private UnicodeSet applyPropertyPattern(String pattern, ParsePosition ppos, Symb else { // Handle case where no '=' is seen, and \N{} propName = pattern.substring(pos, close); - valueName = ""; + valueName = null; // Handle \N{name} if (isName) { diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/CECalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/CECalendar.java index 38b4e7d9bf06..a3c7023800d7 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/CECalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/CECalendar.java @@ -174,6 +174,42 @@ protected CECalendar(int year, int month, int date, int hour, */ abstract protected int getJDEpochOffset(); + /** + * {@inheritDoc} + * @internal + * @deprecated This API is ICU internal only. + */ + @Override + @Deprecated + protected void handleComputeFields(int julianDay) { + int era, year; + int[] fields = new int[3]; + jdToCE(julianDay, getJDEpochOffset(), fields); + internalSet(EXTENDED_YEAR, fields[0]); + internalSet(ERA, extendedYearToEra(fields[0])); + internalSet(YEAR, extendedYearToYear(fields[0])); + internalSet(MONTH, fields[1]); + internalSet(ORDINAL_MONTH, fields[1]); + internalSet(DAY_OF_MONTH, fields[2]); + internalSet(DAY_OF_YEAR, (30 * fields[1]) + fields[2]); + } + + /** + * Convert extended year to era + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + abstract protected int extendedYearToEra(int eyear); + + /** + * Convert extended year to year + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + abstract protected int extendedYearToYear(int eyear); + /** * Return JD of start of given month/extended year */ diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java index 5b49c60aaf36..92f0218c5637 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java @@ -20,6 +20,7 @@ import com.ibm.icu.impl.CalType; import com.ibm.icu.impl.CalendarUtil; +import com.ibm.icu.impl.Grego; import com.ibm.icu.impl.ICUCache; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; @@ -2301,104 +2302,21 @@ public final void set(int year, int month, int date, int hour, int minute, set(SECOND, second); } - // ------------------------------------- - // For now the full getRelatedYear implementation is here; - // per #10752 move the non-default implementation to subclasses - // (default implementation will do no year adjustment) - - /** - * utility function for getRelatedYear - */ - private static int gregoYearFromIslamicStart(int year) { - // ad hoc conversion, improve under #10752 - // rough est for now, ok for grego 1846-2138, - // otherwise occasionally wrong (for 3% of years) - int cycle, offset, shift = 0; - if (year >= 1397) { - cycle = (year - 1397) / 67; - offset = (year - 1397) % 67; - shift = 2*cycle + ((offset >= 33)? 1: 0); - } else { - cycle = (year - 1396) / 67 - 1; - offset = -(year - 1396) % 67; - shift = 2*cycle + ((offset <= 33)? 1: 0); - } - return year + 579 - shift; - } - /** * @internal * @deprecated This API is ICU internal only. */ @Deprecated - public final int getRelatedYear() { - int year = get(EXTENDED_YEAR); - CalType type = CalType.GREGORIAN; - String typeString = getType(); - for (CalType testType : CalType.values()) { - if (typeString.equals(testType.getId())) { - type = testType; - break; - } - } - switch (type) { - case PERSIAN: - year += 622; break; - case HEBREW: - year -= 3760; break; - case CHINESE: - year -= 2637; break; - case INDIAN: - year += 79; break; - case COPTIC: - year += 284; break; - case ETHIOPIC: - year += 8; break; - case ETHIOPIC_AMETE_ALEM: - year -=5492; break; - case DANGI: - year -= 2333; break; - case ISLAMIC_CIVIL: - case ISLAMIC: - case ISLAMIC_UMALQURA: - case ISLAMIC_TBLA: - case ISLAMIC_RGSA: - year = gregoYearFromIslamicStart(year); break; - // case GREGORIAN: - // case JAPANESE: - // case BUDDHIST: - // case ROC: - // case ISO8601: - default: - // do nothing, EXTENDED_YEAR same as Gregorian - break; - } - return year; + protected int getRelatedYearDifference() { + return 0; } - - // ------------------------------------- - // For now the full setRelatedYear implementation is here; - // per #10752 move the non-default implementation to subclasses - // (default implementation will do no year adjustment) - /** - * utility function for setRelatedYear + * @internal + * @deprecated This API is ICU internal only. */ - private static int firstIslamicStartYearFromGrego(int year) { - // ad hoc conversion, improve under #10752 - // rough est for now, ok for grego 1846-2138, - // otherwise occasionally wrong (for 3% of years) - int cycle, offset, shift = 0; - if (year >= 1977) { - cycle = (year - 1977) / 65; - offset = (year - 1977) % 65; - shift = 2*cycle + ((offset >= 32)? 1: 0); - } else { - cycle = (year - 1976) / 65 - 1; - offset = -(year - 1976) % 65; - shift = 2*cycle + ((offset <= 32)? 1: 0); - } - return year - 579 + shift; + @Deprecated + public int getRelatedYear() { + return get(EXTENDED_YEAR) + getRelatedYearDifference(); } /** @@ -2406,48 +2324,8 @@ private static int firstIslamicStartYearFromGrego(int year) { * @deprecated This API is ICU internal only. */ @Deprecated - public final void setRelatedYear(int year) { - CalType type = CalType.GREGORIAN; - String typeString = getType(); - for (CalType testType : CalType.values()) { - if (typeString.equals(testType.getId())) { - type = testType; - break; - } - } - switch (type) { - case PERSIAN: - year -= 622; break; - case HEBREW: - year += 3760; break; - case CHINESE: - year += 2637; break; - case INDIAN: - year -= 79; break; - case COPTIC: - year -= 284; break; - case ETHIOPIC: - year -= 8; break; - case ETHIOPIC_AMETE_ALEM: - year +=5492; break; - case DANGI: - year += 2333; break; - case ISLAMIC_CIVIL: - case ISLAMIC: - case ISLAMIC_UMALQURA: - case ISLAMIC_TBLA: - case ISLAMIC_RGSA: - year = firstIslamicStartYearFromGrego(year); break; - // case GREGORIAN: - // case JAPANESE: - // case BUDDHIST: - // case ROC: - // case ISO8601: - default: - // do nothing, EXTENDED_YEAR same as Gregorian - break; - } - set(EXTENDED_YEAR, year); + public void setRelatedYear(int year) { + set(EXTENDED_YEAR, year - getRelatedYearDifference()); } /** @@ -5322,42 +5200,11 @@ private final void computeGregorianAndDOWFields(int julianDay) { * @stable ICU 2.0 */ protected final void computeGregorianFields(int julianDay) { - int year, month, dayOfMonth, dayOfYear; - - // The Gregorian epoch day is zero for Monday January 1, year 1. - long gregorianEpochDay = julianDay - JAN_1_1_JULIAN_DAY; - - // Here we convert from the day number to the multiple radix - // representation. We use 400-year, 100-year, and 4-year cycles. - // For example, the 4-year cycle has 4 years + 1 leap day; giving - // 1461 == 365*4 + 1 days. - int[] rem = new int[1]; - int n400 = floorDivide(gregorianEpochDay, 146097, rem); // 400-year cycle length - int n100 = floorDivide(rem[0], 36524, rem); // 100-year cycle length - int n4 = floorDivide(rem[0], 1461, rem); // 4-year cycle length - int n1 = floorDivide(rem[0], 365, rem); - year = 400*n400 + 100*n100 + 4*n4 + n1; - dayOfYear = rem[0]; // zero-based day of year - if (n100 == 4 || n1 == 4) { - dayOfYear = 365; // Dec 31 at end of 4- or 400-yr cycle - } else { - ++year; - } - - boolean isLeap = ((year&0x3) == 0) && // equiv. to (year%4 == 0) - (year%100 != 0 || year%400 == 0); - - int correction = 0; - int march1 = isLeap ? 60 : 59; // zero-based DOY for March 1 - if (dayOfYear >= march1) correction = isLeap ? 1 : 2; - month = (12 * (dayOfYear + correction) + 6) / 367; // zero-based month - dayOfMonth = dayOfYear - - GREGORIAN_MONTH_COUNT[month][isLeap?3:2] + 1; // one-based DOM - - gregorianYear = year; - gregorianMonth = month; // 0-based already - gregorianDayOfMonth = dayOfMonth; // 1-based already - gregorianDayOfYear = dayOfYear + 1; // Convert from 0-based to 1-based + int[] gregorian = Grego.dayToFields(julianDay - EPOCH_JULIAN_DAY, null); + gregorianYear = gregorian[0]; + gregorianMonth = gregorian[1]; + gregorianDayOfMonth = gregorian[2]; + gregorianDayOfYear = gregorian[4]; } /** diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/ChineseCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/ChineseCalendar.java index b6510f88e157..f12f1f167800 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/ChineseCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/ChineseCalendar.java @@ -128,7 +128,7 @@ public class ChineseCalendar extends Calendar { * 1813 and 2033, the leap month is after the Winter Solstice of that year. So * this value could be false for a date prior to the Winter Solstice of that * year but that year still has a leap month and therefor is a leap year. - * @see #computeChineseFields + * @see #computeMonthInfo */ private transient boolean hasLeapMonthBetweenWinterSolstices; @@ -823,31 +823,62 @@ private boolean isLeapMonthBetween(int newMoon1, int newMoon2) { * @stable ICU 2.8 */ protected void handleComputeFields(int julianDay) { + int days = julianDay - EPOCH_JULIAN_DAY; // local days + int gyear = getGregorianYear(); + int gmonth = getGregorianMonth(); + MonthInfo info = computeMonthInfo(days, gyear); + + // Extended year and cycle year is based on the epoch year + int extended_year = gyear - epochYear; + int cycle_year = gyear - CHINESE_EPOCH_YEAR; + if (info.month < 10 || + gmonth >= JULY) { + extended_year++; + cycle_year++; + } + int dayOfMonth = days - info.thisMoon + 1; + + // 0->0,60 1->1,1 60->1,60 61->2,1 etc. + int[] yearOfCycle = new int[1]; + int cycle = floorDivide(cycle_year-1, 60, yearOfCycle); + + // Days will be before the first new year we compute if this + // date is in month 11, leap 11, 12. There is never a leap 12. + // New year computations are cached so this should be cheap in + // the long run. + int newYear = newYear(gyear); + if (days < newYear) { + newYear = newYear(gyear-1); + } - computeChineseFields(julianDay - EPOCH_JULIAN_DAY, // local days - getGregorianYear(), getGregorianMonth(), - true); // set all fields + hasLeapMonthBetweenWinterSolstices = info.hasLeapMonthBetweenWinterSolstices; + internalSet(EXTENDED_YEAR, extended_year); + internalSet(ERA, cycle+1); + internalSet(YEAR, yearOfCycle[0]+1); + internalSet(MONTH, info.month); // Convert from 1-based to 0-based + internalSet(ORDINAL_MONTH, info.ordinalMonth); + internalSet(DAY_OF_MONTH, dayOfMonth); + internalSet(IS_LEAP_MONTH, info.isLeapMonth?1:0); + internalSet(DAY_OF_YEAR, days - newYear + 1); } - /** - * Compute fields for the Chinese calendar system. This method can - * either set all relevant fields, as required by - * handleComputeFields(), or it can just set the MONTH and - * IS_LEAP_MONTH fields, as required by - * handleComputeMonthStart(). - * - *

As a side effect, this method sets {@link #hasLeapMonthBetweenWinterSolstices}. - * @param days days after January 1, 1970 0:00 astronomical base zone of the - * date to compute fields for - * @param gyear the Gregorian year of the given date - * @param gmonth the Gregorian month of the given date - * @param setAllFields if true, set the EXTENDED_YEAR, ERA, YEAR, - * DAY_OF_MONTH, and DAY_OF_YEAR fields. In either case set the MONTH - * and IS_LEAP_MONTH fields. - */ - private void computeChineseFields(int days, int gyear, int gmonth, - boolean setAllFields) { + class MonthInfo { + int month; + int ordinalMonth; + int thisMoon; + boolean isLeapMonth; + boolean hasLeapMonthBetweenWinterSolstices; + MonthInfo(int month, int ordinalMonth, int thisMoon, boolean isLeapMonth, + boolean hasLeapMonthBetweenWinterSolstices) { + this.month = month; + this.ordinalMonth = ordinalMonth; + this.thisMoon = thisMoon; + this.isLeapMonth = isLeapMonth; + this.hasLeapMonthBetweenWinterSolstices = hasLeapMonthBetweenWinterSolstices; + } + }; + private MonthInfo computeMonthInfo(int days, int gyear) { // Find the winter solstices before and after the target date. // These define the boundaries of this Chinese year, specifically, // the position of month 11, which always contains the solstice. @@ -867,8 +898,8 @@ private void computeChineseFields(int days, int gyear, int gmonth, int firstMoon = newMoonNear(solsticeBefore + 1, true); int lastMoon = newMoonNear(solsticeAfter + 1, false); int thisMoon = newMoonNear(days + 1, false); // Start of this month - // Note: hasLeapMonthBetweenWinterSolstices is a member variable - hasLeapMonthBetweenWinterSolstices = synodicMonthsBetween(firstMoon, lastMoon) == 12; + + boolean hasLeapMonthBetweenWinterSolstices = synodicMonthsBetween(firstMoon, lastMoon) == 12; int month = synodicMonthsBetween(firstMoon, thisMoon); int theNewYear = newYear(gyear); @@ -890,42 +921,7 @@ private void computeChineseFields(int days, int gyear, int gmonth, hasNoMajorSolarTerm(thisMoon) && !isLeapMonthBetween(firstMoon, newMoonNear(thisMoon - SYNODIC_GAP, false)); - internalSet(MONTH, month-1); // Convert from 1-based to 0-based - internalSet(ORDINAL_MONTH, ordinalMonth); - internalSet(IS_LEAP_MONTH, isLeapMonth?1:0); - - if (setAllFields) { - - // Extended year and cycle year is based on the epoch year - int extended_year = gyear - epochYear; - int cycle_year = gyear - CHINESE_EPOCH_YEAR; - if (month < 11 || - gmonth >= JULY) { - extended_year++; - cycle_year++; - } - int dayOfMonth = days - thisMoon + 1; - - internalSet(EXTENDED_YEAR, extended_year); - - // 0->0,60 1->1,1 60->1,60 61->2,1 etc. - int[] yearOfCycle = new int[1]; - int cycle = floorDivide(cycle_year-1, 60, yearOfCycle); - internalSet(ERA, cycle+1); - internalSet(YEAR, yearOfCycle[0]+1); - - internalSet(DAY_OF_MONTH, dayOfMonth); - - // Days will be before the first new year we compute if this - // date is in month 11, leap 11, 12. There is never a leap 12. - // New year computations are cached so this should be cheap in - // the long run. - int newYear = newYear(gyear); - if (days < newYear) { - newYear = newYear(gyear-1); - } - internalSet(DAY_OF_YEAR, days - newYear + 1); - } + return new MonthInfo(month-1, ordinalMonth, thisMoon, isLeapMonth, hasLeapMonthBetweenWinterSolstices); } //------------------------------------------------------------------ @@ -999,27 +995,17 @@ private int handleComputeMonthStartWithLeap(int eyear, int month, int isLeapMont int julianDay = newMoon + EPOCH_JULIAN_DAY; - // Save fields for later restoration - int saveMonth = internalGet(MONTH); - int saveOrdinalMonth = internalGet(ORDINAL_MONTH); - int saveIsLeapMonth = internalGet(IS_LEAP_MONTH); - computeGregorianFields(julianDay); // This will modify the MONTH and IS_LEAP_MONTH fields (only) - computeChineseFields(newMoon, getGregorianYear(), - getGregorianMonth(), false); + MonthInfo info = computeMonthInfo(newMoon, getGregorianYear()); - if (month != internalGet(MONTH) || - isLeapMonth != internalGet(IS_LEAP_MONTH)) { + if (month != info.month || + info.isLeapMonth != (isLeapMonth != 0) ) { newMoon = newMoonNear(newMoon + SYNODIC_GAP, true); julianDay = newMoon + EPOCH_JULIAN_DAY; } - internalSet(MONTH, saveMonth); - internalSet(ORDINAL_MONTH, saveOrdinalMonth); - internalSet(IS_LEAP_MONTH, saveIsLeapMonth); - return julianDay - 1; } @@ -1186,6 +1172,15 @@ public int getActualMaximum(int field) { } + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + protected final int getRelatedYearDifference() { + return epochYear - 1; + } + /* private static CalendarFactory factory; public static CalendarFactory factory() { diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/CopticCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/CopticCalendar.java index b6eae0fd6873..46c63e2c6544 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/CopticCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/CopticCalendar.java @@ -281,32 +281,21 @@ protected int handleGetExtendedYear() { * @internal * @deprecated This API is ICU internal only. */ - @Override @Deprecated - protected void handleComputeFields(int julianDay) { - int era, year; - int[] fields = new int[3]; - jdToCE(julianDay, getJDEpochOffset(), fields); - - // fields[0] eyear - // fields[1] month - // fields[2] day - - if (fields[0] <= 0) { - era = BCE; - year = 1 - fields[0]; - } else { - era = CE; - year = fields[0]; - } + @Override + protected int extendedYearToEra(int eyear) { + return (eyear <= 0) ? BCE : CE; + } - internalSet(EXTENDED_YEAR, fields[0]); - internalSet(ERA, era); - internalSet(YEAR, year); - internalSet(MONTH, fields[1]); - internalSet(ORDINAL_MONTH, fields[1]); - internalSet(DAY_OF_MONTH, fields[2]); - internalSet(DAY_OF_YEAR, (30 * fields[1]) + fields[2]); + /** + * {@inheritDoc} + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + @Override + protected int extendedYearToYear(int eyear) { + return (eyear <= 0) ? 1-eyear : eyear; } /** @@ -335,5 +324,16 @@ protected int getJDEpochOffset() { public static int copticToJD(long year, int month, int date) { return ceToJD(year, month, date, JD_EPOCH_OFFSET); } + + private static final int COPTIC_CALENDAR_RELATED_YEAR_DIFFERENCE = 284; + + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + protected final int getRelatedYearDifference() { + return COPTIC_CALENDAR_RELATED_YEAR_DIFFERENCE; + } } diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/EthiopicCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/EthiopicCalendar.java index 9f6bdba1b80e..586a314b0ed8 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/EthiopicCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/EthiopicCalendar.java @@ -325,37 +325,29 @@ protected int handleGetExtendedYear() { * @internal * @deprecated This API is ICU internal only. */ - @Override @Deprecated - protected void handleComputeFields(int julianDay) { - int era, year; - int[] fields = new int[3]; - jdToCE(julianDay, getJDEpochOffset(), fields); - - // fields[0] eyear - // fields[1] month - // fields[2] day - + @Override + protected int extendedYearToEra(int eyear) { if (isAmeteAlemEra()) { - era = AMETE_ALEM; - year = fields[0] + AMETE_MIHRET_DELTA; + return AMETE_ALEM; } else { - if (fields[0] > 0) { - era = AMETE_MIHRET; - year = fields[0]; - } else { - era = AMETE_ALEM; - year = fields[0] + AMETE_MIHRET_DELTA; - } + return (eyear <= 0) ? AMETE_ALEM : AMETE_MIHRET; } + } - internalSet(EXTENDED_YEAR, fields[0]); - internalSet(ERA, era); - internalSet(YEAR, year); - internalSet(MONTH, fields[1]); - internalSet(ORDINAL_MONTH, fields[1]); - internalSet(DAY_OF_MONTH, fields[2]); - internalSet(DAY_OF_YEAR, (30 * fields[1]) + fields[2]); + /** + * {@inheritDoc} + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + @Override + protected int extendedYearToYear(int eyear) { + if (isAmeteAlemEra()) { + return eyear + AMETE_MIHRET_DELTA; + } else { + return (eyear <= 0) ? eyear + AMETE_MIHRET_DELTA : eyear; + } } /** @@ -400,6 +392,22 @@ public static int EthiopicToJD(long year, int month, int date) { return ceToJD(year, month, date, JD_EPOCH_OFFSET_AMETE_MIHRET); } + + private static final int ETHIOPIC_AMETE_ALEM_CALENDAR_RELATED_YEAR_DIFFERENCE = -5492; + + private static final int ETHIOPIC_CALENDAR_RELATED_YEAR_DIFFERENCE = 8; + + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + protected final int getRelatedYearDifference() { + return isAmeteAlemEra() ? + ETHIOPIC_AMETE_ALEM_CALENDAR_RELATED_YEAR_DIFFERENCE : + ETHIOPIC_CALENDAR_RELATED_YEAR_DIFFERENCE; + } + /** * set type based on locale */ diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java index 9d090573e5be..925589bb4d20 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/HebrewCalendar.java @@ -914,6 +914,17 @@ public String getType() { return "hebrew"; } + private static final int HEBREW_CALENDAR_RELATED_YEAR_DIFFERENCE = -3760; + + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + protected final int getRelatedYearDifference() { + return HEBREW_CALENDAR_RELATED_YEAR_DIFFERENCE; + } + //------------------------------------------------------------------------- // Temporal Calendar API. //------------------------------------------------------------------------- diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/IndianCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/IndianCalendar.java index cb284c8785d1..39390b793445 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/IndianCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/IndianCalendar.java @@ -359,7 +359,6 @@ protected int handleGetMonthLength(int extendedYear, int month) { protected void handleComputeFields(int julianDay){ double jdAtStartOfGregYear; int leapMonth, IndianYear, yday, IndianMonth, IndianDayOfMonth, mday; - computeGregorianFields(julianDay); int gregorianYear = getGregorianYear(); // Stores gregorian date corresponding to Julian day; IndianYear = gregorianYear - INDIAN_ERA_START; // Year in Saka era @@ -499,7 +498,18 @@ private double IndianToJD(int year, int month, int date) { return jd; } - + + private static final int INDIAN_CALENDAR_RELATED_YEAR_DIFFERENCE = 79; + + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + protected final int getRelatedYearDifference() { + return INDIAN_CALENDAR_RELATED_YEAR_DIFFERENCE; + } + /* * The following function is not needed for basic calendar functioning. * This routine converts a gregorian date to the corresponding Julian date" diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/IslamicCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/IslamicCalendar.java index 09d9d7e6e7a2..a31d7232f5ba 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/IslamicCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/IslamicCalendar.java @@ -1130,6 +1130,63 @@ public void setCalculationType(CalculationType type) { civil = algorithm.isCivil(); } + /** + * utility function for getRelatedYear + */ + private static final int gregoYearFromIslamicStart(int year) { + // ad hoc conversion, improve under #10752 + // rough est for now, ok for grego 1846-2138, + // otherwise occasionally wrong (for 3% of years) + int cycle, offset, shift = 0; + if (year >= 1397) { + cycle = (year - 1397) / 67; + offset = (year - 1397) % 67; + shift = 2*cycle + ((offset >= 33)? 1: 0); + } else { + cycle = (year - 1396) / 67 - 1; + offset = -(year - 1396) % 67; + shift = 2*cycle + ((offset <= 33)? 1: 0); + } + return year + 579 - shift; + } + + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public final int getRelatedYear() { + return gregoYearFromIslamicStart(get(EXTENDED_YEAR)); + } + + /** + * utility function for setRelatedYear + */ + private static int firstIslamicStartYearFromGrego(int year) { + // ad hoc conversion, improve under #10752 + // rough est for now, ok for grego 1846-2138, + // otherwise occasionally wrong (for 3% of years) + int cycle, offset, shift = 0; + if (year >= 1977) { + cycle = (year - 1977) / 65; + offset = (year - 1977) % 65; + shift = 2*cycle + ((offset >= 32)? 1: 0); + } else { + cycle = (year - 1976) / 65 - 1; + offset = -(year - 1976) % 65; + shift = 2*cycle + ((offset <= 32)? 1: 0); + } + return year - 579 + shift; + } + + /* + * @deprecated This API is ICU internal only. + */ + @Deprecated + public final void setRelatedYear(int year) { + set(EXTENDED_YEAR, firstIslamicStartYearFromGrego(year)); + } + /** * gets the calculation type for this calendar. * diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/MeasureUnit.java index 16cd2842e019..10221d4c03ca 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/MeasureUnit.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/MeasureUnit.java @@ -879,6 +879,7 @@ public static MeasureUnit internalGetInstance(String type, String subType) { } else { factory = UNIT_FACTORY; } + return MeasureUnit.addUnit(type, subType, factory); } @@ -1090,12 +1091,30 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit REVOLUTION_ANGLE = MeasureUnit.internalGetInstance("angle", "revolution"); + /** + * Constant for unit of angle: steradian + * @draft ICU 78 + */ + public static final MeasureUnit STERADIAN = MeasureUnit.internalGetInstance("angle", "steradian"); + /** * Constant for unit of area: acre * @stable ICU 53 */ public static final MeasureUnit ACRE = MeasureUnit.internalGetInstance("area", "acre"); + /** + * Constant for unit of area: bu-jp + * @draft ICU 78 + */ + public static final MeasureUnit BU_JP = MeasureUnit.internalGetInstance("area", "bu-jp"); + + /** + * Constant for unit of area: cho + * @draft ICU 78 + */ + public static final MeasureUnit CHO = MeasureUnit.internalGetInstance("area", "cho"); + /** * Constant for unit of area: dunam * @stable ICU 64 @@ -1108,6 +1127,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit HECTARE = MeasureUnit.internalGetInstance("area", "hectare"); + /** + * Constant for unit of area: se-jp + * @draft ICU 78 + */ + public static final MeasureUnit SE_JP = MeasureUnit.internalGetInstance("area", "se-jp"); + /** * Constant for unit of area: square-centimeter * @stable ICU 54 @@ -1162,6 +1187,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit KARAT = MeasureUnit.internalGetInstance("concentr", "karat"); + /** + * Constant for unit of concentr: katal + * @draft ICU 78 + */ + public static final MeasureUnit KATAL = MeasureUnit.internalGetInstance("concentr", "katal"); + /** * Constant for unit of concentr: milligram-ofglucose-per-deciliter * @stable ICU 69 @@ -1170,9 +1201,10 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, /** * Constant for unit of concentr: milligram-per-deciliter + * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69). * @stable ICU 57 */ - public static final MeasureUnit MILLIGRAM_PER_DECILITER = MeasureUnit.internalGetInstance("concentr", "milligram-per-deciliter"); + public static final MeasureUnit MILLIGRAM_PER_DECILITER = MeasureUnit.internalGetInstance("concentr", "milligram-ofglucose-per-deciliter"); /** * Constant for unit of concentr: millimole-per-liter @@ -1186,6 +1218,37 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit MOLE = MeasureUnit.internalGetInstance("concentr", "mole"); + /** + * Constant for unit of concentr: ofglucose + * @draft ICU 78 + */ + public static final MeasureUnit OFGLUCOSE = MeasureUnit.internalGetInstance("concentr", "ofglucose"); + + /** + * Constant for unit of concentr: part + * @draft ICU 78 + */ + public static final MeasureUnit PART = MeasureUnit.internalGetInstance("concentr", "part"); + + /** + * Constant for unit of concentr: part-per-1e6 + * @draft ICU 78 + */ + public static final MeasureUnit PART_PER_1E6 = MeasureUnit.internalGetInstance("concentr", "part-per-1e6"); + + /** + * Constant for unit of concentr: part-per-million + * (renamed to part-per-1e6 in CLDR 48 / ICU 78). + * @stable ICU 57 + */ + public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "part-per-1e6"); + + /** + * Constant for unit of concentr: part-per-1e9 + * @draft ICU 78 + */ + public static final MeasureUnit PART_PER_1E9 = MeasureUnit.internalGetInstance("concentr", "part-per-1e9"); + /** * Constant for unit of concentr: percent * @stable ICU 63 @@ -1198,24 +1261,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit PERMILLE = MeasureUnit.internalGetInstance("concentr", "permille"); - /** - * Constant for unit of concentr: permillion - * @stable ICU 57 - */ - public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "permillion"); - /** * Constant for unit of concentr: permyriad * @stable ICU 64 */ public static final MeasureUnit PERMYRIAD = MeasureUnit.internalGetInstance("concentr", "permyriad"); - /** - * Constant for unit of concentr: portion-per-1e9 - * @draft ICU 77 - */ - public static final MeasureUnit PORTION_PER_1E9 = MeasureUnit.internalGetInstance("concentr", "portion-per-1e9"); - /** * Constant for unit of consumption: liter-per-100-kilometer * @stable ICU 56 @@ -1330,6 +1381,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit DECADE = MeasureUnit.internalGetInstance("duration", "decade"); + /** + * Constant for unit of duration: fortnight + * @draft ICU 78 + */ + public static final MeasureUnit FORTNIGHT = MeasureUnit.internalGetInstance("duration", "fortnight"); + /** * Constant for unit of duration: hour * @stable ICU 4.0 @@ -1420,6 +1477,24 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit AMPERE = MeasureUnit.internalGetInstance("electric", "ampere"); + /** + * Constant for unit of electric: coulomb + * @draft ICU 78 + */ + public static final MeasureUnit COULOMB = MeasureUnit.internalGetInstance("electric", "coulomb"); + + /** + * Constant for unit of electric: farad + * @draft ICU 78 + */ + public static final MeasureUnit FARAD = MeasureUnit.internalGetInstance("electric", "farad"); + + /** + * Constant for unit of electric: henry + * @draft ICU 78 + */ + public static final MeasureUnit HENRY = MeasureUnit.internalGetInstance("electric", "henry"); + /** * Constant for unit of electric: milliampere * @stable ICU 54 @@ -1432,24 +1507,48 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit OHM = MeasureUnit.internalGetInstance("electric", "ohm"); + /** + * Constant for unit of electric: siemens + * @draft ICU 78 + */ + public static final MeasureUnit SIEMENS = MeasureUnit.internalGetInstance("electric", "siemens"); + /** * Constant for unit of electric: volt * @stable ICU 54 */ public static final MeasureUnit VOLT = MeasureUnit.internalGetInstance("electric", "volt"); + /** + * Constant for unit of energy: becquerel + * @draft ICU 78 + */ + public static final MeasureUnit BECQUEREL = MeasureUnit.internalGetInstance("energy", "becquerel"); + /** * Constant for unit of energy: british-thermal-unit * @stable ICU 64 */ public static final MeasureUnit BRITISH_THERMAL_UNIT = MeasureUnit.internalGetInstance("energy", "british-thermal-unit"); + /** + * Constant for unit of energy: british-thermal-unit-it + * @draft ICU 78 + */ + public static final MeasureUnit BRITISH_THERMAL_UNIT_IT = MeasureUnit.internalGetInstance("energy", "british-thermal-unit-it"); + /** * Constant for unit of energy: calorie * @stable ICU 54 */ public static final MeasureUnit CALORIE = MeasureUnit.internalGetInstance("energy", "calorie"); + /** + * Constant for unit of energy: calorie-it + * @draft ICU 78 + */ + public static final MeasureUnit CALORIE_IT = MeasureUnit.internalGetInstance("energy", "calorie-it"); + /** * Constant for unit of energy: electronvolt * @stable ICU 64 @@ -1462,6 +1561,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit FOODCALORIE = MeasureUnit.internalGetInstance("energy", "foodcalorie"); + /** + * Constant for unit of energy: gray + * @draft ICU 78 + */ + public static final MeasureUnit GRAY = MeasureUnit.internalGetInstance("energy", "gray"); + /** * Constant for unit of energy: joule * @stable ICU 54 @@ -1486,12 +1591,24 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit KILOWATT_HOUR = MeasureUnit.internalGetInstance("energy", "kilowatt-hour"); + /** + * Constant for unit of energy: sievert + * @draft ICU 78 + */ + public static final MeasureUnit SIEVERT = MeasureUnit.internalGetInstance("energy", "sievert"); + /** * Constant for unit of energy: therm-us * @stable ICU 65 */ public static final MeasureUnit THERM_US = MeasureUnit.internalGetInstance("energy", "therm-us"); + /** + * Constant for unit of force: kilogram-force + * @draft ICU 78 + */ + public static final MeasureUnit KILOGRAM_FORCE = MeasureUnit.internalGetInstance("force", "kilogram-force"); + /** * Constant for unit of force: kilowatt-hour-per-100-kilometer * @stable ICU 70 @@ -1594,6 +1711,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit CENTIMETER = MeasureUnit.internalGetInstance("length", "centimeter"); + /** + * Constant for unit of length: chain + * @draft ICU 78 + */ + public static final MeasureUnit CHAIN = MeasureUnit.internalGetInstance("length", "chain"); + /** * Constant for unit of length: decimeter * @stable ICU 54 @@ -1630,6 +1753,18 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit INCH = MeasureUnit.internalGetInstance("length", "inch"); + /** + * Constant for unit of length: jo-jp + * @draft ICU 78 + */ + public static final MeasureUnit JO_JP = MeasureUnit.internalGetInstance("length", "jo-jp"); + + /** + * Constant for unit of length: ken + * @draft ICU 78 + */ + public static final MeasureUnit KEN = MeasureUnit.internalGetInstance("length", "ken"); + /** * Constant for unit of length: kilometer * @stable ICU 53 @@ -1702,12 +1837,48 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit POINT = MeasureUnit.internalGetInstance("length", "point"); + /** + * Constant for unit of length: ri-jp + * @draft ICU 78 + */ + public static final MeasureUnit RI_JP = MeasureUnit.internalGetInstance("length", "ri-jp"); + + /** + * Constant for unit of length: rin + * @draft ICU 78 + */ + public static final MeasureUnit RIN = MeasureUnit.internalGetInstance("length", "rin"); + + /** + * Constant for unit of length: rod + * @draft ICU 78 + */ + public static final MeasureUnit ROD = MeasureUnit.internalGetInstance("length", "rod"); + + /** + * Constant for unit of length: shaku-cloth + * @draft ICU 78 + */ + public static final MeasureUnit SHAKU_CLOTH = MeasureUnit.internalGetInstance("length", "shaku-cloth"); + + /** + * Constant for unit of length: shaku-length + * @draft ICU 78 + */ + public static final MeasureUnit SHAKU_LENGTH = MeasureUnit.internalGetInstance("length", "shaku-length"); + /** * Constant for unit of length: solar-radius * @stable ICU 64 */ public static final MeasureUnit SOLAR_RADIUS = MeasureUnit.internalGetInstance("length", "solar-radius"); + /** + * Constant for unit of length: sun + * @draft ICU 78 + */ + public static final MeasureUnit SUN = MeasureUnit.internalGetInstance("length", "sun"); + /** * Constant for unit of length: yard * @stable ICU 53 @@ -1738,6 +1909,18 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit SOLAR_LUMINOSITY = MeasureUnit.internalGetInstance("light", "solar-luminosity"); + /** + * Constant for unit of magnetic: tesla + * @draft ICU 78 + */ + public static final MeasureUnit TESLA = MeasureUnit.internalGetInstance("magnetic", "tesla"); + + /** + * Constant for unit of magnetic: weber + * @draft ICU 78 + */ + public static final MeasureUnit WEBER = MeasureUnit.internalGetInstance("magnetic", "weber"); + /** * Constant for unit of mass: carat * @stable ICU 54 @@ -1756,6 +1939,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit EARTH_MASS = MeasureUnit.internalGetInstance("mass", "earth-mass"); + /** + * Constant for unit of mass: fun + * @draft ICU 78 + */ + public static final MeasureUnit FUN = MeasureUnit.internalGetInstance("mass", "fun"); + /** * Constant for unit of mass: grain * @stable ICU 68 @@ -1774,14 +1963,6 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit KILOGRAM = MeasureUnit.internalGetInstance("mass", "kilogram"); - /** - * Constant for unit of mass: metric-ton (renamed to tonne in CLDR 42 / ICU 72). - * Note: In ICU 74 this will be deprecated in favor of TONNE, which is currently - * draft but will become stable in ICU 74, and which uses the preferred naming. - * @stable ICU 54 - */ - public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance("mass", "tonne"); - /** * Constant for unit of mass: microgram * @stable ICU 54 @@ -1812,6 +1993,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit POUND = MeasureUnit.internalGetInstance("mass", "pound"); + /** + * Constant for unit of mass: slug + * @draft ICU 78 + */ + public static final MeasureUnit SLUG = MeasureUnit.internalGetInstance("mass", "slug"); + /** * Constant for unit of mass: solar-mass * @stable ICU 64 @@ -1836,6 +2023,15 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit TONNE = MeasureUnit.internalGetInstance("mass", "tonne"); + /** + * Constant for unit of mass: metric-ton + * (renamed to tonne in CLDR 42 / ICU 72). + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance("mass", "tonne"); + /** * Constant for unit of power: gigawatt * @stable ICU 54 @@ -1926,6 +2122,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit MILLIMETER_OF_MERCURY = MeasureUnit.internalGetInstance("pressure", "millimeter-ofhg"); + /** + * Constant for unit of pressure: ofhg + * @draft ICU 78 + */ + public static final MeasureUnit OFHG = MeasureUnit.internalGetInstance("pressure", "ofhg"); + /** * Constant for unit of pressure: pascal * @stable ICU 65 @@ -1998,6 +2200,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit KELVIN = MeasureUnit.internalGetInstance("temperature", "kelvin"); + /** + * Constant for unit of temperature: rankine + * @draft ICU 78 + */ + public static final MeasureUnit RANKINE = MeasureUnit.internalGetInstance("temperature", "rankine"); + /** * Constant for unit of torque: newton-meter * @stable ICU 64 @@ -2082,6 +2290,18 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit CUP = MeasureUnit.internalGetInstance("volume", "cup"); + /** + * Constant for unit of volume: cup-imperial + * @draft ICU 78 + */ + public static final MeasureUnit CUP_IMPERIAL = MeasureUnit.internalGetInstance("volume", "cup-imperial"); + + /** + * Constant for unit of volume: cup-jp + * @draft ICU 78 + */ + public static final MeasureUnit CUP_JP = MeasureUnit.internalGetInstance("volume", "cup-jp"); + /** * Constant for unit of volume: cup-metric * @stable ICU 56 @@ -2130,6 +2350,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit FLUID_OUNCE_IMPERIAL = MeasureUnit.internalGetInstance("volume", "fluid-ounce-imperial"); + /** + * Constant for unit of volume: fluid-ounce-metric + * @draft ICU 78 + */ + public static final MeasureUnit FLUID_OUNCE_METRIC = MeasureUnit.internalGetInstance("volume", "fluid-ounce-metric"); + /** * Constant for unit of volume: gallon * @stable ICU 54 @@ -2154,6 +2380,18 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit JIGGER = MeasureUnit.internalGetInstance("volume", "jigger"); + /** + * Constant for unit of volume: koku + * @draft ICU 78 + */ + public static final MeasureUnit KOKU = MeasureUnit.internalGetInstance("volume", "koku"); + + /** + * Constant for unit of volume: kosaji + * @draft ICU 78 + */ + public static final MeasureUnit KOSAJI = MeasureUnit.internalGetInstance("volume", "kosaji"); + /** * Constant for unit of volume: liter * @stable ICU 53 @@ -2172,6 +2410,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit MILLILITER = MeasureUnit.internalGetInstance("volume", "milliliter"); + /** + * Constant for unit of volume: osaji + * @draft ICU 78 + */ + public static final MeasureUnit OSAJI = MeasureUnit.internalGetInstance("volume", "osaji"); + /** * Constant for unit of volume: pinch * @stable ICU 68 @@ -2184,6 +2428,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit PINT = MeasureUnit.internalGetInstance("volume", "pint"); + /** + * Constant for unit of volume: pint-imperial + * @draft ICU 78 + */ + public static final MeasureUnit PINT_IMPERIAL = MeasureUnit.internalGetInstance("volume", "pint-imperial"); + /** * Constant for unit of volume: pint-metric * @stable ICU 56 @@ -2202,6 +2452,18 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit QUART_IMPERIAL = MeasureUnit.internalGetInstance("volume", "quart-imperial"); + /** + * Constant for unit of volume: sai + * @draft ICU 78 + */ + public static final MeasureUnit SAI = MeasureUnit.internalGetInstance("volume", "sai"); + + /** + * Constant for unit of volume: shaku + * @draft ICU 78 + */ + public static final MeasureUnit SHAKU = MeasureUnit.internalGetInstance("volume", "shaku"); + /** * Constant for unit of volume: tablespoon * @stable ICU 54 @@ -2214,6 +2476,12 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName, */ public static final MeasureUnit TEASPOON = MeasureUnit.internalGetInstance("volume", "teaspoon"); + /** + * Constant for unit of volume: to-jp + * @draft ICU 78 + */ + public static final MeasureUnit TO_JP = MeasureUnit.internalGetInstance("volume", "to-jp"); + // End generated MeasureUnit constants /* Private */ diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java b/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java index a53af68a6d94..4eca489fd358 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/util/PersianCalendar.java @@ -489,6 +489,16 @@ protected void handleComputeFields(int julianDay) { internalSet(DAY_OF_YEAR, dayOfYear); } + private static final int PERSIAN_CALENDAR_RELATED_YEAR_DIFFERENCE = 622; + /** + * @internal + * @deprecated This API is ICU internal only. + */ + @Deprecated + protected final int getRelatedYearDifference() { + return PERSIAN_CALENDAR_RELATED_YEAR_DIFFERENCE; + } + /** * {@inheritDoc} * diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af.res index 90449c371969..3ff2549417e7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_NA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_NA.res index 25b9523ae259..6b45d1d9cc13 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_NA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_NA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_ZA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/af_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq.res index cf08b871547d..4486d038d93c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/agq_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak.res index 4fcf51cfad49..8828e706a1d1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak_GH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ak_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am.res index 194ac39e4856..be88ef4d1479 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am_ET.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am_ET.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am_ET.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/am_ET.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar.res index f51770c96c70..8093583cac0c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_001.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_AE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_AE.res index 6f55a112281f..2ef706d85085 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_AE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_AE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_BH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_BH.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_BH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_BH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DJ.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DZ.res index 5fcdf63ef4d6..e91cc8a8529e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_DZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EG.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EH.res index 70953eddfe3d..c36e31c7d5ff 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_EH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_ER.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_ER.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_ER.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_ER.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IL.res index 619ee4af85cf..6f56f914eea8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IQ.res index feccff63a0ed..7b7781917e18 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_IQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_JO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_JO.res index c65eb8676bc2..987235c1f479 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_JO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_JO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KM.res index c28239a84b06..20ba8383e465 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KW.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_KW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LB.res index d96f279730ee..e766fe979422 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LY.res index 5267395c4362..0db6b7fc886c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_LY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MA.res index 386ebf7b6d9f..bfbd96f4f59c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MR.res index b918ce9c513c..835fe7d05955 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_OM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_OM.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_OM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_OM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_PS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_PS.res index c65eb8676bc2..987235c1f479 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_PS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_PS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_QA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_QA.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_QA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_QA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SA.res index 747f3ea20318..7a0341412882 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SD.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SO.res index 884508820236..5cc5aceeea7e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SS.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SY.res index c65eb8676bc2..987235c1f479 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TD.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TN.res index 5fcdf63ef4d6..e91cc8a8529e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_TN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_YE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_YE.res index c6e5106cc382..d624e35c7ba3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_YE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ar_YE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ars.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ars.res index c7452411dbd3..ba90ce0f8e15 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ars.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ars.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as.res index 4ad7ef5de120..44644ff3a4d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/as_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa.res index 323ec4cd41e5..dce8af15b9cc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/asa_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast.res index ecb9a3e90ef1..a9a123d0b0bd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast_ES.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ast_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az.res index 6e867645bc6c..6761efcba67e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_AZ.res index ac3b0ae15bc4..2f9dfa0b36c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl.res index 0ad579a82823..4d6093c9ad71 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl_AZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Cyrl_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn_AZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/az_Latn_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas.res index 9736694ecf94..6fcc54abe7b2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bas_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be.res index c8cf34d3ab98..23423ff4e190 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be_BY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be_BY.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be_BY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/be_BY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem.res index 7a3da2ae8f76..c8479e4cb11e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem_ZM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem_ZM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem_ZM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bem_ZM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez.res index e88561b206a5..101ed15e0f84 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bez_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg.res index 30435128c530..f32a3b67c105 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg_BG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg_BG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg_BG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bg_BG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc.res index 632ba61a38dc..09fa7102e9d3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bgc_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho.res index 6f4cf21b3ad2..9ceba154970d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bho_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo.res index 996be99f7340..9aee9e9cfe49 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo_BJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo_BJ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo_BJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/blo_BJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm.res index a7b4761fccb6..d1653e8ca0de 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm_ML.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm_ML.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm_ML.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bm_ML.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn.res index da54287cb70f..9778661b810b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_BD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_BD.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_BD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_BD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_IN.res index 584fe205018c..ecaec23dbaed 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo.res index 8f1bf10b966b..5dccaceda220 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_CN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_IN.res index 1721ea217953..e9acf11c1ba8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bo_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br.res index 19ff38957a92..283ed351c8d0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br_FR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/br_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/fi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/fi.res deleted file mode 100644 index 61c3a025fed5..000000000000 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/fi.res and /dev/null differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/res_index.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/res_index.res index d09052f87c6e..1def2eb4d0f2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/res_index.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/res_index.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/root.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/root.res index 97d95fe55ef8..adc3f0ea0cf6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/root.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/root.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/sv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/sv.res deleted file mode 100644 index 61c3a025fed5..000000000000 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/sv.res and /dev/null differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx.res index a7da8fc2fe6a..26a6237f0ecd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brx_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs.res index e1164d2e2336..b8e2d69128f4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_BA.res index 95e5a4154966..d092fa2f73e5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl.res index 91b759a21f6c..7e63cfa4eaf9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl_BA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Cyrl_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn_BA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/bs_Latn_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca.res index 971fa1f169d7..a3608fb8b8e0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_AD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_AD.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_AD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_AD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_ES.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_FR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ca_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp.res index e444300a7ce3..8c5139ed4e41 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_BD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_BD.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_BD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_BD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ccp_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce.res index d7d5b29c5f3c..c3004b5b3556 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce_RU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce_RU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce_RU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ce_RU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb.res index c68354e696d4..c68bfaadfa94 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb_PH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ceb_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg.res index 84877d5e0748..29ed028f9c41 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg_UG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cgg_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr.res index 816c94aba9b7..dc1a1a542ac0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr_US.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/chr_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb.res index e272f1ce1803..a0d4be803345 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IQ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IR.res index 170217f6b629..34c709376a0a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ckb_IR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs.res index 45b96cd0ac74..d52ab41aa3d2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs_CZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs_CZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs_CZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cs_CZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw.res index 8e8135d3fb1a..cc54d57d8f36 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw_CA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/csw_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv.res index 9f0bf08c9fcc..4d050cb286c7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv_RU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv_RU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv_RU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cv_RU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy.res index 66312ffa9a0c..ed9609109c17 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy_GB.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cy_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da.res index accf96dd94c2..8e8c26a4ecc2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_DK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_DK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_DK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_DK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_GL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_GL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_GL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/da_GL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav.res index 40b831b9fb82..649f95712151 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dav_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de.res index 7f64191f03b3..93907d06cf85 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_AT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_AT.res index dc7107b11f1c..2500e27e8fb4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_AT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_AT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_BE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_BE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_BE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_BE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_CH.res index 9ad97bedf86c..790f31baac69 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_DE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_IT.res index 6837ba87a97c..e35d8f18f4ef 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LI.res index 0b2673160b84..1d68f743957c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LU.res index 8bcc482d5c5c..93c62fba285b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/de_LU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje.res index 252e96870989..a1d1a3ac72b5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje_NE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje_NE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje_NE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dje_NE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi.res index b0224aa2ee97..bde8ebc98978 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/doi_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb.res index 1f39e5556805..d71f6e172fd8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb_DE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dsb_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua.res index 5a5d0ee8e5c4..77890faad620 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dua_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo.res index a0774a732ad9..49efd7fa3961 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo_SN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dyo_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz.res index e3bfe6a5c9d7..f94d8945ab0a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz_BT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz_BT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz_BT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/dz_BT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu.res index 02eed81e7cef..cccb22d80b85 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ebu_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee.res index d5c9df4beec8..c02005f133a1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_GH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_TG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_TG.res index 33c17d76da10..2b4040b022ae 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_TG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ee_TG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el.res index 13be573b7be7..849bef881f87 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_CY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_CY.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_CY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_CY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_GR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_GR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_GR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/el_GR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en.res index f26b0a8cde1b..90766a31107a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_001.res index 298df7519a16..447c191fe9f3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_150.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_150.res index 1e8fa3636f6c..52b6c309a2fa 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_150.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_150.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AE.res index 3ccf8d55e91a..79e594f59f6a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AG.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AI.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AS.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AT.res index a403c0916085..bedef63635ec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AU.res index 300b42088e1e..2a38a765c7be 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_AU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BB.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BE.res index 1b3e9cb93891..edc14e6941d9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BI.res index c12abde377c0..6556b6ab0db6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BM.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BS.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BW.res index b85d50969ee2..a9f2e3dbd4fb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BZ.res index f13e304a0e65..3bb4733b8a5f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_BZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CA.res index 33108ec68f90..45214eb38a95 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CC.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CH.res index f8ddf32d83d1..d973a1fc8e8f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CK.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CM.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CX.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CY.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CZ.res index 3910d131a199..bdfe749f1d43 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_CZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DE.res index ba2ec818b899..428c0e401a59 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DG.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DK.res index 49842d3732ad..092d5f8ca374 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DM.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_DM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ER.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ER.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ER.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ER.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ES.res index a793b2430b36..81105dfbbb06 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FI.res index f45641a1f74f..509585c52ac9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FJ.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FK.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FM.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FR.res index 0dbe6d16e95f..1a38d2440df5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GB.res index cde0ce9a009c..2888a34724fc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GD.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GG.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GH.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GI.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GM.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GS.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GY.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_GY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HK.res index 556e1097ee13..428d3e5ea4e2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HU.res index 3910d131a199..bdfe749f1d43 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_HU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ID.res index 411891ee480a..c5973f0de849 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IE.res index 96d575bf48de..295a17c187b1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IL.res index 969af7ee202a..0477cd2cdb4e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IM.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IN.res index 98d7aea38aa6..abbee3997ee5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IO.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IT.res index a793b2430b36..81105dfbbb06 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JE.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JM.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_JM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KE.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KI.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KN.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KY.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_KY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LC.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LR.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LS.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_LS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MG.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MO.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MP.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MS.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MT.res index 1c08be1dfeac..a6d013f44a21 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MU.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MV.res index 47199417e8b2..9dc9a62fb7d0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MW.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MY.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NA.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NF.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NG.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NH.res index 8804aca909e9..a9d0d8c2c7aa 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NL.res index 8acccdaa718c..2ae4a1f90383 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NO.res index 571c7e5656e0..1e76751fd36a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NR.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NU.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NZ.res index ff96c7a4218f..8531014f1f10 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_NZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PG.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PK.res index 0ddbde6874fe..9ce674e63db1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PL.res index fa87ae181719..52256464129d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PN.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PT.res index 4e59a58e1e92..8c3107fe80d7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PW.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_PW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RH.res index 853519bc50ea..33adbe30264e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RO.res index fa87ae181719..52256464129d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RW.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_RW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SB.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SC.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SD.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SE.res index a3a3379e66ad..4fb3583e612f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SG.res index a79d444edd26..fdacbc2e6dde 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SH.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SI.res index 4f32dbb14642..632048bcaec0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SK.res index 938e78cecc1e..eda7eb060e04 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SL.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SS.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SX.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SZ.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_SZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TC.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TK.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TO.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TT.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TV.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TZ.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UG.res index 730d5d4b81e5..4e2d99af4332 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_UM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US_POSIX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US_POSIX.res index b8ce94a6df8d..c3f6423ec357 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US_POSIX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_US_POSIX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VC.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VG.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VU.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_VU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_WS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_WS.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_WS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_WS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZA.res index 6aec71f777bd..4efc48517392 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZM.res index 722e154084b2..9c7ec6356642 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZW.res index bb62a2d2f186..18766a3793d4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/en_ZW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo.res index 74937f7b49f9..cacb75d7b60b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo_001.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eo_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es.res index 3fca36380d7b..e8054e8a9823 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_419.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_419.res index 8a9cbf591365..a37476706b34 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_419.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_419.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_AR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_AR.res index 31d2360834fb..063467c336fc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_AR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_AR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BO.res index 09f44a8f50a6..74032bf9232b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BR.res index 4b65dc9e871d..8776ecc93e3c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BZ.res index 4b65dc9e871d..8776ecc93e3c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_BZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CL.res index 9c62fa1df459..b72460051ac0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CO.res index 6badeb618ad8..c36e0b2b1cb2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CR.res index 21fd8e424c0e..d2b95a39f058 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CU.res index 163fcfa0589b..1e6ff1217b87 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_CU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_DO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_DO.res index 307bd41b3cc9..d464958aba77 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_DO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_DO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EC.res index 22f674245af5..f5dfeb86f723 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_EC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_ES.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GQ.res index 0a4ecb157e3a..44d3cf360d65 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GT.res index 989bce923348..de4cb13b9861 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_GT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_HN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_HN.res index f1fca05e5817..e0787868ee0a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_HN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_HN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_IC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_IC.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_IC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_IC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_MX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_MX.res index 345c1997d253..7d670d6f5e75 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_MX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_MX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_NI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_NI.res index aabaf0100123..fc91c6b35521 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_NI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_NI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PA.res index d0b6458716a3..b724da6660ad 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PE.res index 3c8768b24ae9..bd96119b584e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PH.res index 9950f3b4c019..1a6ffdef5663 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PR.res index c7db81abff39..cf25ea0b45df 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PY.res index 880b9cc9032a..8d369d1d8f18 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_PY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_SV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_SV.res index a56ac5559077..f8ba03e4007e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_SV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_SV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_US.res index e153eb69de4f..3dc1c32f8aff 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_UY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_UY.res index 719e5497de07..d889dd86afc2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_UY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_UY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_VE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_VE.res index 86ad88e9a9ca..54bbc70b183e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_VE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/es_VE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et.res index 34c972d64f5e..adb67b8301bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et_EE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et_EE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et_EE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/et_EE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu.res index b91308aab792..4150c9b490d0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu_ES.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/eu_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo.res index ae9d85025d45..349ef4147b49 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ewo_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa.res index 5e633d5b27f0..c40ca14dc3f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_AF.res index cdfcbd2d2593..7169a04394fd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_IR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_IR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_IR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fa_IR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff.res index 14ba44d92232..dfe91ea7c603 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm.res index e2b631030f2b..0650854731a6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_BF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_BF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_BF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_BF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GH.res index f4394fbe24f8..143a070ecaf6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GM.res index f4394fbe24f8..143a070ecaf6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_GW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_LR.res index f4394fbe24f8..143a070ecaf6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_MR.res index f4394fbe24f8..143a070ecaf6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SL.res index f4394fbe24f8..143a070ecaf6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Adlm_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_CM.res index 56b0ab686c51..558dc1e5e196 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_GN.res index 839b1d18dfea..c6a838e0a6bd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_BF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_BF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_BF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_BF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GH.res index 6851f17385ac..4e637e83bded 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GM.res index 6851f17385ac..4e637e83bded 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_GW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_LR.res index 6851f17385ac..4e637e83bded 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_MR.res index 6851f17385ac..4e637e83bded 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SL.res index 6851f17385ac..4e637e83bded 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_Latn_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_MR.res index cf46699e876e..9d9aa0fe7f57 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_SN.res index 9bf25e0bf59a..c4428efcd01b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ff_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi.res index e10f6d384411..0188e3b48d53 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi_FI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fi_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil.res index 2b0a882f8d7e..23dcb6140964 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil_PH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fil_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo.res index 0f7993fd7a5d..f58ae28e4f0b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_DK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_DK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_DK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_DK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_FO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_FO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_FO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fo_FO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr.res index 475abffbca5e..d8d81920b4de 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BE.res index b5bd1e1473fd..8e83e47f6cfb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BJ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_BL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CA.res index 563e18cb144f..efbafbea2538 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CD.res index 9eff55162bbc..7bdf07e6392d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CH.res index a62144de0a76..176be0734939 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CI.res index 127824610050..5c564356c567 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CM.res index 210b93c56204..a11f0e3f4728 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DJ.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DZ.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_DZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_FR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GP.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GQ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_GQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_HT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_HT.res index 0c3efa85ab8f..775029762529 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_HT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_HT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_KM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_KM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_KM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_KM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_LU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_LU.res index 647a6723bd34..e5601da5a827 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_LU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_LU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MA.res index 22ad2b0029c0..cc94665ad3e8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MC.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_ML.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_ML.res index 76fc822118ef..dcbbd3678853 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_ML.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_ML.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MQ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MR.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_MU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NC.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_NE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_PM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RE.res index f45389fce321..c35cab10105d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_RW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SC.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SN.res index f24c2922a960..0ad03dcf8f63 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SY.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TD.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TN.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_TN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_VU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_VU.res index b988d75b389e..3769dfed645d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_VU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_VU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_WF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_WF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_WF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_WF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_YT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_YT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_YT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fr_YT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur.res index 57a3f95a48be..f32081427149 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fur_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy.res index d4c40083ba2c..662fb7351154 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy_NL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy_NL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy_NL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/fy_NL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga.res index 3d0ab42dcfcc..791290956837 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_GB.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_IE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_IE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_IE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ga_IE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa.res index 01008d38e171..1902233b75c5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa_GH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gaa_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd.res index 0092ad9cf0f0..4feaaa869f2e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd_GB.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gd_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl.res index 5020069f228e..2cadd8254947 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl_ES.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gl_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw.res index 00680f732c40..7d5750f7aa39 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_CH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_FR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_LI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_LI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_LI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gsw_LI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu.res index ad1a0d0b70e1..6118f2932ad3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gu_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz.res index 6c3dd9450b06..c0d6d14b306f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/guz_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv.res index 67c608043e8d..221376dd2ba8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv_IM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv_IM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv_IM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/gv_IM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha.res index 5488b8d7af29..35992ec02ca7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_GH.res index e1a3c3d01f8b..a50eaec36ebc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NE.res index a90fe834d771..adb88101ef5c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ha_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw.res index 9874f8ca3199..d24841c0eb2b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw_US.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/haw_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he.res index 9ed3df83280f..b925da60d725 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he_IL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/he_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi.res index dd629b608c15..f899af98a906 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn.res index cc5121ce0a3c..6c58d2c7516b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hi_Latn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr.res index 6d17be70e417..9a3acb30bec8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_BA.res index 93ab093637f6..80b2f93d3963 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_HR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_HR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_HR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hr_HR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb.res index c90375d3cc09..b2b581ec2423 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb_DE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hsb_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu.res index 15b04acb2294..b84c3fab45c1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu_HU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu_HU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu_HU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hu_HU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy.res index 7e041b012d17..75186a64f5d2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy_AM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy_AM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy_AM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/hy_AM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia.res index d356757767a0..14bf49c6db00 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia_001.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ia_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/icuver.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/icuver.res index 24ba3b23e35a..1f341c6c961f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/icuver.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/icuver.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id.res index 9c541dedbd22..bfb9051d2dd8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id_ID.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/id_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie.res index 0bbbfdfd22a4..6814328982ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie_EE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie_EE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie_EE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ie_EE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig.res index 9a869058bb1f..aedb3445637d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig_NG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ig_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii.res index 430276905b81..82d84e5f7333 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii_CN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ii_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in.res index 0efb29497b29..bf0aa9d1fe8e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in_ID.res index b102acf9f434..5a939e39de0e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/in_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is.res index f09037735389..62cb79a1a853 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is_IS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is_IS.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is_IS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/is_IS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it.res index 609a8d5c7d96..1293fa220e03 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_CH.res index 33b393466cbf..9030c8c08e3c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_SM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_SM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_SM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_SM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_VA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_VA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_VA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/it_VA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw.res index fe08dd5a5df3..b1c41791b1d3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw_IL.res index f9ae7acbea7f..45b4cb7d3825 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/iw_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja.res index d7d9f4350395..3e38a863e4db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP_TRADITIONAL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP_TRADITIONAL.res index 5f16b41f4d9c..9ac316df24e7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP_TRADITIONAL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ja_JP_TRADITIONAL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo.res index 9b3859840f9c..be2b7a457369 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jgo_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc.res index 79a4d4665ea2..77b46f830b3d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jmc_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv.res index 5f588c77dfb0..e70f98bf377e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv_ID.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/jv_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka.res index b4d5d354e4e5..7cc3d625f861 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka_GE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka_GE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka_GE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ka_GE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab.res index db701f359119..1f7ef5f4baa0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab_DZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab_DZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab_DZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kab_DZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam.res index f76e0cc96407..198bb020d297 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kam_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde.res index a8eb31e0116f..5d7c09f6bc57 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kde_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea.res index f529bd2ece1d..d3df7c262082 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea_CV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea_CV.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea_CV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kea_CV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp.res index 323af181a5a7..3d69843d373b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp_BR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp_BR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp_BR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kgp_BR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq.res index 7111e2b73106..6d40f26c369d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq_ML.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq_ML.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq_ML.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/khq_ML.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki.res index f8587610e402..e64e70f93cba 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ki_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk.res index d0445f50790a..3fdf1293ef99 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl_KZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl_KZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl_KZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_Cyrl_KZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_KZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_KZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_KZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kk_KZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj.res index bd96e955edfd..b03c6715d4b0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kkj_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl.res index f6310b32778e..abaed5750ca3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl_GL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl_GL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl_GL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kl_GL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln.res index 343795c50612..6b176b10547d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kln_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km.res index 085fd068cb32..11adf238978f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km_KH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km_KH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km_KH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/km_KH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn.res index 98155991dcff..3f4b07901437 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko.res index c90ffbb44a39..cef90a635633 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_CN.res index ea9285c030b8..20993b848a63 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KP.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ko_KR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok.res index 21d9896d15c6..a26ee64f2f8e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Deva_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn.res index 26ec92a2d239..34c3f29b1579 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kok_Latn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks.res index 2072741604d7..524622b65cb0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Arab_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva.res index 2532cc39aa8a..ca2a3e3d2803 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_Deva_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_IN.res index affcb86b52de..aecb5c349e0d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ks_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb.res index 9c7d8fb0565f..f1e69126edc3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksb_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf.res index 1ffbbeed541b..2c906e749227 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksf_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh.res index 945617d2293d..f39f2b4d5638 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh_DE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ksh_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku.res index 28286a6d6e3c..d71a046d3252 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn.res new file mode 100644 index 000000000000..3abb9a92b5db Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_IQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_IQ.res new file mode 100644 index 000000000000..3abb9a92b5db Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_IQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_SY.res new file mode 100644 index 000000000000..3abb9a92b5db Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_TR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_TR.res new file mode 100644 index 000000000000..3abb9a92b5db Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_Latn_TR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_SY.res new file mode 100644 index 000000000000..9283f03912a4 Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_TR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_TR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_TR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ku_TR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw.res index 0ca240b08b8e..c3a6b8a7f066 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw_GB.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kw_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv.res index 9cf58e1b72a8..882f9cc84cf4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva.res index cab1cc221455..c13cea6225bd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Deva_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_IN.res index 8526b93ab2f3..ab42971162cf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Latn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya.res index 2ebffe10535d..3802708838e6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Orya_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu.res index b33ccaf3c389..c3d51c29f5a8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/kxv_Telu_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky.res index 091a384b1126..fb97c8e22bcd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky_KG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky_KG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky_KG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ky_KG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag.res index a96a7d697923..fb3bfabedc05 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lag_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/langInfo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/langInfo.res index 746ae5354e1b..688264e1c15f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/langInfo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/langInfo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb.res index 92dad6eeaf5b..c025c64a16c2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb_LU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb_LU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb_LU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lb_LU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg.res index 5123d57a7996..865bc84523a1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg_UG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lg_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij.res index c9ec730631ca..797ad044178f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lij_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt.res index 7178e58c5beb..ae9447876794 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt_US.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lkt_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo.res index e4f14d7da49b..d30bdc335602 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lmo_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln.res index 14fa1b049fec..757fcc8b52e6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_AO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_AO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_AO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_AO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CD.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ln_CG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo.res index cccf10ead10b..6e6c5cfb68b1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo_LA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo_LA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo_LA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lo_LA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc.res index 5b47ab9d07bf..4fbd1da6a272 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IQ.res index 15990ed993e8..f8423db5be31 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lrc_IR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt.res index bd05d36733c5..4a50b87f0f43 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt_LT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt_LT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt_LT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lt_LT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu.res index 1bb6db0996ed..4612264a4e24 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu_CD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu_CD.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu_CD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lu_CD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo.res index 56f8380b33fa..e5b2818e601f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luo_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy.res index 98cc427ff4a6..7bc5288b4969 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/luy_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv.res index 0243c2b56e87..4ab49abba8f7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv_LV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv_LV.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv_LV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lv_LV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai.res index e0bd866af9d9..bad75c2a3217 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mai_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas.res index 7280b1855331..1f97884cf24a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mas_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer.res index 34df19d1fbcb..5b0dd13a6edc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mer_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res index 80ae1508b959..7b1076b17c29 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metaZones.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metadata.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metadata.res index c9787249e273..1497534d1610 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metadata.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/metadata.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe.res index 3578418c08a4..09ffab6ceaee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe_MU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe_MU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe_MU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mfe_MU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg.res index 4fc9e3e1ab36..f1bb58bbe4cb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg_MG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg_MG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg_MG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mg_MG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh.res index c29c8b00722c..84d196f1080c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh_MZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh_MZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh_MZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgh_MZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo.res index 4b6f6165a790..3a78379baf2c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mgo_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi.res index 62bb1650a430..b47b02d789c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi_NZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi_NZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi_NZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mi_NZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk.res index d918fb01d611..16ca7e1ba164 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk_MK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk_MK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk_MK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mk_MK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml.res index e8b10e459d9f..ab172e0a40ce 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ml_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn.res index ab96eb143085..1f8b6362c41f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn_MN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn_MN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn_MN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mn_MN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni.res index 2e064ff42259..c87e7b44f23e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_Beng_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_IN.res index 7a7094c70e8c..fe85f007cb63 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mni_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mo.res index 8b8d3f630553..3c4a1ecb2541 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr.res index a3f4c7770893..c9701e75d48f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mr_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms.res index ebb8cca796a0..2fbdc4b0f702 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_BN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_BN.res index a0f9a325b674..2d17b7c297bc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_BN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_BN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_ID.res index 2e0b423909d2..82b90739b250 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_MY.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_SG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ms_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt.res index 8138ec991bef..bf7b32ae610d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt_MT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt_MT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt_MT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mt_MT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua.res index c973d541f92f..40373776f86f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mua_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my.res index d6796d6cf69d..defa3f1d599f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my_MM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my_MM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my_MM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/my_MM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn.res index aa3ce1987e2f..fbd11610b2de 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn_IR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn_IR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn_IR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/mzn_IR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq.res index 823740acabd9..5597badd93e1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq_NA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq_NA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq_NA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/naq_NA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb.res index 389e1116108f..5c5fd803498b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_NO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_SJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_SJ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_SJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nb_SJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd.res index 7e48041a9cb9..4292527a90cf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd_ZW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd_ZW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd_ZW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nd_ZW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds.res index 5820a3ba380d..28ec093330f4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_DE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_NL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_NL.res index 66c25d2b97fa..eca8f9a674a7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_NL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nds_NL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne.res index 93eac374ec64..ca0e7dc88663 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_IN.res index 5252d09765ad..489e9f56fd0b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_NP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_NP.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_NP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ne_NP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl.res index a2bbb3668cc6..4ed4bdb5155e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_AW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_AW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_AW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_AW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BE.res index 39a3c8f8fa95..2fdb983b2c60 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BQ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_BQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_CW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_CW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_CW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_CW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_NL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_NL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_NL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_NL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SX.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nl_SX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg.res index e31e9c9890ad..f314c1bf486e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nmg_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn.res index 632675545254..2dba502fd9fa 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn_NO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nn_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh.res index 27d9f0256377..db09943324cd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nnh_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no.res index 50b2e747b85d..ebc009da456d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO.res index daccf3518f8d..46aa97418d6c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO_NY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO_NY.res index 29f240919a7f..1fa1bafe91a2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO_NY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/no_NO_NY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo.res index 42147e9525f8..0e9cd0eefa1c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo_GN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nqo_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso.res index 841f626371a4..9ec5944a9cb7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso_ZA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nso_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus.res index c0d2d42a69fe..5056b27c7b6a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus_SS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus_SS.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus_SS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nus_SS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn.res index fb6689914b88..71a937a8a3f9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn_UG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/nyn_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc.res index 1708ff2bef63..2bb26ceca7c5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_ES.res index 8915822198cd..f153a7be5fd0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_FR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/oc_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om.res index 27f2d344c7de..53983a8bd938 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_ET.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_ET.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_ET.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_ET.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_KE.res index 64a1df95da8f..31500026888d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/om_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or.res index 5510f47af220..6eddc05d7123 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/or_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os.res index c9fb903b9362..c776899094bc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_GE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_GE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_GE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_GE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_RU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_RU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_RU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/os_RU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa.res index 6dab0357031b..4d7c1f9177ea 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab.res index 73820d0303c3..d7d9921bc84e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab_PK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Arab_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_Guru_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_IN.res index cc60fb1412e1..c2a62573c696 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_PK.res index a5f094b7fada..a3adad7f645a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pa_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm.res index 624eebf6021b..eeadbe32cf54 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm_NG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pcm_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl.res index 40b1e3d5dab3..c94532f74656 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl_PL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl_PL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl_PL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pl_PL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pool.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pool.res index b1fe6fd7d793..a9e688501389 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pool.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pool.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg.res index aa79e88e5a0d..632d734fce10 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg_PL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg_PL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg_PL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/prg_PL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps.res index d6fe3dd90a4e..082786592b19 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_AF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_PK.res index 63a5f67b0377..2f9e5fd22d21 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ps_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt.res index 0443c75ca9d5..0c4b44e7ac8c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_AO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_AO.res index 0eaf47ce9bee..269a1a9ad814 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_AO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_AO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_BR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_BR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_BR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_BR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CH.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CV.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_CV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GQ.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GW.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_GW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_LU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_LU.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_LU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_LU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MO.res index 7cb66ba73475..25ca13ae6d2e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MZ.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_MZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_PT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_PT.res index 5d14eda7ac8e..75443135b701 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_PT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_PT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_ST.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_ST.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_ST.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_ST.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_TL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_TL.res index 9a2ab3b9f2fb..eb55f5234cec 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_TL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pt_TL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu.res index 5b0113b1af28..b7e76e962e76 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_BO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_BO.res index c182a8e7b564..2087295c6b20 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_BO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_BO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_EC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_EC.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_EC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_EC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_PE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_PE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_PE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/qu_PE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj.res index f2a9c48d626b..843ade61d49a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/raj_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rbnf/root.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rbnf/root.res index 0f0d41eaee03..bf5818fc9072 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rbnf/root.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rbnf/root.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/res_index.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/res_index.res index aa25efd6ae82..84c8b92a21bc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/res_index.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/res_index.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm.res index a51b90e6a90a..2c5242eb6938 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm_CH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rm_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn.res index 65da11fb8117..7b1e813a97c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn_BI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn_BI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn_BI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rn_BI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro.res index e3e3f98fb368..b657d95f9307 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_MD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_MD.res index cb386ba1a8b4..98a8a9631a23 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_MD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_MD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_RO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_RO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_RO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ro_RO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof.res index 15e7b6c82d88..f9f41adebd02 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rof_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/root.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/root.res index 9cded2bf0df7..351afad51664 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/root.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/root.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru.res index 8a2d2cbade29..69258e1994e0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_BY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_BY.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_BY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_BY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_KZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_MD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_MD.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_MD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_MD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_RU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_RU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_RU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_RU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_UA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_UA.res index b5d24850265e..7af93613112d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_UA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ru_UA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw.res index 06c4cb8b0ea8..de1a610d26b7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw_RW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw_RW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw_RW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rw_RW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk.res index 153de6604ed9..4ea6c59dc275 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/rwk_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa.res index a992040626b1..5fab918a511c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sa_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah.res index 85a0f97c7c79..cb47b1090117 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah_RU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah_RU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah_RU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sah_RU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq.res index 52b684666af1..1efbb5f5af2a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/saq_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat.res index 9b4fe1ead43b..d333f7737e88 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_IN.res index 081b129e0e89..7fc7b0045b84 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sat_Olck_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp.res index e5f87b70081d..0ec5ce354483 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sbp_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc.res index 62d2ad6badb3..ade3bb646597 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sc_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd.res index c613a11a7146..b4b7f3db7056 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab_PK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Arab_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva.res index b387a415239e..11078072968a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_Deva_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_IN.res index 0c913e5c36fc..de81b4241824 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_PK.res index 4a4e61894025..258c9188707d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sd_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se.res index f46d04d9bb48..578d96b03f97 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_FI.res index e82b4f15fdff..3f36263807ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_NO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_SE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_SE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_SE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/se_SE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh.res index 96c36646ca5f..0eb364fd2601 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh_MZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh_MZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh_MZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/seh_MZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses.res index bc192f28394c..1d0817e63778 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses_ML.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses_ML.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses_ML.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ses_ML.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg.res index fa4551184d35..4c3d9ee667cc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg_CF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg_CF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg_CF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sg_CF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh.res index 5a9dd7d9d538..df2de82c3c78 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_BA.res index f7aaf15a7285..98bcc6413776 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_CS.res index 7ff52ee7fc98..d186f09ef9a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_YU.res index 7ff52ee7fc98..d186f09ef9a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sh_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi.res index d81668151ec5..39431968d065 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn.res index 595d9bef18f7..e8e4d7f896ad 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn_MA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Latn_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_MA.res index f0f54ba06176..5517fcca473f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng_MA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/shi_Tfng_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si.res index 9e2c4ccff700..bc3ab8fabae9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si_LK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si_LK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si_LK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/si_LK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk.res index ad53ffa1317a..47a0b470caf9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk_SK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk_SK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk_SK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sk_SK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl.res index 791bfac9567a..de031ea702b1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl_SI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl_SI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl_SI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sl_SI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn.res index d7607d7b9678..d35e47ac87b0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn_FI.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/smn_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn.res index 8d2959c50bcc..51ab4cb127c9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn_ZW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn_ZW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn_ZW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sn_ZW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so.res index e836b48d6330..d3f3efadac78 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_DJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_DJ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_DJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_DJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_ET.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_ET.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_ET.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_ET.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_KE.res index 0bc1a5e43d22..774b6d99fc50 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_SO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_SO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_SO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/so_SO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq.res index fcacd4258ddb..3066ce9e2124 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_AL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_AL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_AL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_AL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_MK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_MK.res index 84cfad65b580..b26481e1d1d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_MK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_MK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_XK.res index 84cfad65b580..b26481e1d1d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sq_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr.res index bd7f4a03e4dd..24490a82840b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_BA.res index a3a5e0a4f368..22be25a59f87 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_CS.res index 4a8fd5f0d1b9..6e03102a658d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_BA.res index 00f7939ee082..f6c3658f9b82 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_CS.res index 7e5ea819ce34..bf636e932bca 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_ME.res index 6ae93d5dca68..6c6f0b217c31 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_RS.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_XK.res index 64d213f2cd01..9b0c6d918583 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_YU.res index 7e5ea819ce34..bf636e932bca 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Cyrl_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn.res index 8b478ee0156b..e69b64ae4f59 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_BA.res index 7b8930d19d76..cea5048344c7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_CS.res index 7ff52ee7fc98..d186f09ef9a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_ME.res index a05b2147c603..955710c9d11f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_RS.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_XK.res index c030025fe020..1ad0be1917b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_YU.res index 7ff52ee7fc98..d186f09ef9a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_Latn_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_ME.res index c96178cf2611..97f02d684333 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_RS.res index 7e5ea819ce34..bf636e932bca 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_XK.res index 2abe42c7fe1a..4f79f619b58c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_YU.res index 4a8fd5f0d1b9..6e03102a658d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sr_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st.res index 69c98ce246d3..cd1d729b5f26 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_LS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_LS.res index d72547eb40a6..1ec8b32ec689 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_LS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_LS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_ZA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/st_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su.res index 413a7e80322f..2901305ff58b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_ID.res index 64f46fa4ce09..fc5500fa2ad7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn_ID.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/su_Latn_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/supplementalData.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/supplementalData.res index 7b816b91cea9..38e600dbe482 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/supplementalData.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/supplementalData.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv.res index a231784422e6..1685d8f1e480 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_AX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_AX.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_AX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_AX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_FI.res index 9ae727f6ea3c..1bb715db7795 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_SE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_SE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_SE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sv_SE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw.res index 50b287cee821..9b91474314fd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_CD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_CD.res index 74e7ae34ff40..3c94147d1b9d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_CD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_CD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_KE.res index 679355836775..1e912bd3ff0d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_UG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/sw_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr.res index 64634c22a453..b0071c749d10 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_IQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_IQ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_IQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_IQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_SY.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_SY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/syr_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl.res index 6a01fadbe760..63c03807fbcf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl_PL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl_PL.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl_PL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/szl_PL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta.res index 38f5e15a8b73..c25d1555f383 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_LK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_LK.res index f50a3af1162a..cee8a090ed88 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_LK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_LK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_MY.res index afa5feb509e2..56d24b7d2040 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_SG.res index afa5feb509e2..56d24b7d2040 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ta_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te.res index b07cecfa5dac..8a43a867f426 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/te_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo.res index 187dd2d0cfbd..70a02c7cd733 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_KE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_UG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/teo_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg.res index 4c1595a7ffb9..040cd0356d8c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg_TJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg_TJ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg_TJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tg_TJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th.res index b0e3a2c518f6..8e2615f522b1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH_TRADITIONAL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH_TRADITIONAL.res index a47a85439e72..dc11e1506167 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH_TRADITIONAL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/th_TH_TRADITIONAL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti.res index 5f04068b6dc4..243b0ebf49cf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ER.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ER.res index b7d187109ad6..49b2fa693918 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ER.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ER.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ET.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ET.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ET.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ti_ET.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res index fa8cac23ed09..ce05b246cff1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/timezoneTypes.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk.res index 6536243769b6..31babfc3f445 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk_TM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk_TM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk_TM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tk_TM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl.res index 5b95edeba554..43a9b34cae42 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl_PH.res index 0f57f249c808..809aa359d005 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tl_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn.res index 2bce85c6833b..195d1feeb858 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_BW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_BW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_BW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_BW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_ZA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tn_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to.res index 3434e255f584..78eaf88ba947 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to_TO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to_TO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to_TO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/to_TO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok.res index d496bb01e87a..48cc89f72a49 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok_001.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tok_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr.res index 6636fbffb453..7e49939d74f5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_CY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_CY.res index 2718b5d2a345..ff2dd8ebdc4e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_CY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_CY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_TR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_TR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_TR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tr_TR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt.res index a002cbed76c9..97ed438d5f6b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt_RU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt_RU.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt_RU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tt_RU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq.res index b7489d451644..c2edf2b614b3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq_NE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq_NE.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq_NE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/twq_NE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm.res index 616e1cbbb279..e247ab95bc21 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm_MA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/tzm_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug.res index f9b6a2f0d4fe..60cb69337715 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug_CN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ug_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk.res index 56b6d4f56862..733c11e48411 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk_UA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk_UA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk_UA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uk_UA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/af.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/af.res index 87dbda69a4e6..b64fdfe8f120 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/af.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/af.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/agq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/agq.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/agq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/agq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ak.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ak.res index c3b98e2aafcb..79b98f11a3d6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ak.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ak.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/am.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/am.res index a2944d87cdf7..4e335e9a9f93 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/am.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/am.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar.res index 968650207c3a..7a75b170ea26 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar_SA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar_SA.res index 455656d3bfc7..7976db1b05d4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar_SA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ar_SA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ars.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ars.res index 095b5f89be51..cedebefee49b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ars.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ars.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/as.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/as.res index d24f3afbe628..6553f71363b3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/as.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/as.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/asa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/asa.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/asa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/asa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ast.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ast.res index 34abbb103357..24a229509c45 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ast.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ast.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az.res index 8fc18eeb38b2..095514ba5e53 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_AZ.res index 137808e84081..06deb4df8bcc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Cyrl.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn_AZ.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/az_Latn_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bas.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bas.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bas.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bas.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/be.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/be.res index b2a012f39d34..3344a06e0fb9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/be.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/be.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bem.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bem.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bem.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bem.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bez.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bez.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bez.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bez.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bg.res index 45bbef7bd9b8..f60e2218a337 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bgc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bgc.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bgc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bgc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bho.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bho.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bho.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bho.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/blo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/blo.res index 9a09e1336bd5..bcce61bde592 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/blo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/blo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bm.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn.res index b16d987dfe9b..8d30d9ba558f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn_IN.res index 2094c5d3413e..f499304f150c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/br.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/br.res index 560a0b73fe49..ff41b96b169b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/br.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/br.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/brx.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/brx.res index c14fc55b1963..bd4f4a52aa65 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/brx.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/brx.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs.res index 23b005affda9..e8f8802e4dc4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_BA.res index c6d9a27b827d..f9de4473d587 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Cyrl.res index cde1fa2580b1..74d931513872 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn_BA.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/bs_Latn_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ca.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ca.res index a564678e0aac..69eee654d225 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ca.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ca.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ccp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ccp.res index d7bacc42aede..71fd97502968 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ccp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ccp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ce.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ce.res index 5f79d863c9b6..3c35d7ed2c45 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ce.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ce.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ceb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ceb.res index b3df18fe7d8d..d194b34dbdc6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ceb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ceb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cgg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cgg.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cgg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cgg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/chr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/chr.res index 985a1523d969..829bcc994c01 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/chr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/chr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ckb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ckb.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ckb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ckb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cs.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cs.res index ae1a6331a1d9..f027a2387f0e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cs.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cs.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/csw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/csw.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/csw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/csw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cv.res index ee67694e84f7..a7876c9778a6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cy.res index 218d1bafb79b..7636e6a33a1f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/cy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/da.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/da.res index ebbb0e642459..e0507dbdffa9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/da.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/da.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dav.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dav.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dav.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dav.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de.res index 6d4f225552c3..c70d630dab08 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de_CH.res index c5f4f132154c..5461e03f886d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/de_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dje.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dje.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dje.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dje.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/doi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/doi.res index 2313384fb581..447197360d55 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/doi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/doi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dsb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dsb.res index 2afb8d0ca98b..5b48005ecd54 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dsb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dsb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dua.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dua.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dua.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dua.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dyo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dyo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dyo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dyo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dz.res index 693cc317c867..9b6567ab0619 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/dz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ebu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ebu.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ebu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ebu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ee.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ee.res index 789809df4276..746789d3938e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ee.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ee.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/el.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/el.res index f7bd4a7a4d18..ed13823cb86c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/el.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/el.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en.res index 81b7e048ab0d..0c72aeb43ef7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_001.res index 7938894951ea..2f383082f64f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_150.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_150.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_150.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_150.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AI.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AT.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AU.res index c696d4b1035d..b2c43a5faae1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_AU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BB.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BE.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BS.res index 5a32fc77922c..91f632f0603f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BW.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BZ.res index 5a32fc77922c..91f632f0603f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_BZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CA.res index 76a4cf96cbf2..077a3dd94c74 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CC.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CH.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CK.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CX.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CY.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CZ.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_CZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DE.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DK.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_DM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ER.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ER.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ER.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ER.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ES.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FI.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FJ.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FK.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FR.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GB.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GD.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GH.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GI.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GS.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GY.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_GY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HK.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HU.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_HU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ID.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IE.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IL.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IN.res index 80bff6c3b2fd..0022540c6fa5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IO.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IT.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JE.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_JM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KE.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KI.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KN.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KY.res index 5a32fc77922c..91f632f0603f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_KY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LC.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LR.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LS.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_LS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MO.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MS.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MT.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MU.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MV.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MW.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MY.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NA.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NF.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NH.res index 387d1deb7992..68df55cbb9e9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NL.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NO.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NR.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NU.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NZ.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_NZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PK.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PL.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PN.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PT.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PW.res index 5a32fc77922c..91f632f0603f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_PW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RH.res index 244c4510acb4..97d3e2d2b272 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RO.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RW.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_RW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SB.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SC.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SD.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SE.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SH.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SI.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SK.res index 94f61a27b340..b926310522a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SL.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SS.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SX.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SZ.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_SZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TC.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TK.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TO.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TT.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TV.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TZ.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_UG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VC.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VG.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VU.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_VU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_WS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_WS.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_WS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_WS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZA.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZM.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZW.res index b6406671e567..9adc5f434fb3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/en_ZW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eo.res index 8dd00879bf73..8df45e527a74 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es.res index 2f3d68dfb063..6691d59491b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_419.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_419.res index 19b6219c5721..7d9769dd967a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_419.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_419.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_AR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_AR.res index eded84fcdb8b..5dfe3cc515c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_AR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_AR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BO.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BR.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BZ.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_BZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CL.res index 07bcfa268332..0ba5fd62b88b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CO.res index 55c5260e4c5c..94dbe95f79ee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CR.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CU.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_CU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_DO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_DO.res index e15d7b6672f0..383723c9344b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_DO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_DO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_EC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_EC.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_EC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_EC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_GT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_GT.res index 4d6aa79619de..84e8d5d0c214 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_GT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_GT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_HN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_HN.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_HN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_HN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_MX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_MX.res index a97c8c811e40..ae8a8439850c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_MX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_MX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_NI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_NI.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_NI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_NI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PA.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PE.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PR.res index 73a4af74c4ae..a03b01d684e9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PY.res index 1b2acf095c34..2a0396f58353 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_PY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_SV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_SV.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_SV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_SV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_US.res index 584cdb670a60..069136fd60c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_UY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_UY.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_UY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_UY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_VE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_VE.res index 905a7b001b18..421404b205f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_VE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/es_VE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/et.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/et.res index 8551c220d451..536afec7fa1a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/et.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/et.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eu.res index 713981ab3616..e11d18b77b7f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/eu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ewo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ewo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ewo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ewo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fa.res index 10627cef4721..11f2f22d36e3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Adlm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Adlm.res index 1bebc6ce8df4..74f80806d938 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Adlm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Adlm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_CM.res index 743be5f30d01..37220e595ec6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_GN.res index 1197c57d77ee..ca7d25c4672b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_CM.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_GN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_MR.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_SN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_Latn_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_MR.res index e4e30dc886ee..2a110522da0b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_SN.res index 607dce0359bb..11c1d659fb4d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ff_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fi.res index fbfe0b45f242..f4aba9f9305d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil.res index 25c7e23c6c22..b958a86044e0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil_PH.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fil_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fo.res index bf00b0f087f4..0867fcdd6a87 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr.res index b7defd3be1ba..97d7cb2d9609 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_CA.res index 409b2e1ff998..229b75e8f299 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_HT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_HT.res index 5d4090701d55..3791e5dfa84f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_HT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fr_HT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fur.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fur.res index a418daf16ba9..d39e49f68c77 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fur.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fur.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fy.res index 5b5192305902..bdf7cc8c5838 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/fy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ga.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ga.res index 5ab3be14433f..6b4bff7b2771 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ga.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ga.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gaa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gaa.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gaa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gaa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gd.res index 3d6061e1651c..5b9ef82725e2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gl.res index 2c4fe3fa17f8..466ca691f0d7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gsw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gsw.res index 129d38391a20..fc5719e3ce5f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gsw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gsw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gu.res index 5d55141c4887..76fc8dfcf9e9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/guz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/guz.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/guz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/guz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gv.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/gv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ha.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ha.res index d2966e2763df..3ee5bcedb894 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ha.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ha.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/haw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/haw.res index 74d0692c721b..e2957ec80342 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/haw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/haw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he.res index 67b77ec275d0..786b64a8639c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he_IL.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/he_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi.res index 73fb13e12473..d8af4a956dad 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi_Latn.res index 71c43f3253eb..6a0a7b384f8f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hi_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hr.res index 8d65db286573..0b7ed47a086d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hsb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hsb.res index cc70468d352a..65403ead30a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hsb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hsb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hu.res index 88285b16a505..93f642d9d6d5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hy.res index a5b32b71261b..7e5e22243509 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/hy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ia.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ia.res index 7ba66bace49c..f64a7523cbe3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ia.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ia.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id.res index f7e5c04149c6..043753c409b2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id_ID.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/id_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ie.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ie.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ie.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ie.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ig.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ig.res index 9982b341ab53..026e5afc1cc4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ig.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ig.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ii.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ii.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ii.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ii.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in.res index 893ed1553ac5..74529c91225e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in_ID.res index 3b09acc978d3..2aa1a1adb8cd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/in_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/is.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/is.res index bda6609a2f44..2ee986175f98 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/is.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/is.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/it.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/it.res index 3a42e8502b58..5c5f538d62ca 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/it.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/it.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw.res index edf1bee6d920..d28c7421ae88 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw_IL.res index 14bccf8b5431..84af80ef215c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/iw_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ja.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ja.res index 07b00e539e9d..70fe5d15dd37 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ja.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ja.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jgo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jgo.res index 49aad1b063c2..1f131fc2610b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jgo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jgo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jmc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jmc.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jmc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jmc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jv.res index 14867e4e1a14..5d28d2c4564f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/jv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ka.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ka.res index 8a78f8c1fed3..000e2f2164fc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ka.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ka.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kab.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kam.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kam.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kam.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kam.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kde.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kde.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kde.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kde.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kea.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kea.res index eef445975365..87c5ae4ef7fb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kea.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kea.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kgp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kgp.res index fe8be466854e..f78a9945b816 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kgp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kgp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/khq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/khq.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/khq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/khq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ki.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ki.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ki.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ki.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kk.res index dc0254a81014..0050adc32f25 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kkj.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kkj.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kkj.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kkj.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kl.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kln.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kln.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kln.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kln.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/km.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/km.res index 63f79210c647..9fd0af4779ce 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/km.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/km.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kn.res index dd5f56c16f33..a2ef57ba7fa8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ko.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ko.res index 0ddbd31c91cd..b113f8311747 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ko.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ko.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok.res index 2d1e9ad6c34d..c859da3c3a77 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok_Latn.res index f95ec9fd25b9..4e6abde64d3d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kok_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks.res index ddf5f4acd3fe..ba720943102e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab_IN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Arab_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Deva.res index 26c8c89ee148..5138685712ed 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_IN.res index e0bf5dfb0564..710b8ae331ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ks_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksb.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksf.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksf.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksf.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksf.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksh.res index 6ddfb3ab2c54..bb151ac04ceb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ksh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku.res index c8545970d630..2cf8aef96321 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_Latn.res new file mode 100644 index 000000000000..f1fa3c3d7046 Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_Latn_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_Latn_SY.res new file mode 100644 index 000000000000..d6749129e97b Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_Latn_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_SY.res new file mode 100644 index 000000000000..3f8addc4c9a3 Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ku_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kw.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Deva.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_IN.res index 0621f45ae31a..8b231bff3820 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn_IN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Latn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Orya.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Orya.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Orya.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Orya.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Telu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Telu.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Telu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/kxv_Telu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ky.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ky.res index 2a83ce104ec5..b11ba43be916 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ky.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ky.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lag.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lag.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lag.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lag.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lb.res index 4d3eb670a99a..07454543d0cd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lg.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lij.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lij.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lij.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lij.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lkt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lkt.res index d600483dc7ac..425b4f66bbc6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lkt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lkt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lmo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lmo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lmo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lmo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ln.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ln.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ln.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ln.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lo.res index 7f3ab184e37c..ff82a65d68f8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lrc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lrc.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lrc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lrc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lt.res index 67d31612c323..a68539138db9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lu.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luy.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/luy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lv.res index b851b96dde00..4c93811bef9d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/lv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mai.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mai.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mai.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mai.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mas.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mas.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mas.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mas.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mer.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mer.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mer.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mer.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mfe.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mfe.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mfe.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mfe.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mg.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgh.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mgo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mi.res index 3418535c54ee..5da7fe36b438 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mk.res index 8d9b7cd11173..e64d2075b22f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ml.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ml.res index 36a71927efea..14c8ae9327ce 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ml.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ml.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mn.res index b9c79e526c9b..4463f1fe97a5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng_IN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_Beng_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_IN.res index de9a3751da22..f919b377eb72 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mni_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mo.res index f6b259d77114..0c888f91bbc0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mr.res index 81fbae10c17d..9e9798c154ef 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ms.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ms.res index f4036bf7e6b6..ebe449927ad7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ms.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ms.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mt.res index cf883d91b49e..d69a36e5ad56 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mua.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mua.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mua.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mua.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/my.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/my.res index e2669954cf6b..6783a5f7538a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/my.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/my.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mzn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mzn.res index d3b2eb8a7771..ab863b0286af 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mzn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/mzn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/naq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/naq.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/naq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/naq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nb.res index 7b0a0ec9d4b8..5c2a35ae3508 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nd.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nds.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nds.res index 49adcd553f0b..474eafd6d376 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nds.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nds.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ne.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ne.res index 82421eeff924..89d08e1152df 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ne.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ne.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nl.res index def1a1ea758b..b52bd8809551 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nmg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nmg.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nmg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nmg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn.res index e6bde20e1e65..e5813946bc24 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn_NO.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nn_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nnh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nnh.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nnh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nnh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no.res index 0695a9f54bb5..4d9897a9c2e9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO.res index 8b3d94eeade3..f400d73c5cd9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO_NY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO_NY.res index 1b9e7f650735..1930a84db308 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO_NY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/no_NO_NY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nqo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nqo.res index d15ab51dd45a..49385ad7608f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nqo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nqo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nso.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nso.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nso.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nso.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nus.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nus.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nus.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nus.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nyn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nyn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nyn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/nyn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/oc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/oc.res index a3db34ac3918..76dccd34f8d7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/oc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/oc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/om.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/om.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/om.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/om.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/or.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/or.res index 9b751723989f..a41898882861 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/or.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/or.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/os.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/os.res index 54ee61e73215..b165fe9ecfce 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/os.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/os.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa.res index c88fbf6ecc84..c38d40f16ab8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab_PK.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Arab_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru_IN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_Guru_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_IN.res index 1a8c5e6d4608..02791aca200b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_PK.res index a0c0be0086c2..eab968d321ea 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pa_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pcm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pcm.res index 781bffff5472..ce9bf66545bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pcm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pcm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pl.res index 27f52bee5787..64d9f7073573 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pool.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pool.res index 9f502c16fb8f..d170cf84aaa0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pool.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pool.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/prg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/prg.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/prg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/prg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps.res index 338ab0aa81d3..3ae58dedd08d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps_PK.res index 10cf3b1fbe4d..35fa754e3cd4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ps_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt.res index 0c68ef881473..0a8a459449e6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_AO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_AO.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_AO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_AO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CH.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CV.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_CV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GQ.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GW.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_GW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_LU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_LU.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_LU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_LU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MO.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MZ.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_MZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_PT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_PT.res index e4094a513bc6..52fb1b5bfe22 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_PT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_PT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_ST.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_ST.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_ST.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_ST.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_TL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_TL.res index 3470530cd2ef..bb013095a6c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_TL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/pt_TL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/qu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/qu.res index dc143230351e..e974d0fae213 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/qu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/qu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/raj.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/raj.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/raj.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/raj.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/res_index.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/res_index.res index 532c8e5708f0..41dcd47584fb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/res_index.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/res_index.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rm.res index 1dea6daa1453..32a655113012 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro.res index 92a2aadbc3f4..126306312265 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro_MD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro_MD.res index bf98eb48d3bf..c1d5c5b2376d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro_MD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ro_MD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rof.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rof.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rof.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rof.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/root.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/root.res index 7c0fbab971e1..d6159e999e84 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/root.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/root.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ru.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ru.res index d350b276311d..b1e1763132e0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ru.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ru.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rw.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rwk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rwk.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rwk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/rwk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sa.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sah.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sah.res index 030eb3aeecaf..1d8f4914330e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sah.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sah.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/saq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/saq.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/saq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/saq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat.res index d09a98511a0c..c91930f176fd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_IN.res index 860edbc6e4ea..a6f8b6247fa0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck_IN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sat_Olck_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sbp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sbp.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sbp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sbp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sc.res index 6f4f34986d0b..03cd19f2dacb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd.res index f49a3edd86ba..fb50e001d657 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab_PK.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Arab_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva_IN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_Deva_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_IN.res index 092c34a8868f..c5faa516bca0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_PK.res index 803cd3742f90..4b9ed2003b08 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sd_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/se.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/se.res index 7ef3d49c049b..575742902614 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/se.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/se.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/seh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/seh.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/seh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/seh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ses.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ses.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ses.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ses.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sg.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh.res index 8527d77482aa..adcac6c43e70 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_BA.res index 7de02c64d15c..9b1fd94c05ef 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_CS.res index 6fcf1d199c60..918852f9d338 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_YU.res index 6fcf1d199c60..918852f9d338 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sh_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Latn.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_MA.res index e42a089fc102..126031ebf470 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng_MA.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/shi_Tfng_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/si.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/si.res index b66b6cc2ab87..4ffa43068699 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/si.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/si.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sk.res index d84f92809594..25595e0ea65e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sl.res index 8d14b095b045..3fb05c4f8795 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/smn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/smn.res index ee423ac000bb..8505b9cd8136 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/smn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/smn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/so.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/so.res index 9d77743f4d0a..026e017fe0c2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/so.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/so.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sq.res index 2b6adb4e3cfb..6f5a13a5193e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr.res index 288f7715c89a..2f6ef00c533e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_BA.res index ec6519b88be5..d27dde0793bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_CS.res index d6210adfdeaf..c74bc601a091 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_BA.res index f855cccf6630..c025813e1406 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_CS.res index 0ba0a4b55496..4d6c6ea095d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_RS.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_XK.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_YU.res index 0ba0a4b55496..4d6c6ea095d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Cyrl_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn.res index fed7a5b768e2..b513f8455640 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_BA.res index 2057c7c5b629..40b06b6bfd6a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_CS.res index 6fcf1d199c60..918852f9d338 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_ME.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_RS.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_YU.res index 6fcf1d199c60..918852f9d338 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_Latn_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_ME.res index 311bd0292c22..77a9d9eaf3d2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_RS.res index 0ba0a4b55496..4d6c6ea095d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_XK.res index 914dc256153d..8aab1d0e0232 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_YU.res index d6210adfdeaf..c74bc601a091 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sr_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/st.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/st.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/st.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/st.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su.res index 67ed945e93c3..887841b79981 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_ID.res index 14ec29f6f665..c5aac06faefc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn_ID.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/su_Latn_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv.res index 07896a01d642..250d9d343ba7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv_FI.res index b9a86fbc7cd2..a3a5319dc016 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sv_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw.res index 1027189cfc71..a17a9fe92c68 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw_KE.res index d749465aed50..7dc39a94a1d1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/sw_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/syr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/syr.res index 0fd63d11928e..f336c7fe5120 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/syr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/syr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/szl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/szl.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/szl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/szl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ta.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ta.res index fe4684293e4b..f561450d4883 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ta.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ta.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/te.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/te.res index 7ea85afa70b8..a6a6c9f3c3a2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/te.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/te.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/teo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/teo.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/teo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/teo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tg.res index 39536d42b06c..901429eaadf8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/th.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/th.res index 20d07e94b482..9bff19458a5e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/th.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/th.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ti.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ti.res index 9b655be386b8..ef28c9a1eaff 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ti.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ti.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tk.res index 8d8ea0ffbee8..909dc0f5e18c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl.res index 836f1a5b72c9..9ed7088fffcd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl_PH.res index 862b2b5f1d0f..b9d692f4ec04 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tl_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/to.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/to.res index b43769c0dba4..49749da620d7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/to.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/to.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tok.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tok.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tok.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tok.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tr.res index 7fde1ce351cf..6846583e5b38 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tt.res index 5f1235ff2b4a..3b79b4186578 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/twq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/twq.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/twq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/twq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tzm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tzm.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tzm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/tzm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ug.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ug.res index f4da81cdf239..0849d6900ae1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ug.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ug.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uk.res index 85c8429506f7..a2a2a73958ff 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur.res index e31e630ab81f..95a4f3f408a8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur_IN.res index 5d355a5d4263..1180a5088744 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/ur_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz.res index 1054fd68dacd..95075ccccd06 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_AF.res index e08c9e9ac0c0..ad1c405122d8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab_AF.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Arab_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Cyrl.res index 7fe225b86149..149639746fcc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn_UZ.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_Latn_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_UZ.res index 15cd80b85e75..a3687931ee5b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/uz_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_LR.res index 96f57b21897a..99e679367401 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Latn.res index ece53c0f61e4..afe99ac3f19d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii_LR.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vai_Vaii_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vec.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vec.res index a551156804e3..711a18b99566 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vec.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vec.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vi.res index 6aada993c131..cb0f6825da98 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vmw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vmw.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vmw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vmw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vun.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vun.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vun.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/vun.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wae.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wae.res index aa79177227bf..7c11e96f7d44 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wae.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wae.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wo.res index 83cbb21e3bf0..0fc909412a55 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/wo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xh.res index 319e2df140c4..ab23a17e78ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xnr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xnr.res index e0f97f073902..ff0c9c13441b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xnr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xnr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xog.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xog.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xog.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/xog.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yav.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yav.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yav.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yav.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yi.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo.res index d7d740d6f786..149d0c31b3cd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo_BJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo_BJ.res index df4e633b5374..f3d4e0440358 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo_BJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yo_BJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl.res index 56e3f5904f3d..14e2bf09eb11 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_CO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_CO.res index 8cb85210f4ab..63f4788d2a44 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_CO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_CO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_VE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_VE.res index 8cb85210f4ab..63f4788d2a44 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_VE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yrl_VE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue.res index 6dce6ba517c4..f7926610afd8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_CN.res index a11fd5c49a01..261a92f15537 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_HK.res index 8a8fcc493bf1..76925645e8ed 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans.res index e2d2b22da63c..5180be71d023 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans_CN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hans_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant_HK.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/yue_Hant_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/za.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/za.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/za.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/za.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zgh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zgh.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zgh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zgh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh.res index 2f63d0f47b44..138b52439910 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_CN.res index 1a148251d2f4..63d95dbc98f3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_HK.res index be0a2e66ccbe..8e3020d84ddd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans.res index 47373d8ce41f..f1fa3c3d7046 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_CN.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_HK.res index 9124078328d5..6450715c4f74 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_MO.res index 9124078328d5..6450715c4f74 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_SG.res index 9124078328d5..6450715c4f74 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hans_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant.res index 6fbbc39c149b..6685621d1abb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_HK.res index 7b3cab7ceed7..b15c24ee9abf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_MO.res index 049717584542..a05b24e6e287 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_TW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_TW.res index d2c511473708..d6749129e97b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_TW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_Hant_TW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_MO.res index 435a4d944fb9..09fd8b2d6813 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_SG.res index 3b7b300cfd7c..f772ed242c22 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_TW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_TW.res index 21c3d74245c9..6df0163ebb8e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_TW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zh_TW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zu.res index ca4a912535de..f13d0186d51d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/zu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/units.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/units.res index 7f617bcc5c95..f2c90e7309ff 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/units.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/units.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur.res index 2741cc7375bd..c9d00e13efc9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_IN.res index c708883b708f..58f30bbca989 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_PK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/ur_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz.res index 902f1c14ab6b..c2b1da09e9a6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_AF.res index c9c559a57450..dac384946d8c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab.res index 5080daabf1ac..a8b73bdc932d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab_AF.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Arab_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl.res index ab476cd19b3a..a1c2b1979d3c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl_UZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Cyrl_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn_UZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_Latn_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_UZ.res index aa3573e19f7e..5949485a135a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/uz_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai.res index 0b92caac0a70..049e035eb1ea 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_LR.res index d2438ba96f23..539f03448e98 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn.res index 0b37147f28c1..be1785e5eb26 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn_LR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Latn_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii_LR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vai_Vaii_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec.res index b0e2d53bcfe7..a4adaef494ca 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec_IT.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vec_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi.res index 418e0b3598f9..472b0256f79d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi_VN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi_VN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi_VN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vi_VN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw.res index 3dea34d64d74..05d01875b50a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw_MZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw_MZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw_MZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vmw_MZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun.res index 79a4d4665ea2..77b46f830b3d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun_TZ.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/vun_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae.res index 03939061a612..8a00825cdb09 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae_CH.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wae_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res index 422ae4861f4d..2bd722506895 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/windowsZones.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo.res index 797ee51a66da..9710cd29ab7e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo_SN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/wo_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh.res index 1f54488152a2..845ec324c806 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh_ZA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xh_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr.res index 322b873d7e77..43b4c9607aa2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr_IN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xnr_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog.res index b371fa1e24ef..4bc405c70ca3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog_UG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/xog_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav.res index 96d2fad7cc8f..2f658206d712 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav_CM.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yav_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi.res index 0ec6339f475d..63c7831bdc10 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi_UA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi_UA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi_UA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yi_UA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo.res index d7690805f9db..36c9417aec9b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_BJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_BJ.res index 7687195900df..bded8c9b771f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_BJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_BJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_NG.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yo_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl.res index 175517603654..b4d1ab4f1ac4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_BR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_BR.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_BR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_BR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_CO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_CO.res index e57c6b631b4b..e922725c1943 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_CO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_CO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_VE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_VE.res index e57c6b631b4b..e922725c1943 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_VE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yrl_VE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue.res index ba858b572da5..dfe24a84a341 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_CN.res index 14da40c52acc..7c3d682386a4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_HK.res index 6f7a13bc22e6..7a9121d5efa6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans.res index e4a2d6195dbc..0dbd45b87578 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans_CN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hans_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_CN.res index 1232e7a7f866..f371c2585639 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_HK.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_MO.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/yue_Hant_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za.res index 02abd0ba1452..5d31e409230c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za_CN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/za_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh.res index 407fedb5b86a..267947f764f7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh_MA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zgh_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh.res index e89b508f1fe7..21e6744f90a9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_CN.res index fde696cd5005..f8c017779b71 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_HK.res index 47f50debdab4..1741ba6cfe51 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_CN.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_HK.res index e678238986d3..e3e177cf0565 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MO.res index 6c21c2b08799..3340394c2b75 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MY.res index 680147e475eb..0fb9b36c7182 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_SG.res index a6fc3689376f..307c6330ec8f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hans_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant.res index f4fc41b4406c..720608215ca4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_HK.res index e6e6202b9f0a..67418eff22ca 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MO.res index 3c70d2e8bd71..5c8a59f65588 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MY.res index a8fc70d72616..03e1e4ff6dee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_TW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_TW.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_TW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_Hant_TW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_MO.res index 4bd56560bdae..b2614f3d79da 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_SG.res index 072472bcb394..cf9b4aecb6b6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_TW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_TW.res index 50e8191864c3..de52ee80ac12 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_TW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zh_TW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/af.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/af.res index 5f7ea2a06f44..f8e020d611ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/af.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/af.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/agq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/agq.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/agq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/agq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ak.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ak.res index 86094ae96ec0..63eecac85e54 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ak.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ak.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/am.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/am.res index ee17e53c028b..9570c5d3d980 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/am.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/am.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar.res index 4e6c151182f9..b37969589178 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar_SA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar_SA.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar_SA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ar_SA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ars.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ars.res index b16211c30bf8..1bcab1f23b55 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ars.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ars.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/as.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/as.res index eb78fc8d7771..b6dc5e7e530a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/as.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/as.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/asa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/asa.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/asa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/asa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ast.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ast.res index 3b7596aefda4..7a3df3b19153 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ast.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ast.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az.res index d91702cdc47e..292f508c2b85 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_AZ.res index 3573266d0242..409b71bd3964 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Cyrl.res index 6594ba467446..422bb53528b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn_AZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn_AZ.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn_AZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/az_Latn_AZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bas.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bas.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bas.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bas.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/be.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/be.res index 1f3ad925f023..a0c22273d2fb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/be.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/be.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bem.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bem.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bem.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bem.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bez.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bez.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bez.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bez.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bg.res index 479f8aaac604..a3a8e2091a2b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bgc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bgc.res index 98102dbfa568..017ef2d740d4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bgc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bgc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bho.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bho.res index 53d783212428..ee65617cd2b7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bho.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bho.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/blo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/blo.res index 1b98debfc28c..5b12ded20561 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/blo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/blo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bm.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bn.res index 1c08ba38e031..467420cbca56 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bo.res index 9fa49f8ac541..1476f531c1f7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/br.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/br.res index 4eee30d3cb62..24c6f5142214 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/br.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/br.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/brx.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/brx.res index 901b05735c8e..455aa7f102e4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/brx.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/brx.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs.res index 22f99eb9513d..2a5ae0c9738f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_BA.res index 4b3b92743544..5a0d4e9c4126 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Cyrl.res index a48499490649..8060d37abafe 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn_BA.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/bs_Latn_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ca.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ca.res index 79ee8671a5de..ed61e639104f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ca.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ca.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ccp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ccp.res index 55522b29889c..50041ad49f4e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ccp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ccp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ce.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ce.res index ba584162a9eb..3540f23f594a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ce.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ce.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ceb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ceb.res index 32a48e41e26f..66affabdaf2e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ceb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ceb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cgg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cgg.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cgg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cgg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/chr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/chr.res index 9c8e2e05dc9a..5529b17dc8b6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/chr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/chr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ckb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ckb.res index 0b10af07e1d2..bab680abb08e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ckb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ckb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cs.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cs.res index f52162a2c4ee..495da0f63973 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cs.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cs.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/csw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/csw.res index 51f248937cc5..102b4a61e3d0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/csw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/csw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cv.res index e8f35703e44f..42eeb0fb1f6d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cy.res index 946322d713e3..a2b548851354 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/cy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/da.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/da.res index cf41e66e1ca2..e8bd0c39b174 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/da.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/da.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dav.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dav.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dav.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dav.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de.res index 80d1b5f2866e..0b8c458a6106 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de_CH.res index 1508e92d3ef1..6eaec49df976 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/de_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dje.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dje.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dje.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dje.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/doi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/doi.res index 529f3f1d6794..1fdaa019e2fc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/doi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/doi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dsb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dsb.res index 02c75e634599..3e18a4c498f6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dsb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dsb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dua.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dua.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dua.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dua.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dyo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dyo.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dyo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dyo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dz.res index 8486ae9aa1b9..98373f25b19e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/dz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ebu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ebu.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ebu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ebu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ee.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ee.res index 121ad7b91050..9f926eb7b3ce 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ee.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ee.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/el.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/el.res index 894454338d92..88a432be1743 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/el.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/el.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en.res index c6a3091e5588..d3ed66064969 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_001.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_001.res index c8d0d1889247..6a9cc67fc911 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_001.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_001.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_150.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_150.res index 14a867e89b89..8a30fc7d89a8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_150.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_150.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AE.res index b1f999deda81..8e1a18873212 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AG.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AI.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AT.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AU.res index 519d6c59e0a5..aa1dbff5d1f9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_AU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BB.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BE.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BM.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BS.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BW.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BZ.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_BZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CA.res index f57c12389ddb..55a8bea04bb8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CC.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CH.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CK.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CM.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CX.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CY.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CZ.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_CZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DE.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DG.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DK.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DM.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_DM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ER.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ER.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ER.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ER.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ES.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ES.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ES.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ES.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FI.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FJ.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FK.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FM.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FR.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_FR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GB.res index 4ae54d619aee..ed3dac4d238d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GD.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GG.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GH.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GI.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GM.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GS.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GU.res index 7b72dabc4a4f..feb989eedf38 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GY.res index b1b2b1d33d6a..916e431c0218 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_GY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HK.res index be3182b8e4b0..56f0975682cc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HU.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_HU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ID.res index 58badf5aa539..007ac75d649d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IE.res index 55470c00a680..b1e67d2263b0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IL.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IM.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IN.res index e192067d236c..37efc3e85197 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IO.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IT.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_IT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JE.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JM.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_JM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KE.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KI.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KN.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KY.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_KY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LC.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LR.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LS.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_LS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MG.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MH.res index cce532ccadcc..923faaf116bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MO.res index 7094d125f1fb..65bc13e35491 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MP.res index cce532ccadcc..923faaf116bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MS.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MT.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MU.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MV.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MW.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MY.res index d9f1665bac84..1aad7546c44f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NA.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NF.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NG.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NH.res index ab495dbf5369..adc439e4c1c9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NL.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NO.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NR.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NU.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NZ.res index 09e71100f6ef..6886e65dd546 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_NZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PG.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PK.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PL.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PN.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PT.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PW.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_PW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RH.res index 306266cd9c94..6b8c0a6f4ff6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RO.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RW.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_RW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SB.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SB.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SB.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SB.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SC.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SD.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SD.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SD.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SD.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SE.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SG.res index a2186cb1a728..220c44f132df 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SH.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SI.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SK.res index eadd088c2657..71dfda542bcb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SL.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SS.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SX.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SZ.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_SZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TC.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TK.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TO.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TT.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TV.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TZ.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_TZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_UG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_UG.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_UG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_UG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VC.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VG.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VU.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_VU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_WS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_WS.res index 31be1a8ddf68..34775ee9232e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_WS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_WS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZA.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZM.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZW.res index 293f94a71e61..e3239f4bb193 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/en_ZW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eo.res index e1fa6fb06f8e..749031a0ace9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es.res index 591751df7c99..488cb5e8a41e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_419.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_419.res index 7c426444b7c8..ed0ead289100 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_419.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_419.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_AR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_AR.res index c0c890dcc8d2..e23e02355213 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_AR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_AR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BO.res index bba4cc892b8e..a9db98fb2ec3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BR.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BZ.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_BZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CL.res index ccdb47641509..4fae481ff8ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CO.res index 6a399db4d3ad..e8826b07186f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CR.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CU.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_CU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_DO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_DO.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_DO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_DO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_EC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_EC.res index fe09562d5713..556e4814b97d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_EC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_EC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_GT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_GT.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_GT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_GT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_HN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_HN.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_HN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_HN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_MX.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_MX.res index 5096aa7e6b42..ec5515f6c0c8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_MX.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_MX.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_NI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_NI.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_NI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_NI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PA.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PE.res index 067a2013e333..35a9b854f846 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PR.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PY.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_PY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_SV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_SV.res index 2de1d87e8f82..e114f40c1589 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_SV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_SV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_US.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_US.res index ee4a85e83db9..e9e83c51998e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_US.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_US.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_UY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_UY.res index a9883d476f90..aa3c5243fe0b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_UY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_UY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_VE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_VE.res index 5256e7a05429..9d5bb88f5945 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_VE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/es_VE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/et.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/et.res index 1df3459eaaf3..eeee8b2451e5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/et.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/et.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eu.res index a756f819332b..494a98261ff0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/eu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ewo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ewo.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ewo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ewo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fa.res index b96dc1f3f8f4..2a1e546669ea 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Adlm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Adlm.res index e115cf851af3..898fbbe812e7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Adlm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Adlm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_CM.res index cad5c29de2a6..52840e5bfbb9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_GN.res index 042136dad554..a1485433b1b6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_CM.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_CM.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_CM.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_CM.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_GN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_GN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_GN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_GN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_MR.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_SN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_Latn_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_MR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_MR.res index f87c26a16806..6c6453fa22e6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_MR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_MR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_SN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_SN.res index 2f68fe687aad..b74f2508ecdd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_SN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ff_SN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fi.res index 7fbb600b75a9..8654254f4088 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil.res index 02c4040358c6..ba2757905bbb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil_PH.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fil_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fo.res index 0f82ddf82310..5fe2efb63896 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr.res index be2ca097ca15..2df3b85a42f7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_CA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_CA.res index a4cfac986be7..5c16c7a298a1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_CA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_CA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_GF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_GF.res index d10078376ac9..2a6b79d874fd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_GF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fr_GF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fur.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fur.res index 42e472dbc0eb..0df286551e05 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fur.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fur.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fy.res index 3dc897cdbf20..56eb9509baee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/fy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ga.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ga.res index 1719fcb5063e..bce32b54f8a4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ga.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ga.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gaa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gaa.res index 1d947f155ae9..ea02c4141bc6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gaa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gaa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gd.res index be2475ad8739..9c2d33962d93 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gl.res index 76ce4606330c..53918c6b28a6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gsw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gsw.res index efbbceb41f9a..cbecf404b592 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gsw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gsw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gu.res index 4b867d327e10..fc46003571b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/guz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/guz.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/guz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/guz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gv.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/gv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ha.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ha.res index 70c8ad8f8da1..6607000a88d0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ha.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ha.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/haw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/haw.res index 5eab5e291fc6..150b2e7aa928 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/haw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/haw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he.res index 490048295a7e..5f182959e8db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he_IL.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/he_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi.res index 37de39ebb996..ae2a5392c30c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi_Latn.res index 3eb489bb28cc..46f7eec7f9c1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hi_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hr.res index 2bd933db4390..9b380736bc33 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hsb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hsb.res index a0ea8e75fae9..b26cfc0d5c52 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hsb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hsb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hu.res index bf4741d59ab3..508e066ca230 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hy.res index 7d1399c7afe1..0a3e7a278829 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/hy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ia.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ia.res index a98c2135e50c..1200dd0256f3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ia.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ia.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id.res index 9fdcef98366f..19459b27d74b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id_ID.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/id_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ie.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ie.res index fbbafa6be4c6..0d246c9c47c8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ie.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ie.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ig.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ig.res index 3a3552eba03f..935572da81ee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ig.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ig.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ii.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ii.res index 28e4cdb05159..28831e8b8384 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ii.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ii.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in.res index 306c3f26d9a2..b1d0044b3983 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in_ID.res index 1180d39e8e2c..64bb47e976f1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/in_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/is.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/is.res index f1bd7a38ca11..d007565a941c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/is.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/is.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/it.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/it.res index 98d8815e716a..64f706c846a2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/it.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/it.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw.res index 1f1fc4037e9a..453272fca3f3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw_IL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw_IL.res index 35d4e1f7f5b1..cadb146a9f3b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw_IL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/iw_IL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ja.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ja.res index 8d9a344c2769..d9f036627864 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ja.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ja.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jgo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jgo.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jgo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jgo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jmc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jmc.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jmc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jmc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jv.res index 80559c800d87..5fd09cc63eb6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/jv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ka.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ka.res index 200356567d8f..e2ac0efac70d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ka.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ka.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kab.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kam.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kam.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kam.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kam.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kde.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kde.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kde.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kde.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kea.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kea.res index a8b76df23224..f6727a9cc206 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kea.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kea.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kgp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kgp.res index f31bcad07b4d..8fad78281234 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kgp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kgp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/khq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/khq.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/khq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/khq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ki.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ki.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ki.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ki.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kk.res index a5b96be392e7..1244aa7f8d97 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kkj.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kkj.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kkj.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kkj.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kl.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kln.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kln.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kln.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kln.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/km.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/km.res index 14e21c07de24..2ab19bcc1f3f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/km.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/km.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kn.res index 810f68c1c5c4..dc5b52d57888 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko.res index 780bde984f04..897fb2af76e2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko_KP.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko_KP.res index 6f4fcdaaf11d..ec904229fc1c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko_KP.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ko_KP.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok.res index 91b350876a7a..5cee9f3c9e14 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok_Latn.res index dd6f0af558de..3c54d8d4b69d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kok_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks.res index c8f932ca391b..05a9f83d676d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab_IN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Arab_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Deva.res index 9ab525081d95..89cfb3bd5e24 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_IN.res index a839fc84ea90..e66939048fee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ks_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksb.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksf.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksf.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksf.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksf.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksh.res index c14dbbde0242..13c7084cd3b2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ksh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku.res index 937321db3998..f0a9ef6fbe87 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_Latn.res new file mode 100644 index 000000000000..3e80886a332e Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_Latn_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_Latn_SY.res new file mode 100644 index 000000000000..7b19a6ac1612 Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_Latn_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_SY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_SY.res new file mode 100644 index 000000000000..dca5a4245118 Binary files /dev/null and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ku_SY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kw.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv.res index 44a22fb0d21c..f3405de9bb8e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Deva.res index 329a12d55ad5..cac173b3aa45 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_IN.res index d8a4eab76095..d73bd61705ea 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn_IN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Latn_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Orya.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Orya.res index e30b3ec9f81e..b73128769295 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Orya.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Orya.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Telu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Telu.res index 73b7dd141658..50cd4483690d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Telu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/kxv_Telu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ky.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ky.res index 5aca2c9f713b..864c6c51a130 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ky.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ky.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lag.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lag.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lag.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lag.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lb.res index 7800fbe6cda8..cabb6ebe00e5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lg.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lij.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lij.res index 25b2ebd2dfe5..8ba8c4d5290d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lij.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lij.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lkt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lkt.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lkt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lkt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lmo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lmo.res index b4e418300ebe..ff286637be78 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lmo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lmo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ln.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ln.res index 026308e77642..0965fde7e17f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ln.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ln.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lo.res index 9df8f2cb506b..2dc1b50c3c2d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lrc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lrc.res index 24dc5e96094c..e921dd03128b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lrc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lrc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lt.res index 5f80760b962d..6e408695d1f1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lu.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luo.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luy.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luy.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luy.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/luy.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lv.res index 44983bc9d3d7..8d69ca095d6b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/lv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mai.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mai.res index 61ede403e02e..b3a53b12b90f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mai.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mai.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mas.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mas.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mas.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mas.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mer.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mer.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mer.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mer.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mfe.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mfe.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mfe.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mfe.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mg.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgh.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgo.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mgo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mi.res index ca8345618bdd..f39c7c1586a8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mk.res index 68afb0696b9d..850ab86e050f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ml.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ml.res index 266f14c6195d..415d5ffb21c3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ml.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ml.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mn.res index 7cac04813246..f3da418dd6bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni.res index 5441c09865c9..956ff10863a6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng_IN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_Beng_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_IN.res index b8aa4cb76887..0b3f74939fc8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mni_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mo.res index aa7c64f4f013..149688ad83b0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mr.res index 6be6d1178346..712d731df6bf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms.res index 6351fb2acfe6..9559ec452d11 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms_ID.res index dd5890472094..6556d6fdb990 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ms_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mt.res index 44ce91e46eac..c45110105ae6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mua.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mua.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mua.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mua.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/my.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/my.res index 5dad7b2b8ec9..d363becb6361 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/my.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/my.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mzn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mzn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mzn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/mzn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/naq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/naq.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/naq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/naq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nb.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nb.res index a4d20e3f047a..fcb0e03206ab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nb.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nb.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nd.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nds.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nds.res index 038747e1f439..a0786adfb8a1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nds.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nds.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne.res index 9f29b79a682e..f747e871e89c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne_IN.res index aba97aa1773a..f730a90c9cab 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ne_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl.res index 069f845daa4a..af23c979273c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl_SR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl_SR.res index ba8134c4be6e..a43c5fc26e9a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl_SR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nl_SR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nmg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nmg.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nmg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nmg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn.res index 0089df8243dd..97e52e4e730c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn_NO.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nn_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nnh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nnh.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nnh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nnh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no.res index ba06e67da617..df7e94c6bf09 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO.res index def27eb5ebc4..bd05f0bd3ab9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO_NY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO_NY.res index a05d6e67c5d2..6a63f282b5e2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO_NY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/no_NO_NY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nqo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nqo.res index 3e4eedb3ab4f..bd255b615159 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nqo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nqo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nso.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nso.res index 375a72bcd2c9..4649a2f80065 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nso.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nso.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nus.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nus.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nus.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nus.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nyn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nyn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nyn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/nyn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/oc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/oc.res index fe3c3a09854d..ecace0b00bc1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/oc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/oc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/om.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/om.res index 30968d231c7b..80e7f77ed5ef 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/om.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/om.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/or.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/or.res index 2c43e31ab26a..a35ba163ad62 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/or.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/or.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/os.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/os.res index 3f4a212a65aa..6aa0f3ec2f7b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/os.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/os.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa.res index 8980c0238b02..638da1759710 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab.res index 6594ba467446..422bb53528b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab_PK.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Arab_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru_IN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_Guru_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_IN.res index c1f138287aa6..8591d9aa3f58 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_PK.res index 455ea44428c7..eb7527c352a7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pa_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pcm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pcm.res index 8ad5eca77ce5..295e49a3df38 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pcm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pcm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pl.res index e9559cbbed70..a93e96144acf 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pool.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pool.res index e28b0c764e9d..438addaffe2a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pool.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pool.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/prg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/prg.res index d895f62afa58..7d675a845375 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/prg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/prg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps.res index 46174e22d9ab..40a3d9e356f6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps_PK.res index c3e28371df1c..143b3357bc86 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ps_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt.res index 03409abb8813..5a022c1d2888 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_AO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_AO.res index d136f338a052..b11c0b5c87c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_AO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_AO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CH.res index 937fdf77a279..b4637ca09aeb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CV.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CV.res index 4f24afef70a2..4851ce97ed29 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CV.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_CV.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GQ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GQ.res index 937fdf77a279..b4637ca09aeb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GQ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GQ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GW.res index d136f338a052..b11c0b5c87c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_GW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_LU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_LU.res index 937fdf77a279..b4637ca09aeb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_LU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_LU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MO.res index d136f338a052..b11c0b5c87c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MZ.res index d136f338a052..b11c0b5c87c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_MZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_PT.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_PT.res index 2d6f84241819..1177094ed52d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_PT.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_PT.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_ST.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_ST.res index d136f338a052..b11c0b5c87c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_ST.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_ST.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_TL.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_TL.res index d136f338a052..b11c0b5c87c4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_TL.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/pt_TL.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu.res index 160860e29770..609111a53ed6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_BO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_BO.res index ce8c4db433a3..dea794580430 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_BO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_BO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_EC.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_EC.res index 7892f88dd582..ef04a1f00cbd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_EC.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/qu_EC.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/raj.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/raj.res index b3c6427836b6..7d9ce5b94967 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/raj.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/raj.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/res_index.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/res_index.res index 2240f1f1bc30..3554f3631e37 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/res_index.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/res_index.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rm.res index 9e9608f1ed50..6b5873d1b44f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ro.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ro.res index b5aecf6f82a7..0b6109771025 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ro.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ro.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rof.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rof.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rof.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rof.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/root.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/root.res index b5938afd5b72..2f94d6bb2a6c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/root.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/root.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ru.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ru.res index 8b14250cb826..0e22aea870e4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ru.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ru.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rw.res index e88c8a0fb1f0..dde39d721bc7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rwk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rwk.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rwk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/rwk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sa.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sa.res index eabb31cd5815..70672275ca4a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sa.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sa.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sah.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sah.res index 7cb9a45904c7..53e1ce64380c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sah.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sah.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/saq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/saq.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/saq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/saq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat.res index f5f9c46ebd0f..83cf7f76f711 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_IN.res index 803810ad3443..324067688760 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck_IN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sat_Olck_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sbp.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sbp.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sbp.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sbp.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sc.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sc.res index 74d9b9001f06..f1b5c4536190 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sc.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sc.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd.res index 0fc1908da6a4..029d0da3c730 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab_PK.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Arab_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva.res index c527e0e7c57d..c61b16fbf1b0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva_IN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_Deva_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_IN.res index b13715c8afbb..4f87246064f2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_PK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_PK.res index 0d5dec08a811..9c50fcbcf8ba 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_PK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sd_PK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se.res index 1510d298e9dc..6828aaaca73f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se_FI.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se_FI.res index d664143341a7..5ae3ec053449 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se_FI.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/se_FI.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/seh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/seh.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/seh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/seh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ses.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ses.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ses.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ses.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sg.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh.res index c057097771b2..53007634487f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_BA.res index c9820b75401b..63322f2f2f9b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_CS.res index 112ae07ce484..62abadcddf7c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_YU.res index 112ae07ce484..62abadcddf7c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sh_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Latn.res index 6594ba467446..422bb53528b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_MA.res index aa9cb42fb1f1..711c3f2aadde 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng_MA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng_MA.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng_MA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/shi_Tfng_MA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/si.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/si.res index 45cc39ce5741..e66937655c9b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/si.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/si.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sk.res index 08776ac8e72b..46c42b9854c0 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sl.res index ed5f3c2633e8..3232ceba4149 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/smn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/smn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/smn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/smn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/so.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/so.res index 30855db668fb..56862535f260 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/so.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/so.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sq.res index 36b6e2d655e9..d58d6e5b5685 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr.res index 11ac2997e2ff..032d6b3e12ea 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_BA.res index 005f86de129b..421f2214e3d9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_CS.res index df9d8bb4f67c..b6f075c4895f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_BA.res index 483636129956..3fc0135f7450 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_CS.res index 59a542fe42b0..90b3a09adc79 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_RS.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_XK.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_YU.res index 59a542fe42b0..90b3a09adc79 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Cyrl_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn.res index 3f1ec588c66c..0c5d5cde5dfd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_BA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_BA.res index f26015607837..84385a3bdedd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_BA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_BA.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_CS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_CS.res index 112ae07ce484..62abadcddf7c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_CS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_CS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_ME.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_RS.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_YU.res index 112ae07ce484..62abadcddf7c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_Latn_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_ME.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_ME.res index 1f9024f8576b..78aefbcedf3b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_ME.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_ME.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_RS.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_RS.res index 59a542fe42b0..90b3a09adc79 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_RS.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_RS.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_XK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_XK.res index 7619cddaa0ae..0b3040f92a1b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_XK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_XK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_YU.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_YU.res index df9d8bb4f67c..b6f075c4895f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_YU.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sr_YU.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/st.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/st.res index ed2e305a9768..dade04d496e5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/st.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/st.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su.res index 1b765a2870c5..fa852ba5d757 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_ID.res index cf5c3fde5cfb..7b883fcd1ce1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn_ID.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn_ID.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn_ID.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/su_Latn_ID.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sv.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sv.res index c3c5657acda7..d00b8271c8f4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sv.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sv.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw.res index aceaf6d37491..c90ec7e1b8e2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw_KE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw_KE.res index b8f0e502c600..8523c7347684 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw_KE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/sw_KE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/syr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/syr.res index 730b013250de..a50893a1fbd7 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/syr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/syr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/szl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/szl.res index 15110496bc2f..b82769f1f92a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/szl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/szl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta.res index aab838dac3d3..32165b98985a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_MY.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_MY.res index 11d1b9048133..b63f27e2130a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_MY.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_MY.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_SG.res index 11d1b9048133..b63f27e2130a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ta_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/te.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/te.res index bacc908cd98e..99a8d3bf5b62 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/te.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/te.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/teo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/teo.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/teo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/teo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tg.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tg.res index 0daae521dd51..c19f0a292776 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tg.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tg.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/th.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/th.res index c30deecafe95..4d6ffb2c2c98 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/th.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/th.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ti.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ti.res index 74d2f612bb67..705afb402b84 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ti.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ti.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tk.res index 693faabd1f92..af430f279174 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl.res index 352824747de9..3b4d67a2d658 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl_PH.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl_PH.res index 431eb1398e06..40637731dc6b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl_PH.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tl_PH.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tn.res index a574fdaa3945..dff78f7fa405 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/to.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/to.res index 77fada4a9bfb..672bc5732e4b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/to.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/to.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tok.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tok.res index cdccf384bd7e..a6236bf86d4f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tok.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tok.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tr.res index 3b30c3d3ace8..7393fb6fb3f3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tt.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tt.res index 5333f681916d..dea3a4c74dee 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tt.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tt.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/twq.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/twq.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/twq.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/twq.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tzm.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tzm.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tzm.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/tzm.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ug.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ug.res index b74fba60745b..415661ed8c9b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ug.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ug.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uk.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uk.res index 12e859a77ac0..bbddd7309b6e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uk.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uk.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur.res index d952f98fb896..2b18bfbabaa6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur_IN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur_IN.res index 3a967a6baf6d..4c3dcea48f6c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur_IN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/ur_IN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz.res index ad02743c70fb..644e3d837fc2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_AF.res index 7f10cba7d537..503f350e5fa6 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab.res index 8f8b679bdd1b..f01aef2ce42c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab_AF.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab_AF.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab_AF.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Arab_AF.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Cyrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Cyrl.res index c2813ace1b21..cb97981c2c05 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Cyrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Cyrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn_UZ.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_Latn_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_UZ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_UZ.res index 895a0f197645..68d8831a5f6d 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_UZ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/uz_UZ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_LR.res index 00e5cec2e781..e6c61d25d169 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Latn.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Latn.res index 6594ba467446..422bb53528b8 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Latn.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Latn.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii_LR.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii_LR.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii_LR.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vai_Vaii_LR.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vec.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vec.res index a30046d4919c..b1dd76fa7d26 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vec.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vec.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vi.res index be4c9fbd4811..3816648d85f5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vmw.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vmw.res index 0951a18f4e0e..9b320aad80cb 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vmw.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vmw.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vun.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vun.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vun.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/vun.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wae.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wae.res index 3a4549de35f5..3731fb93d8f5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wae.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wae.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wo.res index 0d682ac62594..aa78b703b184 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/wo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xh.res index 53afa3c6390c..5c6cd4efaa3b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xnr.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xnr.res index 0ceb1c94c65e..93c30375f5e2 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xnr.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xnr.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xog.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xog.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xog.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/xog.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yav.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yav.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yav.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yav.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yi.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yi.res index 6879a0504a19..4f23c24fb134 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yi.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yi.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo.res index 8ca596c39d24..bfbce83c60d1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo_BJ.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo_BJ.res index 4379b8875b9d..58908e6537f4 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo_BJ.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yo_BJ.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl.res index 84d4db8ad094..0646d15717dc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_CO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_CO.res index eb93da2d24dc..fe5b91044806 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_CO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_CO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_VE.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_VE.res index eb93da2d24dc..fe5b91044806 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_VE.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yrl_VE.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue.res index 43d0a5fa6f9e..17c88a58041b 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_CN.res index 1329a2862eb7..08c7ac9240e1 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_HK.res index b2431dbb65af..62a3429d3afa 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans.res index dbc01860af9b..5ce67ceb8bff 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans_CN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hans_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant_HK.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/yue_Hant_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/za.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/za.res index 8b3a139f6ed2..bbceff1613c9 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/za.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/za.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zgh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zgh.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zgh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zgh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh.res index c566437a4842..e821512d0c32 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_CN.res index ef2e623bea97..0a48c1365a24 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_HK.res index 3caf4739981f..a17ee70a7088 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans.res index 73f8d142b703..3e80886a332e 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_CN.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_CN.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_CN.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_CN.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_SG.res index 8035ab14ef63..af34c8aee084 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hans_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant.res index 29b7ecdce95c..4cfb8ce2422f 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_HK.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_HK.res index 0e6ebf530914..5b752361efbc 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_HK.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_HK.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_MO.res index a4f53f3e3b86..788e04ae4b07 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_TW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_TW.res index 504e326130ce..7b19a6ac1612 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_TW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_Hant_TW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_MO.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_MO.res index 62a1a277bf4c..58c9b0b939e3 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_MO.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_MO.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_SG.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_SG.res index 57258abfa846..a50dc9f5447a 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_SG.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_SG.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_TW.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_TW.res index 12def18786b9..2a8ea9245d24 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_TW.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zh_TW.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zu.res index 2de0cb8ab601..e1799827d2c5 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zone/zu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res index 5d70f5b02c03..fdbeb35dd3bd 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu.res index 67a924f68978..266ae1b3933c 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu.res differ diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu_ZA.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu_ZA.res index bf800d19f985..3abb9a92b5db 100644 Binary files a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu_ZA.res and b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zu_ZA.res differ diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/TestBoilerplate.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/TestBoilerplate.java index c809f4f4d121..cb5dc64e8aef 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/TestBoilerplate.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/TestBoilerplate.java @@ -39,6 +39,7 @@ public abstract class TestBoilerplate extends TestFmwk { protected static Random random = new Random(12345); + @SuppressWarnings({"SelfEquals", "EqualsNull"}) protected final void _test() throws Exception { List list = new LinkedList(); while (_addTestObject(list)) { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/JavaTimeFormatTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/JavaTimeFormatTest.java index 80e4116cb0e6..76fd0e9b4e62 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/JavaTimeFormatTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/JavaTimeFormatTest.java @@ -129,7 +129,7 @@ public void testNonGregorianDateFormatting() { "chinese", "Eighth Month 23, 2013(gui-si)", "hebrew", "23 Tishri 5774 AM", "indian", "Asvina 5, 1935 Saka", - "islamic", "Dhuʻl-Qiʻdah 22, 1434 AH", + "islamic", "Dhuʻl-Qiʻdah 22, 1434 Anno Hegirae", "japanese", "September 27, 25 Heisei", "persian", "Mehr 5, 1392 AP", "roc", "September 27, 102 Minguo", diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java index 2bf4e6e02af4..5051289c1201 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/impl/UnitsTest.java @@ -277,7 +277,7 @@ class TestData { new TestData("millimeter", "meter", UnitsConverter.Convertibility.CONVERTIBLE), new TestData("yard", "meter", UnitsConverter.Convertibility.CONVERTIBLE), new TestData("ounce-troy", "kilogram", UnitsConverter.Convertibility.CONVERTIBLE), - new TestData("percent", "portion", UnitsConverter.Convertibility.CONVERTIBLE), + new TestData("percent", "part", UnitsConverter.Convertibility.CONVERTIBLE), new TestData("ofhg", "kilogram-per-square-meter-square-second", UnitsConverter.Convertibility.CONVERTIBLE), new TestData("second-per-meter", "meter-per-second", UnitsConverter.Convertibility.RECIPROCAL), new TestData("mile-per-hour", "meter-per-second", UnitsConverter.Convertibility.CONVERTIBLE), @@ -512,16 +512,16 @@ class TestData { new TestData("meter-per-10", "foot", 1.0, 0.328084), new TestData("meter", "foot-per-10", 1.0, 32.8084), new TestData("meter", "foot-per-100", 1.0, 328.084), - new TestData("portion", "portion-per-1000", 1.0, 1000), - new TestData("portion", "portion-per-10000", 1.0, 10000), - new TestData("portion", "portion-per-100000", 1.0, 100000), - new TestData("portion", "portion-per-1000000", 1.0, 1000000), - new TestData("portion-per-10", "portion", 1.0, 0.1), - new TestData("portion-per-100", "portion", 1.0, 0.01), - new TestData("portion-per-1000", "portion", 1.0, 0.001), - new TestData("portion-per-10000", "portion", 1.0, 0.0001), - new TestData("portion-per-100000", "portion", 1.0, 0.00001), - new TestData("portion-per-1000000", "portion", 1.0, 0.000001), + new TestData("part", "part-per-1000", 1.0, 1000), + new TestData("part", "part-per-10000", 1.0, 10000), + new TestData("part", "part-per-100000", 1.0, 100000), + new TestData("part", "part-per-1000000", 1.0, 1000000), + new TestData("part-per-10", "part", 1.0, 0.1), + new TestData("part-per-100", "part", 1.0, 0.01), + new TestData("part-per-1000", "part", 1.0, 0.001), + new TestData("part-per-10000", "part", 1.0, 0.0001), + new TestData("part-per-100000", "part", 1.0, 0.00001), + new TestData("part-per-1000000", "part", 1.0, 0.000001), new TestData("mile-per-hour", "meter-per-second", 1.0, 0.44704), new TestData("mile-per-100-hour", "meter-per-100-second", 1.0, 0.44704), new TestData("mile-per-hour", "meter-per-100-second", 1.0, 44.704), @@ -855,8 +855,8 @@ class TestCase { TestCase[] testCases = { new TestCase("meter-per-second", 100, Complexity.COMPOUND), new TestCase("meter-per-100-second", 0, Complexity.COMPOUND), - new TestCase("portion", 100, Complexity.COMPOUND), - new TestCase("portion-per-100", 0, Complexity.SINGLE), + new TestCase("part", 100, Complexity.COMPOUND), + new TestCase("part-per-100", 0, Complexity.SINGLE), }; for (TestCase testCase : testCases) { diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java index 9792d9f816eb..b91f5b7fb743 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java @@ -2,15 +2,12 @@ // License & terms of use: http://www.unicode.org/copyright.html package com.ibm.icu.dev.test.number; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.math.RoundingMode; import java.util.Locale; import org.junit.Test; +import com.ibm.icu.dev.test.CoreTestFmwk; import com.ibm.icu.number.LocalizedNumberFormatter; import com.ibm.icu.number.NumberFormatter; import com.ibm.icu.number.SkeletonSyntaxException; @@ -20,7 +17,7 @@ * @author sffc * */ -public class NumberSkeletonTest { +public class NumberSkeletonTest extends CoreTestFmwk { @Test public void validTokens() { @@ -435,7 +432,7 @@ public void perUnitToSkeleton() { {"area", "acre"}, {"concentr", "percent"}, {"concentr", "permille"}, - {"concentr", "permillion"}, + {"concentr", "part-per-1e9"}, {"concentr", "permyriad"}, {"digital", "bit"}, {"length", "yard"}, @@ -446,7 +443,9 @@ public void perUnitToSkeleton() { String skeleton = "measure-unit/" + cas1[0] + "-" + cas1[1] + " per-measure-unit/" + cas2[0] + "-" + cas2[1]; - if (cas1[0] != cas2[0] && cas1[1] != cas2[1]) { + if (cas1[1].equals("part-per-1e9") || cas2[1].equals("part-per-1e9")) { + logKnownIssue("ICU-23104", "Strange handling of part-per-1e9 in skeletons"); + } else if (cas1[0] != cas2[0] && cas1[1] != cas2[1]) { String toSkeleton = NumberFormatter.forSkeleton(skeleton).toSkeleton(); // Ensure both subtype are in the toSkeleton. diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java index d6dda2a895e3..e014e1eeef65 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/BreakIteratorTest.java @@ -8,6 +8,9 @@ */ package com.ibm.icu.dev.test.rbbi; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; + import java.text.StringCharacterIterator; import java.util.Locale; @@ -107,6 +110,33 @@ public void debugLogln(String s) { // tests //========================================================================= + @Test + public void TestPreceding_NegativeIndex() { + String source = "The quick brown fox jumped over the lazy dog."; + BreakIterator iter = BreakIterator.getWordInstance(); + iter.setText(source); + + assertEquals("length of source string", 45, source.length()); + + Object[][] casesData = { + {"negative index", -2, BreakIterator.DONE}, + {"zero", 0, BreakIterator.DONE}, + {"one", 1, 0}, + {"middle", 41, 40}, + {"end", 45, 44}, + {"after the end", source.length() + 2, source.length()} + }; + + for (Object[] caseDatum : casesData) { + String desc = (String) caseDatum[0]; + int startIdx = (int) caseDatum[1]; + int expected = (int) caseDatum[2]; + + int actual = iter.preceding(startIdx); + + assertThat(desc, actual, is(expected)); + } + } /* * @bug 4153072 @@ -128,7 +158,7 @@ public void TestBug4153072() { errln("Didn't get exception with offset = " + index + " and begin index = " + begin); } - catch (IllegalArgumentException e) { + catch (IndexOutOfBoundsException e) { if (index >= begin) errln("Got exception with offset = " + index + " and begin index = " + begin); diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java index a7210ba12530..e6286e23ae54 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITest.java @@ -324,14 +324,14 @@ public void TestPreceding() { rbbi.setText((CharacterIterator)null); if (rbbi.preceding(-1) != BreakIterator.DONE) { errln("RuleBasedBreakIterator.preceding(-1) was suppose to return " - + "0 when the object has a fText of null."); + + "DONE when the object has a fText of null."); } // Tests when "else if (offset < fText.getBeginIndex())" is true rbbi.setText("dummy"); - if (rbbi.preceding(-1) != 0) { + if (rbbi.preceding(-1) != BreakIterator.DONE) { errln("RuleBasedBreakIterator.preceding(-1) was suppose to return " - + "0 when the object has a fText of dummy."); + + "DONE when the object has a fText of dummy."); } } diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java deleted file mode 100644 index a8ce3c0acfc2..000000000000 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleAliasTest.java +++ /dev/null @@ -1,230 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -/* - ******************************************************************************* - * Copyright (C) 2005-2016, International Business Machines Corporation and - * others. All Rights Reserved. - ******************************************************************************* - */ - -/* - * New added, 2005-5-10 [Terry/SGL] - * Major modification by Ram - */ - -package com.ibm.icu.dev.test.util; - -import java.util.HashMap; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - -import com.ibm.icu.dev.test.CoreTestFmwk; -import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.impl.ICUData; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.util.Calendar; -import com.ibm.icu.util.ULocale; -import com.ibm.icu.util.UResourceBundle; - -@RunWith(JUnit4.class) -public class LocaleAliasTest extends CoreTestFmwk { - private static final ULocale[][] _LOCALES = { - - {new ULocale("en", "RH"), new ULocale("en", "ZW")}, - {new ULocale("in"), new ULocale("id")}, - {new ULocale("in", "ID"), new ULocale("id", "ID")}, - {new ULocale("iw"), new ULocale("he")}, - {new ULocale("iw", "IL"), new ULocale("he", "IL")}, - {new ULocale("ji"), new ULocale("yi")}, - - {new ULocale("en", "BU"), new ULocale("en", "MM")}, - {new ULocale("en", "DY"), new ULocale("en", "BJ")}, - {new ULocale("en", "HV"), new ULocale("en", "BF")}, - {new ULocale("en", "NH"), new ULocale("en", "VU")}, - {new ULocale("en", "TP"), new ULocale("en", "TL")}, - {new ULocale("en", "ZR"), new ULocale("en", "CD")} - }; - - private static final int _LOCALE_NUMBER = _LOCALES.length; - private static ULocale[] available = null; - private HashMap availableMap = new HashMap(); - private static final ULocale _DEFAULT_LOCALE = ULocale.US; - - public LocaleAliasTest() { - } - - @Before - public void init() { - available = ULocale.getAvailableLocales(); - for(int i=0; i**/*IT.java **/*ITCase.java - - - - ${localespi-tests.jvm.args} - - ${localespi-tests.locale-providers} + CLDR,COMPAT,SPI - @@ -167,82 +135,6 @@ - - - - localespi-tests-java8 - - (,8] - - - -Djava.ext.dirs="${java.io.tmpdir}/ext-test-jars" - - - - - - - maven-dependency-plugin - - - it-test-copy-localespi-extension-jars - integration-test - - copy - - - - - ${project.groupId} - icu4j - ${project.version} - ${project.packaging} - - - ${project.groupId} - icu4j-localespi - ${project.version} - ${project.packaging} - - - - ${java.io.tmpdir}/ext-test-jars - - - - - - - - - - - localespi-tests-java9 - - [9,) - - - - CLDR,COMPAT,SPI - - - with_javadoc diff --git a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_Latn.res b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_Latn.res new file mode 100644 index 000000000000..c34c37b8ef51 Binary files /dev/null and b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_Latn.res differ diff --git a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_Latn_SY.res b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_Latn_SY.res new file mode 100644 index 000000000000..489ae2a385f0 Binary files /dev/null and b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_Latn_SY.res differ diff --git a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_SY.res b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_SY.res new file mode 100644 index 000000000000..18c7d14b0b56 Binary files /dev/null and b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/ku_SY.res differ diff --git a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/res_index.res b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/res_index.res index c1884051ae6a..5deecfd31c38 100644 Binary files a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/res_index.res and b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/res_index.res differ diff --git a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/root.res b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/root.res index e641d43ef89e..0c4ebc75f053 100644 Binary files a/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/root.res and b/icu4j/main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region/root.res differ diff --git a/icu4j/main/translit/src/main/java/com/ibm/icu/text/BreakTransliterator.java b/icu4j/main/translit/src/main/java/com/ibm/icu/text/BreakTransliterator.java index 56d8d84603dd..823497bb4ebc 100644 --- a/icu4j/main/translit/src/main/java/com/ibm/icu/text/BreakTransliterator.java +++ b/icu4j/main/translit/src/main/java/com/ibm/icu/text/BreakTransliterator.java @@ -22,8 +22,6 @@ final class BreakTransliterator extends Transliterator { private BreakIterator bi; private String insertion; - private int[] boundaries = new int[50]; - private int boundaryCount = 0; public BreakTransliterator(String ID, UnicodeFilter filter, BreakIterator bi, String insertion) { super(ID, filter); @@ -52,8 +50,9 @@ public void setInsertion(String insertion) { public BreakIterator getBreakIterator() { // Defer initialization of BreakIterator because it is slow, // typically over 2000 ms. - if (bi == null) bi = BreakIterator.getWordInstance(new ULocale("th_TH")); - return bi; + // Using a holder class for safe init without a volatile-read. + if (bi == null) bi = WordBreakIteratorHolder.BI; + return (BreakIterator) bi.clone(); } ///CLOVER:OFF @@ -74,10 +73,11 @@ public void setBreakIterator(BreakIterator bi) { | (1<0 cased (UCaseProps.LOWER etc.) ==0 uncased <0 case-ignorable int type; @@ -108,8 +107,6 @@ protected synchronized void handleTransliterate(Replaceable text, iter.setLimit(offsets.limit); iter.setContextLimits(offsets.contextStart, offsets.contextLimit); - result.setLength(0); - // Walk through original string // If there is a case change, modify corresponding position in replaceable int delta; diff --git a/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java b/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java index 72c14b856544..f875af4be137 100644 --- a/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java +++ b/icu4j/main/translit/src/main/java/com/ibm/icu/text/Transliterator.java @@ -18,6 +18,7 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.Objects; +import java.util.function.Supplier; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; @@ -2185,7 +2186,16 @@ public static final Enumeration getAvailableVariants(String source, if (type.equals("file") || type.equals("internal")) { // Rest of line is :: // pos colon c2 - String resString = res.getString("resource"); + int rowIndex = row; + Supplier resSupplier = () -> { + // Capture the row Id instead of the UResourceBundle object + // due to the memory cost. + UResourceBundle rootBund = UResourceBundle.getBundleInstance( + ICUData.ICU_TRANSLIT_BASE_NAME, ROOT); + UResourceBundle transIDsBund = rootBund.get(RB_RULE_BASED_IDS); + UResourceBundle thisBund = transIDsBund.get(rowIndex).get(0); + return thisBund.getString("resource"); + }; int dir; String direction = res.getString("direction"); switch (direction.charAt(0)) { @@ -2199,7 +2209,7 @@ public static final Enumeration getAvailableVariants(String source, throw new RuntimeException("Can't parse direction: " + direction); } registry.put(ID, - resString, // resource + resSupplier, // resource dir, !type.equals("internal")); } else if (type.equals("alias")) { diff --git a/icu4j/main/translit/src/main/java/com/ibm/icu/text/TransliteratorRegistry.java b/icu4j/main/translit/src/main/java/com/ibm/icu/text/TransliteratorRegistry.java index be6bda496303..aa5509503a94 100644 --- a/icu4j/main/translit/src/main/java/com/ibm/icu/text/TransliteratorRegistry.java +++ b/icu4j/main/translit/src/main/java/com/ibm/icu/text/TransliteratorRegistry.java @@ -23,6 +23,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.Set; +import java.util.function.Supplier; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; @@ -222,11 +223,33 @@ public String getTop() { //---------------------------------------------------------------------- static class ResourceEntry { - public String resource; - public int direction; + private final Supplier resourceSupplier; + public final int direction; + private String resource; public ResourceEntry(String n, int d) { resource = n; direction = d; + resourceSupplier = null; + } + + public ResourceEntry(Supplier resourceSupplier, int dir) { + this.resourceSupplier = resourceSupplier; + direction = dir; + } + + public String getResource() { + if (resourceSupplier == null) { + return resource; + } + + synchronized (this) { + if (resource != null) { + return resource; + } + + resource = resourceSupplier.get(); + return resource; + } } } @@ -349,6 +372,13 @@ public void put(String ID, registerEntry(ID, new ResourceEntry(resourceName, dir), visible); } + void put(String ID, + Supplier resourceSupplier, + int dir, + boolean visible) { + registerEntry(ID, new ResourceEntry(resourceSupplier, dir), visible); + } + /** * Register an ID and an alias ID. This adds an entry to the * dynamic store, or replaces an existing entry. Any entry in the @@ -876,7 +906,7 @@ private Transliterator instantiateEntry(String ID, try { ResourceEntry re = (ResourceEntry) entry; - parser.parse(re.resource, re.direction); + parser.parse(re.getResource(), re.direction); } catch (ClassCastException e) { // If we pull a rule from a locale resource bundle it will diff --git a/icu4j/main/translit/src/main/java/com/ibm/icu/text/UppercaseTransliterator.java b/icu4j/main/translit/src/main/java/com/ibm/icu/text/UppercaseTransliterator.java index cbfae3229216..305c46819ae1 100644 --- a/icu4j/main/translit/src/main/java/com/ibm/icu/text/UppercaseTransliterator.java +++ b/icu4j/main/translit/src/main/java/com/ibm/icu/text/UppercaseTransliterator.java @@ -39,8 +39,6 @@ public Transliterator getInstance(String ID) { private final ULocale locale; private final UCaseProps csp; - private ReplaceableContextIterator iter; - private StringBuilder result; private int caseLocale; /** @@ -50,8 +48,6 @@ public UppercaseTransliterator(ULocale loc) { super(_ID, null); locale = loc; csp=UCaseProps.INSTANCE; - iter=new ReplaceableContextIterator(); - result = new StringBuilder(); caseLocale = UCaseProps.getCaseLocale(locale); } @@ -59,7 +55,7 @@ public UppercaseTransliterator(ULocale loc) { * Implements {@link Transliterator#handleTransliterate}. */ @Override - protected synchronized void handleTransliterate(Replaceable text, + protected void handleTransliterate(Replaceable text, Position offsets, boolean isIncremental) { if(csp==null) { return; @@ -69,8 +65,10 @@ protected synchronized void handleTransliterate(Replaceable text, return; } + ReplaceableContextIterator iter = new ReplaceableContextIterator(); + StringBuilder result = new StringBuilder(); + iter.setText(text); - result.setLength(0); int c, delta; // Walk through original string diff --git a/icu4j/perf-tests/README.txt b/icu4j/perf-tests/README.txt index d26f3fdafa54..dc143cc32448 100644 --- a/icu4j/perf-tests/README.txt +++ b/icu4j/perf-tests/README.txt @@ -43,6 +43,9 @@ COLLATION TESTS The collation tests run only on the command line with tabular output: perl collationperf.pl |& tee collation_output.txt +JMH +Some performance tests run using OpenJDK JMH. Example invocation: + mvn clean package exec:java -pl perf-tests -Pjmh_benchmark OTHER COMMAND LINE TESTS Additional tests are run from the command line, each producing an HTML diff --git a/icu4j/perf-tests/pom.xml b/icu4j/perf-tests/pom.xml index a4debcade133..d6883778caf8 100644 --- a/icu4j/perf-tests/pom.xml +++ b/icu4j/perf-tests/pom.xml @@ -43,6 +43,73 @@ commons-cli ${commons-cli.version} + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + provided + + + + jmh_benchmark + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.openjdk.jmh.generators.BenchmarkProcessor + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + build-jmh-classpath + + build-classpath + + + runtime + jmhClasspath + + + + + + org.codehaus.mojo + exec-maven-plugin + + org.openjdk.jmh.Main + + -f + 1 + -wi + 5 + -i + 10 + + + + java.class.path + ${project.build.outputDirectory}${path.separator}${jmhClasspath} + + + + + + + + + diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CaseFoldTransliteratorPerfTest.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CaseFoldTransliteratorPerfTest.java new file mode 100644 index 000000000000..f1ac50a204a7 --- /dev/null +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CaseFoldTransliteratorPerfTest.java @@ -0,0 +1,35 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +/* + ********************************************************************** + * Copyright (c) 2002-2008, International Business Machines * + * Corporation and others. All Rights Reserved. * + ********************************************************************** + */ +package com.ibm.icu.dev.test.perf; + +import java.util.concurrent.TimeUnit; + +import com.ibm.icu.text.Transliterator; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; + +@BenchmarkMode(Mode.Throughput) +@OutputTimeUnit(TimeUnit.MILLISECONDS) +public class CaseFoldTransliteratorPerfTest { + + static final Transliterator CASE = Transliterator.getInstance("CaseFold"); + + @Benchmark + public String testShort() { + return CASE.transliterate("Cat"); + } + + @Benchmark + public String testSentence() { + return CASE.transliterate("The Quick Brown Fox Jumped Over The Lazy Dog"); + } + +} diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CollationPerformanceTest.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CollationPerformanceTest.java index d8dfceed27fa..07edafcfb423 100644 --- a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CollationPerformanceTest.java +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/CollationPerformanceTest.java @@ -13,6 +13,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Comparator; @@ -831,7 +834,7 @@ void setOptions() { opt_icu = false; } - if (opt_rules.length() != 0) { + if (!opt_rules.isEmpty()) { try { icuCol = new com.ibm.icu.text.RuleBasedCollator(getCollationRules(opt_rules)); } catch (Exception e) { @@ -1119,37 +1122,20 @@ void readDataLines() { * 3. File encoding is ISO-8859-1 */ String getCollationRules(String ruleFileName) { - FileInputStream fis = null; - InputStreamReader isr = null; - BufferedReader br = null; - try { - fis = new FileInputStream(opt_rules); - isr = new InputStreamReader(fis,"ISO-8859-1"); - br= new BufferedReader(isr); - } catch (Exception e) { + StringBuilder rules = new StringBuilder(); + try (BufferedReader br = Files.newBufferedReader(Paths.get(ruleFileName), StandardCharsets.ISO_8859_1)) { + br.lines().forEach(line -> { + int commentPos = line.indexOf('#'); + if (commentPos >= 0) line = line.substring(0, commentPos); + rules.append(line.trim()); + }); + } catch (IOException e) { System.err.println("Error: File access exception: " + e.getMessage() + "!"); System.exit(2); } - String rules = ""; - String line = ""; - while (true) { - try { - line = br.readLine(); - } catch (IOException e) { - System.err.println("Read File Error" + e.getMessage() + "!"); - System.exit(1); - } - if (line == null) { - break; - } - int commentPos = line.indexOf('#'); - if (commentPos >= 0) line = line.substring(0, commentPos); - line = line.trim(); - rules = rules + line; - } - return rules; + return rules.toString(); } - + //Implementing qsort void qSortImpl_java_usekeys(String src[], int fromIndex, int toIndex, java.text.Collator c) { int low = fromIndex; diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/LowercaseTransliteratorPerf.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/LowercaseTransliteratorPerf.java new file mode 100644 index 000000000000..26baea593f0c --- /dev/null +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/LowercaseTransliteratorPerf.java @@ -0,0 +1,35 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +/* + ********************************************************************** + * Copyright (c) 2002-2008, International Business Machines * + * Corporation and others. All Rights Reserved. * + ********************************************************************** + */ +package com.ibm.icu.dev.test.perf; + +import java.util.concurrent.TimeUnit; + +import com.ibm.icu.text.Transliterator; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; + +@BenchmarkMode(Mode.Throughput) +@OutputTimeUnit(TimeUnit.MILLISECONDS) +public class LowercaseTransliteratorPerf { + + static final Transliterator LOWER = Transliterator.getInstance("Lower"); + + @Benchmark + public String testShort() { + return LOWER.transliterate("Cat"); + } + + @Benchmark + public String testSentence() { + return LOWER.transliterate("The Quick Brown Fox Jumped Over The Lazy Dog"); + } + +} diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/RBBIPerf.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/RBBIPerf.java index 342f7a51d422..208af4041649 100644 --- a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/RBBIPerf.java +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/RBBIPerf.java @@ -7,14 +7,13 @@ ********************************************************************** */ package com.ibm.icu.dev.test.perf; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; import java.text.BreakIterator; import com.ibm.icu.text.RuleBasedBreakIterator; -import com.ibm.icu.text.UTF16; /** * A class for testing UnicodeSet performance. @@ -24,7 +23,6 @@ */ public class RBBIPerf extends PerfTest { - String dataFileName; RuleBasedBreakIterator bi; BreakIterator jdkbi; String testString; @@ -40,19 +38,7 @@ protected void setup(String[] args) { } try { - dataFileName = args[0]; - StringBuffer testFileBuf = new StringBuffer(); - InputStream is = new FileInputStream(dataFileName); - InputStreamReader isr = new InputStreamReader(is, "UTF-8"); - int c; - for (;;) { - c = isr.read(); - if (c < 0) { - break; - } - UTF16.append(testFileBuf, c); - } - testString = testFileBuf.toString(); + testString = Files.readString(Paths.get(args[0]), StandardCharsets.UTF_8); } catch (IOException e) { throw new RuntimeException(e.toString()); diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/TitlecaseTransliteratorPerf.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/TitlecaseTransliteratorPerf.java new file mode 100644 index 000000000000..c2d58f7b1984 --- /dev/null +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/TitlecaseTransliteratorPerf.java @@ -0,0 +1,35 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +/* + ********************************************************************** + * Copyright (c) 2002-2008, International Business Machines * + * Corporation and others. All Rights Reserved. * + ********************************************************************** + */ +package com.ibm.icu.dev.test.perf; + +import java.util.concurrent.TimeUnit; + +import com.ibm.icu.text.Transliterator; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; + +@BenchmarkMode(Mode.Throughput) +@OutputTimeUnit(TimeUnit.MILLISECONDS) +public class TitlecaseTransliteratorPerf { + + static final Transliterator TITLE = Transliterator.getInstance("Title"); + + @Benchmark + public String testShort() { + return TITLE.transliterate("CAT"); + } + + @Benchmark + public String testSentence() { + return TITLE.transliterate("the quick brown fox jumped over the lazy dog"); + } + +} diff --git a/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UppercaseTransliteratorPerf.java b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UppercaseTransliteratorPerf.java new file mode 100644 index 000000000000..2434b12ffedc --- /dev/null +++ b/icu4j/perf-tests/src/main/java/com/ibm/icu/dev/test/perf/UppercaseTransliteratorPerf.java @@ -0,0 +1,35 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +/* + ********************************************************************** + * Copyright (c) 2002-2008, International Business Machines * + * Corporation and others. All Rights Reserved. * + ********************************************************************** + */ +package com.ibm.icu.dev.test.perf; + +import java.util.concurrent.TimeUnit; + +import com.ibm.icu.text.Transliterator; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; + +@BenchmarkMode(Mode.Throughput) +@OutputTimeUnit(TimeUnit.MILLISECONDS) +public class UppercaseTransliteratorPerf { + + static final Transliterator UPPER = Transliterator.getInstance("Upper"); + + @Benchmark + public String testShort() { + return UPPER.transliterate("Cat"); + } + + @Benchmark + public String testSentence() { + return UPPER.transliterate("The Quick Brown Fox Jumped Over The Lazy Dog"); + } + +} diff --git a/icu4j/pom.xml b/icu4j/pom.xml index fbf4e94f64cc..eb7a31e4a195 100644 --- a/icu4j/pom.xml +++ b/icu4j/pom.xml @@ -43,14 +43,16 @@ demos samples + tools/build tools/misc + tools/taglets perf-tests UTF-8 - 1.8 - 1.8 + UTF-8 + 11 https://oss.sonatype.org ${maven-central-repo-url}/service/local/staging/deploy/maven2 @@ -59,10 +61,16 @@ ${project.build.directory}/release_directory + 1.37 4.13.2 1.1.1 2.11.0 1.9.0 + + 3.5.1 International Components for Unicode for Java ${project.artifactId} @@ -198,14 +206,7 @@ maven-compiler-plugin - 3.13.0 - - - ${maven.compiler.source} - ${maven.compiler.target} - + 3.14.0 maven-surefire-plugin @@ -246,6 +247,14 @@ maven-source-plugin 3.3.1 + + + + org.codehaus.plexus + plexus-io + ${plexus-io.version} + + maven-gpg-plugin @@ -323,6 +332,9 @@ 3.6.3 + + [11,) + @@ -441,6 +453,14 @@ + + + + org.codehaus.plexus + plexus-io + ${plexus-io.version} + + org.codehaus.mojo @@ -658,36 +678,10 @@ - - newer_jdk - - [9,) - - - tools/build - tools/taglets - - - - - maven-compiler-plugin - - 8 - - - - - - - - + errorprone @@ -695,11 +689,11 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.source} - ${maven.compiler.target} + true + false + true UTF-8 - true -XDcompilePolicy=simple -Xplugin:ErrorProne -XepAllErrorsAsWarnings + -Xmaxerrs + 10000 + -J-Dfile.encoding=UTF-8 + -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED diff --git a/icu4j/tools/build/pom.xml b/icu4j/tools/build/pom.xml index edee524870b4..4d5b76e6dc9a 100644 --- a/icu4j/tools/build/pom.xml +++ b/icu4j/tools/build/pom.xml @@ -15,22 +15,64 @@ tools_build - 11 - 11 + 2.25.0 + + + /tmp/errorprone.log + https://github.com/unicode-org/icu/blob/main/ + + + com.google.errorprone + error_prone_core + ${error_prone.version} + + + commons-cli + commons-cli + ${commons-cli.version} + + + - newer_jdk - - [11,) - + + errorprone_report - maven-compiler-plugin + org.codehaus.mojo + exec-maven-plugin + 3.5.0 + + + + java + + + - 11 + com.ibm.icu.dev.tool.errorprone.Main + + --logFile + ${logFile} + --srcBaseUrl + ${srcBaseUrl} + diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/docs/APIInfo.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/docs/APIInfo.java index 9dadd6fb1dda..359151798d6a 100644 --- a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/docs/APIInfo.java +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/docs/APIInfo.java @@ -80,7 +80,7 @@ public boolean equals(Object rhs) { this.name.equals(that.name) && this.sig.equals(that.sig) && this.exc.equals(that.exc) && - this.stver.equals(this.stver); + this.stver.equals(that.stver); } catch (ClassCastException e) { return false; diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneEntry.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneEntry.java new file mode 100644 index 000000000000..a5adeb104d15 --- /dev/null +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneEntry.java @@ -0,0 +1,56 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +package com.ibm.icu.dev.tool.errorprone; + +import java.util.StringJoiner; + +/** + * Error prone issue as parsed from the maven standard output. + * + *

Very similar to `com.google.errorprone.BugCheckerInfo` + */ +class ErrorProneEntry { + final String path; + final int line; + + @Override + public String toString() { + StringJoiner builder = new StringJoiner("\n ", "ErrorEntry {\n ", "\n}"); + builder.add("path:\"" + path + "\"") + .add("line:" + line) + .add("column:" + column) + .add("type:" + type) + .add("message:\"" + message + "\"") + .add("extra:\"" + extra + "\"") + .add("url:\"" + url + "\""); + return builder.toString(); + } + + final int column; + final String type; + final String message; + String extra; + String url; + String severity; + + void addExtra(String toAdd) { + if (extra == null) { + extra = toAdd; + } else { + extra = extra + "\n" + toAdd; + } + } + + /** Creates an ErrorEntry object. */ + ErrorProneEntry(String path, int line, int column, String type, String message) { + this.path = path; + this.line = line; + this.column = column; + this.type = type; + this.message = message; + this.extra = null; + this.url = null; + this.severity = "???"; + } +} diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneReport.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneReport.java new file mode 100644 index 000000000000..b9b2bf2c1309 --- /dev/null +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneReport.java @@ -0,0 +1,262 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +package com.ibm.icu.dev.tool.errorprone; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import com.google.common.collect.ImmutableBiMap; +import com.google.errorprone.BugCheckerInfo; +import com.google.errorprone.scanner.BuiltInCheckerSuppliers; + +class ErrorProneReport { + private static final String HTML_REPORT_FILE = "errorprone1.html"; + private static final String HTML_REPORT_FILE2 = "errorprone2.html"; + private static final String SORTTABLE_JS_FILE = "sorttable.js"; + private static final String SORTTABLE_CSS_FILE = "errorprone.css"; + private static final String [] EMBEDDED_FILES = + { SORTTABLE_JS_FILE, SORTTABLE_CSS_FILE }; + private static final ImmutableBiMap KNOWN_ERRORS = + BuiltInCheckerSuppliers.allChecks().getAllChecks(); + + public static void genReports(String icuDir, String mavenStdOut, String outDir, String baseUrl) + throws IOException { + + Map> errors = + ParseMavenOutForErrorProne.parse(icuDir, mavenStdOut); + + extractExtraFiles(outDir); + genReport1(errors, outDir, baseUrl); + genReport2(errors, outDir, baseUrl); + } + + // Extract additional files used by the reports (css, js, etc) + private static void extractExtraFiles(String outFolder) throws IOException { + for (String fileName : EMBEDDED_FILES) { + try (InputStream is = ErrorProneReport.class.getResourceAsStream(fileName)) { + Files.copy(is, Paths.get(outFolder, fileName), StandardCopyOption.REPLACE_EXISTING); + } + } + } + + private static void genReport1(Map> errors, + String outDir, String baseUrl) throws IOException { + + Path outFileName = Paths.get(outDir, HTML_REPORT_FILE); + System.out.println("Report generated: " + outFileName); + try (PrintStream wrt = new PrintStream(outFileName.toString(), StandardCharsets.UTF_8)) { + HtmlUtils hu = new HtmlUtils(wrt); + hu.openTag("html"); + + outHtmlHead(hu); + + hu.openTag("body"); + + outTitle(hu); + + hu.openTag("table", Map.of("class", "sortable")); + + // Table header + hu.openTag("thead"); + hu.openTag("tr"); + hu.openTag("th").text("File and line number").closeTag("th"); + hu.openTag("th").text("Severity").closeTag("th"); + hu.openTag("th").text("Issue type").closeTag("th"); + hu.openTag("th").text("Message").closeTag("th"); + hu.closeTag("tr"); + hu.closeTag("thead"); + + for (Map.Entry> e : errors.entrySet()) { + for (ErrorProneEntry error : e.getValue()) { + hu.openTag("tr"); + + outFilePath(hu, error, baseUrl); + + // Error severity + hu.openTag("td", Map.of("class", "severity_" + error.severity)) + .text(error.severity) + .closeTag("td"); + + // Error type + hu.openTag("td", Map.of("class", "tag")); + Map attr = error.url == null + ? Map.of("target", "errWin") + : Map.of("href", error.url, "target", "errWin"); + hu.openTag("a", attr).text(error.type).closeTag("a"); + hu.closeTag("td"); + + outDescription(hu, error); + + hu.closeTag("tr"); + } + } + + hu.closeTag("table"); + + hu.closeTag("body"); + hu.closeTag("html"); + } + } + + private static void genReport2(Map> errors, + String outDir, String baseUrl) throws IOException { + Path outFileName = Paths.get(outDir, HTML_REPORT_FILE2); + System.out.println("Report generated: " + outFileName); + try (PrintStream wrt = new PrintStream(outFileName.toString(), StandardCharsets.UTF_8)) { + HtmlUtils hu = new HtmlUtils(wrt); + hu.openTag("html"); + + outHtmlHead(hu); + + hu.openTag("body"); + + outTitle(hu); + + hu.openTag("div"); + hu.openTag("h2").text("Summary").closeTag("h2"); + for (String severityLevel : ErrorProneUtils.SEVERITY_LEVELS_TO_REPORT) { + outSummary(hu, errors, severityLevel); + } + hu.closeTag("div"); + + hu.openTag("hr"); + + hu.openTag("h2").text("Detailed report").closeTag("h2"); + for (Map.Entry> e : errors.entrySet()) { + String errorType = e.getKey(); + List errorsOfType = e.getValue(); + if (errorsOfType.isEmpty()) { + continue; + } + ErrorProneEntry firstEntry = errorsOfType.get(0); + String errorSeverity = e.getKey(); + // "class", "severity_" + errorSeverity) + hu.openTag("h3", Map.of("id", "name_" + errorType)) + .text("[" + firstEntry.severity + "] ") + .openTag("span", Map.of("class", "tag")).text(errorType).closeTag("span") + .text(" [" + errorsOfType.size() + "] "); + String url = ErrorProneUtils.getUrl(errorType); + if (url != null) { + hu.openTag("a", Map.of("href", url, "target", "errWin")) + .text("\uD83D\uDD17") // link emoji, U+1F517 + .closeTag("a"); + } + hu.closeTag("h2"); + + Map attr = errorType == null + ? Map.of("target", "errWin") + : Map.of("href", errorType, "target", "errWin"); + + hu.openTag("table", Map.of("class", "sortable")); + + // Table header + hu.openTag("thead"); + hu.openTag("tr"); + hu.openTag("th").text("File and line number").closeTag("th"); + hu.openTag("th").text("Message").closeTag("th"); + hu.closeTag("tr"); + hu.closeTag("thead"); + + for (ErrorProneEntry error : errorsOfType) { + if (!error.type.equals(e.getKey())) { + continue; + } + hu.openTag("tr"); + outFilePath(hu, error, baseUrl); + outDescription(hu, error); + hu.closeTag("tr"); + } + hu.closeTag("table"); + } + + hu.closeTag("body"); + hu.closeTag("html"); + } + } + + private static void outHtmlHead(HtmlUtils hu) { + hu.openTag("head"); + hu.openTag("meta", Map.of("charset", "UTF-8")); + hu.openTag("link", Map.of("rel", "stylesheet", "href", SORTTABLE_CSS_FILE)); + hu.openTag("script", Map.of("src", SORTTABLE_JS_FILE)).closeTag("script"); + hu.closeTag("head"); + } + + private static void outFilePath(HtmlUtils hu, ErrorProneEntry error, String baseUrl) { + String visiblePath = error.path + ":[" + error.line + "," + error.column + "]"; + String url = baseUrl + "/" + error.path + "#L" + error.line; + hu.openTag("td", Map.of("class", "file_name")); + hu.openTag("a", Map.of("href", url, "target", "codeWin")).text(visiblePath).closeTag("a"); + hu.closeTag("td"); + } + + private static void outDescription(HtmlUtils hu, ErrorProneEntry error) { + hu.openTag("td", Map.of("class", "desc")); + hu.text(error.message); + if (error.extra != null) { + hu.openTag("hr"); + String extra = error.extra; + if (extra.startsWith("Did you mean '") && extra.endsWith("'?")) { + hu.indent(); + hu.text("Did you mean "); + hu.openTag("br"); + hu.indent(); + hu.openTag("code"); + extra = extra.substring(14, extra.length() - 2); + hu.text(extra); + hu.closeTag("code"); + } else { + hu.text(extra); + } + } + hu.closeTag("td"); + } + + private static void outTitle(HtmlUtils hu) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MMMM-dd, HH:mm:ss", Locale.US); + String title = "ErrorProne report, " + sdf.format(new Date()); + hu.openTag("h1").text(title).closeTag("h1"); + } + + private static void outSummary(HtmlUtils hu, Map> errors, + String severityLevel) { + boolean first = true; + for (Map.Entry> e : errors.entrySet()) { + String errorSeverity = ErrorProneUtils.getErrorLevel(e.getKey()); + if (!severityLevel.equals(errorSeverity)) { + continue; + } + if (first) { + hu.openTag("h3").text(severityLevel).closeTag("h3"); + hu.openTag("p"); + first = false; + } else { + hu.text(" \u2022 "); // bullet + } + // MissingFail [3] + hu.openTag("a", Map.of( + "href", "#name_" + e.getKey(), + "class", "severity_" + errorSeverity)) + .openTag("span", Map.of("class", "tag")) + .text(e.getKey()) + .closeTag("span") + .closeTag("a") + .text(" [" + e.getValue().size() + "]\n"); + } + if (!first) { + hu.closeTag("p").nl(); + } + } +} diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneUtils.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneUtils.java new file mode 100644 index 000000000000..2473da1ce925 --- /dev/null +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ErrorProneUtils.java @@ -0,0 +1,93 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +package com.ibm.icu.dev.tool.errorprone; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import com.google.common.collect.ImmutableBiMap; +import com.google.errorprone.BugCheckerInfo; +import com.google.errorprone.BugPattern; +import com.google.errorprone.scanner.BuiltInCheckerSuppliers; + +class ErrorProneUtils { + + /* + * This is from errorprone library, a list of all known issue types. + * + * The reason why we need all of this complication: + * + * The errorprone tool is implemented as a javac compiler extension. + * So when the code is compiled, the errorprone "hooks" are invoked by the + * Java compiler. + * As such, errorprone can only use the Java compiler mechanisms to report issues. + * But if it reports an error, the compiler stops compiling the rest of the files. + * In order to generate a report on the whole source tree, errorprone has a flag + * to report all issues as warnings (-XepAllErrorsAsWarnings). + * That way the compiler continues on the whole project and does not stop. + * But because of that, even the worst errorprone violations that would qualify + * as errors are still reported as warnings. + * So to "get back" the proper severity level we depend on the errorprone library, + * get all known errors, and then use the `defaultSeverity` field within each `BugCheckerInfo`. + */ + private static final ImmutableBiMap KNOWN_ERRORS = + BuiltInCheckerSuppliers.allChecks().getAllChecks(); + static final String SEVERITY_UNKNOWN = "UNKNOWN"; + // Some special severity classes, to group what ICU considers important to fix. + static final String SEVERITY_ICU_PRI1 = "ICU_PRIORITY_1"; + static final String SEVERITY_ICU_PRI2 = "ICU_PRIORITY_2"; + + // This gives the order of the summary in the report + // The extra "unknown" option seems weird, but at this point errorprone reports an issue + // (type `dep-ann`) but does not list it as a known check. (April 2025) + // It is likely a bug, might be fixed in the meantime, but another one might come back + // at some point in the future. + // We never know, so we take care of that special case. + static final List SEVERITY_LEVELS_TO_REPORT = Arrays.asList( + // A special severity class, where we show first what ICU considers important to fix. + SEVERITY_ICU_PRI1, + SEVERITY_ICU_PRI2, + BugPattern.SeverityLevel.ERROR.toString(), + ErrorProneUtils.SEVERITY_UNKNOWN, + BugPattern.SeverityLevel.WARNING.toString(), + BugPattern.SeverityLevel.SUGGESTION.toString()); + + // A special severity class, where we show first what ICU considers important to fix. + static final Map ICU_SPECIAL_SEVERITIES = Map.of( + // Example: + // "MissingFail", SEVERITY_ICU_PRI1, + // "ReferenceEquality", SEVERITY_ICU_PRI2 + ); + + /** + * Given an error type (for example `BadImport`, `UnusedVariable`) + * it returns the error level (error, warning, info, etc). + * + * @param errorType the error type, as reported by errorprone + * @return the error level (severity) + */ + static String getErrorLevel(String errorType) { + String icuSpecialSeverity = ICU_SPECIAL_SEVERITIES.get(errorType); + if (icuSpecialSeverity != null) { + return icuSpecialSeverity; + } + BugCheckerInfo found = KNOWN_ERRORS.get(errorType); + return found == null + ? SEVERITY_UNKNOWN + : found.defaultSeverity().toString(); + } + + /** + * Given an error type (for example `BadImport`, `UnusedVariable`) + * it returns the url to a public page explaining the error. + * + * @param errorType the error type, as reported by errorprone + * @return the url to a public explanation page + */ + static String getUrl(String errorType) { + BugCheckerInfo found = KNOWN_ERRORS.get(errorType); + return found == null ? null : found.linkUrl(); + } +} diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/HtmlUtils.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/HtmlUtils.java new file mode 100644 index 000000000000..3c28b943b724 --- /dev/null +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/HtmlUtils.java @@ -0,0 +1,164 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +package com.ibm.icu.dev.tool.errorprone; + +import java.io.PrintStream; +import java.util.Map; + +class HtmlUtils { + private static final int NOTHING = 0b0000_0000; + private static final int STANDALONE = 0b0000_0001; + private static final int INDENT_KIDS = 0b0000_0010; + private static final int NL_BEFORE_START = 0b0000_0100; + private static final int NL_AFTER_START = 0b0000_1000; + private static final int NL_BEFORE_END = 0b0001_0000; + private static final int NL_AFTER_END = 0b0010_0000; + private static final int NLNL_AFTER_END = 0b0100_0000; + private static final int NLNL_AFTER_START = 0b1000_0000; + private static final int INLINE = 0b1_0000_0000; + + private static final Map HTML_TAGS = Map.ofEntries( + Map.entry("html", NL_AFTER_START | NL_AFTER_END), + Map.entry("head", NL_AFTER_START | NL_AFTER_END), + Map.entry("meta", NL_AFTER_START | NL_AFTER_END), + Map.entry("script", NL_AFTER_END), + Map.entry("style", NL_AFTER_START | NL_AFTER_END), + Map.entry("link", NL_AFTER_START | NL_AFTER_END), + Map.entry("body", NLNL_AFTER_START | NL_BEFORE_END | NL_AFTER_END), + Map.entry("h1", NLNL_AFTER_END), + Map.entry("h2", NLNL_AFTER_END), + Map.entry("h3", NLNL_AFTER_END), + Map.entry("h4", NLNL_AFTER_END), + Map.entry("h5", NLNL_AFTER_END), + Map.entry("h6", NLNL_AFTER_END), + Map.entry("div", NL_AFTER_START | NLNL_AFTER_END), + Map.entry("hr", NL_BEFORE_START | NL_AFTER_START | STANDALONE), + Map.entry("br", NL_AFTER_START | STANDALONE | INLINE), + Map.entry("p", NL_AFTER_END), + Map.entry("table", NL_AFTER_START | NL_AFTER_END), + Map.entry("thead", NL_AFTER_START | NL_AFTER_END), + Map.entry("tr", NL_AFTER_START | NL_AFTER_END | INDENT_KIDS), + Map.entry("td", NL_AFTER_END), + Map.entry("th", NL_AFTER_END), + Map.entry("code", INLINE), + Map.entry("a", INLINE), + Map.entry("span", INLINE) + ); + + private static final String INDENT_SPACES = " "; + + private static PrintStream wrt; + + int indent = 0; + + HtmlUtils(PrintStream wrt) { + this.wrt = wrt; + } + + HtmlUtils indent() { + for (int i = 0; i < indent; i++) { + wrt.print(INDENT_SPACES); + } + return this; + } + + static int getFlags(String tag) { + Integer flags = HTML_TAGS.get(tag); + if (flags == null) { + System.out.println("Unknown tag '" + tag + "'"); + } + return flags == null ? NOTHING : flags; + } + + static boolean isSet(int flag, int bit) { + return (flag & bit) == bit; + } + + HtmlUtils openTag(String tag, Map attributes) { + int flags = getFlags(tag); + + if (isSet(flags, NL_BEFORE_START)) { + wrt.print("\n"); + } + + if (!isSet(flags, INLINE)) { + indent(); + } + wrt.print("<" + tag); + + if (attributes != null) { + for (Map.Entry attr : attributes.entrySet()) { + wrt.print(" " + attr.getKey() + "=\"" + escAttr(attr.getValue()) + "\""); + } + } + + if (isSet(flags, STANDALONE)) { + wrt.print("/>"); + } else { + wrt.print(">"); + } + + if (isSet(flags, NL_AFTER_START)) { + wrt.print("\n"); + } + if (isSet(flags, NLNL_AFTER_START)) { + wrt.print("\n\n"); + } + + if (isSet(flags, INDENT_KIDS)) { + indent++; + } + return this; + } + + HtmlUtils openTag(String tag) { + return openTag(tag, null); + } + + HtmlUtils closeTag(String tag) { + int flags = getFlags(tag); + if (isSet(flags, INDENT_KIDS)) { + indent--; + } + if (isSet(flags, NL_BEFORE_END)) { + wrt.print("\n"); + indent(); + } + wrt.print(""); + if (isSet(flags, NL_AFTER_END)) { + wrt.print("\n"); + } + if (isSet(flags, NLNL_AFTER_END)) { + wrt.print("\n\n"); + } + + return this; + } + + HtmlUtils text(String text, boolean escape) { + if (escape) { + wrt.print(escText(text)); + } else { + wrt.print(text); + } + return this; + } + + HtmlUtils text(String text) { + return text(text, true); + } + + HtmlUtils nl() { + wrt.println(); + return this; + } + + private static String escAttr(String text) { + return text.replace("\"", """); + } + + private static String escText(String text) { + return text.replace("&", "&").replace("<", "<").replace(">", ">"); + } +} diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/Main.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/Main.java new file mode 100644 index 000000000000..b58a77225ffe --- /dev/null +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/Main.java @@ -0,0 +1,204 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +package com.ibm.icu.dev.tool.errorprone; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; + +/** + * Parses a log that represents the standard output of a maven run with erroprone enabled + * and generates two user friendly reports in html format. + * + * 


+ * mvn clean test -ntp -DskipTests -DskipITs -l errorprone.log -P errorprone
+ * mvn exec:java -f tools/build/ -P errorprone_report
+ *
+ */ +public class Main { + private static final String HELP = "help"; + private static final String HELP_DESC = "this text"; + + private static final String SRC_BASE_URL = "srcBaseUrl"; + private static final String SRC_BASE_URL_DESC = "" + + "The url used as a base for links to the source.\n" + + "The report will append to it the relative path of the Java files to create links.\n" + + "It can point to a web server, or local folder.\n" + + "Some examples:\n" + + " \u00a0 \u00a0 https://github.com/unicode-org/icu/blob/main\n" + + " \u00a0 \u00a0 http://localhost:8000\n" + + " \u00a0 \u00a0 file:///Users/john/icu/\n" + + " \u00a0 \u00a0 ../\n" + + "Except for GitHub these options don't honow the line where to go.\n" + + "And GitHub might be out of sync with the report, so the offset might be wrong."; + private static final String SRC_BASE_URL_DEFAULT = "https://github.com/unicode-org/icu/blob/main/"; + String srcBaseUrl; + + private static final String LOG_FILE_NAME = "logFile"; + private static final String LOG_FILE_NAME_DESC = "The name of the errorprone log file.\n" + + "It is in fact the standard output of a maven build with errorprone profile enabled."; + private static final String LOG_FILE_NAME_DEFAULT = "errorprone.log"; + String logFile; + + private static final String OUT_DIR = "outDir"; + private static final String OUT_DIR_DESC = + "The output directory where to write the converted ICU data."; + private static final String OUT_DIR_DEFAULT = "."; + String outDir; + + private static final String ICU_DIR = "icuDir"; + private static final String ICU_DIR_DESC = "Path top level ICU directory\n" + + "(containing `.git`, `icu4c`, `icu4j`, `tools` directories)"; + private static final String ICU_DIR_DEFAULT = null; + String icuDir; + + // These must be kept in sync with getOptions(). + private static final Options options = + new Options() + .addOption(Option.builder() + .longOpt(HELP) + .desc(HELP_DESC) + .build()) + .addOption(Option.builder() + .longOpt(SRC_BASE_URL) + .hasArg() + .argName("path") + .desc(descWithDefault(SRC_BASE_URL_DESC, SRC_BASE_URL_DEFAULT)) + .build()) + .addOption(Option.builder() + .longOpt(LOG_FILE_NAME) + .hasArg() + .argName("path") + .desc(descWithDefault(LOG_FILE_NAME_DESC, LOG_FILE_NAME_DEFAULT)) + .build()) + .addOption(Option.builder() + .longOpt(ICU_DIR) + .hasArg() + .argName("path") + .desc(descWithDefault(ICU_DIR_DESC, ICU_DIR_DEFAULT)) + .build()) + .addOption(Option.builder() + .longOpt(OUT_DIR) + .hasArg() + .argName("path") + .desc(descWithDefault(OUT_DIR_DESC, OUT_DIR_DEFAULT)) + .build()); + + private static String descWithDefault(String description, String defaultValue) { + if (defaultValue != null) { + return description + "\nDefaults to: \"" + defaultValue + "\""; + } else { + return description; + } + } + + private void showUsageAndExit() { + String thisClassName = this.getClass().getCanonicalName(); + HelpFormatter formatter = new HelpFormatter(); + formatter.printHelp( + /*width*/ 120, + /*cmdLineSyntax*/ thisClassName + " [OPTIONS]\n", + /*header*/ "\n" + + "This program generates an errorprone html report from" + + " the maven standard output.\n" + + "Options:", + options, + /*footer*/ "\nExample: " + + thisClassName + + " --outDir /tmp/debug --logFile=errorprone.log"); + System.exit(-1); + } + + void processArgs(String[] args) { + CommandLine cli = null; + try { + CommandLineParser parser = new DefaultParser(); + cli = parser.parse(options, args); + } catch (Exception e) { + cli = CommandLine.builder().build(); + showUsageAndExit(); + } + if (cli.hasOption(HELP)) { + showUsageAndExit(); + } + + icuDir = cli.getOptionValue(ICU_DIR, icuDir); + outDir = cli.getOptionValue(OUT_DIR, outDir); + srcBaseUrl = cli.getOptionValue(SRC_BASE_URL, srcBaseUrl); + logFile = cli.getOptionValue(LOG_FILE_NAME, logFile); + } + + private static void makeOutputFolder(String dirName) { + File fileOutDir = new File(dirName); + if (!fileOutDir.exists()) { + fileOutDir.mkdirs(); + } else if (!fileOutDir.isDirectory()) { + // already exists, but it is not a directory + System.out.println("Error: " + dirName + + " already exists, but it is not a directory"); + System.exit(2); + } + } + + private static Path guessIcuRoot() { + try { + Path p = Paths.get(Main.class.getResource("/").toURI()); + do { + if (p.resolve("icu4c").toFile().isDirectory() + && p.resolve("icu4j").toFile().isDirectory() + && p.resolve("LICENSE").toFile().isFile()) { + return p; + } + p = p.getParent(); + } while (p != null); + } catch (URISyntaxException e) { + System.out.println("Error: " + e.getMessage()); + System.exit(2); + } + System.out.println("Unable to find the ICU root"); + System.exit(2); + return null; + } + + void execute() { + try { + Path icuDirr = guessIcuRoot(); + icuDir = icuDirr.toString() + "/"; + if (srcBaseUrl == null) { + srcBaseUrl = icuDir; + } + if (outDir == null) { + outDir = icuDir + "icu4j/target/"; + } + if (logFile == null) { + logFile = icuDir + "icu4j/errorprone.log"; + } + makeOutputFolder(outDir); + ErrorProneReport.genReports(icuDir, logFile, outDir, srcBaseUrl); + } catch (IOException e) { + System.out.println("Error: " + e); + System.exit(1); + } + } + + /** Program entry point. */ + public static void main(String[] args) throws IOException { + /* + * mvn clean test -ntp -DskipTests -DskipITs -l errorprone.log -P errorprone + * mvn exec:java -f tools/build/ -P errorprone_report + */ + Main self = new Main(); + self.processArgs(args); + self.execute(); + } +} diff --git a/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ParseMavenOutForErrorProne.java b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ParseMavenOutForErrorProne.java new file mode 100644 index 000000000000..ad7fe82d0f27 --- /dev/null +++ b/icu4j/tools/build/src/main/java/com/ibm/icu/dev/tool/errorprone/ParseMavenOutForErrorProne.java @@ -0,0 +1,123 @@ +// © 2025 and later: Unicode, Inc. and others. +// License & terms of use: https://www.unicode.org/copyright.html + +package com.ibm.icu.dev.tool.errorprone; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +class ParseMavenOutForErrorProne { + // The `(?:[A-F]:)?` in the beginning is for the Windows drive letter (for example D:) + private static final String RE_ERROR_PRONE_START = + "^\\[WARNING\\] ((?:[A-F]:)?[\\\\/a-zA-Z0-9_.\\-]+\\.java):\\[(\\d+),(\\d+)\\]" + + " \\[(\\S+)\\] (.+)"; + private static final Pattern PATTERN = Pattern.compile(RE_ERROR_PRONE_START); + + /** + * The result contains the issues reported by errorprone. + * + *

The key is the issue type (for example `MissingOverride` or `InvalidThrows`). + * The value is a list with all the issues of that type, in the order in which they + * were reported.

+ * + * @param baseDir the "prefix" to remove from the file paths (usually the root of icu) + * @param fileName the name of the maven stdout log file to parse + * @return the summary, a map where the key is the issue type, + * and the value a list of all issues of that type + * @throws IOException for any kind of file system problems. + */ + static Map> parse(String baseDir, String fileName) throws IOException { + Map> errorReport = new TreeMap<>(); + ErrorProneEntry currentError = null; + + if (baseDir != null) { + baseDir = baseDir.replace('\\', '/'); + } + int currentLine = 0; + for (String line : Files.readAllLines(Paths.get(fileName), StandardCharsets.UTF_8)) { + currentLine++; + Matcher m = PATTERN.matcher(line); + if (m.find()) { + String path = line.substring(m.start(1), m.end(1)).replace('\\', '/'); + if (baseDir != null) { + if (path.startsWith(baseDir)) { + path = path.substring(baseDir.length()); + } + } + // If we already had an error report in progress, save it. + addErrorToReportAndReset(errorReport, currentError); + currentError = + new ErrorProneEntry( + path, + Integer.parseInt(line.substring(m.start(2), m.end(2))), // line + Integer.parseInt(line.substring(m.start(3), m.end(3))), // column + line.substring(m.start(4), m.end(4)), // error code + line.substring(m.start(5), m.end(5)) // message + ); + } else if (line.startsWith(" Did you mean ")) { + if (currentError == null) { + error(fileName, currentLine, line, "Parse error: unexpected 'Did you mean' "); + } else { + currentError.addExtra(line.trim()); + } + } else if (line.startsWith(" (see https://") && line.endsWith(")")) { + if (currentError == null) { + error(fileName, currentLine, line, "Parse error: unexpected '(see )'"); + } else { + // 9 is the length of " (see " + currentError.url = line.substring(9, line.length() - 1); + } + } else if (line.equals( + "[WARNING] Unable to autodetect 'javac' path, using 'javac' from the" + + " environment.")) { + currentError = addErrorToReportAndReset(errorReport, currentError); + } else if (line.startsWith("[INFO]")) { + currentError = addErrorToReportAndReset(errorReport, currentError); + } else { + error(fileName, currentLine, line, "Parse error: I don't know what this is"); + currentError = addErrorToReportAndReset(errorReport, currentError); + } + } + // In case we had an error report in progress, save it. + currentError = addErrorToReportAndReset(errorReport, currentError); + return errorReport; + } + + static ErrorProneEntry addErrorToReportAndReset(Map> errorReport, + ErrorProneEntry crtError) { + if (crtError != null) { + String errorType = crtError.type; + // Fix the severity from parsing, which is never error, to the proper errorprone one + crtError.severity = ErrorProneUtils.getErrorLevel(errorType); + List list = errorReport.computeIfAbsent( + errorType, e -> new ArrayList()); + list.add(crtError); + crtError = null; + } + // We want to reset the currentError after we record it. + // One errorprone issue can take several lines in the log. + // The parsing creates currentError when the start of an issue is detected. + // We add more info to the currentError from the following lines. + // When we find something that does not look like an errorprone line, or at the end of the + // log, we add currentError to the report, and then we set it to null. + // By returning null here the call in the main loop can be one single line: + // currentError = addErrorToReport(errorReport, currentError); => report AND reset + // If we return nothing (void method) we would need to do this in the caller (several times): + // addErrorToReport(errorReport, currentError); => report + // currentError = null; => reset + return null; + } + + private static void error(String fileName, int lineNo, String line, String msg) { + System.out.printf("\033[91m%s[%s] %s %n '%s'\033[m%n", fileName, lineNo, msg, line); + } + +} diff --git a/icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/errorprone.css b/icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/errorprone.css new file mode 100644 index 000000000000..3fac81789932 --- /dev/null +++ b/icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/errorprone.css @@ -0,0 +1,68 @@ +/* + * © 2025 and later: Unicode, Inc. and others. + * License & terms of use: https://www.unicode.org/copyright.html + */ + +body { + font-family: sans-serif; +} + +td { + border: 1px solid black; + padding: 0 .5em; +} + +table, th { + border: 2px solid black; + border-collapse: collapse; +} + +th { + cursor: pointer; + background-color: #aaa; +} + +table.sortable tbody tr:nth-child(2n) td { + background: #ddd; +} + +table.sortable tbody tr:nth-child(2n+1) td { + background: #eee; +} + +.file_name { + font-family: monospace; +} + +.tag, .suggestion { + font-family: monospace; + white-space: pre; +} + +.severity_warning { + color:#aa0; +} + +.severity_error { + color:#f00; +} + +.severity_unknown { + color:#f0f; +} + +th::after { + content: " \23F6\23F7"; +} + +th.sorttable_sorted::after { + content: " \23F7"; +} + +th.sorttable_sorted_reverse::after { + content: " \23F6"; +} + +#sorttable_sortfwdind, #sorttable_sortrevind { + display: none; +} diff --git a/icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/sorttable.js b/icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/sorttable.js new file mode 100644 index 000000000000..7246b485f9f0 --- /dev/null +++ b/icu4j/tools/build/src/main/resources/com/ibm/icu/dev/tool/errorprone/sorttable.js @@ -0,0 +1,495 @@ +/* + SortTable + version 2 + 7th April 2007 + Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/ + + Instructions: + Download this file + Add to your HTML + Add class="sortable" to any table you'd like to make sortable + Click on the headers to sort + + Thanks to many, many people for contributions and suggestions. + Licenced as X11: http://www.kryogenix.org/code/browser/licence.html + This basically means: do what you want with it. +*/ + + +var stIsIE = /*@cc_on!@*/false; + +sorttable = { + init: function() { + // quit if this function has already been called + if (arguments.callee.done) return; + // flag this function so we don't do the same thing twice + arguments.callee.done = true; + // kill the timer + if (_timer) clearInterval(_timer); + + if (!document.createElement || !document.getElementsByTagName) return; + + sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/; + + forEach(document.getElementsByTagName('table'), function(table) { + if (table.className.search(/\bsortable\b/) != -1) { + sorttable.makeSortable(table); + } + }); + + }, + + makeSortable: function(table) { + if (table.getElementsByTagName('thead').length == 0) { + // table doesn't have a tHead. Since it should have, create one and + // put the first table row in it. + the = document.createElement('thead'); + the.appendChild(table.rows[0]); + table.insertBefore(the,table.firstChild); + } + // Safari doesn't support table.tHead, sigh + if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0]; + + if (table.tHead.rows.length != 1) return; // can't cope with two header rows + + // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as + // "total" rows, for example). This is B&R, since what you're supposed + // to do is put them in a tfoot. So, if there are sortbottom rows, + // for backwards compatibility, move them to tfoot (creating it if needed). + sortbottomrows = []; + for (var i=0; i5' : ' ▴'; + this.appendChild(sortrevind); + return; + } + if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) { + // if we're already sorted by this column in reverse, just + // re-reverse the table, which is quicker + sorttable.reverse(this.sorttable_tbody); + this.className = this.className.replace('sorttable_sorted_reverse', + 'sorttable_sorted'); + this.removeChild(document.getElementById('sorttable_sortrevind')); + sortfwdind = document.createElement('span'); + sortfwdind.id = "sorttable_sortfwdind"; + sortfwdind.innerHTML = stIsIE ? ' 6' : ' ▾'; + this.appendChild(sortfwdind); + return; + } + + // remove sorttable_sorted classes + theadrow = this.parentNode; + forEach(theadrow.childNodes, function(cell) { + if (cell.nodeType == 1) { // an element + cell.className = cell.className.replace('sorttable_sorted_reverse',''); + cell.className = cell.className.replace('sorttable_sorted',''); + } + }); + sortfwdind = document.getElementById('sorttable_sortfwdind'); + if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); } + sortrevind = document.getElementById('sorttable_sortrevind'); + if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); } + + this.className += ' sorttable_sorted'; + sortfwdind = document.createElement('span'); + sortfwdind.id = "sorttable_sortfwdind"; + sortfwdind.innerHTML = stIsIE ? ' 6' : ' ▾'; + this.appendChild(sortfwdind); + + // build an array to sort. This is a Schwartzian transform thing, + // i.e., we "decorate" each row with the actual sort key, + // sort based on the sort keys, and then put the rows back in order + // which is a lot faster because you only do getInnerText once per row + row_array = []; + col = this.sorttable_columnindex; + rows = this.sorttable_tbody.rows; + for (var j=0; j 12) { + // definitely dd/mm + return sorttable.sort_ddmm; + } else if (second > 12) { + return sorttable.sort_mmdd; + } else { + // looks like a date, but we can't tell which, so assume + // that it's dd/mm (English imperialism!) and keep looking + sortfn = sorttable.sort_ddmm; + } + } + } + } + return sortfn; + }, + + getInnerText: function(node) { + // gets the text we want to use for sorting for a cell. + // strips leading and trailing whitespace. + // this is *not* a generic getInnerText function; it's special to sorttable. + // for example, you can override the cell text with a customkey attribute. + // it also gets .value for fields. + + if (!node) return ""; + + hasInputs = (typeof node.getElementsByTagName == 'function') && + node.getElementsByTagName('input').length; + + if (node.getAttribute("sorttable_customkey") != null) { + return node.getAttribute("sorttable_customkey"); + } + else if (typeof node.textContent != 'undefined' && !hasInputs) { + return node.textContent.replace(/^\s+|\s+$/g, ''); + } + else if (typeof node.innerText != 'undefined' && !hasInputs) { + return node.innerText.replace(/^\s+|\s+$/g, ''); + } + else if (typeof node.text != 'undefined' && !hasInputs) { + return node.text.replace(/^\s+|\s+$/g, ''); + } + else { + switch (node.nodeType) { + case 3: + if (node.nodeName.toLowerCase() == 'input') { + return node.value.replace(/^\s+|\s+$/g, ''); + } + case 4: + return node.nodeValue.replace(/^\s+|\s+$/g, ''); + break; + case 1: + case 11: + var innerText = ''; + for (var i = 0; i < node.childNodes.length; i++) { + innerText += sorttable.getInnerText(node.childNodes[i]); + } + return innerText.replace(/^\s+|\s+$/g, ''); + break; + default: + return ''; + } + } + }, + + reverse: function(tbody) { + // reverse the rows in a tbody + newrows = []; + for (var i=0; i=0; i--) { + tbody.appendChild(newrows[i]); + } + delete newrows; + }, + + /* sort functions + each sort function takes two parameters, a and b + you are comparing a[0] and b[0] */ + sort_numeric: function(a,b) { + aa = parseFloat(a[0].replace(/[^0-9.-]/g,'')); + if (isNaN(aa)) aa = 0; + bb = parseFloat(b[0].replace(/[^0-9.-]/g,'')); + if (isNaN(bb)) bb = 0; + return aa-bb; + }, + sort_alpha: function(a,b) { + if (a[0]==b[0]) return 0; + if (a[0] 0 ) { + var q = list[i]; list[i] = list[i+1]; list[i+1] = q; + swap = true; + } + } // for + t--; + + if (!swap) break; + + for(var i = t; i > b; --i) { + if ( comp_func(list[i], list[i-1]) < 0 ) { + var q = list[i]; list[i] = list[i-1]; list[i-1] = q; + swap = true; + } + } // for + b++; + + } // while(swap) + } +} + +/* ****************************************************************** + Supporting functions: bundled here to avoid depending on a library + ****************************************************************** */ + +// Dean Edwards/Matthias Miller/John Resig + +/* for Mozilla/Opera9 */ +if (document.addEventListener) { + document.addEventListener("DOMContentLoaded", sorttable.init, false); +} + +/* for Internet Explorer */ +/*@cc_on @*/ +/*@if (@_win32) + document.write("