8374926: EnableX86ECoreOpts was not enabled on some hybrid CPU

Reviewed-by: vpaprotski, dholmes

.github/actions/build-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/actions/get-bundles/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/actions/get-gtest/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/actions/get-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/actions/get-msys2/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/actions/upload-bundles/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/workflows/build-alpine-linux.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: alpine:3.20
 
@@ -96,6 +96,8 @@ jobs:
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
+          --with-native-debug-symbols-level=1
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-cross-compile.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ on:
 jobs:
   build-cross-compile:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
@@ -179,6 +179,8 @@ jobs:
           --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
           --with-sysroot=sysroot
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
+          --with-native-debug-symbols-level=1
           CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
           CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (

.github/workflows/build-linux.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ on:
 jobs:
   build-linux:
     name: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
@@ -115,9 +115,21 @@ jobs:
           if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
             sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
           fi
-          sudo apt-get update
-          sudo apt-get install --only-upgrade apt
-          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
+          sudo apt update
+          sudo apt install --only-upgrade apt
+          sudo apt install \
+            gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
+            g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} \
+            libasound2-dev${{ steps.arch.outputs.suffix }} \
+            libcups2-dev${{ steps.arch.outputs.suffix }} \
+            libfontconfig1-dev${{ steps.arch.outputs.suffix }} \
+            libx11-dev${{ steps.arch.outputs.suffix }} \
+            libxext-dev${{ steps.arch.outputs.suffix }} \
+            libxrandr-dev${{ steps.arch.outputs.suffix }} \
+            libxrender-dev${{ steps.arch.outputs.suffix }} \
+            libxt-dev${{ steps.arch.outputs.suffix }} \
+            libxtst-dev${{ steps.arch.outputs.suffix }} \
+            ${{ inputs.apt-extra-packages }}
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
       - name: 'Configure'
@@ -131,6 +143,8 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
+          --with-native-debug-symbols-level=1
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-macos.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -110,6 +110,8 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
+          --with-native-debug-symbols-level=1
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/build-windows.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -134,6 +134,7 @@ jobs:
           --with-gtest=${{ steps.gtest.outputs.path }}
           --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
           --with-jmod-compress=zip-1
+          --with-external-symbols-in-bundles=none
           ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
           echo "Dumping config.log:" &&
           cat config.log &&

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ jobs:
 
   prepare:
     name: 'Prepare the run'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       # List of platforms to exclude by default
       EXCLUDED_PLATFORMS: 'alpine-linux-x64'
@@ -405,7 +405,7 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-24.04
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug
 
@@ -419,7 +419,7 @@ jobs:
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-24.04
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       static-suffix: "-static"
 

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.gitignore

@@ -26,3 +26,8 @@ NashornProfile.txt
 *.rej
 *.orig
 test/benchmarks/**/target
+/src/hotspot/CMakeLists.txt
+/src/hotspot/compile_commands.json
+/src/hotspot/cmake-build-debug/
+/src/hotspot/.cache/
+/src/hotspot/.idea/

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=26
+version=27
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright

README.md

@@ -1,7 +1,7 @@
 # Welcome to the JDK!
 
 For build instructions please see the
-[online documentation](https://openjdk.org/groups/build/doc/building.html),
+[online documentation](https://git.openjdk.org/jdk/blob/master/doc/building.md),
 or either of these files:
 
 - [doc/building.html](doc/building.html) (html version)

bin/generate-symbol-data.sh

@@ -38,7 +38,7 @@
 #   directory.
 # - open a terminal program and run these commands:
 #     cd "${JDK_CHECKOUT}"/src/jdk.compiler/share/data/symbols
-#     bash ../../../../../make/scripts/generate-symbol-data.sh "${JDK_N_INSTALL}"
+#     bash ../../../../../bin/generate-symbol-data.sh "${JDK_N_INSTALL}"
 # - this command will generate or update data for "--release N" into the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols
 #   directory, updating all registration necessary. If the goal was to update the data, and there are no
 #   new or changed files in the ${JDK_CHECKOUT}/src/jdk.compiler/share/data/symbols directory after running this script,

doc/building.html

@@ -541,6 +541,11 @@ href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
 <p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.</p>
+<p>Starting with Xcode 26, introduced in macOS 26, the Metal toolchain
+no longer comes bundled with Xcode, so it needs to be installed
+separately. This can either be done via the Xcode's Settings/Components
+UI, or in the command line calling
+<code>xcodebuild -downloadComponent metalToolchain</code>.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -668,7 +673,7 @@ update.</p>
 (Note that this version is often presented as "MSVC 14.28", and reported
 by cl.exe as 19.28.) Older versions will not be accepted by
 <code>configure</code> and will not work. The maximum accepted version
-of Visual Studio is 2022.</p>
+of Visual Studio is 2026.</p>
 <p>If you have multiple versions of Visual Studio installed,
 <code>configure</code> will by default pick the latest. You can request
 a specific version to be used by setting

doc/building.md

@@ -352,6 +352,11 @@ on some strategies to deal with this.
 It is recommended that you use at least macOS 14 and Xcode 15.4, but
 earlier versions may also work.
 
+Starting with Xcode 26, introduced in macOS 26, the Metal toolchain no longer
+comes bundled with Xcode, so it needs to be installed separately. This can
+either be done via the Xcode's Settings/Components UI, or in the command line
+calling `xcodebuild -downloadComponent metalToolchain`.
+
 The standard macOS environment contains the basic tooling needed to build, but
 for external libraries a package manager is recommended. The JDK uses
 [homebrew](https://brew.sh/) in the examples, but feel free to use whatever
@@ -468,7 +473,7 @@ available for this update.
 The minimum accepted version is Visual Studio 2019 version 16.8. (Note that
 this version is often presented as "MSVC 14.28", and reported by cl.exe as
 19.28.) Older versions will not be accepted by `configure` and will not work.
-The maximum accepted version of Visual Studio is 2022.
+The maximum accepted version of Visual Studio is 2026.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by

doc/hotspot-style.html

@@ -114,7 +114,7 @@ id="toc-compatibility-with-c11">Compatibility with C11</a></li>
 id="toc-additional-permitted-features">Additional Permitted
 Features</a></li>
 </ul></li>
-<li><a href="#excluded-features" id="toc-excluded-features">Excluded
+<li><a href="#forbidden-features" id="toc-forbidden-features">Forbidden
 Features</a>
 <ul>
 <li><a href="#structured-bindings"
@@ -123,8 +123,8 @@ id="toc-structured-bindings">Structured Bindings</a></li>
 System Library</a></li>
 <li><a href="#aggregate-extensions"
 id="toc-aggregate-extensions">Aggregate Extensions</a></li>
-<li><a href="#additional-excluded-features"
-id="toc-additional-excluded-features">Additional Excluded
+<li><a href="#additional-forbidden-features"
+id="toc-additional-forbidden-features">Additional Forbidden
 Features</a></li>
 </ul></li>
 <li><a href="#undecided-features" id="toc-undecided-features">Undecided
@@ -506,19 +506,19 @@ uses a subset. (Backports to JDK versions lacking support for more
 recent Standards must of course stick with the original C++98/03
 subset.)</p>
 <p>This section describes that subset. Features from the C++98/03
-language may be used unless explicitly excluded here. Features from
+language may be used unless explicitly forbidden here. Features from
 C++11, C++14, and C++17 may be explicitly permitted or explicitly
-excluded, and discussed accordingly here. There is a third category,
+forbidden, and discussed accordingly here. There is a third category,
 undecided features, about which HotSpot developers have not yet reached
 a consensus, or perhaps have not discussed at all. Use of these features
-is also excluded.</p>
+is also forbidden.</p>
 <p>(The use of some features may not be immediately obvious and may slip
 in anyway, since the compiler will accept them. The code review process
 is the main defense against this.)</p>
 <p>Some features are discussed in their own subsection, typically to
 provide more extensive discussion or rationale for limitations. Features
 that don't have their own subsection are listed in omnibus feature
-sections for permitted, excluded, and undecided features.</p>
+sections for permitted, forbidden, and undecided features.</p>
 <p>Lists of new features for C++11, C++14, and C++17, along with links
 to their descriptions, can be found in the online documentation for some
 of the compilers and libraries. The C++17 Standard is the definitive
@@ -594,14 +594,15 @@ title="Runtime Type Information">RTTI</a> are deemed not worthwhile,
 given the alternatives.</p>
 <h3 id="memory-allocation">Memory Allocation</h3>
 <p>Do not use the standard global allocation and deallocation functions
-(operator new and related functions). Use of these functions by HotSpot
-code is disabled for some platforms.</p>
+(global <code>operator new</code> and related functions), other than the
+non-allocating forms of those functions. Use of these functions by
+HotSpot code is disabled for some platforms.</p>
 <p>Rationale: HotSpot often uses "resource" or "arena" allocation. Even
 where heap allocation is used, the standard global functions are avoided
-in favor of wrappers around malloc and free that support the VM's Native
-Memory Tracking (NMT) feature. Typically, uses of the global operator
-new are inadvertent and therefore often associated with memory
-leaks.</p>
+in favor of wrappers around <code>malloc</code> and <code>free</code>
+that support the JVM's Native Memory Tracking (NMT) feature. Typically,
+uses of the global <code>operator new</code> are inadvertent and
+therefore often associated with memory leaks.</p>
 <p>Native memory allocation failures are often treated as
 non-recoverable. The place where "out of memory" is (first) detected may
 be an innocent bystander, unrelated to the actual culprit.</p>
@@ -648,7 +649,39 @@ for anonymous namespaces.</p>
 class="uri">https://sourceware.org/bugzilla/show_bug.cgi?id=16874</a><br>
 Bug for similar gdb problems.</p>
 <h3 id="c-standard-library">C++ Standard Library</h3>
-<p>Avoid using the C++ Standard Library.</p>
+<p>Only curated parts of the C++ Standard Library may be used by HotSpot
+code.</p>
+<p>Functions that may throw exceptions must not be used. This is in
+accordance with the HotSpot policy of <a href="#error-handling">not
+using exceptions</a>.</p>
+<p>Also in accordance with HotSpot policy, the <a
+href="#memory-allocation">standard global allocator must not be
+used</a>. This means that uses of standard container classes cannot
+presently be used, as doing so requires specialization on some allocator
+type that is integrated with the existing HotSpot allocation mechanisms.
+(Such allocators may be provided in the future.)</p>
+<p>Standard Library identifiers should usually be fully qualified;
+<code>using</code> directives must not be used to bring Standard Library
+identifiers into scope just to remove the need for namespace
+qualification. Requiring qualification makes it easy to distinguish
+between references to external libraries and code that is part of
+HotSpot.</p>
+<p>As with language features, Standard Library facilities are either
+permitted, explicitly forbidden, or undecided (and so implicitly
+forbidden).</p>
+<p>Most HotSpot code should not directly <code>#include</code> C++
+Standard Library headers. HotSpot provides a set of wrapper headers for
+the Standard Library headers containing permitted definitions. These
+wrappers are in the <code>cppstdlib</code> directory, with the same name
+as the corresponding Standard Library header and a <code>.hpp</code>
+extension. These wrappers provide a place for any additional code (some
+of which may be platform-specific) needed to support HotSpot usage.</p>
+<p>These wrappers also provide a place to document HotSpot usage,
+including any restrictions. The set of wrappers and the usage
+documentation should be considered part of HotSpot style. Any changes
+are subject to the same process as applies to this document. (For
+historical reasons, there may be many direct inclusions of some C++
+Standard Library headers.)</p>
 <p>Historically, HotSpot has mostly avoided use of the Standard
 Library.</p>
 <p>(It used to be impossible to use most of it in shared code, because
@@ -661,46 +694,60 @@ in mid-2017. Support for Solaris was removed in 2020.)</p>
 of Standard Library facilities is exceptions. HotSpot does not use
 exceptions and, for platforms which allow doing so, builds with them
 turned off. Many Standard Library facilities implicitly or explicitly
-use exceptions.</p></li>
+use exceptions. On the other hand, many don't, and can be used without
+concern for this issue. Others may have a useful subset that doesn't use
+exceptions.</p></li>
 <li><p><code>assert</code>. An issue that is quickly encountered is the
 <code>assert</code> macro name collision (<a
 href="https://bugs.openjdk.org/browse/JDK-8007770">JDK-8007770</a>).
-Some mechanism for addressing this would be needed before much of the
-Standard Library could be used. (Not all Standard Library
-implementations use assert in header files, but some do.)</p></li>
+(Not all Standard Library implementations use <code>assert</code> in
+header files, but some do.) HotSpot provides a mechanism for addressing
+this, by establishing a scope around the include of a library header
+where the HotSpot <code>assert</code> macro is suppressed. One of the
+reasons for using wrapper headers rather than directly including
+standard headers is to provide a central place to deal with this issue
+for each header.</p></li>
 <li><p>Memory allocation. HotSpot requires explicit control over where
 allocations occur. The C++98/03 <code>std::allocator</code> class is too
-limited to support our usage. (Changes in more recent Standards may
-remove this limitation.)</p></li>
+limited to support our usage. But changes to the allocator concept in
+more recent Standards removed some of the limitations, supporting
+stateful allocators. HotSpot may, in the future, provide
+standard-conforming allocators that are integrated with HotSpot's
+existing allocation mechanisms.</p></li>
 <li><p>Implementation vagaries. Bugs, or simply different implementation
 choices, can lead to different behaviors among the various Standard
-Libraries we need to deal with.</p></li>
+Libraries we need to deal with. But only selected parts of the Standard
+Library are being permitted, and one of the selection criteria is
+maturity. Some of these facilities are among the most heavily tested and
+used C++ codes that exist.</p></li>
 <li><p>Inconsistent naming conventions. HotSpot and the C++ Standard use
 different naming conventions. The coexistence of those different
-conventions might appear jarring and reduce readability.</p></li>
-</ul>
-<p>There are a few exceptions to this rule.</p>
+conventions might appear jarring and reduce readability. However,
+experience in some other code bases suggests this isn't a significant
+problem, so long as Standard Library names are namespace-qualified. It
+is tempting to bring the Standard Library names into scope via a
+<code>using std;</code> directive. Doing so makes writing code using
+those names easier, since the qualifiers don't need to be included. But
+there are several reasons not to do that.</p>
 <ul>
-<li><code>#include &lt;new&gt;</code> to use placement <code>new</code>,
-<code>std::nothrow</code>, and <code>std::nothrow_t</code>.</li>
-<li><code>#include &lt;limits&gt;</code> to use
-<code>std::numeric_limits</code>.</li>
-<li><code>#include &lt;type_traits&gt;</code> with some restrictions,
-listed below.</li>
-<li><code>#include &lt;cstddef&gt;</code> to use
-<code>std::nullptr_t</code> and <code>std::max_align_t</code>.</li>
+<li><p>There is a risk of future name collisions. Additional Standard
+Library headers may be included, adding to the list of names being used.
+Also, future versions of the Standard Library may add currently unknown
+names to the headers already being included.</p></li>
+<li><p>It may harm readability. Code where this is relevant is a mixture
+of the local HotSpot naming conventions and the Standard Library's (or
+other 3rd-party library's) naming conventions. With only unqualified
+names, any distinctions from the naming conventions for the different
+code sources are lost. Instead one may end up with an undifferentiated
+mess, where it's not obvious whether an identifier is from local code
+that is inconsistent with HotSpot style (and there's a regretable amount
+of that for historical reasons), or is following some other convention.
+Having the qualifiers disambiguates that.</p></li>
+<li><p>It can be helpful to know, at a glance, whether the definition is
+in HotSpot or elsewhere, for purposes of looking up the definition or
+documentation.</p></li>
+</ul></li>
 </ul>
-<p>Certain restrictions apply to the declarations provided by
-<code>&lt;type_traits&gt;</code>.</p>
-<ul>
-<li>The <code>alignof</code> operator should be used rather than
-<code>std::alignment_of&lt;&gt;</code>.</li>
-</ul>
-<p>TODO: Rather than directly #including (permitted) Standard Library
-headers, use a convention of #including wrapper headers (in some
-location like hotspot/shared/stdcpp). This provides a single place for
-dealing with issues we might have for any given header, esp.
-platform-specific issues.</p>
 <h3 id="type-deduction">Type Deduction</h3>
 <p>Use type deduction only if it makes the code clearer or safer. Do not
 use it merely to avoid the inconvenience of writing an explicit type,
@@ -990,8 +1037,8 @@ running destructors at exit can lead to problems.</p>
 <p>Some of the approaches used in HotSpot to avoid dynamic
 initialization include:</p>
 <ul>
-<li><p>Use the <code>Deferred&lt;T&gt;</code> class template. Add a call
-to its initialization function at an appropriate place during VM
+<li><p>Use the <code>DeferredStatic&lt;T&gt;</code> class template. Add
+a call to its initialization function at an appropriate place during VM
 initialization. The underlying object is never destroyed.</p></li>
 <li><p>For objects of class type, use a variable whose value is a
 pointer to the class, initialized to <code>nullptr</code>. Provide an
@@ -1577,10 +1624,10 @@ href="http://wg21.link/p0138r2">p0138r2</a>)</p></li>
 <li><p>Allow <code>typename</code> in template template parameter (<a
 href="http://wg21.link/n4051">n4051</a>) — template template parameters
 are barely used (if at all) in HotSpot, but there's no reason to
-artificially disallow this syntactic regularization in any such
+artificially forbid this syntactic regularization in any such
 uses.</p></li>
 </ul>
-<h2 id="excluded-features">Excluded Features</h2>
+<h2 id="forbidden-features">Forbidden Features</h2>
 <h3 id="structured-bindings">Structured Bindings</h3>
 <p>The use of structured bindings <a
 href="http://wg21.link/p0217r3">p0217r3</a> is forbidden. Preferred
@@ -1622,8 +1669,33 @@ initialization for classes with base classes (<a
 href="https://wg21.link/p0017r1">p0017r1</a>). HotSpot makes very little
 use of aggregate classes, preferring explicit constructors even for very
 simple classes.</p>
-<h3 id="additional-excluded-features">Additional Excluded Features</h3>
+<h3 id="additional-forbidden-features">Additional Forbidden
+Features</h3>
 <ul>
+<li><p><code>&lt;algorithm&gt;</code>, <code>&lt;iterator&gt;</code>,
+<code>&lt;numeric&gt;</code><br> Not useful without standard containers
+or similar classes in HotSpot.</p></li>
+<li><p><code>&lt;bitset&gt;</code> - Overlap with HotSpot
+<code>BitMap</code>.</p></li>
+<li><p><code>&lt;cassert&gt;</code>, <code>assert.h</code> - HotSpot has
+its own <code>assert</code> macro.</p></li>
+<li><p><code>&lt;exception&gt;</code>, <code>&lt;stdexcept&gt;</code> -
+Use of <a href="#error-handling">exceptions</a> is not
+permitted.</p></li>
+<li><p>Thread support - <code>&lt;thread&gt;</code>,
+<code>&lt;mutex&gt;</code>, <code>&lt;shared_mutex&gt;</code>,
+<code>&lt;condition_varible&gt;</code>, <code>&lt;future&gt;</code><br>
+HotSpot has its own threading support.</p></li>
+<li><p>Streams - HotSpot doesn't use the C++ I/O library.</p></li>
+<li><p><code>&lt;scoped_allocator&gt;</code> - Not useful without
+specialized allocators.</p></li>
+<li><p><code>&lt;string&gt;</code> - Requires allocator support, similar
+to standard containers.</p></li>
+<li><p><code>&lt;typeinfo&gt;</code>, <code>&lt;typeindex&gt;</code><br>
+Use of <a href="#runtime-type-information">runtime type information</a>
+is not permitted.</p></li>
+<li><p><code>&lt;valarray&gt;</code> - May allocate, but is not
+allocator-aware.</p></li>
 <li><p>New string and character literals</p>
 <ul>
 <li>New character types (<a
@@ -1881,8 +1953,43 @@ that developers should need to know about this feature. But if someone
 does come up with a good use-case, it's likely that the alternatives are
 significantly worse, because pack manipulation without this can be
 complicated.</p></li>
+<li><p><a
+href="https://en.cppreference.com/w/cpp/header/tuple.html"><code>&lt;tuple&gt;</code></a>
+— Prefer named access to class objects, rather than indexed access to
+anonymous heterogeneous sequences. In particular, a standard-layout
+class is preferred to a tuple.</p></li>
 <li><p><code>std::invoke&lt;&gt;()</code> (<a
 href="http://wg21.link/n4169">n4169</a>)</p></li>
+<li><p><a
+href="https://en.cppreference.com/w/cpp/header/chrono.html"><code>&lt;chrono&gt;</code></a>
+— The argument for chrono is that our existing APIs aren't serving us
+well. chrono provides strong type safety. We've had multiple cases of
+mistakes like a double seconds being treated as double milliseconds or
+vice versa, and other similar errors. But it would be a large effort to
+adopt chrono. We'd also need to decide whether to use the predefined
+clocks or hook up chrono to our clocks. It may be that using the
+predefined clocks is fine, but it's a question that needs careful
+study.</p></li>
+<li><p><a
+href="https://en.cppreference.com/w/cpp/header/initializer_list.html"><code>&lt;initializer_list&gt;</code></a>
+— The potential ambiguity between some forms of direct initialization
+and initializer list initialization, and the resolution of that
+ambiguity, is unfortunate.</p></li>
+<li><p><a
+href="https://en.cppreference.com/w/cpp/header/ratio.html"><code>&lt;ratio&gt;</code></a>
+— <code>&lt;ratio&gt;</code> is a <em>compile-time</em> rational
+arithmetic package. It's also fixed (though parameterized) precision.
+It's not a general purpose rational arithmetic facility. It appears to
+have started out as an implementation detail of chrono, and was
+extracted and promoted to a public facility in the belief that it has
+broader utility.</p></li>
+<li><p><a
+href="https://en.cppreference.com/w/cpp/header/system_error.html"><code>&lt;system_error&gt;</code></a>
+— We don't really have a generally agreed upon mechanism for managing
+errors. Instead, we have a plethora of bespoke ad hoc mechanisms.
+Managing errors is a topic of substantial discussion.
+<code>&lt;system_error&gt;</code> might end up being a part of a result
+from that discussion.</p></li>
 </ul>
 </body>
 </html>

doc/hotspot-style.md

@@ -413,12 +413,12 @@ support for more recent Standards must of course stick with the
 original C++98/03 subset.)
 
 This section describes that subset.  Features from the C++98/03
-language may be used unless explicitly excluded here.  Features from
-C++11, C++14, and C++17 may be explicitly permitted or explicitly excluded,
+language may be used unless explicitly forbidden here.  Features from
+C++11, C++14, and C++17 may be explicitly permitted or explicitly forbidden,
 and discussed accordingly here.  There is a third category, undecided
 features, about which HotSpot developers have not yet reached a
 consensus, or perhaps have not discussed at all.  Use of these
-features is also excluded.
+features is also forbidden.
 
 (The use of some features may not be immediately obvious and may slip
 in anyway, since the compiler will accept them.  The code review
@@ -427,7 +427,7 @@ process is the main defense against this.)
 Some features are discussed in their own subsection, typically to provide
 more extensive discussion or rationale for limitations.  Features that
 don't have their own subsection are listed in omnibus feature sections
-for permitted, excluded, and undecided features.
+for permitted, forbidden, and undecided features.
 
 Lists of new features for C++11, C++14, and C++17, along with links to their
 descriptions, can be found in the online documentation for some of the
@@ -494,15 +494,16 @@ worthwhile, given the alternatives.
 
 ### Memory Allocation
 
-Do not use the standard global allocation and deallocation functions
-(operator new and related functions).  Use of these functions by HotSpot
-code is disabled for some platforms.
+Do not use the standard global allocation and deallocation functions (global
+`operator new` and related functions), other than the non-allocating forms of
+those functions.  Use of these functions by HotSpot code is disabled for some
+platforms.
 
 Rationale: HotSpot often uses "resource" or "arena" allocation.  Even
 where heap allocation is used, the standard global functions are
-avoided in favor of wrappers around malloc and free that support the
-VM's Native Memory Tracking (NMT) feature.  Typically, uses of the global
-operator new are inadvertent and therefore often associated with memory
+avoided in favor of wrappers around `malloc` and `free` that support the
+JVM's Native Memory Tracking (NMT) feature.  Typically, uses of the global
+`operator new` are inadvertent and therefore often associated with memory
 leaks.
 
 Native memory allocation failures are often treated as non-recoverable.
@@ -560,7 +561,39 @@ Bug for similar gdb problems.
 
 ### C++ Standard Library
 
-Avoid using the C++ Standard Library.
+Only curated parts of the C++ Standard Library may be used by HotSpot code.
+
+Functions that may throw exceptions must not be used.  This is in accordance
+with the HotSpot policy of [not using exceptions](#error-handling).
+
+Also in accordance with HotSpot policy, the
+[standard global allocator must not be used](#memory-allocation).  This means
+that uses of standard container classes cannot presently be used, as doing so
+requires specialization on some allocator type that is integrated with the
+existing HotSpot allocation mechanisms. (Such allocators may be provided in
+the future.)
+
+Standard Library identifiers should usually be fully qualified; `using`
+directives must not be used to bring Standard Library identifiers into scope
+just to remove the need for namespace qualification.  Requiring qualification
+makes it easy to distinguish between references to external libraries and code
+that is part of HotSpot.
+
+As with language features, Standard Library facilities are either permitted,
+explicitly forbidden, or undecided (and so implicitly forbidden).
+
+Most HotSpot code should not directly `#include` C++ Standard Library headers.
+HotSpot provides a set of wrapper headers for the Standard Library headers
+containing permitted definitions.  These wrappers are in the `cppstdlib`
+directory, with the same name as the corresponding Standard Library header and
+a `.hpp` extension.  These wrappers provide a place for any additional code
+(some of which may be platform-specific) needed to support HotSpot usage.
+
+These wrappers also provide a place to document HotSpot usage, including any
+restrictions.  The set of wrappers and the usage documentation should be
+considered part of HotSpot style.  Any changes are subject to the same process
+as applies to this document. (For historical reasons, there may be many direct
+inclusions of some C++ Standard Library headers.)
 
 Historically, HotSpot has mostly avoided use of the Standard
 Library.
@@ -577,43 +610,59 @@ Some reasons for this include
 Standard Library facilities is exceptions. HotSpot does not use
 exceptions and, for platforms which allow doing so, builds with them
 turned off.  Many Standard Library facilities implicitly or explicitly
+use exceptions. On the other hand, many don't, and can be used without
+concern for this issue. Others may have a useful subset that doesn't
 use exceptions.
 
 * `assert`.  An issue that is quickly encountered is the `assert` macro name
 collision ([JDK-8007770](https://bugs.openjdk.org/browse/JDK-8007770)).
-Some mechanism for addressing this would be needed before much of the
-Standard Library could be used.  (Not all Standard Library implementations
-use assert in header files, but some do.)
+(Not all Standard Library implementations use `assert` in header files, but
+some  do.) HotSpot provides a mechanism for addressing this, by establishing a
+scope around the include of a library header where the HotSpot `assert` macro
+is suppressed.  One of the reasons for using wrapper headers rather than
+directly including standard headers is to provide a central place to deal with
+this issue for each header.
 
-* Memory allocation. HotSpot requires explicit control over where
-allocations occur. The C++98/03 `std::allocator` class is too limited
-to support our usage.  (Changes in more recent Standards may remove
-this limitation.)
+* Memory allocation. HotSpot requires explicit control over where allocations
+occur. The C++98/03 `std::allocator` class is too limited to support our
+usage. But changes to the allocator concept in more recent Standards removed
+some of the limitations, supporting stateful allocators. HotSpot may, in the
+future, provide standard-conforming allocators that are integrated with
+HotSpot's existing allocation mechanisms.
 
 * Implementation vagaries. Bugs, or simply different implementation choices,
 can lead to different behaviors among the various Standard Libraries we need
-to deal with.
+to deal with. But only selected parts of the Standard Library are being
+permitted, and one of the selection criteria is maturity. Some of these
+facilities are among the most heavily tested and used C++ codes that exist.
 
-* Inconsistent naming conventions. HotSpot and the C++ Standard use
-different naming conventions. The coexistence of those different conventions
-might appear jarring and reduce readability.
+* Inconsistent naming conventions. HotSpot and the C++ Standard use different
+naming conventions. The coexistence of those different conventions might
+appear jarring and reduce readability. However, experience in some other code
+bases suggests this isn't a significant problem, so long as Standard Library
+names are namespace-qualified. It is tempting to bring the Standard Library
+names into scope via a `using std;` directive. Doing so makes writing code
+using those names easier, since the qualifiers don't need to be included. But
+there are several reasons not to do that.
 
-There are a few exceptions to this rule.
+    * There is a risk of future name collisions. Additional Standard Library
+    headers may be included, adding to the list of names being used. Also,
+    future versions of the Standard Library may add currently unknown names to
+    the headers already being included.
 
-* `#include <new>` to use placement `new`, `std::nothrow`, and `std::nothrow_t`.
-* `#include <limits>` to use `std::numeric_limits`.
-* `#include <type_traits>` with some restrictions, listed below.
-* `#include <cstddef>` to use `std::nullptr_t` and `std::max_align_t`.
+    * It may harm readability. Code where this is relevant is a mixture of the
+    local HotSpot naming conventions and the Standard Library's (or other
+    3rd-party library's) naming conventions. With only unqualified names, any
+    distinctions from the naming conventions for the different code sources
+    are lost. Instead one may end up with an undifferentiated mess, where it's
+    not obvious whether an identifier is from local code that is inconsistent
+    with HotSpot style (and there's a regretable amount of that for historical
+    reasons), or is following some other convention. Having the qualifiers
+    disambiguates that.
 
-Certain restrictions apply to the declarations provided by `<type_traits>`.
-
-* The `alignof` operator should be used rather than `std::alignment_of<>`.
-
-TODO: Rather than directly \#including (permitted) Standard Library
-headers, use a convention of \#including wrapper headers (in some
-location like hotspot/shared/stdcpp).  This provides a single place
-for dealing with issues we might have for any given header, esp.
-platform-specific issues.
+    * It can be helpful to know, at a glance, whether the definition is in
+    HotSpot or elsewhere, for purposes of looking up the definition or
+    documentation.
 
 ### Type Deduction
 
@@ -905,7 +954,7 @@ destructors at exit can lead to problems.
 Some of the approaches used in HotSpot to avoid dynamic initialization
 include:
 
-* Use the `Deferred<T>` class template. Add a call to its initialization
+* Use the `DeferredStatic<T>` class template. Add a call to its initialization
 function at an appropriate place during VM initialization. The underlying
 object is never destroyed.
 
@@ -1529,9 +1578,9 @@ single-argument form are permitted.
 * Allow `typename` in template template parameter
 ([n4051](http://wg21.link/n4051)) &mdash; template template parameters are
 barely used (if at all) in HotSpot, but there's no reason to artificially
-disallow this syntactic regularization in any such uses.
+forbid this syntactic regularization in any such uses.
 
-## Excluded Features
+## Forbidden Features
 
 ### Structured Bindings
 
@@ -1581,7 +1630,32 @@ initialization for classes with base classes
 aggregate classes, preferring explicit constructors even for very simple
 classes.
 
-### Additional Excluded Features
+### Additional Forbidden Features
+
+* `<algorithm>`, `<iterator>`, `<numeric>`<br>
+Not useful without standard containers or similar classes in HotSpot.
+
+* `<bitset>` - Overlap with HotSpot `BitMap`.
+
+* `<cassert>`, `assert.h` - HotSpot has its own `assert` macro.
+
+* `<exception>`, `<stdexcept>` - Use of [exceptions](#error-handling) is not
+permitted.
+
+* Thread support - `<thread>`, `<mutex>`, `<shared_mutex>`,
+`<condition_varible>`, `<future>`<br>
+HotSpot has its own threading support.
+
+* Streams - HotSpot doesn't use the C++ I/O library.
+
+* `<scoped_allocator>` - Not useful without specialized allocators.
+
+* `<string>` - Requires allocator support, similar to standard containers.
+
+* `<typeinfo>`, `<typeindex>`<br>
+Use of [runtime type information](#runtime-type-information) is not permitted.
+
+* `<valarray>` - May allocate, but is not allocator-aware.
 
 * New string and character literals
     * New character types
@@ -1880,9 +1954,40 @@ should need to know about this feature.  But if someone does come up with a
 good use-case, it's likely that the alternatives are significantly worse,
 because pack manipulation without this can be complicated.
 
+* [`<tuple>`](https://en.cppreference.com/w/cpp/header/tuple.html) &mdash;
+Prefer named access to class objects, rather than indexed access
+to anonymous heterogeneous sequences.  In particular, a standard-layout
+class is preferred to a tuple.
+
 * `std::invoke<>()`
 ([n4169](http://wg21.link/n4169))
 
+* [`<chrono>`](https://en.cppreference.com/w/cpp/header/chrono.html) &mdash;
+The argument for chrono is that our existing APIs aren't serving us well.
+chrono provides strong type safety. We've had multiple cases of mistakes like
+a double seconds being treated as double milliseconds or vice versa, and other
+similar errors. But it would be a large effort to adopt chrono. We'd also need
+to decide whether to use the predefined clocks or hook up chrono to our
+clocks. It may be that using the predefined clocks is fine, but it's a
+question that needs careful study.
+
+* [`<initializer_list>`](https://en.cppreference.com/w/cpp/header/initializer_list.html) &mdash;
+The potential ambiguity between some forms of direct initialization and
+initializer list initialization, and the resolution of that ambiguity, is
+unfortunate.
+
+* [`<ratio>`](https://en.cppreference.com/w/cpp/header/ratio.html) &mdash;
+`<ratio>` is a *compile-time* rational arithmetic package. It's also fixed
+(though parameterized) precision. It's not a general purpose rational
+arithmetic facility. It appears to have started out as an implementation
+detail of chrono, and was extracted and promoted to a public facility in the
+belief that it has broader utility.
+
+* [`<system_error>`](https://en.cppreference.com/w/cpp/header/system_error.html) &mdash;
+We don't really have a generally agreed upon mechanism for managing
+errors. Instead, we have a plethora of bespoke ad hoc mechanisms. Managing
+errors is a topic of substantial discussion. `<system_error>` might end up
+being a part of a result from that discussion.
 
 
 [ADL]: https://en.cppreference.com/w/cpp/language/adl

doc/hotspot-unit-tests.html

@@ -305,11 +305,11 @@ recognize your tests.</p>
 the product.</p>
 <ul>
 <li><p>All unit tests for a class from <code>foo/bar/baz.cpp</code>
-should be placed <code>foo/bar/test_baz.cpp</code> in
-<code>hotspot/test/native/</code> directory. Having all tests for a
-class in one file is a common practice for unit tests, it helps to see
-all existing tests at once, share functions and/or resources without
-losing encapsulation.</p></li>
+should be placed <code>foo/bar/test_baz.cpp</code> in the
+<code>test/hotspot/gtest/</code> directory. Having all tests for a class
+in one file is a common practice for unit tests, it helps to see all
+existing tests at once, share functions and/or resources without losing
+encapsulation.</p></li>
 <li><p>For tests which test more than one class, directory hierarchy
 should be the same as product hierarchy, and file name should reflect
 the name of the tested subsystem/functionality. For example, if a
@@ -319,7 +319,7 @@ placed in <code>gc/g1</code> directory.</p></li>
 <p>Please note that framework prepends directory name to a test group
 name. For example, if <code>TEST(foo, check_this)</code> and
 <code>TEST(bar, check_that)</code> are defined in
-<code>hotspot/test/native/gc/shared/test_foo.cpp</code> file, they will
+<code>test/hotspot/gtest/gc/shared/test_foo.cpp</code> file, they will
 be reported as <code>gc/shared/foo::check_this</code> and
 <code>gc/shared/bar::check_that</code>.</p>
 <h3 id="test-names">Test names</h3>

doc/hotspot-unit-tests.md

@@ -241,7 +241,7 @@ recognize your tests.
 Test file location should reflect a location of the tested part of the product.
 
 * All unit tests for a class from `foo/bar/baz.cpp` should be placed
-`foo/bar/test_baz.cpp` in `hotspot/test/native/` directory. Having all
+`foo/bar/test_baz.cpp` in the `test/hotspot/gtest/` directory. Having all
 tests for a class in one file is a common practice for unit tests, it
 helps to see all existing tests at once, share functions and/or
 resources without losing encapsulation.
@@ -254,7 +254,7 @@ sub-system under tests belongs to `gc/g1`, tests should be placed in
 
 Please note that framework prepends directory name to a test group
 name. For example, if `TEST(foo, check_this)` and `TEST(bar, check_that)`
-are defined in `hotspot/test/native/gc/shared/test_foo.cpp` file, they
+are defined in `test/hotspot/gtest/gc/shared/test_foo.cpp` file, they
 will be reported as `gc/shared/foo::check_this` and
 `gc/shared/bar::check_that`.
 

doc/starting-next-release.html

@@ -119,6 +119,9 @@ cover the new source version</li>
 and
 <code>test/langtools/tools/javac/preview/classReaderTest/Client.preview.out</code>:
 update expected messages for preview errors and warnings</li>
+<li><code>test/langtools/tools/javac/versions/Versions.java</code>: add
+new source version to the set of valid sources and add new enum constant
+for the new class file version.</li>
 </ul>
 </body>
 </html>

doc/starting-next-release.md

@@ -65,4 +65,4 @@ to be updated for a particular release.
 * `test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java`
    update annotation processor extended by `javac` tests to cover the new source version
 * `test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out` and `test/langtools/tools/javac/preview/classReaderTest/Client.preview.out`: update expected messages for preview errors and warnings
-
+* `test/langtools/tools/javac/versions/Versions.java`: add new source version to the set of valid sources and add new enum constant for the new class file version.

doc/testing.html

@@ -72,6 +72,7 @@ id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+<li><a href="#sctp-tests" id="toc-sctp-tests">SCTP Tests</a></li>
 <li><a href="#testing-ahead-of-time-optimizations"
 id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
 Optimizations</a></li>
@@ -535,6 +536,8 @@ failure. This helps to reproduce intermittent test failures. Defaults to
 <h4 id="report">REPORT</h4>
 <p>Use this report style when reporting test results (sent to JTReg as
 <code>-report</code>). Defaults to <code>files</code>.</p>
+<h4 id="manual">MANUAL</h4>
+<p>Set to <code>true</code> to execute manual tests only.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests
@@ -619,6 +622,21 @@ element of the appropriate <code>@Artifact</code> class. (See
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
+<h3 id="sctp-tests">SCTP Tests</h3>
+<p>The SCTP tests require the SCTP runtime library, which is often not
+installed by default in popular Linux distributions. Without this
+library, the SCTP tests will be skipped. If you want to enable the SCTP
+tests, you should install the SCTP library before running the tests.</p>
+<p>For distributions using the .deb packaging format and the apt tool
+(such as Debian, Ubuntu, etc.), try this:</p>
+<pre><code>sudo apt install libsctp1
+sudo modprobe sctp
+lsmod | grep sctp</code></pre>
+<p>For distributions using the .rpm packaging format and the dnf tool
+(such as Fedora, Red Hat, etc.), try this:</p>
+<pre><code>sudo dnf install -y lksctp-tools
+sudo modprobe sctp
+lsmod | grep sctp</code></pre>
 <h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
 Optimizations</h3>
 <p>One way to improve test coverage of ahead-of-time (AOT) optimizations

doc/testing.md

@@ -512,6 +512,10 @@ helps to reproduce intermittent test failures. Defaults to 0.
 Use this report style when reporting test results (sent to JTReg as `-report`).
 Defaults to `files`.
 
+#### MANUAL
+
+Set to `true` to execute manual tests only.
+
 ### Gtest keywords
 
 #### REPEAT
@@ -636,6 +640,32 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
+
+### SCTP Tests
+
+The SCTP tests require the SCTP runtime library, which is often not installed
+by default in popular Linux distributions. Without this library, the SCTP tests
+will be skipped. If you want to enable the SCTP tests, you should install the
+SCTP library before running the tests.
+
+For distributions using the .deb packaging format and the apt tool
+(such as Debian, Ubuntu, etc.), try this:
+
+```
+sudo apt install libsctp1
+sudo modprobe sctp
+lsmod | grep sctp
+```
+
+For distributions using the .rpm packaging format and the dnf tool
+(such as Fedora, Red Hat, etc.), try this:
+
+```
+sudo dnf install -y lksctp-tools
+sudo modprobe sctp
+lsmod | grep sctp
+```
+
 ### Testing Ahead-of-time Optimizations
 
 One way to improve test coverage of ahead-of-time (AOT) optimizations in

make/Bundles.gmk

@@ -125,13 +125,6 @@ define SetupBundleFileBody
 	    && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
 	        $(TAR_IGNORE_EXIT_VALUE) ) \
 	    | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
-          # Rename stripped pdb files
-          ifeq ($(call isTargetOs, windows)+$(SHIP_DEBUG_SYMBOLS), true+public)
-	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.stripped.pdb"`; do \
-	      $(ECHO) Renaming $$$${f} to $$$${f%stripped.pdb}pdb $(LOG_INFO); \
-	      $(MV) $$$${f} $$$${f%stripped.pdb}pdb; \
-	    done
-          endif
           # Unzip any zipped debuginfo files
           ifeq ($$($1_UNZIP_DEBUGINFO), true)
 	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
@@ -192,96 +185,30 @@ endif
 
 ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 
-  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.map
-
-  # There may be files with spaces in the names, so use ShellFindFiles
-  # explicitly.
+  # There may be files with spaces in the names, so use ShellFindFiles explicitly.
   ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
-  ifneq ($(JDK_IMAGE_DIR), $(JDK_SYMBOLS_IMAGE_DIR))
-    ALL_JDK_SYMBOLS_FILES := $(call ShellFindFiles, $(JDK_SYMBOLS_IMAGE_DIR))
-  else
-    ALL_JDK_SYMBOLS_FILES := $(ALL_JDK_FILES)
-  endif
   ifneq ($(JDK_IMAGE_DIR), $(JDK_DEMOS_IMAGE_DIR))
     ALL_JDK_DEMOS_FILES := $(call ShellFindFiles, $(JDK_DEMOS_IMAGE_DIR))
   else
     ALL_JDK_DEMOS_FILES := $(ALL_JDK_FILES)
   endif
 
-  # Create special filter rules when dealing with unzipped .dSYM directories on
-  # macosx
-  ifeq ($(call isTargetOs, macosx), true)
-    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
-      JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, \
-          $(ALL_JDK_SYMBOLS_FILES))))
-    endif
-  endif
-
-  # Create special filter rules when dealing with debug symbols on windows
-  ifeq ($(call isTargetOs, windows), true)
-    ifeq ($(SHIP_DEBUG_SYMBOLS), )
-      JDK_SYMBOLS_EXCLUDE_PATTERN := %.pdb
-    else
-      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-        JDK_SYMBOLS_EXCLUDE_PATTERN := \
-            $(filter-out \
-                %.stripped.pdb, \
-                $(filter %.pdb, $(ALL_JDK_FILES)) \
-            )
-      endif
-    endif
-  endif
-
   JDK_BUNDLE_FILES := \
       $(filter-out \
-          $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_EXTRA_EXCLUDES) \
-          $(SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_IMAGE_HOMEDIR)/demo/% \
           , \
           $(ALL_JDK_FILES) \
       )
 
-  JDK_SYMBOLS_BUNDLE_FILES := \
-      $(filter-out \
-          %.stripped.pdb, \
-          $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) \
-      )
+  JDK_SYMBOLS_BUNDLE_FILES := $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
       $(ALL_JDK_DEMOS_FILES))
 
   ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
 
-  # Create special filter rules when dealing with unzipped .dSYM directories on
-  # macosx
-  ifeq ($(OPENJDK_TARGET_OS), macosx)
-    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
-      JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
-    endif
-  endif
-
-  # Create special filter rules when dealing with debug symbols on windows
-  ifeq ($(call isTargetOs, windows), true)
-    ifeq ($(SHIP_DEBUG_SYMBOLS), )
-      JRE_SYMBOLS_EXCLUDE_PATTERN := %.pdb
-    else
-      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-        JRE_SYMBOLS_EXCLUDE_PATTERN := \
-            $(filter-out \
-                %.stripped.pdb, \
-                $(filter %.pdb, $(ALL_JRE_FILES)) \
-            )
-      endif
-    endif
-  endif
-
-  JRE_BUNDLE_FILES := $(filter-out \
-      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
-      $(SYMBOLS_EXCLUDE_PATTERN), \
-      $(ALL_JRE_FILES))
+  JRE_BUNDLE_FILES := $(ALL_JRE_FILES)
 
   ifeq ($(MACOSX_CODESIGN_MODE), hardened)
     # Macosx release build and code signing available.

make/CreateJmods.gmk

@@ -218,10 +218,14 @@ ifeq ($(call isTargetOs, windows), true)
   ifeq ($(SHIP_DEBUG_SYMBOLS), )
     JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.pdb,*.map}'
   else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.map}'
   endif
 else
-  JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+  ifeq ($(SHIP_DEBUG_SYMBOLS), )
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+  else
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*}'
+  endif
 endif
 
 # Unless we are creating a very large module, use the small tool JVM options

make/Docs.gmk

@@ -93,16 +93,19 @@ JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
 JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
+# -XDaccessInternalAPI is a temporary workaround, see 8373909
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary
+    --override-methods=summary \
+    -XDaccessInternalAPI
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive
+    -html5 -javafx --expand-requires transitive \
+    -XDaccessInternalAPI
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)
@@ -291,8 +294,7 @@ define SetupApiDocsGenerationBody
   $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES))
   $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
 
-  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \
-	-Djspec.version=$$(VERSION_SPECIFICATION)
+  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION)
 
   ifeq ($$(ENABLE_FULL_DOCS), true)
     $1_SEALED_GRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-sealed-graphs

make/Images.gmk

@@ -148,7 +148,6 @@ define CreateCDSArchive
   $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_COH_OPTION)
   $1_$2_DUMP_TYPE      := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _coh, $2),-COH,)
 
-  # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
   $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -283,29 +282,33 @@ else
 endif
 CMDS_TARGET_SUBDIR := bin
 
-# Param 1 - either JDK or JRE
+# Copy debug info files into symbols bundle.
+# In case of Windows and --with-external-symbols-in-bundles=public, take care to remove *.stripped.pdb files
 SetupCopyDebuginfo = \
     $(foreach m, $(ALL_$1_MODULES), \
+      $(eval dbgfiles := $(call FindDebuginfoFiles, $(SUPPORT_OUTPUTDIR)/modules_libs/$m)) \
+      $(eval dbgfiles := $(if $(filter true+public,$(call isTargetOs,windows)+$(SHIP_DEBUG_SYMBOLS)), \
+        $(filter-out %.stripped.pdb,$(dbgfiles)),$(dbgfiles)) \
+      ) \
       $(eval $(call SetupCopyFiles, COPY_$1_LIBS_DEBUGINFO_$m, \
           SRC := $(SUPPORT_OUTPUTDIR)/modules_libs/$m, \
           DEST := $($1_IMAGE_DIR)/$(LIBS_TARGET_SUBDIR), \
-          FILES := $(call FindDebuginfoFiles, \
-              $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
+          FILES := $(dbgfiles), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
+      $(eval dbgfiles := $(call FindDebuginfoFiles, $(SUPPORT_OUTPUTDIR)/modules_cmds/$m)) \
+      $(eval dbgfiles := $(if $(filter true+public,$(call isTargetOs,windows)+$(SHIP_DEBUG_SYMBOLS)), \
+        $(filter-out %.stripped.pdb,$(dbgfiles)),$(dbgfiles)) \
+      ) \
       $(eval $(call SetupCopyFiles, COPY_$1_CMDS_DEBUGINFO_$m, \
           SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$m, \
           DEST := $($1_IMAGE_DIR)/$(CMDS_TARGET_SUBDIR), \
-          FILES := $(call FindDebuginfoFiles, \
-              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m), \
+          FILES := $(dbgfiles), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_CMDS_DEBUGINFO_$m)) \
     )
 
-# No space before argument to avoid having to put $(strip ) everywhere in
-# implementation above.
-$(call SetupCopyDebuginfo,JDK)
-$(call SetupCopyDebuginfo,JRE)
+# No space before argument to avoid having to put $(strip ) everywhere in implementation above.
 $(call SetupCopyDebuginfo,SYMBOLS)
 
 ################################################################################

make/Main.gmk

@@ -461,9 +461,9 @@ $(eval $(call SetupTarget, symbols-image, \
     TARGET := symbols, \
 ))
 
-$(eval $(call SetupTarget, static-launcher, \
+$(eval $(call SetupTarget, static-launchers, \
     MAKEFILE := StaticLibs, \
-    TARGET := static-launcher, \
+    TARGET := static-launchers, \
     DEPS := hotspot-static-libs static-libs, \
 ))
 
@@ -1290,7 +1290,7 @@ ifeq ($(call isTargetOs, macosx), true)
   legacy-images: mac-legacy-jre-bundle
 endif
 
-static-exploded-image: static-launcher exploded-image
+static-exploded-image: static-launchers exploded-image
 
 # These targets build the various documentation images
 docs-jdk-image: docs-jdk

make/RunTests.gmk

@@ -206,7 +206,7 @@ $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \
         MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \
-        AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        AOT_JDK MANUAL $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
         $(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -873,7 +873,7 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-	$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
+        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
     ))
   endif
 
@@ -881,8 +881,8 @@ define SetupRunJtregTestBody
     AGENT := $$(LIBRARY_PREFIX)JvmtiStressAgent$$(SHARED_LIBRARY_SUFFIX)=$$(JTREG_JVMTI_STRESS_AGENT)
     $1_JTREG_BASIC_OPTIONS += -javaoption:'-agentpath:$(TEST_IMAGE_DIR)/hotspot/jtreg/native/$$(AGENT)'
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-	    $$(addprefix $$($1_TEST_ROOT)/, ProblemList-jvmti-stress-agent.txt) \
-        ))
+        $$(addprefix $$($1_TEST_ROOT)/, ProblemList-jvmti-stress-agent.txt) \
+    ))
   endif
 
 
@@ -911,7 +911,13 @@ define SetupRunJtregTestBody
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
 
-  $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
+  $1_JTREG_BASIC_OPTIONS += -ignore:quiet
+
+  ifeq ($$(JTREG_MANUAL), true)
+    $1_JTREG_BASIC_OPTIONS += -manual
+  else
+    $1_JTREG_BASIC_OPTIONS += -automatic
+  endif
 
   # Make it possible to specify the JIB_DATA_DIR for tests using the
   # JIB Artifact resolver
@@ -1086,7 +1092,7 @@ define SetupRunJtregTestBody
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
 	    $$($1_TEST_TMP_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
-            $$(COV_ENVIRONMENT) $$($1_COMMAND_LINE) \
+	    $$(COV_ENVIRONMENT) $$($1_COMMAND_LINE) \
 	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt
@@ -1096,11 +1102,11 @@ define SetupRunJtregTestBody
 	$$(call LogWarn, Test report is stored in $$(strip \
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
 
-	# Read jtreg documentation to learn on the test stats categories:
-	# https://github.com/openjdk/jtreg/blob/master/src/share/doc/javatest/regtest/faq.md#what-do-all-those-numbers-in-the-test-results-line-mean
-	# In jtreg, "skipped:" category accounts for tests that threw jtreg.SkippedException at runtime.
-	# At the same time these tests contribute to "passed:" tests.
-	# In here we don't want that and so we substract number of "skipped:" from "passed:".
+        # Read jtreg documentation to learn on the test stats categories:
+        # https://github.com/openjdk/jtreg/blob/master/src/share/doc/javatest/regtest/faq.md#what-do-all-those-numbers-in-the-test-results-line-mean
+        # In jtreg, "skipped:" category accounts for tests that threw jtreg.SkippedException at runtime.
+        # At the same time these tests contribute to "passed:" tests.
+        # In here we don't want that and so we substract number of "skipped:" from "passed:".
 
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
 	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \
@@ -1151,6 +1157,7 @@ define SetupRunJtregTestBody
 	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR) + $$($1_SKIPPED))) \
 	, \
 	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0) \
+	  $$(eval $1_PASSED := 0) \
 	  $$(eval $1_RUNTIME_SKIPPED := 0) \
 	  $$(eval $1_SKIPPED := 0) \
 	  $$(eval $1_FAILED := 0) \

make/RunTestsPrebuiltSpec.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/StaticLibs.gmk

@@ -48,8 +48,8 @@ ifneq ($(word 2, $(wildcard $(HOTSPOT_STATIC_LIB_PATH))), )
 endif
 
 # Find all modules with static libraries
-STATIC_LIB_MODULES := $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*))
+STATIC_LIB_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
+    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*)))
 
 # Filter out known broken libraries. This is a temporary measure until
 # proper support for these libraries can be provided.
@@ -123,13 +123,18 @@ else
   $(error Unsupported platform)
 endif
 
+################################################################################
+# Build the java static launcher
+################################################################################
 $(eval $(call SetupBuildLauncher, java, \
     ENABLE_ARG_FILES := true, \
     EXPAND_CLASSPATH_WILDCARDS := true, \
     EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
     OPTIMIZATION := HIGH, \
+    MACOSX_PRIVILEGED := true, \
     STATIC_LAUNCHER := true, \
+    CFLAGS := -DSTATIC_BUILD, \
     LDFLAGS := $(LDFLAGS_STATIC_JDK), \
     LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
     LINK_TYPE := C++, \
@@ -146,7 +151,53 @@ TARGETS += $(java)
 
 JAVA_LAUNCHER := $(BUILD_LAUNCHER_java_TARGET)
 
-static-launcher: $(java)
+static-launchers: $(java)
+
+################################################################################
+# Build relaunchers (thin wrappers calling the java binary) for all other
+# JDK launchers.
+################################################################################
+
+RELAUNCHER_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher
+
+# $1: The module name
+# $2: The launcher name
+define SetupRelauncher
+  $1_$2_LAUNCHER_ARGS_LINE := $$(call ReadFile, $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$1/$2-relauncher-arguments.txt)
+  # Restore |||| with space
+  $1_$2_LAUNCHER_ARGS := '{ $$(subst ||||,$(SPACE),$$(strip $$(foreach a, $$($1_$2_LAUNCHER_ARGS_LINE), "-J$$a"$$(COMMA) )) ) }'
+
+  $$(eval $$(call SetupJdkExecutable, BUILD_relauncher_$2, \
+      NAME := $2, \
+      EXTRA_FILES := $$(RELAUNCHER_SRC)/relauncher.c, \
+      CFLAGS := -DLAUNCHER_ARGS=$$($1_$2_LAUNCHER_ARGS), \
+      LIBS_windows := shlwapi.lib, \
+      OUTPUT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR), \
+      OBJECT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR)/relaunchers/$2, \
+  ))
+
+  TARGETS += $$(BUILD_relauncher_$2)
+
+  RELAUNCHERS += $$(BUILD_relauncher_$2_TARGET)
+  static-launchers: $$(BUILD_relauncher_$2)
+endef
+
+# Find all modules with launchers
+LAUNCHER_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-launchers/%, \
+    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-launchers/*)))
+
+# Find launchers for each module
+$(foreach module, $(LAUNCHER_MODULES), \
+    $(eval LAUNCHERS_$(module) := $(if $(wildcard \
+    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt), \
+    $(shell cat \
+    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt))) \
+)
+
+# For all launchers (except java and javaw), setup a relauncher build
+$(foreach module, $(LAUNCHER_MODULES), \
+    $(foreach launcher, $(filter-out java javaw, $(LAUNCHERS_$(module))), \
+    $(eval $(call SetupRelauncher,$(module),$(launcher)))))
 
 ################################################################################
 #
@@ -188,26 +239,72 @@ TARGETS += $(copy-from-jdk-image)
 
 $(copy-from-jdk-image): | static-jdk-info
 
-$(eval $(call SetupCopyFiles, copy-static-launcher, \
-    FILES := $(JAVA_LAUNCHER), \
+$(eval $(call SetupCopyFiles, copy-static-launchers, \
+    FILES := $(JAVA_LAUNCHER) $(RELAUNCHERS), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
 ))
 
-TARGETS += $(copy-static-launcher)
+TARGETS += $(copy-static-launchers)
 
-$(eval $(call SetupCopyFiles, copy-static-launcher-debuginfo, \
+$(eval $(call SetupCopyFiles, copy-static-launchers-debuginfo, \
     SRC := $(STATIC_LAUNCHER_OUTPUT_DIR), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
     FILES := $(call FindDebuginfoFiles, $(STATIC_LAUNCHER_OUTPUT_DIR)), \
 ))
 
-TARGETS += $(copy-static-launcher-debuginfo)
+TARGETS += $(copy-static-launchers-debuginfo)
 
-static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-launcher-debuginfo)
+# Copy the microsoft runtime libraries on windows
+ifeq ($(call isTargetOs, windows), true)
+  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
+  # Use separate macro calls in case the source files are not in the same
+  # directory.
+  $(eval $(call SetupCopyFiles, copy-windows-msvcr, \
+      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+      FILES := $(MSVCR_DLL), \
+      MACRO := copy-and-chmod-executable, \
+  ))
+
+  TARGETS += $(copy-windows-msvcr)
+
+  $(eval $(call SetupCopyFiles, copy-windows-vcruntime, \
+      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+      FILES := $(VCRUNTIME_1_DLL), \
+      MACRO := copy-and-chmod-executable, \
+  ))
+
+  TARGETS += $(copy-windows-vcruntime)
+
+  $(eval $(call SetupCopyFiles, copy-windows-msvcp, \
+      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+      FILES := $(MSVCP_DLL), \
+      MACRO := copy-and-chmod-executable, \
+  ))
+
+  TARGETS += $(copy-windows-msvcp)
+
+  copy-windows-libs := $(copy-windows-msvcr) $(copy-windows-vcruntime) $(copy-windows-msvcp)
+
+  ifneq ($(UCRT_DLL_DIR), )
+    $(eval $(call SetupCopyFiles, copy-windows-ucrt, \
+        DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
+        SRC := $(UCRT_DLL_DIR), \
+        FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
+        MACRO := copy-and-chmod-executable, \
+    ))
+
+    TARGETS += $(copy-windows-ucrt)
+
+    copy-windows-libs += $(copy-windows-ucrt)
+  endif
+endif
+
+static-jdk-image: $(copy-from-jdk-image) $(copy-static-launchers) \
+    $(copy-static-launchers-debuginfo) $(copy-windows-libs)
 
 TARGETS += static-jdk-image
 
-.PHONY: static-launcher static-jdk-image
+.PHONY: static-launchers static-jdk-image
 
 ################################################################################
 

make/ToolsJdk.gmk

@@ -79,7 +79,7 @@ TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_too
     build.tools.generateextraproperties.GenerateExtraProperties
 
 TOOL_GENERATECASEFOLDING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generatecharacter.CaseFolding
+    build.tools.generatecharacter.GenerateCaseFolding
 
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible

make/autoconf/basic.m4

@@ -353,7 +353,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
       [set up toolchain on Mac OS using a path to an Xcode installation])])
 
   UTIL_DEPRECATED_ARG_WITH(sys-root)
-  UTIL_DEPRECATED_ARG_WITH(tools-dir)
+
+  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
+      [Point to a nonstandard Visual Studio installation location on Windows by
+      specifying any existing directory 2 or 3 levels below the installation
+      root.])]
+  )
 
   if test "x$with_xcode_path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then

make/autoconf/bootcycle-spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/buildjdk-spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/compare.sh.template

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/flags-cflags.m4

@@ -69,6 +69,19 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # Debug prefix mapping if supported by compiler
   DEBUG_PREFIX_CFLAGS=
 
+  UTIL_ARG_WITH(NAME: native-debug-symbols-level, TYPE: literal,
+    DEFAULT: [auto], VALID_VALUES: [auto 1 2 3],
+    CHECK_AVAILABLE: [
+      if test x$TOOLCHAIN_TYPE = xmicrosoft; then
+        AVAILABLE=false
+      fi
+    ],
+    DESC: [set the native debug symbol level (GCC and Clang only)],
+    DEFAULT_DESC: [toolchain default],
+    IF_AUTO: [
+      RESULT=""
+    ])
+
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
@@ -93,8 +106,9 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
       )
     fi
 
-    CFLAGS_DEBUG_SYMBOLS="-g -gdwarf-4"
-    ASFLAGS_DEBUG_SYMBOLS="-g"
+    # Debug info level should follow the debug format to be effective.
+    CFLAGS_DEBUG_SYMBOLS="-gdwarf-4 -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
       # Check if compiler supports -fdebug-prefix-map. If so, use that to make
@@ -113,8 +127,9 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${GDWARF_FLAGS}],
         IF_FALSE: [GDWARF_FLAGS=""])
 
-    CFLAGS_DEBUG_SYMBOLS="-g ${GDWARF_FLAGS}"
-    ASFLAGS_DEBUG_SYMBOLS="-g"
+    # Debug info level should follow the debug format to be effective.
+    CFLAGS_DEBUG_SYMBOLS="${GDWARF_FLAGS} -g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
+    ASFLAGS_DEBUG_SYMBOLS="-g${NATIVE_DEBUG_SYMBOLS_LEVEL}"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
@@ -282,10 +297,17 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM="-O0"
     C_O_FLAG_NONE="-O0"
 
+    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+      C_O_FLAG_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing -fno-fat-lto-objects"
+    else
+      C_O_FLAG_LTO="-flto -fno-strict-aliasing"
+    fi
+
     if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
       C_O_FLAG_HIGHEST_JVM="${C_O_FLAG_HIGHEST_JVM} -finline-functions"
       C_O_FLAG_HIGHEST="${C_O_FLAG_HIGHEST} -finline-functions"
       C_O_FLAG_HI="${C_O_FLAG_HI} -finline-functions"
+      C_O_FLAG_LTO="${C_O_FLAG_LTO} -ffat-lto-objects"
     fi
 
     # -D_FORTIFY_SOURCE=2 hardening option needs optimization (at least -O1) enabled
@@ -317,6 +339,7 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
     C_O_FLAG_DEBUG_JVM=""
     C_O_FLAG_NONE="-Od"
     C_O_FLAG_SIZE="-O1"
+    C_O_FLAG_LTO="-GL"
   fi
 
   # Now copy to C++ flags
@@ -328,6 +351,7 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   CXX_O_FLAG_DEBUG_JVM="$C_O_FLAG_DEBUG_JVM"
   CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
   CXX_O_FLAG_SIZE="$C_O_FLAG_SIZE"
+  CXX_O_FLAG_LTO="$C_O_FLAG_LTO"
 
   # Adjust optimization flags according to debug level.
   case $DEBUG_LEVEL in
@@ -360,12 +384,15 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
   AC_SUBST(C_O_FLAG_NORM)
   AC_SUBST(C_O_FLAG_NONE)
   AC_SUBST(C_O_FLAG_SIZE)
+  AC_SUBST(C_O_FLAG_LTO)
+
   AC_SUBST(CXX_O_FLAG_HIGHEST_JVM)
   AC_SUBST(CXX_O_FLAG_HIGHEST)
   AC_SUBST(CXX_O_FLAG_HI)
   AC_SUBST(CXX_O_FLAG_NORM)
   AC_SUBST(CXX_O_FLAG_NONE)
   AC_SUBST(CXX_O_FLAG_SIZE)
+  AC_SUBST(CXX_O_FLAG_LTO)
 ])
 
 AC_DEFUN([FLAGS_SETUP_CFLAGS],

make/autoconf/flags-ldflags.m4

@@ -34,7 +34,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain
-  FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+  FLAGS_SETUP_LDFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
 
   AC_SUBST(ADLC_LDFLAGS)
 ])
@@ -50,7 +50,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # add -z,relro (mark relocations read only) for all libs
     # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
     # add --no-as-needed to disable default --as-needed link flag on some GCC toolchains
+    # add --icf=all (Identical Code Folding — merges identical functions)
     BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed -Wl,--exclude-libs,ALL"
+
     # Linux : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       if test "x$OPENJDK_TARGET_CPU" = xs390x; then
@@ -61,6 +63,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     fi
 
     BASIC_LDFLAGS_JVM_ONLY=""
+    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
 
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
@@ -68,6 +71,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
         -fPIC"
 
+    LDFLAGS_LTO="-flto=auto -fuse-linker-plugin -fno-strict-aliasing $DEBUG_PREFIX_CFLAGS"
     LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
 
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
@@ -87,6 +91,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS="-opt:ref"
     BASIC_LDFLAGS_JDK_ONLY="-incremental:no"
     BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
+    LDFLAGS_LTO="-LTCG:INCREMENTAL"
   fi
 
   if (test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang) \
@@ -98,6 +103,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup OS-dependent LDFLAGS
   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
+    if test x$DEBUG_LEVEL = xrelease; then
+      BASIC_LDFLAGS_JDK_ONLY="$BASIC_LDFLAGS_JDK_ONLY -Wl,-dead_strip"
+    fi
     # FIXME: We should really generalize SetSharedLibraryOrigin instead.
     OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
     OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN -Wl,-reproducible"
@@ -148,6 +156,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Export some intermediate variables for compatibility
   LDFLAGS_CXX_JDK="$DEBUGLEVEL_LDFLAGS_JDK_ONLY"
+  AC_SUBST(LDFLAGS_LTO)
   AC_SUBST(LDFLAGS_CXX_JDK)
   AC_SUBST(LDFLAGS_CXX_PARTIAL_LINKING)
 ])
@@ -155,7 +164,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 ################################################################################
 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
 #      conditionals against.
-# $2 - Optional prefix for each variable defined.
+# $2 - Optional prefix for each variable defined (OPENJDK_BUILD_ or nothing).
+# $3 - Optional prefix for toolchain variables (BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
 [
   # Setup CPU-dependent basic LDFLAGS. These can differ between the target and
@@ -189,6 +199,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
     fi
   fi
 
+  if test "x${$3LD_TYPE}" = "xgold"; then
+    if test x$DEBUG_LEVEL = xrelease; then
+      $1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--icf=all"
+    fi
+  fi
+
   # Export variables according to old definitions, prefix with $2 if present.
   LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
       $OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"

make/autoconf/hotspot.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/jdk-options.m4

@@ -316,23 +316,36 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
   AC_MSG_CHECKING([if we should add external native debug symbols to the shipped bundles])
   AC_ARG_WITH([external-symbols-in-bundles],
       [AS_HELP_STRING([--with-external-symbols-in-bundles],
-      [which type of external native debug symbol information shall be shipped in product bundles (none, public, full)
-      (e.g. ship full/stripped pdbs on Windows) @<:@none@:>@])])
+      [which type of external native debug symbol information shall be shipped with bundles/images (none, public, full).
+      @<:@none in release builds, full otherwise. --with-native-debug-symbols=external/zipped is a prerequisite. public is only supported on Windows@:>@])],
+      [],
+      [with_external_symbols_in_bundles=default])
 
   if test "x$with_external_symbols_in_bundles" = x || test "x$with_external_symbols_in_bundles" = xnone ; then
     AC_MSG_RESULT([no])
   elif test "x$with_external_symbols_in_bundles" = xfull || test "x$with_external_symbols_in_bundles" = xpublic ; then
-    if test "x$OPENJDK_TARGET_OS" != xwindows ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles currently only works on windows!])
-    elif test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external is used!])
-    elif test "x$with_external_symbols_in_bundles" = xfull ; then
+    if test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
+      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external/zipped is used!])
+    elif test "x$with_external_symbols_in_bundles" = xpublic && test "x$OPENJDK_TARGET_OS" != xwindows ; then
+      AC_MSG_ERROR([--with-external-symbols-in-bundles=public is only supported on Windows!])
+    fi
+
+    if test "x$with_external_symbols_in_bundles" = xfull ; then
       AC_MSG_RESULT([full])
       SHIP_DEBUG_SYMBOLS=full
     else
       AC_MSG_RESULT([public])
       SHIP_DEBUG_SYMBOLS=public
     fi
+  elif test "x$with_external_symbols_in_bundles" = xdefault ; then
+    if test "x$DEBUG_LEVEL" = xrelease ; then
+      AC_MSG_RESULT([no (default)])
+    elif test "x$COPY_DEBUG_SYMBOLS" = xtrue ; then
+      AC_MSG_RESULT([full (default)])
+      SHIP_DEBUG_SYMBOLS=full
+    else
+      AC_MSG_RESULT([no (default, native debug symbols are not external/zipped)])
+    fi
   else
     AC_MSG_ERROR([$with_external_symbols_in_bundles is an unknown value for --with-external-symbols-in-bundles])
   fi

make/autoconf/lib-bundled.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/lib-hsdis.m4

@@ -304,6 +304,8 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
       # If we have libsframe add it.
       if test -e $BINUTILS_INSTALL_DIR/lib/libsframe.a; then
         HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib/libsframe.a"
+      elif test -e $BINUTILS_INSTALL_DIR/lib64/libsframe.a; then
+        HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib64/libsframe.a"
       fi
       AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], AC_MSG_ERROR([libz not found]))
     else

make/autoconf/platform.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/spec.gmk.template

@@ -513,12 +513,14 @@ C_O_FLAG_HI := @C_O_FLAG_HI@
 C_O_FLAG_NORM := @C_O_FLAG_NORM@
 C_O_FLAG_NONE := @C_O_FLAG_NONE@
 C_O_FLAG_SIZE := @C_O_FLAG_SIZE@
+C_O_FLAG_LTO := @C_O_FLAG_LTO@
 CXX_O_FLAG_HIGHEST_JVM := @CXX_O_FLAG_HIGHEST_JVM@
 CXX_O_FLAG_HIGHEST := @CXX_O_FLAG_HIGHEST@
 CXX_O_FLAG_HI := @CXX_O_FLAG_HI@
 CXX_O_FLAG_NORM := @CXX_O_FLAG_NORM@
 CXX_O_FLAG_NONE := @CXX_O_FLAG_NONE@
 CXX_O_FLAG_SIZE := @CXX_O_FLAG_SIZE@
+CXX_O_FLAG_LTO  := @CXX_O_FLAG_LTO@
 
 GENDEPS_FLAGS := @GENDEPS_FLAGS@
 
@@ -587,6 +589,9 @@ LDFLAGS_CXX_JDK := @LDFLAGS_CXX_JDK@
 # LDFLAGS specific to partial linking.
 LDFLAGS_CXX_PARTIAL_LINKING := @LDFLAGS_CXX_PARTIAL_LINKING@
 
+# LDFLAGS specific to link time optimization
+LDFLAGS_LTO := @LDFLAGS_LTO@
+
 # Sometimes a different linker is needed for c++ libs
 LDCXX := @LDCXX@
 # The flags for linking libstdc++ linker.

make/autoconf/toolchain.m4

@@ -516,6 +516,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
     if [ [[ "$LINKER_VERSION_STRING" == *gold* ]] ]; then
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*) .*/\1/'` ]
+      $1_TYPE=gold
     else
       [ LINKER_VERSION_NUMBER=`$ECHO $LINKER_VERSION_STRING | \
           $SED -e 's/.* \([0-9][0-9]*\(\.[0-9][0-9]*\)*\).*/\1/'` ]

make/autoconf/toolchain_microsoft.m4

@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2022 2019"
+VALID_VS_VERSIONS="2022 2019 2026"
 
 VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
 VS_VERSION_INTERNAL_2019=142
@@ -57,6 +57,21 @@ VS_SDK_PLATFORM_NAME_2022=
 VS_SUPPORTED_2022=true
 VS_TOOLSET_SUPPORTED_2022=true
 
+VS_DESCRIPTION_2026="Microsoft Visual Studio 2026"
+VS_VERSION_INTERNAL_2026=145
+VS_MSVCR_2026=vcruntime140.dll
+VS_VCRUNTIME_1_2026=vcruntime140_1.dll
+VS_MSVCP_2026=msvcp140.dll
+VS_ENVVAR_2026="VS180COMNTOOLS"
+VS_USE_UCRT_2026="true"
+VS_VS_INSTALLDIR_2026="Microsoft Visual Studio/18"
+VS_EDITIONS_2026="BuildTools Community Professional Enterprise"
+VS_SDK_INSTALLDIR_2026=
+VS_VS_PLATFORM_NAME_2026="v145"
+VS_SDK_PLATFORM_NAME_2026=
+VS_SUPPORTED_2026=true
+VS_TOOLSET_SUPPORTED_2026=true
+
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],

make/common/NativeCompilation.gmk

@@ -98,6 +98,7 @@ include native/Paths.gmk
 #   SYSROOT_CFLAGS the compiler flags for using the specific sysroot
 #   SYSROOT_LDFLAGS the linker flags for using the specific sysroot
 #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST, HIGHEST_JVM, SIZE
+#   LINK_TIME_OPTIMIZATION if set to true, enables link time optimization
 #   DISABLED_WARNINGS_<toolchain> Disable the given warnings for the specified toolchain
 #   DISABLED_WARNINGS_<toolchain>_<OS> Disable the given warnings for the specified
 #       toolchain and target OS

make/common/Utils.gmk

@@ -114,7 +114,7 @@ EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
 
 ################################################################################
 # This macro works just like EscapeDollar above, but for #.
-EscapeHash = $(subst \#,\\\#,$(subst \\\#,\#,$(strip $1)))
+EscapeHash = $(subst $(HASH),\$(HASH),$(subst \$(HASH),$(HASH),$(strip $1)))
 
 ################################################################################
 # This macro translates $ into $$ to protect the string from make itself.

make/common/modules/LauncherCommon.gmk

@@ -43,6 +43,9 @@ LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
 MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
 JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 
+INCLUDED_LAUNCHERS_FILE := $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(MODULE)/module-included-launchers.txt
+INCLUDED_LAUNCHERS :=
+
 ################################################################################
 # Build standard launcher.
 
@@ -74,19 +77,30 @@ define SetupBuildLauncherBody
 
   $1_MAIN_MODULE := $(MODULE)
 
+  $1_RELAUNCHER_ARGUMENTS :=
+
   ifneq ($$($1_MAIN_CLASS), )
     $1_JAVA_ARGS += -Xms8m
     $1_LAUNCHER_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
   endif
 
-  ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
-    $1_CFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
+  ifeq ($$($1_ENABLE_ARG_FILES), true)
+    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_FALSE
+  else
+    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_TRUE
+    # This must be the first argument given, if it should be present
+    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherArgFiles=false
   endif
 
-  ifeq ($$($1_ENABLE_ARG_FILES), true)
-    $1_CFLAGS += -DENABLE_ARG_FILES
+  ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
+    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_TRUE
+  else
+    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_FALSE
+    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherWildcards=false
   endif
 
+  $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherProgname=$1
+
   ifeq ($(call isTargetOs, windows), true)
     ifeq ($$($1_WINDOWS_JAVAW), true)
       $1_CFLAGS += -DJAVAW
@@ -94,9 +108,14 @@ define SetupBuildLauncherBody
   endif
 
   ifneq ($$($1_JAVA_ARGS), )
-    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
-        $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }'
+    $1_PREFIXED_JAVA_ARGS := $$(addprefix -J, $$($1_JAVA_ARGS)) \
+        $$($1_LAUNCHER_CLASS)
+    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, $$($1_PREFIXED_JAVA_ARGS), \
+        "$$a"$(COMMA) )) }'
     $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
+    # To preserve spaces, substitute them with a hopefully unique pattern
+    $1_RELAUNCHER_ARGUMENTS += \
+        -DjavaLauncherArgs=$$(subst $$(SPACE),||||,$$($1_PREFIXED_JAVA_ARGS))
   endif
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -172,8 +191,28 @@ define SetupBuildLauncherBody
   ))
 
   $1 += $$(BUILD_LAUNCHER_$1)
+
+  $1_RELAUNCHER_ARGUMENTS_FILE := \
+      $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$$(MODULE)/$1-relauncher-arguments.txt
+
+  $1_VARDEPS := $$($1_RELAUNCHER_ARGUMENTS)
+  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
+      $$($1_RELAUNCHER_ARGUMENTS_FILE).vardeps)
+
+  $$($1_RELAUNCHER_ARGUMENTS_FILE):
+	$$(call MakeDir, $$(@D))
+	$$(ECHO) '$$($1_RELAUNCHER_ARGUMENTS)' > $$@
+
+  $1 += $$($1_RELAUNCHER_ARGUMENTS_FILE)
+
   TARGETS += $$($1)
 
+  # Record the fact that this launcher is part of the current module.
+  INCLUDED_LAUNCHERS += $1
+
+  # Add a dependency from this launcher to the launcher list
+  $$(INCLUDED_LAUNCHERS_FILE): $$($1)
+
   $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -242,5 +281,14 @@ endif
 
 ################################################################################
 
+# We need to keep track of which launchers are created by this module. This
+# information is required for static builds, to know which relaunchers to
+# create. The file module-included-launchers.txt is then read in StaticLibs.gmk.
+$(INCLUDED_LAUNCHERS_FILE):
+	$(call MakeDir, $(@D))
+	$(ECHO) $(INCLUDED_LAUNCHERS) > $@
+
+TARGETS += $(INCLUDED_LAUNCHERS_FILE)
+
 endif # include guard
 include MakeIncludeEnd.gmk

make/common/native/Flags.gmk

@@ -194,6 +194,11 @@ define SetupCompilerFlags
     $1_EXTRA_CXXFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
   endif
 
+  ifeq (true, $$($1_LINK_TIME_OPTIMIZATION))
+    $1_EXTRA_CFLAGS += $(C_O_FLAG_LTO)
+    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_LTO)
+  endif
+
   ifeq (NONE, $$($1_OPTIMIZATION))
     $1_OPT_CFLAGS := $(C_O_FLAG_NONE)
     $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE)
@@ -222,6 +227,18 @@ define SetupLinkerFlags
   # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and TOOLCHAIN_TYPE
   # dependent variables for LDFLAGS and LIBS, and additionally the pair dependent
   # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS
+  ifeq ($$($1_LINK_TIME_OPTIMIZATION), true)
+    $1_EXTRA_LDFLAGS += $(LDFLAGS_LTO)
+    # Instruct the ld64 linker not to delete the temporary object file
+    # generated during Link Time Optimization
+    ifeq ($(call isTargetOs, macosx), true)
+      $1_EXTRA_LDFLAGS += -Wl,-object_path_lto,$$($1_OBJECT_DIR)/$$($1_NAME)_lto_helper.o
+    endif
+    ifeq ($(TOOLCHAIN_TYPE), microsoft)
+      $1_EXTRA_LDFLAGS += -LTCGOUT:$$($1_OBJECT_DIR)/$$($1_NAME).iobj
+    endif
+  endif
+
   $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \
       $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)) $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))
   $1_EXTRA_LIBS += $$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) \

make/conf/jib-profiles.js

@@ -1192,8 +1192,8 @@ var getJibProfilesDependencies = function (input, common) {
             server: "jpg",
             product: "jcov",
             version: "3.0",
-            build_number: "3",
-            file: "bundles/jcov-3.0+3.zip",
+            build_number: "5",
+            file: "bundles/jcov-3.0+5.zip",
             environment_name: "JCOV_HOME",
         },
 

make/conf/version-numbers.conf

@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=26
+DEFAULT_VERSION_FEATURE=27
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2026-03-17
-DEFAULT_VERSION_CLASSFILE_MAJOR=70  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2026-09-15
+DEFAULT_VERSION_CLASSFILE_MAJOR=71  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="25 26"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=26
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="25 26 27"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=27
 DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/cldr/LICENSE

@@ -1,4 +1,4 @@
-UNICODE LICENSE V3
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 

make/data/cldr/common/bcp47/calendar.xml

@@ -45,6 +45,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
 			<type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
 			<type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
+			<type name="c12" description="Best 12-hour cycle for locale (h11 or h12)" since="48" deprecated="true" /> <!-- Technical Preview -->
+			<type name="c24" description="Best 24-hour cycle for locale (h23 or h24)" since="48" deprecated="true" /> <!-- Technical Preview -->
 		</key>
     </keyword>
 </ldmlBCP47>

make/data/cldr/common/bcp47/number.xml

@@ -105,6 +105,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="thai" description="Thai digits"/>
             <type name="tirh" description="Tirhuta digits" since="28"/>
             <type name="tibt" description="Tibetan digits"/>
+            <type name="tols" description="Tolong Siki digits" since="48"/>
             <type name="traditio" description="Traditional numerals — may be algorithmic" alias="traditional" since="21"/>
             <type name="vaii" description="Vai digits" since="21"/>
             <type name="wara" description="Warang Citi digits" since="28"/>

make/data/cldr/common/bcp47/timezone.xml

@@ -17,14 +17,14 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aiaxa" description="Anguilla" alias="America/Anguilla"/>
             <type name="altia" description="Tirane, Albania" alias="Europe/Tirane"/>
             <type name="amevn" description="Yerevan, Armenia" alias="Asia/Yerevan"/>
-            <type name="ancur" description="Curaçao" alias="America/Curacao"/>
+            <type name="ancur" description="Curaçao" alias="America/Curacao" region="CW"/>
             <type name="aolad" description="Luanda, Angola" alias="Africa/Luanda"/>
-            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="nzakl"/>
+            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="aqmcm"/>
             <type name="aqcas" description="Casey Station, Bailey Peninsula" alias="Antarctica/Casey"/>
             <type name="aqdav" description="Davis Station, Vestfold Hills" alias="Antarctica/Davis"/>
             <type name="aqddu" description="Dumont d'Urville Station, Terre Adélie" alias="Antarctica/DumontDUrville"/>
             <type name="aqmaw" description="Mawson Station, Holme Bay" alias="Antarctica/Mawson"/>
-            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo"/>
+            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo Antarctica/South_Pole"/>
             <type name="aqplm" description="Palmer Station, Anvers Island" alias="Antarctica/Palmer"/>
             <type name="aqrot" description="Rothera Station, Adelaide Island" alias="Antarctica/Rothera"/>
             <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
@@ -130,6 +130,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="chzrh" description="Zurich, Switzerland" alias="Europe/Zurich"/>
             <type name="ciabj" description="Abidjan, Côte d'Ivoire" alias="Africa/Abidjan"/>
             <type name="ckrar" description="Rarotonga, Cook Islands" alias="Pacific/Rarotonga"/>
+            <type name="clcxq" description="Aysén Region, Chile" alias="America/Coyhaique" since="48"/>
             <type name="clipc" description="Easter Island, Chile" alias="Pacific/Easter Chile/EasterIsland"/>
             <type name="clpuq" description="Punta Arenas, Chile" alias="America/Punta_Arenas" since="31"/>
             <type name="clscl" description="Santiago, Chile" alias="America/Santiago Chile/Continental"/>
@@ -167,7 +168,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="est5edt" description="POSIX style time zone for US Eastern Time" deprecated="true" preferred="usnyc"/>
             <type name="etadd" description="Addis Ababa, Ethiopia" alias="Africa/Addis_Ababa"/>
             <type name="fihel" description="Helsinki, Finland" alias="Europe/Helsinki"/>
-            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn"/>
+            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn" region="AX"/>
             <type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/>
             <type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/>
             <type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/>
@@ -177,7 +178,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
             <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
             <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
-            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
+            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40" region="PS"/>
             <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
             <type name="gdgnd" description="Grenada" alias="America/Grenada"/>
             <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -193,8 +194,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
             <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
             <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
-            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
-            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy"/>
+            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot" region="MF"/>
+            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy" region="BL"/>
             <type name="gqssg" description="Malabo, Equatorial Guinea" alias="Africa/Malabo"/>
             <type name="grath" description="Athens, Greece" alias="Europe/Athens EET"/>
             <type name="gsgrv" description="South Georgia and the South Sandwich Islands" alias="Atlantic/South_Georgia"/>
@@ -202,7 +203,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gugum" description="Guam" alias="Pacific/Guam"/>
             <type name="gwoxb" description="Bissau, Guinea-Bissau" alias="Africa/Bissau"/>
             <type name="gygeo" description="Guyana" alias="America/Guyana"/>
-            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21"/>
+            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21" region="PS"/>
             <type name="hkhkg" description="Hong Kong SAR China" alias="Asia/Hong_Kong Hongkong"/>
             <type name="hntgu" description="Tegucigalpa, Honduras" alias="America/Tegucigalpa"/>
             <type name="hrzag" description="Zagreb, Croatia" alias="Europe/Zagreb"/>
@@ -220,7 +221,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
             <type name="isrey" description="Reykjavik, Iceland" alias="Atlantic/Reykjavik Iceland"/>
             <type name="itrom" description="Rome, Italy" alias="Europe/Rome"/>
-            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel"/>
+            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel" region="IL"/>
             <type name="jesth" description="Jersey" alias="Europe/Jersey"/>
             <type name="jmkin" description="Jamaica" alias="America/Jamaica Jamaica"/>
             <type name="joamm" description="Amman, Jordan" alias="Asia/Amman"/>
@@ -305,7 +306,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu" iana="Asia/Kathmandu"/>
             <type name="nrinu" description="Nauru" alias="Pacific/Nauru"/>
             <type name="nuiue" description="Niue" alias="Pacific/Niue"/>
-            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/>
+            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland NZ"/>
             <type name="nzcht" description="Chatham Islands, New Zealand" alias="Pacific/Chatham NZ-CHAT"/>
             <type name="ommct" description="Muscat, Oman" alias="Asia/Muscat"/>
             <type name="papty" description="Panama" alias="America/Panama EST"/>

make/data/cldr/common/dtd/cldrTest.dtd

@@ -1,13 +1,12 @@
 <!--
-Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
+<!-- This is only referenced by the deprecated GenerateLikelySubtagTests.java - see CLDR-17535 -->
+
 <!ELEMENT cldrTest ((number | date | zoneFields | collation | likelySubtags)*) >
 <!ATTLIST cldrTest version CDATA #REQUIRED>
 <!ATTLIST cldrTest base CDATA #REQUIRED>
@@ -48,4 +47,3 @@ Except as contained in this notice, the name of a copyright holder shall not be
 <!-- likelySubtags result attributes -->
 <!ATTLIST result add NMTOKEN #IMPLIED>
 <!ATTLIST result remove NMTOKEN #IMPLIED>
-

make/data/cldr/common/dtd/ldml.dtd

@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "47" >
+<!ATTLIST version cldrVersion CDATA #FIXED "48" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -64,6 +64,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:validity/locale-for-names-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/long, secondary, short, variant, menu, official-->
+<!ATTLIST language menu NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/core, extension-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -277,6 +279,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:bcp47/anykey-->
 <!ATTLIST type type NMTOKEN #REQUIRED >
     <!--@MATCH:bcp47/anyvalue-->
+<!ATTLIST type scope NMTOKEN #IMPLIED >
+    <!--@MATCH:literal/core-->
 <!ATTLIST type alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/short, variant-->
 <!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -456,7 +460,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@DEPRECATED-->
 
 <!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
-<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
+<!ATTLIST exemplarCharacters type (standard | auxiliary | numbers | numbers-auxiliary | punctuation | punctuation-auxiliary | punctuation-person | index | currencySymbol) #IMPLIED >
     <!--@DEPRECATED:currencySymbol-->
 <!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -1528,7 +1532,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateTimeFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard, atTime-->
+    <!--@MATCH:literal/standard, atTime, relative-->
 <!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -1718,7 +1722,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
+<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, gmtUnknownFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
 <!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1765,6 +1769,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
+<!ELEMENT gmtUnknownFormat ( #PCDATA ) >
+<!ATTLIST gmtUnknownFormat alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST gmtUnknownFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+<!ATTLIST gmtUnknownFormat references CDATA #IMPLIED >
+    <!--@METADATA-->
+
 <!ELEMENT regionFormat ( #PCDATA ) >
 <!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
 <!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
@@ -1963,7 +1976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!-- ######################################################### -->
 
-<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
+<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, rationalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
 <!ATTLIST numbers alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -2267,6 +2280,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
+<!ELEMENT rationalFormats ( alias | ( rationalPattern*, integerAndRationalPattern*, rationalUsage*, special* ) ) >
+<!ATTLIST rationalFormats numberSystem CDATA #REQUIRED >
+    <!--@MATCH:bcp47/nu-->
+
+<!ELEMENT rationalPattern ( #PCDATA ) >
+<!ATTLIST rationalPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST rationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT integerAndRationalPattern ( #PCDATA ) >
+<!ATTLIST integerAndRationalPattern alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/superSub-->
+<!ATTLIST integerAndRationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT rationalUsage ( #PCDATA ) >
+<!ATTLIST rationalUsage alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST rationalUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+
 <!ELEMENT scientificFormats ( alias | ( default*, scientificFormatLength*, special* ) ) >
 <!ATTLIST scientificFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -3100,12 +3135,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT rbnf ( alias | ( rulesetGrouping*, special* ) ) >
 
-<!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
+<!ELEMENT rulesetGrouping ( alias | ( rbnfRules?, ruleset*, special* ) ) >
 <!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
     <!--@MATCH:literal/NumberingSystemRules, OrdinalRules, SpelloutRules-->
 <!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 
+<!ELEMENT rbnfRules ( #PCDATA ) >
+    <!--@CDATA-->
+<!ATTLIST rbnfRules alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST rbnfRules draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
+    <!--@METADATA-->
+    <!--@DEPRECATED:true, false-->
+
 <!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
     <!--@ORDERED-->
 <!ATTLIST ruleset type NMTOKEN #REQUIRED >

make/data/cldr/common/dtd/ldml.xsd

@@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="47" name="cldrVersion">
+      <xs:attribute default="48" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="47"/>
+            <xs:enumeration value="48"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -182,6 +182,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
     <xs:complexType mixed="true">
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="menu" type="xs:NMTOKENS"/>
       <xs:attribute name="draft">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -203,6 +204,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
   <xs:element name="script">
     <xs:complexType mixed="true">
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
@@ -696,6 +698,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
     <xs:complexType mixed="true">
       <xs:attribute name="key" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="scope" type="xs:NMTOKEN"/>
       <xs:attribute name="alt" type="xs:NMTOKENS"/>
       <xs:attribute name="draft">
         <xs:simpleType>
@@ -718,6 +721,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
   <xs:element name="transformNames">
     <xs:complexType>
       <xs:choice>
@@ -1196,12 +1200,15 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="type">
         <xs:simpleType>
           <xs:restriction base="xs:token">
-            <xs:enumeration value="auxiliary"/>
             <xs:enumeration value="standard"/>
-            <xs:enumeration value="punctuation"/>
-            <xs:enumeration value="currencySymbol"/>
-            <xs:enumeration value="index"/>
+            <xs:enumeration value="auxiliary"/>
             <xs:enumeration value="numbers"/>
+            <xs:enumeration value="numbers-auxiliary"/>
+            <xs:enumeration value="punctuation"/>
+            <xs:enumeration value="punctuation-auxiliary"/>
+            <xs:enumeration value="punctuation-person"/>
+            <xs:enumeration value="index"/>
+            <xs:enumeration value="currencySymbol"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -4512,6 +4519,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="hoursFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtZeroFormat"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtUnknownFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="regionFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="fallbackFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="fallbackRegionFormat"/>
@@ -4634,6 +4642,28 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="gmtUnknownFormat">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="references"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
   <xs:element name="regionFormat">
     <xs:complexType mixed="true">
       <xs:attribute name="type">
@@ -5099,6 +5129,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="minimumGroupingDigits"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="symbols"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="decimalFormats"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="scientificFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="percentFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="currencyFormats"/>
@@ -5830,6 +5861,72 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="rationalFormats">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref="alias"/>
+        <xs:sequence>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalPattern"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="integerAndRationalPattern"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalUsage"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
+        </xs:sequence>
+      </xs:choice>
+      <xs:attribute name="numberSystem" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="rationalPattern">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  <xs:element name="integerAndRationalPattern">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  <xs:element name="rationalUsage">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
   <xs:element name="scientificFormats">
     <xs:complexType>
       <xs:choice>
@@ -8049,6 +8146,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:choice>
         <xs:element ref="alias"/>
         <xs:sequence>
+          <xs:element minOccurs="0" ref="rbnfRules"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="ruleset"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
         </xs:sequence>
@@ -8070,6 +8168,27 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   </xs:element>
   
   
+  <xs:element name="rbnfRules">
+    <xs:complexType mixed="true">
+      <xs:attribute name="alt" type="xs:NMTOKENS"/>
+      <xs:attribute name="draft">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="approved"/>
+            <xs:enumeration value="contributed"/>
+            <xs:enumeration value="provisional"/>
+            <xs:enumeration value="unconfirmed"/>
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
   <xs:element name="ruleset">
     <xs:complexType>
       <xs:choice>

make/data/cldr/common/dtd/ldmlBCP47.dtd

@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "47" >
+<!ATTLIST version cldrVersion CDATA #FIXED "48" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
@@ -72,6 +72,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST type iana CDATA #IMPLIED >
     <!--@MATCH:regex/^[A-Za-z]+(/[A-Za-z_\-]+)+$-->
     <!--@VALUE-->
+<!ATTLIST type region CDATA #IMPLIED >
+    <!--@MATCH:regex/^[A-Z]{2}$-->
+    <!--@VALUE-->
 
 <!ELEMENT attribute EMPTY >
 <!ATTLIST attribute name NMTOKEN #REQUIRED >

make/data/cldr/common/dtd/ldmlBCP47.xsd

@@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="47" name="cldrVersion">
+      <xs:attribute default="48" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="47"/>
+            <xs:enumeration value="48"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -120,6 +120,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="alias"/>
       <xs:attribute name="since"/>
       <xs:attribute name="iana"/>
+      <xs:attribute name="region"/>
     </xs:complexType>
   </xs:element>
   
@@ -134,6 +135,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
+  
   <xs:element name="attribute">
     <xs:complexType>
       <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>

make/data/cldr/common/dtd/ldmlOpenOffice.dtd

@@ -1,11 +1,8 @@
 <!--
-Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
 <!--  OpenOffice.org Specific elements                         -->
@@ -60,7 +57,7 @@ openOffice:quarter4Abbreviation?)>
 <!ELEMENT openOffice:belowWord (#PCDATA)>
 
 <!-- START_DEPRECATED -->
-<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>   
+<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter2Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter3Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter4Abbreviation (#PCDATA)>

make/data/cldr/common/dtd/ldmlSupplemental.dtd

@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "47" >
+<!ATTLIST version cldrVersion CDATA #FIXED "48" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "16.0.0" >
@@ -147,6 +147,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST language territories NMTOKENS #IMPLIED >
     <!--@MATCH:set/validity/region-->
     <!--@VALUE-->
+    <!--@DEPRECATED-->
 <!ATTLIST language variants NMTOKENS #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -274,7 +275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:time/yyyy-MM-dd-->
     <!--@VALUE-->
 <!ATTLIST era code NMTOKEN #IMPLIED >
-    <!--@MATCH:regex/[a-z0-9]{3,8}(\-[a-z0-9]{3,8})*-->
+    <!--@MATCH:regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
     <!--@VALUE-->
 <!ATTLIST era aliases NMTOKENS #IMPLIED >
     <!--@MATCH:set/regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
@@ -770,7 +771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST unitAlias type NMTOKEN #REQUIRED >
     <!--@MATCH:validity/short-unit/deprecated-->
 <!ATTLIST unitAlias replacement NMTOKEN #REQUIRED >
-    <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
+    <!--@MATCH:regex/[A-Za-z0-9][-A-Za-z0-9]*-->
     <!--@VALUE-->
 <!ATTLIST unitAlias reason (deprecated) #IMPLIED >
     <!--@VALUE-->
@@ -996,6 +997,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
     <!--@MATCH:metazone-->
     <!--@VALUE-->
+<!ATTLIST usesMetazone stdOffset CDATA #IMPLIED >
+    <!--@MATCH:regex/[+-][0-9]{2}(:[0-9]{2})?-->
+    <!--@VALUE-->
+<!ATTLIST usesMetazone dstOffset CDATA #IMPLIED >
+    <!--@MATCH:regex/[+-][0-9]{2}(:[0-9]{2})?-->
+    <!--@VALUE-->
 
 <!ELEMENT plurals ( pluralRules*, pluralRanges* ) >
 <!ATTLIST plurals type (ordinal | cardinal) #IMPLIED >
@@ -1090,7 +1097,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST numberingSystem digits CDATA #IMPLIED >
-    <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U00010D40-\U00010D49\U000116D0-\U000116E3\U00011BF0-\U00011BF9\U00016130-\U00016139\U00016D70-\U00016D79\U0001CCF0-\U0001CCF9\U0001E5F1-\U0001E5FA]]-->
+    <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U00011DE0-\U00011DE9]]-->
     <!--@VALUE-->
 <!ATTLIST numberingSystem rules CDATA #IMPLIED >
     <!--@MATCH:any-->

make/data/cldr/common/dtd/ldmlSupplemental.xsd

@@ -65,10 +65,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="47" name="cldrVersion">
+      <xs:attribute default="48" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="47"/>
+            <xs:enumeration value="48"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -374,6 +374,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  
   <xs:element name="scriptData">
     <xs:complexType>
       <xs:sequence>
@@ -2183,12 +2184,18 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="from"/>
       <xs:attribute name="to"/>
       <xs:attribute name="mzone" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="stdOffset"/>
+      <xs:attribute name="dstOffset"/>
     </xs:complexType>
   </xs:element>
   
   
   
   
+  
+  
+  
+  
   <xs:element name="plurals">
     <xs:complexType>
       <xs:sequence>

make/data/cldr/common/main/ab.xml

@@ -2072,7 +2072,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity draft="unconfirmed">Пномпен</exemplarCity>
 			</zone>
-			<zone type="Pacific/Kanton">
+			<zone type="Pacific/Enderbury">
 				<exemplarCity draft="unconfirmed">Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2746,9 +2746,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Мраҭашәаратәи Африка</generic>
-					<standard draft="unconfirmed">Мраҭашәаратәи Африка, астандартә аамҭа</standard>
-					<daylight draft="unconfirmed">Мраҭашәаратәи Африка, аԥхынтәи аамҭа</daylight>
+					<standard draft="unconfirmed">Мраҭашәаратәи Африка</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3136,6 +3134,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="unconfirmed">Гаиана</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Ҳаваи-алеуттәи астандартә аамҭа</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Ҳаваи-алеуттәи аамҭа</generic>
@@ -3686,6 +3689,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>

make/data/cldr/common/main/am.xml

@@ -215,7 +215,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hax">ደቡባዊ ሃይዳ</language>
 			<language type="he">ዕብራይስጥ</language>
 			<language type="hi">ሕንድኛ</language>
-			<language type="hi_Latn">ሕንድኛ (ላቲን)</language>
 			<language type="hil">ሂሊጋይኖን</language>
 			<language type="hmn">ህሞንግ</language>
 			<language type="hr">ክሮሽያንኛ</language>
@@ -283,6 +282,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ባፊያ</language>
 			<language type="ksh">ኮሎኝኛ</language>
 			<language type="ku">ኩርድሽ</language>
+			<language type="ku" menu="core">ኩርድሽ</language>
+			<language type="ku" menu="extension">ኩርድሽ</language>
 			<language type="kum">ኩማይክ</language>
 			<language type="kv">ኮሚ</language>
 			<language type="kw">ኮርኒሽ</language>
@@ -711,6 +712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ቻይና</territory>
 			<territory type="CO">ኮሎምቢያ</territory>
 			<territory type="CP">ክሊፐርቶን ደሴት</territory>
+			<territory type="CQ">ሳርክ</territory>
 			<territory type="CR">ኮስታሪካ</territory>
 			<territory type="CU">ኩባ</territory>
 			<territory type="CV">ኬፕቨርዴ</territory>
@@ -952,33 +954,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">የቁጥር ድርደራ</key>
 			<key type="colStrength">የድርደራ አቅም</key>
 			<key type="currency">ምንዛሪ</key>
+			<key type="em">ስሜት ገላጭ ምስል አቀራረብ</key>
 			<key type="hc">የሰዓት ዑደት (12 ወይም 24)</key>
 			<key type="lb">መስመር መስበሪያ ቅጥ</key>
+			<key type="lw">የመስመር መሰባበር በቃላት ውስጥ</key>
 			<key type="ms">የመለኪያ ስርዓት</key>
 			<key type="numbers">ቁጥሮች</key>
+			<key type="ss">ከአህጽሮተ ቃል በኋላ የዐረፍተ ነገር መቋረጥ</key>
 			<key type="timezone">የሰዓት ሰቅ</key>
 			<key type="va">የአካባቢ አይነት</key>
 			<key type="x">ለግል ጥቅም</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">የቡዲስት ቀን አቆጣጠር</type>
+			<type key="calendar" type="buddhist" scope="core">ቡዲስት</type>
 			<type key="calendar" type="chinese">የቻይና የቀን አቆጣጠር</type>
+			<type key="calendar" type="chinese" scope="core">ቻይንኛ</type>
 			<type key="calendar" type="coptic">የኮፕቲክ የቀን አቆጣጠር</type>
+			<type key="calendar" type="coptic" scope="core">ኮፕቲክ</type>
 			<type key="calendar" type="dangi">የዳንጊ የቀን አቆጣጠር</type>
+			<type key="calendar" type="dangi" scope="core">ዳንጊ</type>
 			<type key="calendar" type="ethiopic">የኢትዮጵያ የቀን አቆጣጠር</type>
+			<type key="calendar" type="ethiopic" scope="core">ኢትዮፒክ</type>
 			<type key="calendar" type="ethiopic-amete-alem">የኢትዮፒክ አመተ አለም የቀን አቆጣጠር</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ኢትዮፒክ ዓመተ ዓለም</type>
 			<type key="calendar" type="gregorian">የግሪጎሪያን የቀን አቆጣጠር</type>
+			<type key="calendar" type="gregorian" scope="core">ግሪጎሪያን</type>
 			<type key="calendar" type="hebrew">የእብራዊያን የቀን አቆጣጠር</type>
+			<type key="calendar" type="hebrew" scope="core">ሂብሩ</type>
 			<type key="calendar" type="indian">የህንድ ብሔራዊ የቀን አቆጣጠር</type>
 			<type key="calendar" type="islamic">የሂጅራ የቀን አቆጣጠር</type>
+			<type key="calendar" type="islamic" scope="core">ሂጅራ</type>
 			<type key="calendar" type="islamic-civil">የሂጅራ የቀን አቆጣጠር (ታቡላር፣ ሲቪል አፖች)</type>
+			<type key="calendar" type="islamic-civil" scope="core">ሂጅራ (ታቡላር፣ የሲቪል ዘመን)</type>
 			<type key="calendar" type="islamic-umalqura">የሂጅራ የቀን አቆጣጠር (ኡም አል-ቁራ)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">ሂጅራ (ኡሙ አል-ቁራ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 የቀን አቆጣጠር</type>
 			<type key="calendar" type="japanese">የጃፓን የቀን አቆጣጠር</type>
+			<type key="calendar" type="japanese" scope="core">ጃፓንኛ</type>
 			<type key="calendar" type="persian">የፐርሽያ የቀን አቆጣጠር</type>
+			<type key="calendar" type="persian" scope="core">ፐርሽያን</type>
 			<type key="calendar" type="roc">የሚንጉ የቀን አቆጣጠር</type>
+			<type key="calendar" type="roc" scope="core">ሚንጉ</type>
 			<type key="cf" type="account">የሂሳብ ምንዛሪ ቅርጸት</type>
+			<type key="cf" type="account" scope="core">የሂሳብ አያያዝ</type>
 			<type key="cf" type="standard">መደበኛ የምንዛሪ ቅርጸት</type>
+			<type key="cf" type="standard" scope="core">መደበኛ</type>
 			<type key="colAlternate" type="non-ignorable">ምልክቶችን ደርድር</type>
 			<type key="colAlternate" type="shifted">ችላ ባይ ምልክቶችን ደርድር</type>
 			<type key="colBackwards" type="no">የፊደል ጭረቶችን እንደመደበኛ ደርድር</type>
@@ -988,16 +1009,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">አቢይ ሆሄ መጀመሪያ ደርድር</type>
 			<type key="colCaseLevel" type="no">ያለመልከፊደል ትብ ደርድር</type>
 			<type key="colCaseLevel" type="yes">በመልከፊደል ትብ ደርድር</type>
-			<type key="collation" type="big5han">የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5</type>
 			<type key="collation" type="dictionary">የመዝገበ ቃላት የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="ducet">የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል</type>
-			<type key="collation" type="gb2312han">የቀለለ የቻይንኛ የድርደራ ቅደም ተከተል - GB2312</type>
+			<type key="collation" type="ducet" scope="core">ነባሪ ዩኒኮድ</type>
 			<type key="collation" type="phonebook">የስልክ ደብተር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="phonetic">የፎነቲክ ድርደራ ቅደም ተከተል</type>
 			<type key="collation" type="pinyin">ፒንይን የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="search">ለጠቅላላ ጉዳይ ፍለጋ</type>
+			<type key="collation" type="search" scope="core">ፍለጋ</type>
 			<type key="collation" type="searchjl">በሃንጉል የመጀመሪያ ተነባቢ ፈልግ</type>
 			<type key="collation" type="standard">መደበኛ የድርድር ቅደም ተከተል</type>
+			<type key="collation" type="standard" scope="core">መደበኛ</type>
 			<type key="collation" type="stroke">የበትር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="traditional">ባህላዊ የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="unihan">የመሰረታዊ በትር ድርድር ቅደም ተከተል</type>
@@ -1013,18 +1035,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ሙሉ ወርድ</type>
 			<type key="d0" type="hwidth">ግማሽ ወርድ</type>
 			<type key="d0" type="npinyin">አሃዛዊ</type>
+			<type key="em" type="default" scope="core">ነባሪ</type>
+			<type key="em" type="emoji" scope="core">ስሜት ገላጭ ምስል</type>
+			<type key="em" type="text" scope="core">ጽሑፍ</type>
 			<type key="hc" type="h11">የ12 ሰዓት ስርዓት (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">የ12 ሰዓት ስርዓት (1–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">የ24 ሰዓት ስርዓት (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">የ24 ሰዓት ስርዓት (1–24)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ላላ ያለ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="loose" scope="core">ልቅ</type>
 			<type key="lb" type="normal">መደበኛ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="normal" scope="core">መደበኛ</type>
 			<type key="lb" type="strict">ጠበቅ ያለ መስመር መስበሪያ ቅጥ</type>
+			<type key="lb" type="strict" scope="core">ጥብቅ</type>
+			<type key="lw" type="breakall" scope="core">ሁሉንም ሰብረው</type>
+			<type key="lw" type="keepall" scope="core">ሁሉንም አቆይ</type>
+			<type key="lw" type="normal" scope="core">መደበኛ</type>
+			<type key="lw" type="phrase" scope="core">በዓረፍተ ነገሮች ውስጥ ያስቀምጡ</type>
 			<type key="m0" type="bgn">ዩኤስ ቢጂኤን ትራንስሊትሬሽን</type>
 			<type key="m0" type="ungegn">ዩኤን ጂኢጂኤን ትራንስሊትሬሽን</type>
 			<type key="ms" type="metric">ሜትሪክ ስርዓት</type>
+			<type key="ms" type="metric" scope="core">መለኪያ</type>
 			<type key="ms" type="uksystem">ኢምፔሪያል የመለኪያ ስርዓት</type>
+			<type key="ms" type="uksystem" scope="core">ዩኬ</type>
 			<type key="ms" type="ussystem">የአሜሪካ መለኪያ ስርዓት</type>
+			<type key="ms" type="ussystem" scope="core">ዩኤስ</type>
 			<type key="numbers" type="arab">የአረቢክ-ኢንዲክ አሃዞች</type>
 			<type key="numbers" type="arabext">የተራዘሙ የአረቢክ-ኢንዲክ አሃዞች</type>
 			<type key="numbers" type="armn">የአርመንኛ ቁጥሮች</type>
@@ -1069,6 +1108,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">የቲቤት አሃዞች</type>
 			<type key="numbers" type="traditional">ተለምዷዊ ቁጥሮች</type>
 			<type key="numbers" type="vaii">የቫይ አሃዞች</type>
+			<type key="ss" type="none" scope="core">ጠፍቷል</type>
+			<type key="ss" type="standard" scope="core">በርቷል</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ሜትሪክ</measurementSystemName>
@@ -1098,13 +1139,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="coptic">
 				<eras>
 					<eraAbbr>
-						<era type="0" draft="unconfirmed">ዓ/ዓ</era>
 						<era type="1" draft="unconfirmed">ዓ/ም</era>
 					</eraAbbr>
 				</eras>
@@ -1133,7 +1184,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
+					<intervalFormats>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="generic">
@@ -1164,21 +1226,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} በ {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
@@ -1415,10 +1489,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">ጠ</dayPeriod>
 							<dayPeriod type="pm">ከ</dayPeriod>
-							<dayPeriod type="morning1">ጥዋት</dayPeriod>
-							<dayPeriod type="afternoon1">ከሰዓት</dayPeriod>
-							<dayPeriod type="evening1">ማታ</dayPeriod>
-							<dayPeriod type="night1">ሌሊት</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1426,7 +1496,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<eraNames>
 						<era type="0">ዓመተ ዓለም</era>
 						<era type="1">ዓመተ ምሕረት</era>
-						<era type="1" alt="variant">ዓ/ም</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ዓ/ዓ</era>
@@ -1506,13 +1575,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
+						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
+						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
+						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E MMM d y G</dateFormatItem>
@@ -1520,6 +1593,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
+						<dateFormatItem id="hv">a h v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E፣ d/M</dateFormatItem>
 						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
@@ -1538,6 +1612,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG M/y – GGGGG M/y</greatestDifference>
 							<greatestDifference id="M">GGGGG M/y – M/y</greatestDifference>
@@ -1681,14 +1758,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">ይህ ሩብ</relative>
 				<relative type="1">የሚቀጥለው ሩብ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">+{0} ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">+{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ሩብ በፊት</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ሩብ በፊት</relativeTimePattern>
 				</relativeTime>
 			</field>
+			<field type="quarter-short">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="quarter-narrow">
+				<relativeTime type="future">
+					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
+				</relativeTime>
+			</field>
 			<field type="month">
 				<displayName>ወር</displayName>
 				<relative type="-1">ያለፈው ወር</relative>
@@ -1990,6 +2079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HHmm;-HHmm</hourFormat>
 			<gmtFormat>ጂ ኤም ቲ{0}</gmtFormat>
 			<gmtZeroFormat>ጂ ኤም ቲ</gmtZeroFormat>
+			<gmtUnknownFormat>ጂ ኤም ቲ+</gmtUnknownFormat>
 			<regionFormat>{0} ሰዓት</regionFormat>
 			<regionFormat type="daylight">{0} የቀን ብርሃን ሰዓት</regionFormat>
 			<regionFormat type="standard">{0} መደበኛ ሰዓት</regionFormat>
@@ -2611,9 +2701,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ፍኖም ፔንህ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>ኢንደርበሪ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>ካንቶን</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3283,9 +3370,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>የምዕራብ አፍሪካ ሰዓት</generic>
-					<standard>የምዕራብ አፍሪካ መደበኛ ሰዓት</standard>
-					<daylight>የምዕራብ አፍሪካ ክረምት ሰዓት</daylight>
+					<standard>የምዕራብ አፍሪካ ሰዓት</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3642,6 +3727,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>የጉያና ሰዓት</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>የሃዋይ አሌኡት መደበኛ ሰዓት አቆጣጠር</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>የሃዋይ አሌኡት ሰዓት አቆጣጠር</generic>
@@ -4225,7 +4315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
-					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4775,6 +4864,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>የምዕራብ ካሪብያን ዶላር</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>የካሪቢያን ጊልደር</displayName>
+				<displayName count="one">የካሪቢያን ጊልደር</displayName>
+				<displayName count="other">የካሪቢያን ጊልደር</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>የምዕራብ አፍሪካ ሴፋ ፍራንክ</displayName>
 			</currency>
@@ -4799,6 +4893,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>የዚምቧቡዌ ዶላር</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>የዚምባብዌ ወርቅ</displayName>
+				<displayName count="one">የዚምባብዌ ወርቅ</displayName>
+				<displayName count="other">የዚምባብዌ ወርቅ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4822,9 +4921,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p-3">
 				<unitPrefixPattern>ሚሊ{0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
-			</compoundUnit>
 			<compoundUnit type="10p-9">
 				<unitPrefixPattern>ናኖ{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -4861,18 +4957,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p18">
 				<unitPrefixPattern>ኤክሳ {0}</unitPrefixPattern>
 			</compoundUnit>
-			<compoundUnit type="10p21">
-				<unitPrefixPattern>ዜታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p24">
-				<unitPrefixPattern>ዮታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p27">
-				<unitPrefixPattern>ሮና {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p8">
-				<unitPrefixPattern>ዮቢ {0}</unitPrefixPattern>
-			</compoundUnit>
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0} በ{1}</compoundUnitPattern>
 			</compoundUnit>
@@ -4891,14 +4975,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ጂ-ኃይል</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>ኡደት</displayName>
 				<unitPattern count="one">{0} ኡደት</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኡደት</unitPattern>
 				<unitPattern count="other">{0} ኡደት</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ኡደቶች</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName>ራዲ</displayName>
 				<unitPattern count="one">{0} ራዲ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ራዲያን</unitPattern>
 				<unitPattern count="other">{0} ራዲ</unitPattern>
@@ -4922,11 +5004,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ካሬ ሜትር</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ካሬ ሜትር</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<displayName>ስኴር ያርድ</displayName>
-				<unitPattern count="one">{0} ስኴር ያርድ</unitPattern>
-				<unitPattern count="other">{0} ስኴር ያርድ</unitPattern>
-			</unit>
 			<unit type="area-dunam">
 				<displayName>ጋሻ</displayName>
 			</unit>
@@ -4940,7 +5017,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ንጥሎች</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ንጥሎች</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>ክፍል</displayName>
+				<unitPattern count="one">{0} ክፍል</unitPattern>
+				<unitPattern count="other">{0} ክፍል</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ክፍል በየሚሊዮን</unitPattern>
 				<unitPattern count="other">{0} ppm</unitPattern>
@@ -4964,6 +5046,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mol</unitPattern>
 				<unitPattern count="other" case="accusative">{0} moles</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ሊትሮች በ100 ኪሎሜትሮች</displayName>
 				<unitPattern count="one">{0} ሊትር በ100 ኪሎሜትሮች</unitPattern>
@@ -5031,7 +5118,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ማይክሮሰከንድ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
-				<displayName>አምፒር</displayName>
 				<unitPattern count="one">{0} አምፒር</unitPattern>
 				<unitPattern count="one" case="accusative">{0} አምፒር</unitPattern>
 				<unitPattern count="other">{0} አምፒር</unitPattern>
@@ -5044,33 +5130,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ohms</unitPattern>
 			</unit>
 			<unit type="electric-volt">
-				<displayName>ቮልት</displayName>
 				<unitPattern count="one">{0} ቮልት</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ቮልት</unitPattern>
 				<unitPattern count="other">{0} ቮልት</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ቮልቶች</unitPattern>
 			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ኪሎ ካሎሪ</displayName>
-				<unitPattern count="one">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="other">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኪሎ ካሎሪ</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>ኪጁ</displayName>
-				<unitPattern count="one">{0} ኪጁ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኪጁ</unitPattern>
-				<unitPattern count="other">{0} ኪጁ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኪጁ</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>ጁልስ</displayName>
-				<unitPattern count="one">{0} ጁልስ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ጁልስ</unitPattern>
-				<unitPattern count="other">{0} ጁልስ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ጁልስ</unitPattern>
-			</unit>
 			<unit type="force-newton">
 				<unitPattern count="one">{0} ኒ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኒውተን</unitPattern>
@@ -5084,34 +5148,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ኪሎዋት-ሰዓታት በየ 100 ኪሎሜትሮች</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ኪሎዋት-ሰዓታት በየ 100 ኪሎሜትሮች</unitPattern>
 			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName>ጊጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ጊጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ሜጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሜጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>ኪሎኸርዝ</displayName>
-				<unitPattern count="one">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኪሎኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ኸርዝ</displayName>
-				<unitPattern count="one">{0} ኸርዝ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኸርዝ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ኸርዝ</unitPattern>
-			</unit>
 			<unit type="graphics-em">
 				<displayName>ታይፖግራፊክ em</displayName>
 			</unit>
@@ -5202,15 +5238,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ግራም</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ግራም</unitPattern>
 			</unit>
-			<unit type="mass-milligram">
-				<displayName>ሚግ</displayName>
-				<unitPattern count="one">{0} ሚግ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሚግ</unitPattern>
-				<unitPattern count="other">{0} ሚግ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሚግ</unitPattern>
-			</unit>
 			<unit type="mass-microgram">
-				<displayName>ማግ</displayName>
 				<unitPattern count="one">{0} ማግ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ማይክሮ ግራም</unitPattern>
 				<unitPattern count="other">{0} ማግ</unitPattern>
@@ -5223,11 +5251,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} CD</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ካራቶች</unitPattern>
 			</unit>
-			<unit type="mass-dalton">
-				<displayName>ዳልተንስ</displayName>
-				<unitPattern count="one">{0} ዳልተንስ</unitPattern>
-				<unitPattern count="other">{0} ዳልተንስ</unitPattern>
-			</unit>
 			<unit type="mass-earth-mass">
 				<unitPattern count="one">{0} ኤርዝማስስ</unitPattern>
 				<unitPattern count="other">{0} ኤርዝማስስ</unitPattern>
@@ -5236,19 +5259,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሶላር ማስስ</unitPattern>
 				<unitPattern count="other">{0} ሶላር ማስስ</unitPattern>
 			</unit>
-			<unit type="power-gigawatt">
-				<displayName>ጊጋ ዋት</displayName>
-				<unitPattern count="one">{0} ጊዋ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ጊዋ</unitPattern>
-				<unitPattern count="other">{0} ጊዋ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ጊዋ</unitPattern>
-			</unit>
 			<unit type="power-megawatt">
 				<displayName>ሜጋ ዋት</displayName>
-				<unitPattern count="one">{0} ሜዋ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሜዋ</unitPattern>
-				<unitPattern count="other">{0} ሜዋ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሜዋ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} ኪሎዋት</unitPattern>
@@ -5264,10 +5276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>ሚሊ ዋት</displayName>
-				<unitPattern count="one">{0} ሚዋ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሚዋ</unitPattern>
-				<unitPattern count="other">{0} ሚዋ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሚዋ</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
@@ -5316,7 +5324,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ዲግሪ ፋራንሃይት</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
-				<displayName>ኬ</displayName>
 				<unitPattern count="one">{0} ኬ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኬልቪን</unitPattern>
 				<unitPattern count="other">{0} ኬ</unitPattern>
@@ -5332,24 +5339,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ኩቢክ ማይል</unitPattern>
 				<unitPattern count="other">{0} ኩቢክ ማይል</unitPattern>
 			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>ኪዩቢክ ያርድ</displayName>
-				<unitPattern count="one">{0} ኪዩቢክ ያርድ</unitPattern>
-				<unitPattern count="other">{0} ኪዩቢክ ያርድ</unitPattern>
-			</unit>
-			<unit type="volume-megaliter">
-				<displayName>ሜጋሊትር</displayName>
-				<unitPattern count="one">{0} ሜሊ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሜሊ</unitPattern>
-				<unitPattern count="other">{0} ሜሊ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሜሊ</unitPattern>
-			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ሄክቶሊትር</displayName>
-				<unitPattern count="one">{0} ሄሊ</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ሄሊ</unitPattern>
-				<unitPattern count="other">{0} ሄሊ</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ሄሊ</unitPattern>
 			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one">{0} ሊትር</unitPattern>
@@ -5378,46 +5369,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ሜትሪክ ፒንቶች</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName>ጋሎን</displayName>
 				<unitPattern count="one">{0}/ጋሎን</unitPattern>
 				<unitPattern count="other">{0}/ጋሎን</unitPattern>
-				<perUnitPattern>{0}/ጋሎን</perUnitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<displayName>ኳርትስ</displayName>
-				<unitPattern count="one">{0} ኳርትስ</unitPattern>
-				<unitPattern count="other">{0} ኳርትስ</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>ኩባያ</displayName>
-				<unitPattern count="one">{0} ኩባያ</unitPattern>
-				<unitPattern count="other">{0} ኩባያ</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>Imp. fluid ኦንስስ</displayName>
 				<unitPattern count="one">{0} Imp. fluid ኦንስስ</unitPattern>
 				<unitPattern count="other">{0} Imp. fluid ኦንስስ</unitPattern>
 			</unit>
-			<unit type="volume-tablespoon">
-				<displayName>የሻይ ማንኪያ</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያ</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያ</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>የሻይ ማንኪያዎች</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያዎች</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያዎች</unitPattern>
-			</unit>
 			<unit type="volume-barrel">
 				<unitPattern count="one">{0} በርሜል</unitPattern>
 				<unitPattern count="other">{0} በርሜሎች</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ብርሃን</displayName>
-				<unitPattern count="one">{0} ብርሃን</unitPattern>
-				<unitPattern count="one" case="accusative">{0} ብርሃን</unitPattern>
-				<unitPattern count="other">{0} ብርሃን</unitPattern>
-				<unitPattern count="other" case="accusative">{0} ብርሃን</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>ካታልስ</displayName>
+				<unitPattern count="one">{0} ካት</unitPattern>
+				<unitPattern count="other">{0} ካት</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄነሪስ</displayName>
+				<unitPattern count="one">{0} ሄ</unitPattern>
+				<unitPattern count="other">{0} ሄ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ [IT]</displayName>
+				<unitPattern count="one">{0} ካሎሪ [IT]</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ [IT]</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪሎግራም - ኃይል</displayName>
+				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
+				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴስላስ</displayName>
+				<unitPattern count="one">{0} ቴ</unitPattern>
+				<unitPattern count="other">{0} ቴ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበርስ</displayName>
+				<unitPattern count="one">{0} ዌበ</unitPattern>
+				<unitPattern count="other">{0} ዌበ</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>ለሊት</displayName>
@@ -5425,7 +5417,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="accusative">{0}/ለሊት</unitPattern>
 				<unitPattern count="other">{0}/ለሊት</unitPattern>
 				<unitPattern count="other" case="accusative">{0}/ለሊት</unitPattern>
-				<perUnitPattern>{0}/ለሊት</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>ዓቢይ አቅጣጫ</displayName>
@@ -5613,12 +5604,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ንጥል</unitPattern>
 				<unitPattern count="other">{0} ንጥል</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ክፍል</displayName>
+				<unitPattern count="one">{0} ክፍል</unitPattern>
+				<unitPattern count="other">{0} ክፍል</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>ፐርሰንት</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>በማይል</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊ/ኪሜ</displayName>
 				<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
@@ -6284,6 +6285,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} የፈሳሽ መለኪያ</unitPattern>
 				<unitPattern count="other">{0} የፈሳሽ መለኪያ</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<displayName>ካት</displayName>
+				<unitPattern count="one">{0} ካት</unitPattern>
+				<unitPattern count="other">{0} ካት</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>ሄ</displayName>
+				<unitPattern count="one">{0} ሄ</unitPattern>
+				<unitPattern count="other">{0} ሄ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ-IT</displayName>
+				<unitPattern count="one">{0} ካሎሪ-IT</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪግ-ኃይል</displayName>
+				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
+				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴ</displayName>
+				<unitPattern count="one">{0} ቴ</unitPattern>
+				<unitPattern count="other">{0} ቴ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበ</displayName>
+				<unitPattern count="one">{0} ዌበ</unitPattern>
+				<unitPattern count="other">{0} ዌበ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ብርሃን</displayName>
 				<unitPattern count="one">{0} ብርሃን</unitPattern>
@@ -6304,28 +6335,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<compoundUnit type="10p-6">
-				<unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p21">
-				<unitPrefixPattern>ዜታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p24">
-				<unitPrefixPattern>ዮታ {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="10p27">
-				<unitPrefixPattern>ሮና {0}</unitPrefixPattern>
-			</compoundUnit>
-			<compoundUnit type="1024p8">
-				<unitPrefixPattern>ዮቢ {0}</unitPrefixPattern>
-			</compoundUnit>
 			<unit type="angle-revolution">
 				<displayName>ኡደ</displayName>
 				<unitPattern count="one">{0} ኡደ</unitPattern>
 				<unitPattern count="other">{0}ኡደ</unitPattern>
 			</unit>
 			<unit type="angle-radian">
-				<displayName>ራዲ</displayName>
 				<unitPattern count="one">{0}ራዲ</unitPattern>
 				<unitPattern count="other">{0}ራዲ</unitPattern>
 			</unit>
@@ -6345,17 +6360,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ማይል²</unitPattern>
 				<unitPattern count="other">{0} ማይል²</unitPattern>
 			</unit>
-			<unit type="area-square-yard">
-				<unitPattern count="one">{0} ስኴር ያርድ</unitPattern>
-				<unitPattern count="other">{0} ስኴር ያርድ</unitPattern>
-			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0} ጫማ²</unitPattern>
 				<unitPattern count="other">{0} ጫማ²</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ክፍል</displayName>
+				<unitPattern count="one">{0} ክፍል</unitPattern>
+				<unitPattern count="other">{0} ክፍል</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>ግሉኮስ</displayName>
+				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
+				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}ሊበ100ኪሜ</unitPattern>
 				<unitPattern count="other">{0}ሊበ100ኪሜ</unitPattern>
@@ -6403,51 +6424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሰ</unitPattern>
 				<unitPattern count="other">{0} ሰ</unitPattern>
 			</unit>
-			<unit type="electric-ampere">
-				<displayName>አምፒር</displayName>
-				<unitPattern count="one">{0} አምፒር</unitPattern>
-				<unitPattern count="other">{0} አምፒር</unitPattern>
-			</unit>
-			<unit type="electric-volt">
-				<displayName>ቮልት</displayName>
-				<unitPattern count="one">{0} ቮልት</unitPattern>
-				<unitPattern count="other">{0} ቮልት</unitPattern>
-			</unit>
-			<unit type="energy-kilocalorie">
-				<displayName>ኪሎ ካሎሪ</displayName>
-				<unitPattern count="one">{0} ኪሎ ካሎሪ</unitPattern>
-				<unitPattern count="other">{0} ኪሎ ካሎሪ</unitPattern>
-			</unit>
-			<unit type="energy-kilojoule">
-				<displayName>ኪጁ</displayName>
-				<unitPattern count="one">{0} ኪጁ</unitPattern>
-				<unitPattern count="other">{0} ኪጁ</unitPattern>
-			</unit>
-			<unit type="energy-joule">
-				<displayName>ጁልስ</displayName>
-				<unitPattern count="one">{0} ጁልስ</unitPattern>
-				<unitPattern count="other">{0} ጁልስ</unitPattern>
-			</unit>
-			<unit type="frequency-gigahertz">
-				<displayName>ጊጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ጊጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ጊጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-megahertz">
-				<displayName>ሜጋኸርዝ</displayName>
-				<unitPattern count="one">{0} ሜጋኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ሜጋኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-kilohertz">
-				<displayName>ኪሎኸርዝ</displayName>
-				<unitPattern count="one">{0} ኪሎኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኪሎኸርዝ</unitPattern>
-			</unit>
-			<unit type="frequency-hertz">
-				<displayName>ኸርዝ</displayName>
-				<unitPattern count="one">{0} ኸርዝ</unitPattern>
-				<unitPattern count="other">{0} ኸርዝ</unitPattern>
-			</unit>
 			<unit type="graphics-megapixel">
 				<unitPattern count="one">{0} ሜፒ</unitPattern>
 				<unitPattern count="other">{0} ሜፒ</unitPattern>
@@ -6465,33 +6441,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሚሊግራም</unitPattern>
 				<unitPattern count="other">{0} ሚሊግራም</unitPattern>
 			</unit>
-			<unit type="mass-microgram">
-				<displayName>ማግ</displayName>
-				<unitPattern count="one">{0} ማግ</unitPattern>
-				<unitPattern count="other">{0} ማግ</unitPattern>
-			</unit>
 			<unit type="mass-carat">
 				<displayName>ካራት</displayName>
 			</unit>
-			<unit type="mass-dalton">
-				<displayName>ዳልተንስ</displayName>
-				<unitPattern count="one">{0} ዳልተንስ</unitPattern>
-				<unitPattern count="other">{0} ዳልተንስ</unitPattern>
-			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ጊዋ</displayName>
-				<unitPattern count="one">{0} ጊዋ</unitPattern>
-				<unitPattern count="other">{0} ጊዋ</unitPattern>
-			</unit>
-			<unit type="power-megawatt">
-				<displayName>ሜዋ</displayName>
-				<unitPattern count="one">{0} ሜዋ</unitPattern>
-				<unitPattern count="other">{0} ሜዋ</unitPattern>
-			</unit>
-			<unit type="power-milliwatt">
-				<displayName>ሚዋ</displayName>
-				<unitPattern count="one">{0} ሚዋ</unitPattern>
-				<unitPattern count="other">{0} ሚዋ</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} የፈረስ ኃይል</unitPattern>
@@ -6521,26 +6475,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>ኬ</displayName>
-				<unitPattern count="one">{0} ኬ</unitPattern>
-				<unitPattern count="other">{0} ኬ</unitPattern>
-			</unit>
-			<unit type="volume-cubic-yard">
-				<displayName>ኪዩቢክ ያርድ</displayName>
-				<unitPattern count="one">{0} ኪዩቢክ ያርድ</unitPattern>
-				<unitPattern count="other">{0} ኪዩቢክ ያርድ</unitPattern>
-			</unit>
 			<unit type="volume-megaliter">
-				<displayName>ሜጋሊትር</displayName>
 				<unitPattern count="one">{0} ሜጋሊትር</unitPattern>
 				<unitPattern count="other">{0} ሜጋሊትር</unitPattern>
 			</unit>
-			<unit type="volume-hectoliter">
-				<displayName>ሄሊ</displayName>
-				<unitPattern count="one">{0} ሄሊ</unitPattern>
-				<unitPattern count="other">{0} ሄሊ</unitPattern>
-			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0} ሚሊ</unitPattern>
 				<unitPattern count="other">{0} ሚሊ</unitPattern>
@@ -6550,30 +6488,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ኤጫ</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
-				<displayName>ጋሎን</displayName>
 				<unitPattern count="one">{0} ጋሎን</unitPattern>
 				<unitPattern count="other">{0} ጋሎን</unitPattern>
-				<perUnitPattern>{0}/ጋሎን</perUnitPattern>
-			</unit>
-			<unit type="volume-quart">
-				<displayName>ኳርትስ</displayName>
-				<unitPattern count="one">{0} ኳርትስ</unitPattern>
-				<unitPattern count="other">{0} ኳርትስ</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<displayName>ኩባያ</displayName>
-				<unitPattern count="one">{0} ኩባያ</unitPattern>
-				<unitPattern count="other">{0} ኩባያ</unitPattern>
-			</unit>
-			<unit type="volume-tablespoon">
-				<displayName>የሻይ ማንኪያ</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያ</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያ</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<displayName>የሻይ ማንኪያዎች</displayName>
-				<unitPattern count="one">{0} የሻይ ማንኪያዎች</unitPattern>
-				<unitPattern count="other">{0} የሻይ ማንኪያዎች</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<unitPattern count="one">{0} ክመ</unitPattern>
@@ -6583,16 +6499,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ፈመ</unitPattern>
 				<unitPattern count="other">{0} ፈመ</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>ብርሃን</displayName>
-				<unitPattern count="one">{0} ብርሃን</unitPattern>
-				<unitPattern count="other">{0} ብርሃን</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>ካት</displayName>
+				<unitPattern count="one">{0} ካት</unitPattern>
+				<unitPattern count="other">{0} ካት</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>ለሊቶች</displayName>
-				<unitPattern count="one">{0} ለሊት</unitPattern>
-				<unitPattern count="other">{0} ለሊት</unitPattern>
-				<perUnitPattern>{0}/ለሊት</perUnitPattern>
+			<unit type="electric-henry">
+				<displayName>ሄ</displayName>
+				<unitPattern count="one">{0} ሄ</unitPattern>
+				<unitPattern count="other">{0} ሄ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>ካሎሪ-IT</displayName>
+				<unitPattern count="one">{0} ካሎሪ-IT</unitPattern>
+				<unitPattern count="other">{0} ካሎሪ-IT</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>ኪግ-ኃይል</displayName>
+				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
+				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>ቴ</displayName>
+				<unitPattern count="one">{0} ቴ</unitPattern>
+				<unitPattern count="other">{0} ቴ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ዌበ</displayName>
+				<unitPattern count="one">{0} ዌበ</unitPattern>
+				<unitPattern count="other">{0} ዌበ</unitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -6609,22 +6544,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
 			<listPatternPart type="2">{0} ወይም {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="end">{0} እና {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="end">{0} እና {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-narrow">
-			<listPatternPart type="end">{0} እና {1}</listPatternPart>
-			<listPatternPart type="2">{0} እና {1}</listPatternPart>
-		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>

make/data/cldr/common/main/an.xml

@@ -1066,9 +1066,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>

make/data/cldr/common/main/ar_SA.xml

@@ -133,7 +133,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} بوصة مربعة</unitPattern>
 				<unitPattern count="other">{0} بوصة مربعة</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="zero" draft="contributed">{0} جزء في المليون</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} جزء في المليون</unitPattern>
 				<unitPattern count="two" draft="contributed">جزءان في المليون</unitPattern>
@@ -367,7 +367,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} قيراطًا</unitPattern>
 				<unitPattern count="other">{0} قيراط</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="zero" draft="contributed">{0} جزء/مليون</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} جزء/مليون</unitPattern>
 				<unitPattern count="two" draft="contributed">جزءان/مليون</unitPattern>

make/data/cldr/common/main/as.xml

@@ -42,8 +42,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="awa">অৱধী</language>
 			<language type="ay">আয়মাৰা</language>
 			<language type="az">আজেৰবাইজানী</language>
-			<language type="az" alt="short">আজেৰি</language>
 			<language type="ba">বাছখিৰ</language>
+			<language type="bal">বালুচী</language>
 			<language type="ban">বালিনীজ</language>
 			<language type="bas">বাছা</language>
 			<language type="be">বেলাৰুছীয়</language>
@@ -226,6 +226,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">বাফিয়া</language>
 			<language type="ksh">কোলোগনিয়ান</language>
 			<language type="ku">কুৰ্ডিচ</language>
+			<language type="ku" menu="core">কুৰ্ডিশ্ব</language>
+			<language type="ku" menu="extension">কুৰ্ডিশ্ব</language>
 			<language type="kum">কুমিক</language>
 			<language type="kv">কোমি</language>
 			<language type="kw">কোৰ্নিচ</language>
@@ -619,6 +621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">চীন</territory>
 			<territory type="CO">কলম্বিয়া</territory>
 			<territory type="CP">ক্লিপাৰটোন দ্বীপ</territory>
+			<territory type="CQ">চাৰ্ক</territory>
 			<territory type="CR">কোষ্টা ৰিকা</territory>
 			<territory type="CU">কিউবা</territory>
 			<territory type="CV">কেপ ভার্দে</territory>
@@ -852,49 +855,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">মুদ্ৰা সজ্জা</key>
 			<key type="collation">সজোৱা ক্ৰম</key>
 			<key type="currency">মুদ্ৰা</key>
+			<key type="em">ইম’জীৰ উপস্থাপনা</key>
 			<key type="hc">ঘণ্টীয়া চক্ৰ (১২ বনাম ২৪)</key>
 			<key type="lb">পংক্তি বিচ্ছেদ শৈলী</key>
+			<key type="lw">শব্দৰ মাজত শাৰীৰ বিভাজন</key>
 			<key type="ms">জোখ-মাখৰ প্ৰণালী</key>
 			<key type="numbers">সংখ্যা</key>
+			<key type="ss">ঃ</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">বৌদ্ধ কেলেণ্ডাৰ</type>
+			<type key="calendar" type="buddhist" scope="core">বৌদ্ধ</type>
 			<type key="calendar" type="chinese">চীনা কেলেণ্ডাৰ</type>
+			<type key="calendar" type="chinese" scope="core">চীনা</type>
 			<type key="calendar" type="coptic">ক’প্টিক কেলেণ্ডাৰ</type>
+			<type key="calendar" type="coptic" scope="core">ক’প্টিক</type>
 			<type key="calendar" type="dangi">দাংগি কেলেণ্ডাৰ</type>
+			<type key="calendar" type="dangi" scope="core">দাংগি</type>
 			<type key="calendar" type="ethiopic">ইথিঅ’পিক কেলেণ্ডাৰ</type>
+			<type key="calendar" type="ethiopic" scope="core">ইথিঅ’পিক</type>
 			<type key="calendar" type="ethiopic-amete-alem">ইথিঅ’পিক এমিটি এলেম কেলেণ্ডাৰ</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">ইথিঅ’পিক এমিটি এলেম</type>
 			<type key="calendar" type="gregorian">গ্ৰেগোৰিয়ান কেলেণ্ডাৰ</type>
+			<type key="calendar" type="gregorian" scope="core">গ্ৰেগোৰিয়ান</type>
 			<type key="calendar" type="hebrew">হিব্ৰু কেলেণ্ডাৰ</type>
+			<type key="calendar" type="hebrew" scope="core">হিব্ৰু</type>
 			<type key="calendar" type="indian">ভাৰতীয় ৰাষ্ট্ৰীয় পঞ্জিকা</type>
+			<type key="calendar" type="indian" scope="core">ভাৰতীয় ৰাষ্ট্ৰীয়</type>
 			<type key="calendar" type="islamic">হিজৰি কেলেণ্ডাৰ</type>
+			<type key="calendar" type="islamic" scope="core">হিজৰি</type>
 			<type key="calendar" type="islamic-civil">হিজৰি কেলেণ্ডাৰ (টেবুলাৰ, নাগৰিক যুগ)</type>
+			<type key="calendar" type="islamic-civil" scope="core">হিজৰি (টেবুলাৰ, নাগৰিক যুগ)</type>
 			<type key="calendar" type="islamic-umalqura">হিজৰি কেলেণ্ডাৰ (উম অল-কুৰা)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">হিজৰি (উম অল-কুৰা)</type>
 			<type key="calendar" type="iso8601">আই. এছ. অ’.-৮৬০১ কেলেণ্ডাৰ</type>
 			<type key="calendar" type="japanese">জাপানী কেলেণ্ডাৰ</type>
+			<type key="calendar" type="japanese" scope="core">জাপানী</type>
 			<type key="calendar" type="persian">ফাৰ্চী কেলেণ্ডাৰ</type>
+			<type key="calendar" type="persian" scope="core">ফাৰ্চী</type>
 			<type key="calendar" type="roc">চীনা প্ৰজাতন্ত্ৰৰ কেলেণ্ডাৰ</type>
+			<type key="calendar" type="roc" scope="core">চীনা প্ৰজাতন্ত্ৰ</type>
 			<type key="cf" type="account">গাণনিক মুদ্ৰা সজ্জা</type>
+			<type key="cf" type="account" scope="core">গাণনিক</type>
 			<type key="cf" type="standard">মান্য মুদ্ৰা সজ্জা</type>
-			<type key="collation" type="big5han" draft="contributed">পৰম্পৰাগত চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - Big5</type>
+			<type key="cf" type="standard" scope="core">মান্য</type>
 			<type key="collation" type="ducet">ডিফ’ল্ট ইউনিকোড সজোৱা ক্ৰম</type>
-			<type key="collation" type="gb2312han" draft="contributed">সৰল চীনা শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম - GB2312</type>
+			<type key="collation" type="ducet" scope="core">ডিফ’ল্ট ইউনিকোড</type>
 			<type key="collation" type="phonebook" draft="contributed">টেলিফোন বহিৰ মতেশৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
 			<type key="collation" type="pinyin" draft="contributed">পিন্‌য়িন শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
-			<type key="collation" type="search">সাধাৰণ উদ্দেশ্যে অনুসন্ধান</type>
+			<type key="collation" type="search">সাধাৰণ উদ্দেশ্যে সন্ধান</type>
+			<type key="collation" type="search" scope="core">সন্ধান</type>
 			<type key="collation" type="standard">মান্য সজোৱা ক্ৰম</type>
+			<type key="collation" type="standard" scope="core">মান্য</type>
 			<type key="collation" type="stroke" draft="contributed">স্ট্ৰোক শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
 			<type key="collation" type="traditional" draft="contributed">পৰম্পৰাগতভাবে শৃঙ্খলাবদ্ধ কৰাৰ ক্ৰম</type>
+			<type key="em" type="default" scope="core">ডিফ’ল্ট</type>
+			<type key="em" type="emoji" scope="core">ইম’জী</type>
+			<type key="em" type="text" scope="core">পাঠ্য</type>
 			<type key="hc" type="h11">১২ ঘণ্টীয়া প্ৰণালী (০–১১)</type>
+			<type key="hc" type="h11" scope="core">১২ (০–১১) ১২ (০–১১)</type>
 			<type key="hc" type="h12">১২ ঘণ্টীয়া প্ৰণালী (১–১২)</type>
+			<type key="hc" type="h12" scope="core">১২ (১–১২) ১২ (১–১২)</type>
 			<type key="hc" type="h23">২৪ ঘণ্টীয়া প্ৰণালী (০–২৩)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23) Hour Cycle (12 vs 24) others… ২৪ (০–২৩) …অন্য ঘণ্টীয়া প্ৰণালী(১২ বনাম ২৪): ২৪ (০–২৩) ৩ (০–২৩)</type>
 			<type key="hc" type="h24">২৪ ঘণ্টীয়া প্ৰণালী (১–২৪)</type>
+			<type key="hc" type="h24" scope="core">২৪ (১–২৪) ২৪ (১–২৪)</type>
 			<type key="lb" type="loose">ঢিলা পংক্তি বিচ্ছেদ শৈলী</type>
+			<type key="lb" type="loose" scope="core">ঢিলা</type>
 			<type key="lb" type="normal">সাধাৰণ পংক্তি বিচ্ছেদ শৈলী</type>
+			<type key="lb" type="normal" scope="core">সাধাৰণ</type>
 			<type key="lb" type="strict">কঠোৰ পংক্তি বিচ্ছেদ শৈলী</type>
+			<type key="lb" type="strict" scope="core">পংক্তি বিচ্ছেদ</type>
+			<type key="lw" type="breakall" scope="core">আটাইবোৰ বিভাজন কৰক</type>
+			<type key="lw" type="keepall" scope="core">আটাইবোৰ ৰাখক</type>
+			<type key="lw" type="normal" scope="core">সাধাৰণ</type>
+			<type key="lw" type="phrase" scope="core">ব্যাক্যাংশত ৰাখক</type>
 			<type key="ms" type="metric">মেট্ৰিক প্ৰণালী</type>
+			<type key="ms" type="metric" scope="core">মেট্ৰিক</type>
 			<type key="ms" type="uksystem">ইম্পেৰিয়েল জোখ-মাখৰ প্ৰণালী</type>
+			<type key="ms" type="uksystem" scope="core">ইম্পেৰিয়েল</type>
 			<type key="ms" type="ussystem">মাৰ্কিন যুক্তৰাষ্ট্ৰৰ জোখ-মাখৰ প্ৰণালী</type>
+			<type key="ms" type="ussystem" scope="core">মাৰ্কিন</type>
 			<type key="numbers" type="arab">আৰবী-ভাৰতীয় অংক</type>
 			<type key="numbers" type="arabext">বিস্তাৰিত আৰবী-ভাৰতীয় অংক</type>
 			<type key="numbers" type="armn">আৰ্মেনীয় সংখ্যা</type>
@@ -935,6 +976,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">থাই অংক</type>
 			<type key="numbers" type="tibt">তিব্বতী অংক</type>
 			<type key="numbers" type="vaii">ভেই সংখ্যা</type>
+			<type key="ss" type="none" scope="core">ঃ</type>
+			<type key="ss" type="standard" scope="core">ঃ</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">মেট্ৰিক</measurementSystemName>
@@ -982,7 +1025,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>GGGGG y-MM-dd</pattern>
+							<pattern>G y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -991,9 +1034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0} বজাত</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern>{1} 'at' {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1201,27 +1241,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</quarters>
 				<dayPeriods>
 					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">am</dayPeriod>
-							<dayPeriod type="pm">pm</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
 						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AM</dayPeriod>
-							<dayPeriod type="pm">PM</dayPeriod>
+							<dayPeriod type="am">পূৰ্বাহ্ন</dayPeriod>
+							<dayPeriod type="pm">অপৰাহ্ন</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -2158,6 +2180,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>ইষ্টাৰ</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>কোইহাইক</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>পুণ্টা এৰিনাছ</exemplarCity>
 			</zone>
@@ -2423,9 +2448,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>নোম পেন্‌হ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>এণ্ডৰবাৰী</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>কেণ্টন</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3095,9 +3117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>পশ্চিম আফ্ৰিকাৰ সময়</generic>
-					<standard>পশ্চিম আফ্ৰিকাৰ মান সময়</standard>
-					<daylight>পশ্চিম আফ্ৰিকাৰ গ্ৰীষ্মকালীন সময়</daylight>
+					<standard>পশ্চিম আফ্ৰিকাৰ সময়</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3447,6 +3467,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>গায়ানাৰ সময়</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>হাৱাই-এলিউশ্বনৰ মান সময়</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>হাৱাই-এলিউশ্বনৰ সময়</generic>
@@ -3955,6 +3980,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<otherNumberingSystems>
 			<native>beng</native>
 		</otherNumberingSystems>
+		<symbols numberSystem="beng">
+			<timeSeparator draft="contributed">:</timeSeparator>
+		</symbols>
 		<symbols numberSystem="latn">
 			<timeSeparator draft="unconfirmed">.</timeSeparator>
 		</symbols>
@@ -4004,8 +4032,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000000" count="other">0 নিযুত</pattern>
 					<pattern type="10000000" count="one">00 নিযুত</pattern>
 					<pattern type="10000000" count="other">00 নিযুত</pattern>
-					<pattern type="100000000" count="one">000 নিঃ</pattern>
-					<pattern type="100000000" count="other">000 নিঃ</pattern>
+					<pattern type="100000000" count="one">0 নিঃ</pattern>
+					<pattern type="100000000" count="other">0 নিঃ</pattern>
 					<pattern type="1000000000" count="one">0 শঃ কোঃ</pattern>
 					<pattern type="1000000000" count="other">0 শঃ কোঃ</pattern>
 					<pattern type="10000000000" count="one">00 শঃ কোঃ</pattern>
@@ -4021,6 +4049,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
+		<rationalFormats numberSystem="beng">
+			<rationalUsage>never</rationalUsage>
+		</rationalFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -4031,7 +4062,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencyFormats numberSystem="beng">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
-					<pattern alt="noCurrency">#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -4039,10 +4074,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+					<pattern alt="noCurrency">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -4052,26 +4089,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="1000" count="other">¤ 0 হাজাৰ</pattern>
 					<pattern type="10000" count="one">¤ 00 হাজাৰ</pattern>
 					<pattern type="10000" count="other">¤ 00 হাজাৰ</pattern>
-					<pattern type="100000" count="one">¤ 000 লাখ</pattern>
-					<pattern type="100000" count="other">¤ 000 লাখ</pattern>
+					<pattern type="100000" count="one">¤ 0 লাখ</pattern>
+					<pattern type="100000" count="other">¤ 0 লাখ</pattern>
 					<pattern type="1000000" count="one">¤ 0 নিযুত</pattern>
 					<pattern type="1000000" count="other">¤ 0 নিযুত</pattern>
 					<pattern type="10000000" count="one">¤ 00 নিযুত</pattern>
 					<pattern type="10000000" count="other">¤ 00 নিযুত</pattern>
-					<pattern type="100000000" count="one">¤ 000 নিযুত</pattern>
-					<pattern type="100000000" count="other">¤ 000 নিযুত</pattern>
-					<pattern type="1000000000" count="one">¤ 0 শত কোটি</pattern>
-					<pattern type="1000000000" count="other">¤ 0 শত কোটি</pattern>
-					<pattern type="10000000000" count="one">¤ 00 শত কোটি</pattern>
-					<pattern type="10000000000" count="other">¤ 00 শত কোটি</pattern>
-					<pattern type="100000000000" count="one">¤ 000 শত কোটি</pattern>
-					<pattern type="100000000000" count="other">¤ 000 শত কোটি</pattern>
-					<pattern type="1000000000000" count="one">¤ 0 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="1000000000000" count="other">¤ 0 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="10000000000000" count="one">¤ 00 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="10000000000000" count="other">¤ 00 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="100000000000000" count="one">¤ 000 শত পৰাৰ্দ্ধ</pattern>
-					<pattern type="100000000000000" count="other">¤ 000 শত পৰাৰ্দ্ধ</pattern>
+					<pattern type="100000000" count="one">¤ 0 নিঃ</pattern>
+					<pattern type="100000000" count="other">¤ 0 নিঃ</pattern>
+					<pattern type="1000000000" count="one">¤ 0 শঃ কোঃ</pattern>
+					<pattern type="1000000000" count="other">¤ 0 শঃ কোঃ</pattern>
+					<pattern type="10000000000" count="one">¤ 00 শঃ কোঃ</pattern>
+					<pattern type="10000000000" count="other">¤ 00 শঃ কোঃ</pattern>
+					<pattern type="100000000000" count="one">¤ 000 শঃ কঃ</pattern>
+					<pattern type="100000000000" count="other">¤ 000 শঃ কঃ</pattern>
+					<pattern type="1000000000000" count="one">¤ 0 শঃ পঃ</pattern>
+					<pattern type="1000000000000" count="other">¤ 0 শঃ পঃ</pattern>
+					<pattern type="10000000000000" count="one">¤ 00 শঃ পঃ</pattern>
+					<pattern type="10000000000000" count="other">¤ 00 শঃ পঃ</pattern>
+					<pattern type="100000000000000" count="one">¤ 000 শঃ পঃ</pattern>
+					<pattern type="100000000000000" count="other">¤ 000 শঃ পঃ</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>
@@ -4079,8 +4116,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<currencies>
 			<currency type="AED">
 				<displayName>সংযুক্ত আৰব আমিৰাত ডিৰহেম</displayName>
-				<displayName count="one">UAE ডিৰহেম</displayName>
-				<displayName count="other">UAE ডিৰহেম</displayName>
 			</currency>
 			<currency type="AFN">
 				<displayName>আফগান আফগানী</displayName>
@@ -4563,6 +4598,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>ইষ্ট কেৰিবিয়ান ডলাৰ</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>কেৰিবীয়ান গিল্ডাৰ</displayName>
+				<displayName count="one">কেৰিবীয়ান গিল্ডাৰ</displayName>
+				<displayName count="other">কেৰিবীয়ান গিল্ডাৰ</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক</displayName>
 			</currency>
@@ -4583,6 +4623,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZMW">
 				<displayName>জাম্বিয়ান কোৱাচা</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>জিম্বাৱীয় সোণ</displayName>
+				<displayName count="one">জিম্বাৱীয় সোণ</displayName>
+				<displayName count="other">জিম্বাৱীয় সোণ</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4754,7 +4799,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-item">
 				<displayName>আইটেমসমূহ</displayName>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>অংশ</displayName>
+				<unitPattern count="one">{0} অংশ</unitPattern>
+				<unitPattern count="other">{0} অংশ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>প্ৰতি মিলিয়নত ভাগ</displayName>
 				<unitPattern count="one">প্ৰতি মিলিয়নত {0} ভাগ</unitPattern>
 				<unitPattern count="other">প্ৰতি মিলিয়নত {0} ভাগ</unitPattern>
@@ -4772,6 +4822,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} পাৰমিৰেইড</unitPattern>
 				<unitPattern count="other">{0} পাৰমিৰেইড</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুক’জ</displayName>
+				<unitPattern count="one">{0} গ্লুঃ</unitPattern>
+				<unitPattern count="other">{0}গ্লুঃ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>প্ৰতি কিলোমিটাৰত লিটাৰ</displayName>
 				<unitPattern count="one">প্ৰতি কিলোমিটাৰত {0} লিটাৰ</unitPattern>
@@ -5131,6 +5186,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মিলিমিটাৰ মাৰ্কিউৰী</unitPattern>
 				<unitPattern count="other">{0} মিলিমিটাৰ মাৰ্কিউৰী</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>মাৰ্কিঃ</displayName>
+				<unitPattern count="one">{0} মাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0} মাৰ্কিঃ</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড</displayName>
 				<unitPattern count="one">{0} প্ৰতি বৰ্গ ইঞ্চিত পাউণ্ড</unitPattern>
@@ -5283,6 +5343,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মেট্ৰিক কাপ</unitPattern>
 				<unitPattern count="other">{0} মেট্ৰিক কাপ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ফ্লুঃ আঃ মেঃ</displayName>
+				<unitPattern count="one">{0} ফ্লুঃ আঃ মেঃ</unitPattern>
+				<unitPattern count="other">{0}ফ্লুঃ আঃ মেঃ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<unitPattern count="one">{0} একৰ-ফুট</unitPattern>
 				<unitPattern count="other">{0} একৰ-ফুট</unitPattern>
@@ -5334,22 +5399,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ইম্পেৰিয়েল কুৱাৰ্ট</unitPattern>
 				<unitPattern count="other">{0} ইম্পেৰিয়েল কুৱাৰ্ট</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>আলোক</displayName>
-				<unitPattern count="one">{0} আলোক</unitPattern>
-				<unitPattern count="other">{0} আলোক</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>ষ্টেৰাডিয়ান</displayName>
+				<unitPattern count="one">{0} ষ্টেৰাঃ</unitPattern>
+				<unitPattern count="other">{0} ষ্টেৰাঃ</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>কাটাল</displayName>
+				<unitPattern count="one">{0} কাটাঃ</unitPattern>
+				<unitPattern count="other">{0} কাটাঃ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>কুলম্ব</displayName>
+				<unitPattern count="one">{0} কুঃ</unitPattern>
+				<unitPattern count="other">{0} কুঃ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ফাৰাড</displayName>
+				<unitPattern count="one">{0}ফাঃ</unitPattern>
+				<unitPattern count="other">{0} ফাঃ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>হেনৰী</displayName>
+				<unitPattern count="one">{0} হেনঃ</unitPattern>
+				<unitPattern count="other">{0}হেনঃ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ছিয়েমেন</displayName>
+				<unitPattern count="one">{0} ছিয়েঃ</unitPattern>
+				<unitPattern count="other">{0} ছিয়েঃ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>কেল’ৰি-আইটি</displayName>
+				<unitPattern count="one">{0}কেল-আইটি</unitPattern>
+				<unitPattern count="other">{0} কেল-আইটি</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>বেকাৰেল</displayName>
+				<unitPattern count="one">{0} বেঃ</unitPattern>
+				<unitPattern count="other">{0} বেঃ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>চিয়েভাৰ্ট</displayName>
+				<unitPattern count="one">{0} এচভিঃ</unitPattern>
+				<unitPattern count="other">{0} এচভিঃ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>গ্ৰে</displayName>
+				<unitPattern count="one">{0} গ্ৰে</unitPattern>
+				<unitPattern count="other">{0} গ্ৰে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>কিলোগ্ৰাম-বল</displayName>
+				<unitPattern count="one">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+				<unitPattern count="other">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>টেচলা</displayName>
+				<unitPattern count="one">{0} টেঃ</unitPattern>
+				<unitPattern count="other">{0} টেঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ৱেবাৰ</displayName>
+				<unitPattern count="one">{0} ৱেঃ</unitPattern>
+				<unitPattern count="other">{0} ৱেঃ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>প্ৰতি বিলিয়নত অংশ</displayName>
 				<unitPattern count="one">{0} প্ৰতি বিলিয়নত অংশ</unitPattern>
 				<unitPattern count="other">{0} প্ৰতি বিলিয়নত অংশ</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>নিশা</displayName>
-				<unitPattern count="one">{0} নিশা</unitPattern>
-				<unitPattern count="other">{0} নিশা</unitPattern>
-				<perUnitPattern>{0}/নিশা</perUnitPattern>
-			</unit>
 			<coordinateUnit>
 				<displayName>প্ৰধান দিক্-নিৰ্দেশনা</displayName>
 				<coordinateUnitPattern type="east">{0} পূব</coordinateUnitPattern>
@@ -5542,7 +5661,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} টা আইটেম</unitPattern>
 				<unitPattern count="other">{0} টা আইটেম</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>অংশ</displayName>
+				<unitPattern count="one">{0} অংশ</unitPattern>
+				<unitPattern count="other">{0} অংশ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ভাগ/মিলিয়ন</displayName>
 			</unit>
 			<unit type="concentr-percent">
@@ -5559,6 +5683,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ম’ল</unitPattern>
 				<unitPattern count="other">{0} ম’ল</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুঃ</displayName>
+				<unitPattern count="one">{0} গ্লুঃ</unitPattern>
+				<unitPattern count="other">{0} গ্লুঃ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>লিটাৰ/কিঃ মিঃ</displayName>
 				<unitPattern count="one">{0} লিঃ/কিঃ মিঃ</unitPattern>
@@ -6056,8 +6185,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="pressure-millimeter-ofhg">
 				<displayName>mmHg</displayName>
-				<unitPattern count="one">{0} mmHg</unitPattern>
-				<unitPattern count="other">{0} mmHg</unitPattern>
+				<unitPattern count="one">{0} মিঃমিঃমাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0}মিঃমিঃমাৰ্কিঃ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>মাৰ্কিঃ</displayName>
+				<unitPattern count="one">{0} মাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0} মাৰ্কিঃ</unitPattern>
 			</unit>
 			<unit type="pressure-bar">
 				<displayName>বাৰ</displayName>
@@ -6181,6 +6315,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} মেঃ কাঃ</unitPattern>
 				<unitPattern count="other">{0} মেঃ কাঃ</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ফ্লুঃ আঃ মেঃ</displayName>
+				<unitPattern count="one">{0}ফ্লুঃ আঃ মেঃ</unitPattern>
+				<unitPattern count="other">{0} ফ্লুঃ আঃ মেঃ</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>একৰ-ফুট</displayName>
 				<unitPattern count="one">{0} এঃ-ফুঃ</unitPattern>
@@ -6259,12 +6398,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} পিঞ্চ</unitPattern>
 				<unitPattern count="other">{0} পিঞ্চ</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ষ্টেৰাঃ</displayName>
+				<unitPattern count="one">{0} ষ্টেৰাঃ</unitPattern>
+				<unitPattern count="other">{0}ষ্টেৰাঃ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>কাটাঃ</displayName>
+				<unitPattern count="one">{0} কাটাঃ</unitPattern>
+				<unitPattern count="other">{0} কাটাঃ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>কুঃ</displayName>
+				<unitPattern count="one">{0} কুঃ</unitPattern>
+				<unitPattern count="other">{0} কুঃ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ফাঃ</displayName>
+				<unitPattern count="one">{0} ফাঃ</unitPattern>
+				<unitPattern count="other">{0} ফাঃ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>হেনঃ</displayName>
+				<unitPattern count="one">{0} হেনঃ</unitPattern>
+				<unitPattern count="other">{0} হেনঃ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ছিয়েঃ</displayName>
+				<unitPattern count="one">{0} ছিয়েঃ</unitPattern>
+				<unitPattern count="other">{0} ছিয়েঃ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>কেল’ৰি-আইটি</displayName>
+				<unitPattern count="one">{0} কেল-আইটি</unitPattern>
+				<unitPattern count="other">{0} কেল-আইটি</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>বেঃ</displayName>
+				<unitPattern count="one">{0}বেঃ</unitPattern>
+				<unitPattern count="other">{0}বেঃ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>এচভিঃ</displayName>
+				<unitPattern count="one">{0} এচভিঃ</unitPattern>
+				<unitPattern count="other">{0} এচভিঃ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>গ্ৰে</displayName>
+				<unitPattern count="one">{0}গ্ৰে</unitPattern>
+				<unitPattern count="other">{0} গ্ৰে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>কিঃগ্ৰাঃবঃ</displayName>
+				<unitPattern count="one">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+				<unitPattern count="other">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>টেঃ</displayName>
+				<unitPattern count="one">{0} টেঃ</unitPattern>
+				<unitPattern count="other">{0} টেঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ৱেঃ</displayName>
+				<unitPattern count="one">{0} ৱেঃ</unitPattern>
+				<unitPattern count="other">{0} ৱেঃ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>আলোক</displayName>
 				<unitPattern count="one">{0} আলোক</unitPattern>
 				<unitPattern count="other">{0} আলোক</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>অংশ/বিলিয়ন</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -6367,7 +6571,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}″</unitPattern>
 				<unitPattern count="other">{0}″</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>অংশ</displayName>
+				<unitPattern count="one">{0} অংশ</unitPattern>
+				<unitPattern count="other">{0} অংশ</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>ppm</displayName>
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
@@ -6381,6 +6590,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>গ্লুঃ</displayName>
+				<unitPattern count="one">{0} গ্লুঃ</unitPattern>
+				<unitPattern count="other">{0} গ্লুঃ</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ল/১০০ ক.ম.</displayName>
 			</unit>
@@ -6435,9 +6649,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}কেলৰি</unitPattern>
 				<unitPattern count="other">{0}কেলৰি</unitPattern>
 			</unit>
-			<unit type="force-newton">
-				<displayName>N</displayName>
-			</unit>
 			<unit type="force-kilowatt-hour-per-100-kilometer">
 				<unitPattern count="one">{0}kWh/100km</unitPattern>
 				<unitPattern count="other">{0} kWh/100km</unitPattern>
@@ -6477,6 +6688,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="light-solar-luminosity">
 				<displayName>L☉</displayName>
 			</unit>
+			<unit type="pressure-millimeter-ofhg">
+				<unitPattern count="one">{0} মিঃমিঃমাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0}মিঃমিঃমাৰ্কিঃ</unitPattern>
+			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>মাৰ্কিঃ</displayName>
+				<unitPattern count="one">{0} মাৰ্কিঃ</unitPattern>
+				<unitPattern count="other">{0} মাৰ্কিঃ</unitPattern>
+			</unit>
 			<unit type="pressure-inch-ofhg">
 				<displayName>″ Hg</displayName>
 				<unitPattern count="one">{0}″ Hg</unitPattern>
@@ -6502,6 +6722,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>ফ্লুঃ আঃ মেঃ</displayName>
+				<unitPattern count="one">{0}ফ্লুঃ আঃ মেঃ</unitPattern>
+				<unitPattern count="other">{0} ফ্লুঃ আঃ মেঃ</unitPattern>
+			</unit>
 			<unit type="volume-teaspoon">
 				<unitPattern count="one">{0}টিস্পুন</unitPattern>
 				<unitPattern count="other">{0}টিস্পুন</unitPattern>
@@ -6515,21 +6740,79 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}dsp-Imp</unitPattern>
 				<unitPattern count="other">{0}dsp-Imp</unitPattern>
 			</unit>
+			<unit type="angle-steradian">
+				<displayName>ষ্টেৰাঃ</displayName>
+				<unitPattern count="one">{0} ষ্টেৰাঃ</unitPattern>
+				<unitPattern count="other">{0}ষ্টেৰাঃ</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>কাটাঃ</displayName>
+				<unitPattern count="one">{0} কাটাঃ</unitPattern>
+				<unitPattern count="other">{0} কাটাঃ</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>কুঃ</displayName>
+				<unitPattern count="one">{0} কুঃ</unitPattern>
+				<unitPattern count="other">{0} কুঃ</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>ফাঃ</displayName>
+				<unitPattern count="one">{0} ফাঃ</unitPattern>
+				<unitPattern count="other">{0} ফাঃ</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>হেনঃ</displayName>
+				<unitPattern count="one">{0} হেনঃ</unitPattern>
+				<unitPattern count="other">{0} হেনঃ</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>ছিয়েঃ</displayName>
+				<unitPattern count="one">{0} ছিয়েঃ</unitPattern>
+				<unitPattern count="other">{0} ছিয়েঃ</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>কেল’ৰি-আইটি</displayName>
+				<unitPattern count="one">{0} কেল-আইটি</unitPattern>
+				<unitPattern count="other">{0} কেল-আইটি</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>বেঃ</displayName>
+				<unitPattern count="one">{0}বেঃ</unitPattern>
+				<unitPattern count="other">{0}বেঃ</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>এচভিঃ</displayName>
+				<unitPattern count="one">{0} এচভিঃ</unitPattern>
+				<unitPattern count="other">{0} এচভিঃ</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>গ্ৰে</displayName>
+				<unitPattern count="one">{0} গ্ৰে</unitPattern>
+				<unitPattern count="other">{0}গ্ৰে</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>কিঃগ্ৰাঃবঃ</displayName>
+				<unitPattern count="one">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+				<unitPattern count="other">{0} কিঃগ্ৰাঃবঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>টেঃ</displayName>
+				<unitPattern count="one">{0} টেঃ</unitPattern>
+				<unitPattern count="other">{0} টেঃ</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>ৱেঃ</displayName>
+				<unitPattern count="one">{0} ৱেঃ</unitPattern>
+				<unitPattern count="other">{0} ৱেঃ</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>আলোক</displayName>
 				<unitPattern count="one">{0}আলোক</unitPattern>
 				<unitPattern count="other">{0}আলোক</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<unitPattern count="one">{0}ppb</unitPattern>
 				<unitPattern count="other">{0}ppb</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>নিশা</displayName>
-				<unitPattern count="one">{0} নিশা</unitPattern>
-				<unitPattern count="other">{0} নিশা</unitPattern>
-				<perUnitPattern>{0}/নিশা</perUnitPattern>
-			</unit>
 		</unitLength>
 	</units>
 	<listPatterns>

make/data/cldr/common/main/asa.xml

@@ -556,6 +556,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">

make/data/cldr/common/main/ast.xml

@@ -1198,13 +1198,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">calendariu de la República de China</type>
 			<type key="cf" type="account">formatu monetariu contable</type>
 			<type key="cf" type="standard">formatu monetariu estándar</type>
-			<type key="collation" type="big5han">orde de clasificación chinu tradicional - Big5</type>
 			<type key="collation" type="compat">orde de clasificación anterior, por compatibilidá</type>
 			<type key="collation" type="dictionary">orde de clasificación de diccionariu</type>
 			<type key="collation" type="ducet">orde de clasificación Unicode predetermináu</type>
 			<type key="collation" type="emoji">orde de clasificación Emoji</type>
 			<type key="collation" type="eor">regles d’ordenamientu europees</type>
-			<type key="collation" type="gb2312han">orde de clasificación chinu simplificáu - GB2312</type>
 			<type key="collation" type="phonebook">orde de clasificación de llista telefónica</type>
 			<type key="collation" type="pinyin">orde de clasificación pinyin</type>
 			<type key="collation" type="search">gueta xeneral</type>
@@ -1705,20 +1703,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 				</months>
-				<eras>
-					<eraNames>
-						<era type="0">antes de la Encarnación</era>
-						<era type="1">después de la Encarnación</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a. E.</era>
-						<era type="1">d. E.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">aE</era>
-						<era type="1">dE</era>
-					</eraNarrow>
-				</eras>
 				<dateTimeFormats>
 					<intervalFormats>
 						<intervalFormatItem id="yMMMd">
@@ -3376,11 +3360,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<regionFormat type="daylight">Hora braniega de {0}</regionFormat>
 			<regionFormat type="standard">Hora estándar de {0}</regionFormat>
 			<zone type="Pacific/Honolulu">
-				<short>
-					<generic>HST</generic>
-					<standard>HST</standard>
-					<daylight>HDT</daylight>
-				</short>
 				<exemplarCity>Honolulu</exemplarCity>
 			</zone>
 			<zone type="Etc/UTC">
@@ -3556,9 +3535,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Tokyo">
 				<exemplarCity>Tokiu</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury</exemplarCity>
-			</zone>
 			<zone type="Asia/Pyongyang">
 				<exemplarCity>Pyong Yang</exemplarCity>
 			</zone>
@@ -3768,9 +3744,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Hora d’África del oeste</generic>
-					<standard>Hora estándar d’África del oeste</standard>
-					<daylight>Hora braniega d’África del oeste</daylight>
+					<standard>Hora d’África del oeste</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4206,6 +4180,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Hora de La Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hora estándar de Hawaii-Aleutianes</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hora de Hawaii-Aleutianes</generic>
@@ -4772,6 +4751,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -6431,7 +6414,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} milimol per llitru</unitPattern>
 				<unitPattern count="other">{0} milimoles per llitru</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName>partes per millón</displayName>
 				<unitPattern count="one">{0} parte per millón</unitPattern>
 				<unitPattern count="other">{0} partes per millón</unitPattern>
@@ -7343,7 +7326,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mmol/L</unitPattern>
 				<unitPattern count="other">{0}mmol/L</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<unitPattern count="one">{0}ppm</unitPattern>
 				<unitPattern count="other">{0}ppm</unitPattern>
 			</unit>

make/data/cldr/common/main/az.xml

@@ -124,7 +124,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="dav">taita</language>
 			<language type="de">alman</language>
 			<language type="de_AT">Avstriya almancası</language>
-			<language type="de_CH">İsveçrə yüksək almancası</language>
 			<language type="del">delaver</language>
 			<language type="den">slavey</language>
 			<language type="dgr">doqrib</language>
@@ -257,10 +256,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="kbd">kabarda-çərkəz</language>
 			<language type="kcg">tiyap</language>
 			<language type="kde">makond</language>
-			<language type="kea">kabuverdian</language>
+			<language type="kea">kabuverdianu</language>
 			<language type="kfo">koro</language>
 			<language type="kg">konqo</language>
-			<language type="kgp">kaiqanq</language>
+			<language type="kgp">kaynqanq</language>
 			<language type="kha">xazi</language>
 			<language type="kho">xotan</language>
 			<language type="khq">koyra çiini</language>
@@ -287,6 +286,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">bafia</language>
 			<language type="ksh">köln</language>
 			<language type="ku">kürd</language>
+			<language type="ku" menu="core">kürd dili</language>
+			<language type="ku" menu="extension">kurmanci (kürd dili) dialekti</language>
 			<language type="kum">kumık</language>
 			<language type="kut">kutenay</language>
 			<language type="kv">komi</language>
@@ -805,6 +806,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Çin</territory>
 			<territory type="CO">Kolumbiya</territory>
 			<territory type="CP">Klipperton adası</territory>
+			<territory type="CQ">sark (ingilis dili) dialekti</territory>
 			<territory type="CR">Kosta Rika</territory>
 			<territory type="CU">Kuba</territory>
 			<territory type="CV">Kabo-Verde</territory>
@@ -1039,45 +1041,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">Valyuta Formatı</key>
 			<key type="collation">Sıralama</key>
 			<key type="currency">Valyuta</key>
+			<key type="em">Emojilərin təqdim edilməsi</key>
 			<key type="hc">Saat Sikli (12 / 24)</key>
 			<key type="lb">Sətirdən sətrə keçirmə üslubu</key>
+			<key type="lw">Sözlərin bölünərək sətirdən-sətrə keçirilməsi</key>
 			<key type="ms">Ölçü Sistemi</key>
 			<key type="numbers">Rəqəmlər</key>
+			<key type="ss">Abreviaturadan sonra cümlə kəsintisi</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">Buddist təqvimi</type>
+			<type key="calendar" type="buddhist" scope="core">Buddist</type>
 			<type key="calendar" type="chinese">Çin təqvimi</type>
+			<type key="calendar" type="chinese" scope="core">Çin</type>
 			<type key="calendar" type="coptic">Kopt təqvimi</type>
+			<type key="calendar" type="coptic" scope="core">Qibti</type>
 			<type key="calendar" type="dangi">Dangi təqvimi</type>
+			<type key="calendar" type="dangi" scope="core">Dangi</type>
 			<type key="calendar" type="ethiopic">Efiop təqvimi</type>
+			<type key="calendar" type="ethiopic" scope="core">Efiop</type>
 			<type key="calendar" type="ethiopic-amete-alem">Efiop amet-alem təqvimi</type>
-			<type key="calendar" type="gregorian">Qreqorian təqvimi</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">Efiop Amete Alem</type>
+			<type key="calendar" type="gregorian">Qriqori təqvimi</type>
+			<type key="calendar" type="gregorian" scope="core">Qriqori</type>
 			<type key="calendar" type="hebrew">Yəhudi Təqvimi</type>
+			<type key="calendar" type="hebrew" scope="core">Yəhudi</type>
 			<type key="calendar" type="indian" draft="contributed">Hindi təqvimi</type>
 			<type key="calendar" type="islamic">Hicri təqvimi</type>
+			<type key="calendar" type="islamic" scope="core">Hicri</type>
 			<type key="calendar" type="islamic-civil">Hicri təqvimi (tabulyar, vətəndaşlıq dövrü)</type>
+			<type key="calendar" type="islamic-civil" scope="core">Hicri (cədvəl, mülki dövr)</type>
 			<type key="calendar" type="islamic-tbla">Hicri təqvim (tabulyar, astromonik dövr)</type>
+			<type key="calendar" type="islamic-tbla" scope="core">Hicri (cədvəl, astronomik dövr)</type>
 			<type key="calendar" type="islamic-umalqura">Hicri təqvim (Umm əl-Qura)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Hicri (Umm əl-Qura)</type>
 			<type key="calendar" type="iso8601">ISO-8601 Təqvimi</type>
 			<type key="calendar" type="japanese">Yapon Təqvimi</type>
+			<type key="calendar" type="japanese" scope="core">Yapon</type>
 			<type key="calendar" type="persian">İran Təqvimi</type>
+			<type key="calendar" type="persian" scope="core">İran</type>
 			<type key="calendar" type="roc">Minquo Təqvimi</type>
+			<type key="calendar" type="roc" scope="core">Minquo</type>
 			<type key="cf" type="account">Uçot Valyuta Formatı</type>
+			<type key="cf" type="account" scope="core">Valyuta formatı: Uçot</type>
 			<type key="cf" type="standard">Standart Valyuta Formatı</type>
+			<type key="cf" type="standard" scope="core">Valyuta formatı: Standart</type>
 			<type key="collation" type="ducet">Standart Unicode Sıralama</type>
+			<type key="collation" type="ducet" scope="core">Defolt unikod</type>
 			<type key="collation" type="pinyin" draft="contributed">Pinyin təqvimi</type>
 			<type key="collation" type="search">Ümumi Məqsədli Axtarış</type>
+			<type key="collation" type="search" scope="core">Axtarış</type>
 			<type key="collation" type="standard">Standart Sıralama</type>
+			<type key="collation" type="standard" scope="core">Standart</type>
+			<type key="em" type="default" scope="core">Emojilərin təqdim edilməsi: Standart</type>
+			<type key="em" type="emoji" scope="core">Emoji</type>
+			<type key="em" type="text" scope="core">Mətn</type>
 			<type key="hc" type="h11">12 Saatlıq Sistem (0–11)</type>
+			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">12 Saatlıq Sistem (0–12)</type>
+			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">24 Saatlıq Sistem (0–23)</type>
+			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">24 Saatlıq Sistem (0–23)</type>
+			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">Sərbəst sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="loose" scope="core">Sərbəst</type>
 			<type key="lb" type="normal">Normal sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="normal" scope="core">Normal</type>
 			<type key="lb" type="strict">Sərt sətirdən sətrə keçirmə üslubu</type>
+			<type key="lb" type="strict" scope="core">Ciddi</type>
+			<type key="lw" type="breakall" scope="core">Hamısını böl</type>
+			<type key="lw" type="keepall" scope="core">Hamısını saxla</type>
+			<type key="lw" type="normal" scope="core">Normal</type>
+			<type key="lw" type="phrase" scope="core">İfadələrdə saxla</type>
 			<type key="ms" type="metric">Metrik Sistem</type>
+			<type key="ms" type="metric" scope="core">Metrik</type>
 			<type key="ms" type="uksystem">İmperial Ölçü Sistemi</type>
+			<type key="ms" type="uksystem" scope="core">Birləşmiş Krallıq</type>
 			<type key="ms" type="ussystem">ABŞ Ölçü Sistemi</type>
+			<type key="ms" type="ussystem" scope="core">Birləşmiş Ştatlar</type>
 			<type key="numbers" type="arab">Ərəb-Hind Rəqəmləri</type>
 			<type key="numbers" type="arabext">Genişlənmiş Ərəb-Hind Rəqəmləri</type>
 			<type key="numbers" type="armn">Erməni Rəqəmləri</type>
@@ -1118,6 +1160,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">Tay Rəqəmləri</type>
 			<type key="numbers" type="tibt">Tibet Rəqəmləri</type>
 			<type key="numbers" type="vaii">Vai rəqəmləri</type>
+			<type key="ss" type="none" scope="core">Deaktiv</type>
+			<type key="ss" type="standard" scope="core">Aktiv</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metrik</measurementSystemName>
@@ -1138,9 +1182,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<parseLenients scope="date" level="lenient">
 			<parseLenient sample=":">[\: ∶]</parseLenient>
 		</parseLenients>
-		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="£">[£￡ ₤]</parseLenient>
-		</parseLenients>
 		<parseLenients scope="number" level="lenient">
 			<parseLenient sample="-">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
 			<parseLenient sample=",">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
@@ -1210,11 +1251,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="GyM">G MM/y</dateFormatItem>
 						<dateFormatItem id="GyMd">GGGGG d M y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd/MM/y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">dd.MM</dateFormatItem>
@@ -1230,6 +1272,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yyyyMMMM">G MMMM y</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h – h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm – B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm – h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm – h:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG MM/y– GGGGG MM/y</greatestDifference>
 							<greatestDifference id="M">GGGGG MM/y – MM/y</greatestDifference>
@@ -1264,10 +1315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
 							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1278,10 +1325,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
 							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
@@ -1291,11 +1334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="M">dd.MM, E – dd.MM, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="d">d – d MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M">GGGGG MM/y – MM/y</greatestDifference>
@@ -1316,8 +1355,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">G d–d MMM y</greatestDifference>
-							<greatestDifference id="M">G d MMM y – d MMM</greatestDifference>
+							<greatestDifference id="d">G MMM d – d, y</greatestDifference>
+							<greatestDifference id="M">G MMM d – MMM d, y</greatestDifference>
 							<greatestDifference id="y">G d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
@@ -1525,13 +1564,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}/{0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}/{0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
 						<dateTimeFormat type="atTime">
-							<pattern>{1} 'at' {0}</pattern>
+							<pattern>{1}/{0}</pattern>
+						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}/{0}</pattern>
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
@@ -1541,6 +1586,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1549,6 +1597,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Bh">B h</dateFormatItem>
@@ -1559,11 +1610,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="Ehm">E h:mm a</dateFormatItem>
 						<dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="GyMd">GGGGG d MMM y</dateFormatItem>
+						<dateFormatItem id="GyM">G M y</dateFormatItem>
+						<dateFormatItem id="GyMd">G d M y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G d M y, E</dateFormatItem>
 						<dateFormatItem id="GyMMM">G MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMd">G d MMM y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G d MMM y, E</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
@@ -1586,6 +1638,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="yw" count="other">Y, w 'həftə'</dateFormatItem>
 					</availableFormats>
 					<intervalFormats>
+						<intervalFormatItem id="Bh">
+							<greatestDifference id="B">B h – B h</greatestDifference>
+							<greatestDifference id="h">B h–h</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Bhm">
+							<greatestDifference id="B">B h:mm–B h:mm</greatestDifference>
+							<greatestDifference id="h">B h:mm–h:mm</greatestDifference>
+							<greatestDifference id="m">B h:mm–h:mm</greatestDifference>
+						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG MM.y – GGGGG MM.y</greatestDifference>
 							<greatestDifference id="M">GGGGG MM.y – MM.y</greatestDifference>
@@ -1615,15 +1676,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">G d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMMMEd">
-							<greatestDifference id="d">G d MMM, E – d MMM y, E</greatestDifference>
+							<greatestDifference id="d">G d MMM, E – d MMM, E, y</greatestDifference>
 							<greatestDifference id="G">G d MMM y, E – d MMM y, E</greatestDifference>
 							<greatestDifference id="M">G d MMM, E – d MMM y, E</greatestDifference>
 							<greatestDifference id="y">G d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
@@ -1634,10 +1691,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
 							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
 							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
@@ -1673,12 +1726,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">d MMM y – d MMM</greatestDifference>
+							<greatestDifference id="d">d – d MMM y</greatestDifference>
+							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
 							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">d MMM y, E – d MMM, E</greatestDifference>
-							<greatestDifference id="M">d MMM y, E – d MMM, E</greatestDifference>
+							<greatestDifference id="d">E, d MMM – E, d MMM y</greatestDifference>
+							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
 							<greatestDifference id="y">d MMM y, E – d MMM y, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
@@ -1721,6 +1775,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 				</months>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyM">G MM/y</dateFormatItem>
+						<dateFormatItem id="GyMEd">G dd/MM/y, E</dateFormatItem>
+					</availableFormats>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="persian">
 				<months>
@@ -1843,7 +1903,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName>hft. günü</displayName>
 			</field>
 			<field type="weekdayOfMonth">
-				<displayName>ayın həftə günü</displayName>
+				<displayName>ayın həftəiçi günü</displayName>
 			</field>
 			<field type="weekdayOfMonth-short">
 				<displayName>ay hft. günü</displayName>
@@ -1899,9 +1959,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</relativeTime>
 			</field>
 			<field type="tue-short">
-				<relative type="-1">keçən ÇƏ</relative>
+				<relative type="-1">keçən Ç.ax.</relative>
 				<relative type="0">bu ÇƏ</relative>
 				<relative type="1">gələn ÇƏ</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="one">{0} çərşənbə axşamı sonra</relativeTimePattern>
+					<relativeTimePattern count="other">{0} çərşənbə axşamı ərzində</relativeTimePattern>
+				</relativeTime>
 			</field>
 			<field type="wed">
 				<relative type="-1">keçən çərşənbə</relative>
@@ -2057,9 +2121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="America/Anguilla">
 				<exemplarCity>Angilya</exemplarCity>
 			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
 			<zone type="Antarctica/Syowa">
 				<exemplarCity>Syova</exemplarCity>
 			</zone>
@@ -2300,6 +2361,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Pasxa</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Koyayke</exemplarCity>
+			</zone>
 			<zone type="America/Santiago">
 				<exemplarCity>Santyaqo</exemplarCity>
 			</zone>
@@ -2512,7 +2576,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Pnom Pen</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderböri</exemplarCity>
+				<exemplarCity>Kanton</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Kirimati</exemplarCity>
@@ -2977,9 +3041,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Qərbi Afrika Vaxtı</generic>
-					<standard>Qərbi Afrika Standart Vaxtı</standard>
-					<daylight>Qərbi Afrika Yay Vaxtı</daylight>
+					<standard>Qərbi Afrika Vaxtı</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -2998,9 +3060,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="America_Central">
 				<long>
-					<generic>Şimali Mərkəzi Amerika Vaxtı</generic>
-					<standard>Şimali Mərkəzi Amerika Standart Vaxtı</standard>
-					<daylight>Şimali Mərkəzi Amerika Yay Vaxtı</daylight>
+					<generic>Mərkəzi Amerika saat qurşağı</generic>
+					<standard>Mərkəzi Amerika Standart Vaxtı</standard>
+					<daylight>Mərkəzi Amerika yay vaxtı</daylight>
 				</long>
 			</metazone>
 			<metazone type="America_Eastern">
@@ -3061,7 +3123,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Atlantic">
 				<long>
-					<generic>Atlantik Vaxt</generic>
+					<generic>Atlantik saat qurşağı</generic>
 					<standard>Atlantik Standart Vaxt</standard>
 					<daylight>Atlantik Yay Vaxtı</daylight>
 				</long>
@@ -3329,6 +3391,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Qayana Vaxtı</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Havay-Aleut Standart Vaxtı</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Havay-Aleut Vaxtı</generic>
@@ -3748,6 +3815,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Çuuk Vaxtı</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Türkiya vaxtı</generic>
+					<standard>Türkiya standart vaxtı</standard>
+					<daylight>Türkiya yay vaxtı</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Türkmənistan Vaxtı</generic>
@@ -3926,13 +4000,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
-					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -3943,24 +4030,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<pattern type="10000" count="other">00K ¤</pattern>
 					<pattern type="100000" count="one">000K ¤</pattern>
 					<pattern type="100000" count="other">000K ¤</pattern>
-					<pattern type="1000000" count="one">0M ¤</pattern>
-					<pattern type="1000000" count="other">0M ¤</pattern>
-					<pattern type="10000000" count="one">00M ¤</pattern>
-					<pattern type="10000000" count="other">00M ¤</pattern>
-					<pattern type="100000000" count="one">000M ¤</pattern>
-					<pattern type="100000000" count="other">000M ¤</pattern>
-					<pattern type="1000000000" count="one">0G ¤</pattern>
-					<pattern type="1000000000" count="other">0G ¤</pattern>
-					<pattern type="10000000000" count="one">00G ¤</pattern>
-					<pattern type="10000000000" count="other">00G ¤</pattern>
-					<pattern type="100000000000" count="one">000G ¤</pattern>
-					<pattern type="100000000000" count="other">000G ¤</pattern>
-					<pattern type="1000000000000" count="one">0T ¤</pattern>
-					<pattern type="1000000000000" count="other">0T ¤</pattern>
-					<pattern type="10000000000000" count="one">00T ¤</pattern>
-					<pattern type="10000000000000" count="other">00T ¤</pattern>
-					<pattern type="100000000000000" count="one">000T ¤</pattern>
-					<pattern type="100000000000000" count="other">000T ¤</pattern>
+					<pattern type="1000000" count="one">0 mln ¤</pattern>
+					<pattern type="1000000" count="other">0 mln ¤</pattern>
+					<pattern type="10000000" count="one">00 mln ¤</pattern>
+					<pattern type="10000000" count="other">00 mln ¤</pattern>
+					<pattern type="100000000" count="one">000 mln ¤</pattern>
+					<pattern type="100000000" count="other">000 mln ¤</pattern>
+					<pattern type="1000000000" count="one">0 mlrd ¤</pattern>
+					<pattern type="1000000000" count="other">0 mlrd ¤</pattern>
+					<pattern type="10000000000" count="one">00 mlrd ¤</pattern>
+					<pattern type="10000000000" count="other">00 mlrd ¤</pattern>
+					<pattern type="100000000000" count="one">000 mlrd ¤</pattern>
+					<pattern type="100000000000" count="other">000 mlrd ¤</pattern>
+					<pattern type="1000000000000" count="one">0 trln ¤</pattern>
+					<pattern type="1000000000000" count="other">0 trln ¤</pattern>
+					<pattern type="10000000000000" count="one">00 trln ¤</pattern>
+					<pattern type="10000000000000" count="other">00 trln ¤</pattern>
+					<pattern type="100000000000000" count="one">000 trln ¤</pattern>
+					<pattern type="100000000000000" count="other">000 trln ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5183,6 +5270,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Şərqi Karib dolları</displayName>
 				<displayName count="other">Şərqi Karib dolları</displayName>
 			</currency>
+			<currency type="XCG">
+				<displayName>Karib gilderi</displayName>
+				<displayName count="one">Karib gilderi</displayName>
+				<displayName count="other">Karib gilderi</displayName>
+			</currency>
 			<currency type="XFO">
 				<displayName>Fransız Gızıl Frankı</displayName>
 				<displayName count="one">Fransız gızıl frankı</displayName>
@@ -5276,6 +5368,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">Zimbabve dolları (1980–2008)</displayName>
 				<displayName count="other">Zimbabve dolları (1980–2008)</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>Zimbabve Qızılı</displayName>
+				<displayName count="one">Zimbabve qızılı</displayName>
+				<displayName count="other">Zimbabve qızılı</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabve Dolları (2009)</displayName>
 				<displayName count="one">Zimbabve dolları (2009)</displayName>
@@ -5486,7 +5583,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimol/litr</unitPattern>
 				<unitPattern count="other">{0} millimol/litr</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hissə</displayName>
+				<unitPattern count="one">{0} hissə</unitPattern>
+				<unitPattern count="other">{0} hissə</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>milyonda hissəcik</displayName>
 				<unitPattern count="one">{0} milyonda hissəcik</unitPattern>
 				<unitPattern count="other">{0} milyonda hissəcik</unitPattern>
@@ -5503,6 +5605,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} permiriada</unitPattern>
 				<unitPattern count="other">{0} permiriada</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>qlükoza</displayName>
+				<unitPattern count="one">{0} qlükoza</unitPattern>
+				<unitPattern count="other">{0} qlükoza</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>litr/kilometr</displayName>
 				<unitPattern count="one">{0} litr/kilometr</unitPattern>
@@ -5890,6 +5997,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millimetr civə sütunu</unitPattern>
 				<unitPattern count="other">{0} millimetr civə sütunu</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>civə</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>funt/kvadrat düym</displayName>
 				<unitPattern count="one">{0} funt/kvadrat düym</unitPattern>
@@ -6021,6 +6131,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} millilitr</unitPattern>
 				<unitPattern count="other">{0} millilitr</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>metrik maye unsiyası</displayName>
+				<unitPattern count="one">{0} metrik maye unsiyası</unitPattern>
+				<unitPattern count="other">{0} metrik maye unsiyası</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>akr-fut</displayName>
 				<unitPattern count="one">{0} akr-fut</unitPattern>
@@ -6088,21 +6203,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} İmp. kvarta</unitPattern>
 				<unitPattern count="other">{0} İmp. kvarta</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>işıq</displayName>
-				<unitPattern count="one">{0} işıq</unitPattern>
-				<unitPattern count="other">{0} işıq</unitPattern>
+			<unit type="angle-steradian">
+				<displayName>steradian</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
-				<displayName>bir milyarda düşən hissə sayı</displayName>
-				<unitPattern count="one">bir milyarda düşən {0} hissə</unitPattern>
-				<unitPattern count="other">bir milyarda düşən {0} hissə</unitPattern>
+			<unit type="concentr-katal">
+				<displayName>katal</displayName>
 			</unit>
-			<unit type="duration-night">
-				<displayName>gecə</displayName>
-				<unitPattern count="one">{0} gecə</unitPattern>
-				<unitPattern count="other">{0} gecə</unitPattern>
-				<perUnitPattern>{0}/gecə</perUnitPattern>
+			<unit type="electric-coulomb">
+				<displayName>kulomb</displayName>
+				<unitPattern count="one">{0} kulomb</unitPattern>
+				<unitPattern count="other">{0} kulomb</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>farad</displayName>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>henri</displayName>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>simen</displayName>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kalori-IT</displayName>
+				<unitPattern count="one">{0} kalori [IT]</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>bekkerel</displayName>
+				<unitPattern count="one">{0} bekkerel</unitPattern>
+				<unitPattern count="other">{0} bekkerel</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>zivert</displayName>
+				<unitPattern count="one">{0} zivert</unitPattern>
+				<unitPattern count="other">{0} zivert</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>qrey</displayName>
+				<unitPattern count="one">{0} Qy</unitPattern>
+				<unitPattern count="other">{0} Qy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kiloqram qüvvə</displayName>
+				<unitPattern count="one">{0} kqq</unitPattern>
+				<unitPattern count="other">{0} kqq</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>tesla</displayName>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>veber</displayName>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>milyardda hissə</displayName>
+				<unitPattern count="one">milyardda {0} hissə</unitPattern>
+				<unitPattern count="other">milyardda {0} hissə</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>kardinal istiqamət</displayName>
@@ -6220,7 +6375,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} element</unitPattern>
 				<unitPattern count="other">{0} element</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>hissə</displayName>
+				<unitPattern count="one">{0} hissə</unitPattern>
+				<unitPattern count="other">{0} hissə</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>hissəcik/milyon</displayName>
 				<unitPattern count="one">{0} hs/mln</unitPattern>
 				<unitPattern count="other">{0} hs/mln</unitPattern>
@@ -6234,6 +6394,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>permiriada</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Qlk</displayName>
+				<unitPattern count="one">{0} Qlk</unitPattern>
+				<unitPattern count="other">{0} Qlk</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
 				<unitPattern count="one">{0} l/km</unitPattern>
@@ -6585,6 +6750,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} sL</unitPattern>
 				<unitPattern count="other">{0} sL</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>mmu</displayName>
+				<unitPattern count="one">{0} mmu</unitPattern>
+				<unitPattern count="other">{0} mmu</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>buşel</displayName>
 				<unitPattern count="one">{0} buşel</unitPattern>
@@ -6657,13 +6827,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} kvarta İmp.</unitPattern>
 				<unitPattern count="other">{0} kvarta İmp.</unitPattern>
 			</unit>
+			<unit type="electric-coulomb">
+				<displayName>kulomb</displayName>
+				<unitPattern count="one">{0} kulomb</unitPattern>
+				<unitPattern count="other">{0} kulomb</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">{0} Bk</unitPattern>
+				<unitPattern count="other">{0} Bk</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Zv</displayName>
+				<unitPattern count="one">{0} Zv</unitPattern>
+				<unitPattern count="other">{0} Zv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Qy</displayName>
+				<unitPattern count="one">{0} Qy</unitPattern>
+				<unitPattern count="other">{0} Qy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kqq</displayName>
+				<unitPattern count="one">{0} kqq</unitPattern>
+				<unitPattern count="other">{0} kqq</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>işıq</displayName>
 				<unitPattern count="one">{0} işıq</unitPattern>
 				<unitPattern count="other">{0} işıq</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>hissə/milyard</displayName>
+				<unitPattern count="one">{0} hissə/milyard</unitPattern>
+				<unitPattern count="other">{0} hissə/milyard</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>gecə</displayName>
@@ -6707,9 +6909,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ft²</unitPattern>
 				<unitPattern count="other">{0} ft²</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
-				<unitPattern count="one">{0} hs/mln</unitPattern>
-				<unitPattern count="other">{0}ppm</unitPattern>
+			<unit type="concentr-part">
+				<displayName>hissə</displayName>
+				<unitPattern count="one">{0} hissə</unitPattern>
+				<unitPattern count="other">{0} hissə</unitPattern>
 			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
@@ -6720,6 +6923,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Qlk</displayName>
+				<unitPattern count="one">{0} Qlk</unitPattern>
+				<unitPattern count="other">{0} Qlk</unitPattern>
+			</unit>
 			<unit type="consumption-mile-per-gallon-imperial">
 				<unitPattern count="one">{0} mil/imq</unitPattern>
 				<unitPattern count="other">{0} mil/imq</unitPattern>
@@ -6893,6 +7101,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} mf</unitPattern>
 				<unitPattern count="other">{0} mf</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>mmu</displayName>
+				<unitPattern count="one">{0} mmu</unitPattern>
+				<unitPattern count="other">{0} mmu</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>ak-ft</displayName>
 				<unitPattern count="one">{0} ak-ft</unitPattern>
@@ -6924,16 +7137,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}qt-Imp.</unitPattern>
 				<unitPattern count="other">{0}qt-Imp.</unitPattern>
 			</unit>
+			<unit type="electric-coulomb">
+				<displayName>K</displayName>
+				<unitPattern count="one">{0} K</unitPattern>
+				<unitPattern count="other">{0} K</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>kal-IT</displayName>
+				<unitPattern count="one">{0} kal-IT</unitPattern>
+				<unitPattern count="other">{0} kal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Bk</displayName>
+				<unitPattern count="one">{0} Bk</unitPattern>
+				<unitPattern count="other">{0} Bk</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Zv</displayName>
+				<unitPattern count="one">{0} Zv</unitPattern>
+				<unitPattern count="other">{0} Zv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Qy</displayName>
+				<unitPattern count="one">{0} Qy</unitPattern>
+				<unitPattern count="other">{0} Qy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>kqq</displayName>
+				<unitPattern count="one">{0} kqq</unitPattern>
+				<unitPattern count="other">{0} kqq</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
-				<displayName>işıq</displayName>
 				<unitPattern count="one">{0}işıq</unitPattern>
 				<unitPattern count="other">{0}işıq</unitPattern>
 			</unit>
+			<unit type="concentr-part-per-1e9">
+				<unitPattern count="one">{0} hissə/milyard</unitPattern>
+				<unitPattern count="other">{0} hissə/milyard</unitPattern>
+			</unit>
 			<unit type="duration-night">
-				<displayName>gecə</displayName>
 				<unitPattern count="one">{0}gecə</unitPattern>
 				<unitPattern count="other">{0}gecə</unitPattern>
-				<perUnitPattern>{0}/gecə</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>

make/data/cldr/common/main/az_Cyrl.xml

@@ -1070,6 +1070,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">

make/data/cldr/common/main/bal.xml

@@ -385,6 +385,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>گرین‌وِچ مین ٹائم</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="provisional">هئواییئے گیشّتگێن ساهت</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="provisional">هئواییئے ساهت</generic>

make/data/cldr/common/main/bal_Latn.xml

@@ -997,13 +997,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">Mingu-Chini sáldar</type>
 			<type key="cf" type="account">Hesáb, Zarr Káleb</type>
 			<type key="cf" type="standard">Zarray anjárén káleb</type>
-			<type key="collation" type="big5han">Chini Rabyati Red o band</type>
 			<type key="collation" type="compat">Pésari Red o band, pa hamdapiá</type>
 			<type key="collation" type="dictionary">Labzbaladi Red o band</type>
 			<type key="collation" type="ducet">Aslén Yunikodi Red o band</type>
 			<type key="collation" type="emoji">Emóji Red o band</type>
 			<type key="collation" type="eor">Yuropi Red o bandi Rahband</type>
-			<type key="collation" type="gb2312han">Sádah kortagén Chini Red o band - GB2312</type>
 			<type key="collation" type="phonebook">Pawnbokki Red o band</type>
 			<type key="collation" type="pinyin">Pinyi Red o band</type>
 			<type key="collation" type="search">Ám Kári Shóház</type>
@@ -2955,9 +2953,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Rónendi Aprikáay wahd</generic>
-					<standard>Rónendi Aprikáay anjári wahd</standard>
-					<daylight>Rónendi Aprikáay garmági wahd</daylight>
+					<standard>Rónendi Aprikáay wahd</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3307,6 +3303,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Guyánáay wahd</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Hawái/Alushiay anjári wahd</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Hawái/Alushiay wahd</generic>

make/data/cldr/common/main/bas.xml

@@ -583,6 +583,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">

make/data/cldr/common/main/be.xml

@@ -46,6 +46,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ay">аймара</language>
 			<language type="az">азербайджанская</language>
 			<language type="ba">башкірская</language>
+			<language type="bal">белуджская</language>
 			<language type="ban">балійская</language>
 			<language type="bas">басаа</language>
 			<language type="be">беларуская</language>
@@ -239,6 +240,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафія</language>
 			<language type="ksh">кёльнская</language>
 			<language type="ku">курдская</language>
+			<language type="ku" menu="core">курдская</language>
+			<language type="ku" menu="extension">курманджы</language>
 			<language type="kum">кумыцкая</language>
 			<language type="kv">комі</language>
 			<language type="kw">корнская</language>
@@ -646,6 +649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Кітай</territory>
 			<territory type="CO">Калумбія</territory>
 			<territory type="CP">Востраў Кліпертан</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста-Рыка</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Каба-Вердэ</territory>
@@ -879,42 +883,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="cf">фармат валюты</key>
 			<key type="collation">парадак сартавання</key>
 			<key type="currency">валюта</key>
+			<key type="em">прэзентацыя эмодзі</key>
 			<key type="hc">гадзінны цыкл (12 або 24)</key>
 			<key type="lb">правілы разрыву радка</key>
+			<key type="lw">стыль пераносу слоў</key>
 			<key type="ms">сістэма мер</key>
 			<key type="numbers">лічбы</key>
+			<key type="ss">разрыў сказа пасля скарачэння</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">будыйскі каляндар</type>
+			<type key="calendar" type="buddhist" scope="core">будыйскі</type>
 			<type key="calendar" type="chinese">кітайскі каляндар</type>
+			<type key="calendar" type="chinese" scope="core">кітайскі</type>
 			<type key="calendar" type="coptic">копцкі каляндар</type>
+			<type key="calendar" type="coptic" scope="core">копцкі</type>
 			<type key="calendar" type="dangi">каляндар дангі</type>
+			<type key="calendar" type="dangi" scope="core">дангі</type>
 			<type key="calendar" type="ethiopic">эфіопскі каляндар</type>
+			<type key="calendar" type="ethiopic" scope="core">эфіопскі</type>
 			<type key="calendar" type="ethiopic-amete-alem">эфіопскі каляндар Аметэ Алем</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">эфіопскі (Аметэ Алем)</type>
 			<type key="calendar" type="gregorian">грыгарыянскі каляндар</type>
+			<type key="calendar" type="gregorian" scope="core">грыгарыянскі</type>
 			<type key="calendar" type="hebrew">яўрэйскі каляндар</type>
+			<type key="calendar" type="hebrew" scope="core">яўрэйскі</type>
 			<type key="calendar" type="islamic">каляндар хіджры</type>
+			<type key="calendar" type="islamic" scope="core">хіджра</type>
 			<type key="calendar" type="islamic-civil">свецкі каляндар хіджры (таблічны)</type>
+			<type key="calendar" type="islamic-civil" scope="core">хіджра (свецкі, таблічны)</type>
 			<type key="calendar" type="islamic-umalqura">каляндар хіджры (Ум аль-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">хіджра (Ум аль-Кура)</type>
 			<type key="calendar" type="iso8601">каляндар ISO-8601</type>
 			<type key="calendar" type="japanese">японскі каляндар</type>
+			<type key="calendar" type="japanese" scope="core">японскі</type>
 			<type key="calendar" type="persian">персідскі каляндар</type>
+			<type key="calendar" type="persian" scope="core">персідскі</type>
 			<type key="calendar" type="roc">каляндар Міньго</type>
+			<type key="calendar" type="roc" scope="core">Міньго</type>
 			<type key="cf" type="account">бухгалтарскі фармат валюты</type>
+			<type key="cf" type="account" scope="core">бухгалтарскі</type>
 			<type key="cf" type="standard">стандартны фармат валюты</type>
+			<type key="cf" type="standard" scope="core">стандартны</type>
 			<type key="collation" type="ducet">стандартны парадак сартавання Унікод</type>
+			<type key="collation" type="ducet" scope="core">стандартны (Унікод)</type>
 			<type key="collation" type="search">універсальны пошук</type>
+			<type key="collation" type="search" scope="core">пошук</type>
 			<type key="collation" type="standard">стандартны парадак сартавання</type>
+			<type key="collation" type="standard" scope="core">стандартны</type>
+			<type key="em" type="default" scope="core">стандартныя сімвалы</type>
+			<type key="em" type="emoji" scope="core">эмодзі</type>
+			<type key="em" type="text" scope="core">тэкставыя сімвалы</type>
 			<type key="hc" type="h11">12-гадзінны фармат часу (0-11)</type>
+			<type key="hc" type="h11" scope="core">12-гадзінны (0–11)</type>
 			<type key="hc" type="h12">12-гадзінны фармат часу (1-12)</type>
+			<type key="hc" type="h12" scope="core">12-гадзінны (1–12)</type>
 			<type key="hc" type="h23">24-гадзінны фармат часу (0-23)</type>
+			<type key="hc" type="h23" scope="core">24-гадзінны (0–23)</type>
 			<type key="hc" type="h24">24-гадзінны фармат часу (1-24)</type>
+			<type key="hc" type="h24" scope="core">24-гадзінны (1–24)</type>
 			<type key="lb" type="loose">нястрогія правілы разрыву радка</type>
+			<type key="lb" type="loose" scope="core">нястрогія</type>
 			<type key="lb" type="normal">звычайныя правілы разрыву радка</type>
+			<type key="lb" type="normal" scope="core">звычайныя</type>
 			<type key="lb" type="strict">строгія правілы разрыву радка</type>
+			<type key="lb" type="strict" scope="core">строгія</type>
+			<type key="lw" type="breakall" scope="core">пераносіць усё</type>
+			<type key="lw" type="keepall" scope="core">захаваць усё</type>
+			<type key="lw" type="normal" scope="core">звычайны</type>
+			<type key="lw" type="phrase" scope="core">захоўваць у фразах</type>
 			<type key="ms" type="metric">метрычная сістэма мер</type>
+			<type key="ms" type="metric" scope="core">метрычная</type>
 			<type key="ms" type="uksystem">брытанская сістэма мер</type>
+			<type key="ms" type="uksystem" scope="core">брытанская</type>
 			<type key="ms" type="ussystem">амерыканская сістэма мер</type>
+			<type key="ms" type="ussystem" scope="core">амерыканская</type>
 			<type key="numbers" type="arab">арабска-індыйскія лічбы</type>
 			<type key="numbers" type="arabext">пашыраная сістэма арабска-індыйскіх лічбаў</type>
 			<type key="numbers" type="armn">армянскія лічбы</type>
@@ -955,6 +998,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="thai">тайскія лічбы</type>
 			<type key="numbers" type="tibt">тыбецкія лічбы</type>
 			<type key="numbers" type="vaii">лічбы ваі</type>
+			<type key="ss" type="none" scope="core">выключана</type>
+			<type key="ss" type="standard" scope="core">уключана</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрычная</measurementSystemName>
@@ -1126,7 +1171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMM">LLL y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y G</dateFormatItem>
-						<dateFormatItem id="h">h a</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
@@ -1500,10 +1544,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMMd">d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d MMM y 'г'. G</dateFormatItem>
 						<dateFormatItem id="h">hh a</dateFormatItem>
+						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
 						<dateFormatItem id="hmsv">h:mm:ss a v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'г' v</dateFormatItem>
 						<dateFormatItem id="Md">d.M</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
@@ -1578,7 +1624,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
 							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
@@ -1600,7 +1645,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
 							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
 							<greatestDifference id="M">M–M</greatestDifference>
@@ -1663,8 +1707,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</field>
 			<field type="year">
 				<displayName>год</displayName>
-				<relative type="-1">у мінулым годзе</relative>
-				<relative type="0">у гэтым годзе</relative>
+				<relative type="-1">летась</relative>
+				<relative type="0">сёлета</relative>
 				<relative type="1">у наступным годзе</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">праз {0} год</relativeTimePattern>
@@ -1682,7 +1726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<field type="year-short">
 				<displayName>г.</displayName>
 				<relative type="-1">у мін. годзе</relative>
-				<relative type="0">у гэтым годзе</relative>
+				<relative type="0">сёлета</relative>
 				<relative type="1">у наст. годзе</relative>
 				<relativeTime type="future">
 					<relativeTimePattern count="one">праз {0} г.</relativeTimePattern>
@@ -2075,9 +2119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<relativeTimePattern count="other">{0} сб таму</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="dayperiod">
-				<displayName>AM/PM</displayName>
-			</field>
 			<field type="hour">
 				<displayName>гадзіна</displayName>
 				<relative type="0">у гэту гадзіну</relative>
@@ -2532,6 +2573,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Вялікадня востраў</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity>Кайайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта-Арэнас</exemplarCity>
 			</zone>
@@ -2797,9 +2841,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пнампень</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндэрберы</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3469,9 +3510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Заходнеафрыканскі час</generic>
-					<standard>Заходнеафрыканскі стандартны час</standard>
-					<daylight>Заходнеафрыканскі летні час</daylight>
+					<standard>Заходнеафрыканскі час</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3821,6 +3860,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Час Гаяны</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Гавайска-Алеуцкі стандартны час</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Гавайска-Алеуцкі час</generic>
@@ -4421,6 +4465,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -5590,6 +5638,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">усходнекарыбскага долара</displayName>
 				<symbol alt="narrow">EC$</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName>карыбскі гульдэн</displayName>
+				<displayName count="one">карыбскі гульдэн</displayName>
+				<displayName count="few">карыбскія гульдэны</displayName>
+				<displayName count="many">карыбскіх гульдэнаў</displayName>
+				<displayName count="other">карыбскага гульдэна</displayName>
+			</currency>
 			<currency type="XOF">
 				<displayName>заходнеафрыканскі франк КФА</displayName>
 				<displayName count="one">заходнеафрыканскі франк КФА</displayName>
@@ -5632,6 +5687,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="many">замбійскіх квач</displayName>
 				<displayName count="other">замбійскай квачы</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName>зімбабвійскі залаты</displayName>
+				<displayName count="one">зімбабвійскі залаты</displayName>
+				<displayName count="few">зімбабвійскія залатыя</displayName>
+				<displayName count="many">зімбабвійскіх залатых</displayName>
+				<displayName count="other">зімбабвійскага залатога</displayName>
+			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="approximately">≈{0}</pattern>
@@ -5893,7 +5955,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} элементаў</unitPattern>
 				<unitPattern count="other">{0} элемента</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName>часткі</displayName>
+				<unitPattern count="one">{0} частка</unitPattern>
+				<unitPattern count="few">{0} часткі</unitPattern>
+				<unitPattern count="many">{0} частак</unitPattern>
+				<unitPattern count="other">{0} часткі</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>часткі на мільён</displayName>
 				<unitPattern count="one">{0} частка на мільён</unitPattern>
 				<unitPattern count="few">{0} часткі на мільён</unitPattern>
@@ -5924,6 +5993,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="concentr-mole">
 				<displayName>молі</displayName>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>літры на кіламетр</displayName>
 				<unitPattern count="one">{0} літр на кіламетр</unitPattern>
@@ -6619,6 +6695,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} міліметраў ртутнага слупа</unitPattern>
 				<unitPattern count="other">{0} міліметра ртутнага слупа</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>ртутнага слупка</displayName>
+				<unitPattern count="one">{0} ртутнага слупка</unitPattern>
+				<unitPattern count="few">{0} ртутнага слупка</unitPattern>
+				<unitPattern count="many">{0} ртутнага слупка</unitPattern>
+				<unitPattern count="other">{0} ртутнага слупка</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунты на квадратную цалю</displayName>
 				<unitPattern count="one">{0} фунт на квадратную цалю</unitPattern>
@@ -6849,6 +6932,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} метрычных кубкаў</unitPattern>
 				<unitPattern count="other">{0} метрычнага кубка</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>метрычныя вадкія унцыі</displayName>
+				<unitPattern count="one">{0} метрычная вадкая унцыя</unitPattern>
+				<unitPattern count="few">{0} метрычныя вадкія унцыі</unitPattern>
+				<unitPattern count="many">{0} метрычных вадкіх унцый</unitPattern>
+				<unitPattern count="other">{0} метрычнай вадкай унцыі</unitPattern>
+			</unit>
 			<unit type="volume-bushel">
 				<displayName>бушалі</displayName>
 				<unitPattern count="one">{0} бушаль</unitPattern>
@@ -6932,7 +7022,105 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="volume-quart-imperial">
 				<displayName>брыт. кварты</displayName>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>стэрадыяны</displayName>
+				<unitPattern count="one">{0} стэрадыян</unitPattern>
+				<unitPattern count="few">{0} стэрадыяны</unitPattern>
+				<unitPattern count="many">{0} стэрадыянаў</unitPattern>
+				<unitPattern count="other">{0} стэрадыяна</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>каталы</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="few">{0} каталы</unitPattern>
+				<unitPattern count="many">{0} каталаў</unitPattern>
+				<unitPattern count="other">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>кулоны</displayName>
+				<unitPattern count="one">{0} кулон</unitPattern>
+				<unitPattern count="few">{0} кулоны</unitPattern>
+				<unitPattern count="many">{0} кулонаў</unitPattern>
+				<unitPattern count="other">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>фарады</displayName>
+				<unitPattern count="one">{0} фарад</unitPattern>
+				<unitPattern count="few">{0} фарады</unitPattern>
+				<unitPattern count="many">{0} фарадаў</unitPattern>
+				<unitPattern count="other">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>генры</displayName>
+				<unitPattern count="one">{0} генры</unitPattern>
+				<unitPattern count="few">{0} генры</unitPattern>
+				<unitPattern count="many">{0} генры</unitPattern>
+				<unitPattern count="other">{0} генры</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>сіменсы</displayName>
+				<unitPattern count="one">{0} сіменс</unitPattern>
+				<unitPattern count="few">{0} сіменсы</unitPattern>
+				<unitPattern count="many">{0} сіменсаў</unitPattern>
+				<unitPattern count="other">{0} сіменса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>міжнародныя калорыі</displayName>
+				<unitPattern count="one">{0} міжнародная калорыя</unitPattern>
+				<unitPattern count="few">{0} міжнародныя калорыі</unitPattern>
+				<unitPattern count="many">{0} міжнародных калорый</unitPattern>
+				<unitPattern count="other">{0} міжнароднай калорыі</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерэлі</displayName>
+				<unitPattern count="one">{0} бекерэль</unitPattern>
+				<unitPattern count="few">{0} бекерэлі</unitPattern>
+				<unitPattern count="many">{0} бекерэляў</unitPattern>
+				<unitPattern count="other">{0} бекерэля</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>зіверты</displayName>
+				<unitPattern count="one">{0} зіверт</unitPattern>
+				<unitPattern count="few">{0} зіверты</unitPattern>
+				<unitPattern count="many">{0} зівертаў</unitPattern>
+				<unitPattern count="other">{0} зіверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>грэі</displayName>
+				<unitPattern count="one">{0} грэй</unitPattern>
+				<unitPattern count="few">{0} грэі</unitPattern>
+				<unitPattern count="many">{0} грэяў</unitPattern>
+				<unitPattern count="other">{0} грэя</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кілаграм-сілы</displayName>
+				<unitPattern count="one">{0} кілаграм-сіла</unitPattern>
+				<unitPattern count="few">{0} кілаграм-сілы</unitPattern>
+				<unitPattern count="many">{0} кілаграм-сіл</unitPattern>
+				<unitPattern count="other">{0} кілаграм-сілы</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>тэслы</displayName>
+				<unitPattern count="one">{0} тэсла</unitPattern>
+				<unitPattern count="few">{0} тэслы</unitPattern>
+				<unitPattern count="many">{0} тэслаў</unitPattern>
+				<unitPattern count="other">{0} тэслы</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>веберы</displayName>
+				<unitPattern count="one">{0} вебер</unitPattern>
+				<unitPattern count="few">{0} веберы</unitPattern>
+				<unitPattern count="many">{0} вебераў</unitPattern>
+				<unitPattern count="other">{0} вебера</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>скорасць святла</displayName>
+				<unitPattern count="one">{0} скорасць святла</unitPattern>
+				<unitPattern count="few">{0} скорасці святла</unitPattern>
+				<unitPattern count="many">{0} скарасцей святла</unitPattern>
+				<unitPattern count="other">{0} скорасці святла</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>частак на мільярд</displayName>
 				<unitPattern count="one">{0} частка на мільярд</unitPattern>
 				<unitPattern count="few">{0} часткі на мільярд</unitPattern>
@@ -6940,7 +7128,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} часткі на мільярд</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ночы</displayName>
 				<unitPattern count="one">{0} ноч</unitPattern>
 				<unitPattern count="few">{0} ночы</unitPattern>
 				<unitPattern count="many">{0} начэй</unitPattern>
@@ -6998,6 +7185,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p2">
 				<unitPrefixPattern>г{0}</unitPrefixPattern>
 			</compoundUnit>
+			<compoundUnit type="10p3">
+				<unitPrefixPattern>к{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="10p6">
 				<unitPrefixPattern>М{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -7189,6 +7379,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} элем.</unitPattern>
 				<unitPattern count="other">{0} элем.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>ч.</displayName>
+				<unitPattern count="one">{0} ч.</unitPattern>
+				<unitPattern count="few">{0} ч.</unitPattern>
+				<unitPattern count="many">{0} ч.</unitPattern>
+				<unitPattern count="other">{0} ч.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0} %</unitPattern>
 				<unitPattern count="few">{0} %</unitPattern>
@@ -7214,6 +7411,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} моль</unitPattern>
 				<unitPattern count="other">{0} молі</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>л/км</displayName>
 				<unitPattern count="one">{0} л/км</unitPattern>
@@ -7920,6 +8124,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мм рт. сл.</unitPattern>
 				<unitPattern count="other">{0} мм рт. сл.</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. сл.</displayName>
+				<unitPattern count="one">{0} рт. сл.</unitPattern>
+				<unitPattern count="few">{0} рт. сл.</unitPattern>
+				<unitPattern count="many">{0} рт. сл.</unitPattern>
+				<unitPattern count="other">{0} рт. сл.</unitPattern>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунты на кв. цалю</displayName>
 				<unitPattern count="one">{0} фунт на кв. цалю</unitPattern>
@@ -8165,6 +8376,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} мет. кубкаў</unitPattern>
 				<unitPattern count="other">{0} мет. кубка</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м. вадк. унц.</displayName>
+				<unitPattern count="one">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="few">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="many">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="other">{0} м. вадк. унц.</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акр-футы</displayName>
 				<unitPattern count="one">{0} акр-фут</unitPattern>
@@ -8300,7 +8518,105 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} брыт. кварт</unitPattern>
 				<unitPattern count="other">{0} брыт. кварты</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="few">{0} ср</unitPattern>
+				<unitPattern count="many">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="few">{0} кат</unitPattern>
+				<unitPattern count="many">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="few">{0} Кл</unitPattern>
+				<unitPattern count="many">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="few">{0} Ф</unitPattern>
+				<unitPattern count="many">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="few">{0} Гн</unitPattern>
+				<unitPattern count="many">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="few">{0} См</unitPattern>
+				<unitPattern count="many">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калм</displayName>
+				<unitPattern count="one">{0} калм</unitPattern>
+				<unitPattern count="few">{0} калм</unitPattern>
+				<unitPattern count="many">{0} калм</unitPattern>
+				<unitPattern count="other">{0} калм</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="few">{0} Бк</unitPattern>
+				<unitPattern count="many">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="few">{0} Зв</unitPattern>
+				<unitPattern count="many">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="few">{0} Гр</unitPattern>
+				<unitPattern count="many">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="few">{0} Тл</unitPattern>
+				<unitPattern count="many">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="few">{0} Вб</unitPattern>
+				<unitPattern count="many">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>ск. святла</displayName>
+				<unitPattern count="one">{0} ск. святла</unitPattern>
+				<unitPattern count="few">{0} ск. святла</unitPattern>
+				<unitPattern count="many">{0} ск. святла</unitPattern>
+				<unitPattern count="other">{0} ск. святла</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>частак/мільярд</displayName>
 				<unitPattern count="one">{0} ч/млрд</unitPattern>
 				<unitPattern count="few">{0} ч/млрд</unitPattern>
@@ -8310,7 +8626,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<unit type="duration-night">
 				<displayName>ночы</displayName>
 				<unitPattern count="one">{0} ноч</unitPattern>
-				<unitPattern count="few">{0} ноч</unitPattern>
+				<unitPattern count="few">{0} ночы</unitPattern>
 				<unitPattern count="many">{0} начэй</unitPattern>
 				<unitPattern count="other">{0} ночы</unitPattern>
 				<perUnitPattern>{0}/ноч</perUnitPattern>
@@ -8330,12 +8646,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="times">
 				<compoundUnitPattern>{0}{1}</compoundUnitPattern>
 			</compoundUnit>
+			<unit type="concentr-part">
+				<displayName>ч.</displayName>
+				<unitPattern count="one">{0} ч.</unitPattern>
+				<unitPattern count="few">{0} ч.</unitPattern>
+				<unitPattern count="many">{0} ч.</unitPattern>
+				<unitPattern count="other">{0} ч.</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<unitPattern count="one">{0}%</unitPattern>
 				<unitPattern count="few">{0}%</unitPattern>
 				<unitPattern count="many">{0}%</unitPattern>
 				<unitPattern count="other">{0}%</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкозы</displayName>
+				<unitPattern count="one">{0} глюкозы</unitPattern>
+				<unitPattern count="few">{0} глюкозы</unitPattern>
+				<unitPattern count="many">{0} глюкозы</unitPattern>
+				<unitPattern count="other">{0} глюкозы</unitPattern>
+			</unit>
 			<unit type="energy-therm-us">
 				<unitPattern count="one">{0} амер. тэрм</unitPattern>
 				<unitPattern count="few">{0} амер. тэрмы</unitPattern>
@@ -8348,26 +8678,132 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="many">{0} фунт-сіл</unitPattern>
 				<unitPattern count="other">{0} фунт-сілы</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName>рт. сл.</displayName>
+				<unitPattern count="one">{0} рт. сл.</unitPattern>
+				<unitPattern count="few">{0} рт. сл.</unitPattern>
+				<unitPattern count="many">{0} рт. сл.</unitPattern>
+				<unitPattern count="other">{0} рт. сл.</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName>м. вадк. унц.</displayName>
+				<unitPattern count="one">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="few">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="many">{0} м. вадк. унц.</unitPattern>
+				<unitPattern count="other">{0} м. вадк. унц.</unitPattern>
+			</unit>
 			<unit type="volume-dessert-spoon">
 				<unitPattern count="one">{0} дэс. лыжка</unitPattern>
 				<unitPattern count="few">{0} дэс. лыжкі</unitPattern>
 				<unitPattern count="many">{0} дэс. лыжак</unitPattern>
 				<unitPattern count="other">{0} дэс. лыжкі</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="angle-steradian">
+				<displayName>ср</displayName>
+				<unitPattern count="one">{0} ср</unitPattern>
+				<unitPattern count="few">{0} ср</unitPattern>
+				<unitPattern count="many">{0} ср</unitPattern>
+				<unitPattern count="other">{0} ср</unitPattern>
+			</unit>
+			<unit type="concentr-katal">
+				<displayName>кат</displayName>
+				<unitPattern count="one">{0} кат</unitPattern>
+				<unitPattern count="few">{0} кат</unitPattern>
+				<unitPattern count="many">{0} кат</unitPattern>
+				<unitPattern count="other">{0} кат</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName>Кл</displayName>
+				<unitPattern count="one">{0} Кл</unitPattern>
+				<unitPattern count="few">{0} Кл</unitPattern>
+				<unitPattern count="many">{0} Кл</unitPattern>
+				<unitPattern count="other">{0} Кл</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName>Ф</displayName>
+				<unitPattern count="one">{0} Ф</unitPattern>
+				<unitPattern count="few">{0} Ф</unitPattern>
+				<unitPattern count="many">{0} Ф</unitPattern>
+				<unitPattern count="other">{0} Ф</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName>Гн</displayName>
+				<unitPattern count="one">{0} Гн</unitPattern>
+				<unitPattern count="few">{0} Гн</unitPattern>
+				<unitPattern count="many">{0} Гн</unitPattern>
+				<unitPattern count="other">{0} Гн</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName>См</displayName>
+				<unitPattern count="one">{0} См</unitPattern>
+				<unitPattern count="few">{0} См</unitPattern>
+				<unitPattern count="many">{0} См</unitPattern>
+				<unitPattern count="other">{0} См</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калм</displayName>
+				<unitPattern count="one">{0} калм</unitPattern>
+				<unitPattern count="few">{0} калм</unitPattern>
+				<unitPattern count="many">{0} калм</unitPattern>
+				<unitPattern count="other">{0} калм</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>Бк</displayName>
+				<unitPattern count="one">{0} Бк</unitPattern>
+				<unitPattern count="few">{0} Бк</unitPattern>
+				<unitPattern count="many">{0} Бк</unitPattern>
+				<unitPattern count="other">{0} Бк</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>Зв</displayName>
+				<unitPattern count="one">{0} Зв</unitPattern>
+				<unitPattern count="few">{0} Зв</unitPattern>
+				<unitPattern count="many">{0} Зв</unitPattern>
+				<unitPattern count="other">{0} Зв</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>Гр</displayName>
+				<unitPattern count="one">{0} Гр</unitPattern>
+				<unitPattern count="few">{0} Гр</unitPattern>
+				<unitPattern count="many">{0} Гр</unitPattern>
+				<unitPattern count="other">{0} Гр</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>кгс</displayName>
+				<unitPattern count="one">{0} кгс</unitPattern>
+				<unitPattern count="few">{0} кгс</unitPattern>
+				<unitPattern count="many">{0} кгс</unitPattern>
+				<unitPattern count="other">{0} кгс</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName>Тл</displayName>
+				<unitPattern count="one">{0} Тл</unitPattern>
+				<unitPattern count="few">{0} Тл</unitPattern>
+				<unitPattern count="many">{0} Тл</unitPattern>
+				<unitPattern count="other">{0} Тл</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName>Вб</displayName>
+				<unitPattern count="one">{0} Вб</unitPattern>
+				<unitPattern count="few">{0} Вб</unitPattern>
+				<unitPattern count="many">{0} Вб</unitPattern>
+				<unitPattern count="other">{0} Вб</unitPattern>
+			</unit>
+			<unit type="speed-light-speed">
+				<displayName>с</displayName>
+				<unitPattern count="one">{0} с</unitPattern>
+				<unitPattern count="few">{0} с</unitPattern>
+				<unitPattern count="many">{0} с</unitPattern>
+				<unitPattern count="other">{0} с</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>ч/млрд</displayName>
-				<unitPattern count="one">{0} ч/млрд</unitPattern>
-				<unitPattern count="few">{0} ч/млрд</unitPattern>
-				<unitPattern count="many">{0} ч/млрд</unitPattern>
-				<unitPattern count="other">{0} ч/млрд</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>ночы</displayName>
 				<unitPattern count="one">{0} ноч</unitPattern>
 				<unitPattern count="few">{0} ночы</unitPattern>
 				<unitPattern count="many">{0} начэй</unitPattern>
 				<unitPattern count="other">{0} ночы</unitPattern>
-				<perUnitPattern>{0}/ноч</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<coordinateUnitPattern type="east">{0} У</coordinateUnitPattern>

make/data/cldr/common/main/be_TARASK.xml

@@ -1361,13 +1361,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="provisional">Аўганістанскі час</standard>
 				</long>
 			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic draft="provisional">Заходнеафрыканскі час</generic>
-					<standard draft="provisional">Заходнеафрыканскі змоўчны час</standard>
-					<daylight draft="provisional">Заходнеафрыканскі летні час</daylight>
-				</long>
-			</metazone>
 			<metazone type="Alaska">
 				<long>
 					<generic draft="provisional">Час Аляскі</generic>
@@ -1670,6 +1663,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="provisional">Час Пэрсыдзкага заліву</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="provisional">Гавайска-Алэвуцкі змоўчны час</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="provisional">Гавайска-Алевуцкі час</generic>

make/data/cldr/common/main/bew.xml

@@ -62,10 +62,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="bm" draft="unconfirmed">Bambara</language>
 			<language type="bn" draft="unconfirmed">Benggala</language>
 			<language type="bo" draft="unconfirmed">Tibèt</language>
+			<language type="bqi" draft="unconfirmed">Bahtiar</language>
 			<language type="br" draft="unconfirmed">Brèton</language>
 			<language type="brx" draft="unconfirmed">Boro</language>
 			<language type="bs" draft="unconfirmed">Bosni</language>
 			<language type="bss" draft="unconfirmed">Akosé</language>
+			<language type="bua" draft="unconfirmed">Buriat</language>
 			<language type="bug" draft="unconfirmed">Bugis</language>
 			<language type="byn" draft="unconfirmed">Belin</language>
 			<language type="ca" draft="unconfirmed">Katalan</language>
@@ -89,6 +91,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ckb" alt="variant" draft="unconfirmed">Kurdi, Tenga</language>
 			<language type="clc" draft="unconfirmed">Cilkotin</language>
 			<language type="co" draft="unconfirmed">Korsikan</language>
+			<language type="cop" draft="unconfirmed">Gibti</language>
 			<language type="crg" draft="unconfirmed">Micip</language>
 			<language type="crj" draft="unconfirmed">Kri Wètan Kidul</language>
 			<language type="crk" draft="unconfirmed">Kri Dataran</language>
@@ -228,6 +231,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ksf" draft="unconfirmed">Bapia</language>
 			<language type="ksh" draft="unconfirmed">Kèl</language>
 			<language type="ku" draft="unconfirmed">Kurdi</language>
+			<language type="ku" menu="core" draft="unconfirmed">Kurdi</language>
 			<language type="kum" draft="unconfirmed">Kumuk</language>
 			<language type="kv" draft="unconfirmed">Komi</language>
 			<language type="kw" draft="unconfirmed">Kornis</language>
@@ -278,7 +282,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="mi" draft="unconfirmed">Maori</language>
 			<language type="mic" draft="unconfirmed">Mikmak</language>
 			<language type="min" draft="unconfirmed">Minangkabo</language>
-			<language type="mk" draft="unconfirmed">Makèdoni</language>
+			<language type="mk" draft="unconfirmed">Makédoni</language>
 			<language type="ml" draft="unconfirmed">Malayalam</language>
 			<language type="mn" draft="unconfirmed">Monggol</language>
 			<language type="mni" draft="unconfirmed">Manipur</language>
@@ -337,6 +341,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="pap" draft="unconfirmed">Papiamèn</language>
 			<language type="pau" draft="unconfirmed">Palau</language>
 			<language type="pcm" draft="unconfirmed">Pijin Nigéria</language>
+			<language type="pi" draft="unconfirmed">Pali</language>
 			<language type="pis" draft="unconfirmed">Pijin</language>
 			<language type="pl" draft="unconfirmed">Pol</language>
 			<language type="pqm" draft="unconfirmed">Malisèt-Pasamakuodi</language>
@@ -850,7 +855,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MF" draft="unconfirmed">Sint-Martèn (Prasman)</territory>
 			<territory type="MG" draft="unconfirmed">Madagaskar</territory>
 			<territory type="MH" draft="unconfirmed">Pulo Marsal</territory>
-			<territory type="MK" draft="unconfirmed">Makèdoni Lor</territory>
+			<territory type="MK" draft="unconfirmed">Makédoni Lor</territory>
 			<territory type="ML" draft="unconfirmed">Mali</territory>
 			<territory type="MM" draft="unconfirmed">Mianmar (Birma)</territory>
 			<territory type="MN" draft="unconfirmed">Monggoli</territory>
@@ -1099,13 +1104,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc" draft="unconfirmed">Almenak Bingkok</type>
 			<type key="cf" type="account" draft="unconfirmed">Pormat Mata Uang Pembukuan</type>
 			<type key="cf" type="standard" draft="unconfirmed">Pormat Mata Uang Pakem</type>
-			<type key="collation" type="big5han" draft="unconfirmed">Rèntètan Sortir Tionghoa Terdisionil - Big5</type>
 			<type key="collation" type="compat" draft="unconfirmed">Rèntètan Sortir Sebelonnya, bakal kecocokan</type>
 			<type key="collation" type="dictionary" draft="unconfirmed">Rèntètan Sortir Kamus</type>
 			<type key="collation" type="ducet" draft="unconfirmed">Rèntètan Sortir Bawaan Unicode</type>
 			<type key="collation" type="emoji" draft="unconfirmed">Rèntètan Sortir Émoji</type>
 			<type key="collation" type="eor" draft="unconfirmed">Aturan Pengrèntètan Èropa</type>
-			<type key="collation" type="gb2312han" draft="unconfirmed">Rèntètan Sortir Tionghoa Ringkes - GB2312</type>
 			<type key="collation" type="phonebook" draft="unconfirmed">Rèntètan Sortir Buku Telepon</type>
 			<type key="collation" type="pinyin" draft="unconfirmed">Rèntètan Sortir Pin-in</type>
 			<type key="collation" type="reformed" draft="unconfirmed">Rèntètan Sortir Kerobah</type>
@@ -3119,9 +3122,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic draft="unconfirmed">Waktu Aprika Kulon</generic>
-					<standard draft="unconfirmed">Waktu Pakem Aprika Kulon</standard>
-					<daylight draft="unconfirmed">Waktu Musim Pentèr Aprika Kulon</daylight>
+					<standard draft="unconfirmed">Waktu Aprika Kulon</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3504,6 +3505,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard draft="unconfirmed">Waktu Guyana</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard draft="unconfirmed">Waktu Pakem Hawai-Aléut</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Waktu Hawai-Aléut</generic>
@@ -4939,7 +4945,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">milimol per lèter</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} milimol per lèter</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">bagèan per juta</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} bagèan per juta</unitPattern>
 			</unit>
@@ -5567,7 +5573,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">biji</displayName>
 				<unitPattern count="other" draft="unconfirmed">{0} biji</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part-per-1e6">
 				<displayName draft="unconfirmed">bagèan/juta</displayName>
 			</unit>
 			<unit type="concentr-percent">

make/data/cldr/common/main/bg.xml

@@ -276,6 +276,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">бафия</language>
 			<language type="ksh">кьолнски</language>
 			<language type="ku">кюрдски</language>
+			<language type="ku" menu="core">кюрдски</language>
+			<language type="ku" menu="extension">курманджи</language>
 			<language type="kum">кумикски</language>
 			<language type="kut">кутенай</language>
 			<language type="kv">коми</language>
@@ -792,6 +794,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">Китай</territory>
 			<territory type="CO">Колумбия</territory>
 			<territory type="CP">остров Клипертон</territory>
+			<territory type="CQ">Сарк</territory>
 			<territory type="CR">Коста Рика</territory>
 			<territory type="CU">Куба</territory>
 			<territory type="CV">Кабо Верде</territory>
@@ -1065,33 +1068,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">Сортиране на цифрите</key>
 			<key type="colStrength">Сила на сортиране</key>
 			<key type="currency">валута</key>
+			<key type="em">Представяне на емотикон</key>
 			<key type="hc">Часови формат (12- или 24-часов)</key>
 			<key type="lb">Стил за нов ред</key>
+			<key type="lw">Нов ред в средата на думите</key>
 			<key type="ms">Мерна система</key>
 			<key type="numbers">цифри</key>
+			<key type="ss">прекъсване на изречение след съкращение</key>
 			<key type="timezone">Часова зона</key>
 			<key type="va">Вариант на локала</key>
 			<key type="x">Собствена употреба</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">будистки календар</type>
+			<type key="calendar" type="buddhist" scope="core">будистки</type>
 			<type key="calendar" type="chinese">китайски календар</type>
+			<type key="calendar" type="chinese" scope="core">китайски</type>
 			<type key="calendar" type="coptic">коптски календар</type>
+			<type key="calendar" type="coptic" scope="core">коптски</type>
 			<type key="calendar" type="dangi">корейски календар</type>
+			<type key="calendar" type="dangi" scope="core">корейски</type>
 			<type key="calendar" type="ethiopic">етиопски календар</type>
+			<type key="calendar" type="ethiopic" scope="core">етиопски</type>
 			<type key="calendar" type="ethiopic-amete-alem">етиопски календар Амит Алем</type>
+			<type key="calendar" type="ethiopic-amete-alem" scope="core">етиопски Амит Алем</type>
 			<type key="calendar" type="gregorian">григориански календар</type>
+			<type key="calendar" type="gregorian" scope="core">григориански</type>
 			<type key="calendar" type="hebrew">еврейски календар</type>
+			<type key="calendar" type="hebrew" scope="core">еврейски</type>
 			<type key="calendar" type="indian">Индийски граждански календар</type>
 			<type key="calendar" type="islamic">ислямски календар</type>
-			<type key="calendar" type="islamic-civil">ислямски цивилен календар</type>
-			<type key="calendar" type="islamic-umalqura">ислямски календар (Ум ал-Кура)</type>
+			<type key="calendar" type="islamic" scope="core">Хиджра</type>
+			<type key="calendar" type="islamic-civil">ислямски календар Хиджра</type>
+			<type key="calendar" type="islamic-civil" scope="core">календар Хиджра</type>
+			<type key="calendar" type="islamic-umalqura">ислямски календар Хиджра (Ум ал-Кура)</type>
+			<type key="calendar" type="islamic-umalqura" scope="core">Хиджра (Ум ал-Кура)</type>
 			<type key="calendar" type="iso8601">календар съгласно ISO 8601</type>
 			<type key="calendar" type="japanese">японски календар</type>
+			<type key="calendar" type="japanese" scope="core">японски</type>
 			<type key="calendar" type="persian">персийски календар</type>
+			<type key="calendar" type="persian" scope="core">персийски</type>
 			<type key="calendar" type="roc">календар на Република Китай</type>
+			<type key="calendar" type="roc" scope="core">календар Мингуо</type>
 			<type key="cf" type="account">формат на валута за счетоводни цели</type>
+			<type key="cf" type="account" scope="core">счетоводен</type>
 			<type key="cf" type="standard">стандартен формат на валута</type>
+			<type key="cf" type="standard" scope="core">стандартен</type>
 			<type key="colAlternate" type="non-ignorable">Сортиране по символи</type>
 			<type key="colAlternate" type="shifted">Сортиране с пренебрегване на символи</type>
 			<type key="colBackwards" type="no">Нормално сортиране по диакритични знаци</type>
@@ -1101,21 +1123,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">Сортиране първо по горен регистър</type>
 			<type key="colCaseLevel" type="no">Сортиране без различаване на регистъра на буквите</type>
 			<type key="colCaseLevel" type="yes">Сортиране с различаване на регистъра на буквите</type>
-			<type key="collation" type="big5han">Традиционен китайски (Big5)</type>
 			<type key="collation" type="compat">предишен ред на сортиране, за съвместимост</type>
+			<type key="collation" type="compat" scope="core">съвместимост</type>
 			<type key="collation" type="dictionary">Речников ред на сортиране</type>
+			<type key="collation" type="dictionary" scope="core">речник</type>
 			<type key="collation" type="ducet">ред на сортиране в Unicode по подразбиране</type>
-			<type key="collation" type="gb2312han">Опростен китайски (GB2312)</type>
+			<type key="collation" type="ducet" scope="core">по подразбиране Unicode</type>
 			<type key="collation" type="phonebook">Азбучен ред</type>
+			<type key="collation" type="phonebook" scope="core">азбучен</type>
 			<type key="collation" type="phonetic">Фонетичен ред на сортиране</type>
+			<type key="collation" type="phonetic" scope="core">фонетичен</type>
 			<type key="collation" type="pinyin">Сортиране Пинин</type>
+			<type key="collation" type="pinyin" scope="core">Пинин</type>
 			<type key="collation" type="search">търсене с общо предназначение</type>
+			<type key="collation" type="search" scope="core">търсене</type>
 			<type key="collation" type="searchjl">Търсене по първоначални съгласни в хангул</type>
 			<type key="collation" type="standard">стандартен ред на сортиране</type>
+			<type key="collation" type="standard" scope="core">стандартен</type>
 			<type key="collation" type="stroke">Сортиране по щрих</type>
+			<type key="collation" type="stroke" scope="core">щрих</type>
 			<type key="collation" type="traditional">Традиционно сортиране</type>
+			<type key="collation" type="traditional" scope="core">традиционно</type>
 			<type key="collation" type="unihan">Ред на сортиране по ключове и черти</type>
+			<type key="collation" type="unihan" scope="core">ключове и черти</type>
 			<type key="collation" type="zhuyin">ред на сортиране Бопомофо</type>
+			<type key="collation" type="zhuyin" scope="core">Бопомофо</type>
 			<type key="colNormalization" type="no">Сортиране без нормализиране</type>
 			<type key="colNormalization" type="yes">Нормализирано сортиране в Уникод</type>
 			<type key="colNumeric" type="no">Сортиране на цифрите индивидуално</type>
@@ -1128,18 +1160,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">С пълна ширина</type>
 			<type key="d0" type="hwidth">С половин ширина</type>
 			<type key="d0" type="npinyin" draft="contributed">Цифрови</type>
+			<type key="em" type="default" scope="core">по подразбиране</type>
+			<type key="em" type="emoji" scope="core">емоджи</type>
+			<type key="em" type="text" scope="core">текст</type>
 			<type key="hc" type="h11">12-часова система (0 – 11)</type>
+			<type key="hc" type="h11" scope="core">12 (0 – 11)</type>
 			<type key="hc" type="h12">12-часова система (1 – 12)</type>
+			<type key="hc" type="h12" scope="core">12 (1 – 12)</type>
 			<type key="hc" type="h23">24-часова система (0 – 23)</type>
+			<type key="hc" type="h23" scope="core">24 (0 – 23)</type>
 			<type key="hc" type="h24">24-часова система (1 – 24)</type>
+			<type key="hc" type="h24" scope="core">24 (1 – 24)</type>
 			<type key="lb" type="loose">Свободен стил за нов ред</type>
+			<type key="lb" type="loose" scope="core">Свободен</type>
 			<type key="lb" type="normal">Нормален стил за нов ред</type>
+			<type key="lb" type="normal" scope="core">Нормален</type>
 			<type key="lb" type="strict">Строг стил за нов ред</type>
+			<type key="lb" type="strict" scope="core">Строг</type>
+			<type key="lw" type="breakall" scope="core">Разделяне на всички</type>
+			<type key="lw" type="keepall" scope="core">Запазване на всички</type>
+			<type key="lw" type="normal" scope="core">Нормално</type>
+			<type key="lw" type="phrase" scope="core">Запазване във фразите</type>
 			<type key="m0" type="bgn">АКГН (BGN)</type>
 			<type key="m0" type="ungegn">ГЕСГИ ООН (UNGEGN)</type>
 			<type key="ms" type="metric">Метрична система</type>
+			<type key="ms" type="metric" scope="core">Метрична</type>
 			<type key="ms" type="uksystem">Имперска мерна система</type>
+			<type key="ms" type="uksystem" scope="core">Обединено кралство</type>
 			<type key="ms" type="ussystem">Мерна система на САЩ</type>
+			<type key="ms" type="ussystem" scope="core">САЩ</type>
 			<type key="numbers" type="arab">арабско-индийски цифри</type>
 			<type key="numbers" type="arabext">разширени арабско-индийски цифри</type>
 			<type key="numbers" type="armn">арменски цифри</type>
@@ -1184,6 +1233,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">тибетски цифри</type>
 			<type key="numbers" type="traditional">Традиционни цифри</type>
 			<type key="numbers" type="vaii">цифри във ваи</type>
+			<type key="ss" type="none" scope="core">изкл.</type>
+			<type key="ss" type="standard" scope="core">вкл.</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">метрична</measurementSystemName>
@@ -1248,6 +1299,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1256,6 +1310,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern draft="contributed">{1} 'в' {0}</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
@@ -1292,6 +1349,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hm">HH:mm 'ч'.</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss 'ч'. a</dateFormatItem>
 						<dateFormatItem id="Hms">HH:mm:ss 'ч'.</dateFormatItem>
+						<dateFormatItem id="Hv" draft="contributed">HH 'ч' v</dateFormatItem>
 						<dateFormatItem id="M">M</dateFormatItem>
 						<dateFormatItem id="Md">d.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.MM</dateFormatItem>
@@ -1652,6 +1710,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0} 'ч'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
@@ -1660,11 +1721,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat type="atTime">
 							<pattern>{1} 'в' {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1} 'в' {0} 'ч'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1}, {0}</pattern>
 						</dateTimeFormat>
+						<dateTimeFormat type="relative">
+							<pattern>{1}, {0} 'ч'</pattern>
+						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
@@ -1675,15 +1742,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">h 'ч'. B</dateFormatItem>
 						<dateFormatItem id="Bhm">h:mm 'ч'. B</dateFormatItem>
 						<dateFormatItem id="Bhms">h:mm:ss 'ч'. B</dateFormatItem>
+						<dateFormatItem id="EBh">E, h B</dateFormatItem>
 						<dateFormatItem id="EBhm">E, h:mm 'ч'. B</dateFormatItem>
 						<dateFormatItem id="EBhms">E, h:mm:ss 'ч'. B</dateFormatItem>
 						<dateFormatItem id="Ed">E, d</dateFormatItem>
+						<dateFormatItem id="Eh">E, h a</dateFormatItem>
 						<dateFormatItem id="Ehm">E, h:mm 'ч'. a</dateFormatItem>
 						<dateFormatItem id="EHm">E, HH:mm 'ч'.</dateFormatItem>
 						<dateFormatItem id="Ehms">E, h:mm:ss 'ч'. a</dateFormatItem>
 						<dateFormatItem id="EHms">E, HH:mm:ss 'ч'.</dateFormatItem>
 						<dateFormatItem id="Gy">y 'г'. G</dateFormatItem>
+						<dateFormatItem id="GyM">M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMd">dd.MM.y 'г'. GGGGG</dateFormatItem>
+						<dateFormatItem id="GyMEd">E, d.M.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MM.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">d.MM.y 'г'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E, d.MM.y 'г'. G</dateFormatItem>
@@ -1700,6 +1771,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Hmsv">HH:mm:ss 'ч'. v</dateFormatItem>
 						<dateFormatItem id="hmv">h:mm 'ч'. a v</dateFormatItem>
 						<dateFormatItem id="Hmv">HH:mm 'ч'. v</dateFormatItem>
+						<dateFormatItem id="hv">h 'ч'. a v</dateFormatItem>
+						<dateFormatItem id="Hv">HH 'ч' v</dateFormatItem>
 						<dateFormatItem id="Md">d.MM</dateFormatItem>
 						<dateFormatItem id="MEd">E, d.MM</dateFormatItem>
 						<dateFormatItem id="MMM">MM</dateFormatItem>
@@ -2558,6 +2631,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<timeZoneNames>
 			<gmtFormat>Гринуич{0}</gmtFormat>
 			<gmtZeroFormat>Гринуич</gmtZeroFormat>
+			<gmtUnknownFormat draft="contributed">Гринуич+?</gmtUnknownFormat>
 			<regionFormat type="daylight">{0} – лятно часово време</regionFormat>
 			<regionFormat type="standard">{0} – стандартно време</regionFormat>
 			<zone type="Pacific/Honolulu">
@@ -2913,6 +2987,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Pacific/Easter">
 				<exemplarCity>Великденски остров</exemplarCity>
 			</zone>
+			<zone type="America/Coyhaique">
+				<exemplarCity draft="contributed">Койайке</exemplarCity>
+			</zone>
 			<zone type="America/Punta_Arenas">
 				<exemplarCity>Пунта Аренас</exemplarCity>
 			</zone>
@@ -3178,9 +3255,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>Пном Пен</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендърбъри</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3850,9 +3924,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западноафриканско време</generic>
-					<standard>Западноафриканско стандартно време</standard>
-					<daylight>Западноафриканско лятно часово време</daylight>
+					<standard>Западноафриканско време</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4209,6 +4281,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>Гаяна</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавайско-алеутско стандартно време</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавайско-алеутско време</generic>
@@ -4791,9 +4868,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤;(#,##0.00 ¤)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
@@ -6079,6 +6159,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="other">източнокарибски долара</displayName>
 				<symbol>XCD</symbol>
 			</currency>
+			<currency type="XCG">
+				<displayName draft="contributed">Карибски гулден</displayName>
+				<displayName count="one">Карибски гулден</displayName>
+				<displayName count="other">Карибски гулден</displayName>
+			</currency>
 			<currency type="XDR">
 				<displayName>Специални права на тираж</displayName>
 			</currency>
@@ -6172,6 +6257,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<displayName count="one">зимбабвийски долар</displayName>
 				<displayName count="other">зимбабвийски долара</displayName>
 			</currency>
+			<currency type="ZWG">
+				<displayName draft="contributed">Зимбабвийско злато</displayName>
+				<displayName count="one">Зимбабвийско злато</displayName>
+				<displayName count="other">Зимбабвийско злато</displayName>
+			</currency>
 			<currency type="ZWL">
 				<displayName>Зимбабвийски долар (2009)</displayName>
 				<displayName count="one">зимбабвийски долар (2009)</displayName>
@@ -6306,7 +6396,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} метра за секунда на квадрат</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
-				<displayName>оборот</displayName>
+				<displayName>обороти</displayName>
 				<unitPattern count="one">{0} оборот</unitPattern>
 				<unitPattern count="other">{0} оборота</unitPattern>
 			</unit>
@@ -6395,7 +6485,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} единица</unitPattern>
 				<unitPattern count="other">{0} единици</unitPattern>
 			</unit>
-			<unit type="concentr-permillion">
+			<unit type="concentr-part">
+				<displayName draft="contributed">части</displayName>
+				<unitPattern count="one">{0} част</unitPattern>
+				<unitPattern count="other">{0} части</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e6">
 				<displayName>части на милион</displayName>
 				<unitPattern count="one">{0} част на милион</unitPattern>
 				<unitPattern count="other">{0} части на милион</unitPattern>
@@ -6415,9 +6510,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>молове</displayName>
-				<unitPattern count="one">{0} мол</unitPattern>
+				<unitPattern count="one">{0} mol</unitPattern>
 				<unitPattern count="other">{0} мола</unitPattern>
 			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>глюкоза</displayName>
+				<unitPattern count="one">{0} глюкоза</unitPattern>
+				<unitPattern count="other">{0} глюкоза</unitPattern>
+			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>литри на километър</displayName>
 				<unitPattern count="one">{0} литър на километър</unitPattern>
@@ -6935,6 +7035,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} милиметър живачен стълб</unitPattern>
 				<unitPattern count="other">{0} милиметра живачен стълб</unitPattern>
 			</unit>
+			<unit type="pressure-ofhg">
+				<displayName draft="contributed">живачен стълб</displayName>
+			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<displayName>фунтове на квадратен инч</displayName>
 				<unitPattern count="one">{0} фунт на квадратен инч</unitPattern>
@@ -7108,6 +7211,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} метрична чаша</unitPattern>
 				<unitPattern count="other">{0} метрични чаши</unitPattern>
 			</unit>
+			<unit type="volume-fluid-ounce-metric">
+				<displayName draft="contributed">метрични течни унции</displayName>
+				<unitPattern count="one" draft="contributed">{0} метрична течна унция</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} метрични течни унции</unitPattern>
+			</unit>
 			<unit type="volume-acre-foot">
 				<displayName>акър-футове</displayName>
 				<unitPattern count="one">{0} акър-фут</unitPattern>
@@ -7190,20 +7298,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} имперска кварта</unitPattern>
 				<unitPattern count="other">{0} имперски кварти</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлина</unitPattern>
+			<unit type="angle-steradian">
+				<displayName draft="contributed">стерадиани</displayName>
+				<unitPattern count="one" draft="contributed">{0} стерадиан</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} стерадиана</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-katal">
+				<displayName>катали</displayName>
+				<unitPattern count="one">{0} катал</unitPattern>
+				<unitPattern count="other">{0} катала</unitPattern>
+			</unit>
+			<unit type="electric-coulomb">
+				<displayName draft="contributed">кулони</displayName>
+				<unitPattern count="one" draft="contributed">{0} кулон</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} кулона</unitPattern>
+			</unit>
+			<unit type="electric-farad">
+				<displayName draft="contributed">фаради</displayName>
+				<unitPattern count="one" draft="contributed">{0} фарад</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} фарада</unitPattern>
+			</unit>
+			<unit type="electric-henry">
+				<displayName draft="contributed">хенри</displayName>
+				<unitPattern count="one" draft="contributed">{0} хенри</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} хенри</unitPattern>
+			</unit>
+			<unit type="electric-siemens">
+				<displayName draft="contributed">сименс</displayName>
+				<unitPattern count="one" draft="contributed">{0} сименс</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} сименса</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>калории [IT]</displayName>
+				<unitPattern count="one">{0} калория [IT]</unitPattern>
+				<unitPattern count="other">{0} калории [IT]</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<displayName>бекерели</displayName>
+				<unitPattern count="one">{0} бекерел</unitPattern>
+				<unitPattern count="other">{0} бекерела</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<displayName>сиверти</displayName>
+				<unitPattern count="one">{0} сиверт</unitPattern>
+				<unitPattern count="other">{0} сиверта</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<displayName>грей</displayName>
+				<unitPattern count="one">{0} грей</unitPattern>
+				<unitPattern count="other">{0} грея</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<displayName>килограм-сила</displayName>
+				<unitPattern count="one">{0} килограм-сила</unitPattern>
+				<unitPattern count="other">{0} килограма-сила</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<displayName draft="contributed">тесла</displayName>
+				<unitPattern count="one" draft="contributed">{0} тесла</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} тесла</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<displayName draft="contributed">вебери</displayName>
+				<unitPattern count="one" draft="contributed">{0} вебер</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} вебера</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
 				<displayName>части на милиард</displayName>
 				<unitPattern count="one">{0} част на милиард</unitPattern>
 				<unitPattern count="other">{0} части на милиард</unitPattern>
 			</unit>
 			<unit type="duration-night">
-				<displayName>нощи</displayName>
-				<unitPattern count="one">{0} нощ</unitPattern>
-				<unitPattern count="other">{0} нощи</unitPattern>
 				<perUnitPattern>{0} на нощ</perUnitPattern>
 			</unit>
 			<coordinateUnit>
@@ -7250,6 +7415,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ед.</unitPattern>
 				<unitPattern count="other">{0} ед.</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName draft="contributed">част</displayName>
+				<unitPattern count="one">{0} част</unitPattern>
+				<unitPattern count="other">{0} част</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>процент</displayName>
 			</unit>
@@ -7258,8 +7428,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="concentr-mole">
 				<displayName>мол</displayName>
-				<unitPattern count="one">{0} мол</unitPattern>
-				<unitPattern count="other">{0} мол</unitPattern>
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+				<unitPattern count="one">{0} Glc</unitPattern>
+				<unitPattern count="other">{0} Glc</unitPattern>
 			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>l/km</displayName>
@@ -7554,12 +7729,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} имп. кварта</unitPattern>
 				<unitPattern count="other">{0} имп. кварти</unitPattern>
 			</unit>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
+			</unit>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one">{0} cal-IT</unitPattern>
+				<unitPattern count="other">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-becquerel">
+				<unitPattern count="one">{0} Bq</unitPattern>
+				<unitPattern count="other">{0} Bq</unitPattern>
+			</unit>
+			<unit type="energy-sievert">
+				<unitPattern count="one">{0} Sv</unitPattern>
+				<unitPattern count="other">{0} Sv</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Wb</unitPattern>
+			</unit>
 			<unit type="speed-light-speed">
 				<displayName>светлина</displayName>
 				<unitPattern count="one">{0} светлина</unitPattern>
 				<unitPattern count="other">{0} светлина</unitPattern>
 			</unit>
-			<unit type="concentr-portion-per-1e9">
+			<unit type="concentr-part-per-1e9">
 				<displayName>части/милиард</displayName>
 			</unit>
 			<unit type="duration-night">
@@ -7584,12 +7792,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} кв. миля</unitPattern>
 				<unitPattern count="other">{0} кв. мили</unitPattern>
 			</unit>
+			<unit type="concentr-part">
+				<displayName>част</displayName>
+				<unitPattern count="one">{0} част</unitPattern>
+				<unitPattern count="other">{0} част</unitPattern>
+			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
 			<unit type="concentr-permyriad">
 				<displayName>‱</displayName>
 			</unit>
+			<unit type="concentr-mole">
+				<displayName>mol</displayName>
+				<unitPattern count="one">{0} mol</unitPattern>
+				<unitPattern count="other">{0} mol</unitPattern>
+			</unit>
+			<unit type="concentr-ofglucose">
+				<displayName>Glc</displayName>
+			</unit>
 			<unit type="digital-petabyte">
 				<displayName>PB</displayName>
 			</unit>
@@ -7661,16 +7882,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} брит. дес. лъж.</unitPattern>
 				<unitPattern count="other">{0} брит. дес. лъж.</unitPattern>
 			</unit>
-			<unit type="speed-light-speed">
-				<displayName>светлина</displayName>
-				<unitPattern count="one">{0} светлина</unitPattern>
-				<unitPattern count="other">{0} светлина</unitPattern>
+			<unit type="concentr-katal">
+				<unitPattern count="one">{0} kat</unitPattern>
+				<unitPattern count="other">{0} kat</unitPattern>
 			</unit>
-			<unit type="duration-night">
-				<displayName>нощи</displayName>
-				<unitPattern count="one">{0} нощ</unitPattern>
-				<unitPattern count="other">{0} нощи</unitPattern>
-				<perUnitPattern>{0}/нощ</perUnitPattern>
+			<unit type="energy-calorie-it">
+				<displayName>cal-IT</displayName>
+				<unitPattern count="one" draft="contributed">{0} cal-IT</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} cal-IT</unitPattern>
+			</unit>
+			<unit type="energy-gray">
+				<unitPattern count="one">{0} Gy</unitPattern>
+				<unitPattern count="other">{0} Gy</unitPattern>
+			</unit>
+			<unit type="force-kilogram-force">
+				<unitPattern count="one">{0} kgf</unitPattern>
+				<unitPattern count="other">{0} kgf</unitPattern>
+			</unit>
+			<unit type="magnetic-tesla">
+				<unitPattern count="one" draft="contributed">{0} T</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} T</unitPattern>
+			</unit>
+			<unit type="magnetic-weber">
+				<unitPattern count="one" draft="contributed">{0} Wb</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} Wb</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-1e9">
+				<displayName>ppb</displayName>
 			</unit>
 		</unitLength>
 	</units>

make/data/cldr/common/main/bm_Nkoo.xml

@@ -156,6 +156,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern draft="unconfirmed">¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>

make/data/cldr/common/main/bn_IN.xml

@@ -143,6 +143,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##,##0.00;(¤#,##,##0.00)</pattern>

make/data/cldr/common/main/bqi.xml

@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bqi"/>
+	</identity>
+	<localeDisplayNames>
+		<localeDisplayPattern>
+			<localeSeparator draft="unconfirmed">{0}، {1}</localeSeparator>
+		</localeDisplayPattern>
+		<languages>
+			<language type="ar" draft="unconfirmed">عروی</language>
+			<language type="ar_001" draft="unconfirmed">عروی استاندارد مودرن</language>
+			<language type="bn" draft="unconfirmed">بنگلا</language>
+			<language type="bqi" draft="unconfirmed">لوری بختیاری</language>
+			<language type="de" draft="unconfirmed">آلمانی</language>
+			<language type="de_AT" draft="unconfirmed">آلمانی اوتریشی</language>
+			<language type="de_CH" draft="unconfirmed">آلمانی روء سوییس</language>
+			<language type="en" draft="unconfirmed">اینگیلیسی</language>
+			<language type="en_AU" draft="unconfirmed">اینگیلیسی اوستورولیایی</language>
+			<language type="en_CA" draft="unconfirmed">اینگیلیسی کانادایی</language>
+			<language type="en_GB" draft="unconfirmed">اینگیلیسی بیریتانیایی</language>
+			<language type="en_US" draft="unconfirmed">اینگیلیسی آمریکایی</language>
+			<language type="es" draft="unconfirmed">اسپانیایی</language>
+			<language type="es_419" draft="unconfirmed">اسپانیایی آمریکای لاتین</language>
+			<language type="es_ES" draft="unconfirmed">اسپانیایی اوروپایی</language>
+			<language type="es_MX" draft="unconfirmed">اسپانیایی مکزیکی</language>
+			<language type="fr" draft="unconfirmed">فرانسوی</language>
+			<language type="fr_CA" draft="unconfirmed">فرانسوی کانادایی</language>
+			<language type="fr_CH" draft="unconfirmed">فرانسوی سوییسی</language>
+			<language type="hi_Latn" draft="unconfirmed">هیندی لاتین</language>
+			<language type="id" draft="unconfirmed">اندونزیایی</language>
+			<language type="it" draft="unconfirmed">ایتالیایی</language>
+			<language type="ja" draft="unconfirmed">ژاپونی</language>
+			<language type="ko" draft="unconfirmed">کوره ای</language>
+			<language type="nl" draft="unconfirmed">هولندی</language>
+			<language type="nl_BE" draft="unconfirmed">فلاندری</language>
+			<language type="pl" draft="unconfirmed">لهستووی</language>
+			<language type="pt" draft="unconfirmed">پورتقالی</language>
+			<language type="pt_BR" draft="unconfirmed">پورتقالی بریزیلی</language>
+			<language type="pt_PT" draft="unconfirmed">پورتقالی اوروپایی</language>
+			<language type="ru" draft="unconfirmed">روسی</language>
+			<language type="th" draft="unconfirmed">تایلندی</language>
+			<language type="tr" draft="unconfirmed">تورکی</language>
+			<language type="und" draft="unconfirmed">زوون نشناخته</language>
+			<language type="zh" draft="unconfirmed">چینی</language>
+			<language type="zh" alt="menu" draft="unconfirmed">چینی، ماندارین</language>
+			<language type="zh_Hans" draft="unconfirmed">چینی ساده وابیده</language>
+			<language type="zh_Hans" alt="long" draft="unconfirmed">چینی ماندارین ساده وابیده</language>
+			<language type="zh_Hant" draft="unconfirmed">چینی سونتی</language>
+			<language type="zh_Hant" alt="long" draft="unconfirmed">چینی سونتی ماندارین</language>
+		</languages>
+		<scripts>
+			<script type="Arab" draft="unconfirmed">عروی</script>
+			<script type="Cyrl" draft="unconfirmed">سیریلیک</script>
+			<script type="Hans" draft="unconfirmed">ساده وابیده</script>
+			<script type="Hans" alt="stand-alone" draft="unconfirmed">هان ساده وابیده</script>
+			<script type="Hant" draft="unconfirmed">سونتی</script>
+			<script type="Hant" alt="stand-alone" draft="unconfirmed">هان سونتی</script>
+			<script type="Jpan" draft="unconfirmed">ژاپونی</script>
+			<script type="Kore" draft="unconfirmed">کوره ای</script>
+			<script type="Latn" draft="unconfirmed">لاتین</script>
+			<script type="Zxxx" draft="unconfirmed">ننوشته</script>
+			<script type="Zzzz" draft="unconfirmed">اسکریپت نشناخته</script>
+		</scripts>
+		<territories>
+			<territory type="IR" draft="unconfirmed">ایران</territory>
+		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="metric" draft="unconfirmed">متریک</measurementSystemName>
+			<measurementSystemName type="UK" draft="unconfirmed">بریتانیایی</measurementSystemName>
+			<measurementSystemName type="US" draft="unconfirmed">امریکایی</measurementSystemName>
+		</measurementSystemNames>
+		<codePatterns>
+			<codePattern type="language" draft="unconfirmed">زوون: {0}</codePattern>
+			<codePattern type="script" draft="unconfirmed">تور: {0}</codePattern>
+			<codePattern type="territory" draft="unconfirmed">ناحیه: {0}</codePattern>
+		</codePatterns>
+	</localeDisplayNames>
+	<layout>
+		<orientation>
+			<characterOrder>right-to-left</characterOrder>
+		</orientation>
+	</layout>
+	<characters>
+		<!-- Using the Persian orthography -->
+		<exemplarCharacters>[ً ٌ ٍ ّ ٔ ء آ أ ؤ ئ ا ب پ ة ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[ـ\u200C\u200D\u200E\u200F َ ُ ِ ْ ٖ ٰ إ ك ى ي]</exemplarCharacters>
+		<exemplarCharacters type="index">[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart draft="unconfirmed">«</quotationStart>
+		<quotationEnd draft="unconfirmed">»</quotationEnd>
+		<alternateQuotationStart draft="unconfirmed">‹</alternateQuotationStart>
+		<alternateQuotationEnd draft="unconfirmed">›</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1" draft="unconfirmed">ژانویه</month>
+							<month type="2" draft="unconfirmed">فوریه</month>
+							<month type="3" draft="unconfirmed">مارس</month>
+							<month type="4" draft="unconfirmed">آوریل</month>
+							<month type="5" draft="unconfirmed">مهٔ</month>
+							<month type="6" draft="unconfirmed">ژوئن</month>
+							<month type="7" draft="unconfirmed">ژوئیه</month>
+							<month type="8" draft="unconfirmed">اوت</month>
+							<month type="9" draft="unconfirmed">سپتامبر</month>
+							<month type="10" draft="unconfirmed">اکتبر</month>
+							<month type="11" draft="unconfirmed">نوامبر</month>
+							<month type="12" draft="unconfirmed">دسامبر</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="wide">
+							<day type="sun" draft="unconfirmed">یه شمبه</day>
+							<day type="mon" draft="unconfirmed">دوشمبه</day>
+							<day type="tue" draft="unconfirmed">سه شمبه</day>
+							<day type="wed" draft="unconfirmed">چار شمبه</day>
+							<day type="thu" draft="unconfirmed">پنجشمبه</day>
+							<day type="fri" draft="unconfirmed">جومه</day>
+							<day type="sat" draft="unconfirmed">شمبه</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am" draft="unconfirmed">پیش ز ظهر</dayPeriod>
+							<dayPeriod type="pm" draft="unconfirmed">بعد ز ظهر</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+				</dayPeriods>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="yMd" draft="unconfirmed">y/M/d</dateFormatItem>
+						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback draft="unconfirmed">{0} تا {1}</intervalFormatFallback>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="era">
+				<displayName draft="unconfirmed">دوران</displayName>
+			</field>
+			<field type="year">
+				<displayName draft="unconfirmed">سال</displayName>
+				<relative type="-1" draft="unconfirmed">سال گوذشته</relative>
+				<relative type="0" draft="unconfirmed">امسال</relative>
+				<relative type="1" draft="unconfirmed">سال نیایی</relative>
+			</field>
+			<field type="year-short">
+				<displayName draft="unconfirmed">سال</displayName>
+				<relative type="-1" draft="unconfirmed">سال گوذشته</relative>
+				<relative type="0" draft="unconfirmed">امسال</relative>
+				<relative type="1" draft="unconfirmed">سال نیایی</relative>
+			</field>
+			<field type="year-narrow">
+				<displayName draft="unconfirmed">سال</displayName>
+				<relative type="-1" draft="unconfirmed">سال گوذشته</relative>
+				<relative type="0" draft="unconfirmed">امسال</relative>
+				<relative type="1" draft="unconfirmed">سال نیایی</relative>
+			</field>
+			<field type="quarter">
+				<displayName draft="unconfirmed">سه ماهه</displayName>
+			</field>
+			<field type="quarter-short">
+				<displayName draft="unconfirmed">سه ماهه</displayName>
+			</field>
+			<field type="quarter-narrow">
+				<displayName draft="unconfirmed">سه ماهه</displayName>
+			</field>
+			<field type="month">
+				<displayName draft="unconfirmed">ما</displayName>
+				<relative type="-1" draft="unconfirmed">ما گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای ما</relative>
+				<relative type="1" draft="unconfirmed">ما نیایی</relative>
+			</field>
+			<field type="month-short">
+				<displayName draft="unconfirmed">ما</displayName>
+				<relative type="-1" draft="unconfirmed">ما گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای ما</relative>
+				<relative type="1" draft="unconfirmed">ما نیایی</relative>
+			</field>
+			<field type="month-narrow">
+				<displayName draft="unconfirmed">ما</displayName>
+				<relative type="-1" draft="unconfirmed">ما گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای ما</relative>
+				<relative type="1" draft="unconfirmed">ما نیایی</relative>
+			</field>
+			<field type="week">
+				<displayName draft="unconfirmed">هفته</displayName>
+				<relative type="-1" draft="unconfirmed">هفته گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای هفته</relative>
+				<relative type="1" draft="unconfirmed">هفته نیایی</relative>
+				<relativePeriod draft="unconfirmed">هفته {0}</relativePeriod>
+			</field>
+			<field type="week-short">
+				<displayName draft="unconfirmed">هفته</displayName>
+				<relative type="-1" draft="unconfirmed">هفته گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای هفته</relative>
+				<relative type="1" draft="unconfirmed">هفته نیایی</relative>
+				<relativePeriod draft="unconfirmed">هفته {0}</relativePeriod>
+			</field>
+			<field type="week-narrow">
+				<displayName draft="unconfirmed">هفته</displayName>
+				<relative type="-1" draft="unconfirmed">هفته گوذشته</relative>
+				<relative type="0" draft="unconfirmed">ای هفته</relative>
+				<relative type="1" draft="unconfirmed">هفته نیایی</relative>
+				<relativePeriod draft="unconfirmed">هفته {0}</relativePeriod>
+			</field>
+			<field type="day">
+				<displayName draft="unconfirmed">روز</displayName>
+				<relative type="-1" draft="unconfirmed">دوش</relative>
+				<relative type="0" draft="unconfirmed">امروز</relative>
+				<relative type="1" draft="unconfirmed">صوه</relative>
+			</field>
+			<field type="day-short">
+				<displayName draft="unconfirmed">روز</displayName>
+				<relative type="-1" draft="unconfirmed">دوش</relative>
+				<relative type="0" draft="unconfirmed">امروز</relative>
+				<relative type="1" draft="unconfirmed">صوه</relative>
+			</field>
+			<field type="day-narrow">
+				<displayName draft="unconfirmed">روز</displayName>
+				<relative type="-1" draft="unconfirmed">دوش</relative>
+				<relative type="0" draft="unconfirmed">امروز</relative>
+				<relative type="1" draft="unconfirmed">صوه</relative>
+			</field>
+			<field type="weekday">
+				<displayName draft="unconfirmed">روز هفته</displayName>
+			</field>
+			<field type="dayperiod">
+				<displayName draft="unconfirmed">پ.ظ/ب.ظ</displayName>
+			</field>
+			<field type="hour">
+				<displayName draft="unconfirmed">ساعت</displayName>
+			</field>
+			<field type="hour-short">
+				<displayName draft="unconfirmed">ساعت</displayName>
+			</field>
+			<field type="hour-narrow">
+				<displayName draft="unconfirmed">ساعت</displayName>
+			</field>
+			<field type="minute">
+				<displayName draft="unconfirmed">دیقه</displayName>
+			</field>
+			<field type="minute-short">
+				<displayName draft="unconfirmed">دیقه</displayName>
+			</field>
+			<field type="minute-narrow">
+				<displayName draft="unconfirmed">دیقه</displayName>
+			</field>
+			<field type="second">
+				<displayName draft="unconfirmed">ثانیه</displayName>
+			</field>
+			<field type="second-short">
+				<displayName draft="unconfirmed">ثانیه</displayName>
+			</field>
+			<field type="second-narrow">
+				<displayName draft="unconfirmed">ثانیه</displayName>
+			</field>
+			<field type="zone">
+				<displayName draft="unconfirmed">جاگه زمووی</displayName>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<hourFormat draft="unconfirmed">‎+HH:mm;‎−HH:mm</hourFormat>
+			<gmtFormat draft="unconfirmed">{0} گرینویچ</gmtFormat>
+			<gmtZeroFormat draft="unconfirmed">گرینویچ</gmtZeroFormat>
+			<regionFormat draft="unconfirmed">مجال {0}</regionFormat>
+			<regionFormat type="daylight" draft="unconfirmed">مجال توستووی {0}</regionFormat>
+			<regionFormat type="standard" draft="unconfirmed">مجال عادی {0}</regionFormat>
+			<metazone type="GMT">
+				<long>
+					<standard draft="unconfirmed">مجال گرینویچ</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="arab">
+			<percentSign draft="unconfirmed">٪</percentSign>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<plusSign draft="unconfirmed">+‎</plusSign>
+			<minusSign draft="unconfirmed">‎−</minusSign>
+		</symbols>
+		<symbols numberSystem="latn">
+			<plusSign draft="unconfirmed">‎+</plusSign>
+			<minusSign draft="unconfirmed">‎−</minusSign>
+		</symbols>
+		<currencyFormats numberSystem="arabext">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">‎#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">‎#,##0.00;‎(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern draft="unconfirmed">‎¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00</pattern>
+					<pattern alt="noCurrency">‎#,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern draft="unconfirmed">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
+					<pattern alt="noCurrency">‎#,##0.00;‎(#,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+			<currencyFormatLength type="short">
+				<currencyFormat type="standard">
+					<pattern type="1000" count="other" draft="unconfirmed">0 هزار ¤</pattern>
+					<pattern type="10000" count="other" draft="unconfirmed">00 هزار ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>

make/data/cldr/common/main/bqi_IR.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bqi"/>
+		<territory type="IR"/>
+	</identity>
+</ldml>

make/data/cldr/common/main/brx.xml

@@ -1059,9 +1059,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">मिंगुव’ फान्जामुथि</type>
 			<type key="cf" type="account">मुद्रानि नुथायखौ हिसाब लाखिनाय</type>
 			<type key="cf" type="standard">थाखोआरि मुद्रानि नुथाय</type>
-			<type key="collation" type="big5han">पारम्पारिक चीनी वर्गीकरण बीग फ़ाईव</type>
 			<type key="collation" type="ducet">गरहाजिर इउनिकड रान्नायनि फारि</type>
-			<type key="collation" type="gb2312han">सरलीकृत चीनी वर्गीकरण जीबी2312</type>
 			<type key="collation" type="phonebook">दूरभाष निर्देशिका वर्गीकरण</type>
 			<type key="collation" type="pinyin">पिनयीन वर्गीकरण</type>
 			<type key="collation" type="search">सादारन-जाहोननि नायगिरनाय</type>
@@ -1551,13 +1549,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="GyMd">GGGGG dd-MM-y</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">G y MMM E d</dateFormatItem>
 						<dateFormatItem id="h">a नि h</dateFormatItem>
-						<dateFormatItem id="hmsv">a नि h:mm:ss v</dateFormatItem>
 						<dateFormatItem id="hmv">a h:mm v</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
 						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">dd-MM-y</dateFormatItem>
@@ -1648,7 +1644,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
 							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M –/dM</greatestDifference>
+							<greatestDifference id="M">d/M – d/M</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
 							<greatestDifference id="d">d/M, E –d/M, E</greatestDifference>
@@ -2575,9 +2571,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<exemplarCity>नॉम पेन</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
-				<exemplarCity>एन्डारबारी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kanton">
 				<exemplarCity>केन्ट’न</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3251,9 +3244,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>सोनाब आफ्रिकानि सम</generic>
-					<standard>सोनाब आफ्रिकानि थाखोआरि सम</standard>
-					<daylight>सोनाब आफ्रिकानि दैज्लां सम</daylight>
+					<standard>सोनाब आफ्रिकानि सम</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3636,6 +3627,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>गुयाना सम</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>हावाई-एल्युतियान थाखोआरि सम</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>हावाई-एल्युतियान सम</generic>
@@ -4084,6 +4080,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>चूक सम</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>तुर्की टाईम</generic>
+					<standard>तुर्की स्टैंडर्ड टाईम</standard>
+					<daylight>तुर्की समर टाईम</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>तुर्कमेनीस्तान सम</generic>
@@ -4249,39 +4252,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<currencyFormats numberSystem="deva">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##,##0.00</pattern>
 					<pattern alt="noCurrency" draft="provisional">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00;(¤ #,##0.00)</pattern>
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
 				<currencyFormat type="standard">
-					<pattern type="100000" count="one">¤000K</pattern>
-					<pattern type="100000" count="other">¤000K</pattern>
-					<pattern type="1000000" count="one">¤0M</pattern>
-					<pattern type="1000000" count="other">¤0M</pattern>
-					<pattern type="10000000" count="one">¤00M</pattern>
-					<pattern type="10000000" count="other">¤00M</pattern>
-					<pattern type="100000000" count="one">¤000M</pattern>
-					<pattern type="100000000" count="other">¤000M</pattern>
-					<pattern type="1000000000" count="one">¤0B</pattern>
-					<pattern type="1000000000" count="other">¤0B</pattern>
-					<pattern type="10000000000" count="one">¤00B</pattern>
-					<pattern type="10000000000" count="other">¤00B</pattern>
-					<pattern type="100000000000" count="one">¤000B</pattern>
-					<pattern type="100000000000" count="other">¤000B</pattern>
-					<pattern type="1000000000000" count="one">¤0T</pattern>
-					<pattern type="1000000000000" count="other">¤0T</pattern>
-					<pattern type="10000000000000" count="one">¤00T</pattern>
-					<pattern type="10000000000000" count="other">¤00T</pattern>
-					<pattern type="100000000000000" count="one">¤000T</pattern>
-					<pattern type="100000000000000" count="other">¤000T</pattern>
+					<pattern type="1000" count="one">¤ 0के</pattern>
+					<pattern type="1000" count="other">¤ 0के</pattern>
+					<pattern type="10000" count="one">¤ 00के</pattern>
+					<pattern type="10000" count="other">¤ 00के</pattern>
+					<pattern type="100000" count="one">¤ 000के</pattern>
+					<pattern type="100000" count="other">¤ 000के</pattern>
+					<pattern type="1000000" count="one">¤ 0एम</pattern>
+					<pattern type="1000000" count="other">¤ 0एम</pattern>
+					<pattern type="10000000" count="one">¤ 00एम</pattern>
+					<pattern type="10000000" count="other">¤ 00एम</pattern>
+					<pattern type="100000000" count="one">¤ 000एम</pattern>
+					<pattern type="100000000" count="other">¤ 000एम</pattern>
+					<pattern type="1000000000" count="one">¤ 0बि</pattern>
+					<pattern type="1000000000" count="other">¤ 0बि</pattern>
+					<pattern type="10000000000" count="one">¤ 00बि</pattern>
+					<pattern type="10000000000" count="other">¤ 00बि</pattern>
+					<pattern type="100000000000" count="one">¤ 000बि</pattern>
+					<pattern type="100000000000" count="other">¤ 000बि</pattern>
+					<pattern type="1000000000000" count="one">¤ 0ति</pattern>
+					<pattern type="1000000000000" count="other">¤ 0ति</pattern>
+					<pattern type="10000000000000" count="one">¤ 00ति</pattern>
+					<pattern type="10000000000000" count="other">¤ 00ति</pattern>
+					<pattern type="100000000000000" count="one">¤ 000ति</pattern>
+					<pattern type="100000000000000" count="other">¤ 000ति</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyPatternAppendISO>{0} ¤¤</currencyPatternAppendISO>

make/data/cldr/common/main/bs_Cyrl.xml

@@ -1144,10 +1144,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<type key="calendar" type="roc">Календар Републике Кине</type>
 			<type key="cf" type="account">рачуноводствени формат валуте</type>
 			<type key="cf" type="standard">стандардни формат валуте</type>
-			<type key="collation" type="big5han">Традиционално кинеско сортирање</type>
 			<type key="collation" type="dictionary" draft="contributed">Редослед сортирања у речнику</type>
 			<type key="collation" type="ducet">задани Unicode редослијед сортирања</type>
-			<type key="collation" type="gb2312han">Поједностављено кинеско сортирање</type>
 			<type key="collation" type="phonebook">Сортирање као телефонски именик</type>
 			<type key="collation" type="pinyin">Пињин сортирање</type>
 			<type key="collation" type="reformed" draft="contributed">Реформисани редослед сортирања</type>
@@ -3145,9 +3143,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity>Пном Пен</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербери</exemplarCity>
-			</zone>
 			<zone type="Pacific/Kiritimati">
 				<exemplarCity>Киритимати</exemplarCity>
 			</zone>
@@ -3819,9 +3814,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<generic>Западно-афричко вријеме</generic>
-					<standard>Западно-афричко стандардно вријеме</standard>
-					<daylight>Западно-афричко љетње рачунање времена</daylight>
+					<standard>Западно-афричко вријеме</standard>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -4204,6 +4197,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Гвајана вријеме</standard>
 				</long>
 			</metazone>
+			<metazone type="Hawaii">
+				<long>
+					<standard>Хавајско-алеутско стандардно вријеме</standard>
+				</long>
+			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>Хавајско-алеутско вријеме</generic>
@@ -4654,6 +4652,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<standard>Трук вријеме</standard>
 				</long>
 			</metazone>
+			<metazone type="Turkey">
+				<long>
+					<generic>Турска време</generic>
+					<standard>Турска стандардно време</standard>
+					<daylight>Турска летње рачунање времена</daylight>
+				</long>
+			</metazone>
 			<metazone type="Turkmenistan">
 				<long>
 					<generic>Туркменистан вријеме</generic>
@@ -4821,6 +4826,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">

make/data/cldr/common/main/bua.xml

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bua"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="bua">буряад</language>
+			<language type="en">англи</language>
+		</languages>
+		<scripts>
+			<script type="Cyrl">кирил</script>
+		</scripts>
+		<territories>
+			<territory type="RU">Ород Улас</territory>
+		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="metric">Мэтрик</measurementSystemName>
+			<measurementSystemName type="UK">ЕБ</measurementSystemName>
+			<measurementSystemName type="US">АНУ</measurementSystemName>
+		</measurementSystemNames>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[а б в г д её ж з и й к л м н о ө п р с т у ү ф х һ ц ч ш щ ъ ы ь э ю я]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary" draft="contributed">[{а́} {е́} {и́} {о́} {у́} {ы́} {э́} {ю́} {я́}]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
+	</characters>
+	<delimiters>
+		<quotationStart>«</quotationStart>
+		<quotationEnd>»</quotationEnd>
+		<alternateQuotationStart>„</alternateQuotationStart>
+		<alternateQuotationEnd>“</alternateQuotationEnd>
+	</delimiters>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+							<month type="1">нэгэдүгээр һара</month>
+							<month type="2">хоёрдугаар һара</month>
+							<month type="3">гурбадугаар һара</month>
+							<month type="4">дүрбэдүгээр һара</month>
+							<month type="5">табадугаар һара</month>
+							<month type="6">зургадугаар һара</month>
+							<month type="7">долодугаар һара</month>
+							<month type="8">наймадугаар һара</month>
+							<month type="9">юһэдүгээр һара</month>
+							<month type="10">арбадугаар һара</month>
+							<month type="11">арбан нэгэдүгээр һара</month>
+							<month type="12">арбан хоёрдугаар һара</month>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
+					<dayContext type="format">
+						<dayWidth type="narrow">
+							<day type="sun">Ни</day>
+							<day type="mon">Да</day>
+							<day type="tue">Ми</day>
+							<day type="wed">Һа</day>
+							<day type="thu">Пү</day>
+							<day type="fri">Ба</day>
+							<day type="sat">Би</day>
+						</dayWidth>
+						<dayWidth type="wide">
+							<day type="sun">нима</day>
+							<day type="mon">дабаа</day>
+							<day type="tue">мигмар</day>
+							<day type="wed">һарба</day>
+							<day type="thu">пүрбэ</day>
+							<day type="fri">баасан</day>
+							<day type="sat">бимба</day>
+						</dayWidth>
+					</dayContext>
+				</days>
+				<dateTimeFormats>
+					<availableFormats>
+						<dateFormatItem id="GyMMMd">G y MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MM 'һарын' d, E</dateFormatItem>
+						<dateFormatItem id="MMMd">MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="MMMEd">E, MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="MMMMd">MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="yMd">dd.MM.y</dateFormatItem>
+						<dateFormatItem id="yMMMd">y 'оной' MM 'һарын' d</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y 'оной' MM 'һарын' d, E</dateFormatItem>
+						<dateFormatItem id="yMMMM">y 'оной' MMMM</dateFormatItem>
+					</availableFormats>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="GyMMMd">
+							<greatestDifference id="d">G y MM 'һарын' d–d</greatestDifference>
+							<greatestDifference id="G">G y MM 'һарын' d – G y MM 'һарын' d</greatestDifference>
+							<greatestDifference id="M">G y MM 'һарын' d – MM 'һарын' d</greatestDifference>
+							<greatestDifference id="y">G y MM 'һарын' d – y MM 'һарын' d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="GyMMMEd">
+							<greatestDifference id="d">G y MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="G">G y MM 'һарын' d, E – G y MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="M">G y MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="y">G y MM 'һарын' d, E – y MM 'һарын' d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MM 'һарын' d – d</greatestDifference>
+							<greatestDifference id="M">MM 'һарын' d – MM 'һарын' d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="M">MM 'һарын' d, E – MM 'һарын' d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">y MMM – MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">y 'оной' MMM d – d</greatestDifference>
+							<greatestDifference id="M">y 'оной' MM 'һарын' d – MM 'һарын' d</greatestDifference>
+							<greatestDifference id="y">y 'оной' MMMM d – y 'оной' MMMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">y 'оной' MM 'һарын' d, E – y 'оной' MM 'һарын' d, E</greatestDifference>
+							<greatestDifference id="M">E, MM 'һарын' d – E, MM 'һарын' d, y</greatestDifference>
+							<greatestDifference id="y">E, MM 'һарын' d, y – E, MM 'һарын' d, y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">y 'оной' MMMM – MMMM</greatestDifference>
+							<greatestDifference id="y">y 'оной' MMMM – y 'оной' MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+		</calendars>
+		<fields>
+			<field type="year">
+				<relative type="-1">үнгэрэгшэ жэл</relative>
+				<relative type="0">энэ жэл</relative>
+				<relative type="1">хойто жэл</relative>
+			</field>
+			<field type="month">
+				<relative type="-1">үнгэрэгшэ һара</relative>
+				<relative type="0">энэ һара</relative>
+				<relative type="1">хойто һара</relative>
+			</field>
+			<field type="week">
+				<relative type="-1">үнгэрэгшэ долоон хоног</relative>
+				<relative type="0">энэ долоон хоног</relative>
+				<relative type="1">хойто долоон хоног</relative>
+			</field>
+			<field type="day">
+				<relative type="-1">үсэгэлдэр</relative>
+				<relative type="0">мүнөө</relative>
+				<relative type="1">үглөөдэр</relative>
+			</field>
+			<field type="sun">
+				<relative type="-1">үнгэрэгшэ нима</relative>
+				<relative type="0">энэ нима</relative>
+				<relative type="1">хойто нима</relative>
+			</field>
+		</fields>
+		<timeZoneNames>
+			<metazone type="GMT">
+				<long>
+					<standard>Гринвичын саг</standard>
+				</long>
+			</metazone>
+		</timeZoneNames>
+	</dates>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="standard">
+					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+				<currencyFormat type="accounting">
+					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>

make/data/cldr/common/main/bua_RU.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="bua"/>
+		<territory type="RU"/>
+	</identity>
+</ldml>