From 21ce9772a7073babdffc25a3ac7dbfeb339594cd Mon Sep 17 00:00:00 2001 From: Calvin Cheung Date: Fri, 18 Oct 2019 09:17:38 -0700 Subject: [PATCH 001/163] 8232030: HelloDynamic.java fails with latest Graal Include the dynamic dumping condition when setting up the merged_ordering array in merge_in_new_methods() of defaultMethods.cpp. Reviewed-by: iklam, coleenp --- src/hotspot/share/classfile/defaultMethods.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp index dffcede6673..dec8223ec90 100644 --- a/src/hotspot/share/classfile/defaultMethods.cpp +++ b/src/hotspot/share/classfile/defaultMethods.cpp @@ -1012,7 +1012,7 @@ static void merge_in_new_methods(InstanceKlass* klass, klass->class_loader_data(), new_size, NULL, CHECK); // original_ordering might be empty if this class has no methods of its own - if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) { + if (JvmtiExport::can_maintain_original_method_order() || Arguments::is_dumping_archive()) { merged_ordering = MetadataFactory::new_array( klass->class_loader_data(), new_size, CHECK); } From 2c573582ab76f721dade122390d8ff4da3ff7426 Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Fri, 18 Oct 2019 12:20:51 -0400 Subject: [PATCH 002/163] 8232009: Shenandoah: C2 load barrier does not match interpreter version Reviewed-by: rkennke --- .../share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp index 6e9dbcddfdf..d10440d0cc4 100644 --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp @@ -536,9 +536,12 @@ Node* ShenandoahBarrierSetC2::load_at_resolved(C2Access& access, const Type* val bool mismatched = (decorators & C2_MISMATCHED) != 0; bool unknown = (decorators & ON_UNKNOWN_OOP_REF) != 0; bool on_heap = (decorators & IN_HEAP) != 0; - bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0; + bool on_weak_ref = (decorators & (ON_WEAK_OOP_REF | ON_PHANTOM_OOP_REF)) != 0; bool is_unordered = (decorators & MO_UNORDERED) != 0; bool need_cpu_mem_bar = !is_unordered || mismatched || !on_heap; + bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); + bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode; + bool in_native = (decorators & IN_NATIVE) != 0; Node* top = Compile::current()->top(); @@ -547,7 +550,7 @@ Node* ShenandoahBarrierSetC2::load_at_resolved(C2Access& access, const Type* val if (access.is_oop()) { if (ShenandoahLoadRefBarrier) { - load = new ShenandoahLoadReferenceBarrierNode(NULL, load, (decorators & IN_NATIVE) != 0); + load = new ShenandoahLoadReferenceBarrierNode(NULL, load, in_native && !is_traversal_mode); if (access.is_parse_access()) { load = static_cast(access).kit()->gvn().transform(load); } else { @@ -563,7 +566,7 @@ Node* ShenandoahBarrierSetC2::load_at_resolved(C2Access& access, const Type* val // Also we need to add memory barrier to prevent commoning reads // from this field across safepoint since GC can change its value. bool need_read_barrier = ShenandoahKeepAliveBarrier && - (on_heap && (on_weak || (unknown && offset != top && obj != top))); + (on_weak_ref || (unknown && offset != top && obj != top)); if (!access.is_oop() || !need_read_barrier) { return load; @@ -573,7 +576,7 @@ Node* ShenandoahBarrierSetC2::load_at_resolved(C2Access& access, const Type* val C2ParseAccess& parse_access = static_cast(access); GraphKit* kit = parse_access.kit(); - if (on_weak) { + if (on_weak_ref && keep_alive) { // Use the pre-barrier to record the value in the referent field satb_write_barrier_pre(kit, false /* do_load */, NULL /* obj */, NULL /* adr */, max_juint /* alias_idx */, NULL /* val */, NULL /* val_type */, From f8440c33d22245ae02ec34982b8f1dd33ec7cc2b Mon Sep 17 00:00:00 2001 From: Julia Boes Date: Thu, 17 Oct 2019 08:56:06 +0100 Subject: [PATCH 003/163] 8225499: InetSocketAddress::toString not friendly to IPv6 literal addresses Enclose IPv6 literal in brackets and adjust string format for unresolved addresses Reviewed-by: dfuchs, chegar --- .../classes/java/net/InetSocketAddress.java | 17 ++- .../java/net/InetSocketAddress/ToString.java | 132 +++++++++++++++++- 2 files changed, 141 insertions(+), 8 deletions(-) diff --git a/src/java.base/share/classes/java/net/InetSocketAddress.java b/src/java.base/share/classes/java/net/InetSocketAddress.java index 6c1ed79b30d..f9f475a6cc6 100644 --- a/src/java.base/share/classes/java/net/InetSocketAddress.java +++ b/src/java.base/share/classes/java/net/InetSocketAddress.java @@ -101,11 +101,20 @@ public class InetSocketAddress @Override public String toString() { + + String formatted; + if (isUnresolved()) { - return hostname + ":" + port; + formatted = hostname + "/"; } else { - return addr.toString() + ":" + port; + formatted = addr.toString(); + if (addr instanceof Inet6Address) { + int i = formatted.lastIndexOf("/"); + formatted = formatted.substring(0, i + 1) + + "[" + formatted.substring(i + 1) + "]"; + } } + return formatted + ":" + port; } @Override @@ -367,7 +376,9 @@ public class InetSocketAddress * Constructs a string representation of this InetSocketAddress. * This String is constructed by calling toString() on the InetAddress * and concatenating the port number (with a colon). If the address - * is unresolved then the part before the colon will only contain the hostname. + * is an IPv6 address, the IPv6 literal is enclosed in square brackets. + * If the address is {@linkplain #isUnresolved() unresolved}, + * {@code } is displayed in place of the address literal. * * @return a string representation of this object. */ diff --git a/test/jdk/java/net/InetSocketAddress/ToString.java b/test/jdk/java/net/InetSocketAddress/ToString.java index 3f5d057acf6..33fd1dd6a73 100644 --- a/test/jdk/java/net/InetSocketAddress/ToString.java +++ b/test/jdk/java/net/InetSocketAddress/ToString.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2019, 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 @@ -23,19 +23,141 @@ /* * @test - * @bug 4464064 - * @summary InetSocketAddress.toString() throws NPE with unresolved address + * @bug 8225499 4464064 + * @library /test/lib + * @summary InetSocketAddress::toString not friendly to IPv6 literal addresses + * @run testng/othervm ToString + * @run testng/othervm -Djava.net.preferIPv4Stack=true ToString + * @run testng/othervm -Djava.net.preferIPv6Addresses=true ToString */ import java.net.*; -import java.io.*; +import jdk.test.lib.net.IPSupport; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; public class ToString { - public static void main (String args[]){ + private static final String loopbackAddr; + private static final String wildcardAddr; + private static final String localAddr; + static { + try { + InetAddress loopback = InetAddress.getLoopbackAddress(); + String addr = loopback.getHostAddress(); + if (loopback instanceof Inet6Address) { + addr = "[" + addr + "]"; + } + loopbackAddr = addr; + + InetSocketAddress isa = new InetSocketAddress((InetAddress) null, 80); + addr = isa.getAddress().toString(); + if (isa.getAddress() instanceof Inet6Address) { + addr = "::/[0:0:0:0:0:0:0:0]"; + } + wildcardAddr = addr; + + InetAddress ia = InetAddress.getLocalHost(); + addr = ia.toString(); + if (ia instanceof Inet6Address) { + addr = ia.getHostName() + "/[" + ia.getHostAddress() + "]"; + } + localAddr = addr; + + } catch (UnknownHostException uhe) { + throw new RuntimeException(uhe); + } + } + + @BeforeTest + public void setup() { + IPSupport.throwSkippedExceptionIfNonOperational(); + } + + @Test + // InetSocketAddress.toString() throws NPE with unresolved address + public static void NPETest() { System.out.println(new InetSocketAddress("unresolved", 12345)); + } + @DataProvider(name = "hostPortArgs") + public Object[][] createArgs1() { + return new Object[][]{ + // hostname, port number, expected string in format + // /: or + // /: if address is unresolved + {"::1", 80, "/[0:0:0:0:0:0:0:1]:80"}, + {"fedc:ba98:7654:3210:fedc:ba98:7654:3210", 80, "/[fedc:ba98:7654:3210:fedc:ba98:7654:3210]:80"}, + {"::192.9.5.5", 80, "/[0:0:0:0:0:0:c009:505]:80"}, + {"127.0.0.1", 80, "/127.0.0.1:80"}, + {"::ffff:192.0.2.128", 80, "/192.0.2.128:80"}, + {"0", 80, "/0.0.0.0:80"}, + {":", 80, ":/:80"}, + {":1", 80, ":1/:80"} + }; + } + + @Test(dataProvider = "hostPortArgs") + public static void testConstructor(String host, int port, String string) { + String received = new InetSocketAddress(host, port).toString(); + + if (!string.equals(received)) { + throw new RuntimeException("Expected: " + string + " Received: " + received); + } + } + + @DataProvider(name = "addrPortArgs") + public Object[][] createArgs2() { + InetAddress nullAddr = null; + try { + return new Object[][]{ + // InetAddress, port number, expected string + {InetAddress.getLoopbackAddress(), 80, "localhost/" + loopbackAddr + ":80"}, + {InetAddress.getLocalHost(), 80, localAddr + ":80"}, + {InetAddress.getByAddress(new byte[]{1, 1, 1, 1}), 80, "/1.1.1.1:80"}, + {InetAddress.getByAddress(new byte[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}), 80, "/[101:101:101:101:101:101:101:101]:80"}, + {InetAddress.getByName("225.225.225.0"), 80, "/225.225.225.0:80"}, + {nullAddr, 80, wildcardAddr + ":80"} + }; + } catch (UnknownHostException uhe) { + throw new RuntimeException("Data provider creation failed: " + uhe, uhe); + } + } + + @Test(dataProvider = "addrPortArgs") + public static void testConstructor(InetAddress addr, int port, String string) { + String received = new InetSocketAddress(addr, port).toString(); + + if (!string.equals(received)) { + throw new RuntimeException("Expected: " + string + " Received: " + received); + } + } + + @DataProvider(name = "unresolved") + public Object[][] createArgs3() { + return new Object[][]{ + // hostname, port number, expected string + {"::1", 80, "::1/:80"}, + {"fedc:ba98:7654:3210:fedc:ba98:7654:3210", 80, "fedc:ba98:7654:3210:fedc:ba98:7654:3210/:80"}, + {"::192.9.5.5", 80, "::192.9.5.5/:80"}, + {"127.0.0.1", 80, "127.0.0.1/:80"}, + {"::ffff:192.0.2.128", 80, "::ffff:192.0.2.128/:80"}, + {"0", 80, "0/:80"}, + {"foo", 80, "foo/:80"}, + {":", 80, ":/:80"}, + {":1", 80, ":1/:80"} + }; + } + + @Test(dataProvider = "unresolved") + public static void testCreateUnresolved(String host, int port, String string) { + String received = InetSocketAddress.createUnresolved(host, port).toString(); + + if (!string.equals(received)) { + throw new RuntimeException("Expected: " + string + " Received: " + received); + } } } From c497b2b06609074ca9f059626eb1ce2e57ec5122 Mon Sep 17 00:00:00 2001 From: Patrick Concannon Date: Wed, 16 Oct 2019 11:12:47 +0100 Subject: [PATCH 004/163] 8231719: Correct contradictions in timeout range descriptions Clarified verbiage in method descriptions. Reviewed-by: chegar, dfuchs --- .../share/classes/java/net/DatagramSocket.java | 10 +++++----- .../share/classes/java/net/ServerSocket.java | 13 +++++++------ src/java.base/share/classes/java/net/Socket.java | 9 ++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/java.base/share/classes/java/net/DatagramSocket.java b/src/java.base/share/classes/java/net/DatagramSocket.java index 05616406296..2cef22b58c5 100644 --- a/src/java.base/share/classes/java/net/DatagramSocket.java +++ b/src/java.base/share/classes/java/net/DatagramSocket.java @@ -888,14 +888,14 @@ class DatagramSocket implements java.io.Closeable { } /** Enable/disable SO_TIMEOUT with the specified timeout, in - * milliseconds. With this option set to a non-zero timeout, + * milliseconds. With this option set to a positive timeout value, * a call to receive() for this DatagramSocket * will block for only this amount of time. If the timeout expires, * a java.net.SocketTimeoutException is raised, though the - * DatagramSocket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * DatagramSocket is still valid. A timeout of zero is interpreted + * as an infinite timeout. + * The option must be enabled prior to entering the blocking + * operation to have effect. * * @param timeout the specified timeout in milliseconds. * @throws SocketException if there is an error in the underlying protocol, such as an UDP error. diff --git a/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java index b718b0ba8bd..8e3aa62a7da 100644 --- a/src/java.base/share/classes/java/net/ServerSocket.java +++ b/src/java.base/share/classes/java/net/ServerSocket.java @@ -749,14 +749,15 @@ class ServerSocket implements java.io.Closeable { /** * Enable/disable {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} with the - * specified timeout, in milliseconds. With this option set to a non-zero - * timeout, a call to accept() for this ServerSocket + * specified timeout, in milliseconds. With this option set to a positive + * timeout value, a call to accept() for this ServerSocket * will block for only this amount of time. If the timeout expires, * a java.net.SocketTimeoutException is raised, though the - * ServerSocket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * ServerSocket is still valid. A timeout of zero is interpreted as an + * infinite timeout. + * The option must be enabled prior to entering the blocking + * operation to have effect. + * * @param timeout the specified timeout, in milliseconds * @throws SocketException if there is an error in the underlying protocol, * such as a TCP error diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java index 93d0c042b8e..dc2f2d1ffee 100644 --- a/src/java.base/share/classes/java/net/Socket.java +++ b/src/java.base/share/classes/java/net/Socket.java @@ -1171,13 +1171,12 @@ class Socket implements java.io.Closeable { /** * Enable/disable {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} * with the specified timeout, in milliseconds. With this option set - * to a non-zero timeout, a read() call on the InputStream associated with + * to a positive timeout value, a read() call on the InputStream associated with * this Socket will block for only this amount of time. If the timeout * expires, a java.net.SocketTimeoutException is raised, though the - * Socket is still valid. The option must be enabled - * prior to entering the blocking operation to have effect. The - * timeout must be {@code > 0}. - * A timeout of zero is interpreted as an infinite timeout. + * Socket is still valid. A timeout of zero is interpreted as an infinite timeout. + * The option must be enabled prior to entering the blocking operation + * to have effect. * * @param timeout the specified timeout, in milliseconds. * @throws SocketException if there is an error in the underlying protocol, From 0f822d90d131f39b312598cabf8e5b90a0999f2e Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Fri, 18 Oct 2019 13:07:46 -0400 Subject: [PATCH 005/163] 8232010: Shenandoah: implement self-fixing native barrier Reviewed-by: rkennke --- .../shenandoahBarrierSetAssembler_x86.cpp | 45 ++++++++++++++++--- .../shenandoahBarrierSetAssembler_x86.hpp | 2 +- .../shenandoah/c1/shenandoahBarrierSetC1.cpp | 4 ++ .../gc/shenandoah/shenandoahBarrierSet.cpp | 10 ++++- .../gc/shenandoah/shenandoahBarrierSet.hpp | 4 +- .../shenandoahBarrierSet.inline.hpp | 2 +- .../share/gc/shenandoah/shenandoahRuntime.cpp | 4 +- .../share/gc/shenandoah/shenandoahRuntime.hpp | 2 +- 8 files changed, 59 insertions(+), 14 deletions(-) diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp index e315ef229a8..b39003a505c 100644 --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp @@ -333,7 +333,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembl #endif } -void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst) { +void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst, Address src) { if (!ShenandoahLoadRefBarrier) { return; } @@ -341,6 +341,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler Label done; Label not_null; Label slow_path; + __ block_comment("load_reference_barrier_native { "); // null check __ testptr(dst, dst); @@ -371,7 +372,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler __ bind(slow_path); if (dst != rax) { - __ xchgptr(dst, rax); // Move obj into rax and save rax into obj. + __ push(rax); } __ push(rcx); __ push(rdx); @@ -388,8 +389,9 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler __ push(r15); #endif - __ movptr(rdi, rax); - __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), rdi); + assert_different_registers(dst, rsi); + __ lea(rsi, src); + __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), dst, rsi); #ifdef _LP64 __ pop(r15); @@ -407,10 +409,12 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler __ pop(rcx); if (dst != rax) { - __ xchgptr(rax, dst); // Swap back obj with rax. + __ movptr(dst, rax); + __ pop(rax); } __ bind(done); + __ block_comment("load_reference_barrier_native { "); } void ShenandoahBarrierSetAssembler::storeval_barrier(MacroAssembler* masm, Register dst, Register tmp) { @@ -474,14 +478,43 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); bool keep_alive = ((decorators & AS_NO_KEEPALIVE) == 0) || is_traversal_mode; + Register result_dst = dst; + bool use_tmp1_for_dst = false; + + if (on_oop) { + // We want to preserve src + if (dst == src.base() || dst == src.index()) { + // Use tmp1 for dst if possible, as it is not used in BarrierAssembler::load_at() + if (tmp1->is_valid() && tmp1 != src.base() && tmp1 != src.index()) { + dst = tmp1; + use_tmp1_for_dst = true; + } else { + dst = rdi; + __ push(dst); + } + } + assert_different_registers(dst, src.base(), src.index()); + } + BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread); + if (on_oop) { if (not_in_heap && !is_traversal_mode) { - load_reference_barrier_native(masm, dst); + load_reference_barrier_native(masm, dst, src); } else { load_reference_barrier(masm, dst); } + if (dst != result_dst) { + __ movptr(result_dst, dst); + + if (!use_tmp1_for_dst) { + __ pop(dst); + } + + dst = result_dst; + } + if (ShenandoahKeepAliveBarrier && on_reference && keep_alive) { const Register thread = NOT_LP64(tmp_thread) LP64_ONLY(r15_thread); assert_different_registers(dst, tmp1, tmp_thread); diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp index f953786d0dc..270c0ad2aa2 100644 --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp @@ -76,7 +76,7 @@ public: #endif void load_reference_barrier(MacroAssembler* masm, Register dst); - void load_reference_barrier_native(MacroAssembler* masm, Register dst); + void load_reference_barrier_native(MacroAssembler* masm, Register dst, Address src); void cmpxchg_oop(MacroAssembler* masm, Register res, Address addr, Register oldval, Register newval, diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp index 94574b82e55..e0f02cb16d6 100644 --- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp +++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp @@ -215,9 +215,13 @@ void ShenandoahBarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result) assert(access.is_oop(), "IN_NATIVE access only for oop values"); BarrierSetC1::load_at_resolved(access, result); LIR_OprList* args = new LIR_OprList(); + LIR_Opr addr = access.resolved_addr(); + addr = ensure_in_register(gen, addr); args->append(result); + args->append(addr); BasicTypeList signature; signature.append(T_OBJECT); + signature.append(T_ADDRESS); LIR_Opr call_result = gen->call_runtime(&signature, args, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), objectType, NULL); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp index 85398c55c5a..2d7c1fe09bd 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp @@ -262,7 +262,7 @@ void ShenandoahBarrierSet::on_thread_detach(Thread *thread) { } } -oop ShenandoahBarrierSet::oop_load_from_native_barrier(oop obj) { +oop ShenandoahBarrierSet::oop_load_from_native_barrier(oop obj, oop* load_addr) { if (CompressedOops::is_null(obj)) { return NULL; } @@ -277,7 +277,13 @@ oop ShenandoahBarrierSet::oop_load_from_native_barrier(oop obj) { } } - return load_reference_barrier_not_null(obj); + oop fwd = load_reference_barrier_not_null(obj); + if (load_addr != NULL && fwd != obj) { + // Since we are here and we know the load address, update the reference. + ShenandoahHeap::cas_oop(fwd, load_addr, obj); + } + + return fwd; } void ShenandoahBarrierSet::clone_barrier_runtime(oop src) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp index 21c3c422de4..d9cc1734757 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp @@ -84,7 +84,9 @@ public: void write_ref_field_work(void* v, oop o, bool release = false); - oop oop_load_from_native_barrier(oop obj); + oop oop_load_from_native_barrier(oop obj, oop* load_addr); + oop oop_load_from_native_barrier(oop obj, narrowOop* load_addr); + virtual void on_thread_create(Thread* thread); virtual void on_thread_destroy(Thread* thread); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp index 48ca747d75f..bc488470b0c 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp @@ -69,7 +69,7 @@ template template inline oop ShenandoahBarrierSet::AccessBarrier::oop_load_not_in_heap(T* addr) { oop value = Raw::oop_load_not_in_heap(addr); - value = ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(value); + value = ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(value, addr); keep_alive_if_weak(decorators, value); return value; } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp index f26f5306489..163a43ce7bd 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp @@ -82,6 +82,6 @@ JRT_LEAF(void, ShenandoahRuntime::shenandoah_clone_barrier(oopDesc* src)) ShenandoahBarrierSet::barrier_set()->clone_barrier(s); JRT_END -JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_native(oopDesc * src)) - return (oopDesc*) ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(oop(src)); +JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_native(oopDesc * src, oop* load_addr)) + return (oopDesc*) ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(oop(src), load_addr); JRT_END diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp index c63c3787fe4..3ce9d63cae1 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp @@ -42,7 +42,7 @@ public: static oopDesc* load_reference_barrier_fixup(oopDesc* src, oop* load_addr); static oopDesc* load_reference_barrier_fixup_narrow(oopDesc* src, narrowOop* load_addr); - static oopDesc* load_reference_barrier_native(oopDesc* src); + static oopDesc* load_reference_barrier_native(oopDesc* src, oop* load_addr); static void shenandoah_clone_barrier(oopDesc* src); }; From ce4a41c71f50048b57485330bc224cce9183fc2c Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Fri, 18 Oct 2019 14:03:44 -0400 Subject: [PATCH 006/163] 8232008: Shenandoah: C1 load barrier does not match interpreter version Reviewed-by: rkennke --- .../shenandoah/c1/shenandoahBarrierSetC1.cpp | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp index e0f02cb16d6..68ac8118c15 100644 --- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp +++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp @@ -211,7 +211,9 @@ void ShenandoahBarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result) LIRGenerator* gen = access.gen(); DecoratorSet decorators = access.decorators(); - if ((decorators & IN_NATIVE) != 0) { + bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); + + if ((decorators & IN_NATIVE) != 0 && !is_traversal_mode) { assert(access.is_oop(), "IN_NATIVE access only for oop values"); BarrierSetC1::load_at_resolved(access, result); LIR_OprList* args = new LIR_OprList(); @@ -226,23 +228,24 @@ void ShenandoahBarrierSetC1::load_at_resolved(LIRAccess& access, LIR_Opr result) CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native), objectType, NULL); __ move(call_result, result); - return; - } - - if (ShenandoahLoadRefBarrier) { - LIR_Opr tmp = gen->new_register(T_OBJECT); - BarrierSetC1::load_at_resolved(access, tmp); - tmp = load_reference_barrier(access.gen(), tmp, access.resolved_addr()); - __ move(tmp, result); } else { - BarrierSetC1::load_at_resolved(access, result); + if (ShenandoahLoadRefBarrier) { + LIR_Opr tmp = gen->new_register(T_OBJECT); + BarrierSetC1::load_at_resolved(access, tmp); + tmp = load_reference_barrier(access.gen(), tmp, access.resolved_addr()); + __ move(tmp, result); + } else { + BarrierSetC1::load_at_resolved(access, result); + } } if (ShenandoahKeepAliveBarrier) { bool is_weak = (decorators & ON_WEAK_OOP_REF) != 0; bool is_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0; bool is_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0; - if (is_weak || is_phantom || is_anonymous) { + bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode; + + if ((is_weak || is_phantom || is_anonymous) && keep_alive) { // Register the value in the referent field with the pre-barrier LabelObj *Lcont_anonymous; if (is_anonymous) { From 5db7fc5aa9b1d33faaf943c2a91c0e713b8c0ead Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Fri, 18 Oct 2019 14:07:47 -0700 Subject: [PATCH 007/163] 8232276: Problem list serviceability/sa/ClhsdbJstackXcompStress.java Reviewed-by: sgehwolf, dholmes --- test/hotspot/jtreg/ProblemList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 2c0c024ac4e..1d4addf49df 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -108,6 +108,7 @@ serviceability/sa/ClhsdbInspect.java 8193639 solaris-all serviceability/sa/ClhsdbJdis.java 8193639 solaris-all serviceability/sa/ClhsdbJhisto.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbJstack.java 8193639 solaris-all +serviceability/sa/ClhsdbJstackXcompStress.java 8193639,8231635 solaris-all,windows-x64 serviceability/sa/ClhsdbLongConstant.java 8193639 solaris-all serviceability/sa/ClhsdbPmap.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbPrintAll.java 8193639 solaris-all From 048b09bdbeac29e35908c8cf16eb71967ab50b95 Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Fri, 18 Oct 2019 20:28:16 +0800 Subject: [PATCH 008/163] 8232616: JVMCI_lock fails to get initialized when cds is disabled Reviewed-by: iklam, dholmes --- src/hotspot/share/runtime/mutexLocker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp index 5c9065f3dff..9ac5d9808de 100644 --- a/src/hotspot/share/runtime/mutexLocker.cpp +++ b/src/hotspot/share/runtime/mutexLocker.cpp @@ -334,12 +334,12 @@ void mutex_init() { #if INCLUDE_JVMTI def(CDSClassFileStream_lock , PaddedMutex , max_nonleaf, false, _safepoint_check_always); #endif + def(DumpTimeTable_lock , PaddedMutex , leaf, true, _safepoint_check_never); +#endif // INCLUDE_CDS #if INCLUDE_JVMCI def(JVMCI_lock , PaddedMonitor, nonleaf+2, true, _safepoint_check_always); #endif - def(DumpTimeTable_lock , PaddedMutex , leaf, true, _safepoint_check_never); -#endif // INCLUDE_CDS } GCMutexLocker::GCMutexLocker(Mutex* mutex) { From b404ddd9a2f814a8c7978f5374d1e51d2213a08f Mon Sep 17 00:00:00 2001 From: Amy Lu Date: Mon, 21 Oct 2019 14:04:16 +0800 Subject: [PATCH 009/163] 8232195: Enable BigInteger tests: DivisionOverflow, SymmetricRangeTests and StringConstructorOverflow Reviewed-by: bpb, darcy --- test/jdk/TEST.ROOT | 3 ++- .../math/BigInteger/{ => largeMemory}/DivisionOverflow.java | 5 +++-- .../{ => largeMemory}/StringConstructorOverflow.java | 2 +- .../BigInteger/{ => largeMemory}/SymmetricRangeTests.java | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) rename test/jdk/java/math/BigInteger/{ => largeMemory}/DivisionOverflow.java (93%) rename test/jdk/java/math/BigInteger/{ => largeMemory}/StringConstructorOverflow.java (97%) rename test/jdk/java/math/BigInteger/{ => largeMemory}/SymmetricRangeTests.java (99%) diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT index 3f504bfce04..bc9778e6186 100644 --- a/test/jdk/TEST.ROOT +++ b/test/jdk/TEST.ROOT @@ -22,7 +22,8 @@ com/apple/laf com/sun/java/accessibility com/sun/java/swing sanity/client demo/j javax/management sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle # Tests that cannot run concurrently -exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote \ +exclusiveAccess.dirs=java/math/BigInteger/largeMemory \ +java/rmi/Naming java/util/prefs sun/management/jmxremote \ sun/tools/jstatd sun/tools/jcmd sun/tools/jhsdb sun/tools/jhsdb/heapconfig \ sun/tools/jinfo sun/tools/jmap sun/tools/jps sun/tools/jstack sun/tools/jstat \ com/sun/tools/attach sun/security/mscapi java/util/stream java/util/Arrays/largeMemory \ diff --git a/test/jdk/java/math/BigInteger/DivisionOverflow.java b/test/jdk/java/math/BigInteger/largeMemory/DivisionOverflow.java similarity index 93% rename from test/jdk/java/math/BigInteger/DivisionOverflow.java rename to test/jdk/java/math/BigInteger/largeMemory/DivisionOverflow.java index 7f35d07adca..20bdcc01dcf 100644 --- a/test/jdk/java/math/BigInteger/DivisionOverflow.java +++ b/test/jdk/java/math/BigInteger/largeMemory/DivisionOverflow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2019, 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 @@ -25,7 +25,8 @@ * @test * @bug 8022780 * @summary Test division of large values - * @run main/othervm -Xshare:off DivisionOverflow + * @requires os.maxMemory > 8g + * @run main/othervm -Xshare:off -Xmx8g DivisionOverflow * @author Dmitry Nadezhin */ import java.math.BigInteger; diff --git a/test/jdk/java/math/BigInteger/StringConstructorOverflow.java b/test/jdk/java/math/BigInteger/largeMemory/StringConstructorOverflow.java similarity index 97% rename from test/jdk/java/math/BigInteger/StringConstructorOverflow.java rename to test/jdk/java/math/BigInteger/largeMemory/StringConstructorOverflow.java index 0ecab7fc4ab..9f5f97d2205 100644 --- a/test/jdk/java/math/BigInteger/StringConstructorOverflow.java +++ b/test/jdk/java/math/BigInteger/largeMemory/StringConstructorOverflow.java @@ -25,7 +25,7 @@ * @test * @bug 8021204 * @summary Test constructor BigInteger(String val, int radix) on very long string - * @ignore This test has huge memory requirements + * @requires os.maxMemory > 8g * @run main/othervm -Xshare:off -Xmx8g StringConstructorOverflow * @author Dmitry Nadezhin */ diff --git a/test/jdk/java/math/BigInteger/SymmetricRangeTests.java b/test/jdk/java/math/BigInteger/largeMemory/SymmetricRangeTests.java similarity index 99% rename from test/jdk/java/math/BigInteger/SymmetricRangeTests.java rename to test/jdk/java/math/BigInteger/largeMemory/SymmetricRangeTests.java index 31334cc49b7..66a01c60b73 100644 --- a/test/jdk/java/math/BigInteger/SymmetricRangeTests.java +++ b/test/jdk/java/math/BigInteger/largeMemory/SymmetricRangeTests.java @@ -23,11 +23,11 @@ /* * @test - * @library /test/lib - * @ignore This test has huge memory requirements - * @run main/timeout=180/othervm -Xmx8g SymmetricRangeTests * @bug 6910473 8021204 8021203 9005933 8074460 8078672 * @summary Test range of BigInteger values (use -Dseed=X to set PRNG seed) + * @library /test/lib + * @requires os.maxMemory > 8g + * @run main/timeout=180/othervm -Xmx8g SymmetricRangeTests * @author Dmitry Nadezhin * @key randomness */ From f751808df9604a1f35d2ea430fbf5e3d8eda6f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:51:24 +0200 Subject: [PATCH 010/163] 8232001: ZGC: Ignore metaspace GC threshold until GC is warm Reviewed-by: eosterlund --- src/hotspot/share/gc/z/zDirector.cpp | 14 +++----------- src/hotspot/share/gc/z/zDirector.hpp | 3 --- src/hotspot/share/gc/z/zDriver.cpp | 8 +++++++- src/hotspot/share/gc/z/zStat.cpp | 8 ++++++++ src/hotspot/share/gc/z/zStat.hpp | 2 ++ 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/hotspot/share/gc/z/zDirector.cpp b/src/hotspot/share/gc/z/zDirector.cpp index 4823053370d..731a6841ea9 100644 --- a/src/hotspot/share/gc/z/zDirector.cpp +++ b/src/hotspot/share/gc/z/zDirector.cpp @@ -48,14 +48,6 @@ void ZDirector::sample_allocation_rate() const { ZStatAllocRate::avg_sd() / M); } -bool ZDirector::is_first() const { - return ZStatCycle::ncycles() == 0; -} - -bool ZDirector::is_warm() const { - return ZStatCycle::ncycles() >= 3; -} - bool ZDirector::rule_timer() const { if (ZCollectionInterval == 0) { // Rule disabled @@ -73,7 +65,7 @@ bool ZDirector::rule_timer() const { } bool ZDirector::rule_warmup() const { - if (is_warm()) { + if (ZStatCycle::is_warm()) { // Rule disabled return false; } @@ -93,7 +85,7 @@ bool ZDirector::rule_warmup() const { } bool ZDirector::rule_allocation_rate() const { - if (is_first()) { + if (ZStatCycle::is_first()) { // Rule disabled return false; } @@ -140,7 +132,7 @@ bool ZDirector::rule_allocation_rate() const { } bool ZDirector::rule_proactive() const { - if (!ZProactive || !is_warm()) { + if (!ZProactive || !ZStatCycle::is_warm()) { // Rule disabled return false; } diff --git a/src/hotspot/share/gc/z/zDirector.hpp b/src/hotspot/share/gc/z/zDirector.hpp index 0495f26b4c7..544624f1636 100644 --- a/src/hotspot/share/gc/z/zDirector.hpp +++ b/src/hotspot/share/gc/z/zDirector.hpp @@ -36,9 +36,6 @@ private: void sample_allocation_rate() const; - bool is_first() const; - bool is_warm() const; - bool rule_timer() const; bool rule_warmup() const; bool rule_allocation_rate() const; diff --git a/src/hotspot/share/gc/z/zDriver.cpp b/src/hotspot/share/gc/z/zDriver.cpp index f419975c1bf..4c6d721aad1 100644 --- a/src/hotspot/share/gc/z/zDriver.cpp +++ b/src/hotspot/share/gc/z/zDriver.cpp @@ -250,11 +250,17 @@ void ZDriver::collect(GCCause::Cause cause) { case GCCause::_z_allocation_stall: case GCCause::_z_proactive: case GCCause::_z_high_usage: - case GCCause::_metadata_GC_threshold: // Start asynchronous GC _gc_cycle_port.send_async(cause); break; + case GCCause::_metadata_GC_threshold: + // Start asynchronous GC, but only if the GC is warm + if (ZStatCycle::is_warm()) { + _gc_cycle_port.send_async(cause); + } + break; + case GCCause::_gc_locker: // Restart VM operation previously blocked by the GC locker _gc_locker_port.signal(); diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp index 439ae8e5b0e..e14a5846533 100644 --- a/src/hotspot/share/gc/z/zStat.cpp +++ b/src/hotspot/share/gc/z/zStat.cpp @@ -1049,6 +1049,14 @@ void ZStatCycle::at_end(double boost_factor) { _normalized_duration.add(normalized_duration); } +bool ZStatCycle::is_first() { + return _ncycles == 0; +} + +bool ZStatCycle::is_warm() { + return _ncycles >= 3; +} + uint64_t ZStatCycle::ncycles() { return _ncycles; } diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp index 1b344a2401a..dc261a5b231 100644 --- a/src/hotspot/share/gc/z/zStat.hpp +++ b/src/hotspot/share/gc/z/zStat.hpp @@ -374,6 +374,8 @@ public: static void at_start(); static void at_end(double boost_factor); + static bool is_first(); + static bool is_warm(); static uint64_t ncycles(); static const AbsSeq& normalized_duration(); static double time_since_last(); From db89b5fdf9f1dca06ba569dbf61e15f637a4367b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:55:31 +0200 Subject: [PATCH 011/163] 8231943: ZGC: Enable serviceability/dcmd/gc/RunGCTest Reviewed-by: tschatzl, eosterlund, sspitsyn --- test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java b/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java index 6156f46905c..33182fc78a3 100644 --- a/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java +++ b/test/hotspot/jtreg/serviceability/dcmd/gc/RunGCTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -36,13 +36,12 @@ import jdk.test.lib.dcmd.JMXExecutor; /* * @test * @summary Test of diagnostic command GC.run - * @requires vm.gc != "Z" * @library /test/lib * @modules java.base/jdk.internal.misc * java.compiler * java.management * jdk.internal.jvmstat/sun.jvmstat.monitor - * @run testng/othervm -Xlog:gc=debug:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest + * @run testng/othervm -Xlog:gc:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest */ public class RunGCTest { public void run(CommandExecutor executor) { @@ -58,7 +57,7 @@ public class RunGCTest { } OutputAnalyzer output = new OutputAnalyzer(gcLog, ""); - output.shouldContain("Pause Full (Diagnostic Command)"); + output.shouldContain("(Diagnostic Command)"); } @Test From 2e1040e4c6bf1ec40d530415c1502be6c78f545f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:55:48 +0200 Subject: [PATCH 012/163] 8231940: ZGC: Print correct low/high capacity Reviewed-by: eosterlund --- src/hotspot/share/gc/z/zStat.cpp | 18 ++++++++++++++++-- src/hotspot/share/gc/z/zStat.hpp | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp index e14a5846533..f4263f9fe2d 100644 --- a/src/hotspot/share/gc/z/zStat.cpp +++ b/src/hotspot/share/gc/z/zStat.cpp @@ -1223,6 +1223,20 @@ ZStatHeap::ZAtMarkEnd ZStatHeap::_at_mark_end; ZStatHeap::ZAtRelocateStart ZStatHeap::_at_relocate_start; ZStatHeap::ZAtRelocateEnd ZStatHeap::_at_relocate_end; +size_t ZStatHeap::capacity_high() { + return MAX4(_at_mark_start.capacity, + _at_mark_end.capacity, + _at_relocate_start.capacity, + _at_relocate_end.capacity); +} + +size_t ZStatHeap::capacity_low() { + return MIN4(_at_mark_start.capacity, + _at_mark_end.capacity, + _at_relocate_start.capacity, + _at_relocate_end.capacity); +} + size_t ZStatHeap::available(size_t used) { return _at_initialize.max_capacity - used; } @@ -1290,8 +1304,8 @@ void ZStatHeap::set_at_relocate_end(size_t capacity, size_t used_high, size_t used_low) { _at_relocate_end.capacity = capacity; - _at_relocate_end.capacity_high = capacity; - _at_relocate_end.capacity_low = _at_mark_start.capacity; + _at_relocate_end.capacity_high = capacity_high(); + _at_relocate_end.capacity_low = capacity_low(); _at_relocate_end.reserve = reserve(used); _at_relocate_end.reserve_high = reserve(used_low); _at_relocate_end.reserve_low = reserve(used_high); diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp index dc261a5b231..21687045ecf 100644 --- a/src/hotspot/share/gc/z/zStat.hpp +++ b/src/hotspot/share/gc/z/zStat.hpp @@ -521,6 +521,8 @@ private: size_t free_low; } _at_relocate_end; + static size_t capacity_high(); + static size_t capacity_low(); static size_t available(size_t used); static size_t reserve(size_t used); static size_t free(size_t used); From cf86d3519c3d26a68738e0669f201ace3addcbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:55:58 +0200 Subject: [PATCH 013/163] 8231996: ZGC: Replace ZStatisticsForceTrace with check if JFR event is enabled Reviewed-by: eosterlund --- src/hotspot/share/gc/z/zStat.cpp | 16 ++++----- src/hotspot/share/gc/z/zStat.hpp | 4 +-- src/hotspot/share/gc/z/zTracer.cpp | 44 +++++++---------------- src/hotspot/share/gc/z/zTracer.hpp | 9 +++-- src/hotspot/share/gc/z/zTracer.inline.hpp | 28 ++++++++++++++- src/hotspot/share/gc/z/z_globals.hpp | 3 -- src/jdk.jfr/share/conf/jfr/default.jfc | 8 ++--- src/jdk.jfr/share/conf/jfr/profile.jfc | 8 ++--- 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp index f4263f9fe2d..7fbe6ff684d 100644 --- a/src/hotspot/share/gc/z/zStat.cpp +++ b/src/hotspot/share/gc/z/zStat.cpp @@ -716,7 +716,7 @@ void ZStatSubPhase::register_start(const Ticks& start) const { } void ZStatSubPhase::register_end(const Ticks& start, const Ticks& end) const { - ZTracer::tracer()->report_thread_phase(*this, start, end); + ZTracer::tracer()->report_thread_phase(name(), start, end); const Tickspan duration = end - start; ZStatSample(_sampler, duration.value()); @@ -736,7 +736,7 @@ void ZStatCriticalPhase::register_start(const Ticks& start) const { } void ZStatCriticalPhase::register_end(const Ticks& start, const Ticks& end) const { - ZTracer::tracer()->report_thread_phase(*this, start, end); + ZTracer::tracer()->report_thread_phase(name(), start, end); const Tickspan duration = end - start; ZStatSample(_sampler, duration.value()); @@ -759,7 +759,7 @@ THREAD_LOCAL uint32_t ZStatTimerDisable::_active = 0; // // Stat sample/inc // -void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace) { +void ZStatSample(const ZStatSampler& sampler, uint64_t value) { ZStatSamplerData* const cpu_data = sampler.get(); Atomic::add(1u, &cpu_data->_nsamples); Atomic::add(value, &cpu_data->_sum); @@ -782,18 +782,14 @@ void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace) { max = prev_max; } - if (trace) { - ZTracer::tracer()->report_stat_sampler(sampler, value); - } + ZTracer::tracer()->report_stat_sampler(sampler, value); } -void ZStatInc(const ZStatCounter& counter, uint64_t increment, bool trace) { +void ZStatInc(const ZStatCounter& counter, uint64_t increment) { ZStatCounterData* const cpu_data = counter.get(); const uint64_t value = Atomic::add(increment, &cpu_data->_counter); - if (trace) { - ZTracer::tracer()->report_stat_counter(counter, increment, value); - } + ZTracer::tracer()->report_stat_counter(counter, increment, value); } void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment) { diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp index 21687045ecf..ae235cd0f47 100644 --- a/src/hotspot/share/gc/z/zStat.hpp +++ b/src/hotspot/share/gc/z/zStat.hpp @@ -315,8 +315,8 @@ public: // // Stat sample/increment // -void ZStatSample(const ZStatSampler& sampler, uint64_t value, bool trace = ZStatisticsForceTrace); -void ZStatInc(const ZStatCounter& counter, uint64_t increment = 1, bool trace = ZStatisticsForceTrace); +void ZStatSample(const ZStatSampler& sampler, uint64_t value); +void ZStatInc(const ZStatCounter& counter, uint64_t increment = 1); void ZStatInc(const ZStatUnsampledCounter& counter, uint64_t increment = 1); // diff --git a/src/hotspot/share/gc/z/zTracer.cpp b/src/hotspot/share/gc/z/zTracer.cpp index f2659171c3e..82747f3878a 100644 --- a/src/hotspot/share/gc/z/zTracer.cpp +++ b/src/hotspot/share/gc/z/zTracer.cpp @@ -22,18 +22,19 @@ */ #include "precompiled.hpp" +#include "gc/shared/gcId.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTracer.hpp" -#include "gc/shared/gcId.hpp" -#include "gc/shared/gcLocker.hpp" #include "jfr/jfrEvents.hpp" -#include "runtime/safepoint.hpp" #include "runtime/safepointVerifiers.hpp" +#include "utilities/debug.hpp" +#include "utilities/macros.hpp" #if INCLUDE_JFR #include "jfr/metadata/jfrSerializer.hpp" #endif #if INCLUDE_JFR + class ZStatisticsCounterTypeConstant : public JfrSerializer { public: virtual void serialize(JfrCheckpointWriter& writer) { @@ -66,7 +67,8 @@ static void register_jfr_type_serializers() { true /* permit_cache */, new ZStatisticsSamplerTypeConstant()); } -#endif + +#endif // INCLUDE_JFR ZTracer* ZTracer::_tracer = NULL; @@ -79,24 +81,24 @@ void ZTracer::initialize() { JFR_ONLY(register_jfr_type_serializers()); } -void ZTracer::send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value) { +void ZTracer::send_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) { NoSafepointVerifier nsv; EventZStatisticsCounter e; if (e.should_commit()) { - e.set_id(counter_id); + e.set_id(counter.id()); e.set_increment(increment); e.set_value(value); e.commit(); } } -void ZTracer::send_stat_sampler(uint32_t sampler_id, uint64_t value) { +void ZTracer::send_stat_sampler(const ZStatSampler& sampler, uint64_t value) { NoSafepointVerifier nsv; EventZStatisticsSampler e; if (e.should_commit()) { - e.set_id(sampler_id); + e.set_id(sampler.id()); e.set_value(value); e.commit(); } @@ -115,7 +117,7 @@ void ZTracer::send_thread_phase(const char* name, const Ticks& start, const Tick } } -void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve) { +void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) { NoSafepointVerifier nsv; EventZPageAllocation e; @@ -124,28 +126,8 @@ void ZTracer::send_page_alloc(size_t size, size_t used, size_t free, size_t cach e.set_usedAfter(used); e.set_freeAfter(free); e.set_inCacheAfter(cache); - e.set_nonBlocking(nonblocking); - e.set_noReserve(noreserve); + e.set_nonBlocking(flags.non_blocking()); + e.set_noReserve(flags.no_reserve()); e.commit(); } } - -void ZTracer::report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) { - send_stat_counter(counter.id(), increment, value); -} - -void ZTracer::report_stat_sampler(const ZStatSampler& sampler, uint64_t value) { - send_stat_sampler(sampler.id(), value); -} - -void ZTracer::report_thread_phase(const ZStatPhase& phase, const Ticks& start, const Ticks& end) { - send_thread_phase(phase.name(), start, end); -} - -void ZTracer::report_thread_phase(const char* name, const Ticks& start, const Ticks& end) { - send_thread_phase(name, start, end); -} - -void ZTracer::report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) { - send_page_alloc(size, used, free, cache, flags.non_blocking(), flags.no_reserve()); -} diff --git a/src/hotspot/share/gc/z/zTracer.hpp b/src/hotspot/share/gc/z/zTracer.hpp index 0da1f2a887a..d02502f49d1 100644 --- a/src/hotspot/share/gc/z/zTracer.hpp +++ b/src/hotspot/share/gc/z/zTracer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, 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 @@ -37,10 +37,10 @@ private: ZTracer(); - void send_stat_counter(uint32_t counter_id, uint64_t increment, uint64_t value); - void send_stat_sampler(uint32_t sampler_id, uint64_t value); + void send_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value); + void send_stat_sampler(const ZStatSampler& sampler, uint64_t value); void send_thread_phase(const char* name, const Ticks& start, const Ticks& end); - void send_page_alloc(size_t size, size_t used, size_t free, size_t cache, bool nonblocking, bool noreserve); + void send_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags); public: static ZTracer* tracer(); @@ -48,7 +48,6 @@ public: void report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value); void report_stat_sampler(const ZStatSampler& sampler, uint64_t value); - void report_thread_phase(const ZStatPhase& phase, const Ticks& start, const Ticks& end); void report_thread_phase(const char* name, const Ticks& start, const Ticks& end); void report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags); }; diff --git a/src/hotspot/share/gc/z/zTracer.inline.hpp b/src/hotspot/share/gc/z/zTracer.inline.hpp index ab2d7e48aea..52b264b21f2 100644 --- a/src/hotspot/share/gc/z/zTracer.inline.hpp +++ b/src/hotspot/share/gc/z/zTracer.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, 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 @@ -24,12 +24,38 @@ #ifndef SHARE_GC_Z_ZTRACER_INLINE_HPP #define SHARE_GC_Z_ZTRACER_INLINE_HPP +#include "gc/z/zStat.hpp" #include "gc/z/zTracer.hpp" +#include "jfr/jfrEvents.hpp" inline ZTracer* ZTracer::tracer() { return _tracer; } +inline void ZTracer::report_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) { + if (EventZStatisticsCounter::is_enabled()) { + send_stat_counter(counter, increment, value); + } +} + +inline void ZTracer::report_stat_sampler(const ZStatSampler& sampler, uint64_t value) { + if (EventZStatisticsSampler::is_enabled()) { + send_stat_sampler(sampler, value); + } +} + +inline void ZTracer::report_thread_phase(const char* name, const Ticks& start, const Ticks& end) { + if (EventZThreadPhase::is_enabled()) { + send_thread_phase(name, start, end); + } +} + +inline void ZTracer::report_page_alloc(size_t size, size_t used, size_t free, size_t cache, ZAllocationFlags flags) { + if (EventZPageAllocation::is_enabled()) { + send_page_alloc(size, used, free, cache, flags); + } +} + inline ZTraceThreadPhase::ZTraceThreadPhase(const char* name) : _start(Ticks::now()), _name(name) {} diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp index fefa976c439..50895216612 100644 --- a/src/hotspot/share/gc/z/z_globals.hpp +++ b/src/hotspot/share/gc/z/z_globals.hpp @@ -67,9 +67,6 @@ "Time between statistics print outs (in seconds)") \ range(1, (uint)-1) \ \ - diagnostic(bool, ZStatisticsForceTrace, false, \ - "Force tracing of ZStats") \ - \ diagnostic(bool, ZProactive, true, \ "Enable proactive GC cycles") \ \ diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc index eefa5113983..ce5a30fe6e7 100644 --- a/src/jdk.jfr/share/conf/jfr/default.jfc +++ b/src/jdk.jfr/share/conf/jfr/default.jfc @@ -689,13 +689,13 @@ - true - 10 ms + false + 0 ms - true - 10 ms + false + 0 ms diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc index 639c34cc9a6..01ed3b22145 100644 --- a/src/jdk.jfr/share/conf/jfr/profile.jfc +++ b/src/jdk.jfr/share/conf/jfr/profile.jfc @@ -689,13 +689,13 @@ - 10 ms - true + 0 ms + false - true - 10 ms + false + 0 ms From 11d949f2022c675da4fab5b40ae9f59ceb569693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:56:43 +0200 Subject: [PATCH 014/163] 8232235: ZGC: Move ZValue inline funtions to zValue.inline.hpp Reviewed-by: tschatzl --- src/hotspot/share/gc/z/zObjectAllocator.cpp | 3 +- src/hotspot/share/gc/z/zObjectAllocator.hpp | 2 +- src/hotspot/share/gc/z/zPageCache.cpp | 1 + src/hotspot/share/gc/z/zPageCache.inline.hpp | 3 +- .../share/gc/z/zReferenceProcessor.cpp | 1 + src/hotspot/share/gc/z/zRelocate.cpp | 1 + .../share/gc/z/zThreadLocalAllocBuffer.cpp | 1 + src/hotspot/share/gc/z/zValue.hpp | 239 ++++------------ src/hotspot/share/gc/z/zValue.inline.hpp | 264 ++++++++++++++++++ .../share/gc/z/zWeakRootsProcessor.hpp | 4 +- 10 files changed, 327 insertions(+), 192 deletions(-) create mode 100644 src/hotspot/share/gc/z/zValue.inline.hpp diff --git a/src/hotspot/share/gc/z/zObjectAllocator.cpp b/src/hotspot/share/gc/z/zObjectAllocator.cpp index abdbbe1714a..fa2a38ee20b 100644 --- a/src/hotspot/share/gc/z/zObjectAllocator.cpp +++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, 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 @@ -30,6 +30,7 @@ #include "gc/z/zStat.hpp" #include "gc/z/zThread.hpp" #include "gc/z/zUtils.inline.hpp" +#include "gc/z/zValue.inline.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" #include "runtime/safepoint.hpp" diff --git a/src/hotspot/share/gc/z/zObjectAllocator.hpp b/src/hotspot/share/gc/z/zObjectAllocator.hpp index 6554597975e..fb54f1e6c42 100644 --- a/src/hotspot/share/gc/z/zObjectAllocator.hpp +++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 diff --git a/src/hotspot/share/gc/z/zPageCache.cpp b/src/hotspot/share/gc/z/zPageCache.cpp index f0d19262bef..229c47617e5 100644 --- a/src/hotspot/share/gc/z/zPageCache.cpp +++ b/src/hotspot/share/gc/z/zPageCache.cpp @@ -27,6 +27,7 @@ #include "gc/z/zPage.inline.hpp" #include "gc/z/zPageCache.hpp" #include "gc/z/zStat.hpp" +#include "gc/z/zValue.inline.hpp" #include "logging/log.hpp" static const ZStatCounter ZCounterPageCacheHitL1("Memory", "Page Cache Hit L1", ZStatUnitOpsPerSecond); diff --git a/src/hotspot/share/gc/z/zPageCache.inline.hpp b/src/hotspot/share/gc/z/zPageCache.inline.hpp index 690f47c582b..80f29332306 100644 --- a/src/hotspot/share/gc/z/zPageCache.inline.hpp +++ b/src/hotspot/share/gc/z/zPageCache.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -26,6 +26,7 @@ #include "gc/z/zList.inline.hpp" #include "gc/z/zPageCache.hpp" +#include "gc/z/zValue.inline.hpp" inline size_t ZPageCache::available() const { return _available; diff --git a/src/hotspot/share/gc/z/zReferenceProcessor.cpp b/src/hotspot/share/gc/z/zReferenceProcessor.cpp index d754640230a..dd702d879de 100644 --- a/src/hotspot/share/gc/z/zReferenceProcessor.cpp +++ b/src/hotspot/share/gc/z/zReferenceProcessor.cpp @@ -32,6 +32,7 @@ #include "gc/z/zTask.hpp" #include "gc/z/zTracer.inline.hpp" #include "gc/z/zUtils.inline.hpp" +#include "gc/z/zValue.inline.hpp" #include "memory/universe.hpp" #include "runtime/mutexLocker.hpp" #include "runtime/os.hpp" diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp index c653e8a68eb..d6f989b5a27 100644 --- a/src/hotspot/share/gc/z/zRelocate.cpp +++ b/src/hotspot/share/gc/z/zRelocate.cpp @@ -33,6 +33,7 @@ #include "gc/z/zRootsIterator.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTask.hpp" +#include "gc/z/zThread.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" #include "gc/z/zWorkers.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp index 1e13cdec983..ae30fc1af58 100644 --- a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp +++ b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "gc/z/zAddress.inline.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" +#include "gc/z/zValue.inline.hpp" #include "runtime/globals.hpp" #include "runtime/thread.hpp" diff --git a/src/hotspot/share/gc/z/zValue.hpp b/src/hotspot/share/gc/z/zValue.hpp index 37413b6aaac..87174f282dd 100644 --- a/src/hotspot/share/gc/z/zValue.hpp +++ b/src/hotspot/share/gc/z/zValue.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -25,13 +25,11 @@ #define SHARE_GC_Z_ZVALUE_HPP #include "memory/allocation.hpp" -#include "gc/z/zCPU.hpp" -#include "gc/z/zGlobals.hpp" -#include "gc/z/zNUMA.hpp" -#include "gc/z/zThread.hpp" -#include "gc/z/zUtils.hpp" -#include "runtime/globals.hpp" -#include "utilities/align.hpp" +#include "utilities/globalDefinitions.hpp" + +// +// Storage +// template class ZValueStorage : public AllStatic { @@ -42,203 +40,94 @@ private: public: static const size_t offset = 4 * K; - static uintptr_t alloc(size_t size) { - guarantee(size <= offset, "Allocation too large"); - - // Allocate entry in existing memory block - const uintptr_t addr = align_up(_top, S::alignment()); - _top = addr + size; - - if (_top < _end) { - // Success - return addr; - } - - // Allocate new block of memory - const size_t block_alignment = offset; - const size_t block_size = offset * S::count(); - _top = ZUtils::alloc_aligned(block_alignment, block_size); - _end = _top + offset; - - // Retry allocation - return alloc(size); - } + static uintptr_t alloc(size_t size); }; -template uintptr_t ZValueStorage::_end = 0; -template uintptr_t ZValueStorage::_top = 0; - class ZContendedStorage : public ZValueStorage { public: - static size_t alignment() { - return ZCacheLineSize; - } - - static uint32_t count() { - return 1; - } - - static uint32_t id() { - return 0; - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; class ZPerCPUStorage : public ZValueStorage { public: - static size_t alignment() { - return sizeof(uintptr_t); - } - - static uint32_t count() { - return ZCPU::count(); - } - - static uint32_t id() { - return ZCPU::id(); - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; class ZPerNUMAStorage : public ZValueStorage { public: - static size_t alignment() { - return sizeof(uintptr_t); - } - - static uint32_t count() { - return ZNUMA::count(); - } - - static uint32_t id() { - return ZNUMA::id(); - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; class ZPerWorkerStorage : public ZValueStorage { public: - static size_t alignment() { - return sizeof(uintptr_t); - } - - static uint32_t count() { - return MAX2(ParallelGCThreads, ConcGCThreads); - } - - static uint32_t id() { - return ZThread::worker_id(); - } + static size_t alignment(); + static uint32_t count(); + static uint32_t id(); }; -template -class ZValueIterator; +// +// Value +// template class ZValue : public CHeapObj { private: const uintptr_t _addr; - uintptr_t value_addr(uint32_t value_id) const { - return _addr + (value_id * S::offset); - } + uintptr_t value_addr(uint32_t value_id) const; public: - ZValue() : - _addr(S::alloc(sizeof(T))) { - // Initialize all instances - ZValueIterator iter(this); - for (T* addr; iter.next(&addr);) { - ::new (addr) T; - } - } + ZValue(); + ZValue(const T& value); - ZValue(const T& value) : - _addr(S::alloc(sizeof(T))) { - // Initialize all instances - ZValueIterator iter(this); - for (T* addr; iter.next(&addr);) { - ::new (addr) T(value); - } - } + const T* addr(uint32_t value_id = S::id()) const; + T* addr(uint32_t value_id = S::id()); - // Not implemented - ZValue(const ZValue& value); - ZValue& operator=(const ZValue& value); + const T& get(uint32_t value_id = S::id()) const; + T& get(uint32_t value_id = S::id()); - const T* addr(uint32_t value_id = S::id()) const { - return reinterpret_cast(value_addr(value_id)); - } - - T* addr(uint32_t value_id = S::id()) { - return reinterpret_cast(value_addr(value_id)); - } - - const T& get(uint32_t value_id = S::id()) const { - return *addr(value_id); - } - - T& get(uint32_t value_id = S::id()) { - return *addr(value_id); - } - - void set(const T& value, uint32_t value_id = S::id()) { - get(value_id) = value; - } - - void set_all(const T& value) { - ZValueIterator iter(this); - for (T* addr; iter.next(&addr);) { - *addr = value; - } - } + void set(const T& value, uint32_t value_id = S::id()); + void set_all(const T& value); }; template class ZContended : public ZValue { public: - ZContended() : - ZValue() {} - - ZContended(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZContended(); + ZContended(const T& value); }; template class ZPerCPU : public ZValue { public: - ZPerCPU() : - ZValue() {} - - ZPerCPU(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZPerCPU(); + ZPerCPU(const T& value); }; template class ZPerNUMA : public ZValue { public: - ZPerNUMA() : - ZValue() {} - - ZPerNUMA(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZPerNUMA(); + ZPerNUMA(const T& value); }; template class ZPerWorker : public ZValue { public: - ZPerWorker() : - ZValue() {} - - ZPerWorker(const T& value) : - ZValue(value) {} - - using ZValue::operator=; + ZPerWorker(); + ZPerWorker(const T& value); }; +// +// Iterator +// + template class ZValueIterator { private: @@ -246,38 +135,27 @@ private: uint32_t _value_id; public: - ZValueIterator(ZValue* value) : - _value(value), - _value_id(0) {} + ZValueIterator(ZValue* value); - bool next(T** value) { - if (_value_id < S::count()) { - *value = _value->addr(_value_id++); - return true; - } - return false; - } + bool next(T** value); }; template class ZPerCPUIterator : public ZValueIterator { public: - ZPerCPUIterator(ZPerCPU* value) : - ZValueIterator(value) {} + ZPerCPUIterator(ZPerCPU* value); }; template class ZPerNUMAIterator : public ZValueIterator { public: - ZPerNUMAIterator(ZPerNUMA* value) : - ZValueIterator(value) {} + ZPerNUMAIterator(ZPerNUMA* value); }; template class ZPerWorkerIterator : public ZValueIterator { public: - ZPerWorkerIterator(ZPerWorker* value) : - ZValueIterator(value) {} + ZPerWorkerIterator(ZPerWorker* value); }; template @@ -287,38 +165,27 @@ private: uint32_t _value_id; public: - ZValueConstIterator(const ZValue* value) : - _value(value), - _value_id(0) {} + ZValueConstIterator(const ZValue* value); - bool next(const T** value) { - if (_value_id < S::count()) { - *value = _value->addr(_value_id++); - return true; - } - return false; - } + bool next(const T** value); }; template class ZPerCPUConstIterator : public ZValueConstIterator { public: - ZPerCPUConstIterator(const ZPerCPU* value) : - ZValueConstIterator(value) {} + ZPerCPUConstIterator(const ZPerCPU* value); }; template class ZPerNUMAConstIterator : public ZValueConstIterator { public: - ZPerNUMAConstIterator(const ZPerNUMA* value) : - ZValueConstIterator(value) {} + ZPerNUMAConstIterator(const ZPerNUMA* value); }; template class ZPerWorkerConstIterator : public ZValueConstIterator { public: - ZPerWorkerConstIterator(const ZPerWorker* value) : - ZValueConstIterator(value) {} + ZPerWorkerConstIterator(const ZPerWorker* value); }; #endif // SHARE_GC_Z_ZVALUE_HPP diff --git a/src/hotspot/share/gc/z/zValue.inline.hpp b/src/hotspot/share/gc/z/zValue.inline.hpp new file mode 100644 index 00000000000..a9ae1c92ac0 --- /dev/null +++ b/src/hotspot/share/gc/z/zValue.inline.hpp @@ -0,0 +1,264 @@ +/* + * Copyright (c) 2015, 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP +#define SHARE_GC_Z_ZVALUE_INLINE_HPP + +#include "gc/z/zCPU.hpp" +#include "gc/z/zGlobals.hpp" +#include "gc/z/zNUMA.hpp" +#include "gc/z/zThread.hpp" +#include "gc/z/zUtils.hpp" +#include "gc/z/zValue.hpp" +#include "runtime/globals.hpp" +#include "utilities/align.hpp" + +// +// Storage +// + +template uintptr_t ZValueStorage::_end = 0; +template uintptr_t ZValueStorage::_top = 0; + +template +uintptr_t ZValueStorage::alloc(size_t size) { + assert(size <= offset, "Allocation too large"); + + // Allocate entry in existing memory block + const uintptr_t addr = align_up(_top, S::alignment()); + _top = addr + size; + + if (_top < _end) { + // Success + return addr; + } + + // Allocate new block of memory + const size_t block_alignment = offset; + const size_t block_size = offset * S::count(); + _top = ZUtils::alloc_aligned(block_alignment, block_size); + _end = _top + offset; + + // Retry allocation + return alloc(size); +} + +inline size_t ZContendedStorage::alignment() { + return ZCacheLineSize; +} + +inline uint32_t ZContendedStorage::count() { + return 1; +} + +inline uint32_t ZContendedStorage::id() { + return 0; +} + +inline size_t ZPerCPUStorage::alignment() { + return sizeof(uintptr_t); +} + +inline uint32_t ZPerCPUStorage::count() { + return ZCPU::count(); +} + +inline uint32_t ZPerCPUStorage::id() { + return ZCPU::id(); +} + +inline size_t ZPerNUMAStorage::alignment() { + return sizeof(uintptr_t); +} + +inline uint32_t ZPerNUMAStorage::count() { + return ZNUMA::count(); +} + +inline uint32_t ZPerNUMAStorage::id() { + return ZNUMA::id(); +} + +inline size_t ZPerWorkerStorage::alignment() { + return sizeof(uintptr_t); +} + +inline uint32_t ZPerWorkerStorage::count() { + return MAX2(ParallelGCThreads, ConcGCThreads); +} + +inline uint32_t ZPerWorkerStorage::id() { + return ZThread::worker_id(); +} + +// +// Value +// + +template +inline uintptr_t ZValue::value_addr(uint32_t value_id) const { + return _addr + (value_id * S::offset); +} + +template +inline ZValue::ZValue() : + _addr(S::alloc(sizeof(T))) { + // Initialize all instances + ZValueIterator iter(this); + for (T* addr; iter.next(&addr);) { + ::new (addr) T; + } +} + +template +inline ZValue::ZValue(const T& value) : + _addr(S::alloc(sizeof(T))) { + // Initialize all instances + ZValueIterator iter(this); + for (T* addr; iter.next(&addr);) { + ::new (addr) T(value); + } +} + +template +inline const T* ZValue::addr(uint32_t value_id) const { + return reinterpret_cast(value_addr(value_id)); +} + +template +inline T* ZValue::addr(uint32_t value_id) { + return reinterpret_cast(value_addr(value_id)); +} + +template +inline const T& ZValue::get(uint32_t value_id) const { + return *addr(value_id); +} + +template +inline T& ZValue::get(uint32_t value_id) { + return *addr(value_id); +} + +template +inline void ZValue::set(const T& value, uint32_t value_id) { + get(value_id) = value; +} + +template +inline void ZValue::set_all(const T& value) { + ZValueIterator iter(this); + for (T* addr; iter.next(&addr);) { + *addr = value; + } +} + +template +inline ZContended::ZContended() : + ZValue() {} + +template +inline ZContended::ZContended(const T& value) : + ZValue(value) {} + +template +inline ZPerCPU::ZPerCPU() : + ZValue() {} + +template +inline ZPerCPU::ZPerCPU(const T& value) : + ZValue(value) {} + +template +inline ZPerNUMA::ZPerNUMA() : + ZValue() {} + +template +inline ZPerNUMA::ZPerNUMA(const T& value) : + ZValue(value) {} + +template +inline ZPerWorker::ZPerWorker() : + ZValue() {} + +template +inline ZPerWorker::ZPerWorker(const T& value) : + ZValue(value) {} + +// +// Iterator +// + +template +inline ZValueIterator::ZValueIterator(ZValue* value) : + _value(value), + _value_id(0) {} + +template +inline bool ZValueIterator::next(T** value) { + if (_value_id < S::count()) { + *value = _value->addr(_value_id++); + return true; + } + return false; +} + +template +inline ZPerCPUIterator::ZPerCPUIterator(ZPerCPU* value) : + ZValueIterator(value) {} + +template +inline ZPerNUMAIterator::ZPerNUMAIterator(ZPerNUMA* value) : + ZValueIterator(value) {} + +template +inline ZPerWorkerIterator::ZPerWorkerIterator(ZPerWorker* value) : + ZValueIterator(value) {} + +template +inline ZValueConstIterator::ZValueConstIterator(const ZValue* value) : + _value(value), + _value_id(0) {} + +template +inline bool ZValueConstIterator::next(const T** value) { + if (_value_id < S::count()) { + *value = _value->addr(_value_id++); + return true; + } + return false; +} + +template +inline ZPerCPUConstIterator::ZPerCPUConstIterator(const ZPerCPU* value) : + ZValueConstIterator(value) {} + +template +inline ZPerNUMAConstIterator::ZPerNUMAConstIterator(const ZPerNUMA* value) : + ZValueConstIterator(value) {} + +template +inline ZPerWorkerConstIterator::ZPerWorkerConstIterator(const ZPerWorker* value) : + ZValueConstIterator(value) {} + +#endif // SHARE_GC_Z_ZVALUE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp index cf70406e512..1f295a47b20 100644 --- a/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp +++ b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019, 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 @@ -24,8 +24,6 @@ #ifndef SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP #define SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP -#include "gc/z/zValue.hpp" - class ZWorkers; class ZWeakRootsProcessor { From 6ca7febb545deaa4a7a3fe69376d20ac02ee993e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:56:58 +0200 Subject: [PATCH 015/163] 8232236: ZGC: Move ZThread inline funtions to zThread.inline.hpp Reviewed-by: tschatzl --- src/hotspot/share/gc/z/zHeap.cpp | 2 +- src/hotspot/share/gc/z/zLiveMap.cpp | 2 +- src/hotspot/share/gc/z/zMark.cpp | 2 +- src/hotspot/share/gc/z/zObjectAllocator.cpp | 2 +- src/hotspot/share/gc/z/zRelocate.cpp | 2 +- src/hotspot/share/gc/z/zThread.cpp | 4 +- src/hotspot/share/gc/z/zThread.hpp | 46 +++----------- src/hotspot/share/gc/z/zThread.inline.hpp | 66 +++++++++++++++++++++ src/hotspot/share/gc/z/zValue.inline.hpp | 2 +- 9 files changed, 82 insertions(+), 46 deletions(-) create mode 100644 src/hotspot/share/gc/z/zThread.inline.hpp diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp index 127ab2ce294..dce19dad628 100644 --- a/src/hotspot/share/gc/z/zHeap.cpp +++ b/src/hotspot/share/gc/z/zHeap.cpp @@ -34,7 +34,7 @@ #include "gc/z/zRelocationSetSelector.hpp" #include "gc/z/zResurrection.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zVerify.hpp" #include "gc/z/zWorkers.inline.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/z/zLiveMap.cpp b/src/hotspot/share/gc/z/zLiveMap.cpp index 62a770c5d91..ba71414e6f2 100644 --- a/src/hotspot/share/gc/z/zLiveMap.cpp +++ b/src/hotspot/share/gc/z/zLiveMap.cpp @@ -25,7 +25,7 @@ #include "gc/z/zHeap.inline.hpp" #include "gc/z/zLiveMap.inline.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "logging/log.hpp" #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp index 5dd3f6241da..134da2c979f 100644 --- a/src/hotspot/share/gc/z/zMark.cpp +++ b/src/hotspot/share/gc/z/zMark.cpp @@ -34,7 +34,7 @@ #include "gc/z/zRootsIterator.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTask.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" #include "gc/z/zUtils.inline.hpp" #include "gc/z/zWorkers.inline.hpp" diff --git a/src/hotspot/share/gc/z/zObjectAllocator.cpp b/src/hotspot/share/gc/z/zObjectAllocator.cpp index fa2a38ee20b..2a05662aa8d 100644 --- a/src/hotspot/share/gc/z/zObjectAllocator.cpp +++ b/src/hotspot/share/gc/z/zObjectAllocator.cpp @@ -28,7 +28,7 @@ #include "gc/z/zObjectAllocator.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zStat.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zUtils.inline.hpp" #include "gc/z/zValue.inline.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp index d6f989b5a27..cd9aebe9c73 100644 --- a/src/hotspot/share/gc/z/zRelocate.cpp +++ b/src/hotspot/share/gc/z/zRelocate.cpp @@ -33,7 +33,7 @@ #include "gc/z/zRootsIterator.hpp" #include "gc/z/zStat.hpp" #include "gc/z/zTask.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zThreadLocalAllocBuffer.hpp" #include "gc/z/zWorkers.hpp" #include "logging/log.hpp" diff --git a/src/hotspot/share/gc/z/zThread.cpp b/src/hotspot/share/gc/z/zThread.cpp index 8c787dd4d67..8b8ac240b07 100644 --- a/src/hotspot/share/gc/z/zThread.cpp +++ b/src/hotspot/share/gc/z/zThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -22,7 +22,7 @@ */ #include "precompiled.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "runtime/thread.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zThread.hpp b/src/hotspot/share/gc/z/zThread.hpp index 88a813451ed..4a00ae7ed64 100644 --- a/src/hotspot/share/gc/z/zThread.hpp +++ b/src/hotspot/share/gc/z/zThread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -26,7 +26,6 @@ #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" -#include "utilities/debug.hpp" class ZThread : public AllStatic { friend class ZTask; @@ -43,12 +42,7 @@ private: static THREAD_LOCAL uint _worker_id; static void initialize(); - - static void ensure_initialized() { - if (!_initialized) { - initialize(); - } - } + static void ensure_initialized(); static void set_worker(); static void set_runtime_worker(); @@ -59,36 +53,12 @@ private: public: static const char* name(); - - static uintptr_t id() { - ensure_initialized(); - return _id; - } - - static bool is_vm() { - ensure_initialized(); - return _is_vm; - } - - static bool is_java() { - ensure_initialized(); - return _is_java; - } - - static bool is_worker() { - ensure_initialized(); - return _is_worker; - } - - static bool is_runtime_worker() { - ensure_initialized(); - return _is_runtime_worker; - } - - static uint worker_id() { - assert(has_worker_id(), "Worker id not initialized"); - return _worker_id; - } + static uintptr_t id(); + static bool is_vm(); + static bool is_java(); + static bool is_worker(); + static bool is_runtime_worker(); + static uint worker_id(); }; #endif // SHARE_GC_Z_ZTHREAD_HPP diff --git a/src/hotspot/share/gc/z/zThread.inline.hpp b/src/hotspot/share/gc/z/zThread.inline.hpp new file mode 100644 index 00000000000..761dfdb5ae5 --- /dev/null +++ b/src/hotspot/share/gc/z/zThread.inline.hpp @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2015, 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef SHARE_GC_Z_ZTHREAD_INLINE_HPP +#define SHARE_GC_Z_ZTHREAD_INLINE_HPP + +#include "gc/z/zThread.hpp" +#include "utilities/debug.hpp" + +inline void ZThread::ensure_initialized() { + if (!_initialized) { + initialize(); + } +} + +inline uintptr_t ZThread::id() { + ensure_initialized(); + return _id; +} + +inline bool ZThread::is_vm() { + ensure_initialized(); + return _is_vm; +} + +inline bool ZThread::is_java() { + ensure_initialized(); + return _is_java; +} + +inline bool ZThread::is_worker() { + ensure_initialized(); + return _is_worker; +} + +inline bool ZThread::is_runtime_worker() { + ensure_initialized(); + return _is_runtime_worker; +} + +inline uint ZThread::worker_id() { + assert(has_worker_id(), "Worker id not initialized"); + return _worker_id; +} + +#endif // SHARE_GC_Z_ZTHREAD_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zValue.inline.hpp b/src/hotspot/share/gc/z/zValue.inline.hpp index a9ae1c92ac0..29c5593746e 100644 --- a/src/hotspot/share/gc/z/zValue.inline.hpp +++ b/src/hotspot/share/gc/z/zValue.inline.hpp @@ -27,7 +27,7 @@ #include "gc/z/zCPU.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zNUMA.hpp" -#include "gc/z/zThread.hpp" +#include "gc/z/zThread.inline.hpp" #include "gc/z/zUtils.hpp" #include "gc/z/zValue.hpp" #include "runtime/globals.hpp" From b2ac9a5937c61205adc44af4f5f06d2956415f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:57:26 +0200 Subject: [PATCH 016/163] 8232237: ZGC: Move ZArray inline funtions to zArray.inline.hpp Reviewed-by: tschatzl --- src/hotspot/share/gc/z/zArray.hpp | 8 +++----- src/hotspot/share/gc/z/zArray.inline.hpp | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/gc/z/zArray.hpp b/src/hotspot/share/gc/z/zArray.hpp index 1bab29eefc2..378e45032c2 100644 --- a/src/hotspot/share/gc/z/zArray.hpp +++ b/src/hotspot/share/gc/z/zArray.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -74,15 +74,13 @@ public: template class ZArrayIterator : public ZArrayIteratorImpl { public: - ZArrayIterator(ZArray* array) : - ZArrayIteratorImpl(array) {} + ZArrayIterator(ZArray* array); }; template class ZArrayParallelIterator : public ZArrayIteratorImpl { public: - ZArrayParallelIterator(ZArray* array) : - ZArrayIteratorImpl(array) {} + ZArrayParallelIterator(ZArray* array); }; #endif // SHARE_GC_Z_ZARRAY_HPP diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp index 3e92fc57e07..4a6a17af55d 100644 --- a/src/hotspot/share/gc/z/zArray.inline.hpp +++ b/src/hotspot/share/gc/z/zArray.inline.hpp @@ -117,4 +117,12 @@ inline bool ZArrayIteratorImpl::next(T* elem) { return false; } +template +inline ZArrayIterator::ZArrayIterator(ZArray* array) : + ZArrayIteratorImpl(array) {} + +template +inline ZArrayParallelIterator::ZArrayParallelIterator(ZArray* array) : + ZArrayIteratorImpl(array) {} + #endif // SHARE_GC_Z_ZARRAY_INLINE_HPP From cb5e22630627f31bb0f598ebbd4590ff975a8224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:58:07 +0200 Subject: [PATCH 017/163] 8232238: ZGC: Move ZList inline funtions to zList.inline.hpp Reviewed-by: eosterlund --- src/hotspot/share/gc/z/zList.hpp | 174 +++---------------- src/hotspot/share/gc/z/zList.inline.hpp | 193 +++++++++++++++++++++- src/hotspot/share/gc/z/zMemory.inline.hpp | 1 + src/hotspot/share/gc/z/zPage.cpp | 3 + src/hotspot/share/gc/z/zPage.hpp | 1 + 5 files changed, 222 insertions(+), 150 deletions(-) diff --git a/src/hotspot/share/gc/z/zList.hpp b/src/hotspot/share/gc/z/zList.hpp index bebd0827b4c..6fc1a11758e 100644 --- a/src/hotspot/share/gc/z/zList.hpp +++ b/src/hotspot/share/gc/z/zList.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -25,7 +25,6 @@ #define SHARE_GC_Z_ZLIST_HPP #include "memory/allocation.hpp" -#include "utilities/debug.hpp" template class ZList; @@ -38,27 +37,15 @@ private: ZListNode* _next; ZListNode* _prev; - ZListNode(ZListNode* next, ZListNode* prev) : - _next(next), - _prev(prev) {} + ZListNode(ZListNode* next, ZListNode* prev); - void set_unused() { - _next = NULL; - _prev = NULL; - } + void set_unused(); public: - ZListNode() { - set_unused(); - } + ZListNode(); + ~ZListNode(); - ~ZListNode() { - set_unused(); - } - - bool is_unused() const { - return _next == NULL && _prev == NULL; - } + bool is_unused() const; }; // Doubly linked list @@ -72,139 +59,34 @@ private: ZList(const ZList& list); ZList& operator=(const ZList& list); - void verify() const { - assert(_head._next->_prev == &_head, "List corrupt"); - assert(_head._prev->_next == &_head, "List corrupt"); - } + void verify() const; - void insert(ZListNode* before, ZListNode* node) { - verify(); + void insert(ZListNode* before, ZListNode* node); - assert(node->is_unused(), "Already in a list"); - node->_prev = before; - node->_next = before->_next; - before->_next = node; - node->_next->_prev = node; - - _size++; - } - - ZListNode* cast_to_inner(T* elem) const { - return &elem->_node; - } - - T* cast_to_outer(ZListNode* node) const { - return (T*)((uintptr_t)node - offset_of(T, _node)); - } + ZListNode* cast_to_inner(T* elem) const; + T* cast_to_outer(ZListNode* node) const; public: - ZList() : - _head(&_head, &_head), - _size(0) { - verify(); - } + ZList(); - size_t size() const { - verify(); - return _size; - } + size_t size() const; + bool is_empty() const; - bool is_empty() const { - return _size == 0; - } + T* first() const; + T* last() const; + T* next(T* elem) const; + T* prev(T* elem) const; - T* first() const { - return is_empty() ? NULL : cast_to_outer(_head._next); - } + void insert_first(T* elem); + void insert_last(T* elem); + void insert_before(T* before, T* elem); + void insert_after(T* after, T* elem); - T* last() const { - return is_empty() ? NULL : cast_to_outer(_head._prev); - } + void remove(T* elem); + T* remove_first(); + T* remove_last(); - T* next(T* elem) const { - verify(); - ZListNode* next = cast_to_inner(elem)->_next; - return (next == &_head) ? NULL : cast_to_outer(next); - } - - T* prev(T* elem) const { - verify(); - ZListNode* prev = cast_to_inner(elem)->_prev; - return (prev == &_head) ? NULL : cast_to_outer(prev); - } - - void insert_first(T* elem) { - insert(&_head, cast_to_inner(elem)); - } - - void insert_last(T* elem) { - insert(_head._prev, cast_to_inner(elem)); - } - - void insert_before(T* before, T* elem) { - insert(cast_to_inner(before)->_prev, cast_to_inner(elem)); - } - - void insert_after(T* after, T* elem) { - insert(cast_to_inner(after), cast_to_inner(elem)); - } - - void remove(T* elem) { - verify(); - - ZListNode* const node = cast_to_inner(elem); - assert(!node->is_unused(), "Not in a list"); - - ZListNode* const next = node->_next; - ZListNode* const prev = node->_prev; - assert(next->_prev == node, "List corrupt"); - assert(prev->_next == node, "List corrupt"); - - prev->_next = next; - next->_prev = prev; - node->set_unused(); - - _size--; - } - - T* remove_first() { - T* elem = first(); - if (elem != NULL) { - remove(elem); - } - - return elem; - } - - T* remove_last() { - T* elem = last(); - if (elem != NULL) { - remove(elem); - } - - return elem; - } - - void transfer(ZList* list) { - verify(); - - if (!list->is_empty()) { - list->_head._next->_prev = _head._prev; - list->_head._prev->_next = _head._prev->_next; - - _head._prev->_next = list->_head._next; - _head._prev = list->_head._prev; - - list->_head._next = &list->_head; - list->_head._prev = &list->_head; - - _size += list->_size; - list->_size = 0; - - list->verify(); - verify(); - } - } + void transfer(ZList* list); }; template @@ -226,15 +108,13 @@ public: template class ZListIterator : public ZListIteratorImpl { public: - ZListIterator(const ZList* list) : - ZListIteratorImpl(list) {} + ZListIterator(const ZList* list); }; template class ZListReverseIterator : public ZListIteratorImpl { public: - ZListReverseIterator(const ZList* list) : - ZListIteratorImpl(list) {} + ZListReverseIterator(const ZList* list); }; #endif // SHARE_GC_Z_ZLIST_HPP diff --git a/src/hotspot/share/gc/z/zList.inline.hpp b/src/hotspot/share/gc/z/zList.inline.hpp index b6a3400b00e..c37c9f98bb2 100644 --- a/src/hotspot/share/gc/z/zList.inline.hpp +++ b/src/hotspot/share/gc/z/zList.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -25,14 +25,193 @@ #define SHARE_GC_Z_ZLIST_INLINE_HPP #include "gc/z/zList.hpp" +#include "utilities/debug.hpp" + +template +inline ZListNode::ZListNode(ZListNode* next, ZListNode* prev) : + _next(next), + _prev(prev) {} + +template +inline void ZListNode::set_unused() { + _next = NULL; + _prev = NULL; +} + +template +inline ZListNode::ZListNode() { + set_unused(); +} + +template +inline ZListNode::~ZListNode() { + set_unused(); +} + +template +inline bool ZListNode::is_unused() const { + return _next == NULL && _prev == NULL; +} + +template +inline void ZList::verify() const { + assert(_head._next->_prev == &_head, "List corrupt"); + assert(_head._prev->_next == &_head, "List corrupt"); +} + +template +inline void ZList::insert(ZListNode* before, ZListNode* node) { + verify(); + + assert(node->is_unused(), "Already in a list"); + node->_prev = before; + node->_next = before->_next; + before->_next = node; + node->_next->_prev = node; + + _size++; +} + +template +inline ZListNode* ZList::cast_to_inner(T* elem) const { + return &elem->_node; +} + +template +inline T* ZList::cast_to_outer(ZListNode* node) const { + return (T*)((uintptr_t)node - offset_of(T, _node)); +} + +template +inline ZList::ZList() : + _head(&_head, &_head), + _size(0) { + verify(); +} + +template +inline size_t ZList::size() const { + verify(); + return _size; +} + +template +inline bool ZList::is_empty() const { + return _size == 0; +} + +template +inline T* ZList::first() const { + return is_empty() ? NULL : cast_to_outer(_head._next); +} + +template +inline T* ZList::last() const { + return is_empty() ? NULL : cast_to_outer(_head._prev); +} + +template +inline T* ZList::next(T* elem) const { + verify(); + ZListNode* next = cast_to_inner(elem)->_next; + return (next == &_head) ? NULL : cast_to_outer(next); +} + +template +inline T* ZList::prev(T* elem) const { + verify(); + ZListNode* prev = cast_to_inner(elem)->_prev; + return (prev == &_head) ? NULL : cast_to_outer(prev); +} + +template +inline void ZList::insert_first(T* elem) { + insert(&_head, cast_to_inner(elem)); +} + +template +inline void ZList::insert_last(T* elem) { + insert(_head._prev, cast_to_inner(elem)); +} + +template +inline void ZList::insert_before(T* before, T* elem) { + insert(cast_to_inner(before)->_prev, cast_to_inner(elem)); +} + +template +inline void ZList::insert_after(T* after, T* elem) { + insert(cast_to_inner(after), cast_to_inner(elem)); +} + +template +inline void ZList::remove(T* elem) { + verify(); + + ZListNode* const node = cast_to_inner(elem); + assert(!node->is_unused(), "Not in a list"); + + ZListNode* const next = node->_next; + ZListNode* const prev = node->_prev; + assert(next->_prev == node, "List corrupt"); + assert(prev->_next == node, "List corrupt"); + + prev->_next = next; + next->_prev = prev; + node->set_unused(); + + _size--; +} + +template +inline T* ZList::remove_first() { + T* elem = first(); + if (elem != NULL) { + remove(elem); + } + + return elem; +} + +template +inline T* ZList::remove_last() { + T* elem = last(); + if (elem != NULL) { + remove(elem); + } + + return elem; +} + +template +inline void ZList::transfer(ZList* list) { + verify(); + + if (!list->is_empty()) { + list->_head._next->_prev = _head._prev; + list->_head._prev->_next = _head._prev->_next; + + _head._prev->_next = list->_head._next; + _head._prev = list->_head._prev; + + list->_head._next = &list->_head; + list->_head._prev = &list->_head; + + _size += list->_size; + list->_size = 0; + + list->verify(); + verify(); + } +} template -ZListIteratorImpl::ZListIteratorImpl(const ZList* list) : +inline ZListIteratorImpl::ZListIteratorImpl(const ZList* list) : _list(list), _next(forward ? list->first() : list->last()) {} template -bool ZListIteratorImpl::next(T** elem) { +inline bool ZListIteratorImpl::next(T** elem) { if (_next != NULL) { *elem = _next; _next = forward ? _list->next(_next) : _list->prev(_next); @@ -43,4 +222,12 @@ bool ZListIteratorImpl::next(T** elem) { return false; } +template +inline ZListIterator::ZListIterator(const ZList* list) : + ZListIteratorImpl(list) {} + +template +inline ZListReverseIterator::ZListReverseIterator(const ZList* list) : + ZListIteratorImpl(list) {} + #endif // SHARE_GC_Z_ZLIST_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMemory.inline.hpp b/src/hotspot/share/gc/z/zMemory.inline.hpp index 8bc27a2bf90..9d5fe209913 100644 --- a/src/hotspot/share/gc/z/zMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zMemory.inline.hpp @@ -24,6 +24,7 @@ #ifndef SHARE_GC_Z_ZMEMORY_INLINE_HPP #define SHARE_GC_Z_ZMEMORY_INLINE_HPP +#include "gc/z/zList.inline.hpp" #include "gc/z/zMemory.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/gc/z/zPage.cpp b/src/hotspot/share/gc/z/zPage.cpp index cf0c6992f84..c919e315d0a 100644 --- a/src/hotspot/share/gc/z/zPage.cpp +++ b/src/hotspot/share/gc/z/zPage.cpp @@ -22,6 +22,7 @@ */ #include "precompiled.hpp" +#include "gc/z/zList.inline.hpp" #include "gc/z/zPage.inline.hpp" #include "gc/z/zPhysicalMemory.inline.hpp" #include "gc/z/zVirtualMemory.inline.hpp" @@ -52,6 +53,8 @@ ZPage::ZPage(uint8_t type, const ZVirtualMemory& vmem, const ZPhysicalMemory& pm assert_initialized(); } +ZPage::~ZPage() {} + void ZPage::assert_initialized() const { assert(!_virtual.is_null(), "Should not be null"); assert(!_physical.is_null(), "Should not be null"); diff --git a/src/hotspot/share/gc/z/zPage.hpp b/src/hotspot/share/gc/z/zPage.hpp index 57d1395fe72..4c4d684b674 100644 --- a/src/hotspot/share/gc/z/zPage.hpp +++ b/src/hotspot/share/gc/z/zPage.hpp @@ -56,6 +56,7 @@ private: public: ZPage(const ZVirtualMemory& vmem, const ZPhysicalMemory& pmem); ZPage(uint8_t type, const ZVirtualMemory& vmem, const ZPhysicalMemory& pmem); + ~ZPage(); uint32_t object_max_count() const; size_t object_alignment_shift() const; From ee4c8f5f19a2bd9eef88e477ad3193357a882989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Lid=C3=A9n?= Date: Mon, 21 Oct 2019 09:58:32 +0200 Subject: [PATCH 018/163] 8232239: ZGC: Inline ZCPU::count() and ZCPU:id() Reviewed-by: tschatzl --- src/hotspot/os/linux/gc/z/zNUMA_linux.cpp | 2 +- src/hotspot/share/gc/z/zCPU.cpp | 25 +++++------- src/hotspot/share/gc/z/zCPU.hpp | 4 +- src/hotspot/share/gc/z/zCPU.inline.hpp | 47 +++++++++++++++++++++++ src/hotspot/share/gc/z/zStat.cpp | 2 +- src/hotspot/share/gc/z/zValue.inline.hpp | 2 +- 6 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 src/hotspot/share/gc/z/zCPU.inline.hpp diff --git a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp index c521ebbe88b..be22c3455b8 100644 --- a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp +++ b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp @@ -22,7 +22,7 @@ */ #include "gc/z/zErrno.hpp" -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "gc/z/zNUMA.hpp" #include "runtime/globals.hpp" #include "runtime/os.hpp" diff --git a/src/hotspot/share/gc/z/zCPU.cpp b/src/hotspot/share/gc/z/zCPU.cpp index ca46036343c..37b1d43e2dc 100644 --- a/src/hotspot/share/gc/z/zCPU.cpp +++ b/src/hotspot/share/gc/z/zCPU.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -22,15 +22,15 @@ */ #include "precompiled.hpp" -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "logging/log.hpp" #include "memory/padded.inline.hpp" #include "runtime/os.hpp" #include "runtime/thread.inline.hpp" #include "utilities/debug.hpp" -#define ZCPU_UNKNOWN_AFFINITY (Thread*)-1; -#define ZCPU_UNKNOWN_SELF (Thread*)-2; +#define ZCPU_UNKNOWN_AFFINITY ((Thread*)-1) +#define ZCPU_UNKNOWN_SELF ((Thread*)-2) PaddedEnd* ZCPU::_affinity = NULL; THREAD_LOCAL Thread* ZCPU::_self = ZCPU_UNKNOWN_SELF; @@ -51,20 +51,13 @@ void ZCPU::initialize() { os::initial_active_processor_count()); } -uint32_t ZCPU::count() { - return os::processor_count(); -} - -uint32_t ZCPU::id() { - assert(_affinity != NULL, "Not initialized"); - - // Fast path - if (_affinity[_cpu]._thread == _self) { - return _cpu; +uint32_t ZCPU::id_slow() { + // Set current thread + if (_self == ZCPU_UNKNOWN_SELF) { + _self = Thread::current(); } - // Slow path - _self = Thread::current(); + // Set current CPU _cpu = os::processor_id(); // Update affinity table diff --git a/src/hotspot/share/gc/z/zCPU.hpp b/src/hotspot/share/gc/z/zCPU.hpp index 4c7038df46f..65e04cc75e3 100644 --- a/src/hotspot/share/gc/z/zCPU.hpp +++ b/src/hotspot/share/gc/z/zCPU.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -40,6 +40,8 @@ private: static THREAD_LOCAL Thread* _self; static THREAD_LOCAL uint32_t _cpu; + static uint32_t id_slow(); + public: static void initialize(); diff --git a/src/hotspot/share/gc/z/zCPU.inline.hpp b/src/hotspot/share/gc/z/zCPU.inline.hpp new file mode 100644 index 00000000000..7de98ae6285 --- /dev/null +++ b/src/hotspot/share/gc/z/zCPU.inline.hpp @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef SHARE_GC_Z_ZCPU_INLINE_HPP +#define SHARE_GC_Z_ZCPU_INLINE_HPP + +#include "gc/z/zCPU.hpp" +#include "runtime/os.hpp" +#include "utilities/debug.hpp" + +inline uint32_t ZCPU::count() { + return os::processor_count(); +} + +inline uint32_t ZCPU::id() { + assert(_affinity != NULL, "Not initialized"); + + // Fast path + if (_affinity[_cpu]._thread == _self) { + return _cpu; + } + + // Slow path + return id_slow(); +} + +#endif // SHARE_GC_Z_ZCPU_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp index 7fbe6ff684d..18d99ea36de 100644 --- a/src/hotspot/share/gc/z/zStat.cpp +++ b/src/hotspot/share/gc/z/zStat.cpp @@ -23,7 +23,7 @@ #include "precompiled.hpp" #include "gc/z/zCollectedHeap.hpp" -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zHeap.inline.hpp" #include "gc/z/zLargePages.inline.hpp" diff --git a/src/hotspot/share/gc/z/zValue.inline.hpp b/src/hotspot/share/gc/z/zValue.inline.hpp index 29c5593746e..064e81ccdb3 100644 --- a/src/hotspot/share/gc/z/zValue.inline.hpp +++ b/src/hotspot/share/gc/z/zValue.inline.hpp @@ -24,7 +24,7 @@ #ifndef SHARE_GC_Z_ZVALUE_INLINE_HPP #define SHARE_GC_Z_ZVALUE_INLINE_HPP -#include "gc/z/zCPU.hpp" +#include "gc/z/zCPU.inline.hpp" #include "gc/z/zGlobals.hpp" #include "gc/z/zNUMA.hpp" #include "gc/z/zThread.inline.hpp" From 76465eb1d9edf229f1fa7e4a75feba3b1944242f Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 21 Oct 2019 15:11:42 +0200 Subject: [PATCH 019/163] 8232674: Fix build and rename ShenandoahBarrierSet::oop_load_from_native_barrier Reviewed-by: zgu --- .../share/gc/shenandoah/c2/shenandoahSupport.cpp | 2 +- .../share/gc/shenandoah/shenandoahBarrierSet.cpp | 13 ++++++++++++- .../share/gc/shenandoah/shenandoahBarrierSet.hpp | 10 ++++++---- .../gc/shenandoah/shenandoahBarrierSet.inline.hpp | 2 +- .../share/gc/shenandoah/shenandoahRuntime.cpp | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp index 6632576e7c4..11b7de7a491 100644 --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp @@ -1033,7 +1033,7 @@ void ShenandoahBarrierC2Support::call_lrb_stub(Node*& ctrl, Node*& val, Node* lo address calladdr = is_native ? CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native) : target; - const char* name = is_native ? "oop_load_from_native_barrier" : "load_reference_barrier"; + const char* name = is_native ? "load_reference_barrier_native" : "load_reference_barrier"; Node* call = new CallLeafNode(ShenandoahBarrierSetC2::shenandoah_load_reference_barrier_Type(), calladdr, name, TypeRawPtr::BOTTOM); call->init_req(TypeFunc::Control, ctrl); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp index 2d7c1fe09bd..ea12aee6471 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp @@ -262,7 +262,18 @@ void ShenandoahBarrierSet::on_thread_detach(Thread *thread) { } } -oop ShenandoahBarrierSet::oop_load_from_native_barrier(oop obj, oop* load_addr) { +oop ShenandoahBarrierSet::load_reference_barrier_native(oop obj, oop* load_addr) { + return load_reference_barrier_native_impl(obj, load_addr); +} + +oop ShenandoahBarrierSet::load_reference_barrier_native(oop obj, narrowOop* load_addr) { + // Assumption: narrow oop version should not be used anywhere. + ShouldNotReachHere(); + return NULL; +} + +template +oop ShenandoahBarrierSet::load_reference_barrier_native_impl(oop obj, T* load_addr) { if (CompressedOops::is_null(obj)) { return NULL; } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp index d9cc1734757..7e0e11bad0a 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp @@ -84,10 +84,6 @@ public: void write_ref_field_work(void* v, oop o, bool release = false); - oop oop_load_from_native_barrier(oop obj, oop* load_addr); - oop oop_load_from_native_barrier(oop obj, narrowOop* load_addr); - - virtual void on_thread_create(Thread* thread); virtual void on_thread_destroy(Thread* thread); virtual void on_thread_attach(Thread* thread); @@ -108,6 +104,9 @@ public: template oop load_reference_barrier_mutator_work(oop obj, T* load_addr); + oop load_reference_barrier_native(oop obj, oop* load_addr); + oop load_reference_barrier_native(oop obj, narrowOop* load_addr); + void enqueue(oop obj); private: @@ -120,6 +119,9 @@ private: oop load_reference_barrier_impl(oop obj); + template + oop load_reference_barrier_native_impl(oop obj, T* load_addr); + static void keep_alive_if_weak(DecoratorSet decorators, oop value) { assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known"); const bool on_strong_oop_ref = (decorators & ON_STRONG_OOP_REF) != 0; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp index bc488470b0c..2039f8357cc 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp @@ -69,7 +69,7 @@ template template inline oop ShenandoahBarrierSet::AccessBarrier::oop_load_not_in_heap(T* addr) { oop value = Raw::oop_load_not_in_heap(addr); - value = ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(value, addr); + value = ShenandoahBarrierSet::barrier_set()->load_reference_barrier_native(value, addr); keep_alive_if_weak(decorators, value); return value; } diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp index 163a43ce7bd..824de2a611a 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp @@ -83,5 +83,5 @@ JRT_LEAF(void, ShenandoahRuntime::shenandoah_clone_barrier(oopDesc* src)) JRT_END JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_native(oopDesc * src, oop* load_addr)) - return (oopDesc*) ShenandoahBarrierSet::barrier_set()->oop_load_from_native_barrier(oop(src), load_addr); + return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier_native(oop(src), load_addr); JRT_END From c3d807276d68f3e3c09fcd4604f538fd7a0de312 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 21 Oct 2019 15:11:43 +0200 Subject: [PATCH 020/163] 8232575: Shenandoah: asynchronous object/region pinning Reviewed-by: rkennke --- ...henandoahTraversalAggressiveHeuristics.cpp | 3 ++ .../shenandoahTraversalHeuristics.cpp | 3 ++ .../share/gc/shenandoah/shenandoahHeap.cpp | 53 +++++++++++++++++-- .../share/gc/shenandoah/shenandoahHeap.hpp | 4 ++ .../gc/shenandoah/shenandoahHeapRegion.cpp | 48 ++++++++--------- .../gc/shenandoah/shenandoahHeapRegion.hpp | 6 ++- .../gc/shenandoah/shenandoahHeuristics.cpp | 3 ++ .../gc/shenandoah/shenandoahMarkCompact.cpp | 7 +++ .../gc/shenandoah/shenandoahPhaseTimings.hpp | 4 ++ .../gc/shenandoah/shenandoahTraversalGC.cpp | 34 ++++++++---- 10 files changed, 125 insertions(+), 40 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp index f752d581c87..400305fa464 100644 --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalAggressiveHeuristics.cpp @@ -75,6 +75,9 @@ void ShenandoahTraversalAggressiveHeuristics::choose_collection_set(ShenandoahCo RegionData *data = get_region_data_cache(heap->num_regions()); size_t cnt = 0; + // About to choose the collection set, make sure we have pinned regions in correct state + heap->assert_pinned_region_status(); + // Step 0. Prepare all regions for (size_t i = 0; i < heap->num_regions(); i++) { ShenandoahHeapRegion* r = heap->get_region(i); diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp index 9a3fa2a57a8..973278e3629 100644 --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.cpp @@ -59,6 +59,9 @@ void ShenandoahTraversalHeuristics::choose_collection_set(ShenandoahCollectionSe RegionData *data = get_region_data_cache(heap->num_regions()); size_t cnt = 0; + // About to choose the collection set, make sure we have pinned regions in correct state + heap->assert_pinned_region_status(); + // Step 0. Prepare all regions for (size_t i = 0; i < heap->num_regions(); i++) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp index 1ae11eab3ce..c6c07cbdbb7 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp @@ -1507,6 +1507,14 @@ void ShenandoahHeap::op_final_mark() { make_parsable(true); } + // We are about to select the collection set, make sure it knows about + // current pinning status. Also, this allows trashing more regions that + // now have their pinning status dropped. + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::sync_pinned); + sync_pinned_region_status(); + } + // Trash the collection set left over from previous cycle, if any. { ShenandoahGCPhase phase(ShenandoahPhaseTimings::trash_cset); @@ -1784,6 +1792,7 @@ void ShenandoahHeap::op_degenerated(ShenandoahDegenPoint point) { // it, we fail degeneration right away and slide into Full GC to recover. { + sync_pinned_region_status(); collection_set()->clear_current_index(); ShenandoahHeapRegion* r; @@ -2148,16 +2157,45 @@ void ShenandoahHeap::unregister_nmethod(nmethod* nm) { } oop ShenandoahHeap::pin_object(JavaThread* thr, oop o) { - ShenandoahHeapLocker locker(lock()); - heap_region_containing(o)->make_pinned(); + heap_region_containing(o)->record_pin(); return o; } void ShenandoahHeap::unpin_object(JavaThread* thr, oop o) { - ShenandoahHeapLocker locker(lock()); - heap_region_containing(o)->make_unpinned(); + heap_region_containing(o)->record_unpin(); } +void ShenandoahHeap::sync_pinned_region_status() { + ShenandoahHeapLocker locker(lock()); + + for (size_t i = 0; i < num_regions(); i++) { + ShenandoahHeapRegion *r = get_region(i); + if (r->is_active()) { + if (r->is_pinned()) { + if (r->pin_count() == 0) { + r->make_unpinned(); + } + } else { + if (r->pin_count() > 0) { + r->make_pinned(); + } + } + } + } + + assert_pinned_region_status(); +} + +#ifdef ASSERT +void ShenandoahHeap::assert_pinned_region_status() { + for (size_t i = 0; i < num_regions(); i++) { + ShenandoahHeapRegion* r = get_region(i); + assert((r->is_pinned() && r->pin_count() > 0) || (!r->is_pinned() && r->pin_count() == 0), + "Region " SIZE_FORMAT " pinning status is inconsistent", i); + } +} +#endif + GCTimer* ShenandoahHeap::gc_timer() const { return _gc_timer; } @@ -2316,6 +2354,13 @@ void ShenandoahHeap::op_final_updaterefs() { verifier()->verify_roots_in_to_space(); } + // Drop unnecessary "pinned" state from regions that does not have CP marks + // anymore, as this would allow trashing them below. + { + ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_update_refs_sync_pinned); + sync_pinned_region_status(); + } + { ShenandoahGCPhase phase(ShenandoahPhaseTimings::final_update_refs_trash_cset); trash_cset_regions(); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index c5ea7a52959..96bca67d5c9 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -43,6 +43,7 @@ class ShenandoahGCSession; class ShenandoahGCStateResetter; class ShenandoahHeuristics; class ShenandoahMarkingContext; +class ShenandoahMarkCompact; class ShenandoahMode; class ShenandoahPhaseTimings; class ShenandoahHeap; @@ -574,6 +575,9 @@ public: oop pin_object(JavaThread* thread, oop obj); void unpin_object(JavaThread* thread, oop obj); + void sync_pinned_region_status(); + void assert_pinned_region_status() NOT_DEBUG_RETURN; + // ---------- Allocation support // private: diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp index f99ef2674ce..2cad5e158d3 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp @@ -59,7 +59,6 @@ ShenandoahHeapRegion::ShenandoahHeapRegion(ShenandoahHeap* heap, HeapWord* start _reserved(MemRegion(start, size_words)), _region_number(index), _new_top(NULL), - _critical_pins(0), _empty_time(os::elapsedTime()), _state(committed ? _empty_committed : _empty_uncommitted), _tlab_allocs(0), @@ -69,7 +68,8 @@ ShenandoahHeapRegion::ShenandoahHeapRegion(ShenandoahHeap* heap, HeapWord* start _seqnum_first_alloc_gc(0), _seqnum_last_alloc_mutator(0), _seqnum_last_alloc_gc(0), - _live_data(0) { + _live_data(0), + _critical_pins(0) { ContiguousSpace::initialize(_reserved, true, committed); } @@ -187,25 +187,21 @@ void ShenandoahHeapRegion::make_humongous_cont_bypass() { void ShenandoahHeapRegion::make_pinned() { _heap->assert_heaplock_owned_by_current_thread(); + assert(pin_count() > 0, "Should have pins: " SIZE_FORMAT, pin_count()); + switch (_state) { case _regular: - assert (_critical_pins == 0, "sanity"); set_state(_pinned); case _pinned_cset: case _pinned: - _critical_pins++; return; case _humongous_start: - assert (_critical_pins == 0, "sanity"); set_state(_pinned_humongous_start); case _pinned_humongous_start: - _critical_pins++; return; case _cset: guarantee(_heap->cancelled_gc(), "only valid when evac has been cancelled"); - assert (_critical_pins == 0, "sanity"); _state = _pinned_cset; - _critical_pins++; return; default: report_illegal_transition("pinning"); @@ -214,32 +210,21 @@ void ShenandoahHeapRegion::make_pinned() { void ShenandoahHeapRegion::make_unpinned() { _heap->assert_heaplock_owned_by_current_thread(); + assert(pin_count() == 0, "Should not have pins: " SIZE_FORMAT, pin_count()); + switch (_state) { case _pinned: - assert (_critical_pins > 0, "sanity"); - _critical_pins--; - if (_critical_pins == 0) { - set_state(_regular); - } + set_state(_regular); return; case _regular: case _humongous_start: - assert (_critical_pins == 0, "sanity"); return; case _pinned_cset: guarantee(_heap->cancelled_gc(), "only valid when evac has been cancelled"); - assert (_critical_pins > 0, "sanity"); - _critical_pins--; - if (_critical_pins == 0) { - set_state(_cset); - } + set_state(_cset); return; case _pinned_humongous_start: - assert (_critical_pins > 0, "sanity"); - _critical_pins--; - if (_critical_pins == 0) { - set_state(_humongous_start); - } + set_state(_humongous_start); return; default: report_illegal_transition("unpinning"); @@ -434,7 +419,7 @@ void ShenandoahHeapRegion::print_on(outputStream* st) const { st->print("|G " SIZE_FORMAT_W(5) "%1s", byte_size_in_proper_unit(get_gclab_allocs()), proper_unit_for_byte_size(get_gclab_allocs())); st->print("|S " SIZE_FORMAT_W(5) "%1s", byte_size_in_proper_unit(get_shared_allocs()), proper_unit_for_byte_size(get_shared_allocs())); st->print("|L " SIZE_FORMAT_W(5) "%1s", byte_size_in_proper_unit(get_live_data_bytes()), proper_unit_for_byte_size(get_live_data_bytes())); - st->print("|CP " SIZE_FORMAT_W(3), _critical_pins); + st->print("|CP " SIZE_FORMAT_W(3), pin_count()); st->print("|SN " UINT64_FORMAT_X_W(12) ", " UINT64_FORMAT_X_W(8) ", " UINT64_FORMAT_X_W(8) ", " UINT64_FORMAT_X_W(8), seqnum_first_alloc_mutator(), seqnum_last_alloc_mutator(), seqnum_first_alloc_gc(), seqnum_last_alloc_gc()); @@ -702,3 +687,16 @@ void ShenandoahHeapRegion::set_state(RegionState to) { } _state = to; } + +void ShenandoahHeapRegion::record_pin() { + Atomic::add((size_t)1, &_critical_pins); +} + +void ShenandoahHeapRegion::record_unpin() { + assert(pin_count() > 0, "Region " SIZE_FORMAT " should have non-zero pins", region_number()); + Atomic::sub((size_t)1, &_critical_pins); +} + +size_t ShenandoahHeapRegion::pin_count() const { + return Atomic::load(&_critical_pins); +} diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp index f40eed191f5..ea3e9372399 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp @@ -203,6 +203,10 @@ public: RegionState state() const { return _state; } int state_ordinal() const { return region_state_to_ordinal(_state); } + void record_pin(); + void record_unpin(); + size_t pin_count() const; + private: static size_t RegionCount; static size_t RegionSizeBytes; @@ -238,7 +242,6 @@ private: // Rarely updated fields HeapWord* _new_top; - size_t _critical_pins; double _empty_time; // Seldom updated fields @@ -255,6 +258,7 @@ private: uint64_t _seqnum_last_alloc_gc; volatile size_t _live_data; + volatile size_t _critical_pins; // Claim some space at the end to protect next region DEFINE_PAD_MINUS_SIZE(0, DEFAULT_CACHE_LINE_SIZE, 0); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp index 30cb2347a19..feaf22c1f72 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.cpp @@ -120,6 +120,9 @@ void ShenandoahHeuristics::choose_collection_set(ShenandoahCollectionSet* collec ShenandoahHeap* heap = ShenandoahHeap::heap(); + // Check all pinned regions have updated status before choosing the collection set. + heap->assert_pinned_region_status(); + // Step 1. Build up the region candidates we care about, rejecting losers and accepting winners right away. size_t num_regions = heap->num_regions(); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp index 00192d41bbb..d496351a0b1 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp @@ -128,6 +128,9 @@ void ShenandoahMarkCompact::do_it(GCCause::Cause gc_cause) { // e. Set back forwarded objects bit back, in case some steps above dropped it. heap->set_has_forwarded_objects(has_forwarded_objects); + // f. Sync pinned region status from the CP marks + heap->sync_pinned_region_status(); + // The rest of prologue: BiasedLocking::preserve_marks(); _preserved_marks->init(heap->workers()->active_workers()); @@ -505,6 +508,10 @@ void ShenandoahMarkCompact::phase2_calculate_target_addresses(ShenandoahHeapRegi ShenandoahHeap* heap = ShenandoahHeap::heap(); + // About to figure out which regions can be compacted, make sure pinning status + // had been updated in GC prologue. + heap->assert_pinned_region_status(); + { // Trash the immediately collectible regions before computing addresses ShenandoahTrashImmediateGarbageClosure tigcl; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp index 9f02f9a0372..db7682d06a4 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp @@ -101,6 +101,7 @@ class outputStream; f(purge_cldg, " CLDG") \ f(complete_liveness, " Complete Liveness") \ f(retire_tlabs, " Retire TLABs") \ + f(sync_pinned, " Sync Pinned") \ f(trash_cset, " Trash CSet") \ f(prepare_evac, " Prepare Evacuation") \ \ @@ -161,6 +162,7 @@ class outputStream; f(final_update_refs_string_dedup_queue_roots, " UR: Dedup Queue Roots") \ f(final_update_refs_finish_queues, " UR: Finish Queues") \ \ + f(final_update_refs_sync_pinned, " Sync Pinned") \ f(final_update_refs_trash_cset, " Trash CSet") \ \ f(degen_gc_gross, "Pause Degenerated GC (G)") \ @@ -193,6 +195,7 @@ class outputStream; f(traversal_gc_prepare, " Prepare") \ f(traversal_gc_make_parsable, " Make Parsable") \ f(traversal_gc_resize_tlabs, " Resize TLABs") \ + f(traversal_gc_prepare_sync_pinned, " Sync Pinned") \ \ /* Per-thread timer block, should have "roots" counters in consistent order */ \ f(init_traversal_gc_work, " Work") \ @@ -264,6 +267,7 @@ class outputStream; f(final_traversal_update_string_dedup_queue_roots, " TU: Dedup Queue Roots") \ f(final_traversal_update_finish_queues, " TU: Finish Queues") \ \ + f(traversal_gc_sync_pinned, " Sync Pinned") \ f(traversal_gc_cleanup, " Cleanup") \ \ f(full_gc_gross, "Pause Full GC (G)") \ diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp index c59d339b6d6..46ee476abcf 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp @@ -340,9 +340,6 @@ void ShenandoahTraversalGC::prepare_regions() { } void ShenandoahTraversalGC::prepare() { - _heap->collection_set()->clear(); - assert(_heap->collection_set()->count() == 0, "collection set not clear"); - { ShenandoahGCPhase phase(ShenandoahPhaseTimings::traversal_gc_make_parsable); _heap->make_parsable(true); @@ -356,15 +353,26 @@ void ShenandoahTraversalGC::prepare() { assert(_heap->marking_context()->is_bitmap_clear(), "need clean mark bitmap"); assert(!_heap->marking_context()->is_complete(), "should not be complete"); - ShenandoahFreeSet* free_set = _heap->free_set(); + // About to choose the collection set, make sure we know which regions are pinned. + { + ShenandoahGCPhase phase_cleanup(ShenandoahPhaseTimings::traversal_gc_prepare_sync_pinned); + _heap->sync_pinned_region_status(); + } + ShenandoahCollectionSet* collection_set = _heap->collection_set(); + { + ShenandoahHeapLocker lock(_heap->lock()); - // Find collection set - _heap->heuristics()->choose_collection_set(collection_set); - prepare_regions(); + collection_set->clear(); + assert(collection_set->count() == 0, "collection set not clear"); - // Rebuild free set - free_set->rebuild(); + // Find collection set + _heap->heuristics()->choose_collection_set(collection_set); + prepare_regions(); + + // Rebuild free set + _heap->free_set()->rebuild(); + } log_info(gc, ergo)("Collectable Garbage: " SIZE_FORMAT "%s, " SIZE_FORMAT "%s CSet, " SIZE_FORMAT " CSet regions", byte_size_in_proper_unit(collection_set->garbage()), proper_unit_for_byte_size(collection_set->garbage()), @@ -385,7 +393,6 @@ void ShenandoahTraversalGC::init_traversal_collection() { { ShenandoahGCPhase phase_prepare(ShenandoahPhaseTimings::traversal_gc_prepare); - ShenandoahHeapLocker lock(_heap->lock()); prepare(); } @@ -613,6 +620,13 @@ void ShenandoahTraversalGC::final_traversal_collection() { // Resize metaspace MetaspaceGC::compute_new_size(); + // Need to see that pinned region status is updated: newly pinned regions must not + // be trashed. New unpinned regions should be trashed. + { + ShenandoahGCPhase phase_cleanup(ShenandoahPhaseTimings::traversal_gc_sync_pinned); + _heap->sync_pinned_region_status(); + } + // Still good? We can now trash the cset, and make final verification { ShenandoahGCPhase phase_cleanup(ShenandoahPhaseTimings::traversal_gc_cleanup); From f771978f532c1b507f62cba9cfae8d51ce525757 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 21 Oct 2019 15:11:44 +0200 Subject: [PATCH 021/163] 8232702: Shenandoah: gc/shenandoah/TestVerifyJCStress.java uses non-existent -XX:+VerifyObjectEquals Reviewed-by: rkennke --- .../gc/shenandoah/TestVerifyJCStress.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java index e7224816d61..8a60546cf17 100644 --- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java +++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java @@ -29,14 +29,14 @@ * @modules java.base/jdk.internal.misc * java.management * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive - * -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify -XX:+VerifyObjectEquals + * -XX:+ShenandoahDegeneratedGC -XX:+ShenandoahVerify * TestVerifyJCStress * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive - * -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify -XX:+VerifyObjectEquals + * -XX:-ShenandoahDegeneratedGC -XX:+ShenandoahVerify * TestVerifyJCStress */ @@ -48,14 +48,14 @@ * @modules java.base/jdk.internal.misc * java.management * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive - * -XX:+ShenandoahVerify -XX:+VerifyObjectEquals -XX:+ShenandoahVerifyOptoBarriers + * -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers * TestVerifyJCStress * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact - * -XX:+ShenandoahVerify -XX:+VerifyObjectEquals -XX:+ShenandoahVerifyOptoBarriers + * -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers * TestVerifyJCStress */ @@ -67,9 +67,9 @@ * @modules java.base/jdk.internal.misc * java.management * - * @run main/othervm -Xmx1g -Xms1g -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions + * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=traversal - * -XX:+ShenandoahVerify -XX:+VerifyObjectEquals -XX:+ShenandoahVerifyOptoBarriers + * -XX:+ShenandoahVerify -XX:+IgnoreUnrecognizedVMOptions -XX:+ShenandoahVerifyOptoBarriers * TestVerifyJCStress */ From a1894385b388bf43ca8f715a7c4d8a6352ce1d61 Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Mon, 21 Oct 2019 15:38:26 +0200 Subject: [PATCH 022/163] 8226585: Improve javac messages for using a preview API Avoiding deprecation for removal for APIs associated with preview features, the features are marked with an annotation, and errors/warnings are produced for them based on the annotation. Co-authored-by: Joe Darcy Reviewed-by: erikj, mcimadamore, alanb --- make/CompileInterimLangtools.gmk | 11 +- make/Docs.gmk | 1 + .../classes/build/tools/taglet/Preview.java | 79 +++++ .../share/classes/java/lang/String.java | 43 ++- .../classes/jdk/internal/PreviewFeature.java | 60 ++++ src/java.base/share/classes/module-info.java | 3 +- .../classes/com/sun/source/tree/CaseTree.java | 56 ++-- .../sun/source/tree/SwitchExpressionTree.java | 14 +- .../classes/com/sun/source/tree/Tree.java | 34 ++- .../com/sun/source/tree/TreeVisitor.java | 34 ++- .../com/sun/source/tree/YieldTree.java | 14 +- .../sun/source/util/SimpleTreeVisitor.java | 21 +- .../com/sun/source/util/TreeScanner.java | 39 +-- .../sun/tools/javac/api/JavacTaskPool.java | 3 + .../com/sun/tools/javac/code/Flags.java | 24 +- .../com/sun/tools/javac/code/Lint.java | 3 + .../com/sun/tools/javac/code/Preview.java | 17 +- .../com/sun/tools/javac/code/Symbol.java | 4 + .../com/sun/tools/javac/code/Symtab.java | 2 + .../com/sun/tools/javac/comp/Annotate.java | 27 +- .../com/sun/tools/javac/comp/Attr.java | 7 +- .../com/sun/tools/javac/comp/Check.java | 36 +++ .../com/sun/tools/javac/comp/Lower.java | 1 - .../com/sun/tools/javac/comp/Resolve.java | 1 + .../com/sun/tools/javac/comp/TypeEnter.java | 31 +- .../sun/tools/javac/file/BaseFileManager.java | 5 + .../com/sun/tools/javac/jvm/ClassReader.java | 23 +- .../sun/tools/javac/parser/JavacParser.java | 14 +- .../tools/javac/resources/compiler.properties | 8 + .../com/sun/tools/javac/tree/JCTree.java | 23 +- .../com/sun/tools/javac/tree/Pretty.java | 1 - .../com/sun/tools/javac/tree/TreeCopier.java | 4 +- .../com/sun/tools/javac/tree/TreeMaker.java | 4 +- .../javac/util/MandatoryWarningHandler.java | 13 +- .../com/sun/tools/javac/util/Names.java | 2 + test/jdk/java/lang/String/Formatted.java | 3 +- test/jdk/java/lang/String/StripIndent.java | 3 +- .../java/lang/String/TranslateEscapes.java | 3 +- .../tools/javac/diags/examples.not-yet.txt | 2 + .../tools/javac/lib/combo/ComboInstance.java | 11 +- .../tools/javac/preview/PreviewErrors.java | 274 ++++++++++++++++++ .../javac/tree/NoPrivateTypesExported.java | 1 + .../tools/jdeps/listdeps/ListModuleDeps.java | 1 + 43 files changed, 794 insertions(+), 166 deletions(-) create mode 100644 make/jdk/src/classes/build/tools/taglet/Preview.java create mode 100644 src/java.base/share/classes/jdk/internal/PreviewFeature.java create mode 100644 test/langtools/tools/javac/preview/PreviewErrors.java diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk index b8ff3af48ad..736dfd70280 100644 --- a/make/CompileInterimLangtools.gmk +++ b/make/CompileInterimLangtools.gmk @@ -49,6 +49,13 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/%.interim/module-info.java: \ TARGETS += $(patsubst %, $(BUILDTOOLS_OUTPUTDIR)/gensrc/%/module-info.java, \ $(INTERIM_LANGTOOLS_MODULES)) +$(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \ + FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/PreviewFeature.java, \ + DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/, \ +)) + +TARGETS += $(COPY_PREVIEW_FEATURES) + ################################################################################ # Setup the rules to build interim langtools, which is compiled by the boot # javac and can be run on the boot jdk. This will be used to compile the rest of @@ -72,13 +79,15 @@ define SetupInterimModule BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \ ADD_JAVAC_FLAGS := --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \ $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \ + --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \ + --add-exports java.base/jdk.internal=jdk.compiler.interim \ -Xlint:-module, \ )) $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \ $$(INTERIM_LANGTOOLS_BASE_MODULES), $$(call FindTransitiveDepsForModule, $1))) - $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) + $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) $(COPY_PREVIEW_FEATURES) TARGETS += $$(BUILD_$1.interim) endef diff --git a/make/Docs.gmk b/make/Docs.gmk index 2572cb4389e..10eda630e66 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -95,6 +95,7 @@ JAVADOC_TAGS := \ -tag see \ -taglet build.tools.taglet.ExtLink \ -taglet build.tools.taglet.Incubating \ + -taglet build.tools.taglet.Preview \ -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ $(CUSTOM_JAVADOC_TAGS) \ # diff --git a/make/jdk/src/classes/build/tools/taglet/Preview.java b/make/jdk/src/classes/build/tools/taglet/Preview.java new file mode 100644 index 00000000000..2b4bf16b75c --- /dev/null +++ b/make/jdk/src/classes/build/tools/taglet/Preview.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package build.tools.taglet; + +import java.util.Arrays; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; +import javax.lang.model.element.Element; +import com.sun.source.doctree.DocTree; +import com.sun.source.doctree.TextTree; +import com.sun.source.doctree.UnknownInlineTagTree; +import jdk.javadoc.doclet.Taglet; +import static jdk.javadoc.doclet.Taglet.Location.*; + +/** + * An block tag to insert a standard warning about a preview API. + */ +public class Preview implements Taglet { + + /** Returns the set of locations in which a taglet may be used. */ + @Override + public Set getAllowedLocations() { + return EnumSet.of(MODULE, PACKAGE, TYPE, CONSTRUCTOR, METHOD, FIELD); + } + + @Override + public boolean isInlineTag() { + return true; + } + + @Override + public String getName() { + return "preview"; + } + + @Override + public String toString(List tags, Element elem) { + UnknownInlineTagTree previewTag = (UnknownInlineTagTree) tags.get(0); + List previewContent = previewTag.getContent(); + String previewText = ((TextTree) previewContent.get(0)).getBody(); + String[] summaryAndDetails = previewText.split("\n\r?\n\r?"); + String summary = summaryAndDetails[0]; + String details = summaryAndDetails.length > 1 ? summaryAndDetails[1] : summaryAndDetails[0]; + StackTraceElement[] stackTrace = new Exception().getStackTrace(); + Predicate isSummary = + el -> el.getClassName().endsWith("HtmlDocletWriter") && + el.getMethodName().equals("addSummaryComment"); + if (Arrays.stream(stackTrace).anyMatch(isSummary)) { + return "
" + summary + "

"; + } + return "
" + details + "

"; + } +} + diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java index cfbbd4178ba..21c286c4790 100644 --- a/src/java.base/share/classes/java/lang/String.java +++ b/src/java.base/share/classes/java/lang/String.java @@ -2888,6 +2888,15 @@ public final class String } /** + * {@preview Associated with text blocks, a preview feature of + * the Java language. + * + * This method is associated with text blocks, a preview + * feature of the Java language. Programs can only use this + * method when preview features are enabled. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns a string whose value is this string, with incidental * {@linkplain Character#isWhitespace(int) white space} removed from * the beginning and end of every line. @@ -2963,10 +2972,9 @@ public final class String * * @since 13 * - * @deprecated This method is associated with text blocks, a preview language feature. - * Text blocks and/or this method may be changed or removed in a future release. */ - @Deprecated(forRemoval=true, since="13") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.TEXT_BLOCKS, + essentialAPI=true) public String stripIndent() { int length = length(); if (length == 0) { @@ -3005,6 +3013,15 @@ public final class String } /** + * {@preview Associated with text blocks, a preview feature of + * the Java language. + * + * This method is associated with text blocks, a preview + * feature of the Java language. Programs can only use this + * method when preview features are enabled. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns a string whose value is this string, with escape sequences * translated as if in a string literal. *

@@ -3079,11 +3096,9 @@ public final class String * @jls 3.10.7 Escape Sequences * * @since 13 - * - * @deprecated This method is associated with text blocks, a preview language feature. - * Text blocks and/or this method may be changed or removed in a future release. */ - @Deprecated(forRemoval=true, since="13") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.TEXT_BLOCKS, + essentialAPI=true) public String translateEscapes() { if (isEmpty()) { return ""; @@ -3309,6 +3324,15 @@ public final class String } /** + * {@preview Associated with text blocks, a preview feature of + * the Java language. + * + * This method is associated with text blocks, a preview + * feature of the Java language. Programs can only use this + * method when preview features are enabled. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Formats using this string as the format string, and the supplied * arguments. * @@ -3324,10 +3348,9 @@ public final class String * * @since 13 * - * @deprecated This method is associated with text blocks, a preview language feature. - * Text blocks and/or this method may be changed or removed in a future release. */ - @Deprecated(forRemoval=true, since="13") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.TEXT_BLOCKS, + essentialAPI=true) public String formatted(Object... args) { return new Formatter().format(this, args).toString(); } diff --git a/src/java.base/share/classes/jdk/internal/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/PreviewFeature.java new file mode 100644 index 00000000000..7b38b51c9b5 --- /dev/null +++ b/src/java.base/share/classes/jdk/internal/PreviewFeature.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.internal; + +import java.lang.annotation.*; + +/** + * Indicates the API declaration in question is associated with a + * preview feature. See JEP 12: "Preview Language and VM + * Features" (http://openjdk.java.net/jeps/12). + * @since 14 + */ +// Match the meaningful targets of java.lang.Deprecated, omit local +// variables and parameter declarations +@Target({ElementType.METHOD, + ElementType.CONSTRUCTOR, + ElementType.FIELD, + ElementType.PACKAGE, + ElementType.MODULE, + ElementType.TYPE}) + // CLASS retention will hopefully be sufficient for the purposes at hand +@Retention(RetentionPolicy.CLASS) +// *Not* @Documented +public @interface PreviewFeature { + /** + * Name of the preview feature the annotated API is associated + * with. + */ + public Feature feature(); + + public boolean essentialAPI() default false; + + public enum Feature { + SWITCH_EXPRESSIONS, + TEXT_BLOCKS; + } +} diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java index 0d556239ccf..eb5d1965683 100644 --- a/src/java.base/share/classes/module-info.java +++ b/src/java.base/share/classes/module-info.java @@ -135,7 +135,8 @@ module java.base { exports com.sun.security.ntlm to java.security.sasl; exports jdk.internal to - jdk.jfr; + jdk.jfr, + jdk.compiler; exports jdk.internal.access to java.desktop, java.logging, diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java index 45f7253120a..21d26046715 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/CaseTree.java @@ -55,17 +55,25 @@ public interface CaseTree extends Tree { ExpressionTree getExpression(); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns the labels for this case. * For default case, returns an empty list. * * @return labels for this case * @since 12 * - * @deprecated This method is modeling a case with multiple labels, + * @preview This method is modeling a case with multiple labels, * which is part of a preview feature and may be removed * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) List getExpressions(); /** @@ -78,6 +86,14 @@ public interface CaseTree extends Tree { List getStatements(); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * For case with kind {@linkplain CaseKind#RULE}, * returns the statement or expression after the arrow. * Returns {@code null} for case with kind @@ -85,32 +101,41 @@ public interface CaseTree extends Tree { * * @return case value or null * @since 12 - * - * @deprecated This method is modeling a rule case, - * which is part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) public default Tree getBody() { return null; } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Returns the kind of this case. * * @return the kind of this case * @since 12 - * - * @deprecated This method is used to model a rule case, - * which is part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public default CaseKind getCaseKind() { return CaseKind.STATEMENT; } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This enum is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * The syntatic form of this case: *

    *
  • STATEMENT: {@code case : }
    • @@ -118,12 +143,9 @@ public interface CaseTree extends Tree { *
* * @since 12 - * - * @deprecated This enum is used to model a rule case, - * which is part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public enum CaseKind { /** * Case is in the form: {@code case : }. diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java index 4c47b42b0b5..9181e596230 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java @@ -28,6 +28,14 @@ package com.sun.source.tree; import java.util.List; /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This interface is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * A tree node for a {@code switch} expression. * * For example: @@ -40,12 +48,8 @@ import java.util.List; * @jls 15.29 Switch Expressions * * @since 12 - * - * @deprecated This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ -@Deprecated(forRemoval=true, since="12") +@jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) public interface SwitchExpressionTree extends ExpressionTree { /** * Returns the expression for the {@code switch} expression. diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java index f39c8ad6b74..e0908c42117 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java @@ -240,17 +240,20 @@ public interface Tree { SWITCH(SwitchTree.class), /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This enum constant is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Used for instances of {@link SwitchExpressionTree}. * * @since 12 - * - * @deprecated - * This enum constant is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") SWITCH_EXPRESSION(SwitchExpressionTree.class), /** @@ -659,17 +662,20 @@ public interface Tree { OTHER(null), /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This enum constant is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Used for instances of {@link YieldTree}. * * @since 13 - * - * @deprecated - * This enum constant is modeling yield statement, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") YIELD(YieldTree.class); diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java index e74d18ec867..4230270b904 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java @@ -354,20 +354,23 @@ public interface TreeVisitor { R visitSwitch(SwitchTree node, P p); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Visits a SwitchExpressionTree node. * * @param node the node being visited * @param p a parameter value * @return a result value * @since 12 - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") R visitSwitchExpression(SwitchExpressionTree node, P p); /** @@ -557,18 +560,21 @@ public interface TreeVisitor { R visitOther(Tree node, P p); /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * Visits a YieldTree node. * @param node the node being visited * @param p a parameter value * @return a result value * @since 13 - * - * @deprecated - * This method is modeling yield statement, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") R visitYield(YieldTree node, P p); } diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java index 7b8d59736cc..87c7bb4c64d 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java +++ b/src/jdk.compiler/share/classes/com/sun/source/tree/YieldTree.java @@ -26,6 +26,14 @@ package com.sun.source.tree; /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * A tree node for a {@code yield} statement. * * For example: @@ -36,12 +44,8 @@ package com.sun.source.tree; * @jls section TODO * * @since 13 - * - * @deprecated This class is modeling yield from switch expressions, - * which are part of a preview feature and may be removed if - * the preview feature is removed. */ -@Deprecated(forRemoval=true, since="13") +@jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) public interface YieldTree extends StatementTree { /** diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java index b0703f79eb1..4cf81f5a1b0 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java +++ b/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java @@ -264,20 +264,23 @@ public class SimpleTreeVisitor implements TreeVisitor { } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * {@inheritDoc} This implementation calls {@code defaultAction}. * * @param node {@inheritDoc} * @param p {@inheritDoc} * @return the result of {@code defaultAction} - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ @Override - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitSwitchExpression(SwitchExpressionTree node, P p) { return defaultAction(node, p); } @@ -791,8 +794,8 @@ public class SimpleTreeVisitor implements TreeVisitor { * @return the result of {@code defaultAction} */ @Override - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitYield(YieldTree node, P p) { return defaultAction(node, p); } diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java index dae128f2359..11d5bfac6d6 100644 --- a/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java +++ b/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java @@ -26,7 +26,6 @@ package com.sun.source.util; import com.sun.source.tree.*; -import com.sun.source.tree.CaseTree.CaseKind; /** * A TreeVisitor that visits all the child tree nodes. @@ -335,20 +334,23 @@ public class TreeScanner implements TreeVisitor { } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * {@inheritDoc} This implementation scans the children in left to right order. * * @param node {@inheritDoc} * @param p {@inheritDoc} * @return the result of scanning - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ @Override - @Deprecated(forRemoval=true, since="12") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitSwitchExpression(SwitchExpressionTree node, P p) { R r = scan(node.getExpression(), p); r = scanAndReduce(node.getCases(), p, r); @@ -363,10 +365,10 @@ public class TreeScanner implements TreeVisitor { * @return the result of scanning */ @Override - @SuppressWarnings("removal") + @SuppressWarnings("preview") public R visitCase(CaseTree node, P p) { R r = scan(node.getExpressions(), p); - if (node.getCaseKind() == CaseKind.RULE) + if (node.getCaseKind() == CaseTree.CaseKind.RULE) r = scanAndReduce(node.getBody(), p, r); else r = scanAndReduce(node.getStatements(), p, r); @@ -936,20 +938,23 @@ public class TreeScanner implements TreeVisitor { } /** + * {@preview Associated with switch expressions, a preview feature of + * the Java language. + * + * This method is associated with switch expressions, a preview + * feature of the Java language. Preview features + * may be removed in a future release, or upgraded to permanent + * features of the Java language.} + * * {@inheritDoc} This implementation returns {@code null}. * * @param node {@inheritDoc} * @param p {@inheritDoc} * @return the result of scanning - * - * @deprecated - * This method is modeling switch expressions, - * which are part of a preview feature and may be removed - * if the preview feature is removed. */ @Override - @Deprecated(forRemoval=true, since="13") - @SuppressWarnings("removal") + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.SWITCH_EXPRESSIONS) + @SuppressWarnings("preview") public R visitYield(YieldTree node, P p) { return scan(node.getValue(), p); } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java index 615e7b631ec..643d778eec9 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java @@ -52,6 +52,7 @@ import com.sun.source.util.TaskEvent.Kind; import com.sun.source.util.TaskListener; import com.sun.source.util.TreeScanner; import com.sun.tools.javac.code.Kinds; +import com.sun.tools.javac.code.Preview; import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.code.Type; @@ -257,6 +258,8 @@ public class JavacTaskPool { ((ReusableJavaCompiler)ReusableJavaCompiler.instance(this)).clear(); Types.instance(this).newRound(); Check.instance(this).newRound(); + Check.instance(this).clear(); //clear mandatory warning handlers + Preview.instance(this).clear(); //clear mandatory warning handlers Modules.instance(this).newRound(); Annotate.instance(this).newRound(); CompileStates.instance(this).clear(); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java index 79f69a674bd..648763d4057 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java @@ -286,7 +286,17 @@ public class Flags { /** * Flag to indicate the given ModuleSymbol is an automatic module. */ - public static final long AUTOMATIC_MODULE = 1L<<52; + public static final long AUTOMATIC_MODULE = 1L<<52; //ModuleSymbols only + + /** + * Flag to indicate the given PackageSymbol contains any non-.java and non-.class resources. + */ + public static final long HAS_RESOURCE = 1L<<52; //PackageSymbols only + + /** + * Flag to indicate the given ParamSymbol has a user-friendly name filled. + */ + public static final long NAME_FILLED = 1L<<52; //ParamSymbols only /** * Flag to indicate the given ModuleSymbol is a system module. @@ -304,9 +314,9 @@ public class Flags { public static final long DEPRECATED_REMOVAL = 1L<<55; /** - * Flag to indicate the given PackageSymbol contains any non-.java and non-.class resources. + * Flag to indicate the API element in question is for a preview API. */ - public static final long HAS_RESOURCE = 1L<<56; + public static final long PREVIEW_API = 1L<<56; //any Symbol kind /** * Flag for synthesized default constructors of anonymous classes that have an enclosing expression. @@ -320,9 +330,9 @@ public class Flags { public static final long BODY_ONLY_FINALIZE = 1L<<17; //blocks only /** - * Flag to indicate the given ParamSymbol has a user-friendly name filled. + * Flag to indicate the API element in question is for a preview API. */ - public static final long NAME_FILLED = 1L<<58; //ParamSymbols only + public static final long PREVIEW_ESSENTIAL_API = 1L<<58; //any Symbol kind /** Modifier masks. */ @@ -441,7 +451,9 @@ public class Flags { HAS_RESOURCE(Flags.HAS_RESOURCE), POTENTIALLY_AMBIGUOUS(Flags.POTENTIALLY_AMBIGUOUS), ANONCONSTR_BASED(Flags.ANONCONSTR_BASED), - NAME_FILLED(Flags.NAME_FILLED); + NAME_FILLED(Flags.NAME_FILLED), + PREVIEW_API(Flags.PREVIEW_API), + PREVIEW_ESSENTIAL_API(Flags.PREVIEW_ESSENTIAL_API); Flag(long flag) { this.value = flag; diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java index 318a50d790f..18799e2b757 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java @@ -122,6 +122,9 @@ public class Lint values.add(LintCategory.OPENS); values.add(LintCategory.MODULE); values.add(LintCategory.REMOVAL); + if (!options.isSet(Option.PREVIEW)) { + values.add(LintCategory.PREVIEW); + } } // Look for specific overrides diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java index e85adfb37e7..a0acb14ea9a 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java @@ -27,7 +27,6 @@ package com.sun.tools.javac.code; import com.sun.tools.javac.code.Lint.LintCategory; import com.sun.tools.javac.code.Source.Feature; -import com.sun.tools.javac.comp.Infer; import com.sun.tools.javac.jvm.Target; import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Warnings; @@ -36,17 +35,14 @@ import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import com.sun.tools.javac.util.JCDiagnostic.Error; import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition; +import com.sun.tools.javac.util.JCDiagnostic.Warning; import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.MandatoryWarningHandler; -import com.sun.tools.javac.util.Name; import com.sun.tools.javac.util.Options; import javax.tools.JavaFileObject; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Optional; -import java.util.Set; import static com.sun.tools.javac.main.Option.PREVIEW; @@ -62,7 +58,7 @@ import static com.sun.tools.javac.main.Option.PREVIEW; */ public class Preview { - /** flag: are preview featutres enabled */ + /** flag: are preview features enabled */ private final boolean enabled; /** the diag handler to manage preview feature usage diagnostics */ @@ -151,6 +147,10 @@ public class Preview { } } + public void reportPreviewWarning(DiagnosticPosition pos, Warning warnKey) { + previewHandler.report(pos, warnKey); + } + /** * Are preview features enabled? * @return true, if preview features are enabled. @@ -206,4 +206,9 @@ public class Preview { public void reportDeferredDiagnostics() { previewHandler.reportDeferredDiagnostic(); } + + public void clear() { + previewHandler.clear(); + } + } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java index 7e77dc5d9e3..d9f465aad04 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java @@ -378,6 +378,10 @@ public abstract class Symbol extends AnnoConstruct implements PoolConstant, Elem return (flags_field & DEPRECATED_REMOVAL) != 0; } + public boolean isPreviewApi() { + return (flags_field & PREVIEW_API) != 0; + } + public boolean isDeprecatableViaAnnotation() { switch (getKind()) { case LOCAL_VARIABLE: diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java index fd8147a8a99..38d04a35b14 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java @@ -214,6 +214,7 @@ public class Symtab { public final Type documentedType; public final Type elementTypeType; public final Type functionalInterfaceType; + public final Type previewFeatureType; /** The symbol representing the length field of an array. */ @@ -570,6 +571,7 @@ public class Symtab { lambdaMetafactory = enterClass("java.lang.invoke.LambdaMetafactory"); stringConcatFactory = enterClass("java.lang.invoke.StringConcatFactory"); functionalInterfaceType = enterClass("java.lang.FunctionalInterface"); + previewFeatureType = enterClass("jdk.internal.PreviewFeature"); synthesizeEmptyInterfaceIfMissing(autoCloseableType); synthesizeEmptyInterfaceIfMissing(cloneableType); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java index cd6409585c5..091a9e8026d 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java @@ -364,12 +364,17 @@ public class Annotate { && (toAnnotate.kind == MDL || toAnnotate.owner.kind != MTH) && types.isSameType(c.type, syms.deprecatedType)) { toAnnotate.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION); - Attribute fr = c.member(names.forRemoval); - if (fr instanceof Attribute.Constant) { - Attribute.Constant v = (Attribute.Constant) fr; - if (v.type == syms.booleanType && ((Integer) v.value) != 0) { - toAnnotate.flags_field |= Flags.DEPRECATED_REMOVAL; - } + if (isAttributeTrue(c.member(names.forRemoval))) { + toAnnotate.flags_field |= Flags.DEPRECATED_REMOVAL; + } + } + + // Note: @Deprecated has no effect on local variables and parameters + if (!c.type.isErroneous() + && types.isSameType(c.type, syms.previewFeatureType)) { + toAnnotate.flags_field |= Flags.PREVIEW_API; + if (isAttributeTrue(c.member(names.essentialAPI))) { + toAnnotate.flags_field |= Flags.PREVIEW_ESSENTIAL_API; } } } @@ -397,6 +402,16 @@ public class Annotate { toAnnotate.setDeclarationAttributes(attrs); } } + //where: + private boolean isAttributeTrue(Attribute attr) { + if (attr instanceof Attribute.Constant) { + Attribute.Constant v = (Attribute.Constant) attr; + if (v.type == syms.booleanType && ((Integer) v.value) != 0) { + return true; + } + } + return false; + } /** * Attribute and store a semantic representation of the annotation tree {@code tree} into the diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java index 429bb303acb..c1ca4078310 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; import javax.lang.model.element.ElementKind; import javax.tools.JavaFileObject; -import com.sun.source.tree.CaseTree.CaseKind; +import com.sun.source.tree.CaseTree; import com.sun.source.tree.IdentifierTree; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.MemberSelectTree; @@ -1486,8 +1486,8 @@ public class Attr extends JCTree.Visitor { // check that there are no duplicate case labels or default clauses. Set labels = new HashSet<>(); // The set of case labels. boolean hasDefault = false; // Is there a default label? - @SuppressWarnings("removal") - CaseKind caseKind = null; + @SuppressWarnings("preview") + CaseTree.CaseKind caseKind = null; boolean wasError = false; for (List l = cases; l.nonEmpty(); l = l.tail) { JCCase c = l.head; @@ -4092,6 +4092,7 @@ public class Attr extends JCTree.Visitor { chk.checkDeprecated(tree.pos(), env.info.scope.owner, sym); chk.checkSunAPI(tree.pos(), sym); chk.checkProfile(tree.pos(), sym); + chk.checkPreview(tree.pos(), sym); } // If symbol is a variable, check that its type and diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java index 0619d112101..776799cb4a7 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java @@ -93,6 +93,7 @@ public class Check { private final Source source; private final Target target; private final Profile profile; + private final Preview preview; private final boolean warnOnAnyAccessToMembers; // The set of lint options currently in effect. It is initialized @@ -139,6 +140,7 @@ public class Check { syntheticNameChar = target.syntheticNameChar(); profile = Profile.instance(context); + preview = Preview.instance(context); boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION); boolean verboseRemoval = lint.isEnabled(LintCategory.REMOVAL); @@ -224,6 +226,23 @@ public class Check { } } + /** Warn about deprecated symbol. + * @param pos Position to be used for error reporting. + * @param sym The deprecated symbol. + */ + void warnPreview(DiagnosticPosition pos, Symbol sym) { + warnPreview(pos, Warnings.IsPreview(sym)); + } + + /** Log a preview warning. + * @param pos Position to be used for error reporting. + * @param msg A Warning describing the problem. + */ + public void warnPreview(DiagnosticPosition pos, Warning warnKey) { + if (!lint.isSuppressed(LintCategory.PREVIEW)) + preview.reportPreviewWarning(pos, warnKey); + } + /** Warn about unchecked operation. * @param pos Position to be used for error reporting. * @param msg A string describing the problem. @@ -434,6 +453,13 @@ public class Check { localClassNameIndexes.clear(); } + public void clear() { + deprecationHandler.clear(); + removalHandler.clear(); + uncheckedHandler.clear(); + sunApiHandler.clear(); + } + public void putCompiled(ClassSymbol csym) { compiled.put(Pair.of(csym.packge().modle, csym.flatname), csym); } @@ -3290,6 +3316,16 @@ public class Check { } } + void checkPreview(DiagnosticPosition pos, Symbol s) { + if ((s.flags() & PREVIEW_API) != 0) { + if ((s.flags() & PREVIEW_ESSENTIAL_API) != 0 && !preview.isEnabled()) { + log.error(pos, Errors.IsPreview(s)); + } else { + deferredLintHandler.report(() -> warnPreview(pos, s)); + } + } + } + /* ************************************************************************* * Check for recursive annotation elements. **************************************************************************/ diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java index cf6e71a1338..0f3b8aa5cb2 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java @@ -30,7 +30,6 @@ import java.util.Map.Entry; import java.util.function.Function; import java.util.stream.Stream; -import com.sun.source.tree.CaseTree.CaseKind; import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Kinds.KindSelector; import com.sun.tools.javac.code.Scope.WriteableScope; diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java index 686f62326af..8e8186147e0 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java @@ -2819,6 +2819,7 @@ public class Resolve { typeargtypes, allowBoxing, useVarargs); chk.checkDeprecated(pos, env.info.scope.owner, sym); + chk.checkPreview(pos, sym); return sym; } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java index 5583076a87a..506ba046ba0 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java @@ -1156,19 +1156,26 @@ public class TypeEnter implements Completer { JCAnnotation a = al.head; if (a.annotationType.type == syms.deprecatedType) { sym.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION); - a.args.stream() - .filter(e -> e.hasTag(ASSIGN)) - .map(e -> (JCAssign) e) - .filter(assign -> TreeInfo.name(assign.lhs) == names.forRemoval) - .findFirst() - .ifPresent(assign -> { - JCExpression rhs = TreeInfo.skipParens(assign.rhs); - if (rhs.hasTag(LITERAL) - && Boolean.TRUE.equals(((JCLiteral) rhs).getValue())) { - sym.flags_field |= DEPRECATED_REMOVAL; - } - }); + setFlagIfAttributeTrue(a, sym, names.forRemoval, DEPRECATED_REMOVAL); + } else if (a.annotationType.type == syms.previewFeatureType) { + sym.flags_field |= Flags.PREVIEW_API; + setFlagIfAttributeTrue(a, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API); } } } + //where: + private void setFlagIfAttributeTrue(JCAnnotation a, Symbol sym, Name attribute, long flag) { + a.args.stream() + .filter(e -> e.hasTag(ASSIGN)) + .map(e -> (JCAssign) e) + .filter(assign -> TreeInfo.name(assign.lhs) == attribute) + .findFirst() + .ifPresent(assign -> { + JCExpression rhs = TreeInfo.skipParens(assign.rhs); + if (rhs.hasTag(LITERAL) + && Boolean.TRUE.equals(((JCLiteral) rhs).getValue())) { + sym.flags_field |= flag; + } + }); + } } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java index 2b6fd52705d..21f29a867ff 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java @@ -44,6 +44,7 @@ import java.nio.charset.UnsupportedCharsetException; import java.nio.file.Path; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Objects; @@ -173,6 +174,10 @@ public abstract class BaseFileManager implements JavaFileManager { private long lastUsedTime = System.currentTimeMillis(); protected long deferredCloseTimeout = 0; + public void clear() { + new HashSet<>(options.keySet()).forEach(k -> options.remove(k)); + } + protected ClassLoader getClassLoader(URL[] urls) { ClassLoader thisClassLoader = getClass().getClassLoader(); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java index 25d1ee60af3..6aa0054992f 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java @@ -1395,20 +1395,27 @@ public class ClassReader { repeatable = proxy; } else if (proxy.type.tsym == syms.deprecatedType.tsym) { sym.flags_field |= (DEPRECATED | DEPRECATED_ANNOTATION); - for (Pair v : proxy.values) { - if (v.fst == names.forRemoval && v.snd instanceof Attribute.Constant) { - Attribute.Constant c = (Attribute.Constant)v.snd; - if (c.type == syms.booleanType && ((Integer)c.value) != 0) { - sym.flags_field |= DEPRECATED_REMOVAL; - } - } - } + setFlagIfAttributeTrue(proxy, sym, names.forRemoval, DEPRECATED_REMOVAL); + } else if (proxy.type.tsym == syms.previewFeatureType.tsym) { + sym.flags_field |= PREVIEW_API; + setFlagIfAttributeTrue(proxy, sym, names.essentialAPI, PREVIEW_ESSENTIAL_API); } proxies.append(proxy); } } annotate.normal(new AnnotationCompleter(sym, proxies.toList())); } + //where: + private void setFlagIfAttributeTrue(CompoundAnnotationProxy proxy, Symbol sym, Name attribute, long flag) { + for (Pair v : proxy.values) { + if (v.fst == attribute && v.snd instanceof Attribute.Constant) { + Attribute.Constant c = (Attribute.Constant)v.snd; + if (c.type == syms.booleanType && ((Integer)c.value) != 0) { + sym.flags_field |= flag; + } + } + } + } /** Read parameter annotations. */ diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java index 91e50ba0c84..1911e07a030 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -29,7 +29,7 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import com.sun.source.tree.CaseTree.CaseKind; +import com.sun.source.tree.CaseTree; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.ModuleTree.ModuleKind; @@ -1432,8 +1432,8 @@ public class JavacParser implements Parser { } List stats = null; JCTree body = null; - @SuppressWarnings("removal") - CaseKind kind; + @SuppressWarnings("preview") + CaseTree.CaseKind kind; switch (token.kind) { case ARROW: checkSourceLevel(Feature.SWITCH_RULE); @@ -2897,8 +2897,8 @@ public class JavacParser implements Parser { nextToken(); checkSourceLevel(Feature.SWITCH_MULTIPLE_CASE_LABELS); }; - @SuppressWarnings("removal") - CaseKind caseKind; + @SuppressWarnings("preview") + CaseTree.CaseKind caseKind; JCTree body = null; if (token.kind == ARROW) { checkSourceLevel(Feature.SWITCH_RULE); @@ -2922,8 +2922,8 @@ public class JavacParser implements Parser { } case DEFAULT: { nextToken(); - @SuppressWarnings("removal") - CaseKind caseKind; + @SuppressWarnings("preview") + CaseTree.CaseKind caseKind; JCTree body = null; if (token.kind == ARROW) { checkSourceLevel(Feature.SWITCH_RULE); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties index 1f29df0704c..ce34a095911 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -1774,6 +1774,14 @@ compiler.warn.has.been.deprecated=\ compiler.warn.has.been.deprecated.for.removal=\ {0} in {1} has been deprecated and marked for removal +# 0: symbol +compiler.warn.is.preview=\ + {0} is an API that is part of a preview feature + +# 0: symbol +compiler.err.is.preview=\ + {0} is an API that is part of a preview feature + # 0: symbol compiler.warn.has.been.deprecated.module=\ module {0} has been deprecated diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java index 72de8e2dc5f..7254ba4f9d5 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java @@ -47,7 +47,6 @@ import static com.sun.tools.javac.tree.JCTree.Tag.*; import javax.tools.JavaFileManager.Location; -import com.sun.source.tree.CaseTree.CaseKind; import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.Directive.ExportsDirective; import com.sun.tools.javac.code.Directive.OpensDirective; @@ -1250,17 +1249,17 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public static class JCCase extends JCStatement implements CaseTree { //as CaseKind is deprecated for removal (as it is part of a preview feature), //using indirection through these fields to avoid unnecessary @SuppressWarnings: - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static final CaseKind STATEMENT = CaseKind.STATEMENT; - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static final CaseKind RULE = CaseKind.RULE; - @SuppressWarnings("removal") + @SuppressWarnings("preview") public final CaseKind caseKind; public List pats; public List stats; public JCTree body; public boolean completesNormally; - protected JCCase(@SuppressWarnings("removal") CaseKind caseKind, List pats, + protected JCCase(@SuppressWarnings("preview") CaseKind caseKind, List pats, List stats, JCTree body) { Assert.checkNonNull(pats); Assert.check(pats.isEmpty() || pats.head != null); @@ -1277,18 +1276,18 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { @Override @DefinedBy(Api.COMPILER_TREE) public JCExpression getExpression() { return pats.head; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public List getExpressions() { return pats; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public List getStatements() { return caseKind == CaseKind.STATEMENT ? stats : null; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public JCTree getBody() { return body; } @Override @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public CaseKind getCaseKind() { return caseKind; } @@ -1305,7 +1304,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { /** * A "switch ( ) { }" construction. */ - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static class JCSwitchExpression extends JCPolyExpression implements SwitchExpressionTree { public JCExpression selector; public List cases; @@ -1586,7 +1585,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { /** * A break-with from a switch expression. */ - @SuppressWarnings("removal") + @SuppressWarnings("preview") public static class JCYield extends JCStatement implements YieldTree { public JCExpression value; public JCTree target; @@ -3105,7 +3104,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { JCLabeledStatement Labelled(Name label, JCStatement body); JCSwitch Switch(JCExpression selector, List cases); JCSwitchExpression SwitchExpression(JCExpression selector, List cases); - JCCase Case(@SuppressWarnings("removal") CaseKind caseKind, List pat, + JCCase Case(@SuppressWarnings("preview") CaseTree.CaseKind caseKind, List pat, List stats, JCTree body); JCSynchronized Synchronized(JCExpression lock, JCBlock body); JCTry Try(JCBlock body, List catchers, JCBlock finalizer); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java index c8b6d368e2a..818dcca4d76 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java @@ -27,7 +27,6 @@ package com.sun.tools.javac.tree; import java.io.*; -import com.sun.source.tree.CaseTree.CaseKind; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.*; diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java index 35cba11a93d..66ae74eac81 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java @@ -144,7 +144,7 @@ public class TreeCopier

implements TreeVisitor { } @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public JCTree visitYield(YieldTree node, P p) { JCYield t = (JCYield) node; JCExpression value = copy(t.value, p); @@ -380,7 +380,7 @@ public class TreeCopier

implements TreeVisitor { } @DefinedBy(Api.COMPILER_TREE) - @SuppressWarnings("removal") + @SuppressWarnings("preview") public JCTree visitSwitchExpression(SwitchExpressionTree node, P p) { JCSwitchExpression t = (JCSwitchExpression) node; JCExpression selector = copy(t.selector, p); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java index 53ec5d87996..a70c687c609 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java @@ -27,7 +27,7 @@ package com.sun.tools.javac.tree; import java.util.Iterator; -import com.sun.source.tree.CaseTree.CaseKind; +import com.sun.source.tree.CaseTree; import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.source.tree.Tree.Kind; import com.sun.tools.javac.code.*; @@ -274,7 +274,7 @@ public class TreeMaker implements JCTree.Factory { return tree; } - public JCCase Case(@SuppressWarnings("removal") CaseKind caseKind, List pats, + public JCCase Case(@SuppressWarnings("preview") CaseTree.CaseKind caseKind, List pats, List stats, JCTree body) { JCCase tree = new JCCase(caseKind, pats, stats, body); tree.pos = pos; diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java index e03e4123db0..51b2d24ef3a 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java @@ -186,18 +186,18 @@ public class MandatoryWarningHandler { /** * The log to which to report warnings. */ - private Log log; + private final Log log; /** * Whether or not to report individual warnings, or simply to report a * single aggregate warning at the end of the compilation. */ - private boolean verbose; + private final boolean verbose; /** * The common prefix for all I18N message keys generated by this handler. */ - private String prefix; + private final String prefix; /** * A set containing the names of the source files for which specific @@ -262,4 +262,11 @@ public class MandatoryWarningHandler { else log.note(file, new Note("compiler", msg, args)); } + + public void clear() { + sourcesWithReportedWarnings = null; + deferredDiagnosticKind = null; + deferredDiagnosticSource = null; + deferredDiagnosticArg = null; + } } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java index d4c5e51c03f..f2532a73891 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java @@ -86,6 +86,7 @@ public class Names { public final Name error; public final Name finalize; public final Name forRemoval; + public final Name essentialAPI; public final Name getClass; public final Name hasNext; public final Name hashCode; @@ -236,6 +237,7 @@ public class Names { error = fromString(""); finalize = fromString("finalize"); forRemoval = fromString("forRemoval"); + essentialAPI = fromString("essentialAPI"); getClass = fromString("getClass"); hasNext = fromString("hasNext"); hashCode = fromString("hashCode"); diff --git a/test/jdk/java/lang/String/Formatted.java b/test/jdk/java/lang/String/Formatted.java index d94d35dca5d..5e8764fa7ec 100644 --- a/test/jdk/java/lang/String/Formatted.java +++ b/test/jdk/java/lang/String/Formatted.java @@ -25,7 +25,8 @@ * @test * bug 8203444 * @summary Unit tests for instance versions of String#format - * @run main Formatted + * @compile --enable-preview -source 14 Formatted.java + * @run main/othervm --enable-preview Formatted */ import java.util.Locale; diff --git a/test/jdk/java/lang/String/StripIndent.java b/test/jdk/java/lang/String/StripIndent.java index f3e34d6429e..91e43fa8ddc 100644 --- a/test/jdk/java/lang/String/StripIndent.java +++ b/test/jdk/java/lang/String/StripIndent.java @@ -25,7 +25,8 @@ * @test * @bug 8223775 * @summary This exercises String#stripIndent patterns and limits. - * @run main StripIndent + * @compile --enable-preview -source 14 StripIndent.java + * @run main/othervm --enable-preview StripIndent */ public class StripIndent { diff --git a/test/jdk/java/lang/String/TranslateEscapes.java b/test/jdk/java/lang/String/TranslateEscapes.java index 5f165d16cb1..f585f063b9a 100644 --- a/test/jdk/java/lang/String/TranslateEscapes.java +++ b/test/jdk/java/lang/String/TranslateEscapes.java @@ -25,7 +25,8 @@ * @test * @bug 8223780 * @summary This exercises String#translateEscapes patterns and limits. - * @run main TranslateEscapes + * @compile --enable-preview -source 14 TranslateEscapes.java + * @run main/othervm --enable-preview TranslateEscapes */ public class TranslateEscapes { diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt index aa5ea4139de..2dfc2a91c8d 100644 --- a/test/langtools/tools/javac/diags/examples.not-yet.txt +++ b/test/langtools/tools/javac/diags/examples.not-yet.txt @@ -11,6 +11,7 @@ compiler.err.invalid.repeatable.annotation # should not happen compiler.err.invalid.repeatable.annotation.invalid.value # "can't" happen compiler.err.invalid.repeatable.annotation.multiple.values # can't happen compiler.err.io.exception # (javah.JavahTask?) +compiler.err.is.preview # difficult to produce reliably despite future changes to java.base compiler.err.limit.code # Code compiler.err.limit.code.too.large.for.try.stmt # Gen compiler.err.limit.dimensions # Gen @@ -111,6 +112,7 @@ compiler.warn.future.attr # ClassReader compiler.warn.illegal.char.for.encoding compiler.warn.incubating.modules # requires adjusted classfile compiler.warn.invalid.archive.file +compiler.warn.is.preview # difficult to produce reliably despite future changes to java.base compiler.warn.override.bridge compiler.warn.position.overflow # CRTable: caused by files with long lines >= 1024 chars compiler.warn.proc.type.already.exists # JavacFiler: just mentioned in TODO diff --git a/test/langtools/tools/javac/lib/combo/ComboInstance.java b/test/langtools/tools/javac/lib/combo/ComboInstance.java index 4145dc20202..99f6a408391 100644 --- a/test/langtools/tools/javac/lib/combo/ComboInstance.java +++ b/test/langtools/tools/javac/lib/combo/ComboInstance.java @@ -23,6 +23,7 @@ package combo; +import java.lang.reflect.Method; import javax.tools.StandardJavaFileManager; import java.util.Optional; @@ -57,6 +58,14 @@ public abstract class ComboInstance> { env.info().lastError = Optional.of(ex); } finally { this.env = null; + try { + Class fmClass = env.fileManager().getClass(); + Method clear = fmClass.getMethod("clear"); + clear.setAccessible(true); + clear.invoke(env.fileManager()); + } catch (Exception ex) { + throw new IllegalStateException(ex); + } } } @@ -125,4 +134,4 @@ public abstract class ComboInstance> { return success; } } -} \ No newline at end of file +} diff --git a/test/langtools/tools/javac/preview/PreviewErrors.java b/test/langtools/tools/javac/preview/PreviewErrors.java new file mode 100644 index 00000000000..2e8fc74e91e --- /dev/null +++ b/test/langtools/tools/javac/preview/PreviewErrors.java @@ -0,0 +1,274 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8226585 + * @summary Verify behavior w.r.t. preview feature API errors and warnings + * @library /tools/lib /tools/javac/lib + * @modules + * java.base/jdk.internal + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.main + * jdk.compiler/com.sun.tools.javac.util + * @build toolbox.ToolBox toolbox.JavacTask + * @build combo.ComboTestHelper + * @compile --enable-preview -source ${jdk.version} PreviewErrors.java + * @run main/othervm --enable-preview PreviewErrors + */ + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import combo.ComboInstance; +import combo.ComboParameter; +import combo.ComboTask; +import combo.ComboTestHelper; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; +import javax.tools.Diagnostic; + +import jdk.internal.PreviewFeature; + +import toolbox.JavacTask; +import toolbox.ToolBox; + +public class PreviewErrors extends ComboInstance { + + protected ToolBox tb; + + PreviewErrors() { + super(); + tb = new ToolBox(); + } + + public static void main(String... args) throws Exception { + new ComboTestHelper() + .withDimension("ESSENTIAL", (x, essential) -> x.essential = essential, EssentialAPI.values()) + .withDimension("PREVIEW", (x, preview) -> x.preview = preview, Preview.values()) + .withDimension("LINT", (x, lint) -> x.lint = lint, Lint.values()) + .withDimension("SUPPRESS", (x, suppress) -> x.suppress = suppress, Suppress.values()) + .withDimension("FROM", (x, from) -> x.from = from, PreviewFrom.values()) + .run(PreviewErrors::new); + } + + private EssentialAPI essential; + private Preview preview; + private Lint lint; + private Suppress suppress; + private PreviewFrom from; + + @Override + public void doWork() throws IOException { + Path base = Paths.get("."); + Path src = base.resolve("src"); + Path srcJavaBase = src.resolve("java.base"); + Path classes = base.resolve("classes"); + Path classesJavaBase = classes.resolve("java.base"); + + Files.createDirectories(classesJavaBase); + + String previewAPI = """ + package preview.api; + public class Extra { + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview} + ${essential}) + public static void test() { } + @jdk.internal.PreviewFeature(feature=jdk.internal.PreviewFeature.Feature.${preview} + ${essential}) + public static class Clazz {} + } + """.replace("${preview}", PreviewFeature.Feature.values()[0].name()) + .replace("${essential}", essential.expand(null)); + + if (from == PreviewFrom.CLASS) { + tb.writeJavaFiles(srcJavaBase, previewAPI); + + new JavacTask(tb) + .outdir(classesJavaBase) + .options("--patch-module", "java.base=" + srcJavaBase.toString()) + .files(tb.findJavaFiles(srcJavaBase)) + .run() + .writeAll(); + } + + ComboTask task = newCompilationTask() + .withSourceFromTemplate(""" + package test; + public class Test { + #{SUPPRESS} + public void test() { + preview.api.Extra.test(); + preview.api.Extra.Clazz c; + } + } + """) + .withOption("-XDrawDiagnostics") + .withOption("-source") + .withOption(String.valueOf(Runtime.version().feature())); + + if (from == PreviewFrom.CLASS) { + task.withOption("--patch-module") + .withOption("java.base=" + classesJavaBase.toString()) + .withOption("--add-exports") + .withOption("java.base/preview.api=ALL-UNNAMED"); + } else { + task.withSourceFromTemplate("Extra", previewAPI) + .withOption("--add-exports") + .withOption("java.base/jdk.internal=ALL-UNNAMED"); + } + + if (preview.expand(null)!= null) { + task = task.withOption(preview.expand(null)); + } + + if (lint.expand(null) != null) { + task = task.withOption(lint.expand(null)); + } + + task.generate(result -> { + Set actual = Arrays.stream(Diagnostic.Kind.values()) + .flatMap(kind -> result.diagnosticsForKind(kind).stream()) + .map(d -> d.getLineNumber() + ":" + d.getColumnNumber() + ":" + d.getCode()) + .collect(Collectors.toSet()); + Set expected; + boolean ok; + if (essential == EssentialAPI.YES) { + if (preview == Preview.YES) { + if (suppress == Suppress.YES) { + expected = Set.of(); + } else if (lint == Lint.ENABLE_PREVIEW) { + expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview"); + } else { + expected = Set.of("-1:-1:compiler.note.preview.filename", + "-1:-1:compiler.note.preview.recompile"); + } + ok = true; + } else { + expected = Set.of("5:26:compiler.err.is.preview", "6:26:compiler.err.is.preview"); + ok = false; + } + } else { + if (suppress == Suppress.YES) { + expected = Set.of(); + } else if ((preview == Preview.YES && (lint == Lint.NONE || lint == Lint.DISABLE_PREVIEW)) || + (preview == Preview.NO && lint == Lint.DISABLE_PREVIEW)) { + expected = Set.of("-1:-1:compiler.note.preview.filename", + "-1:-1:compiler.note.preview.recompile"); + } else { + expected = Set.of("5:26:compiler.warn.is.preview", "6:26:compiler.warn.is.preview"); + } + ok = true; + } + if (ok) { + if (!result.get().iterator().hasNext()) { + throw new IllegalStateException("Did not succeed as expected." + actual); + } + } else { + if (result.get().iterator().hasNext()) { + throw new IllegalStateException("Succeed unexpectedly."); + } + } + if (!expected.equals(actual)) { + throw new IllegalStateException("Unexpected output for " + essential + ", " + preview + ", " + lint + ", " + suppress + ", " + from + ": actual: \"" + actual + "\", expected: \"" + expected + "\""); + } + }); + } + + public enum EssentialAPI implements ComboParameter { + YES(", essentialAPI=true"), + NO(", essentialAPI=false"); + + private final String code; + + private EssentialAPI(String code) { + this.code = code; + } + + public String expand(String optParameter) { + return code; + } + } + + public enum Preview implements ComboParameter { + YES("--enable-preview"), + NO(null); + + private final String opt; + + private Preview(String opt) { + this.opt = opt; + } + + public String expand(String optParameter) { + return opt; + } + } + + public enum Lint implements ComboParameter { + NONE(null), + ENABLE_PREVIEW("-Xlint:preview"), + DISABLE_PREVIEW("-Xlint:-preview"); + + private final String opt; + + private Lint(String opt) { + this.opt = opt; + } + + public String expand(String optParameter) { + return opt; + } + } + + public enum Suppress implements ComboParameter { + YES("@SuppressWarnings(\"preview\")"), + NO(""); + + private final String code; + + private Suppress(String code) { + this.code = code; + } + + public String expand(String optParameter) { + return code; + } + } + + public enum PreviewFrom implements ComboParameter { + CLASS, + SOURCE; + + private PreviewFrom() { + } + + public String expand(String optParameter) { + throw new IllegalStateException(); + } + } +} diff --git a/test/langtools/tools/javac/tree/NoPrivateTypesExported.java b/test/langtools/tools/javac/tree/NoPrivateTypesExported.java index 2f8b51f0a30..33948a90aee 100644 --- a/test/langtools/tools/javac/tree/NoPrivateTypesExported.java +++ b/test/langtools/tools/javac/tree/NoPrivateTypesExported.java @@ -177,6 +177,7 @@ public class NoPrivateTypesExported extends JavacTestingAbstractProcessor { if (annotationElement.getAnnotation(Documented.class) == null) { note("Ignoring undocumented annotation: " + mirror.getAnnotationType()); + continue; } verifyTypeAcceptable(mirror.getAnnotationType(), acceptable); diff --git a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java index e3f6826c1b8..fbf75dd8518 100644 --- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java +++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java @@ -92,6 +92,7 @@ public class ListModuleDeps { public Object[][] jdkModules() { return new Object[][]{ {"jdk.compiler", new String[]{ + "java.base/jdk.internal", "java.base/jdk.internal.jmod", "java.base/jdk.internal.misc", "java.base/sun.reflect.annotation", From 0192c5a02f983c3724c646e66011050c58197968 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Mon, 21 Oct 2019 09:26:14 -0700 Subject: [PATCH 023/163] 8232572: Add hooks for custom output dir in Bundles.gmk Reviewed-by: tbell --- make/Bundles.gmk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/make/Bundles.gmk b/make/Bundles.gmk index 0a193f3ad20..506855cded7 100644 --- a/make/Bundles.gmk +++ b/make/Bundles.gmk @@ -50,6 +50,7 @@ $(eval $(call IncludeCustomExtension, Bundles-pre.gmk)) # files or directories may contain spaces. # BASE_DIRS : Base directories for the root dir in the bundle. # SUBDIR : Optional name of root dir in bundle. +# OUTPUTDIR : Optionally override output dir SetupBundleFile = $(NamedParamsMacroTemplate) define SetupBundleFileBody @@ -70,8 +71,11 @@ define SetupBundleFileBody $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) - $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) + $$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR)) + + $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) $$(call MakeTargetDir) + $$(call LogWarn, Creating $$($1_BUNDLE_NAME)) # If any of the files contain a space in the file name, FindFiles # will have replaced it with ?. Tar does not accept that so need to # switch it back. @@ -137,7 +141,7 @@ define SetupBundleFileBody endif endif - $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME) + $1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME) endef @@ -165,7 +169,7 @@ endif ################################################################################ -ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), ) +ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), ) SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map From fce43203699336e9513d06cd54b66735e93234a4 Mon Sep 17 00:00:00 2001 From: Lois Foltan Date: Mon, 21 Oct 2019 13:13:16 -0400 Subject: [PATCH 024/163] 8231844: Enhance type signature characters in classfile_constants.h and improve the JVM to use type signature characters more consistently Increase the use of type signature constants instead of hard coded characters within the JVM. Co-authored-by: John Rose Reviewed-by: coleenp, dholmes, fparain --- src/hotspot/share/aot/aotCodeHeap.cpp | 2 +- .../share/c1/c1_InstructionPrinter.cpp | 18 +- src/hotspot/share/ci/ciEnv.cpp | 10 +- src/hotspot/share/ci/ciInstanceKlass.cpp | 4 +- src/hotspot/share/ci/ciObjArrayKlass.cpp | 16 +- src/hotspot/share/ci/ciObjectFactory.cpp | 2 +- src/hotspot/share/ci/ciReplay.cpp | 11 +- .../share/classfile/classFileParser.cpp | 37 +++-- src/hotspot/share/classfile/classLoader.cpp | 8 +- .../share/classfile/javaAssertions.cpp | 10 +- src/hotspot/share/classfile/javaClasses.hpp | 4 +- src/hotspot/share/classfile/modules.cpp | 2 +- .../share/classfile/systemDictionary.cpp | 2 +- .../share/classfile/verificationType.cpp | 20 +-- .../share/classfile/verificationType.hpp | 26 +-- src/hotspot/share/classfile/verifier.cpp | 10 +- src/hotspot/share/classfile/vmSymbols.cpp | 2 +- src/hotspot/share/compiler/methodMatcher.cpp | 6 +- .../share/interpreter/interpreterRuntime.cpp | 18 +- src/hotspot/share/jvmci/compilerRuntime.cpp | 2 +- src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 4 +- src/hotspot/share/jvmci/jvmciRuntime.cpp | 8 +- src/hotspot/share/memory/heapInspection.cpp | 6 +- src/hotspot/share/oops/generateOopMap.cpp | 10 +- src/hotspot/share/oops/instanceKlass.cpp | 4 +- src/hotspot/share/oops/objArrayKlass.cpp | 6 +- src/hotspot/share/oops/symbol.cpp | 12 +- src/hotspot/share/prims/jni.cpp | 40 ++--- src/hotspot/share/prims/jvmtiEnvBase.cpp | 2 +- src/hotspot/share/prims/jvmtiExport.cpp | 16 +- src/hotspot/share/prims/jvmtiImpl.cpp | 3 +- .../share/prims/jvmtiRedefineClasses.cpp | 18 +- src/hotspot/share/prims/jvmtiTagMap.cpp | 2 +- src/hotspot/share/prims/methodHandles.cpp | 39 +++-- src/hotspot/share/prims/nativeLookup.cpp | 2 +- src/hotspot/share/runtime/fieldType.cpp | 28 ++-- src/hotspot/share/runtime/fieldType.hpp | 8 +- src/hotspot/share/runtime/sharedRuntime.cpp | 34 ++-- src/hotspot/share/runtime/signature.cpp | 157 +++++++++--------- src/hotspot/share/runtime/signature.hpp | 18 +- .../share/utilities/globalDefinitions.cpp | 13 +- .../share/utilities/globalDefinitions.hpp | 53 +++--- .../include/classfile_constants.h.template | 4 + 43 files changed, 371 insertions(+), 326 deletions(-) diff --git a/src/hotspot/share/aot/aotCodeHeap.cpp b/src/hotspot/share/aot/aotCodeHeap.cpp index 944e26912ad..827734a4d63 100644 --- a/src/hotspot/share/aot/aotCodeHeap.cpp +++ b/src/hotspot/share/aot/aotCodeHeap.cpp @@ -93,7 +93,7 @@ Klass* AOTCodeHeap::lookup_klass(const char* name, int len, const Method* method Handle protection_domain(thread, caller->method_holder()->protection_domain()); // Ignore wrapping L and ; - if (name[0] == 'L') { + if (name[0] == JVM_SIGNATURE_CLASS) { assert(len > 2, "small name %s", name); name++; len -= 2; diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.cpp b/src/hotspot/share/c1/c1_InstructionPrinter.cpp index 1f2fd7f5b7b..e34f8b47f2f 100644 --- a/src/hotspot/share/c1/c1_InstructionPrinter.cpp +++ b/src/hotspot/share/c1/c1_InstructionPrinter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -33,19 +33,11 @@ #ifndef PRODUCT const char* InstructionPrinter::basic_type_name(BasicType type) { - switch (type) { - case T_BOOLEAN: return "boolean"; - case T_BYTE : return "byte"; - case T_CHAR : return "char"; - case T_SHORT : return "short"; - case T_INT : return "int"; - case T_LONG : return "long"; - case T_FLOAT : return "float"; - case T_DOUBLE : return "double"; - case T_ARRAY : return "array"; - case T_OBJECT : return "object"; - default : return "???"; + const char* n = type2name(type); + if (n == NULL || type > T_VOID) { + return "???"; } + return n; } diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp index d22ffcec0d7..33677ace184 100644 --- a/src/hotspot/share/ci/ciEnv.cpp +++ b/src/hotspot/share/ci/ciEnv.cpp @@ -413,8 +413,8 @@ ciKlass* ciEnv::get_klass_by_name_impl(ciKlass* accessing_klass, // Now we need to check the SystemDictionary Symbol* sym = name->get_symbol(); - if (sym->char_at(0) == 'L' && - sym->char_at(sym->utf8_length()-1) == ';') { + if (sym->char_at(0) == JVM_SIGNATURE_CLASS && + sym->char_at(sym->utf8_length()-1) == JVM_SIGNATURE_ENDCLASS) { // This is a name from a signature. Strip off the trimmings. // Call recursive to keep scope of strippedsym. TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1, @@ -440,7 +440,7 @@ ciKlass* ciEnv::get_klass_by_name_impl(ciKlass* accessing_klass, // setup up the proper type to return on OOM ciKlass* fail_type; - if (sym->char_at(0) == '[') { + if (sym->char_at(0) == JVM_SIGNATURE_ARRAY) { fail_type = _unloaded_ciobjarrayklass; } else { fail_type = _unloaded_ciinstance_klass; @@ -466,8 +466,8 @@ ciKlass* ciEnv::get_klass_by_name_impl(ciKlass* accessing_klass, // we must build an array type around it. The CI requires array klasses // to be loaded if their element klasses are loaded, except when memory // is exhausted. - if (sym->char_at(0) == '[' && - (sym->char_at(1) == '[' || sym->char_at(1) == 'L')) { + if (sym->char_at(0) == JVM_SIGNATURE_ARRAY && + (sym->char_at(1) == JVM_SIGNATURE_ARRAY || sym->char_at(1) == JVM_SIGNATURE_CLASS)) { // We have an unloaded array. // Build it on the fly if the element class exists. TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1, diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp index fb26277a094..1444b21099f 100644 --- a/src/hotspot/share/ci/ciInstanceKlass.cpp +++ b/src/hotspot/share/ci/ciInstanceKlass.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -116,7 +116,7 @@ ciInstanceKlass::ciInstanceKlass(ciSymbol* name, jobject loader, jobject protection_domain) : ciKlass(name, T_OBJECT) { - assert(name->char_at(0) != '[', "not an instance klass"); + assert(name->char_at(0) != JVM_SIGNATURE_ARRAY, "not an instance klass"); _init_state = (InstanceKlass::ClassState)0; _nonstatic_field_size = -1; _has_nonstatic_fields = false; diff --git a/src/hotspot/share/ci/ciObjArrayKlass.cpp b/src/hotspot/share/ci/ciObjArrayKlass.cpp index 6cdeef70237..2ce543fcfc1 100644 --- a/src/hotspot/share/ci/ciObjArrayKlass.cpp +++ b/src/hotspot/share/ci/ciObjArrayKlass.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -112,16 +112,16 @@ ciSymbol* ciObjArrayKlass::construct_array_name(ciSymbol* element_name, Symbol* base_name_sym = element_name->get_symbol(); char* name; - if (base_name_sym->char_at(0) == '[' || - (base_name_sym->char_at(0) == 'L' && // watch package name 'Lxx' - base_name_sym->char_at(element_len-1) == ';')) { + if (base_name_sym->char_at(0) == JVM_SIGNATURE_ARRAY || + (base_name_sym->char_at(0) == JVM_SIGNATURE_CLASS && // watch package name 'Lxx' + base_name_sym->char_at(element_len-1) == JVM_SIGNATURE_ENDCLASS)) { int new_len = element_len + dimension + 1; // for the ['s and '\0' name = CURRENT_THREAD_ENV->name_buffer(new_len); int pos = 0; for ( ; pos < dimension; pos++) { - name[pos] = '['; + name[pos] = JVM_SIGNATURE_ARRAY; } strncpy(name+pos, (char*)element_name->base(), element_len); name[new_len-1] = '\0'; @@ -133,11 +133,11 @@ ciSymbol* ciObjArrayKlass::construct_array_name(ciSymbol* element_name, name = CURRENT_THREAD_ENV->name_buffer(new_len); int pos = 0; for ( ; pos < dimension; pos++) { - name[pos] = '['; + name[pos] = JVM_SIGNATURE_ARRAY; } - name[pos++] = 'L'; + name[pos++] = JVM_SIGNATURE_CLASS; strncpy(name+pos, (char*)element_name->base(), element_len); - name[new_len-2] = ';'; + name[new_len-2] = JVM_SIGNATURE_ENDCLASS; name[new_len-1] = '\0'; } return ciSymbol::make(name); diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp index 7178040baf6..01ccbfe5e15 100644 --- a/src/hotspot/share/ci/ciObjectFactory.cpp +++ b/src/hotspot/share/ci/ciObjectFactory.cpp @@ -486,7 +486,7 @@ ciKlass* ciObjectFactory::get_unloaded_klass(ciKlass* accessing_klass, // Two cases: this is an unloaded ObjArrayKlass or an // unloaded InstanceKlass. Deal with both. - if (name->char_at(0) == '[') { + if (name->char_at(0) == JVM_SIGNATURE_ARRAY) { // Decompose the name.' FieldArrayInfo fd; BasicType element_type = FieldType::get_array_info(name->get_symbol(), diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp index a4d8fd0db91..f4573b1f41a 100644 --- a/src/hotspot/share/ci/ciReplay.cpp +++ b/src/hotspot/share/ci/ciReplay.cpp @@ -814,18 +814,18 @@ class CompileReplay : public StackObj { } oop java_mirror = k->java_mirror(); - if (field_signature[0] == '[') { + if (field_signature[0] == JVM_SIGNATURE_ARRAY) { int length = parse_int("array length"); oop value = NULL; - if (field_signature[1] == '[') { + if (field_signature[1] == JVM_SIGNATURE_ARRAY) { // multi dimensional array ArrayKlass* kelem = (ArrayKlass *)parse_klass(CHECK); if (kelem == NULL) { return; } int rank = 0; - while (field_signature[rank] == '[') { + while (field_signature[rank] == JVM_SIGNATURE_ARRAY) { rank++; } jint* dims = NEW_RESOURCE_ARRAY(jint, rank); @@ -851,7 +851,8 @@ class CompileReplay : public StackObj { value = oopFactory::new_intArray(length, CHECK); } else if (strcmp(field_signature, "[J") == 0) { value = oopFactory::new_longArray(length, CHECK); - } else if (field_signature[0] == '[' && field_signature[1] == 'L') { + } else if (field_signature[0] == JVM_SIGNATURE_ARRAY && + field_signature[1] == JVM_SIGNATURE_CLASS) { Klass* kelem = resolve_klass(field_signature + 1, CHECK); value = oopFactory::new_objArray(kelem, length, CHECK); } else { @@ -892,7 +893,7 @@ class CompileReplay : public StackObj { } else if (strcmp(field_signature, "Ljava/lang/String;") == 0) { Handle value = java_lang_String::create_from_str(string_value, CHECK); java_mirror->obj_field_put(fd.offset(), value()); - } else if (field_signature[0] == 'L') { + } else if (field_signature[0] == JVM_SIGNATURE_CLASS) { Klass* k = resolve_klass(string_value, CHECK); oop value = InstanceKlass::cast(k)->allocate_instance(CHECK); java_mirror->obj_field_put(fd.offset(), value); diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp index c73c3c1578c..259532885a1 100644 --- a/src/hotspot/share/classfile/classFileParser.cpp +++ b/src/hotspot/share/classfile/classFileParser.cpp @@ -731,7 +731,7 @@ void ClassFileParser::parse_constant_pool(const ClassFileStream* const stream, const unsigned int name_len = name->utf8_length(); if (tag == JVM_CONSTANT_Methodref && name_len != 0 && - name->char_at(0) == '<' && + name->char_at(0) == JVM_SIGNATURE_SPECIAL && name != vmSymbols::object_initializer_name()) { classfile_parse_error( "Bad method name at constant pool index %u in class file %s", @@ -4961,24 +4961,25 @@ bool ClassFileParser::verify_unqualified_name(const char* name, if (length == 0) return false; // Must have at least one char. for (const char* p = name; p != name + length; p++) { switch(*p) { - case '.': - case ';': - case '[': + case JVM_SIGNATURE_DOT: + case JVM_SIGNATURE_ENDCLASS: + case JVM_SIGNATURE_ARRAY: // do not permit '.', ';', or '[' return false; - case '/': + case JVM_SIGNATURE_SLASH: // check for '//' or leading or trailing '/' which are not legal // unqualified name must not be empty if (type == ClassFileParser::LegalClass) { - if (p == name || p+1 >= name+length || *(p+1) == '/') { + if (p == name || p+1 >= name+length || + *(p+1) == JVM_SIGNATURE_SLASH) { return false; } } else { return false; // do not permit '/' unless it's class name } break; - case '<': - case '>': + case JVM_SIGNATURE_SPECIAL: + case JVM_SIGNATURE_ENDSPECIAL: // do not permit '<' or '>' in method names if (type == ClassFileParser::LegalMethod) { return false; @@ -5015,7 +5016,7 @@ static const char* skip_over_field_name(const char* const name, last_is_slash = false; continue; } - if (slash_ok && ch == '/') { + if (slash_ok && ch == JVM_SIGNATURE_SLASH) { if (last_is_slash) { return NULL; // Don't permit consecutive slashes } @@ -5095,14 +5096,14 @@ const char* ClassFileParser::skip_over_field_signature(const char* signature, const char* const p = skip_over_field_name(signature + 1, true, --length); // The next character better be a semicolon - if (p && (p - signature) > 1 && p[0] == ';') { + if (p && (p - signature) > 1 && p[0] == JVM_SIGNATURE_ENDCLASS) { return p + 1; } } else { // Skip leading 'L' and ignore first appearance of ';' signature++; - const char* c = (const char*) memchr(signature, ';', length - 1); + const char* c = (const char*) memchr(signature, JVM_SIGNATURE_ENDCLASS, length - 1); // Format check signature if (c != NULL) { int newlen = c - (char*) signature; @@ -5151,7 +5152,7 @@ void ClassFileParser::verify_legal_class_name(const Symbol* name, TRAPS) const { p = skip_over_field_signature(bytes, false, length, CHECK); legal = (p != NULL) && ((p - bytes) == (int)length); } else if (_major_version < JAVA_1_5_VERSION) { - if (bytes[0] != '<') { + if (bytes[0] != JVM_SIGNATURE_SPECIAL) { p = skip_over_field_name(bytes, true, length); legal = (p != NULL) && ((p - bytes) == (int)length); } @@ -5186,7 +5187,7 @@ void ClassFileParser::verify_legal_field_name(const Symbol* name, TRAPS) const { if (length > 0) { if (_major_version < JAVA_1_5_VERSION) { - if (bytes[0] != '<') { + if (bytes[0] != JVM_SIGNATURE_SPECIAL) { const char* p = skip_over_field_name(bytes, false, length); legal = (p != NULL) && ((p - bytes) == (int)length); } @@ -5219,7 +5220,7 @@ void ClassFileParser::verify_legal_method_name(const Symbol* name, TRAPS) const bool legal = false; if (length > 0) { - if (bytes[0] == '<') { + if (bytes[0] == JVM_SIGNATURE_SPECIAL) { if (name == vmSymbols::object_initializer_name() || name == vmSymbols::class_initializer_name()) { legal = true; } @@ -5303,7 +5304,7 @@ int ClassFileParser::verify_legal_method_signature(const Symbol* name, // The first non-signature thing better be a ')' if ((length > 0) && (*p++ == JVM_SIGNATURE_ENDFUNC)) { length--; - if (name->utf8_length() > 0 && name->char_at(0) == '<') { + if (name->utf8_length() > 0 && name->char_at(0) == JVM_SIGNATURE_SPECIAL) { // All internal methods must return void if ((length == 1) && (p[0] == JVM_SIGNATURE_VOID)) { return args_size; @@ -5705,7 +5706,7 @@ void ClassFileParser::update_class_name(Symbol* new_class_name) { // its _class_name field. void ClassFileParser::prepend_host_package_name(const InstanceKlass* unsafe_anonymous_host, TRAPS) { ResourceMark rm(THREAD); - assert(strrchr(_class_name->as_C_string(), '/') == NULL, + assert(strrchr(_class_name->as_C_string(), JVM_SIGNATURE_SLASH) == NULL, "Unsafe anonymous class should not be in a package"); const char* host_pkg_name = ClassLoader::package_from_name(unsafe_anonymous_host->name()->as_C_string(), NULL); @@ -5738,7 +5739,7 @@ void ClassFileParser::fix_unsafe_anonymous_class_name(TRAPS) { assert(_unsafe_anonymous_host != NULL, "Expected an unsafe anonymous class"); const jbyte* anon_last_slash = UTF8::strrchr((const jbyte*)_class_name->base(), - _class_name->utf8_length(), '/'); + _class_name->utf8_length(), JVM_SIGNATURE_SLASH); if (anon_last_slash == NULL) { // Unnamed package prepend_host_package_name(_unsafe_anonymous_host, CHECK); } else { @@ -6343,7 +6344,7 @@ bool ClassFileParser::is_internal_format(Symbol* class_name) { if (class_name != NULL) { ResourceMark rm; char* name = class_name->as_C_string(); - return strchr(name, '.') == NULL; + return strchr(name, JVM_SIGNATURE_DOT) == NULL; } else { return true; } diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp index b16d1e8568b..dbeec71aecc 100644 --- a/src/hotspot/share/classfile/classLoader.cpp +++ b/src/hotspot/share/classfile/classLoader.cpp @@ -187,7 +187,7 @@ const char* ClassLoader::package_from_name(const char* const class_name, bool* b *bad_class_name = false; } - const char* const last_slash = strrchr(class_name, '/'); + const char* const last_slash = strrchr(class_name, JVM_SIGNATURE_SLASH); if (last_slash == NULL) { // No package name return NULL; @@ -195,16 +195,16 @@ const char* ClassLoader::package_from_name(const char* const class_name, bool* b char* class_name_ptr = (char*) class_name; // Skip over '['s - if (*class_name_ptr == '[') { + if (*class_name_ptr == JVM_SIGNATURE_ARRAY) { do { class_name_ptr++; - } while (*class_name_ptr == '['); + } while (*class_name_ptr == JVM_SIGNATURE_ARRAY); // Fully qualified class names should not contain a 'L'. // Set bad_class_name to true to indicate that the package name // could not be obtained due to an error condition. // In this situation, is_same_class_package returns false. - if (*class_name_ptr == 'L') { + if (*class_name_ptr == JVM_SIGNATURE_CLASS) { if (bad_class_name != NULL) { *bad_class_name = true; } diff --git a/src/hotspot/share/classfile/javaAssertions.cpp b/src/hotspot/share/classfile/javaAssertions.cpp index 1bc6e7c460a..606440542eb 100644 --- a/src/hotspot/share/classfile/javaAssertions.cpp +++ b/src/hotspot/share/classfile/javaAssertions.cpp @@ -79,7 +79,7 @@ void JavaAssertions::addOption(const char* name, bool enable) { // JVM_DesiredAssertionStatus pass the external_name() to // JavaAssertion::enabled(), but that is done once per loaded class. for (int i = 0; i < len; ++i) { - if (name_copy[i] == '.') name_copy[i] = '/'; + if (name_copy[i] == JVM_SIGNATURE_DOT) name_copy[i] = JVM_SIGNATURE_SLASH; } if (TraceJavaAssertions) { @@ -135,7 +135,7 @@ objArrayHandle names, typeArrayHandle enabled, TRAPS) { for (index = len - 1; p != 0; p = p->next(), --index) { assert(index >= 0, "length does not match list"); Handle s = java_lang_String::create_from_str(p->name(), CHECK); - s = java_lang_String::char_converter(s, '/', '.', CHECK); + s = java_lang_String::char_converter(s, JVM_SIGNATURE_SLASH, JVM_SIGNATURE_DOT, CHECK); names->obj_at_put(index, s()); enabled->bool_at_put(index, p->enabled()); } @@ -163,10 +163,10 @@ JavaAssertions::match_package(const char* classname) { // does not include a package, length will be 0 which will match items for the // default package (from options "-ea:..." or "-da:..."). size_t len = strlen(classname); - for (/* empty */; len > 0 && classname[len] != '/'; --len) /* empty */; + for (/* empty */; len > 0 && classname[len] != JVM_SIGNATURE_SLASH; --len) /* empty */; do { - assert(len == 0 || classname[len] == '/', "not a package name"); + assert(len == 0 || classname[len] == JVM_SIGNATURE_SLASH, "not a package name"); for (OptionList* p = _packages; p != 0; p = p->next()) { if (strncmp(p->name(), classname, len) == 0 && p->name()[len] == '\0') { return p; @@ -175,7 +175,7 @@ JavaAssertions::match_package(const char* classname) { // Find the length of the next package, taking care to avoid decrementing // past 0 (len is unsigned). - while (len > 0 && classname[--len] != '/') /* empty */; + while (len > 0 && classname[--len] != JVM_SIGNATURE_SLASH) /* empty */; } while (len > 0); return 0; diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp index 6027290386a..cc52154efa3 100644 --- a/src/hotspot/share/classfile/javaClasses.hpp +++ b/src/hotspot/share/classfile/javaClasses.hpp @@ -201,7 +201,9 @@ class java_lang_String : AllStatic { static inline bool value_equals(typeArrayOop str_value1, typeArrayOop str_value2); // Conversion between '.' and '/' formats - static Handle externalize_classname(Handle java_string, TRAPS) { return char_converter(java_string, '/', '.', THREAD); } + static Handle externalize_classname(Handle java_string, TRAPS) { + return char_converter(java_string, JVM_SIGNATURE_SLASH, JVM_SIGNATURE_DOT, THREAD); + } // Conversion static Symbol* as_symbol(oop java_string); diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp index ded41cb2ba6..c21089e7c19 100644 --- a/src/hotspot/share/classfile/modules.cpp +++ b/src/hotspot/share/classfile/modules.cpp @@ -331,7 +331,7 @@ void Modules::define_module(jobject module, jboolean is_open, jstring version, if (!h_loader.is_null() && !SystemDictionary::is_platform_class_loader(h_loader()) && (strncmp(package_name, JAVAPKG, JAVAPKG_LEN) == 0 && - (package_name[JAVAPKG_LEN] == '/' || package_name[JAVAPKG_LEN] == '\0'))) { + (package_name[JAVAPKG_LEN] == JVM_SIGNATURE_SLASH || package_name[JAVAPKG_LEN] == '\0'))) { const char* class_loader_name = loader_data->loader_name_and_id(); size_t pkg_len = strlen(package_name); char* pkg_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, pkg_len + 1); diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index 7c555633f76..3b10fbd85b0 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -2533,7 +2533,7 @@ Handle SystemDictionary::find_java_mirror_for_type(Symbol* signature, // It's a primitive. (Void has a primitive mirror too.) char ch = type->char_at(0); - assert(is_java_primitive(char2type(ch)) || ch == 'V', ""); + assert(is_java_primitive(char2type(ch)) || ch == JVM_SIGNATURE_VOID, ""); return Handle(THREAD, find_java_mirror_for_type(ch)); } else if (FieldType::is_obj(type) || FieldType::is_array(type)) { diff --git a/src/hotspot/share/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp index 9263cac7401..361aa441652 100644 --- a/src/hotspot/share/classfile/verificationType.cpp +++ b/src/hotspot/share/classfile/verificationType.cpp @@ -122,19 +122,19 @@ VerificationType VerificationType::get_component(ClassVerifier *context, TRAPS) assert(is_array() && name()->utf8_length() >= 2, "Must be a valid array"); Symbol* component; switch (name()->char_at(1)) { - case 'Z': return VerificationType(Boolean); - case 'B': return VerificationType(Byte); - case 'C': return VerificationType(Char); - case 'S': return VerificationType(Short); - case 'I': return VerificationType(Integer); - case 'J': return VerificationType(Long); - case 'F': return VerificationType(Float); - case 'D': return VerificationType(Double); - case '[': + case JVM_SIGNATURE_BOOLEAN: return VerificationType(Boolean); + case JVM_SIGNATURE_BYTE: return VerificationType(Byte); + case JVM_SIGNATURE_CHAR: return VerificationType(Char); + case JVM_SIGNATURE_SHORT: return VerificationType(Short); + case JVM_SIGNATURE_INT: return VerificationType(Integer); + case JVM_SIGNATURE_LONG: return VerificationType(Long); + case JVM_SIGNATURE_FLOAT: return VerificationType(Float); + case JVM_SIGNATURE_DOUBLE: return VerificationType(Double); + case JVM_SIGNATURE_ARRAY: component = context->create_temporary_symbol( name(), 1, name()->utf8_length()); return VerificationType::reference_type(component); - case 'L': + case JVM_SIGNATURE_CLASS: component = context->create_temporary_symbol( name(), 2, name()->utf8_length() - 1); return VerificationType::reference_type(component); diff --git a/src/hotspot/share/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp index 9a9b7bb2d91..83366551054 100644 --- a/src/hotspot/share/classfile/verificationType.hpp +++ b/src/hotspot/share/classfile/verificationType.hpp @@ -209,24 +209,24 @@ class VerificationType { bool is_x_array(char sig) const { return is_null() || (is_array() && (name()->char_at(1) == sig)); } - bool is_int_array() const { return is_x_array('I'); } - bool is_byte_array() const { return is_x_array('B'); } - bool is_bool_array() const { return is_x_array('Z'); } - bool is_char_array() const { return is_x_array('C'); } - bool is_short_array() const { return is_x_array('S'); } - bool is_long_array() const { return is_x_array('J'); } - bool is_float_array() const { return is_x_array('F'); } - bool is_double_array() const { return is_x_array('D'); } - bool is_object_array() const { return is_x_array('L'); } - bool is_array_array() const { return is_x_array('['); } + bool is_int_array() const { return is_x_array(JVM_SIGNATURE_INT); } + bool is_byte_array() const { return is_x_array(JVM_SIGNATURE_BYTE); } + bool is_bool_array() const { return is_x_array(JVM_SIGNATURE_BOOLEAN); } + bool is_char_array() const { return is_x_array(JVM_SIGNATURE_CHAR); } + bool is_short_array() const { return is_x_array(JVM_SIGNATURE_SHORT); } + bool is_long_array() const { return is_x_array(JVM_SIGNATURE_LONG); } + bool is_float_array() const { return is_x_array(JVM_SIGNATURE_FLOAT); } + bool is_double_array() const { return is_x_array(JVM_SIGNATURE_DOUBLE); } + bool is_object_array() const { return is_x_array(JVM_SIGNATURE_CLASS); } + bool is_array_array() const { return is_x_array(JVM_SIGNATURE_ARRAY); } bool is_reference_array() const { return is_object_array() || is_array_array(); } bool is_object() const { return (is_reference() && !is_null() && name()->utf8_length() >= 1 && - name()->char_at(0) != '['); } + name()->char_at(0) != JVM_SIGNATURE_ARRAY); } bool is_array() const { return (is_reference() && !is_null() && name()->utf8_length() >= 2 && - name()->char_at(0) == '['); } + name()->char_at(0) == JVM_SIGNATURE_ARRAY); } bool is_uninitialized() const { return ((_u._data & Uninitialized) == Uninitialized); } bool is_uninitialized_this() const @@ -322,7 +322,7 @@ class VerificationType { int dimensions() const { assert(is_array(), "Must be an array"); int index = 0; - while (name()->char_at(index) == '[') index++; + while (name()->char_at(index) == JVM_SIGNATURE_ARRAY) index++; return index; } diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp index 84a4650fadb..a60a05573a5 100644 --- a/src/hotspot/share/classfile/verifier.cpp +++ b/src/hotspot/share/classfile/verifier.cpp @@ -2852,7 +2852,7 @@ void ClassVerifier::verify_invoke_instructions( } } - if (method_name->char_at(0) == '<') { + if (method_name->char_at(0) == JVM_SIGNATURE_SPECIAL) { // Make sure can only be invoked by invokespecial if (opcode != Bytecodes::_invokespecial || method_name != vmSymbols::object_initializer_name()) { @@ -3028,21 +3028,23 @@ void ClassVerifier::verify_anewarray( // Check for more than MAX_ARRAY_DIMENSIONS length = (int)strlen(component_name); if (length > MAX_ARRAY_DIMENSIONS && - component_name[MAX_ARRAY_DIMENSIONS - 1] == '[') { + component_name[MAX_ARRAY_DIMENSIONS - 1] == JVM_SIGNATURE_ARRAY) { verify_error(ErrorContext::bad_code(bci), "Illegal anewarray instruction, array has more than 255 dimensions"); } // add one dimension to component length++; arr_sig_str = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, length + 1); - int n = os::snprintf(arr_sig_str, length + 1, "[%s", component_name); + int n = os::snprintf(arr_sig_str, length + 1, "%c%s", + JVM_SIGNATURE_ARRAY, component_name); assert(n == length, "Unexpected number of characters in string"); } else { // it's an object or interface const char* component_name = component_type.name()->as_utf8(); // add one dimension to component with 'L' prepended and ';' postpended. length = (int)strlen(component_name) + 3; arr_sig_str = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, length + 1); - int n = os::snprintf(arr_sig_str, length + 1, "[L%s;", component_name); + int n = os::snprintf(arr_sig_str, length + 1, "%c%c%s;", + JVM_SIGNATURE_ARRAY, JVM_SIGNATURE_CLASS, component_name); assert(n == length, "Unexpected number of characters in string"); } Symbol* arr_sig = create_temporary_symbol(arr_sig_str, length); diff --git a/src/hotspot/share/classfile/vmSymbols.cpp b/src/hotspot/share/classfile/vmSymbols.cpp index 6ac72cafda2..d102ae6ac0c 100644 --- a/src/hotspot/share/classfile/vmSymbols.cpp +++ b/src/hotspot/share/classfile/vmSymbols.cpp @@ -970,7 +970,7 @@ const char* vmIntrinsics::short_name_as_C_string(vmIntrinsics::ID id, char* buf, case F_RNY:fname = "native synchronized "; break; default: break; } - const char* kptr = strrchr(kname, '/'); + const char* kptr = strrchr(kname, JVM_SIGNATURE_SLASH); if (kptr != NULL) kname = kptr + 1; int len = jio_snprintf(buf, buflen, "%s: %s%s.%s%s", str, fname, kname, mname, sname); diff --git a/src/hotspot/share/compiler/methodMatcher.cpp b/src/hotspot/share/compiler/methodMatcher.cpp index 2a182037679..fd3bfeb1dd0 100644 --- a/src/hotspot/share/compiler/methodMatcher.cpp +++ b/src/hotspot/share/compiler/methodMatcher.cpp @@ -264,11 +264,13 @@ void MethodMatcher::parse_method_pattern(char*& line, const char*& error_msg, Me c_match = check_mode(class_name, error_msg); m_match = check_mode(method_name, error_msg); - if ((strchr(class_name, '<') != NULL) || (strchr(class_name, '>') != NULL)) { + if ((strchr(class_name, JVM_SIGNATURE_SPECIAL) != NULL) || + (strchr(class_name, JVM_SIGNATURE_ENDSPECIAL) != NULL)) { error_msg = "Chars '<' and '>' not allowed in class name"; return; } - if ((strchr(method_name, '<') != NULL) || (strchr(method_name, '>') != NULL)) { + if ((strchr(method_name, JVM_SIGNATURE_SPECIAL) != NULL) || + (strchr(method_name, JVM_SIGNATURE_ENDSPECIAL) != NULL)) { if ((strncmp("", method_name, 255) != 0) && (strncmp("", method_name, 255) != 0)) { error_msg = "Chars '<' and '>' only allowed in and "; return; diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp index 9eb04f4d784..e921de3eddb 100644 --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp @@ -1249,15 +1249,15 @@ JRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread, char sig_type = '\0'; switch(cp_entry->flag_state()) { - case btos: sig_type = 'B'; break; - case ztos: sig_type = 'Z'; break; - case ctos: sig_type = 'C'; break; - case stos: sig_type = 'S'; break; - case itos: sig_type = 'I'; break; - case ftos: sig_type = 'F'; break; - case atos: sig_type = 'L'; break; - case ltos: sig_type = 'J'; break; - case dtos: sig_type = 'D'; break; + case btos: sig_type = JVM_SIGNATURE_BYTE; break; + case ztos: sig_type = JVM_SIGNATURE_BOOLEAN; break; + case ctos: sig_type = JVM_SIGNATURE_CHAR; break; + case stos: sig_type = JVM_SIGNATURE_SHORT; break; + case itos: sig_type = JVM_SIGNATURE_INT; break; + case ftos: sig_type = JVM_SIGNATURE_FLOAT; break; + case atos: sig_type = JVM_SIGNATURE_CLASS; break; + case ltos: sig_type = JVM_SIGNATURE_LONG; break; + case dtos: sig_type = JVM_SIGNATURE_DOUBLE; break; default: ShouldNotReachHere(); return; } bool is_static = (obj == NULL); diff --git a/src/hotspot/share/jvmci/compilerRuntime.cpp b/src/hotspot/share/jvmci/compilerRuntime.cpp index 1250c8b5b8c..6aea1547990 100644 --- a/src/hotspot/share/jvmci/compilerRuntime.cpp +++ b/src/hotspot/share/jvmci/compilerRuntime.cpp @@ -73,7 +73,7 @@ Klass* CompilerRuntime::resolve_klass_helper(JavaThread *thread, const char* nam Handle protection_domain(THREAD, caller->method_holder()->protection_domain()); // Ignore wrapping L and ; - if (name[0] == 'L') { + if (name[0] == JVM_SIGNATURE_CLASS) { assert(len > 2, "small name %s", name); name++; len -= 2; diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp index b5a77120a67..b16ca788174 100644 --- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp +++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp @@ -535,8 +535,8 @@ C2V_VMENTRY_NULL(jobject, lookupType, (JNIEnv* env, jobject, jstring jname, jcla JVMCI_THROW_MSG_NULL(ClassNotFoundException, str); } } else { - if (class_name->char_at(0) == 'L' && - class_name->char_at(class_name->utf8_length()-1) == ';') { + if (class_name->char_at(0) == JVM_SIGNATURE_CLASS && + class_name->char_at(class_name->utf8_length()-1) == JVM_SIGNATURE_ENDCLASS) { // This is a name from a signature. Strip off the trimmings. // Call recursive to keep scope of strippedsym. TempNewSymbol strippedsym = SymbolTable::new_symbol(class_name->as_utf8()+1, diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp index 596b8ff0f4b..9c73cb5a450 100644 --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp @@ -980,8 +980,8 @@ Klass* JVMCIRuntime::get_klass_by_name_impl(Klass*& accessing_klass, JVMCI_EXCEPTION_CONTEXT; // Now we need to check the SystemDictionary - if (sym->char_at(0) == 'L' && - sym->char_at(sym->utf8_length()-1) == ';') { + if (sym->char_at(0) == JVM_SIGNATURE_CLASS && + sym->char_at(sym->utf8_length()-1) == JVM_SIGNATURE_ENDCLASS) { // This is a name from a signature. Strip off the trimmings. // Call recursive to keep scope of strippedsym. TempNewSymbol strippedsym = SymbolTable::new_symbol(sym->as_utf8()+1, @@ -1013,8 +1013,8 @@ Klass* JVMCIRuntime::get_klass_by_name_impl(Klass*& accessing_klass, // we must build an array type around it. The CI requires array klasses // to be loaded if their element klasses are loaded, except when memory // is exhausted. - if (sym->char_at(0) == '[' && - (sym->char_at(1) == '[' || sym->char_at(1) == 'L')) { + if (sym->char_at(0) == JVM_SIGNATURE_ARRAY && + (sym->char_at(1) == JVM_SIGNATURE_ARRAY || sym->char_at(1) == JVM_SIGNATURE_CLASS)) { // We have an unloaded array. // Build it on the fly if the element class exists. TempNewSymbol elem_sym = SymbolTable::new_symbol(sym->as_utf8()+1, diff --git a/src/hotspot/share/memory/heapInspection.cpp b/src/hotspot/share/memory/heapInspection.cpp index ab05eee3f00..cee1b51fb38 100644 --- a/src/hotspot/share/memory/heapInspection.cpp +++ b/src/hotspot/share/memory/heapInspection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2019, 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 @@ -72,8 +72,8 @@ int KlassInfoEntry::compare(KlassInfoEntry* e1, KlassInfoEntry* e2) { ResourceMark rm; const char* name1 = e1->klass()->external_name(); const char* name2 = e2->klass()->external_name(); - bool d1 = (name1[0] == '['); - bool d2 = (name2[0] == '['); + bool d1 = (name1[0] == JVM_SIGNATURE_ARRAY); + bool d2 = (name2[0] == JVM_SIGNATURE_ARRAY); if (d1 && !d2) { return -1; } else if (d2 && !d1) { diff --git a/src/hotspot/share/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp index 3fa07c3df5c..773de2e14c0 100644 --- a/src/hotspot/share/oops/generateOopMap.cpp +++ b/src/hotspot/share/oops/generateOopMap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2019, 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 @@ -1993,14 +1993,14 @@ void GenerateOopMap::do_method(int is_static, int is_interface, int idx, int bci // This is used to parse the signature for fields, since they are very simple... CellTypeState *GenerateOopMap::sigchar_to_effect(char sigch, int bci, CellTypeState *out) { // Object and array - if (sigch=='L' || sigch=='[') { + if (sigch==JVM_SIGNATURE_CLASS || sigch==JVM_SIGNATURE_ARRAY) { out[0] = CellTypeState::make_line_ref(bci); out[1] = CellTypeState::bottom; return out; } - if (sigch == 'J' || sigch == 'D' ) return vvCTS; // Long and Double - if (sigch == 'V' ) return epsilonCTS; // Void - return vCTS; // Otherwise + if (sigch == JVM_SIGNATURE_LONG || sigch == JVM_SIGNATURE_DOUBLE) return vvCTS; // Long and Double + if (sigch == JVM_SIGNATURE_VOID) return epsilonCTS; // Void + return vCTS; // Otherwise } long GenerateOopMap::_total_byte_count = 0; diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index 59b3c734a2f..e87e3c287ae 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -2594,7 +2594,7 @@ const char* InstanceKlass::signature_name() const { // Add L as type indicator int dest_index = 0; - dest[dest_index++] = 'L'; + dest[dest_index++] = JVM_SIGNATURE_CLASS; // Add the actual class name for (int src_index = 0; src_index < src_length; ) { @@ -2607,7 +2607,7 @@ const char* InstanceKlass::signature_name() const { } // Add the semicolon and the NULL - dest[dest_index++] = ';'; + dest[dest_index++] = JVM_SIGNATURE_ENDCLASS; dest[dest_index] = '\0'; return dest; } diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp index b2e1f2e034e..29c23afcd74 100644 --- a/src/hotspot/share/oops/objArrayKlass.cpp +++ b/src/hotspot/share/oops/objArrayKlass.cpp @@ -106,14 +106,14 @@ Klass* ObjArrayKlass::allocate_objArray_klass(ClassLoaderData* loader_data, int len = element_klass->name()->utf8_length(); char *new_str = NEW_RESOURCE_ARRAY(char, len + 4); int idx = 0; - new_str[idx++] = '['; + new_str[idx++] = JVM_SIGNATURE_ARRAY; if (element_klass->is_instance_klass()) { // it could be an array or simple type - new_str[idx++] = 'L'; + new_str[idx++] = JVM_SIGNATURE_CLASS; } memcpy(&new_str[idx], name_str, len * sizeof(char)); idx += len; if (element_klass->is_instance_klass()) { - new_str[idx++] = ';'; + new_str[idx++] = JVM_SIGNATURE_ENDCLASS; } new_str[idx++] = '\0'; name = SymbolTable::new_permanent_symbol(new_str); diff --git a/src/hotspot/share/oops/symbol.cpp b/src/hotspot/share/oops/symbol.cpp index 0c8391f52a6..e3090a7fbc4 100644 --- a/src/hotspot/share/oops/symbol.cpp +++ b/src/hotspot/share/oops/symbol.cpp @@ -201,8 +201,8 @@ const char* Symbol::as_klass_external_name() const { int length = (int)strlen(str); // Turn all '/'s into '.'s (also for array klasses) for (int index = 0; index < length; index++) { - if (str[index] == '/') { - str[index] = '.'; + if (str[index] == JVM_SIGNATURE_SLASH) { + str[index] = JVM_SIGNATURE_DOT; } } return str; @@ -210,8 +210,8 @@ const char* Symbol::as_klass_external_name() const { static void print_class(outputStream *os, char *class_str, int len) { for (int i = 0; i < len; ++i) { - if (class_str[i] == '/') { - os->put('.'); + if (class_str[i] == JVM_SIGNATURE_SLASH) { + os->put(JVM_SIGNATURE_DOT); } else { os->put(class_str[i]); } @@ -221,9 +221,9 @@ static void print_class(outputStream *os, char *class_str, int len) { static void print_array(outputStream *os, char *array_str, int len) { int dimensions = 0; for (int i = 0; i < len; ++i) { - if (array_str[i] == '[') { + if (array_str[i] == JVM_SIGNATURE_ARRAY) { dimensions++; - } else if (array_str[i] == 'L') { + } else if (array_str[i] == JVM_SIGNATURE_CLASS) { // Expected format: L;. Skip 'L' and ';' delimiting the type name. print_class(os, array_str+i+1, len-i-2); break; diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp index 699c98f73e0..9b7e44d9151 100644 --- a/src/hotspot/share/prims/jni.cpp +++ b/src/hotspot/share/prims/jni.cpp @@ -2151,7 +2151,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldI if (JvmtiExport::should_post_field_modification()) { jvalue field_value; field_value.l = value; - o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, 'L', (jvalue *)&field_value); + o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, JVM_SIGNATURE_CLASS, (jvalue *)&field_value); } HeapAccess::oop_store_at(o, offset, JNIHandles::resolve(value)); HOTSPOT_JNI_SETOBJECTFIELD_RETURN(); @@ -2177,34 +2177,34 @@ JNI_ENTRY_NO_PRESERVE(void, jni_Set##Result##Field(JNIEnv *env, jobject obj, jfi field_value.unionType = value; \ o = JvmtiExport::jni_SetField_probe_nh(thread, obj, o, k, fieldID, false, SigType, (jvalue *)&field_value); \ } \ - if (SigType == 'Z') { value = ((jboolean)value) & 1; } \ + if (SigType == JVM_SIGNATURE_BOOLEAN) { value = ((jboolean)value) & 1; } \ o->Fieldname##_field_put(offset, value); \ ReturnProbe; \ JNI_END -DEFINE_SETFIELD(jboolean, bool, Boolean, 'Z', z +DEFINE_SETFIELD(jboolean, bool, Boolean, JVM_SIGNATURE_BOOLEAN, z , HOTSPOT_JNI_SETBOOLEANFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETBOOLEANFIELD_RETURN()) -DEFINE_SETFIELD(jbyte, byte, Byte, 'B', b +DEFINE_SETFIELD(jbyte, byte, Byte, JVM_SIGNATURE_BYTE, b , HOTSPOT_JNI_SETBYTEFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETBYTEFIELD_RETURN()) -DEFINE_SETFIELD(jchar, char, Char, 'C', c +DEFINE_SETFIELD(jchar, char, Char, JVM_SIGNATURE_CHAR, c , HOTSPOT_JNI_SETCHARFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETCHARFIELD_RETURN()) -DEFINE_SETFIELD(jshort, short, Short, 'S', s +DEFINE_SETFIELD(jshort, short, Short, JVM_SIGNATURE_SHORT, s , HOTSPOT_JNI_SETSHORTFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETSHORTFIELD_RETURN()) -DEFINE_SETFIELD(jint, int, Int, 'I', i +DEFINE_SETFIELD(jint, int, Int, JVM_SIGNATURE_INT, i , HOTSPOT_JNI_SETINTFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETINTFIELD_RETURN()) -DEFINE_SETFIELD(jlong, long, Long, 'J', j +DEFINE_SETFIELD(jlong, long, Long, JVM_SIGNATURE_LONG, j , HOTSPOT_JNI_SETLONGFIELD_ENTRY(env, obj, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETLONGFIELD_RETURN()) // Float and double probes don't return value because dtrace doesn't currently support it -DEFINE_SETFIELD(jfloat, float, Float, 'F', f +DEFINE_SETFIELD(jfloat, float, Float, JVM_SIGNATURE_FLOAT, f , HOTSPOT_JNI_SETFLOATFIELD_ENTRY(env, obj, (uintptr_t)fieldID), HOTSPOT_JNI_SETFLOATFIELD_RETURN()) -DEFINE_SETFIELD(jdouble, double, Double, 'D', d +DEFINE_SETFIELD(jdouble, double, Double, JVM_SIGNATURE_DOUBLE, d , HOTSPOT_JNI_SETDOUBLEFIELD_ENTRY(env, obj, (uintptr_t)fieldID), HOTSPOT_JNI_SETDOUBLEFIELD_RETURN()) @@ -2352,7 +2352,7 @@ JNI_ENTRY(void, jni_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fie if (JvmtiExport::should_post_field_modification()) { jvalue field_value; field_value.l = value; - JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, 'L', (jvalue *)&field_value); + JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, JVM_SIGNATURE_CLASS, (jvalue *)&field_value); } id->holder()->java_mirror()->obj_field_put(id->offset(), JNIHandles::resolve(value)); HOTSPOT_JNI_SETSTATICOBJECTFIELD_RETURN(); @@ -2376,34 +2376,34 @@ JNI_ENTRY(void, jni_SetStatic##Result##Field(JNIEnv *env, jclass clazz, jfieldID field_value.unionType = value; \ JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \ } \ - if (SigType == 'Z') { value = ((jboolean)value) & 1; } \ + if (SigType == JVM_SIGNATURE_BOOLEAN) { value = ((jboolean)value) & 1; } \ id->holder()->java_mirror()-> Fieldname##_field_put (id->offset(), value); \ ReturnProbe;\ JNI_END -DEFINE_SETSTATICFIELD(jboolean, bool, Boolean, 'Z', z +DEFINE_SETSTATICFIELD(jboolean, bool, Boolean, JVM_SIGNATURE_BOOLEAN, z , HOTSPOT_JNI_SETSTATICBOOLEANFIELD_ENTRY(env, clazz, (uintptr_t)fieldID, value), HOTSPOT_JNI_SETSTATICBOOLEANFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jbyte, byte, Byte, 'B', b +DEFINE_SETSTATICFIELD(jbyte, byte, Byte, JVM_SIGNATURE_BYTE, b , HOTSPOT_JNI_SETSTATICBYTEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICBYTEFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jchar, char, Char, 'C', c +DEFINE_SETSTATICFIELD(jchar, char, Char, JVM_SIGNATURE_CHAR, c , HOTSPOT_JNI_SETSTATICCHARFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICCHARFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jshort, short, Short, 'S', s +DEFINE_SETSTATICFIELD(jshort, short, Short, JVM_SIGNATURE_SHORT, s , HOTSPOT_JNI_SETSTATICSHORTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICSHORTFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jint, int, Int, 'I', i +DEFINE_SETSTATICFIELD(jint, int, Int, JVM_SIGNATURE_INT, i , HOTSPOT_JNI_SETSTATICINTFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICINTFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jlong, long, Long, 'J', j +DEFINE_SETSTATICFIELD(jlong, long, Long, JVM_SIGNATURE_LONG, j , HOTSPOT_JNI_SETSTATICLONGFIELD_ENTRY(env, clazz, (uintptr_t) fieldID, value), HOTSPOT_JNI_SETSTATICLONGFIELD_RETURN()) // Float and double probes don't return value because dtrace doesn't currently support it -DEFINE_SETSTATICFIELD(jfloat, float, Float, 'F', f +DEFINE_SETSTATICFIELD(jfloat, float, Float, JVM_SIGNATURE_FLOAT, f , HOTSPOT_JNI_SETSTATICFLOATFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_SETSTATICFLOATFIELD_RETURN()) -DEFINE_SETSTATICFIELD(jdouble, double, Double, 'D', d +DEFINE_SETSTATICFIELD(jdouble, double, Double, JVM_SIGNATURE_DOUBLE, d , HOTSPOT_JNI_SETSTATICDOUBLEFIELD_ENTRY(env, clazz, (uintptr_t) fieldID), HOTSPOT_JNI_SETSTATICDOUBLEFIELD_RETURN()) diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp index 3a36ebd9f57..513596e4316 100644 --- a/src/hotspot/share/prims/jvmtiEnvBase.cpp +++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp @@ -1361,7 +1361,7 @@ JvmtiEnvBase::check_top_frame(JavaThread* current_thread, JavaThread* java_threa NULL_CHECK(ob_k, JVMTI_ERROR_INVALID_OBJECT); // Method return type signature. - char* ty_sign = 1 + strchr(signature->as_C_string(), ')'); + char* ty_sign = 1 + strchr(signature->as_C_string(), JVM_SIGNATURE_ENDFUNC); if (!VM_GetOrSetLocal::is_assignable(ty_sign, ob_k, current_thread)) { return JVMTI_ERROR_TYPE_MISMATCH; diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp index f44730f9efe..f34c36871a1 100644 --- a/src/hotspot/share/prims/jvmtiExport.cpp +++ b/src/hotspot/share/prims/jvmtiExport.cpp @@ -1994,7 +1994,9 @@ void JvmtiExport::post_raw_field_modification(JavaThread *thread, Method* method address location, Klass* field_klass, Handle object, jfieldID field, char sig_type, jvalue *value) { - if (sig_type == 'I' || sig_type == 'Z' || sig_type == 'B' || sig_type == 'C' || sig_type == 'S') { + if (sig_type == JVM_SIGNATURE_INT || sig_type == JVM_SIGNATURE_BOOLEAN || + sig_type == JVM_SIGNATURE_BYTE || sig_type == JVM_SIGNATURE_CHAR || + sig_type == JVM_SIGNATURE_SHORT) { // 'I' instructions are used for byte, char, short and int. // determine which it really is, and convert fieldDescriptor fd; @@ -2005,22 +2007,22 @@ void JvmtiExport::post_raw_field_modification(JavaThread *thread, Method* method // convert value from int to appropriate type switch (fd.field_type()) { case T_BOOLEAN: - sig_type = 'Z'; + sig_type = JVM_SIGNATURE_BOOLEAN; value->i = 0; // clear it value->z = (jboolean)ival; break; case T_BYTE: - sig_type = 'B'; + sig_type = JVM_SIGNATURE_BYTE; value->i = 0; // clear it value->b = (jbyte)ival; break; case T_CHAR: - sig_type = 'C'; + sig_type = JVM_SIGNATURE_CHAR; value->i = 0; // clear it value->c = (jchar)ival; break; case T_SHORT: - sig_type = 'S'; + sig_type = JVM_SIGNATURE_SHORT; value->i = 0; // clear it value->s = (jshort)ival; break; @@ -2035,11 +2037,11 @@ void JvmtiExport::post_raw_field_modification(JavaThread *thread, Method* method } } - assert(sig_type != '[', "array should have sig_type == 'L'"); + assert(sig_type != JVM_SIGNATURE_ARRAY, "array should have sig_type == 'L'"); bool handle_created = false; // convert oop to JNI handle. - if (sig_type == 'L') { + if (sig_type == JVM_SIGNATURE_CLASS) { handle_created = true; value->l = (jobject)JNIHandles::make_local(thread, (oop)value->l); } diff --git a/src/hotspot/share/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp index 625a5ce2aa4..bb8aa96b96a 100644 --- a/src/hotspot/share/prims/jvmtiImpl.cpp +++ b/src/hotspot/share/prims/jvmtiImpl.cpp @@ -588,7 +588,8 @@ bool VM_GetOrSetLocal::is_assignable(const char* ty_sign, Klass* klass, Thread* assert(klass != NULL, "klass must not be NULL"); int len = (int) strlen(ty_sign); - if (ty_sign[0] == 'L' && ty_sign[len-1] == ';') { // Need pure class/interface name + if (ty_sign[0] == JVM_SIGNATURE_CLASS && + ty_sign[len-1] == JVM_SIGNATURE_ENDCLASS) { // Need pure class/interface name ty_sign++; len -= 2; } diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp index 8c79de6ad52..b97f43339cc 100644 --- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp +++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp @@ -2166,14 +2166,14 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_element_value( switch (tag) { // These BaseType tag values are from Table 4.2 in VM spec: - case 'B': // byte - case 'C': // char - case 'D': // double - case 'F': // float - case 'I': // int - case 'J': // long - case 'S': // short - case 'Z': // boolean + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: // The remaining tag values are from Table 4.8 in the 2nd-edition of // the VM spec: @@ -2244,7 +2244,7 @@ bool VM_RedefineClasses::rewrite_cp_refs_in_element_value( } break; - case '[': + case JVM_SIGNATURE_ARRAY: { if ((byte_i_ref + 2) > annotations_typeArray->length()) { // not enough room for a num_values field diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp b/src/hotspot/share/prims/jvmtiTagMap.cpp index 8549beaeeca..4a9d3d2f007 100644 --- a/src/hotspot/share/prims/jvmtiTagMap.cpp +++ b/src/hotspot/share/prims/jvmtiTagMap.cpp @@ -1032,7 +1032,7 @@ static inline bool is_filtered_by_klass_filter(oop obj, Klass* klass_filter) { // helper function to tell if a field is a primitive field or not static inline bool is_primitive_field_type(char type) { - return (type != 'L' && type != '['); + return (type != JVM_SIGNATURE_CLASS && type != JVM_SIGNATURE_ARRAY); } // helper function to copy the value from location addr to jvalue. diff --git a/src/hotspot/share/prims/methodHandles.cpp b/src/hotspot/share/prims/methodHandles.cpp index e6a99347865..c9cade600a6 100644 --- a/src/hotspot/share/prims/methodHandles.cpp +++ b/src/hotspot/share/prims/methodHandles.cpp @@ -542,18 +542,22 @@ bool MethodHandles::is_basic_type_signature(Symbol* sig) { const int len = sig->utf8_length(); for (int i = 0; i < len; i++) { switch (sig->char_at(i)) { - case 'L': + case JVM_SIGNATURE_CLASS: // only java/lang/Object is valid here if (sig->index_of_at(i, OBJ_SIG, OBJ_SIG_LEN) != i) return false; i += OBJ_SIG_LEN-1; //-1 because of i++ in loop continue; - case '(': case ')': case 'V': - case 'I': case 'J': case 'F': case 'D': + case JVM_SIGNATURE_FUNC: + case JVM_SIGNATURE_ENDFUNC: + case JVM_SIGNATURE_VOID: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_DOUBLE: continue; - //case '[': - //case 'Z': case 'B': case 'C': case 'S': default: + // subword types (T_BYTE etc.), arrays return false; } } @@ -567,7 +571,7 @@ Symbol* MethodHandles::lookup_basic_type_signature(Symbol* sig, bool keep_last_a } else if (is_basic_type_signature(sig)) { sig->increment_refcount(); return sig; // that was easy - } else if (sig->char_at(0) != '(') { + } else if (sig->char_at(0) != JVM_SIGNATURE_FUNC) { BasicType bt = char2type(sig->char_at(0)); if (is_subword_type(bt)) { bsig = vmSymbols::int_signature(); @@ -578,7 +582,7 @@ Symbol* MethodHandles::lookup_basic_type_signature(Symbol* sig, bool keep_last_a } else { ResourceMark rm; stringStream buffer(128); - buffer.put('('); + buffer.put(JVM_SIGNATURE_FUNC); int arg_pos = 0, keep_arg_pos = -1; if (keep_last_arg) keep_arg_pos = ArgumentCount(sig).size() - 1; @@ -586,7 +590,7 @@ Symbol* MethodHandles::lookup_basic_type_signature(Symbol* sig, bool keep_last_a BasicType bt = ss.type(); size_t this_arg_pos = buffer.size(); if (ss.at_return_type()) { - buffer.put(')'); + buffer.put(JVM_SIGNATURE_ENDFUNC); } if (arg_pos == keep_arg_pos) { buffer.write((char*) ss.raw_bytes(), @@ -621,25 +625,26 @@ void MethodHandles::print_as_basic_type_signature_on(outputStream* st, for (int i = 0; i < len; i++) { char ch = sig->char_at(i); switch (ch) { - case '(': case ')': + case JVM_SIGNATURE_FUNC: + case JVM_SIGNATURE_ENDFUNC: prev_type = false; st->put(ch); continue; - case '[': + case JVM_SIGNATURE_ARRAY: if (!keep_basic_names && keep_arrays) st->put(ch); array++; continue; - case 'L': + case JVM_SIGNATURE_CLASS: { if (prev_type) st->put(','); int start = i+1, slash = start; - while (++i < len && (ch = sig->char_at(i)) != ';') { - if (ch == '/' || ch == '.' || ch == '$') slash = i+1; + while (++i < len && (ch = sig->char_at(i)) != JVM_SIGNATURE_ENDCLASS) { + if (ch == JVM_SIGNATURE_SLASH || ch == JVM_SIGNATURE_DOT || ch == '$') slash = i+1; } if (slash < i) start = slash; if (!keep_basic_names) { - st->put('L'); + st->put(JVM_SIGNATURE_CLASS); } else { for (int j = start; j < i; j++) st->put(sig->char_at(j)); @@ -650,7 +655,7 @@ void MethodHandles::print_as_basic_type_signature_on(outputStream* st, default: { if (array && char2type(ch) != T_ILLEGAL && !keep_arrays) { - ch = '['; + ch = JVM_SIGNATURE_ARRAY; array = 0; } if (prev_type) st->put(','); @@ -978,7 +983,7 @@ int MethodHandles::find_MemberNames(Klass* k, } if (sig != NULL) { if (sig->utf8_length() == 0) return 0; // a match is not possible - if (sig->char_at(0) == '(') + if (sig->char_at(0) == JVM_SIGNATURE_FUNC) match_flags &= ~(IS_FIELD | IS_TYPE); else match_flags &= ~(IS_CONSTRUCTOR | IS_METHOD); @@ -1456,7 +1461,7 @@ JVM_ENTRY(void, MHN_copyOutBootstrapArguments(JNIEnv* env, jobject igcls, { Symbol* type = caller->constants()->signature_ref_at(bss_index_in_pool); Handle th; - if (type->char_at(0) == '(') { + if (type->char_at(0) == JVM_SIGNATURE_FUNC) { th = SystemDictionary::find_method_handle_type(type, caller, CHECK); } else { th = SystemDictionary::find_java_mirror_for_type(type, caller, SignatureStream::NCDFError, CHECK); diff --git a/src/hotspot/share/prims/nativeLookup.cpp b/src/hotspot/share/prims/nativeLookup.cpp index a165e8d0e0e..1ed3ce7609c 100644 --- a/src/hotspot/share/prims/nativeLookup.cpp +++ b/src/hotspot/share/prims/nativeLookup.cpp @@ -106,7 +106,7 @@ char* NativeLookup::long_jni_name(const methodHandle& method) { st.print("__"); // find ')' int end; - for (end = 0; end < signature->utf8_length() && signature->char_at(end) != ')'; end++); + for (end = 0; end < signature->utf8_length() && signature->char_at(end) != JVM_SIGNATURE_ENDFUNC; end++); // skip first '(' mangle_name_on(&st, signature, 1, end); return st.as_string(); diff --git a/src/hotspot/share/runtime/fieldType.cpp b/src/hotspot/share/runtime/fieldType.cpp index c82ded28fc6..c0d9d0c9c98 100644 --- a/src/hotspot/share/runtime/fieldType.cpp +++ b/src/hotspot/share/runtime/fieldType.cpp @@ -39,28 +39,28 @@ BasicType FieldType::basic_type(Symbol* signature) { // Check if it is a valid array signature bool FieldType::is_valid_array_signature(Symbol* sig) { assert(sig->utf8_length() > 1, "this should already have been checked"); - assert(sig->char_at(0) == '[', "this should already have been checked"); + assert(sig->char_at(0) == JVM_SIGNATURE_ARRAY, "this should already have been checked"); // The first character is already checked int i = 1; int len = sig->utf8_length(); // First skip all '['s - while(i < len - 1 && sig->char_at(i) == '[') i++; + while(i < len - 1 && sig->char_at(i) == JVM_SIGNATURE_ARRAY) i++; // Check type switch(sig->char_at(i)) { - case 'B': // T_BYTE - case 'C': // T_CHAR - case 'D': // T_DOUBLE - case 'F': // T_FLOAT - case 'I': // T_INT - case 'J': // T_LONG - case 'S': // T_SHORT - case 'Z': // T_BOOLEAN + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: // If it is an array, the type is the last character return (i + 1 == len); - case 'L': + case JVM_SIGNATURE_CLASS: // If it is an object, the last character must be a ';' - return sig->char_at(len - 1) == ';'; + return sig->char_at(len - 1) == JVM_SIGNATURE_ENDCLASS; } return false; @@ -71,7 +71,7 @@ BasicType FieldType::get_array_info(Symbol* signature, FieldArrayInfo& fd, TRAPS assert(basic_type(signature) == T_ARRAY, "must be array"); int index = 1; int dim = 1; - while (signature->char_at(index) == '[') { + while (signature->char_at(index) == JVM_SIGNATURE_ARRAY) { index++; dim++; } @@ -80,7 +80,7 @@ BasicType FieldType::get_array_info(Symbol* signature, FieldArrayInfo& fd, TRAPS BasicType element_type = char2type(element[0]); if (element_type == T_OBJECT) { int len = (int)strlen(element); - assert(element[len-1] == ';', "last char should be a semicolon"); + assert(element[len-1] == JVM_SIGNATURE_ENDCLASS, "last char should be a semicolon"); element[len-1] = '\0'; // chop off semicolon fd._object_key = SymbolTable::new_symbol(element + 1); } diff --git a/src/hotspot/share/runtime/fieldType.hpp b/src/hotspot/share/runtime/fieldType.hpp index 0fd6b887994..5ebe79682f4 100644 --- a/src/hotspot/share/runtime/fieldType.hpp +++ b/src/hotspot/share/runtime/fieldType.hpp @@ -58,14 +58,16 @@ class FieldType: public AllStatic { static BasicType basic_type(Symbol* signature); // Testing - static bool is_array(Symbol* signature) { return signature->utf8_length() > 1 && signature->char_at(0) == '[' && is_valid_array_signature(signature); } + static bool is_array(Symbol* signature) { return signature->utf8_length() > 1 && + signature->char_at(0) == JVM_SIGNATURE_ARRAY && + is_valid_array_signature(signature); } static bool is_obj(Symbol* signature) { int sig_length = signature->utf8_length(); // Must start with 'L' and end with ';' return (sig_length >= 2 && - (signature->char_at(0) == 'L') && - (signature->char_at(sig_length - 1) == ';')); + (signature->char_at(0) == JVM_SIGNATURE_CLASS) && + (signature->char_at(sig_length - 1) == JVM_SIGNATURE_ENDCLASS)); } // Parse field and extract array information. Works for T_ARRAY only. diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp index 4d3178b866e..735878a86b5 100644 --- a/src/hotspot/share/runtime/sharedRuntime.cpp +++ b/src/hotspot/share/runtime/sharedRuntime.cpp @@ -2990,28 +2990,28 @@ VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver, sig_bt[cnt++] = T_OBJECT; // Receiver is argument 0; not in signature } - while (*s != ')') { // Find closing right paren - switch (*s++) { // Switch on signature character - case 'B': sig_bt[cnt++] = T_BYTE; break; - case 'C': sig_bt[cnt++] = T_CHAR; break; - case 'D': sig_bt[cnt++] = T_DOUBLE; sig_bt[cnt++] = T_VOID; break; - case 'F': sig_bt[cnt++] = T_FLOAT; break; - case 'I': sig_bt[cnt++] = T_INT; break; - case 'J': sig_bt[cnt++] = T_LONG; sig_bt[cnt++] = T_VOID; break; - case 'S': sig_bt[cnt++] = T_SHORT; break; - case 'Z': sig_bt[cnt++] = T_BOOLEAN; break; - case 'V': sig_bt[cnt++] = T_VOID; break; - case 'L': // Oop - while (*s++ != ';'); // Skip signature + while (*s != JVM_SIGNATURE_ENDFUNC) { // Find closing right paren + switch (*s++) { // Switch on signature character + case JVM_SIGNATURE_BYTE: sig_bt[cnt++] = T_BYTE; break; + case JVM_SIGNATURE_CHAR: sig_bt[cnt++] = T_CHAR; break; + case JVM_SIGNATURE_DOUBLE: sig_bt[cnt++] = T_DOUBLE; sig_bt[cnt++] = T_VOID; break; + case JVM_SIGNATURE_FLOAT: sig_bt[cnt++] = T_FLOAT; break; + case JVM_SIGNATURE_INT: sig_bt[cnt++] = T_INT; break; + case JVM_SIGNATURE_LONG: sig_bt[cnt++] = T_LONG; sig_bt[cnt++] = T_VOID; break; + case JVM_SIGNATURE_SHORT: sig_bt[cnt++] = T_SHORT; break; + case JVM_SIGNATURE_BOOLEAN: sig_bt[cnt++] = T_BOOLEAN; break; + case JVM_SIGNATURE_VOID: sig_bt[cnt++] = T_VOID; break; + case JVM_SIGNATURE_CLASS: // Oop + while (*s++ != JVM_SIGNATURE_ENDCLASS); // Skip signature sig_bt[cnt++] = T_OBJECT; break; - case '[': { // Array + case JVM_SIGNATURE_ARRAY: { // Array do { // Skip optional size while (*s >= '0' && *s <= '9') s++; - } while (*s++ == '['); // Nested arrays? + } while (*s++ == JVM_SIGNATURE_ARRAY); // Nested arrays? // Skip element type - if (s[-1] == 'L') - while (*s++ != ';'); // Skip signature + if (s[-1] == JVM_SIGNATURE_CLASS) + while (*s++ != JVM_SIGNATURE_ENDCLASS); // Skip signature sig_bt[cnt++] = T_ARRAY; break; } diff --git a/src/hotspot/share/runtime/signature.cpp b/src/hotspot/share/runtime/signature.cpp index a126c69a584..e5875a159fa 100644 --- a/src/hotspot/share/runtime/signature.cpp +++ b/src/hotspot/share/runtime/signature.cpp @@ -63,41 +63,41 @@ int SignatureIterator::parse_type() { // compiler bug (was problem - gri 4/27/2000). int size = -1; switch(_signature->char_at(_index)) { - case 'B': do_byte (); if (_parameter_index < 0 ) _return_type = T_BYTE; - _index++; size = T_BYTE_size ; break; - case 'C': do_char (); if (_parameter_index < 0 ) _return_type = T_CHAR; - _index++; size = T_CHAR_size ; break; - case 'D': do_double(); if (_parameter_index < 0 ) _return_type = T_DOUBLE; - _index++; size = T_DOUBLE_size ; break; - case 'F': do_float (); if (_parameter_index < 0 ) _return_type = T_FLOAT; - _index++; size = T_FLOAT_size ; break; - case 'I': do_int (); if (_parameter_index < 0 ) _return_type = T_INT; - _index++; size = T_INT_size ; break; - case 'J': do_long (); if (_parameter_index < 0 ) _return_type = T_LONG; - _index++; size = T_LONG_size ; break; - case 'S': do_short (); if (_parameter_index < 0 ) _return_type = T_SHORT; - _index++; size = T_SHORT_size ; break; - case 'Z': do_bool (); if (_parameter_index < 0 ) _return_type = T_BOOLEAN; - _index++; size = T_BOOLEAN_size; break; - case 'V': do_void (); if (_parameter_index < 0 ) _return_type = T_VOID; - _index++; size = T_VOID_size; ; break; - case 'L': + case JVM_SIGNATURE_BYTE: do_byte(); if (_parameter_index < 0 ) _return_type = T_BYTE; + _index++; size = T_BYTE_size; break; + case JVM_SIGNATURE_CHAR: do_char(); if (_parameter_index < 0 ) _return_type = T_CHAR; + _index++; size = T_CHAR_size; break; + case JVM_SIGNATURE_DOUBLE: do_double(); if (_parameter_index < 0 ) _return_type = T_DOUBLE; + _index++; size = T_DOUBLE_size; break; + case JVM_SIGNATURE_FLOAT: do_float(); if (_parameter_index < 0 ) _return_type = T_FLOAT; + _index++; size = T_FLOAT_size; break; + case JVM_SIGNATURE_INT: do_int(); if (_parameter_index < 0 ) _return_type = T_INT; + _index++; size = T_INT_size; break; + case JVM_SIGNATURE_LONG: do_long(); if (_parameter_index < 0 ) _return_type = T_LONG; + _index++; size = T_LONG_size; break; + case JVM_SIGNATURE_SHORT: do_short(); if (_parameter_index < 0 ) _return_type = T_SHORT; + _index++; size = T_SHORT_size; break; + case JVM_SIGNATURE_BOOLEAN: do_bool(); if (_parameter_index < 0 ) _return_type = T_BOOLEAN; + _index++; size = T_BOOLEAN_size; break; + case JVM_SIGNATURE_VOID: do_void(); if (_parameter_index < 0 ) _return_type = T_VOID; + _index++; size = T_VOID_size; break; + case JVM_SIGNATURE_CLASS: { int begin = ++_index; Symbol* sig = _signature; - while (sig->char_at(_index++) != ';') ; + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; do_object(begin, _index); } if (_parameter_index < 0 ) _return_type = T_OBJECT; size = T_OBJECT_size; break; - case '[': + case JVM_SIGNATURE_ARRAY: { int begin = ++_index; Symbol* sig = _signature; - while (sig->char_at(_index) == '[') { + while (sig->char_at(_index) == JVM_SIGNATURE_ARRAY) { _index++; } - if (sig->char_at(_index) == 'L') { - while (sig->char_at(_index++) != ';') ; + if (sig->char_at(_index) == JVM_SIGNATURE_CLASS) { + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; } else { _index++; } @@ -128,9 +128,9 @@ void SignatureIterator::iterate_parameters() { // Parse parameters _index = 0; _parameter_index = 0; - expect('('); - while (_signature->char_at(_index) != ')') _parameter_index += parse_type(); - expect(')'); + expect(JVM_SIGNATURE_FUNC); + while (_signature->char_at(_index) != JVM_SIGNATURE_ENDFUNC) _parameter_index += parse_type(); + expect(JVM_SIGNATURE_ENDFUNC); _parameter_index = 0; } @@ -202,36 +202,36 @@ void SignatureIterator::iterate_parameters( uint64_t fingerprint ) { void SignatureIterator::iterate_returntype() { // Ignore parameters _index = 0; - expect('('); + expect(JVM_SIGNATURE_FUNC); Symbol* sig = _signature; // Need to skip over each type in the signature's argument list until a // closing ')' is found., then get the return type. We cannot just scan // for the first ')' because ')' is a legal character in a type name. - while (sig->char_at(_index) != ')') { + while (sig->char_at(_index) != JVM_SIGNATURE_ENDFUNC) { switch(sig->char_at(_index)) { - case 'B': - case 'C': - case 'D': - case 'F': - case 'I': - case 'J': - case 'S': - case 'Z': - case 'V': + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: + case JVM_SIGNATURE_VOID: { _index++; } break; - case 'L': + case JVM_SIGNATURE_CLASS: { - while (sig->char_at(_index++) != ';') ; + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; } break; - case '[': + case JVM_SIGNATURE_ARRAY: { - while (sig->char_at(++_index) == '[') ; - if (sig->char_at(_index) == 'L') { - while (sig->char_at(_index++) != ';') ; + while (sig->char_at(++_index) == JVM_SIGNATURE_ARRAY) ; + if (sig->char_at(_index) == JVM_SIGNATURE_CLASS) { + while (sig->char_at(_index++) != JVM_SIGNATURE_ENDCLASS) ; } else { _index++; } @@ -242,7 +242,7 @@ void SignatureIterator::iterate_returntype() { break; } } - expect(')'); + expect(JVM_SIGNATURE_ENDFUNC); // Parse return type _parameter_index = -1; parse_type(); @@ -255,9 +255,9 @@ void SignatureIterator::iterate() { // Parse parameters _parameter_index = 0; _index = 0; - expect('('); - while (_signature->char_at(_index) != ')') _parameter_index += parse_type(); - expect(')'); + expect(JVM_SIGNATURE_FUNC); + while (_signature->char_at(_index) != JVM_SIGNATURE_ENDFUNC) _parameter_index += parse_type(); + expect(JVM_SIGNATURE_ENDFUNC); // Parse return type _parameter_index = -1; parse_type(); @@ -289,39 +289,39 @@ bool SignatureStream::is_done() const { void SignatureStream::next_non_primitive(int t) { switch (t) { - case 'L': { + case JVM_SIGNATURE_CLASS: { _type = T_OBJECT; Symbol* sig = _signature; - while (sig->char_at(_end++) != ';'); + while (sig->char_at(_end++) != JVM_SIGNATURE_ENDCLASS); break; } - case '[': { + case JVM_SIGNATURE_ARRAY: { _type = T_ARRAY; Symbol* sig = _signature; char c = sig->char_at(_end); while ('0' <= c && c <= '9') c = sig->char_at(_end++); - while (sig->char_at(_end) == '[') { + while (sig->char_at(_end) == JVM_SIGNATURE_ARRAY) { _end++; c = sig->char_at(_end); while ('0' <= c && c <= '9') c = sig->char_at(_end++); } switch(sig->char_at(_end)) { - case 'B': - case 'C': - case 'D': - case 'F': - case 'I': - case 'J': - case 'S': - case 'Z':_end++; break; + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN:_end++; break; default: { - while (sig->char_at(_end++) != ';'); + while (sig->char_at(_end++) != JVM_SIGNATURE_ENDCLASS); break; } } break; } - case ')': _end++; next(); _at_return_type = true; break; + case JVM_SIGNATURE_ENDFUNC: _end++; next(); _at_return_type = true; break; default : ShouldNotReachHere(); } } @@ -341,8 +341,8 @@ Symbol* SignatureStream::as_symbol() { int begin = _begin; int end = _end; - if ( _signature->char_at(_begin) == 'L' - && _signature->char_at(_end-1) == ';') { + if ( _signature->char_at(_begin) == JVM_SIGNATURE_CLASS + && _signature->char_at(_end-1) == JVM_SIGNATURE_ENDCLASS) { begin++; end--; } @@ -407,8 +407,8 @@ Symbol* SignatureStream::as_symbol_or_null() { int begin = _begin; int end = _end; - if ( _signature->char_at(_begin) == 'L' - && _signature->char_at(_end-1) == ';') { + if ( _signature->char_at(_begin) == JVM_SIGNATURE_CLASS + && _signature->char_at(_end-1) == JVM_SIGNATURE_ENDCLASS) { begin++; end--; } @@ -436,9 +436,9 @@ bool SignatureVerifier::is_valid_method_signature(Symbol* sig) { const char* method_sig = (const char*)sig->bytes(); ssize_t len = sig->utf8_length(); ssize_t index = 0; - if (method_sig != NULL && len > 1 && method_sig[index] == '(') { + if (method_sig != NULL && len > 1 && method_sig[index] == JVM_SIGNATURE_FUNC) { ++index; - while (index < len && method_sig[index] != ')') { + while (index < len && method_sig[index] != JVM_SIGNATURE_ENDFUNC) { ssize_t res = is_valid_type(&method_sig[index], len - index); if (res == -1) { return false; @@ -446,7 +446,7 @@ bool SignatureVerifier::is_valid_method_signature(Symbol* sig) { index += res; } } - if (index < len && method_sig[index] == ')') { + if (index < len && method_sig[index] == JVM_SIGNATURE_ENDFUNC) { // check the return type ++index; return (is_valid_type(&method_sig[index], len - index) == (len - index)); @@ -469,21 +469,28 @@ ssize_t SignatureVerifier::is_valid_type(const char* type, ssize_t limit) { ssize_t index = 0; // Iterate over any number of array dimensions - while (index < limit && type[index] == '[') ++index; + while (index < limit && type[index] == JVM_SIGNATURE_ARRAY) ++index; if (index >= limit) { return -1; } switch (type[index]) { - case 'B': case 'C': case 'D': case 'F': case 'I': - case 'J': case 'S': case 'Z': case 'V': + case JVM_SIGNATURE_BYTE: + case JVM_SIGNATURE_CHAR: + case JVM_SIGNATURE_DOUBLE: + case JVM_SIGNATURE_FLOAT: + case JVM_SIGNATURE_INT: + case JVM_SIGNATURE_LONG: + case JVM_SIGNATURE_SHORT: + case JVM_SIGNATURE_BOOLEAN: + case JVM_SIGNATURE_VOID: return index + 1; - case 'L': + case JVM_SIGNATURE_CLASS: for (index = index + 1; index < limit; ++index) { char c = type[index]; switch (c) { - case ';': + case JVM_SIGNATURE_ENDCLASS: return index + 1; - case '\0': case '.': case '[': + case '\0': case JVM_SIGNATURE_DOT: case JVM_SIGNATURE_ARRAY: return -1; default: ; // fall through } diff --git a/src/hotspot/share/runtime/signature.hpp b/src/hotspot/share/runtime/signature.hpp index fbfa54aced3..067e8174f76 100644 --- a/src/hotspot/share/runtime/signature.hpp +++ b/src/hotspot/share/runtime/signature.hpp @@ -379,15 +379,15 @@ class SignatureStream : public StackObj { _begin = _end; int t = sig->char_at(_begin); switch (t) { - case 'B': _type = T_BYTE; break; - case 'C': _type = T_CHAR; break; - case 'D': _type = T_DOUBLE; break; - case 'F': _type = T_FLOAT; break; - case 'I': _type = T_INT; break; - case 'J': _type = T_LONG; break; - case 'S': _type = T_SHORT; break; - case 'Z': _type = T_BOOLEAN; break; - case 'V': _type = T_VOID; break; + case JVM_SIGNATURE_BYTE: _type = T_BYTE; break; + case JVM_SIGNATURE_CHAR: _type = T_CHAR; break; + case JVM_SIGNATURE_DOUBLE: _type = T_DOUBLE; break; + case JVM_SIGNATURE_FLOAT: _type = T_FLOAT; break; + case JVM_SIGNATURE_INT: _type = T_INT; break; + case JVM_SIGNATURE_LONG: _type = T_LONG; break; + case JVM_SIGNATURE_SHORT: _type = T_SHORT; break; + case JVM_SIGNATURE_BOOLEAN: _type = T_BOOLEAN; break; + case JVM_SIGNATURE_VOID: _type = T_VOID; break; default : next_non_primitive(t); return; } diff --git a/src/hotspot/share/utilities/globalDefinitions.cpp b/src/hotspot/share/utilities/globalDefinitions.cpp index b94560249cd..54ec0b55efb 100644 --- a/src/hotspot/share/utilities/globalDefinitions.cpp +++ b/src/hotspot/share/utilities/globalDefinitions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2019, 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 @@ -178,7 +178,16 @@ void basic_types_init() { // Map BasicType to signature character -char type2char_tab[T_CONFLICT+1]={ 0, 0, 0, 0, 'Z', 'C', 'F', 'D', 'B', 'S', 'I', 'J', 'L', '[', 'V', 0, 0, 0, 0, 0}; +char type2char_tab[T_CONFLICT+1] = { + 0, 0, 0, 0, + JVM_SIGNATURE_BOOLEAN, JVM_SIGNATURE_CHAR, + JVM_SIGNATURE_FLOAT, JVM_SIGNATURE_DOUBLE, + JVM_SIGNATURE_BYTE, JVM_SIGNATURE_SHORT, + JVM_SIGNATURE_INT, JVM_SIGNATURE_LONG, + JVM_SIGNATURE_CLASS, JVM_SIGNATURE_ARRAY, + JVM_SIGNATURE_VOID, 0, + 0, 0, 0, 0 +}; // Map BasicType to Java type name const char* type2name_tab[T_CONFLICT+1] = { diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp index 9779d97e731..b87e56123f4 100644 --- a/src/hotspot/share/utilities/globalDefinitions.hpp +++ b/src/hotspot/share/utilities/globalDefinitions.hpp @@ -29,6 +29,9 @@ #include "utilities/debug.hpp" #include "utilities/macros.hpp" +// Get constants like JVM_T_CHAR and JVM_SIGNATURE_INT, before pulling in . +#include "classfile_constants.h" + #include COMPILER_HEADER(utilities/globalDefinitions) // Defaults for macros that might be defined per compiler. @@ -570,14 +573,22 @@ void basic_types_init(); // cannot define here; uses assert // NOTE: replicated in SA in vm/agent/sun/jvm/hotspot/runtime/BasicType.java enum BasicType { - T_BOOLEAN = 4, - T_CHAR = 5, - T_FLOAT = 6, - T_DOUBLE = 7, - T_BYTE = 8, - T_SHORT = 9, - T_INT = 10, - T_LONG = 11, +// The values T_BOOLEAN..T_LONG (4..11) are derived from the JVMS. + T_BOOLEAN = JVM_T_BOOLEAN, + T_CHAR = JVM_T_CHAR, + T_FLOAT = JVM_T_FLOAT, + T_DOUBLE = JVM_T_DOUBLE, + T_BYTE = JVM_T_BYTE, + T_SHORT = JVM_T_SHORT, + T_INT = JVM_T_INT, + T_LONG = JVM_T_LONG, + // The remaining values are not part of any standard. + // T_OBJECT and T_VOID denote two more semantic choices + // for method return values. + // T_OBJECT and T_ARRAY describe signature syntax. + // T_ADDRESS, T_METADATA, T_NARROWOOP, T_NARROWKLASS describe + // internal references within the JVM as if they were Java + // types in their own right. T_OBJECT = 12, T_ARRAY = 13, T_VOID = 14, @@ -602,6 +613,10 @@ inline bool is_signed_subword_type(BasicType t) { return (t == T_BYTE || t == T_SHORT); } +inline bool is_double_word_type(BasicType t) { + return (t == T_DOUBLE || t == T_LONG); +} + inline bool is_reference_type(BasicType t) { return (t == T_OBJECT || t == T_ARRAY); } @@ -609,17 +624,17 @@ inline bool is_reference_type(BasicType t) { // Convert a char from a classfile signature to a BasicType inline BasicType char2type(char c) { switch( c ) { - case 'B': return T_BYTE; - case 'C': return T_CHAR; - case 'D': return T_DOUBLE; - case 'F': return T_FLOAT; - case 'I': return T_INT; - case 'J': return T_LONG; - case 'S': return T_SHORT; - case 'Z': return T_BOOLEAN; - case 'V': return T_VOID; - case 'L': return T_OBJECT; - case '[': return T_ARRAY; + case JVM_SIGNATURE_BYTE: return T_BYTE; + case JVM_SIGNATURE_CHAR: return T_CHAR; + case JVM_SIGNATURE_DOUBLE: return T_DOUBLE; + case JVM_SIGNATURE_FLOAT: return T_FLOAT; + case JVM_SIGNATURE_INT: return T_INT; + case JVM_SIGNATURE_LONG: return T_LONG; + case JVM_SIGNATURE_SHORT: return T_SHORT; + case JVM_SIGNATURE_BOOLEAN: return T_BOOLEAN; + case JVM_SIGNATURE_VOID: return T_VOID; + case JVM_SIGNATURE_CLASS: return T_OBJECT; + case JVM_SIGNATURE_ARRAY: return T_ARRAY; } return T_ILLEGAL; } diff --git a/src/java.base/share/native/include/classfile_constants.h.template b/src/java.base/share/native/include/classfile_constants.h.template index f575e090a71..fb022ec1fd4 100644 --- a/src/java.base/share/native/include/classfile_constants.h.template +++ b/src/java.base/share/native/include/classfile_constants.h.template @@ -144,6 +144,10 @@ enum { /* Type signatures */ enum { + JVM_SIGNATURE_SLASH = '/', + JVM_SIGNATURE_DOT = '.', + JVM_SIGNATURE_SPECIAL = '<', + JVM_SIGNATURE_ENDSPECIAL = '>', JVM_SIGNATURE_ARRAY = '[', JVM_SIGNATURE_BYTE = 'B', JVM_SIGNATURE_CHAR = 'C', From 938be1ecfbb73ce73c4801b59e065dd236069535 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Mon, 21 Oct 2019 10:32:49 -0700 Subject: [PATCH 025/163] 8232569: Use test image from different jib profile for testing Reviewed-by: tbell --- make/conf/jib-profiles.js | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 3b74812c508..7453ccd7282 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -839,13 +839,17 @@ var getJibProfilesProfiles = function (input, common, data) { if (testedProfile == null) { testedProfile = input.build_os + "-" + input.build_cpu; } - var testedProfileJDK = testedProfile + ".jdk"; - var testedProfileTest = "" - if (testedProfile.endsWith("-jcov")) { - testedProfileTest = testedProfile.substring(0, testedProfile.length - "-jcov".length) + ".test"; + var testedProfileJdk = testedProfile + ".jdk"; + // Make it possible to use the test image from a different profile + var testImageProfile; + if (input.testImageProfile != null) { + testImageProfile = input.testImageProfile; + } else if (testedProfile.endsWith("-jcov")) { + testImageProfile = testedProfile.substring(0, testedProfile.length - "-jcov".length); } else { - testedProfileTest = testedProfile + ".test"; + testImageProfile = testedProfile; } + var testedProfileTest = testImageProfile + ".test" var testOnlyMake = [ "run-test-prebuilt", "LOG_CMDLINES=true", "JTREG_VERBOSE=fail,error,time" ]; if (testedProfile.endsWith("-gcov")) { testOnlyMake = concat(testOnlyMake, "GCOV_ENABLED=true") @@ -855,14 +859,14 @@ var getJibProfilesProfiles = function (input, common, data) { target_os: input.build_os, target_cpu: input.build_cpu, dependencies: [ - "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJDK, + "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJdk, testedProfileTest ], src: "src.conf", make_args: testOnlyMake, environment: { "BOOT_JDK": common.boot_jdk_home, - "JDK_IMAGE_DIR": input.get(testedProfileJDK, "home_path"), + "JDK_IMAGE_DIR": input.get(testedProfileJdk, "home_path"), "TEST_IMAGE_DIR": input.get(testedProfileTest, "home_path") }, labels: "test" @@ -871,10 +875,10 @@ var getJibProfilesProfiles = function (input, common, data) { // If actually running the run-test-prebuilt profile, verify that the input // variable is valid and if so, add the appropriate target_* values from - // the tested profile. + // the tested profile. Use testImageProfile value as backup. if (input.profile == "run-test-prebuilt") { - if (profiles[testedProfile] == null) { - error("testedProfile is not defined: " + testedProfile); + if (profiles[testedProfile] == null && profiles[testImageProfile] == null) { + error("testedProfile is not defined: " + testedProfile + " " + testImageProfile); } } if (profiles[testedProfile] != null) { @@ -882,6 +886,11 @@ var getJibProfilesProfiles = function (input, common, data) { = profiles[testedProfile]["target_os"]; testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] = profiles[testedProfile]["target_cpu"]; + } else if (profiles[testImageProfile] != null) { + testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"] + = profiles[testImageProfile]["target_os"]; + testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"] + = profiles[testImageProfile]["target_cpu"]; } profiles = concatObjects(profiles, testOnlyProfilesPrebuilt); @@ -1346,3 +1355,8 @@ var isWsl = function (input) { || (input.build_os == "linux" && java.lang.System.getProperty("os.version").contains("Microsoft"))); } + +var error = function (s) { + java.lang.System.err.println("[ERROR] " + s); + exit(1); +}; From b96be4b7ae5741292bc0356d0cc4de691c2f6e80 Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Mon, 21 Oct 2019 14:26:10 -0400 Subject: [PATCH 026/163] 8232712: Shenandoah: SIGBUS in load_reference_barrier_native Reviewed-by: shade, rkennke --- .../shenandoahBarrierSetAssembler_aarch64.cpp | 40 +++++++++++++------ .../shenandoahBarrierSetAssembler_aarch64.hpp | 2 +- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp index 7264f312658..e42fe115b1a 100644 --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp @@ -262,7 +262,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembl __ leave(); } -void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst, Register tmp) { +void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler* masm, Register dst, Address load_addr) { if (!ShenandoahLoadRefBarrier) { return; } @@ -272,6 +272,8 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler Label is_null; Label done; + __ block_comment("load_reference_barrier_native { "); + __ cbz(dst, is_null); __ enter(); @@ -285,6 +287,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler __ mov(rscratch2, dst); __ push_call_clobbered_registers(); __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native)); + __ lea(r1, load_addr); __ mov(r0, rscratch2); __ blr(lr); __ mov(rscratch2, r0); @@ -294,6 +297,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler __ bind(done); __ leave(); __ bind(is_null); + __ block_comment("} load_reference_barrier_native"); } void ShenandoahBarrierSetAssembler::storeval_barrier(MacroAssembler* masm, Register dst, Register tmp) { @@ -327,20 +331,32 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0; bool on_phantom = (decorators & ON_PHANTOM_OOP_REF) != 0; bool on_reference = on_weak || on_phantom; - bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0; + bool is_traversal_mode = ShenandoahHeap::heap()->is_traversal_mode(); + bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0 || is_traversal_mode; + + Register result_dst = dst; + + if (on_oop) { + // We want to preserve src + if (dst == src.base() || dst == src.index()) { + dst = rscratch1; + } + assert_different_registers(dst, src.base(), src.index()); + } BarrierSetAssembler::load_at(masm, decorators, type, dst, src, tmp1, tmp_thread); if (on_oop) { - if (not_in_heap) { - if (ShenandoahHeap::heap()->is_traversal_mode()) { - load_reference_barrier(masm, dst, tmp1); - keep_alive = true; - } else { - load_reference_barrier_native(masm, dst, tmp1); - } - } else { - load_reference_barrier(masm, dst, tmp1); - } + if (not_in_heap && !is_traversal_mode) { + load_reference_barrier_native(masm, dst, src); + } else { + load_reference_barrier(masm, dst, tmp1); + } + + if (dst != result_dst) { + __ mov(result_dst, dst); + dst = result_dst; + } + if (ShenandoahKeepAliveBarrier && on_reference && keep_alive) { __ enter(); satb_write_barrier_pre(masm /* masm */, diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp index 107e56921cf..f71e5d83d1a 100644 --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp @@ -58,7 +58,7 @@ private: void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg); void load_reference_barrier(MacroAssembler* masm, Register dst, Register tmp); void load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Register tmp); - void load_reference_barrier_native(MacroAssembler* masm, Register dst, Register tmp); + void load_reference_barrier_native(MacroAssembler* masm, Register dst, Address load_addr); address generate_shenandoah_lrb(StubCodeGenerator* cgen); From f5b14bd7801d8fc1cf584b14726d4328139ef5c0 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Mon, 21 Oct 2019 11:35:36 -0700 Subject: [PATCH 027/163] 8232639: Change module graph images to use SVG instead of PNG format Reviewed-by: mchung, ihse --- make/Docs.gmk | 26 +++++++++---------- .../build/tools/taglet/ModuleGraph.java | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/make/Docs.gmk b/make/Docs.gmk index 10eda630e66..f01257c19d0 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -192,26 +192,26 @@ JAVASE_LONG_NAME := Java® Platform, Standard Edition ################################################################################ # Functions -# Helper function for creating a png file from a dot file generated by the +# Helper function for creating a svg file from a dot file generated by the # GenGraphs tool. # param 1: SetupJavadocGeneration namespace ($1) # param 2: module name # -define setup_gengraph_dot_to_png +define setup_gengraph_dot_to_svg $1_$2_DOT_SRC := $$($1_GENGRAPHS_DIR)/$2.dot - $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.png + $1_$2_SVG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.svg - # For each module needing a graph, create a png file from the dot file + # For each module needing a graph, create a svg file from the dot file # generated by the GenGraphs tool and store it in the target dir. - $$(eval $$(call SetupExecute, gengraphs_png_$1_$2, \ + $$(eval $$(call SetupExecute, gengraphs_svg_$1_$2, \ INFO := Running dot for module graphs for $2, \ DEPS := $$(gengraphs_$1_TARGET), \ - OUTPUT_FILE := $$($1_$2_PNG_TARGET), \ + OUTPUT_FILE := $$($1_$2_SVG_TARGET), \ SUPPORT_DIR := $$($1_GENGRAPHS_DIR), \ - COMMAND := $$(DOT) -Tpng -o $$($1_$2_PNG_TARGET) $$($1_$2_DOT_SRC), \ + COMMAND := $$(DOT) -Tsvg -o $$($1_$2_SVG_TARGET) $$($1_$2_DOT_SRC), \ )) - $1_MODULEGRAPH_TARGETS += $$($1_$2_PNG_TARGET) + $1_MODULEGRAPH_TARGETS += $$($1_$2_SVG_TARGET) endef # Helper function to create the overview.html file to use with the -overview @@ -282,7 +282,7 @@ define SetupApiDocsGenerationBody ifeq ($$(ENABLE_FULL_DOCS), true) # Tell the ModuleGraph taglet to generate html links to soon-to-be-created - # png files with module graphs. + # svg files with module graphs. $1_JAVA_ARGS += -DenableModuleGraph=true endif @@ -362,8 +362,8 @@ define SetupApiDocsGenerationBody $1_JAVADOC_TARGETS := $$(javadoc_$1_TARGET) ifeq ($$(ENABLE_FULL_DOCS), true) - # We have asked ModuleGraph to generate links to png files. Now we must - # produce the png files. + # We have asked ModuleGraph to generate links to svg files. Now we must + # produce the svg files. # Locate which modules has the @moduleGraph tag in their module-info.java $1_MODULES_NEEDING_GRAPH := $$(strip $$(foreach m, $$($1_ALL_MODULES), \ @@ -388,11 +388,11 @@ define SetupApiDocsGenerationBody --dot-attributes $$(GENGRAPHS_PROPS), \ )) - # For each module needing a graph, create a png file from the dot file + # For each module needing a graph, create a svg file from the dot file # generated by the GenGraphs tool and store it in the target dir. # They will depend on gengraphs_$1_TARGET, and will be added to $1. $$(foreach m, $$($1_MODULES_NEEDING_GRAPH), \ - $$(eval $$(call setup_gengraph_dot_to_png,$1,$$m)) \ + $$(eval $$(call setup_gengraph_dot_to_svg,$1,$$m)) \ ) endif endef diff --git a/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java index f5904f799ed..98117b3cdb6 100644 --- a/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java +++ b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java @@ -64,7 +64,7 @@ public class ModuleGraph implements Taglet { } String moduleName = ((ModuleElement) element).getQualifiedName().toString(); - String imageFile = "module-graph.png"; + String imageFile = "module-graph.svg"; int thumbnailHeight = -1; String hoverImage = ""; if (!moduleName.equals("java.base")) { From c483fbe6d6f4439e07df48f2215e60f75528ff17 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 21 Oct 2019 13:25:36 -0700 Subject: [PATCH 028/163] 8231587: Memory leak in WorkArounds.serializedForms Reviewed-by: hannesw --- .../internal/doclets/toolkit/WorkArounds.java | 36 +++++++------------ .../internal/doclets/toolkit/util/Utils.java | 8 ++--- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java index 33f972eb054..ccac1edad57 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java @@ -332,36 +332,26 @@ public class WorkArounds { } //------------------Start of Serializable Implementation---------------------// - private final static Map serializedForms = new HashMap<>(); + private final Map serializedForms = new HashMap<>(); - public SortedSet getSerializableFields(Utils utils, TypeElement klass) { - NewSerializedForm sf = serializedForms.get(klass); - if (sf == null) { - sf = new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), klass); - serializedForms.put(klass, sf); - } - return sf.fields; + private NewSerializedForm getSerializedForm(TypeElement typeElem) { + return serializedForms.computeIfAbsent(typeElem, + te -> new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), te)); } - public SortedSet getSerializationMethods(Utils utils, TypeElement klass) { - NewSerializedForm sf = serializedForms.get(klass); - if (sf == null) { - sf = new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), klass); - serializedForms.put(klass, sf); - } - return sf.methods; + public SortedSet getSerializableFields(TypeElement typeElem) { + return getSerializedForm(typeElem).fields; } - public boolean definesSerializableFields(Utils utils, TypeElement klass) { - if (!utils.isSerializable(klass) || utils.isExternalizable(klass)) { + public SortedSet getSerializationMethods(TypeElement typeElem) { + return getSerializedForm(typeElem).methods; + } + + public boolean definesSerializableFields(TypeElement typeElem) { + if (!utils.isSerializable(typeElem) || utils.isExternalizable(typeElem)) { return false; } else { - NewSerializedForm sf = serializedForms.get(klass); - if (sf == null) { - sf = new NewSerializedForm(utils, configuration.docEnv.getElementUtils(), klass); - serializedForms.put(klass, sf); - } - return sf.definesSerializableFields; + return getSerializedForm(typeElem).definesSerializableFields; } } diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java index ddf1ccb62e9..164512880ba 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -417,15 +417,15 @@ public class Utils { } public SortedSet serializableFields(TypeElement aclass) { - return configuration.workArounds.getSerializableFields(this, aclass); + return configuration.workArounds.getSerializableFields(aclass); } public SortedSet serializationMethods(TypeElement aclass) { - return configuration.workArounds.getSerializationMethods(this, aclass); + return configuration.workArounds.getSerializationMethods(aclass); } public boolean definesSerializableFields(TypeElement aclass) { - return configuration.workArounds.definesSerializableFields(this, aclass); + return configuration.workArounds.definesSerializableFields( aclass); } public String modifiersToString(Element e, boolean trailingSpace) { From 16f39194057da985574f7e0e474d71993e389d0a Mon Sep 17 00:00:00 2001 From: Alexey Ivanov Date: Mon, 21 Oct 2019 21:36:26 +0100 Subject: [PATCH 029/163] 8232624: Java cannot start: NewStringPlatform missing Reviewed-by: dholmes, alanb, redestad --- src/hotspot/share/classfile/javaClasses.cpp | 2 +- src/java.base/share/native/libjava/jni_util.c | 7 +++++++ src/java.base/share/native/libjava/jni_util.h | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 382bca037d1..7f4c2a8cd4d 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -377,7 +377,7 @@ Handle java_lang_String::create_from_platform_dependent_str(const char* str, TRA if (_to_java_string_fn == NULL) { void *lib_handle = os::native_java_library(); - _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "JNU_NewStringPlatform")); + _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "NewStringPlatform")); if (_to_java_string_fn == NULL) { fatal("NewStringPlatform missing"); } diff --git a/src/java.base/share/native/libjava/jni_util.c b/src/java.base/share/native/libjava/jni_util.c index 061716dbe61..f835410bc72 100644 --- a/src/java.base/share/native/libjava/jni_util.c +++ b/src/java.base/share/native/libjava/jni_util.c @@ -791,6 +791,13 @@ InitializeEncoding(JNIEnv *env, const char *encname) CHECK_NULL(String_value_ID); } +// This alias is used for compatibility with 32 bit Windows +JNIEXPORT jstring +NewStringPlatform(JNIEnv *env, const char *str) +{ + return JNU_NewStringPlatform(env, str); +} + JNIEXPORT jstring JNICALL JNU_NewStringPlatform(JNIEnv *env, const char *str) { diff --git a/src/java.base/share/native/libjava/jni_util.h b/src/java.base/share/native/libjava/jni_util.h index d052cc0efbd..a29a9c248dc 100644 --- a/src/java.base/share/native/libjava/jni_util.h +++ b/src/java.base/share/native/libjava/jni_util.h @@ -93,6 +93,9 @@ JNIEXPORT void JNICALL JNU_ThrowIOExceptionWithLastError(JNIEnv *env, const char *defaultDetail); /* Convert between Java strings and i18n C strings */ +JNIEXPORT jstring +NewStringPlatform(JNIEnv *env, const char *str); + JNIEXPORT const char * GetStringPlatformChars(JNIEnv *env, jstring jstr, jboolean *isCopy); From d2629060938c444e870de240d10dd18d1e74a498 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 21 Oct 2019 22:44:48 +0200 Subject: [PATCH 030/163] 8232730: Shenandoah: Traversal should not CAS the roots Reviewed-by: zgu, rkennke --- .../gc/shenandoah/shenandoahOopClosures.hpp | 33 ++++++++++++++----- .../shenandoahOopClosures.inline.hpp | 4 +-- .../gc/shenandoah/shenandoahTraversalGC.cpp | 12 +++---- .../gc/shenandoah/shenandoahTraversalGC.hpp | 2 +- .../shenandoahTraversalGC.inline.hpp | 9 +++-- 5 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp index 9a998f3d3dd..7fcf714f934 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp @@ -214,15 +214,30 @@ protected: _mark_context(ShenandoahHeap::heap()->marking_context()) { } - template + template void work(T* p); }; +class ShenandoahTraversalRootsClosure : public ShenandoahTraversalSuperClosure { +private: + template + inline void do_oop_work(T* p) { work(p); } + +public: + ShenandoahTraversalRootsClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : + ShenandoahTraversalSuperClosure(q, rp) {} + + virtual void do_oop(narrowOop* p) { do_oop_work(p); } + virtual void do_oop(oop* p) { do_oop_work(p); } + + virtual bool do_metadata() { return false; } +}; + class ShenandoahTraversalClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -237,7 +252,7 @@ public: class ShenandoahTraversalMetadataClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -252,7 +267,7 @@ public: class ShenandoahTraversalDedupClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalDedupClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -267,7 +282,7 @@ public: class ShenandoahTraversalMetadataDedupClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataDedupClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -282,7 +297,7 @@ public: class ShenandoahTraversalDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -297,7 +312,7 @@ public: class ShenandoahTraversalMetadataDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -312,7 +327,7 @@ public: class ShenandoahTraversalDedupDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalDedupDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : @@ -327,7 +342,7 @@ public: class ShenandoahTraversalMetadataDedupDegenClosure : public ShenandoahTraversalSuperClosure { private: template - inline void do_oop_work(T* p) { work(p); } + inline void do_oop_work(T* p) { work(p); } public: ShenandoahTraversalMetadataDedupDegenClosure(ShenandoahObjToScanQueue* q, ReferenceProcessor* rp) : diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp index 23d5bc17a3b..a8b84e60d6e 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp @@ -38,9 +38,9 @@ inline void ShenandoahUpdateHeapRefsClosure::do_oop_work(T* p) { _heap->maybe_update_with_forwarded(p); } -template +template inline void ShenandoahTraversalSuperClosure::work(T* p) { - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } #endif // SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp index 46ee476abcf..c3966073948 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp @@ -186,7 +186,7 @@ public: // Step 1: Process ordinary GC roots. { - ShenandoahTraversalClosure roots_cl(q, rp); + ShenandoahTraversalRootsClosure roots_cl(q, rp); ShenandoahMarkCLDClosure cld_cl(&roots_cl); MarkingCodeBlobClosure code_cl(&roots_cl, CodeBlobToOopClosure::FixRelocations); if (unload_classes) { @@ -266,7 +266,7 @@ public: // in similar way during nmethod-register process. Therefore, we don't need to rescan code // roots here. if (!_heap->is_degenerated_gc_in_progress()) { - ShenandoahTraversalClosure roots_cl(q, rp); + ShenandoahTraversalRootsClosure roots_cl(q, rp); ShenandoahTraversalSATBThreadsClosure tc(&satb_cl); if (unload_classes) { ShenandoahRemarkCLDClosure remark_cld_cl(&roots_cl); @@ -767,7 +767,7 @@ private: template inline void do_oop_work(T* p) { - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: @@ -789,7 +789,7 @@ private: template inline void do_oop_work(T* p) { - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: @@ -812,7 +812,7 @@ private: template inline void do_oop_work(T* p) { ShenandoahEvacOOMScope evac_scope; - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: @@ -835,7 +835,7 @@ private: template inline void do_oop_work(T* p) { ShenandoahEvacOOMScope evac_scope; - _traversal_gc->process_oop(p, _thread, _queue, _mark_context); + _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } public: diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp index 7b64107d750..2d2cd0490e0 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp @@ -48,7 +48,7 @@ public: void concurrent_traversal_collection(); void final_traversal_collection(); - template + template inline void process_oop(T* p, Thread* thread, ShenandoahObjToScanQueue* queue, ShenandoahMarkingContext* const mark_context); bool check_and_handle_cancelled_gc(ShenandoahTaskTerminator* terminator, bool sts_yield); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp index 575a9a4b542..70de555016c 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp @@ -35,12 +35,13 @@ #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" -template +template void ShenandoahTraversalGC::process_oop(T* p, Thread* thread, ShenandoahObjToScanQueue* queue, ShenandoahMarkingContext* const mark_context) { T o = RawAccess<>::oop_load(p); if (!CompressedOops::is_null(o)) { oop obj = CompressedOops::decode_not_null(o); if (DEGEN) { + assert(!ATOMIC_UPDATE, "Degen path assumes non-atomic updates"); oop forw = ShenandoahBarrierSet::resolve_forwarded_not_null(obj); if (obj != forw) { // Update reference. @@ -54,7 +55,11 @@ void ShenandoahTraversalGC::process_oop(T* p, Thread* thread, ShenandoahObjToSca } shenandoah_assert_forwarded_except(p, obj, _heap->cancelled_gc()); // Update reference. - ShenandoahHeap::cas_oop(forw, p, obj); + if (ATOMIC_UPDATE) { + ShenandoahHeap::cas_oop(forw, p, obj); + } else { + RawAccess::oop_store(p, forw); + } obj = forw; } From fd9052f3c54aeee72f42ca7142a6ddadd11a4826 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Mon, 21 Oct 2019 22:44:49 +0200 Subject: [PATCH 031/163] 8232729: Shenandoah: assert ShenandoahHeap::cas_oop addresses are aligned Reviewed-by: rkennke --- src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp index 32fb3da3b0e..7f93ed20798 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp @@ -130,15 +130,18 @@ inline oop ShenandoahHeap::evac_update_with_forwarded(T* p) { } inline oop ShenandoahHeap::cas_oop(oop n, oop* addr, oop c) { + assert(is_aligned(addr, HeapWordSize), "Address should be aligned: " PTR_FORMAT, p2i(addr)); return (oop) Atomic::cmpxchg(n, addr, c); } inline oop ShenandoahHeap::cas_oop(oop n, narrowOop* addr, narrowOop c) { + assert(is_aligned(addr, sizeof(narrowOop)), "Address should be aligned: " PTR_FORMAT, p2i(addr)); narrowOop val = CompressedOops::encode(n); return CompressedOops::decode((narrowOop) Atomic::cmpxchg(val, addr, c)); } inline oop ShenandoahHeap::cas_oop(oop n, narrowOop* addr, oop c) { + assert(is_aligned(addr, sizeof(narrowOop)), "Address should be aligned: " PTR_FORMAT, p2i(addr)); narrowOop cmp = CompressedOops::encode(c); narrowOop val = CompressedOops::encode(n); return CompressedOops::decode((narrowOop) Atomic::cmpxchg(val, addr, cmp)); From 750eab1ecc3b7cb676b96170c4371e5ef1af8d69 Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Mon, 21 Oct 2019 17:27:51 +0800 Subject: [PATCH 032/163] 8232692: [TESTBUG] compiler/aot/fingerprint/SelfChangedCDS.java fails when cds is disabled Reviewed-by: kvn --- test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java index 996fcdaaefb..29414511412 100644 --- a/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java +++ b/test/hotspot/jtreg/compiler/aot/fingerprint/SelfChangedCDS.java @@ -27,7 +27,7 @@ * @library /test/lib / * @modules java.base/jdk.internal.misc * java.management - * @requires vm.aot + * @requires vm.aot & vm.cds * @build compiler.aot.fingerprint.SelfChanged * compiler.aot.AotCompiler * From 8bdffc5f7eb64dfbddb99d04c0a955bbf63a63ca Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Tue, 22 Oct 2019 11:32:19 +0800 Subject: [PATCH 033/163] 8232757: VM fails to report an error for DumpLoadedClassList when cds is disabled Reviewed-by: iklam, dholmes --- src/hotspot/share/runtime/arguments.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index b4131ef4b4f..b113f96f7d1 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -3968,6 +3968,11 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) { "Shared spaces are not supported in this VM\n"); return JNI_ERR; } + if (DumpLoadedClassList != NULL) { + jio_fprintf(defaultStream::error_stream(), + "DumpLoadedClassList is not supported in this VM\n"); + return JNI_ERR; + } if ((UseSharedSpaces && FLAG_IS_CMDLINE(UseSharedSpaces)) || log_is_enabled(Info, cds)) { warning("Shared spaces are not supported in this VM"); From 41bd7c5e7628e4bc805ce3a576b79f785e0ab6c3 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Tue, 22 Oct 2019 08:57:41 +0200 Subject: [PATCH 034/163] 8223400: Replace some enums with static const members in hotspot/runtime Reviewed-by: iklam, coleenp --- src/hotspot/share/oops/klass.hpp | 24 +++++++++++------------- src/hotspot/share/prims/jvm.cpp | 2 +- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp index f9290b8fb85..e5df688e8e9 100644 --- a/src/hotspot/share/oops/klass.hpp +++ b/src/hotspot/share/oops/klass.hpp @@ -340,19 +340,17 @@ protected: static ByteSize access_flags_offset() { return in_ByteSize(offset_of(Klass, _access_flags)); } // Unpacking layout_helper: - enum { - _lh_neutral_value = 0, // neutral non-array non-instance value - _lh_instance_slow_path_bit = 0x01, - _lh_log2_element_size_shift = BitsPerByte*0, - _lh_log2_element_size_mask = BitsPerLong-1, - _lh_element_type_shift = BitsPerByte*1, - _lh_element_type_mask = right_n_bits(BitsPerByte), // shifted mask - _lh_header_size_shift = BitsPerByte*2, - _lh_header_size_mask = right_n_bits(BitsPerByte), // shifted mask - _lh_array_tag_bits = 2, - _lh_array_tag_shift = BitsPerInt - _lh_array_tag_bits, - _lh_array_tag_obj_value = ~0x01 // 0x80000000 >> 30 - }; + static const int _lh_neutral_value = 0; // neutral non-array non-instance value + static const int _lh_instance_slow_path_bit = 0x01; + static const int _lh_log2_element_size_shift = BitsPerByte*0; + static const int _lh_log2_element_size_mask = BitsPerLong-1; + static const int _lh_element_type_shift = BitsPerByte*1; + static const int _lh_element_type_mask = right_n_bits(BitsPerByte); // shifted mask + static const int _lh_header_size_shift = BitsPerByte*2; + static const int _lh_header_size_mask = right_n_bits(BitsPerByte); // shifted mask + static const int _lh_array_tag_bits = 2; + static const int _lh_array_tag_shift = BitsPerInt - _lh_array_tag_bits; + static const int _lh_array_tag_obj_value = ~0x01; // 0x80000000 >> 30 static const unsigned int _lh_array_tag_type_value = 0Xffffffff; // ~0x00, // 0xC0000000 >> 30 diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp index c3bbae2605e..50463253a86 100644 --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -2308,7 +2308,7 @@ JVM_ENTRY(void, JVM_GetClassCPTypes(JNIEnv *env, jclass cls, unsigned char *type ConstantPool* cp = InstanceKlass::cast(k)->constants(); for (int index = cp->length() - 1; index >= 0; index--) { constantTag tag = cp->tag_at(index); - types[index] = (tag.is_unresolved_klass()) ? JVM_CONSTANT_Class : tag.value(); + types[index] = (tag.is_unresolved_klass()) ? (unsigned char) JVM_CONSTANT_Class : tag.value(); } } JVM_END From 02dc957198e731f7e6347f5ecd680c418b9dfe7c Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Tue, 22 Oct 2019 14:05:56 +0200 Subject: [PATCH 035/163] 8232778: Shenandoah: SBSA::arraycopy_prologue checks wrong register Reviewed-by: rkennke --- .../gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp index e42fe115b1a..af23561f131 100644 --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp @@ -58,7 +58,7 @@ void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, Dec Address gc_state(rthread, in_bytes(ShenandoahThreadLocalData::gc_state_offset())); __ ldrb(rscratch1, gc_state); if (dest_uninitialized) { - __ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, done); + __ tbz(rscratch1, ShenandoahHeap::HAS_FORWARDED_BITPOS, done); } else { __ mov(rscratch2, ShenandoahHeap::HAS_FORWARDED | ShenandoahHeap::MARKING); __ tst(rscratch1, rscratch2); From 094a1b8a5f849072de7d5038834cb82bc99617a7 Mon Sep 17 00:00:00 2001 From: Zhengyu Gu Date: Tue, 22 Oct 2019 11:59:42 -0400 Subject: [PATCH 036/163] 8232747: Shenandoah: Concurrent GC should deactivate SATB before processing weak roots Reviewed-by: shade --- .../shenandoah/shenandoahConcurrentMark.cpp | 2 -- .../share/gc/shenandoah/shenandoahHeap.cpp | 25 ++++++++----------- .../share/gc/shenandoah/shenandoahHeap.hpp | 2 -- .../gc/shenandoah/shenandoahMarkCompact.cpp | 4 +-- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp index a9609875f66..bd794707ee5 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp @@ -442,8 +442,6 @@ void ShenandoahConcurrentMark::finish_mark_from_roots(bool full_gc) { weak_refs_work(full_gc); } - _heap->parallel_cleaning(full_gc); - assert(task_queues()->is_empty(), "Should be empty"); TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats()); TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats()); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp index c6c07cbdbb7..82506fd1843 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp @@ -1478,6 +1478,12 @@ void ShenandoahHeap::op_final_mark() { if (!cancelled_gc()) { concurrent_mark()->finish_mark_from_roots(/* full_gc = */ false); + // Marking is completed, deactivate SATB barrier + set_concurrent_mark_in_progress(false); + mark_complete_marking_context(); + + parallel_cleaning(false /* full gc*/); + if (has_forwarded_objects()) { // Degen may be caused by failed evacuation of roots if (is_degenerated_gc_in_progress()) { @@ -1485,14 +1491,12 @@ void ShenandoahHeap::op_final_mark() { } else { concurrent_mark()->update_thread_roots(ShenandoahPhaseTimings::update_roots); } + set_has_forwarded_objects(false); } if (ShenandoahVerify) { verifier()->verify_roots_no_forwarded(); } - - stop_concurrent_marking(); - // All allocations past TAMS are implicitly live, adjust the region data. // Bitmaps/TAMS are swapped at this point, so we need to poll complete bitmap. { @@ -1575,8 +1579,10 @@ void ShenandoahHeap::op_final_mark() { } } else { + // If this cycle was updating references, we need to keep the has_forwarded_objects + // flag on, for subsequent phases to deal with it. concurrent_mark()->cancel(); - stop_concurrent_marking(); + set_concurrent_mark_in_progress(false); if (process_references()) { // Abandon reference processing right away: pre-cleaning must have failed. @@ -1872,17 +1878,6 @@ void ShenandoahHeap::op_degenerated_futile() { op_full(GCCause::_shenandoah_upgrade_to_full_gc); } -void ShenandoahHeap::stop_concurrent_marking() { - assert(is_concurrent_mark_in_progress(), "How else could we get here?"); - set_concurrent_mark_in_progress(false); - if (!cancelled_gc()) { - // If we needed to update refs, and concurrent marking has been cancelled, - // we need to finish updating references. - set_has_forwarded_objects(false); - mark_complete_marking_context(); - } -} - void ShenandoahHeap::force_satb_flush_all_threads() { if (!is_concurrent_mark_in_progress() && !is_concurrent_traversal_in_progress()) { // No need to flush SATBs diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp index 96bca67d5c9..9dd2e26ac55 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -717,8 +717,6 @@ public: void deduplicate_string(oop str); - void stop_concurrent_marking(); - private: void trash_cset_regions(); void update_heap_references(bool concurrent); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp index d496351a0b1..3a04182467a 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp @@ -110,7 +110,7 @@ void ShenandoahMarkCompact::do_it(GCCause::Cause gc_cause) { // b. Cancel concurrent mark, if in progress if (heap->is_concurrent_mark_in_progress()) { heap->concurrent_mark()->cancel(); - heap->stop_concurrent_marking(); + heap->set_concurrent_mark_in_progress(false); } assert(!heap->is_concurrent_mark_in_progress(), "sanity"); @@ -243,8 +243,8 @@ void ShenandoahMarkCompact::phase1_mark_heap() { cm->update_roots(ShenandoahPhaseTimings::full_gc_roots); cm->mark_roots(ShenandoahPhaseTimings::full_gc_roots); cm->finish_mark_from_roots(/* full_gc = */ true); - heap->mark_complete_marking_context(); + heap->parallel_cleaning(true /* full_gc */); } class ShenandoahPrepareForCompactionObjectClosure : public ObjectClosure { From 3f94fb08c7e7345aec621e46e4b141f64adce0d7 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Tue, 22 Oct 2019 09:20:21 -0700 Subject: [PATCH 037/163] 8232617: Update the outdated code comments in java.lang.System class Reviewed-by: dholmes, bchristi --- src/java.base/share/classes/java/lang/System.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java index 3c85bb1f534..fe3ca0df1d2 100644 --- a/src/java.base/share/classes/java/lang/System.java +++ b/src/java.base/share/classes/java/lang/System.java @@ -94,10 +94,8 @@ import sun.security.util.SecurityConstants; public final class System { /* Register the natives via the static initializer. * - * VM will invoke the initializeSystemClass method to complete - * the initialization for this class separated from clinit. - * Note that to use properties set by the VM, see the constraints - * described in the initializeSystemClass method. + * The VM will invoke the initPhase1 method to complete the initialization + * of this class separate from . */ private static native void registerNatives(); static { From fd5d5d762251f3ce7314380dd34b7623d440b434 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Tue, 22 Oct 2019 18:53:22 +0200 Subject: [PATCH 038/163] 8232791: Shenandoah: passive mode should disable pacing Reviewed-by: zgu --- .../gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp | 5 +++++ .../gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp index 05596934a9d..1deace20ad3 100644 --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp @@ -29,6 +29,11 @@ #include "logging/log.hpp" #include "logging/logTag.hpp" +ShenandoahPassiveHeuristics::ShenandoahPassiveHeuristics() : ShenandoahHeuristics() { + // Passive runs with max speed for allocation, because GC is always STW + SHENANDOAH_ERGO_DISABLE_FLAG(ShenandoahPacing); +} + bool ShenandoahPassiveHeuristics::should_start_gc() const { // Never do concurrent GCs. return false; diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp index 371f6ec216f..3b7ff56855a 100644 --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp @@ -28,7 +28,9 @@ class ShenandoahPassiveHeuristics : public ShenandoahHeuristics { public: - virtual bool should_start_gc() const; + ShenandoahPassiveHeuristics(); + + virtual bool should_start_gc() const; virtual bool should_process_references(); From 80f1aaa7a8cf858cc821541dc425b8528715433e Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Tue, 22 Oct 2019 18:53:28 +0200 Subject: [PATCH 039/163] 8232802: Shenandoah: transition between "cset" and "pinned_cset" does not require cancelled gc Reviewed-by: zgu --- src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp index 2cad5e158d3..02864e0830b 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp @@ -200,7 +200,6 @@ void ShenandoahHeapRegion::make_pinned() { case _pinned_humongous_start: return; case _cset: - guarantee(_heap->cancelled_gc(), "only valid when evac has been cancelled"); _state = _pinned_cset; return; default: @@ -220,7 +219,6 @@ void ShenandoahHeapRegion::make_unpinned() { case _humongous_start: return; case _pinned_cset: - guarantee(_heap->cancelled_gc(), "only valid when evac has been cancelled"); set_state(_cset); return; case _pinned_humongous_start: From 010675849eecc484f9a595f385aeed34181219a8 Mon Sep 17 00:00:00 2001 From: Chihiro Ito Date: Tue, 22 Oct 2019 23:55:33 +0200 Subject: [PATCH 040/163] 8223697: jfr tool can't format duration values greater than 1 minute Reviewed-by: egahlin --- .../jdk/jfr/internal/tool/PrettyWriter.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java index 8dbfdc78f14..4ceb262d54f 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java @@ -57,6 +57,9 @@ import jdk.jfr.internal.Utils; * This class is also used by {@link RecordedObject#toString()} */ public final class PrettyWriter extends EventPrintWriter { + private static final Duration MILLSECOND = Duration.ofMillis(1); + private static final Duration SECOND = Duration.ofSeconds(1); + private static final Duration MINUTE = Duration.ofMinutes(1); private static final String TYPE_OLD_OBJECT = Type.TYPES_PREFIX + "OldObject"; private final static DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss.SSS"); private final static Long ZERO = 0L; @@ -550,19 +553,14 @@ public final class PrettyWriter extends EventPrintWriter { println("N/A"); return true; } - double s = d.toNanosPart() / 1000_000_000.0 + d.toSecondsPart(); - if (s < 1.0) { - if (s < 0.001) { - println(String.format("%.3f", s * 1_000_000) + " us"); - } else { - println(String.format("%.3f", s * 1_000) + " ms"); - } + if(d.compareTo(MILLSECOND) < 0){ + println(String.format("%.3f us", (double)d.toNanos() / 1_000)); + } else if(d.compareTo(SECOND) < 0){ + println(String.format("%.3f ms", (double)d.toNanos() / 1_000_000)); + } else if(d.compareTo(MINUTE) < 0){ + println(String.format("%.3f s", (double)d.toMillis() / 1_000)); } else { - if (s < 1000.0) { - println(String.format("%.3f", s) + " s"); - } else { - println(String.format("%.0f", s) + " s"); - } + println(String.format("%d s", d.toSeconds())); } return true; } From c6672a2f20ceb545a19b88b57c0bdc36306f68c3 Mon Sep 17 00:00:00 2001 From: Yasumasa Suenaga Date: Wed, 23 Oct 2019 10:02:26 +0900 Subject: [PATCH 041/163] 8232592: is shown in jstack mixed mode Reviewed-by: cjplummer, phh --- .../classes/sun/jvm/hotspot/tools/PStack.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java index c863cd77609..76623e2cee5 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java @@ -130,10 +130,19 @@ public class PStack extends Tool { if (c.contains(pc)) { CodeBlob cb = c.findBlobUnsafe(pc); if (cb.isNMethod()) { - names = getJavaNames(th, f.localVariableBase()); - // just print compiled code, if can't determine method - if (names == null || names.length == 0) { - out.println(""); + if (cb.isNativeMethod()) { + out.print(((CompiledMethod)cb).getMethod().externalNameAndSignature()); + long diff = pc.minus(cb.codeBegin()); + if (diff != 0L) { + out.print(" + 0x" + Long.toHexString(diff)); + } + out.println(" (Native method)"); + } else { + names = getJavaNames(th, f.localVariableBase()); + // just print compiled code, if can't determine method + if (names == null || names.length == 0) { + out.println(""); + } } } else if (cb.isBufferBlob()) { out.println(""); From 54be25b07b258b0141759df36d1e3807164f2c7e Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 22 Oct 2019 22:00:21 -0400 Subject: [PATCH 042/163] 8232571: Add missing SIGINFO signal Reviewed-by: dholmes, rriggs --- src/hotspot/os/posix/os_posix.cpp | 3 ++ .../jtreg/runtime/signal/TestSiginfo.java | 35 +++++++++++++++++++ test/jdk/sun/misc/SunMiscSignalTest.java | 4 ++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/hotspot/jtreg/runtime/signal/TestSiginfo.java diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp index 5378c0efc50..8e52bdf7426 100644 --- a/src/hotspot/os/posix/os_posix.cpp +++ b/src/hotspot/os/posix/os_posix.cpp @@ -685,6 +685,9 @@ static const struct { #endif { SIGHUP, "SIGHUP" }, { SIGILL, "SIGILL" }, +#ifdef SIGINFO + { SIGINFO, "SIGINFO" }, +#endif { SIGINT, "SIGINT" }, #ifdef SIGIO { SIGIO, "SIGIO" }, diff --git a/test/hotspot/jtreg/runtime/signal/TestSiginfo.java b/test/hotspot/jtreg/runtime/signal/TestSiginfo.java new file mode 100644 index 00000000000..b2718cb6a5a --- /dev/null +++ b/test/hotspot/jtreg/runtime/signal/TestSiginfo.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + +/* + * @test + * @requires os.family != "windows" & os.family != "aix" + * + * @summary tests the SIGINFO signal (available on BSD platforms) + * VM testbase keywords: [signal, runtime, linux, solaris, macosx] + * + * @library /test/lib + * @run main/native SigTestDriver SIGINFO + */ + diff --git a/test/jdk/sun/misc/SunMiscSignalTest.java b/test/jdk/sun/misc/SunMiscSignalTest.java index e2c647b4424..dd45ec179b0 100644 --- a/test/jdk/sun/misc/SunMiscSignalTest.java +++ b/test/jdk/sun/misc/SunMiscSignalTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, 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 @@ -133,10 +133,12 @@ public class SunMiscSignalTest { Object[][] posixNonOSXSignals = { {"BUS", IsSupported.YES, CanRegister.YES, CanRaise.YES, invokedXrs}, + {"INFO", IsSupported.NO, CanRegister.NO, CanRaise.NO, Invoked.NO}, }; Object[][] posixOSXSignals = { {"BUS", IsSupported.YES, CanRegister.NO, CanRaise.NO, Invoked.NO}, + {"INFO", IsSupported.YES, CanRegister.YES, CanRaise.YES, invokedXrs}, }; Object[][] windowsSignals = { From f004d45d3db310f5ce25bbcc416c90eb1eb574d4 Mon Sep 17 00:00:00 2001 From: Michihiro Horie Date: Tue, 22 Oct 2019 21:26:45 -0500 Subject: [PATCH 043/163] 8231649: PPC64: Intrinsics for Math.ceil, floor, rint on Power Reviewed-by: mdoerr, vlivanov --- src/hotspot/cpu/ppc/assembler_ppc.hpp | 13 +++++ src/hotspot/cpu/ppc/assembler_ppc.inline.hpp | 8 ++++ src/hotspot/cpu/ppc/ppc.ad | 50 ++++++++++++++++++++ src/hotspot/share/opto/convertnode.cpp | 5 ++ src/hotspot/share/opto/convertnode.hpp | 6 +++ src/hotspot/share/opto/library_call.cpp | 6 +-- 6 files changed, 85 insertions(+), 3 deletions(-) diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp index 7cc46ca173f..a2fcea92f03 100644 --- a/src/hotspot/cpu/ppc/assembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp @@ -444,6 +444,9 @@ class Assembler : public AbstractAssembler { FDIV_OPCODE = (63u << OPCODE_SHIFT | 18u << 1), FDIVS_OPCODE = (59u << OPCODE_SHIFT | 18u << 1), FMR_OPCODE = (63u << OPCODE_SHIFT | 72u << 1), + FRIN_OPCODE = (63u << OPCODE_SHIFT | 392u << 1), + FRIP_OPCODE = (63u << OPCODE_SHIFT | 456u << 1), + FRIM_OPCODE = (63u << OPCODE_SHIFT | 488u << 1), // These are special Power6 opcodes, reused for "lfdepx" and "stfdepx" // on Power7. Do not use. // MFFGPR_OPCODE = (31u << OPCODE_SHIFT | 607u << 1), @@ -545,6 +548,9 @@ class Assembler : public AbstractAssembler { XVMSUBADP_OPCODE=(60u << OPCODE_SHIFT | 113u << 3), XVNMSUBASP_OPCODE=(60u<< OPCODE_SHIFT | 209u << 3), XVNMSUBADP_OPCODE=(60u<< OPCODE_SHIFT | 241u << 3), + XVRDPI_OPCODE = (60u << OPCODE_SHIFT | 201u << 2), + XVRDPIM_OPCODE = (60u << OPCODE_SHIFT | 249u << 2), + XVRDPIP_OPCODE = (60u << OPCODE_SHIFT | 233u << 2), // Deliver A Random Number (introduced with POWER9) DARN_OPCODE = (31u << OPCODE_SHIFT | 755u << 1), @@ -1981,6 +1987,10 @@ class Assembler : public AbstractAssembler { inline void fmr( FloatRegister d, FloatRegister b); inline void fmr_( FloatRegister d, FloatRegister b); + inline void frin( FloatRegister d, FloatRegister b); + inline void frip( FloatRegister d, FloatRegister b); + inline void frim( FloatRegister d, FloatRegister b); + // inline void mffgpr( FloatRegister d, Register b); // inline void mftgpr( Register d, FloatRegister b); inline void cmpb( Register a, Register s, Register b); @@ -2241,6 +2251,9 @@ class Assembler : public AbstractAssembler { inline void xvmsubadp(VectorSRegister d, VectorSRegister a, VectorSRegister b); inline void xvnmsubasp(VectorSRegister d, VectorSRegister a, VectorSRegister b); inline void xvnmsubadp(VectorSRegister d, VectorSRegister a, VectorSRegister b); + inline void xvrdpi( VectorSRegister d, VectorSRegister b); + inline void xvrdpim( VectorSRegister d, VectorSRegister b); + inline void xvrdpip( VectorSRegister d, VectorSRegister b); // VSX Extended Mnemonics inline void xxspltd( VectorSRegister d, VectorSRegister a, int x); diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp index d30c6dffc4e..7ff30043f14 100644 --- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp @@ -675,6 +675,10 @@ inline void Assembler::stfdx(FloatRegister s, Register a, Register b){ emit_int3 inline void Assembler::fmr( FloatRegister d, FloatRegister b) { emit_int32( FMR_OPCODE | frt(d) | frb(b) | rc(0)); } inline void Assembler::fmr_(FloatRegister d, FloatRegister b) { emit_int32( FMR_OPCODE | frt(d) | frb(b) | rc(1)); } +inline void Assembler::frin( FloatRegister d, FloatRegister b) { emit_int32( FRIN_OPCODE | frt(d) | frb(b) | rc(0)); } +inline void Assembler::frip( FloatRegister d, FloatRegister b) { emit_int32( FRIP_OPCODE | frt(d) | frb(b) | rc(0)); } +inline void Assembler::frim( FloatRegister d, FloatRegister b) { emit_int32( FRIM_OPCODE | frt(d) | frb(b) | rc(0)); } + // These are special Power6 opcodes, reused for "lfdepx" and "stfdepx" // on Power7. Do not use. //inline void Assembler::mffgpr( FloatRegister d, Register b) { emit_int32( MFFGPR_OPCODE | frt(d) | rb(b) | rc(0)); } @@ -796,6 +800,10 @@ inline void Assembler::xvmsubasp( VectorSRegister d, VectorSRegister a, VectorSR inline void Assembler::xvmsubadp( VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVMSUBADP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); } inline void Assembler::xvnmsubasp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVNMSUBASP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); } inline void Assembler::xvnmsubadp(VectorSRegister d, VectorSRegister a, VectorSRegister b) { emit_int32( XVNMSUBADP_OPCODE | vsrt(d) | vsra(a) | vsrb(b)); } +inline void Assembler::xvrdpi( VectorSRegister d, VectorSRegister b) { emit_int32( XVRDPI_OPCODE | vsrt(d) | vsrb(b)); } +inline void Assembler::xvrdpim( VectorSRegister d, VectorSRegister b) { emit_int32( XVRDPIM_OPCODE | vsrt(d) | vsrb(b)); } +inline void Assembler::xvrdpip( VectorSRegister d, VectorSRegister b) { emit_int32( XVRDPIP_OPCODE | vsrt(d) | vsrb(b)); } + inline void Assembler::mtvrd( VectorRegister d, Register a) { emit_int32( MTVSRD_OPCODE | vsrt(d->to_vsr()) | ra(a)); } inline void Assembler::mfvrd( Register a, VectorRegister d) { emit_int32( MFVSRD_OPCODE | vsrt(d->to_vsr()) | ra(a)); } inline void Assembler::mtvrwz( VectorRegister d, Register a) { emit_int32( MTVSRWZ_OPCODE | vsrt(d->to_vsr()) | ra(a)); } diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad index 2c2057e902a..73557cba95a 100644 --- a/src/hotspot/cpu/ppc/ppc.ad +++ b/src/hotspot/cpu/ppc/ppc.ad @@ -972,6 +972,8 @@ source_hpp %{ // To keep related declarations/definitions/uses close together, // we switch between source %{ }% and source_hpp %{ }% freely as needed. +#include "opto/convertnode.hpp" + // Returns true if Node n is followed by a MemBar node that // will do an acquire. If so, this node must not do the acquire // operation. @@ -2272,6 +2274,7 @@ const bool Matcher::match_rule_supported(int opcode) { case Op_AddVL: case Op_SubVL: case Op_MulVI: + case Op_RoundDoubleModeV: return SuperwordUseVSX; case Op_PopCountVI: return (SuperwordUseVSX && UsePopCountInstruction); @@ -14454,6 +14457,53 @@ instruct vabs2D_reg(vecX dst, vecX src) %{ ins_pipe(pipe_class_default); %} +// Round Instructions +instruct roundD_reg(regD dst, regD src, immI8 rmode) %{ + match(Set dst (RoundDoubleMode src rmode)); + format %{ "RoundDoubleMode $src,$rmode" %} + size(4); + ins_encode %{ + switch ($rmode$$constant) { + case RoundDoubleModeNode::rmode_rint: + __ frin($dst$$FloatRegister, $src$$FloatRegister); + break; + case RoundDoubleModeNode::rmode_floor: + __ frim($dst$$FloatRegister, $src$$FloatRegister); + break; + case RoundDoubleModeNode::rmode_ceil: + __ frip($dst$$FloatRegister, $src$$FloatRegister); + break; + default: + ShouldNotReachHere(); + } + %} + ins_pipe(pipe_class_default); +%} + +// Vector Round Instructions +instruct vround2D_reg(vecX dst, vecX src, immI8 rmode) %{ + match(Set dst (RoundDoubleModeV src rmode)); + predicate(n->as_Vector()->length() == 2); + format %{ "RoundDoubleModeV $src,$rmode" %} + size(4); + ins_encode %{ + switch ($rmode$$constant) { + case RoundDoubleModeNode::rmode_rint: + __ xvrdpi($dst$$VectorSRegister, $src$$VectorSRegister); + break; + case RoundDoubleModeNode::rmode_floor: + __ xvrdpim($dst$$VectorSRegister, $src$$VectorSRegister); + break; + case RoundDoubleModeNode::rmode_ceil: + __ xvrdpip($dst$$VectorSRegister, $src$$VectorSRegister); + break; + default: + ShouldNotReachHere(); + } + %} + ins_pipe(pipe_class_default); +%} + // Vector Negate Instructions instruct vneg4F_reg(vecX dst, vecX src) %{ diff --git a/src/hotspot/share/opto/convertnode.cpp b/src/hotspot/share/opto/convertnode.cpp index a4dd500a6f2..cf2af1f40f3 100644 --- a/src/hotspot/share/opto/convertnode.cpp +++ b/src/hotspot/share/opto/convertnode.cpp @@ -532,6 +532,11 @@ const Type* RoundDoubleNode::Value(PhaseGVN* phase) const { } //============================================================================= +RoundDoubleModeNode* RoundDoubleModeNode::make(PhaseGVN& gvn, Node* arg, RoundDoubleModeNode::RoundingMode rmode) { + ConINode* rm = gvn.intcon(rmode); + return new RoundDoubleModeNode(arg, (Node *)rm); +} + //------------------------------Identity--------------------------------------- // Remove redundant roundings. Node* RoundDoubleModeNode::Identity(PhaseGVN* phase) { diff --git a/src/hotspot/share/opto/convertnode.hpp b/src/hotspot/share/opto/convertnode.hpp index 87c1bf286fb..563843f3dc8 100644 --- a/src/hotspot/share/opto/convertnode.hpp +++ b/src/hotspot/share/opto/convertnode.hpp @@ -215,7 +215,13 @@ class RoundDoubleNode: public Node { //-----------------------------RoundDoubleModeNode----------------------------- class RoundDoubleModeNode: public Node { public: + enum RoundingMode { + rmode_rint = 0, + rmode_floor = 1, + rmode_ceil = 2 + }; RoundDoubleModeNode(Node *in1, Node * rmode): Node(0, in1, rmode) {} + static RoundDoubleModeNode* make(PhaseGVN& gvn, Node* arg, RoundDoubleModeNode::RoundingMode rmode); virtual int Opcode() const; virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual uint ideal_reg() const { return Op_RegD; } diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp index b93ae58a507..c4eaf4996b0 100644 --- a/src/hotspot/share/opto/library_call.cpp +++ b/src/hotspot/share/opto/library_call.cpp @@ -1822,9 +1822,9 @@ bool LibraryCallKit::inline_double_math(vmIntrinsics::ID id) { switch (id) { case vmIntrinsics::_dabs: n = new AbsDNode( arg); break; case vmIntrinsics::_dsqrt: n = new SqrtDNode(C, control(), arg); break; - case vmIntrinsics::_ceil: n = new RoundDoubleModeNode(arg, makecon(TypeInt::make(2))); break; - case vmIntrinsics::_floor: n = new RoundDoubleModeNode(arg, makecon(TypeInt::make(1))); break; - case vmIntrinsics::_rint: n = new RoundDoubleModeNode(arg, makecon(TypeInt::make(0))); break; + case vmIntrinsics::_ceil: n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_ceil); break; + case vmIntrinsics::_floor: n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_floor); break; + case vmIntrinsics::_rint: n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_rint); break; default: fatal_unexpected_iid(id); break; } set_result(_gvn.transform(n)); From 29e2c16e5b5aa3afc26f8dcc859e940a23a01aee Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 23 Oct 2019 09:45:41 +0200 Subject: [PATCH 044/163] 8211073: Remove -Wno-extra from Hotspot Reviewed-by: dholmes, erikj, kbarrett --- make/hotspot/lib/CompileJvm.gmk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk index f6e0adfc168..fb701c03bf5 100644 --- a/make/hotspot/lib/CompileJvm.gmk +++ b/make/hotspot/lib/CompileJvm.gmk @@ -78,14 +78,14 @@ CFLAGS_VM_VERSION := \ ################################################################################ # Disabled warnings -DISABLED_WARNINGS_gcc := extra parentheses comment unknown-pragmas address \ +DISABLED_WARNINGS_gcc := parentheses comment unknown-pragmas address \ delete-non-virtual-dtor char-subscripts array-bounds int-in-bool-context \ ignored-qualifiers missing-field-initializers implicit-fallthrough \ empty-body strict-overflow sequence-point maybe-uninitialized \ - misleading-indentation + misleading-indentation cast-function-type ifeq ($(call check-jvm-feature, zero), true) - DISABLED_WARNINGS_gcc += return-type switch + DISABLED_WARNINGS_gcc += return-type switch clobbered endif DISABLED_WARNINGS_clang := tautological-compare \ From 21585ebcdff839db39d2e1a80c17f5b95851824b Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 23 Oct 2019 09:48:46 +0200 Subject: [PATCH 045/163] 8232770: Enable more warnings on solaris studio Reviewed-by: erikj --- make/autoconf/flags-cflags.m4 | 8 ++++---- make/common/TestFilesCompilation.gmk | 2 +- make/hotspot/gensrc/GensrcAdlc.gmk | 1 - make/launcher/Launcher-jdk.pack.gmk | 1 + make/lib/Awt2dLibraries.gmk | 11 +++++------ make/lib/CoreLibraries.gmk | 3 --- make/lib/Lib-jdk.hotspot.agent.gmk | 2 +- make/lib/Lib-jdk.pack.gmk | 1 + 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 index 9884c5b1f88..ffaf1af7de3 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 @@ -170,11 +170,11 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS], DISABLE_WARNING_PREFIX="-erroff=" CFLAGS_WARNINGS_ARE_ERRORS="-errwarn=%all" - WARNINGS_ENABLE_ALL_CFLAGS="-v" - WARNINGS_ENABLE_ALL_CXXFLAGS="+w" + WARNINGS_ENABLE_ALL_CFLAGS="-v -fd -xtransition" + WARNINGS_ENABLE_ALL_CXXFLAGS="+w +w2" - DISABLED_WARNINGS_C="" - DISABLED_WARNINGS_CXX="" + DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING E_DECLARATION_IN_CODE" + DISABLED_WARNINGS_CXX="inllargeuse inllargeint notused wemptydecl notemsource" ;; gcc) diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk index d8400b3dc95..999aec7db29 100644 --- a/make/common/TestFilesCompilation.gmk +++ b/make/common/TestFilesCompilation.gmk @@ -98,7 +98,7 @@ define SetupTestFilesCompilationBody DISABLED_WARNINGS_gcc := format undef unused-function unused-value, \ DISABLED_WARNINGS_clang := undef format-nonliteral \ missing-field-initializers sometimes-uninitialized, \ - DISABLED_WARNINGS_CXX_solstudio := wvarhidenmem, \ + DISABLED_WARNINGS_CXX_solstudio := wvarhidenmem doubunder, \ LIBS := $$($1_LIBS_$$(name)), \ TOOLCHAIN := $(if $$(filter %.cpp, $$(file)), TOOLCHAIN_LINK_CXX, TOOLCHAIN_DEFAULT), \ OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \ diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk index 6e9086177d0..e1c6aded5a2 100644 --- a/make/hotspot/gensrc/GensrcAdlc.gmk +++ b/make/hotspot/gensrc/GensrcAdlc.gmk @@ -75,7 +75,6 @@ ifeq ($(call check-jvm-feature, compiler2), true) OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc, \ DEBUG_SYMBOLS := false, \ DISABLED_WARNINGS_clang := tautological-compare, \ - DISABLED_WARNINGS_solstudio := notemsource, \ DEFINE_THIS_FILE := false, \ )) diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk index 04160166928..10636b38bed 100644 --- a/make/launcher/Launcher-jdk.pack.gmk +++ b/make/launcher/Launcher-jdk.pack.gmk @@ -87,6 +87,7 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \ CFLAGS_solaris := -KPIC, \ CFLAGS_macosx := -fPIC, \ DISABLED_WARNINGS_clang := format-nonliteral, \ + DISABLED_WARNINGS_solstudio := wunreachable, \ LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \ diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk index 7e67bd2c763..a0ac884ddac 100644 --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -229,7 +229,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ format-nonliteral parentheses unused-value unused-function, \ DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \ sign-compare format-nonliteral, \ - DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \ DISABLED_WARNINGS_microsoft := 4244 4267 4996, \ ASFLAGS := $(LIBAWT_ASFLAGS), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -339,8 +338,8 @@ ifeq ($(call isTargetOs, windows macosx), false) implicit-fallthrough undef unused-function, \ DISABLED_WARNINGS_clang := parentheses format undef \ logical-op-parentheses format-nonliteral int-conversion, \ - DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ - E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \ + DISABLED_WARNINGS_solstudio := E_ASSIGNMENT_TYPE_MISMATCH \ + E_NON_CONST_INIT, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -L$(INSTALL_LIBRARIES_HERE), \ @@ -620,7 +619,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ E_ENUM_VAL_OVERFLOWS_INT_MAX, \ DISABLED_WARNINGS_CXX_solstudio := \ truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ - hidevf w_novirtualdescr arrowrtn2 refmemnoconstr_aggr unknownpragma, \ + hidevf w_novirtualdescr arrowrtn2 refmemnoconstr_aggr unknownpragma \ + doubunder wunreachable, \ DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101 4068 4805 4138, \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \ $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ @@ -848,8 +848,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false) maybe-uninitialized shift-negative-value implicit-fallthrough \ unused-function, \ DISABLED_WARNINGS_clang := incompatible-pointer-types sign-compare, \ - DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ - E_STATEMENT_NOT_REACHED, \ + DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ DISABLED_WARNINGS_microsoft := 4018 4244 4267, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk index 8676625e3cb..9fd0b392c01 100644 --- a/make/lib/CoreLibraries.gmk +++ b/make/lib/CoreLibraries.gmk @@ -212,9 +212,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \ DISABLED_WARNINGS_gcc := unused-function, \ DISABLED_WARNINGS_clang := sometimes-uninitialized format-nonliteral, \ - DISABLED_WARNINGS_solstudio := \ - E_ASM_DISABLES_OPTIMIZATION \ - E_STATEMENT_NOT_REACHED, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS_unix := $(LIBZ_LIBS), \ diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk index f6dbbc95fe7..8784f1bbcfa 100644 --- a/make/lib/Lib-jdk.hotspot.agent.gmk +++ b/make/lib/Lib-jdk.hotspot.agent.gmk @@ -61,7 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \ DISABLED_WARNINGS_microsoft := 4267, \ DISABLED_WARNINGS_gcc := sign-compare pointer-arith, \ DISABLED_WARNINGS_clang := sign-compare pointer-arith format-nonliteral, \ - DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \ + DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma doubunder, \ CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \ EXTRA_SRC := $(LIBSA_EXTRA_SRC), \ diff --git a/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk index 7210be8c650..bc537fc9d2c 100644 --- a/make/lib/Lib-jdk.pack.gmk +++ b/make/lib/Lib-jdk.pack.gmk @@ -38,6 +38,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \ EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \ DISABLED_WARNINGS_gcc := implicit-fallthrough, \ DISABLED_WARNINGS_clang := format-nonliteral, \ + DISABLED_WARNINGS_solstudio := wunreachable, \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \ From a2c5af45fd476cffc217c501e4f43e59e9c9dae9 Mon Sep 17 00:00:00 2001 From: Jie Fu Date: Wed, 23 Oct 2019 09:53:07 +0200 Subject: [PATCH 046/163] 8232768: Configuration with --disable-cds --enable-generate-classlist should be reported as an error Reviewed-by: ihse --- make/autoconf/jdk-options.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 5d276a88c21..2fe10bb1700 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -599,7 +599,14 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST], AC_MSG_RESULT([yes, forced]) ENABLE_GENERATE_CLASSLIST="true" if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then - AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS]) + if test "x$ENABLE_CDS" = "xfalse"; then + # In GenerateLinkOptData.gmk, DumpLoadedClassList is used to generate the + # classlist file. It never will work in this case since the VM will report + # an error for DumpLoadedClassList when CDS is disabled. + AC_MSG_ERROR([Generation of classlist is not possible with enable-cds=false]) + else + AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS]) + fi fi elif test "x$enable_generate_classlist" = "xno"; then AC_MSG_RESULT([no, forced]) From 3cc9ed08e7c60e28974daf382c291d7122142ca6 Mon Sep 17 00:00:00 2001 From: Christian Hagedorn Date: Wed, 23 Oct 2019 12:15:42 +0200 Subject: [PATCH 047/163] 8232873: Add missing test for 8220416 Adds a missing test which verifies the bug fix of 8220416. Reviewed-by: roland, thartmann --- .../jtreg/compiler/c2/CmpPNodeSubTest.java | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 test/hotspot/jtreg/compiler/c2/CmpPNodeSubTest.java diff --git a/test/hotspot/jtreg/compiler/c2/CmpPNodeSubTest.java b/test/hotspot/jtreg/compiler/c2/CmpPNodeSubTest.java new file mode 100644 index 00000000000..1a15cd71082 --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/CmpPNodeSubTest.java @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8220416 + * @summary This test uses a class pointer comparison optimization which was not applied anymore since JDK-6964458 resulting in a better IR. + * + * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline + * -XX:CompileOnly=compiler.c2.CompareKlassPointersTest::test compiler.c2.CompareKlassPointersTest + */ + +package compiler.c2; + + + +public class CompareKlassPointersTest { + + static A a; + + public static void main(String[] args) { + a = new C(); + for (int i = 0; i < 10_000; i++) { + test(); + } + } + + public static int test() { + Object a = getA(); + + /* + * This check is now optimized away which was not the case before anymore since JDK-6964458: + * The klass pointer comparison optimization sees that the check is always false since a and B are always unrelated klasses + */ + if (a instanceof B) { + return 1; + } + return 0; + } + + private static Object getA() { + return a; + } +} + +class A { } + +class B { } + +class C extends A { } From 13b4952f11b8d7bf684926453f027ad3099ca012 Mon Sep 17 00:00:00 2001 From: Christian Hagedorn Date: Wed, 23 Oct 2019 12:17:14 +0200 Subject: [PATCH 048/163] 8232874: Add missing test for 8230062 Adds a missing test which verifies the bug fix of 8230062. Reviewed-by: roland, thartmann --- .../superword/SuperWordIntermediateUse.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/SuperWordIntermediateUse.java diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/SuperWordIntermediateUse.java b/test/hotspot/jtreg/compiler/loopopts/superword/SuperWordIntermediateUse.java new file mode 100644 index 00000000000..1d8357fd32e --- /dev/null +++ b/test/hotspot/jtreg/compiler/loopopts/superword/SuperWordIntermediateUse.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8230062 + * @summary The IR of this test contains a reduction chain which corresponds to a pack in which the 2nd last element has a usage outside of the optimized loop. + * + * @run main/othervm -Xbatch -XX:CompileCommand=compileonly,compiler.loopopts.superword.SuperWordIntermediateUse::test + * compiler.loopopts.superword.SuperWordIntermediateUse + */ + +package compiler.loopopts.superword; + +public class SuperWordIntermediateUse { + + private int iFld; + private int[] iArr = new int[1024]; + + public void test() { + int local = 4; + + /** + * Before unrolling this loop: + * iFld: AddI 1 = -85 + Phi 1 + * local: MulI 2 = Phi 1 * LoadI 3 + * + * This loop is now unrolled. 'local' is a reduction. The loop is first copied: + * iFldCopy: AddI C1 = -85 + Phi C1 + * localCopy: MulI C2 = Phi C1 * LoadI C3 + * + * iFld: AddI 1 = -85 + Phi 1 + * local: MulI 2 = Phi 1 * LoadI 3 + * + * Then, the unnecessary nodes like phis are removed from the original loop by igvn: + * (iFldCopy: AddI C1 = -85 + Phi C1) field store optimized away + * localCopy: MulI C2 = Phi C1 * LoadI C3 + * + * iFld: AddI 1 = -85 + MulI C2 + * local: MulI 2 = MulI C2 * LoadI 3 -> Input into Phi C1 + * + * As a result AddI 1 has an input from MulI C2 which isn't the last operation in the reduction chain + * Phi C1 -> MulI C2 -> MulI 2 -> Phi C1 and therefore not the last element in a pack. + * Additionally, AddI 1 does not belong to the loop being optimized: The store node for iFld is put outside of the loop being optimized. + * This triggers the assertion bug when unrolled at least 4 times which creates packs of at least size 4. + */ + for (int i = 0; i < 1024; i++) { + iFld = -85; + iFld = iFld + local; + local = local * iArr[i]; + iArr[i] = 3; // Just used to trigger SuperWord optimization + } + } + + public static void main(String[] strArr) { + SuperWordIntermediateUse instance = new SuperWordIntermediateUse(); + for (int i = 0; i < 1000; i++) { + instance.test(); + } + } +} From 465f4c12009c87cd5f36c5ccdf82c38f6b91eced Mon Sep 17 00:00:00 2001 From: Christian Hagedorn Date: Wed, 23 Oct 2019 12:21:32 +0200 Subject: [PATCH 049/163] 8231412: C2: InitializeNode::detect_init_independence() bails out on simple IR shapes Avoids early bailout of capturing a field store to remove unnecessary zeroing in simple methods containing only non-escaping objects. Reviewed-by: roland, thartmann --- src/hotspot/share/opto/memnode.cpp | 78 +++++++++++-------- src/hotspot/share/opto/memnode.hpp | 6 +- src/hotspot/share/opto/phaseX.cpp | 2 +- .../TestEliminateAllocation.java | 74 ++++++++++++++++++ 4 files changed, 124 insertions(+), 36 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/escapeAnalysis/TestEliminateAllocation.java diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp index 5ea32a659b0..b7bc62365be 100644 --- a/src/hotspot/share/opto/memnode.cpp +++ b/src/hotspot/share/opto/memnode.cpp @@ -3534,37 +3534,51 @@ intptr_t InitializeNode::get_store_offset(Node* st, PhaseTransform* phase) { // within the initialization without creating a vicious cycle, such as: // { Foo p = new Foo(); p.next = p; } // True for constants and parameters and small combinations thereof. -bool InitializeNode::detect_init_independence(Node* n, int& count) { - if (n == NULL) return true; // (can this really happen?) - if (n->is_Proj()) n = n->in(0); - if (n == this) return false; // found a cycle - if (n->is_Con()) return true; - if (n->is_Start()) return true; // params, etc., are OK - if (n->is_Root()) return true; // even better +bool InitializeNode::detect_init_independence(Node* value, PhaseGVN* phase) { + ResourceMark rm; + Unique_Node_List worklist; + worklist.push(value); - Node* ctl = n->in(0); - if (ctl != NULL && !ctl->is_top()) { - if (ctl->is_Proj()) ctl = ctl->in(0); - if (ctl == this) return false; + uint complexity_limit = 20; + for (uint j = 0; j < worklist.size(); j++) { + if (j >= complexity_limit) { + return false; // Bail out if processed too many nodes + } - // If we already know that the enclosing memory op is pinned right after - // the init, then any control flow that the store has picked up - // must have preceded the init, or else be equal to the init. - // Even after loop optimizations (which might change control edges) - // a store is never pinned *before* the availability of its inputs. - if (!MemNode::all_controls_dominate(n, this)) - return false; // failed to prove a good control - } + Node* n = worklist.at(j); + if (n == NULL) continue; // (can this really happen?) + if (n->is_Proj()) n = n->in(0); + if (n == this) return false; // found a cycle + if (n->is_Con()) continue; + if (n->is_Start()) continue; // params, etc., are OK + if (n->is_Root()) continue; // even better - // Check data edges for possible dependencies on 'this'. - if ((count += 1) > 20) return false; // complexity limit - for (uint i = 1; i < n->req(); i++) { - Node* m = n->in(i); - if (m == NULL || m == n || m->is_top()) continue; - uint first_i = n->find_edge(m); - if (i != first_i) continue; // process duplicate edge just once - if (!detect_init_independence(m, count)) { - return false; + // There cannot be any dependency if 'n' is a CFG node that dominates the current allocation + if (n->is_CFG() && phase->is_dominator(n, allocation())) { + continue; + } + + Node* ctl = n->in(0); + if (ctl != NULL && !ctl->is_top()) { + if (ctl->is_Proj()) ctl = ctl->in(0); + if (ctl == this) return false; + + // If we already know that the enclosing memory op is pinned right after + // the init, then any control flow that the store has picked up + // must have preceded the init, or else be equal to the init. + // Even after loop optimizations (which might change control edges) + // a store is never pinned *before* the availability of its inputs. + if (!MemNode::all_controls_dominate(n, this)) + return false; // failed to prove a good control + } + + // Check data edges for possible dependencies on 'this'. + for (uint i = 1; i < n->req(); i++) { + Node* m = n->in(i); + if (m == NULL || m == n || m->is_top()) continue; + + // Only process data inputs once + worklist.push(m); } } @@ -3575,7 +3589,7 @@ bool InitializeNode::detect_init_independence(Node* n, int& count) { // an initialization. Returns zero if a check fails. // On success, returns the (constant) offset to which the store applies, // within the initialized memory. -intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape) { +intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseGVN* phase, bool can_reshape) { const int FAIL = 0; if (st->req() != MemNode::ValueIn + 1) return FAIL; // an inscrutable StoreNode (card mark?) @@ -3597,8 +3611,8 @@ intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseTransform* phase, return FAIL; // mismatched access } Node* val = st->in(MemNode::ValueIn); - int complexity_count = 0; - if (!detect_init_independence(val, complexity_count)) + + if (!detect_init_independence(val, phase)) return FAIL; // stored value must be 'simple enough' // The Store can be captured only if nothing after the allocation @@ -3796,7 +3810,7 @@ Node* InitializeNode::make_raw_address(intptr_t offset, // rawstore1 rawstore2) // Node* InitializeNode::capture_store(StoreNode* st, intptr_t start, - PhaseTransform* phase, bool can_reshape) { + PhaseGVN* phase, bool can_reshape) { assert(stores_are_sane(phase), ""); if (start < 0) return NULL; diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp index 37b44a8faec..4c001f14f1d 100644 --- a/src/hotspot/share/opto/memnode.hpp +++ b/src/hotspot/share/opto/memnode.hpp @@ -1387,11 +1387,11 @@ public: // See if this store can be captured; return offset where it initializes. // Return 0 if the store cannot be moved (any sort of problem). - intptr_t can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape); + intptr_t can_capture_store(StoreNode* st, PhaseGVN* phase, bool can_reshape); // Capture another store; reformat it to write my internal raw memory. // Return the captured copy, else NULL if there is some sort of problem. - Node* capture_store(StoreNode* st, intptr_t start, PhaseTransform* phase, bool can_reshape); + Node* capture_store(StoreNode* st, intptr_t start, PhaseGVN* phase, bool can_reshape); // Find captured store which corresponds to the range [start..start+size). // Return my own memory projection (meaning the initial zero bits) @@ -1414,7 +1414,7 @@ public: Node* make_raw_address(intptr_t offset, PhaseTransform* phase); - bool detect_init_independence(Node* n, int& count); + bool detect_init_independence(Node* value, PhaseGVN* phase); void coalesce_subword_stores(intptr_t header_size, Node* size_in_bytes, PhaseGVN* phase); diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp index a83769db157..47b92da6547 100644 --- a/src/hotspot/share/opto/phaseX.cpp +++ b/src/hotspot/share/opto/phaseX.cpp @@ -899,7 +899,7 @@ bool PhaseGVN::is_dominator_helper(Node *d, Node *n, bool linear_only) { while (d != n) { n = IfNode::up_one_dom(n, linear_only); i++; - if (n == NULL || i >= 10) { + if (n == NULL || i >= 100) { return false; } } diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestEliminateAllocation.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestEliminateAllocation.java new file mode 100644 index 00000000000..cbb0ba850c1 --- /dev/null +++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestEliminateAllocation.java @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8231412 + * @summary The enhancement eliminates all allocations in the loop body of test() due to an improved field zeroing elimination dominance check. + * @run main/othervm -XX:-TieredCompilation -XX:CompileCommand=compileonly,compiler.escapeAnalysis.TestEliminateAllocation::test + * compiler.escapeAnalysis.TestEliminateAllocation + */ + +package compiler.escapeAnalysis; + +public class TestEliminateAllocation { + + public static int a = 20; + public static int b = 30; + public static int c = 40; + + public void test() { + int i = 0; + + /* + * The resulting IR for the loop body contains 2 allocations, one Wrapper and an int array + * The array field store in the Wrapper object 'wrapper.arr = arr' cannot be capturued due to an early bail out. + * Therefore, the initial value of wrapper.arr is null. + * As a result, the escape analysis marks the array allocation as not scalar replaceable: + * 'wrapper.arr' which is null is merged with the int array object in the assignment 'wrapper.arr = arr'. + * Both null and the int array are treated as different objects. As a result the array allocation cannot be eliminated. + * + * The new enhancement does not bail out early anymore and therefore escape analysis does not mark it as + * not scalar replaceable. This results in elimination of all allocations in this method. + */ + do { + int[] arr = new int[] { a / b / c }; + Wrapper wrapper = new Wrapper(); + wrapper.setArr(arr); + i++; + } + while (i < 10); + } + + public static void main(String[] strArr) { + TestEliminateAllocation _instance = new TestEliminateAllocation(); + for (int i = 0; i < 10_000; i++ ) { + _instance.test(); + } + } +} + +class Wrapper { + int[] arr; + void setArr(int... many) { arr = many; } +} From 7b38a7e87d31a5a10021661502d1dc0d6ed0f47f Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Wed, 23 Oct 2019 13:52:33 +0200 Subject: [PATCH 050/163] 8232883: compiler/c2/CmpPNodeSubTest.java fails because test class name is wrong Renamed test file to match class name. Reviewed-by: roland --- .../c2/{CmpPNodeSubTest.java => CompareKlassPointersTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/hotspot/jtreg/compiler/c2/{CmpPNodeSubTest.java => CompareKlassPointersTest.java} (100%) diff --git a/test/hotspot/jtreg/compiler/c2/CmpPNodeSubTest.java b/test/hotspot/jtreg/compiler/c2/CompareKlassPointersTest.java similarity index 100% rename from test/hotspot/jtreg/compiler/c2/CmpPNodeSubTest.java rename to test/hotspot/jtreg/compiler/c2/CompareKlassPointersTest.java From f2abda172b56e701bcf935e1d3e68cb6eac4b592 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 23 Oct 2019 14:06:39 +0200 Subject: [PATCH 051/163] 8232771: Revert JDK-8230794 because of environment changes Reviewed-by: pliden, sjohanss --- src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp index c78a37a2e0b..db6de824567 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp @@ -3613,6 +3613,7 @@ protected: p->record_or_add_time_secs(termination_phase, worker_id, cl.term_time()); p->record_or_add_thread_work_item(termination_phase, worker_id, cl.term_attempts()); } + assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation"); } virtual void start_work(uint worker_id) { } @@ -3654,22 +3655,14 @@ public: class G1EvacuateRegionsTask : public G1EvacuateRegionsBaseTask { G1RootProcessor* _root_processor; - void verify_trim_ticks(G1ParScanThreadState* pss, const char* location) { - assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation at %s %.3lf " JLONG_FORMAT, location, pss->trim_ticks().seconds(), pss->trim_ticks().value()); - } - void scan_roots(G1ParScanThreadState* pss, uint worker_id) { _root_processor->evacuate_roots(pss, worker_id); - verify_trim_ticks(pss, "roots"); _g1h->rem_set()->scan_heap_roots(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::ObjCopy); - verify_trim_ticks(pss, "heap roots"); _g1h->rem_set()->scan_collection_set_regions(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::CodeRoots, G1GCPhaseTimes::ObjCopy); - verify_trim_ticks(pss, "scan cset"); } void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) { G1EvacuateRegionsBaseTask::evacuate_live_objects(pss, worker_id, G1GCPhaseTimes::ObjCopy, G1GCPhaseTimes::Termination); - verify_trim_ticks(pss, "evac live"); } void start_work(uint worker_id) { From 3ab90ac5be0f82dff2d90ecde93666c4b90afe38 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Wed, 23 Oct 2019 05:48:17 -0700 Subject: [PATCH 052/163] 8232834: RunTest sometimes fails to produce valid exitcode.txt Reviewed-by: ihse --- make/RunTests.gmk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/make/RunTests.gmk b/make/RunTests.gmk index b2260c75b08..a6a6d1caf76 100644 --- a/make/RunTests.gmk +++ b/make/RunTests.gmk @@ -185,13 +185,13 @@ define SetupAotModuleBody $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \ $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \ ) - $$(call ExecuteWithLog, $$@.check, \ + $$(call ExecuteWithLog, $$@.check, ( \ $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \ $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \ -XX:+PrintAOT -XX:+UseAOTStrictLoading \ -XX:AOTLibrary=$$@ -version \ > $$@.verify-aot \ - ) + )) $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB) @@ -593,7 +593,7 @@ define SetupRunGtestTestBody $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \ $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \ -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \ --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \ @@ -602,7 +602,7 @@ define SetupRunGtestTestBody > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt @@ -705,7 +705,7 @@ define SetupRunMicroTestBody $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, ( \ $$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \ -jar $$($1_MICRO_BENCHMARKS_JAR) \ $$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \ @@ -715,7 +715,7 @@ define SetupRunMicroTestBody > >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt @@ -928,7 +928,7 @@ define SetupRunJtregTestBody $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \ $$(COV_ENVIRONMENT) \ $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \ -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \ @@ -943,7 +943,7 @@ define SetupRunJtregTestBody $$($1_TEST_NAME) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt @@ -1019,12 +1019,12 @@ define SetupRunSpecialTestBody $$(call LogWarn) $$(call LogWarn, Running test '$$($1_TEST)') $$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR)) - $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \ + $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \ $$($1_TEST_COMMAND_LINE) \ > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \ && $$(ECHO) $$$$? > $$($1_EXITCODE) \ || $$(ECHO) $$$$? > $$($1_EXITCODE) \ - ) + )) $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt From 86329fc198aa48d1fbba829ce86315c4443e25b3 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Wed, 23 Oct 2019 15:48:11 +0200 Subject: [PATCH 053/163] 8232887: Remove SystemDictionary::has_checkPackageAccess Reviewed-by: coleenp, lfoltan --- src/hotspot/share/classfile/dictionary.hpp | 1 - src/hotspot/share/classfile/systemDictionary.cpp | 9 --------- src/hotspot/share/classfile/systemDictionary.hpp | 5 ----- 3 files changed, 15 deletions(-) diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp index 7dbadd0cceb..10037b3e935 100644 --- a/src/hotspot/share/classfile/dictionary.hpp +++ b/src/hotspot/share/classfile/dictionary.hpp @@ -156,7 +156,6 @@ class DictionaryEntry : public HashtableEntry { // Tells whether the initiating class' protection domain can access the klass in this entry bool is_valid_protection_domain(Handle protection_domain) { if (!ProtectionDomainVerification) return true; - if (!SystemDictionary::has_checkPackageAccess()) return true; return protection_domain() == NULL ? true diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index 3b10fbd85b0..7397d697215 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -109,8 +109,6 @@ InstanceKlass* SystemDictionary::_box_klasses[T_VOID+1] = { NULL /*, oop SystemDictionary::_java_system_loader = NULL; oop SystemDictionary::_java_platform_loader = NULL; -bool SystemDictionary::_has_checkPackageAccess = false; - // Default ProtectionDomainCacheSize value const int defaultProtectionDomainCacheSize = 1009; @@ -447,8 +445,6 @@ void SystemDictionary::validate_protection_domain(InstanceKlass* klass, Handle class_loader, Handle protection_domain, TRAPS) { - if(!has_checkPackageAccess()) return; - // Now we have to call back to java to check if the initating class has access JavaValue result(T_VOID); LogTarget(Debug, protectiondomain) lt; @@ -2021,11 +2017,6 @@ void SystemDictionary::resolve_well_known_classes(TRAPS) { //_box_klasses[T_OBJECT] = WK_KLASS(object_klass); //_box_klasses[T_ARRAY] = WK_KLASS(object_klass); - { // Compute whether we should use checkPackageAccess or NOT - Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::checkPackageAccess_name(), vmSymbols::class_protectiondomain_signature()); - _has_checkPackageAccess = (method != NULL); - } - #ifdef ASSERT if (UseSharedSpaces) { assert(JvmtiExport::is_early_phase(), diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp index fc82e8b4ae2..83362c024d5 100644 --- a/src/hotspot/share/classfile/systemDictionary.hpp +++ b/src/hotspot/share/classfile/systemDictionary.hpp @@ -430,9 +430,6 @@ protected: } public: - // Tells whether ClassLoader.checkPackageAccess is present - static bool has_checkPackageAccess() { return _has_checkPackageAccess; } - static bool Parameter_klass_loaded() { return WK_KLASS(reflect_Parameter_klass) != NULL; } static bool Class_klass_loaded() { return WK_KLASS(Class_klass) != NULL; } static bool Cloneable_klass_loaded() { return WK_KLASS(Cloneable_klass) != NULL; } @@ -667,8 +664,6 @@ private: static oop _java_system_loader; static oop _java_platform_loader; - static bool _has_checkPackageAccess; - public: static TableStatistics placeholders_statistics(); static TableStatistics loader_constraints_statistics(); From b3477399d01c81dfe87e2041926a0244e616c18f Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Wed, 23 Oct 2019 15:54:39 +0100 Subject: [PATCH 054/163] 8232625: HttpClient redirect policy should be more conservative When enabled, HttpClient redirect is fixed to drop the body when the request method is changed, and to relay any redirection code it does not understand to the caller. Reviewed-by: chegar --- .../internal/net/http/HttpRequestImpl.java | 21 +- .../jdk/internal/net/http/RedirectFilter.java | 31 +- .../java/net/httpclient/HttpRedirectTest.java | 457 ++++++++++++++++++ .../net/httpclient/http2/RedirectTest.java | 7 +- .../http2/server/Http2RedirectHandler.java | 10 +- 5 files changed, 514 insertions(+), 12 deletions(-) create mode 100644 test/jdk/java/net/httpclient/HttpRedirectTest.java diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java index a7a34e9e165..cfb1f0569c6 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java @@ -41,6 +41,7 @@ import java.util.Optional; import java.net.http.HttpClient; import java.net.http.HttpHeaders; import java.net.http.HttpRequest; + import jdk.internal.net.http.common.HttpHeadersBuilder; import jdk.internal.net.http.common.Utils; import jdk.internal.net.http.websocket.OpeningHandshake; @@ -152,13 +153,14 @@ public class HttpRequestImpl extends HttpRequest implements WebSocketRequest { /** Returns a new instance suitable for redirection. */ public static HttpRequestImpl newInstanceForRedirection(URI uri, String method, - HttpRequestImpl other) { - return new HttpRequestImpl(uri, method, other); + HttpRequestImpl other, + boolean mayHaveBody) { + return new HttpRequestImpl(uri, method, other, mayHaveBody); } /** Returns a new instance suitable for authentication. */ public static HttpRequestImpl newInstanceForAuthentication(HttpRequestImpl other) { - HttpRequestImpl request = new HttpRequestImpl(other.uri(), other.method(), other); + HttpRequestImpl request = new HttpRequestImpl(other.uri(), other.method(), other, true); if (request.isWebSocket()) { Utils.setWebSocketUpgradeHeaders(request); } @@ -171,7 +173,8 @@ public class HttpRequestImpl extends HttpRequest implements WebSocketRequest { */ private HttpRequestImpl(URI uri, String method, - HttpRequestImpl other) { + HttpRequestImpl other, + boolean mayHaveBody) { assert method == null || Utils.isValidName(method); this.method = method == null? "GET" : method; this.userHeaders = other.userHeaders; @@ -184,13 +187,21 @@ public class HttpRequestImpl extends HttpRequest implements WebSocketRequest { this.proxy = other.proxy; this.expectContinue = other.expectContinue; this.secure = uri.getScheme().toLowerCase(Locale.US).equals("https"); - this.requestPublisher = other.requestPublisher; // may be null + this.requestPublisher = mayHaveBody ? publisher(other) : null; // may be null this.acc = other.acc; this.timeout = other.timeout; this.version = other.version(); this.authority = null; } + private BodyPublisher publisher(HttpRequestImpl other) { + BodyPublisher res = other.requestPublisher; + if (!Objects.equals(method, other.method)) { + res = null; + } + return res; + } + /* used for creating CONNECT requests */ HttpRequestImpl(String method, InetSocketAddress authority, HttpHeaders headers) { // TODO: isWebSocket flag is not specified, but the assumption is that diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java index 3161132f313..79e2a2fbfc3 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/RedirectFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -89,6 +89,31 @@ class RedirectFilter implements HeaderFilter { } } + private static boolean isRedirecting(int statusCode) { + // < 300: not a redirect codes + if (statusCode < 300) return false; + // 309-399 Unassigned => don't follow + // > 399: not a redirect code + if (statusCode > 308) return false; + switch (statusCode) { + // 300: MultipleChoice => don't follow + case 300: + return false; + // 304: Not Modified => don't follow + case 304: + return false; + // 305: Proxy Redirect => don't follow. + case 305: + return false; + // 306: Unused => don't follow + case 306: + return false; + // 301, 302, 303, 307, 308: OK to follow. + default: + return true; + } + } + /** * Checks to see if a new request is needed and returns it. * Null means response is ok to return to user. @@ -102,13 +127,13 @@ class RedirectFilter implements HeaderFilter { if (rcode == HTTP_NOT_MODIFIED) return null; - if (rcode >= 300 && rcode <= 399) { + if (isRedirecting(rcode)) { URI redir = getRedirectedURI(r.headers()); String newMethod = redirectedMethod(rcode, method); Log.logTrace("response code: {0}, redirected URI: {1}", rcode, redir); if (canRedirect(redir) && ++exchange.numberOfRedirects < max_redirects) { Log.logTrace("redirect to: {0} with method: {1}", redir, newMethod); - return HttpRequestImpl.newInstanceForRedirection(redir, newMethod, request); + return HttpRequestImpl.newInstanceForRedirection(redir, newMethod, request, rcode != 303); } else { Log.logTrace("not redirecting"); return null; diff --git a/test/jdk/java/net/httpclient/HttpRedirectTest.java b/test/jdk/java/net/httpclient/HttpRedirectTest.java new file mode 100644 index 00000000000..34ec95f7770 --- /dev/null +++ b/test/jdk/java/net/httpclient/HttpRedirectTest.java @@ -0,0 +1,457 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import com.sun.net.httpserver.HttpServer; +import com.sun.net.httpserver.HttpsConfigurator; +import com.sun.net.httpserver.HttpsServer; +import jdk.test.lib.net.SimpleSSLContext; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.AfterClass; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +/** + * @test + * @bug 8232625 + * @summary This test verifies that the HttpClient works correctly when redirecting a post request. + * @library /test/lib http2/server + * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpRedirectTest + * @modules java.net.http/jdk.internal.net.http.common + * java.net.http/jdk.internal.net.http.frame + * java.net.http/jdk.internal.net.http.hpack + * java.logging + * java.base/sun.net.www.http + * java.base/sun.net.www + * java.base/sun.net + * @run testng/othervm -Dtest.requiresHost=true + * -Djdk.httpclient.HttpClient.log=headers + * -Djdk.internal.httpclient.debug=false + * HttpRedirectTest + * + */ +public class HttpRedirectTest implements HttpServerAdapters { + static final String GET_RESPONSE_BODY = "Lorem ipsum dolor sit amet"; + static final String REQUEST_BODY = "Here it goes"; + static final SSLContext context; + static { + try { + context = new SimpleSSLContext().get(); + SSLContext.setDefault(context); + } catch (Exception x) { + throw new ExceptionInInitializerError(x); + } + } + + final AtomicLong requestCounter = new AtomicLong(); + final AtomicLong responseCounter = new AtomicLong(); + HttpTestServer http1Server; + HttpTestServer http2Server; + HttpTestServer https1Server; + HttpTestServer https2Server; + DigestEchoServer.TunnelingProxy proxy; + + URI http1URI; + URI https1URI; + URI http2URI; + URI https2URI; + InetSocketAddress proxyAddress; + ProxySelector proxySelector; + HttpClient client; + List> futures = new CopyOnWriteArrayList<>(); + Set pending = new CopyOnWriteArraySet<>(); + + final ExecutorService executor = new ThreadPoolExecutor(12, 60, 10, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Shared by HTTP/1.1 servers + final ExecutorService clientexec = new ThreadPoolExecutor(6, 12, 1, + TimeUnit.SECONDS, new LinkedBlockingQueue<>()); // Used by the client + + public HttpClient newHttpClient(ProxySelector ps) { + HttpClient.Builder builder = HttpClient + .newBuilder() + .sslContext(context) + .executor(clientexec) + .followRedirects(HttpClient.Redirect.ALWAYS) + .proxy(ps); + return builder.build(); + } + + @DataProvider(name="uris") + Object[][] testURIs() throws URISyntaxException { + List uris = List.of( + http1URI.resolve("direct/orig/"), + https1URI.resolve("direct/orig/"), + https1URI.resolve("proxy/orig/"), + http2URI.resolve("direct/orig/"), + https2URI.resolve("direct/orig/"), + https2URI.resolve("proxy/orig/")); + List> redirects = List.of( + Map.entry(301, "GET"), + Map.entry(308, "POST"), + Map.entry(302, "GET"), + Map.entry(303, "GET"), + Map.entry(307, "POST"), + Map.entry(300, "DO_NOT_FOLLOW"), + Map.entry(304, "DO_NOT_FOLLOW"), + Map.entry(305, "DO_NOT_FOLLOW"), + Map.entry(306, "DO_NOT_FOLLOW"), + Map.entry(309, "DO_NOT_FOLLOW"), + Map.entry(new Random().nextInt(90) + 310, "DO_NOT_FOLLOW") + ); + Object[][] tests = new Object[redirects.size() * uris.size()][3]; + int count = 0; + for (int i=0; i < uris.size(); i++) { + URI u = uris.get(i); + for (int j=0; j < redirects.size() ; j++) { + int code = redirects.get(j).getKey(); + String m = redirects.get(j).getValue(); + tests[count][0] = u.resolve(code +"/"); + tests[count][1] = code; + tests[count][2] = m; + count++; + } + } + return tests; + } + + @BeforeClass + public void setUp() throws Exception { + try { + InetSocketAddress sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0); + + // HTTP/1.1 + HttpServer server1 = HttpServer.create(sa, 0); + server1.setExecutor(executor); + http1Server = HttpTestServer.of(server1); + http1Server.addHandler(new HttpTestRedirectHandler("http", http1Server), + "/HttpRedirectTest/http1/"); + http1Server.start(); + http1URI = new URI("http://" + http1Server.serverAuthority() + "/HttpRedirectTest/http1/"); + + + // HTTPS/1.1 + HttpsServer sserver1 = HttpsServer.create(sa, 100); + sserver1.setExecutor(executor); + sserver1.setHttpsConfigurator(new HttpsConfigurator(context)); + https1Server = HttpTestServer.of(sserver1); + https1Server.addHandler(new HttpTestRedirectHandler("https", https1Server), + "/HttpRedirectTest/https1/"); + https1Server.start(); + https1URI = new URI("https://" + https1Server.serverAuthority() + "/HttpRedirectTest/https1/"); + + // HTTP/2.0 + http2Server = HttpTestServer.of( + new Http2TestServer("localhost", false, 0)); + http2Server.addHandler(new HttpTestRedirectHandler("http", http2Server), + "/HttpRedirectTest/http2/"); + http2Server.start(); + http2URI = new URI("http://" + http2Server.serverAuthority() + "/HttpRedirectTest/http2/"); + + // HTTPS/2.0 + https2Server = HttpTestServer.of( + new Http2TestServer("localhost", true, 0)); + https2Server.addHandler(new HttpTestRedirectHandler("https", https2Server), + "/HttpRedirectTest/https2/"); + https2Server.start(); + https2URI = new URI("https://" + https2Server.serverAuthority() + "/HttpRedirectTest/https2/"); + + proxy = DigestEchoServer.createHttpsProxyTunnel( + DigestEchoServer.HttpAuthSchemeType.NONE); + proxyAddress = proxy.getProxyAddress(); + proxySelector = new HttpProxySelector(proxyAddress); + client = newHttpClient(proxySelector); + System.out.println("Setup: done"); + } catch (Exception x) { + tearDown(); throw x; + } catch (Error e) { + tearDown(); throw e; + } + } + + private void testNonIdempotent(URI u, HttpRequest request, + int code, String method) throws Exception { + System.out.println("Testing with " + u); + CompletableFuture> respCf = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse resp = respCf.join(); + if (method.equals("DO_NOT_FOLLOW")) { + assertEquals(resp.statusCode(), code, u + ": status code"); + } else { + assertEquals(resp.statusCode(), 200, u + ": status code"); + } + if (method.equals("POST")) { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 304) { + assertEquals(resp.body(), "", u + ": body"); + } else if (method.equals("DO_NOT_FOLLOW")) { + assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + assertNotEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else { + assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + } + } + + public void testIdempotent(URI u, HttpRequest request, + int code, String method) throws Exception { + CompletableFuture> respCf = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse resp = respCf.join(); + if (method.equals("DO_NOT_FOLLOW")) { + assertEquals(resp.statusCode(), code, u + ": status code"); + } else { + assertEquals(resp.statusCode(), 200, u + ": status code"); + } + if (method.equals("POST")) { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 304) { + assertEquals(resp.body(), "", u + ": body"); + } else if (method.equals("DO_NOT_FOLLOW")) { + assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + assertNotEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 303) { + assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + } else { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } + } + + @Test(dataProvider = "uris") + public void testPOST(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + HttpRequest request = HttpRequest.newBuilder(u) + .POST(HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + // POST is not considered idempotent. + testNonIdempotent(u, request, code, method); + } + + @Test(dataProvider = "uris") + public void testPUT(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + System.out.println("Testing with " + u); + HttpRequest request = HttpRequest.newBuilder(u) + .PUT(HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + // PUT is considered idempotent. + testIdempotent(u, request, code, method); + } + + @Test(dataProvider = "uris") + public void testFoo(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + System.out.println("Testing with " + u); + HttpRequest request = HttpRequest.newBuilder(u) + .method("FOO", + HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + // FOO is considered idempotent. + testIdempotent(u, request, code, method); + } + + @Test(dataProvider = "uris") + public void testGet(URI uri, int code, String method) throws Exception { + URI u = uri.resolve("foo?n=" + requestCounter.incrementAndGet()); + System.out.println("Testing with " + u); + HttpRequest request = HttpRequest.newBuilder(u) + .method("GET", + HttpRequest.BodyPublishers.ofString(REQUEST_BODY)).build(); + CompletableFuture> respCf = + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()); + HttpResponse resp = respCf.join(); + // body will be preserved except for 304 and 303: this is a GET. + if (method.equals("DO_NOT_FOLLOW")) { + assertEquals(resp.statusCode(), code, u + ": status code"); + } else { + assertEquals(resp.statusCode(), 200, u + ": status code"); + } + if (code == 304) { + assertEquals(resp.body(), "", u + ": body"); + } else if (method.equals("DO_NOT_FOLLOW")) { + assertNotEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + assertNotEquals(resp.body(), REQUEST_BODY, u + ": body"); + } else if (code == 303) { + assertEquals(resp.body(), GET_RESPONSE_BODY, u + ": body"); + } else { + assertEquals(resp.body(), REQUEST_BODY, u + ": body"); + } + } + + @AfterClass + public void tearDown() { + proxy = stop(proxy, DigestEchoServer.TunnelingProxy::stop); + http1Server = stop(http1Server, HttpTestServer::stop); + https1Server = stop(https1Server, HttpTestServer::stop); + http2Server = stop(http2Server, HttpTestServer::stop); + https2Server = stop(https2Server, HttpTestServer::stop); + client = null; + try { + executor.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + executor.shutdownNow(); + } + try { + clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); + } catch (Throwable x) { + } finally { + clientexec.shutdownNow(); + } + System.out.println("Teardown: done"); + } + + private interface Stoppable { public void stop(T service) throws Exception; } + + static T stop(T service, Stoppable stop) { + try { if (service != null) stop.stop(service); } catch (Throwable x) { }; + return null; + } + + static class HttpProxySelector extends ProxySelector { + private static final List NO_PROXY = List.of(Proxy.NO_PROXY); + private final List proxyList; + HttpProxySelector(InetSocketAddress proxyAddress) { + proxyList = List.of(new Proxy(Proxy.Type.HTTP, proxyAddress)); + } + + @Override + public List select(URI uri) { + // our proxy only supports tunneling + if (uri.getScheme().equalsIgnoreCase("https")) { + if (uri.getPath().contains("/proxy/")) { + return proxyList; + } + } + return NO_PROXY; + } + + @Override + public void connectFailed(URI uri, SocketAddress sa, IOException ioe) { + System.err.println("Connection to proxy failed: " + ioe); + System.err.println("Proxy: " + sa); + System.err.println("\tURI: " + uri); + ioe.printStackTrace(); + } + } + + public static class HttpTestRedirectHandler implements HttpTestHandler { + static final AtomicLong respCounter = new AtomicLong(); + final String scheme; + final HttpTestServer server; + HttpTestRedirectHandler(String scheme, HttpTestServer server) { + this.scheme = scheme; + this.server = server; + } + + @Override + public void handle(HttpTestExchange t) throws IOException { + try (InputStream is = t.getRequestBody()) { + byte[] bytes = is.readAllBytes(); + URI u = t.getRequestURI(); + long responseID = Long.parseLong(u.getQuery().substring(2)); + String path = u.getPath(); + int i = path.lastIndexOf('/'); + String file = path.substring(i+1); + String parent = path.substring(0, i); + int code = 200; + if (file.equals("foo")) { + i = parent.lastIndexOf("/"); + code = Integer.parseInt(parent.substring(i+1)); + } + String response; + if (code == 200) { + if (t.getRequestMethod().equals("GET")) { + if (bytes.length == 0) { + response = GET_RESPONSE_BODY; + } else { + response = new String(bytes, StandardCharsets.UTF_8); + } + } else if (t.getRequestMethod().equals("POST")) { + response = new String(bytes, StandardCharsets.UTF_8); + } else { + response = new String(bytes, StandardCharsets.UTF_8); + } + } else if (code < 300 || code > 399) { + response = "Unexpected code: " + code; + code = 400; + } else { + try { + URI reloc = new URI(scheme, server.serverAuthority(), parent + "/bar", u.getQuery(), null); + t.getResponseHeaders().addHeader("Location", reloc.toASCIIString()); + if (code != 304) { + response = "Code: " + code; + } else response = null; + } catch (URISyntaxException x) { + x.printStackTrace(); + x.printStackTrace(System.out); + code = 400; + response = x.toString(); + } + } + + System.out.println("Server " + t.getRequestURI() + " sending response " + responseID); + System.out.println("code: " + code + " body: " + response); + t.sendResponseHeaders(code, code == 304 ? 0: -1); + if (code != 304) { + try (OutputStream os = t.getResponseBody()) { + bytes = response.getBytes(StandardCharsets.UTF_8); + os.write(bytes); + os.flush(); + } + } else { + bytes = new byte[0]; + } + + System.out.println("\tresp:" + responseID + ": wrote " + bytes.length + " bytes"); + } catch (Throwable e) { + e.printStackTrace(); + e.printStackTrace(System.out); + throw e; + } + } + } + +} diff --git a/test/jdk/java/net/httpclient/http2/RedirectTest.java b/test/jdk/java/net/httpclient/http2/RedirectTest.java index bf886502954..b51c4df42ea 100644 --- a/test/jdk/java/net/httpclient/http2/RedirectTest.java +++ b/test/jdk/java/net/httpclient/http2/RedirectTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2019, 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 @@ -87,6 +87,11 @@ public class RedirectTest { } } + @Override + protected int redirectCode() { + return 308; // we need to use a code that preserves the body + } + public synchronized boolean error() { return error; } diff --git a/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java b/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java index 42d269de81a..97ea94b7b91 100644 --- a/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java +++ b/test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2019, 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 @@ -42,11 +42,11 @@ public class Http2RedirectHandler implements Http2Handler { is.readAllBytes(); String location = supplier.get(); System.err.printf("RedirectHandler request to %s from %s\n", - t.getRequestURI().toString(), t.getRemoteAddress().toString()); + t.getRequestURI().toString(), t.getRemoteAddress().toString()); System.err.println("Redirecting to: " + location); HttpHeadersBuilder headersBuilder = t.getResponseHeaders(); headersBuilder.addHeader("Location", location); - t.sendResponseHeaders(301, 1024); + t.sendResponseHeaders(redirectCode(), 1024); byte[] bb = new byte[1024]; OutputStream os = t.getResponseBody(); os.write(bb); @@ -55,6 +55,10 @@ public class Http2RedirectHandler implements Http2Handler { } } + protected int redirectCode() { + return 301; + } + // override in sub-class to examine the exchange, but don't // alter transaction state by reading the request body etc. protected void examineExchange(Http2TestExchange t) { From bbc4e0d9990a4dbb0aed005caa5816ccdf68960c Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Wed, 23 Oct 2019 17:35:32 +0200 Subject: [PATCH 055/163] 8232882: GCC 4.8.5 build failure after JDK-8211073 Reviewed-by: thartmann --- src/hotspot/share/opto/memnode.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp index b7bc62365be..ee2f1ae1fd2 100644 --- a/src/hotspot/share/opto/memnode.cpp +++ b/src/hotspot/share/opto/memnode.cpp @@ -736,9 +736,7 @@ Node* MemNode::find_previous_store(PhaseTransform* phase) { // Also, asserts a cross-check of the type against the expected address type. const TypePtr* MemNode::calculate_adr_type(const Type* t, const TypePtr* cross_check) { if (t == Type::TOP) return NULL; // does not touch memory any more? - #ifdef PRODUCT - cross_check = NULL; - #else + #ifdef ASSERT if (!VerifyAliases || VMError::is_error_reported() || Node::in_dump()) cross_check = NULL; #endif const TypePtr* tp = t->isa_ptr(); From 36ac846d351c95cb0e29b71491cd300f44277c17 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Wed, 23 Oct 2019 18:34:25 +0200 Subject: [PATCH 056/163] 8232881: Remove unnecessary InstanceKlass::casts Reviewed-by: coleenp --- src/hotspot/share/classfile/classListParser.cpp | 8 ++++---- src/hotspot/share/classfile/defaultMethods.cpp | 2 +- src/hotspot/share/classfile/systemDictionary.cpp | 10 +++++----- src/hotspot/share/classfile/verificationType.cpp | 2 +- src/hotspot/share/jvmci/jvmciRuntime.cpp | 2 +- src/hotspot/share/prims/jniCheck.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/hotspot/share/classfile/classListParser.cpp b/src/hotspot/share/classfile/classListParser.cpp index 54477e13291..2f05b9d2cfd 100644 --- a/src/hotspot/share/classfile/classListParser.cpp +++ b/src/hotspot/share/classfile/classListParser.cpp @@ -229,17 +229,17 @@ void ClassListParser::print_specified_interfaces() { jio_fprintf(defaultStream::error_stream(), "}\n"); } -void ClassListParser::print_actual_interfaces(InstanceKlass *ik) { +void ClassListParser::print_actual_interfaces(InstanceKlass* ik) { int n = ik->local_interfaces()->length(); jio_fprintf(defaultStream::error_stream(), "Actual interfaces[%d] = {\n", n); for (int i = 0; i < n; i++) { - InstanceKlass* e = InstanceKlass::cast(ik->local_interfaces()->at(i)); + InstanceKlass* e = ik->local_interfaces()->at(i); jio_fprintf(defaultStream::error_stream(), " %s\n", e->name()->as_klass_external_name()); } jio_fprintf(defaultStream::error_stream(), "}\n"); } -void ClassListParser::error(const char *msg, ...) { +void ClassListParser::error(const char* msg, ...) { va_list ap; va_start(ap, msg); int error_index = _token - _line; @@ -328,7 +328,7 @@ InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS Klass* ClassListParser::load_current_class(TRAPS) { TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name); - Klass *klass = NULL; + Klass* klass = NULL; if (!is_loading_from_source()) { // Load classes for the boot/platform/app loaders only. if (is_super_specified()) { diff --git a/src/hotspot/share/classfile/defaultMethods.cpp b/src/hotspot/share/classfile/defaultMethods.cpp index dec8223ec90..5b69e8b74f5 100644 --- a/src/hotspot/share/classfile/defaultMethods.cpp +++ b/src/hotspot/share/classfile/defaultMethods.cpp @@ -146,7 +146,7 @@ class HierarchyVisitor : StackObj { return interface_index() >= number_of_interfaces(); } InstanceKlass* interface_at(int index) { - return InstanceKlass::cast(_class->local_interfaces()->at(index)); + return _class->local_interfaces()->at(index); } InstanceKlass* next_super() { return _class->java_super(); } InstanceKlass* next_interface() { diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index 7397d697215..c19dc4c042a 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -1989,14 +1989,14 @@ void SystemDictionary::resolve_well_known_classes(TRAPS) { resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Reference_klass), scan, CHECK); // Preload ref klasses and set reference types - InstanceKlass::cast(WK_KLASS(Reference_klass))->set_reference_type(REF_OTHER); + WK_KLASS(Reference_klass)->set_reference_type(REF_OTHER); InstanceRefKlass::update_nonstatic_oop_maps(WK_KLASS(Reference_klass)); resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(PhantomReference_klass), scan, CHECK); - InstanceKlass::cast(WK_KLASS(SoftReference_klass))->set_reference_type(REF_SOFT); - InstanceKlass::cast(WK_KLASS(WeakReference_klass))->set_reference_type(REF_WEAK); - InstanceKlass::cast(WK_KLASS(FinalReference_klass))->set_reference_type(REF_FINAL); - InstanceKlass::cast(WK_KLASS(PhantomReference_klass))->set_reference_type(REF_PHANTOM); + WK_KLASS(SoftReference_klass)->set_reference_type(REF_SOFT); + WK_KLASS(WeakReference_klass)->set_reference_type(REF_WEAK); + WK_KLASS(FinalReference_klass)->set_reference_type(REF_FINAL); + WK_KLASS(PhantomReference_klass)->set_reference_type(REF_PHANTOM); // JSR 292 classes WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass); diff --git a/src/hotspot/share/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp index 361aa441652..623495c3a1c 100644 --- a/src/hotspot/share/classfile/verificationType.cpp +++ b/src/hotspot/share/classfile/verificationType.cpp @@ -71,7 +71,7 @@ bool VerificationType::resolve_and_check_assignability(InstanceKlass* klass, Sym if (log_is_enabled(Debug, class, resolve)) { Verifier::trace_class_resolution(from_class, klass); } - return InstanceKlass::cast(from_class)->is_subclass_of(this_class); + return from_class->is_subclass_of(this_class); } return false; diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp index 9c73cb5a450..5f91e167fd6 100644 --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp @@ -1271,7 +1271,7 @@ InstanceKlass* JVMCIRuntime::get_instance_klass_for_declared_method_holder(Klass if (method_holder->is_instance_klass()) { return InstanceKlass::cast(method_holder); } else if (method_holder->is_array_klass()) { - return InstanceKlass::cast(SystemDictionary::Object_klass()); + return SystemDictionary::Object_klass(); } else { ShouldNotReachHere(); } diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp index 9c2c89015e4..983f5e5eb69 100644 --- a/src/hotspot/share/prims/jniCheck.cpp +++ b/src/hotspot/share/prims/jniCheck.cpp @@ -266,7 +266,7 @@ checkStaticFieldID(JavaThread* thr, jfieldID fid, jclass cls, int ftype) /* check for proper subclass hierarchy */ JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fid); Klass* f_oop = id->holder(); - if (!InstanceKlass::cast(k_oop)->is_subtype_of(f_oop)) + if (!k_oop->is_subtype_of(f_oop)) ReportJNIFatalError(thr, fatal_wrong_static_field); /* check for proper field type */ @@ -513,7 +513,7 @@ void jniCheck::validate_throwable_klass(JavaThread* thr, Klass* klass) { assert(klass != NULL, "klass argument must have a value"); if (!klass->is_instance_klass() || - !InstanceKlass::cast(klass)->is_subclass_of(SystemDictionary::Throwable_klass())) { + !klass->is_subclass_of(SystemDictionary::Throwable_klass())) { ReportJNIFatalError(thr, fatal_class_not_a_throwable_class); } } From d8240afe426629bca916e5a170ca7098647396fa Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Wed, 23 Oct 2019 13:01:40 -0700 Subject: [PATCH 057/163] 8232442: Suppress warnings on non-serializable non-transient instance fields in java.management.* Reviewed-by: rriggs, mchung --- .../classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java | 5 +++-- .../classes/javax/management/remote/rmi/RMIConnector.java | 3 ++- .../share/classes/javax/management/Attribute.java | 3 ++- .../javax/management/AttributeChangeNotification.java | 4 +++- .../javax/management/BadAttributeValueExpException.java | 3 ++- .../classes/javax/management/ImmutableDescriptor.java | 3 ++- .../javax/management/InvalidApplicationException.java | 3 ++- .../javax/management/NotificationFilterSupport.java | 3 ++- .../classes/javax/management/loading/PrivateMLet.java | 3 ++- .../javax/management/monitor/MonitorNotification.java | 5 ++++- .../javax/management/openmbean/CompositeDataSupport.java | 3 ++- .../openmbean/OpenMBeanAttributeInfoSupport.java | 7 ++++++- .../openmbean/OpenMBeanParameterInfoSupport.java | 7 ++++++- .../javax/management/openmbean/TabularDataSupport.java | 3 ++- .../classes/javax/management/openmbean/TabularType.java | 3 ++- .../share/classes/sun/management/LazyCompositeData.java | 3 ++- .../classes/sun/management/LockInfoCompositeData.java | 3 ++- .../sun/management/MemoryNotifInfoCompositeData.java | 3 ++- .../classes/sun/management/MemoryUsageCompositeData.java | 3 ++- .../classes/sun/management/MonitorInfoCompositeData.java | 3 ++- .../classes/sun/management/ThreadInfoCompositeData.java | 4 +++- .../sun/management/counter/perf/PerfByteArrayCounter.java | 3 ++- .../sun/management/counter/perf/PerfLongArrayCounter.java | 4 +++- .../sun/management/counter/perf/PerfLongCounter.java | 3 ++- 24 files changed, 62 insertions(+), 25 deletions(-) diff --git a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java index a86f26b90c9..8dd0932020b 100644 --- a/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java +++ b/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -35,7 +35,8 @@ import java.rmi.server.RemoteObject; import java.rmi.server.RemoteRef; -@SuppressWarnings("deprecation") +@SuppressWarnings({"deprecation", + "serial"}) // Externalizable class w/o no-arg c'tor public class ProxyRef implements RemoteRef { private static final long serialVersionUID = -6503061366316814723L; diff --git a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java index 200340136ea..f493a800f20 100644 --- a/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java +++ b/src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2019, 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 @@ -2245,6 +2245,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable * * @see #RMIConnector(RMIServer,Map) **/ + @SuppressWarnings("serial") // Not statically typed as Serializable private final RMIServer rmiServer; /** diff --git a/src/java.management/share/classes/javax/management/Attribute.java b/src/java.management/share/classes/javax/management/Attribute.java index 64d9bb290d8..21593bd67b8 100644 --- a/src/java.management/share/classes/javax/management/Attribute.java +++ b/src/java.management/share/classes/javax/management/Attribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -49,6 +49,7 @@ public class Attribute implements Serializable { /** * @serial Attribute value */ + @SuppressWarnings("serial") // Conditionally serializable private Object value= null; diff --git a/src/java.management/share/classes/javax/management/AttributeChangeNotification.java b/src/java.management/share/classes/javax/management/AttributeChangeNotification.java index 62870a3dd0a..eb08b33d6d2 100644 --- a/src/java.management/share/classes/javax/management/AttributeChangeNotification.java +++ b/src/java.management/share/classes/javax/management/AttributeChangeNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -74,11 +74,13 @@ public class AttributeChangeNotification extends javax.management.Notification { /** * @serial The MBean attribute old value. */ + @SuppressWarnings("serial") // Conditionally serializable private Object oldValue = null; /** * @serial The MBean attribute new value. */ + @SuppressWarnings("serial") // Conditionally serializable private Object newValue = null; diff --git a/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java index d343338a4f3..e9a27e4d7b6 100644 --- a/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java +++ b/src/java.management/share/classes/javax/management/BadAttributeValueExpException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -47,6 +47,7 @@ public class BadAttributeValueExpException extends Exception { * @serial A string representation of the attribute that originated this exception. * for example, the string value can be the return of {@code attribute.toString()} */ + @SuppressWarnings("serial") // See handling in constructor and readObject private Object val; /** diff --git a/src/java.management/share/classes/javax/management/ImmutableDescriptor.java b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java index 64764a55e39..675c1990590 100644 --- a/src/java.management/share/classes/javax/management/ImmutableDescriptor.java +++ b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2019, 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 @@ -52,6 +52,7 @@ public class ImmutableDescriptor implements Descriptor { * elements in this array match the corresponding elements in the * {@code names} array. */ + @SuppressWarnings("serial") // Conditionally serializable private final Object[] values; private transient int hashCode = -1; diff --git a/src/java.management/share/classes/javax/management/InvalidApplicationException.java b/src/java.management/share/classes/javax/management/InvalidApplicationException.java index 63a5a0cd2a5..31371ac1663 100644 --- a/src/java.management/share/classes/javax/management/InvalidApplicationException.java +++ b/src/java.management/share/classes/javax/management/InvalidApplicationException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -44,6 +44,7 @@ public class InvalidApplicationException extends Exception { /** * @serial The object representing the class of the MBean */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object val; diff --git a/src/java.management/share/classes/javax/management/NotificationFilterSupport.java b/src/java.management/share/classes/javax/management/NotificationFilterSupport.java index 7979d46c49a..c67298de2fc 100644 --- a/src/java.management/share/classes/javax/management/NotificationFilterSupport.java +++ b/src/java.management/share/classes/javax/management/NotificationFilterSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -64,6 +64,7 @@ public class NotificationFilterSupport implements NotificationFilter { * @serial {@link Vector} that contains the enabled notification types. * The default value is an empty vector. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private List enabledTypes = new Vector(); diff --git a/src/java.management/share/classes/javax/management/loading/PrivateMLet.java b/src/java.management/share/classes/javax/management/loading/PrivateMLet.java index 0b5535bda79..f9b0d0ebd77 100644 --- a/src/java.management/share/classes/javax/management/loading/PrivateMLet.java +++ b/src/java.management/share/classes/javax/management/loading/PrivateMLet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2019, 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 @@ -38,6 +38,7 @@ import java.net.URLStreamHandlerFactory; * * @since 1.5 */ +@SuppressWarnings("serial") // Externalizable class w/o no-arg c'tor public class PrivateMLet extends MLet implements PrivateClassLoader { private static final long serialVersionUID = 2503458973393711979L; diff --git a/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java index a82ca882a9c..614fc4d64ee 100644 --- a/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java +++ b/src/java.management/share/classes/javax/management/monitor/MonitorNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2019, 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 @@ -162,6 +162,7 @@ public class MonitorNotification extends javax.management.Notification { /** * @serial Monitor notification observed object. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private ObjectName observedObject = null; /** @@ -172,6 +173,7 @@ public class MonitorNotification extends javax.management.Notification { /** * @serial Monitor notification derived gauge. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object derivedGauge = null; /** @@ -179,6 +181,7 @@ public class MonitorNotification extends javax.management.Notification { * This value is used to keep the threshold/string (depending on the * monitor type) that triggered off this notification. */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object trigger = null; diff --git a/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java index 38c74692698..373c9e602fa 100644 --- a/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java +++ b/src/java.management/share/classes/javax/management/openmbean/CompositeDataSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2019, 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 @@ -62,6 +62,7 @@ public class CompositeDataSupport * respective values. * A {@link SortedMap} is used for faster retrieval of elements. */ + @SuppressWarnings("serial") // Conditionally serializable private final SortedMap contents; /** diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java index 9ea4c987673..a7ff232e8e4 100644 --- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java +++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2019, 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 @@ -64,27 +64,32 @@ public class OpenMBeanAttributeInfoSupport /** * @serial The open mbean attribute's open type */ + @SuppressWarnings("serial") // Not statically typed as Serializable private OpenType openType; /** * @serial The open mbean attribute's default value */ + @SuppressWarnings("serial") // Not statically typed as Serializable private final Object defaultValue; /** * @serial The open mbean attribute's legal values. This {@link * Set} is unmodifiable */ + @SuppressWarnings("serial") // Conditionally serializable private final Set legalValues; // to be constructed unmodifiable /** * @serial The open mbean attribute's min value */ + @SuppressWarnings("serial") // Conditionally serializable private final Comparable minValue; /** * @serial The open mbean attribute's max value */ + @SuppressWarnings("serial") // Conditionally serializable private final Comparable maxValue; diff --git a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java index 4cf21fd89a1..454f089650d 100644 --- a/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java +++ b/src/java.management/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2019, 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 @@ -58,27 +58,32 @@ public class OpenMBeanParameterInfoSupport /** * @serial The open mbean parameter's open type */ + @SuppressWarnings("serial") // Not statically typed as Serializable private OpenType openType; /** * @serial The open mbean parameter's default value */ + @SuppressWarnings("serial") // Not statically typed as Serializable private Object defaultValue = null; /** * @serial The open mbean parameter's legal values. This {@link * Set} is unmodifiable */ + @SuppressWarnings("serial") // Conditionally serializable private Set legalValues = null; // to be constructed unmodifiable /** * @serial The open mbean parameter's min value */ + @SuppressWarnings("serial") // Conditionally serializable private Comparable minValue = null; /** * @serial The open mbean parameter's max value */ + @SuppressWarnings("serial") // Conditionally serializable private Comparable maxValue = null; diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java index 28092a5cbd9..7dd47dc5393 100644 --- a/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java +++ b/src/java.management/share/classes/javax/management/openmbean/TabularDataSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2019, 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 @@ -86,6 +86,7 @@ public class TabularDataSupport * @serial This tabular data instance's contents: a {@link HashMap} */ // field cannot be final because of clone method + @SuppressWarnings("serial") // Conditionally serializable private Map dataMap; /** diff --git a/src/java.management/share/classes/javax/management/openmbean/TabularType.java b/src/java.management/share/classes/javax/management/openmbean/TabularType.java index bb72d228e06..11e5e61f4d1 100644 --- a/src/java.management/share/classes/javax/management/openmbean/TabularType.java +++ b/src/java.management/share/classes/javax/management/openmbean/TabularType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2019, 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,6 +59,7 @@ public class TabularType extends OpenType { * @serial The items used to index each row element, kept in the order the user gave * This is an unmodifiable {@link ArrayList} */ + @SuppressWarnings("serial") // Conditionally serializable private List indexNames; diff --git a/src/java.management/share/classes/sun/management/LazyCompositeData.java b/src/java.management/share/classes/sun/management/LazyCompositeData.java index 879c11bfeef..9d1ddd354dd 100644 --- a/src/java.management/share/classes/sun/management/LazyCompositeData.java +++ b/src/java.management/share/classes/sun/management/LazyCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2019, 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 @@ -46,6 +46,7 @@ import javax.management.openmbean.TabularType; public abstract class LazyCompositeData implements CompositeData, Serializable { + @SuppressWarnings("serial") // Not statically typed as Serializable private CompositeData compositeData; // Implementation of the CompositeData interface diff --git a/src/java.management/share/classes/sun/management/LockInfoCompositeData.java b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java index b62e236a3da..087ce3d780e 100644 --- a/src/java.management/share/classes/sun/management/LockInfoCompositeData.java +++ b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2019, 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 @@ -38,6 +38,7 @@ import javax.management.openmbean.OpenDataException; * construction of a CompositeData use in the local case. */ public class LockInfoCompositeData extends LazyCompositeData { + @SuppressWarnings("serial") // Not statically typed as Serializable private final LockInfo lock; private LockInfoCompositeData(LockInfo li) { diff --git a/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java b/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java index 219b2d9fbc1..d8eb6ad3b5a 100644 --- a/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java +++ b/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2019, 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 @@ -38,6 +38,7 @@ import javax.management.openmbean.OpenDataException; * construction of a CompositeData use in the local case. */ public class MemoryNotifInfoCompositeData extends LazyCompositeData { + @SuppressWarnings("serial") // Not statically typed as Serializable private final MemoryNotificationInfo memoryNotifInfo; private MemoryNotifInfoCompositeData(MemoryNotificationInfo info) { diff --git a/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java b/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java index 0b3a6e0656f..7413757e713 100644 --- a/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java +++ b/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2019, 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 @@ -37,6 +37,7 @@ import javax.management.openmbean.OpenDataException; * construction of a CompositeData use in the local case. */ public class MemoryUsageCompositeData extends LazyCompositeData { + @SuppressWarnings("serial") // Not statically typed as Serializable private final MemoryUsage usage; private MemoryUsageCompositeData(MemoryUsage u) { diff --git a/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java b/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java index d10e07d6e31..3c6d51f7999 100644 --- a/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java +++ b/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2019, 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 @@ -40,6 +40,7 @@ import javax.management.openmbean.OpenType; * construction of a CompositeData use in the local case. */ public class MonitorInfoCompositeData extends LazyCompositeData { + @SuppressWarnings("serial") // Not statically typed as Serializable private final MonitorInfo lock; private MonitorInfoCompositeData(MonitorInfo mi) { diff --git a/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java b/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java index 29a474630fb..ee8c7739d78 100644 --- a/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java +++ b/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2019, 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 @@ -45,7 +45,9 @@ import javax.management.openmbean.OpenType; * construction of a CompositeData use in the local case. */ public class ThreadInfoCompositeData extends LazyCompositeData { + @SuppressWarnings("serial") // Not statically typed as Serializable private final ThreadInfo threadInfo; + @SuppressWarnings("serial") // Not statically typed as Serializable private final CompositeData cdata; private ThreadInfoCompositeData(ThreadInfo ti) { diff --git a/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java index 615d5697472..9a637f9e269 100644 --- a/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java +++ b/src/java.management/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -31,6 +31,7 @@ import java.nio.*; public class PerfByteArrayCounter extends AbstractCounter implements ByteArrayCounter { + @SuppressWarnings("serial") // Value indirectly copied as a byte[] in writeReplace ByteBuffer bb; PerfByteArrayCounter(String name, Units u, Variability v, diff --git a/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java index bb48e8e2cdb..2acc852d70a 100644 --- a/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java +++ b/src/java.management/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -33,6 +33,8 @@ import java.nio.ReadOnlyBufferException; public class PerfLongArrayCounter extends AbstractCounter implements LongArrayCounter { + + @SuppressWarnings("serial") // Value indirectly copied as a long[] in writeReplace LongBuffer lb; PerfLongArrayCounter(String name, Units u, Variability v, diff --git a/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java b/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java index b0246ed717a..c75e5487226 100644 --- a/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java +++ b/src/java.management/share/classes/sun/management/counter/perf/PerfLongCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -32,6 +32,7 @@ import java.nio.ReadOnlyBufferException; public class PerfLongCounter extends AbstractCounter implements LongCounter { + @SuppressWarnings("serial") // Value indirectly copied as a long[] in writeReplace LongBuffer lb; // package private From 3f50e2563e9fa7d3e652a20636641257b5f5097a Mon Sep 17 00:00:00 2001 From: Jesper Wilhelmsson Date: Thu, 24 Oct 2019 02:58:29 +0200 Subject: [PATCH 058/163] Added tag jdk-14+20 for changeset 54ffb15c4839 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 96fe2d789bd..3e8bf7fc86e 100644 --- a/.hgtags +++ b/.hgtags @@ -592,3 +592,4 @@ d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16 5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17 e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18 9b67dd88a9313e982ec5f710a7747161bc8f0c23 jdk-14+19 +54ffb15c48399dd59922ee22bb592d815307e77c jdk-14+20 From 68e5c40f6f0f42a893595d2a3ecbebcd81742543 Mon Sep 17 00:00:00 2001 From: Paul Hohensee Date: Wed, 23 Oct 2019 18:43:18 -0700 Subject: [PATCH 059/163] 8231968: getCurrentThreadAllocatedBytes default implementation s/b getThreadAllocatedBytes Pass Thread.currentThread().getId() to getThreadAllocatedBytes, remove its implSpec Reviewed-by: dholmes, mchung, sspitsyn --- .../share/classes/com/sun/management/ThreadMXBean.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java b/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java index edfdff2e565..7023fab721e 100644 --- a/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java +++ b/src/jdk.management/share/classes/com/sun/management/ThreadMXBean.java @@ -122,9 +122,6 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean { * {@link #getThreadAllocatedBytes getThreadAllocatedBytes}(Thread.currentThread().getId()); * * - * @implSpec The default implementation throws - * {@code UnsupportedOperationException}. - * * @return an approximation of the total memory allocated, in bytes, in * heap memory for the current thread * if thread memory allocation measurement is enabled; @@ -141,7 +138,7 @@ public interface ThreadMXBean extends java.lang.management.ThreadMXBean { * @since 14 */ public default long getCurrentThreadAllocatedBytes() { - throw new UnsupportedOperationException(); + return getThreadAllocatedBytes(Thread.currentThread().getId()); } /** From 574263a88429ef5ca6c7afae7a7359404725144f Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Thu, 24 Oct 2019 09:57:29 +0200 Subject: [PATCH 060/163] 8232613: Move Object.registerNatives into HotSpot Reviewed-by: dholmes, adinn, coleenp, lfoltan, mchung --- src/hotspot/share/classfile/javaClasses.cpp | 15 ++ src/hotspot/share/classfile/javaClasses.hpp | 7 + .../share/classfile/systemDictionary.cpp | 4 + .../share/classfile/systemDictionary.hpp | 17 -- src/hotspot/share/oops/method.cpp | 77 ++++++++ src/hotspot/share/oops/method.hpp | 6 + src/hotspot/share/prims/jni.cpp | 87 +-------- .../share/classes/java/lang/Object.java | 5 - src/java.base/share/native/libjava/Object.c | 15 -- .../java.base/java/lang/Object.java | 5 - .../runtime/8024804/RegisterNatives.java | 28 ++- .../jvmti/RedefineClasses/RedefineObject.java | 177 ++++++++++++++++++ .../java.base/java/lang/Object.java | 5 - 13 files changed, 312 insertions(+), 136 deletions(-) create mode 100644 test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 7f4c2a8cd4d..409bf6abc5b 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -87,6 +87,21 @@ InjectedField JavaClasses::_injected_fields[] = { ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD) }; +// Register native methods of Object +void java_lang_Object::register_natives(TRAPS) { + InstanceKlass* obj = SystemDictionary::Object_klass(); + Method::register_native(obj, vmSymbols::hashCode_name(), + vmSymbols::void_int_signature(), (address) &JVM_IHashCode, CHECK); + Method::register_native(obj, vmSymbols::wait_name(), + vmSymbols::long_void_signature(), (address) &JVM_MonitorWait, CHECK); + Method::register_native(obj, vmSymbols::notify_name(), + vmSymbols::void_method_signature(), (address) &JVM_MonitorNotify, CHECK); + Method::register_native(obj, vmSymbols::notifyAll_name(), + vmSymbols::void_method_signature(), (address) &JVM_MonitorNotifyAll, CHECK); + Method::register_native(obj, vmSymbols::clone_name(), + vmSymbols::void_object_signature(), (address) &JVM_Clone, THREAD); +} + int JavaClasses::compute_injected_offset(InjectedFieldID id) { return _injected_fields[id].compute_offset(); } diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp index cc52154efa3..a24d3c0f2e3 100644 --- a/src/hotspot/share/classfile/javaClasses.hpp +++ b/src/hotspot/share/classfile/javaClasses.hpp @@ -88,6 +88,13 @@ BASIC_JAVA_CLASSES_DO_PART1(f) \ BASIC_JAVA_CLASSES_DO_PART2(f) +// Interface to java.lang.Object objects + +class java_lang_Object : AllStatic { + public: + static void register_natives(TRAPS); +}; + // Interface to java.lang.String objects class java_lang_String : AllStatic { diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index c19dc4c042a..af9b4695957 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -1972,6 +1972,10 @@ void SystemDictionary::resolve_well_known_classes(TRAPS) { resolve_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK); } + assert(WK_KLASS(Object_klass) != NULL, "well-known classes should now be initialized"); + + java_lang_Object::register_natives(CHECK); + // Calculate offsets for String and Class classes since they are loaded and // can be used after this point. java_lang_String::compute_offsets(); diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp index 83362c024d5..d54ab22b797 100644 --- a/src/hotspot/share/classfile/systemDictionary.hpp +++ b/src/hotspot/share/classfile/systemDictionary.hpp @@ -219,7 +219,6 @@ class GCTimer; \ /*end*/ - class SystemDictionary : AllStatic { friend class BootstrapInfo; friend class VMStructs; @@ -383,7 +382,6 @@ public: int limit = (int)end_id + 1; resolve_wk_klasses_until((WKID) limit, start_id, THREAD); } - public: #define WK_KLASS_DECLARE(name, symbol) \ static InstanceKlass* name() { return check_klass(_well_known_klasses[WK_KLASS_ENUM_NAME(name)]); } \ @@ -628,21 +626,6 @@ protected: // Basic find on classes in the midst of being loaded static Symbol* find_placeholder(Symbol* name, ClassLoaderData* loader_data); - // Add a placeholder for a class being loaded - static void add_placeholder(int index, - Symbol* class_name, - ClassLoaderData* loader_data); - static void remove_placeholder(int index, - Symbol* class_name, - ClassLoaderData* loader_data); - - // Performs cleanups after resolve_super_or_fail. This typically needs - // to be called on failure. - // Won't throw, but can block. - static void resolution_cleanups(Symbol* class_name, - ClassLoaderData* loader_data, - TRAPS); - // Resolve well-known classes so they can be used like SystemDictionary::String_klass() static void resolve_well_known_classes(TRAPS); diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp index a86e5df96b5..29523eec29b 100644 --- a/src/hotspot/share/oops/method.cpp +++ b/src/hotspot/share/oops/method.cpp @@ -25,6 +25,7 @@ #include "precompiled.hpp" #include "classfile/classLoaderDataGraph.hpp" #include "classfile/metadataOnStackMark.hpp" +#include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp" #include "code/codeCache.hpp" #include "code/debugInfoRec.hpp" @@ -378,7 +379,83 @@ void Method::set_itable_index(int index) { assert(valid_itable_index(), ""); } +// The RegisterNatives call being attempted tried to register with a method that +// is not native. Ask JVM TI what prefixes have been specified. Then check +// to see if the native method is now wrapped with the prefixes. See the +// SetNativeMethodPrefix(es) functions in the JVM TI Spec for details. +static Method* find_prefixed_native(Klass* k, Symbol* name, Symbol* signature, TRAPS) { +#if INCLUDE_JVMTI + ResourceMark rm(THREAD); + Method* method; + int name_len = name->utf8_length(); + char* name_str = name->as_utf8(); + int prefix_count; + char** prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count); + for (int i = 0; i < prefix_count; i++) { + char* prefix = prefixes[i]; + int prefix_len = (int)strlen(prefix); + // try adding this prefix to the method name and see if it matches another method name + int trial_len = name_len + prefix_len; + char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1); + strcpy(trial_name_str, prefix); + strcat(trial_name_str, name_str); + TempNewSymbol trial_name = SymbolTable::probe(trial_name_str, trial_len); + if (trial_name == NULL) { + continue; // no such symbol, so this prefix wasn't used, try the next prefix + } + method = k->lookup_method(trial_name, signature); + if (method == NULL) { + continue; // signature doesn't match, try the next prefix + } + if (method->is_native()) { + method->set_is_prefixed_native(); + return method; // wahoo, we found a prefixed version of the method, return it + } + // found as non-native, so prefix is good, add it, probably just need more prefixes + name_len = trial_len; + name_str = trial_name_str; + } +#endif // INCLUDE_JVMTI + return NULL; // not found +} + +bool Method::register_native(Klass* k, Symbol* name, Symbol* signature, address entry, TRAPS) { + Method* method = k->lookup_method(name, signature); + if (method == NULL) { + ResourceMark rm(THREAD); + stringStream st; + st.print("Method '"); + print_external_name(&st, k, name, signature); + st.print("' name or signature does not match"); + THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), false); + } + if (!method->is_native()) { + // trying to register to a non-native method, see if a JVM TI agent has added prefix(es) + method = find_prefixed_native(k, name, signature, THREAD); + if (method == NULL) { + ResourceMark rm(THREAD); + stringStream st; + st.print("Method '"); + print_external_name(&st, k, name, signature); + st.print("' is not declared as native"); + THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), false); + } + } + + if (entry != NULL) { + method->set_native_function(entry, native_bind_event_is_interesting); + } else { + method->clear_native_function(); + } + if (PrintJNIResolving) { + ResourceMark rm(THREAD); + tty->print_cr("[Registering JNI native method %s.%s]", + method->method_holder()->external_name(), + method->name()->as_C_string()); + } + return true; +} bool Method::was_executed_more_than(int n) { // Invocation counter is reset when the Method* is compiled. diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp index 2bc43cbd43c..59cdcc03c43 100644 --- a/src/hotspot/share/oops/method.hpp +++ b/src/hotspot/share/oops/method.hpp @@ -346,6 +346,12 @@ class Method : public Metadata { // InterpreterRuntime::exception_handler_for_exception. static int fast_exception_handler_bci_for(const methodHandle& mh, Klass* ex_klass, int throw_bci, TRAPS); + static bool register_native(Klass* k, + Symbol* name, + Symbol* signature, + address entry, + TRAPS); + // method data access MethodData* method_data() const { return _method_data; diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp index 9b7e44d9151..912b11e47f4 100644 --- a/src/hotspot/share/prims/jni.cpp +++ b/src/hotspot/share/prims/jni.cpp @@ -2909,89 +2909,6 @@ DEFINE_SETSCALARARRAYREGION(T_DOUBLE, jdouble, Double, double HOTSPOT_JNI_SETDOUBLEARRAYREGION_RETURN()) -// -// Interception of natives -// - -// The RegisterNatives call being attempted tried to register with a method that -// is not native. Ask JVM TI what prefixes have been specified. Then check -// to see if the native method is now wrapped with the prefixes. See the -// SetNativeMethodPrefix(es) functions in the JVM TI Spec for details. -static Method* find_prefixed_native(Klass* k, Symbol* name, Symbol* signature, TRAPS) { -#if INCLUDE_JVMTI - ResourceMark rm(THREAD); - Method* method; - int name_len = name->utf8_length(); - char* name_str = name->as_utf8(); - int prefix_count; - char** prefixes = JvmtiExport::get_all_native_method_prefixes(&prefix_count); - for (int i = 0; i < prefix_count; i++) { - char* prefix = prefixes[i]; - int prefix_len = (int)strlen(prefix); - - // try adding this prefix to the method name and see if it matches another method name - int trial_len = name_len + prefix_len; - char* trial_name_str = NEW_RESOURCE_ARRAY(char, trial_len + 1); - strcpy(trial_name_str, prefix); - strcat(trial_name_str, name_str); - TempNewSymbol trial_name = SymbolTable::probe(trial_name_str, trial_len); - if (trial_name == NULL) { - continue; // no such symbol, so this prefix wasn't used, try the next prefix - } - method = k->lookup_method(trial_name, signature); - if (method == NULL) { - continue; // signature doesn't match, try the next prefix - } - if (method->is_native()) { - method->set_is_prefixed_native(); - return method; // wahoo, we found a prefixed version of the method, return it - } - // found as non-native, so prefix is good, add it, probably just need more prefixes - name_len = trial_len; - name_str = trial_name_str; - } -#endif // INCLUDE_JVMTI - return NULL; // not found -} - -static bool register_native(Klass* k, Symbol* name, Symbol* signature, address entry, TRAPS) { - Method* method = k->lookup_method(name, signature); - if (method == NULL) { - ResourceMark rm; - stringStream st; - st.print("Method '"); - Method::print_external_name(&st, k, name, signature); - st.print("' name or signature does not match"); - THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), false); - } - if (!method->is_native()) { - // trying to register to a non-native method, see if a JVM TI agent has added prefix(es) - method = find_prefixed_native(k, name, signature, THREAD); - if (method == NULL) { - ResourceMark rm; - stringStream st; - st.print("Method '"); - Method::print_external_name(&st, k, name, signature); - st.print("' is not declared as native"); - THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), false); - } - } - - if (entry != NULL) { - method->set_native_function(entry, - Method::native_bind_event_is_interesting); - } else { - method->clear_native_function(); - } - if (PrintJNIResolving) { - ResourceMark rm(THREAD); - tty->print_cr("[Registering JNI native method %s.%s]", - method->method_holder()->external_name(), - method->name()->as_C_string()); - } - return true; -} - DT_RETURN_MARK_DECL(RegisterNatives, jint , HOTSPOT_JNI_REGISTERNATIVES_RETURN(_ret_ref)); @@ -3024,8 +2941,8 @@ JNI_ENTRY(jint, jni_RegisterNatives(JNIEnv *env, jclass clazz, THROW_MSG_(vmSymbols::java_lang_NoSuchMethodError(), st.as_string(), -1); } - bool res = register_native(k, name, signature, - (address) methods[index].fnPtr, THREAD); + bool res = Method::register_native(k, name, signature, + (address) methods[index].fnPtr, THREAD); if (!res) { ret = -1; break; diff --git a/src/java.base/share/classes/java/lang/Object.java b/src/java.base/share/classes/java/lang/Object.java index 8da10f21df4..5f9dbc516d6 100644 --- a/src/java.base/share/classes/java/lang/Object.java +++ b/src/java.base/share/classes/java/lang/Object.java @@ -38,11 +38,6 @@ import jdk.internal.HotSpotIntrinsicCandidate; */ public class Object { - private static native void registerNatives(); - static { - registerNatives(); - } - /** * Constructs a new object. */ diff --git a/src/java.base/share/native/libjava/Object.c b/src/java.base/share/native/libjava/Object.c index d800e086ec3..2651415ae0f 100644 --- a/src/java.base/share/native/libjava/Object.c +++ b/src/java.base/share/native/libjava/Object.c @@ -39,21 +39,6 @@ #include "java_lang_Object.h" -static JNINativeMethod methods[] = { - {"hashCode", "()I", (void *)&JVM_IHashCode}, - {"wait", "(J)V", (void *)&JVM_MonitorWait}, - {"notify", "()V", (void *)&JVM_MonitorNotify}, - {"notifyAll", "()V", (void *)&JVM_MonitorNotifyAll}, - {"clone", "()Ljava/lang/Object;", (void *)&JVM_Clone}, -}; - -JNIEXPORT void JNICALL -Java_java_lang_Object_registerNatives(JNIEnv *env, jclass cls) -{ - (*env)->RegisterNatives(env, cls, - methods, sizeof(methods)/sizeof(methods[0])); -} - JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass(JNIEnv *env, jobject this) { diff --git a/test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java b/test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java index 1b5a7ea96b5..cbe46303e08 100644 --- a/test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java +++ b/test/hotspot/jtreg/compiler/dependencies/MonomorphicObjectCall/java.base/java/lang/Object.java @@ -34,11 +34,6 @@ public class Object { @HotSpotIntrinsicCandidate public Object() {} - private static native void registerNatives(); - static { - registerNatives(); - } - @HotSpotIntrinsicCandidate public final native Class getClass(); diff --git a/test/hotspot/jtreg/runtime/8024804/RegisterNatives.java b/test/hotspot/jtreg/runtime/8024804/RegisterNatives.java index e46812752b3..60f659f63b9 100644 --- a/test/hotspot/jtreg/runtime/8024804/RegisterNatives.java +++ b/test/hotspot/jtreg/runtime/8024804/RegisterNatives.java @@ -23,15 +23,27 @@ /* * @test - * @bug 8024804 - * @bug 8028741 + * @bug 8024804 8028741 8232613 * @summary interface method resolution should skip finding j.l.Object's registerNatives() and succeed in selecting class B's registerNatives() * @run main RegisterNatives */ public class RegisterNatives { - interface I { void registerNatives(); } + interface I { + void registerNatives(); + } + interface J extends I {} - static class B implements J { public void registerNatives() { System.out.println("B"); } } + + interface K { + default public void registerNatives() { System.out.println("K"); } + } + + static class B implements J { + public void registerNatives() { System.out.println("B"); } + } + + static class C implements K {} + public static void main(String... args) { System.out.println("Regression test for JDK-8024804, crash when InterfaceMethodref resolves to Object.registerNatives\n"); J val = new B(); @@ -42,6 +54,14 @@ public class RegisterNatives { e.printStackTrace(); throw e; } + C cval = new C(); + try { + cval.registerNatives(); + } catch (IllegalAccessError e) { + System.out.println("TEST FAILS - a default method named registerNatives should no longer be masked by removed Object.registerNatives\n"); + e.printStackTrace(); + throw e; + } System.out.println("TEST PASSES - no IAE resulted\n"); } } diff --git a/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java new file mode 100644 index 00000000000..004d3b5846f --- /dev/null +++ b/test/hotspot/jtreg/serviceability/jvmti/RedefineClasses/RedefineObject.java @@ -0,0 +1,177 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8232613 + * @summary Ensure Object natives stay registered after redefinition + * @library /test/lib + * @modules java.base/jdk.internal.misc + * java.base/jdk.internal.org.objectweb.asm + * java.compiler + * java.instrument + * jdk.jartool/sun.tools.jar + * @run main RedefineObject buildagent + * @run main/othervm -javaagent:redefineagent.jar RedefineObject + */ + +import static jdk.test.lib.Asserts.assertTrue; +import java.io.FileNotFoundException; +import java.io.PrintWriter; +import java.lang.RuntimeException; +import java.lang.instrument.ClassFileTransformer; +import java.lang.instrument.IllegalClassFormatException; +import java.lang.instrument.Instrumentation; +import java.lang.instrument.UnmodifiableClassException; +import java.security.ProtectionDomain; +import java.util.Arrays; + +import jdk.internal.org.objectweb.asm.ClassReader; +import jdk.internal.org.objectweb.asm.ClassVisitor; +import jdk.internal.org.objectweb.asm.ClassWriter; + +import static jdk.internal.org.objectweb.asm.Opcodes.ASM6; +import static jdk.internal.org.objectweb.asm.Opcodes.V1_8; + +public class RedefineObject { + + static Instrumentation inst; + + public static void premain(String agentArgs, Instrumentation inst) { + RedefineObject.inst = inst; + } + + static class Transformer implements ClassFileTransformer { + + public byte[] asm(ClassLoader loader, String className, + Class classBeingRedefined, + ProtectionDomain protectionDomain, byte[] classfileBuffer) + throws IllegalClassFormatException { + ClassWriter cw = new ClassWriter(0); + // Force an older ASM to force a bytecode update + ClassVisitor cv = new DummyClassVisitor(ASM6, cw) { }; + ClassReader cr = new ClassReader(classfileBuffer); + cr.accept(cv, 0); + byte[] bytes = cw.toByteArray(); + return bytes; + } + + public class DummyClassVisitor extends ClassVisitor { + + public DummyClassVisitor(int api, ClassVisitor cv) { + super(api, cv); + } + + public void visit( + final int version, + final int access, + final String name, + final String signature, + final String superName, + final String[] interfaces) { + // Artificially lower to JDK 8 version to force a redefine + cv.visit(V1_8, access, name, signature, superName, interfaces); + } + } + + @Override public byte[] transform(ClassLoader loader, String className, + Class classBeingRedefined, + ProtectionDomain protectionDomain, byte[] classfileBuffer) + throws IllegalClassFormatException { + + if (className.contains("java/lang/Object")) { + try { + // Here we remove and re-add the dummy fields. This shuffles the constant pool + return asm(loader, className, classBeingRedefined, protectionDomain, classfileBuffer); + } catch (Throwable e) { + // The retransform native code that called this method does not propagate + // exceptions. Instead of getting an uninformative generic error, catch + // problems here and print it, then exit. + e.printStackTrace(); + System.exit(1); + } + } + return null; + } + } + + private static void buildAgent() { + try { + ClassFileInstaller.main("RedefineObject"); + } catch (Exception e) { + throw new RuntimeException("Could not write agent classfile", e); + } + + try { + PrintWriter pw = new PrintWriter("MANIFEST.MF"); + pw.println("Premain-Class: RedefineObject"); + pw.println("Agent-Class: RedefineObject"); + pw.println("Can-Retransform-Classes: true"); + pw.close(); + } catch (FileNotFoundException e) { + throw new RuntimeException("Could not write manifest file for the agent", e); + } + + sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar"); + if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineObject.class" })) { + throw new RuntimeException("Could not write the agent jar file"); + } + } + + public static void main(String[] args) throws Exception { + + int objHash = System.identityHashCode(Object.class); + System.out.println("Object hashCode: " + objHash); + if (args.length == 1 && args[0].equals("buildagent")) { + buildAgent(); + return; + } + + if (inst == null) { + throw new RuntimeException("Instrumentation object was null"); + } + + try { + inst.addTransformer(new RedefineObject.Transformer(), true); + inst.retransformClasses(Object.class); + } catch (UnmodifiableClassException e) { + throw new RuntimeException(e); + } + + // Exercise native methods on Object after transform + Object b = new Object(); + b.hashCode(); + + C c = new C(); + assertTrue(c.hashCode() != c.clone().hashCode() || c != c.clone()); + assertTrue(c.clone() instanceof C); + c = (C)c.clone(); // native method on new Object + } + + private static class C implements Cloneable { + @Override + protected Object clone() throws CloneNotSupportedException { + return super.clone(); + } + } +} diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java index 888736a9aca..d8f4875bd49 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/newclass02/java.base/java/lang/Object.java @@ -37,11 +37,6 @@ import nsk.jvmti.scenarios.bcinstr.BI04.bi04t002a; */ public class Object { - private static native void registerNatives(); - static { - registerNatives(); - } - /** * Returns the runtime class of an object. That Class * object is the object that is locked by static synchronized From 72330c70d75c73bb6f0e23315556f6ea613a900b Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Thu, 24 Oct 2019 15:53:20 +0800 Subject: [PATCH 061/163] 8231598: keytool does not export sun.security.mscapi Reviewed-by: mullan --- .../sun/security/tools/KeyStoreUtil.java | 9 +++-- .../security/mscapi/ProviderClassOption.java | 40 +++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 test/jdk/sun/security/mscapi/ProviderClassOption.java diff --git a/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java b/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java index bc93634c642..397bd2b2fa5 100644 --- a/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java +++ b/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2019, 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 @@ -304,14 +304,17 @@ public class KeyStoreUtil { public static void loadProviderByClass( String provClass, String arg, ClassLoader cl) { - // For compatibility, SunPKCS11 and OracleUcrypto can still be - // loadable with -providerClass. + // For compatibility, SunPKCS11, OracleUcrypto, and SunMSCAPI + // can still be loadable with -providerClass. if (provClass.equals("sun.security.pkcs11.SunPKCS11")) { loadProviderByName("SunPKCS11", arg); return; } else if (provClass.equals("com.oracle.security.crypto.UcryptoProvider")) { loadProviderByName("OracleUcrypto", arg); return; + } else if (provClass.equals("sun.security.mscapi.SunMSCAPI")) { + loadProviderByName("SunMSCAPI", arg); + return; } Provider prov; diff --git a/test/jdk/sun/security/mscapi/ProviderClassOption.java b/test/jdk/sun/security/mscapi/ProviderClassOption.java new file mode 100644 index 00000000000..f8e9103dc37 --- /dev/null +++ b/test/jdk/sun/security/mscapi/ProviderClassOption.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8231598 + * @requires os.family == "windows" + * @library /test/lib + * @summary keytool does not export sun.security.mscapi + */ + +import jdk.test.lib.SecurityTools; + +public class ProviderClassOption { + public static void main(String[] args) throws Throwable { + SecurityTools.keytool("-v -storetype Windows-ROOT -list" + + " -providerClass sun.security.mscapi.SunMSCAPI") + .shouldHaveExitValue(0); + } +} From 5a21a8c4ddf081d1a684144ff4aad88ca6a37a78 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Thu, 24 Oct 2019 11:08:16 +0200 Subject: [PATCH 062/163] 8230706: Waiting on completion of strong nmethod processing causes long pause times with G1 Instead of globally waiting for completion of strong nmethod processing during evacuation, synchronize the nmethods processing on a per-nmethod basis so that only one thread processes one nmethod at once using a state. This state indicates what work (strong/weak processing) needs to be done and what has already been done. Reviewed-by: sjohanss, kbarrett --- src/hotspot/share/code/nmethod.cpp | 217 ++++++++++++++---- src/hotspot/share/code/nmethod.hpp | 140 ++++++++++- src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp | 65 +++++- src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp | 30 ++- src/hotspot/share/gc/g1/g1FullCollector.cpp | 16 +- src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp | 2 - src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp | 3 +- src/hotspot/share/gc/g1/g1RootClosures.cpp | 6 - src/hotspot/share/gc/g1/g1RootClosures.hpp | 3 - src/hotspot/share/gc/g1/g1RootProcessor.cpp | 43 +--- src/hotspot/share/gc/g1/g1RootProcessor.hpp | 10 +- src/hotspot/share/gc/g1/g1SharedClosures.hpp | 7 +- src/hotspot/share/gc/z/zRootsIterator.cpp | 2 +- src/hotspot/share/memory/iterator.cpp | 2 +- .../jtreg/gc/g1/TestGCLogMessages.java | 1 - .../gc/collection/TestG1ParallelPhases.java | 1 - 16 files changed, 415 insertions(+), 133 deletions(-) diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp index 78a229b09a7..0d5cd32614d 100644 --- a/src/hotspot/share/code/nmethod.cpp +++ b/src/hotspot/share/code/nmethod.cpp @@ -1826,57 +1826,183 @@ void nmethod::oops_do(OopClosure* f, bool allow_dead) { } } -#define NMETHOD_SENTINEL ((nmethod*)badAddress) - nmethod* volatile nmethod::_oops_do_mark_nmethods; -// An nmethod is "marked" if its _mark_link is set non-null. -// Even if it is the end of the linked list, it will have a non-null link value, -// as long as it is on the list. -// This code must be MP safe, because it is used from parallel GC passes. -bool nmethod::test_set_oops_do_mark() { - assert(nmethod::oops_do_marking_is_active(), "oops_do_marking_prologue must be called"); - if (_oops_do_mark_link == NULL) { - // Claim this nmethod for this thread to mark. - if (Atomic::replace_if_null(NMETHOD_SENTINEL, &_oops_do_mark_link)) { - // Atomically append this nmethod (now claimed) to the head of the list: - nmethod* observed_mark_nmethods = _oops_do_mark_nmethods; - for (;;) { - nmethod* required_mark_nmethods = observed_mark_nmethods; - _oops_do_mark_link = required_mark_nmethods; - observed_mark_nmethods = - Atomic::cmpxchg(this, &_oops_do_mark_nmethods, required_mark_nmethods); - if (observed_mark_nmethods == required_mark_nmethods) - break; - } - // Mark was clear when we first saw this guy. - LogTarget(Trace, gc, nmethod) lt; - if (lt.is_enabled()) { - LogStream ls(lt); - CompileTask::print(&ls, this, "oops_do, mark", /*short_form:*/ true); - } - return false; - } +void nmethod::oops_do_log_change(const char* state) { + LogTarget(Trace, gc, nmethod) lt; + if (lt.is_enabled()) { + LogStream ls(lt); + CompileTask::print(&ls, this, state, true /* short_form */); } - // On fall through, another racing thread marked this nmethod before we did. - return true; +} + +bool nmethod::oops_do_try_claim() { + if (oops_do_try_claim_weak_request()) { + nmethod* result = oops_do_try_add_to_list_as_weak_done(); + assert(result == NULL, "adding to global list as weak done must always succeed."); + return true; + } + return false; +} + +bool nmethod::oops_do_try_claim_weak_request() { + assert(SafepointSynchronize::is_at_safepoint(), "only at safepoint"); + + if ((_oops_do_mark_link == NULL) && + (Atomic::replace_if_null(mark_link(this, claim_weak_request_tag), &_oops_do_mark_link))) { + oops_do_log_change("oops_do, mark weak request"); + return true; + } + return false; +} + +void nmethod::oops_do_set_strong_done(nmethod* old_head) { + _oops_do_mark_link = mark_link(old_head, claim_strong_done_tag); +} + +nmethod::oops_do_mark_link* nmethod::oops_do_try_claim_strong_done() { + assert(SafepointSynchronize::is_at_safepoint(), "only at safepoint"); + + oops_do_mark_link* old_next = Atomic::cmpxchg(mark_link(this, claim_strong_done_tag), &_oops_do_mark_link, mark_link(NULL, claim_weak_request_tag)); + if (old_next == NULL) { + oops_do_log_change("oops_do, mark strong done"); + } + return old_next; +} + +nmethod::oops_do_mark_link* nmethod::oops_do_try_add_strong_request(nmethod::oops_do_mark_link* next) { + assert(SafepointSynchronize::is_at_safepoint(), "only at safepoint"); + assert(next == mark_link(this, claim_weak_request_tag), "Should be claimed as weak"); + + oops_do_mark_link* old_next = Atomic::cmpxchg(mark_link(this, claim_strong_request_tag), &_oops_do_mark_link, next); + if (old_next == next) { + oops_do_log_change("oops_do, mark strong request"); + } + return old_next; +} + +bool nmethod::oops_do_try_claim_weak_done_as_strong_done(nmethod::oops_do_mark_link* next) { + assert(SafepointSynchronize::is_at_safepoint(), "only at safepoint"); + assert(extract_state(next) == claim_weak_done_tag, "Should be claimed as weak done"); + + oops_do_mark_link* old_next = Atomic::cmpxchg(mark_link(extract_nmethod(next), claim_strong_done_tag), &_oops_do_mark_link, next); + if (old_next == next) { + oops_do_log_change("oops_do, mark weak done -> mark strong done"); + return true; + } + return false; +} + +nmethod* nmethod::oops_do_try_add_to_list_as_weak_done() { + assert(SafepointSynchronize::is_at_safepoint(), "only at safepoint"); + + assert(extract_state(_oops_do_mark_link) == claim_weak_request_tag || + extract_state(_oops_do_mark_link) == claim_strong_request_tag, + "must be but is nmethod " PTR_FORMAT " %u", p2i(extract_nmethod(_oops_do_mark_link)), extract_state(_oops_do_mark_link)); + + nmethod* old_head = Atomic::xchg(this, &_oops_do_mark_nmethods); + // Self-loop if needed. + if (old_head == NULL) { + old_head = this; + } + // Try to install end of list and weak done tag. + if (Atomic::cmpxchg(mark_link(old_head, claim_weak_done_tag), &_oops_do_mark_link, mark_link(this, claim_weak_request_tag)) == mark_link(this, claim_weak_request_tag)) { + oops_do_log_change("oops_do, mark weak done"); + return NULL; + } else { + return old_head; + } +} + +void nmethod::oops_do_add_to_list_as_strong_done() { + assert(SafepointSynchronize::is_at_safepoint(), "only at safepoint"); + + nmethod* old_head = Atomic::xchg(this, &_oops_do_mark_nmethods); + // Self-loop if needed. + if (old_head == NULL) { + old_head = this; + } + assert(_oops_do_mark_link == mark_link(this, claim_strong_done_tag), "must be but is nmethod " PTR_FORMAT " state %u", + p2i(extract_nmethod(_oops_do_mark_link)), extract_state(_oops_do_mark_link)); + + oops_do_set_strong_done(old_head); +} + +void nmethod::oops_do_process_weak(OopsDoProcessor* p) { + if (!oops_do_try_claim_weak_request()) { + // Failed to claim for weak processing. + oops_do_log_change("oops_do, mark weak request fail"); + return; + } + + p->do_regular_processing(this); + + nmethod* old_head = oops_do_try_add_to_list_as_weak_done(); + if (old_head == NULL) { + return; + } + oops_do_log_change("oops_do, mark weak done fail"); + // Adding to global list failed, another thread added a strong request. + assert(extract_state(_oops_do_mark_link) == claim_strong_request_tag, + "must be but is %u", extract_state(_oops_do_mark_link)); + + oops_do_log_change("oops_do, mark weak request -> mark strong done"); + + oops_do_set_strong_done(old_head); + // Do missing strong processing. + p->do_remaining_strong_processing(this); +} + +void nmethod::oops_do_process_strong(OopsDoProcessor* p) { + oops_do_mark_link* next_raw = oops_do_try_claim_strong_done(); + if (next_raw == NULL) { + p->do_regular_processing(this); + oops_do_add_to_list_as_strong_done(); + return; + } + // Claim failed. Figure out why and handle it. + if (oops_do_has_weak_request(next_raw)) { + oops_do_mark_link* old = next_raw; + // Claim failed because being weak processed (state == "weak request"). + // Try to request deferred strong processing. + next_raw = oops_do_try_add_strong_request(old); + if (next_raw == old) { + // Successfully requested deferred strong processing. + return; + } + // Failed because of a concurrent transition. No longer in "weak request" state. + } + if (oops_do_has_any_strong_state(next_raw)) { + // Already claimed for strong processing or requested for such. + return; + } + if (oops_do_try_claim_weak_done_as_strong_done(next_raw)) { + // Successfully claimed "weak done" as "strong done". Do the missing marking. + p->do_remaining_strong_processing(this); + return; + } + // Claim failed, some other thread got it. } void nmethod::oops_do_marking_prologue() { + assert_at_safepoint(); + log_trace(gc, nmethod)("oops_do_marking_prologue"); - assert(_oops_do_mark_nmethods == NULL, "must not call oops_do_marking_prologue twice in a row"); - // We use cmpxchg instead of regular assignment here because the user - // may fork a bunch of threads, and we need them all to see the same state. - nmethod* observed = Atomic::cmpxchg(NMETHOD_SENTINEL, &_oops_do_mark_nmethods, (nmethod*)NULL); - guarantee(observed == NULL, "no races in this sequential code"); + assert(_oops_do_mark_nmethods == NULL, "must be empty"); } void nmethod::oops_do_marking_epilogue() { - assert(_oops_do_mark_nmethods != NULL, "must not call oops_do_marking_epilogue twice in a row"); - nmethod* cur = _oops_do_mark_nmethods; - while (cur != NMETHOD_SENTINEL) { - assert(cur != NULL, "not NULL-terminated"); - nmethod* next = cur->_oops_do_mark_link; + assert_at_safepoint(); + + nmethod* next = _oops_do_mark_nmethods; + _oops_do_mark_nmethods = NULL; + if (next == NULL) { + return; + } + nmethod* cur; + do { + cur = next; + next = extract_nmethod(cur->_oops_do_mark_link); cur->_oops_do_mark_link = NULL; DEBUG_ONLY(cur->verify_oop_relocations()); @@ -1885,11 +2011,8 @@ void nmethod::oops_do_marking_epilogue() { LogStream ls(lt); CompileTask::print(&ls, cur, "oops_do, unmark", /*short_form:*/ true); } - cur = next; - } - nmethod* required = _oops_do_mark_nmethods; - nmethod* observed = Atomic::cmpxchg((nmethod*)NULL, &_oops_do_mark_nmethods, required); - guarantee(observed == required, "no races in this sequential code"); + // End if self-loop has been detected. + } while (cur != next); log_trace(gc, nmethod)("oops_do_marking_epilogue"); } @@ -2262,6 +2385,8 @@ void nmethod::verify() { assert(voc.ok(), "embedded oops must be OK"); Universe::heap()->verify_nmethod(this); + assert(_oops_do_mark_link == NULL, "_oops_do_mark_link for %s should be NULL but is " PTR_FORMAT, + nm->method()->external_name(), p2i(_oops_do_mark_link)); verify_scopes(); CompiledICLocker nm_verify(this); diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp index 8fb5858db45..2471424fccf 100644 --- a/src/hotspot/share/code/nmethod.hpp +++ b/src/hotspot/share/code/nmethod.hpp @@ -67,8 +67,8 @@ class nmethod : public CompiledMethod { friend class NMethodSweeper; friend class CodeCache; // scavengable oops friend class JVMCINMethodData; - private: + private: // Shared fields for all nmethod's int _entry_bci; // != InvocationEntryBci if this nmethod is an on-stack replacement method jmethodID _jmethod_id; // Cache of method()->jmethod_id() @@ -76,8 +76,119 @@ class nmethod : public CompiledMethod { // To support simple linked-list chaining of nmethods: nmethod* _osr_link; // from InstanceKlass::osr_nmethods_head + // STW two-phase nmethod root processing helpers. + // + // When determining liveness of a given nmethod to do code cache unloading, + // some collectors need to to different things depending on whether the nmethods + // need to absolutely be kept alive during root processing; "strong"ly reachable + // nmethods are known to be kept alive at root processing, but the liveness of + // "weak"ly reachable ones is to be determined later. + // + // We want to allow strong and weak processing of nmethods by different threads + // at the same time without heavy synchronization. Additional constraints are + // to make sure that every nmethod is processed a minimal amount of time, and + // nmethods themselves are always iterated at most once at a particular time. + // + // Note that strong processing work must be a superset of weak processing work + // for this code to work. + // + // We store state and claim information in the _oops_do_mark_link member, using + // the two LSBs for the state and the remaining upper bits for linking together + // nmethods that were already visited. + // The last element is self-looped, i.e. points to itself to avoid some special + // "end-of-list" sentinel value. + // + // _oops_do_mark_link special values: + // + // _oops_do_mark_link == NULL: the nmethod has not been visited at all yet, i.e. + // is Unclaimed. + // + // For other values, its lowest two bits indicate the following states of the nmethod: + // + // weak_request (WR): the nmethod has been claimed by a thread for weak processing + // weak_done (WD): weak processing has been completed for this nmethod. + // strong_request (SR): the nmethod has been found to need strong processing while + // being weak processed. + // strong_done (SD): strong processing has been completed for this nmethod . + // + // The following shows the _only_ possible progressions of the _oops_do_mark_link + // pointer. + // + // Given + // N as the nmethod + // X the current next value of _oops_do_mark_link + // + // Unclaimed (C)-> N|WR (C)-> X|WD: the nmethod has been processed weakly by + // a single thread. + // Unclaimed (C)-> N|WR (C)-> X|WD (O)-> X|SD: after weak processing has been + // completed (as above) another thread found that the nmethod needs strong + // processing after all. + // Unclaimed (C)-> N|WR (O)-> N|SR (C)-> X|SD: during weak processing another + // thread finds that the nmethod needs strong processing, marks it as such and + // terminates. The original thread completes strong processing. + // Unclaimed (C)-> N|SD (C)-> X|SD: the nmethod has been processed strongly from + // the beginning by a single thread. + // + // "|" describes the concatentation of bits in _oops_do_mark_link. + // + // The diagram also describes the threads responsible for changing the nmethod to + // the next state by marking the _transition_ with (C) and (O), which mean "current" + // and "other" thread respectively. + // + struct oops_do_mark_link; // Opaque data type. + + // States used for claiming nmethods during root processing. + static const uint claim_weak_request_tag = 0; + static const uint claim_weak_done_tag = 1; + static const uint claim_strong_request_tag = 2; + static const uint claim_strong_done_tag = 3; + + static oops_do_mark_link* mark_link(nmethod* nm, uint tag) { + assert(tag <= claim_strong_done_tag, "invalid tag %u", tag); + assert(is_aligned(nm, 4), "nmethod pointer must have zero lower two LSB"); + return (oops_do_mark_link*)(((uintptr_t)nm & ~0x3) | tag); + } + + static uint extract_state(oops_do_mark_link* link) { + return (uint)((uintptr_t)link & 0x3); + } + + static nmethod* extract_nmethod(oops_do_mark_link* link) { + return (nmethod*)((uintptr_t)link & ~0x3); + } + + void oops_do_log_change(const char* state); + + static bool oops_do_has_weak_request(oops_do_mark_link* next) { + return extract_state(next) == claim_weak_request_tag; + } + + static bool oops_do_has_any_strong_state(oops_do_mark_link* next) { + return extract_state(next) >= claim_strong_request_tag; + } + + // Attempt Unclaimed -> N|WR transition. Returns true if successful. + bool oops_do_try_claim_weak_request(); + + // Attempt Unclaimed -> N|SD transition. Returns the current link. + oops_do_mark_link* oops_do_try_claim_strong_done(); + // Attempt N|WR -> X|WD transition. Returns NULL if successful, X otherwise. + nmethod* oops_do_try_add_to_list_as_weak_done(); + + // Attempt X|WD -> N|SR transition. Returns the current link. + oops_do_mark_link* oops_do_try_add_strong_request(oops_do_mark_link* next); + // Attempt X|WD -> X|SD transition. Returns true if successful. + bool oops_do_try_claim_weak_done_as_strong_done(oops_do_mark_link* next); + + // Do the N|SD -> X|SD transition. + void oops_do_add_to_list_as_strong_done(); + + // Sets this nmethod as strongly claimed (as part of N|SD -> X|SD and N|SR -> X|SD + // transitions). + void oops_do_set_strong_done(nmethod* old_head); + static nmethod* volatile _oops_do_mark_nmethods; - nmethod* volatile _oops_do_mark_link; + oops_do_mark_link* volatile _oops_do_mark_link; // offsets for entry points address _entry_point; // entry point with class check @@ -480,11 +591,30 @@ public: void oops_do(OopClosure* f) { oops_do(f, false); } void oops_do(OopClosure* f, bool allow_dead); - bool test_set_oops_do_mark(); + // All-in-one claiming of nmethods: returns true if the caller successfully claimed that + // nmethod. + bool oops_do_try_claim(); + + // Class containing callbacks for the oops_do_process_weak/strong() methods + // below. + class OopsDoProcessor { + public: + // Process the oops of the given nmethod based on whether it has been called + // in a weak or strong processing context, i.e. apply either weak or strong + // work on it. + virtual void do_regular_processing(nmethod* nm) = 0; + // Assuming that the oops of the given nmethod has already been its weak + // processing applied, apply the remaining strong processing part. + virtual void do_remaining_strong_processing(nmethod* nm) = 0; + }; + + // The following two methods do the work corresponding to weak/strong nmethod + // processing. + void oops_do_process_weak(OopsDoProcessor* p); + void oops_do_process_strong(OopsDoProcessor* p); + static void oops_do_marking_prologue(); static void oops_do_marking_epilogue(); - static bool oops_do_marking_is_active() { return _oops_do_mark_nmethods != NULL; } - bool test_oops_do_mark() { return _oops_do_mark_link != NULL; } private: ScopeDesc* scope_desc_in(address begin, address end); diff --git a/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp index 878365bde0b..954bffee069 100644 --- a/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp +++ b/src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp @@ -26,6 +26,7 @@ #include "code/nmethod.hpp" #include "gc/g1/g1CodeBlobClosure.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1ConcurrentMark.inline.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/g1/heapRegionRemSet.hpp" #include "oops/access.inline.hpp" @@ -52,14 +53,62 @@ void G1CodeBlobClosure::HeapRegionGatheringOopClosure::do_oop(narrowOop* o) { do_oop_work(o); } -void G1CodeBlobClosure::do_code_blob(CodeBlob* cb) { - nmethod* nm = cb->as_nmethod_or_null(); - if (nm != NULL) { - if (!nm->test_set_oops_do_mark()) { - _oc.set_nm(nm); - nm->oops_do(&_oc); - nm->fix_oop_relocations(); - } +template +void G1CodeBlobClosure::MarkingOopClosure::do_oop_work(T* p) { + T oop_or_narrowoop = RawAccess<>::oop_load(p); + if (!CompressedOops::is_null(oop_or_narrowoop)) { + oop o = CompressedOops::decode_not_null(oop_or_narrowoop); + _cm->mark_in_next_bitmap(_worker_id, o); } } +G1CodeBlobClosure::MarkingOopClosure::MarkingOopClosure(uint worker_id) : + _cm(G1CollectedHeap::heap()->concurrent_mark()), _worker_id(worker_id) { } + +void G1CodeBlobClosure::MarkingOopClosure::do_oop(oop* o) { + do_oop_work(o); +} + +void G1CodeBlobClosure::MarkingOopClosure::do_oop(narrowOop* o) { + do_oop_work(o); +} + +void G1CodeBlobClosure::do_evacuation_and_fixup(nmethod* nm) { + _oc.set_nm(nm); + nm->oops_do(&_oc); + nm->fix_oop_relocations(); +} + +void G1CodeBlobClosure::do_marking(nmethod* nm) { + nm->oops_do(&_marking_oc); +} + +class G1NmethodProcessor : public nmethod::OopsDoProcessor { + G1CodeBlobClosure* _cl; + +public: + G1NmethodProcessor(G1CodeBlobClosure* cl) : _cl(cl) { } + + void do_regular_processing(nmethod* nm) { + _cl->do_evacuation_and_fixup(nm); + } + + void do_remaining_strong_processing(nmethod* nm) { + _cl->do_marking(nm); + } +}; + +void G1CodeBlobClosure::do_code_blob(CodeBlob* cb) { + nmethod* nm = cb->as_nmethod_or_null(); + if (nm == NULL) { + return; + } + + G1NmethodProcessor cl(this); + + if (_strong) { + nm->oops_do_process_strong(&cl); + } else { + nm->oops_do_process_weak(&cl); + } +} diff --git a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp index 94c6587cfc8..e929456e500 100644 --- a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp +++ b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp @@ -28,9 +28,11 @@ #include "gc/g1/g1CollectedHeap.hpp" #include "memory/iterator.hpp" +class G1ConcurrentMark; class nmethod; class G1CodeBlobClosure : public CodeBlobClosure { + // Gather nmethod remembered set entries. class HeapRegionGatheringOopClosure : public OopClosure { G1CollectedHeap* _g1h; OopClosure* _work; @@ -50,9 +52,35 @@ class G1CodeBlobClosure : public CodeBlobClosure { } }; + // Mark all oops below TAMS. + class MarkingOopClosure : public OopClosure { + G1ConcurrentMark* _cm; + uint _worker_id; + + template + void do_oop_work(T* p); + + public: + MarkingOopClosure(uint worker_id); + + void do_oop(oop* o); + void do_oop(narrowOop* o); + }; + HeapRegionGatheringOopClosure _oc; + MarkingOopClosure _marking_oc; + + bool _strong; + + void do_code_blob_weak(CodeBlob* cb); + void do_code_blob_strong(CodeBlob* cb); + public: - G1CodeBlobClosure(OopClosure* oc) : _oc(oc) {} + G1CodeBlobClosure(uint worker_id, OopClosure* oc, bool strong) : + _oc(oc), _marking_oc(worker_id), _strong(strong) { } + + void do_evacuation_and_fixup(nmethod* nm); + void do_marking(nmethod* nm); void do_code_blob(CodeBlob* cb); }; diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp index 9aff03b1da4..8f3897dbaf5 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.cpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp @@ -198,13 +198,17 @@ void G1FullCollector::phase1_mark_live_objects() { // Recursively traverse all live objects and mark them. GCTraceTime(Info, gc, phases) info("Phase 1: Mark live objects", scope()->timer()); - // Do the actual marking. - G1FullGCMarkTask marking_task(this); - run_task(&marking_task); + { + // Do the actual marking. + G1FullGCMarkTask marking_task(this); + run_task(&marking_task); + } - // Process references discovered during marking. - G1FullGCReferenceProcessingExecutor reference_processing(this); - reference_processing.execute(scope()->timer(), scope()->tracer()); + { + // Process references discovered during marking. + G1FullGCReferenceProcessingExecutor reference_processing(this); + reference_processing.execute(scope()->timer(), scope()->tracer()); + } // Weak oops cleanup. { diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp index f6c234a4e7a..36dbe35b490 100644 --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp @@ -62,7 +62,6 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) : _gc_par_phases[JVMTIRoots] = new WorkerDataArray(max_gc_threads, "JVMTI Roots (ms):"); AOT_ONLY(_gc_par_phases[AOTCodeRoots] = new WorkerDataArray(max_gc_threads, "AOT Root Scan (ms):");) _gc_par_phases[CMRefRoots] = new WorkerDataArray(max_gc_threads, "CM RefProcessor Roots (ms):"); - _gc_par_phases[WaitForStrongRoots] = new WorkerDataArray(max_gc_threads, "Wait For Strong Roots (ms):"); _gc_par_phases[MergeER] = new WorkerDataArray(max_gc_threads, "Eager Reclaim (ms):"); @@ -566,7 +565,6 @@ const char* G1GCPhaseTimes::phase_name(GCParPhases phase) { "JVMTIRoots", AOT_ONLY("AOTCodeRoots" COMMA) "CMRefRoots", - "WaitForStrongRoots", "MergeER", "MergeRS", "OptMergeRS", diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp index 10c86eaa77a..77fe38c4a3f 100644 --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp @@ -57,7 +57,6 @@ class G1GCPhaseTimes : public CHeapObj { JVMTIRoots, AOT_ONLY(AOTCodeRoots COMMA) CMRefRoots, - WaitForStrongRoots, MergeER, MergeRS, OptMergeRS, @@ -83,7 +82,7 @@ class G1GCPhaseTimes : public CHeapObj { }; static const GCParPhases ExtRootScanSubPhasesFirst = ThreadRoots; - static const GCParPhases ExtRootScanSubPhasesLast = WaitForStrongRoots; + static const GCParPhases ExtRootScanSubPhasesLast = CMRefRoots; enum GCMergeRSWorkTimes { MergeRSMergedSparse, diff --git a/src/hotspot/share/gc/g1/g1RootClosures.cpp b/src/hotspot/share/gc/g1/g1RootClosures.cpp index 6907a9362be..c18168890fe 100644 --- a/src/hotspot/share/gc/g1/g1RootClosures.cpp +++ b/src/hotspot/share/gc/g1/g1RootClosures.cpp @@ -45,8 +45,6 @@ public: CodeBlobClosure* strong_codeblobs() { return &_closures._codeblobs; } CodeBlobClosure* weak_codeblobs() { return &_closures._codeblobs; } - - bool trace_metadata() { return false; } }; // Closures used during initial mark. @@ -71,10 +69,6 @@ public: CodeBlobClosure* strong_codeblobs() { return &_strong._codeblobs; } CodeBlobClosure* weak_codeblobs() { return &_weak._codeblobs; } - - // If we are not marking all weak roots then we are tracing - // which metadata is alive. - bool trace_metadata() { return MarkWeak == G1MarkPromotedFromRoot; } }; G1EvacuationRootClosures* G1EvacuationRootClosures::create_root_closures(G1ParScanThreadState* pss, G1CollectedHeap* g1h) { diff --git a/src/hotspot/share/gc/g1/g1RootClosures.hpp b/src/hotspot/share/gc/g1/g1RootClosures.hpp index 13806445a1e..6a81f80c74e 100644 --- a/src/hotspot/share/gc/g1/g1RootClosures.hpp +++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp @@ -52,9 +52,6 @@ public: // Applied to code blobs treated as weak roots. virtual CodeBlobClosure* weak_codeblobs() = 0; - // Is this closure used for tracing metadata? - virtual bool trace_metadata() = 0; - static G1EvacuationRootClosures* create_root_closures(G1ParScanThreadState* pss, G1CollectedHeap* g1h); }; diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.cpp b/src/hotspot/share/gc/g1/g1RootProcessor.cpp index 0dc7dc158bc..b45c31871c9 100644 --- a/src/hotspot/share/gc/g1/g1RootProcessor.cpp +++ b/src/hotspot/share/gc/g1/g1RootProcessor.cpp @@ -45,34 +45,10 @@ #include "services/management.hpp" #include "utilities/macros.hpp" -void G1RootProcessor::worker_has_discovered_all_strong_nmethods() { - assert(ClassUnloadingWithConcurrentMark, "Currently only needed when doing G1 Class Unloading"); - - uint new_value = (uint)Atomic::add(1, &_n_workers_discovered_strong_classes); - if (new_value == n_workers()) { - // This thread is last. Notify the others. - MonitorLocker ml(&_lock, Mutex::_no_safepoint_check_flag); - _lock.notify_all(); - } -} - -void G1RootProcessor::wait_until_all_strong_nmethods_discovered() { - assert(ClassUnloadingWithConcurrentMark, "Currently only needed when doing G1 Class Unloading"); - - if ((uint)_n_workers_discovered_strong_classes != n_workers()) { - MonitorLocker ml(&_lock, Mutex::_no_safepoint_check_flag); - while ((uint)_n_workers_discovered_strong_classes != n_workers()) { - ml.wait(0); - } - } -} - G1RootProcessor::G1RootProcessor(G1CollectedHeap* g1h, uint n_workers) : _g1h(g1h), _process_strong_tasks(G1RP_PS_NumElements), - _srs(n_workers), - _lock(Mutex::leaf, "G1 Root Scan barrier lock", false, Mutex::_safepoint_check_never), - _n_workers_discovered_strong_classes(0) {} + _srs(n_workers) {} void G1RootProcessor::evacuate_roots(G1ParScanThreadState* pss, uint worker_id) { G1GCPhaseTimes* phase_times = _g1h->phase_times(); @@ -80,7 +56,7 @@ void G1RootProcessor::evacuate_roots(G1ParScanThreadState* pss, uint worker_id) G1EvacPhaseTimesTracker timer(phase_times, pss, G1GCPhaseTimes::ExtRootScan, worker_id); G1EvacuationRootClosures* closures = pss->closures(); - process_java_roots(closures, phase_times, worker_id, closures->trace_metadata() /* notify_claimed_nmethods_done */); + process_java_roots(closures, phase_times, worker_id); process_vm_roots(closures, phase_times, worker_id); @@ -96,12 +72,6 @@ void G1RootProcessor::evacuate_roots(G1ParScanThreadState* pss, uint worker_id) } } - if (closures->trace_metadata()) { - G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::WaitForStrongRoots, worker_id); - // Wait to make sure all workers passed the strong nmethods phase. - wait_until_all_strong_nmethods_discovered(); - } - _process_strong_tasks.all_tasks_completed(n_workers()); } @@ -171,8 +141,7 @@ void G1RootProcessor::process_all_roots(OopClosure* oops, void G1RootProcessor::process_java_roots(G1RootClosures* closures, G1GCPhaseTimes* phase_times, - uint worker_id, - bool notify_claimed_nmethods_done) { + uint worker_id) { // We need to make make sure that the "strong" nmethods are processed first // using the strong closure. Only after that we process the weakly reachable // nmethods. @@ -197,12 +166,6 @@ void G1RootProcessor::process_java_roots(G1RootClosures* closures, closures->strong_codeblobs()); } - // This is the point where this worker thread will not find more strong nmethods. - // Report this so G1 can synchronize the strong and weak CLDs/nmethods processing. - if (notify_claimed_nmethods_done) { - worker_has_discovered_all_strong_nmethods(); - } - { G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::CLDGRoots, worker_id); if (_process_strong_tasks.try_claim_task(G1RP_PS_ClassLoaderDataGraph_oops_do)) { diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp index f5ff91dc882..9da113c5c6b 100644 --- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp +++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp @@ -50,10 +50,6 @@ class G1RootProcessor : public StackObj { SubTasksDone _process_strong_tasks; StrongRootsScope _srs; - // Used to implement the Thread work barrier. - Monitor _lock; - volatile jint _n_workers_discovered_strong_classes; - enum G1H_process_roots_tasks { G1RP_PS_Universe_oops_do, G1RP_PS_JNIHandles_oops_do, @@ -69,13 +65,9 @@ class G1RootProcessor : public StackObj { G1RP_PS_NumElements }; - void worker_has_discovered_all_strong_nmethods(); - void wait_until_all_strong_nmethods_discovered(); - void process_java_roots(G1RootClosures* closures, G1GCPhaseTimes* phase_times, - uint worker_id, - bool notify_claimed_nmethods_done = false); + uint worker_id); void process_vm_roots(G1RootClosures* closures, G1GCPhaseTimes* phase_times, diff --git a/src/hotspot/share/gc/g1/g1SharedClosures.hpp b/src/hotspot/share/gc/g1/g1SharedClosures.hpp index 04fb99d7170..af77223cfa8 100644 --- a/src/hotspot/share/gc/g1/g1SharedClosures.hpp +++ b/src/hotspot/share/gc/g1/g1SharedClosures.hpp @@ -32,6 +32,11 @@ class G1ParScanThreadState; // Simple holder object for a complete set of closures used by the G1 evacuation code. template class G1SharedClosures { + static bool needs_strong_processing() { + // Request strong code root processing when G1MarkFromRoot is passed in during + // initial mark. + return Mark == G1MarkFromRoot; + } public: G1ParCopyClosure _oops; G1ParCopyClosure _oops_in_cld; @@ -43,5 +48,5 @@ public: _oops(g1h, pss), _oops_in_cld(g1h, pss), _clds(&_oops_in_cld, process_only_dirty), - _codeblobs(&_oops) {} + _codeblobs(pss->worker_id(), &_oops, needs_strong_processing()) {} }; diff --git a/src/hotspot/share/gc/z/zRootsIterator.cpp b/src/hotspot/share/gc/z/zRootsIterator.cpp index 512ac99ce4e..53a923b26c2 100644 --- a/src/hotspot/share/gc/z/zRootsIterator.cpp +++ b/src/hotspot/share/gc/z/zRootsIterator.cpp @@ -149,7 +149,7 @@ public: virtual void do_code_blob(CodeBlob* cb) { nmethod* const nm = cb->as_nmethod_or_null(); - if (nm != NULL && !nm->test_set_oops_do_mark()) { + if (nm != NULL && nm->oops_do_try_claim()) { CodeBlobToOopClosure::do_code_blob(cb); _bs->disarm(nm); } diff --git a/src/hotspot/share/memory/iterator.cpp b/src/hotspot/share/memory/iterator.cpp index 6916d8f06f4..b0692d5217a 100644 --- a/src/hotspot/share/memory/iterator.cpp +++ b/src/hotspot/share/memory/iterator.cpp @@ -59,7 +59,7 @@ void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) { void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) { nmethod* nm = cb->as_nmethod_or_null(); - if (nm != NULL && !nm->test_set_oops_do_mark()) { + if (nm != NULL && nm->oops_do_try_claim()) { do_nmethod(nm); } } diff --git a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java index cea8ade0101..3d58ec8aee1 100644 --- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java +++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java @@ -128,7 +128,6 @@ public class TestGCLogMessages { new LogMessageWithLevel("CLDG Roots", Level.TRACE), new LogMessageWithLevel("JVMTI Roots", Level.TRACE), new LogMessageWithLevel("CM RefProcessor Roots", Level.TRACE), - new LogMessageWithLevel("Wait For Strong Roots", Level.TRACE), // Redirty Cards new LogMessageWithLevel("Redirty Cards", Level.DEBUG), new LogMessageWithLevel("Parallel Redirty", Level.TRACE), diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java index 96314506e24..1328f73d10b 100644 --- a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java +++ b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java @@ -98,7 +98,6 @@ public class TestG1ParallelPhases { "CLDGRoots", "JVMTIRoots", "CMRefRoots", - "WaitForStrongRoots", "MergeER", "MergeHCC", "MergeRS", From 06d37a2754e5ce19d9189634e53ad90b1729a8a0 Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Thu, 24 Oct 2019 11:49:56 +0200 Subject: [PATCH 063/163] 8232908: Shenandoah: compact heuristics has incorrect trigger "Free is lower than allocated recently" Reviewed-by: rkennke --- .../shenandoah/heuristics/shenandoahCompactHeuristics.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp index ece6827c99e..7cedfcb820d 100644 --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp @@ -65,13 +65,6 @@ bool ShenandoahCompactHeuristics::should_start_gc() const { return true; } - if (available < threshold_bytes_allocated) { - log_info(gc)("Trigger: Free (" SIZE_FORMAT "%s) is lower than allocated recently (" SIZE_FORMAT "%s)", - byte_size_in_proper_unit(available), proper_unit_for_byte_size(available), - byte_size_in_proper_unit(threshold_bytes_allocated), proper_unit_for_byte_size(threshold_bytes_allocated)); - return true; - } - size_t bytes_allocated = heap->bytes_allocated_since_gc_start(); if (bytes_allocated > threshold_bytes_allocated) { log_info(gc)("Trigger: Allocated since last cycle (" SIZE_FORMAT "%s) is larger than allocation threshold (" SIZE_FORMAT "%s)", From e69b4d261db899c0a959b193aae9a69998f1d1ae Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Thu, 24 Oct 2019 11:07:31 +0100 Subject: [PATCH 064/163] 8231602: Deprecate Thread.suspend/resume for removal Reviewed-by: mchung, dholmes, chegar --- src/java.base/share/classes/java/lang/Thread.java | 4 ++-- .../share/classes/java/lang/ThreadGroup.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java index 89d0a549c4d..868354d706c 100644 --- a/src/java.base/share/classes/java/lang/Thread.java +++ b/src/java.base/share/classes/java/lang/Thread.java @@ -1075,7 +1075,7 @@ class Thread implements Runnable { * Why * are Thread.stop, Thread.suspend and Thread.resume Deprecated?. */ - @Deprecated(since="1.2") + @Deprecated(since="1.2", forRemoval=true) public final void suspend() { checkAccess(); suspend0(); @@ -1101,7 +1101,7 @@ class Thread implements Runnable { * Why * are Thread.stop, Thread.suspend and Thread.resume Deprecated?. */ - @Deprecated(since="1.2") + @Deprecated(since="1.2", forRemoval=true) public final void resume() { checkAccess(); resume0(); diff --git a/src/java.base/share/classes/java/lang/ThreadGroup.java b/src/java.base/share/classes/java/lang/ThreadGroup.java index a4a9fd58922..54edce5b102 100644 --- a/src/java.base/share/classes/java/lang/ThreadGroup.java +++ b/src/java.base/share/classes/java/lang/ThreadGroup.java @@ -666,8 +666,8 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * @deprecated This method is inherently deadlock-prone. See * {@link Thread#suspend} for details. */ - @Deprecated(since="1.2") - @SuppressWarnings("deprecation") + @Deprecated(since="1.2", forRemoval=true) + @SuppressWarnings("removal") public final void suspend() { if (stopOrSuspend(true)) Thread.currentThread().suspend(); @@ -680,7 +680,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * if (and only if) the current thread is found to be in this thread * group or one of its subgroups. */ - @SuppressWarnings("deprecation") + @SuppressWarnings({"deprecation", "removal"}) private boolean stopOrSuspend(boolean suspend) { boolean suicide = false; Thread us = Thread.currentThread(); @@ -729,8 +729,8 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * both of which have been deprecated, as they are inherently * deadlock-prone. See {@link Thread#suspend} for details. */ - @Deprecated(since="1.2") - @SuppressWarnings("deprecation") + @Deprecated(since="1.2", forRemoval=true) + @SuppressWarnings("removal") public final void resume() { int ngroupsSnapshot; ThreadGroup[] groupsSnapshot; @@ -1070,7 +1070,7 @@ class ThreadGroup implements Thread.UncaughtExceptionHandler { * which is deprecated. Further, the behavior of this call * was never specified. */ - @Deprecated(since="1.2") + @Deprecated(since="1.2", forRemoval=true) public boolean allowThreadSuspension(boolean b) { return true; } From 217b2cc4fc7aba07a2560d949230a463f151571f Mon Sep 17 00:00:00 2001 From: Aleksei Efimov Date: Thu, 24 Oct 2019 11:54:33 +0100 Subject: [PATCH 065/163] 8232713: Update BCEL version to 6.3.1 in license file Reviewed-by: joehw --- src/java.xml/share/legal/bcel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.xml/share/legal/bcel.md b/src/java.xml/share/legal/bcel.md index bb434b09d2c..757c2072388 100644 --- a/src/java.xml/share/legal/bcel.md +++ b/src/java.xml/share/legal/bcel.md @@ -1,4 +1,4 @@ -## Apache Commons Byte Code Engineering Library (BCEL) Version 6.0 +## Apache Commons Byte Code Engineering Library (BCEL) Version 6.3.1 ### Apache Commons BCEL Notice 


From 89cdeeb6fea144c244a7fe53865617062f146b81 Mon Sep 17 00:00:00 2001
From: Christoph Goettschkes 
Date: Thu, 24 Oct 2019 15:46:50 +0300
Subject: [PATCH 066/163] 8231952: ARM32: Wrong assumption in assertion in
 LIRGenerator::atomic_xchg and LIRGenerator::atomic_add

Reviewed-by: dlong, shade
---
 src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
index 8719448528f..fc41da2bf20 100644
--- a/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp
@@ -774,7 +774,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
   bool is_oop = type == T_OBJECT || type == T_ARRAY;
   LIR_Opr result = new_register(type);
   value.load_item();
-  assert(type == T_INT || is_oop LP64_ONLY( || type == T_LONG ), "unexpected type");
+  assert(type == T_INT || is_oop || (type == T_LONG && VM_Version::supports_ldrexd()), "unexpected type");
   LIR_Opr tmp = (UseCompressedOops && is_oop) ? new_pointer_register() : LIR_OprFact::illegalOpr;
   __ xchg(addr, value.result(), result, tmp);
   return result;
@@ -783,7 +783,7 @@ LIR_Opr LIRGenerator::atomic_xchg(BasicType type, LIR_Opr addr, LIRItem& value)
 LIR_Opr LIRGenerator::atomic_add(BasicType type, LIR_Opr addr, LIRItem& value) {
   LIR_Opr result = new_register(type);
   value.load_item();
-  assert(type == T_INT LP64_ONLY( || type == T_LONG), "unexpected type");
+  assert(type == T_INT || (type == T_LONG && VM_Version::supports_ldrexd ()), "unexpected type");
   LIR_Opr tmp = new_register(type);
   __ xadd(addr, value.result(), result, tmp);
   return result;

From 31ab60e21107caeaa92bd1706f5b618a5d1ffbd4 Mon Sep 17 00:00:00 2001
From: Christoph Goettschkes 
Date: Thu, 24 Oct 2019 08:49:21 -0400
Subject: [PATCH 067/163] 8231953: Wrong assumption in assertion in
 oop::register_oop

On ARM32 thumb mode, the pc of the current frame is always zero

Reviewed-by: coleenp, dcubed
---
 src/hotspot/share/oops/oopsHierarchy.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/hotspot/share/oops/oopsHierarchy.cpp b/src/hotspot/share/oops/oopsHierarchy.cpp
index a77f17ecf5d..3fcb87a3c46 100644
--- a/src/hotspot/share/oops/oopsHierarchy.cpp
+++ b/src/hotspot/share/oops/oopsHierarchy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -37,8 +37,6 @@ void oop::register_oop() {
   Thread* t = Thread::current_or_null();
   if (t != NULL && t->is_Java_thread()) {
      frame fr = os::current_frame();
-     // This points to the oop creator, I guess current frame points to caller
-     assert (fr.pc(), "should point to a vm frame");
      t->unhandled_oops()->register_unhandled_oop(this, fr.pc());
   }
 }

From 9308d1858044f5b361850af40b1421e47a5da955 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore 
Date: Thu, 24 Oct 2019 08:52:33 -0400
Subject: [PATCH 068/163] 8232788: Move biased locking initalization

Reviewed-by: pchilanomate, dholmes
---
 .../share/classfile/systemDictionary.cpp      | 20 -------------------
 src/hotspot/share/oops/instanceKlass.cpp      | 12 +++++++++++
 .../{test_markOop.cpp => test_markWord.cpp}   |  7 ++++++-
 3 files changed, 18 insertions(+), 21 deletions(-)
 rename test/hotspot/gtest/oops/{test_markOop.cpp => test_markWord.cpp} (96%)

diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index af9b4695957..949726cdbab 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -2132,26 +2132,6 @@ void SystemDictionary::update_dictionary(unsigned int d_hash,
   {
     MutexLocker mu1(SystemDictionary_lock, THREAD);
 
-    // See whether biased locking is enabled and if so set it for this
-    // klass.
-    // Note that this must be done past the last potential blocking
-    // point / safepoint. We might enable biased locking lazily using a
-    // VM_Operation to iterate the SystemDictionary and installing the
-    // biasable mark word into each InstanceKlass's prototype header.
-    // To avoid race conditions where we accidentally miss enabling the
-    // optimization for one class in the process of being added to the
-    // dictionary, we must not safepoint after the test of
-    // BiasedLocking::enabled().
-    if (UseBiasedLocking && BiasedLocking::enabled()) {
-      // Set biased locking bit for all loaded classes; it will be
-      // cleared if revocation occurs too often for this type
-      // NOTE that we must only do this when the class is initally
-      // defined, not each time it is referenced from a new class loader
-      if (k->class_loader() == class_loader()) {
-        k->set_prototype_header(markWord::biased_locking_prototype());
-      }
-    }
-
     // Make a new dictionary entry.
     Dictionary* dictionary = loader_data->dictionary();
     InstanceKlass* sd_check = find_class(d_hash, name, dictionary);
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index e87e3c287ae..f900e4e4363 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -69,6 +69,7 @@
 #include "prims/jvmtiThreadState.hpp"
 #include "prims/methodComparator.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/biasedLocking.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
@@ -456,6 +457,12 @@ InstanceKlass::InstanceKlass(const ClassFileParser& parser, unsigned kind, Klass
   if (Arguments::is_dumping_archive()) {
     SystemDictionaryShared::init_dumptime_info(this);
   }
+
+  // Set biased locking bit for all instances of this class; it will be
+  // cleared if revocation occurs too often for this type
+  if (UseBiasedLocking && BiasedLocking::enabled()) {
+    set_prototype_header(markWord::biased_locking_prototype());
+  }
 }
 
 void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data,
@@ -2408,6 +2415,11 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl
     // --> see ArrayKlass::complete_create_array_klass()
     array_klasses()->restore_unshareable_info(ClassLoaderData::the_null_class_loader_data(), Handle(), CHECK);
   }
+
+  // Initialize current biased locking state.
+  if (UseBiasedLocking && BiasedLocking::enabled()) {
+    set_prototype_header(markWord::biased_locking_prototype());
+  }
 }
 
 // returns true IFF is_in_error_state() has been changed as a result of this call.
diff --git a/test/hotspot/gtest/oops/test_markOop.cpp b/test/hotspot/gtest/oops/test_markWord.cpp
similarity index 96%
rename from test/hotspot/gtest/oops/test_markOop.cpp
rename to test/hotspot/gtest/oops/test_markWord.cpp
index 29f9c8f8c4d..7b5b1f919d6 100644
--- a/test/hotspot/gtest/oops/test_markOop.cpp
+++ b/test/hotspot/gtest/oops/test_markWord.cpp
@@ -27,6 +27,7 @@
 #include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/biasedLocking.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
@@ -84,10 +85,14 @@ TEST_VM(markWord, printing) {
   ThreadInVMfromNative invm(THREAD);
   ResourceMark rm(THREAD);
 
+  if (!UseBiasedLocking || !BiasedLocking::enabled()) {
+    // Can't test this with biased locking disabled.
+    return;
+  }
+
   oop obj = SystemDictionary::Byte_klass()->allocate_instance(THREAD);
 
   FlagSetting fs(WizardMode, true);
-  FlagSetting bf(UseBiasedLocking, true);
 
   HandleMark hm(THREAD);
   Handle h_obj(THREAD, obj);

From aba2880e2e53447ffc9f30889ace60436229747d Mon Sep 17 00:00:00 2001
From: Martin Doerr 
Date: Thu, 24 Oct 2019 16:28:49 +0200
Subject: [PATCH 069/163] 8232005: [s390, PPC64] More exception checks missing
 in interpreter

Reviewed-by: rrich, goetz
---
 .../cpu/ppc/templateInterpreterGenerator_ppc.cpp       |  6 +++---
 src/hotspot/cpu/s390/interp_masm_s390.cpp              | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index 046e327ea50..22bd173b582 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -592,10 +592,10 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(const ch
   __ load_const_optimized(R4_ARG2, (address) name, R11_scratch1);
   if (pass_oop) {
     __ mr(R5_ARG3, Rexception);
-    __ call_VM(Rexception, CAST_FROM_FN_PTR(address, InterpreterRuntime::create_klass_exception), false);
+    __ call_VM(Rexception, CAST_FROM_FN_PTR(address, InterpreterRuntime::create_klass_exception));
   } else {
     __ load_const_optimized(R5_ARG3, (address) message, R11_scratch1);
-    __ call_VM(Rexception, CAST_FROM_FN_PTR(address, InterpreterRuntime::create_exception), false);
+    __ call_VM(Rexception, CAST_FROM_FN_PTR(address, InterpreterRuntime::create_exception));
   }
 
   // Throw exception.
@@ -2105,7 +2105,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
     // The member name argument must be restored if _invokestatic is re-executed after a PopFrame call.
     // Detect such a case in the InterpreterRuntime function and return the member name argument, or NULL.
     __ ld(R4_ARG2, 0, R18_locals);
-    __ MacroAssembler::call_VM(R4_ARG2, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), R4_ARG2, R19_method, R14_bcp, false);
+    __ call_VM(R4_ARG2, CAST_FROM_FN_PTR(address, InterpreterRuntime::member_name_arg_or_null), R4_ARG2, R19_method, R14_bcp);
     __ restore_interpreter_state(R11_scratch1, /*bcp_and_mdx_only*/ true);
     __ cmpdi(CCR0, R4_ARG2, 0);
     __ beq(CCR0, L_done);
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index d4a10274c76..d5e48eb5f2b 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -1072,8 +1072,7 @@ void InterpreterMacroAssembler::lock_object(Register monitor, Register object) {
 void InterpreterMacroAssembler::unlock_object(Register monitor, Register object) {
 
   if (UseHeavyMonitors) {
-    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit),
-            monitor, /*check_for_exceptions=*/ true);
+    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), monitor);
     return;
   }
 
@@ -1147,8 +1146,7 @@ void InterpreterMacroAssembler::unlock_object(Register monitor, Register object)
   // The lock has been converted into a heavy lock and hence
   // we need to get into the slow case.
   z_stg(object, obj_entry);   // Restore object entry, has been cleared above.
-  call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit),
-          monitor,  /*check_for_exceptions=*/false);
+  call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), monitor);
 
   // }
 
@@ -2095,7 +2093,7 @@ void InterpreterMacroAssembler::notify_method_entry() {
     Label jvmti_post_done;
     MacroAssembler::load_and_test_int(Z_R0, Address(Z_thread, JavaThread::interp_only_mode_offset()));
     z_bre(jvmti_post_done);
-    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_entry), /*check_exceptions=*/false);
+    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_entry));
     bind(jvmti_post_done);
   }
 }
@@ -2129,7 +2127,7 @@ void InterpreterMacroAssembler::notify_method_exit(bool native_method,
     MacroAssembler::load_and_test_int(Z_R0, Address(Z_thread, JavaThread::interp_only_mode_offset()));
     z_bre(jvmti_post_done);
     if (!native_method) push(state); // see frame::interpreter_frame_result()
-    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_exit), /*check_exceptions=*/false);
+    call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_exit));
     if (!native_method) pop(state);
     bind(jvmti_post_done);
   }

From a5fab799841df79c9ecc3a831e83065d904ef9af Mon Sep 17 00:00:00 2001
From: Martin Doerr 
Date: Thu, 24 Oct 2019 16:28:51 +0200
Subject: [PATCH 070/163] 8231949: [PPC64, s390]: Make async profiling more
 reliable

Better checks if method from interpreter frame is valid.

Reviewed-by: rrich, ghaug, goetz
---
 .../os_cpu/linux_ppc/thread_linux_ppc.cpp     | 29 ++++++++--------
 .../os_cpu/linux_s390/thread_linux_s390.cpp   | 33 ++++++++++---------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
index f4945cd8198..ca7c68f646b 100644
--- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
@@ -65,21 +65,22 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
     }
 
     if (ret_frame.is_interpreted_frame()) {
-       frame::ijava_state* istate = ret_frame.get_ijava_state();
-       if (MetaspaceObj::is_valid((Method*)(istate->method)) == false) {
-         return false;
-       }
-       uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
-       uint64_t istate_bcp = istate->bcp;
-       uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base());
-       uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size());
-       if (istate_bcp >= code_start && istate_bcp < code_end) {
-         // we have a valid bcp, don't touch it, do nothing
-       } else if (reg_bcp >= code_start && reg_bcp < code_end) {
-         istate->bcp = reg_bcp;
+      frame::ijava_state *istate = ret_frame.get_ijava_state();
+      const Method *m = (const Method*)(istate->method);
+      if (!Method::is_valid_method(m)) return false;
+      if (!Metaspace::contains(m->constMethod())) return false;
+
+      uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
+      uint64_t istate_bcp = istate->bcp;
+      uint64_t code_start = (uint64_t)(m->code_base());
+      uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
+      if (istate_bcp >= code_start && istate_bcp < code_end) {
+        // we have a valid bcp, don't touch it, do nothing
+      } else if (reg_bcp >= code_start && reg_bcp < code_end) {
+        istate->bcp = reg_bcp;
       } else {
-         return false;
-       }
+        return false;
+      }
     }
     if (!ret_frame.safe_for_sender(this)) {
       // nothing else to try if the frame isn't good
diff --git a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp
index a9f97ec97af..f2fb4e30e7e 100644
--- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp
+++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp
@@ -63,21 +63,24 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
 
     if (ret_frame.is_interpreted_frame()) {
       frame::z_ijava_state* istate = ret_frame.ijava_state_unchecked();
-       if ((stack_base() >= (address)istate && (address)istate > stack_end()) ||
-           MetaspaceObj::is_valid((Method*)(istate->method)) == false) {
-         return false;
-       }
-       uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/];
-       uint64_t istate_bcp = istate->bcp;
-       uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base());
-       uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size());
-       if (istate_bcp >= code_start && istate_bcp < code_end) {
-         // we have a valid bcp, don't touch it, do nothing
-       } else if (reg_bcp >= code_start && reg_bcp < code_end) {
-         istate->bcp = reg_bcp;
-       } else {
-         return false;
-       }
+      if (stack_base() >= (address)istate && (address)istate > stack_end()) {
+        return false;
+      }
+      const Method *m = (const Method*)(istate->method);
+      if (!Method::is_valid_method(m)) return false;
+      if (!Metaspace::contains(m->constMethod())) return false;
+
+      uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/];
+      uint64_t istate_bcp = istate->bcp;
+      uint64_t code_start = (uint64_t)(m->code_base());
+      uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());
+      if (istate_bcp >= code_start && istate_bcp < code_end) {
+        // we have a valid bcp, don't touch it, do nothing
+      } else if (reg_bcp >= code_start && reg_bcp < code_end) {
+        istate->bcp = reg_bcp;
+      } else {
+        return false;
+      }
     }
     if (!ret_frame.safe_for_sender(this)) {
       // nothing else to try if the frame isn't good

From b4d37ba6b9d1217d34e6b6fc243ed2815017d7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= 
Date: Thu, 24 Oct 2019 16:37:22 +0200
Subject: [PATCH 071/163] 8231081: TestMetadataRetention fails due to missing
 symbol id

Reviewed-by: egahlin
---
 .../checkpoint/jfrCheckpointManager.cpp       |  36 +++++-
 .../jfr/recorder/checkpoint/types/jfrType.cpp |  25 ----
 .../jfr/recorder/checkpoint/types/jfrType.hpp |  13 --
 .../checkpoint/types/jfrTypeManager.cpp       |  40 +-----
 .../checkpoint/types/jfrTypeManager.hpp       |   4 +-
 .../recorder/checkpoint/types/jfrTypeSet.cpp  |  28 ++++-
 .../recorder/checkpoint/types/jfrTypeSet.hpp  |   1 +
 .../checkpoint/types/jfrTypeSetUtils.cpp      |  91 ++++++--------
 .../checkpoint/types/jfrTypeSetUtils.hpp      |   6 +-
 .../jdk/jfr/jvm/TestClearStaleConstants.java  | 115 ++++++++++++++++++
 10 files changed, 218 insertions(+), 141 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/jvm/TestClearStaleConstants.java

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
index 71f5ebe0676..fbbd59fb137 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -24,15 +24,18 @@
 
 #include "precompiled.hpp"
 #include "classfile/javaClasses.inline.hpp"
-#include "jfr/recorder/jfrRecorder.hpp"
+#include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
+#include "jfr/leakprofiler/leakProfiler.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointManager.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
 #include "jfr/recorder/checkpoint/types/jfrTypeManager.hpp"
+#include "jfr/recorder/checkpoint/types/jfrTypeSet.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
+#include "jfr/recorder/jfrRecorder.hpp"
+#include "jfr/recorder/repository/jfrChunkWriter.hpp"
 #include "jfr/recorder/service/jfrOptionSet.hpp"
 #include "jfr/recorder/storage/jfrMemorySpace.inline.hpp"
 #include "jfr/recorder/storage/jfrStorageUtils.inline.hpp"
-#include "jfr/recorder/repository/jfrChunkWriter.hpp"
 #include "jfr/utilities/jfrBigEndian.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
 #include "logging/log.hpp"
@@ -81,7 +84,7 @@ JfrCheckpointManager::~JfrCheckpointManager() {
   if (_lock != NULL) {
     delete _lock;
   }
-  JfrTypeManager::clear();
+  JfrTypeManager::destroy();
 }
 
 static const size_t unlimited_mspace_size = 0;
@@ -332,6 +335,7 @@ size_t JfrCheckpointManager::write_epoch_transition_mspace() {
 
 typedef DiscardOp > DiscardOperation;
 size_t JfrCheckpointManager::clear() {
+  JfrTypeSet::clear();
   DiscardOperation discarder(mutexed); // mutexed discard mode
   process_free_list(discarder, _free_list_mspace);
   process_free_list(discarder, _epoch_transition_mspace);
@@ -353,12 +357,34 @@ size_t JfrCheckpointManager::write_safepoint_types() {
 }
 
 void JfrCheckpointManager::write_type_set() {
-  JfrTypeManager::write_type_set();
+  assert(!SafepointSynchronize::is_at_safepoint(), "invariant");
+  // can safepoint here
+  MutexLocker cld_lock(ClassLoaderDataGraph_lock);
+  MutexLocker module_lock(Module_lock);
+  if (!LeakProfiler::is_running()) {
+    JfrCheckpointWriter writer(true, true, Thread::current());
+    JfrTypeSet::serialize(&writer, NULL, false);
+    return;
+  }
+  Thread* const t = Thread::current();
+  JfrCheckpointWriter leakp_writer(false, true, t);
+  JfrCheckpointWriter writer(false, true, t);
+  JfrTypeSet::serialize(&writer, &leakp_writer, false);
+  ObjectSampleCheckpoint::on_type_set(leakp_writer);
 }
 
 void JfrCheckpointManager::write_type_set_for_unloaded_classes() {
   assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-  JfrTypeManager::write_type_set_for_unloaded_classes();
+  JfrCheckpointWriter writer(false, true, Thread::current());
+  const JfrCheckpointContext ctx = writer.context();
+  JfrTypeSet::serialize(&writer, NULL, true);
+  if (LeakProfiler::is_running()) {
+    ObjectSampleCheckpoint::on_type_set_unload(writer);
+  }
+  if (!JfrRecorder::is_recording()) {
+    // discard by rewind
+    writer.set_context(ctx);
+  }
 }
 
 void JfrCheckpointManager::create_thread_blob(JavaThread* jt) {
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
index cd72c2a8128..16b59dfb70f 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
@@ -36,7 +36,6 @@
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/recorder/checkpoint/types/jfrThreadGroup.hpp"
 #include "jfr/recorder/checkpoint/types/jfrThreadState.hpp"
-#include "jfr/recorder/checkpoint/types/jfrTypeSet.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "jfr/writers/jfrJavaEventWriter.hpp"
 #include "memory/metaspaceGCThresholdUpdater.hpp"
@@ -271,30 +270,6 @@ void VMOperationTypeConstant::serialize(JfrCheckpointWriter& writer) {
   }
 }
 
-class TypeSetSerialization {
- private:
-  JfrCheckpointWriter* _leakp_writer;
-  bool _class_unload;
- public:
-  TypeSetSerialization(bool class_unload, JfrCheckpointWriter* leakp_writer = NULL) :
-    _leakp_writer(leakp_writer), _class_unload(class_unload) {}
-  void write(JfrCheckpointWriter& writer) {
-    JfrTypeSet::serialize(&writer, _leakp_writer, _class_unload);
-  }
-};
-
-void ClassUnloadTypeSet::serialize(JfrCheckpointWriter& writer) {
-  TypeSetSerialization type_set(true);
-  type_set.write(writer);
-};
-
-TypeSet::TypeSet(JfrCheckpointWriter* leakp_writer) : _leakp_writer(leakp_writer) {}
-
-void TypeSet::serialize(JfrCheckpointWriter& writer) {
-  TypeSetSerialization type_set(false, _leakp_writer);
-  type_set.write(writer);
-};
-
 void ThreadStateConstant::serialize(JfrCheckpointWriter& writer) {
   JfrThreadState::serialize(writer);
 }
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
index 0cdf5ae838d..1ff6f9acf09 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
@@ -37,11 +37,6 @@ class JfrThreadGroupConstant : public JfrSerializer {
   void serialize(JfrCheckpointWriter& writer);
 };
 
-class ClassUnloadTypeSet : public JfrSerializer {
- public:
-  void serialize(JfrCheckpointWriter& writer);
-};
-
 class FlagValueOriginConstant : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer);
@@ -107,14 +102,6 @@ class VMOperationTypeConstant : public JfrSerializer {
   void serialize(JfrCheckpointWriter& writer);
 };
 
-class TypeSet : public JfrSerializer {
- private:
-  JfrCheckpointWriter* _leakp_writer;
- public:
-  explicit TypeSet(JfrCheckpointWriter* leakp_writer = NULL);
-  void serialize(JfrCheckpointWriter& writer);
-};
-
 class ThreadStateConstant : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer);
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
index 31dbda2ec7a..a127ba6de31 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
@@ -23,9 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jfr/jfr.hpp"
-#include "jfr/leakprofiler/leakProfiler.hpp"
-#include "jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp"
 #include "jfr/metadata/jfrSerializer.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
 #include "jfr/recorder/checkpoint/types/jfrType.hpp"
@@ -35,9 +32,9 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/safepoint.hpp"
+#include "runtime/semaphore.hpp"
 #include "runtime/thread.inline.hpp"
 #include "utilities/exceptions.hpp"
-#include "runtime/semaphore.hpp"
 
 class JfrSerializerRegistration : public JfrCHeapObj {
  private:
@@ -120,7 +117,7 @@ typedef StopOnNullIterator Iterator;
 static List types;
 static List safepoint_types;
 
-void JfrTypeManager::clear() {
+void JfrTypeManager::destroy() {
   SerializerRegistrationGuard guard;
   Iterator iter(types);
   JfrSerializerRegistration* registration;
@@ -152,39 +149,6 @@ void JfrTypeManager::write_safepoint_types(JfrCheckpointWriter& writer) {
   }
 }
 
-void JfrTypeManager::write_type_set() {
-  assert(!SafepointSynchronize::is_at_safepoint(), "invariant");
-  // can safepoint here
-  MutexLocker cld_lock(ClassLoaderDataGraph_lock);
-  MutexLocker module_lock(Module_lock);
-  if (!LeakProfiler::is_running()) {
-    JfrCheckpointWriter writer(true, true, Thread::current());
-    TypeSet set;
-    set.serialize(writer);
-    return;
-  }
-  JfrCheckpointWriter leakp_writer(false, true, Thread::current());
-  JfrCheckpointWriter writer(false, true, Thread::current());
-  TypeSet set(&leakp_writer);
-  set.serialize(writer);
-  ObjectSampleCheckpoint::on_type_set(leakp_writer);
-}
-
-void JfrTypeManager::write_type_set_for_unloaded_classes() {
-  assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
-  JfrCheckpointWriter writer(false, true, Thread::current());
-  const JfrCheckpointContext ctx = writer.context();
-  ClassUnloadTypeSet class_unload_set;
-  class_unload_set.serialize(writer);
-  if (LeakProfiler::is_running()) {
-    ObjectSampleCheckpoint::on_type_set_unload(writer);
-  }
-  if (!Jfr::is_recording()) {
-    // discard anything written
-    writer.set_context(ctx);
-  }
-}
-
 void JfrTypeManager::create_thread_blob(JavaThread* jt) {
   assert(jt != NULL, "invariant");
   ResourceMark rm(jt);
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
index af957bdf697..75d073be145 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
@@ -32,11 +32,9 @@ class JfrCheckpointWriter;
 class JfrTypeManager : public AllStatic {
  public:
   static bool initialize();
-  static void clear();
+  static void destroy();
   static void write_types(JfrCheckpointWriter& writer);
   static void write_safepoint_types(JfrCheckpointWriter& writer);
-  static void write_type_set();
-  static void write_type_set_for_unloaded_classes();
   static void create_thread_blob(JavaThread* jt);
   static void write_thread_checkpoint(JavaThread* jt);
 };
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index 575681f315b..3e777c5a252 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -204,9 +204,14 @@ int write__klass__leakp(JfrCheckpointWriter* writer, const void* k) {
   return write_klass(writer, klass, true);
 }
 
+static bool is_implied(const Klass* klass) {
+  assert(klass != NULL, "invariant");
+  return klass->is_subclass_of(SystemDictionary::ClassLoader_klass()) || klass == SystemDictionary::Object_klass();
+}
+
 static void do_implied(Klass* klass) {
   assert(klass != NULL, "invariant");
-  if (klass->is_subclass_of(SystemDictionary::ClassLoader_klass()) || klass == SystemDictionary::Object_klass()) {
+  if (is_implied(klass)) {
     if (_leakp_writer != NULL) {
       SET_LEAKP(klass);
     }
@@ -259,6 +264,16 @@ typedef JfrTypeWriterHost KlassWriter;
 typedef CompositeFunctor KlassWriterRegistration;
 typedef JfrArtifactCallbackHost KlassCallback;
 
+template <>
+class LeakPredicate {
+public:
+  LeakPredicate(bool class_unload) {}
+  bool operator()(const Klass* klass) {
+    assert(klass != NULL, "invariant");
+    return IS_LEAKP(klass) || is_implied(klass);
+  }
+};
+
 typedef LeakPredicate LeakKlassPredicate;
 typedef JfrPredicatedTypeWriterImplHost LeakKlassWriterImpl;
 typedef JfrTypeWriterHost LeakKlassWriter;
@@ -809,6 +824,12 @@ static void write_symbols() {
   _artifacts->tally(sw);
 }
 
+static bool clear_artifacts = false;
+
+void JfrTypeSet::clear() {
+  clear_artifacts = true;
+}
+
 typedef Wrapper ClearKlassBits;
 typedef Wrapper ClearMethodFlag;
 typedef MethodIteratorHost ClearKlassAndMethods;
@@ -820,7 +841,7 @@ static size_t teardown() {
     assert(_writer != NULL, "invariant");
     ClearKlassAndMethods clear(_writer);
     _artifacts->iterate_klasses(clear);
-    _artifacts->clear();
+    JfrTypeSet::clear();
     ++checkpoint_id;
   }
   return total_count;
@@ -833,8 +854,9 @@ static void setup(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer
   if (_artifacts == NULL) {
     _artifacts = new JfrArtifactSet(class_unload);
   } else {
-    _artifacts->initialize(class_unload);
+    _artifacts->initialize(class_unload, clear_artifacts);
   }
+  clear_artifacts = false;
   assert(_artifacts != NULL, "invariant");
   assert(!_artifacts->has_klass_entries(), "invariant");
 }
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
index 80ecc0c8223..db53464bbc8 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
@@ -31,6 +31,7 @@ class JfrCheckpointWriter;
 
 class JfrTypeSet : AllStatic {
  public:
+  static void clear();
   static size_t serialize(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer, bool class_unload);
 };
 
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp
index 80f06de3611..541a4023ed6 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.cpp
@@ -35,6 +35,8 @@ JfrSymbolId::JfrSymbolId() :
   _cstring_table(new CStringTable(this)),
   _sym_list(NULL),
   _cstring_list(NULL),
+  _sym_query(NULL),
+  _cstring_query(NULL),
   _symbol_id_counter(1),
   _class_unload(false) {
   assert(_sym_table != NULL, "invariant");
@@ -66,9 +68,11 @@ void JfrSymbolId::clear() {
   assert(!_cstring_table->has_entries(), "invariant");
 
   _sym_list = NULL;
-  _cstring_list = NULL;
   _symbol_id_counter = 1;
 
+  _sym_query = NULL;
+  _cstring_query = NULL;
+
   assert(bootstrap != NULL, "invariant");
   bootstrap->reset();
   _cstring_list = bootstrap;
@@ -88,10 +92,10 @@ void JfrSymbolId::on_link(const SymbolEntry* entry) {
 }
 
 bool JfrSymbolId::on_equals(uintptr_t hash, const SymbolEntry* entry) {
-  // query might be NULL
   assert(entry != NULL, "invariant");
   assert(entry->hash() == hash, "invariant");
-  return true;
+  assert(_sym_query != NULL, "invariant");
+  return _sym_query == entry->literal();
 }
 
 void JfrSymbolId::on_unlink(const SymbolEntry* entry) {
@@ -99,18 +103,36 @@ void JfrSymbolId::on_unlink(const SymbolEntry* entry) {
   const_cast(entry->literal())->decrement_refcount();
 }
 
+static const char* resource_to_cstring(const char* resource_str) {
+  assert(resource_str != NULL, "invariant");
+  const size_t length = strlen(resource_str);
+  char* const c_string = JfrCHeapObj::new_array(length + 1);
+  assert(c_string != NULL, "invariant");
+  strncpy(c_string, resource_str, length + 1);
+  return c_string;
+}
+
 void JfrSymbolId::on_link(const CStringEntry* entry) {
   assert(entry != NULL, "invariant");
   assert(entry->id() == 0, "invariant");
   entry->set_id(++_symbol_id_counter);
+  const_cast(entry)->set_literal(resource_to_cstring(entry->literal()));
   entry->set_list_next(_cstring_list);
   _cstring_list = entry;
 }
 
+static bool string_compare(const char* query, const char* candidate) {
+  assert(query != NULL, "invariant");
+  assert(candidate != NULL, "invariant");
+  const size_t length = strlen(query);
+  return strncmp(query, candidate, length) == 0;
+}
+
 bool JfrSymbolId::on_equals(uintptr_t hash, const CStringEntry* entry) {
   assert(entry != NULL, "invariant");
   assert(entry->hash() == hash, "invariant");
-  return true;
+  assert(_cstring_query != NULL, "invariant");
+  return string_compare(_cstring_query, entry->literal());
 }
 
 void JfrSymbolId::on_unlink(const CStringEntry* entry) {
@@ -131,16 +153,10 @@ traceid JfrSymbolId::mark(const Symbol* symbol, bool leakp) {
   return mark((uintptr_t)symbol->identity_hash(), symbol, leakp);
 }
 
-static unsigned int last_symbol_hash = 0;
-static traceid last_symbol_id = 0;
-
 traceid JfrSymbolId::mark(uintptr_t hash, const Symbol* data, bool leakp) {
   assert(data != NULL, "invariant");
   assert(_sym_table != NULL, "invariant");
-  if (hash == last_symbol_hash) {
-    assert(last_symbol_id != 0, "invariant");
-    return last_symbol_id;
-  }
+  _sym_query = data;
   const SymbolEntry& entry = _sym_table->lookup_put(hash, data);
   if (_class_unload) {
     entry.set_unloading();
@@ -148,21 +164,13 @@ traceid JfrSymbolId::mark(uintptr_t hash, const Symbol* data, bool leakp) {
   if (leakp) {
     entry.set_leakp();
   }
-  last_symbol_hash = hash;
-  last_symbol_id = entry.id();
-  return last_symbol_id;
+  return entry.id();
 }
 
-static unsigned int last_cstring_hash = 0;
-static traceid last_cstring_id = 0;
-
 traceid JfrSymbolId::mark(uintptr_t hash, const char* str, bool leakp) {
   assert(str != NULL, "invariant");
   assert(_cstring_table != NULL, "invariant");
-  if (hash == last_cstring_hash) {
-    assert(last_cstring_id != 0, "invariant");
-    return last_cstring_id;
-  }
+  _cstring_query = str;
   const CStringEntry& entry = _cstring_table->lookup_put(hash, str);
   if (_class_unload) {
     entry.set_unloading();
@@ -170,9 +178,7 @@ traceid JfrSymbolId::mark(uintptr_t hash, const char* str, bool leakp) {
   if (leakp) {
     entry.set_leakp();
   }
-  last_cstring_hash = hash;
-  last_cstring_id = entry.id();
-  return last_cstring_id;
+  return entry.id();
 }
 
 /*
@@ -202,7 +208,7 @@ static const char* create_unsafe_anonymous_klass_symbol(const InstanceKlass* ik,
   sprintf(hash_buf, "/" UINTX_FORMAT, hash);
   const size_t hash_len = strlen(hash_buf);
   const size_t result_len = ik->name()->utf8_length();
-  anonymous_symbol = JfrCHeapObj::new_array(result_len + hash_len + 1);
+  anonymous_symbol = NEW_RESOURCE_ARRAY(char, result_len + hash_len + 1);
   ik->name()->as_klass_external_name(anonymous_symbol, (int)result_len + 1);
   assert(strlen(anonymous_symbol) == result_len, "invariant");
   strcpy(anonymous_symbol + result_len, hash_buf);
@@ -215,21 +221,12 @@ bool JfrSymbolId::is_unsafe_anonymous_klass(const Klass* k) {
   return k->is_instance_klass() && ((const InstanceKlass*)k)->is_unsafe_anonymous();
 }
 
-static unsigned int last_anonymous_hash = 0;
-static traceid last_anonymous_id = 0;
-
 traceid JfrSymbolId::mark_unsafe_anonymous_klass_name(const InstanceKlass* ik, bool leakp) {
   assert(ik != NULL, "invariant");
   assert(ik->is_unsafe_anonymous(), "invariant");
   const uintptr_t hash = unsafe_anonymous_klass_name_hash(ik);
-  if (hash == last_anonymous_hash) {
-    assert(last_anonymous_id != 0, "invariant");
-    return last_anonymous_id;
-  }
-  last_anonymous_hash = hash;
-  const CStringEntry* const entry = _cstring_table->lookup_only(hash);
-  last_anonymous_id = entry != NULL ? entry->id() : mark(hash, create_unsafe_anonymous_klass_symbol(ik, hash), leakp);
-  return last_anonymous_id;
+  const char* const anonymous_klass_symbol = create_unsafe_anonymous_klass_symbol(ik, hash);
+  return mark(hash, anonymous_klass_symbol, leakp);
 }
 
 traceid JfrSymbolId::mark(const Klass* k, bool leakp) {
@@ -249,23 +246,20 @@ traceid JfrSymbolId::mark(const Klass* k, bool leakp) {
   return symbol_id;
 }
 
-static void reset_symbol_caches() {
-  last_anonymous_hash = 0;
-  last_symbol_hash = 0;
-  last_cstring_hash = 0;
-}
-
 JfrArtifactSet::JfrArtifactSet(bool class_unload) : _symbol_id(new JfrSymbolId()),
-                                                     _klass_list(NULL),
-                                                     _total_count(0) {
+                                                    _klass_list(NULL),
+                                                    _total_count(0) {
   initialize(class_unload);
   assert(_klass_list != NULL, "invariant");
 }
 
 static const size_t initial_class_list_size = 200;
 
-void JfrArtifactSet::initialize(bool class_unload) {
+void JfrArtifactSet::initialize(bool class_unload, bool clear /* false */) {
   assert(_symbol_id != NULL, "invariant");
+  if (clear) {
+    _symbol_id->clear();
+  }
   _symbol_id->set_class_unload(class_unload);
   _total_count = 0;
   // resource allocation
@@ -273,13 +267,8 @@ void JfrArtifactSet::initialize(bool class_unload) {
 }
 
 JfrArtifactSet::~JfrArtifactSet() {
-  clear();
-  delete _symbol_id;
-}
-
-void JfrArtifactSet::clear() {
-  reset_symbol_caches();
   _symbol_id->clear();
+  delete _symbol_id;
   // _klass_list will be cleared by a ResourceMark
 }
 
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
index b32e6420b0d..0482489601f 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
@@ -222,6 +222,8 @@ class JfrSymbolId : public JfrCHeapObj {
   CStringTable* _cstring_table;
   const SymbolEntry* _sym_list;
   const CStringEntry* _cstring_list;
+  const Symbol* _sym_query;
+  const char* _cstring_query;
   traceid _symbol_id_counter;
   bool _class_unload;
 
@@ -300,9 +302,7 @@ class JfrArtifactSet : public JfrCHeapObj {
   ~JfrArtifactSet();
 
   // caller needs ResourceMark
-  void initialize(bool class_unload);
-  void clear();
-
+  void initialize(bool class_unload, bool clear = false);
 
   traceid mark(uintptr_t hash, const Symbol* sym, bool leakp);
   traceid mark(const Klass* klass, bool leakp);
diff --git a/test/jdk/jdk/jfr/jvm/TestClearStaleConstants.java b/test/jdk/jdk/jfr/jvm/TestClearStaleConstants.java
new file mode 100644
index 00000000000..028612a007b
--- /dev/null
+++ b/test/jdk/jdk/jfr/jvm/TestClearStaleConstants.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.jvm;
+
+import java.time.Duration;
+import java.util.List;
+
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedClassLoader;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.internal.JVM;
+import jdk.jfr.Recording;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.TestClassLoader;
+
+/**
+ * @test
+ * @bug 8231081
+ * @key jfr
+ * @requires vm.hasJFR
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @library /test/lib /test/jdk
+ * @run main/othervm -Xlog:class+unload -Xlog:gc -Xmx16m jdk.jfr.jvm.TestClearStaleConstants
+ */
+
+/**
+ * System.gc() will trigger class unloading if -XX:+ExplicitGCInvokesConcurrent is NOT set.
+ * If this flag is set G1 will never unload classes on System.gc() and
+ * As far as the "jfr" key guarantees no VM flags are set from the outside
+ * it should be enough with System.gc().
+ */
+public final class TestClearStaleConstants {
+    static class MyClass {
+    }
+    private final static String TEST_CLASS_NAME = "jdk.jfr.jvm.TestClearStaleConstants$MyClass";
+    private final static String EVENT_NAME = EventNames.ClassDefine;
+
+    // to prevent the compiler to optimize away all unread writes
+    public static TestClassLoader firstClassLoader;
+    public static TestClassLoader secondClassLoader;
+
+    public static void main(String... args) throws Exception {
+        firstClassLoader = new TestClassLoader();
+        // define a  class using a class loader under a recording
+        Class clz = recordClassDefinition(firstClassLoader);
+        JVM jvm = JVM.getJVM();
+        // we will now tag the defined and loaded clz as being in use (no recordings are running here)
+        jvm.getClassIdNonIntrinsic(clz);
+        // null out for unload to occur
+        firstClassLoader = null;
+        clz = null;
+        // provoke unload
+        System.gc();
+        // try to define another class _with the same name_ using a different class loader
+        secondClassLoader = new TestClassLoader();
+        // this will throw a NPE for 8231081 because it will reuse the same class name
+        // that symbol was  marked as already serialized by the unload, but since no recordings were running
+        // it was not written to any chunk. This creates a reference to a non-existing symbol, leading to an NPE (no symbol at the expected location).
+        recordClassDefinition(secondClassLoader);
+    }
+
+    private static Class recordClassDefinition(TestClassLoader classLoader) throws Exception  {
+        try (Recording recording = new Recording())  {
+            recording.enable(EVENT_NAME);
+            recording.start();
+            Class clz = classLoader.loadClass(TEST_CLASS_NAME);
+            recording.stop();
+            assertClassDefineEvent(recording);
+            return clz;
+        }
+    }
+
+    private static void assertClassDefineEvent(Recording recording) throws Exception {
+        boolean isAnyFound = false;
+        for (RecordedEvent event : Events.fromRecording(recording)) {
+            System.out.println(event);
+            RecordedClass definedClass = event.getValue("definedClass");
+            if (TEST_CLASS_NAME.equals(definedClass.getName())) {
+                RecordedClassLoader definingClassLoader = definedClass.getClassLoader();
+                String definingName = definingClassLoader.getType().getName();
+                String testName = TestClassLoader.class.getName();
+                String errorMsg = "Expected " + testName + ", got " + definingName;
+                Asserts.assertEquals(testName, definingName, errorMsg);
+                Asserts.assertFalse(isAnyFound, "Found more than 1 event");
+                isAnyFound = true;
+            }
+        }
+        Asserts.assertTrue(isAnyFound, "No events found");
+    }
+}

From a8c4e6786dcb5c8a38800cf469b30f99ed31a45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Lid=C3=A9n?= 
Date: Thu, 24 Oct 2019 17:24:58 +0200
Subject: [PATCH 072/163] 8231552: ZGC: Refine address space reservation

Reviewed-by: eosterlund, stefank
---
 .../cpu/aarch64/gc/z/zGlobals_aarch64.cpp     |  3 +-
 .../cpu/aarch64/gc/z/zGlobals_aarch64.hpp     | 18 +---
 src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp     |  3 +-
 src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp     | 18 +---
 .../os/posix/gc/z/zVirtualMemory_posix.cpp    |  2 +-
 src/hotspot/share/gc/z/zAddressSpaceLimit.cpp | 51 ++++++++++
 src/hotspot/share/gc/z/zAddressSpaceLimit.hpp | 35 +++++++
 src/hotspot/share/gc/z/zArguments.cpp         | 10 ++
 src/hotspot/share/gc/z/zGlobals.hpp           | 17 ++++
 src/hotspot/share/gc/z/zVirtualMemory.cpp     | 96 ++++++++++++++++---
 src/hotspot/share/gc/z/zVirtualMemory.hpp     |  8 +-
 .../Allocate/alloc001/TestDescription.java    |  2 -
 12 files changed, 214 insertions(+), 49 deletions(-)
 create mode 100644 src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
 create mode 100644 src/hotspot/share/gc/z/zAddressSpaceLimit.hpp

diff --git a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
index 607c2fee23e..03d05471a7e 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.cpp
@@ -142,8 +142,7 @@ uintptr_t ZPlatformAddressBase() {
 size_t ZPlatformAddressOffsetBits() {
   const size_t min_address_offset_bits = 42; // 4TB
   const size_t max_address_offset_bits = 44; // 16TB
-  const size_t virtual_to_physical_ratio = 7; // 7:1
-  const size_t address_offset = ZUtils::round_up_power_of_2(MaxHeapSize * virtual_to_physical_ratio);
+  const size_t address_offset = ZUtils::round_up_power_of_2(MaxHeapSize * ZVirtualToPhysicalRatio);
   const size_t address_offset_bits = log2_intptr(address_offset);
   return MIN2(MAX2(address_offset_bits, min_address_offset_bits), max_address_offset_bits);
 }
diff --git a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp
index 40adf839242..58d2e5760a7 100644
--- a/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/z/zGlobals_aarch64.hpp
@@ -24,23 +24,13 @@
 #ifndef CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
 #define CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
 
-//
-// Page Allocation Tiers
-// ---------------------
-//
-//  Page Type     Page Size     Object Size Limit     Object Alignment
-//  ------------------------------------------------------------------
-//  Small         2M            <= 265K               
-//  Medium        32M           <= 4M                 4K
-//  Large         X*M           > 4M                  2M
-//  ------------------------------------------------------------------
-//
 const size_t ZPlatformGranuleSizeShift      = 21; // 2MB
+const size_t ZPlatformHeapViews             = 3;
 const size_t ZPlatformNMethodDisarmedOffset = 4;
 const size_t ZPlatformCacheLineSize         = 64;
 
-uintptr_t    ZPlatformAddressBase();
-size_t       ZPlatformAddressOffsetBits();
-size_t       ZPlatformAddressMetadataShift();
+uintptr_t ZPlatformAddressBase();
+size_t ZPlatformAddressOffsetBits();
+size_t ZPlatformAddressMetadataShift();
 
 #endif // CPU_AARCH64_GC_Z_ZGLOBALS_AARCH64_HPP
diff --git a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
index 607c2fee23e..03d05471a7e 100644
--- a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.cpp
@@ -142,8 +142,7 @@ uintptr_t ZPlatformAddressBase() {
 size_t ZPlatformAddressOffsetBits() {
   const size_t min_address_offset_bits = 42; // 4TB
   const size_t max_address_offset_bits = 44; // 16TB
-  const size_t virtual_to_physical_ratio = 7; // 7:1
-  const size_t address_offset = ZUtils::round_up_power_of_2(MaxHeapSize * virtual_to_physical_ratio);
+  const size_t address_offset = ZUtils::round_up_power_of_2(MaxHeapSize * ZVirtualToPhysicalRatio);
   const size_t address_offset_bits = log2_intptr(address_offset);
   return MIN2(MAX2(address_offset_bits, min_address_offset_bits), max_address_offset_bits);
 }
diff --git a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp
index 24971c24a51..c794d3587ff 100644
--- a/src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/z/zGlobals_x86.hpp
@@ -24,23 +24,13 @@
 #ifndef CPU_X86_GC_Z_ZGLOBALS_X86_HPP
 #define CPU_X86_GC_Z_ZGLOBALS_X86_HPP
 
-//
-// Page Allocation Tiers
-// ---------------------
-//
-//  Page Type     Page Size     Object Size Limit     Object Alignment
-//  ------------------------------------------------------------------
-//  Small         2M            <= 265K               
-//  Medium        32M           <= 4M                 4K
-//  Large         X*M           > 4M                  2M
-//  ------------------------------------------------------------------
-//
 const size_t ZPlatformGranuleSizeShift      = 21; // 2MB
+const size_t ZPlatformHeapViews             = 3;
 const size_t ZPlatformNMethodDisarmedOffset = 4;
 const size_t ZPlatformCacheLineSize         = 64;
 
-uintptr_t    ZPlatformAddressBase();
-size_t       ZPlatformAddressOffsetBits();
-size_t       ZPlatformAddressMetadataShift();
+uintptr_t ZPlatformAddressBase();
+size_t ZPlatformAddressOffsetBits();
+size_t ZPlatformAddressMetadataShift();
 
 #endif // CPU_X86_GC_Z_ZGLOBALS_X86_HPP
diff --git a/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp b/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
index 58c93dc99e0..8bd2dfda53a 100644
--- a/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
+++ b/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
@@ -51,7 +51,7 @@ static bool map(uintptr_t start, size_t size) {
   return true;
 }
 
-bool ZVirtualMemoryManager::reserve_platform(uintptr_t start, size_t size) {
+bool ZVirtualMemoryManager::reserve_contiguous_platform(uintptr_t start, size_t size) {
   // Reserve address views
   const uintptr_t marked0 = ZAddress::marked0(start);
   const uintptr_t marked1 = ZAddress::marked1(start);
diff --git a/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp b/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
new file mode 100644
index 00000000000..20c10411711
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zAddressSpaceLimit.hpp"
+#include "gc/z/zGlobals.hpp"
+#include "runtime/os.hpp"
+#include "utilities/align.hpp"
+
+static size_t address_space_limit() {
+  julong limit = 0;
+
+  if (os::has_allocatable_memory_limit(&limit)) {
+    return (size_t)limit;
+  }
+
+  // No limit
+  return SIZE_MAX;
+}
+
+size_t ZAddressSpaceLimit::mark_stack() {
+  // Allow mark stacks to occupy 10% of the address space
+  const size_t limit = address_space_limit() / 10;
+  return align_up(limit, ZMarkStackSpaceExpandSize);
+}
+
+size_t ZAddressSpaceLimit::heap_view() {
+  // Allow all heap views to occupy 50% of the address space
+  const size_t limit = address_space_limit() / 2 / ZHeapViews;
+  return align_up(limit, ZGranuleSize);
+}
diff --git a/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp b/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp
new file mode 100644
index 00000000000..b6a03776f5c
--- /dev/null
+++ b/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#ifndef SHARE_GC_Z_ZADDRESSSPACELIMIT_HPP
+#define SHARE_GC_Z_ZADDRESSSPACELIMIT_HPP
+
+#include "memory/allocation.hpp"
+
+class ZAddressSpaceLimit : public AllStatic {
+public:
+  static size_t mark_stack();
+  static size_t heap_view();
+};
+
+#endif // SHARE_GC_Z_ZADDRESSSPACELIMIT_HPP
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index 1ae53f337b9..51f722eb779 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/z/zAddressSpaceLimit.hpp"
 #include "gc/z/zArguments.hpp"
 #include "gc/z/zCollectedHeap.hpp"
 #include "gc/z/zWorkers.hpp"
@@ -37,6 +38,15 @@ void ZArguments::initialize_alignments() {
 void ZArguments::initialize() {
   GCArguments::initialize();
 
+  // Check mark stack size
+  const size_t mark_stack_space_limit = ZAddressSpaceLimit::mark_stack();
+  if (ZMarkStackSpaceLimit > mark_stack_space_limit) {
+    if (!FLAG_IS_DEFAULT(ZMarkStackSpaceLimit)) {
+      vm_exit_during_initialization("ZMarkStackSpaceLimit too large for limited address space");
+    }
+    FLAG_SET_DEFAULT(ZMarkStackSpaceLimit, mark_stack_space_limit);
+  }
+
   // Enable NUMA by default
   if (FLAG_IS_DEFAULT(UseNUMA)) {
     FLAG_SET_DEFAULT(UseNUMA, true);
diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
index fec6376050a..b2f5059295f 100644
--- a/src/hotspot/share/gc/z/zGlobals.hpp
+++ b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -44,6 +44,23 @@ extern uint32_t   ZGlobalSeqNum;
 const size_t      ZGranuleSizeShift             = ZPlatformGranuleSizeShift;
 const size_t      ZGranuleSize                  = (size_t)1 << ZGranuleSizeShift;
 
+// Number of heap views
+const size_t      ZHeapViews                    = ZPlatformHeapViews;
+
+// Virtual memory to physical memory ratio
+const size_t      ZVirtualToPhysicalRatio       = 16; // 16:1
+
+//
+// Page Tiers (assuming ZGranuleSize=2M)
+// -------------------------------------
+//
+//                 Page Size        Object Size      Object Alignment
+//                 --------------------------------------------------
+//  Small          2M               <= 265K          MinObjAlignmentInBytes
+//  Medium         32M              <= 4M            4K
+//  Large          N x 2M           > 4M             2M
+//
+
 // Page types
 const uint8_t     ZPageTypeSmall                = 0;
 const uint8_t     ZPageTypeMedium               = 1;
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.cpp b/src/hotspot/share/gc/z/zVirtualMemory.cpp
index cfb2fee796a..4942ab3d16a 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.cpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.cpp
@@ -22,10 +22,13 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/z/zAddressSpaceLimit.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zVirtualMemory.inline.hpp"
 #include "logging/log.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/align.hpp"
 
 ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
     _manager(),
@@ -38,11 +41,9 @@ ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
     return;
   }
 
-  log_info(gc, init)("Address Space: " SIZE_FORMAT "T", ZAddressOffsetMax / K / G);
-
   // Reserve address space
-  if (reserve(0, ZAddressOffsetMax) < max_capacity) {
-    log_error(gc)("Failed to reserve address space for Java heap");
+  if (!reserve(max_capacity)) {
+    log_error(gc)("Failed to reserve enough address space for Java heap");
     return;
   }
 
@@ -50,21 +51,92 @@ ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
   _initialized = true;
 }
 
-size_t ZVirtualMemoryManager::reserve(uintptr_t start, size_t size) {
-  if (size < ZGranuleSize) {
+size_t ZVirtualMemoryManager::reserve_discontiguous(uintptr_t start, size_t size, size_t min_range) {
+  if (size < min_range) {
     // Too small
     return 0;
   }
 
-  if (!reserve_platform(start, size)) {
-    const size_t half = size / 2;
-    return reserve(start, half) + reserve(start + half, half);
+  assert(is_aligned(size, ZGranuleSize), "Misaligned");
+
+  if (reserve_contiguous_platform(start, size)) {
+    // Make the address range free
+    _manager.free(start, size);
+    return size;
   }
 
-  // Make the address range free
-  _manager.free(start, size);
+  const size_t half = size / 2;
+  if (half < min_range) {
+    // Too small
+    return 0;
+  }
 
-  return size;
+  // Divide and conquer
+  const size_t first_part = align_down(half, ZGranuleSize);
+  const size_t second_part = size - first_part;
+  return reserve_discontiguous(start, first_part, min_range) +
+         reserve_discontiguous(start + first_part, second_part, min_range);
+}
+
+size_t ZVirtualMemoryManager::reserve_discontiguous(size_t size) {
+  // Don't try to reserve address ranges smaller than 1% of the requested size.
+  // This avoids an explosion of reservation attempts in case large parts of the
+  // address space is already occupied.
+  const size_t min_range = align_up(size / 100, ZGranuleSize);
+  size_t start = 0;
+  size_t reserved = 0;
+
+  // Reserve size somewhere between [0, ZAddressOffsetMax)
+  while (reserved < size && start < ZAddressOffsetMax) {
+    const size_t remaining = MIN2(size - reserved, ZAddressOffsetMax - start);
+    reserved += reserve_discontiguous(start, remaining, min_range);
+    start += remaining;
+  }
+
+  return reserved;
+}
+
+bool ZVirtualMemoryManager::reserve_contiguous(size_t size) {
+  // Allow at most 8192 attempts spread evenly across [0, ZAddressOffsetMax)
+  const size_t end = ZAddressOffsetMax - size;
+  const size_t increment = align_up(end / 8192, ZGranuleSize);
+
+  for (size_t start = 0; start <= end; start += increment) {
+    if (reserve_contiguous_platform(start, size)) {
+      // Make the address range free
+      _manager.free(start, size);
+
+      // Success
+      return true;
+    }
+  }
+
+  // Failed
+  return false;
+}
+
+bool ZVirtualMemoryManager::reserve(size_t max_capacity) {
+  const size_t limit = MIN2(ZAddressOffsetMax, ZAddressSpaceLimit::heap_view());
+  const size_t size = MIN2(max_capacity * ZVirtualToPhysicalRatio, limit);
+
+  size_t reserved = size;
+  bool contiguous = true;
+
+  // Prefer a contiguous address space
+  if (!reserve_contiguous(size)) {
+    // Fall back to a discontiguous address space
+    reserved = reserve_discontiguous(size);
+    contiguous = false;
+  }
+
+  log_info(gc, init)("Address Space Type: %s/%s/%s",
+                     (contiguous ? "Contiguous" : "Discontiguous"),
+                     (limit == ZAddressOffsetMax ? "Unrestricted" : "Restricted"),
+                     (reserved == size ? "Complete" : "Degraded"));
+  log_info(gc, init)("Address Space Size: " SIZE_FORMAT "M x " SIZE_FORMAT " = " SIZE_FORMAT "M",
+                     reserved / M, ZHeapViews, (reserved * ZHeapViews) / M);
+
+  return reserved >= max_capacity;
 }
 
 void ZVirtualMemoryManager::nmt_reserve(uintptr_t start, size_t size) {
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
index 118048dd670..0271601b3b1 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -50,8 +50,12 @@ private:
   ZMemoryManager _manager;
   bool           _initialized;
 
-  bool reserve_platform(uintptr_t start, size_t size);
-  size_t reserve(uintptr_t start, size_t size);
+  bool reserve_contiguous_platform(uintptr_t start, size_t size);
+  bool reserve_contiguous(size_t size);
+  size_t reserve_discontiguous(uintptr_t start, size_t size, size_t min_range);
+  size_t reserve_discontiguous(size_t size);
+  bool reserve(size_t max_capacity);
+
   void nmt_reserve(uintptr_t start, size_t size);
 
 public:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/TestDescription.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/TestDescription.java
index 386dd36cbe8..c7bf3df62fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/TestDescription.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/TestDescription.java
@@ -42,8 +42,6 @@
  * @library /vmTestbase
  *          /test/lib
  * @requires os.family != "aix"
- * @comment Test is incompatible with ZGC, due to ZGC's address space requirements.
- * @requires vm.gc != "Z"
  * @run driver jdk.test.lib.FileInstaller . .
  * @build nsk.jvmti.Allocate.alloc001
  * @run shell alloc001.sh

From d157ebb41c7190881f265e811116cdb91beedb46 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev 
Date: Mon, 30 Sep 2019 22:39:11 +0200
Subject: [PATCH 073/163] 8222766: Shenandoah: streamline post-LRB CAS barrier
 (x86)

Reviewed-by: rkennke
---
 .../shenandoahBarrierSetAssembler_x86.cpp     | 201 +++++++++---------
 .../shenandoahBarrierSetAssembler_x86.hpp     |   3 -
 2 files changed, 103 insertions(+), 101 deletions(-)

diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index b39003a505c..b6bc10bf6cc 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -247,54 +247,6 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
   __ bind(done);
 }
 
-void ShenandoahBarrierSetAssembler::resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp) {
-  assert(ShenandoahCASBarrier, "should be enabled");
-  Label is_null;
-  __ testptr(dst, dst);
-  __ jcc(Assembler::zero, is_null);
-  resolve_forward_pointer_not_null(masm, dst, tmp);
-  __ bind(is_null);
-}
-
-void ShenandoahBarrierSetAssembler::resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp) {
-  assert(ShenandoahCASBarrier || ShenandoahLoadRefBarrier, "should be enabled");
-  // The below loads the mark word, checks if the lowest two bits are
-  // set, and if so, clear the lowest two bits and copy the result
-  // to dst. Otherwise it leaves dst alone.
-  // Implementing this is surprisingly awkward. I do it here by:
-  // - Inverting the mark word
-  // - Test lowest two bits == 0
-  // - If so, set the lowest two bits
-  // - Invert the result back, and copy to dst
-
-  bool borrow_reg = (tmp == noreg);
-  if (borrow_reg) {
-    // No free registers available. Make one useful.
-    tmp = LP64_ONLY(rscratch1) NOT_LP64(rdx);
-    if (tmp == dst) {
-      tmp = LP64_ONLY(rscratch2) NOT_LP64(rcx);
-    }
-    __ push(tmp);
-  }
-
-  assert_different_registers(dst, tmp);
-
-  Label done;
-  __ movptr(tmp, Address(dst, oopDesc::mark_offset_in_bytes()));
-  __ notptr(tmp);
-  __ testb(tmp, markWord::marked_value);
-  __ jccb(Assembler::notZero, done);
-  __ orptr(tmp, markWord::marked_value);
-  __ notptr(tmp);
-  __ mov(dst, tmp);
-  __ bind(done);
-
-  if (borrow_reg) {
-    __ pop(tmp);
-  }
-}
-
-
 void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembler* masm, Register dst) {
   assert(ShenandoahLoadRefBarrier, "Should be enabled");
 
@@ -605,8 +557,9 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
                                                 bool exchange, Register tmp1, Register tmp2) {
   assert(ShenandoahCASBarrier, "Should only be used when CAS barrier is enabled");
   assert(oldval == rax, "must be in rax for implicit use in cmpxchg");
+  assert_different_registers(oldval, newval, tmp1, tmp2);
 
-  Label retry, done;
+  Label L_success, L_failure;
 
   // Remember oldval for retry logic below
 #ifdef _LP64
@@ -618,8 +571,10 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
     __ movptr(tmp1, oldval);
   }
 
-  // Step 1. Try to CAS with given arguments. If successful, then we are done,
-  // and can safely return.
+  // Step 1. Fast-path.
+  //
+  // Try to CAS with given arguments. If successful, then we are done.
+
   if (os::is_MP()) __ lock();
 #ifdef _LP64
   if (UseCompressedOops) {
@@ -629,21 +584,32 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
   {
     __ cmpxchgptr(newval, addr);
   }
-  __ jcc(Assembler::equal, done, true);
+  __ jcc(Assembler::equal, L_success);
 
   // Step 2. CAS had failed. This may be a false negative.
   //
   // The trouble comes when we compare the to-space pointer with the from-space
-  // pointer to the same object. To resolve this, it will suffice to resolve both
-  // oldval and the value from memory -- this will give both to-space pointers.
+  // pointer to the same object. To resolve this, it will suffice to resolve
+  // the value from memory -- this will give both to-space pointers.
   // If they mismatch, then it was a legitimate failure.
   //
+  // Before reaching to resolve sequence, see if we can avoid the whole shebang
+  // with filters.
+
+  // Filter: when offending in-memory value is NULL, the failure is definitely legitimate
+  __ testptr(oldval, oldval);
+  __ jcc(Assembler::zero, L_failure);
+
+  // Filter: when heap is stable, the failure is definitely legitimate
 #ifdef _LP64
-  if (UseCompressedOops) {
-    __ decode_heap_oop(tmp1);
-  }
+  const Register thread = r15_thread;
+#else
+  const Register thread = tmp2;
+  __ get_thread(thread);
 #endif
-  resolve_forward_pointer(masm, tmp1);
+  Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
+  __ testb(gc_state, ShenandoahHeap::HAS_FORWARDED);
+  __ jcc(Assembler::zero, L_failure);
 
 #ifdef _LP64
   if (UseCompressedOops) {
@@ -654,18 +620,70 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
   {
     __ movptr(tmp2, oldval);
   }
-  resolve_forward_pointer(masm, tmp2);
 
+  // Decode offending in-memory value.
+  // Test if-forwarded
+  __ testb(Address(tmp2, oopDesc::mark_offset_in_bytes()), markWord::marked_value);
+  __ jcc(Assembler::noParity, L_failure);  // When odd number of bits, then not forwarded
+  __ jcc(Assembler::zero, L_failure);      // When it is 00, then also not forwarded
+
+  // Load and mask forwarding pointer
+  __ movptr(tmp2, Address(tmp2, oopDesc::mark_offset_in_bytes()));
+  __ shrptr(tmp2, 2);
+  __ shlptr(tmp2, 2);
+
+#ifdef _LP64
+  if (UseCompressedOops) {
+    __ decode_heap_oop(tmp1); // decode for comparison
+  }
+#endif
+
+  // Now we have the forwarded offender in tmp2.
+  // Compare and if they don't match, we have legitimate failure
   __ cmpptr(tmp1, tmp2);
-  __ jcc(Assembler::notEqual, done, true);
+  __ jcc(Assembler::notEqual, L_failure);
 
-  // Step 3. Try to CAS again with resolved to-space pointers.
+  // Step 3. Need to fix the memory ptr before continuing.
   //
-  // Corner case: it may happen that somebody stored the from-space pointer
-  // to memory while we were preparing for retry. Therefore, we can fail again
-  // on retry, and so need to do this in loop, always resolving the failure
-  // witness.
-  __ bind(retry);
+  // At this point, we have from-space oldval in the register, and its to-space
+  // address is in tmp2. Let's try to update it into memory. We don't care if it
+  // succeeds or not. If it does, then the retrying CAS would see it and succeed.
+  // If this fixup fails, this means somebody else beat us to it, and necessarily
+  // with to-space ptr store. We still have to do the retry, because the GC might
+  // have updated the reference for us.
+
+#ifdef _LP64
+  if (UseCompressedOops) {
+    __ encode_heap_oop(tmp2); // previously decoded at step 2.
+  }
+#endif
+
+  if (os::is_MP()) __ lock();
+#ifdef _LP64
+  if (UseCompressedOops) {
+    __ cmpxchgl(tmp2, addr);
+  } else
+#endif
+  {
+    __ cmpxchgptr(tmp2, addr);
+  }
+
+  // Step 4. Try to CAS again.
+  //
+  // This is guaranteed not to have false negatives, because oldval is definitely
+  // to-space, and memory pointer is to-space as well. Nothing is able to store
+  // from-space ptr into memory anymore. Make sure oldval is restored, after being
+  // garbled during retries.
+  //
+#ifdef _LP64
+  if (UseCompressedOops) {
+    __ movl(oldval, tmp2);
+  } else
+#endif
+  {
+    __ movptr(oldval, tmp2);
+  }
+
   if (os::is_MP()) __ lock();
 #ifdef _LP64
   if (UseCompressedOops) {
@@ -675,41 +693,28 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
   {
     __ cmpxchgptr(newval, addr);
   }
-  __ jcc(Assembler::equal, done, true);
-
-#ifdef _LP64
-  if (UseCompressedOops) {
-    __ movl(tmp2, oldval);
-    __ decode_heap_oop(tmp2);
-  } else
-#endif
-  {
-    __ movptr(tmp2, oldval);
-  }
-  resolve_forward_pointer(masm, tmp2);
-
-  __ cmpptr(tmp1, tmp2);
-  __ jcc(Assembler::equal, retry, true);
-
-  // Step 4. If we need a boolean result out of CAS, check the flag again,
-  // and promote the result. Note that we handle the flag from both the CAS
-  // itself and from the retry loop.
-  __ bind(done);
   if (!exchange) {
+    __ jccb(Assembler::equal, L_success); // fastpath, peeking into Step 5, no need to jump
+  }
+
+  // Step 5. If we need a boolean result out of CAS, set the flag appropriately.
+  // and promote the result. Note that we handle the flag from both the 1st and 2nd CAS.
+  // Otherwise, failure witness for CAE is in oldval on all paths, and we can return.
+
+  if (exchange) {
+    __ bind(L_failure);
+    __ bind(L_success);
+  } else {
     assert(res != NULL, "need result register");
-#ifdef _LP64
-    __ setb(Assembler::equal, res);
-    __ movzbl(res, res);
-#else
-    // Need something else to clean the result, because some registers
-    // do not have byte encoding that movzbl wants. Cannot do the xor first,
-    // because it modifies the flags.
-    Label res_non_zero;
-    __ movptr(res, 1);
-    __ jcc(Assembler::equal, res_non_zero, true);
+
+    Label exit;
+    __ bind(L_failure);
     __ xorptr(res, res);
-    __ bind(res_non_zero);
-#endif
+    __ jmpb(exit);
+
+    __ bind(L_success);
+    __ movptr(res, 1);
+    __ bind(exit);
   }
 }
 
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
index 270c0ad2aa2..23f20977fbb 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
@@ -55,9 +55,6 @@ private:
                                     bool tosca_live,
                                     bool expand_call);
 
-  void resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp = noreg);
-  void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg);
-
   void load_reference_barrier_not_null(MacroAssembler* masm, Register dst);
 
   void storeval_barrier_impl(MacroAssembler* masm, Register dst, Register tmp);

From 29f2d7417326cb7105c79c46278ec3d1180bbbeb Mon Sep 17 00:00:00 2001
From: Vojin Jovanovic 
Date: Mon, 28 Oct 2019 15:03:36 +0100
Subject: [PATCH 074/163] 8232806: Introduce a system property to disable eager
 lambda initialization

Reviewed-by: briangoetz, mr, psandoz, forax
---
 .../invoke/InnerClassLambdaMetafactory.java   | 22 ++++++---
 .../lambda/lambdaExpression/LambdaTest6.java  | 48 ++++++++++++++-----
 .../lambda/methodReference/BridgeMethod.java  | 45 +++++++++++++----
 3 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index 70db5c9c7ac..1c386e181bf 100644
--- a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -29,6 +29,7 @@ import jdk.internal.org.objectweb.asm.*;
 import sun.invoke.util.BytecodeDescriptor;
 import jdk.internal.misc.Unsafe;
 import sun.security.action.GetPropertyAction;
+import sun.security.action.GetBooleanAction;
 
 import java.io.FilePermission;
 import java.io.Serializable;
@@ -87,10 +88,15 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
     // For dumping generated classes to disk, for debugging purposes
     private static final ProxyClassesDumper dumper;
 
+    private static final boolean disableEagerInitialization;
+
     static {
-        final String key = "jdk.internal.lambda.dumpProxyClasses";
-        String path = GetPropertyAction.privilegedGetProperty(key);
-        dumper = (null == path) ? null : ProxyClassesDumper.getInstance(path);
+        final String dumpProxyClassesKey = "jdk.internal.lambda.dumpProxyClasses";
+        String dumpPath = GetPropertyAction.privilegedGetProperty(dumpProxyClassesKey);
+        dumper = (null == dumpPath) ? null : ProxyClassesDumper.getInstance(dumpPath);
+
+        final String disableEagerInitializationKey = "jdk.internal.lambda.disableEagerInitialization";
+        disableEagerInitialization = GetBooleanAction.privilegedGetProperty(disableEagerInitializationKey);
     }
 
     // See context values in AbstractValidatingLambdaMetafactory
@@ -187,7 +193,9 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
     @Override
     CallSite buildCallSite() throws LambdaConversionException {
         final Class innerClass = spinInnerClass();
-        if (invokedType.parameterCount() == 0) {
+        if (invokedType.parameterCount() == 0 && !disableEagerInitialization) {
+            // In the case of a non-capturing lambda, we optimize linkage by pre-computing a single instance,
+            // unless we've suppressed eager initialization
             final Constructor[] ctrs = AccessController.doPrivileged(
                     new PrivilegedAction<>() {
                 @Override
@@ -215,7 +223,9 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
             }
         } else {
             try {
-                UNSAFE.ensureClassInitialized(innerClass);
+                if (!disableEagerInitialization) {
+                    UNSAFE.ensureClassInitialized(innerClass);
+                }
                 return new ConstantCallSite(
                         MethodHandles.Lookup.IMPL_LOOKUP
                              .findStatic(innerClass, NAME_FACTORY, invokedType));
@@ -273,7 +283,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*;
 
         generateConstructor();
 
-        if (invokedType.parameterCount() != 0) {
+        if (invokedType.parameterCount() != 0 || disableEagerInitialization) {
             generateFactory();
         }
 
diff --git a/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest6.java b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest6.java
index 76bc2ba34ac..a0513860ff9 100644
--- a/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest6.java
+++ b/test/langtools/tools/javac/lambda/lambdaExpression/LambdaTest6.java
@@ -26,8 +26,11 @@
  * @bug 8003280
  * @summary Add lambda tests
  *   Test bridge methods for certain SAM conversions
+ *   Tests that jdk.internal.lambda.disableEagerInitialization=true creates a
+ *   get$Lambda method for non-capturing lambdas
  * @compile LambdaTest6.java
  * @run main LambdaTest6
+ * @run main/othervm -Djdk.internal.lambda.disableEagerInitialization=true LambdaTest6
  */
 
 import java.lang.reflect.Method;
@@ -60,18 +63,37 @@ public class LambdaTest6 {
         return s;
     }
 
+    private static Set allowedMethods() {
+        Set s = new HashSet<>();
+        s.add("m");
+        if (Boolean.getBoolean("jdk.internal.lambda.disableEagerInitialization")) {
+            s.add("get$Lambda");
+        }
+        return s;
+    }
+
+    private static boolean matchingMethodNames(Method[] methods) {
+        Set methodNames = new HashSet<>();
+        for (Method m : methods) {
+            methodNames.add(m.getName());
+        }
+        return methodNames.equals(allowedMethods());
+    }
+
     private void test1()
     {
         L la = s -> { };
         la.m("hi");
         Class c1 = la.getClass();
         Method[] methods = c1.getDeclaredMethods();
+        assertTrue(matchingMethodNames(methods));
         Set types = setOfStringObject();
         for(Method m : methods) {
-            assertTrue(m.getName().equals("m"));
-            Class[] parameterTypes = m.getParameterTypes();
-            assertTrue(parameterTypes.length == 1);
-            assertTrue(types.remove(parameterTypes[0].getName()));
+            if ("m".equals(m.getName())) {
+                Class[] parameterTypes = m.getParameterTypes();
+                assertTrue(parameterTypes.length == 1);
+                assertTrue(types.remove(parameterTypes[0].getName()));
+            }
         }
         assertTrue(types.isEmpty() || (types.size() == 1 && types.contains("java.lang.String")));
     }
@@ -82,12 +104,14 @@ public class LambdaTest6 {
         //km.m("hi");
         Class c2 = km.getClass();
         Method[] methods = c2.getDeclaredMethods();
+        assertTrue(matchingMethodNames(methods));
         Set types = setOfStringObject();
         for(Method m : methods) {
-            assertTrue(m.getName().equals("m"));
-            Class[] parameterTypes = m.getParameterTypes();
-            assertTrue(parameterTypes.length == 1);
-            assertTrue(types.remove(parameterTypes[0].getName()));
+            if ("m".equals(m.getName())) {
+                Class[] parameterTypes = m.getParameterTypes();
+                assertTrue(parameterTypes.length == 1);
+                assertTrue(types.remove(parameterTypes[0].getName()));
+            }
         }
         assertTrue(types.isEmpty());
     }
@@ -99,11 +123,13 @@ public class LambdaTest6 {
         assertTrue( ((H)na).m().equals("hi") );
         Class c3 = na.getClass();
         Method[] methods = c3.getDeclaredMethods();
+        assertTrue(matchingMethodNames(methods));
         Set types = setOfStringObject();
         for(Method m : methods) {
-            assertTrue(m.getName().equals("m"));
-            Class returnType = m.getReturnType();
-            assertTrue(types.remove(returnType.getName()));
+            if ("m".equals(m.getName())) {
+                Class returnType = m.getReturnType();
+                assertTrue(types.remove(returnType.getName()));
+            }
         }
         assertTrue(types.size() == 1); //there's a bridge
     }
diff --git a/test/langtools/tools/javac/lambda/methodReference/BridgeMethod.java b/test/langtools/tools/javac/lambda/methodReference/BridgeMethod.java
index eb68d162763..dd9dd2582ad 100644
--- a/test/langtools/tools/javac/lambda/methodReference/BridgeMethod.java
+++ b/test/langtools/tools/javac/lambda/methodReference/BridgeMethod.java
@@ -26,11 +26,15 @@
  * @bug 8003280
  * @summary Add lambda tests
  *   Test bridge methods in certain SAM conversion
+ *   Tests that jdk.internal.lambda.disableEagerInitialization=true creates a
+ *   get$Lambda method for non-capturing lambdas
  * @compile BridgeMethod.java
  * @run main BridgeMethod
+ * @run main/othervm -Djdk.internal.lambda.disableEagerInitialization=true BridgeMethod
  */
 
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -68,19 +72,38 @@ public class BridgeMethod {
         return s;
     }
 
+    private static Set allowedMethods() {
+        Set s = new HashSet<>();
+        s.add("m");
+        if (Boolean.getBoolean("jdk.internal.lambda.disableEagerInitialization")) {
+            s.add("get$Lambda");
+        }
+        return s;
+    }
+
+    private static boolean matchingMethodNames(Method[] methods) {
+        Set methodNames = new HashSet<>();
+        for (Method m : methods) {
+            methodNames.add(m.getName());
+        }
+        return methodNames.equals(allowedMethods());
+    }
+
     public static void main(String[] args) {
         L la = BridgeMethod::bar; //static reference
         la.m("hi");
         Class c1 = la.getClass();
         Method[] methods = c1.getDeclaredMethods();
+        assertTrue(matchingMethodNames(methods));
         Set types = setOfStringObject();
         System.out.println("methods in SAM conversion of L:");
         for(Method m : methods) {
-            System.out.println(m.toGenericString());
-            assertTrue(m.getName().equals("m"));
-            Class[] parameterTypes = m.getParameterTypes();
-            assertTrue(parameterTypes.length == 1);
-            assertTrue(types.remove(parameterTypes[0].getName()));
+            if (m.getName().equals("m")) {
+                System.out.println(m.toGenericString());
+                Class[] parameterTypes = m.getParameterTypes();
+                assertTrue(parameterTypes.length == 1);
+                assertTrue(types.remove(parameterTypes[0].getName()));
+            }
         }
         assertTrue(types.isEmpty() || (types.size() == 1 && types.contains("java.lang.String")));
 
@@ -88,14 +111,16 @@ public class BridgeMethod {
         //km.m("hi"); //will be uncommented when CR7028808 fixed
         Class c2 = km.getClass();
         methods = c2.getDeclaredMethods();
+        assertTrue(matchingMethodNames(methods));
         types = setOfStringObject();
         System.out.println("methods in SAM conversion of KM:");
         for(Method m : methods) {
-            System.out.println(m.toGenericString());
-            assertTrue(m.getName().equals("m"));
-            Class[] parameterTypes = m.getParameterTypes();
-            assertTrue(parameterTypes.length == 1);
-            assertTrue(types.remove(parameterTypes[0].getName()));
+            if (m.getName().equals("m")) {
+                System.out.println(m.toGenericString());
+                Class[] parameterTypes = m.getParameterTypes();
+                assertTrue(parameterTypes.length == 1);
+                assertTrue(types.remove(parameterTypes[0].getName()));
+            }
         }
         assertTrue(types.isEmpty());
 

From 6d98a3bdd8e0097b0a1549f6c42511d7429df766 Mon Sep 17 00:00:00 2001
From: Alan Bateman 
Date: Thu, 31 Oct 2019 16:45:58 +0000
Subject: [PATCH 075/163] 8205132: Degrade Thread.countStackFrames() to throw
 UOE

Reviewed-by: mchung, dholmes, dcubed
---
 make/hotspot/symbols/symbols-unix             |   1 -
 src/hotspot/share/include/jvm.h               |   3 -
 src/hotspot/share/prims/jvm.cpp               |  44 -------
 .../share/classes/java/lang/Thread.java       |  18 +--
 src/java.base/share/native/libjava/Thread.c   |   3 +-
 .../Thread/CountStackFramesAtExit.java        | 111 ------------------
 .../java/lang/Thread/CountStackFrames.java    |  56 +++++++++
 7 files changed, 66 insertions(+), 170 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java
 create mode 100644 test/jdk/java/lang/Thread/CountStackFrames.java

diff --git a/make/hotspot/symbols/symbols-unix b/make/hotspot/symbols/symbols-unix
index d49eca5d2da..bb3a4c94584 100644
--- a/make/hotspot/symbols/symbols-unix
+++ b/make/hotspot/symbols/symbols-unix
@@ -46,7 +46,6 @@ JVM_ConstantPoolGetSize
 JVM_ConstantPoolGetStringAt
 JVM_ConstantPoolGetTagAt
 JVM_ConstantPoolGetUTF8At
-JVM_CountStackFrames
 JVM_CurrentThread
 JVM_CurrentTimeMillis
 JVM_DefineClass
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index 8a464dd5cc2..d1e0e4934ef 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -248,9 +248,6 @@ JVM_Sleep(JNIEnv *env, jclass threadClass, jlong millis);
 JNIEXPORT jobject JNICALL
 JVM_CurrentThread(JNIEnv *env, jclass threadClass);
 
-JNIEXPORT jint JNICALL
-JVM_CountStackFrames(JNIEnv *env, jobject thread);
-
 JNIEXPORT void JNICALL
 JVM_Interrupt(JNIEnv *env, jobject thread);
 
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 50463253a86..a47038ba2f7 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -3052,50 +3052,6 @@ JVM_ENTRY(jobject, JVM_CurrentThread(JNIEnv* env, jclass threadClass))
   return JNIHandles::make_local(env, jthread);
 JVM_END
 
-class CountStackFramesTC : public ThreadClosure {
-  int _count;
-  bool _suspended;
- public:
-  CountStackFramesTC() : _count(0), _suspended(false) {}
-  virtual void do_thread(Thread* thread) {
-    JavaThread* jt = (JavaThread*)thread;
-    if (!jt->is_external_suspend()) {
-      // To keep same behavior we fail this operation,
-      // even if it would work perfectly.
-      return;
-    }
-    _suspended = true;
-     // Count all java activation, i.e., number of vframes.
-    for (vframeStream vfst(jt); !vfst.at_end(); vfst.next()) {
-      // Native frames are not counted.
-      if (!vfst.method()->is_native()) _count++;
-    }
-  }
-  int count() { return _count; }
-  int suspended() { return _suspended; }
-};
-
-JVM_ENTRY(jint, JVM_CountStackFrames(JNIEnv* env, jobject jthread))
-  JVMWrapper("JVM_CountStackFrames");
-
-  ThreadsListHandle tlh(thread);
-  JavaThread* receiver = NULL;
-  bool is_alive = tlh.cv_internal_thread_to_JavaThread(jthread, &receiver, NULL);
-  if (is_alive) {
-    // jthread refers to a live JavaThread.
-    CountStackFramesTC csf;
-    Handshake::execute(&csf, receiver);
-    if (!csf.suspended()) {
-      THROW_MSG_0(vmSymbols::java_lang_IllegalThreadStateException(),
-                  "this thread is not suspended");
-    }
-    return csf.count();
-  }
-  // Implied else: if JavaThread is not alive simply return a count of 0.
-  return 0;
-JVM_END
-
-
 JVM_ENTRY(void, JVM_Interrupt(JNIEnv* env, jobject jthread))
   JVMWrapper("JVM_Interrupt");
 
diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java
index 868354d706c..e6751d1338a 100644
--- a/src/java.base/share/classes/java/lang/Thread.java
+++ b/src/java.base/share/classes/java/lang/Thread.java
@@ -1251,20 +1251,20 @@ class Thread implements Runnable {
     }
 
     /**
-     * Counts the number of stack frames in this thread. The thread must
-     * be suspended.
+     * Throws {@code UnsupportedOperationException}.
      *
-     * @return     the number of stack frames in this thread.
-     * @throws     IllegalThreadStateException  if this thread is not
-     *             suspended.
-     * @deprecated The definition of this call depends on {@link #suspend},
-     *             which is deprecated.  Further, the results of this call
-     *             were never well-defined.
+     * @return     nothing
+     *
+     * @deprecated This method was originally designed to count the number of
+     *             stack frames but the results were never well-defined and it
+     *             depended on thread-suspension.
      *             This method is subject to removal in a future version of Java SE.
      * @see        StackWalker
      */
     @Deprecated(since="1.2", forRemoval=true)
-    public native int countStackFrames();
+    public int countStackFrames() {
+        throw new UnsupportedOperationException();
+    }
 
     /**
      * Waits at most {@code millis} milliseconds for this thread to
diff --git a/src/java.base/share/native/libjava/Thread.c b/src/java.base/share/native/libjava/Thread.c
index 05be07e7724..51b16a48e52 100644
--- a/src/java.base/share/native/libjava/Thread.c
+++ b/src/java.base/share/native/libjava/Thread.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -50,7 +50,6 @@ static JNINativeMethod methods[] = {
     {"yield",            "()V",        (void *)&JVM_Yield},
     {"sleep",            "(J)V",       (void *)&JVM_Sleep},
     {"currentThread",    "()" THD,     (void *)&JVM_CurrentThread},
-    {"countStackFrames", "()I",        (void *)&JVM_CountStackFrames},
     {"interrupt0",       "()V",        (void *)&JVM_Interrupt},
     {"isInterrupted",    "(Z)Z",       (void *)&JVM_IsInterrupted},
     {"holdsLock",        "(" OBJ ")Z", (void *)&JVM_HoldsLock},
diff --git a/test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java b/test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java
deleted file mode 100644
index af9f6453836..00000000000
--- a/test/hotspot/jtreg/runtime/Thread/CountStackFramesAtExit.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8167108
- * @summary Stress test java.lang.Thread.countStackFrames() at thread exit.
- * @run main/othervm -Xlog:thread+smr=debug CountStackFramesAtExit
- */
-
-import java.util.concurrent.CountDownLatch;
-
-public class CountStackFramesAtExit extends Thread {
-    final static int N_THREADS = 32;
-    final static int N_LATE_CALLS = 1000;
-
-    public CountDownLatch exitSyncObj = new CountDownLatch(1);
-    public CountDownLatch startSyncObj = new CountDownLatch(1);
-
-    @Override
-    public void run() {
-        // Tell main thread we have started.
-        startSyncObj.countDown();
-        try {
-            // Wait for main thread to interrupt us so we
-            // can race to exit.
-            exitSyncObj.await();
-        } catch (InterruptedException e) {
-            // ignore because we expect one
-        }
-    }
-
-    public static void main(String[] args) {
-        CountStackFramesAtExit threads[] = new CountStackFramesAtExit[N_THREADS];
-
-        for (int i = 0; i < N_THREADS; i++ ) {
-            threads[i] = new CountStackFramesAtExit();
-            int late_count = 1;
-            threads[i].start();
-            try {
-                // Wait for the worker thread to get going.
-                threads[i].startSyncObj.await();
-
-                // This interrupt() call will break the worker out of
-                // the exitSyncObj.await() call and the countStackFrames()
-                // calls will come in during thread exit.
-                threads[i].interrupt();
-                for (; late_count <= N_LATE_CALLS; late_count++) {
-                    try {
-                        threads[i].countStackFrames();
-                    } catch (IllegalThreadStateException itse) {
-                        // ignore because we expect it
-                    }
-
-                    if (!threads[i].isAlive()) {
-                        // Done with Thread.countStackFrames() calls since
-                        // thread is not alive.
-                        break;
-                    }
-                }
-            } catch (InterruptedException e) {
-                throw new Error("Unexpected: " + e);
-            }
-
-            System.out.println("INFO: thread #" + i + ": made " + late_count +
-                               " late calls to java.lang.Thread.countStackFrames()");
-            System.out.println("INFO: thread #" + i + ": N_LATE_CALLS==" +
-                               N_LATE_CALLS + " value is " +
-                               ((late_count >= N_LATE_CALLS) ? "NOT " : "") +
-                               "large enough to cause a Thread.countStackFrames() " +
-                               "call after thread exit.");
-
-            try {
-                threads[i].join();
-            } catch (InterruptedException e) {
-                throw new Error("Unexpected: " + e);
-            }
-            threads[i].countStackFrames();
-            if (threads[i].isAlive()) {
-                throw new Error("Expected !Thread.isAlive() after thread #" +
-                                i + " has been join()'ed");
-            }
-        }
-
-        String cmd = System.getProperty("sun.java.command");
-        if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
-            // Exit with success in a non-JavaTest environment:
-            System.exit(0);
-        }
-    }
-}
diff --git a/test/jdk/java/lang/Thread/CountStackFrames.java b/test/jdk/java/lang/Thread/CountStackFrames.java
new file mode 100644
index 00000000000..2765f27d4e3
--- /dev/null
+++ b/test/jdk/java/lang/Thread/CountStackFrames.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8205132
+ * @summary Test Thread.countStackFrames()
+ * @run testng CountStackFrames
+ */
+
+import org.testng.annotations.Test;
+
+public class CountStackFrames {
+
+    // current thread
+    @Test(expectedExceptions = UnsupportedOperationException.class)
+    public void testCurrentThread() {
+        Thread.currentThread().countStackFrames();
+    }
+
+    // unstarted thread
+    @Test(expectedExceptions = UnsupportedOperationException.class)
+    public void testUnstartedThread() {
+        Thread thread = new Thread(() -> { });
+        thread.countStackFrames();
+    }
+
+    // terminated thread
+    @Test(expectedExceptions = UnsupportedOperationException.class)
+    public void testTerminatedThread() throws Exception {
+        Thread thread = new Thread(() -> { });
+        thread.start();
+        thread.join();
+        thread.countStackFrames();
+    }
+
+}

From 7df849224bef6b55c50f4640fdd31d4584e99000 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs 
Date: Thu, 31 Oct 2019 19:31:03 +0000
Subject: [PATCH 076/163] 8231631: sun/net/ftp/FtpURLConnectionLeak.java fails
 intermittently with NPE

Sun/net/www/ftptest/FtpCommandHandler.java is modified to handle EOF properly

Reviewed-by: chegar, vtewari
---
 test/jdk/sun/net/www/ftptest/FtpCommandHandler.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java b/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java
index fea4273e257..1e491961851 100644
--- a/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java
+++ b/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java
@@ -466,6 +466,10 @@ public class FtpCommandHandler extends Thread {
             try {
                 str = in.readLine();
                 System.out.println("line: " + str);
+                if (str == null) {
+                    System.out.println("EOF read from input");
+                    break;
+                }
                 buf = new StringBuffer(str);
                 res = parseCmd(buf);
                 switch (res) {

From f5632e62b2faa1733f3b2feefec48380e29c161c Mon Sep 17 00:00:00 2001
From: Bob Vandette 
Date: Thu, 31 Oct 2019 19:32:41 +0000
Subject: [PATCH 077/163] 8227006: [linux] Runtime.availableProcessors
 execution time increased by factor of 100

Reviewed-by: dholmes, sgehwolf, redestad
---
 src/hotspot/os/linux/osContainer_linux.cpp | 37 +++++++++++++++++-----
 src/hotspot/os/linux/osContainer_linux.hpp |  5 +++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/os/linux/osContainer_linux.cpp b/src/hotspot/os/linux/osContainer_linux.cpp
index 57686c7cf6f..99784a128b5 100644
--- a/src/hotspot/os/linux/osContainer_linux.cpp
+++ b/src/hotspot/os/linux/osContainer_linux.cpp
@@ -54,12 +54,16 @@
 
 bool  OSContainer::_is_initialized   = false;
 bool  OSContainer::_is_containerized = false;
+int   OSContainer::_active_processor_count = 1;
 julong _unlimited_memory;
 
 class CgroupSubsystem: CHeapObj {
  friend class OSContainer;
 
+
  private:
+    volatile jlong _next_check_counter;
+
     /* mountinfo contents */
     char *_root;
     char *_mount_point;
@@ -72,6 +76,7 @@ class CgroupSubsystem: CHeapObj {
       _root = os::strdup(root);
       _mount_point = os::strdup(mountpoint);
       _path = NULL;
+      _next_check_counter = min_jlong;
     }
 
     /*
@@ -121,6 +126,14 @@ class CgroupSubsystem: CHeapObj {
     }
 
     char *subsystem_path() { return _path; }
+
+    bool cache_has_expired() {
+      return os::elapsed_counter() > _next_check_counter;
+    }
+
+    void set_cache_expiry_time(jlong timeout) {
+      _next_check_counter = os::elapsed_counter() + timeout;
+    }
 };
 
 class CgroupMemorySubsystem: CgroupSubsystem {
@@ -132,31 +145,26 @@ class CgroupMemorySubsystem: CgroupSubsystem {
      * file if everything else seems unlimited */
     bool _uses_mem_hierarchy;
     volatile jlong _memory_limit_in_bytes;
-    volatile jlong _next_check_counter;
 
  public:
     CgroupMemorySubsystem(char *root, char *mountpoint) : CgroupSubsystem::CgroupSubsystem(root, mountpoint) {
       _uses_mem_hierarchy = false;
       _memory_limit_in_bytes = -1;
-      _next_check_counter = min_jlong;
 
     }
 
     bool is_hierarchical() { return _uses_mem_hierarchy; }
     void set_hierarchical(bool value) { _uses_mem_hierarchy = value; }
 
-    bool should_check_memory_limit() {
-      return os::elapsed_counter() > _next_check_counter;
-    }
     jlong memory_limit_in_bytes() { return _memory_limit_in_bytes; }
     void set_memory_limit_in_bytes(jlong value) {
       _memory_limit_in_bytes = value;
       // max memory limit is unlikely to change, but we want to remain
-      // responsive to configuration changes. A very short (20ms) grace time
+      // responsive to configuration changes. A very short grace time
       // between re-read avoids excessive overhead during startup without
       // significantly reducing the VMs ability to promptly react to reduced
       // memory availability
-      _next_check_counter = os::elapsed_counter() + (NANOSECS_PER_SEC/50);
+      set_cache_expiry_time(OSCONTAINER_CACHE_TIMEOUT);
     }
 
 };
@@ -481,7 +489,7 @@ jlong OSContainer::uses_mem_hierarchy() {
  *    OSCONTAINER_ERROR for not supported
  */
 jlong OSContainer::memory_limit_in_bytes() {
-  if (!memory->should_check_memory_limit()) {
+  if (!memory->cache_has_expired()) {
     return memory->memory_limit_in_bytes();
   }
   jlong memory_limit = read_memory_limit_in_bytes();
@@ -617,6 +625,14 @@ int OSContainer::active_processor_count() {
   int cpu_count, limit_count;
   int result;
 
+  // We use a cache with a timeout to avoid performing expensive
+  // computations in the event this function is called frequently.
+  // [See 8227006].
+  if (!cpu->cache_has_expired()) {
+    log_trace(os, container)("OSContainer::active_processor_count (cached): %d", OSContainer::_active_processor_count);
+    return OSContainer::_active_processor_count;
+  }
+
   cpu_count = limit_count = os::Linux::active_processor_count();
   int quota  = cpu_quota();
   int period = cpu_period();
@@ -649,6 +665,11 @@ int OSContainer::active_processor_count() {
 
   result = MIN2(cpu_count, limit_count);
   log_trace(os, container)("OSContainer::active_processor_count: %d", result);
+
+  // Update the value and reset the cache timeout
+  OSContainer::_active_processor_count = result;
+  cpu->set_cache_expiry_time(OSCONTAINER_CACHE_TIMEOUT);
+
   return result;
 }
 
diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp
index 3082c6743de..93b3202a622 100644
--- a/src/hotspot/os/linux/osContainer_linux.hpp
+++ b/src/hotspot/os/linux/osContainer_linux.hpp
@@ -31,11 +31,16 @@
 
 #define OSCONTAINER_ERROR (-2)
 
+// 20ms timeout between re-reads of memory limit and _active_processor_count.
+#define OSCONTAINER_CACHE_TIMEOUT (NANOSECS_PER_SEC/50)
+
 class OSContainer: AllStatic {
 
  private:
   static bool   _is_initialized;
   static bool   _is_containerized;
+  static int    _active_processor_count;
+
   static jlong read_memory_limit_in_bytes();
 
  public:

From a3ee39cb81f05955e9e3ea983fb046a0e3283e51 Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier 
Date: Tue, 29 Oct 2019 15:08:19 +0100
Subject: [PATCH 078/163] 8232921: assert(is_object_aligned(result)) failed:
 address not aligned

Reviewed-by: coleenp, rschmelter
---
 src/hotspot/share/classfile/javaClasses.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index afa97970263..e929b7f521c 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -1962,6 +1962,8 @@ static inline bool version_matches(Method* method, int version) {
 // This class provides a simple wrapper over the internal structure of
 // exception backtrace to insulate users of the backtrace from needing
 // to know what it looks like.
+// The code of this class is not GC safe. Allocations can only happen
+// in expand().
 class BacktraceBuilder: public StackObj {
  friend class BacktraceIterator;
  private:
@@ -2110,10 +2112,14 @@ class BacktraceBuilder: public StackObj {
 
   void set_has_hidden_top_frame(TRAPS) {
     if (_has_hidden_top_frame == NULL) {
-      jvalue prim;
-      prim.z = 1;
-      PauseNoSafepointVerifier pnsv(&_nsv);
-      _has_hidden_top_frame = java_lang_boxing_object::create(T_BOOLEAN, &prim, CHECK);
+      // It would be nice to add java/lang/Boolean::TRUE here
+      // to indicate that this backtrace has a hidden top frame.
+      // But this code is used before TRUE is allocated.
+      // Therefor let's just use an arbitrary legal oop
+      // available right here. We only test for != null
+      // anyways. _methods is a short[].
+      assert(_methods != NULL, "we need a legal oop");
+      _has_hidden_top_frame = _methods;
       _head->obj_at_put(trace_hidden_offset, _has_hidden_top_frame);
     }
   }

From 3f93ec68ee119dbc36d9fe8c60fcbd7f6006aecb Mon Sep 17 00:00:00 2001
From: Alex Menkov 
Date: Thu, 31 Oct 2019 14:23:06 -0700
Subject: [PATCH 079/163] 8224159: JDWP IPv6 scope support

Reviewed-by: sspitsyn, cjplummer
---
 make/lib/Lib-jdk.jdwp.agent.gmk               |   2 +-
 .../native/libdt_socket/socketTransport.c     | 133 +++++++++++++-----
 test/jdk/com/sun/jdi/JdwpAttachTest.java      | 109 ++++++++++----
 test/jdk/com/sun/jdi/JdwpListenTest.java      |  46 +++++-
 4 files changed, 222 insertions(+), 68 deletions(-)

diff --git a/make/lib/Lib-jdk.jdwp.agent.gmk b/make/lib/Lib-jdk.jdwp.agent.gmk
index beda0e71fe4..dd8cbe25cc3 100644
--- a/make/lib/Lib-jdk.jdwp.agent.gmk
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk
@@ -38,7 +38,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_linux := -lpthread, \
     LIBS_solaris := -lnsl -lsocket, \
-    LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \
+    LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib iphlpapi.lib, \
 ))
 
 $(BUILD_LIBDT_SOCKET): $(call FindLib, java.base, java)
diff --git a/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c b/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
index 489d3fb7823..b63334a829a 100644
--- a/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
+++ b/src/jdk.jdwp.agent/share/native/libdt_socket/socketTransport.c
@@ -35,9 +35,11 @@
 #ifdef _WIN32
  #include 
  #include 
+ #include 
 #else
  #include 
  #include 
+ #include 
 #endif
 
 /*
@@ -266,17 +268,102 @@ static unsigned short getPort(struct sockaddr *sa)
                                     : (((struct sockaddr_in6*)sa)->sin6_port));
 }
 
+/*
+ * Parses scope id.
+ * Scope id is ulong on Windows, uint32 on unix, so returns long which can be cast to uint32.
+ * On error sets last error and returns -1.
+ */
+static long parseScopeId(const char *str) {
+    // try to handle scope as interface name
+    unsigned long scopeId = if_nametoindex(str);
+    if (scopeId == 0) {
+        // try to parse integer value
+        char *end;
+        scopeId = strtoul(str, &end, 10);
+        if (*end != '\0') {
+            setLastError(JDWPTRANSPORT_ERROR_ILLEGAL_ARGUMENT, "failed to parse scope");
+            return -1;
+        }
+    }
+    // ensure parsed value is in uint32 range
+    if (scopeId > 0xFFFFFFFF) {
+        setLastError(JDWPTRANSPORT_ERROR_ILLEGAL_ARGUMENT, "scope is out of range");
+        return -1;
+    }
+    return (long)scopeId;
+}
+
+/*
+ * Wrapper for dbgsysGetAddrInfo (getaddrinfo).
+ * Handles enclosing square brackets and scopes.
+ */
+static jdwpTransportError
+getAddrInfo(const char *hostname, size_t hostnameLen,
+            const char *service,
+            const struct addrinfo *hints,
+            struct addrinfo **result)
+{
+    int err = 0;
+    char *buffer = NULL;
+    long scopeId = 0;
+
+    if (hostname != NULL) {
+        char *scope = NULL;
+        // skip surrounding
+        if (hostnameLen > 2 && hostname[0] == '[' && hostname[hostnameLen - 1] == ']') {
+            hostname++;
+            hostnameLen -= 2;
+        }
+        buffer = (*callback->alloc)((int)hostnameLen + 1);
+        if (buffer == NULL) {
+            RETURN_ERROR(JDWPTRANSPORT_ERROR_OUT_OF_MEMORY, "out of memory");
+        }
+        memcpy(buffer, hostname, hostnameLen);
+        buffer[hostnameLen] = '\0';
+
+        scope = strchr(buffer, '%');
+        if (scope != NULL) {
+            // drop scope from the address
+            *scope = '\0';
+            // and parse the value
+            scopeId = parseScopeId(scope + 1);
+            if (scopeId < 0) {
+                (*callback->free)(buffer);
+                return JDWPTRANSPORT_ERROR_ILLEGAL_ARGUMENT;
+            }
+        }
+    }
+
+    err = dbgsysGetAddrInfo(buffer, service, hints, result);
+
+    if (buffer != NULL) {
+        (*callback->free)(buffer);
+    }
+    if (err != 0) {
+        setLastError(err, "getaddrinfo: failed to parse address");
+        return JDWPTRANSPORT_ERROR_IO_ERROR;
+    }
+
+    if (scopeId > 0) {
+        if ((*result)->ai_family != AF_INET6) {
+            RETURN_ERROR(JDWPTRANSPORT_ERROR_ILLEGAL_ARGUMENT, "IPv4 address cannot contain scope");
+        }
+
+        ((struct sockaddr_in6 *)((*result)->ai_addr))->sin6_scope_id = (uint32_t)scopeId;
+    }
+
+    return JDWPTRANSPORT_ERROR_NONE;
+}
+
 /*
  * Result must be released with dbgsysFreeAddrInfo.
  */
 static jdwpTransportError
 parseAddress(const char *address, struct addrinfo **result) {
     const char *colon;
-    size_t hostLen;
-    char *host = NULL;
+    size_t hostnameLen;
     const char *port;
     struct addrinfo hints;
-    int res;
 
     *result = NULL;
 
@@ -295,39 +382,21 @@ parseAddress(const char *address, struct addrinfo **result) {
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_NUMERICSERV;    // port must be a number
 
-    hostLen = (colon == NULL ? 0 : colon - address);
-    if (hostLen == 0) {
+    hostnameLen = (colon == NULL ? 0 : colon - address);
+    if (hostnameLen == 0) {
         /* no hostname - use localhost address (pass NULL to getaddrinfo) */
-    } else  if (*address == '*' && hostLen == 1) {
+        address = NULL;
+    } else  if (*address == '*' && hostnameLen == 1) {
         /* *:port - listen on all interfaces
          * use IPv6 socket (to accept IPv6 and mapped IPv4),
          * pass hostname == NULL to getaddrinfo.
          */
         hints.ai_family = allowOnlyIPv4 ? AF_INET : AF_INET6;
         hints.ai_flags |= AI_PASSIVE | (allowOnlyIPv4 ? 0 : AI_V4MAPPED | AI_ALL);
-    } else {
-        if (address[0] == '[' && colon[-1] == ']') {
-            address++;
-            hostLen -= 2;
-        }
-        host = (*callback->alloc)((int)hostLen + 1);
-        if (host == NULL) {
-            RETURN_ERROR(JDWPTRANSPORT_ERROR_OUT_OF_MEMORY, "out of memory");
-        }
-        strncpy(host, address, hostLen);
-        host[hostLen] = '\0';
+        address = NULL;
     }
 
-    res = dbgsysGetAddrInfo(host, port, &hints, result);
-    if (host != NULL) {
-        (*callback->free)(host);
-    }
-    if (res != 0) {
-        setLastError(res, "getaddrinfo: unknown host");
-        return JDWPTRANSPORT_ERROR_IO_ERROR;
-    }
-
-    return JDWPTRANSPORT_ERROR_NONE;
+    return getAddrInfo(address, hostnameLen, port, &hints, result);
 }
 
 /*
@@ -352,7 +421,7 @@ static jdwpTransportError
 parseAllowedAddr(const char *buffer, struct in6_addr *result, int *isIPv4) {
     struct addrinfo hints;
     struct addrinfo *addrInfo = NULL;
-    int err;
+    jdwpTransportError err;
 
     /*
      * To parse both IPv4 and IPv6 need to specify AF_UNSPEC family
@@ -364,11 +433,10 @@ parseAllowedAddr(const char *buffer, struct in6_addr *result, int *isIPv4) {
     hints.ai_protocol = IPPROTO_TCP;
     hints.ai_flags = AI_NUMERICHOST;        // only numeric addresses, no resolution
 
-    err = dbgsysGetAddrInfo(buffer, NULL, &hints, &addrInfo);
+    err = getAddrInfo(buffer, strlen(buffer), NULL, &hints, &addrInfo);
 
-    if (err != 0) {
-        setLastError(err, "getaddrinfo: failed to parse address");
-        return JDWPTRANSPORT_ERROR_IO_ERROR;
+    if (err != JDWPTRANSPORT_ERROR_NONE) {
+        return err;
     }
 
     if (addrInfo->ai_family == AF_INET6) {
@@ -844,6 +912,7 @@ static jdwpTransportError connectToAddr(struct addrinfo *ai, jlong timeout, int
     }
 
     err = dbgsysConnect(socketFD, ai->ai_addr, (socklen_t)ai->ai_addrlen);
+
     if (err == DBG_EINPROGRESS && timeout > 0) {
         err = dbgsysFinishConnect(socketFD, (long)timeout);
 
diff --git a/test/jdk/com/sun/jdi/JdwpAttachTest.java b/test/jdk/com/sun/jdi/JdwpAttachTest.java
index a76ff6569c9..76092eaae10 100644
--- a/test/jdk/com/sun/jdi/JdwpAttachTest.java
+++ b/test/jdk/com/sun/jdi/JdwpAttachTest.java
@@ -32,6 +32,7 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
+import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Iterator;
@@ -41,7 +42,6 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 /*
  * @test
@@ -54,24 +54,36 @@ import java.util.concurrent.TimeUnit;
  */
 public class JdwpAttachTest {
 
+    private static final boolean IsWindows = System.getProperty("os.name").toLowerCase().contains("windows");
+
+    // Set to true to perform testing of attach from wrong address (expected to fail).
+    // It's off by default as it caused significant test time increase\
+    // (tests  *  cases, each case fails by timeout).
+    private static boolean testFailedAttach = false;
+
     public static void main(String[] args) throws Exception {
         List addresses = getAddresses();
 
         boolean ipv4EnclosedTested = false;
         boolean ipv6EnclosedTested = false;
         for (InetAddress addr: addresses) {
-            // also test that addresses enclosed in square brackets are supported
-            attachTest(addr.getHostAddress(), addr.getHostAddress());
+            if (testFailedAttach) {
+                for (InetAddress connectAddr : addresses) {
+                    attachTest(addr.getHostAddress(), connectAddr.getHostAddress(), addr.equals(connectAddr));
+                }
+            } else {
+                attachTest(addr.getHostAddress(), addr.getHostAddress(), true);
+            }
             // listening on "*" should accept connections from all addresses
-            attachTest("*", addr.getHostAddress());
+            attachTest("*", addr.getHostAddress(), true);
 
-            // test that addresses enclosed in square brackets are supported.
+            // also test that addresses enclosed in square brackets are supported.
             if (addr instanceof Inet4Address && !ipv4EnclosedTested) {
-                attachTest("[" + addr.getHostAddress() + "]", "[" + addr.getHostAddress() + "]");
+                attachTest("[" + addr.getHostAddress() + "]", "[" + addr.getHostAddress() + "]", true);
                 ipv4EnclosedTested = true;
             }
             if (addr instanceof Inet6Address && !ipv6EnclosedTested) {
-                attachTest("[" + addr.getHostAddress() + "]", "[" + addr.getHostAddress() + "]");
+                attachTest("[" + addr.getHostAddress() + "]", "[" + addr.getHostAddress() + "]", true);
                 ipv6EnclosedTested = true;
             }
         }
@@ -80,13 +92,14 @@ public class JdwpAttachTest {
         // we should be able to attach to both IPv4 and IPv6 addresses (127.0.0.1 & ::1)
         InetAddress localAddresses[] = InetAddress.getAllByName("localhost");
         for (int i = 0; i < localAddresses.length; i++) {
-            attachTest(localAddresses[i].getHostAddress(), "");
+            attachTest(localAddresses[i].getHostAddress(), "", true);
         }
     }
 
-    private static void attachTest(String listenAddress, String connectAddresses)
+    private static void attachTest(String listenAddress, String connectAddress, boolean expectedResult)
             throws Exception {
-        log("Starting listening at " + listenAddress);
+        log("\nTest: listen on '" + listenAddress + "', attach to '" + connectAddress + "'");
+        log("  Starting listening at " + listenAddress);
         ListeningConnector connector = getListenConnector();
         Map args = connector.defaultArguments();
         setConnectorArg(args, "localAddress", listenAddress);
@@ -100,31 +113,48 @@ public class JdwpAttachTest {
             throw new RuntimeException("values from connector.startListening (" + actualPort
                     + " is not equal to values from arguments (" + port + ")");
         }
-        log("Listening port: " + port);
+        log("  Listening port: " + port);
 
-        log("Attaching from " + connectAddresses);
+        log("  Attaching from " + connectAddress);
         try {
             ExecutorService executor = Executors.newSingleThreadExecutor();
             executor.submit((Callable)() -> {
                 VirtualMachine vm = connector.accept(args);
-                log("ACCEPTED.");
                 vm.dispose();
                 return null;
             });
             executor.shutdown();
 
-            LingeredApp debuggee = LingeredApp.startApp(
-                    Arrays.asList("-agentlib:jdwp=transport=dt_socket"
-                                +",address=" + connectAddresses + ":" + port
-                                + ",server=n,suspend=n"));
-            debuggee.stopApp();
-
-            executor.awaitTermination(20, TimeUnit.SECONDS);
+            try {
+                LingeredApp debuggee = LingeredApp.startApp(
+                        Arrays.asList("-agentlib:jdwp=transport=dt_socket"
+                                + ",address=" + connectAddress + ":" + port
+                                + ",server=n,suspend=n"
+                                // if failure is expected set small timeout (default is 20 sec)
+                                + (!expectedResult ? ",timeout=1000" : "")));
+                debuggee.stopApp();
+                if (expectedResult) {
+                    log("OK: attached as expected");
+                } else {
+                    throw new RuntimeException("ERROR: LingeredApp.startApp was able to attach");
+                }
+            } catch (Exception ex) {
+                if (expectedResult) {
+                    throw new RuntimeException("ERROR: LingeredApp.startApp was able to attach");
+                } else {
+                    log("OK: failed to attach as expected");
+                }
+            }
         } finally {
             connector.stopListening(args);
         }
     }
 
+    private static void addAddr(List list, InetAddress addr) {
+        log(" - (" + addr.getClass().getSimpleName() + ") " + addr.getHostAddress());
+        list.add(addr);
+    }
+
     private static List getAddresses() {
         List result = new LinkedList<>();
         try {
@@ -136,17 +166,37 @@ public class JdwpAttachTest {
                         Enumeration addresses = iface.getInetAddresses();
                         while (addresses.hasMoreElements()) {
                             InetAddress addr = addresses.nextElement();
-                            // Java reports link local addresses with named scope,
-                            // but Windows sockets routines support only numeric scope id.
-                            // skip such addresses.
+                            // Java reports link local addresses with symbolic scope,
+                            // but on Windows java.net.NetworkInterface generates its own scope names
+                            // which are incompatible with native Windows routines.
+                            // So on Windows test only addresses with numeric scope.
+                            // On other platforms test both symbolic and numeric scopes.
                             if (addr instanceof Inet6Address) {
                                 Inet6Address addr6 = (Inet6Address)addr;
-                                if (addr6.getScopedInterface() != null) {
-                                    continue;
+                                NetworkInterface scopeIface = addr6.getScopedInterface();
+                                if (scopeIface != null && scopeIface.getName() != null) {
+                                    // On some test machines VPN creates link local addresses
+                                    // which we cannot connect to.
+                                    // Skip them.
+                                    if (scopeIface.isPointToPoint()) {
+                                        continue;
+                                    }
+
+                                    try {
+                                        // the same address with numeric scope
+                                        addAddr(result, Inet6Address.getByAddress(null, addr6.getAddress(), addr6.getScopeId()));
+                                    } catch (UnknownHostException e) {
+                                        // cannot happen!
+                                        throw new RuntimeException("Unexpected", e);
+                                    }
+
+                                    if (IsWindows) {
+                                        // don't add addresses with symbolic scope
+                                        continue;
+                                    }
                                 }
                             }
-                            log(" - (" + addr.getClass().getSimpleName() + ") " + addr.getHostAddress());
-                            result.add(addr);
+                            addAddr(result, addr);
                         }
                     }
                 } catch (SocketException e) {
@@ -184,8 +234,11 @@ public class JdwpAttachTest {
         arg.setValue(value);
     }
 
+    private static long startTime = System.currentTimeMillis();
+
     private static void log(Object o) {
-        System.out.println(String.valueOf(o));
+        long time = System.currentTimeMillis() - startTime;
+        System.out.println(String.format("[%7.3f] %s", (time / 1000f), String.valueOf(o)));
     }
 
 }
diff --git a/test/jdk/com/sun/jdi/JdwpListenTest.java b/test/jdk/com/sun/jdi/JdwpListenTest.java
index a0e52638b0c..392df9ca133 100644
--- a/test/jdk/com/sun/jdi/JdwpListenTest.java
+++ b/test/jdk/com/sun/jdi/JdwpListenTest.java
@@ -34,6 +34,7 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
+import java.net.UnknownHostException;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -51,6 +52,8 @@ import java.util.Map;
  */
 public class JdwpListenTest {
 
+    private static final boolean IsWindows = System.getProperty("os.name").toLowerCase().contains("windows");
+
     public static void main(String[] args) throws Exception {
         List addresses = getAddresses();
 
@@ -60,6 +63,8 @@ public class JdwpListenTest {
             for (InetAddress attach: addresses) {
                 // can connect only from the same address
                 // IPv6 cannot connect to IPv4 (::1 to 127.0.0.1) and vice versa.
+                // Note: for IPv6 addresses equals() does not compare scopes
+                // (so addresses with symbolic and numeric scopes are equals).
                 listenTest(listen.getHostAddress(), attach.getHostAddress(), attach.equals(listen));
             }
             // test that addresses enclosed in square brackets are supported.
@@ -80,6 +85,8 @@ public class JdwpListenTest {
 
     private static void listenTest(String listenAddress, String connectAddress, boolean expectedResult)
             throws IOException {
+        log("\nTest: listen at " + listenAddress + ", attaching from " + connectAddress
+                + ", expected: " + (expectedResult ? "SUCCESS" : "FAILURE"));
         log("Starting listening debuggee at " + listenAddress);
         try (Debuggee debuggee = Debuggee.launcher("HelloWorld").setAddress(listenAddress + ":0").launch()) {
             log("Debuggee is listening on " + listenAddress + ":" + debuggee.getAddress());
@@ -98,6 +105,11 @@ public class JdwpListenTest {
         }
     }
 
+    private static void addAddr(List list, InetAddress addr) {
+        log(" - (" + addr.getClass().getSimpleName() + ") " + addr.getHostAddress());
+        list.add(addr);
+    }
+
     private static List getAddresses() {
         List result = new LinkedList<>();
         try {
@@ -109,17 +121,37 @@ public class JdwpListenTest {
                         Enumeration addresses = iface.getInetAddresses();
                         while (addresses.hasMoreElements()) {
                             InetAddress addr = addresses.nextElement();
-                            // Java reports link local addresses with named scope,
-                            // but Windows sockets routines support only numeric scope id.
-                            // skip such addresses.
+                            // Java reports link local addresses with symbolic scope,
+                            // but on Windows java.net.NetworkInterface generates its own scope names
+                            // which are incompatible with native Windows routines.
+                            // So on Windows test only addresses with numeric scope.
+                            // On other platforms test both symbolic and numeric scopes.
                             if (addr instanceof Inet6Address) {
                                 Inet6Address addr6 = (Inet6Address)addr;
-                                if (addr6.getScopedInterface() != null) {
-                                    continue;
+                                NetworkInterface scopeIface = addr6.getScopedInterface();
+                                if (scopeIface != null && scopeIface.getName() != null) {
+                                    // On some test machines VPN creates link local addresses
+                                    // which we cannot connect to.
+                                    // Skip them.
+                                    if (scopeIface.isPointToPoint()) {
+                                        continue;
+                                    }
+
+                                    try {
+                                        // the same address with numeric scope
+                                        addAddr(result, Inet6Address.getByAddress(null, addr6.getAddress(), addr6.getScopeId()));
+                                    } catch (UnknownHostException e) {
+                                        // cannot happen!
+                                        throw new RuntimeException("Unexpected", e);
+                                    }
+
+                                    if (IsWindows) {
+                                        // don't add addresses with symbolic scope
+                                        continue;
+                                    }
                                 }
                             }
-                            log(" - (" + addr.getClass().getSimpleName() + ") " + addr.getHostAddress());
-                            result.add(addr);
+                            addAddr(result, addr);
                         }
                     }
                 } catch (SocketException e) {

From cf43427ce94198125d3530d6d12b2bffd08eb578 Mon Sep 17 00:00:00 2001
From: Dean Long 
Date: Thu, 31 Oct 2019 16:54:16 -0700
Subject: [PATCH 080/163] 8233273: Update Graal

Reviewed-by: kvn
---
 .../vm/compiler/collections/EconomicMap.java  |   2 +-
 .../vm/compiler/collections/EconomicSet.java  |   2 +-
 .../vm/compiler/collections/Equivalence.java  |   2 +-
 .../vm/compiler/collections/MapCursor.java    |   2 +-
 .../vm/compiler/collections/Pair.java         |   2 +-
 .../collections/UnmodifiableEconomicMap.java  |   2 +-
 .../collections/UnmodifiableEconomicSet.java  |   2 +-
 .../collections/UnmodifiableMapCursor.java    |   2 +-
 .../vm/compiler/collections/package-info.java |   2 +-
 .../vm/compiler/word/ComparableWord.java      |   2 +-
 .../vm/compiler/word/LocationIdentity.java    |   2 +-
 .../internal/vm/compiler/word/Pointer.java    |   2 +-
 .../vm/compiler/word/PointerBase.java         |   2 +-
 .../internal/vm/compiler/word/SignedWord.java |   2 +-
 .../vm/compiler/word/UnsignedWord.java        |   2 +-
 .../internal/vm/compiler/word/WordBase.java   |   2 +-
 .../vm/compiler/word/WordFactory.java         |   2 +-
 .../vm/compiler/word/package-info.java        |   2 +-
 .../api/replacements/MethodSubstitution.java  |   6 +-
 .../MethodSubstitutionRegistry.java           |  63 ---
 .../api}/test/ExportingClassLoader.java       |   2 +-
 .../compiler/api}/test/ModuleSupport.java     |   2 +-
 .../asm/aarch64/AArch64Assembler.java         |  33 +-
 .../asm/aarch64/AArch64MacroAssembler.java    |  58 ++-
 .../aarch64/test/AArch64MultiplyLongTest.java | 101 ++++
 .../AArch64ArithmeticLIRGenerator.java        |  33 +-
 .../core/aarch64/AArch64NodeMatchRules.java   |  32 +-
 .../core/amd64/AMD64NodeMatchRules.java       |  20 +
 .../compiler/core/common/GraalOptions.java    |   8 +-
 .../core/common/cfg/AbstractBlockBase.java    |  32 ++
 .../common/cfg/AbstractControlFlowGraph.java  |   4 +-
 .../compiler/core/common/cfg/Loop.java        |  19 -
 .../core/common/type/IntegerStamp.java        |  16 +-
 .../core/sparc/SPARCNodeMatchRules.java       |   2 +
 .../core/test/BoxingEliminationTest.java      |   8 +-
 .../core/test/CheckGraalInvariants.java       |   2 +-
 .../core/test/CompareCanonicalizerTest.java   |   5 +-
 .../core/test/CompareCanonicalizerTest2.java  |   3 +-
 .../core/test/CompareCanonicalizerTest3.java  |   2 +-
 .../test/ConditionalEliminationMulTest.java   |   4 +-
 .../test/ConditionalEliminationTest10.java    |   3 +-
 .../test/ConditionalEliminationTest14.java    |   2 +-
 .../test/ConditionalEliminationTest15.java    |   4 +-
 .../test/ConditionalEliminationTest16.java    |   3 +-
 .../test/ConditionalEliminationTest2.java     |   6 +-
 .../test/ConditionalEliminationTestBase.java  |   9 +-
 .../compiler/core/test/CountedLoopTest.java   |   3 +-
 .../test/DeMorganCanonicalizationTest.java    |   7 +-
 .../core/test/DegeneratedLoopsTest.java       |   5 +-
 .../compiler/core/test/EnumSwitchTest.java    |   3 +-
 .../core/test/FinalizableSubclassTest.java    |   3 +-
 .../compiler/core/test/FloatingReadTest.java  |   3 +-
 .../compiler/core/test/GraalCompilerTest.java |  16 +-
 .../compiler/core/test/GraphEncoderTest.java  |   3 +-
 .../core/test/GuardPrioritiesTest.java        |   2 +-
 .../core/test/IfCanonicalizerTest.java        |   9 +-
 .../core/test/ImplicitNullCheckTest.java      |   3 +-
 .../test/IntegerEqualsCanonicalizerTest.java  |   3 +-
 .../core/test/InterfaceMethodHandleTest.java  |   4 +-
 .../core/test/InvokeExceptionTest.java        |   7 +-
 .../compiler/core/test/InvokeHintsTest.java   |   7 +-
 .../core/test/LateMembarInsertionTest.java    | 233 +++++++++
 .../core/test/LockEliminationTest.java        |  12 +-
 .../compiler/core/test/LongNodeChainTest.java |   5 +-
 .../core/test/LoopFullUnrollTest.java         |   3 +-
 .../compiler/core/test/LoopUnswitchTest.java  |   5 +-
 .../core/test/MarkUnsafeAccessTest.java       |   7 +-
 .../test/MemoryGraphCanonicalizeTest.java     |  10 +-
 .../core/test/MemoryScheduleTest.java         |  18 +-
 .../core/test/MergeCanonicalizerTest.java     |   5 +-
 .../compiler/core/test/MonitorGraphTest.java  |   7 +-
 .../core/test/NodePropertiesTest.java         |  32 +-
 .../core/test/PushNodesThroughPiTest.java     |   2 +-
 .../compiler/core/test/PushThroughIfTest.java |   7 +-
 .../core/test/ReadAfterCheckCastTest.java     |   2 +-
 .../test/ReassociateAndCanonicalTest.java     |   5 +-
 .../core/test/ScalarTypeSystemTest.java       |   3 +-
 .../compiler/core/test/SchedulingTest2.java   |   5 +-
 .../core/test/StampCanonicalizerTest.java     |   3 +-
 .../compiler/core/test/StraighteningTest.java |   3 +-
 .../core/test/SwitchCanonicalizerTest.java    |   3 +-
 .../core/test/SwitchDyingLoopTest.java        |   2 +-
 .../compiler/core/test/SwitchFoldingTest.java |   3 +-
 .../compiler/core/test/TypeSystemTest.java    |  13 +-
 .../core/test/UnsafeReadEliminationTest.java  |   4 +-
 .../core/test/UnsafeVirtualizationTest.java   |   2 +-
 .../compiler/core/test/UnusedArray.java       |   3 +-
 .../core/test/deopt/CompiledMethodTest.java   |   3 +-
 .../compiler/core/test/ea/EATestBase.java     |   5 +-
 .../test/ea/EarlyReadEliminationTest.java     |  54 +-
 .../core/test/ea/EscapeAnalysisTest.java      |  11 +-
 .../core/test/ea/PEAReadEliminationTest.java  |   5 +-
 .../PartialEscapeAnalysisIterationTest.java   |   5 +-
 .../test/ea/PartialEscapeAnalysisTest.java    |   5 +-
 .../ea/PartialEscapeAnalysisTreesTest.java    |   5 +-
 .../compiler/core/test/ea/PoorMansEATest.java |   5 +-
 .../compiler/core/test/ea/TrufflePEATest.java |   5 +-
 .../compiler/core/test/ea/UnsafeEATest.java   |   5 +-
 .../core/test/inlining/InliningTest.java      |   7 +-
 .../NestedLoopEffectsPhaseComplexityTest.java |   6 +-
 .../compiler/core/gen/NodeMatchRules.java     |   2 +
 .../compiler/core/phases/BaseTier.java        |  50 ++
 .../compiler/core/phases/EconomyHighTier.java |  13 +-
 .../compiler/core/phases/EconomyLowTier.java  |  13 +-
 .../compiler/core/phases/EconomyMidTier.java  |  15 +-
 .../compiler/core/phases/HighTier.java        |  30 +-
 .../graalvm/compiler/core/phases/LowTier.java |  18 +-
 .../graalvm/compiler/core/phases/MidTier.java |  27 +-
 .../aarch64/AArch64HotSpotBackendFactory.java |  12 +-
 .../amd64/AMD64HotSpotBackendFactory.java     |   6 +-
 .../sparc/SPARCHotSpotBackendFactory.java     |  12 +-
 .../hotspot/test/CheckGraalIntrinsics.java    |  41 +-
 .../hotspot/test/CompileTheWorld.java         |   4 +-
 .../test/ConstantPoolSubstitutionsTests.java  |   2 +-
 .../test/DeferredBarrierAdditionTest.java     |  11 +-
 .../test/HotSpotCryptoSubstitutionTest.java   |   9 +-
 .../test/HotSpotInvokeDynamicPluginTest.java  |   2 +-
 .../test/ReplaceConstantNodesPhaseTest.java   |   2 +-
 .../hotspot/test/TestSHASubstitutions.java    |  15 +-
 .../test/WriteBarrierAdditionTest.java        |   9 +-
 .../hotspot/HotSpotReplacementsImpl.java      |  72 +--
 .../hotspot/SymbolicSnippetEncoder.java       | 139 ++++--
 .../meta/DefaultHotSpotLoweringProvider.java  |   4 +-
 .../meta/HotSpotGraphBuilderPlugins.java      | 234 ++++-----
 .../meta/HotSpotHostForeignCallsProvider.java |   4 +-
 .../hotspot/meta/HotSpotSuitesProvider.java   |   2 +-
 .../hotspot/nodes/BeginLockScopeNode.java     |   4 +-
 .../hotspot/nodes/EndLockScopeNode.java       |   4 +-
 .../hotspot/nodes/StubForeignCallNode.java    |   4 +-
 .../nodes/aot/InitializeKlassNode.java        |   4 +-
 .../nodes/aot/InitializeKlassStubCall.java    |   4 +-
 .../nodes/aot/ResolveDynamicConstantNode.java |   4 +-
 .../nodes/aot/ResolveDynamicStubCall.java     |   4 +-
 .../phases/AheadOfTimeVerificationPhase.java  |  14 +-
 .../replacements/IdentityHashCodeNode.java    |   4 +-
 .../replacements/SHA2Substitutions.java       |   3 -
 .../replacements/SHA5Substitutions.java       |   3 -
 .../replacements/SHASubstitutions.java        |   3 -
 .../hotspot/stubs/ForeignCallStub.java        |   2 -
 .../compiler/hotspot/stubs/SnippetStub.java   |   4 +-
 .../graalvm/compiler/java/BytecodeParser.java |  29 +-
 .../compiler/java/FrameStateBuilder.java      |  22 +-
 .../jtt/backend/LargeConstantSectionTest.java |   4 +-
 .../jtt/except/UntrustedInterfaces.java       |   4 +-
 .../compiler/jtt/optimize/NestedLoop_EA.java  |   2 +-
 .../compiler/jtt/optimize/TrichotomyTest.java |   4 +-
 .../lir/aarch64/AArch64ArithmeticOp.java      |  30 +-
 .../graalvm/compiler/lir/amd64/AMD64Move.java |   2 +-
 .../lir/amd64/AMD64StringLatin1InflateOp.java |  18 +-
 .../lir/amd64/AMD64StringUTF16CompressOp.java |   8 +-
 .../lir/amd64/vector/AMD64VectorMove.java     |   2 +-
 .../compiler/lir/LIRIntrospection.java        |  22 +-
 .../lsra/LinearScanLifetimeAnalysisPhase.java |   7 +-
 .../phases/ConvertDeoptimizeToGuardPhase.java |   2 +-
 .../loop/phases/LoopPeelingPhase.java         |  14 +-
 .../loop/phases/LoopTransformations.java      |  70 ++-
 .../loop/test/LoopPartialUnrollTest.java      |   6 +-
 .../compiler/loop/CountedLoopInfo.java        |  42 +-
 .../compiler/loop/DefaultLoopPolicies.java    |  53 +-
 .../src/org/graalvm/compiler/loop/LoopEx.java |   6 +-
 .../graalvm/compiler/loop/LoopFragment.java   |  11 +-
 .../compiler/loop/LoopFragmentInside.java     |   4 +-
 .../graalvm/compiler/loop/LoopPolicies.java   |  10 +-
 .../org/graalvm/compiler/loop/MathUtil.java   |   6 +-
 .../microbenchmarks/graal/GraalBenchmark.java |   7 +-
 .../graal/TestJMHWhitebox.java                |   4 +-
 .../test/IfNodeCanonicalizationTest.java      |  13 +-
 .../nodes/test/LoopPhiCanonicalizerTest.java  |   3 +-
 .../nodes/test/ShortCircuitOrNodeTest.java    |   2 +-
 .../graalvm/compiler/nodes/FrameState.java    |  23 +-
 .../graalvm/compiler/nodes/GraphDecoder.java  |   4 +-
 .../compiler/nodes/GuardProxyNode.java        |  29 +-
 .../org/graalvm/compiler/nodes/IfNode.java    | 460 +-----------------
 .../graalvm/compiler/nodes/InvokeNode.java    |   4 +-
 .../nodes/InvokeWithExceptionNode.java        |   6 +-
 .../compiler/nodes/KillingBeginNode.java      |   4 +-
 .../graalvm/compiler/nodes/LoopBeginNode.java |   2 +-
 .../compiler/nodes/MemoryProxyNode.java       |  62 +++
 .../org/graalvm/compiler/nodes/ProxyNode.java |  35 +-
 .../org/graalvm/compiler/nodes/StartNode.java |   4 +-
 .../compiler/nodes/StructuredGraph.java       |   4 +
 .../compiler/nodes/ValueProxyNode.java        |  11 +-
 .../graalvm/compiler/nodes/calc/AndNode.java  |  30 +-
 .../nodes/calc/BinaryArithmeticNode.java      |   4 +
 .../compiler/nodes/calc/CompareNode.java      |  19 +-
 .../graalvm/compiler/nodes/calc/OrNode.java   |  44 +-
 .../graalvm/compiler/nodes/calc/XorNode.java  |  12 +
 .../org/graalvm/compiler/nodes/cfg/Block.java |  26 +-
 .../compiler/nodes/cfg/ControlFlowGraph.java  |  10 +
 .../nodes/debug/StringToBytesNode.java        |   4 +-
 .../nodes/extended/BytecodeExceptionNode.java |   4 +-
 .../nodes/extended/ForeignCallNode.java       |   2 +-
 .../nodes/extended/JavaWriteNode.java         |   5 +
 .../compiler/nodes/extended/MembarNode.java   |   4 +-
 .../compiler/nodes/extended/RawLoadNode.java  |   4 +-
 .../compiler/nodes/extended/RawStoreNode.java |   9 +-
 .../compiler/nodes/extended/SwitchNode.java   |   3 +
 .../nodes/extended/UnsafeAccessNode.java      |  72 ++-
 .../nodes/extended/UnsafeMemoryStoreNode.java |   4 +-
 .../GraphBuilderConfiguration.java            |  32 ++
 .../graphbuilderconf/InvocationPlugins.java   | 239 +++++++--
 .../MethodSubstitutionPlugin.java             |  50 +-
 .../java/AbstractCompareAndSwapNode.java      |   7 +-
 .../AbstractUnsafeCompareAndSwapNode.java     |   4 +-
 .../nodes/java/AtomicReadAndAddNode.java      |   4 +-
 .../nodes/java/AtomicReadAndWriteNode.java    |   4 +-
 .../nodes/java/ExceptionObjectNode.java       |   6 +-
 .../java/LoweredAtomicReadAndWriteNode.java   |   7 +-
 .../compiler/nodes/java/MonitorEnterNode.java |   4 +-
 .../compiler/nodes/java/MonitorExitNode.java  |   2 +-
 .../nodes/java/RawMonitorEnterNode.java       |   4 +-
 .../nodes/memory/FixedAccessNode.java         |   3 +-
 .../nodes/memory/MemoryCheckpoint.java        |   7 +-
 .../nodes/memory/VolatileReadNode.java        |  70 +++
 .../compiler/nodes/memory/WriteNode.java      |  23 +-
 .../nodes/spi/DelegatingReplacements.java     |  10 +-
 .../compiler/nodes/spi/Replacements.java      |   9 +-
 .../compiler/nodes/util/GraphUtil.java        |  55 +++
 .../nodes/virtual/AllocatedObjectNode.java    |   6 +-
 .../nodes/virtual/CommitAllocationNode.java   |   4 +-
 .../phases/common/CanonicalizerPhase.java     | 140 ++++--
 .../common/ConditionalEliminationPhase.java   |  16 +-
 .../phases/common/FloatingReadPhase.java      |  36 +-
 .../phases/common/GuardLoweringPhase.java     |  22 +-
 .../phases/common/InsertMembarsPhase.java     |  66 +++
 .../compiler/phases/common/LoweringPhase.java |  77 +--
 .../phases/common/inlining/InliningUtil.java  |  14 +-
 .../info/MultiTypeGuardInlineInfo.java        |  10 +-
 .../phases/schedule/SchedulePhase.java        |  19 +-
 ...ication.java => ScheduleVerification.java} |  79 ++-
 .../aarch64/AArch64GraphBuilderPlugins.java   |  36 +-
 .../amd64/AMD64CountLeadingZerosNode.java     |   8 +-
 .../amd64/AMD64CountTrailingZerosNode.java    |   8 +-
 .../amd64/AMD64GraphBuilderPlugins.java       | 149 +++---
 .../amd64/AMD64IntegerSubstitutions.java      |  77 +++
 .../amd64/AMD64LongSubstitutions.java         |  80 +++
 .../amd64/AMD64StringLatin1InflateNode.java   |   4 +-
 .../amd64/AMD64StringUTF16CompressNode.java   |   4 +-
 .../replacements/jdk9/test/VarHandleTest.java |   6 +-
 .../sparc/SPARCGraphBuilderPlugins.java       |  16 +-
 .../test/ArraysSubstitutionsTest.java         |  17 +-
 .../replacements/test/BitOpNodesTest.java     |   4 +-
 .../test/DeoptimizeOnExceptionTest.java       |   2 +-
 .../compiler/replacements/test/EdgesTest.java |   7 +-
 .../compiler/replacements/test/FoldTest.java  |   4 +-
 .../test/IntegerExactFoldTest.java            |  10 +-
 .../test/MethodSubstitutionTest.java          |  23 +-
 .../replacements/test/ObjectAccessTest.java   |   4 +-
 .../replacements/test/PEGraphDecoderTest.java |   3 +-
 .../replacements/test/PointerTest.java        |   7 +-
 .../test/ReplacementsParseTest.java           |   4 +-
 .../test/StandardMethodSubstitutionsTest.java |  26 +-
 .../SubstitutionNodeSourcePositionTest.java   |   2 +-
 .../replacements/test/SubstitutionsTest.java  |   2 +-
 .../ClassfileBytecodeProviderTest.java        |   2 +-
 .../test/classfile/RedefineIntrinsicTest.java |   2 +-
 .../replacements/CachingPEGraphDecoder.java   |   2 +-
 .../DefaultJavaLoweringProvider.java          |  33 +-
 .../NodeIntrinsificationProvider.java         |  11 +-
 .../replacements/ReplacementsImpl.java        |   8 +-
 .../replacements/SnippetTemplate.java         |  19 +-
 .../StandardGraphBuilderPlugins.java          |  62 +--
 .../TargetGraphBuilderPlugins.java            |   4 +-
 .../arraycopy/ArrayCopyCallNode.java          |   5 +
 .../replacements/arraycopy/ArrayCopyNode.java |   4 +-
 .../arraycopy/CheckcastArrayCopyCallNode.java |   4 +-
 .../arraycopy/GenericArrayCopyCallNode.java   |   4 +-
 .../nodes/BasicArrayCopyNode.java             |   5 +
 .../replacements/nodes/MacroNode.java         |   2 +-
 .../nodes/MacroStateSplitNode.java            |   6 +-
 .../phases/ea/PEReadEliminationClosure.java   |   4 +-
 .../phases/ea/ReadEliminationBlockState.java  |   3 +-
 .../phases/ea/ReadEliminationClosure.java     |  22 +-
 .../src/org/graalvm/util/OptionsEncoder.java  |  96 ++++
 .../graalvm/util/TypedDataInputStream.java    |  82 ++++
 .../graalvm/util/TypedDataOutputStream.java   | 102 ++++
 276 files changed, 3337 insertions(+), 1911 deletions(-)
 delete mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java
 rename src/jdk.internal.vm.compiler/share/classes/{org.graalvm.compiler.test/src/org/graalvm/compiler => org.graalvm.compiler.api.test/src/org/graalvm/compiler/api}/test/ExportingClassLoader.java (97%)
 rename src/jdk.internal.vm.compiler/share/classes/{org.graalvm.compiler.test/src/org/graalvm/compiler => org.graalvm.compiler.api.test/src/org/graalvm/compiler/api}/test/ModuleSupport.java (99%)
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MemoryProxyNode.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java
 rename src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/{MemoryScheduleVerification.java => ScheduleVerification.java} (62%)
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/OptionsEncoder.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataInputStream.java
 create mode 100644 src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataOutputStream.java

diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java
index 78319ffd5cf..02af6d941c2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicSet.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicSet.java
index 5cabefc6ed3..4a7c7a29dc4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicSet.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/EconomicSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Equivalence.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Equivalence.java
index 99699e166a3..1c6f0c524dd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Equivalence.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Equivalence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/MapCursor.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/MapCursor.java
index ad537e64979..64d2cbe2637 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/MapCursor.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/MapCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Pair.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Pair.java
index f203c05c9ba..3b0c50967e7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Pair.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java
index 27adf676bda..8a1851a337b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicSet.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicSet.java
index f8e24ce5d72..cdbc39b681f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicSet.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableEconomicSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableMapCursor.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableMapCursor.java
index 740e336b73e..f6aba707b95 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableMapCursor.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/UnmodifiableMapCursor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/package-info.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/package-info.java
index bcc22566ad6..b84fe2b1a74 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/package-info.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.collections/src/jdk/internal/vm/compiler/collections/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/ComparableWord.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/ComparableWord.java
index 94a7a184cb3..34263d909b3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/ComparableWord.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/ComparableWord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/LocationIdentity.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/LocationIdentity.java
index b67590a570b..8e06e270a5a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/LocationIdentity.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/LocationIdentity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/Pointer.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/Pointer.java
index 9faf88cfcf3..6090be660e4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/Pointer.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/Pointer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/PointerBase.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/PointerBase.java
index d43c20116c6..c8c2600ee36 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/PointerBase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/PointerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/SignedWord.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/SignedWord.java
index 91e5f018a5e..29c8fd46894 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/SignedWord.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/SignedWord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/UnsignedWord.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/UnsignedWord.java
index 3a5825c337f..db2dff7410c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/UnsignedWord.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/UnsignedWord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordBase.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordBase.java
index 718a94ced6f..500fecd3aec 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordBase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordFactory.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordFactory.java
index 379c7c9506a..37d7d12544c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordFactory.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/WordFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/package-info.java b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/package-info.java
index 120192a8a70..f314577b5e3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/package-info.java
+++ b/src/jdk.internal.vm.compiler/share/classes/jdk.internal.vm.compiler.word/src/jdk/internal/vm/compiler/word/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java
index 1b4d3e6a6db..dca1c5be833 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -35,9 +35,7 @@ import jdk.vm.ci.meta.Signature;
 /**
  * Denotes a method whose body is used by a compiler as the substitute (or intrinsification) of
  * another method. The exact mechanism used to do the substitution is compiler dependent but every
- * compiler should require substitute methods to be annotated with {@link MethodSubstitution}. In
- * addition, a compiler is recommended to implement {@link MethodSubstitutionRegistry} to advertise
- * the mechanism by which it supports registration of method substitutes.
+ * compiler should require substitute methods to be annotated with {@link MethodSubstitution}.
  *
  * A compiler may support partial intrinsification where only a part of a method is implemented by
  * the compiler. The unsupported path is expressed by a call to either the original or substitute
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java
deleted file mode 100644
index 9f623fd06af..00000000000
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package org.graalvm.compiler.api.replacements;
-
-import java.lang.reflect.Type;
-
-/**
- * A registry for {@link MethodSubstitution}s.
- */
-public interface MethodSubstitutionRegistry {
-
-    /**
-     * Gets the type representing the receiver (i.e., {@code this}) argument in a non-static method.
-     */
-    Class getReceiverType();
-
-    /**
-     * Registers a substitution method.
-     *
-     * @param substituteDeclaringClass the class declaring the substitute method
-     * @param name the name of both the original and substitute method
-     * @param argumentTypes the argument types of the method. Element 0 of this array must be
-     *            {@link #getReceiverType()} iff the method is non-static. Upon returning, element 0
-     *            will have been rewritten to {@code declaringClass}.
-     */
-    default void registerMethodSubstitution(Class substituteDeclaringClass, String name, Type... argumentTypes) {
-        registerMethodSubstitution(substituteDeclaringClass, name, name, argumentTypes);
-    }
-
-    /**
-     * Registers a substitution method.
-     *
-     * @param substituteDeclaringClass the class declaring the substitute method
-     * @param name the name of both the original method
-     * @param substituteName the name of the substitute method
-     * @param argumentTypes the argument types of the method. Element 0 of this array must be
-     *            {@link #getReceiverType()} iff the method is non-static. Upon returning, element 0
-     *            will have been rewritten to {@code declaringClass}.
-     */
-    void registerMethodSubstitution(Class substituteDeclaringClass, String name, String substituteName, Type... argumentTypes);
-}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/ExportingClassLoader.java
similarity index 97%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/ExportingClassLoader.java
index 1f364c60986..a3292423572 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ExportingClassLoader.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/ExportingClassLoader.java
@@ -22,7 +22,7 @@
  */
 
 
-package org.graalvm.compiler.test;
+package org.graalvm.compiler.api.test;
 
 /**
  * A class loader that exports all packages in the module defining the class loader to all classes
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ModuleSupport.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/ModuleSupport.java
similarity index 99%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ModuleSupport.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/ModuleSupport.java
index 8cb418511d9..7396442d334 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/ModuleSupport.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.api.test/src/org/graalvm/compiler/api/test/ModuleSupport.java
@@ -22,7 +22,7 @@
  */
 
 
-package org.graalvm.compiler.test;
+package org.graalvm.compiler.api.test;
 
 import java.io.IOException;
 import java.lang.module.ModuleDescriptor.Requires;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
index a7c2afb0cae..f1fd4367511 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
@@ -471,6 +471,7 @@ public abstract class AArch64Assembler extends Assembler {
     private static final int AddSubExtendedOp = 0x0B200000;
 
     private static final int MulOp = 0x1B000000;
+    private static final int SignedMulLongOp = 0x9B200000;
     private static final int DataProcessing1SourceOp = 0x5AC00000;
     private static final int DataProcessing2SourceOp = 0x1AC00000;
 
@@ -2313,7 +2314,7 @@ public abstract class AArch64Assembler extends Assembler {
     }
 
     /**
-     * unsigned multiply high. dst = (src1 * src2)[127:64]
+     * Unsigned multiply high. dst = (src1 * src2)[127:64]
      *
      * @param dst general purpose register. May not be null or the stackpointer.
      * @param src1 general purpose register. May not be null or the stackpointer.
@@ -2327,7 +2328,7 @@ public abstract class AArch64Assembler extends Assembler {
     }
 
     /**
-     * unsigned multiply add-long. xDst = xSrc3 + (wSrc1 * wSrc2)
+     * Unsigned multiply add-long. xDst = xSrc3 + (wSrc1 * wSrc2)
      *
      * @param dst general purpose register. May not be null or the stackpointer.
      * @param src1 general purpose register. May not be null or the stackpointer.
@@ -2343,7 +2344,7 @@ public abstract class AArch64Assembler extends Assembler {
     }
 
     /**
-     * signed multiply add-long. xDst = xSrc3 + (wSrc1 * wSrc2)
+     * Signed multiply-add long. xDst = xSrc3 + (wSrc1 * wSrc2)
      *
      * @param dst general purpose register. May not be null or the stackpointer.
      * @param src1 general purpose register. May not be null or the stackpointer.
@@ -2351,11 +2352,19 @@ public abstract class AArch64Assembler extends Assembler {
      * @param src3 general purpose register. May not be null or the stackpointer.
      */
     public void smaddl(Register dst, Register src1, Register src2, Register src3) {
-        assert !dst.equals(sp);
-        assert !src1.equals(sp);
-        assert !src2.equals(sp);
-        assert !src3.equals(sp);
-        emitInt(0b10011011001 << 21 | dst.encoding | rs1(src1) | rs2(src2) | rs3(src3));
+        smullInstruction(MADD, dst, src1, src2, src3);
+    }
+
+    /**
+     * Signed multiply-sub long. xDst = xSrc3 - (wSrc1 * wSrc2)
+     *
+     * @param dst general purpose register. May not be null or the stackpointer.
+     * @param src1 general purpose register. May not be null or the stackpointer.
+     * @param src2 general purpose register. May not be null or the stackpointer.
+     * @param src3 general purpose register. May not be null or the stackpointer.
+     */
+    public void smsubl(Register dst, Register src1, Register src2, Register src3) {
+        smullInstruction(MSUB, dst, src1, src2, src3);
     }
 
     private void mulInstruction(Instruction instr, Register dst, Register src1, Register src2, Register src3, InstructionType type) {
@@ -2366,6 +2375,14 @@ public abstract class AArch64Assembler extends Assembler {
         emitInt(type.encoding | instr.encoding | MulOp | rd(dst) | rs1(src1) | rs2(src2) | rs3(src3));
     }
 
+    private void smullInstruction(Instruction instr, Register dst, Register src1, Register src2, Register src3) {
+        assert !dst.equals(sp);
+        assert !src1.equals(sp);
+        assert !src2.equals(sp);
+        assert !src3.equals(sp);
+        emitInt(instr.encoding | SignedMulLongOp | rd(dst) | rs1(src1) | rs2(src2) | rs3(src3));
+    }
+
     /**
      * Signed divide. dst = src1 / src2.
      *
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
index f012aa93d78..e38d5750618 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
@@ -817,7 +817,7 @@ public class AArch64MacroAssembler extends AArch64Assembler {
     }
 
     /**
-     * unsigned multiply high. dst = (src1 * src2) >> size
+     * Unsigned multiply high. dst = (src1 * src2) >> size
      *
      * @param size register size. Has to be 32 or 64.
      * @param dst general purpose register. May not be null or the stackpointer.
@@ -838,7 +838,7 @@ public class AArch64MacroAssembler extends AArch64Assembler {
     }
 
     /**
-     * signed multiply high. dst = (src1 * src2) >> size
+     * Signed multiply high. dst = (src1 * src2) >> size
      *
      * @param size register size. Has to be 32 or 64.
      * @param dst general purpose register. May not be null or the stackpointer.
@@ -858,6 +858,60 @@ public class AArch64MacroAssembler extends AArch64Assembler {
         }
     }
 
+    /**
+     * Signed multiply long. xDst = wSrc1 * wSrc2
+     *
+     * @param size destination register size. Has to be 64.
+     * @param dst 64-bit general purpose register. May not be null or the stackpointer.
+     * @param src1 32-bit general purpose register. May not be null or the stackpointer.
+     * @param src2 32-bit general purpose register. May not be null or the stackpointer.
+     */
+    public void smull(int size, Register dst, Register src1, Register src2) {
+        this.smaddl(size, dst, src1, src2, zr);
+    }
+
+    /**
+     * Signed multiply-negate long. xDst = -(wSrc1 * wSrc2)
+     *
+     * @param size destination register size. Has to be 64.
+     * @param dst 64-bit general purpose register. May not be null or the stackpointer.
+     * @param src1 32-bit general purpose register. May not be null or the stackpointer.
+     * @param src2 32-bit general purpose register. May not be null or the stackpointer.
+     */
+    public void smnegl(int size, Register dst, Register src1, Register src2) {
+        this.smsubl(size, dst, src1, src2, zr);
+    }
+
+    /**
+     * Signed multiply-add long. xDst = xSrc3 + (wSrc1 * wSrc2)
+     *
+     * @param size destination register size. Has to be 64.
+     * @param dst 64-bit general purpose register. May not be null or the stackpointer.
+     * @param src1 32-bit general purpose register. May not be null or the stackpointer.
+     * @param src2 32-bit general purpose register. May not be null or the stackpointer.
+     * @param src3 64-bit general purpose register. May not be null or the stackpointer.
+     */
+    public void smaddl(int size, Register dst, Register src1, Register src2, Register src3) {
+        assert (!dst.equals(sp) && !src1.equals(sp) && !src2.equals(sp) && !src3.equals(sp));
+        assert size == 64;
+        super.smaddl(dst, src1, src2, src3);
+    }
+
+    /**
+     * Signed multiply-sub long. xDst = xSrc3 - (wSrc1 * wSrc2)
+     *
+     * @param size destination register size. Has to be 64.
+     * @param dst 64-bit general purpose register. May not be null or the stackpointer.
+     * @param src1 32-bit general purpose register. May not be null or the stackpointer.
+     * @param src2 32-bit general purpose register. May not be null or the stackpointer.
+     * @param src3 64-bit general purpose register. May not be null or the stackpointer.
+     */
+    public void smsubl(int size, Register dst, Register src1, Register src2, Register src3) {
+        assert (!dst.equals(sp) && !src1.equals(sp) && !src2.equals(sp) && !src3.equals(sp));
+        assert size == 64;
+        super.smsubl(dst, src1, src2, src3);
+    }
+
     /**
      * dst = src1 % src2. Signed.
      *
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java
new file mode 100644
index 00000000000..933f3ff95ab
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Arm Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.core.aarch64.test;
+
+import org.junit.Test;
+
+public class AArch64MultiplyLongTest extends AArch64MatchRuleTest {
+
+    public long signedMulLong(int a, int b) {
+        return a * (long) b;
+    }
+
+    public long signedMulLongFromShort(short a, short b) {
+        return (long) a * b;
+    }
+
+    public long signedMulLongFromChar(char a, char b) {
+        return a * (long) b;
+    }
+
+    public long signedMulLongFromByte(byte a, byte b) {
+        return (long) a * b;
+    }
+
+    @Test
+    public void testSignedMulLong() {
+        test("signedMulLong", 0x12345678, 0x87654321);
+        checkLIR("signedMulLong", op -> op.name().equals("SMULL"), 1);
+        test("signedMulLongFromShort", (short) 32767, (short) -32768);
+        checkLIR("signedMulLongFromShort", op -> op.name().equals("SMULL"), 1);
+        test("signedMulLongFromChar", (char) 59999, (char) 65535);
+        checkLIR("signedMulLongFromChar", op -> op.name().equals("SMULL"), 1);
+        test("signedMulLongFromByte", (byte) 10, (byte) -256);
+        checkLIR("signedMulLongFromByte", op -> op.name().equals("SMULL"), 1);
+    }
+
+    public long signedMNegLong1(int a, int b) {
+        return -(a * (long) b);
+    }
+
+    public long signedMNegLong2(int a, int b) {
+        return a * (-(long) b);
+    }
+
+    @Test
+    public void testSignedMNegLong() {
+        test("signedMNegLong1", 0x89abcdef, 0xfedcba98);
+        checkLIR("signedMNegLong1", op -> op.name().equals("SMNEGL"), 1);
+        test("signedMNegLong2", 0x89abcdef, 0xfedcba98);
+        checkLIR("signedMNegLong2", op -> op.name().equals("SMNEGL"), 1);
+    }
+
+    public long signedMAddLong1(int a, int b, long c) {
+        return c + a * (long) b;
+    }
+
+    public long signedMAddLong2(int a, int b, long c) {
+        return a * (long) b + c;
+    }
+
+    @Test
+    public void testSignedMAddLong() {
+        test("signedMAddLong1", 0x22228888, 0xaaaacccc, 0x123456789abcdL);
+        checkLIR("signedMAddLong1", op -> op.name().equals("SMADDL"), 1);
+        test("signedMAddLong2", 0x22228888, 0xaaaacccc, 0x123456789abcdL);
+        checkLIR("signedMAddLong2", op -> op.name().equals("SMADDL"), 1);
+    }
+
+    public long signedMSubLong(int a, int b, long c) {
+        return c - a * (long) b;
+    }
+
+    @Test
+    public void testSignedMSubLong() {
+        test("signedMSubLong", 0x99995555, 0xeeeebbbb, 0x3456789abcdefL);
+        checkLIR("signedMSubLong", op -> op.name().equals("SMSUBL"), 1);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
index 0e311b344ad..e02ae857005 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
@@ -220,23 +220,34 @@ public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implem
         return result;
     }
 
-    public Value emitMAdd(Value a, Value b, Value c) {
-        return emitMultiplyAddSub(AArch64ArithmeticOp.ADD, a, b, c);
+    Value emitIntegerMAdd(Value a, Value b, Value c, boolean isI2L) {
+        return emitMultiplyAddSub(isI2L ? AArch64ArithmeticOp.SMADDL : AArch64ArithmeticOp.MADD, a, b, c);
     }
 
-    public Value emitMSub(Value a, Value b, Value c) {
-        return emitMultiplyAddSub(AArch64ArithmeticOp.SUB, a, b, c);
+    Value emitIntegerMSub(Value a, Value b, Value c, boolean isI2L) {
+        return emitMultiplyAddSub(isI2L ? AArch64ArithmeticOp.SMSUBL : AArch64ArithmeticOp.MSUB, a, b, c);
     }
 
     private Value emitMultiplyAddSub(AArch64ArithmeticOp op, Value a, Value b, Value c) {
-        assert a.getPlatformKind() == b.getPlatformKind() && b.getPlatformKind() == c.getPlatformKind();
-        if (op == AArch64ArithmeticOp.ADD || op == AArch64ArithmeticOp.SUB) {
-            assert isNumericInteger(a.getPlatformKind());
-        } else if (op == AArch64ArithmeticOp.FADD) {
-            assert a.getPlatformKind() == AArch64Kind.SINGLE || a.getPlatformKind() == AArch64Kind.DOUBLE;
+        assert a.getPlatformKind() == b.getPlatformKind();
+        Variable result;
+        if (op == AArch64ArithmeticOp.SMADDL || op == AArch64ArithmeticOp.SMSUBL) {
+            // For signed multiply int and then add/sub long.
+            assert a.getPlatformKind() != c.getPlatformKind();
+            result = getLIRGen().newVariable(LIRKind.combine(c));
+        } else {
+            assert a.getPlatformKind() == c.getPlatformKind();
+            if (op == AArch64ArithmeticOp.FADD) {
+                // For floating-point Math.fma intrinsic.
+                assert a.getPlatformKind() == AArch64Kind.SINGLE || a.getPlatformKind() == AArch64Kind.DOUBLE;
+            } else {
+                // For int/long multiply add or sub.
+                assert op == AArch64ArithmeticOp.MADD || op == AArch64ArithmeticOp.MSUB;
+                assert isNumericInteger(a.getPlatformKind());
+            }
+            result = getLIRGen().newVariable(LIRKind.combine(a, b, c));
         }
 
-        Variable result = getLIRGen().newVariable(LIRKind.combine(a, b, c));
         AllocatableValue x = moveSp(asAllocatable(a));
         AllocatableValue y = moveSp(asAllocatable(b));
         AllocatableValue z = moveSp(asAllocatable(c));
@@ -451,7 +462,7 @@ public class AArch64ArithmeticLIRGenerator extends ArithmeticLIRGenerator implem
 
     @Override
     public Value emitFusedMultiplyAdd(Value a, Value b, Value c) {
-        return emitMultiplyAddSub(AArch64ArithmeticOp.FADD, a, b, c);
+        return emitMultiplyAddSub(AArch64ArithmeticOp.FMADD, a, b, c);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
index 770b512d822..aec5231c749 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
@@ -57,6 +57,7 @@ import org.graalvm.compiler.nodes.calc.AndNode;
 import org.graalvm.compiler.nodes.calc.BinaryNode;
 import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
 import org.graalvm.compiler.nodes.calc.LeftShiftNode;
+import org.graalvm.compiler.nodes.calc.MulNode;
 import org.graalvm.compiler.nodes.calc.NotNode;
 import org.graalvm.compiler.nodes.calc.OrNode;
 import org.graalvm.compiler.nodes.calc.RightShiftNode;
@@ -224,6 +225,33 @@ public class AArch64NodeMatchRules extends NodeMatchRules {
         return emitBinaryShift(op, a, shift, isShiftNot);
     }
 
+    @MatchRule("(Add=binary (Mul (SignExtend a) (SignExtend b)) c)")
+    @MatchRule("(Sub=binary c (Mul (SignExtend a) (SignExtend b)))")
+    public ComplexMatchResult signedMultiplyAddSubLong(BinaryNode binary, ValueNode a, ValueNode b, ValueNode c) {
+        assert a.getStackKind() == JavaKind.Int && b.getStackKind() == JavaKind.Int && c.getStackKind() == JavaKind.Long;
+        if (binary instanceof AddNode) {
+            return builder -> getArithmeticLIRGenerator().emitIntegerMAdd(operand(a), operand(b), operand(c), true);
+        }
+        return builder -> getArithmeticLIRGenerator().emitIntegerMSub(operand(a), operand(b), operand(c), true);
+    }
+
+    @MatchRule("(Negate (Mul=mul (SignExtend a) (SignExtend b)))")
+    @MatchRule("(Mul=mul (Negate (SignExtend a)) (SignExtend b))")
+    public ComplexMatchResult signedMultiplyNegLong(MulNode mul, ValueNode a, ValueNode b) {
+        assert a.getStackKind() == JavaKind.Int && b.getStackKind() == JavaKind.Int;
+        LIRKind resultKind = LIRKind.fromJavaKind(gen.target().arch, mul.getStackKind());
+        return builder -> getArithmeticLIRGenerator().emitBinary(
+                        resultKind, AArch64ArithmeticOp.SMNEGL, true, operand(a), operand(b));
+    }
+
+    @MatchRule("(Mul=mul (SignExtend a) (SignExtend b))")
+    public ComplexMatchResult signedMultiplyLong(MulNode mul, ValueNode a, ValueNode b) {
+        assert a.getStackKind() == JavaKind.Int && b.getStackKind() == JavaKind.Int;
+        LIRKind resultKind = LIRKind.fromJavaKind(gen.target().arch, mul.getStackKind());
+        return builder -> getArithmeticLIRGenerator().emitBinary(
+                        resultKind, AArch64ArithmeticOp.SMULL, true, operand(a), operand(b));
+    }
+
     @MatchRule("(Mul (Negate a) b)")
     @MatchRule("(Negate (Mul a b))")
     public ComplexMatchResult multiplyNegate(ValueNode a, ValueNode b) {
@@ -244,9 +272,9 @@ public class AArch64NodeMatchRules extends NodeMatchRules {
         }
 
         if (binary instanceof AddNode) {
-            return builder -> getArithmeticLIRGenerator().emitMAdd(operand(a), operand(b), operand(c));
+            return builder -> getArithmeticLIRGenerator().emitIntegerMAdd(operand(a), operand(b), operand(c), false);
         }
-        return builder -> getArithmeticLIRGenerator().emitMSub(operand(a), operand(b), operand(c));
+        return builder -> getArithmeticLIRGenerator().emitIntegerMSub(operand(a), operand(b), operand(c), false);
     }
 
     /**
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java
index 3b2e7c64477..09d6a95d986 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java
@@ -359,6 +359,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(If (IntegerTest Read=access value))")
     @MatchRule("(If (IntegerTest FloatingRead=access value))")
+    @MatchRule("(If (IntegerTest VolatileRead=access value))")
     public ComplexMatchResult integerTestBranchMemory(IfNode root, LIRLowerableAccess access, ValueNode value) {
         return emitIntegerTestBranchMemory(root, value, access);
     }
@@ -369,14 +370,21 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
     @MatchRule("(If (IntegerEquals=compare value FloatingRead=access))")
     @MatchRule("(If (IntegerLessThan=compare value FloatingRead=access))")
     @MatchRule("(If (IntegerBelow=compare value FloatingRead=access))")
+    @MatchRule("(If (IntegerEquals=compare value VolatileRead=access))")
+    @MatchRule("(If (IntegerLessThan=compare value VolatileRead=access))")
+    @MatchRule("(If (IntegerBelow=compare value VolatileRead=access))")
     @MatchRule("(If (FloatEquals=compare value Read=access))")
     @MatchRule("(If (FloatEquals=compare value FloatingRead=access))")
+    @MatchRule("(If (FloatEquals=compare value VolatileRead=access))")
     @MatchRule("(If (FloatLessThan=compare value Read=access))")
     @MatchRule("(If (FloatLessThan=compare value FloatingRead=access))")
+    @MatchRule("(If (FloatLessThan=compare value VolatileRead=access))")
     @MatchRule("(If (PointerEquals=compare value Read=access))")
     @MatchRule("(If (PointerEquals=compare value FloatingRead=access))")
+    @MatchRule("(If (PointerEquals=compare value VolatileRead=access))")
     @MatchRule("(If (ObjectEquals=compare value Read=access))")
     @MatchRule("(If (ObjectEquals=compare value FloatingRead=access))")
+    @MatchRule("(If (ObjectEquals=compare value VolatileRead=access))")
     public ComplexMatchResult ifCompareMemory(IfNode root, CompareNode compare, ValueNode value, LIRLowerableAccess access) {
         return emitCompareBranchMemory(root, compare, value, access);
     }
@@ -478,6 +486,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Add value Read=access)")
     @MatchRule("(Add value FloatingRead=access)")
+    @MatchRule("(Add value VolatileRead=access)")
     public ComplexMatchResult addMemory(ValueNode value, LIRLowerableAccess access) {
         OperandSize size = getMemorySize(access);
         if (size.isXmmType()) {
@@ -493,6 +502,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Sub value Read=access)")
     @MatchRule("(Sub value FloatingRead=access)")
+    @MatchRule("(Sub value VolatileRead=access)")
     public ComplexMatchResult subMemory(ValueNode value, LIRLowerableAccess access) {
         OperandSize size = getMemorySize(access);
         if (size.isXmmType()) {
@@ -508,6 +518,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Mul value Read=access)")
     @MatchRule("(Mul value FloatingRead=access)")
+    @MatchRule("(Mul value VolatileRead=access)")
     public ComplexMatchResult mulMemory(ValueNode value, LIRLowerableAccess access) {
         OperandSize size = getMemorySize(access);
         if (size.isXmmType()) {
@@ -523,6 +534,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(And value Read=access)")
     @MatchRule("(And value FloatingRead=access)")
+    @MatchRule("(And value VolatileRead=access)")
     public ComplexMatchResult andMemory(ValueNode value, LIRLowerableAccess access) {
         OperandSize size = getMemorySize(access);
         if (size.isXmmType()) {
@@ -534,6 +546,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Or value Read=access)")
     @MatchRule("(Or value FloatingRead=access)")
+    @MatchRule("(Or value VolatileRead=access)")
     public ComplexMatchResult orMemory(ValueNode value, LIRLowerableAccess access) {
         OperandSize size = getMemorySize(access);
         if (size.isXmmType()) {
@@ -545,6 +558,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Xor value Read=access)")
     @MatchRule("(Xor value FloatingRead=access)")
+    @MatchRule("(Xor value VolatileRead=access)")
     public ComplexMatchResult xorMemory(ValueNode value, LIRLowerableAccess access) {
         OperandSize size = getMemorySize(access);
         if (size.isXmmType()) {
@@ -565,12 +579,14 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(SignExtend Read=access)")
     @MatchRule("(SignExtend FloatingRead=access)")
+    @MatchRule("(SignExtend VolatileRead=access)")
     public ComplexMatchResult signExtend(SignExtendNode root, LIRLowerableAccess access) {
         return emitSignExtendMemory(access, root.getInputBits(), root.getResultBits(), null);
     }
 
     @MatchRule("(ZeroExtend Read=access)")
     @MatchRule("(ZeroExtend FloatingRead=access)")
+    @MatchRule("(ZeroExtend VolatileRead=access)")
     public ComplexMatchResult zeroExtend(ZeroExtendNode root, LIRLowerableAccess access) {
         AMD64Kind memoryKind = getMemoryKind(access);
         return builder -> getArithmeticLIRGenerator().emitZeroExtendMemory(memoryKind, root.getResultBits(), (AMD64AddressValue) operand(access.getAddress()), getState(access));
@@ -578,6 +594,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Narrow Read=access)")
     @MatchRule("(Narrow FloatingRead=access)")
+    @MatchRule("(Narrow VolatileRead=access)")
     public ComplexMatchResult narrowRead(NarrowNode root, LIRLowerableAccess access) {
         return new ComplexMatchResult() {
             @Override
@@ -595,6 +612,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(SignExtend (Narrow=narrow Read=access))")
     @MatchRule("(SignExtend (Narrow=narrow FloatingRead=access))")
+    @MatchRule("(SignExtend (Narrow=narrow VolatileRead=access))")
     public ComplexMatchResult signExtendNarrowRead(SignExtendNode root, NarrowNode narrow, LIRLowerableAccess access) {
         LIRKind kind = getLIRGeneratorTool().getLIRKind(narrow.stamp(NodeView.DEFAULT));
         return emitSignExtendMemory(access, narrow.getResultBits(), root.getResultBits(), kind);
@@ -602,6 +620,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(FloatConvert Read=access)")
     @MatchRule("(FloatConvert FloatingRead=access)")
+    @MatchRule("(FloatConvert VolatileRead=access)")
     public ComplexMatchResult floatConvert(FloatConvertNode root, LIRLowerableAccess access) {
         switch (root.getFloatConvert()) {
             case D2F:
@@ -631,6 +650,7 @@ public class AMD64NodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(Reinterpret Read=access)")
     @MatchRule("(Reinterpret FloatingRead=access)")
+    @MatchRule("(Reinterpret VolatileRead=access)")
     public ComplexMatchResult reinterpret(ReinterpretNode root, LIRLowerableAccess access) {
         return builder -> {
             LIRKind kind = getLIRGeneratorTool().getLIRKind(root.stamp(NodeView.DEFAULT));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java
index a0d522f90ec..8d3e11373a2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java
@@ -115,7 +115,7 @@ public final class GraalOptions {
     public static final OptionKey PartialUnroll = new OptionKey<>(true);
 
     @Option(help = "", type = OptionType.Expert)
-    public static final OptionKey MinimumPeelProbability = new OptionKey<>(0.35f);
+    public static final OptionKey MinimumPeelFrequency = new OptionKey<>(0.35f);
 
     @Option(help = "", type = OptionType.Expert)
     public static final OptionKey LoopMaxUnswitch = new OptionKey<>(3);
@@ -241,9 +241,6 @@ public final class GraalOptions {
     @Option(help = "", type = OptionType.Debug)
     public static final OptionKey OptImplicitNullChecks = new OptionKey<>(true);
 
-    @Option(help = "", type = OptionType.Debug)
-    public static final OptionKey OptLoopTransform = new OptionKey<>(true);
-
     @Option(help = "", type = OptionType.Debug)
     public static final OptionKey OptFloatingReads = new OptionKey<>(true);
 
@@ -291,4 +288,7 @@ public final class GraalOptions {
 
     @Option(help = "Alignment in bytes for loop header blocks.", type = OptionType.Expert)
     public static final OptionKey LoopHeaderAlignment = new OptionKey<>(16);
+
+    @Option(help = "Do not include membars for volatile accesses until the end of optimizations.", type = OptionType.Expert)
+    public static final OptionKey LateMembars = new OptionKey<>(true);
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java
index 4deee05d05e..576b53a87c1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractBlockBase.java
@@ -94,6 +94,38 @@ public abstract class AbstractBlockBase> {
         return dominator;
     }
 
+    /**
+     * Returns the next dominator of this block that is either in the same loop of this block or in
+     * an outer loop.
+     *
+     * @return the next dominator while skipping over loops
+     */
+    public T getDominatorSkipLoops() {
+        T d = getDominator();
+
+        if (d == null) {
+            // We are at the start block and don't have a dominator.
+            return null;
+        }
+
+        if (isLoopHeader()) {
+            // We are moving out of current loop => just return dominator.
+            assert d.getLoopDepth() == getLoopDepth() - 1;
+            assert d.getLoop() != getLoop();
+            return d;
+        }
+
+        while (d.getLoop() != getLoop()) {
+            // We have a case where our dominator is in a different loop. Move further along
+            // the domiantor tree until we hit our loop again.
+            d = d.getDominator();
+        }
+
+        assert d.getLoopDepth() <= getLoopDepth();
+
+        return d;
+    }
+
     public void setDominator(T dominator) {
         this.dominator = dominator;
         this.domDepth = dominator.domDepth + 1;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java
index 2279d64cf09..15736ac7474 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -46,7 +46,7 @@ public interface AbstractControlFlowGraph> {
     T getStartBlock();
 
     /**
-     * True if block {@code a} is dominated by block {@code b}.
+     * True if block {@code a} is dominated by block {@code b} or {@code a} is equal to {@code b}.
      */
     static boolean isDominatedBy(AbstractBlockBase a, AbstractBlockBase b) {
         int domNumberA = a.getDominatorNumber();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java
index 8188f724bc4..8a7f218469e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/cfg/Loop.java
@@ -177,25 +177,6 @@ public abstract class Loop> {
         return true;
     }
 
-    /**
-     * Determines if one loop is a transitive parent of another loop.
-     *
-     * @param childLoop The loop for which parentLoop might be a transitive parent loop.
-     * @param parentLoop The loop which might be a transitive parent loop of child loop.
-     * @return {@code true} if parentLoop is a (transitive) parent loop of childLoop, {@code false}
-     *         otherwise
-     */
-    public static > boolean transitiveParentLoop(Loop childLoop, Loop parentLoop) {
-        Loop curr = childLoop;
-        while (curr != null) {
-            if (curr == parentLoop) {
-                return true;
-            }
-            curr = curr.getParent();
-        }
-        return false;
-    }
-
     @Override
     public int hashCode() {
         return index + depth * 31;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
index 4aad7fc99f3..53a213ecd16 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
@@ -167,8 +167,15 @@ public final class IntegerStamp extends PrimitiveStamp {
     @Override
     public Stamp constant(Constant c, MetaAccessProvider meta) {
         if (c instanceof PrimitiveConstant) {
-            long value = ((PrimitiveConstant) c).asLong();
-            return StampFactory.forInteger(getBits(), value, value);
+            PrimitiveConstant primitiveConstant = (PrimitiveConstant) c;
+            long value = primitiveConstant.asLong();
+            if (primitiveConstant.getJavaKind() == JavaKind.Boolean && value == 1) {
+                // Need to special case booleans as integer stamps are always signed values.
+                value = -1;
+            }
+            Stamp returnedStamp = StampFactory.forInteger(getBits(), value, value);
+            assert returnedStamp.hasValues();
+            return returnedStamp;
         }
         return this;
     }
@@ -1605,7 +1612,10 @@ public final class IntegerStamp extends PrimitiveStamp {
                             long newUpMask = stamp.upMask() & defaultMask;
                             long newLowerBound = CodeUtil.signExtend((lowerBound | newDownMask) & newUpMask, resultBits);
                             long newUpperBound = CodeUtil.signExtend((upperBound | newDownMask) & newUpMask, resultBits);
-                            return new IntegerStamp(resultBits, newLowerBound, newUpperBound, newDownMask, newUpMask);
+
+                            IntegerStamp result = new IntegerStamp(resultBits, newLowerBound, newUpperBound, newDownMask, newUpMask);
+                            assert result.hasValues();
+                            return result;
                         }
                     },
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java
index 5754e144d2b..8c94295db66 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCNodeMatchRules.java
@@ -134,12 +134,14 @@ public class SPARCNodeMatchRules extends NodeMatchRules {
 
     @MatchRule("(SignExtend Read=access)")
     @MatchRule("(SignExtend FloatingRead=access)")
+    @MatchRule("(SignExtend VolatileRead=access)")
     public ComplexMatchResult signExtend(SignExtendNode root, Access access) {
         return emitSignExtendMemory(access, root.getInputBits(), root.getResultBits());
     }
 
     @MatchRule("(ZeroExtend Read=access)")
     @MatchRule("(ZeroExtend FloatingRead=access)")
+    @MatchRule("(ZeroExtend VolatileRead=access)")
     public ComplexMatchResult zeroExtend(ZeroExtendNode root, Access access) {
         return emitZeroExtendMemory(access, root.getInputBits(), root.getResultBits());
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java
index f26b2c15946..f61e87f429c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -313,7 +313,7 @@ public class BoxingEliminationTest extends GraalCompilerTest {
         graph = parseEager(snippet, AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
         createInliningPhase().apply(graph, context);
-        new PartialEscapePhase(false, new CanonicalizerPhase(), graph.getOptions()).apply(graph, context);
+        new PartialEscapePhase(false, createCanonicalizerPhase(), graph.getOptions()).apply(graph, context);
     }
 
     private void compareGraphs(final String snippet, final String referenceSnippet) {
@@ -323,7 +323,7 @@ public class BoxingEliminationTest extends GraalCompilerTest {
     private void compareGraphs(final String snippet, final String referenceSnippet, final boolean loopPeeling, final boolean excludeVirtual) {
         graph = parseEager(snippet, AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         canonicalizer.apply(graph, context);
         createInliningPhase().apply(graph, context);
         if (loopPeeling) {
@@ -339,7 +339,7 @@ public class BoxingEliminationTest extends GraalCompilerTest {
         StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.YES);
         createInliningPhase().apply(referenceGraph, context);
         new DeadCodeEliminationPhase().apply(referenceGraph);
-        new CanonicalizerPhase().apply(referenceGraph, context);
+        this.createCanonicalizerPhase().apply(referenceGraph, context);
 
         assertEquals(referenceGraph, graph, excludeVirtual, true);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
index 26edbd430b1..7146b306d39 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
@@ -78,7 +78,7 @@ import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.compiler.runtime.RuntimeProvider;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.test.AddExports;
-import org.graalvm.compiler.test.ModuleSupport;
+import org.graalvm.compiler.api.test.ModuleSupport;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 import org.junit.Assert;
 import org.junit.Assume;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java
index 85c9c5b4da8..ff8315918ad 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java
@@ -31,14 +31,13 @@ import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.ConditionalNode;
 import org.graalvm.compiler.nodes.calc.IntegerTestNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class CompareCanonicalizerTest extends GraalCompilerTest {
 
     private StructuredGraph getCanonicalizedGraph(String name) {
         StructuredGraph graph = parseEager(name, AllowAssumptions.YES);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         return graph;
     }
 
@@ -55,7 +54,7 @@ public class CompareCanonicalizerTest extends GraalCompilerTest {
             StructuredGraph graph = parseEager("canonicalCompare" + i, AllowAssumptions.NO);
             assertEquals(referenceGraph, graph);
         }
-        new CanonicalizerPhase().apply(referenceGraph, getProviders());
+        createCanonicalizerPhase().apply(referenceGraph, getProviders());
         for (int i = 1; i < 4; i++) {
             StructuredGraph graph = getCanonicalizedGraph("canonicalCompare" + i);
             assertEquals(referenceGraph, graph);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java
index 461f65ee305..ffc074d2289 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java
@@ -26,7 +26,6 @@ package org.graalvm.compiler.core.test;
 
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class CompareCanonicalizerTest2 extends GraalCompilerTest {
@@ -35,7 +34,7 @@ public class CompareCanonicalizerTest2 extends GraalCompilerTest {
 
     private StructuredGraph getCanonicalizedGraph(String name) {
         StructuredGraph graph = getRegularGraph(name);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         return graph;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java
index ff66297a3a4..b998c5d3635 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java
@@ -239,7 +239,7 @@ public class CompareCanonicalizerTest3 extends GraalCompilerTest {
     protected void assertCanonicallyEqual(String snippet, String reference) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
         CoreProviders context = getProviders();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
 
         canonicalizer.apply(graph, context);
         new GuardLoweringPhase().apply(graph, new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo()));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java
index fc4d23965fc..f2b4edaa4b7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -78,7 +78,7 @@ public class ConditionalEliminationMulTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
         new ConditionalEliminationPhase(false).apply(graph, context);
-        CanonicalizerPhase c = new CanonicalizerPhase();
+        CanonicalizerPhase c = createCanonicalizerPhase();
         c.apply(graph, context);
         new ConditionalEliminationPhase(false).apply(graph, context);
         c.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java
index 68808cce841..f8420c23b2e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java
@@ -30,7 +30,6 @@ import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.junit.Assert;
@@ -95,7 +94,7 @@ public class ConditionalEliminationTest10 extends ConditionalEliminationTestBase
     private void test(String snippet, int guardCount) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
         CoreProviders context = getProviders();
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         new ConditionalEliminationPhase(true).apply(graph, context);
         Assert.assertEquals(guardCount, graph.getNodes().filter(GuardNode.class).count());
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java
index 4b37e5a1f04..c282d4090c5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java
@@ -70,7 +70,7 @@ public class ConditionalEliminationTest14 extends ConditionalEliminationTestBase
     @Test
     public void test1() {
         StructuredGraph graph = parseEager("test1Snippet", AllowAssumptions.YES);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         CoreProviders context = getProviders();
 
         /* Convert the LoadIndexNode to ReadNode with floating guards. */
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java
index 12d35fced9f..0ed9d82c916 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java
@@ -47,10 +47,10 @@ public class ConditionalEliminationTest15 extends ConditionalEliminationTestBase
     private void checkNodeCount(String methodName, Class nodeClass, int count) {
         StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
 
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         CoreProviders context = getProviders();
 
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        new LoweringPhase(this.createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         canonicalizer.apply(graph, context);
 
         // Merge arr.length reads.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java
index c5b6efbe3a3..c3bc6fda952 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java
@@ -31,7 +31,6 @@ import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.nodes.ParameterNode;
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -69,7 +68,7 @@ public class ConditionalEliminationTest16 extends ConditionalEliminationTestBase
                     break;
                 }
             }
-            new CanonicalizerPhase().apply(graph, getDefaultHighTierContext());
+            this.createCanonicalizerPhase().apply(graph, getDefaultHighTierContext());
         }
         super.checkHighTierGraph(graph);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java
index 397532a63a9..0a89b129224 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java
@@ -109,7 +109,7 @@ public class ConditionalEliminationTest2 extends ConditionalEliminationTestBase
     @Test
     public void testRedundantCompares() {
         StructuredGraph graph = parseEager("testRedundantComparesSnippet", AllowAssumptions.YES);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         CoreProviders context = getProviders();
 
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
@@ -132,7 +132,7 @@ public class ConditionalEliminationTest2 extends ConditionalEliminationTestBase
     public void testInstanceOfCheckCastLowered() {
         StructuredGraph graph = parseEager("testInstanceOfCheckCastSnippet", AllowAssumptions.YES);
 
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         CoreProviders context = getProviders();
 
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
@@ -146,7 +146,7 @@ public class ConditionalEliminationTest2 extends ConditionalEliminationTestBase
     private void checkInstanceOfCount(String methodName, int count) {
         StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
 
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         CoreProviders context = getProviders();
 
         canonicalizer.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java
index 462c4d3bb14..ad66e42514e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java
@@ -69,8 +69,8 @@ public class ConditionalEliminationTestBase extends GraalCompilerTest {
         DebugContext debug = graph.getDebug();
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
         CoreProviders context = getProviders();
-        CanonicalizerPhase canonicalizer1 = new CanonicalizerPhase();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer1 = createCanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         try (DebugContext.Scope scope = debug.scope("ConditionalEliminationTest", graph)) {
             prepareGraph(graph, canonicalizer1, context, applyLowering);
             new IterativeConditionalEliminationPhase(canonicalizer, true).apply(graph, context);
@@ -106,10 +106,9 @@ public class ConditionalEliminationTestBase extends GraalCompilerTest {
     public void testProxies(String snippet, int expectedProxiesCreated) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
         CoreProviders context = getProviders();
-        CanonicalizerPhase canonicalizer1 = new CanonicalizerPhase();
-        canonicalizer1.disableSimplification();
+        CanonicalizerPhase canonicalizer1 = CanonicalizerPhase.createWithoutCFGSimplification();
         canonicalizer1.apply(graph, context);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         canonicalizer.apply(graph, context);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java
index 6c052f8b4fb..fb57c1e1565 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java
@@ -43,6 +43,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Test;
@@ -559,7 +560,7 @@ public class CountedLoopTest extends GraalCompilerTest {
         }
 
         public void rewrite(LoopsData loops) {
-            InductionVariable inductionVariable = loops.getInductionVariable(iv);
+            InductionVariable inductionVariable = loops.getInductionVariable(GraphUtil.unproxify(iv));
             ValueNode node = null;
             if (inductionVariable == null) {
                 assert loopCanBeRemoved;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java
index 2eede24c77a..369316b14f4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -29,7 +29,6 @@ import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.calc.AndNode;
 import org.graalvm.compiler.nodes.calc.NotNode;
 import org.graalvm.compiler.nodes.calc.OrNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -46,7 +45,7 @@ public class DeMorganCanonicalizationTest extends GraalCompilerTest {
     @Test
     public void testAnd() {
         StructuredGraph g = parseEager("and", AllowAssumptions.NO, getInitialOptions());
-        new CanonicalizerPhase().apply(g, getDefaultHighTierContext());
+        createCanonicalizerPhase().apply(g, getDefaultHighTierContext());
         Assert.assertEquals(1, g.getNodes().filter(OrNode.class).count());
         Assert.assertEquals(1, g.getNodes().filter(NotNode.class).count());
 
@@ -59,7 +58,7 @@ public class DeMorganCanonicalizationTest extends GraalCompilerTest {
     @Test
     public void testOr() {
         StructuredGraph g = parseEager("or", AllowAssumptions.NO, getInitialOptions());
-        new CanonicalizerPhase().apply(g, getDefaultHighTierContext());
+        createCanonicalizerPhase().apply(g, getDefaultHighTierContext());
         Assert.assertEquals(1, g.getNodes().filter(AndNode.class).count());
         Assert.assertEquals(1, g.getNodes().filter(NotNode.class).count());
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java
index 908d0fc084a..6c4e96f1c92 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -28,7 +28,6 @@ import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.DebugDumpScope;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Test;
 
@@ -85,7 +84,7 @@ public class DegeneratedLoopsTest extends GraalCompilerTest {
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
             HighTierContext context = getDefaultHighTierContext();
             createInliningPhase().apply(graph, context);
-            new CanonicalizerPhase().apply(graph, context);
+            createCanonicalizerPhase().apply(graph, context);
             debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
             StructuredGraph referenceGraph = parseEager(REFERENCE_SNIPPET, AllowAssumptions.YES);
             debug.dump(DebugContext.BASIC_LEVEL, referenceGraph, "ReferenceGraph");
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java
index 1b90b6cee83..27cb16cf9d9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java
@@ -29,7 +29,6 @@ import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
 import org.graalvm.compiler.phases.tiers.Suites;
 import org.junit.Assume;
 import org.junit.Test;
@@ -157,7 +156,7 @@ public class EnumSwitchTest extends GraalCompilerTest {
                 return "CheckGraphPhase";
             }
         });
-        ret.getHighTier().findPhase(RemoveValueProxyPhase.class).add(new Phase() {
+        ret.getHighTier().addBeforeLast(new Phase() {
             @Override
             protected void run(StructuredGraph graph) {
                 /* Re-writing of the switch cases eliminates the array load. */
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java
index 1c7283bf72d..9c31061d0c4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java
@@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import org.graalvm.compiler.nodes.java.RegisterFinalizerNode;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Assert;
 import org.junit.Test;
@@ -80,7 +79,7 @@ public class FinalizableSubclassTest extends GraalCompilerTest {
         new GraphBuilderPhase.Instance(getProviders(), conf, OptimisticOptimizations.ALL, null).apply(graph);
         HighTierContext context = new HighTierContext(getProviders(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL);
         createInliningPhase().apply(graph, context);
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         return graph;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java
index f7b54c6712f..f7ed386ea87 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java
@@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.extended.MonitorExit;
 import org.graalvm.compiler.nodes.memory.FloatingReadNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FloatingReadPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.junit.Assert;
@@ -68,7 +67,7 @@ public class FloatingReadTest extends GraphScheduleTest {
 
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
             CoreProviders context = getProviders();
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+            new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
             new FloatingReadPhase().apply(graph);
 
             ReturnNode returnNode = null;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
index 759ce5bbb93..94f6c33ead8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -126,7 +126,7 @@ import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
 import org.graalvm.compiler.runtime.RuntimeProvider;
 import org.graalvm.compiler.test.AddExports;
 import org.graalvm.compiler.test.GraalTest;
-import org.graalvm.compiler.test.ModuleSupport;
+import org.graalvm.compiler.api.test.ModuleSupport;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -643,7 +643,7 @@ public abstract class GraalCompilerTest extends GraalTest {
     }
 
     protected final BasePhase createInliningPhase() {
-        return createInliningPhase(new CanonicalizerPhase());
+        return createInliningPhase(this.createCanonicalizerPhase());
     }
 
     protected BasePhase createInliningPhase(CanonicalizerPhase canonicalizer) {
@@ -1119,6 +1119,12 @@ public abstract class GraalCompilerTest extends GraalTest {
         return graph;
     }
 
+    protected StructuredGraph getFinalGraph(ResolvedJavaMethod method, OptionValues options) {
+        StructuredGraph graph = parseForCompile(method, options);
+        applyFrontEnd(graph);
+        return graph;
+    }
+
     @SuppressWarnings("try")
     protected void applyFrontEnd(StructuredGraph graph) {
         DebugContext debug = graph.getDebug();
@@ -1515,4 +1521,8 @@ public abstract class GraalCompilerTest extends GraalTest {
     protected boolean isArchitecture(String name) {
         return name.equals(backend.getTarget().arch.getName());
     }
+
+    protected CanonicalizerPhase createCanonicalizerPhase() {
+        return CanonicalizerPhase.create();
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java
index a0d34256f63..01238887300 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java
@@ -35,7 +35,6 @@ import org.graalvm.compiler.nodes.GraphEncoder;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -61,7 +60,7 @@ public class GraphEncoderTest extends GraalCompilerTest {
                 StructuredGraph originalGraph = parseEager(javaMethod, AllowAssumptions.YES);
                 if (canonicalize) {
                     CoreProviders context = getProviders();
-                    new CanonicalizerPhase().apply(originalGraph, context);
+                    createCanonicalizerPhase().apply(originalGraph, context);
                 }
                 originalGraphs.add(originalGraph);
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java
index bfb43ae1038..61a23420b6d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java
@@ -86,7 +86,7 @@ public class GuardPrioritiesTest extends GraphScheduleTest {
     private StructuredGraph prepareGraph(String method) {
         StructuredGraph graph = parseEager(method, StructuredGraph.AllowAssumptions.YES);
         HighTierContext highTierContext = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         new ConvertDeoptimizeToGuardPhase().apply(graph, highTierContext);
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highTierContext);
         new FloatingReadPhase().apply(graph);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java
index dc5b02e47ea..b0b5ff74112 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java
@@ -35,7 +35,6 @@ import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FloatingReadPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
@@ -227,12 +226,12 @@ public class IfCanonicalizerTest extends GraalCompilerTest {
     private void testCombinedIf(String snippet, int count) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
         CoreProviders context = getProviders();
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         new FloatingReadPhase().apply(graph);
         MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
         new GuardLoweringPhase().apply(graph, midContext);
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
-        new CanonicalizerPhase().apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
+        createCanonicalizerPhase().apply(graph, context);
         assertDeepEquals(count, graph.getNodes().filter(IfNode.class).count());
     }
 
@@ -247,7 +246,7 @@ public class IfCanonicalizerTest extends GraalCompilerTest {
             }
         }
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         for (FrameState fs : param.usages().filter(FrameState.class).snapshot()) {
             fs.replaceFirstInput(param, null);
             param.safeDelete();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java
index b343b448cc7..3ca38341021 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java
@@ -34,7 +34,6 @@ import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FloatingReadPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
@@ -72,7 +71,7 @@ public class ImplicitNullCheckTest extends GraphScheduleTest {
         try (DebugContext.Scope s = debug.scope("FloatingReadTest", new DebugDumpScope(snippet))) {
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES, debug);
             CoreProviders context = getProviders();
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+            new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
             new FloatingReadPhase().apply(graph);
             MidTierContext midTierContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
             new GuardLoweringPhase().apply(graph, midTierContext);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java
index 1a4c7757248..bbd1c0386b6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java
@@ -27,7 +27,6 @@ package org.graalvm.compiler.core.test;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class IntegerEqualsCanonicalizerTest extends GraalCompilerTest {
@@ -166,7 +165,7 @@ public class IntegerEqualsCanonicalizerTest extends GraalCompilerTest {
 
     private StructuredGraph getCanonicalizedGraph(String snippet) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         for (FrameState state : graph.getNodes(FrameState.TYPE).snapshot()) {
             state.replaceAtUsages(null);
             state.safeDelete();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java
index d64c4ff622a..5ab9e3de059 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -30,7 +30,7 @@ import java.lang.invoke.MethodType;
 
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.test.ExportingClassLoader;
+import org.graalvm.compiler.api.test.ExportingClassLoader;
 import org.junit.Test;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Label;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java
index 662809f8cbf..1f077a1c65e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -30,7 +30,6 @@ import java.util.Map;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Test;
@@ -69,8 +68,8 @@ public class InvokeExceptionTest extends GraalCompilerTest {
             hints.put(invoke, 1000d);
         }
         HighTierContext context = getDefaultHighTierContext();
-        createInliningPhase(hints, new CanonicalizerPhase()).apply(graph, context);
-        new CanonicalizerPhase().apply(graph, context);
+        createInliningPhase(hints, createCanonicalizerPhase()).apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         new DeadCodeEliminationPhase().apply(graph);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java
index 2ce70b62f28..d2d065224b5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -30,7 +30,6 @@ import java.util.Map;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Test;
@@ -80,8 +79,8 @@ public class InvokeHintsTest extends GraalCompilerTest {
         }
 
         HighTierContext context = getDefaultHighTierContext();
-        createInliningPhase(hints, new CanonicalizerPhase()).apply(graph, context);
-        new CanonicalizerPhase().apply(graph, context);
+        createInliningPhase(hints, createCanonicalizerPhase()).apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         new DeadCodeEliminationPhase().apply(graph);
         StructuredGraph referenceGraph = parseEager(REFERENCE_SNIPPET, AllowAssumptions.NO);
         assertEquals(referenceGraph, graph);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java
new file mode 100644
index 00000000000..b8a0c3eff2e
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LateMembarInsertionTest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Red Hat Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+
+package org.graalvm.compiler.core.test;
+
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.internal.vm.compiler.collections.EconomicMap;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.cfg.Block;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+import org.graalvm.compiler.nodes.memory.MemoryAccess;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionValues;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.graalvm.compiler.core.common.GraalOptions.StressTestEarlyReads;
+
+public class LateMembarInsertionTest extends GraalCompilerTest {
+
+    private final ResolvedJavaType volatileAccessType = getMetaAccess().lookupJavaType(VolatileAccess.class);
+    private final ResolvedJavaType regularAccessField = getMetaAccess().lookupJavaType(RegularAccess.class);
+    private final ResolvedJavaType volatileAccess2Type = getMetaAccess().lookupJavaType(VolatileAccess2.class);
+
+    static class VolatileAccess {
+        static volatile int field;
+    }
+
+    static class VolatileAccess2 {
+        static volatile int field;
+    }
+
+    static class RegularAccess {
+        static int field;
+    }
+
+    public static int volatileFieldLoadFieldLoad() {
+        int v1 = VolatileAccess.field;
+        int v2 = RegularAccess.field;
+        return v1 + v2;
+    }
+
+    @Test
+    public void test01() {
+        List accesses = compile("volatileFieldLoadFieldLoad", stressTestEarlyReads());
+
+        Assert.assertEquals(accesses.size(), 2);
+        Assert.assertEquals(accesses.get(0).getType(), volatileAccessType);
+        Assert.assertEquals(accesses.get(1).getType(), regularAccessField);
+        Assert.assertTrue(accesses.get(0).isRead());
+        Assert.assertTrue(accesses.get(1).isRead());
+    }
+
+    public static int volatileFieldLoadVolatileFieldLoad() {
+        int v1 = VolatileAccess.field;
+        int v2 = VolatileAccess2.field;
+        return v1 + v2;
+    }
+
+    @Test
+    public void test02() {
+        List accesses = compile("volatileFieldLoadVolatileFieldLoad", stressTestEarlyReads());
+
+        Assert.assertEquals(accesses.size(), 2);
+        Assert.assertEquals(accesses.get(0).getType(), volatileAccessType);
+        Assert.assertEquals(accesses.get(1).getType(), volatileAccess2Type);
+        Assert.assertTrue(accesses.get(0).isRead());
+        Assert.assertTrue(accesses.get(1).isRead());
+    }
+
+    public static int volatileFieldLoadVolatileFieldStore(int v2) {
+        int v1 = VolatileAccess.field;
+        VolatileAccess2.field = v2;
+        return v1;
+    }
+
+    @Test
+    public void test03() {
+        List accesses = compile("volatileFieldLoadVolatileFieldStore");
+
+        Assert.assertEquals(accesses.size(), 2);
+        Assert.assertEquals(accesses.get(0).getType(), volatileAccessType);
+        Assert.assertEquals(accesses.get(1).getType(), volatileAccess2Type);
+        Assert.assertTrue(accesses.get(0).isRead());
+        Assert.assertTrue(accesses.get(1).isWrite());
+    }
+
+    public static int volatileFieldStoreVolatileFieldLoad(int v2) {
+        VolatileAccess.field = v2;
+        return VolatileAccess2.field;
+    }
+
+    @Test
+    public void test04() {
+        List accesses = compile("volatileFieldStoreVolatileFieldLoad", stressTestEarlyReads());
+
+        Assert.assertEquals(accesses.size(), 2);
+        Assert.assertEquals(accesses.get(0).getType(), volatileAccessType);
+        Assert.assertEquals(accesses.get(1).getType(), volatileAccess2Type);
+        Assert.assertTrue(accesses.get(0).isWrite());
+        Assert.assertTrue(accesses.get(1).isRead());
+    }
+
+    public static int fieldLoadVolatileFieldStore(int v2) {
+        int v1 = RegularAccess.field;
+        VolatileAccess2.field = v2;
+        return v1;
+    }
+
+    @Test
+    public void test05() {
+        List accesses = compile("fieldLoadVolatileFieldStore");
+
+        Assert.assertEquals(accesses.size(), 2);
+        Assert.assertEquals(accesses.get(0).getType(), regularAccessField);
+        Assert.assertEquals(accesses.get(1).getType(), volatileAccess2Type);
+        Assert.assertTrue(accesses.get(0).isRead());
+        Assert.assertTrue(accesses.get(1).isWrite());
+    }
+
+    public static void volatileFieldStoreVolatileFieldStore(int v1, int v2) {
+        VolatileAccess.field = v1;
+        VolatileAccess2.field = v2;
+    }
+
+    @Test
+    public void test06() {
+        List accesses = compile("volatileFieldStoreVolatileFieldStore");
+
+        Assert.assertEquals(accesses.size(), 2);
+        Assert.assertEquals(accesses.get(0).getType(), volatileAccessType);
+        Assert.assertEquals(accesses.get(1).getType(), volatileAccess2Type);
+        Assert.assertTrue(accesses.get(0).isWrite());
+        Assert.assertTrue(accesses.get(1).isWrite());
+    }
+
+    private static OptionValues stressTestEarlyReads() {
+        EconomicMap, Object> overrides = OptionValues.newOptionMap();
+        overrides.put(StressTestEarlyReads, true);
+        return new OptionValues(getInitialOptions(), overrides);
+    }
+
+    static class TypePair {
+        private boolean isRead;
+        private ResolvedJavaType type;
+
+        TypePair(boolean isRead, ResolvedJavaType type) {
+            this.isRead = isRead;
+            this.type = type;
+        }
+
+        public boolean isRead() {
+            return isRead;
+        }
+
+        public boolean isWrite() {
+            return !isRead;
+        }
+
+        public ResolvedJavaType getType() {
+            return type;
+        }
+    }
+
+    private List compile(String test, OptionValues options) {
+        StructuredGraph graph = getFinalGraph(getResolvedJavaMethod(test), options);
+        return getAccesses(graph);
+    }
+
+    private List getAccesses(StructuredGraph graph) {
+        StructuredGraph.ScheduleResult schedule = graph.getLastSchedule();
+        ControlFlowGraph cfg = schedule.getCFG();
+        Block[] blocks = cfg.getBlocks();
+
+        return Arrays.stream(blocks).flatMap(b -> schedule.nodesFor(b).stream()).filter(n -> n instanceof MemoryAccess).map(
+                        n -> new TypePair(n instanceof ReadNode, classForAccess((FixedAccessNode) n))).collect(Collectors.toList());
+    }
+
+    private List compile(String test) {
+        StructuredGraph graph = getFinalGraph(getResolvedJavaMethod(test));
+        return getAccesses(graph);
+    }
+
+    private ResolvedJavaType classForAccess(FixedAccessNode n) {
+        AddressNode address = n.getAddress();
+        ValueNode base = address.getBase();
+        Stamp stamp = base.stamp(NodeView.DEFAULT);
+        MetaAccessProvider metaAccess = getMetaAccess();
+        ResolvedJavaType javaType = stamp.javaType(metaAccess);
+        if (javaType == metaAccess.lookupJavaType(Class.class) && base instanceof ConstantNode) {
+            ConstantReflectionProvider constantReflection = getConstantReflection();
+            javaType = constantReflection.asJavaType(base.asConstant());
+        }
+        return javaType;
+    }
+
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java
index 43832959df5..cfcf2094c01 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java
@@ -69,7 +69,7 @@ public class LockEliminationTest extends GraalCompilerTest {
         test("testSynchronizedSnippet", new A(), new A());
 
         StructuredGraph graph = getGraph("testSynchronizedSnippet", false);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         new LockEliminationPhase().apply(graph);
         assertDeepEquals(1, graph.getNodes().filter(RawMonitorEnterNode.class).count());
         assertDeepEquals(1, graph.getNodes().filter(MonitorExitNode.class).count());
@@ -87,7 +87,7 @@ public class LockEliminationTest extends GraalCompilerTest {
         test("testSynchronizedMethodSnippet", new A());
 
         StructuredGraph graph = getGraph("testSynchronizedMethodSnippet", false);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         new LockEliminationPhase().apply(graph);
         assertDeepEquals(1, graph.getNodes().filter(RawMonitorEnterNode.class).count());
         assertDeepEquals(1, graph.getNodes().filter(MonitorExitNode.class).count());
@@ -104,7 +104,7 @@ public class LockEliminationTest extends GraalCompilerTest {
     @Test
     public void testUnrolledSync() {
         StructuredGraph graph = getGraph("testUnrolledSyncSnippet", false);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         canonicalizer.apply(graph, getProviders());
         HighTierContext context = getDefaultHighTierContext();
         new LoopFullUnrollPhase(canonicalizer, new DefaultLoopPolicies()).apply(graph, context);
@@ -117,15 +117,15 @@ public class LockEliminationTest extends GraalCompilerTest {
         ResolvedJavaMethod method = getResolvedJavaMethod(snippet);
         StructuredGraph graph = parseEager(method, AllowAssumptions.YES);
         HighTierContext context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         canonicalizer.apply(graph, context);
         createInliningPhase().apply(graph, context);
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         new DeadCodeEliminationPhase().apply(graph);
         if (doEscapeAnalysis) {
             new PartialEscapePhase(true, canonicalizer, graph.getOptions()).apply(graph, context);
         }
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         return graph;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java
index a994eb440c9..740d46cdc8e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.AddNode;
 import org.graalvm.compiler.nodes.extended.OpaqueNode;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
@@ -85,7 +84,7 @@ public class LongNodeChainTest extends GraalCompilerTest {
             new SchedulePhase(s).apply(graph);
         }
 
-        new CanonicalizerPhase().apply(graph, context);
+        this.createCanonicalizerPhase().apply(graph, context);
         JavaConstant asConstant = (JavaConstant) returnNode.result().asConstant();
         Assert.assertEquals(N + 1, asConstant.asInt());
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java
index 4e2fac4eeeb..c8129f5aeb8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java
@@ -32,7 +32,6 @@ import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class LoopFullUnrollTest extends GraalCompilerTest {
@@ -89,7 +88,7 @@ public class LoopFullUnrollTest extends GraalCompilerTest {
             final StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, debug);
 
             CoreProviders context = getProviders();
-            new LoopFullUnrollPhase(new CanonicalizerPhase(), new DefaultLoopPolicies()).apply(graph, context);
+            new LoopFullUnrollPhase(createCanonicalizerPhase(), new DefaultLoopPolicies()).apply(graph, context);
 
             assertTrue(graph.getNodes().filter(LoopBeginNode.class).count() == loopCount);
         } catch (Throwable e) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java
index 5c5209065ed..9a40cef9108 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java
@@ -30,7 +30,6 @@ import org.graalvm.compiler.loop.DefaultLoopPolicies;
 import org.graalvm.compiler.loop.phases.LoopUnswitchingPhase;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class LoopUnswitchTest extends GraalCompilerTest {
@@ -133,8 +132,8 @@ public class LoopUnswitchTest extends GraalCompilerTest {
         graph.clearAllStateAfter();
         referenceGraph.clearAllStateAfter();
 
-        new CanonicalizerPhase().apply(graph, getProviders());
-        new CanonicalizerPhase().apply(referenceGraph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(referenceGraph, getProviders());
         try (DebugContext.Scope s = debug.scope("Test", new DebugDumpScope("Test:" + snippet))) {
             assertEquals(referenceGraph, graph);
         } catch (Throwable e) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java
index d95a683bf5c..89cdce3bfba 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -37,7 +37,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.inlining.InliningPhase;
 import org.graalvm.compiler.phases.common.inlining.policy.InlineEverythingPolicy;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
@@ -125,8 +124,8 @@ public class MarkUnsafeAccessTest extends GraalCompilerTest {
         Assert.assertNotNull(getMethodImpl);
         StructuredGraph graph = parseForCompile(getMethodImpl);
         HighTierContext highContext = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(graph, highContext);
-        new InliningPhase(new InlineEverythingPolicy(), new CanonicalizerPhase()).apply(graph, highContext);
+        createCanonicalizerPhase().apply(graph, highContext);
+        new InliningPhase(new InlineEverythingPolicy(), createCanonicalizerPhase()).apply(graph, highContext);
         InstalledCode compiledCode = getCode(getMethodImpl, graph);
         testMappedByteBuffer(mbb -> {
             try {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java
index 8060cceb70e..dd5992ad01d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -28,7 +28,6 @@ package org.graalvm.compiler.core.test;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.memory.WriteNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FloatingReadPhase;
 import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
@@ -76,10 +75,9 @@ public class MemoryGraphCanonicalizeTest extends GraalCompilerTest {
     public void testGraph(String name, int expectedWrites) {
         StructuredGraph graph = parseEager(name, StructuredGraph.AllowAssumptions.YES);
         HighTierContext context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
-        new IncrementalCanonicalizerPhase<>(canonicalizer, new FloatingReadPhase()).apply(graph, context);
-        new CanonicalizerPhase().apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        new IncrementalCanonicalizerPhase<>(createCanonicalizerPhase(), new FloatingReadPhase()).apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         int writes = graph.getNodes().filter(WriteNode.class).count();
         assertTrue(writes == expectedWrites, "Expected %d writes, found %d", expectedWrites, writes);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java
index a5fca846bab..df1e4fcfdd1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java
@@ -38,7 +38,6 @@ import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StartNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
@@ -177,7 +176,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop1() {
         ScheduleResult schedule = getFinalSchedule("testLoop1Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(6, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, true);
         assertReadWithinAllReturnBlocks(schedule, false);
     }
@@ -202,7 +200,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop2() {
         ScheduleResult schedule = getFinalSchedule("testLoop2Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(6, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, true);
     }
@@ -224,7 +221,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop3() {
         ScheduleResult schedule = getFinalSchedule("testLoop3Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(6, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, true);
         assertReadWithinAllReturnBlocks(schedule, false);
     }
@@ -260,7 +256,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop5() {
         ScheduleResult schedule = getFinalSchedule("testLoop5Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(10, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, false);
     }
@@ -289,7 +284,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop6() {
         ScheduleResult schedule = getFinalSchedule("testLoop6Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(13, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, false);
     }
@@ -322,7 +316,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop7() {
         ScheduleResult schedule = getFinalSchedule("testLoop7Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(18, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, false);
     }
@@ -349,7 +342,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testLoop8() {
         ScheduleResult schedule = getFinalSchedule("testLoop8Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(10, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, true);
         assertReadWithinAllReturnBlocks(schedule, false);
     }
@@ -391,7 +383,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testIfRead1() {
         ScheduleResult schedule = getFinalSchedule("testIfRead1Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(3, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, true);
         assertReadAndWriteInSameBlock(schedule, false);
     }
@@ -412,7 +403,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testIfRead2() {
         ScheduleResult schedule = getFinalSchedule("testIfRead2Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(3, schedule.getCFG().getBlocks().length);
         assertDeepEquals(1, schedule.getCFG().graph.getNodes().filter(FloatingReadNode.class).count());
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, false);
@@ -434,7 +424,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testIfRead3() {
         ScheduleResult schedule = getFinalSchedule("testIfRead3Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(4, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, true);
     }
@@ -455,7 +444,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testIfRead4() {
         ScheduleResult schedule = getFinalSchedule("testIfRead4Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(3, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, false);
         assertReadAndWriteInSameBlock(schedule, true);
@@ -474,7 +462,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testIfRead5() {
         ScheduleResult schedule = getFinalSchedule("testIfRead5Snippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(4, schedule.getCFG().getBlocks().length);
         assertReadWithinStartBlock(schedule, false);
         assertReadWithinAllReturnBlocks(schedule, true);
         assertReadAndWriteInSameBlock(schedule, false);
@@ -500,7 +487,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
     @Test
     public void testAntiDependency() {
         ScheduleResult schedule = getFinalSchedule("testAntiDependencySnippet", TestMode.WITHOUT_FRAMESTATES);
-        assertDeepEquals(4, schedule.getCFG().getBlocks().length);
         assertReadBeforeAllWritesInStartBlock(schedule);
     }
 
@@ -527,7 +513,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
         StructuredGraph graph = schedule.getCFG().graph;
         NodeIterable writeNodes = graph.getNodes().filter(WriteNode.class);
 
-        assertDeepEquals(1, schedule.getCFG().getBlocks().length);
         assertDeepEquals(8, writeNodes.count());
         assertDeepEquals(1, graph.getNodes().filter(FloatingReadNode.class).count());
 
@@ -708,7 +693,7 @@ public class MemoryScheduleTest extends GraphScheduleTest {
         DebugContext debug = graph.getDebug();
         try (DebugContext.Scope d = debug.scope("FloatingReadTest", graph)) {
             HighTierContext context = getDefaultHighTierContext();
-            CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+            CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
             canonicalizer.apply(graph, context);
             if (mode == TestMode.INLINED_WITHOUT_FRAMESTATES) {
                 createInliningPhase(canonicalizer).apply(graph, context);
@@ -729,7 +714,6 @@ public class MemoryScheduleTest extends GraphScheduleTest {
 
             SchedulePhase schedule = new SchedulePhase(schedulingStrategy);
             schedule.apply(graph);
-            assertDeepEquals(1, graph.getNodes().filter(StartNode.class).count());
             return graph.getLastSchedule();
         } catch (Throwable e) {
             throw debug.handle(e);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java
index bac9566efb3..adb040adac8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java
@@ -30,7 +30,6 @@ import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
 import org.graalvm.compiler.phases.OptimisticOptimizations.Optimization;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Test;
 
@@ -70,8 +69,8 @@ public class MergeCanonicalizerTest extends GraalCompilerTest {
 
     private void testReturnCount(String snippet, int returnCount) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
-        new CanonicalizerPhase().apply(graph, getProviders());
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         graph.getDebug().dump(DebugContext.BASIC_LEVEL, graph, "Graph");
         assertDeepEquals(returnCount, graph.getNodes(ReturnNode.TYPE).count());
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java
index 38f54d851d4..174f77e3028 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -36,7 +36,6 @@ import org.graalvm.compiler.nodes.ParameterNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.java.MonitorExitNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Assert;
@@ -103,8 +102,8 @@ public class MonitorGraphTest extends GraalCompilerTest {
             hints.put(invoke, 1000d);
         }
         HighTierContext context = getDefaultHighTierContext();
-        createInliningPhase(hints, new CanonicalizerPhase()).apply(graph, context);
-        new CanonicalizerPhase().apply(graph, context);
+        createInliningPhase(hints, createCanonicalizerPhase()).apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         new DeadCodeEliminationPhase().apply(graph);
         return graph;
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java
index 8dc2aafc89d..8716ed030c1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java
@@ -36,7 +36,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.phases.BasePhase;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase.CustomCanonicalizer;
+import org.graalvm.compiler.phases.common.CanonicalizerPhase.CustomSimplification;
 import org.graalvm.compiler.phases.contract.NodeCostUtil;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Assert;
@@ -162,19 +162,21 @@ public class NodePropertiesTest extends GraalCompilerTest {
     @Test
     public void testCanonicalizationExample() {
         HighTierContext htc = getDefaultHighTierContext();
-        ImprovementSavingCanonicalizer c1 = new ImprovementSavingCanonicalizer();
+        ImprovementSavingCalculator c1 = new ImprovementSavingCalculator();
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("test1Snippet"));
-        new CanonicalizerPhase(c1).apply(g1, htc);
-        ImprovementSavingCanonicalizer c2 = new ImprovementSavingCanonicalizer();
+        CanonicalizerPhase canonicalizer1 = this.createCanonicalizerPhase().copyWithCustomSimplification(c1);
+        canonicalizer1.apply(g1, htc);
+        ImprovementSavingCalculator c2 = new ImprovementSavingCalculator();
         StructuredGraph g2 = parseForCompile(getResolvedJavaMethod("test2Snippet"));
-        new CanonicalizerPhase(c2).apply(g2, htc);
+        CanonicalizerPhase canonicalizer2 = this.createCanonicalizerPhase().copyWithCustomSimplification(c2);
+        canonicalizer2.apply(g2, htc);
         Assert.assertEquals(0, c1.savedCycles);
         Assert.assertEquals(0, c2.savedCycles);
     }
 
-    private static void prepareGraphForLoopFrequencies(StructuredGraph g, HighTierContext htc) {
+    private void prepareGraphForLoopFrequencies(StructuredGraph g, HighTierContext htc) {
         // let canonicalizer work away branch probability nodes
-        new CanonicalizerPhase().apply(g, htc);
+        createCanonicalizerPhase().apply(g, htc);
         // recompute the loop frequencies
         ComputeLoopFrequenciesClosure.compute(g);
     }
@@ -242,8 +244,8 @@ public class NodePropertiesTest extends GraalCompilerTest {
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("test1Snippet"));
         StructuredGraph g2 = parseForCompile(getResolvedJavaMethod("test2Snippet"));
         HighTierContext htc = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(g1, htc);
-        new CanonicalizerPhase().apply(g2, htc);
+        createCanonicalizerPhase().apply(g1, htc);
+        createCanonicalizerPhase().apply(g2, htc);
         GraphCostPhase gc1 = new GraphCostPhase();
         GraphCostPhase gc2 = new GraphCostPhase();
         gc1.apply(g1, htc);
@@ -257,7 +259,7 @@ public class NodePropertiesTest extends GraalCompilerTest {
     public void testExpectUntrusted() {
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("untrused01"));
         HighTierContext htc = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(g1, htc);
+        createCanonicalizerPhase().apply(g1, htc);
         GraphCostPhase gc1 = new GraphCostPhase();
         gc1.apply(g1, htc);
     }
@@ -266,7 +268,7 @@ public class NodePropertiesTest extends GraalCompilerTest {
     public void testArrayLoad() {
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("arrayLoadTest"));
         HighTierContext htc = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(g1, htc);
+        createCanonicalizerPhase().apply(g1, htc);
         GraphCostPhase gc1 = new GraphCostPhase();
         gc1.apply(g1, htc);
         Assert.assertEquals(15, gc1.finalCycles, 25);
@@ -276,7 +278,7 @@ public class NodePropertiesTest extends GraalCompilerTest {
     public void testArrayStore() {
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("arrayStoreTest"));
         HighTierContext htc = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(g1, htc);
+        createCanonicalizerPhase().apply(g1, htc);
         GraphCostPhase gc1 = new GraphCostPhase();
         gc1.apply(g1, htc);
         Assert.assertEquals(15, gc1.finalCycles, 25);
@@ -286,7 +288,7 @@ public class NodePropertiesTest extends GraalCompilerTest {
     public void testFieldLoad() {
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("fieldLoad"));
         HighTierContext htc = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(g1, htc);
+        createCanonicalizerPhase().apply(g1, htc);
         GraphCostPhase gc1 = new GraphCostPhase();
         gc1.apply(g1, htc);
         Assert.assertEquals(15, gc1.finalCycles, 25);
@@ -296,13 +298,13 @@ public class NodePropertiesTest extends GraalCompilerTest {
     public void testFieldStore() {
         StructuredGraph g1 = parseForCompile(getResolvedJavaMethod("fieldStore"));
         HighTierContext htc = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(g1, htc);
+        createCanonicalizerPhase().apply(g1, htc);
         GraphCostPhase gc1 = new GraphCostPhase();
         gc1.apply(g1, htc);
         Assert.assertEquals(15, gc1.finalCycles, 25);
     }
 
-    static class ImprovementSavingCanonicalizer extends CustomCanonicalizer {
+    static class ImprovementSavingCalculator implements CustomSimplification {
         private int savedCycles;
 
         @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java
index 82c75c793a5..9dcae66af81 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java
@@ -104,7 +104,7 @@ public class PushNodesThroughPiTest extends GraalCompilerTest {
     private StructuredGraph compileTestSnippet(final String snippet) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
         CoreProviders context = getProviders();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         canonicalizer.apply(graph, context);
         canonicalizer.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java
index 20c22fcbb92..dddecd40f4d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java
@@ -29,7 +29,6 @@ import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class PushThroughIfTest extends GraalCompilerTest {
@@ -65,15 +64,15 @@ public class PushThroughIfTest extends GraalCompilerTest {
             fs.replaceAtUsages(null);
             GraphUtil.killWithUnusedFloatingInputs(fs);
         }
-        new CanonicalizerPhase().apply(graph, getProviders());
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
 
         StructuredGraph referenceGraph = parseEager(reference, AllowAssumptions.YES);
         for (FrameState fs : referenceGraph.getNodes(FrameState.TYPE).snapshot()) {
             fs.replaceAtUsages(null);
             GraphUtil.killWithUnusedFloatingInputs(fs);
         }
-        new CanonicalizerPhase().apply(referenceGraph, getProviders());
+        createCanonicalizerPhase().apply(referenceGraph, getProviders());
         assertEquals(referenceGraph, graph);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java
index d5e28656523..7345cf5892f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java
@@ -90,7 +90,7 @@ public class ReadAfterCheckCastTest extends GraphScheduleTest {
             // structure changes significantly
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
             CoreProviders context = getProviders();
-            CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+            CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
             new FloatingReadPhase().apply(graph);
             canonicalizer.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java
index b472a507967..f73db544744 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java
@@ -28,7 +28,6 @@ import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class ReassociateAndCanonicalTest extends GraalCompilerTest {
@@ -245,9 +244,9 @@ public class ReassociateAndCanonicalTest extends GraalCompilerTest {
 
     private  void test(String test, String ref) {
         StructuredGraph testGraph = parseEager(test, AllowAssumptions.NO);
-        new CanonicalizerPhase().apply(testGraph, getProviders());
+        createCanonicalizerPhase().apply(testGraph, getProviders());
         StructuredGraph refGraph = parseEager(ref, AllowAssumptions.NO);
-        new CanonicalizerPhase().apply(refGraph, getProviders());
+        createCanonicalizerPhase().apply(refGraph, getProviders());
         assertEquals(testGraph, refGraph);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java
index b65bacfc7e6..6a86a75a201 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java
@@ -28,7 +28,6 @@ import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 /**
@@ -134,7 +133,7 @@ public class ScalarTypeSystemTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
         graph.getDebug().dump(DebugContext.BASIC_LEVEL, graph, "Graph");
         CoreProviders context = getProviders();
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.NO);
         assertEquals(referenceGraph, graph);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java
index 6872dfc1aa0..a47718b3e06 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java
@@ -44,7 +44,6 @@ import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
@@ -99,8 +98,8 @@ public class SchedulingTest2 extends GraphScheduleTest {
         }
 
         CoreProviders context = getProviders();
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
-        new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+        new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, context);
         MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
 
         new GuardLoweringPhase().apply(graph, midContext);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java
index 25d1392848a..9a05a1ef6e3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java
@@ -27,7 +27,6 @@ package org.graalvm.compiler.core.test;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.junit.Test;
 
@@ -111,7 +110,7 @@ public class StampCanonicalizerTest extends GraalCompilerTest {
 
     private void testZeroReturn(String methodName) {
         StructuredGraph graph = parseEager(methodName, AllowAssumptions.YES);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         new DeadCodeEliminationPhase().apply(graph);
         assertConstantReturn(graph, 0);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java
index 71e97187cb1..4ec4abf2714 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java
@@ -27,7 +27,6 @@ package org.graalvm.compiler.core.test;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class StraighteningTest extends GraalCompilerTest {
@@ -90,7 +89,7 @@ public class StraighteningTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
         DebugContext debug = graph.getDebug();
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         StructuredGraph referenceGraph = parseEager(REFERENCE_SNIPPET, AllowAssumptions.YES);
         assertEquals(referenceGraph, graph);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java
index 0916a5c32aa..258d0a67ba6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java
@@ -26,7 +26,6 @@ package org.graalvm.compiler.core.test;
 
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class SwitchCanonicalizerTest extends GraalCompilerTest {
@@ -119,7 +118,7 @@ public class SwitchCanonicalizerTest extends GraalCompilerTest {
 
     private void shouldFoldSwitch(String methodName) {
         StructuredGraph graph = parseForCompile(getResolvedJavaMethod(methodName));
-        new CanonicalizerPhase().apply(graph, getDefaultHighTierContext());
+        createCanonicalizerPhase().apply(graph, getDefaultHighTierContext());
         assertTrue(graph.getNodes().filter(IntegerSwitchNode.class).isEmpty());
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java
index 1dd70c472e9..9aab44e7bd3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java
@@ -70,7 +70,7 @@ public class SwitchDyingLoopTest extends GraalCompilerTest {
 
     @Test
     public void test() {
-        CanonicalizerPhase canonicalizerPhase = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizerPhase = createCanonicalizerPhase();
         HighTierContext highTierContext = getDefaultHighTierContext();
         StructuredGraph graph = parseEager("snippet", StructuredGraph.AllowAssumptions.YES);
         // there should be 1 loop and 1 switch
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java
index 9fd53fc95fb..9aa6a021fbd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java
@@ -27,7 +27,6 @@ package org.graalvm.compiler.core.test;
 
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class SwitchFoldingTest extends GraalCompilerTest {
@@ -484,7 +483,7 @@ public class SwitchFoldingTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, StructuredGraph.AllowAssumptions.YES);
         DebugContext debug = graph.getDebug();
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         StructuredGraph referenceGraph = parseEager(ref, StructuredGraph.AllowAssumptions.YES);
         assertEquals(referenceGraph, graph);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java
index 278e4187765..3677adadf58 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java
@@ -41,7 +41,6 @@ import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
 import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase;
 import org.junit.Assert;
@@ -188,13 +187,13 @@ public class TypeSystemTest extends GraalCompilerTest {
          * reference graph.
          */
         new ConditionalEliminationPhase(false).apply(graph, getProviders());
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         // a second canonicalizer is needed to process nested MaterializeNodes
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         StructuredGraph referenceGraph = parseEager(referenceSnippet, AllowAssumptions.NO);
         new ConditionalEliminationPhase(false).apply(referenceGraph, getProviders());
-        new CanonicalizerPhase().apply(referenceGraph, getProviders());
-        new CanonicalizerPhase().apply(referenceGraph, getProviders());
+        this.createCanonicalizerPhase().apply(referenceGraph, getProviders());
+        this.createCanonicalizerPhase().apply(referenceGraph, getProviders());
         assertEquals(referenceGraph, graph);
     }
 
@@ -244,8 +243,8 @@ public class TypeSystemTest extends GraalCompilerTest {
 
     private  void testHelper(String snippet, Class clazz) {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
-        new CanonicalizerPhase().apply(graph, getProviders());
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         DebugContext debug = graph.getDebug();
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph " + snippet);
         Assert.assertFalse("shouldn't have nodes of type " + clazz, graph.getNodes().filter(clazz).iterator().hasNext());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java
index ffe831b63ae..da02a01c2e0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java
@@ -119,7 +119,7 @@ public class UnsafeReadEliminationTest extends GraalCompilerTest {
 
     public void testEarlyReadElimination(StructuredGraph graph, int reads, int writes) {
         CoreProviders context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         canonicalizer.apply(graph, context);
         new EarlyReadEliminationPhase(canonicalizer).apply(graph, context);
         Assert.assertEquals(3, graph.getNodes().filter(UnsafeAccessNode.class).count());
@@ -134,7 +134,7 @@ public class UnsafeReadEliminationTest extends GraalCompilerTest {
     public void testPartialEscapeReadElimination(StructuredGraph graph, int reads, int writes) {
         OptionValues options = graph.getOptions();
         CoreProviders context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         canonicalizer.apply(graph, context);
         new PartialEscapePhase(true, true, canonicalizer, null, options).apply(graph, context);
         Assert.assertEquals(3, graph.getNodes().filter(UnsafeAccessNode.class).count());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java
index ab00c1a80bf..673b1919748 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java
@@ -147,7 +147,7 @@ public class UnsafeVirtualizationTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
         OptionValues options = graph.getOptions();
         CoreProviders context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         if (canonicalizeBefore) {
             canonicalizer.apply(graph, context);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java
index 67644f6b9d2..a6cc1274601 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/UnusedArray.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.assertThat;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Test;
 
 public class UnusedArray extends GraalCompilerTest {
@@ -66,7 +65,7 @@ public class UnusedArray extends GraalCompilerTest {
 
     public void test(String method) {
         StructuredGraph graph = parseEager(method, StructuredGraph.AllowAssumptions.YES);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         NodeIterable newArrayNodes = graph.getNodes().filter(NewArrayNode.class);
         assertThat(newArrayNodes, isEmpty());
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java
index 36f1a794aeb..9a8970b2a8c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java
@@ -29,7 +29,6 @@ import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.junit.Assert;
 import org.junit.Test;
@@ -62,7 +61,7 @@ public class CompiledMethodTest extends GraalCompilerTest {
     public void test1() {
         final ResolvedJavaMethod javaMethod = getResolvedJavaMethod("testMethod");
         final StructuredGraph graph = parseEager(javaMethod, AllowAssumptions.NO);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
         new DeadCodeEliminationPhase().apply(graph);
 
         for (ConstantNode node : ConstantNode.getConstantNodes(graph)) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java
index 0dd5273ea67..1d267902735 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java
@@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.java.NewArrayNode;
 import org.graalvm.compiler.nodes.java.NewInstanceNode;
 import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
 import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
@@ -173,7 +172,7 @@ public class EATestBase extends GraalCompilerTest {
             createInliningPhase().apply(graph, context);
             new DeadCodeEliminationPhase().apply(graph);
             canonicalizeGraph();
-            new PartialEscapePhase(iterativeEscapeAnalysis, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+            new PartialEscapePhase(iterativeEscapeAnalysis, false, createCanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
             postEACanonicalizeGraph();
             returnNodes = graph.getNodes(ReturnNode.TYPE).snapshot();
         } catch (Throwable e) {
@@ -185,6 +184,6 @@ public class EATestBase extends GraalCompilerTest {
     }
 
     protected void canonicalizeGraph() {
-        new CanonicalizerPhase().apply(graph, context);
+        this.createCanonicalizerPhase().apply(graph, context);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java
index ccf1ed40995..c25c6713578 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EarlyReadEliminationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -27,6 +27,9 @@ package org.graalvm.compiler.core.test.ea;
 import java.util.List;
 
 import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.LogicConstantNode;
 import org.graalvm.compiler.nodes.ProxyNode;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -37,7 +40,6 @@ import org.graalvm.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.virtual.phases.ea.EarlyReadEliminationPhase;
@@ -47,6 +49,50 @@ public class EarlyReadEliminationTest extends GraalCompilerTest {
 
     public static Object staticField;
 
+    static void cfgSnippet() {
+        if (staticField != null) {
+            staticField = 12;
+            if (staticField != null) {
+                staticField = 12;
+            }
+            if (staticField != null) {
+                staticField = 12;
+            }
+            if (staticField != null) {
+                staticField = 12;
+            }
+            if (staticField != null) {
+                staticField = 12;
+            }
+        } else {
+            if (staticField != null) {
+                staticField = 12;
+            } else {
+                if (staticField != null) {
+                    staticField = 12;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testDeadBranches() {
+        StructuredGraph graph = parseEager(getResolvedJavaMethod("cfgSnippet"), AllowAssumptions.NO);
+        HighTierContext context = getDefaultHighTierContext();
+        int index = 0;
+        boolean[] conditions = new boolean[]{true, false, false, true, true, true, false};
+        /*
+         * Create a graph with "dead" branches in the beginning.
+         */
+        for (Node n : graph.getNodes()) {
+            if (n instanceof IfNode) {
+                IfNode ifNode = (IfNode) n;
+                ifNode.setCondition(LogicConstantNode.forBoolean(conditions[index++], graph));
+            }
+        }
+        new EarlyReadEliminationPhase(createCanonicalizerPhase()).apply(graph, context);
+    }
+
     public static class TestObject {
 
         public int x;
@@ -264,9 +310,9 @@ public class EarlyReadEliminationTest extends GraalCompilerTest {
         HighTierContext context = getDefaultHighTierContext();
         createInliningPhase().apply(graph, context);
         if (doLowering) {
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+            new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
         }
-        new EarlyReadEliminationPhase(new CanonicalizerPhase()).apply(graph, context);
+        new EarlyReadEliminationPhase(createCanonicalizerPhase()).apply(graph, context);
         return graph;
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
index acb7fc07135..6c64ecc8dfb 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
@@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
 import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.compiler.test.SubprocessUtil;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
@@ -327,7 +326,7 @@ public class EscapeAnalysisTest extends EATestBase {
         Assert.assertEquals(1, graph.getNodes().filter(BoxNode.class).count());
         List nodes = graph.getNodes().snapshot();
         // verify that an additional run doesn't add or remove nodes
-        new PartialEscapePhase(false, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+        new PartialEscapePhase(false, false, createCanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
         Assert.assertEquals(nodes.size(), graph.getNodeCount());
         for (Node node : nodes) {
             Assert.assertTrue(node.isAlive());
@@ -362,9 +361,9 @@ public class EscapeAnalysisTest extends EATestBase {
         Assert.assertEquals(2, graph.getNodes().filter(CommitAllocationNode.class).count());
         // create the situation by removing the if
         graph.replaceFixedWithFloating(graph.getNodes().filter(LoadFieldNode.class).first(), graph.unique(ConstantNode.forInt(0)));
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         // verify that an additional run removes all allocations
-        new PartialEscapePhase(false, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+        new PartialEscapePhase(false, false, createCanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
         Assert.assertEquals(0, graph.getNodes().filter(CommitAllocationNode.class).count());
     }
 
@@ -440,8 +439,8 @@ public class EscapeAnalysisTest extends EATestBase {
     @Test
     public void testFullyUnrolledLoop() {
         prepareGraph("testFullyUnrolledLoopSnippet", false);
-        new LoopFullUnrollPhase(new CanonicalizerPhase(), new DefaultLoopPolicies()).apply(graph, context);
-        new PartialEscapePhase(false, new CanonicalizerPhase(), graph.getOptions()).apply(graph, context);
+        new LoopFullUnrollPhase(createCanonicalizerPhase(), new DefaultLoopPolicies()).apply(graph, context);
+        new PartialEscapePhase(false, createCanonicalizerPhase(), graph.getOptions()).apply(graph, context);
         Assert.assertEquals(1, returnNodes.size());
         Assert.assertTrue(returnNodes.get(0).result() instanceof AllocatedObjectNode);
         CommitAllocationNode commit = ((AllocatedObjectNode) returnNodes.get(0).result()).getCommit();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java
index 7d24aaf52c4..e15962e4ed2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -30,7 +30,6 @@ import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.java.LoadIndexedNode;
 import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
 import org.junit.Test;
@@ -181,7 +180,7 @@ public class PEAReadEliminationTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
         createInliningPhase().apply(graph, context);
-        new PartialEscapePhase(false, true, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+        new PartialEscapePhase(false, true, createCanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
         return graph;
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java
index c3840d4e4e7..ed7d4a62bd3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -31,7 +31,6 @@ import org.graalvm.compiler.nodes.extended.BoxNode;
 import org.graalvm.compiler.nodes.extended.UnboxNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
 import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
 import org.junit.Assert;
 import org.junit.Test;
@@ -147,7 +146,7 @@ public class PartialEscapeAnalysisIterationTest extends EATestBase {
         for (String name : new String[]{"noLoopIterationEmpty", "noLoopIteration"}) {
             prepareGraph(name, false);
             List allocations = graph.getNodes().filter(CommitAllocationNode.class).snapshot();
-            new PartialEscapePhase(true, false, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+            new PartialEscapePhase(true, false, createCanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
             Assert.assertEquals(1, allocations.size());
             Assert.assertTrue(allocations.get(0).isAlive());
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java
index e57739cf010..192cdc4c193 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -44,7 +44,6 @@ import org.graalvm.compiler.nodes.java.NewArrayNode;
 import org.graalvm.compiler.nodes.java.NewInstanceNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
 import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 
 /**
@@ -287,7 +286,7 @@ public class PartialEscapeAnalysisTest extends EATestBase {
             merge.setStateAfter(null);
         }
         new DeadCodeEliminationPhase().apply(graph);
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         try {
             Assert.assertTrue("partial escape analysis should have removed all NewInstanceNode allocations", graph.getNodes().filter(NewInstanceNode.class).isEmpty());
             Assert.assertTrue("partial escape analysis should have removed all NewArrayNode allocations", graph.getNodes().filter(NewArrayNode.class).isEmpty());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java
index 321f9a776df..38b676ad721 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -30,7 +30,6 @@ import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.debug.BlackholeNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.junit.Assert;
 import org.junit.Test;
@@ -118,7 +117,7 @@ public class PartialEscapeAnalysisTreesTest extends EATestBase {
                 graph.removeFixed(node);
             }
             new DeadCodeEliminationPhase().apply(graph);
-            new CanonicalizerPhase().apply(graph, context);
+            createCanonicalizerPhase().apply(graph, context);
 
             InstalledCode code = getCode(method, graph, true);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java
index 0a7cb42d608..6d59f1bc426 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java
@@ -35,7 +35,6 @@ import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
 import org.graalvm.compiler.nodes.java.NewInstanceNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Test;
@@ -68,7 +67,7 @@ public class PoorMansEATest extends GraalCompilerTest {
             HighTierContext highTierContext = getDefaultHighTierContext();
             createInliningPhase().apply(graph, highTierContext);
             CoreProviders context = getProviders();
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+            new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
 
             // remove framestates in order to trigger the simplification.
             cleanup: for (FrameState fs : graph.getNodes(FrameState.TYPE).snapshot()) {
@@ -80,7 +79,7 @@ public class PoorMansEATest extends GraalCompilerTest {
                     }
                 }
             }
-            new CanonicalizerPhase().apply(graph, context);
+            createCanonicalizerPhase().apply(graph, context);
         } catch (Throwable e) {
             throw debug.handle(e);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java
index b260ae54bbc..17d64a9aaf3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -32,7 +32,6 @@ import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.extended.RawStoreNode;
 import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
 import org.junit.Test;
@@ -123,7 +122,7 @@ public class TrufflePEATest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(snippet, StructuredGraph.AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
         createInliningPhase().apply(graph, context);
-        new PartialEscapePhase(true, true, new CanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
+        new PartialEscapePhase(true, true, createCanonicalizerPhase(), null, graph.getOptions()).apply(graph, context);
         return graph;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java
index fd5bdcdb37f..4b440393352 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.extended.RawStoreNode;
 import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -123,7 +122,7 @@ public class UnsafeEATest extends EATestBase {
         for (UnpackEndianHalfNode node : graph.getNodes().filter(UnpackEndianHalfNode.class)) {
             node.lower(getTarget().arch.getByteOrder());
         }
-        new CanonicalizerPhase().applyIncremental(graph, context, mark);
+        createCanonicalizerPhase().applyIncremental(graph, context, mark);
     }
 
     private boolean testingUnsafe;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java
index 513c89553dc..ee237eb7ca6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -41,7 +41,6 @@ import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
 import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.junit.Assert;
@@ -291,10 +290,10 @@ public class InliningTest extends GraalCompilerTest {
                                 : getDefaultGraphBuilderSuite();
                 HighTierContext context = new HighTierContext(getProviders(), graphBuilderSuite, OptimisticOptimizations.ALL);
                 debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
-                new CanonicalizerPhase().apply(graph, context);
+                createCanonicalizerPhase().apply(graph, context);
                 createInliningPhase().apply(graph, context);
                 debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
-                new CanonicalizerPhase().apply(graph, context);
+                createCanonicalizerPhase().apply(graph, context);
                 new DeadCodeEliminationPhase().apply(graph);
                 return graph;
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java
index 3a047363cf5..8ff2baa7a1a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java
@@ -112,8 +112,8 @@ public class NestedLoopEffectsPhaseComplexityTest extends GraalCompilerTest {
             StructuredGraph g1 = prepareGraph(snippet, i);
             StructuredGraph g2 = (StructuredGraph) g1.copy(g1.getDebug());
             ResolvedJavaMethod method = g1.method();
-            long elapsedRE = runAndTimePhase(g1, new EarlyReadEliminationPhase(new CanonicalizerPhase()));
-            long elapsedPEA = runAndTimePhase(g2, new PartialEscapePhase(true, new CanonicalizerPhase(), g1.getOptions()));
+            long elapsedRE = runAndTimePhase(g1, new EarlyReadEliminationPhase(createCanonicalizerPhase()));
+            long elapsedPEA = runAndTimePhase(g2, new PartialEscapePhase(true, createCanonicalizerPhase(), g1.getOptions()));
             if (LOG_PHASE_TIMINGS) {
                 TTY.printf("Needed %dms to run early partial escape analysis on a graph with %d nested loops compiling method %s\n", elapsedPEA, i, method);
             }
@@ -138,7 +138,7 @@ public class NestedLoopEffectsPhaseComplexityTest extends GraalCompilerTest {
         StructuredGraph callerGraph = parseEager(callerMethod, AllowAssumptions.YES);
         PhaseSuite graphBuilderSuite = getDefaultGraphBuilderSuite();
         HighTierContext context = new HighTierContext(getProviders(), graphBuilderSuite, OptimisticOptimizations.ALL);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         Invoke next = callerGraph.getNodes(MethodCallTargetNode.TYPE).first().invoke();
         StructuredGraph calleeGraph = parseBytecodes(next.callTarget().targetMethod(), context, canonicalizer);
         ResolvedJavaMethod calleeMethod = next.callTarget().targetMethod();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java
index 478b7272440..4bfaad577ae 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/NodeMatchRules.java
@@ -63,6 +63,7 @@ import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode;
 import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode;
 import org.graalvm.compiler.nodes.memory.FloatingReadNode;
 import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.VolatileReadNode;
 import org.graalvm.compiler.nodes.memory.WriteNode;
 
 import jdk.vm.ci.meta.Value;
@@ -75,6 +76,7 @@ import jdk.vm.ci.meta.Value;
 @MatchableNode(nodeClass = LeftShiftNode.class, inputs = {"x", "y"}, ignoresSideEffects = true)
 @MatchableNode(nodeClass = NarrowNode.class, inputs = {"value"}, ignoresSideEffects = true)
 @MatchableNode(nodeClass = ReadNode.class, inputs = {"address"})
+@MatchableNode(nodeClass = VolatileReadNode.class, inputs = {"address"})
 @MatchableNode(nodeClass = ReinterpretNode.class, inputs = {"value"}, ignoresSideEffects = true)
 @MatchableNode(nodeClass = SignExtendNode.class, inputs = {"value"}, ignoresSideEffects = true)
 @MatchableNode(nodeClass = UnsignedRightShiftNode.class, inputs = {"x", "y"}, ignoresSideEffects = true)
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java
new file mode 100644
index 00000000000..ea2b5c8d3e4
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.core.phases;
+
+import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
+
+import org.graalvm.compiler.loop.DefaultLoopPolicies;
+import org.graalvm.compiler.loop.LoopPolicies;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.phases.PhaseSuite;
+import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+
+public class BaseTier extends PhaseSuite {
+
+    public LoopPolicies createLoopPolicies() {
+        return new DefaultLoopPolicies();
+    }
+
+    public CanonicalizerPhase createCanonicalizerPhase(OptionValues options) {
+        CanonicalizerPhase canonicalizer = null;
+        if (ImmutableCode.getValue(options)) {
+            canonicalizer = CanonicalizerPhase.createWithoutReadCanonicalization();
+        } else {
+            canonicalizer = CanonicalizerPhase.create();
+        }
+        return canonicalizer;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java
index 62e472e0d87..e3b1d652965 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -24,23 +24,16 @@
 
 package org.graalvm.compiler.core.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 
-public class EconomyHighTier extends PhaseSuite {
+public class EconomyHighTier extends BaseTier {
 
     public EconomyHighTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer.disableReadCanonicalization();
-        }
-
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase(options);
         appendPhase(canonicalizer);
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER));
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java
index d9366ae50ba..66a0ccfc037 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java
@@ -24,29 +24,20 @@
 
 package org.graalvm.compiler.core.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.ExpandLogicPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.compiler.phases.tiers.LowTierContext;
 
-public class EconomyLowTier extends PhaseSuite {
+public class EconomyLowTier extends BaseTier {
 
     public EconomyLowTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer.disableReadCanonicalization();
-        }
-
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase(options);
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER));
-
         appendPhase(new ExpandLogicPhase());
-
         appendPhase(new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS));
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java
index fb912670b09..eebb4989adc 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java
@@ -24,11 +24,8 @@
 
 package org.graalvm.compiler.core.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
@@ -38,23 +35,15 @@ import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
 import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase;
 import org.graalvm.compiler.phases.tiers.MidTierContext;
 
-public class EconomyMidTier extends PhaseSuite {
+public class EconomyMidTier extends BaseTier {
 
     public EconomyMidTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer.disableReadCanonicalization();
-        }
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase(options);
         appendPhase(new RemoveValueProxyPhase());
-
         appendPhase(new LoopSafepointInsertionPhase());
-
         appendPhase(new GuardLoweringPhase());
-
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER));
-
         appendPhase(new FrameStateAssignmentPhase());
-
         appendPhase(new WriteBarrierAdditionPhase());
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java
index 1de4f04f39e..340a7e3a933 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java
@@ -25,17 +25,16 @@
 package org.graalvm.compiler.core.phases;
 
 import static org.graalvm.compiler.core.common.GraalOptions.ConditionalElimination;
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
 import static org.graalvm.compiler.core.common.GraalOptions.LoopPeeling;
 import static org.graalvm.compiler.core.common.GraalOptions.LoopUnswitch;
 import static org.graalvm.compiler.core.common.GraalOptions.OptConvertDeoptsToGuards;
-import static org.graalvm.compiler.core.common.GraalOptions.OptLoopTransform;
 import static org.graalvm.compiler.core.common.GraalOptions.OptReadElimination;
 import static org.graalvm.compiler.core.common.GraalOptions.PartialEscapeAnalysis;
 import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
 
 import org.graalvm.compiler.loop.DefaultLoopPolicies;
 import org.graalvm.compiler.loop.LoopPolicies;
+import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
 import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase;
 import org.graalvm.compiler.loop.phases.LoopPeelingPhase;
 import org.graalvm.compiler.loop.phases.LoopUnswitchingPhase;
@@ -44,22 +43,19 @@ import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionType;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
 import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.common.NodeCounterPhase;
-import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
 import org.graalvm.compiler.phases.common.inlining.InliningPhase;
 import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.virtual.phases.ea.EarlyReadEliminationPhase;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
 
-public class HighTier extends PhaseSuite {
+public class HighTier extends BaseTier {
 
     public static class Options {
 
@@ -70,11 +66,7 @@ public class HighTier extends PhaseSuite {
     }
 
     public HighTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer.disableReadCanonicalization();
-        }
-
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase(options);
         appendPhase(canonicalizer);
 
         if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
@@ -101,13 +93,12 @@ public class HighTier extends PhaseSuite {
         LoopPolicies loopPolicies = createLoopPolicies();
         appendPhase(new LoopFullUnrollPhase(canonicalizer, loopPolicies));
 
-        if (OptLoopTransform.getValue(options)) {
-            if (LoopPeeling.getValue(options)) {
-                appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new LoopPeelingPhase(loopPolicies)));
-            }
-            if (LoopUnswitch.getValue(options)) {
-                appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new LoopUnswitchingPhase(loopPolicies)));
-            }
+        if (LoopPeeling.getValue(options)) {
+            appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new LoopPeelingPhase(loopPolicies)));
+        }
+
+        if (LoopUnswitch.getValue(options)) {
+            appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new LoopUnswitchingPhase(loopPolicies)));
         }
 
         if (PartialEscapeAnalysis.getValue(options)) {
@@ -118,8 +109,6 @@ public class HighTier extends PhaseSuite {
             appendPhase(new EarlyReadEliminationPhase(canonicalizer));
         }
 
-        appendPhase(new RemoveValueProxyPhase());
-
         if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
             appendPhase(new NodeCounterPhase(NodeCounterPhase.Stage.LATE));
         }
@@ -127,6 +116,7 @@ public class HighTier extends PhaseSuite {
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER));
     }
 
+    @Override
     public LoopPolicies createLoopPolicies() {
         return new DefaultLoopPolicies();
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java
index 36701bb4158..98b85df66e1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java
@@ -24,7 +24,7 @@
 
 package org.graalvm.compiler.core.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
+import static org.graalvm.compiler.core.common.GraalOptions.LateMembars;
 import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
 
 import org.graalvm.compiler.core.common.GraalOptions;
@@ -33,11 +33,11 @@ import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionType;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.common.ExpandLogicPhase;
 import org.graalvm.compiler.phases.common.FixReadsPhase;
+import org.graalvm.compiler.phases.common.InsertMembarsPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.common.ProfileCompiledMethodsPhase;
 import org.graalvm.compiler.phases.common.PropagateDeoptimizeProbabilityPhase;
@@ -46,7 +46,7 @@ import org.graalvm.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
 import org.graalvm.compiler.phases.tiers.LowTierContext;
 
-public class LowTier extends PhaseSuite {
+public class LowTier extends BaseTier {
 
     static class Options {
 
@@ -58,13 +58,8 @@ public class LowTier extends PhaseSuite {
     }
 
     public LowTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        CanonicalizerPhase canonicalizerWithoutGVN = new CanonicalizerPhase();
-        canonicalizerWithoutGVN.disableGVN();
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer.disableReadCanonicalization();
-            canonicalizerWithoutGVN.disableReadCanonicalization();
-        }
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase(options);
+        CanonicalizerPhase canonicalizerWithoutGVN = canonicalizer.copyWithoutGVN();
 
         if (Options.ProfileCompiledMethods.getValue(options)) {
             appendPhase(new ProfileCompiledMethodsPhase());
@@ -85,6 +80,9 @@ public class LowTier extends PhaseSuite {
 
         appendPhase(new PropagateDeoptimizeProbabilityPhase());
 
+        if (LateMembars.getValue(options)) {
+            appendPhase(new InsertMembarsPhase());
+        }
         appendPhase(new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS));
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
index 76c6a9697a5..a9c97bca875 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
@@ -25,10 +25,8 @@
 package org.graalvm.compiler.core.phases;
 
 import static org.graalvm.compiler.core.common.GraalOptions.ConditionalElimination;
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
 import static org.graalvm.compiler.core.common.GraalOptions.OptDeoptimizationGrouping;
 import static org.graalvm.compiler.core.common.GraalOptions.OptFloatingReads;
-import static org.graalvm.compiler.core.common.GraalOptions.OptLoopTransform;
 import static org.graalvm.compiler.core.common.GraalOptions.PartialUnroll;
 import static org.graalvm.compiler.core.common.GraalOptions.ReassociateInvariants;
 import static org.graalvm.compiler.core.common.GraalOptions.VerifyHeapAtReturn;
@@ -43,7 +41,6 @@ import org.graalvm.compiler.loop.phases.LoopSafepointEliminationPhase;
 import org.graalvm.compiler.loop.phases.ReassociateInvariantPhase;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase;
 import org.graalvm.compiler.phases.common.FloatingReadPhase;
@@ -56,17 +53,15 @@ import org.graalvm.compiler.phases.common.LockEliminationPhase;
 import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.common.OptimizeDivPhase;
+import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
 import org.graalvm.compiler.phases.common.VerifyHeapAtReturnPhase;
 import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase;
 import org.graalvm.compiler.phases.tiers.MidTierContext;
 
-public class MidTier extends PhaseSuite {
+public class MidTier extends BaseTier {
 
     public MidTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer.disableReadCanonicalization();
-        }
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase(options);
 
         appendPhase(new LockEliminationPhase());
 
@@ -80,8 +75,6 @@ public class MidTier extends PhaseSuite {
 
         appendPhase(new LoopSafepointEliminationPhase());
 
-        appendPhase(new LoopSafepointInsertionPhase());
-
         appendPhase(new GuardLoweringPhase());
 
         if (MitigateSpeculativeExecutionAttacks.getValue(options) == GuardTargets || MitigateSpeculativeExecutionAttacks.getValue(options) == NonDeoptGuardTargets) {
@@ -92,18 +85,21 @@ public class MidTier extends PhaseSuite {
             appendPhase(new VerifyHeapAtReturnPhase());
         }
 
+        appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new RemoveValueProxyPhase()));
+
+        appendPhase(new LoopSafepointInsertionPhase());
+
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER));
 
         appendPhase(new OptimizeDivPhase());
 
         appendPhase(new FrameStateAssignmentPhase());
 
-        LoopPolicies loopPolicies = createLoopPolicies();
-        if (OptLoopTransform.getValue(options)) {
-            if (PartialUnroll.getValue(options)) {
-                appendPhase(new LoopPartialUnrollPhase(loopPolicies, canonicalizer));
-            }
+        if (PartialUnroll.getValue(options)) {
+            LoopPolicies loopPolicies = createLoopPolicies();
+            appendPhase(new LoopPartialUnrollPhase(loopPolicies, canonicalizer));
         }
+
         if (ReassociateInvariants.getValue(options)) {
             appendPhase(new ReassociateInvariantPhase());
         }
@@ -117,6 +113,7 @@ public class MidTier extends PhaseSuite {
         appendPhase(new WriteBarrierAdditionPhase());
     }
 
+    @Override
     public LoopPolicies createLoopPolicies() {
         return new DefaultLoopPolicies();
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
index 75392a2ec4f..df15af7b3e0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java
@@ -100,6 +100,7 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory {
     public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRuntime, CompilerConfiguration compilerConfiguration, HotSpotJVMCIRuntime jvmciRuntime, HotSpotBackend host) {
         assert host == null;
 
+        OptionValues options = graalRuntime.getOptions();
         JVMCIBackend jvmci = jvmciRuntime.getHostJVMCIBackend();
         GraalHotSpotVMConfig config = graalRuntime.getVMConfig();
         HotSpotProviders providers;
@@ -156,7 +157,7 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory {
             }
             try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
                 plugins = createGraphBuilderPlugins(graalRuntime, compilerConfiguration, config, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes,
-                                graalRuntime.getOptions());
+                                graalRuntime.getOptions(), target);
                 replacements.setGraphBuilderPlugins(plugins);
             }
             try (InitTimer rt = timer("create Suites provider")) {
@@ -165,6 +166,7 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory {
             providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, suites, registers,
                             snippetReflection, wordTypes, plugins, gc);
             replacements.setProviders(providers);
+            replacements.maybeInitializeEncoder(options);
         }
         try (InitTimer rt = timer("instantiate backend")) {
             return createBackend(config, graalRuntime, providers);
@@ -180,7 +182,8 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory {
                     HotSpotSnippetReflectionProvider snippetReflection,
                     HotSpotReplacementsImpl replacements,
                     HotSpotWordTypes wordTypes,
-                    OptionValues options) {
+                    OptionValues options,
+                    TargetDescription target) {
         Plugins plugins = HotSpotGraphBuilderPlugins.create(graalRuntime,
                         compilerConfiguration,
                         config,
@@ -190,8 +193,9 @@ public class AArch64HotSpotBackendFactory extends HotSpotBackendFactory {
                         snippetReflection,
                         foreignCalls,
                         replacements,
-                        options);
-        AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false,
+                        options,
+                        target);
+        AArch64GraphBuilderPlugins.register(plugins, replacements, false, //
                         /* registerMathPlugins */true, /* emitJDK9StringSubstitutions */true, config.useFMAIntrinsics);
         return plugins;
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java
index 74748dcbe8c..288340ee223 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java
@@ -158,6 +158,7 @@ public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory {
             providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, suites, registers,
                             snippetReflection, wordTypes, plugins, gc);
             replacements.setProviders(providers);
+            replacements.maybeInitializeEncoder(options);
         }
         try (InitTimer rt = timer("instantiate backend")) {
             return createBackend(config, graalRuntime, providers);
@@ -185,8 +186,9 @@ public class AMD64HotSpotBackendFactory extends HotSpotBackendFactory {
                         snippetReflection,
                         foreignCalls,
                         replacements,
-                        options);
-        AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false, JavaVersionUtil.JAVA_SPEC >= 9, config.useFMAIntrinsics);
+                        options,
+                        target);
+        AMD64GraphBuilderPlugins.register(plugins, replacements, (AMD64) target.arch, false, JavaVersionUtil.JAVA_SPEC >= 9, config.useFMAIntrinsics);
         return plugins;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java
index cd368128416..63f355c662e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotBackendFactory.java
@@ -87,6 +87,7 @@ public class SPARCHotSpotBackendFactory extends HotSpotBackendFactory {
     public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, CompilerConfiguration compilerConfiguration, HotSpotJVMCIRuntime jvmciRuntime, HotSpotBackend host) {
         assert host == null;
 
+        OptionValues options = runtime.getOptions();
         GraalHotSpotVMConfig config = runtime.getVMConfig();
         JVMCIBackend jvmci = jvmciRuntime.getHostJVMCIBackend();
         HotSpotRegistersProvider registers = createRegisters();
@@ -106,12 +107,13 @@ public class SPARCHotSpotBackendFactory extends HotSpotBackendFactory {
         BytecodeProvider bytecodeProvider = createBytecodeProvider(metaAccess, snippetReflection);
         HotSpotReplacementsImpl replacements = createReplacements(target, p, snippetReflection, bytecodeProvider);
         Plugins plugins = createGraphBuilderPlugins(runtime, compilerConfiguration, config, metaAccess, constantReflection, foreignCalls, snippetReflection, replacements, wordTypes,
-                        runtime.getOptions());
+                        runtime.getOptions(), target);
         replacements.setGraphBuilderPlugins(plugins);
         HotSpotSuitesProvider suites = createSuites(config, runtime, compilerConfiguration, plugins, replacements);
         HotSpotProviders providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, suites, registers,
                         snippetReflection, wordTypes, plugins, gc);
         replacements.setProviders(providers);
+        replacements.maybeInitializeEncoder(options);
 
         return createBackend(config, runtime, providers);
     }
@@ -125,7 +127,8 @@ public class SPARCHotSpotBackendFactory extends HotSpotBackendFactory {
                     HotSpotSnippetReflectionProvider snippetReflection,
                     HotSpotReplacementsImpl replacements,
                     HotSpotWordTypes wordTypes,
-                    OptionValues options) {
+                    OptionValues options,
+                    TargetDescription target) {
         Plugins plugins = HotSpotGraphBuilderPlugins.create(
                         graalRuntime,
                         compilerConfiguration,
@@ -136,8 +139,9 @@ public class SPARCHotSpotBackendFactory extends HotSpotBackendFactory {
                         snippetReflection,
                         foreignCalls,
                         replacements,
-                        options);
-        SPARCGraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false);
+                        options,
+                        target);
+        SPARCGraphBuilderPlugins.register(plugins, replacements, false);
         return plugins;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
index 3b22e1804c7..a27c211ace5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java
@@ -24,9 +24,6 @@
 
 package org.graalvm.compiler.hotspot.test;
 
-import static org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.aesDecryptName;
-import static org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.aesEncryptName;
-
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -368,10 +365,6 @@ public class CheckGraalIntrinsics extends GraalTest {
                 add(ignore,
                                 "com/sun/crypto/provider/GHASH.processBlocks([BII[J[J)V");
             }
-            if (!(config.useSHA1Intrinsics() || config.useSHA256Intrinsics() || config.useSHA512Intrinsics())) {
-                add(ignore,
-                                "sun/security/provider/DigestBase.implCompressMultiBlock0([BII)I");
-            }
             if (!config.useFMAIntrinsics) {
                 add(ignore,
                                 "java/lang/Math.fma(DDD)D",
@@ -516,15 +509,16 @@ public class CheckGraalIntrinsics extends GraalTest {
                             "java/util/zip/CRC32C.updateDirectByteBuffer(IJII)I");
         }
 
-        boolean implNames = HotSpotGraphBuilderPlugins.cbcUsesImplNames(config);
-        String cbcEncryptName = implNames ? "implEncrypt" : "encrypt";
-        String cbcDecryptName = implNames ? "implDecrypt" : "decrypt";
+        String cbcEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
+        String cbcDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
+        String aesEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
+        String aesDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
 
         // AES intrinsics
         if (!config.useAESIntrinsics) {
             add(ignore,
-                            "com/sun/crypto/provider/AESCrypt." + aesDecryptName + "([BI[BI)V",
                             "com/sun/crypto/provider/AESCrypt." + aesEncryptName + "([BI[BI)V",
+                            "com/sun/crypto/provider/AESCrypt." + aesDecryptName + "([BI[BI)V",
                             "com/sun/crypto/provider/CipherBlockChaining." + cbcDecryptName + "([BII[BI)I",
                             "com/sun/crypto/provider/CipherBlockChaining." + cbcEncryptName + "([BII[BI)I");
         }
@@ -549,28 +543,21 @@ public class CheckGraalIntrinsics extends GraalTest {
         if (!config.useSquareToLenIntrinsic()) {
             add(ignore, "java/math/BigInteger.implSquareToLen([II[II)[I");
         }
-
+        // DigestBase intrinsics
+        if (HotSpotGraphBuilderPlugins.isIntrinsicName(config, "sun/security/provider/DigestBase", "implCompressMultiBlock0") &&
+                        !(config.useSHA1Intrinsics() || config.useSHA256Intrinsics() || config.useSHA512Intrinsics())) {
+            add(ignore, "sun/security/provider/DigestBase.implCompressMultiBlock0([BII)I");
+        }
         // SHA intrinsics
+        String shaCompressName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(config, "sun/security/provider/SHA", "implCompress0", "implCompress");
         if (!config.useSHA1Intrinsics()) {
-            if (isJDK9OrHigher()) {
-                add(ignore, "sun/security/provider/SHA.implCompress0([BI)V");
-            } else {
-                add(ignore, "sun/security/provider/SHA.implCompress([BI)V");
-            }
+            add(ignore, "sun/security/provider/SHA." + shaCompressName + "([BI)V");
         }
         if (!config.useSHA256Intrinsics()) {
-            if (isJDK9OrHigher()) {
-                add(ignore, "sun/security/provider/SHA2.implCompress0([BI)V");
-            } else {
-                add(ignore, "sun/security/provider/SHA2.implCompress([BI)V");
-            }
+            add(ignore, "sun/security/provider/SHA2." + shaCompressName + "([BI)V");
         }
         if (!config.useSHA512Intrinsics()) {
-            if (isJDK9OrHigher()) {
-                add(ignore, "sun/security/provider/SHA5.implCompress0([BI)V");
-            } else {
-                add(ignore, "sun/security/provider/SHA5.implCompress([BI)V");
-            }
+            add(ignore, "sun/security/provider/SHA5." + shaCompressName + "([BI)V");
         }
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java
index 86257e5cd1d..de3bddff387 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java
@@ -101,10 +101,10 @@ import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.options.OptionsParser;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.test.ModuleSupport;
+import org.graalvm.compiler.api.test.ModuleSupport;
 import jdk.internal.vm.compiler.libgraal.LibGraal;
 import jdk.internal.vm.compiler.libgraal.LibGraalScope;
-import jdk.internal.vm.compiler.libgraal.OptionsEncoder;
+import org.graalvm.util.OptionsEncoder;
 
 import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java
index 52d80296d48..3abbf453aa6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ConstantPoolSubstitutionsTests.java
@@ -34,7 +34,7 @@ import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.test.ModuleSupport;
+import org.graalvm.compiler.api.test.ModuleSupport;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.objectweb.asm.ClassWriter;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java
index 83a6002d582..49623ce287b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java
@@ -38,7 +38,6 @@ import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase;
@@ -83,12 +82,12 @@ public class DeferredBarrierAdditionTest extends HotSpotGraalCompilerTest {
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, debug);
             HighTierContext highContext = getDefaultHighTierContext();
             MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
-            new InliningPhase(new InlineEverythingPolicy(), new CanonicalizerPhase()).apply(graph, highContext);
-            new CanonicalizerPhase().apply(graph, highContext);
-            new PartialEscapePhase(false, new CanonicalizerPhase(), debug.getOptions()).apply(graph, highContext);
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highContext);
+            new InliningPhase(new InlineEverythingPolicy(), createCanonicalizerPhase()).apply(graph, highContext);
+            this.createCanonicalizerPhase().apply(graph, highContext);
+            new PartialEscapePhase(false, createCanonicalizerPhase(), debug.getOptions()).apply(graph, highContext);
+            new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highContext);
             new GuardLoweringPhase().apply(graph, midContext);
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
+            new LoweringPhase(createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
             new WriteBarrierAdditionPhase().apply(graph, midContext);
             debug.dump(DebugContext.BASIC_LEVEL, graph, "After Write Barrier Addition");
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java
index 06746f87c5d..e610a14e683 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java
@@ -80,7 +80,9 @@ public class HotSpotCryptoSubstitutionTest extends HotSpotGraalCompilerTest {
 
     @Test
     public void testAESCryptIntrinsics() throws Exception {
-        if (compileAndInstall("com.sun.crypto.provider.AESCrypt", HotSpotGraphBuilderPlugins.aesEncryptName, HotSpotGraphBuilderPlugins.aesDecryptName)) {
+        String aesEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
+        String aesDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
+        if (compileAndInstall("com.sun.crypto.provider.AESCrypt", aesEncryptName, aesDecryptName)) {
             ByteArrayOutputStream actual = new ByteArrayOutputStream();
             actual.write(runEncryptDecrypt(aesKey, "AES/CBC/NoPadding"));
             actual.write(runEncryptDecrypt(aesKey, "AES/CBC/PKCS5Padding"));
@@ -90,9 +92,8 @@ public class HotSpotCryptoSubstitutionTest extends HotSpotGraalCompilerTest {
 
     @Test
     public void testCipherBlockChainingIntrinsics() throws Exception {
-        boolean implNames = HotSpotGraphBuilderPlugins.cbcUsesImplNames(runtime().getVMConfig());
-        String cbcEncryptName = implNames ? "implEncrypt" : "encrypt";
-        String cbcDecryptName = implNames ? "implDecrypt" : "decrypt";
+        String cbcEncryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
+        String cbcDecryptName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(runtime().getVMConfig(), "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
         if (compileAndInstall("com.sun.crypto.provider.CipherBlockChaining", cbcEncryptName, cbcDecryptName)) {
             ByteArrayOutputStream actual = new ByteArrayOutputStream();
             actual.write(runEncryptDecrypt(aesKey, "AES/CBC/NoPadding"));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java
index 8deee88b9ee..f5c974ecc68 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java
@@ -93,7 +93,7 @@ public class HotSpotInvokeDynamicPluginTest extends HotSpotGraalCompilerTest {
         StructuredGraph graph = parseEager(name, AllowAssumptions.NO, new OptionValues(getInitialOptions(), GraalOptions.GeneratePIC, true));
         MidTierContext midTierContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
 
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         Assert.assertEquals(expectedResolves, graph.getNodes().filter(ResolveDynamicConstantNode.class).count());
         Assert.assertEquals(0, graph.getNodes().filter(ResolveDynamicStubCall.class).count());
         CoreProviders context = getProviders();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java
index d3ead35ea73..f34b5d44d42 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java
@@ -117,7 +117,7 @@ public class ReplaceConstantNodesPhaseTest extends HotSpotGraalCompilerTest {
     private void test(String name, int expectedInits, int expectedResolves, int expectedLoads) {
         StructuredGraph graph = parseEager(name, AllowAssumptions.NO, new OptionValues(getInitialOptions(), GraalOptions.GeneratePIC, true));
         HighTierContext highTierContext = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         new EliminateRedundantInitializationPhase().apply(graph, highTierContext);
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highTierContext);
         new LoadJavaMirrorWithKlassPhase(config).apply(graph, highTierContext);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java
index 18a6ef465a5..bb6010220e8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/TestSHASubstitutions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,9 +34,7 @@ import org.junit.internal.AssumptionViolatedException;
 import org.graalvm.compiler.api.test.Graal;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
-import org.graalvm.compiler.hotspot.replacements.SHA2Substitutions;
-import org.graalvm.compiler.hotspot.replacements.SHA5Substitutions;
-import org.graalvm.compiler.hotspot.replacements.SHASubstitutions;
+import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins;
 import org.graalvm.compiler.runtime.RuntimeProvider;
 
 import jdk.vm.ci.code.InstalledCode;
@@ -74,7 +72,8 @@ public class TestSHASubstitutions extends HotSpotGraalCompilerTest {
     @Test
     public void testSha1() {
         if (getConfig().useSHA1Intrinsics()) {
-            testWithInstalledIntrinsic("sun.security.provider.SHA", SHASubstitutions.implCompressName, "testDigest", "SHA-1", getData());
+            String implCompressName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(getConfig(), "sun/security/provider/SHA", "implCompress0", "implCompress");
+            testWithInstalledIntrinsic("sun.security.provider.SHA", implCompressName, "testDigest", "SHA-1", getData());
         }
     }
 
@@ -107,14 +106,16 @@ public class TestSHASubstitutions extends HotSpotGraalCompilerTest {
     @Test
     public void testSha256() {
         if (getConfig().useSHA256Intrinsics()) {
-            testWithInstalledIntrinsic("sun.security.provider.SHA2", SHA2Substitutions.implCompressName, "testDigest", "SHA-256", getData());
+            String implCompressName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(getConfig(), "sun/security/provider/SHA", "implCompress0", "implCompress");
+            testWithInstalledIntrinsic("sun.security.provider.SHA2", implCompressName, "testDigest", "SHA-256", getData());
         }
     }
 
     @Test
     public void testSha512() {
         if (getConfig().useSHA512Intrinsics()) {
-            testWithInstalledIntrinsic("sun.security.provider.SHA5", SHA5Substitutions.implCompressName, "testDigest", "SHA-512", getData());
+            String implCompressName = HotSpotGraphBuilderPlugins.lookupIntrinsicName(getConfig(), "sun/security/provider/SHA", "implCompress0", "implCompress");
+            testWithInstalledIntrinsic("sun.security.provider.SHA5", implCompressName, "testDigest", "SHA-512", getData());
         }
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java
index 71c3d5840c6..9779c6fe707 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java
@@ -44,7 +44,6 @@ import org.graalvm.compiler.nodes.memory.WriteNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase;
@@ -263,11 +262,11 @@ public class WriteBarrierAdditionTest extends HotSpotGraalCompilerTest {
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO, debug);
             HighTierContext highContext = getDefaultHighTierContext();
             MidTierContext midContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
-            new InliningPhase(new InlineEverythingPolicy(), new CanonicalizerPhase()).apply(graph, highContext);
-            new CanonicalizerPhase().apply(graph, highContext);
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highContext);
+            new InliningPhase(new InlineEverythingPolicy(), createCanonicalizerPhase()).apply(graph, highContext);
+            this.createCanonicalizerPhase().apply(graph, highContext);
+            new LoweringPhase(this.createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highContext);
             new GuardLoweringPhase().apply(graph, midContext);
-            new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
+            new LoweringPhase(this.createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, midContext);
             new WriteBarrierAdditionPhase().apply(graph, midContext);
             debug.dump(DebugContext.BASIC_LEVEL, graph, "After Write Barrier Addition");
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java
index aeb477e0a6c..fa003bdbb99 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java
@@ -72,25 +72,39 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
                         replacements.getDefaultReplacementBytecodeProvider(), replacements.target);
     }
 
+    public void maybeInitializeEncoder(OptionValues options) {
+        if (IS_BUILDING_NATIVE_IMAGE || UseEncodedGraphs.getValue(options)) {
+            synchronized (HotSpotReplacementsImpl.class) {
+                if (snippetEncoder == null) {
+                    snippetEncoder = new SymbolicSnippetEncoder(this);
+                }
+            }
+        }
+    }
+
     @Override
     public Class getIntrinsifyingPlugin(ResolvedJavaMethod method) {
         return method.getAnnotation(HotSpotOperation.class) != null ? HotSpotWordOperationPlugin.class : super.getIntrinsifyingPlugin(method);
     }
 
     @Override
-    public void registerMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, OptionValues options) {
-        if (!IS_IN_NATIVE_IMAGE) {
-            if (IS_BUILDING_NATIVE_IMAGE || UseEncodedGraphs.getValue(options)) {
-                synchronized (HotSpotReplacementsImpl.class) {
-                    if (snippetEncoder == null) {
-                        snippetEncoder = new SymbolicSnippetEncoder(this);
-                    }
-                    snippetEncoder.registerMethodSubstitution(plugin, original, context, options);
-                }
-            }
+    public void registerMethodSubstitution(MethodSubstitutionPlugin plugin) {
+        if (snippetEncoder != null) {
+            snippetEncoder.registerMethodSubstitution(plugin);
         }
     }
 
+    @Override
+    public void registerConditionalPlugin(InvocationPlugin plugin) {
+        if (snippetEncoder != null) {
+            snippetEncoder.registerConditionalPlugin(plugin);
+        }
+    }
+
+    public void checkRegistered(MethodSubstitutionPlugin plugin) {
+        snippetEncoder.checkRegistered(plugin);
+    }
+
     @Override
     public StructuredGraph getIntrinsicGraph(ResolvedJavaMethod method, CompilationIdentifier compilationId, DebugContext debug, Cancellable cancellable) {
         boolean useEncodedGraphs = UseEncodedGraphs.getValue(debug.getOptions());
@@ -99,8 +113,9 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
             InvocationPlugin plugin = replacements.getGraphBuilderPlugins().getInvocationPlugins().lookupInvocation(method);
             if (plugin instanceof MethodSubstitutionPlugin) {
                 MethodSubstitutionPlugin msp = (MethodSubstitutionPlugin) plugin;
-                if (useEncodedGraphs) {
-                    replacements.registerMethodSubstitution(msp, method, ROOT_COMPILATION, debug.getOptions());
+                if (!IS_IN_NATIVE_IMAGE && useEncodedGraphs) {
+                    replacements.maybeInitializeEncoder(debug.getOptions());
+                    replacements.registerMethodSubstitution(msp);
                 }
                 StructuredGraph methodSubstitution = replacements.getMethodSubstitution(msp, method, ROOT_COMPILATION, StructuredGraph.AllowAssumptions.YES, cancellable, debug.getOptions());
                 methodSubstitution.resetDebug(debug);
@@ -119,7 +134,8 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
             if (plugin instanceof MethodSubstitutionPlugin && (!plugin.inlineOnly() || invokeBci >= 0)) {
                 MethodSubstitutionPlugin msPlugin = (MethodSubstitutionPlugin) plugin;
                 if (!IS_IN_NATIVE_IMAGE && useEncodedGraphs) {
-                    registerMethodSubstitution(msPlugin, targetMethod, INLINE_AFTER_PARSING, options);
+                    maybeInitializeEncoder(options);
+                    registerMethodSubstitution(msPlugin);
                 }
                 // This assumes the normal path creates the graph using
                 // GraphBuilderConfiguration.getSnippetDefault with omits exception edges
@@ -155,9 +171,6 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
             assert registeredSnippets.add(method) : "Cannot register snippet twice: " + method.format("%H.%n(%p)");
             if (IS_BUILDING_NATIVE_IMAGE || UseEncodedGraphs.getValue(options)) {
                 synchronized (HotSpotReplacementsImpl.class) {
-                    if (snippetEncoder == null) {
-                        snippetEncoder = new SymbolicSnippetEncoder(this);
-                    }
                     snippetEncoder.registerSnippet(method, original, receiver, trackNodeSourcePosition, options);
                 }
             }
@@ -169,7 +182,10 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
         snippetRegistrationClosed = true;
     }
 
-    private static SymbolicSnippetEncoder.EncodedSnippets getEncodedSnippets() {
+    private static SymbolicSnippetEncoder.EncodedSnippets getEncodedSnippets(OptionValues options) {
+        if (!IS_IN_NATIVE_IMAGE && snippetEncoder != null) {
+            snippetEncoder.encode(options);
+        }
         return encodedSnippets;
     }
 
@@ -210,20 +226,15 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
 
     @SuppressWarnings("try")
     private StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, Object[] args, StructuredGraph.AllowAssumptions allowAssumptions, OptionValues options) {
-        boolean useEncodedGraphs = UseEncodedGraphs.getValue(options);
-        if (IS_IN_NATIVE_IMAGE || useEncodedGraphs) {
+        if (IS_IN_NATIVE_IMAGE || UseEncodedGraphs.getValue(options)) {
             synchronized (HotSpotReplacementsImpl.class) {
-                if (!IS_IN_NATIVE_IMAGE) {
-                    snippetEncoder.encode(options);
-                }
-
-                if (getEncodedSnippets() == null) {
+                if (getEncodedSnippets(options) == null) {
                     throw GraalError.shouldNotReachHere("encoded snippets not found");
                 }
                 // Snippets graphs can contain foreign object reference and
                 // outlive a single compilation.
                 try (CompilationContext scope = HotSpotGraalServices.enterGlobalCompilationContext()) {
-                    StructuredGraph graph = getEncodedSnippets().getEncodedSnippet(method, this, args, allowAssumptions, options);
+                    StructuredGraph graph = getEncodedSnippets(options).getEncodedSnippet(method, this, args, allowAssumptions, options);
                     if (graph == null) {
                         throw GraalError.shouldNotReachHere("snippet not found: " + method.format("%H.%n(%p)"));
                     }
@@ -239,16 +250,11 @@ public class HotSpotReplacementsImpl extends ReplacementsImpl {
     @Override
     public StructuredGraph getMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context,
                     StructuredGraph.AllowAssumptions allowAssumptions, Cancellable cancellable, OptionValues options) {
-        boolean useEncodedGraphs = UseEncodedGraphs.getValue(options);
-        if (IS_IN_NATIVE_IMAGE || useEncodedGraphs) {
-            if (!IS_IN_NATIVE_IMAGE) {
-                snippetEncoder.encode(options);
-            }
-
-            if (getEncodedSnippets() == null) {
+        if (IS_IN_NATIVE_IMAGE || UseEncodedGraphs.getValue(options)) {
+            if (getEncodedSnippets(options) == null) {
                 throw GraalError.shouldNotReachHere("encoded snippets not found");
             }
-            return getEncodedSnippets().getMethodSubstitutionGraph(plugin, original, this, context, allowAssumptions, cancellable, options);
+            return getEncodedSnippets(options).getMethodSubstitutionGraph(plugin, original, this, context, allowAssumptions, cancellable, options);
         }
         return null;
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
index 56b29771d87..92f9d6ac695 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
@@ -30,6 +30,7 @@ import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 import static org.graalvm.compiler.core.common.GraalOptions.UseEncodedGraphs;
 import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
 import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
+import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.ROOT_COMPILATION;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -156,6 +157,12 @@ public class SymbolicSnippetEncoder {
      */
     private Map preparedSnippetGraphs = new HashMap<>();
 
+    private Set knownPlugins = new HashSet<>();
+
+    private Set conditionalPlugins = new HashSet<>();
+
+    private int preparedPlugins = 0;
+
     /**
      * The invocation plugins which were delayed during graph preparation.
      */
@@ -239,7 +246,7 @@ public class SymbolicSnippetEncoder {
      * for lookup.
      */
     private static String methodKey(ResolvedJavaMethod method) {
-        return method.format("%f %H.%n(%P)");
+        return method.format("%H.%n(%P)");
     }
 
     SymbolicSnippetEncoder(HotSpotReplacementsImpl replacements) {
@@ -255,15 +262,30 @@ public class SymbolicSnippetEncoder {
         this.snippetReplacements.setGraphBuilderPlugins(copy);
     }
 
+    synchronized void registerMethodSubstitution(MethodSubstitutionPlugin plugin) {
+        knownPlugins.add(plugin);
+    }
+
+    void registerConditionalPlugin(InvocationPlugin plugin) {
+        conditionalPlugins.add(plugin);
+    }
+
+    synchronized void checkRegistered(MethodSubstitutionPlugin plugin) {
+        if (!knownPlugins.contains(plugin)) {
+            throw new GraalError("missing plugin should have been registered during construction");
+        }
+    }
+
     /**
      * Compiles the snippet and stores the graph.
      */
-    synchronized void registerMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, OptionValues options) {
+    private synchronized void registerMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, OptionValues options) {
         ResolvedJavaMethod method = plugin.getSubstitute(snippetReplacements.getProviders().getMetaAccess());
         assert method.getAnnotation(MethodSubstitution.class) != null : "MethodSubstitution must be annotated with @" + MethodSubstitution.class.getSimpleName();
-        StructuredGraph subst = buildGraph(method, original, null, true, false, context, options);
+        String originalMethodString = plugin.originalMethodAsString();
+        StructuredGraph subst = buildGraph(method, original, originalMethodString, null, true, false, context, options);
         snippetMethods.add(method);
-        originalMethods.put(methodKey(method), methodKey(original));
+        originalMethods.put(methodKey(method), originalMethodString);
         preparedSnippetGraphs.put(plugin.toString() + context, subst);
     }
 
@@ -370,7 +392,7 @@ public class SymbolicSnippetEncoder {
         }
     }
 
-    private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean requireInlining, boolean trackNodeSourcePosition,
+    private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, String originalMethodString, Object receiver, boolean requireInlining, boolean trackNodeSourcePosition,
                     IntrinsicContext.CompilationContext context, OptionValues options) {
         assert method.hasBytecodes() : "Snippet must not be abstract or native";
         Object[] args = null;
@@ -378,7 +400,13 @@ public class SymbolicSnippetEncoder {
             args = new Object[method.getSignature().getParameterCount(true)];
             args[0] = receiver;
         }
-        try (DebugContext debug = openDebugContext("Snippet_", method, options)) {
+        // To get dumping out from this context during image building, it's necessary to pass the
+        // dumping options directly to the VM, otherwise they aren't available during initialization
+        // of the backend. Use this:
+        //
+        // -J-Dgraal.Dump=SymbolicSnippetEncoder_:2 -J-Dgraal.PrintGraph=File
+        // -J-Dgraal.DebugStubsAndSnippets=true
+        try (DebugContext debug = openDebugContext("SymbolicSnippetEncoder_", method, options)) {
             StructuredGraph graph = snippetReplacements.makeGraph(debug, snippetReplacements.getDefaultReplacementBytecodeProvider(), method, args, original, trackNodeSourcePosition, null, context);
 
             // Check if all methods which should be inlined are really inlined.
@@ -388,7 +416,7 @@ public class SymbolicSnippetEncoder {
                     throw GraalError.shouldNotReachHere("method " + callee.format("%H.%n") + " not inlined in snippet " + method.getName() + " (maybe not final?)");
                 }
             }
-            assert verifySnippetEncodeDecode(method, original, trackNodeSourcePosition, graph);
+            assert verifySnippetEncodeDecode(debug, method, original, originalMethodString, trackNodeSourcePosition, graph);
             debug.dump(DebugContext.VERBOSE_LEVEL, graph, "After buildGraph");
             return graph;
         }
@@ -426,46 +454,45 @@ public class SymbolicSnippetEncoder {
     }
 
     @SuppressWarnings("try")
-    private boolean verifySnippetEncodeDecode(ResolvedJavaMethod method, ResolvedJavaMethod original, boolean trackNodeSourcePosition, StructuredGraph graph) {
+    private boolean verifySnippetEncodeDecode(DebugContext debug, ResolvedJavaMethod method, ResolvedJavaMethod original, String originalMethodString, boolean trackNodeSourcePosition,
+                    StructuredGraph graph) {
         // Verify the encoding and decoding process
         EncodedGraph encodedGraph = GraphEncoder.encodeSingleGraph(graph, HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch);
 
-        try (DebugContext debug = snippetReplacements.openDebugContext("VerifySnippetEncodeDecode_", method, graph.getOptions())) {
-            HotSpotProviders originalProvider = (HotSpotProviders) snippetReplacements.getProviders();
+        HotSpotProviders originalProvider = (HotSpotProviders) snippetReplacements.getProviders();
 
-            SnippetReflectionProvider snippetReflection = originalProvider.getSnippetReflection();
-            SymbolicSnippetEncoder.HotSpotSubstrateConstantReflectionProvider constantReflection = new SymbolicSnippetEncoder.HotSpotSubstrateConstantReflectionProvider(
-                            originalProvider.getConstantReflection());
-            HotSpotProviders newProviders = new HotSpotProviders(originalProvider.getMetaAccess(), originalProvider.getCodeCache(), constantReflection,
-                            originalProvider.getConstantFieldProvider(), originalProvider.getForeignCalls(), originalProvider.getLowerer(), null, originalProvider.getSuites(),
-                            originalProvider.getRegisters(), snippetReflection, originalProvider.getWordTypes(), originalProvider.getGraphBuilderPlugins(), originalProvider.getGC());
-            HotSpotSnippetReplacementsImpl filteringReplacements = new HotSpotSnippetReplacementsImpl(newProviders, snippetReflection,
-                            originalProvider.getReplacements().getDefaultReplacementBytecodeProvider(), originalProvider.getCodeCache().getTarget());
-            filteringReplacements.setGraphBuilderPlugins(originalProvider.getReplacements().getGraphBuilderPlugins());
-            try (DebugContext.Scope scaope = debug.scope("VerifySnippetEncodeDecode", graph)) {
-                for (int i = 0; i < encodedGraph.getNumObjects(); i++) {
-                    filterSnippetObject(encodedGraph.getObject(i));
-                }
-                StructuredGraph snippet = filteringReplacements.makeGraph(debug, filteringReplacements.getDefaultReplacementBytecodeProvider(), method, null, original,
-                                trackNodeSourcePosition, null);
-                SymbolicEncodedGraph symbolicGraph = new SymbolicEncodedGraph(encodedGraph, method.getDeclaringClass(), original != null ? methodKey(original) : null);
-                StructuredGraph decodedSnippet = decodeSnippetGraph(symbolicGraph, original != null ? original : method, originalReplacements, null,
-                                StructuredGraph.AllowAssumptions.ifNonNull(graph.getAssumptions()), graph.getOptions());
-                String snippetString = getCanonicalGraphString(snippet, true, false);
-                String decodedSnippetString = getCanonicalGraphString(decodedSnippet, true, false);
-                if (snippetString.equals(decodedSnippetString)) {
-                    debug.log("Snippet decode for %s produces exactly same graph", method);
-                    debug.dump(DebugContext.VERBOSE_LEVEL, decodedSnippet, "Decoded snippet graph for %s", method);
-                } else {
-                    debug.log("Snippet decode for %s produces different graph", method);
-                    debug.log("%s", compareGraphStrings(snippet, snippetString, decodedSnippet, decodedSnippetString));
-                    debug.dump(DebugContext.VERBOSE_LEVEL, snippet, "Snippet graph for %s", method);
-                    debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Encoded snippet graph for %s", method);
-                    debug.dump(DebugContext.VERBOSE_LEVEL, decodedSnippet, "Decoded snippet graph for %s", method);
-                }
-            } catch (Throwable t) {
-                throw debug.handle(t);
+        SnippetReflectionProvider snippetReflection = originalProvider.getSnippetReflection();
+        SymbolicSnippetEncoder.HotSpotSubstrateConstantReflectionProvider constantReflection = new SymbolicSnippetEncoder.HotSpotSubstrateConstantReflectionProvider(
+                        originalProvider.getConstantReflection());
+        HotSpotProviders newProviders = new HotSpotProviders(originalProvider.getMetaAccess(), originalProvider.getCodeCache(), constantReflection,
+                        originalProvider.getConstantFieldProvider(), originalProvider.getForeignCalls(), originalProvider.getLowerer(), null, originalProvider.getSuites(),
+                        originalProvider.getRegisters(), snippetReflection, originalProvider.getWordTypes(), originalProvider.getGraphBuilderPlugins(), originalProvider.getGC());
+        HotSpotSnippetReplacementsImpl filteringReplacements = new HotSpotSnippetReplacementsImpl(newProviders, snippetReflection,
+                        originalProvider.getReplacements().getDefaultReplacementBytecodeProvider(), originalProvider.getCodeCache().getTarget());
+        filteringReplacements.setGraphBuilderPlugins(originalProvider.getReplacements().getGraphBuilderPlugins());
+        try (DebugContext.Scope scaope = debug.scope("VerifySnippetEncodeDecode", graph)) {
+            for (int i = 0; i < encodedGraph.getNumObjects(); i++) {
+                filterSnippetObject(encodedGraph.getObject(i));
             }
+            StructuredGraph snippet = filteringReplacements.makeGraph(debug, filteringReplacements.getDefaultReplacementBytecodeProvider(), method, null, original,
+                            trackNodeSourcePosition, null);
+            SymbolicEncodedGraph symbolicGraph = new SymbolicEncodedGraph(encodedGraph, method.getDeclaringClass(), originalMethodString);
+            StructuredGraph decodedSnippet = decodeSnippetGraph(symbolicGraph, original != null ? original : method, originalReplacements, null,
+                            StructuredGraph.AllowAssumptions.ifNonNull(graph.getAssumptions()), graph.getOptions());
+            String snippetString = getCanonicalGraphString(snippet, true, false);
+            String decodedSnippetString = getCanonicalGraphString(decodedSnippet, true, false);
+            if (snippetString.equals(decodedSnippetString)) {
+                debug.log("Snippet decode for %s produces exactly same graph", method);
+                debug.dump(DebugContext.VERBOSE_LEVEL, decodedSnippet, "Decoded snippet graph for %s", method);
+            } else {
+                debug.log("Snippet decode for %s produces different graph", method);
+                debug.log("%s", compareGraphStrings(snippet, snippetString, decodedSnippet, decodedSnippetString));
+                debug.dump(DebugContext.VERBOSE_LEVEL, snippet, "Snippet graph for %s", method);
+                debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Encoded snippet graph for %s", method);
+                debug.dump(DebugContext.VERBOSE_LEVEL, decodedSnippet, "Decoded snippet graph for %s", method);
+            }
+        } catch (Throwable t) {
+            throw debug.handle(t);
         }
         return true;
     }
@@ -475,6 +502,17 @@ public class SymbolicSnippetEncoder {
      */
     @SuppressWarnings("try")
     private synchronized EncodedSnippets maybeEncodeSnippets(OptionValues options) {
+        Set plugins = this.knownPlugins;
+        if (preparedPlugins != plugins.size()) {
+            for (MethodSubstitutionPlugin plugin : plugins) {
+                ResolvedJavaMethod original = plugin.getOriginalMethod(originalReplacements.getProviders().getMetaAccess());
+                registerMethodSubstitution(plugin, original, INLINE_AFTER_PARSING, options);
+                if (!original.isNative()) {
+                    registerMethodSubstitution(plugin, original, ROOT_COMPILATION, options);
+                }
+            }
+            preparedPlugins = plugins.size();
+        }
         Map graphs = this.preparedSnippetGraphs;
         if (encodedGraphs != graphs.size()) {
             DebugContext debug = openDebugContext("SnippetEncoder", null, options);
@@ -499,7 +537,7 @@ public class SymbolicSnippetEncoder {
                 if (original != null) {
                     originalMethods.put(key, methodKey(original));
                 }
-                StructuredGraph snippet = buildGraph(method, original, receiver, true, trackNodeSourcePosition, INLINE_AFTER_PARSING, options);
+                StructuredGraph snippet = buildGraph(method, original, null, receiver, true, trackNodeSourcePosition, INLINE_AFTER_PARSING, options);
                 snippetMethods.add(method);
                 preparedSnippetGraphs.put(key, snippet);
             }
@@ -1001,7 +1039,7 @@ public class SymbolicSnippetEncoder {
      * This horror show of classes exists solely get {@link HotSpotSnippetBytecodeParser} to be used
      * as the parser for these snippets.
      */
-    static class HotSpotSnippetReplacementsImpl extends HotSpotReplacementsImpl {
+    class HotSpotSnippetReplacementsImpl extends HotSpotReplacementsImpl {
         HotSpotSnippetReplacementsImpl(HotSpotReplacementsImpl replacements, Providers providers) {
             super(replacements, providers);
         }
@@ -1016,7 +1054,7 @@ public class SymbolicSnippetEncoder {
         }
     }
 
-    static class SnippetGraphMaker extends ReplacementsImpl.GraphMaker {
+    class SnippetGraphMaker extends ReplacementsImpl.GraphMaker {
         SnippetGraphMaker(ReplacementsImpl replacements, ResolvedJavaMethod substitute, ResolvedJavaMethod substitutedMethod) {
             super(replacements, substitute, substitutedMethod);
         }
@@ -1028,7 +1066,7 @@ public class SymbolicSnippetEncoder {
         }
     }
 
-    static class HotSpotSnippetGraphBuilderPhase extends GraphBuilderPhase.Instance {
+    class HotSpotSnippetGraphBuilderPhase extends GraphBuilderPhase.Instance {
         HotSpotSnippetGraphBuilderPhase(Providers theProviders, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
             super(theProviders, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
         }
@@ -1039,7 +1077,7 @@ public class SymbolicSnippetEncoder {
         }
     }
 
-    static class HotSpotSnippetBytecodeParser extends BytecodeParser {
+    class HotSpotSnippetBytecodeParser extends BytecodeParser {
         HotSpotSnippetBytecodeParser(GraphBuilderPhase.Instance graphBuilderInstance, StructuredGraph graph, BytecodeParser parent, ResolvedJavaMethod method, int entryBCI,
                         IntrinsicContext intrinsicContext) {
             super(graphBuilderInstance, graph, parent, method, entryBCI, intrinsicContext);
@@ -1066,6 +1104,13 @@ public class SymbolicSnippetEncoder {
                 // Always defer Fold until decode time but NodeIntrinsics may fold if they are able.
                 return false;
             }
+            InvocationPlugin plugin = graphBuilderConfig.getPlugins().getInvocationPlugins().lookupInvocation(targetMethod);
+            if (conditionalPlugins.contains(plugin)) {
+                // Because supporting arbitrary plugins in the context of encoded graphs is complex
+                // we disallow it. This limitation can be worked around through the use of method
+                // substitutions.
+                throw new GraalError("conditional plugins are unsupported in snippets and method substitutions: " + targetMethod + " " + plugin);
+            }
             return super.tryInvocationPlugin(invokeKind, args, targetMethod, resultType);
         }
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
index ad08cfe157c..2f69d10d8ea 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
@@ -646,7 +646,7 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering
 
                 // write the displaced mark to the correct stack slot
                 AddressNode addressDisplacedMark = createOffsetAddress(graph, beginLockScope, runtime.getVMConfig().basicLockDisplacedHeaderOffset);
-                WriteNode writeStackSlot = graph.add(new WriteNode(addressDisplacedMark, DISPLACED_MARK_WORD_LOCATION, loadDisplacedHeader, BarrierType.NONE));
+                WriteNode writeStackSlot = graph.add(new WriteNode(addressDisplacedMark, DISPLACED_MARK_WORD_LOCATION, loadDisplacedHeader, BarrierType.NONE, false));
                 graph.addBeforeFixed(migrationEnd, writeStackSlot);
 
                 // load the lock object from the osr buffer
@@ -776,7 +776,7 @@ public abstract class DefaultHotSpotLoweringProvider extends DefaultJavaLowering
         }
 
         AddressNode address = createOffsetAddress(graph, object, runtime.getVMConfig().hubOffset);
-        return graph.add(new WriteNode(address, HUB_WRITE_LOCATION, writeValue, BarrierType.NONE));
+        return graph.add(new WriteNode(address, HUB_WRITE_LOCATION, writeValue, BarrierType.NONE, false));
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 69b3b70e9a9..39f715c85d3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -39,7 +39,6 @@ import java.math.BigInteger;
 import java.util.zip.CRC32;
 
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
@@ -92,6 +91,7 @@ import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
@@ -108,6 +108,7 @@ import org.graalvm.compiler.word.WordTypes;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 
 import jdk.vm.ci.code.CodeUtil;
+import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.hotspot.VMIntrinsicMethod;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
@@ -128,6 +129,7 @@ public class HotSpotGraphBuilderPlugins {
      * @param snippetReflection
      * @param foreignCalls
      * @param options
+     * @param target
      */
     public static Plugins create(HotSpotGraalRuntimeProvider graalRuntime,
                     CompilerConfiguration compilerConfiguration,
@@ -138,11 +140,11 @@ public class HotSpotGraphBuilderPlugins {
                     SnippetReflectionProvider snippetReflection,
                     ForeignCallsProvider foreignCalls,
                     ReplacementsImpl replacements,
-                    OptionValues options) {
+                    OptionValues options, TargetDescription target) {
         InvocationPlugins invocationPlugins = new HotSpotInvocationPlugins(graalRuntime, config, compilerConfiguration);
 
         Plugins plugins = new Plugins(invocationPlugins);
-        NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes);
+        NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes, target);
         HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes);
         HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin, config, wordTypes);
 
@@ -171,29 +173,28 @@ public class HotSpotGraphBuilderPlugins {
 
             @Override
             public void run() {
-                BytecodeProvider replacementBytecodeProvider = replacements.getDefaultReplacementBytecodeProvider();
-                registerObjectPlugins(invocationPlugins, options, config, replacementBytecodeProvider);
-                registerClassPlugins(plugins, config, replacementBytecodeProvider);
+                registerObjectPlugins(invocationPlugins, options, config, replacements);
+                registerClassPlugins(plugins, config, replacements);
                 registerSystemPlugins(invocationPlugins, foreignCalls);
-                registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacementBytecodeProvider);
+                registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacements);
                 if (!GeneratePIC.getValue(options)) {
                     registerCallSitePlugins(invocationPlugins);
                 }
-                registerReflectionPlugins(invocationPlugins, replacementBytecodeProvider);
-                registerConstantPoolPlugins(invocationPlugins, wordTypes, config, replacementBytecodeProvider);
-                registerAESPlugins(invocationPlugins, config, replacementBytecodeProvider);
-                registerCRC32Plugins(invocationPlugins, config, replacementBytecodeProvider);
-                registerCRC32CPlugins(invocationPlugins, config, replacementBytecodeProvider);
-                registerBigIntegerPlugins(invocationPlugins, config, replacementBytecodeProvider);
-                registerSHAPlugins(invocationPlugins, config, replacementBytecodeProvider);
+                registerReflectionPlugins(invocationPlugins, replacements);
+                registerConstantPoolPlugins(invocationPlugins, wordTypes, config, replacements);
+                registerAESPlugins(invocationPlugins, config, replacements);
+                registerCRC32Plugins(invocationPlugins, config, replacements);
+                registerCRC32CPlugins(invocationPlugins, config, replacements);
+                registerBigIntegerPlugins(invocationPlugins, config, replacements);
+                registerSHAPlugins(invocationPlugins, config, replacements);
                 registerGHASHPlugins(invocationPlugins, config, metaAccess, foreignCalls);
-                registerCounterModePlugins(invocationPlugins, config, replacementBytecodeProvider);
+                registerCounterModePlugins(invocationPlugins, config, replacements);
                 registerBase64Plugins(invocationPlugins, config, metaAccess, foreignCalls);
-                registerUnsafePlugins(invocationPlugins, config, replacementBytecodeProvider);
-                StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacementBytecodeProvider, true, false);
-                registerArrayPlugins(invocationPlugins, replacementBytecodeProvider);
-                registerStringPlugins(invocationPlugins, replacementBytecodeProvider);
-                registerArraysSupportPlugins(invocationPlugins, config, replacementBytecodeProvider);
+                registerUnsafePlugins(invocationPlugins, config, replacements);
+                StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacements, true, false);
+                registerArrayPlugins(invocationPlugins, replacements);
+                registerStringPlugins(invocationPlugins, replacements);
+                registerArraysSupportPlugins(invocationPlugins, config, replacements);
 
                 for (NodeIntrinsicPluginFactory factory : GraalServices.load(NodeIntrinsicPluginFactory.class)) {
                     factory.registerPlugins(invocationPlugins, nodeIntrinsificationProvider);
@@ -203,8 +204,8 @@ public class HotSpotGraphBuilderPlugins {
         return plugins;
     }
 
-    private static void registerObjectPlugins(InvocationPlugins plugins, OptionValues options, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Object.class, bytecodeProvider);
+    private static void registerObjectPlugins(InvocationPlugins plugins, OptionValues options, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins, Object.class, replacements);
         if (!GeneratePIC.getValue(options)) {
             // FIXME: clone() requires speculation and requires a fix in here (to check that
             // b.getAssumptions() != null), and in ReplacementImpl.getSubstitution() where there is
@@ -235,8 +236,8 @@ public class HotSpotGraphBuilderPlugins {
         }
     }
 
-    private static void registerClassPlugins(Plugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins.getInvocationPlugins(), Class.class, bytecodeProvider);
+    private static void registerClassPlugins(Plugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins.getInvocationPlugins(), Class.class, replacements);
 
         r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getModifiers", Receiver.class);
         r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isInterface", Receiver.class);
@@ -273,8 +274,8 @@ public class HotSpotGraphBuilderPlugins {
         plugins.register(plugin, VolatileCallSite.class, "getTarget", Receiver.class);
     }
 
-    private static void registerReflectionPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, reflectionClass, bytecodeProvider);
+    private static void registerReflectionPlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, reflectionClass, replacements);
         r.register0("getCallerClass", new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
@@ -290,12 +291,12 @@ public class HotSpotGraphBuilderPlugins {
         r.registerMethodSubstitution(ReflectionSubstitutions.class, "getClassAccessFlags", Class.class);
     }
 
-    private static void registerUnsafePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider replacementBytecodeProvider) {
+    private static void registerUnsafePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         Registration r;
         if (JavaVersionUtil.JAVA_SPEC <= 8) {
-            r = new Registration(plugins, Unsafe.class, replacementBytecodeProvider);
+            r = new Registration(plugins, Unsafe.class, replacements);
         } else {
-            r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacementBytecodeProvider);
+            r = new Registration(plugins, "jdk.internal.misc.Unsafe", replacements);
         }
         String substituteMethodName = config.doingUnsafeAccessOffset != Integer.MAX_VALUE ? "copyMemoryGuarded" : "copyMemory";
         r.registerMethodSubstitution(HotSpotUnsafeSubstitutions.class, HotSpotUnsafeSubstitutions.copyMemoryName, substituteMethodName, Receiver.class, Object.class, long.class, Object.class,
@@ -340,8 +341,8 @@ public class HotSpotGraphBuilderPlugins {
         return true;
     }
 
-    private static void registerConstantPoolPlugins(InvocationPlugins plugins, WordTypes wordTypes, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, constantPoolClass, bytecodeProvider);
+    private static void registerConstantPoolPlugins(InvocationPlugins plugins, WordTypes wordTypes, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins, constantPoolClass, replacements);
 
         r.register2("getSize0", Receiver.class, Object.class, new InvocationPlugin() {
             @Override
@@ -411,22 +412,22 @@ public class HotSpotGraphBuilderPlugins {
         });
     }
 
-    private static void registerArrayPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Array.class, bytecodeProvider);
+    private static void registerArrayPlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, Array.class, replacements);
         r.setAllowOverwrite(true);
         r.registerMethodSubstitution(HotSpotArraySubstitutions.class, "newInstance", Class.class, int.class);
     }
 
-    private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+    private static void registerStringPlugins(InvocationPlugins plugins, Replacements replacements) {
         if (JavaVersionUtil.JAVA_SPEC > 8) {
-            final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", bytecodeProvider);
+            final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", replacements);
             utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "toBytes", char[].class, int.class, int.class);
             utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "getChars", byte[].class, int.class, int.class, char[].class, int.class);
         }
     }
 
-    private static void registerThreadPlugins(InvocationPlugins plugins, MetaAccessProvider metaAccess, WordTypes wordTypes, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Thread.class, bytecodeProvider);
+    private static void registerThreadPlugins(InvocationPlugins plugins, MetaAccessProvider metaAccess, WordTypes wordTypes, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins, Thread.class, replacements);
         r.register0("currentThread", new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
@@ -443,40 +444,51 @@ public class HotSpotGraphBuilderPlugins {
         r.registerMethodSubstitution(ThreadSubstitutions.class, "isInterrupted", Receiver.class, boolean.class);
     }
 
-    public static final String aesEncryptName;
-    public static final String aesDecryptName;
-
     public static final String reflectionClass;
     public static final String constantPoolClass;
 
     static {
         if (JavaVersionUtil.JAVA_SPEC <= 8) {
-            aesEncryptName = "encryptBlock";
-            aesDecryptName = "decryptBlock";
             reflectionClass = "sun.reflect.Reflection";
             constantPoolClass = "sun.reflect.ConstantPool";
         } else {
-            aesEncryptName = "implEncryptBlock";
-            aesDecryptName = "implDecryptBlock";
             reflectionClass = "jdk.internal.reflect.Reflection";
             constantPoolClass = "jdk.internal.reflect.ConstantPool";
         }
     }
 
-    public static boolean cbcUsesImplNames(GraalHotSpotVMConfig config) {
+    public static String lookupIntrinsicName(GraalHotSpotVMConfig config, String className, String name1, String name2) {
+        boolean foundName1 = false;
+        boolean foundName2 = false;
+        String name = name1;
         for (VMIntrinsicMethod intrinsic : config.getStore().getIntrinsics()) {
-            if ("com/sun/crypto/provider/CipherBlockChaining".equals(intrinsic.declaringClass)) {
-                if ("encrypt".equals(intrinsic.name)) {
-                    return false;
-                } else if ("implEncrypt".equals(intrinsic.name)) {
-                    return true;
+            if (className.equals(intrinsic.declaringClass)) {
+                if (name1.equals(intrinsic.name)) {
+                    foundName1 = true;
+                } else if (name2.equals(intrinsic.name)) {
+                    foundName2 = true;
+                    name = name2;
                 }
             }
         }
+        if (foundName1 != foundName2) {
+            return name;
+        }
         throw GraalError.shouldNotReachHere();
     }
 
-    private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+    public static boolean isIntrinsicName(GraalHotSpotVMConfig config, String className, String name) {
+        for (VMIntrinsicMethod intrinsic : config.getStore().getIntrinsics()) {
+            if (className.equals(intrinsic.declaringClass)) {
+                if (name.equals(intrinsic.name)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         if (config.useAESIntrinsics) {
             assert config.aescryptEncryptBlockStub != 0L;
             assert config.aescryptDecryptBlockStub != 0L;
@@ -484,72 +496,66 @@ public class HotSpotGraphBuilderPlugins {
             assert config.cipherBlockChainingDecryptAESCryptStub != 0L;
             String arch = config.osArch;
             String decryptSuffix = arch.equals("sparc") ? "WithOriginalKey" : "";
-            Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", bytecodeProvider);
-
-            boolean implNames = cbcUsesImplNames(config);
-            String cbcEncryptName = implNames ? "implEncrypt" : "encrypt";
-            String cbcDecryptName = implNames ? "implDecrypt" : "decrypt";
 
+            String cbcEncryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
+            String cbcDecryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
+            Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements);
             r.registerMethodSubstitution(CipherBlockChainingSubstitutions.class, cbcEncryptName, Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class);
             r.registerMethodSubstitution(CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName + decryptSuffix, Receiver.class, byte[].class, int.class, int.class, byte[].class,
                             int.class);
 
-            r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", bytecodeProvider);
+            String aesEncryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
+            String aesDecryptName = lookupIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
+
+            r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements);
             r.registerMethodSubstitution(AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class);
             r.registerMethodSubstitution(AESCryptSubstitutions.class, aesDecryptName, aesDecryptName + decryptSuffix, Receiver.class, byte[].class, int.class, byte[].class, int.class);
         }
     }
 
-    private static void registerBigIntegerPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, BigInteger.class, bytecodeProvider);
-        if (config.useMultiplyToLenIntrinsic()) {
-            assert config.multiplyToLen != 0L;
-            if (JavaVersionUtil.JAVA_SPEC <= 8) {
-                r.registerMethodSubstitution(BigIntegerSubstitutions.class, "multiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class, int.class,
-                                int[].class);
-            } else {
-                r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMultiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class, int.class,
-                                int[].class);
-            }
-        }
-        if (config.useMulAddIntrinsic()) {
-            r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMulAdd", int[].class, int[].class, int.class, int.class, int.class);
-        }
-        if (config.useMontgomeryMultiplyIntrinsic()) {
-            r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMontgomeryMultiply", int[].class, int[].class, int[].class, int.class, long.class, int[].class);
-        }
-        if (config.useMontgomerySquareIntrinsic()) {
-            r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implMontgomerySquare", int[].class, int[].class, int.class, long.class, int[].class);
-        }
-        if (config.useSquareToLenIntrinsic()) {
-            r.registerMethodSubstitution(BigIntegerSubstitutions.class, "implSquareToLen", int[].class, int.class, int[].class, int.class);
+    private static void registerBigIntegerPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins, BigInteger.class, replacements);
+        assert !config.useMultiplyToLenIntrinsic() || config.multiplyToLen != 0L;
+        if (JavaVersionUtil.JAVA_SPEC <= 8) {
+            r.registerConditionalMethodSubstitution(config.useMultiplyToLenIntrinsic(), BigIntegerSubstitutions.class, "multiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class,
+                            int.class, int[].class);
+        } else {
+            r.registerConditionalMethodSubstitution(config.useMultiplyToLenIntrinsic(), BigIntegerSubstitutions.class, "implMultiplyToLen", "multiplyToLenStatic", int[].class, int.class, int[].class,
+                            int.class, int[].class);
         }
+        r.registerConditionalMethodSubstitution(config.useMulAddIntrinsic(), BigIntegerSubstitutions.class, "implMulAdd", int[].class, int[].class, int.class, int.class, int.class);
+        r.registerConditionalMethodSubstitution(config.useMontgomeryMultiplyIntrinsic(), BigIntegerSubstitutions.class, "implMontgomeryMultiply", int[].class, int[].class, int[].class, int.class,
+                        long.class, int[].class);
+        r.registerConditionalMethodSubstitution(config.useMontgomerySquareIntrinsic(), BigIntegerSubstitutions.class, "implMontgomerySquare", int[].class, int[].class, int.class, long.class,
+                        int[].class);
+        r.registerConditionalMethodSubstitution(config.useSquareToLenIntrinsic(), BigIntegerSubstitutions.class, "implSquareToLen", int[].class, int.class, int[].class, int.class);
     }
 
-    private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+    private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         boolean useSha1 = config.useSHA1Intrinsics();
         boolean useSha256 = config.useSHA256Intrinsics();
         boolean useSha512 = config.useSHA512Intrinsics();
 
-        if (JavaVersionUtil.JAVA_SPEC > 8 && (useSha1 || useSha256 || useSha512)) {
-            Registration r = new Registration(plugins, "sun.security.provider.DigestBase", bytecodeProvider);
+        if (isIntrinsicName(config, "sun/security/provider/DigestBase", "implCompressMultiBlock0") && (useSha1 || useSha256 || useSha512)) {
+            Registration r = new Registration(plugins, "sun.security.provider.DigestBase", replacements);
             r.registerMethodSubstitution(DigestBaseSubstitutions.class, "implCompressMultiBlock0", Receiver.class, byte[].class, int.class, int.class);
         }
 
+        String implCompressName = lookupIntrinsicName(config, "sun/security/provider/SHA", "implCompress", "implCompress0");
         if (useSha1) {
             assert config.sha1ImplCompress != 0L;
-            Registration r = new Registration(plugins, "sun.security.provider.SHA", bytecodeProvider);
-            r.registerMethodSubstitution(SHASubstitutions.class, SHASubstitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
+            Registration r = new Registration(plugins, "sun.security.provider.SHA", replacements);
+            r.registerMethodSubstitution(SHASubstitutions.class, implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
         }
         if (useSha256) {
             assert config.sha256ImplCompress != 0L;
-            Registration r = new Registration(plugins, "sun.security.provider.SHA2", bytecodeProvider);
-            r.registerMethodSubstitution(SHA2Substitutions.class, SHA2Substitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
+            Registration r = new Registration(plugins, "sun.security.provider.SHA2", replacements);
+            r.registerMethodSubstitution(SHA2Substitutions.class, implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
         }
         if (useSha512) {
             assert config.sha512ImplCompress != 0L;
-            Registration r = new Registration(plugins, "sun.security.provider.SHA5", bytecodeProvider);
-            r.registerMethodSubstitution(SHA5Substitutions.class, SHA5Substitutions.implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
+            Registration r = new Registration(plugins, "sun.security.provider.SHA5", replacements);
+            r.registerMethodSubstitution(SHA5Substitutions.class, implCompressName, "implCompress0", Receiver.class, byte[].class, int.class);
         }
     }
 
@@ -586,11 +592,12 @@ public class HotSpotGraphBuilderPlugins {
         }
     }
 
-    private static void registerCounterModePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        if (config.useAESCTRIntrinsics) {
-            assert config.counterModeAESCrypt != 0L;
-            Registration r = new Registration(plugins, "com.sun.crypto.provider.CounterMode", bytecodeProvider);
-            r.registerMethodSubstitution(CounterModeSubstitutions.class, "implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class);
+    private static void registerCounterModePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        if (JavaVersionUtil.JAVA_SPEC > 8) {
+            assert !config.useAESCTRIntrinsics || config.counterModeAESCrypt != 0L;
+            Registration r = new Registration(plugins, "com.sun.crypto.provider.CounterMode", replacements);
+            r.registerConditionalMethodSubstitution(config.useAESCTRIntrinsics, CounterModeSubstitutions.class, "implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class,
+                            int.class);
         }
     }
 
@@ -626,32 +633,31 @@ public class HotSpotGraphBuilderPlugins {
         }
     }
 
-    private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        if (config.useCRC32Intrinsics) {
-            Registration r = new Registration(plugins, CRC32.class, bytecodeProvider);
-            r.registerMethodSubstitution(CRC32Substitutions.class, "update", int.class, int.class);
-            if (JavaVersionUtil.JAVA_SPEC <= 8) {
-                r.registerMethodSubstitution(CRC32Substitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
-                r.registerMethodSubstitution(CRC32Substitutions.class, "updateByteBuffer", int.class, long.class, int.class, int.class);
-            } else {
-                r.registerMethodSubstitution(CRC32Substitutions.class, "updateBytes0", int.class, byte[].class, int.class, int.class);
-                r.registerMethodSubstitution(CRC32Substitutions.class, "updateByteBuffer0", int.class, long.class, int.class, int.class);
-            }
+    private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        Registration r = new Registration(plugins, CRC32.class, replacements);
+        r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "update", int.class, int.class);
+        if (JavaVersionUtil.JAVA_SPEC <= 8) {
+            r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
+            r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateByteBuffer", int.class, long.class, int.class, int.class);
+        } else {
+            r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateBytes0", int.class, byte[].class, int.class, int.class);
+            r.registerConditionalMethodSubstitution(config.useCRC32Intrinsics, CRC32Substitutions.class, "updateByteBuffer0", int.class, long.class, int.class, int.class);
         }
     }
 
-    private static void registerCRC32CPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        if (config.useCRC32CIntrinsics) {
-            Registration r = new Registration(plugins, "java.util.zip.CRC32C", bytecodeProvider);
-            r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
-            r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateDirectByteBuffer", int.class, long.class, int.class, int.class);
+    private static void registerCRC32CPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        if (JavaVersionUtil.JAVA_SPEC > 8) {
+            Registration r = new Registration(plugins, "java.util.zip.CRC32C", replacements);
+            r.registerConditionalMethodSubstitution(config.useCRC32CIntrinsics, CRC32CSubstitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
+            r.registerConditionalMethodSubstitution(config.useCRC32CIntrinsics, CRC32CSubstitutions.class, "updateDirectByteBuffer", int.class, long.class, int.class, int.class);
         }
     }
 
-    private static void registerArraysSupportPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
-        if (config.useVectorizedMismatchIntrinsic) {
-            Registration r = new Registration(plugins, "jdk.internal.util.ArraysSupport", bytecodeProvider);
-            r.registerMethodSubstitution(ArraysSupportSubstitutions.class, "vectorizedMismatch", Object.class, long.class, Object.class, long.class, int.class, int.class);
+    private static void registerArraysSupportPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        if (JavaVersionUtil.JAVA_SPEC > 8) {
+            Registration r = new Registration(plugins, "jdk.internal.util.ArraysSupport", replacements);
+            r.registerConditionalMethodSubstitution(config.useVectorizedMismatchIntrinsic, ArraysSupportSubstitutions.class, "vectorizedMismatch", Object.class, long.class, Object.class, long.class,
+                            int.class, int.class);
         }
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index e8e8c235c9e..1c562038703 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -339,8 +339,8 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall
         linkForeignCall(options, providers, REGISTER_FINALIZER, c.registerFinalizerAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any());
         linkForeignCall(options, providers, MONITORENTER, c.monitorenterAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any());
         linkForeignCall(options, providers, MONITOREXIT, c.monitorexitAddress, PREPEND_THREAD, STACK_INSPECTABLE_LEAF, NOT_REEXECUTABLE, any());
-        linkForeignCall(options, providers, NOTIFY, c.notifyAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any());
-        linkForeignCall(options, providers, NOTIFY_ALL, c.notifyAllAddress, PREPEND_THREAD, SAFEPOINT, NOT_REEXECUTABLE, any());
+        linkForeignCall(options, providers, NOTIFY, c.notifyAddress, PREPEND_THREAD, LEAF_NO_VZERO, NOT_REEXECUTABLE, any());
+        linkForeignCall(options, providers, NOTIFY_ALL, c.notifyAllAddress, PREPEND_THREAD, LEAF_NO_VZERO, NOT_REEXECUTABLE, any());
         linkForeignCall(options, providers, LOG_PRINTF, c.logPrintfAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS);
         linkForeignCall(options, providers, LOG_OBJECT, c.logObjectAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS);
         linkForeignCall(options, providers, LOG_PRIMITIVE, c.logPrimitiveAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java
index 7013110331e..16925ed7b27 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java
@@ -168,7 +168,7 @@ public class HotSpotSuitesProvider extends SuitesProviderBase {
         if (profileInstructions != null) {
             suites.getPostAllocationOptimizationStage().appendPhase(new HotSpotInstructionProfiling(profileInstructions));
         }
-        if (Assertions.detailedAssertionsEnabled(options)) {
+        if (Assertions.assertionsEnabled()) {
             suites.getPostAllocationOptimizationStage().appendPhase(new VerifyMaxRegisterSizePhase(config.maxVectorSize));
         }
         return suites;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java
index 8ee28e3e19d..634df6f9285 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -73,7 +73,7 @@ public final class BeginLockScopeNode extends AbstractMemoryCheckpoint implement
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java
index 1cc3cfc9924..4a5aacacba3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -56,7 +56,7 @@ public final class EndLockScopeNode extends AbstractMemoryCheckpoint implements
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java
index 94b8ec54232..4d3be9e1ebd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -72,7 +72,7 @@ public final class StubForeignCallNode extends FixedWithNextNode implements LIRL
     }
 
     @Override
-    public LocationIdentity[] getLocationIdentities() {
+    public LocationIdentity[] getKilledLocationIdentities() {
         LocationIdentity[] killedLocations = foreignCalls.getKilledLocations(descriptor);
         killedLocations = Arrays.copyOf(killedLocations, killedLocations.length + 1);
         killedLocations[killedLocations.length - 1] = HotSpotReplacementsUtil.PENDING_EXCEPTION_LOCATION;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java
index 8253fb2df96..c277327dacc 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -64,7 +64,7 @@ public class InitializeKlassNode extends DeoptimizingFixedWithNextNode implement
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java
index 5706c394d6c..de58e6c567b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -98,7 +98,7 @@ public class InitializeKlassStubCall extends AbstractMemoryCheckpoint implements
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java
index af5f9534511..5cd246f261c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -64,7 +64,7 @@ public class ResolveDynamicConstantNode extends DeoptimizingFixedWithNextNode im
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java
index 65a3c9ff142..24730cab38d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -93,7 +93,7 @@ public class ResolveDynamicStubCall extends AbstractMemoryCheckpoint implements
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java
index ff41d0002ef..2fdfea0136c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java
@@ -70,10 +70,22 @@ public class AheadOfTimeVerificationPhase extends VerifyPhase {
     }
 
     private static boolean isDirectMethodHandle(ConstantNode node) {
+        String typeName = StampTool.typeOrNull(node).getName();
         if (!isObject(node)) {
             return false;
         }
-        return "Ljava/lang/invoke/DirectMethodHandle;".equals(StampTool.typeOrNull(node).getName());
+
+        switch (typeName) {
+            case "Ljava/lang/invoke/DirectMethodHandle;":
+            case "Ljava/lang/invoke/DirectMethodHandle$StaticAccessor;":
+            case "Ljava/lang/invoke/DirectMethodHandle$Accessor;":
+            case "Ljava/lang/invoke/DirectMethodHandle$Constructor;":
+            case "Ljava/lang/invoke/DirectMethodHandle$Special;":
+            case "Ljava/lang/invoke/DirectMethodHandle$Interface;":
+                return true;
+            default:
+                return false;
+        }
     }
 
     private static boolean isBoundMethodHandle(ConstantNode node) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java
index 6737ac03833..6b140ae2407 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/IdentityHashCodeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -61,7 +61,7 @@ public class IdentityHashCodeNode extends FixedWithNextNode implements Canonical
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return HotSpotReplacementsUtil.MARK_WORD_LOCATION;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java
index 15b520ea222..ca92dd270ae 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA2Substitutions.java
@@ -36,7 +36,6 @@ import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.word.Word;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 import jdk.internal.vm.compiler.word.WordFactory;
@@ -46,8 +45,6 @@ import jdk.vm.ci.meta.JavaKind;
 @ClassSubstitution(className = "sun.security.provider.SHA2", optional = true)
 public class SHA2Substitutions {
 
-    public static final String implCompressName = JavaVersionUtil.JAVA_SPEC <= 8 ? "implCompress" : "implCompress0";
-
     @MethodSubstitution(isStatic = false)
     static void implCompress0(Object receiver, byte[] buf, int ofs) {
         Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java
index 44e0ee39d9c..255e3c91e9f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHA5Substitutions.java
@@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.word.Word;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 import jdk.internal.vm.compiler.word.WordFactory;
@@ -47,8 +46,6 @@ import jdk.vm.ci.meta.JavaKind;
 @ClassSubstitution(className = "sun.security.provider.SHA5", optional = true)
 public class SHA5Substitutions {
 
-    public static final String implCompressName = JavaVersionUtil.JAVA_SPEC <= 8 ? "implCompress" : "implCompress0";
-
     @MethodSubstitution(isStatic = false)
     static void implCompress0(Object receiver, byte[] buf, int ofs) {
         Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java
index ce8e8d0b65a..dd383e79b89 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/SHASubstitutions.java
@@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.word.Word;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 import jdk.internal.vm.compiler.word.WordFactory;
@@ -47,8 +46,6 @@ import jdk.vm.ci.meta.JavaKind;
 @ClassSubstitution(className = "sun.security.provider.SHA", optional = true)
 public class SHASubstitutions {
 
-    public static final String implCompressName = JavaVersionUtil.JAVA_SPEC <= 8 ? "implCompress" : "implCompress0";
-
     @MethodSubstitution(isStatic = false)
     static void implCompress0(Object receiver, byte[] buf, int ofs) {
         Object realReceiver = PiNode.piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java
index 1e12a65b5cf..75ad5720c9d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java
@@ -56,7 +56,6 @@ import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
 import org.graalvm.compiler.replacements.GraphKit;
 import org.graalvm.compiler.replacements.nodes.ReadRegisterNode;
 import org.graalvm.compiler.word.Word;
@@ -258,7 +257,6 @@ public class ForeignCallStub extends Stub {
             debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Initial stub graph");
 
             kit.inlineInvokes("Foreign call stub.", "Backend");
-            new RemoveValueProxyPhase().apply(graph);
 
             debug.dump(DebugContext.VERBOSE_LEVEL, graph, "Stub graph before compilation");
             return graph;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java
index 2b4b79a22cc..ba429a032b2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java
@@ -41,7 +41,6 @@ import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
 import org.graalvm.compiler.replacements.SnippetTemplate;
 import org.graalvm.compiler.replacements.Snippets;
 
@@ -100,9 +99,8 @@ public abstract class SnippetStub extends Stub implements Snippets {
                 }
             }
 
-            new RemoveValueProxyPhase().apply(graph);
             graph.setGuardsStage(GuardsStage.FLOATING_GUARDS);
-            CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+            CanonicalizerPhase canonicalizer = CanonicalizerPhase.create();
             canonicalizer.apply(graph, providers);
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, providers);
         } catch (Throwable e) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index f46ade2c124..fca890348da 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -3221,7 +3221,7 @@ public class BytecodeParser implements GraphBuilderContext {
             lastInstr = loopBegin;
 
             // Create phi functions for all local variables and operand stack slots.
-            frameState.insertLoopPhis(liveness, block.loopId, loopBegin, forceLoopPhis(), stampFromValueForForcedPhis());
+            frameState.insertLoopPhis(liveness, block.loopId, loopBegin, forceLoopPhis() || this.graphBuilderConfig.replaceLocalsWithConstants(), stampFromValueForForcedPhis());
             loopBegin.setStateAfter(createFrameState(block.startBci, loopBegin));
 
             /*
@@ -3545,8 +3545,9 @@ public class BytecodeParser implements GraphBuilderContext {
                      * will never see that the branch is taken. This can lead to deopt loops or OSR
                      * failure.
                      */
+                    double calculatedProbability = negated ? BranchProbabilityNode.DEOPT_PROBABILITY : 1.0 - BranchProbabilityNode.DEOPT_PROBABILITY;
                     FixedNode deoptSuccessor = BeginNode.begin(deopt);
-                    ValueNode ifNode = genIfNode(condition, negated ? deoptSuccessor : noDeoptSuccessor, negated ? noDeoptSuccessor : deoptSuccessor, negated ? 1 - probability : probability);
+                    ValueNode ifNode = genIfNode(condition, negated ? deoptSuccessor : noDeoptSuccessor, negated ? noDeoptSuccessor : deoptSuccessor, calculatedProbability);
                     postProcessIfNode(ifNode);
                     append(ifNode);
                 }
@@ -3569,8 +3570,28 @@ public class BytecodeParser implements GraphBuilderContext {
             }
 
             this.controlFlowSplit = true;
-            FixedNode trueSuccessor = createTarget(trueBlock, frameState, false, false);
-            FixedNode falseSuccessor = createTarget(falseBlock, frameState, false, true);
+            FixedNode falseSuccessor = createTarget(falseBlock, frameState, false, false);
+            FixedNode trueSuccessor = createTarget(trueBlock, frameState, false, true);
+
+            if (this.graphBuilderConfig.replaceLocalsWithConstants() && condition instanceof CompareNode) {
+                CompareNode compareNode = (CompareNode) condition;
+                if (compareNode.condition() == CanonicalCondition.EQ) {
+                    ValueNode constantNode = null;
+                    ValueNode nonConstantNode = null;
+                    if (compareNode.getX() instanceof ConstantNode) {
+                        constantNode = compareNode.getX();
+                        nonConstantNode = compareNode.getY();
+                    } else if (compareNode.getY() instanceof ConstantNode) {
+                        constantNode = compareNode.getY();
+                        nonConstantNode = compareNode.getX();
+                    }
+
+                    if (constantNode != null && nonConstantNode != null) {
+                        this.getEntryState(trueBlock).replaceValue(nonConstantNode, constantNode);
+                    }
+                }
+            }
+
             ValueNode ifNode = genIfNode(condition, trueSuccessor, falseSuccessor, probability);
             postProcessIfNode(ifNode);
             append(ifNode);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java
index 252924a9dab..4b8831a9843 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.java/src/org/graalvm/compiler/java/FrameStateBuilder.java
@@ -328,8 +328,7 @@ public final class FrameStateBuilder implements SideEffectsState {
             outerFrameState = parent.getFrameStateBuilder().create(parent.bci(), parent.getNonIntrinsicAncestor(), true, null, null);
         }
         if (bci == BytecodeFrame.AFTER_EXCEPTION_BCI && parent != null) {
-            FrameState newFrameState = outerFrameState.duplicateModified(outerFrameState.bci, true, false, JavaKind.Void, new JavaKind[]{JavaKind.Object}, new ValueNode[]{stack[0]});
-            return newFrameState;
+            return outerFrameState.duplicateModified(graph, outerFrameState.bci, true, false, JavaKind.Void, new JavaKind[]{JavaKind.Object}, new ValueNode[]{stack[0]});
         }
         if (bci == BytecodeFrame.INVALID_FRAMESTATE_BCI) {
             throw shouldNotReachHere();
@@ -527,21 +526,21 @@ public final class FrameStateBuilder implements SideEffectsState {
             ValueNode value = locals[i];
             if (value != null && value != TWO_SLOT_MARKER && (!loopEntryState.contains(value) || loopExit.loopBegin().isPhiAtMerge(value))) {
                 debug.log(" inserting proxy for %s", value);
-                locals[i] = ProxyNode.forValue(value, loopExit, graph);
+                locals[i] = ProxyNode.forValue(value, loopExit);
             }
         }
         for (int i = 0; i < stackSize(); i++) {
             ValueNode value = stack[i];
             if (value != null && value != TWO_SLOT_MARKER && (!loopEntryState.contains(value) || loopExit.loopBegin().isPhiAtMerge(value))) {
                 debug.log(" inserting proxy for %s", value);
-                stack[i] = ProxyNode.forValue(value, loopExit, graph);
+                stack[i] = ProxyNode.forValue(value, loopExit);
             }
         }
         for (int i = 0; i < lockedObjects.length; i++) {
             ValueNode value = lockedObjects[i];
             if (value != null && (!loopEntryState.contains(value) || loopExit.loopBegin().isPhiAtMerge(value))) {
                 debug.log(" inserting proxy for %s", value);
-                lockedObjects[i] = ProxyNode.forValue(value, loopExit, graph);
+                lockedObjects[i] = ProxyNode.forValue(value, loopExit);
             }
         }
     }
@@ -1028,4 +1027,17 @@ public final class FrameStateBuilder implements SideEffectsState {
         }
         sideEffects.add(sideEffect);
     }
+
+    public void replaceValue(ValueNode oldValue, ValueNode newValue) {
+        for (int i = 0; i < locals.length; ++i) {
+            if (locals[i] == oldValue) {
+                locals[i] = newValue;
+            }
+        }
+        for (int i = 0; i < stack.length; ++i) {
+            if (stack[i] == oldValue) {
+                stack[i] = newValue;
+            }
+        }
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java
index 81caf50da98..2b885ca8282 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -38,7 +38,7 @@ import java.util.List;
 
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.jtt.JTTTest;
-import org.graalvm.compiler.test.ExportingClassLoader;
+import org.graalvm.compiler.api.test.ExportingClassLoader;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java
index 80660e75dec..eb399f6c97d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -25,7 +25,7 @@
 package org.graalvm.compiler.jtt.except;
 
 import org.graalvm.compiler.jtt.JTTTest;
-import org.graalvm.compiler.test.ExportingClassLoader;
+import org.graalvm.compiler.api.test.ExportingClassLoader;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.objectweb.asm.ClassWriter;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java
index d3bcb714b66..ff2decb4606 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java
@@ -44,7 +44,7 @@ public class NestedLoop_EA extends JTTTest {
     protected Suites createSuites(OptionValues options) {
         Suites suites = super.createSuites(options);
         ListIterator> position = suites.getHighTier().findPhase(PartialEscapePhase.class);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         // incremental canonicalizer of PEA is missing some important canonicalization (TODO?)
         position.add(canonicalizer);
         position.add(new PartialEscapePhase(true, canonicalizer, options));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java
index 5283eab6c10..624601062a1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -2527,7 +2527,7 @@ public class TrichotomyTest extends JTTTest {
         // test folding
         StructuredGraph graph = self.parseForCompile(self.getResolvedJavaMethod(name));
         HighTierContext context = self.getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = self.createCanonicalizerPhase();
         canonicalizer.apply(graph, context);
         Assert.assertTrue("Too many ConditionalNodes after canonicalization", graph.getNodes().filter(ConditionalNode.class).count() <= 1);
         Assert.assertTrue("Unexpected IfNodes after canonicalization", graph.getNodes().filter(IfNode.class).isEmpty());
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
index 5b946c8ba91..8cfdbad7bb8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
@@ -58,6 +58,13 @@ public enum AArch64ArithmeticOp {
     DIV,
     SMULH,
     UMULH,
+    SMULL,
+    SMNEGL,
+    MADD,
+    MSUB,
+    FMADD,
+    SMADDL,
+    SMSUBL,
     REM,
     UDIV,
     UREM,
@@ -279,6 +286,12 @@ public enum AArch64ArithmeticOp {
                 case MNEG:
                     masm.mneg(size, dst, src1, src2);
                     break;
+                case SMULL:
+                    masm.smull(size, dst, src1, src2);
+                    break;
+                case SMNEGL:
+                    masm.smnegl(size, dst, src1, src2);
+                    break;
                 case DIV:
                     masm.sdiv(size, dst, src1, src2);
                     break;
@@ -477,11 +490,10 @@ public enum AArch64ArithmeticOp {
         @Use(REG) protected AllocatableValue src3;
 
         /**
-         * Computes result = src3  src1 * src2.
+         * Computes result = src3 +/- src1 * src2.
          */
         public MultiplyAddSubOp(AArch64ArithmeticOp op, AllocatableValue result, AllocatableValue src1, AllocatableValue src2, AllocatableValue src3) {
             super(TYPE);
-            assert op == ADD || op == SUB || op == FADD;
             this.op = op;
             this.result = result;
             this.src1 = src1;
@@ -493,15 +505,23 @@ public enum AArch64ArithmeticOp {
         public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             int size = result.getPlatformKind().getSizeInBytes() * Byte.SIZE;
             switch (op) {
-                case ADD:
+                case MADD:
                     masm.madd(size, asRegister(result), asRegister(src1), asRegister(src2), asRegister(src3));
                     break;
-                case SUB:
+                case MSUB:
                     masm.msub(size, asRegister(result), asRegister(src1), asRegister(src2), asRegister(src3));
                     break;
-                case FADD:
+                case FMADD:
                     masm.fmadd(size, asRegister(result), asRegister(src1), asRegister(src2), asRegister(src3));
                     break;
+                case SMADDL:
+                    assert size == 64;
+                    masm.smaddl(size, asRegister(result), asRegister(src1), asRegister(src2), asRegister(src3));
+                    break;
+                case SMSUBL:
+                    assert size == 64;
+                    masm.smsubl(size, asRegister(result), asRegister(src1), asRegister(src2), asRegister(src3));
+                    break;
                 default:
                     throw GraalError.shouldNotReachHere();
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
index 5098012d6e9..016ed86d1a8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
@@ -96,7 +96,7 @@ public class AMD64Move {
     public static final class MoveToRegOp extends AbstractMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveToRegOp.class);
 
-        @Def({REG, HINT}) protected AllocatableValue result;
+        @Def({REG, STACK, HINT}) protected AllocatableValue result;
         @Use({REG, STACK}) protected AllocatableValue input;
 
         public MoveToRegOp(AMD64Kind moveKind, AllocatableValue result, AllocatableValue input) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
index 6be71ce9d31..aab2241f3f4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
@@ -32,6 +32,8 @@ import static jdk.vm.ci.amd64.AMD64.rsi;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 
+import java.util.EnumSet;
+
 import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.asm.amd64.AMD64Address;
 import org.graalvm.compiler.asm.amd64.AMD64Assembler;
@@ -43,8 +45,10 @@ import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.Value;
 
 @Opcode("AMD64_STRING_INFLATE")
@@ -73,7 +77,7 @@ public final class AMD64StringLatin1InflateOp extends AMD64LIRInstruction {
         rdstTemp = rdst = dst;
         rlenTemp = rlen = len;
 
-        vtmp1 = tool.newVariable(LIRKind.value(AMD64Kind.V512_BYTE));
+        vtmp1 = useAVX512ForStringInflateCompress(tool.target()) ? tool.newVariable(LIRKind.value(AMD64Kind.V512_BYTE)) : tool.newVariable(LIRKind.value(AMD64Kind.V128_BYTE));
         rtmp2 = tool.newVariable(LIRKind.value(AMD64Kind.DWORD));
     }
 
@@ -89,6 +93,13 @@ public final class AMD64StringLatin1InflateOp extends AMD64LIRInstruction {
         byteArrayInflate(masm, src, dst, len, tmp1, tmp2);
     }
 
+    public static boolean useAVX512ForStringInflateCompress(TargetDescription target) {
+        EnumSet features = ((AMD64) target.arch).getFeatures();
+        return features.contains(AMD64.CPUFeature.AVX512BW) &&
+                        features.contains(AMD64.CPUFeature.AVX512VL) &&
+                        features.contains(AMD64.CPUFeature.BMI2);
+    }
+
     /**
      * Inflate a Latin1 string using a byte[] array representation into a UTF16 string using a
      * char[] array representation.
@@ -110,10 +121,7 @@ public final class AMD64StringLatin1InflateOp extends AMD64LIRInstruction {
         assert dst.number != len.number && dst.number != tmp.number;
         assert len.number != tmp.number;
 
-        if (masm.supports(AMD64.CPUFeature.AVX512BW) &&
-                        masm.supports(AMD64.CPUFeature.AVX512VL) &&
-                        masm.supports(AMD64.CPUFeature.BMI2)) {
-
+        if (useAVX512ForStringInflateCompress(masm.target)) {
             // If the length of the string is less than 16, we chose not to use the
             // AVX512 instructions.
             masm.testl(len, -16);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
index b4c81b781b9..1f672ffc45d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
@@ -34,6 +34,7 @@ import static jdk.vm.ci.amd64.AMD64.rsi;
 import static jdk.vm.ci.amd64.AMD64.rsp;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static org.graalvm.compiler.lir.amd64.AMD64StringLatin1InflateOp.useAVX512ForStringInflateCompress;
 
 import org.graalvm.compiler.asm.Label;
 import org.graalvm.compiler.asm.amd64.AMD64Address;
@@ -82,7 +83,7 @@ public final class AMD64StringUTF16CompressOp extends AMD64LIRInstruction {
         rdstTemp = rdst = dst;
         rlenTemp = rlen = len;
 
-        LIRKind vkind = LIRKind.value(AMD64Kind.V512_BYTE);
+        LIRKind vkind = useAVX512ForStringInflateCompress(tool.target()) ? LIRKind.value(AMD64Kind.V512_BYTE) : LIRKind.value(AMD64Kind.V128_BYTE);
 
         vtmp1 = tool.newVariable(vkind);
         vtmp2 = tool.newVariable(vkind);
@@ -139,10 +140,7 @@ public final class AMD64StringUTF16CompressOp extends AMD64LIRInstruction {
 
         masm.push(len);      // Save length for return.
 
-        if (masm.supports(AMD64.CPUFeature.AVX512BW) &&
-                        masm.supports(AMD64.CPUFeature.AVX512VL) &&
-                        masm.supports(AMD64.CPUFeature.BMI2)) {
-
+        if (useAVX512ForStringInflateCompress(masm.target)) {
             Label labelRestoreK1ReturnZero = new Label();
             Label labelAvxPostAlignment = new Label();
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java
index a9a63042338..9cf3fbebf65 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java
@@ -74,7 +74,7 @@ public class AMD64VectorMove {
     public static final class MoveToRegOp extends AMD64LIRInstruction implements ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveToRegOp.class);
 
-        @Def({REG, HINT}) protected AllocatableValue result;
+        @Def({REG, STACK, HINT}) protected AllocatableValue result;
         @Use({REG, STACK}) protected AllocatableValue input;
 
         public MoveToRegOp(AllocatableValue result, AllocatableValue input) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java
index 861fda151ef..5edcf920232 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/LIRIntrospection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -214,6 +214,23 @@ abstract class LIRIntrospection extends FieldIntrospection {
         }
     }
 
+    private static boolean verifyAssignment(LIRInstruction inst, Value newValue, EnumSet flags) {
+        Class type = newValue.getClass();
+        if (!flags.contains(REG)) {
+            assert !type.isAssignableFrom(REGISTER_VALUE_CLASS) && !type.isAssignableFrom(VARIABLE_CLASS) : "Cannot assign RegisterValue / Variable to field without REG flag: " + inst + " newValue=" +
+                            newValue;
+        }
+        if (!flags.contains(STACK)) {
+            assert !type.isAssignableFrom(STACK_SLOT_CLASS) : "Cannot assign StackSlot to field without STACK flag: " + inst + " newValue=" +
+                            newValue;
+        }
+        if (!flags.contains(CONST)) {
+            assert !type.isAssignableFrom(CONSTANT_VALUE_CLASS) : "Cannot assign Constant to field without CONST flag: " + inst + " newValue=" +
+                            newValue;
+        }
+        return true;
+    }
+
     protected static void forEach(LIRInstruction inst, Values values, OperandMode mode, InstructionValueProcedure proc) {
         for (int i = 0; i < values.getCount(); i++) {
             assert LIRInstruction.ALLOWED_FLAGS.get(mode).containsAll(values.getFlags(i));
@@ -228,6 +245,9 @@ abstract class LIRIntrospection extends FieldIntrospection {
                     newValue = proc.doValue(inst, value, mode, values.getFlags(i));
                 }
                 if (!value.identityEquals(newValue)) {
+                    if (!(value instanceof CompositeValue)) {
+                        assert verifyAssignment(inst, newValue, values.getFlags(i));
+                    }
                     values.setValue(inst, i, newValue);
                 }
             } else {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java
index 879625d2492..225ef0d10ee 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java
@@ -881,7 +881,12 @@ public class LinearScanLifetimeAnalysisPhase extends LinearScanAllocationPhase {
                     }
                 }
             }
-            return move.getConstant();
+            Constant constant = move.getConstant();
+            if (!(constant instanceof JavaConstant)) {
+                // Other kinds of constants might not be supported by the generic move operation.
+                return null;
+            }
+            return constant;
         }
         return null;
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
index d7d90f5fe22..0b1c72b2ff5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
@@ -217,7 +217,7 @@ public class ConvertDeoptimizeToGuardPhase extends BasePhase {
 
                             Node newGuard = guard;
                             if (survivingSuccessor instanceof LoopExitNode) {
-                                newGuard = ProxyNode.forGuard(guard, (LoopExitNode) survivingSuccessor, graph);
+                                newGuard = ProxyNode.forGuard(guard, (LoopExitNode) survivingSuccessor);
                             }
                             survivingSuccessor.replaceAtUsages(InputType.Guard, newGuard);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java
index fb78dc92aa5..d1ddfeb15b4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java
@@ -24,6 +24,7 @@
 
 package org.graalvm.compiler.loop.phases;
 
+import org.graalvm.compiler.debug.CounterKey;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.loop.LoopEx;
 import org.graalvm.compiler.loop.LoopPolicies;
@@ -33,6 +34,8 @@ import org.graalvm.compiler.nodes.spi.CoreProviders;
 
 public class LoopPeelingPhase extends LoopPhase {
 
+    public static final CounterKey PEELED = DebugContext.counter("Peeled");
+
     public LoopPeelingPhase(LoopPolicies policies) {
         super(policies);
     }
@@ -45,10 +48,13 @@ public class LoopPeelingPhase extends LoopPhase {
             LoopsData data = new LoopsData(graph);
             try (DebugContext.Scope s = debug.scope("peeling", data.getCFG())) {
                 for (LoopEx loop : data.outerFirst()) {
-                    if (getPolicies().shouldPeel(loop, data.getCFG(), context.getMetaAccess())) {
-                        debug.log("Peeling %s", loop);
-                        LoopTransformations.peel(loop);
-                        debug.dump(DebugContext.DETAILED_LEVEL, graph, "Peeling %s", loop);
+                    if (loop.canDuplicateLoop() && loop.loopBegin().getLoopEndCount() > 0) {
+                        if (LoopPolicies.Options.PeelALot.getValue(graph.getOptions()) || getPolicies().shouldPeel(loop, data.getCFG(), context.getMetaAccess())) {
+                            debug.log("Peeling %s", loop);
+                            PEELED.add(debug, 1);
+                            LoopTransformations.peel(loop);
+                            debug.dump(DebugContext.DETAILED_LEVEL, graph, "Peeling %s", loop);
+                        }
                     }
                 }
                 data.deleteUnusedNodes();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
index 18b3352bccc..c39d5113047 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -35,9 +35,13 @@ import org.graalvm.compiler.core.common.RetryableBailoutException;
 import org.graalvm.compiler.core.common.calc.CanonicalCondition;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.Graph.Mark;
+import org.graalvm.compiler.graph.Graph.NodeEventScope;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Position;
+import org.graalvm.compiler.graph.spi.Simplifiable;
+import org.graalvm.compiler.graph.spi.SimplifierTool;
 import org.graalvm.compiler.loop.CountedLoopInfo;
+import org.graalvm.compiler.loop.DefaultLoopPolicies;
 import org.graalvm.compiler.loop.InductionVariable.Direction;
 import org.graalvm.compiler.loop.LoopEx;
 import org.graalvm.compiler.loop.LoopFragmentInside;
@@ -49,6 +53,7 @@ import org.graalvm.compiler.nodes.AbstractMergeNode;
 import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.ControlSplitNode;
 import org.graalvm.compiler.nodes.EndNode;
+import org.graalvm.compiler.nodes.FixedGuardNode;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.IfNode;
@@ -65,8 +70,10 @@ import org.graalvm.compiler.nodes.calc.ConditionalNode;
 import org.graalvm.compiler.nodes.extended.OpaqueNode;
 import org.graalvm.compiler.nodes.extended.SwitchNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
+import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.nodes.util.IntegerHelper;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 public abstract class LoopTransformations {
 
@@ -75,24 +82,63 @@ public abstract class LoopTransformations {
     }
 
     public static void peel(LoopEx loop) {
+        loop.detectCounted();
         loop.inside().duplicate().insertBefore(loop);
-        loop.loopBegin().setLoopFrequency(Math.max(0.0, loop.loopBegin().loopFrequency() - 1));
+        if (loop.isCounted()) {
+            // For counted loops we assume that we have an effect on the loop frequency.
+            loop.loopBegin().setLoopFrequency(Math.max(1.0, loop.loopBegin().loopFrequency() - 1));
+        }
     }
 
+    @SuppressWarnings("try")
     public static void fullUnroll(LoopEx loop, CoreProviders context, CanonicalizerPhase canonicalizer) {
         // assert loop.isCounted(); //TODO (gd) strengthen : counted with known trip count
         LoopBeginNode loopBegin = loop.loopBegin();
         StructuredGraph graph = loopBegin.graph();
         int initialNodeCount = graph.getNodeCount();
-        while (!loopBegin.isDeleted()) {
-            Mark mark = graph.getMark();
-            peel(loop);
-            canonicalizer.applyIncremental(graph, context, mark);
-            loop.invalidateFragments();
-            if (graph.getNodeCount() > initialNodeCount + MaximumDesiredSize.getValue(graph.getOptions()) * 2) {
-                throw new RetryableBailoutException("FullUnroll : Graph seems to grow out of proportion");
+        SimplifierTool defaultSimplifier = GraphUtil.getDefaultSimplifier(context.getMetaAccess(), context.getConstantReflection(), context.getConstantFieldProvider(),
+                        canonicalizer.getCanonicalizeReads(), graph.getAssumptions(), graph.getOptions());
+        /*
+         * IMPORTANT: Canonicalizations inside the body of the remaining loop can introduce new
+         * control flow that is not automatically picked up by the control flow graph computation of
+         * the original LoopEx data structure, thus we disable simplification and manually simplify
+         * conditions in the peeled iteration to simplify the exit path.
+         */
+        CanonicalizerPhase c = canonicalizer.copyWithoutSimplification();
+        EconomicSetNodeEventListener l = new EconomicSetNodeEventListener();
+        int peelings = 0;
+        try (NodeEventScope ev = graph.trackNodeEvents(l)) {
+            while (!loopBegin.isDeleted()) {
+                Mark newNodes = graph.getMark();
+                /*
+                 * Mark is not enough for the canonicalization of the floating nodes in the unrolled
+                 * code since pre-existing constants are not new nodes. Therefore, we canonicalize
+                 * (without simplification) all floating nodes changed during peeling but only
+                 * simplify new (in the peeled iteration) ones.
+                 */
+                EconomicSetNodeEventListener peeledListener = new EconomicSetNodeEventListener();
+                try (NodeEventScope peeledScope = graph.trackNodeEvents(peeledListener)) {
+                    LoopTransformations.peel(loop);
+                }
+                graph.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, graph, "After peeling loop %s", loop);
+                c.applyIncremental(graph, context, peeledListener.getNodes());
+                loop.invalidateFragments();
+                for (Node n : graph.getNewNodes(newNodes)) {
+                    if (n.isAlive() && (n instanceof IfNode || n instanceof SwitchNode || n instanceof FixedGuardNode || n instanceof BeginNode)) {
+                        Simplifiable s = (Simplifiable) n;
+                        s.simplify(defaultSimplifier);
+                        graph.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, graph, "After simplifying if %s", s);
+                    }
+                }
+                if (graph.getNodeCount() > initialNodeCount + MaximumDesiredSize.getValue(graph.getOptions()) * 2 ||
+                                peelings > DefaultLoopPolicies.Options.FullUnrollMaxIterations.getValue(graph.getOptions())) {
+                    throw new RetryableBailoutException("FullUnroll : Graph seems to grow out of proportion");
+                }
+                peelings++;
             }
         }
+        // Canonicalize with the original canonicalizer to capture all simplifications
+        canonicalizer.applyIncremental(graph, context, l.getNodes());
     }
 
     public static void unswitch(LoopEx loop, List controlSplitNodeSet) {
@@ -280,9 +326,9 @@ public abstract class LoopTransformations {
 
         // Change the preLoop to execute one iteration for now
         updatePreLoopLimit(preCounted);
-        preLoopBegin.setLoopFrequency(1);
-        mainLoopBegin.setLoopFrequency(Math.max(0.0, mainLoopBegin.loopFrequency() - 2));
-        postLoopBegin.setLoopFrequency(Math.max(0.0, postLoopBegin.loopFrequency() - 1));
+        preLoopBegin.setLoopFrequency(1.0);
+        mainLoopBegin.setLoopFrequency(Math.max(1.0, mainLoopBegin.loopFrequency() - 2));
+        postLoopBegin.setLoopFrequency(Math.max(1.0, postLoopBegin.loopFrequency() - 1));
 
         // The pre and post loops don't require safepoints at all
         for (SafepointNode safepoint : preLoop.nodes().filter(SafepointNode.class)) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java
index 87ceff23b7d..3499275deec 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -302,7 +302,7 @@ public class LoopPartialUnrollTest extends GraalCompilerTest {
         try (DebugContext.Scope buildScope = graph.getDebug().scope(name, method, graph)) {
             MidTierContext context = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, null);
 
-            CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+            CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
             canonicalizer.apply(graph, context);
             new RemoveValueProxyPhase().apply(graph);
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
@@ -338,7 +338,7 @@ public class LoopPartialUnrollTest extends GraalCompilerTest {
 
         StructuredGraph referenceGraph = buildGraph(reference, false);
         StructuredGraph testGraph = buildGraph(test, true);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         canonicalizer.apply(testGraph, getDefaultMidTierContext());
         canonicalizer.apply(referenceGraph, getDefaultMidTierContext());
         assertEquals(referenceGraph, testGraph);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java
index 8754bb1af0c..a67fabc23d5 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/CountedLoopInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -122,18 +122,18 @@ public class CountedLoopInfo {
         }
         ValueNode range = sub(max, min);
 
-        ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1);
+        ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1, graph);
         if (oneOff) {
             range = add(range, one);
         }
         // round-away-from-zero divison: (range + stride -/+ 1) / stride
-        ValueNode denominator = add(range, sub(absStride, one));
+        ValueNode denominator = add(graph, range, sub(absStride, one), NodeView.DEFAULT);
         ValueNode div = unsignedDivBefore(graph, loop.entryPoint(), denominator, absStride, null);
 
         if (assumeLoopEntered) {
             return graph.addOrUniqueWithInputs(div);
         }
-        ConstantNode zero = ConstantNode.forIntegerStamp(stamp, 0);
+        ConstantNode zero = ConstantNode.forIntegerStamp(stamp, 0, graph);
         // This check is "wide": it looks like min <= max
         // That's OK even if the loop is strict (`!isLimitIncluded()`)
         // because in this case, `div` will be zero when min == max
@@ -141,6 +141,40 @@ public class CountedLoopInfo {
         return graph.addOrUniqueWithInputs(ConditionalNode.create(noEntryCheck, zero, div, NodeView.DEFAULT));
     }
 
+    /**
+     * Determine if the loop might be entered. Returns {@code false} if we can tell statically that
+     * the loop cannot be entered; returns {@code true} if the loop might possibly be entered,
+     * including in the case where we cannot be sure statically.
+     *
+     * @return false if the loop can definitely not be entered, true otherwise
+     */
+    public boolean loopMightBeEntered() {
+        Stamp stamp = iv.valueNode().stamp(NodeView.DEFAULT);
+
+        ValueNode max;
+        ValueNode min;
+        if (iv.direction() == Direction.Up) {
+            max = end;
+            min = iv.initNode();
+        } else {
+            assert iv.direction() == Direction.Down;
+            max = iv.initNode();
+            min = end;
+        }
+        if (oneOff) {
+            max = add(max, ConstantNode.forIntegerStamp(stamp, 1));
+        }
+
+        LogicNode entryCheck = getCounterIntegerHelper().createCompareNode(min, max, NodeView.DEFAULT);
+        if (entryCheck.isContradiction()) {
+            // We can definitely not enter this loop.
+            return false;
+        } else {
+            // We don't know for sure that the loop can't be entered, so assume it can.
+            return true;
+        }
+    }
+
     /**
      * @return true if the loop has constant bounds.
      */
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java
index 3d6bbe1d2bc..ca590a8e5cf 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/DefaultLoopPolicies.java
@@ -26,7 +26,7 @@ package org.graalvm.compiler.loop;
 
 import static org.graalvm.compiler.core.common.GraalOptions.LoopMaxUnswitch;
 import static org.graalvm.compiler.core.common.GraalOptions.MaximumDesiredSize;
-import static org.graalvm.compiler.core.common.GraalOptions.MinimumPeelProbability;
+import static org.graalvm.compiler.core.common.GraalOptions.MinimumPeelFrequency;
 
 import java.util.List;
 
@@ -38,9 +38,6 @@ import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeBitMap;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.InvokeNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.MergeNode;
@@ -51,7 +48,6 @@ import org.graalvm.compiler.nodes.calc.CompareNode;
 import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode;
-import org.graalvm.compiler.nodes.java.TypeSwitchNode;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionType;
@@ -79,13 +75,32 @@ public class DefaultLoopPolicies implements LoopPolicies {
     public boolean shouldPeel(LoopEx loop, ControlFlowGraph cfg, MetaAccessProvider metaAccess) {
         LoopBeginNode loopBegin = loop.loopBegin();
         double entryProbability = cfg.blockFor(loopBegin.forwardEnd()).getRelativeFrequency();
-        OptionValues options = cfg.graph.getOptions();
-        if (entryProbability > MinimumPeelProbability.getValue(options) && loop.size() + loopBegin.graph().getNodeCount() < MaximumDesiredSize.getValue(options)) {
-            // check whether we're allowed to peel this loop
-            return loop.canDuplicateLoop();
-        } else {
+        StructuredGraph graph = cfg.graph;
+        OptionValues options = graph.getOptions();
+
+        if (entryProbability < MinimumPeelFrequency.getValue(options)) {
             return false;
         }
+
+        if (loop.parent() != null) {
+            if (loop.size() > loop.parent().size() >> 1) {
+                // This loops make up more than half of the parent loop in terms of number of nodes.
+                // There is a risk that this loop unproportionally increases parent loop body size.
+                return false;
+            }
+        }
+
+        if (loop.loop().getChildren().size() > 0) {
+            // This loop has child loops. Loop peeling could explode graph size.
+            return false;
+        }
+
+        if (loop.size() + graph.getNodeCount() > MaximumDesiredSize.getValue(options)) {
+            // We are out of budget for peeling.
+            return false;
+        }
+
+        return true;
     }
 
     @Override
@@ -189,7 +204,7 @@ public class DefaultLoopPolicies implements LoopPolicies {
             return false;
         }
         OptionValues options = loop.entryPoint().getOptions();
-        return loopBegin.unswitches() <= LoopMaxUnswitch.getValue(options);
+        return loopBegin.unswitches() < LoopMaxUnswitch.getValue(options);
     }
 
     private static final class CountingClosure implements VirtualClosure {
@@ -238,19 +253,9 @@ public class DefaultLoopPolicies implements LoopPolicies {
         int loopTotal = loop.size() - loop.loopBegin().phis().count() - stateNodesCount.count - 1;
         int actualDiff = (loopTotal - inBranchTotal);
         ControlSplitNode firstSplit = controlSplits.get(0);
-        if (firstSplit instanceof TypeSwitchNode) {
-            int copies = firstSplit.successors().count() - 1;
-            for (Node succ : firstSplit.successors()) {
-                FixedNode current = (FixedNode) succ;
-                while (current instanceof FixedWithNextNode) {
-                    current = ((FixedWithNextNode) current).next();
-                }
-                if (current instanceof DeoptimizeNode) {
-                    copies--;
-                }
-            }
-            actualDiff = actualDiff * copies;
-        }
+
+        int copies = firstSplit.successors().count() - 1;
+        actualDiff = actualDiff * copies;
 
         debug.log("shouldUnswitch(%s, %s) : delta=%d (%.2f%% inside of branches), max=%d, f=%.2f, phis=%d -> %b", loop, controlSplits, actualDiff, (double) (inBranchTotal) / loopTotal * 100, maxDiff,
                         loopFrequency, phis, actualDiff <= maxDiff);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java
index bdd1b38d37f..318e8285eb9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopEx.java
@@ -81,6 +81,7 @@ public class LoopEx {
     private LoopsData data;
     private EconomicMap ivs;
     private boolean countedLoopChecked;
+    private int size = -1;
 
     LoopEx(Loop loop, LoopsData data) {
         this.loop = loop;
@@ -156,7 +157,10 @@ public class LoopEx {
     }
 
     public int size() {
-        return whole().nodes().count();
+        if (size == -1) {
+            size = whole().nodes().count();
+        }
+        return size;
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java
index f9f609818a5..8097f91bb68 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragment.java
@@ -349,12 +349,11 @@ public abstract class LoopFragment {
                         TriState isAnchorInLoop = isLoopNode(anchor, loopNodes, nonLoopNodes);
                         if (isAnchorInLoop != TriState.FALSE) {
                             if (!(anchor instanceof LoopExitNode && ((LoopExitNode) anchor).loopBegin() == loopBeginNode)) {
-                                /*
-                                 * (gd) this is wrong in general, it's completely avoidable while we
-                                 * are doing loop transforms using ValueProxies. If it happens after
-                                 * it could still cause problem.
-                                 */
-                                assert !((GuardNode) current).graph().hasValueProxies();
+                                // It is undecidable whether the node is in the loop or not. This is
+                                // not an issue for getting counted loop information,
+                                // but causes issues when using the information for actual loop
+                                // transformations. This is why a loop transformation must
+                                // not happen while guards are floating.
                                 isLoopNode = true;
                             }
                         } else if (AbstractControlFlowGraph.strictlyDominates(cfg.blockFor(anchor), cfg.blockFor(loopBeginNode))) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java
index 05bba16a91b..e0e2690de85 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopFragmentInside.java
@@ -233,7 +233,7 @@ public class LoopFragmentInside extends LoopFragment {
             }
         }
         mainLoopBegin.setUnrollFactor(mainLoopBegin.getUnrollFactor() * 2);
-        mainLoopBegin.setLoopFrequency(mainLoopBegin.loopFrequency() / 2);
+        mainLoopBegin.setLoopFrequency(Math.max(1.0, mainLoopBegin.loopFrequency() / 2));
         graph.getDebug().dump(DebugContext.DETAILED_LEVEL, graph, "LoopPartialUnroll %s", loop);
 
         mainLoopBegin.getDebug().dump(DebugContext.VERBOSE_LEVEL, mainLoopBegin.graph(), "After insertWithinAfter %s", mainLoopBegin);
@@ -438,7 +438,7 @@ public class LoopFragmentInside extends LoopFragment {
             for (int i = 0; i < phi.valueCount(); i++) {
                 ValueNode v = phi.valueAt(i);
                 if (loopBegin.isPhiAtMerge(v)) {
-                    PhiNode newV = peel.getDuplicatedNode((ValuePhiNode) v);
+                    PhiNode newV = peel.getDuplicatedNode((PhiNode) v);
                     if (newV != null) {
                         phi.setValueAt(i, newV);
                     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java
index b16bd6d7689..b5bf3847060 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/LoopPolicies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -28,10 +28,18 @@ import java.util.List;
 
 import org.graalvm.compiler.nodes.ControlSplitNode;
 import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionType;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
 public interface LoopPolicies {
+
+    class Options {
+        @Option(help = "", type = OptionType.Expert) public static final OptionKey PeelALot = new OptionKey<>(false);
+    }
+
     boolean shouldPeel(LoopEx loop, ControlFlowGraph cfg, MetaAccessProvider metaAccess);
 
     boolean shouldFullUnroll(LoopEx loop);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java
index de06c796bdc..720d15e1fae 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.loop/src/org/graalvm/compiler/loop/MathUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -94,7 +94,9 @@ public class MathUtil {
             if (before.predecessor() instanceof FixedBinaryNode) {
                 FixedBinaryNode binaryPredecessor = (FixedBinaryNode) before.predecessor();
                 if (fixedDiv.dataFlowEquals(binaryPredecessor)) {
-                    fixedDiv.safeDelete();
+                    if (fixedDiv.isAlive()) {
+                        fixedDiv.safeDelete();
+                    }
                     return binaryPredecessor;
                 }
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java
index f1d3b31ee26..4c611ce56d2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -28,6 +28,8 @@ import static org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark.Defaults
 import static org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark.Defaults.MEASUREMENT_ITERATIONS;
 import static org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark.Defaults.WARMUP_ITERATIONS;
 
+import org.graalvm.compiler.api.test.ModuleSupport;
+
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Warmup;
@@ -41,6 +43,9 @@ import org.openjdk.jmh.annotations.Warmup;
 @Measurement(iterations = MEASUREMENT_ITERATIONS)
 @Fork(FORKS)
 public class GraalBenchmark {
+    static {
+        ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.compiler");
+    }
 
     public static class Defaults {
         public static final int MEASUREMENT_ITERATIONS = 5;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java
index 5bf5995a619..fe0706724b8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -36,7 +36,7 @@ import org.openjdk.jmh.annotations.Warmup;
 /**
  * This dummy class is used to verify that the JMH microbenchmarking environment is set up properly.
  */
-public class TestJMHWhitebox {
+public class TestJMHWhitebox extends GraalBenchmark {
 
     @Benchmark
     public void testJMH(@SuppressWarnings("unused") GraalState s) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java
index d2fba3465c9..2306602a5da 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java
@@ -67,19 +67,19 @@ public class IfNodeCanonicalizationTest extends GraalCompilerTest {
                     for (byte d : testValues) {
                         values[3] = d;
                         value = 2;
-                        super.test("testSnippet1", values, true);
-                        super.test("testSnippet1", values, false);
+                        super.test("testSnippet1", values);
                     }
                 }
             }
         }
     }
 
-    public int testSnippet1(byte[] values, boolean test) {
+    public int testSnippet1(byte[] values) {
         int v = values[0] - values[1];
-        if (test) {
-            v = values[2] - values[3];
+        if (v < 0) {
+            value = 2;
         }
+        v = values[3] - values[2];
         if (v < 0) {
             value = 1;
         }
@@ -156,13 +156,12 @@ public class IfNodeCanonicalizationTest extends GraalCompilerTest {
         StructuredGraph graph = parseEager(name, AllowAssumptions.YES);
 
         CoreProviders context = getProviders();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         new ConvertDeoptimizeToGuardPhase().apply(graph, context);
         graph.clearAllStateAfter();
         graph.setGuardsStage(StructuredGraph.GuardsStage.AFTER_FSA);
         canonicalizer.apply(graph, context);
 
-        // new DominatorConditionalEliminationPhase(true).apply(graph, context);
         new IterativeConditionalEliminationPhase(canonicalizer, true).apply(graph, context);
         canonicalizer.apply(graph, context);
         canonicalizer.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java
index 27ab0e523cc..ec74f7d5683 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java
@@ -31,7 +31,6 @@ import org.graalvm.compiler.nodes.PhiNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -67,7 +66,7 @@ public class LoopPhiCanonicalizerTest extends GraalCompilerTest {
 
         CoreProviders context = getProviders();
         Assert.assertEquals(5, graph.getNodes().filter(loopPhis).count());
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         Assert.assertEquals(2, graph.getNodes().filter(loopPhis).count());
 
         test("loopSnippet");
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java
index 4433d717f43..2b0899b6b3e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java
@@ -378,7 +378,7 @@ public class ShortCircuitOrNodeTest extends GraalCompilerTest {
             String snippet = "testCascadeSnippet" + i;
             StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
             CoreProviders context = getProviders();
-            CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+            CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
             canonicalizer.apply(graph, context);
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
             new IncrementalCanonicalizerPhase<>(canonicalizer, new FloatingReadPhase()).apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java
index f33692559ba..0a907cfb509 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java
@@ -303,18 +303,11 @@ public final class FrameState extends VirtualState implements IterableNodeType {
         return virtualObjectMappings;
     }
 
-    /**
-     * Gets a copy of this frame state.
-     */
-    public FrameState duplicate(int newBci) {
-        return graph().add(new FrameState(outerFrameState(), code, newBci, values, localsSize, stackSize, rethrowException, duringCall, monitorIds, virtualObjectMappings));
-    }
-
     /**
      * Gets a copy of this frame state.
      */
     public FrameState duplicate() {
-        return duplicate(bci);
+        return graph().add(new FrameState(outerFrameState(), code, bci, values, localsSize, stackSize, rethrowException, duringCall, monitorIds, virtualObjectMappings));
     }
 
     /**
@@ -349,20 +342,6 @@ public final class FrameState extends VirtualState implements IterableNodeType {
         return duplicateModified(graph(), newBci, rethrowException, false, popKind, pushedSlotKinds, pushedValues);
     }
 
-    /**
-     * Creates a copy of this frame state with one stack element of type {@code popKind} popped from
-     * the stack and the values in {@code pushedValues} pushed on the stack. The
-     * {@code pushedValues} will be formatted correctly in slot encoding: a long or double will be
-     * followed by a null slot.
-     */
-    public FrameState duplicateModified(int newBci, boolean newRethrowException, JavaKind popKind, JavaKind[] pushedSlotKinds, ValueNode[] pushedValues) {
-        return duplicateModified(graph(), newBci, newRethrowException, duringCall, popKind, pushedSlotKinds, pushedValues);
-    }
-
-    public FrameState duplicateModified(int newBci, boolean newRethrowException, boolean newDuringCall, JavaKind popKind, JavaKind[] pushedSlotKinds, ValueNode[] pushedValues) {
-        return duplicateModified(graph(), newBci, newRethrowException, newDuringCall, popKind, pushedSlotKinds, pushedValues);
-    }
-
     /**
      * Creates a copy of this frame state with the top of stack replaced with with
      * {@code pushedValue} which must be of type {@code popKind}.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java
index 797a11df031..840fccf188b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -1748,7 +1748,7 @@ class LoopDetector implements Runnable {
                                 "Value flowing out of loop, but we are not prepared to insert a ProxyNode");
 
                 ProxyPlaceholder proxyPlaceholder = (ProxyPlaceholder) value;
-                ValueProxyNode proxy = ProxyNode.forValue(proxyPlaceholder.value, loopExit, graph);
+                ValueProxyNode proxy = ProxyNode.forValue(proxyPlaceholder.value, loopExit);
                 proxyPlaceholder.setValue(proxy);
                 newValues.add(proxy);
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java
index fabb6654ba5..bb9a047cb13 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GuardProxyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -25,19 +25,13 @@
 package org.graalvm.compiler.nodes;
 
 import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.Canonicalizable;
-import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Proxy;
 
-@NodeInfo(allowedUsageTypes = {InputType.Guard}, nameTemplate = "Proxy({i#value})")
-public final class GuardProxyNode extends ProxyNode implements GuardingNode, Proxy, LIRLowerable, Canonicalizable {
+@NodeInfo(allowedUsageTypes = {InputType.Guard}, nameTemplate = "GuardProxy({i#value})")
+public final class GuardProxyNode extends ProxyNode implements GuardingNode {
 
     public static final NodeClass TYPE = NodeClass.create(GuardProxyNode.class);
     @OptionalInput(InputType.Guard) GuardingNode value;
@@ -47,10 +41,6 @@ public final class GuardProxyNode extends ProxyNode implements GuardingNode, Pro
         this.value = value;
     }
 
-    @Override
-    public void generate(NodeLIRBuilderTool generator) {
-    }
-
     public void setValue(GuardingNode newValue) {
         this.updateUsages(value.asNode(), newValue.asNode());
         this.value = newValue;
@@ -65,17 +55,4 @@ public final class GuardProxyNode extends ProxyNode implements GuardingNode, Pro
     public PhiNode createPhi(AbstractMergeNode merge) {
         return graph().addWithoutUnique(new GuardPhiNode(merge));
     }
-
-    @Override
-    public Node getOriginalNode() {
-        return (value == null ? null : value.asNode());
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value == null) {
-            return null;
-        }
-        return this;
-    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java
index 966b0166103..cd01b55fb58 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java
@@ -54,7 +54,6 @@ import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.graph.spi.Canonicalizable;
 import org.graalvm.compiler.graph.spi.Simplifiable;
 import org.graalvm.compiler.graph.spi.SimplifierTool;
 import org.graalvm.compiler.nodeinfo.InputType;
@@ -95,9 +94,6 @@ import jdk.vm.ci.meta.TriState;
 public final class IfNode extends ControlSplitNode implements Simplifiable, LIRLowerable, IterableNodeType, SwitchFoldable {
     public static final NodeClass TYPE = NodeClass.create(IfNode.class);
 
-    private static final int MAX_USAGE_COLOR_SET_SIZE = 64;
-    private static final int MAX_FRAMESTATE_SEARCH_DEPTH = 4;
-
     private static final CounterKey CORRECTED_PROBABILITIES = DebugContext.counter("CorrectedProbabilities");
 
     @Successor AbstractBeginNode trueSuccessor;
@@ -297,10 +293,6 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
             return;
         }
 
-        if (splitIfAtPhi(tool)) {
-            return;
-        }
-
         if (conditionalNodeOptimization(tool)) {
             return;
         }
@@ -1184,400 +1176,6 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
         MIXED
     }
 
-    /**
-     * Take an if that is immediately dominated by a merge with a single phi and split off any paths
-     * where the test would be statically decidable creating a new merge below the appropriate side
-     * of the IfNode. Any undecidable tests will continue to use the original IfNode.
-     *
-     * @param tool
-     */
-    @SuppressWarnings("try")
-    private boolean splitIfAtPhi(SimplifierTool tool) {
-        if (!(predecessor() instanceof MergeNode)) {
-            return false;
-        }
-        MergeNode merge = (MergeNode) predecessor();
-        if (merge.forwardEndCount() == 1) {
-            // Don't bother.
-            return false;
-        }
-        if (merge.getUsageCount() != 1 || merge.phis().count() != 1) {
-            // Don't trigger with multiple phis. Would require more rewiring.
-            // Most of the time the additional phis are memory phis that are removed after
-            // fixed read phase.
-            return false;
-        }
-        if (graph().getGuardsStage().areFrameStatesAtSideEffects() && merge.stateAfter() == null) {
-            return false;
-        }
-
-        PhiNode generalPhi = merge.phis().first();
-        if (!(generalPhi instanceof ValuePhiNode)) {
-            return false;
-        }
-
-        if (trueSuccessor().isUsedAsGuardInput() || falseSuccessor().isUsedAsGuardInput()) {
-            return false;
-        }
-
-        ValuePhiNode phi = (ValuePhiNode) generalPhi;
-
-        EconomicMap coloredNodes = EconomicMap.create(Equivalence.IDENTITY, 8);
-
-        /*
-         * Check that the condition uses the phi and that there is only one user of the condition
-         * expression.
-         */
-        if (!conditionUses(condition(), phi, coloredNodes)) {
-            return false;
-        }
-
-        if (!mayRemoveSplit(merge)) {
-            return false;
-        }
-
-        LogicNode[] results = new LogicNode[merge.forwardEndCount()];
-        boolean success = false;
-        for (int i = 0; i < results.length; ++i) {
-            ValueNode value = phi.valueAt(i);
-            LogicNode curResult = computeCondition(tool, condition, phi, value);
-            if (curResult != condition) {
-                for (Node n : curResult.inputs()) {
-                    if (n instanceof ConstantNode || n instanceof ParameterNode || n instanceof FixedNode) {
-                        // Constant inputs or parameters or fixed nodes are OK.
-                    } else if (n == value) {
-                        // References to the value itself are also OK.
-                    } else {
-                        // Input may cause scheduling issues.
-                        curResult = condition;
-                        break;
-                    }
-                }
-                success = true;
-            }
-            results[i] = curResult;
-        }
-
-        if (!success) {
-            return false;
-        }
-
-        for (Node usage : phi.usages()) {
-            if (usage == merge.stateAfter()) {
-                // This usage can be ignored, because it is directly in the state after.
-            } else {
-                NodeColor color = colorUsage(coloredNodes, usage, merge, this.trueSuccessor(), this.falseSuccessor());
-                if (color == NodeColor.MIXED) {
-                    return false;
-                }
-            }
-        }
-
-        /*
-         * We could additionally filter for the case that at least some of the Phi inputs or one of
-         * the condition inputs are constants but there are cases where a non-constant is
-         * simplifiable, usually where the stamp allows the question to be answered.
-         */
-
-        /* Each successor of the if gets a new merge if needed. */
-        MergeNode trueMerge = null;
-        MergeNode falseMerge = null;
-        int i = 0;
-        for (EndNode end : merge.forwardEnds().snapshot()) {
-            ValueNode value = phi.valueAt(end);
-            LogicNode result = results[i++];
-            if (result instanceof LogicConstantNode) {
-                if (((LogicConstantNode) result).getValue()) {
-                    if (trueMerge == null) {
-                        trueMerge = insertMerge(trueSuccessor(), phi, merge.stateAfter(), tool);
-                        replaceNodesInBranch(coloredNodes, NodeColor.TRUE_BRANCH, phi, trueMerge.phis().first());
-                    }
-                    trueMerge.phis().first().addInput(value);
-                    trueMerge.addForwardEnd(end);
-                } else {
-                    if (falseMerge == null) {
-                        falseMerge = insertMerge(falseSuccessor(), phi, merge.stateAfter(), tool);
-                        replaceNodesInBranch(coloredNodes, NodeColor.FALSE_BRANCH, phi, falseMerge.phis().first());
-                    }
-                    falseMerge.phis().first().addInput(value);
-                    falseMerge.addForwardEnd(end);
-                }
-                merge.removeEnd(end);
-            } else if (result != condition) {
-                // Build a new IfNode using the new condition
-                BeginNode trueBegin = graph().add(new BeginNode());
-                trueBegin.setNodeSourcePosition(trueSuccessor().getNodeSourcePosition());
-                BeginNode falseBegin = graph().add(new BeginNode());
-                falseBegin.setNodeSourcePosition(falseSuccessor().getNodeSourcePosition());
-
-                if (result.graph() == null) {
-                    result = graph().addOrUniqueWithInputs(result);
-                    result.setNodeSourcePosition(condition.getNodeSourcePosition());
-                }
-                IfNode newIfNode = graph().add(new IfNode(result, trueBegin, falseBegin, trueSuccessorProbability));
-                newIfNode.setNodeSourcePosition(getNodeSourcePosition());
-
-                if (trueMerge == null) {
-                    trueMerge = insertMerge(trueSuccessor(), phi, merge.stateAfter(), tool);
-                    replaceNodesInBranch(coloredNodes, NodeColor.TRUE_BRANCH, phi, trueMerge.phis().first());
-                }
-                trueMerge.phis().first().addInput(value);
-                trueBegin.setNext(graph().add(new EndNode()));
-                trueMerge.addForwardEnd((EndNode) trueBegin.next());
-
-                if (falseMerge == null) {
-                    falseMerge = insertMerge(falseSuccessor(), phi, merge.stateAfter(), tool);
-                    replaceNodesInBranch(coloredNodes, NodeColor.FALSE_BRANCH, phi, falseMerge.phis().first());
-                }
-                falseMerge.phis().first().addInput(value);
-                falseBegin.setNext(graph().add(new EndNode()));
-                falseMerge.addForwardEnd((EndNode) falseBegin.next());
-
-                merge.removeEnd(end);
-                ((FixedWithNextNode) end.predecessor()).setNext(newIfNode);
-                end.safeDelete();
-            }
-        }
-
-        cleanupMerge(merge);
-        cleanupMerge(trueMerge);
-        cleanupMerge(falseMerge);
-
-        return true;
-    }
-
-    private static void replaceNodesInBranch(EconomicMap coloredNodes, NodeColor branch, ValuePhiNode phi, ValueNode newValue) {
-        for (Node n : phi.usages().snapshot()) {
-            if (coloredNodes.get(n) == branch) {
-                n.replaceAllInputs(phi, newValue);
-            } else if (coloredNodes.get(n) == NodeColor.PHI_MIXED) {
-                assert n instanceof PhiNode;
-                PhiNode phiNode = (PhiNode) n;
-                AbstractMergeNode merge = phiNode.merge();
-                for (int i = 0; i < merge.forwardEndCount(); ++i) {
-                    if (phiNode.valueAt(i) == phi && coloredNodes.get(merge.forwardEndAt(i)) == branch) {
-                        phiNode.setValueAt(i, newValue);
-                    }
-                }
-            }
-        }
-    }
-
-    private NodeColor colorUsage(EconomicMap coloredNodes, Node node, MergeNode merge, AbstractBeginNode trueSucc, AbstractBeginNode falseSucc) {
-        NodeColor color = coloredNodes.get(node);
-        if (color == null) {
-
-            if (coloredNodes.size() >= MAX_USAGE_COLOR_SET_SIZE) {
-                return NodeColor.MIXED;
-            }
-
-            coloredNodes.put(node, NodeColor.MIXED);
-
-            if (node == merge) {
-                color = NodeColor.MIXED;
-            } else if (node == trueSucc) {
-                color = NodeColor.TRUE_BRANCH;
-            } else if (node == falseSucc) {
-                color = NodeColor.FALSE_BRANCH;
-            } else {
-                if (node instanceof AbstractMergeNode) {
-                    AbstractMergeNode mergeNode = (AbstractMergeNode) node;
-                    NodeColor combinedColor = null;
-                    for (int i = 0; i < mergeNode.forwardEndCount(); ++i) {
-                        NodeColor curColor = colorUsage(coloredNodes, mergeNode.forwardEndAt(i), merge, trueSucc, falseSucc);
-                        if (combinedColor == null) {
-                            combinedColor = curColor;
-                        } else if (combinedColor != curColor) {
-                            combinedColor = NodeColor.MIXED;
-                            break;
-                        }
-                    }
-                    color = combinedColor;
-                } else if (node instanceof StartNode) {
-                    color = NodeColor.MIXED;
-                } else if (node instanceof FixedNode) {
-                    FixedNode fixedNode = (FixedNode) node;
-                    Node predecessor = fixedNode.predecessor();
-                    assert predecessor != null : fixedNode;
-                    color = colorUsage(coloredNodes, predecessor, merge, trueSucc, falseSucc);
-                } else if (node instanceof PhiNode) {
-                    PhiNode phiNode = (PhiNode) node;
-                    AbstractMergeNode phiMerge = phiNode.merge();
-
-                    if (phiMerge instanceof LoopBeginNode) {
-                        color = colorUsage(coloredNodes, phiMerge, merge, trueSucc, falseSucc);
-                    } else {
-
-                        for (int i = 0; i < phiMerge.forwardEndCount(); ++i) {
-                            NodeColor curColor = colorUsage(coloredNodes, phiMerge.forwardEndAt(i), merge, trueSucc, falseSucc);
-                            if (curColor != NodeColor.TRUE_BRANCH && curColor != NodeColor.FALSE_BRANCH) {
-                                color = NodeColor.MIXED;
-                                break;
-                            }
-                        }
-
-                        if (color == null) {
-                            // Each of the inputs to the phi are either coming unambigously from
-                            // true or false branch.
-                            color = NodeColor.PHI_MIXED;
-                            assert node instanceof PhiNode;
-                        }
-                    }
-                } else {
-                    NodeColor combinedColor = null;
-                    for (Node n : node.usages()) {
-                        if (n != node) {
-                            NodeColor curColor = colorUsage(coloredNodes, n, merge, trueSucc, falseSucc);
-                            if (combinedColor == null) {
-                                combinedColor = curColor;
-                            } else if (combinedColor != curColor) {
-                                combinedColor = NodeColor.MIXED;
-                                break;
-                            }
-                        }
-                    }
-                    if (combinedColor == NodeColor.PHI_MIXED) {
-                        combinedColor = NodeColor.MIXED;
-                    }
-                    if (combinedColor == null) {
-                        // Floating node without usages => association unclear.
-                        combinedColor = NodeColor.MIXED;
-                    }
-                    color = combinedColor;
-                }
-            }
-
-            assert color != null : node;
-            coloredNodes.put(node, color);
-        }
-        return color;
-    }
-
-    /**
-     * @param condition
-     * @param phi
-     * @param coloredNodes
-     * @return true if the passed in {@code condition} uses {@code phi} and the condition is only
-     *         used once. Since the phi will go dead the condition using it will also have to be
-     *         dead after the optimization.
-     */
-    private static boolean conditionUses(LogicNode condition, PhiNode phi, EconomicMap coloredNodes) {
-        if (!condition.hasExactlyOneUsage()) {
-            return false;
-        }
-        if (condition instanceof ShortCircuitOrNode) {
-            if (condition.graph().getGuardsStage().areDeoptsFixed()) {
-                /*
-                 * It can be unsafe to simplify a ShortCircuitOr before deopts are fixed because
-                 * conversion to guards assumes that all the required conditions are being tested.
-                 * Simplfying the condition based on context before this happens may lose a
-                 * condition.
-                 */
-                ShortCircuitOrNode orNode = (ShortCircuitOrNode) condition;
-                return (conditionUses(orNode.x, phi, coloredNodes) || conditionUses(orNode.y, phi, coloredNodes));
-            }
-        } else if (condition instanceof Canonicalizable.Unary) {
-            Canonicalizable.Unary unary = (Canonicalizable.Unary) condition;
-            if (unary.getValue() == phi) {
-                coloredNodes.put(condition, NodeColor.CONDITION_USAGE);
-                return true;
-            }
-        } else if (condition instanceof Canonicalizable.Binary) {
-            Canonicalizable.Binary binary = (Canonicalizable.Binary) condition;
-            if (binary.getX() == phi || binary.getY() == phi) {
-                coloredNodes.put(condition, NodeColor.CONDITION_USAGE);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Canonicalize {@code} condition using {@code value} in place of {@code phi}.
-     *
-     * @param tool
-     * @param condition
-     * @param phi
-     * @param value
-     * @return an improved LogicNode or the original condition
-     */
-    @SuppressWarnings("unchecked")
-    private static LogicNode computeCondition(SimplifierTool tool, LogicNode condition, PhiNode phi, Node value) {
-        if (condition instanceof ShortCircuitOrNode) {
-            if (condition.graph().getGuardsStage().areDeoptsFixed() && !condition.graph().isAfterExpandLogic()) {
-                ShortCircuitOrNode orNode = (ShortCircuitOrNode) condition;
-                LogicNode resultX = computeCondition(tool, orNode.x, phi, value);
-                LogicNode resultY = computeCondition(tool, orNode.y, phi, value);
-                if (resultX != orNode.x || resultY != orNode.y) {
-                    LogicNode result = orNode.canonical(tool, resultX, resultY);
-                    if (result != orNode) {
-                        return result;
-                    }
-                    /*
-                     * Create a new node to carry the optimized inputs.
-                     */
-                    ShortCircuitOrNode newOr = new ShortCircuitOrNode(resultX, orNode.xNegated, resultY,
-                                    orNode.yNegated, orNode.getShortCircuitProbability());
-                    return newOr.canonical(tool);
-                }
-                return orNode;
-            }
-        } else if (condition instanceof Canonicalizable.Binary) {
-            Canonicalizable.Binary compare = (Canonicalizable.Binary) condition;
-            if (compare.getX() == phi || compare.getY() == phi) {
-                return (LogicNode) compare.canonical(tool, compare.getX() == phi ? value : compare.getX(), compare.getY() == phi ? value : compare.getY());
-            }
-        } else if (condition instanceof Canonicalizable.Unary) {
-            Canonicalizable.Unary compare = (Canonicalizable.Unary) condition;
-            if (compare.getValue() == phi) {
-                return (LogicNode) compare.canonical(tool, value);
-            }
-        }
-        if (condition instanceof Canonicalizable) {
-            return (LogicNode) ((Canonicalizable) condition).canonical(tool);
-        }
-        return condition;
-    }
-
-    private void cleanupMerge(MergeNode merge) {
-        if (merge != null && merge.isAlive()) {
-            if (merge.forwardEndCount() == 0) {
-                GraphUtil.killCFG(merge);
-            } else if (merge.forwardEndCount() == 1) {
-                graph().reduceTrivialMerge(merge);
-            }
-        }
-    }
-
-    @SuppressWarnings("try")
-    private MergeNode insertMerge(AbstractBeginNode begin, ValuePhiNode oldPhi, FrameState stateAfter, SimplifierTool tool) {
-        MergeNode merge = graph().add(new MergeNode());
-
-        AbstractBeginNode newBegin;
-        try (DebugCloseable position = begin.withNodeSourcePosition()) {
-            newBegin = graph().add(new BeginNode());
-            begin.replaceAtPredecessor(newBegin);
-            newBegin.setNext(begin);
-        }
-
-        FixedNode next = newBegin.next();
-        next.replaceAtPredecessor(merge);
-        newBegin.setNext(graph().add(new EndNode()));
-        merge.addForwardEnd((EndNode) newBegin.next());
-
-        ValuePhiNode phi = begin.graph().addOrUnique(new ValuePhiNode(oldPhi.stamp(NodeView.DEFAULT), merge));
-        phi.addInput(oldPhi);
-
-        if (stateAfter != null) {
-            FrameState newState = stateAfter.duplicate();
-            newState.replaceAllInputs(oldPhi, phi);
-            merge.setStateAfter(newState);
-        }
-        merge.setNext(next);
-        tool.addToWorkList(begin);
-        return merge;
-    }
-
     /**
      * Tries to connect code that initializes a variable directly with the successors of an if
      * construct that switches on the variable. For example, the pseudo code below:
@@ -1709,7 +1307,7 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
             return false;
         }
 
-        if (!mayRemoveSplit(merge)) {
+        if (merge.stateAfter() != null && !GraphUtil.mayRemoveSplit(this)) {
             return false;
         }
 
@@ -1771,15 +1369,6 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
         return true;
     }
 
-    private boolean mayRemoveSplit(AbstractMergeNode merge) {
-
-        if (merge.stateAfter() != null && (!checkFrameState(trueSuccessor, MAX_FRAMESTATE_SEARCH_DEPTH) || !checkFrameState(trueSuccessor, MAX_FRAMESTATE_SEARCH_DEPTH))) {
-            return false;
-        }
-
-        return true;
-    }
-
     private static void propagateZeroProbability(FixedNode startNode) {
         Node prev = null;
         for (FixedNode node : GraphUtil.predecessorIterable(startNode)) {
@@ -1816,53 +1405,6 @@ public final class IfNode extends ControlSplitNode implements Simplifiable, LIRL
         }
     }
 
-    /**
-     * Snippet lowerings may produce patterns without a frame state on the merge. We need to take
-     * extra care when optimizing these patterns.
-     */
-    private static boolean checkFrameState(FixedNode start, int maxDepth) {
-        if (maxDepth == 0) {
-            return false;
-        }
-        FixedNode node = start;
-        while (true) {
-            if (node instanceof AbstractMergeNode) {
-                AbstractMergeNode mergeNode = (AbstractMergeNode) node;
-                if (mergeNode.stateAfter() == null) {
-                    return false;
-                } else {
-                    return true;
-                }
-            } else if (node instanceof StateSplit) {
-                StateSplit stateSplitNode = (StateSplit) node;
-                if (stateSplitNode.stateAfter() != null) {
-                    return true;
-                }
-            }
-
-            if (node instanceof ControlSplitNode) {
-                ControlSplitNode controlSplitNode = (ControlSplitNode) node;
-                for (Node succ : controlSplitNode.cfgSuccessors()) {
-                    if (checkFrameState((FixedNode) succ, maxDepth - 1)) {
-                        return true;
-                    }
-                }
-                return false;
-            } else if (node instanceof FixedWithNextNode) {
-                FixedWithNextNode fixedWithNextNode = (FixedWithNextNode) node;
-                node = fixedWithNextNode.next();
-            } else if (node instanceof AbstractEndNode) {
-                AbstractEndNode endNode = (AbstractEndNode) node;
-                node = endNode.merge();
-            } else if (node instanceof ControlSinkNode) {
-                return true;
-            } else {
-                assert false : "unexpected node";
-                return false;
-            }
-        }
-    }
-
     /**
      * Connects a set of ends to a given successor, inserting a merge node if there is more than one
      * end. If {@code ends} is not empty, then {@code successor} is added to {@code tool}'s
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java
index f2bce556645..ab05a580048 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java
@@ -109,7 +109,7 @@ public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke
         this.bci = invoke.bci;
         this.polymorphic = invoke.polymorphic;
         this.useForInlining = invoke.useForInlining;
-        this.identity = invoke.getLocationIdentity();
+        this.identity = invoke.getKilledLocationIdentity();
     }
 
     @Override
@@ -181,7 +181,7 @@ public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return identity;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
index 3a8aede66fb..799802478d0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
@@ -159,7 +159,7 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I
     @Override
     public void setNext(FixedNode x) {
         if (x != null) {
-            this.setNext(KillingBeginNode.begin(x, getLocationIdentity()));
+            this.setNext(KillingBeginNode.begin(x, this.getKilledLocationIdentity()));
         } else {
             this.setNext(null);
         }
@@ -192,7 +192,7 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
@@ -290,7 +290,7 @@ public final class InvokeWithExceptionNode extends ControlSplitNode implements I
      * code.
      */
     public InvokeNode replaceWithInvoke() {
-        InvokeNode newInvoke = graph().add(new InvokeNode(callTarget, bci, stamp, getLocationIdentity()));
+        InvokeNode newInvoke = graph().add(new InvokeNode(callTarget, bci, stamp, this.getKilledLocationIdentity()));
         newInvoke.setStateAfter(stateAfter);
         newInvoke.setStateDuring(stateDuring);
         AbstractBeginNode oldException = this.exceptionEdge;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java
index 95045aba513..4de2ed1bee6 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -58,7 +58,7 @@ public final class KillingBeginNode extends AbstractBeginNode implements MemoryC
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return locationIdentity;
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
index c98b05be1c1..a22d90621a8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
@@ -141,7 +141,7 @@ public final class LoopBeginNode extends AbstractMergeNode implements IterableNo
     }
 
     public void setLoopFrequency(double loopFrequency) {
-        assert loopFrequency >= 0;
+        assert loopFrequency >= 1.0;
         this.loopFrequency = loopFrequency;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MemoryProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MemoryProxyNode.java
new file mode 100644
index 00000000000..c3fcd912bb2
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/MemoryProxyNode.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.nodes;
+
+import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.memory.MemoryNode;
+import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
+import jdk.internal.vm.compiler.word.LocationIdentity;
+
+@NodeInfo(allowedUsageTypes = {InputType.Memory}, nameTemplate = "MemoryProxy({i#value})")
+public final class MemoryProxyNode extends ProxyNode implements MemoryNode {
+
+    public static final NodeClass TYPE = NodeClass.create(MemoryProxyNode.class);
+    @OptionalInput(InputType.Memory) MemoryNode value;
+    protected final LocationIdentity locationIdentity;
+
+    public MemoryProxyNode(MemoryNode value, LoopExitNode proxyPoint, LocationIdentity locationIdentity) {
+        super(TYPE, StampFactory.forVoid(), proxyPoint);
+        this.value = value;
+        this.locationIdentity = locationIdentity;
+    }
+
+    public void setValue(MemoryNode newValue) {
+        this.updateUsages(value.asNode(), newValue.asNode());
+        this.value = newValue;
+    }
+
+    @Override
+    public ValueNode value() {
+        return (value == null ? null : value.asNode());
+    }
+
+    @Override
+    public PhiNode createPhi(AbstractMergeNode merge) {
+        return graph().addWithoutUnique(new MemoryPhiNode(merge, locationIdentity));
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java
index 8f35e0c37a5..d1ce5b4012d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProxyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -29,18 +29,24 @@ import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Node.ValueNumberable;
+import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.graph.spi.CanonicalizerTool;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.memory.MemoryNode;
+import org.graalvm.compiler.nodes.spi.Proxy;
+import jdk.internal.vm.compiler.word.LocationIdentity;
 
 /**
  * A proxy is inserted at loop exits for any value that is created inside the loop (i.e. was not
  * live on entry to the loop) and is (potentially) used after the loop.
  */
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
-public abstract class ProxyNode extends FloatingNode implements ValueNumberable {
+public abstract class ProxyNode extends FloatingNode implements Proxy, ValueNumberable, Canonicalizable {
 
     public static final NodeClass TYPE = NodeClass.create(ProxyNode.class);
     @Input(Association) LoopExitNode loopExit;
@@ -62,18 +68,35 @@ public abstract class ProxyNode extends FloatingNode implements ValueNumberable
         return loopExit;
     }
 
+    @Override
+    public ValueNode getOriginalNode() {
+        return value();
+    }
+
     @Override
     public boolean verify() {
         assert !(value() instanceof ProxyNode) || ((ProxyNode) value()).loopExit != loopExit;
         return super.verify();
     }
 
-    public static ValueProxyNode forValue(ValueNode value, LoopExitNode exit, StructuredGraph graph) {
-        return graph.unique(new ValueProxyNode(value, exit));
+    public static ValueProxyNode forValue(ValueNode value, LoopExitNode exit) {
+        return exit.graph().unique(new ValueProxyNode(value, exit));
     }
 
-    public static GuardProxyNode forGuard(GuardingNode value, LoopExitNode exit, StructuredGraph graph) {
-        return graph.unique(new GuardProxyNode(value, exit));
+    public static GuardProxyNode forGuard(GuardingNode value, LoopExitNode exit) {
+        return exit.graph().unique(new GuardProxyNode(value, exit));
+    }
+
+    public static MemoryProxyNode forMemory(MemoryNode value, LoopExitNode exit, LocationIdentity locationIdentity) {
+        return exit.graph().unique(new MemoryProxyNode(value, exit, locationIdentity));
+    }
+
+    @Override
+    public Node canonical(CanonicalizerTool tool) {
+        if (value() == null) {
+            return null;
+        }
+        return this;
     }
 
     public abstract PhiNode createPhi(AbstractMergeNode merge);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java
index 5b9d7448998..338eafe8eda 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StartNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -49,7 +49,7 @@ public class StartNode extends BeginStateSplitNode implements MemoryCheckpoint.S
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
index 8a84fc2db67..f6b9d4eb2da 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
@@ -125,6 +125,10 @@ public final class StructuredGraph extends Graph implements JavaMethodContext {
         public boolean areDeoptsFixed() {
             return this.ordinal() >= FIXED_DEOPTS.ordinal();
         }
+
+        public boolean requiresValueProxies() {
+            return this != AFTER_FSA;
+        }
     }
 
     /**
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java
index 86e0773e5a7..907844f6a82 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueProxyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -35,7 +35,7 @@ import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
 
-@NodeInfo(nameTemplate = "Proxy({i#value})")
+@NodeInfo(nameTemplate = "ValueProxy({i#value})")
 public final class ValueProxyNode extends ProxyNode implements Canonicalizable, Virtualizable, ValueProxy {
 
     public static final NodeClass TYPE = NodeClass.create(ValueProxyNode.class);
@@ -65,8 +65,13 @@ public final class ValueProxyNode extends ProxyNode implements Canonicalizable,
 
     @Override
     public Node canonical(CanonicalizerTool tool) {
+        Node result = super.canonical(tool);
+        if (result != this) {
+            return result;
+        }
+
         ValueNode curValue = value;
-        if (curValue.isConstant()) {
+        if (curValue.getNodeClass().isLeafNode()) {
             return curValue;
         }
         if (loopPhiProxy && !loopExit.loopBegin().isPhiAtMerge(curValue)) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java
index 78886631a05..2f8f2ba6f45 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/AndNode.java
@@ -28,7 +28,6 @@ import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.spi.Canonicalizable.BinaryCommutative;
@@ -41,7 +40,6 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 
-import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
 
@@ -61,7 +59,7 @@ public final class AndNode extends BinaryArithmeticNode implements Narrowab
         if (tryConstantFold != null) {
             return tryConstantFold;
         }
-        return canonical(null, op, stamp, x, y, view);
+        return canonical(null, op, x, y, view);
     }
 
     @Override
@@ -77,16 +75,29 @@ public final class AndNode extends BinaryArithmeticNode implements Narrowab
         }
 
         NodeView view = NodeView.from(tool);
-        return canonical(this, getOp(forX, forY), stamp(view), forX, forY, view);
+        return canonical(this, getOp(forX, forY), forX, forY, view);
     }
 
-    private static ValueNode canonical(AndNode self, BinaryOp op, Stamp stamp, ValueNode forX, ValueNode forY, NodeView view) {
+    private static ValueNode canonical(AndNode self, BinaryOp op, ValueNode forX, ValueNode forY, NodeView view) {
         if (GraphUtil.unproxify(forX) == GraphUtil.unproxify(forY)) {
             return forX;
         }
         if (forX.isConstant() && !forY.isConstant()) {
             return new AndNode(forY, forX);
         }
+
+        Stamp rawXStamp = forX.stamp(view);
+        Stamp rawYStamp = forY.stamp(view);
+        if (rawXStamp instanceof IntegerStamp && rawYStamp instanceof IntegerStamp) {
+            IntegerStamp xStamp = (IntegerStamp) rawXStamp;
+            IntegerStamp yStamp = (IntegerStamp) rawYStamp;
+            if (((~xStamp.downMask()) & yStamp.upMask()) == 0) {
+                return forY;
+            } else if (((~yStamp.downMask()) & xStamp.upMask()) == 0) {
+                return forX;
+            }
+        }
+
         if (forY.isConstant()) {
             Constant c = forY.asConstant();
             if (op.isNeutral(c)) {
@@ -95,21 +106,12 @@ public final class AndNode extends BinaryArithmeticNode implements Narrowab
 
             if (c instanceof PrimitiveConstant && ((PrimitiveConstant) c).getJavaKind().isNumericInteger()) {
                 long rawY = ((PrimitiveConstant) c).asLong();
-                long mask = CodeUtil.mask(PrimitiveStamp.getBits(stamp));
-                if ((rawY & mask) == 0) {
-                    return ConstantNode.forIntegerStamp(stamp, 0);
-                }
                 if (forX instanceof SignExtendNode) {
                     SignExtendNode ext = (SignExtendNode) forX;
                     if (rawY == ((1L << ext.getInputBits()) - 1)) {
                         return new ZeroExtendNode(ext.getValue(), ext.getResultBits());
                     }
                 }
-                IntegerStamp xStamp = (IntegerStamp) forX.stamp(view);
-                if (((xStamp.upMask() | xStamp.downMask()) & ~rawY) == 0) {
-                    // No bits are set which are outside the mask, so the mask will have no effect.
-                    return forX;
-                }
             }
 
             return reassociate(self != null ? self : (AndNode) new AndNode(forX, forY).maybeCommuteInputs(), ValueNode.isConstantPredicate(), forX, forY, view);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java
index d66a2bff234..4a9e44791b8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java
@@ -59,6 +59,10 @@ public abstract class BinaryArithmeticNode extends BinaryNode implements Ari
         super(c, opForStampComputation.foldStamp(x.stamp(NodeView.DEFAULT), y.stamp(NodeView.DEFAULT)), x, y);
     }
 
+    protected BinaryArithmeticNode(NodeClass> c, Stamp stamp, ValueNode x, ValueNode y) {
+        super(c, stamp, x, y);
+    }
+
     public static ArithmeticOpTable getArithmeticOpTable(ValueNode forValue) {
         return ArithmeticOpTable.forStamp(forValue.stamp(NodeView.DEFAULT));
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java
index b61240e357c..3831a930315 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -33,8 +33,11 @@ import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
 import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
+import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.Position;
 import org.graalvm.compiler.graph.spi.Canonicalizable;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.BinaryOpLogicNode;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -44,6 +47,7 @@ import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.VolatileReadNode;
 import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Constant;
@@ -189,6 +193,19 @@ public abstract class CompareNode extends BinaryOpLogicNode implements Canonical
             } else if (nonConstant instanceof ConvertNode) {
                 ConvertNode convert = (ConvertNode) nonConstant;
                 boolean multiUsage = (convert.asNode().hasMoreThanOneUsage() && convert.getValue().hasExactlyOneUsage());
+                if (!multiUsage && convert.asNode().hasMoreThanOneUsage() && convert.getValue() instanceof VolatileReadNode) {
+                    // Only account for data usages
+                    VolatileReadNode read = (VolatileReadNode) convert.getValue();
+                    int nonMemoryEdges = 0;
+                    for (Node u : read.usages()) {
+                        for (Position pos : u.inputPositions()) {
+                            if (pos.get(u) == read && pos.getInputType() != InputType.Memory) {
+                                nonMemoryEdges++;
+                            }
+                        }
+                    }
+                    multiUsage = nonMemoryEdges == 1;
+                }
                 if (convert instanceof IntegerConvertNode && multiUsage) {
                     // Do not perform for integer convers if it could introduce
                     // new live values.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java
index 67e1ea171b2..9fb39842475 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/OrNode.java
@@ -27,7 +27,7 @@ package org.graalvm.compiler.nodes.calc;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
+import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.spi.Canonicalizable.BinaryCommutative;
@@ -40,9 +40,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 
-import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.PrimitiveConstant;
 
 @NodeInfo(shortName = "|")
 public final class OrNode extends BinaryArithmeticNode implements BinaryCommutative, NarrowableArithmeticNode {
@@ -53,6 +51,18 @@ public final class OrNode extends BinaryArithmeticNode implements BinaryComm
         super(TYPE, getArithmeticOpTable(x).getOr(), x, y);
     }
 
+    private OrNode(ValueNode x, ValueNode y, Stamp forcedStamp) {
+        super(TYPE, forcedStamp, x, y);
+    }
+
+    /**
+     * Create a new XorNode with a forced stamp, without eager folding. This should only be used in
+     * snippet code, where native-image may assign wrong stamps during graph generation.
+     */
+    public static ValueNode createForSnippet(ValueNode x, ValueNode y, Stamp forcedStamp) {
+        return new OrNode(x, y, forcedStamp);
+    }
+
     public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
         BinaryOp op = ArithmeticOpTable.forStamp(x.stamp(view)).getOr();
         Stamp stamp = op.foldStamp(x.stamp(view), y.stamp(view));
@@ -60,7 +70,7 @@ public final class OrNode extends BinaryArithmeticNode implements BinaryComm
         if (tryConstantFold != null) {
             return tryConstantFold;
         }
-        return canonical(null, op, stamp, x, y, view);
+        return canonical(null, op, x, y, view);
     }
 
     @Override
@@ -76,34 +86,42 @@ public final class OrNode extends BinaryArithmeticNode implements BinaryComm
             return ret;
         }
 
-        return canonical(this, getOp(forX, forY), stamp(view), forX, forY, view);
+        return canonical(this, getOp(forX, forY), forX, forY, view);
     }
 
-    private static ValueNode canonical(OrNode self, BinaryOp op, Stamp stamp, ValueNode forX, ValueNode forY, NodeView view) {
+    private static ValueNode canonical(OrNode self, BinaryOp op, ValueNode forX, ValueNode forY, NodeView view) {
         if (GraphUtil.unproxify(forX) == GraphUtil.unproxify(forY)) {
             return forX;
         }
         if (forX.isConstant() && !forY.isConstant()) {
             return new OrNode(forY, forX);
         }
+
+        Stamp rawXStamp = forX.stamp(view);
+        Stamp rawYStamp = forY.stamp(view);
+        if (rawXStamp instanceof IntegerStamp && rawYStamp instanceof IntegerStamp) {
+            IntegerStamp xStamp = (IntegerStamp) rawXStamp;
+            IntegerStamp yStamp = (IntegerStamp) rawYStamp;
+            if (((~xStamp.downMask()) & yStamp.upMask()) == 0) {
+                return forX;
+            } else if (((~yStamp.downMask()) & xStamp.upMask()) == 0) {
+                return forY;
+            }
+        }
+
         if (forY.isConstant()) {
             Constant c = forY.asConstant();
             if (op.isNeutral(c)) {
                 return forX;
             }
 
-            if (c instanceof PrimitiveConstant && ((PrimitiveConstant) c).getJavaKind().isNumericInteger()) {
-                long rawY = ((PrimitiveConstant) c).asLong();
-                long mask = CodeUtil.mask(PrimitiveStamp.getBits(stamp));
-                if ((rawY & mask) == mask) {
-                    return ConstantNode.forIntegerStamp(stamp, mask);
-                }
-            }
             return reassociate(self != null ? self : (OrNode) new OrNode(forX, forY).maybeCommuteInputs(), ValueNode.isConstantPredicate(), forX, forY, view);
         }
+
         if (forX instanceof NotNode && forY instanceof NotNode) {
             return new NotNode(AndNode.create(((NotNode) forX).getValue(), ((NotNode) forY).getValue(), view));
         }
+
         return self != null ? self : new OrNode(forX, forY).maybeCommuteInputs();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java
index 60b6ca81676..f546c278cd4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/XorNode.java
@@ -54,6 +54,18 @@ public final class XorNode extends BinaryArithmeticNode implements BinaryCo
         assert x.stamp(NodeView.DEFAULT).isCompatible(y.stamp(NodeView.DEFAULT));
     }
 
+    private XorNode(ValueNode x, ValueNode y, Stamp forcedStamp) {
+        super(TYPE, forcedStamp, x, y);
+    }
+
+    /**
+     * Create a new XorNode with a forced stamp, without eager folding. This should only be used in
+     * snippet code, where native-image may assign wrong stamps during graph generation.
+     */
+    public static ValueNode createForSnippet(ValueNode x, ValueNode y, Stamp forcedStamp) {
+        return new XorNode(x, y, forcedStamp);
+    }
+
     public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
         BinaryOp op = ArithmeticOpTable.forStamp(x.stamp(view)).getXor();
         Stamp stamp = op.foldStamp(x.stamp(view), y.stamp(view));
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java
index e51690b85aa..3d5d3a086a7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java
@@ -260,10 +260,10 @@ public final class Block extends AbstractBlockBase {
         LocationSet result = new LocationSet();
         for (FixedNode node : this.getNodes()) {
             if (node instanceof MemoryCheckpoint.Single) {
-                LocationIdentity identity = ((MemoryCheckpoint.Single) node).getLocationIdentity();
+                LocationIdentity identity = ((MemoryCheckpoint.Single) node).getKilledLocationIdentity();
                 result.add(identity);
             } else if (node instanceof MemoryCheckpoint.Multi) {
-                for (LocationIdentity identity : ((MemoryCheckpoint.Multi) node).getLocationIdentities()) {
+                for (LocationIdentity identity : ((MemoryCheckpoint.Multi) node).getKilledLocationIdentities()) {
                     result.add(identity);
                 }
             }
@@ -365,4 +365,26 @@ public final class Block extends AbstractBlockBase {
     protected void setPostDominator(Block postdominator) {
         this.postdominator = postdominator;
     }
+
+    /**
+     * Checks whether {@code this} block is in the same loop or an outer loop of the block given as
+     * parameter.
+     */
+    public boolean isInSameOrOuterLoopOf(Block block) {
+
+        if (this.loop == null) {
+            // We are in no loop, so this holds true for every other block.
+            return true;
+        }
+
+        Loop l = block.loop;
+        while (l != null) {
+            if (l == this.loop) {
+                return true;
+            }
+            l = l.getParent();
+        }
+
+        return false;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index fc5edcb091d..53791ed9215 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -38,6 +38,7 @@ import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeMap;
+import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.AbstractEndNode;
 import org.graalvm.compiler.nodes.ControlSinkNode;
@@ -416,6 +417,15 @@ public final class ControlFlowGraph implements AbstractControlFlowGraph {
         return nodeToBlock.get(node);
     }
 
+    public Block commonDominatorFor(NodeIterable nodes) {
+        Block commonDom = null;
+        for (Node n : nodes) {
+            Block b = blockFor(n);
+            commonDom = (Block) AbstractControlFlowGraph.commonDominator(commonDom, b);
+        }
+        return commonDom;
+    }
+
     @Override
     public List> getLoops() {
         return loops;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java
index 11c9a1b351b..177cad43e39 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -66,7 +66,7 @@ public final class StringToBytesNode extends FixedWithNextNode implements Lowera
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return NamedLocationIdentity.getArrayLocation(JavaKind.Byte);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
index 850e8e750a1..1d71cb5f156 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -100,7 +100,7 @@ public final class BytecodeExceptionNode extends AbstractMemoryCheckpoint implem
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java
index 80446a34176..6705dfbae51 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java
@@ -159,7 +159,7 @@ public class ForeignCallNode extends AbstractMemoryCheckpoint implements LIRLowe
     }
 
     @Override
-    public LocationIdentity[] getLocationIdentities() {
+    public LocationIdentity[] getKilledLocationIdentities() {
         return foreignCalls.getKilledLocations(descriptor);
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java
index 84fc249d26e..5a85ac7bc67 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java
@@ -79,4 +79,9 @@ public final class JavaWriteNode extends AbstractWriteNode implements Lowerable,
     public Stamp getAccessStamp() {
         return StampFactory.forKind(writeKind);
     }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return getLocationIdentity();
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java
index ea25e3908f6..d7dff035257 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/MembarNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -58,7 +58,7 @@ public final class MembarNode extends FixedWithNextNode implements LIRLowerable,
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return location;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
index 10d8679c6d8..0c555056f08 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -161,7 +161,7 @@ public class RawLoadNode extends UnsafeAccessNode implements Lowerable, Virtuali
 
     @Override
     protected ValueNode cloneAsFieldAccess(Assumptions assumptions, ResolvedJavaField field, boolean volatileAccess) {
-        return LoadFieldNode.create(assumptions, object(), field, volatileAccess);
+        return LoadFieldNode.create(assumptions, field.isStatic() ? null : object(), field, volatileAccess);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java
index 710f1291662..deecc054642 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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,7 +134,7 @@ public final class RawStoreNode extends UnsafeAccessNode implements StateSplit,
 
     @Override
     protected ValueNode cloneAsFieldAccess(Assumptions assumptions, ResolvedJavaField field, boolean volatileAccess) {
-        return new StoreFieldNode(object(), field, value(), stateAfter(), volatileAccess);
+        return new StoreFieldNode(field.isStatic() ? null : object(), field, value(), stateAfter(), volatileAccess);
     }
 
     @Override
@@ -145,4 +145,9 @@ public final class RawStoreNode extends UnsafeAccessNode implements StateSplit,
     public FrameState getState() {
         return stateAfter;
     }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return getLocationIdentity();
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java
index ad098f0b38b..3e6a245b5b8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/SwitchNode.java
@@ -290,4 +290,7 @@ public abstract class SwitchNode extends ControlSplitNode {
         }
     }
 
+    public int[] getKeySuccessors() {
+        return keySuccessors.clone();
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java
index 5c3fac1d7f3..40bf9adcb99 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -27,6 +27,8 @@ package org.graalvm.compiler.nodes.extended;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 
+import java.nio.ByteOrder;
+
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
@@ -40,6 +42,8 @@ import org.graalvm.compiler.nodes.type.StampTool;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Assumptions;
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -95,10 +99,14 @@ public abstract class UnsafeAccessNode extends FixedWithNextNode implements Cano
                 // Try to canonicalize to a field access.
                 ResolvedJavaType receiverType = StampTool.typeOrNull(object());
                 if (receiverType != null) {
-                    ResolvedJavaField field = receiverType.findInstanceFieldWithOffset(constantOffset, accessKind());
-                    // No need for checking that the receiver is non-null. The field access includes
-                    // the null check and if a field is found, the offset is so small that this is
-                    // never a valid access of an arbitrary address.
+                    ResolvedJavaField field = getStaticFieldUnsafeAccess(tool.getConstantReflection());
+                    if (field == null) {
+                        field = receiverType.findInstanceFieldWithOffset(constantOffset, accessKind());
+                    }
+
+                    // No need for checking that the receiver is non-null. The field access
+                    // includes the null check and if a field is found, the offset is so small that
+                    // this is never a valid access of an arbitrary address.
                     if (field != null && field.getJavaKind() == this.accessKind()) {
                         assert !graph().isAfterFloatingReadPhase() : "cannot add more precise memory location after floating read phase";
                         // Unsafe accesses never have volatile semantics.
@@ -128,4 +136,58 @@ public abstract class UnsafeAccessNode extends FixedWithNextNode implements Cano
     protected abstract ValueNode cloneAsFieldAccess(Assumptions assumptions, ResolvedJavaField field, boolean volatileAccess);
 
     protected abstract ValueNode cloneAsArrayAccess(ValueNode location, LocationIdentity identity);
+
+    /**
+     * In this method we check if the unsafe access is to a static field. This is the case when
+     * {@code object} is a constant of type {@link Class} (static field's declaring class) and
+     * {@code offset} is a constant (HotSpot-specific field offset from the declaring class).
+     *
+     * @return the static field, if any, that this node is reading
+     */
+    private ResolvedJavaField getStaticFieldUnsafeAccess(ConstantReflectionProvider constantReflection) {
+        if (!object().isJavaConstant() || !offset().isJavaConstant() ||
+                        object().isNullConstant() || offset().isNullConstant()) {
+            return null;
+        }
+        JavaConstant objectConstant = object().asJavaConstant();
+        JavaConstant offsetConstant = offset().asJavaConstant();
+        assert objectConstant != null && offsetConstant != null : "Verified by the check at the beginning.";
+        ResolvedJavaType staticReceiverType = constantReflection.asJavaType(objectConstant);
+        if (staticReceiverType == null) {
+            // object is not of type Class so it is not a static field
+            return null;
+        }
+        return findStaticFieldWithOffset(staticReceiverType, offsetConstant.asLong(), accessKind);
+    }
+
+    private static ResolvedJavaField findStaticFieldWithOffset(ResolvedJavaType type, long offset, JavaKind expectedEntryKind) {
+        try {
+            ResolvedJavaField[] declaredFields = type.getStaticFields();
+            return findFieldWithOffset(offset, expectedEntryKind, declaredFields);
+        } catch (UnsupportedOperationException e) {
+            return null;
+        }
+    }
+
+    /**
+     * NOTE GR-18873: this is a copy-paste implementation derived from
+     * {@code jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl#findStaticFieldWithOffset}.
+     */
+    private static ResolvedJavaField findFieldWithOffset(long offset, JavaKind expectedEntryKind, ResolvedJavaField[] declaredFields) {
+        for (ResolvedJavaField field : declaredFields) {
+            long resolvedFieldOffset = field.getOffset();
+            if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN &&
+                            expectedEntryKind.isPrimitive() &&
+                            !expectedEntryKind.equals(JavaKind.Void) &&
+                            field.getJavaKind().isPrimitive()) {
+                resolvedFieldOffset += field.getJavaKind().getByteCount() -
+                                Math.min(field.getJavaKind().getByteCount(), 4 + expectedEntryKind.getByteCount());
+            }
+            if (resolvedFieldOffset == offset) {
+                return field;
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java
index 4e67c5cf319..e03d20e5423 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -77,7 +77,7 @@ public class UnsafeMemoryStoreNode extends AbstractStateSplit implements Lowerab
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return locationIdentity;
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
index 314d96fc261..824efefee17 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
@@ -203,6 +203,7 @@ public final class GraphBuilderConfiguration {
     private final boolean trackNodeSourcePosition;
     private final boolean retainLocalVariables;
     private final Plugins plugins;
+    private final boolean replaceLocalsWithConstants;
 
     public enum BytecodeExceptionMode {
         /**
@@ -231,6 +232,7 @@ public final class GraphBuilderConfiguration {
                     boolean insertFullInfopoints,
                     boolean trackNodeSourcePosition,
                     boolean retainLocalVariables,
+                    boolean replaceLocalsWithConstants,
                     List skippedExceptionTypes,
                     Plugins plugins) {
         this.eagerResolving = eagerResolving;
@@ -240,6 +242,7 @@ public final class GraphBuilderConfiguration {
         this.insertFullInfopoints = insertFullInfopoints;
         this.trackNodeSourcePosition = trackNodeSourcePosition;
         this.retainLocalVariables = retainLocalVariables;
+        this.replaceLocalsWithConstants = replaceLocalsWithConstants;
         this.skippedExceptionTypes = skippedExceptionTypes;
         this.plugins = plugins;
     }
@@ -259,6 +262,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         newPlugins);
         return result;
@@ -279,6 +283,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -292,6 +297,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -305,6 +311,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         Collections.unmodifiableList(Arrays.asList(newSkippedExceptionTypes)),
                         plugins);
     }
@@ -317,6 +324,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -330,6 +338,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -343,6 +352,7 @@ public final class GraphBuilderConfiguration {
                         newInsertFullInfopoints,
                         trackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -356,6 +366,7 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         newTrackNodeSourcePosition,
                         retainLocalVariables,
+                        replaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -369,6 +380,21 @@ public final class GraphBuilderConfiguration {
                         insertFullInfopoints,
                         trackNodeSourcePosition,
                         newRetainLocalVariables,
+                        replaceLocalsWithConstants,
+                        skippedExceptionTypes,
+                        plugins);
+    }
+
+    public GraphBuilderConfiguration withReplaceLocalsWithConstants(boolean newReplaceLocalsWithConstants) {
+        return new GraphBuilderConfiguration(
+                        eagerResolving,
+                        unresolvedIsError,
+                        bytecodeExceptionMode,
+                        omitAssertions,
+                        insertFullInfopoints,
+                        trackNodeSourcePosition,
+                        retainLocalVariables,
+                        newReplaceLocalsWithConstants,
                         skippedExceptionTypes,
                         plugins);
     }
@@ -401,6 +427,10 @@ public final class GraphBuilderConfiguration {
         return insertFullInfopoints;
     }
 
+    public boolean replaceLocalsWithConstants() {
+        return this.replaceLocalsWithConstants;
+    }
+
     public static GraphBuilderConfiguration getDefault(Plugins plugins) {
         return new GraphBuilderConfiguration(
                         /* eagerResolving: */ false,
@@ -410,6 +440,7 @@ public final class GraphBuilderConfiguration {
                         /* insertFullInfopoints: */ false,
                         /* trackNodeSourcePosition: */ false,
                         /* retainLocalVariables */ false,
+                        /* replaceLocalsWithConstants */ false,
                         Collections.emptyList(),
                         plugins);
     }
@@ -423,6 +454,7 @@ public final class GraphBuilderConfiguration {
                         /* insertFullInfopoints: */ false,
                         /* trackNodeSourcePosition: */ false,
                         /* retainLocalVariables */ false,
+                        /* replaceLocalsWithConstants */ false,
                         Collections.emptyList(),
                         plugins);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
index 740ce9e3307..6d94488d39e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
@@ -46,7 +46,6 @@ import jdk.internal.vm.compiler.collections.Pair;
 import jdk.internal.vm.compiler.collections.UnmodifiableEconomicMap;
 import jdk.internal.vm.compiler.collections.UnmodifiableMapCursor;
 import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitutionRegistry;
 import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.debug.Assertions;
@@ -55,6 +54,7 @@ import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import org.graalvm.compiler.nodes.spi.Replacements;
 
 import jdk.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -175,21 +175,25 @@ public class InvocationPlugins {
     }
 
     /**
-     * Utility for {@linkplain InvocationPlugins#register(InvocationPlugin, Class, String, Class...)
-     * registration} of invocation plugins.
+     * Utility for {@linkplain InvocationPlugins#register registration} of invocation plugins.
      */
-    public static class Registration implements MethodSubstitutionRegistry {
+    public static class Registration {
 
         private final InvocationPlugins plugins;
+
         private final Type declaringType;
-        private final BytecodeProvider methodSubstitutionBytecodeProvider;
+        private final Replacements replacements;
+        private final BytecodeProvider bytecodeProvider;
         private boolean allowOverwrite;
 
-        @Override
         public Class getReceiverType() {
             return Receiver.class;
         }
 
+        public Type getDeclaringType() {
+            return declaringType;
+        }
+
         /**
          * Creates an object for registering {@link InvocationPlugin}s for methods declared by a
          * given class.
@@ -201,7 +205,8 @@ public class InvocationPlugins {
         public Registration(InvocationPlugins plugins, Type declaringType) {
             this.plugins = plugins;
             this.declaringType = declaringType;
-            this.methodSubstitutionBytecodeProvider = null;
+            this.replacements = null;
+            this.bytecodeProvider = null;
         }
 
         /**
@@ -211,13 +216,29 @@ public class InvocationPlugins {
          * @param plugins where to register the plugins
          * @param declaringType the class declaring the methods for which plugins will be registered
          *            via this object
-         * @param methodSubstitutionBytecodeProvider provider used to get the bytecodes to parse for
-         *            method substitutions
+         * @param replacements the current Replacements provider
          */
-        public Registration(InvocationPlugins plugins, Type declaringType, BytecodeProvider methodSubstitutionBytecodeProvider) {
+        public Registration(InvocationPlugins plugins, Type declaringType, Replacements replacements) {
             this.plugins = plugins;
             this.declaringType = declaringType;
-            this.methodSubstitutionBytecodeProvider = methodSubstitutionBytecodeProvider;
+            this.replacements = replacements;
+            this.bytecodeProvider = replacements != null ? replacements.getDefaultReplacementBytecodeProvider() : null;
+        }
+
+        /**
+         * Creates an object for registering {@link InvocationPlugin}s for methods declared by a
+         * given class.
+         *
+         * @param plugins where to register the plugins
+         * @param declaringType the class declaring the methods for which plugins will be registered
+         *            via this object
+         * @param replacements the current Replacements provider
+         */
+        public Registration(InvocationPlugins plugins, Type declaringType, Replacements replacements, BytecodeProvider bytecodeProvider) {
+            this.plugins = plugins;
+            this.declaringType = declaringType;
+            this.replacements = replacements;
+            this.bytecodeProvider = bytecodeProvider;
         }
 
         /**
@@ -231,7 +252,8 @@ public class InvocationPlugins {
         public Registration(InvocationPlugins plugins, String declaringClassName) {
             this.plugins = plugins;
             this.declaringType = new OptionalLazySymbol(declaringClassName);
-            this.methodSubstitutionBytecodeProvider = null;
+            this.replacements = null;
+            this.bytecodeProvider = null;
         }
 
         /**
@@ -241,13 +263,13 @@ public class InvocationPlugins {
          * @param plugins where to register the plugins
          * @param declaringClassName the name of the class class declaring the methods for which
          *            plugins will be registered via this object
-         * @param methodSubstitutionBytecodeProvider provider used to get the bytecodes to parse for
-         *            method substitutions
+         * @param replacements the current Replacements provider
          */
-        public Registration(InvocationPlugins plugins, String declaringClassName, BytecodeProvider methodSubstitutionBytecodeProvider) {
+        public Registration(InvocationPlugins plugins, String declaringClassName, Replacements replacements) {
             this.plugins = plugins;
             this.declaringType = new OptionalLazySymbol(declaringClassName);
-            this.methodSubstitutionBytecodeProvider = methodSubstitutionBytecodeProvider;
+            this.replacements = replacements;
+            this.bytecodeProvider = replacements != null ? replacements.getDefaultReplacementBytecodeProvider() : null;
         }
 
         /**
@@ -338,6 +360,118 @@ public class InvocationPlugins {
             plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
         }
 
+        /**
+         * Registers a plugin for a method with no arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional0(boolean isEnabled, String name, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 1 argument that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional1(boolean isEnabled, String name, Type arg, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 2 arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional2(boolean isEnabled, String name, Type arg1, Type arg2, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 3 arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional3(boolean isEnabled, String name, Type arg1, Type arg2, Type arg3, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2, arg3);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 4 arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional4(boolean isEnabled, String name, Type arg1, Type arg2, Type arg3, Type arg4, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2, arg3, arg4);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 5 arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional5(boolean isEnabled, String name, Type arg1, Type arg2, Type arg3, Type arg4, Type arg5, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2, arg3, arg4, arg5);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 6 arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional6(boolean isEnabled, String name, Type arg1, Type arg2, Type arg3, Type arg4, Type arg5, Type arg6, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2, arg3, arg4, arg5, arg6);
+            }
+        }
+
+        /**
+         * Registers a plugin for a method with 7 arguments that is conditionally enabled. This
+         * ensures that {@code Replacements} is aware of this plugin.
+         *
+         * @param name the name of the method
+         * @param plugin the plugin to be registered
+         */
+        public void registerConditional7(boolean isEnabled, String name, Type arg1, Type arg2, Type arg3, Type arg4, Type arg5, Type arg6, Type arg7, InvocationPlugin plugin) {
+            replacements.registerConditionalPlugin(plugin);
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+            }
+        }
+
         /**
          * Registers a plugin for an optional method with no arguments.
          *
@@ -398,7 +532,6 @@ public class InvocationPlugins {
          *            is non-static. Upon returning, element 0 will have been rewritten to
          *            {@code declaringClass}
          */
-        @Override
         public void registerMethodSubstitution(Class substituteDeclaringClass, String name, Type... argumentTypes) {
             registerMethodSubstitution(substituteDeclaringClass, name, name, argumentTypes);
         }
@@ -407,25 +540,63 @@ public class InvocationPlugins {
          * Registers a plugin that implements a method based on the bytecode of a substitute method.
          *
          * @param substituteDeclaringClass the class declaring the substitute method
-         * @param name the name of both the original method
+         * @param name the name of the original method
          * @param substituteName the name of the substitute method
          * @param argumentTypes the argument types of the method. Element 0 of this array must be
          *            the {@link Class} value for {@link InvocationPlugin.Receiver} iff the method
          *            is non-static. Upon returning, element 0 will have been rewritten to
          *            {@code declaringClass}
          */
-        @Override
         public void registerMethodSubstitution(Class substituteDeclaringClass, String name, String substituteName, Type... argumentTypes) {
-            MethodSubstitutionPlugin plugin = createMethodSubstitution(substituteDeclaringClass, substituteName, argumentTypes);
-            plugins.register(plugin, false, allowOverwrite, declaringType, name, argumentTypes);
+            doMethodSubstitutionRegistration(false, true, substituteDeclaringClass, name, substituteName, argumentTypes);
         }
 
-        public MethodSubstitutionPlugin createMethodSubstitution(Class substituteDeclaringClass, String substituteName, Type... argumentTypes) {
-            assert methodSubstitutionBytecodeProvider != null : "Registration used for method substitutions requires a non-null methodSubstitutionBytecodeProvider";
-            MethodSubstitutionPlugin plugin = new MethodSubstitutionPlugin(methodSubstitutionBytecodeProvider, substituteDeclaringClass, substituteName, argumentTypes);
-            return plugin;
+        /**
+         * Registers a plugin that implements a method based on the bytecode of a substitute method
+         * that is conditinally enabled. This ensures that {@code Replacements} is aware of this
+         * plugin.
+         *
+         * @param isEnabled whether the plugin is enabled in the current compiler
+         * @param substituteDeclaringClass the class declaring the substitute method
+         * @param name the name of both the original and substitute method
+         * @param argumentTypes the argument types of the method. Element 0 of this array must be
+         *            the {@link Class} value for {@link InvocationPlugin.Receiver} iff the method
+         *            is non-static. Upon returning, element 0 will have been rewritten to
+         *            {@code declaringClass}
+         */
+        public void registerConditionalMethodSubstitution(boolean isEnabled, Class substituteDeclaringClass, String name, Type... argumentTypes) {
+            registerConditionalMethodSubstitution(isEnabled, substituteDeclaringClass, name, name, argumentTypes);
         }
 
+        /**
+         * Registers a plugin that implements a method based on the bytecode of a substitute method
+         * that is conditinally enabled. This ensures that {@code Replacements} is aware of this
+         * plugin.
+         *
+         * @param isEnabled whether the plugin is enabled in the current compiler
+         * @param substituteDeclaringClass the class declaring the substitute method
+         * @param name the name of the original method
+         * @param substituteName the name of the substitute method
+         * @param argumentTypes the argument types of the method. Element 0 of this array must be
+         *            the {@link Class} value for {@link InvocationPlugin.Receiver} iff the method
+         *            is non-static. Upon returning, element 0 will have been rewritten to
+         *            {@code declaringClass}
+         */
+        public void registerConditionalMethodSubstitution(boolean isEnabled, Class substituteDeclaringClass, String name, String substituteName, Type... argumentTypes) {
+            doMethodSubstitutionRegistration(true, isEnabled, substituteDeclaringClass, name, substituteName, argumentTypes);
+        }
+
+        private void doMethodSubstitutionRegistration(boolean isConditional, boolean isEnabled, Class substituteDeclaringClass, String name, String substituteName, Type[] argumentTypes) {
+            MethodSubstitutionPlugin plugin = new MethodSubstitutionPlugin(this, bytecodeProvider, name, substituteDeclaringClass, substituteName, argumentTypes);
+            replacements.registerMethodSubstitution(plugin);
+            if (isConditional) {
+                // Notify Replacements about the plugin even if it's not current enabled
+                replacements.registerConditionalPlugin(plugin);
+            }
+            if (isEnabled) {
+                plugins.register(plugin, false, allowOverwrite, declaringType, name, argumentTypes);
+            }
+        }
     }
 
     /**
@@ -519,13 +690,7 @@ public class InvocationPlugins {
             this.plugin = data;
             this.isStatic = isStatic;
             this.name = name;
-            StringBuilder buf = new StringBuilder();
-            buf.append('(');
-            for (int i = isStatic ? 0 : 1; i < argumentTypes.length; i++) {
-                buf.append(MetaUtil.toInternalName(argumentTypes[i].getTypeName()));
-            }
-            buf.append(')');
-            this.argumentsDescriptor = buf.toString();
+            this.argumentsDescriptor = toArgumentDescriptor(isStatic, argumentTypes);
             assert !name.equals("") || !isStatic : this;
         }
 
@@ -546,6 +711,16 @@ public class InvocationPlugins {
         }
     }
 
+    static String toArgumentDescriptor(boolean isStatic, Type[] argumentTypes) {
+        StringBuilder buf = new StringBuilder();
+        buf.append('(');
+        for (int i = isStatic ? 0 : 1; i < argumentTypes.length; i++) {
+            buf.append(MetaUtil.toInternalName(argumentTypes[i].getTypeName()));
+        }
+        buf.append(')');
+        return buf.toString();
+    }
+
     /**
      * Plugin registrations for already resolved methods. If non-null, then {@link #registrations}
      * is null and no further registrations can be made.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java
index 8ea0056901a..d9329b6d79b 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/MethodSubstitutionPlugin.java
@@ -42,6 +42,7 @@ import org.graalvm.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
  * An {@link InvocationPlugin} for a method where the implementation of the method is provided by a
@@ -56,6 +57,8 @@ import jdk.vm.ci.meta.ResolvedJavaMethod;
  */
 public final class MethodSubstitutionPlugin implements InvocationPlugin {
 
+    private InvocationPlugins.Registration registration;
+
     private ResolvedJavaMethod cachedSubstitute;
 
     /**
@@ -64,9 +67,14 @@ public final class MethodSubstitutionPlugin implements InvocationPlugin {
     private final Class declaringClass;
 
     /**
-     * The name of the original and substitute method.
+     * The name of the substitute method.
      */
-    private final String name;
+    private final String substituteName;
+
+    /**
+     * The name of the original method.
+     */
+    private final String originalName;
 
     /**
      * The parameter types of the substitute method.
@@ -81,16 +89,21 @@ public final class MethodSubstitutionPlugin implements InvocationPlugin {
      * Creates a method substitution plugin.
      *
      * @param bytecodeProvider used to get the bytecodes to parse for the substitute method
+     * @param originalName the name of the original method
      * @param declaringClass the class in which the substitute method is declared
-     * @param name the name of the substitute method
+     * @param substituteName the name of the substitute method
      * @param parameters the parameter types of the substitute method. If the original method is not
      *            static, then {@code parameters[0]} must be the {@link Class} value denoting
      *            {@link InvocationPlugin.Receiver}
      */
-    public MethodSubstitutionPlugin(BytecodeProvider bytecodeProvider, Class declaringClass, String name, Type... parameters) {
+    public MethodSubstitutionPlugin(InvocationPlugins.Registration registration, BytecodeProvider bytecodeProvider, String originalName, Class declaringClass, String substituteName,
+                    Type... parameters) {
+        assert bytecodeProvider != null : "Requires a non-null methodSubstitutionBytecodeProvider";
+        this.registration = registration;
         this.bytecodeProvider = bytecodeProvider;
+        this.originalName = originalName;
         this.declaringClass = declaringClass;
-        this.name = name;
+        this.substituteName = substituteName;
         this.parameters = parameters;
         this.originalIsStatic = parameters.length == 0 || parameters[0] != InvocationPlugin.Receiver.class;
     }
@@ -144,7 +157,7 @@ public final class MethodSubstitutionPlugin implements InvocationPlugin {
      * Determines if a given method is the substitute method of this plugin.
      */
     private boolean isSubstitute(Method m) {
-        if (Modifier.isStatic(m.getModifiers()) && m.getName().equals(name)) {
+        if (Modifier.isStatic(m.getModifiers()) && m.getName().equals(substituteName)) {
             if (parameters.length == m.getParameterCount()) {
                 Class[] mparams = m.getParameterTypes();
                 int start = 0;
@@ -189,9 +202,6 @@ public final class MethodSubstitutionPlugin implements InvocationPlugin {
     @Override
     public boolean execute(GraphBuilderContext b, ResolvedJavaMethod targetMethod, InvocationPlugin.Receiver receiver, ValueNode[] argsIncludingReceiver) {
         if (IS_IN_NATIVE_IMAGE || (UseEncodedGraphs.getValue(b.getOptions()) && !b.parsingIntrinsic())) {
-            if (!IS_IN_NATIVE_IMAGE && UseEncodedGraphs.getValue(b.getOptions())) {
-                b.getReplacements().registerMethodSubstitution(this, targetMethod, INLINE_AFTER_PARSING, b.getOptions());
-            }
             StructuredGraph subst = b.getReplacements().getMethodSubstitution(this,
                             targetMethod,
                             INLINE_AFTER_PARSING,
@@ -220,7 +230,27 @@ public final class MethodSubstitutionPlugin implements InvocationPlugin {
 
     @Override
     public String toString() {
-        return String.format("%s[%s.%s(%s)]", getClass().getSimpleName(), declaringClass.getName(), name,
+        return String.format("%s[%s.%s(%s)]", getClass().getSimpleName(), declaringClass.getName(), substituteName,
                         Arrays.asList(parameters).stream().map(c -> c.getTypeName()).collect(Collectors.joining(", ")));
     }
+
+    public String originalMethodAsString() {
+        return String.format("%s.%s(%s)", declaringClass.getName(), substituteName, Arrays.asList(parameters).stream().map(c -> c.getTypeName()).collect(Collectors.joining(", ")));
+    }
+
+    public ResolvedJavaMethod getOriginalMethod(MetaAccessProvider metaAccess) {
+        Class clazz = resolveType(registration.getDeclaringType(), false);
+        if (clazz == null) {
+            throw new GraalError("Can't find original class for " + this + " with class " + registration.getDeclaringType());
+        }
+        ResolvedJavaType type = metaAccess.lookupJavaType(clazz);
+        String argumentsDescriptor = InvocationPlugins.toArgumentDescriptor(originalIsStatic, this.parameters);
+        for (ResolvedJavaMethod declared : type.getDeclaredMethods()) {
+            if (declared.getName().equals(originalName) && declared.isStatic() == originalIsStatic &&
+                            declared.getSignature().toMethodDescriptor().startsWith(argumentsDescriptor)) {
+                return declared;
+            }
+        }
+        throw new GraalError("Can't find original method for " + this + " with class " + registration.getDeclaringType());
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
index f889918074b..53876042b79 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -93,4 +93,9 @@ public abstract class AbstractCompareAndSwapNode extends FixedAccessNode impleme
     public Stamp getAccessStamp() {
         return expectedValue.stamp(NodeView.DEFAULT).meet(newValue.stamp(NodeView.DEFAULT)).unrestricted();
     }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return getLocationIdentity();
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
index 7279d2e461b..80abcfac7c7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -97,7 +97,7 @@ public abstract class AbstractUnsafeCompareAndSwapNode extends AbstractMemoryChe
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return locationIdentity;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
index f555c47f4d4..3f8c4a8b714 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -74,7 +74,7 @@ public final class AtomicReadAndAddNode extends AbstractMemoryCheckpoint impleme
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return locationIdentity;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java
index 1364b9f764d..478115da1c3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -80,7 +80,7 @@ public final class AtomicReadAndWriteNode extends AbstractMemoryCheckpoint imple
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return locationIdentity;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
index c4ff17d6af9..9a6239016ef 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -60,7 +60,7 @@ public final class ExceptionObjectNode extends BeginStateSplitNode implements Lo
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
@@ -80,7 +80,7 @@ public final class ExceptionObjectNode extends BeginStateSplitNode implements Lo
              * Now the lowering to BeginNode+LoadExceptionNode can be performed, since no more
              * deopts can float in between the begin node and the load exception node.
              */
-            LocationIdentity locationsKilledByInvoke = ((InvokeWithExceptionNode) predecessor()).getLocationIdentity();
+            LocationIdentity locationsKilledByInvoke = ((InvokeWithExceptionNode) predecessor()).getKilledLocationIdentity();
             AbstractBeginNode entry = graph().add(KillingBeginNode.create(locationsKilledByInvoke));
             LoadExceptionObjectNode loadException = graph().add(new LoadExceptionObjectNode(stamp(NodeView.DEFAULT)));
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
index 121892d471c..2cd73e55bdb 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -103,4 +103,9 @@ public final class LoweredAtomicReadAndWriteNode extends FixedAccessNode impleme
     public Stamp getAccessStamp() {
         return stamp(NodeView.DEFAULT);
     }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return getLocationIdentity();
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java
index 13c19feedb9..365f03717b3 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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 @@ public class MonitorEnterNode extends AccessMonitorNode implements Virtualizable
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java
index 2baf93c81eb..f377a7dfc31 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java
@@ -70,7 +70,7 @@ public final class MonitorExitNode extends AccessMonitorNode implements Virtuali
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java
index c76d2de6b52..05ac30d819e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/RawMonitorEnterNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -64,7 +64,7 @@ public final class RawMonitorEnterNode extends AccessMonitorNode implements Virt
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java
index 7b3b68d357f..004372b6e85 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java
@@ -25,6 +25,7 @@
 package org.graalvm.compiler.nodes.memory;
 
 import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.IterableNodeType;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -39,7 +40,7 @@ import jdk.internal.vm.compiler.word.LocationIdentity;
  * does not include a null check on the object.
  */
 @NodeInfo
-public abstract class FixedAccessNode extends DeoptimizingFixedWithNextNode implements Access {
+public abstract class FixedAccessNode extends DeoptimizingFixedWithNextNode implements Access, IterableNodeType {
     public static final NodeClass TYPE = NodeClass.create(FixedAccessNode.class);
 
     @OptionalInput(InputType.Guard) protected GuardingNode guard;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java
index ffd094804d9..5e89f35dc03 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryCheckpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -44,8 +44,7 @@ public interface MemoryCheckpoint extends MemoryNode, FixedNodeInterface {
          *
          * @return the identity of the location killed by this node.
          */
-        LocationIdentity getLocationIdentity();
-
+        LocationIdentity getKilledLocationIdentity();
     }
 
     interface Multi extends MemoryCheckpoint {
@@ -57,7 +56,7 @@ public interface MemoryCheckpoint extends MemoryNode, FixedNodeInterface {
          *
          * @return the identities of all locations killed by this node.
          */
-        LocationIdentity[] getLocationIdentities();
+        LocationIdentity[] getKilledLocationIdentities();
 
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java
new file mode 100644
index 00000000000..dc0680908fa
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/VolatileReadNode.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Red Hat Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+
+package org.graalvm.compiler.nodes.memory;
+
+import org.graalvm.compiler.core.common.GraalOptions;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import jdk.internal.vm.compiler.word.LocationIdentity;
+
+import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+
+@NodeInfo(nameTemplate = "Read#{p#location/s}", allowedUsageTypes = Memory, cycles = CYCLES_2, size = SIZE_1)
+public class VolatileReadNode extends ReadNode implements MemoryCheckpoint.Single {
+    public static final NodeClass TYPE = NodeClass.create(VolatileReadNode.class);
+
+    public VolatileReadNode(AddressNode address, LocationIdentity location, Stamp stamp, BarrierType barrierType) {
+        super(TYPE, address, location, stamp, null, barrierType, false, null);
+        assert GraalOptions.LateMembars.getValue(address.getOptions());
+    }
+
+    @SuppressWarnings("try")
+    @Override
+    public FloatingAccessNode asFloatingNode() {
+        throw new RuntimeException();
+    }
+
+    @Override
+    public boolean canFloat() {
+        return false;
+    }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return LocationIdentity.any();
+    }
+
+    @Override
+    public boolean canNullCheck() {
+        return false;
+    }
+
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java
index 778caf3ee42..e2a5e8ec297 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/WriteNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -44,13 +44,16 @@ import jdk.internal.vm.compiler.word.LocationIdentity;
 public class WriteNode extends AbstractWriteNode implements LIRLowerableAccess, Canonicalizable {
 
     public static final NodeClass TYPE = NodeClass.create(WriteNode.class);
+    private final boolean volatileAccess;
 
-    public WriteNode(AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType) {
+    public WriteNode(AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType, boolean volatileAccess) {
         super(TYPE, address, location, value, barrierType);
+        this.volatileAccess = volatileAccess;
     }
 
     protected WriteNode(NodeClass c, AddressNode address, LocationIdentity location, ValueNode value, BarrierType barrierType) {
         super(c, address, location, value, barrierType);
+        this.volatileAccess = false;
     }
 
     @Override
@@ -61,7 +64,7 @@ public class WriteNode extends AbstractWriteNode implements LIRLowerableAccess,
 
     @Override
     public boolean canNullCheck() {
-        return true;
+        return !isVolatile();
     }
 
     @Override
@@ -73,11 +76,23 @@ public class WriteNode extends AbstractWriteNode implements LIRLowerableAccess,
     public Node canonical(CanonicalizerTool tool) {
         if (tool.canonicalizeReads() && hasExactlyOneUsage() && next() instanceof WriteNode) {
             WriteNode write = (WriteNode) next();
-            if (write.lastLocationAccess == this && write.getAddress() == getAddress() && getAccessStamp().isCompatible(write.getAccessStamp())) {
+            if (write.lastLocationAccess == this && write.getAddress() == getAddress() && getAccessStamp().isCompatible(write.getAccessStamp()) && !isVolatile()) {
                 write.setLastLocationAccess(getLastLocationAccess());
                 return write;
             }
         }
         return this;
     }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        if (isVolatile()) {
+            return LocationIdentity.any();
+        }
+        return getLocationIdentity();
+    }
+
+    public boolean isVolatile() {
+        return volatileAccess;
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java
index 880d82e3a8a..8fc1e6df166 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java
@@ -34,6 +34,7 @@ import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
 import org.graalvm.compiler.options.OptionValues;
 
@@ -82,8 +83,13 @@ public class DelegatingReplacements implements Replacements {
     }
 
     @Override
-    public void registerMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, OptionValues options) {
-        delegate.registerMethodSubstitution(plugin, original, context, options);
+    public void registerMethodSubstitution(MethodSubstitutionPlugin plugin) {
+        delegate.registerMethodSubstitution(plugin);
+    }
+
+    @Override
+    public void registerConditionalPlugin(InvocationPlugin plugin) {
+        delegate.registerConditionalPlugin(plugin);
     }
 
     @Override
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java
index 1ca04f227c0..ea71be8b539 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Replacements.java
@@ -97,7 +97,14 @@ public interface Replacements {
     /**
      * Registers a plugin as a substitution.
      */
-    void registerMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, OptionValues options);
+    void registerMethodSubstitution(MethodSubstitutionPlugin plugin);
+
+    /**
+     * Marks a plugin as conditionally applied. In the contenxt of libgraal conditional plugins
+     * can't be used in during graph encoding for snippets and method substitutions and this is used
+     * to detect violations of this restriction.
+     */
+    void registerConditionalPlugin(InvocationPlugin plugin);
 
     /**
      * Gets a graph that is a substitution for a given method.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
index 593998c1781..b2551c8173f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
@@ -54,11 +54,13 @@ import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.AbstractEndNode;
 import org.graalvm.compiler.nodes.AbstractMergeNode;
 import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.ControlSinkNode;
 import org.graalvm.compiler.nodes.ControlSplitNode;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.GuardNode;
+import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.LoopEndNode;
 import org.graalvm.compiler.nodes.LoopExitNode;
@@ -105,6 +107,8 @@ public class GraphUtil {
         public static final OptionKey VerifyKillCFGUnusedNodes = new OptionKey<>(false);
     }
 
+    public static final int MAX_FRAMESTATE_SEARCH_DEPTH = 4;
+
     private static void killCFGInner(FixedNode node) {
         EconomicSet markedNodes = EconomicSet.create();
         EconomicMap> unmarkedMerges = EconomicMap.create();
@@ -1110,4 +1114,55 @@ public class GraphUtil {
         tool.createVirtualObject(newVirtualArray, newEntryState, Collections. emptyList(), false);
         tool.replaceWithVirtual(newVirtualArray);
     }
+
+    /**
+     * Snippet lowerings may produce patterns without a frame state on the merge. We need to take
+     * extra care when optimizing these patterns.
+     */
+    public static boolean checkFrameState(FixedNode start, int maxDepth) {
+        if (maxDepth == 0) {
+            return false;
+        }
+        FixedNode node = start;
+        while (true) {
+            if (node instanceof AbstractMergeNode) {
+                AbstractMergeNode mergeNode = (AbstractMergeNode) node;
+                if (mergeNode.stateAfter() == null) {
+                    return false;
+                } else {
+                    return true;
+                }
+            } else if (node instanceof StateSplit) {
+                StateSplit stateSplitNode = (StateSplit) node;
+                if (stateSplitNode.stateAfter() != null) {
+                    return true;
+                }
+            }
+
+            if (node instanceof ControlSplitNode) {
+                ControlSplitNode controlSplitNode = (ControlSplitNode) node;
+                for (Node succ : controlSplitNode.cfgSuccessors()) {
+                    if (checkFrameState((FixedNode) succ, maxDepth - 1)) {
+                        return true;
+                    }
+                }
+                return false;
+            } else if (node instanceof FixedWithNextNode) {
+                FixedWithNextNode fixedWithNextNode = (FixedWithNextNode) node;
+                node = fixedWithNextNode.next();
+            } else if (node instanceof AbstractEndNode) {
+                AbstractEndNode endNode = (AbstractEndNode) node;
+                node = endNode.merge();
+            } else if (node instanceof ControlSinkNode) {
+                return true;
+            } else {
+                assert false : "unexpected node";
+                return false;
+            }
+        }
+    }
+
+    public static boolean mayRemoveSplit(IfNode ifNode) {
+        return GraphUtil.checkFrameState(ifNode.trueSuccessor(), MAX_FRAMESTATE_SEARCH_DEPTH) && GraphUtil.checkFrameState(ifNode.falseSuccessor(), MAX_FRAMESTATE_SEARCH_DEPTH);
+    }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
index a3d97b22648..9fce61d1716 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -36,7 +36,7 @@ import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
+import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 
@@ -45,7 +45,7 @@ import org.graalvm.compiler.nodes.util.GraphUtil;
  * {@link VirtualObjectNode}.
  */
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
-public final class AllocatedObjectNode extends FloatingNode implements Virtualizable, ArrayLengthProvider {
+public final class AllocatedObjectNode extends FloatingNode implements VirtualizableAllocation, ArrayLengthProvider {
 
     public static final NodeClass TYPE = NodeClass.create(AllocatedObjectNode.class);
     @Input VirtualObjectNode virtualObject;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java
index 4e58ef5302a..c43b461cfbb 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, 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
@@ -121,7 +121,7 @@ public final class CommitAllocationNode extends FixedWithNextNode implements Vir
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return locks.isEmpty() ? LocationIdentity.init() : LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
index ef023fc9ea6..ba5784a0e46 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
@@ -24,6 +24,12 @@
 
 package org.graalvm.compiler.phases.common;
 
+import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.CFG_SIMPLIFICATION;
+import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.GVN;
+import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.READ_CANONICALIZATION;
+
+import java.util.EnumSet;
+
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.debug.CounterKey;
@@ -66,6 +72,12 @@ import jdk.vm.ci.meta.MetaAccessProvider;
 
 public class CanonicalizerPhase extends BasePhase {
 
+    public enum CanonicalizerFeature {
+        READ_CANONICALIZATION,
+        CFG_SIMPLIFICATION,
+        GVN
+    }
+
     private static final int MAX_ITERATION_PER_NODE = 10;
     private static final CounterKey COUNTER_CANONICALIZED_NODES = DebugContext.counter("CanonicalizedNodes");
     private static final CounterKey COUNTER_PROCESSED_NODES = DebugContext.counter("ProcessedNodes");
@@ -75,40 +87,79 @@ public class CanonicalizerPhase extends BasePhase {
     private static final CounterKey COUNTER_SIMPLIFICATION_CONSIDERED_NODES = DebugContext.counter("SimplificationConsideredNodes");
     private static final CounterKey COUNTER_GLOBAL_VALUE_NUMBERING_HITS = DebugContext.counter("GlobalValueNumberingHits");
 
-    private boolean globalValueNumber = true;
-    private boolean canonicalizeReads = true;
-    private boolean simplify = true;
-    private final CustomCanonicalizer customCanonicalizer;
+    private final EnumSet features;
+    private final CustomCanonicalization customCanonicalization;
+    private final CustomSimplification customSimplification;
 
-    public abstract static class CustomCanonicalizer {
-
-        public Node canonicalize(Node node) {
-            return node;
-        }
-
-        @SuppressWarnings("unused")
-        public void simplify(Node node, SimplifierTool tool) {
-        }
+    public interface CustomCanonicalization {
+        /**
+         * @param node the node to be canonicalized
+         * @return the same node if no action should be taken, {@code null} if the node should be
+         *         deleted, or a new node that should replace the given node
+         */
+        Node canonicalize(Node node);
     }
 
-    public CanonicalizerPhase() {
-        this(null);
+    public interface CustomSimplification {
+        /**
+         * @param node the node to be simplified
+         * @param tool utility available during the simplification process
+         */
+        void simplify(Node node, SimplifierTool tool);
     }
 
-    public CanonicalizerPhase(CustomCanonicalizer customCanonicalizer) {
-        this.customCanonicalizer = customCanonicalizer;
+    protected CanonicalizerPhase(EnumSet features) {
+        this(null, null, features);
     }
 
-    public void disableGVN() {
-        globalValueNumber = false;
+    protected CanonicalizerPhase() {
+        this(null, null, EnumSet.allOf(CanonicalizerFeature.class));
     }
 
-    public void disableReadCanonicalization() {
-        canonicalizeReads = false;
+    protected CanonicalizerPhase(CustomCanonicalization customCanonicalization, CustomSimplification customSimplification) {
+        this(customCanonicalization, customSimplification, EnumSet.allOf(CanonicalizerFeature.class));
     }
 
-    public void disableSimplification() {
-        simplify = false;
+    protected CanonicalizerPhase(CustomCanonicalization customCanonicalization, CustomSimplification customSimplification, EnumSet features) {
+        this.customCanonicalization = customCanonicalization;
+        this.customSimplification = customSimplification;
+        this.features = features;
+    }
+
+    public CanonicalizerPhase copyWithCustomCanonicalization(CustomCanonicalization newCanonicalization) {
+        return new CanonicalizerPhase(newCanonicalization, customSimplification, features);
+    }
+
+    public CanonicalizerPhase copyWithCustomSimplification(CustomSimplification newSimplification) {
+        return new CanonicalizerPhase(customCanonicalization, newSimplification, features);
+    }
+
+    public CanonicalizerPhase copyWithoutGVN() {
+        EnumSet newFeatures = EnumSet.copyOf(features);
+        newFeatures.remove(GVN);
+        return new CanonicalizerPhase(customCanonicalization, customSimplification, newFeatures);
+    }
+
+    public CanonicalizerPhase copyWithoutSimplification() {
+        EnumSet newFeatures = EnumSet.copyOf(features);
+        newFeatures.remove(CFG_SIMPLIFICATION);
+        return new CanonicalizerPhase(customCanonicalization, customSimplification, newFeatures);
+    }
+
+    public static CanonicalizerPhase create() {
+        return new CanonicalizerPhase(null, null, EnumSet.allOf(CanonicalizerFeature.class));
+    }
+
+    public static CanonicalizerPhase createWithoutReadCanonicalization() {
+        return new CanonicalizerPhase(EnumSet.complementOf(EnumSet.of(READ_CANONICALIZATION)));
+    }
+
+    public static CanonicalizerPhase createWithoutGVN() {
+        return new CanonicalizerPhase(EnumSet.complementOf(EnumSet.of(GVN)));
+    }
+
+    public static CanonicalizerPhase createWithoutCFGSimplification() {
+        return new CanonicalizerPhase(EnumSet.complementOf(EnumSet.of(CFG_SIMPLIFICATION)));
     }
 
     @Override
@@ -274,7 +325,7 @@ public class CanonicalizerPhase extends BasePhase {
             if (tryCanonicalize(node, nodeClass)) {
                 return true;
             }
-            if (globalValueNumber && tryGlobalValueNumbering(node, nodeClass)) {
+            if (features.contains(GVN) && tryGlobalValueNumbering(node, nodeClass)) {
                 return true;
             }
             if (node instanceof ValueNode) {
@@ -329,24 +380,18 @@ public class CanonicalizerPhase extends BasePhase {
         @SuppressWarnings("try")
         public boolean tryCanonicalize(final Node node, NodeClass nodeClass) {
             try (DebugCloseable position = node.withNodeSourcePosition(); DebugContext.Scope scope = debug.withContext(node)) {
-                if (customCanonicalizer != null) {
-                    Node canonical = customCanonicalizer.canonicalize(node);
-                    if (performReplacement(node, canonical)) {
-                        return true;
-                    } else {
-                        customCanonicalizer.simplify(node, tool);
-                        if (node.isDeleted()) {
-                            return true;
-                        }
-                    }
-                }
                 if (nodeClass.isCanonicalizable()) {
                     COUNTER_CANONICALIZATION_CONSIDERED_NODES.increment(debug);
-                    Node canonical;
+                    Node canonical = node;
                     try (AutoCloseable verify = getCanonicalizeableContractAssertion(node)) {
-                        canonical = ((Canonicalizable) node).canonical(tool);
-                        if (canonical == node && nodeClass.isCommutative()) {
-                            canonical = ((BinaryCommutative) node).maybeCommuteInputs();
+                        if (customCanonicalization != null) {
+                            canonical = customCanonicalization.canonicalize(node);
+                        }
+                        if (canonical == node) {
+                            canonical = ((Canonicalizable) node).canonical(tool);
+                            if (canonical == node && nodeClass.isCommutative()) {
+                                canonical = ((BinaryCommutative) node).maybeCommuteInputs();
+                            }
                         }
                     } catch (Throwable e) {
                         throw new GraalGraphError(e).addContext(node);
@@ -356,12 +401,17 @@ public class CanonicalizerPhase extends BasePhase {
                     }
                 }
 
-                if (nodeClass.isSimplifiable() && simplify) {
+                if (features.contains(CFG_SIMPLIFICATION) && nodeClass.isSimplifiable()) {
                     debug.log(DebugContext.VERBOSE_LEVEL, "Canonicalizer: simplifying %s", node);
                     COUNTER_SIMPLIFICATION_CONSIDERED_NODES.increment(debug);
-                    node.simplify(tool);
-                    if (node.isDeleted()) {
-                        debug.log("Canonicalizer: simplified %s", node);
+                    if (customSimplification != null) {
+                        customSimplification.simplify(node, tool);
+                    }
+                    if (node.isAlive()) {
+                        node.simplify(tool);
+                        if (node.isDeleted()) {
+                            debug.log("Canonicalizer: simplified %s", node);
+                        }
                     }
                     return node.isDeleted();
                 }
@@ -518,7 +568,7 @@ public class CanonicalizerPhase extends BasePhase {
 
             @Override
             public boolean canonicalizeReads() {
-                return canonicalizeReads;
+                return features.contains(READ_CANONICALIZATION);
             }
 
             @Override
@@ -549,7 +599,7 @@ public class CanonicalizerPhase extends BasePhase {
     }
 
     public boolean getCanonicalizeReads() {
-        return canonicalizeReads;
+        return features.contains(READ_CANONICALIZATION);
     }
 
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
index fcc205b8de5..be8827c6f7a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
@@ -186,6 +186,8 @@ public class ConditionalEliminationPhase extends BasePhase {
 
                 // Check if we can move guards upwards.
                 AbstractBeginNode trueSuccessor = node.trueSuccessor();
+                AbstractBeginNode falseSuccessor = node.falseSuccessor();
+
                 EconomicMap trueGuards = EconomicMap.create(Equivalence.IDENTITY);
                 for (GuardNode guard : trueSuccessor.guards()) {
                     LogicNode condition = guard.getCondition();
@@ -195,7 +197,7 @@ public class ConditionalEliminationPhase extends BasePhase {
                 }
 
                 if (!trueGuards.isEmpty()) {
-                    for (GuardNode guard : node.falseSuccessor().guards().snapshot()) {
+                    for (GuardNode guard : falseSuccessor.guards().snapshot()) {
                         GuardNode otherGuard = trueGuards.get(guard.getCondition());
                         if (otherGuard != null && guard.isNegated() == otherGuard.isNegated()) {
                             Speculation speculation = otherGuard.getSpeculation();
@@ -210,9 +212,17 @@ public class ConditionalEliminationPhase extends BasePhase {
                                                 guard.getNoDeoptSuccessorPosition());
                                 GuardNode newGuard = node.graph().unique(newlyCreatedGuard);
                                 if (otherGuard.isAlive()) {
-                                    otherGuard.replaceAndDelete(newGuard);
+                                    if (trueSuccessor instanceof LoopExitNode && beginNode.graph().hasValueProxies()) {
+                                        otherGuard.replaceAndDelete(ProxyNode.forGuard(newGuard, (LoopExitNode) trueSuccessor));
+                                    } else {
+                                        otherGuard.replaceAndDelete(newGuard);
+                                    }
+                                }
+                                if (falseSuccessor instanceof LoopExitNode && beginNode.graph().hasValueProxies()) {
+                                    guard.replaceAndDelete(ProxyNode.forGuard(newGuard, (LoopExitNode) falseSuccessor));
+                                } else {
+                                    guard.replaceAndDelete(newGuard);
                                 }
-                                guard.replaceAndDelete(newGuard);
                             }
                         }
                     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java
index c568efafb7d..59b31ce15b0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java
@@ -48,6 +48,7 @@ import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.LoopEndNode;
 import org.graalvm.compiler.nodes.LoopExitNode;
 import org.graalvm.compiler.nodes.PhiNode;
+import org.graalvm.compiler.nodes.ProxyNode;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StartNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -166,9 +167,9 @@ public class FloatingReadPhase extends Phase {
 
     protected void processNode(FixedNode node, EconomicSet currentState) {
         if (node instanceof MemoryCheckpoint.Single) {
-            processIdentity(currentState, ((MemoryCheckpoint.Single) node).getLocationIdentity());
+            processIdentity(currentState, ((MemoryCheckpoint.Single) node).getKilledLocationIdentity());
         } else if (node instanceof MemoryCheckpoint.Multi) {
-            for (LocationIdentity identity : ((MemoryCheckpoint.Multi) node).getLocationIdentities()) {
+            for (LocationIdentity identity : ((MemoryCheckpoint.Multi) node).getKilledLocationIdentities()) {
                 processIdentity(currentState, identity);
             }
         }
@@ -274,7 +275,7 @@ public class FloatingReadPhase extends Phase {
                 }
                 mergedStatesCount++;
             }
-            newState.lastMemorySnapshot.put(key, merged);
+            newState.getMap().put(key, merged);
         }
         return newState;
 
@@ -301,6 +302,16 @@ public class FloatingReadPhase extends Phase {
 
         @Override
         protected MemoryMapImpl processNode(FixedNode node, MemoryMapImpl state) {
+
+            if (node instanceof LoopExitNode) {
+                final LoopExitNode loopExitNode = (LoopExitNode) node;
+                final EconomicSet modifiedInLoop = modifiedInLoops.get(loopExitNode.loopBegin());
+                final boolean anyModified = modifiedInLoop.contains(LocationIdentity.any());
+                state.getMap().replaceAll((locationIdentity, memoryNode) -> (anyModified || modifiedInLoop.contains(locationIdentity))
+                                ? ProxyNode.forMemory(memoryNode, loopExitNode, locationIdentity)
+                                : memoryNode);
+            }
+
             if (node instanceof MemoryAnchorNode) {
                 processAnchor((MemoryAnchorNode) node, state);
                 return state;
@@ -312,7 +323,8 @@ public class FloatingReadPhase extends Phase {
 
             if (createFloatingReads && node instanceof FloatableAccessNode) {
                 processFloatable((FloatableAccessNode) node, state);
-            } else if (node instanceof MemoryCheckpoint.Single) {
+            }
+            if (node instanceof MemoryCheckpoint.Single) {
                 processCheckpoint((MemoryCheckpoint.Single) node, state);
             } else if (node instanceof MemoryCheckpoint.Multi) {
                 processCheckpoint((MemoryCheckpoint.Multi) node, state);
@@ -320,7 +332,7 @@ public class FloatingReadPhase extends Phase {
             assert MemoryCheckpoint.TypeAssertion.correctType(node) : node;
 
             if (createMemoryMapNodes && node instanceof ReturnNode) {
-                ((ReturnNode) node).setMemoryMap(node.graph().unique(new MemoryMapNode(state.lastMemorySnapshot)));
+                ((ReturnNode) node).setMemoryMap(node.graph().unique(new MemoryMapNode(state.getMap())));
             }
             return state;
         }
@@ -355,21 +367,21 @@ public class FloatingReadPhase extends Phase {
         }
 
         private static void processCheckpoint(MemoryCheckpoint.Single checkpoint, MemoryMapImpl state) {
-            processIdentity(checkpoint.getLocationIdentity(), checkpoint, state);
+            processIdentity(checkpoint.getKilledLocationIdentity(), checkpoint, state);
         }
 
         private static void processCheckpoint(MemoryCheckpoint.Multi checkpoint, MemoryMapImpl state) {
-            for (LocationIdentity identity : checkpoint.getLocationIdentities()) {
+            for (LocationIdentity identity : checkpoint.getKilledLocationIdentities()) {
                 processIdentity(identity, checkpoint, state);
             }
         }
 
         private static void processIdentity(LocationIdentity identity, MemoryCheckpoint checkpoint, MemoryMapImpl state) {
             if (identity.isAny()) {
-                state.lastMemorySnapshot.clear();
+                state.getMap().clear();
             }
             if (identity.isMutable()) {
-                state.lastMemorySnapshot.put(identity, checkpoint);
+                state.getMap().put(identity, checkpoint);
             }
         }
 
@@ -405,7 +417,7 @@ public class FloatingReadPhase extends Phase {
                  * side it needs to choose by putting in the location identity on both successors.
                  */
                 InvokeWithExceptionNode invoke = (InvokeWithExceptionNode) node.predecessor();
-                result.lastMemorySnapshot.put(invoke.getLocationIdentity(), (MemoryCheckpoint) node);
+                result.getMap().put(invoke.getKilledLocationIdentity(), (MemoryCheckpoint) node);
             }
             return result;
         }
@@ -417,13 +429,13 @@ public class FloatingReadPhase extends Phase {
             if (modifiedLocations.contains(LocationIdentity.any())) {
                 // create phis for all locations if ANY is modified in the loop
                 modifiedLocations = EconomicSet.create(Equivalence.DEFAULT, modifiedLocations);
-                modifiedLocations.addAll(initialState.lastMemorySnapshot.getKeys());
+                modifiedLocations.addAll(initialState.getMap().getKeys());
             }
 
             for (LocationIdentity location : modifiedLocations) {
                 createMemoryPhi(loop, initialState, phis, location);
             }
-            initialState.lastMemorySnapshot.putAll(phis);
+            initialState.getMap().putAll(phis);
 
             LoopInfo loopInfo = ReentrantNodeIterator.processLoop(this, loop, initialState);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
index 6fa53af1c33..6e407b423f2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -24,7 +24,6 @@
 
 package org.graalvm.compiler.phases.common;
 
-import org.graalvm.compiler.core.common.cfg.Loop;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.Node;
@@ -34,8 +33,6 @@ import org.graalvm.compiler.nodes.DeoptimizeNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.GuardNode;
 import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
 import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
@@ -62,11 +59,9 @@ public class GuardLoweringPhase extends BasePhase {
 
     private static class LowerGuards extends ScheduledNodeIterator {
 
-        private final Block block;
         private boolean useGuardIdAsDebugId;
 
-        LowerGuards(Block block, boolean useGuardIdAsDebugId) {
-            this.block = block;
+        LowerGuards(boolean useGuardIdAsDebugId) {
             this.useGuardIdAsDebugId = useGuardIdAsDebugId;
         }
 
@@ -95,7 +90,6 @@ public class GuardLoweringPhase extends BasePhase {
                 AbstractBeginNode deoptBranch = BeginNode.begin(deopt);
                 AbstractBeginNode trueSuccessor;
                 AbstractBeginNode falseSuccessor;
-                insertLoopExits(deopt);
                 if (guard.isNegated()) {
                     trueSuccessor = deoptBranch;
                     falseSuccessor = fastPath;
@@ -108,16 +102,6 @@ public class GuardLoweringPhase extends BasePhase {
                 insert(ifNode, fastPath);
             }
         }
-
-        private void insertLoopExits(DeoptimizeNode deopt) {
-            Loop loop = block.getLoop();
-            StructuredGraph graph = deopt.graph();
-            while (loop != null) {
-                LoopExitNode exit = graph.add(new LoopExitNode((LoopBeginNode) loop.getHeader().getBeginNode()));
-                graph.addBeforeFixed(deopt, exit);
-                loop = loop.getParent();
-            }
-        }
     }
 
     @Override
@@ -143,6 +127,6 @@ public class GuardLoweringPhase extends BasePhase {
 
     private static void processBlock(Block block, ScheduleResult schedule) {
         DebugContext debug = block.getBeginNode().getDebug();
-        new LowerGuards(block, debug.isDumpEnabledForMethod() || debug.isLogEnabledForMethod()).processNodes(block, schedule);
+        new LowerGuards(debug.isDumpEnabledForMethod() || debug.isLogEnabledForMethod()).processNodes(block, schedule);
     }
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java
new file mode 100644
index 00000000000..a4e5667225d
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/InsertMembarsPhase.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Red Hat Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+
+package org.graalvm.compiler.phases.common;
+
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.extended.MembarNode;
+import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.VolatileReadNode;
+import org.graalvm.compiler.nodes.memory.WriteNode;
+import org.graalvm.compiler.phases.Phase;
+
+import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_READ;
+import static jdk.vm.ci.code.MemoryBarriers.JMM_POST_VOLATILE_WRITE;
+import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_READ;
+import static jdk.vm.ci.code.MemoryBarriers.JMM_PRE_VOLATILE_WRITE;
+
+public class InsertMembarsPhase extends Phase {
+    @Override
+    protected void run(StructuredGraph graph) {
+        for (FixedAccessNode access : graph.getNodes(FixedAccessNode.TYPE)) {
+            if (access instanceof VolatileReadNode) {
+                ReadNode read = (ReadNode) access;
+                MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_READ));
+                graph.addBeforeFixed(read, preMembar);
+                MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_READ));
+                graph.addAfterFixed(read, postMembar);
+            } else if (access instanceof WriteNode && ((WriteNode) access).isVolatile()) {
+                WriteNode write = (WriteNode) access;
+                MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_WRITE));
+                graph.addBeforeFixed(write, preMembar);
+                MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_WRITE));
+                graph.addAfterFixed(write, postMembar);
+            }
+        }
+    }
+
+    @Override
+    public float codeSizeIncrease() {
+        return 3f;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
index 119ef74ac8e..14bee5912aa 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
@@ -46,6 +46,7 @@ import org.graalvm.compiler.graph.Graph.Mark;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeBitMap;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodeinfo.InputType;
@@ -131,12 +132,14 @@ public class LoweringPhase extends BasePhase {
         private final NodeBitMap activeGuards;
         private AnchoringNode guardAnchor;
         private FixedWithNextNode lastFixedNode;
+        private NodeMap nodeMap;
 
-        LoweringToolImpl(CoreProviders context, AnchoringNode guardAnchor, NodeBitMap activeGuards, FixedWithNextNode lastFixedNode) {
+        LoweringToolImpl(CoreProviders context, AnchoringNode guardAnchor, NodeBitMap activeGuards, FixedWithNextNode lastFixedNode, NodeMap nodeMap) {
             this.context = context;
             this.guardAnchor = guardAnchor;
             this.activeGuards = activeGuards;
             this.lastFixedNode = lastFixedNode;
+            this.nodeMap = nodeMap;
         }
 
         @Override
@@ -199,7 +202,8 @@ public class LoweringPhase extends BasePhase {
             StructuredGraph graph = before.graph();
             if (OptEliminateGuards.getValue(graph.getOptions())) {
                 for (Node usage : condition.usages()) {
-                    if (!activeGuards.isNew(usage) && activeGuards.isMarked(usage) && ((GuardNode) usage).isNegated() == negated) {
+                    if (!activeGuards.isNew(usage) && activeGuards.isMarked(usage) && ((GuardNode) usage).isNegated() == negated &&
+                                    (!before.graph().hasValueProxies() || nodeMap.get(((GuardNode) usage).getAnchor().asNode()).isInSameOrOuterLoopOf(nodeMap.get(before)))) {
                         return (GuardNode) usage;
                     }
                 }
@@ -310,9 +314,9 @@ public class LoweringPhase extends BasePhase {
                  */
                 boolean isAny = false;
                 if (n instanceof MemoryCheckpoint.Single) {
-                    isAny = ((MemoryCheckpoint.Single) n).getLocationIdentity().isAny();
+                    isAny = ((MemoryCheckpoint.Single) n).getKilledLocationIdentity().isAny();
                 } else {
-                    for (LocationIdentity ident : ((MemoryCheckpoint.Multi) n).getLocationIdentities()) {
+                    for (LocationIdentity ident : ((MemoryCheckpoint.Multi) n).getKilledLocationIdentities()) {
                         if (ident.isAny()) {
                             isAny = true;
                         }
@@ -447,7 +451,7 @@ public class LoweringPhase extends BasePhase {
         @SuppressWarnings("try")
         private AnchoringNode process(final Block b, final NodeBitMap activeGuards, final AnchoringNode startAnchor) {
 
-            final LoweringToolImpl loweringTool = new LoweringToolImpl(context, startAnchor, activeGuards, b.getBeginNode());
+            final LoweringToolImpl loweringTool = new LoweringToolImpl(context, startAnchor, activeGuards, b.getBeginNode(), this.schedule.getNodeToBlockMap());
 
             // Lower the instructions of this block.
             List nodes = schedule.nodesFor(b);
@@ -613,69 +617,6 @@ public class LoweringPhase extends BasePhase {
         }
     }
 
-    public static void processBlockBounded(final Frame rootFrame) {
-        ProcessBlockState state = ST_PROCESS;
-        Frame f = rootFrame;
-        while (f != null) {
-            ProcessBlockState nextState;
-            if (state == ST_PROCESS || state == ST_PROCESS_ALWAYS_REACHED) {
-                f.preprocess();
-                nextState = state == ST_PROCESS_ALWAYS_REACHED ? ST_ENTER : ST_ENTER_ALWAYS_REACHED;
-            } else if (state == ST_ENTER_ALWAYS_REACHED) {
-                if (f.alwaysReachedBlock != null && f.alwaysReachedBlock.getDominator() == f.block) {
-                    Frame continueRecur = f.enterAlwaysReached(f.alwaysReachedBlock);
-                    if (continueRecur == null) {
-                        // stop recursion here
-                        f.postprocess();
-                        f = f.parent;
-                        state = ST_ENTER;
-                        continue;
-                    }
-                    f = continueRecur;
-                    nextState = ST_PROCESS;
-                } else {
-                    nextState = ST_ENTER;
-                }
-            } else if (state == ST_ENTER) {
-                if (f.dominated != null) {
-                    Block n = f.dominated;
-                    f.dominated = n.getDominatedSibling();
-                    if (n == f.alwaysReachedBlock) {
-                        if (f.dominated != null) {
-                            n = f.dominated;
-                            f.dominated = n.getDominatedSibling();
-                        } else {
-                            n = null;
-                        }
-                    }
-                    if (n == null) {
-                        nextState = ST_LEAVE;
-                    } else {
-                        Frame continueRecur = f.enter(n);
-                        if (continueRecur == null) {
-                            // stop recursion here
-                            f.postprocess();
-                            f = f.parent;
-                            state = ST_ENTER;
-                            continue;
-                        }
-                        f = continueRecur;
-                        nextState = ST_PROCESS;
-                    }
-                } else {
-                    nextState = ST_LEAVE;
-                }
-            } else if (state == ST_LEAVE) {
-                f.postprocess();
-                f = f.parent;
-                nextState = ST_ENTER;
-            } else {
-                throw GraalError.shouldNotReachHere();
-            }
-            state = nextState;
-        }
-    }
-
     public abstract static class Frame> {
         protected final Block block;
         final T parent;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
index 0c807ad26ca..4973e063626 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
@@ -56,6 +56,7 @@ import org.graalvm.compiler.graph.NodeInputList;
 import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.graph.NodeWorkList;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.Verbosity;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.AbstractEndNode;
@@ -87,6 +88,7 @@ import org.graalvm.compiler.nodes.UnwindNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.IsNullNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
+import org.graalvm.compiler.nodes.extended.GuardedNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
@@ -526,7 +528,17 @@ public class InliningUtil extends ValueMergeUtil {
                 assert unwindNode.predecessor() != null;
                 assert invokeWithException.exceptionEdge().successors().count() == 1;
                 ExceptionObjectNode obj = (ExceptionObjectNode) invokeWithException.exceptionEdge();
-                obj.replaceAtUsages(unwindNode.exception());
+                /*
+                 * The exception object node is a begin node, i.e., it can be used as an anchor for
+                 * other nodes, thus we need to re-route them to a valid anchor, i.e. the begin node
+                 * of the unwind block.
+                 */
+                assert obj.usages().filter(x -> x instanceof GuardedNode && ((GuardedNode) x).getGuard() == obj).count() == 0 : "Must not have guards attached to an exception object node";
+                AbstractBeginNode replacementAnchor = AbstractBeginNode.prevBegin(unwindNode);
+                assert replacementAnchor != null;
+                obj.replaceAtUsages(InputType.Anchor, replacementAnchor);
+                obj.replaceAtUsages(InputType.Value, unwindNode.exception());
+
                 Node n = obj.next();
                 obj.setNext(null);
                 unwindNode.replaceAndDelete(n);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
index ba4e10dd1dd..b2f4d220630 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -208,8 +208,10 @@ public class MultiTypeGuardInlineInfo extends AbstractInlineInfo {
             FixedNode exceptionSux = exceptionEdge.next();
             graph.addBeforeFixed(exceptionSux, exceptionMerge);
             exceptionObjectPhi = graph.addWithoutUnique(new ValuePhiNode(StampFactory.forKind(JavaKind.Object), exceptionMerge));
-            exceptionMerge.setStateAfter(exceptionEdge.stateAfter().duplicateModified(invoke.stateAfter().bci, true, JavaKind.Object, new JavaKind[]{JavaKind.Object},
-                            new ValueNode[]{exceptionObjectPhi}));
+
+            assert exceptionEdge.stateAfter().bci == invoke.bci();
+            assert exceptionEdge.stateAfter().rethrowException();
+            exceptionMerge.setStateAfter(exceptionEdge.stateAfter().duplicateModified(JavaKind.Object, JavaKind.Object, exceptionObjectPhi));
         }
 
         // create one separate block for each invoked method
@@ -396,7 +398,7 @@ public class MultiTypeGuardInlineInfo extends AbstractInlineInfo {
         JavaKind kind = invoke.asNode().getStackKind();
         if (kind != JavaKind.Void) {
             FrameState stateAfter = invoke.stateAfter();
-            stateAfter = stateAfter.duplicate(stateAfter.bci);
+            stateAfter = stateAfter.duplicate();
             stateAfter.replaceFirstInput(invoke.asNode(), result.asNode());
             result.setStateAfter(stateAfter);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
index 0eea6b1fb0e..ad3d29f5ff8 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
@@ -206,7 +206,8 @@ public final class SchedulePhase extends Phase {
                 sortNodesLatestWithinBlock(cfg, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited);
 
                 assert verifySchedule(cfg, latestBlockToNodesMap, currentNodeMap);
-                assert (!Assertions.detailedAssertionsEnabled(graph.getOptions())) || MemoryScheduleVerification.check(cfg.getStartBlock(), latestBlockToNodesMap);
+                assert (!Assertions.detailedAssertionsEnabled(graph.getOptions())) ||
+                                ScheduleVerification.check(cfg.getStartBlock(), latestBlockToNodesMap, currentNodeMap);
 
                 this.blockToNodesMap = latestBlockToNodesMap;
 
@@ -358,7 +359,7 @@ public final class SchedulePhase extends Phase {
             }
 
             if (lastBlock.getBeginNode() instanceof KillingBeginNode) {
-                LocationIdentity locationIdentity = ((KillingBeginNode) lastBlock.getBeginNode()).getLocationIdentity();
+                LocationIdentity locationIdentity = ((KillingBeginNode) lastBlock.getBeginNode()).getKilledLocationIdentity();
                 if ((locationIdentity.isAny() || locationIdentity.equals(location)) && lastBlock != earliestBlock) {
                     // The begin of this block kills the location, so we *have* to schedule the node
                     // in the dominating block.
@@ -374,13 +375,13 @@ public final class SchedulePhase extends Phase {
                 for (Node n : subList) {
                     // Check if this node kills a node in the watch list.
                     if (n instanceof MemoryCheckpoint.Single) {
-                        LocationIdentity identity = ((MemoryCheckpoint.Single) n).getLocationIdentity();
+                        LocationIdentity identity = ((MemoryCheckpoint.Single) n).getKilledLocationIdentity();
                         killed.add(identity);
                         if (killed.isAny()) {
                             return;
                         }
                     } else if (n instanceof MemoryCheckpoint.Multi) {
-                        for (LocationIdentity identity : ((MemoryCheckpoint.Multi) n).getLocationIdentities()) {
+                        for (LocationIdentity identity : ((MemoryCheckpoint.Multi) n).getKilledLocationIdentities()) {
                             killed.add(identity);
                             if (killed.isAny()) {
                                 return;
@@ -471,10 +472,10 @@ public final class SchedulePhase extends Phase {
             if (watchList != null && !watchList.isEmpty()) {
                 // Check if this node kills a node in the watch list.
                 if (n instanceof MemoryCheckpoint.Single) {
-                    LocationIdentity identity = ((MemoryCheckpoint.Single) n).getLocationIdentity();
+                    LocationIdentity identity = ((MemoryCheckpoint.Single) n).getKilledLocationIdentity();
                     checkWatchList(watchList, identity, b, result, nodeMap, unprocessed);
                 } else if (n instanceof MemoryCheckpoint.Multi) {
-                    for (LocationIdentity identity : ((MemoryCheckpoint.Multi) n).getLocationIdentities()) {
+                    for (LocationIdentity identity : ((MemoryCheckpoint.Multi) n).getKilledLocationIdentities()) {
                         checkWatchList(watchList, identity, b, result, nodeMap, unprocessed);
                     }
                 }
@@ -896,7 +897,7 @@ public final class SchedulePhase extends Phase {
                 }
             }
 
-            assert (!Assertions.detailedAssertionsEnabled(cfg.graph.getOptions())) || MemoryScheduleVerification.check(cfg.getStartBlock(), blockToNodes);
+            assert (!Assertions.detailedAssertionsEnabled(cfg.graph.getOptions())) || ScheduleVerification.check(cfg.getStartBlock(), blockToNodes, nodeToBlock);
         }
 
         private static void processNodes(NodeBitMap visited, NodeMap entries, NodeStack stack, MicroBlock startBlock, Iterable nodes) {
@@ -1183,10 +1184,10 @@ public final class SchedulePhase extends Phase {
             Formatter buf = new Formatter();
             buf.format("%s", n);
             if (n instanceof MemoryCheckpoint.Single) {
-                buf.format(" // kills %s", ((MemoryCheckpoint.Single) n).getLocationIdentity());
+                buf.format(" // kills %s", ((MemoryCheckpoint.Single) n).getKilledLocationIdentity());
             } else if (n instanceof MemoryCheckpoint.Multi) {
                 buf.format(" // kills ");
-                for (LocationIdentity locid : ((MemoryCheckpoint.Multi) n).getLocationIdentities()) {
+                for (LocationIdentity locid : ((MemoryCheckpoint.Multi) n).getKilledLocationIdentities()) {
                     buf.format("%s, ", locid);
                 }
             } else if (n instanceof FloatingReadNode) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/ScheduleVerification.java
similarity index 62%
rename from src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java
rename to src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/ScheduleVerification.java
index 301fc296034..b689a538439 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/MemoryScheduleVerification.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/ScheduleVerification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,10 +32,16 @@ import org.graalvm.compiler.core.common.cfg.BlockMap;
 import org.graalvm.compiler.core.common.cfg.Loop;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.AbstractMergeNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
+import org.graalvm.compiler.nodes.LoopExitNode;
+import org.graalvm.compiler.nodes.MemoryProxyNode;
 import org.graalvm.compiler.nodes.PhiNode;
+import org.graalvm.compiler.nodes.ProxyNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.VirtualState;
 import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.cfg.HIRLoop;
 import org.graalvm.compiler.nodes.memory.FloatingReadNode;
@@ -46,17 +52,26 @@ import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
 import org.graalvm.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 
-public final class MemoryScheduleVerification extends BlockIteratorClosure> {
+/**
+ * Verifies that the schedule of the graph is correct. Checks that floating reads are not killed
+ * between definition and usage. Also checks that there are no usages spanning loop exits without a
+ * proper proxy node.
+ */
+public final class ScheduleVerification extends BlockIteratorClosure> {
 
     private final BlockMap> blockToNodesMap;
+    private final NodeMap nodeMap;
+    private final StructuredGraph graph;
 
-    public static boolean check(Block startBlock, BlockMap> blockToNodesMap) {
-        ReentrantBlockIterator.apply(new MemoryScheduleVerification(blockToNodesMap), startBlock);
+    public static boolean check(Block startBlock, BlockMap> blockToNodesMap, NodeMap nodeMap) {
+        ReentrantBlockIterator.apply(new ScheduleVerification(blockToNodesMap, nodeMap, startBlock.getBeginNode().graph()), startBlock);
         return true;
     }
 
-    private MemoryScheduleVerification(BlockMap> blockToNodesMap) {
+    private ScheduleVerification(BlockMap> blockToNodesMap, NodeMap nodeMap, StructuredGraph graph) {
         this.blockToNodesMap = blockToNodesMap;
+        this.nodeMap = nodeMap;
+        this.graph = graph;
     }
 
     @Override
@@ -76,14 +91,23 @@ public final class MemoryScheduleVerification extends BlockIteratorClosure usageLoop = null;
+                    if (usageNode instanceof ProxyNode) {
+                        ProxyNode proxyNode = (ProxyNode) usageNode;
+                        usageLoop = nodeMap.get(proxyNode.proxyPoint().loopBegin()).getLoop();
+                    } else {
+                        if (usageBlock.getBeginNode() instanceof LoopExitNode) {
+                            // For nodes in the loop exit node block, we don't know for sure
+                            // whether they are "in the loop" or not. It depends on whether
+                            // one of their transient usages is a loop proxy node.
+                            // For now, let's just assume those nodes are OK, i.e., "in the loop".
+                            LoopExitNode loopExitNode = (LoopExitNode) usageBlock.getBeginNode();
+                            usageLoop = nodeMap.get(loopExitNode.loopBegin()).getLoop();
+                        } else {
+                            usageLoop = usageBlock.getLoop();
+                        }
+                    }
+
+                    assert usageLoop != null : n + ", " + nodeMap.get(n) + " / " + usageNode + ", " + nodeMap.get(usageNode);
+                    while (usageLoop != block.getLoop() && usageLoop != null) {
+                        usageLoop = usageLoop.getParent();
+                    }
+                    assert usageLoop != null : n + ", " + usageNode + ", " + usageBlock + ", " + usageBlock.getLoop() + ", " + block + ", " + block.getLoop();
+                }
             }
         }
         return currentState;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
index 54412b21165..9cca1544e19 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
@@ -32,7 +32,6 @@ import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.Una
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
 
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticLIRGeneratorTool.RoundingMode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
@@ -45,6 +44,7 @@ import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode;
 import org.graalvm.compiler.nodes.java.AtomicReadAndWriteNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.FusedMultiplyAddNode;
@@ -60,39 +60,39 @@ import sun.misc.Unsafe;
 
 public class AArch64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
     @Override
-    public void register(Plugins plugins, BytecodeProvider replacementsBytecodeProvider, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerMathPlugins,
+    public void register(Plugins plugins, Replacements replacements, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerMathPlugins,
                     boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) {
-        register(plugins, replacementsBytecodeProvider, explicitUnsafeNullChecks, registerMathPlugins, emitJDK9StringSubstitutions, useFMAIntrinsics);
+        register(plugins, replacements, explicitUnsafeNullChecks, registerMathPlugins, emitJDK9StringSubstitutions, useFMAIntrinsics);
     }
 
-    public static void register(Plugins plugins, BytecodeProvider bytecodeProvider, boolean explicitUnsafeNullChecks,
+    public static void register(Plugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks,
                     boolean registerMathPlugins, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) {
         InvocationPlugins invocationPlugins = plugins.getInvocationPlugins();
         invocationPlugins.defer(new Runnable() {
             @Override
             public void run() {
-                registerIntegerLongPlugins(invocationPlugins, JavaKind.Int, bytecodeProvider);
-                registerIntegerLongPlugins(invocationPlugins, JavaKind.Long, bytecodeProvider);
+                registerIntegerLongPlugins(invocationPlugins, JavaKind.Int, replacements);
+                registerIntegerLongPlugins(invocationPlugins, JavaKind.Long, replacements);
                 if (registerMathPlugins) {
                     registerMathPlugins(invocationPlugins, useFMAIntrinsics);
                 }
                 if (emitJDK9StringSubstitutions) {
-                    registerStringLatin1Plugins(invocationPlugins, bytecodeProvider);
-                    registerStringUTF16Plugins(invocationPlugins, bytecodeProvider);
+                    registerStringLatin1Plugins(invocationPlugins, replacements);
+                    registerStringUTF16Plugins(invocationPlugins, replacements);
                 }
-                registerUnsafePlugins(invocationPlugins, bytecodeProvider);
+                registerUnsafePlugins(invocationPlugins, replacements);
                 // This is temporarily disabled until we implement correct emitting of the CAS
                 // instructions of the proper width.
-                registerPlatformSpecificUnsafePlugins(invocationPlugins, bytecodeProvider, explicitUnsafeNullChecks,
+                registerPlatformSpecificUnsafePlugins(invocationPlugins, replacements, explicitUnsafeNullChecks,
                                 new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object});
             }
         });
     }
 
-    private static void registerIntegerLongPlugins(InvocationPlugins plugins, JavaKind kind, BytecodeProvider bytecodeProvider) {
+    private static void registerIntegerLongPlugins(InvocationPlugins plugins, JavaKind kind, Replacements replacements) {
         Class declaringClass = kind.toBoxedJavaClass();
         Class type = kind.toJavaClass();
-        Registration r = new Registration(plugins, declaringClass, bytecodeProvider);
+        Registration r = new Registration(plugins, declaringClass, replacements);
         r.register1("numberOfLeadingZeros", type, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
@@ -196,29 +196,29 @@ public class AArch64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         });
     }
 
-    private static void registerStringLatin1Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
+    private static void registerStringLatin1Plugins(InvocationPlugins plugins, Replacements replacements) {
         if (JavaVersionUtil.JAVA_SPEC >= 9) {
-            Registration r = new Registration(plugins, "java.lang.StringLatin1", replacementsBytecodeProvider);
+            Registration r = new Registration(plugins, "java.lang.StringLatin1", replacements);
             r.setAllowOverwrite(true);
             r.registerMethodSubstitution(AArch64StringLatin1Substitutions.class, "compareTo", byte[].class, byte[].class);
             r.registerMethodSubstitution(AArch64StringLatin1Substitutions.class, "compareToUTF16", byte[].class, byte[].class);
         }
     }
 
-    private static void registerStringUTF16Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
+    private static void registerStringUTF16Plugins(InvocationPlugins plugins, Replacements replacements) {
         if (JavaVersionUtil.JAVA_SPEC >= 9) {
-            Registration r = new Registration(plugins, "java.lang.StringUTF16", replacementsBytecodeProvider);
+            Registration r = new Registration(plugins, "java.lang.StringUTF16", replacements);
             r.setAllowOverwrite(true);
             r.registerMethodSubstitution(AArch64StringUTF16Substitutions.class, "compareTo", byte[].class, byte[].class);
             r.registerMethodSubstitution(AArch64StringUTF16Substitutions.class, "compareToLatin1", byte[].class, byte[].class);
         }
     }
 
-    private static void registerUnsafePlugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
+    private static void registerUnsafePlugins(InvocationPlugins plugins, Replacements replacements) {
         registerUnsafePlugins(new Registration(plugins, Unsafe.class),
                         new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object}, "Object");
         if (JavaVersionUtil.JAVA_SPEC > 8) {
-            registerUnsafePlugins(new Registration(plugins, "jdk.internal.misc.Unsafe", replacementsBytecodeProvider),
+            registerUnsafePlugins(new Registration(plugins, "jdk.internal.misc.Unsafe", replacements),
                             new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object},
                             JavaVersionUtil.JAVA_SPEC <= 11 ? "Object" : "Reference");
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java
index 63de11bf8fa..a4766160716 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountLeadingZerosNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -90,4 +90,10 @@ public final class AMD64CountLeadingZerosNode extends UnaryNode implements Arith
     public void generate(NodeLIRBuilderTool builder, ArithmeticLIRGeneratorTool gen) {
         builder.setResult(this, ((AMD64ArithmeticLIRGeneratorTool) gen).emitCountLeadingZeros(builder.operand(getValue())));
     }
+
+    @NodeIntrinsic
+    public static native int countLeadingZeros(int i);
+
+    @NodeIntrinsic
+    public static native int countLeadingZeros(long i);
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java
index 549024e1850..851ecfe6a96 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64CountTrailingZerosNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -90,4 +90,10 @@ public final class AMD64CountTrailingZerosNode extends UnaryNode implements Arit
     public void generate(NodeLIRBuilderTool builder, ArithmeticLIRGeneratorTool gen) {
         builder.setResult(this, ((AMD64ArithmeticLIRGeneratorTool) gen).emitCountTrailingZeros(builder.operand(getValue())));
     }
+
+    @NodeIntrinsic
+    public static native int countTrailingZeros(int i);
+
+    @NodeIntrinsic
+    public static native int countTrailingZeros(long i);
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
index 348cf1f7f6c..d15a0fab26f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
@@ -35,7 +35,6 @@ import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.Una
 
 import java.util.Arrays;
 
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.lir.amd64.AMD64ArithmeticLIRGeneratorTool.RoundingMode;
 import org.graalvm.compiler.nodes.PauseNode;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -48,9 +47,8 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registratio
 import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode;
 import org.graalvm.compiler.nodes.java.AtomicReadAndWriteNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.replacements.ArraysSubstitutions;
-import org.graalvm.compiler.replacements.IntegerSubstitutions;
-import org.graalvm.compiler.replacements.LongSubstitutions;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.UnsafeAccessPlugin;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.UnsafeGetPlugin;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.UnsafePutPlugin;
@@ -72,30 +70,31 @@ import sun.misc.Unsafe;
 
 public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
     @Override
-    public void register(Plugins plugins, BytecodeProvider replacementsBytecodeProvider, Architecture architecture, boolean explicitUnsafeNullChecks,
+    public void register(Plugins plugins, Replacements replacements, Architecture architecture, boolean explicitUnsafeNullChecks,
                     boolean registerMathPlugins, boolean emitJDK9StringSubstitutions, boolean useFMAIntrinsics) {
-        register(plugins, replacementsBytecodeProvider, (AMD64) architecture, explicitUnsafeNullChecks, emitJDK9StringSubstitutions, useFMAIntrinsics);
+        register(plugins, replacements, (AMD64) architecture, explicitUnsafeNullChecks, emitJDK9StringSubstitutions, useFMAIntrinsics);
     }
 
-    public static void register(Plugins plugins, BytecodeProvider replacementsBytecodeProvider, AMD64 arch, boolean explicitUnsafeNullChecks, boolean emitJDK9StringSubstitutions,
+    public static void register(Plugins plugins, Replacements replacements, AMD64 arch, boolean explicitUnsafeNullChecks,
+                    boolean emitJDK9StringSubstitutions,
                     boolean useFMAIntrinsics) {
         InvocationPlugins invocationPlugins = plugins.getInvocationPlugins();
         invocationPlugins.defer(new Runnable() {
             @Override
             public void run() {
                 registerThreadPlugins(invocationPlugins, arch);
-                registerIntegerLongPlugins(invocationPlugins, IntegerSubstitutions.class, JavaKind.Int, arch, replacementsBytecodeProvider);
-                registerIntegerLongPlugins(invocationPlugins, LongSubstitutions.class, JavaKind.Long, arch, replacementsBytecodeProvider);
-                registerPlatformSpecificUnsafePlugins(invocationPlugins, replacementsBytecodeProvider, explicitUnsafeNullChecks,
+                registerIntegerLongPlugins(invocationPlugins, AMD64IntegerSubstitutions.class, JavaKind.Int, arch, replacements);
+                registerIntegerLongPlugins(invocationPlugins, AMD64LongSubstitutions.class, JavaKind.Long, arch, replacements);
+                registerPlatformSpecificUnsafePlugins(invocationPlugins, replacements, explicitUnsafeNullChecks,
                                 new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object, JavaKind.Boolean, JavaKind.Byte, JavaKind.Short, JavaKind.Char, JavaKind.Float, JavaKind.Double});
-                registerUnsafePlugins(invocationPlugins, replacementsBytecodeProvider, explicitUnsafeNullChecks);
-                registerStringPlugins(invocationPlugins, replacementsBytecodeProvider);
+                registerUnsafePlugins(invocationPlugins, replacements, explicitUnsafeNullChecks);
+                registerStringPlugins(invocationPlugins, replacements);
                 if (emitJDK9StringSubstitutions) {
-                    registerStringLatin1Plugins(invocationPlugins, replacementsBytecodeProvider);
-                    registerStringUTF16Plugins(invocationPlugins, replacementsBytecodeProvider);
+                    registerStringLatin1Plugins(invocationPlugins, replacements);
+                    registerStringUTF16Plugins(invocationPlugins, replacements);
                 }
-                registerMathPlugins(invocationPlugins, useFMAIntrinsics, arch, replacementsBytecodeProvider);
-                registerArraysEqualsPlugins(invocationPlugins, replacementsBytecodeProvider);
+                registerMathPlugins(invocationPlugins, useFMAIntrinsics, arch, replacements);
+                registerArraysEqualsPlugins(invocationPlugins, replacements);
             }
         });
     }
@@ -103,72 +102,37 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
     private static void registerThreadPlugins(InvocationPlugins plugins, AMD64 arch) {
         if (JavaVersionUtil.JAVA_SPEC > 8) {
             // Pause instruction introduced with SSE2
-            if (arch.getFeatures().contains(AMD64.CPUFeature.SSE2)) {
-                Registration r = new Registration(plugins, Thread.class);
-                r.register0("onSpinWait", new InvocationPlugin() {
-                    @Override
-                    public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                        b.append(new PauseNode());
-                        return true;
-                    }
-                });
-            }
+            assert (arch.getFeatures().contains(AMD64.CPUFeature.SSE2));
+            Registration r = new Registration(plugins, Thread.class);
+            r.register0("onSpinWait", new InvocationPlugin() {
+                @Override
+                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                    b.append(new PauseNode());
+                    return true;
+                }
+            });
         }
     }
 
-    private static void registerIntegerLongPlugins(InvocationPlugins plugins, Class substituteDeclaringClass, JavaKind kind, AMD64 arch, BytecodeProvider bytecodeProvider) {
+    private static void registerIntegerLongPlugins(InvocationPlugins plugins, Class substituteDeclaringClass, JavaKind kind, AMD64 arch, Replacements replacements) {
         Class declaringClass = kind.toBoxedJavaClass();
         Class type = kind.toJavaClass();
-        Registration r = new Registration(plugins, declaringClass, bytecodeProvider);
+        Registration r = new Registration(plugins, declaringClass, replacements);
         r.registerMethodSubstitution(substituteDeclaringClass, "numberOfLeadingZeros", type);
-        if (arch.getFeatures().contains(AMD64.CPUFeature.LZCNT) && arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction)) {
-            r.setAllowOverwrite(true);
-            r.register1("numberOfLeadingZeros", type, new InvocationPlugin() {
-                @Override
-                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
-                    ValueNode folded = AMD64CountLeadingZerosNode.tryFold(value);
-                    if (folded != null) {
-                        b.addPush(JavaKind.Int, folded);
-                    } else {
-                        b.addPush(JavaKind.Int, new AMD64CountLeadingZerosNode(value));
-                    }
-                    return true;
-                }
-            });
-        }
-
         r.registerMethodSubstitution(substituteDeclaringClass, "numberOfTrailingZeros", type);
-        if (arch.getFeatures().contains(AMD64.CPUFeature.BMI1) && arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction)) {
-            r.setAllowOverwrite(true);
-            r.register1("numberOfTrailingZeros", type, new InvocationPlugin() {
-
-                @Override
-                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
-                    ValueNode folded = AMD64CountTrailingZerosNode.tryFold(value);
-                    if (folded != null) {
-                        b.addPush(JavaKind.Int, folded);
-                    } else {
-                        b.addPush(JavaKind.Int, new AMD64CountTrailingZerosNode(value));
-                    }
-                    return true;
-                }
-            });
-        }
-
-        if (arch.getFeatures().contains(AMD64.CPUFeature.POPCNT)) {
-            r.register1("bitCount", type, new InvocationPlugin() {
-                @Override
-                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
-                    b.push(JavaKind.Int, b.append(new BitCountNode(value).canonical(null)));
-                    return true;
-                }
-            });
-        }
 
+        r.registerConditional1(arch.getFeatures().contains(AMD64.CPUFeature.POPCNT),
+                        "bitCount", type, new InvocationPlugin() {
+                            @Override
+                            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
+                                b.push(JavaKind.Int, b.append(new BitCountNode(value).canonical(null)));
+                                return true;
+                            }
+                        });
     }
 
-    private static void registerMathPlugins(InvocationPlugins plugins, boolean useFMAIntrinsics, AMD64 arch, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Math.class, bytecodeProvider);
+    private static void registerMathPlugins(InvocationPlugins plugins, boolean useFMAIntrinsics, AMD64 arch, Replacements replacements) {
+        Registration r = new Registration(plugins, Math.class, replacements);
         registerUnaryMath(r, "log", LOG);
         registerUnaryMath(r, "log10", LOG10);
         registerUnaryMath(r, "exp", EXP);
@@ -177,19 +141,18 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         registerUnaryMath(r, "cos", COS);
         registerUnaryMath(r, "tan", TAN);
 
-        if (arch.getFeatures().contains(CPUFeature.SSE4_1)) {
-            registerRound(r, "rint", RoundingMode.NEAREST);
-            registerRound(r, "ceil", RoundingMode.UP);
-            registerRound(r, "floor", RoundingMode.DOWN);
-        }
+        boolean roundEnabled = arch.getFeatures().contains(CPUFeature.SSE4_1);
+        registerRound(roundEnabled, r, "rint", RoundingMode.NEAREST);
+        registerRound(roundEnabled, r, "ceil", RoundingMode.UP);
+        registerRound(roundEnabled, r, "floor", RoundingMode.DOWN);
 
-        if (useFMAIntrinsics && JavaVersionUtil.JAVA_SPEC > 8 && arch.getFeatures().contains(CPUFeature.FMA)) {
-            registerFMA(r);
+        if (JavaVersionUtil.JAVA_SPEC > 8) {
+            registerFMA(r, useFMAIntrinsics && arch.getFeatures().contains(CPUFeature.FMA));
         }
     }
 
-    private static void registerFMA(Registration r) {
-        r.register3("fma",
+    private static void registerFMA(Registration r, boolean isEnabled) {
+        r.registerConditional3(isEnabled, "fma",
                         Double.TYPE,
                         Double.TYPE,
                         Double.TYPE,
@@ -205,7 +168,7 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
                                 return true;
                             }
                         });
-        r.register3("fma",
+        r.registerConditional3(isEnabled, "fma",
                         Float.TYPE,
                         Float.TYPE,
                         Float.TYPE,
@@ -243,8 +206,8 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         });
     }
 
-    private static void registerRound(Registration r, String name, RoundingMode mode) {
-        r.register1(name, Double.TYPE, new InvocationPlugin() {
+    private static void registerRound(boolean isEnabled, Registration r, String name, RoundingMode mode) {
+        r.registerConditional1(isEnabled, name, Double.TYPE, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
                 b.push(JavaKind.Double, b.append(new AMD64RoundNode(arg, mode)));
@@ -253,10 +216,10 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         });
     }
 
-    private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
+    private static void registerStringPlugins(InvocationPlugins plugins, Replacements replacements) {
         if (JavaVersionUtil.JAVA_SPEC <= 8) {
             Registration r;
-            r = new Registration(plugins, String.class, replacementsBytecodeProvider);
+            r = new Registration(plugins, String.class, replacements);
             r.setAllowOverwrite(true);
             r.registerMethodSubstitution(AMD64StringSubstitutions.class, "indexOf", char[].class, int.class,
                             int.class, char[].class, int.class, int.class, int.class);
@@ -265,8 +228,8 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         }
     }
 
-    private static void registerStringLatin1Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
-        Registration r = new Registration(plugins, "java.lang.StringLatin1", replacementsBytecodeProvider);
+    private static void registerStringLatin1Plugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, "java.lang.StringLatin1", replacements);
         r.setAllowOverwrite(true);
         r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "compareTo", byte[].class, byte[].class);
         r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "compareToUTF16", byte[].class, byte[].class);
@@ -276,8 +239,8 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         r.registerMethodSubstitution(AMD64StringLatin1Substitutions.class, "indexOf", byte[].class, int.class, byte[].class, int.class, int.class);
     }
 
-    private static void registerStringUTF16Plugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider) {
-        Registration r = new Registration(plugins, "java.lang.StringUTF16", replacementsBytecodeProvider);
+    private static void registerStringUTF16Plugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, "java.lang.StringUTF16", replacements);
         r.setAllowOverwrite(true);
         r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "compareTo", byte[].class, byte[].class);
         r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "compareToLatin1", byte[].class, byte[].class);
@@ -288,10 +251,10 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         r.registerMethodSubstitution(AMD64StringUTF16Substitutions.class, "indexOfLatin1Unsafe", byte[].class, int.class, byte[].class, int.class, int.class);
     }
 
-    private static void registerUnsafePlugins(InvocationPlugins plugins, BytecodeProvider replacementsBytecodeProvider, boolean explicitUnsafeNullChecks) {
+    private static void registerUnsafePlugins(InvocationPlugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks) {
         registerUnsafePlugins(new Registration(plugins, Unsafe.class), explicitUnsafeNullChecks, new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object}, true);
         if (JavaVersionUtil.JAVA_SPEC > 8) {
-            registerUnsafePlugins(new Registration(plugins, "jdk.internal.misc.Unsafe", replacementsBytecodeProvider), explicitUnsafeNullChecks,
+            registerUnsafePlugins(new Registration(plugins, "jdk.internal.misc.Unsafe", replacements), explicitUnsafeNullChecks,
                             new JavaKind[]{JavaKind.Boolean, JavaKind.Byte, JavaKind.Char, JavaKind.Short, JavaKind.Int, JavaKind.Long, JavaKind.Object},
                             JavaVersionUtil.JAVA_SPEC <= 11);
         }
@@ -330,8 +293,8 @@ public class AMD64GraphBuilderPlugins implements TargetGraphBuilderPlugins {
         }
     }
 
-    private static void registerArraysEqualsPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Arrays.class, bytecodeProvider);
+    private static void registerArraysEqualsPlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, Arrays.class, replacements);
         r.registerMethodSubstitution(ArraysSubstitutions.class, "equals", float[].class, float[].class);
         r.registerMethodSubstitution(ArraysSubstitutions.class, "equals", double[].class, double[].class);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java
new file mode 100644
index 00000000000..f9829e83c0b
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.replacements.amd64;
+
+import static org.graalvm.compiler.replacements.NodeIntrinsificationProvider.INJECTED_TARGET;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
+import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
+
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.code.TargetDescription;
+
+@ClassSubstitution(Integer.class)
+public class AMD64IntegerSubstitutions {
+
+    @Fold
+    static boolean lzcnt(@Fold.InjectedParameter TargetDescription target) {
+        AMD64 arch = (AMD64) target.arch;
+        return arch.getFeatures().contains(AMD64.CPUFeature.LZCNT) && arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction);
+    }
+
+    @Fold
+    static boolean tzcnt(@Fold.InjectedParameter TargetDescription target) {
+        AMD64 arch = (AMD64) target.arch;
+        return arch.getFeatures().contains(AMD64.CPUFeature.BMI1) && arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction);
+    }
+
+    @MethodSubstitution
+    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
+    public static int numberOfLeadingZeros(int i) {
+        if (lzcnt(INJECTED_TARGET)) {
+            return AMD64CountLeadingZerosNode.countLeadingZeros(i);
+        }
+        if (i == 0) {
+            return 32;
+        }
+        return 31 - BitScanReverseNode.unsafeScan(i);
+    }
+
+    @MethodSubstitution
+    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
+    public static int numberOfTrailingZeros(int i) {
+        if (tzcnt(INJECTED_TARGET)) {
+            return AMD64CountTrailingZerosNode.countTrailingZeros(i);
+        }
+        if (i == 0) {
+            return 32;
+        }
+        return BitScanForwardNode.unsafeScan(i);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java
new file mode 100644
index 00000000000..b3802fabe1f
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.compiler.replacements.amd64;
+
+// JaCoCo Exclude
+
+import static org.graalvm.compiler.replacements.NodeIntrinsificationProvider.INJECTED_TARGET;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
+import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
+
+import jdk.vm.ci.amd64.AMD64;
+import jdk.vm.ci.code.TargetDescription;
+
+@ClassSubstitution(Long.class)
+public class AMD64LongSubstitutions {
+
+    @Fold
+    static boolean lzcnt(@Fold.InjectedParameter TargetDescription target) {
+        AMD64 arch = (AMD64) target.arch;
+        return arch.getFeatures().contains(AMD64.CPUFeature.LZCNT) && arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction);
+    }
+
+    @Fold
+    static boolean tzcnt(@Fold.InjectedParameter TargetDescription target) {
+        AMD64 arch = (AMD64) target.arch;
+        return arch.getFeatures().contains(AMD64.CPUFeature.BMI1) && arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction);
+    }
+
+    @MethodSubstitution
+    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
+    public static int numberOfLeadingZeros(long i) {
+        if (lzcnt(INJECTED_TARGET)) {
+            return AMD64CountLeadingZerosNode.countLeadingZeros(i);
+        }
+        if (i == 0) {
+            return 64;
+        }
+        return 63 - BitScanReverseNode.unsafeScan(i);
+    }
+
+    @MethodSubstitution
+    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
+    public static int numberOfTrailingZeros(long i) {
+        if (tzcnt(INJECTED_TARGET)) {
+            return AMD64CountTrailingZerosNode.countTrailingZeros(i);
+        }
+
+        if (i == 0) {
+            return 64;
+        }
+        return BitScanForwardNode.unsafeScan(i);
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1InflateNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1InflateNode.java
index aa4f05b4ce0..ff2d4cc9c86 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1InflateNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringLatin1InflateNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -82,7 +82,7 @@ public final class AMD64StringLatin1InflateNode extends FixedWithNextNode
     }
 
     @Override
-    public LocationIdentity[] getLocationIdentities() {
+    public LocationIdentity[] getKilledLocationIdentities() {
         // Model write access via 'dst' using:
         return new LocationIdentity[]{NamedLocationIdentity.getArrayLocation(writeKind)};
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16CompressNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16CompressNode.java
index a39f15c27a2..dd75715be2c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16CompressNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringUTF16CompressNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -82,7 +82,7 @@ public final class AMD64StringUTF16CompressNode extends FixedWithNextNode
     }
 
     @Override
-    public LocationIdentity[] getLocationIdentities() {
+    public LocationIdentity[] getKilledLocationIdentities() {
         // Model write access via 'dst' using:
         return new LocationIdentity[]{NamedLocationIdentity.getArrayLocation(JavaKind.Byte)};
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java
index 85cd17c9d6b..96ada79899c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/test/VarHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -162,12 +162,12 @@ public class VarHandleTest extends GraalCompilerTest {
                 startNodes++;
             } else if (n instanceof MemoryCheckpoint.Single) {
                 MemoryCheckpoint.Single single = (MemoryCheckpoint.Single) n;
-                if (single.getLocationIdentity().isAny()) {
+                if (single.getKilledLocationIdentity().isAny()) {
                     anyKillCount++;
                 }
             } else if (n instanceof MemoryCheckpoint.Multi) {
                 MemoryCheckpoint.Multi multi = (MemoryCheckpoint.Multi) n;
-                for (LocationIdentity loc : multi.getLocationIdentities()) {
+                for (LocationIdentity loc : multi.getKilledLocationIdentities()) {
                     if (loc.isAny()) {
                         anyKillCount++;
                         break;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java
index 613a9bdb1ff..8b0e185f893 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.sparc/src/org/graalvm/compiler/replacements/sparc/SPARCGraphBuilderPlugins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,13 +32,13 @@ import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.Una
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
 
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.replacements.IntegerSubstitutions;
 import org.graalvm.compiler.replacements.LongSubstitutions;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
@@ -51,26 +51,26 @@ import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public class SPARCGraphBuilderPlugins {
 
-    public static void register(Plugins plugins, BytecodeProvider bytecodeProvider, boolean explicitUnsafeNullChecks) {
+    public static void register(Plugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks) {
         InvocationPlugins invocationPlugins = plugins.getInvocationPlugins();
         invocationPlugins.defer(new Runnable() {
             @Override
             public void run() {
-                registerIntegerLongPlugins(invocationPlugins, IntegerSubstitutions.class, JavaKind.Int, bytecodeProvider);
-                registerIntegerLongPlugins(invocationPlugins, LongSubstitutions.class, JavaKind.Long, bytecodeProvider);
+                registerIntegerLongPlugins(invocationPlugins, IntegerSubstitutions.class, JavaKind.Int, replacements);
+                registerIntegerLongPlugins(invocationPlugins, LongSubstitutions.class, JavaKind.Long, replacements);
                 registerMathPlugins(invocationPlugins);
                 // This is temporarily disabled until we implement correct emitting of the CAS
                 // instructions of the proper width.
-                registerPlatformSpecificUnsafePlugins(invocationPlugins, bytecodeProvider, explicitUnsafeNullChecks,
+                registerPlatformSpecificUnsafePlugins(invocationPlugins, replacements, explicitUnsafeNullChecks,
                                 new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object});
             }
         });
     }
 
-    private static void registerIntegerLongPlugins(InvocationPlugins plugins, Class substituteDeclaringClass, JavaKind kind, BytecodeProvider bytecodeProvider) {
+    private static void registerIntegerLongPlugins(InvocationPlugins plugins, Class substituteDeclaringClass, JavaKind kind, Replacements replacements) {
         Class declaringClass = kind.toBoxedJavaClass();
         Class type = kind.toJavaClass();
-        Registration r = new Registration(plugins, declaringClass, bytecodeProvider);
+        Registration r = new Registration(plugins, declaringClass, replacements);
         r.registerMethodSubstitution(substituteDeclaringClass, "numberOfLeadingZeros", type);
         r.registerMethodSubstitution(substituteDeclaringClass, "numberOfTrailingZeros", type);
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java
index f610e15112d..2c7961fbc9e 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java
@@ -31,7 +31,6 @@ import java.util.Arrays;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
@@ -132,7 +131,7 @@ public class ArraysSubstitutionsTest extends ArraysSubstitutionsTestBase {
         StructuredGraph graph = parseEager("testCanonicalLengthSnippet", AllowAssumptions.NO);
         HighTierContext context = new HighTierContext(getProviders(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL);
         createInliningPhase().apply(graph, context);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
 
         Assert.assertTrue(graph.getNodes(ReturnNode.TYPE).first().result().asJavaConstant().asLong() == 0);
     }
@@ -148,7 +147,7 @@ public class ArraysSubstitutionsTest extends ArraysSubstitutionsTestBase {
         StructuredGraph graph = parseEager("testCanonicalEqualSnippet", AllowAssumptions.NO);
         HighTierContext context = new HighTierContext(getProviders(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL);
         createInliningPhase().apply(graph, context);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
 
         Assert.assertTrue(graph.getNodes(ReturnNode.TYPE).first().result().asJavaConstant().asLong() == 1);
     }
@@ -162,9 +161,9 @@ public class ArraysSubstitutionsTest extends ArraysSubstitutionsTestBase {
         StructuredGraph graph = parseEager("testVirtualEqualSnippet", AllowAssumptions.NO);
         HighTierContext context = new HighTierContext(getProviders(), getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL);
         createInliningPhase().apply(graph, context);
-        new CanonicalizerPhase().apply(graph, getProviders());
-        new PartialEscapePhase(false, new CanonicalizerPhase(), graph.getOptions()).apply(graph, context);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
+        new PartialEscapePhase(false, this.createCanonicalizerPhase(), graph.getOptions()).apply(graph, context);
+        createCanonicalizerPhase().apply(graph, getProviders());
 
         Assert.assertTrue(graph.getNodes(ReturnNode.TYPE).first().result().asJavaConstant().asLong() == 1);
     }
@@ -180,9 +179,9 @@ public class ArraysSubstitutionsTest extends ArraysSubstitutionsTestBase {
         StructuredGraph graph = parseEager("testVirtualNotEqualSnippet", AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
         createInliningPhase().apply(graph, context);
-        new CanonicalizerPhase().apply(graph, getProviders());
-        new PartialEscapePhase(false, new CanonicalizerPhase(), graph.getOptions()).apply(graph, context);
-        new CanonicalizerPhase().apply(graph, getProviders());
+        createCanonicalizerPhase().apply(graph, getProviders());
+        new PartialEscapePhase(false, this.createCanonicalizerPhase(), graph.getOptions()).apply(graph, context);
+        createCanonicalizerPhase().apply(graph, getProviders());
 
         Assert.assertTrue(graph.getNodes(ReturnNode.TYPE).first().result().asJavaConstant().asLong() == 0);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java
index 1c050e405ef..4f0310077e7 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -303,7 +303,7 @@ public class BitOpNodesTest extends GraalCompilerTest {
     private ValueNode parseAndInline(String name, Class expectedClass) {
         StructuredGraph graph = parseEager(name, AllowAssumptions.YES);
         HighTierContext context = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         canonicalizer.apply(graph, context);
         createInliningPhase(canonicalizer).apply(graph, context);
         canonicalizer.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java
index 8339987cf74..5b20114dee2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java
@@ -35,7 +35,7 @@ import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.AbstractInliningPhase;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.test.ExportingClassLoader;
+import org.graalvm.compiler.api.test.ExportingClassLoader;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java
index 08558a87883..24235c2e713 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -45,7 +45,6 @@ import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.java.InstanceOfNode;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.inlining.InliningPhase;
 import org.graalvm.compiler.phases.common.inlining.policy.InlineMethodSubstitutionsPolicy;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
@@ -133,8 +132,8 @@ public class EdgesTest extends GraalCompilerTest {
         ResolvedJavaMethod javaMethod = getMetaAccess().lookupJavaMethod(method);
         StructuredGraph g = parseProfiled(javaMethod, AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
-        new InliningPhase(new InlineMethodSubstitutionsPolicy(), new CanonicalizerPhase()).apply(g, context);
-        new CanonicalizerPhase().apply(g, context);
+        new InliningPhase(new InlineMethodSubstitutionsPolicy(), createCanonicalizerPhase()).apply(g, context);
+        this.createCanonicalizerPhase().apply(g, context);
         Assert.assertTrue(g.getNodes().filter(InstanceOfNode.class).isEmpty());
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java
index d99b9a1727f..a40840c63f2 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/FoldTest.java
@@ -81,10 +81,10 @@ public class FoldTest extends ReplacementsTest {
 
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        InjectionProvider injection = new NodeIntrinsificationProvider(getMetaAccess(), getSnippetReflection(), getProviders().getForeignCalls(), null);
+        InjectionProvider injection = new NodeIntrinsificationProvider(getMetaAccess(), getSnippetReflection(), getProviders().getForeignCalls(), null, getTarget());
         new PluginFactory_FoldTest().registerPlugins(invocationPlugins, injection);
         BytecodeProvider replacementBytecodeProvider = getSystemClassLoaderBytecodeProvider();
-        Registration r = new Registration(invocationPlugins, TestMethod.class, replacementBytecodeProvider);
+        Registration r = new Registration(invocationPlugins, TestMethod.class, getReplacements(), replacementBytecodeProvider);
         r.registerMethodSubstitution(TestMethodSubstitution.class, "test");
         super.registerInvocationPlugins(invocationPlugins);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java
index eb22160d5f7..1dbf3ba36c1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java
@@ -94,7 +94,7 @@ public class IntegerExactFoldTest extends GraalCompilerTest {
         Node originalNode = graph.getNodes().filter(x -> x instanceof IntegerExactArithmeticNode).first();
         assertNotNull("original node must be in the graph", originalNode);
 
-        new CanonicalizerPhase().apply(graph, getDefaultHighTierContext());
+        createCanonicalizerPhase().apply(graph, getDefaultHighTierContext());
 
         ValueNode node = findNode(graph);
         boolean overflowExpected = node instanceof IntegerExactArithmeticNode;
@@ -109,19 +109,19 @@ public class IntegerExactFoldTest extends GraalCompilerTest {
 
         Node originalNode = graph.getNodes().filter(x -> x instanceof IntegerExactArithmeticNode).first();
         assertNotNull("original node must be in the graph", originalNode);
-        CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         HighTierContext highTierContext = getDefaultHighTierContext();
         new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highTierContext);
         MidTierContext midTierContext = getDefaultMidTierContext();
         new GuardLoweringPhase().apply(graph, midTierContext);
-        new CanonicalizerPhase().apply(graph, midTierContext);
+        createCanonicalizerPhase().apply(graph, midTierContext);
 
         IntegerExactArithmeticSplitNode loweredNode = graph.getNodes().filter(IntegerExactArithmeticSplitNode.class).first();
         assertNotNull("the lowered node must be in the graph", loweredNode);
 
         loweredNode.getX().setStamp(StampFactory.forInteger(bits, lowerBoundA, upperBoundA));
         loweredNode.getY().setStamp(StampFactory.forInteger(bits, lowerBoundB, upperBoundB));
-        new CanonicalizerPhase().apply(graph, midTierContext);
+        createCanonicalizerPhase().apply(graph, midTierContext);
 
         ValueNode node = findNode(graph);
         boolean overflowExpected = node instanceof IntegerExactArithmeticSplitNode;
@@ -144,7 +144,7 @@ public class IntegerExactFoldTest extends GraalCompilerTest {
         String snippet = "snippetInt" + bits;
         StructuredGraph graph = parseEager(getResolvedJavaMethod(operation.getClass(), snippet), AllowAssumptions.NO);
         HighTierContext context = getDefaultHighTierContext();
-        new CanonicalizerPhase().apply(graph, context);
+        createCanonicalizerPhase().apply(graph, context);
         return graph;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java
index 6c8b256685c..a00cd719756 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java
@@ -25,6 +25,7 @@
 package org.graalvm.compiler.replacements.test;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 
 import org.graalvm.compiler.api.replacements.MethodSubstitution;
 import org.graalvm.compiler.core.test.GraalCompilerTest;
@@ -35,7 +36,6 @@ import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
@@ -78,14 +78,14 @@ public abstract class MethodSubstitutionTest extends GraalCompilerTest {
             debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
             createInliningPhase().apply(graph, context);
             debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
-            new CanonicalizerPhase().apply(graph, context);
+            createCanonicalizerPhase().apply(graph, context);
             new DeadCodeEliminationPhase().apply(graph);
             // Try to ensure any macro nodes are lowered to expose any resulting invokes
             if (graph.getNodes().filter(MacroNode.class).isNotEmpty()) {
-                new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
+                new LoweringPhase(this.createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
             }
             if (graph.getNodes().filter(MacroNode.class).isNotEmpty()) {
-                new LoweringPhase(new CanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, context);
+                new LoweringPhase(this.createCanonicalizerPhase(), LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, context);
             }
             assertNotInGraph(graph, MacroNode.class);
             if (name != null) {
@@ -153,13 +153,20 @@ public abstract class MethodSubstitutionTest extends GraalCompilerTest {
         }
     }
 
-    protected static StructuredGraph assertInGraph(StructuredGraph graph, Class clazz) {
+    protected static StructuredGraph assertInGraph(StructuredGraph graph, Class... clazzes) {
         for (Node node : graph.getNodes()) {
-            if (clazz.isInstance(node)) {
-                return graph;
+            for (Class clazz : clazzes) {
+                if (clazz.isInstance(node)) {
+                    return graph;
+                }
             }
         }
-        fail("Graph does not contain a node of class " + clazz.getName());
+        if (clazzes.length == 1) {
+            fail("Graph does not contain a node of class " + clazzes[0].getName());
+        } else {
+            fail("Graph does not contain a node of one these classes class " + Arrays.toString(clazzes));
+
+        }
         return graph;
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java
index 7e1007c031f..3a7e0778f56 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -130,7 +130,7 @@ public class ObjectAccessTest extends SnippetsTest {
         Assert.assertEquals(graph.getParameter(0), address.getBase());
         Assert.assertEquals(BytecodeFrame.AFTER_BCI, write.stateAfter().bci);
 
-        Assert.assertEquals(locationIdentity, write.getLocationIdentity());
+        Assert.assertEquals(locationIdentity, write.getKilledLocationIdentity());
 
         if (indexConvert) {
             SignExtendNode convert = (SignExtendNode) address.getOffset();
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java
index 15bcce6e982..35ef592500d 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java
@@ -46,7 +46,6 @@ import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.replacements.CachingPEGraphDecoder;
 import jdk.internal.vm.compiler.word.LocationIdentity;
 import org.junit.Test;
@@ -146,7 +145,7 @@ public class PEGraphDecoderTest extends GraalCompilerTest {
             targetGraph.verify();
 
             CoreProviders context = getProviders();
-            new CanonicalizerPhase().apply(targetGraph, context);
+            createCanonicalizerPhase().apply(targetGraph, context);
             targetGraph.verify();
 
         } catch (Throwable ex) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java
index 5efd2dbaee3..882b9c04bfd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -37,7 +37,6 @@ import org.graalvm.compiler.nodes.extended.JavaReadNode;
 import org.graalvm.compiler.nodes.extended.JavaWriteNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.compiler.word.WordCastNode;
@@ -150,7 +149,7 @@ public class PointerTest extends SnippetsTest {
         Assert.assertEquals(graph.getParameter(0), cast.getInput());
         Assert.assertEquals(target.wordJavaKind, cast.stamp(NodeView.DEFAULT).getStackKind());
 
-        Assert.assertEquals(locationIdentity, write.getLocationIdentity());
+        Assert.assertEquals(locationIdentity, write.getKilledLocationIdentity());
 
         if (indexConvert) {
             SignExtendNode convert = (SignExtendNode) address.getOffset();
@@ -409,7 +408,7 @@ public class PointerTest extends SnippetsTest {
         HighTierContext context = new HighTierContext(getProviders(), null, OptimisticOptimizations.ALL);
 
         StructuredGraph graph = parseEager(snippetName, AllowAssumptions.YES);
-        new CanonicalizerPhase().apply(graph, context);
+        this.createCanonicalizerPhase().apply(graph, context);
         Assert.assertEquals(expectedWordCasts, graph.getNodes().filter(WordCastNode.class).count());
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java
index 2c92ad6de71..42226fcf14f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/ReplacementsParseTest.java
@@ -318,7 +318,7 @@ public class ReplacementsParseTest extends ReplacementsTest {
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
         BytecodeProvider replacementBytecodeProvider = getSystemClassLoaderBytecodeProvider();
-        Registration r = new Registration(invocationPlugins, TestObject.class, replacementBytecodeProvider);
+        Registration r = new Registration(invocationPlugins, TestObject.class, getReplacements(), replacementBytecodeProvider);
         NodeIntrinsicPluginFactory.InjectionProvider injections = new DummyInjectionProvider();
         new PluginFactory_ReplacementsParseTest().registerPlugins(invocationPlugins, injections);
         r.registerMethodSubstitution(TestObjectSubstitutions.class, "nextAfter", double.class, double.class);
@@ -634,7 +634,7 @@ public class ReplacementsParseTest extends ReplacementsTest {
                 node.remove();
             }
             HighTierContext context = getDefaultHighTierContext();
-            CanonicalizerPhase canonicalizer = new CanonicalizerPhase();
+            CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
             new FloatingReadPhase().apply(graph);
             canonicalizer.apply(graph, context);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java
index 9ddef33f755..7477c44ea0a 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java
@@ -31,6 +31,8 @@ import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.calc.AbsNode;
 import org.graalvm.compiler.nodes.calc.ReinterpretNode;
+import org.graalvm.compiler.replacements.amd64.AMD64CountLeadingZerosNode;
+import org.graalvm.compiler.replacements.amd64.AMD64CountTrailingZerosNode;
 import org.graalvm.compiler.replacements.nodes.BitCountNode;
 import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
 import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
@@ -132,7 +134,7 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest {
         return Math.sqrt(value) + Math.log(value) + Math.log10(value) + Math.sin(value) + Math.cos(value) + Math.tan(value);
     }
 
-    public void testSubstitution(String testMethodName, Class intrinsicClass, Class holder, String methodName, boolean optional, Object... args) {
+    public void testSubstitution(String testMethodName, Class holder, String methodName, boolean optional, Object[] args, Class... intrinsicClasses) {
         ResolvedJavaMethod realJavaMethod = getResolvedJavaMethod(holder, methodName);
         ResolvedJavaMethod testJavaMethod = getResolvedJavaMethod(testMethodName);
         StructuredGraph graph = testGraph(testMethodName);
@@ -140,7 +142,7 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest {
         // Check to see if the resulting graph contains the expected node
         StructuredGraph replacement = getReplacements().getSubstitution(realJavaMethod, -1, false, null, graph.getOptions());
         if (replacement == null && !optional) {
-            assertInGraph(graph, intrinsicClass);
+            assertInGraph(graph, intrinsicClasses);
         }
 
         for (Object l : args) {
@@ -159,7 +161,7 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest {
     public void testCharSubstitutions() {
         Object[] args = new Character[]{Character.MIN_VALUE, (char) -1, (char) 0, (char) 1, Character.MAX_VALUE};
 
-        testSubstitution("charReverseBytes", ReverseBytesNode.class, Character.class, "reverseBytes", false, args);
+        testSubstitution("charReverseBytes", Character.class, "reverseBytes", false, args, ReverseBytesNode.class);
     }
 
     public static char charReverseBytes(char value) {
@@ -183,7 +185,7 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest {
     public void testShortSubstitutions() {
         Object[] args = new Short[]{Short.MIN_VALUE, -1, 0, 1, Short.MAX_VALUE};
 
-        testSubstitution("shortReverseBytes", ReverseBytesNode.class, Short.class, "reverseBytes", false, args);
+        testSubstitution("shortReverseBytes", Short.class, "reverseBytes", false, args, ReverseBytesNode.class);
     }
 
     public static short shortReverseBytes(short value) {
@@ -207,10 +209,10 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest {
     public void testIntegerSubstitutions() {
         Object[] args = new Object[]{Integer.MIN_VALUE, -1, 0, 1, Integer.MAX_VALUE};
 
-        testSubstitution("integerReverseBytes", ReverseBytesNode.class, Integer.class, "reverseBytes", false, args);
-        testSubstitution("integerNumberOfLeadingZeros", BitScanReverseNode.class, Integer.class, "numberOfLeadingZeros", true, args);
-        testSubstitution("integerNumberOfTrailingZeros", BitScanForwardNode.class, Integer.class, "numberOfTrailingZeros", false, args);
-        testSubstitution("integerBitCount", BitCountNode.class, Integer.class, "bitCount", true, args);
+        testSubstitution("integerReverseBytes", Integer.class, "reverseBytes", false, args, ReverseBytesNode.class);
+        testSubstitution("integerNumberOfLeadingZeros", Integer.class, "numberOfLeadingZeros", true, args, BitScanReverseNode.class, AMD64CountLeadingZerosNode.class);
+        testSubstitution("integerNumberOfTrailingZeros", Integer.class, "numberOfTrailingZeros", false, args, BitScanForwardNode.class, AMD64CountTrailingZerosNode.class);
+        testSubstitution("integerBitCount", Integer.class, "bitCount", true, args, BitCountNode.class);
     }
 
     public static int integerReverseBytes(int value) {
@@ -233,10 +235,10 @@ public class StandardMethodSubstitutionsTest extends MethodSubstitutionTest {
     public void testLongSubstitutions() {
         Object[] args = new Object[]{Long.MIN_VALUE, -1L, 0L, 1L, Long.MAX_VALUE};
 
-        testSubstitution("longReverseBytes", ReverseBytesNode.class, Long.class, "reverseBytes", false, args);
-        testSubstitution("longNumberOfLeadingZeros", BitScanReverseNode.class, Long.class, "numberOfLeadingZeros", true, args);
-        testSubstitution("longNumberOfTrailingZeros", BitScanForwardNode.class, Long.class, "numberOfTrailingZeros", false, args);
-        testSubstitution("longBitCount", BitCountNode.class, Long.class, "bitCount", true, args);
+        testSubstitution("longReverseBytes", Long.class, "reverseBytes", false, args, ReverseBytesNode.class);
+        testSubstitution("longNumberOfLeadingZeros", Long.class, "numberOfLeadingZeros", true, args, BitScanReverseNode.class, AMD64CountLeadingZerosNode.class);
+        testSubstitution("longNumberOfTrailingZeros", Long.class, "numberOfTrailingZeros", false, args, BitScanForwardNode.class, AMD64CountTrailingZerosNode.class);
+        testSubstitution("longBitCount", Long.class, "bitCount", true, args, BitCountNode.class);
     }
 
     public static long longReverseBytes(long value) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java
index cfb858ff703..b41f52d989c 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java
@@ -84,7 +84,7 @@ public class SubstitutionNodeSourcePositionTest extends ReplacementsTest {
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
         new PluginFactory_SubstitutionNodeSourcePositionTest().registerPlugins(invocationPlugins, null);
         ClassfileBytecodeProvider bytecodeProvider = getSystemClassLoaderBytecodeProvider();
-        InvocationPlugins.Registration r = new InvocationPlugins.Registration(invocationPlugins, TestMethod.class, bytecodeProvider);
+        InvocationPlugins.Registration r = new InvocationPlugins.Registration(invocationPlugins, TestMethod.class, getReplacements(), bytecodeProvider);
         r.registerMethodSubstitution(TestMethodSubstitution.class, "test", int.class);
         super.registerInvocationPlugins(invocationPlugins);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java
index 956a72a2ac4..70a938818b4 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/SubstitutionsTest.java
@@ -120,7 +120,7 @@ public class SubstitutionsTest extends ReplacementsTest {
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
         new PluginFactory_SubstitutionsTest().registerPlugins(invocationPlugins, null);
         ClassfileBytecodeProvider bytecodeProvider = getSystemClassLoaderBytecodeProvider();
-        Registration r = new Registration(invocationPlugins, TestMethod.class, bytecodeProvider);
+        Registration r = new Registration(invocationPlugins, TestMethod.class, getReplacements(), bytecodeProvider);
         r.registerMethodSubstitution(TestMethodSubstitution.class, "test");
         super.registerInvocationPlugins(invocationPlugins);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java
index cf5571160f1..b4cc33e9558 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java
@@ -104,7 +104,7 @@ import org.graalvm.compiler.replacements.classfile.ClassfileBytecode;
 import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
 import org.graalvm.compiler.runtime.RuntimeProvider;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.test.ModuleSupport;
+import org.graalvm.compiler.api.test.ModuleSupport;
 import org.graalvm.compiler.test.SubprocessUtil;
 import org.junit.Assert;
 import org.junit.Assume;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java
index 938d68e216a..94bd3274ad0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/classfile/RedefineIntrinsicTest.java
@@ -87,7 +87,7 @@ public class RedefineIntrinsicTest extends ReplacementsTest {
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
         BytecodeProvider replacementBytecodeProvider = getSystemClassLoaderBytecodeProvider();
-        Registration r = new Registration(invocationPlugins, Original.class, replacementBytecodeProvider);
+        Registration r = new Registration(invocationPlugins, Original.class, getReplacements(), replacementBytecodeProvider);
         r.registerMethodSubstitution(Intrinsic.class, "getValue");
         super.registerInvocationPlugins(invocationPlugins);
     }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java
index e5297d07db4..41d22932362 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java
@@ -132,7 +132,7 @@ public class CachingPEGraphDecoder extends PEGraphDecoder {
                             : null;
             GraphBuilderPhase.Instance graphBuilderPhaseInstance = createGraphBuilderPhaseInstance(initialIntrinsicContext);
             graphBuilderPhaseInstance.apply(graphToEncode);
-            new CanonicalizerPhase().apply(graphToEncode, providers);
+            CanonicalizerPhase.create().apply(graphToEncode, providers);
             if (postParsingPhase != null) {
                 postParsingPhase.apply(graphToEncode, providers);
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
index 13d4fac0d7d..cbd6cebe4ce 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -47,6 +47,7 @@ import jdk.vm.ci.meta.JavaConstant;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
@@ -129,6 +130,7 @@ import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
 import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode;
 import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
 import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.VolatileReadNode;
 import org.graalvm.compiler.nodes.memory.WriteNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
@@ -397,12 +399,17 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         AddressNode address = createFieldAddress(graph, object, field);
         assert address != null : "Field that is loaded must not be eliminated: " + field.getDeclaringClass().toJavaName(true) + "." + field.getName();
 
-        ReadNode memoryRead = graph.add(new ReadNode(address, fieldLocationIdentity(field), loadStamp, fieldLoadBarrierType(field)));
+        ReadNode memoryRead = null;
+        if (loadField.isVolatile() && GraalOptions.LateMembars.getValue(graph.getOptions())) {
+            memoryRead = graph.add(new VolatileReadNode(address, fieldLocationIdentity(field), loadStamp, fieldLoadBarrierType(field)));
+        } else {
+            memoryRead = graph.add(new ReadNode(address, fieldLocationIdentity(field), loadStamp, fieldLoadBarrierType(field)));
+        }
         ValueNode readValue = implicitLoadConvert(graph, getStorageKind(field), memoryRead);
         loadField.replaceAtUsages(readValue);
         graph.replaceFixed(loadField, memoryRead);
 
-        if (loadField.isVolatile()) {
+        if (loadField.isVolatile() && !GraalOptions.LateMembars.getValue(graph.getOptions())) {
             MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_READ));
             graph.addBeforeFixed(memoryRead, preMembar);
             MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_READ));
@@ -419,11 +426,11 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         AddressNode address = createFieldAddress(graph, object, field);
         assert address != null;
 
-        WriteNode memoryWrite = graph.add(new WriteNode(address, fieldLocationIdentity(field), value, fieldStoreBarrierType(storeField.field())));
+        WriteNode memoryWrite = graph.add(new WriteNode(address, fieldLocationIdentity(field), value, fieldStoreBarrierType(storeField.field()), storeField.isVolatile()));
         memoryWrite.setStateAfter(storeField.stateAfter());
         graph.replaceFixedWithFixed(storeField, memoryWrite);
 
-        if (storeField.isVolatile()) {
+        if (storeField.isVolatile() && !GraalOptions.LateMembars.getValue(graph.getOptions())) {
             MembarNode preMembar = graph.add(new MembarNode(JMM_PRE_VOLATILE_WRITE));
             graph.addBeforeFixed(memoryWrite, preMembar);
             MembarNode postMembar = graph.add(new MembarNode(JMM_POST_VOLATILE_WRITE));
@@ -528,7 +535,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
 
         AddressNode address = createArrayIndexAddress(graph, array, elementKind, storeIndexed.index(), boundsCheck);
         WriteNode memoryWrite = graph.add(new WriteNode(address, NamedLocationIdentity.getArrayLocation(elementKind), implicitStoreConvert(graph, elementKind, value),
-                        arrayStoreBarrierType(storeIndexed.elementKind())));
+                        arrayStoreBarrierType(storeIndexed.elementKind()), false));
         memoryWrite.setGuard(boundsCheck);
         if (condition != null) {
             tool.createGuard(storeIndexed, condition, DeoptimizationReason.ArrayStoreException, DeoptimizationAction.InvalidateReprofile);
@@ -623,7 +630,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
 
         AddressNode address = graph.unique(new OffsetAddressNode(cas.object(), cas.offset()));
         BarrierType barrierType = guessStoreBarrierType(cas.object(), expectedValue);
-        LogicCompareAndSwapNode atomicNode = graph.add(new LogicCompareAndSwapNode(address, cas.getLocationIdentity(), expectedValue, newValue, barrierType));
+        LogicCompareAndSwapNode atomicNode = graph.add(new LogicCompareAndSwapNode(address, cas.getKilledLocationIdentity(), expectedValue, newValue, barrierType));
         atomicNode.setStateAfter(cas.stateAfter());
         graph.replaceFixedWithFixed(cas, atomicNode);
     }
@@ -637,7 +644,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
 
         AddressNode address = graph.unique(new OffsetAddressNode(cas.object(), cas.offset()));
         BarrierType barrierType = guessStoreBarrierType(cas.object(), expectedValue);
-        ValueCompareAndSwapNode atomicNode = graph.add(new ValueCompareAndSwapNode(address, expectedValue, newValue, cas.getLocationIdentity(), barrierType));
+        ValueCompareAndSwapNode atomicNode = graph.add(new ValueCompareAndSwapNode(address, expectedValue, newValue, cas.getKilledLocationIdentity(), barrierType));
         ValueNode coercedNode = implicitLoadConvert(graph, valueKind, atomicNode, true);
         atomicNode.setStateAfter(cas.stateAfter());
         cas.replaceAtUsages(coercedNode);
@@ -653,7 +660,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         AddressNode address = graph.unique(new OffsetAddressNode(n.object(), n.offset()));
         BarrierType barrierType = guessStoreBarrierType(n.object(), n.newValue());
         LIRKind lirAccessKind = LIRKind.fromJavaKind(target.arch, valueKind);
-        LoweredAtomicReadAndWriteNode memoryRead = graph.add(new LoweredAtomicReadAndWriteNode(address, n.getLocationIdentity(), newValue, lirAccessKind, barrierType));
+        LoweredAtomicReadAndWriteNode memoryRead = graph.add(new LoweredAtomicReadAndWriteNode(address, n.getKilledLocationIdentity(), newValue, lirAccessKind, barrierType));
         memoryRead.setStateAfter(n.stateAfter());
 
         ValueNode readValue = implicitLoadConvert(graph, valueKind, memoryRead);
@@ -744,7 +751,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         JavaKind valueKind = store.accessKind();
         ValueNode value = implicitStoreConvert(graph, valueKind, store.value(), compressible);
         AddressNode address = createUnsafeAddress(graph, store.object(), store.offset());
-        WriteNode write = graph.add(new WriteNode(address, store.getLocationIdentity(), value, unsafeStoreBarrierType(store)));
+        WriteNode write = graph.add(new WriteNode(address, store.getKilledLocationIdentity(), value, unsafeStoreBarrierType(store), false));
         write.setStateAfter(store.stateAfter());
         graph.replaceFixedWithFixed(store, write);
     }
@@ -755,7 +762,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
         JavaKind valueKind = store.getKind();
         ValueNode value = implicitStoreConvert(graph, valueKind, store.getValue(), false);
         AddressNode address = graph.addOrUniqueWithInputs(OffsetAddressNode.create(store.getAddress()));
-        WriteNode write = graph.add(new WriteNode(address, store.getLocationIdentity(), value, BarrierType.NONE));
+        WriteNode write = graph.add(new WriteNode(address, store.getKilledLocationIdentity(), value, BarrierType.NONE, false));
         write.setStateAfter(store.stateAfter());
         graph.replaceFixedWithFixed(store, write);
     }
@@ -782,7 +789,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
     protected void lowerJavaWriteNode(JavaWriteNode write) {
         StructuredGraph graph = write.graph();
         ValueNode value = implicitStoreConvert(graph, write.getWriteKind(), write.value(), write.isCompressible());
-        WriteNode memoryWrite = graph.add(new WriteNode(write.getAddress(), write.getLocationIdentity(), value, write.getBarrierType()));
+        WriteNode memoryWrite = graph.add(new WriteNode(write.getAddress(), write.getKilledLocationIdentity(), value, write.getBarrierType(), false));
         memoryWrite.setStateAfter(write.stateAfter());
         graph.replaceFixedWithFixed(write, memoryWrite);
         memoryWrite.setGuard(write.getGuard());
@@ -842,7 +849,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
                                 barrierType = arrayInitializationBarrier(entryKind);
                             }
                             if (address != null) {
-                                WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, entryKind, value), barrierType);
+                                WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, entryKind, value), barrierType, false);
                                 graph.addAfterFixed(newObject, graph.add(write));
                             }
                         }
@@ -875,7 +882,7 @@ public abstract class DefaultJavaLoweringProvider implements LoweringProvider {
                                     barrierType = arrayStoreBarrierType(virtual.entryKind(i));
                                 }
                                 if (address != null) {
-                                    WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, JavaKind.Object, allocValue), barrierType);
+                                    WriteNode write = new WriteNode(address, LocationIdentity.init(), implicitStoreConvert(graph, JavaKind.Object, allocValue), barrierType, false);
                                     graph.addBeforeFixed(commit, graph.add(write));
                                 }
                             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java
index a6df6b001ce..e85c2df68e1 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -34,22 +34,27 @@ import org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory.In
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
 import org.graalvm.compiler.word.WordTypes;
 
+import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 public class NodeIntrinsificationProvider implements InjectionProvider {
 
+    public static final TargetDescription INJECTED_TARGET = null;
+
     private final MetaAccessProvider metaAccess;
     private final SnippetReflectionProvider snippetReflection;
     private final ForeignCallsProvider foreignCalls;
     private final WordTypes wordTypes;
+    private final TargetDescription target;
 
-    public NodeIntrinsificationProvider(MetaAccessProvider metaAccess, SnippetReflectionProvider snippetReflection, ForeignCallsProvider foreignCalls, WordTypes wordTypes) {
+    public NodeIntrinsificationProvider(MetaAccessProvider metaAccess, SnippetReflectionProvider snippetReflection, ForeignCallsProvider foreignCalls, WordTypes wordTypes, TargetDescription target) {
         this.metaAccess = metaAccess;
         this.snippetReflection = snippetReflection;
         this.foreignCalls = foreignCalls;
         this.wordTypes = wordTypes;
+        this.target = target;
     }
 
     @Override
@@ -78,6 +83,8 @@ public class NodeIntrinsificationProvider implements InjectionProvider {
             return type.cast(snippetReflection);
         } else if (type.equals(WordTypes.class)) {
             return type.cast(wordTypes);
+        } else if (type.equals(TargetDescription.class)) {
+            return type.cast(target);
         } else {
             throw new GraalError("Cannot handle injected argument of type %s.", type.getName());
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java
index 3eb9e3cf751..4071f2121aa 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/ReplacementsImpl.java
@@ -269,10 +269,14 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin {
     }
 
     @Override
-    public void registerMethodSubstitution(MethodSubstitutionPlugin plugin, ResolvedJavaMethod original, IntrinsicContext.CompilationContext context, OptionValues options) {
+    public void registerMethodSubstitution(MethodSubstitutionPlugin plugin) {
         // No initialization needed as method substitutions are parsed by the BytecodeParser.
     }
 
+    @Override
+    public void registerConditionalPlugin(InvocationPlugin plugin) {
+    }
+
     @Override
     public boolean hasSubstitution(ResolvedJavaMethod method, int invokeBci) {
         InvocationPlugin plugin = graphBuilderPlugins.getInvocationPlugins().lookupInvocation(method);
@@ -560,7 +564,7 @@ public class ReplacementsImpl implements Replacements, InlineInvokePlugin {
 
                 createGraphBuilder(replacements.providers, config, OptimisticOptimizations.NONE, initialIntrinsicContext).apply(graph);
 
-                new CanonicalizerPhase().apply(graph, replacements.providers);
+                CanonicalizerPhase.create().apply(graph, replacements.providers);
             } catch (Throwable e) {
                 throw debug.handle(e);
             }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index b5304370852..c75e2939c6f 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -891,7 +891,7 @@ public class SnippetTemplate {
             }
             snippetCopy.setGuardsStage(guardsStage);
             try (DebugContext.Scope s = debug.scope("LoweringSnippetTemplate", snippetCopy)) {
-                new LoweringPhase(new CanonicalizerPhase(), args.cacheKey.loweringStage).apply(snippetCopy, providers);
+                new LoweringPhase(CanonicalizerPhase.create(), args.cacheKey.loweringStage).apply(snippetCopy, providers);
             } catch (Throwable e) {
                 throw debug.handle(e);
             }
@@ -930,7 +930,10 @@ public class SnippetTemplate {
             assert checkAllVarargPlaceholdersAreDeleted(parameterCount, placeholders);
 
             new FloatingReadPhase(true, true).apply(snippetCopy);
-            new RemoveValueProxyPhase().apply(snippetCopy);
+
+            if (!guardsStage.requiresValueProxies()) {
+                new RemoveValueProxyPhase().apply(snippetCopy);
+            }
 
             MemoryAnchorNode anchor = snippetCopy.add(new MemoryAnchorNode());
             snippetCopy.start().replaceAtUsages(InputType.Memory, anchor);
@@ -1059,8 +1062,14 @@ public class SnippetTemplate {
                 if (loopBegin != null) {
                     LoopEx loop = new LoopsData(snippetCopy).loop(loopBegin);
                     Mark mark = snippetCopy.getMark();
-                    LoopTransformations.fullUnroll(loop, providers, new CanonicalizerPhase());
-                    new CanonicalizerPhase().applyIncremental(snippetCopy, providers, mark, false);
+                    CanonicalizerPhase canonicalizer = null;
+                    if (GraalOptions.ImmutableCode.getValue(snippetCopy.getOptions())) {
+                        canonicalizer = CanonicalizerPhase.createWithoutReadCanonicalization();
+                    } else {
+                        canonicalizer = CanonicalizerPhase.create();
+                    }
+                    LoopTransformations.fullUnroll(loop, providers, canonicalizer);
+                    CanonicalizerPhase.create().applyIncremental(snippetCopy, providers, mark, false);
                     loop.deleteUnusedNodes();
                 }
                 GraphUtil.removeFixedWithUnusedInputs(explodeLoop);
@@ -1278,7 +1287,7 @@ public class SnippetTemplate {
 
         if (replacee instanceof MemoryCheckpoint.Single) {
             // check if some node in snippet graph also kills the same location
-            LocationIdentity locationIdentity = ((MemoryCheckpoint.Single) replacee).getLocationIdentity();
+            LocationIdentity locationIdentity = ((MemoryCheckpoint.Single) replacee).getKilledLocationIdentity();
             if (locationIdentity.isAny()) {
                 assert !(memoryMap.getLastLocationAccess(any()) instanceof MemoryAnchorNode) : replacee + " kills ANY_LOCATION, but snippet does not";
                 // if the replacee kills ANY_LOCATION, the snippet can kill arbitrary locations
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
index bb6fe0cd4e5..a668fde13b0 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -40,7 +40,6 @@ import java.util.Arrays;
 
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.core.common.calc.Condition.CanonicalizedCondition;
 import org.graalvm.compiler.core.common.calc.UnsignedMath;
@@ -115,6 +114,7 @@ import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
 import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
 import org.graalvm.compiler.nodes.memory.HeapAccess;
 import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
+import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode;
@@ -154,30 +154,30 @@ import sun.misc.Unsafe;
  */
 public class StandardGraphBuilderPlugins {
 
-    public static void registerInvocationPlugins(MetaAccessProvider metaAccess, SnippetReflectionProvider snippetReflection, InvocationPlugins plugins, BytecodeProvider bytecodeProvider,
+    public static void registerInvocationPlugins(MetaAccessProvider metaAccess, SnippetReflectionProvider snippetReflection, InvocationPlugins plugins, Replacements replacements,
                     boolean allowDeoptimization, boolean explicitUnsafeNullChecks) {
         registerObjectPlugins(plugins);
         registerClassPlugins(plugins);
         registerMathPlugins(plugins, allowDeoptimization);
         registerStrictMathPlugins(plugins);
         registerUnsignedMathPlugins(plugins);
-        registerStringPlugins(plugins, bytecodeProvider, snippetReflection);
+        registerStringPlugins(plugins, replacements, snippetReflection);
         registerCharacterPlugins(plugins);
         registerShortPlugins(plugins);
         registerIntegerLongPlugins(plugins, JavaKind.Int);
         registerIntegerLongPlugins(plugins, JavaKind.Long);
         registerFloatPlugins(plugins);
         registerDoublePlugins(plugins);
-        registerArraysPlugins(plugins, bytecodeProvider);
-        registerArrayPlugins(plugins, bytecodeProvider);
-        registerUnsafePlugins(plugins, bytecodeProvider, explicitUnsafeNullChecks);
+        registerArraysPlugins(plugins, replacements);
+        registerArrayPlugins(plugins, replacements);
+        registerUnsafePlugins(plugins, replacements, explicitUnsafeNullChecks);
         registerEdgesPlugins(metaAccess, plugins);
         registerGraalDirectivesPlugins(plugins);
         registerBoxingPlugins(plugins);
-        registerJMHBlackholePlugins(plugins, bytecodeProvider);
-        registerJFRThrowablePlugins(plugins, bytecodeProvider);
-        registerMethodHandleImplPlugins(plugins, snippetReflection, bytecodeProvider);
-        registerJcovCollectPlugins(plugins, bytecodeProvider);
+        registerJMHBlackholePlugins(plugins, replacements);
+        registerJFRThrowablePlugins(plugins, replacements);
+        registerMethodHandleImplPlugins(plugins, snippetReflection, replacements);
+        registerJcovCollectPlugins(plugins, replacements);
     }
 
     private static final Field STRING_VALUE_FIELD;
@@ -196,8 +196,8 @@ public class StandardGraphBuilderPlugins {
         STRING_CODER_FIELD = coder;
     }
 
-    private static void registerStringPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider, SnippetReflectionProvider snippetReflection) {
-        final Registration r = new Registration(plugins, String.class, bytecodeProvider);
+    private static void registerStringPlugins(InvocationPlugins plugins, Replacements replacements, SnippetReflectionProvider snippetReflection) {
+        final Registration r = new Registration(plugins, String.class, replacements);
         r.register1("hashCode", Receiver.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
@@ -243,7 +243,7 @@ public class StandardGraphBuilderPlugins {
             });
         } else {
             r.registerMethodSubstitution(JDK9StringSubstitutions.class, "equals", Receiver.class, Object.class);
-            Registration utf16sub = new Registration(plugins, StringUTF16Substitutions.class, bytecodeProvider);
+            Registration utf16sub = new Registration(plugins, StringUTF16Substitutions.class, replacements);
             utf16sub.register2("getCharDirect", byte[].class, int.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg1, ValueNode arg2) {
@@ -261,10 +261,10 @@ public class StandardGraphBuilderPlugins {
                 }
             });
 
-            final Registration latin1r = new Registration(plugins, "java.lang.StringLatin1", bytecodeProvider);
+            final Registration latin1r = new Registration(plugins, "java.lang.StringLatin1", replacements);
             latin1r.register5("indexOf", byte[].class, int.class, byte[].class, int.class, int.class, new StringLatin1IndexOfConstantPlugin());
 
-            final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", bytecodeProvider);
+            final Registration utf16r = new Registration(plugins, "java.lang.StringUTF16", replacements);
             utf16r.register5("indexOfUnsafe", byte[].class, int.class, byte[].class, int.class, int.class, new StringUTF16IndexOfConstantPlugin());
             utf16r.setAllowOverwrite(true);
             utf16r.registerMethodSubstitution(StringUTF16Substitutions.class, "getChar", byte[].class, int.class);
@@ -292,8 +292,8 @@ public class StandardGraphBuilderPlugins {
         }
     }
 
-    private static void registerArraysPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Arrays.class, bytecodeProvider);
+    private static void registerArraysPlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, Arrays.class, replacements);
         r.registerMethodSubstitution(ArraysSubstitutions.class, "equals", boolean[].class, boolean[].class);
         r.registerMethodSubstitution(ArraysSubstitutions.class, "equals", byte[].class, byte[].class);
         r.registerMethodSubstitution(ArraysSubstitutions.class, "equals", short[].class, short[].class);
@@ -302,8 +302,8 @@ public class StandardGraphBuilderPlugins {
         r.registerMethodSubstitution(ArraysSubstitutions.class, "equals", long[].class, long[].class);
     }
 
-    private static void registerArrayPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, Array.class, bytecodeProvider);
+    private static void registerArrayPlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, Array.class, replacements);
         r.register2("newInstance", Class.class, int.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unused, ValueNode componentType, ValueNode length) {
@@ -381,10 +381,10 @@ public class StandardGraphBuilderPlugins {
 
     private static UnsafeCompareAndExchangePluginsRegistrar unsafeCompareAndExchangePluginsRegistrar = new UnsafeCompareAndExchangePluginsRegistrar();
 
-    public static void registerPlatformSpecificUnsafePlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider, boolean explicitUnsafeNullChecks, JavaKind[] supportedCasKinds) {
+    public static void registerPlatformSpecificUnsafePlugins(InvocationPlugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks, JavaKind[] supportedCasKinds) {
         registerPlatformSpecificUnsafePlugins(supportedCasKinds, new Registration(plugins, Unsafe.class), true, explicitUnsafeNullChecks);
         if (JavaVersionUtil.JAVA_SPEC > 8) {
-            registerPlatformSpecificUnsafePlugins(supportedCasKinds, new Registration(plugins, "jdk.internal.misc.Unsafe", bytecodeProvider), false, explicitUnsafeNullChecks);
+            registerPlatformSpecificUnsafePlugins(supportedCasKinds, new Registration(plugins, "jdk.internal.misc.Unsafe", replacements), false, explicitUnsafeNullChecks);
         }
 
     }
@@ -398,10 +398,10 @@ public class StandardGraphBuilderPlugins {
         }
     }
 
-    private static void registerUnsafePlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider, boolean explicitUnsafeNullChecks) {
+    private static void registerUnsafePlugins(InvocationPlugins plugins, Replacements replacements, boolean explicitUnsafeNullChecks) {
         registerUnsafePlugins(new Registration(plugins, Unsafe.class), true, explicitUnsafeNullChecks);
         if (JavaVersionUtil.JAVA_SPEC > 8) {
-            registerUnsafePlugins(new Registration(plugins, "jdk.internal.misc.Unsafe", bytecodeProvider), false, explicitUnsafeNullChecks);
+            registerUnsafePlugins(new Registration(plugins, "jdk.internal.misc.Unsafe", replacements), false, explicitUnsafeNullChecks);
         }
     }
 
@@ -1300,7 +1300,7 @@ public class StandardGraphBuilderPlugins {
         });
     }
 
-    private static void registerJMHBlackholePlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+    private static void registerJMHBlackholePlugins(InvocationPlugins plugins, Replacements replacements) {
         InvocationPlugin blackholePlugin = new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver blackhole, ValueNode value) {
@@ -1316,7 +1316,7 @@ public class StandardGraphBuilderPlugins {
         };
         String[] names = {"org.openjdk.jmh.infra.Blackhole", "org.openjdk.jmh.logic.BlackHole"};
         for (String name : names) {
-            Registration r = new Registration(plugins, name, bytecodeProvider);
+            Registration r = new Registration(plugins, name, replacements);
             for (JavaKind kind : JavaKind.values()) {
                 if ((kind.isPrimitive() && kind != JavaKind.Void) || kind == JavaKind.Object) {
                     Class javaClass = kind == JavaKind.Object ? Object.class : kind.toJavaClass();
@@ -1327,8 +1327,8 @@ public class StandardGraphBuilderPlugins {
         }
     }
 
-    private static void registerJFRThrowablePlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, "oracle.jrockit.jfr.jdkevents.ThrowableTracer", bytecodeProvider);
+    private static void registerJFRThrowablePlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, "oracle.jrockit.jfr.jdkevents.ThrowableTracer", replacements);
         r.register2("traceThrowable", Throwable.class, String.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode throwable, ValueNode message) {
@@ -1343,8 +1343,8 @@ public class StandardGraphBuilderPlugins {
         });
     }
 
-    private static void registerMethodHandleImplPlugins(InvocationPlugins plugins, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, "java.lang.invoke.MethodHandleImpl", bytecodeProvider);
+    private static void registerMethodHandleImplPlugins(InvocationPlugins plugins, SnippetReflectionProvider snippetReflection, Replacements replacements) {
+        Registration r = new Registration(plugins, "java.lang.invoke.MethodHandleImpl", replacements);
         // In later JDKs this no longer exists and the usage is replace by Class.cast which is
         // already an intrinsic
         r.registerOptional2("castReference", Class.class, Object.class, new InvocationPlugin() {
@@ -1408,8 +1408,8 @@ public class StandardGraphBuilderPlugins {
      * Registers a plugin to ignore {@code com.sun.tdk.jcov.runtime.Collect.hit} within an
      * intrinsic.
      */
-    private static void registerJcovCollectPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
-        Registration r = new Registration(plugins, "com.sun.tdk.jcov.runtime.Collect", bytecodeProvider);
+    private static void registerJcovCollectPlugins(InvocationPlugins plugins, Replacements replacements) {
+        Registration r = new Registration(plugins, "com.sun.tdk.jcov.runtime.Collect", replacements);
         r.register1("hit", int.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode object) {
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java
index 8aa46d62582..be5cf64e4ba 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java
@@ -24,12 +24,12 @@
 
 package org.graalvm.compiler.replacements;
 
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import org.graalvm.compiler.nodes.spi.Replacements;
 
 import jdk.vm.ci.code.Architecture;
 
 public interface TargetGraphBuilderPlugins {
-    void register(Plugins plugins, BytecodeProvider replacementsBytecodeProvider, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerMathPlugins, boolean emitJDK9StringSubstitutions,
+    void register(Plugins plugins, Replacements replacements, Architecture arch, boolean explicitUnsafeNullChecks, boolean registerMathPlugins, boolean emitJDK9StringSubstitutions,
                     boolean useFMAIntrinsics);
 }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
index 45addaa895e..f5b5df0ee88 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
@@ -188,6 +188,11 @@ public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements
         return locationIdentity;
     }
 
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return getLocationIdentity();
+    }
+
     @NodeIntrinsic(hasSideEffect = true)
     private static native void arraycopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter boolean aligned,
                     @ConstantNodeParameter boolean disjoint, @ConstantNodeParameter boolean uninitialized, @ConstantNodeParameter int heapWordSize);
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
index 6acf9a32670..2665e1af3dd 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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 @@ public final class ArrayCopyNode extends BasicArrayCopyNode implements Lowerable
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         if (!forceAnyLocation && elementKind == null) {
             elementKind = ArrayCopySnippets.Templates.selectComponentKind(this);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java
index 83d9d04d822..53027ebf3ff 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -146,7 +146,7 @@ public final class CheckcastArrayCopyCallNode extends AbstractMemoryCheckpoint i
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         /*
          * Because of restrictions that the memory graph of snippets matches the original node,
          * pretend that we kill any.
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java
index d16e7aa16e3..fcacdb21c07 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -102,7 +102,7 @@ public final class GenericArrayCopyCallNode extends AbstractMemoryCheckpoint imp
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 37515ad77bc..c67f3e803b9 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -127,6 +127,11 @@ public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Virt
         return any();
     }
 
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return getLocationIdentity();
+    }
+
     @Override
     public MemoryNode getLastLocationAccess() {
         return lastLocationAccess;
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
index 9efc1ec034e..b587b43e2ed 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
@@ -173,7 +173,7 @@ public abstract class MacroNode extends FixedWithNextNode implements Lowerable,
         }
         DebugContext debug = replacementGraph.getDebug();
         try (DebugContext.Scope s = debug.scope("LoweringSnippetTemplate", replacementGraph)) {
-            new LoweringPhase(new CanonicalizerPhase(), tool.getLoweringStage()).apply(replacementGraph, c);
+            new LoweringPhase(CanonicalizerPhase.create(), tool.getLoweringStage()).apply(replacementGraph, c);
         } catch (Throwable e) {
             throw debug.handle(e);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
index f996b2c10ec..1cc8d6b5312 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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 @@ public abstract class MacroStateSplitNode extends MacroNode implements StateSpli
     }
 
     @Override
-    public LocationIdentity getLocationIdentity() {
+    public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
@@ -87,7 +87,7 @@ public abstract class MacroStateSplitNode extends MacroNode implements StateSpli
             }
             assert invoke.stateAfter().bci == BytecodeFrame.AFTER_BCI;
             // Here we need to fix the bci of the invoke
-            InvokeNode newInvoke = snippetGraph.add(new InvokeNode(invoke.callTarget(), bci(), invoke.getLocationIdentity()));
+            InvokeNode newInvoke = snippetGraph.add(new InvokeNode(invoke.callTarget(), bci(), invoke.getKilledLocationIdentity()));
             newInvoke.setStateAfter(invoke.stateAfter());
             snippetGraph.replaceFixedWithFixed((InvokeNode) invoke.asNode(), newInvoke);
         }
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java
index c8058407433..41650683d05 100644
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java
@@ -121,11 +121,11 @@ public final class PEReadEliminationClosure extends PartialEscapeClosure options) {
+        try (ByteArrayOutputStream baout = new ByteArrayOutputStream()) {
+            try (TypedDataOutputStream out = new TypedDataOutputStream(baout)) {
+                out.writeInt(options.size());
+                for (Map.Entry e : options.entrySet()) {
+                    out.writeUTF(e.getKey());
+                    try {
+                        out.writeTypedValue(e.getValue());
+                    } catch (IllegalArgumentException iae) {
+                        throw new IllegalArgumentException(String.format("Key: %s, Value: %s, Value type: %s",
+                                        e.getKey(), e.getValue(), e.getValue().getClass()), iae);
+                    }
+                }
+            }
+            return baout.toByteArray();
+        } catch (IOException ioe) {
+            throw new IllegalArgumentException(ioe);
+        }
+    }
+
+    /**
+     * Decodes {@code input} into a name/value map.
+     *
+     * @throws IllegalArgumentException if {@code input} cannot be decoded
+     */
+    public static Map decode(byte[] input) {
+        Map res = new LinkedHashMap<>();
+        try (TypedDataInputStream in = new TypedDataInputStream(new ByteArrayInputStream(input))) {
+            final int size = in.readInt();
+            for (int i = 0; i < size; i++) {
+                final String key = in.readUTF();
+                final Object value = in.readTypedValue();
+                res.put(key, value);
+            }
+            if (in.available() != 0) {
+                throw new IllegalArgumentException(in.available() + " undecoded bytes");
+            }
+        } catch (IOException ioe) {
+            throw new IllegalArgumentException(ioe);
+        }
+        return res;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataInputStream.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataInputStream.java
new file mode 100644
index 00000000000..7654a165b81
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataInputStream.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.util;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A stream that can read (trivial) values using their in-band data type information, intended for
+ * use with {@link TypedDataOutputStream}.
+ */
+public class TypedDataInputStream extends DataInputStream {
+    public TypedDataInputStream(InputStream in) {
+        super(in);
+    }
+
+    /**
+     * Reads a single value, using the data type encoded in the stream.
+     *
+     * @return The read value, such as a boxed primitive or a {@link String}.
+     * @exception IOException in case of an I/O error.
+     */
+    public Object readTypedValue() throws IOException {
+        Object value;
+        final byte type = readByte();
+        switch (type) {
+            case 'Z':
+                value = readBoolean();
+                break;
+            case 'B':
+                value = readByte();
+                break;
+            case 'S':
+                value = readShort();
+                break;
+            case 'C':
+                value = readChar();
+                break;
+            case 'I':
+                value = readInt();
+                break;
+            case 'J':
+                value = readLong();
+                break;
+            case 'F':
+                value = readFloat();
+                break;
+            case 'D':
+                value = readDouble();
+                break;
+            case 'U':
+                value = readUTF();
+                break;
+            default:
+                throw new IOException("Unsupported type: " + Integer.toHexString(type));
+        }
+        return value;
+    }
+}
diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataOutputStream.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataOutputStream.java
new file mode 100644
index 00000000000..aed75708d59
--- /dev/null
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.util/src/org/graalvm/util/TypedDataOutputStream.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package org.graalvm.util;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * A stream that can write (trivial) values together with their data type, for use with
+ * {@link TypedDataInputStream}.
+ */
+public class TypedDataOutputStream extends DataOutputStream {
+    /** Determines if {@code value} is supported by {@link #writeTypedValue(Object)}. */
+    public static boolean isValueSupported(Object value) {
+        if (value == null) {
+            return false;
+        }
+        Class valueClass = value.getClass();
+        return valueClass == Boolean.class ||
+                        valueClass == Byte.class ||
+                        valueClass == Short.class ||
+                        valueClass == Character.class ||
+                        valueClass == Integer.class ||
+                        valueClass == Long.class ||
+                        valueClass == Float.class ||
+                        valueClass == Double.class ||
+                        valueClass == String.class ||
+                        value.getClass().isEnum();
+    }
+
+    public TypedDataOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    /**
+     * Writes the value that is represented by the given non-null object, together with information
+     * on the value's data type.
+     *
+     * @param value A value of a {@linkplain #isValueSupported supported type}.
+     * @exception IllegalArgumentException when the provided type is not supported.
+     * @exception IOException in case of an I/O error.
+     */
+    public void writeTypedValue(Object value) throws IOException {
+        Class valueClz = value.getClass();
+        if (valueClz == Boolean.class) {
+            this.writeByte('Z');
+            this.writeBoolean((Boolean) value);
+        } else if (valueClz == Byte.class) {
+            this.writeByte('B');
+            this.writeByte((Byte) value);
+        } else if (valueClz == Short.class) {
+            this.writeByte('S');
+            this.writeShort((Short) value);
+        } else if (valueClz == Character.class) {
+            this.writeByte('C');
+            this.writeChar((Character) value);
+        } else if (valueClz == Integer.class) {
+            this.writeByte('I');
+            this.writeInt((Integer) value);
+        } else if (valueClz == Long.class) {
+            this.writeByte('J');
+            this.writeLong((Long) value);
+        } else if (valueClz == Float.class) {
+            this.writeByte('F');
+            this.writeFloat((Float) value);
+        } else if (valueClz == Double.class) {
+            this.writeByte('D');
+            this.writeDouble((Double) value);
+        } else if (valueClz == String.class) {
+            this.writeByte('U');
+            this.writeUTF((String) value);
+        } else if (valueClz.isEnum()) {
+            this.writeByte('U');
+            this.writeUTF(((Enum) value).name());
+        } else {
+            throw new IllegalArgumentException(String.format("Unsupported type: Value: %s, Value type: %s", value, valueClz));
+        }
+    }
+}

From 04e885b498d114554dbd53cb17781d1b7001a913 Mon Sep 17 00:00:00 2001
From: Ralf Schmelter 
Date: Tue, 15 Oct 2019 17:08:09 +0200
Subject: [PATCH 081/163] 8232168: Fix non wide char canonicalization on
 Windows

Reviewed-by: clanger, alanb, ccheung
---
 .../windows/native/libjava/canonicalize_md.c  | 344 +++---------------
 .../jtreg/runtime/LoadClass/LongBCP.java      |  18 +-
 2 files changed, 64 insertions(+), 298 deletions(-)

diff --git a/src/java.base/windows/native/libjava/canonicalize_md.c b/src/java.base/windows/native/libjava/canonicalize_md.c
index b51919e77e4..ca79de48b5d 100644
--- a/src/java.base/windows/native/libjava/canonicalize_md.c
+++ b/src/java.base/windows/native/libjava/canonicalize_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -41,39 +41,9 @@
 
 #undef DEBUG_PATH        /* Define this to debug path code */
 
-#define isfilesep(c) ((c) == '/' || (c) == '\\')
-#define wisfilesep(c) ((c) == L'/' || (c) == L'\\')
-#define islb(c)      (IsDBCSLeadByte((BYTE)(c)))
-
-
 /* Copy bytes to dst, not going past dend; return dst + number of bytes copied,
    or NULL if dend would have been exceeded.  If first != '\0', copy that byte
    before copying bytes from src to send - 1. */
-
-static char *
-cp(char *dst, char *dend, char first, char *src, char *send)
-{
-    char *p = src, *q = dst;
-    if (first != '\0') {
-        if (q < dend) {
-            *q++ = first;
-        } else {
-            errno = ENAMETOOLONG;
-            return NULL;
-        }
-    }
-    if (send - p > dend - q) {
-        errno = ENAMETOOLONG;
-        return NULL;
-    }
-    while (p < send) {
-        *q++ = *p++;
-    }
-    return q;
-}
-
-/* Wide character version of cp */
-
 static WCHAR*
 wcp(WCHAR *dst, WCHAR *dend, WCHAR first, WCHAR *src, WCHAR *send)
 {
@@ -95,23 +65,8 @@ wcp(WCHAR *dst, WCHAR *dend, WCHAR first, WCHAR *src, WCHAR *send)
     return q;
 }
 
-
 /* Find first instance of '\\' at or following start.  Return the address of
    that byte or the address of the null terminator if '\\' is not found. */
-
-static char *
-nextsep(char *start)
-{
-    char *p = start;
-    int c;
-    while ((c = *p) && (c != '\\')) {
-        p += ((islb(c) && p[1]) ? 2 : 1);
-    }
-    return p;
-}
-
-/* Wide character version of nextsep */
-
 static WCHAR *
 wnextsep(WCHAR *start)
 {
@@ -123,21 +78,6 @@ wnextsep(WCHAR *start)
 }
 
 /* Tell whether the given string contains any wildcard characters */
-
-static int
-wild(char *start)
-{
-    char *p = start;
-    int c;
-    while (c = *p) {
-        if ((c == '*') || (c == '?')) return 1;
-        p += ((islb(c) && p[1]) ? 2 : 1);
-    }
-    return 0;
-}
-
-/* Wide character version of wild */
-
 static int
 wwild(WCHAR *start)
 {
@@ -157,25 +97,6 @@ wwild(WCHAR *start)
    Prohibited canonical paths: c:\..\x  c:\x.\d c:\...
 */
 static int
-dots(char *start)
-{
-    char *p = start;
-    while (*p) {
-        if ((p = strchr(p, '.')) == NULL) // find next occurrence of '.'
-            return 0; // no more dots
-        p++; // next char
-        while ((*p) == '.') // go to the end of dots
-            p++;
-        if (*p && (*p != '\\')) // path element does not end with a dot
-            p++; // go to the next char
-        else
-            return 1; // path element does end with a dot - prohibited
-    }
-    return 0; // no prohibited combinations of dots found
-}
-
-/* Wide character version of dots */
-static int
 wdots(WCHAR *start)
 {
     WCHAR *p = start;
@@ -203,7 +124,6 @@ wdots(WCHAR *start)
    successfully after copying the rest of the original path to the result path.
    Other I/O errors cause an error return.
 */
-
 int
 lastErrorReportable()
 {
@@ -225,222 +145,10 @@ lastErrorReportable()
     return 1;
 }
 
-int wcanonicalize(WCHAR *orig_path, WCHAR *result, int size);
-
 /* Convert a pathname to canonical form.  The input orig_path is assumed to
    have been converted to native form already, via JVM_NativePath().  This is
    necessary because _fullpath() rejects duplicate separator characters on
    Win95, though it accepts them on NT. */
-
-int
-canonicalize(char *orig_path, char *result, int size)
-{
-    WIN32_FIND_DATA fd;
-    HANDLE h;
-    char path[1024];    /* Working copy of path */
-    char *src, *dst, *dend;
-    wchar_t *worig_path, *wresult;
-    size_t converted_chars = 0;
-
-    /* handle long path with length >= MAX_PATH */
-    if (strlen(orig_path) >= MAX_PATH) {
-        if ((worig_path = (WCHAR*)malloc(size * sizeof(WCHAR))) == NULL)
-            return -1;
-
-        if (mbstowcs_s(&converted_chars, worig_path, (size_t)size, orig_path, (size_t)(size - 1)) != 0) {
-            free(worig_path);
-            return -1;
-        }
-
-        if ((wresult = (WCHAR*)malloc(size * sizeof(WCHAR))) == NULL)
-            return -1;
-
-        if (wcanonicalize(worig_path, wresult, size) != 0) {
-            free(worig_path);
-            free(wresult);
-            return -1;
-        }
-
-        if (wcstombs_s(&converted_chars, result, (size_t)size, wresult, (size_t)(size - 1)) != 0) {
-            free(worig_path);
-            free(wresult);
-            return -1;
-        }
-
-        free(worig_path);
-        free(wresult);
-        return 0;
-    }
-
-    /* Reject paths that contain wildcards */
-    if (wild(orig_path)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    /* Collapse instances of "foo\.." and ensure absoluteness.  Note that
-      contrary to the documentation, the _fullpath procedure does not require
-      the drive to be available.  It also does not reliably change all
-      occurrences of '/' to '\\' on Win95, so now JVM_NativePath does that. */
-    if (!_fullpath(path, orig_path, sizeof(path))) {
-        return -1;
-    }
-
-    /* Correction for Win95: _fullpath may leave a trailing "\\"
-      on a UNC pathname */
-    if ((path[0] == '\\') && (path[1] == '\\')) {
-        char *p = path + strlen(path);
-        if ((p[-1] == '\\') && !islb(p[-2])) {
-            p[-1] = '\0';
-        }
-    }
-
-    if (dots(path)) /* Check for prohibited combinations of dots */
-        return -1;
-
-    src = path;            /* Start scanning here */
-    dst = result;        /* Place results here */
-    dend = dst + size;        /* Don't go to or past here */
-
-    /* Copy prefix, assuming path is absolute */
-    if (isalpha(src[0]) && (src[1] == ':') && (src[2] == '\\')) {
-        /* Drive specifier */
-        *src = toupper(*src);    /* Canonicalize drive letter */
-        if (!(dst = cp(dst, dend, '\0', src, src + 2))) {
-            return -1;
-        }
-        src += 2;
-    } else if ((src[0] == '\\') && (src[1] == '\\')) {
-        /* UNC pathname */
-        char *p;
-        p = nextsep(src + 2);    /* Skip past host name */
-        if (!*p) {
-            /* A UNC pathname must begin with "\\\\host\\share",
-            so reject this path as invalid if there is no share name */
-            errno = EINVAL;
-            return -1;
-        }
-        p = nextsep(p + 1);    /* Skip past share name */
-        if (!(dst = cp(dst, dend, '\0', src, p))) {
-            return -1;
-        }
-        src = p;
-    } else {
-        /* Invalid path */
-        errno = EINVAL;
-        return -1;
-    }
-
-    /* Windows 95/98/Me bug - FindFirstFile fails on network mounted drives */
-    /* for root pathes like "E:\" . If the path has this form, we should  */
-    /* simply return it, it is already canonicalized. */
-    if (strlen(path) == 3 && path[1] == ':' && path[2] == '\\') {
-        /* At this point we have already copied the drive specifier ("z:")*/
-        /* so we need to copy "\" and the null character. */
-        result[2] = '\\';
-        result[3] = '\0';
-        return 0;
-    }
-
-    /* At this point we have copied either a drive specifier ("z:") or a UNC
-    prefix ("\\\\host\\share") to the result buffer, and src points to the
-    first byte of the remainder of the path.  We now scan through the rest
-    of the path, looking up each prefix in order to find the true name of
-    the last element of each prefix, thereby computing the full true name of
-    the original path. */
-    while (*src) {
-        char *p = nextsep(src + 1);    /* Find next separator */
-        char c = *p;
-        assert(*src == '\\');        /* Invariant */
-        *p = '\0';            /* Temporarily clear separator */
-        h = FindFirstFile(path, &fd);    /* Look up prefix */
-        *p = c;                /* Restore separator */
-        if (h != INVALID_HANDLE_VALUE) {
-            /* Lookup succeeded; append true name to result and continue */
-            FindClose(h);
-            if (!(dst = cp(dst, dend, '\\',
-                fd.cFileName,
-                fd.cFileName + strlen(fd.cFileName)))) {
-                return -1;
-            }
-            src = p;
-            continue;
-        } else {
-            if (!lastErrorReportable()) {
-                if (!(dst = cp(dst, dend, '\0', src, src + strlen(src)))) {
-                    return -1;
-                }
-                break;
-            } else {
-                return -1;
-            }
-        }
-    }
-
-    if (dst >= dend) {
-        errno = ENAMETOOLONG;
-        return -1;
-    }
-    *dst = '\0';
-    return 0;
-
-}
-
-
-/* Convert a pathname to canonical form.  The input prefix is assumed
-   to be in canonical form already, and the trailing filename must not
-   contain any wildcard, dot/double dot, or other "tricky" characters
-   that are rejected by the canonicalize() routine above.  This
-   routine is present to allow the canonicalization prefix cache to be
-   used while still returning canonical names with the correct
-   capitalization. */
-
-int
-canonicalizeWithPrefix(char* canonicalPrefix, char* pathWithCanonicalPrefix, char *result, int size)
-{
-    WIN32_FIND_DATA fd;
-    HANDLE h;
-    char *src, *dst, *dend;
-
-    src = pathWithCanonicalPrefix;
-    dst = result;        /* Place results here */
-    dend = dst + size;   /* Don't go to or past here */
-
-    h = FindFirstFile(pathWithCanonicalPrefix, &fd);    /* Look up file */
-    if (h != INVALID_HANDLE_VALUE) {
-        /* Lookup succeeded; concatenate true name to prefix */
-        FindClose(h);
-        if (!(dst = cp(dst, dend, '\0',
-                       canonicalPrefix,
-                       canonicalPrefix + strlen(canonicalPrefix)))) {
-            return -1;
-        }
-        if (!(dst = cp(dst, dend, '\\',
-                       fd.cFileName,
-                       fd.cFileName + strlen(fd.cFileName)))) {
-            return -1;
-        }
-    } else {
-        if (!lastErrorReportable()) {
-            if (!(dst = cp(dst, dend, '\0', src, src + strlen(src)))) {
-                return -1;
-            }
-        } else {
-            return -1;
-        }
-    }
-
-    if (dst >= dend) {
-        errno = ENAMETOOLONG;
-        return -1;
-    }
-    *dst = '\0';
-    return 0;
-}
-
-
-/* Wide character version of canonicalize. Size is a wide-character size. */
-
 int
 wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
 {
@@ -559,9 +267,13 @@ wcanonicalize(WCHAR *orig_path, WCHAR *result, int size)
     return -1;
 }
 
-
-/* Wide character version of canonicalizeWithPrefix. */
-
+/* Convert a pathname to canonical form.  The input prefix is assumed
+   to be in canonical form already, and the trailing filename must not
+   contain any wildcard, dot/double dot, or other "tricky" characters
+   that are rejected by the canonicalize() routine above.  This
+   routine is present to allow the canonicalization prefix cache to be
+   used while still returning canonical names with the correct
+   capitalization. */
 int
 wcanonicalizeWithPrefix(WCHAR *canonicalPrefix, WCHAR *pathWithCanonicalPrefix, WCHAR *result, int size)
 {
@@ -613,6 +325,46 @@ wcanonicalizeWithPrefix(WCHAR *canonicalPrefix, WCHAR *pathWithCanonicalPrefix,
     return 0;
 }
 
+/* Non-Wide character version of canonicalize.
+   Converts to whchar and delegates to wcanonicalize. */
+int
+canonicalize(char* orig_path, char* result, int size) {
+    wchar_t* wpath = NULL;
+    wchar_t* wresult = NULL;
+    size_t conv;
+    size_t path_len = strlen(orig_path);
+    int ret = -1;
+
+    if ((wpath = (wchar_t*) malloc(sizeof(wchar_t) * (path_len + 1))) == NULL) {
+        goto finish;
+    }
+
+    if (mbstowcs_s(&conv, wpath, path_len + 1, orig_path, path_len) != 0) {
+        goto finish;
+    }
+
+    if ((wresult = (wchar_t*) malloc(sizeof(wchar_t) * size)) == NULL) {
+        goto finish;
+    }
+
+    if (wcanonicalize(wpath, wresult, size) != 0) {
+        goto finish;
+    }
+
+    if (wcstombs_s(&conv, result, (size_t) size, wresult, (size_t) (size - 1)) != 0) {
+        goto finish;
+    }
+
+    // Change return value to success.
+    ret = 0;
+
+finish:
+    free(wresult);
+    free(wpath);
+
+    return ret;
+}
+
 
 /* The appropriate location of getPrefixed() should be io_util_md.c, but
    java.lang.instrument package has hardwired canonicalize_md.c into their
diff --git a/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java b/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java
index 3e4b41a20f1..7731c44544b 100644
--- a/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java
+++ b/test/hotspot/jtreg/runtime/LoadClass/LongBCP.java
@@ -102,8 +102,6 @@ public class LongBCP {
               .shouldHaveExitValue(0);
 
         // relative path tests
-        // We currently cannot handle relative path specified in the
-        // -Xbootclasspath/a on windows.
         //
         // relative path length within the file system limit
         int fn_max_length = 255;
@@ -124,6 +122,22 @@ public class LongBCP {
         pb = ProcessTools.createJavaProcessBuilder(
             bootCP, "Hello");
 
+        output = new OutputAnalyzer(pb.start());
+        output.shouldContain("Hello World")
+              .shouldHaveExitValue(0);
+
+        // Test a relative path for a jar file < MAX_PATH, but where the
+        // absolute path is > MAX_PATH.
+        Path jarDir = Paths.get(".");
+        for (int i = 0; i < 21; ++i) {
+            jarDir = jarDir.resolve("0123456789");
+        }
+        Files.createDirectories(jarDir);
+        Path jarPath = jarDir.resolve("hello.jar");
+        Files.copy(Paths.get(helloJar), jarPath);
+        bootCP = "-Xbootclasspath/a:" + jarPath.toString();
+        pb = ProcessTools.createJavaProcessBuilder(bootCP, "Hello");
+
         output = new OutputAnalyzer(pb.start());
         output.shouldContain("Hello World")
               .shouldHaveExitValue(0);

From 05015118259408a399836df563bbd608e9766734 Mon Sep 17 00:00:00 2001
From: Ekaterina Pavlova 
Date: Thu, 24 Oct 2019 11:25:53 -0700
Subject: [PATCH 082/163] 8166275: vm/mlvm/meth/stress/compiler/deoptimize
 keeps timeouting

Reviewed-by: kvn
---
 test/hotspot/jtreg/ProblemList.txt            |  1 -
 .../meth/stress/compiler/deoptimize/Test.java | 26 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 1d4addf49df..4d9ee75c7f0 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -194,7 +194,6 @@ vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java 8208
 vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java 8013267 generic-all
 vmTestbase/vm/mlvm/meth/func/java/throwException/Test.java 8058176 generic-all
 vmTestbase/vm/mlvm/meth/func/jdi/breakpointOtherStratum/Test.java 8208257,8058176 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java 8058176 generic-all
 vmTestbase/vm/mlvm/meth/stress/compiler/i2c_c2i/Test.java 8058176 generic-all
 vmTestbase/vm/mlvm/meth/stress/compiler/sequences/Test.java 8058176 generic-all
 vmTestbase/vm/mlvm/meth/stress/gc/callSequencesDuringGC/Test.java 8058176 generic-all
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java
index bd2fb7957a1..a19f7a87266 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -42,6 +42,8 @@
  * @build vm.mlvm.meth.stress.compiler.deoptimize.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
+ * @requires vm.debug != true
+ *
  * @run main/othervm
  *      -XX:ReservedCodeCacheSize=100m
  *      vm.mlvm.meth.stress.compiler.deoptimize.Test
@@ -49,6 +51,28 @@
  *      -threadsExtra 2
  */
 
+
+/*
+ * @test
+ *
+ * @library /vmTestbase
+ *          /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ *
+ * @comment build test class and indify classes
+ * @build vm.mlvm.meth.stress.compiler.deoptimize.Test
+ * @run driver vm.mlvm.share.IndifiedClassesBuilder
+ *
+ * @requires vm.debug == true
+ *
+ * @run main/othervm
+ *      -XX:ReservedCodeCacheSize=100m
+ *      vm.mlvm.meth.stress.compiler.deoptimize.Test
+ *      -threadsPerCpu 2
+ *      -threadsExtra 2
+ */
+
+
 package vm.mlvm.meth.stress.compiler.deoptimize;
 
 import java.lang.invoke.MethodHandle;

From cd4d0bc498c922b48b3b76c52c033a1b1eb6ba03 Mon Sep 17 00:00:00 2001
From: Mikhailo Seledtsov 
Date: Thu, 24 Oct 2019 12:18:32 -0700
Subject: [PATCH 083/163] 8227317: [TESTBUG] jdk
 docker/TestDockerMemoryMetrics.java fails on systems w/o kernel memory
 accounting

Skipping the test case if kernel memory acct not supported

Reviewed-by: sgehwolf, lmesnik
---
 test/jdk/ProblemList.txt                          |  2 --
 .../platform/docker/TestDockerMemoryMetrics.java  | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 0bf04c85fcd..fd68288c6d0 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -890,6 +890,4 @@ jdk/jfr/event/oldobject/TestLargeRootSet.java                   8205651    gener
 
 # jdk_internal
 
-jdk/internal/platform/docker/TestDockerMemoryMetrics.java       8227317    linux-x64
-
 ############################################################################
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
index c7093cff5e5..7e37e1c332f 100644
--- a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
@@ -25,6 +25,7 @@ import jdk.test.lib.Utils;
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerRunOptions;
 import jdk.test.lib.containers.docker.DockerTestUtils;
+import jdk.test.lib.process.OutputAnalyzer;
 
 /*
  * @test
@@ -119,7 +120,19 @@ public class TestDockerMemoryMetrics {
                 .addJavaOpts("-cp", "/test-classes/")
                 .addJavaOpts("--add-exports", "java.base/jdk.internal.platform=ALL-UNNAMED")
                 .addClassOptions("kernelmem", value);
-        DockerTestUtils.dockerRunJava(opts).shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");
+        OutputAnalyzer oa = DockerTestUtils.dockerRunJava(opts);
+
+        // Some container runtimes (e.g. runc, docker 18.09)
+        // have been built without kernel memory accounting. In
+        // that case, the runtime issues a message on stderr saying
+        // so. Skip the test in that case.
+        if (oa.getStderr().contains("kernel memory accounting disabled")) {
+            System.out.println("Kernel memory accounting disabled, " +
+                                       "skipping the test case");
+            return;
+        }
+
+        oa.shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");
     }
 
     private static void testOomKillFlag(String value, boolean oomKillFlag) throws Exception {

From e15849a0f8e44600d38d56f1c1b2518c66ac67a3 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov 
Date: Thu, 24 Oct 2019 16:58:39 -0700
Subject: [PATCH 084/163] 8232904: Update JVMCI

Reviewed-by: dnsimon
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |  11 ++
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   2 +
 .../src/jdk/vm/ci/hotspot/CompilerToVM.java   |   5 +
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    |   8 ++
 .../ci/hotspot/HotSpotResolvedJavaType.java   |   9 ++
 .../HotSpotResolvedObjectTypeImpl.java        |  12 +-
 .../hotspot/HotSpotResolvedPrimitiveType.java |   5 +
 .../hotspot/HotSpotSpeculationEncoding.java   |  41 ++++---
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |   1 +
 .../hotspot/SharedHotSpotSpeculationLog.java  |  42 +++++++
 .../vm/ci/meta/EncodedSpeculationReason.java  | 115 ++++++++++++++++++
 .../test/TestHotSpotSpeculationLog.java       |   3 +-
 12 files changed, 232 insertions(+), 22 deletions(-)
 create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedHotSpotSpeculationLog.java
 create mode 100644 src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/EncodedSpeculationReason.java

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index b16ca788174..99752d7da71 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -2330,6 +2330,16 @@ C2V_VMENTRY_PREFIX(jboolean, isCurrentThreadAttached, (JNIEnv* env, jobject c2vm
   return true;
 C2V_END
 
+C2V_VMENTRY_PREFIX(jlong, getCurrentJavaThread, (JNIEnv* env, jobject c2vm))
+  if (base_thread == NULL) {
+    // Called from unattached JVMCI shared library thread
+    return 0L;
+  }
+  JVMCITraceMark jtm("getCurrentJavaThread");
+  assert(base_thread->is_Java_thread(), "just checking");
+  return (jlong) p2i(base_thread);
+C2V_END
+
 C2V_VMENTRY_PREFIX(jboolean, attachCurrentThread, (JNIEnv* env, jobject c2vm, jboolean as_daemon))
   if (base_thread == NULL) {
     // Called from unattached JVMCI shared library thread
@@ -2743,6 +2753,7 @@ JNINativeMethod CompilerToVM::methods[] = {
   {CC "deleteGlobalHandle",                           CC "(J)V",                                                                            FN_PTR(deleteGlobalHandle)},
   {CC "registerNativeMethods",                        CC "(" CLASS ")[J",                                                                   FN_PTR(registerNativeMethods)},
   {CC "isCurrentThreadAttached",                      CC "()Z",                                                                             FN_PTR(isCurrentThreadAttached)},
+  {CC "getCurrentJavaThread",                         CC "()J",                                                                             FN_PTR(getCurrentJavaThread)},
   {CC "attachCurrentThread",                          CC "(Z)Z",                                                                            FN_PTR(attachCurrentThread)},
   {CC "detachCurrentThread",                          CC "()V",                                                                             FN_PTR(detachCurrentThread)},
   {CC "translate",                                    CC "(" OBJECT ")J",                                                                   FN_PTR(translate)},
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index a82ff096452..874b44051cc 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -180,6 +180,7 @@
   nonstatic_field(JavaThread,                  _pending_transfer_to_interpreter,              bool)                                  \
   nonstatic_field(JavaThread,                  _jvmci_counters,                               jlong*)                                \
   nonstatic_field(JavaThread,                  _should_post_on_exceptions_flag,               int)                                   \
+  nonstatic_field(JavaThread,                  _jni_environment,                              JNIEnv)                                \
   nonstatic_field(JavaThread,                  _reserved_stack_activation,                    address)                               \
                                                                                                                                      \
   static_field(java_lang_Class,                _klass_offset,                                 int)                                   \
@@ -538,6 +539,7 @@
   declare_constant(FieldInfo::field_slots)                                \
                                                                           \
   declare_constant(InstanceKlass::linked)                                 \
+  declare_constant(InstanceKlass::being_initialized)                      \
   declare_constant(InstanceKlass::fully_initialized)                      \
   declare_constant(InstanceKlass::_misc_is_unsafe_anonymous)              \
                                                                           \
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index 6d64f4e8538..cd5130ed375 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -966,6 +966,11 @@ final class CompilerToVM {
      */
     native boolean isCurrentThreadAttached();
 
+    /**
+     * @see HotSpotJVMCIRuntime#getCurrentJavaThread()
+     */
+    native long getCurrentJavaThread();
+
     /**
      * @see HotSpotJVMCIRuntime#attachCurrentThread
      */
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 6df2f66cb9d..e86210e07de 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -998,6 +998,14 @@ assert factories != null : "sanity";
         return compilerToVm.isCurrentThreadAttached();
     }
 
+    /**
+     * Gets the address of the HotSpot {@code JavaThread} C++ object for the current thread. This
+     * will return {@code 0} if called from an unattached JVMCI shared library thread.
+     */
+    public long getCurrentJavaThread() {
+        return compilerToVm.getCurrentJavaThread();
+    }
+
     /**
      * Ensures the current thread is attached to the peer runtime.
      *
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java
index 0113db3b9b6..82932dfb558 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaType.java
@@ -52,4 +52,13 @@ public abstract class HotSpotResolvedJavaType extends HotSpotJavaType implements
         }
         return arrayOfType;
     }
+
+    /**
+     * Checks whether this type is currently being initialized. If a type is being initialized it
+     * implies that it was {@link #isLinked() linked} and that the static initializer is currently
+     * being run.
+     *
+     * @return {@code true} if this type is being initialized
+     */
+    abstract boolean isBeingInitialized();
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index d50617de4c5..62fa4e47176 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -359,6 +359,11 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         return isArray() ? true : getInitState() == config().instanceKlassStateFullyInitialized;
     }
 
+    @Override
+    public boolean isBeingInitialized() {
+        return isArray() ? false : getInitState() == config().instanceKlassStateBeingInitialized;
+    }
+
     @Override
     public boolean isLinked() {
         return isArray() ? true : getInitState() >= config().instanceKlassStateLinked;
@@ -379,7 +384,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
     public void initialize() {
         if (!isInitialized()) {
             runtime().compilerToVm.ensureInitialized(this);
-            assert isInitialized();
+            assert isInitialized() || isBeingInitialized();
         }
     }
 
@@ -578,11 +583,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
             return new AssumptionResult<>(resolvedMethod);
         }
 
-        if (resolvedMethod.canBeStaticallyBound()) {
-            // No assumptions are required.
-            return new AssumptionResult<>(resolvedMethod);
-        }
-
         ResolvedJavaMethod result = resolvedMethod.uniqueConcreteMethod(this);
         if (result != null) {
             return new AssumptionResult<>(result, new ConcreteMethod(method, this, result));
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
index 02508caa91f..af3dfdace5b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
@@ -149,6 +149,11 @@ public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType
         return true;
     }
 
+    @Override
+    public boolean isBeingInitialized() {
+        return false;
+    }
+
     @Override
     public boolean isLinked() {
         return true;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationEncoding.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationEncoding.java
index 1eed71ea169..25021336cd6 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationEncoding.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSpeculationEncoding.java
@@ -29,7 +29,6 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
-import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.SpeculationLog.SpeculationReasonEncoding;
@@ -37,8 +36,8 @@ import jdk.vm.ci.meta.SpeculationLog.SpeculationReasonEncoding;
 /**
  * Implements a {@link SpeculationReasonEncoding} that {@linkplain #getByteArray() produces} a byte
  * array. Data is added via a {@link DataOutputStream}. When producing the final byte array, if the
- * total length of data exceeds the length of a SHA-1 digest, then a SHA-1 digest of the data is
- * produced instead.
+ * total length of data exceeds the length of a SHA-1 digest and a SHA-1 digest algorithm is
+ * available, then a SHA-1 digest of the data is produced instead.
  */
 final class HotSpotSpeculationEncoding extends ByteArrayOutputStream implements SpeculationReasonEncoding {
 
@@ -152,21 +151,33 @@ final class HotSpotSpeculationEncoding extends ByteArrayOutputStream implements
     }
 
     /**
-     * Prototype SHA1 digest that is cloned before use.
+     * Prototype SHA1 digest.
      */
-    private static final MessageDigest SHA1 = getSHA1();
-    private static final int SHA1_LENGTH = SHA1.getDigestLength();
+    private static final MessageDigest SHA1;
 
-    private static MessageDigest getSHA1() {
+    /**
+     * Cloning the prototype is quicker than calling {@link MessageDigest#getInstance(String)} every
+     * time.
+     */
+    private static final boolean SHA1_IS_CLONEABLE;
+    private static final int SHA1_LENGTH;
+
+    static {
+        MessageDigest sha1 = null;
+        boolean sha1IsCloneable = false;
         try {
-            MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
+            sha1 = MessageDigest.getInstance("SHA-1");
             sha1.clone();
-            return sha1;
-        } catch (CloneNotSupportedException | NoSuchAlgorithmException e) {
+            sha1IsCloneable = true;
+        } catch (NoSuchAlgorithmException e) {
             // Should never happen given that SHA-1 is mandated in a
-            // compliant Java platform implementation.
-            throw new JVMCIError("Expect a cloneable implementation of a SHA-1 message digest to be available", e);
+            // compliant Java platform implementation. However, be
+            // conservative and fall back to not using a digest.
+        } catch (CloneNotSupportedException e) {
         }
+        SHA1 = sha1;
+        SHA1_IS_CLONEABLE = sha1IsCloneable;
+        SHA1_LENGTH = SHA1 == null ? 20 : SHA1.getDigestLength();
     }
 
     /**
@@ -175,12 +186,12 @@ final class HotSpotSpeculationEncoding extends ByteArrayOutputStream implements
      */
     byte[] getByteArray() {
         if (result == null) {
-            if (count > SHA1_LENGTH) {
+            if (SHA1 != null && count > SHA1_LENGTH) {
                 try {
-                    MessageDigest md = (MessageDigest) SHA1.clone();
+                    MessageDigest md = SHA1_IS_CLONEABLE ? (MessageDigest) SHA1.clone() : MessageDigest.getInstance("SHA-1");
                     md.update(buf, 0, count);
                     result = md.digest();
-                } catch (CloneNotSupportedException e) {
+                } catch (CloneNotSupportedException | NoSuchAlgorithmException e) {
                     throw new InternalError(e);
                 }
             } else {
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
index b6e9ccf90f3..d5bc20ad962 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
@@ -107,6 +107,7 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
 
     final int instanceKlassStateLinked = getConstant("InstanceKlass::linked", Integer.class);
     final int instanceKlassStateFullyInitialized = getConstant("InstanceKlass::fully_initialized", Integer.class);
+    final int instanceKlassStateBeingInitialized = getConstant("InstanceKlass::being_initialized", Integer.class);
     final int instanceKlassMiscIsUnsafeAnonymous = getConstant("InstanceKlass::_misc_is_unsafe_anonymous", Integer.class);
 
     final int annotationsFieldAnnotationsOffset = getFieldOffset("Annotations::_fields_annotations", Integer.class, "Array*");
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedHotSpotSpeculationLog.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedHotSpotSpeculationLog.java
new file mode 100644
index 00000000000..befd0255e5e
--- /dev/null
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedHotSpotSpeculationLog.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014, 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot;
+
+/**
+ * A wrapper that holds a strong reference to a "master" speculation log that
+ * {@linkplain HotSpotSpeculationLog#managesFailedSpeculations() manages} the failed speculations
+ * list.
+ */
+public class SharedHotSpotSpeculationLog extends HotSpotSpeculationLog {
+    private final HotSpotSpeculationLog masterLog;
+
+    public SharedHotSpotSpeculationLog(HotSpotSpeculationLog masterLog) {
+        super(masterLog.getFailedSpeculationsAddress());
+        this.masterLog = masterLog;
+    }
+
+    @Override
+    public String toString() {
+        return masterLog.toString();
+    }
+}
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/EncodedSpeculationReason.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/EncodedSpeculationReason.java
new file mode 100644
index 00000000000..c5da6b47355
--- /dev/null
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/EncodedSpeculationReason.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package jdk.vm.ci.meta;
+
+import java.util.Arrays;
+import java.util.function.Supplier;
+
+import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
+
+/**
+ * An implementation of {@link SpeculationReason} based on encoded values.
+ */
+public class EncodedSpeculationReason implements SpeculationReason {
+    final int groupId;
+    final String groupName;
+    final Object[] context;
+    private SpeculationLog.SpeculationReasonEncoding encoding;
+
+    public EncodedSpeculationReason(int groupId, String groupName, Object[] context) {
+        this.groupId = groupId;
+        this.groupName = groupName;
+        this.context = context;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EncodedSpeculationReason) {
+            if (obj instanceof EncodedSpeculationReason) {
+                EncodedSpeculationReason that = (EncodedSpeculationReason) obj;
+                return this.groupId == that.groupId && Arrays.equals(this.context, that.context);
+            }
+            return false;
+        }
+        return false;
+    }
+
+    @Override
+    public SpeculationLog.SpeculationReasonEncoding encode(Supplier encodingSupplier) {
+        if (encoding == null) {
+            encoding = encodingSupplier.get();
+            encoding.addInt(groupId);
+            for (Object o : context) {
+                if (o == null) {
+                    encoding.addInt(0);
+                } else {
+                    addNonNullObject(encoding, o);
+                }
+            }
+        }
+        return encoding;
+    }
+
+    static void addNonNullObject(SpeculationLog.SpeculationReasonEncoding encoding, Object o) {
+        Class c = o.getClass();
+        if (c == String.class) {
+            encoding.addString((String) o);
+        } else if (c == Byte.class) {
+            encoding.addByte((Byte) o);
+        } else if (c == Short.class) {
+            encoding.addShort((Short) o);
+        } else if (c == Character.class) {
+            encoding.addShort((Character) o);
+        } else if (c == Integer.class) {
+            encoding.addInt((Integer) o);
+        } else if (c == Long.class) {
+            encoding.addLong((Long) o);
+        } else if (c == Float.class) {
+            encoding.addInt(Float.floatToRawIntBits((Float) o));
+        } else if (c == Double.class) {
+            encoding.addLong(Double.doubleToRawLongBits((Double) o));
+        } else if (o instanceof Enum) {
+            encoding.addInt(((Enum) o).ordinal());
+        } else if (o instanceof ResolvedJavaMethod) {
+            encoding.addMethod((ResolvedJavaMethod) o);
+        } else if (o instanceof ResolvedJavaType) {
+            encoding.addType((ResolvedJavaType) o);
+        } else if (o instanceof ResolvedJavaField) {
+            encoding.addField((ResolvedJavaField) o);
+        } else {
+            throw new IllegalArgumentException("Unsupported type for encoding: " + c.getName());
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return groupId + Arrays.hashCode(this.context);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s@%d%s", groupName, groupId, Arrays.toString(context));
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHotSpotSpeculationLog.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHotSpotSpeculationLog.java
index 094ec71c63a..3e49f9cc042 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHotSpotSpeculationLog.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestHotSpotSpeculationLog.java
@@ -78,7 +78,8 @@ public class TestHotSpotSpeculationLog {
     public synchronized void testFailedSpeculations() {
         HotSpotSpeculationLog log = new HotSpotSpeculationLog();
         DummyReason reason1 = new DummyReason("dummy1");
-        DummyReason reason2 = new DummyReason("dummy2");
+        String longName = new String(new char[2000]).replace('\0', 'X');
+        DummyReason reason2 = new DummyReason(longName);
         Assert.assertTrue(log.maySpeculate(reason1));
         Assert.assertTrue(log.maySpeculate(reason2));
 

From c87a6fc0b3259068a6c6a4edfaf6ff01940ff1e8 Mon Sep 17 00:00:00 2001
From: Amy Lu 
Date: Fri, 25 Oct 2019 08:50:50 +0800
Subject: [PATCH 085/163] 8232922: Add
 java/math/BigInteger/largeMemory/SymmetricRangeTests.java to
 ProblemList-Xcomp

Reviewed-by: bpb, darcy, iignatyev
---
 test/jdk/ProblemList-Xcomp.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList-Xcomp.txt b/test/jdk/ProblemList-Xcomp.txt
index 3345c52ee97..2b9ac6203ac 100644
--- a/test/jdk/ProblemList-Xcomp.txt
+++ b/test/jdk/ProblemList-Xcomp.txt
@@ -29,3 +29,4 @@
 
 java/lang/invoke/MethodHandles/CatchExceptionTest.java 8146623 generic-all
 java/util/stream/test/org/openjdk/tests/java/util/stream/StreamLinkTest.java 8216317 solaris-all
+java/math/BigInteger/largeMemory/SymmetricRangeTests.java 8232840 generic-all

From be6a893e1faefaccc3a080757eb6e7458e1e75c5 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez 
Date: Thu, 24 Oct 2019 22:41:24 -0700
Subject: [PATCH 086/163] 8232083: Minimal VM is broken after JDK-8231586

Reviewed-by: dlong
---
 src/hotspot/share/compiler/oopMap.cpp | 42 +++++++++++++--------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp
index cbcb39e773e..b8c0d70699d 100644
--- a/src/hotspot/share/compiler/oopMap.cpp
+++ b/src/hotspot/share/compiler/oopMap.cpp
@@ -308,10 +308,13 @@ void OopMapSet::all_do(const frame *fr, const RegisterMap *reg_map,
 
   // handle derived pointers first (otherwise base pointer may be
   // changed before derived pointer offset has been collected)
-  OopMapValue omv;
   {
-    OopMapStream oms(map);
-    if (!oms.is_done()) {
+    for (OopMapStream oms(map); !oms.is_done(); oms.next()) {
+      OopMapValue omv = oms.current();
+      if (omv.type() != OopMapValue::derived_oop_value) {
+        continue;
+      }
+
 #ifndef TIERED
       COMPILER1_PRESENT(ShouldNotReachHere();)
 #if INCLUDE_JVMCI
@@ -320,31 +323,26 @@ void OopMapSet::all_do(const frame *fr, const RegisterMap *reg_map,
       }
 #endif
 #endif // !TIERED
-      do {
-        omv = oms.current();
-        if (omv.type() == OopMapValue::derived_oop_value) {
-          oop* loc = fr->oopmapreg_to_location(omv.reg(),reg_map);
-          guarantee(loc != NULL, "missing saved register");
-          oop *derived_loc = loc;
-          oop *base_loc    = fr->oopmapreg_to_location(omv.content_reg(), reg_map);
-          // Ignore NULL oops and decoded NULL narrow oops which
-          // equal to CompressedOops::base() when a narrow oop
-          // implicit null check is used in compiled code.
-          // The narrow_oop_base could be NULL or be the address
-          // of the page below heap depending on compressed oops mode.
-          if (base_loc != NULL && *base_loc != NULL && !CompressedOops::is_base(*base_loc)) {
-            derived_oop_fn(base_loc, derived_loc);
-          }
-        }
-        oms.next();
-      }  while (!oms.is_done());
+      oop* loc = fr->oopmapreg_to_location(omv.reg(),reg_map);
+      guarantee(loc != NULL, "missing saved register");
+      oop *derived_loc = loc;
+      oop *base_loc    = fr->oopmapreg_to_location(omv.content_reg(), reg_map);
+      // Ignore NULL oops and decoded NULL narrow oops which
+      // equal to CompressedOops::base() when a narrow oop
+      // implicit null check is used in compiled code.
+      // The narrow_oop_base could be NULL or be the address
+      // of the page below heap depending on compressed oops mode.
+      if (base_loc != NULL && *base_loc != NULL && !CompressedOops::is_base(*base_loc)) {
+        derived_oop_fn(base_loc, derived_loc);
+      }
+      oms.next();
     }
   }
 
   {
     // We want coop and oop oop_types
     for (OopMapStream oms(map); !oms.is_done(); oms.next()) {
-      omv = oms.current();
+      OopMapValue omv = oms.current();
       oop* loc = fr->oopmapreg_to_location(omv.reg(),reg_map);
       // It should be an error if no location can be found for a
       // register mentioned as contained an oop of some kind.  Maybe

From e4a6d80db2ba6fa9e72195b53b3aaf7c5e7f476f Mon Sep 17 00:00:00 2001
From: Thomas Schatzl 
Date: Fri, 25 Oct 2019 12:34:30 +0200
Subject: [PATCH 087/163] 8232779: G1 current collection parallel time does not
 include optional evacuation

Reviewed-by: kbarrett, sangheki
---
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp | 6 +++---
 src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 36dbe35b490..89afbbaaa20 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -164,7 +164,7 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) :
 
 void G1GCPhaseTimes::reset() {
   _cur_collection_initial_evac_time_ms = 0.0;
-  _cur_optional_evac_ms = 0.0;
+  _cur_optional_evac_time_ms = 0.0;
   _cur_collection_code_root_fixup_time_ms = 0.0;
   _cur_strong_code_root_purge_time_ms = 0.0;
   _cur_merge_heap_roots_time_ms = 0.0;
@@ -416,14 +416,14 @@ double G1GCPhaseTimes::print_pre_evacuate_collection_set() const {
 }
 
 double G1GCPhaseTimes::print_evacuate_optional_collection_set() const {
-  const double sum_ms = _cur_optional_evac_ms + _cur_optional_merge_heap_roots_time_ms;
+  const double sum_ms = _cur_optional_evac_time_ms + _cur_optional_merge_heap_roots_time_ms;
   if (sum_ms > 0) {
     info_time("Merge Optional Heap Roots", _cur_optional_merge_heap_roots_time_ms);
 
     debug_time("Prepare Optional Merge Heap Roots", _cur_optional_prepare_merge_heap_roots_time_ms);
     debug_phase(_gc_par_phases[OptMergeRS]);
 
-    info_time("Evacuate Optional Collection Set", _cur_optional_evac_ms);
+    info_time("Evacuate Optional Collection Set", _cur_optional_evac_time_ms);
     debug_phase(_gc_par_phases[OptScanHR]);
     debug_phase(_gc_par_phases[OptObjCopy]);
     debug_phase(_gc_par_phases[OptCodeRoots]);
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
index 77fe38c4a3f..e40c7b2520a 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
@@ -156,7 +156,7 @@ class G1GCPhaseTimes : public CHeapObj {
   WorkerDataArray* _redirtied_cards;
 
   double _cur_collection_initial_evac_time_ms;
-  double _cur_optional_evac_ms;
+  double _cur_optional_evac_time_ms;
   double _cur_collection_code_root_fixup_time_ms;
   double _cur_strong_code_root_purge_time_ms;
 
@@ -296,7 +296,7 @@ class G1GCPhaseTimes : public CHeapObj {
   }
 
   void record_or_add_optional_evac_time(double ms) {
-    _cur_optional_evac_ms += ms;
+    _cur_optional_evac_time_ms += ms;
   }
 
   void record_or_add_code_root_fixup_time(double ms) {
@@ -415,7 +415,7 @@ class G1GCPhaseTimes : public CHeapObj {
   }
 
   double cur_collection_par_time_ms() {
-    return _cur_collection_initial_evac_time_ms;
+    return _cur_collection_initial_evac_time_ms + _cur_optional_evac_time_ms;
   }
 
   double cur_clear_ct_time_ms() {

From 9ae0d5f81f205eb09649ec1d9e7c22ad9c5e6b38 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl 
Date: Fri, 25 Oct 2019 12:33:30 +0200
Subject: [PATCH 088/163] 8232777: Rename G1Policy::_max_rs_length as it is no
 maximum

Reviewed-by: kbarrett, sjohanss
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp |  2 +-
 src/hotspot/share/gc/g1/g1Policy.cpp        | 14 +++++++-------
 src/hotspot/share/gc/g1/g1Policy.hpp        |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index db6de824567..20f162b1e13 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -4098,7 +4098,7 @@ private:
     _cl.complete_work();
 
     G1Policy* policy = G1CollectedHeap::heap()->policy();
-    policy->record_max_rs_length(_rs_length);
+    policy->record_rs_length(_rs_length);
     policy->cset_regions_freed();
   }
 public:
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 495961849c9..6fdf0e3e918 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -68,7 +68,7 @@ G1Policy::G1Policy(STWGCTimer* gc_timer) :
   _reserve_regions(0),
   _young_gen_sizer(G1YoungGenSizer::create_gen_sizer()),
   _free_regions_at_end_of_collection(0),
-  _max_rs_length(0),
+  _rs_length(0),
   _rs_length_prediction(0),
   _pending_cards_at_gc_start(0),
   _pending_cards_at_prev_gc_end(0),
@@ -753,13 +753,13 @@ void G1Policy::record_collection_pause_end(double pause_time_ms, size_t heap_use
       _analytics->report_cost_per_remset_card_ms(cost_per_remset_card_ms, this_pause_was_young_only);
     }
 
-    if (_max_rs_length > 0) {
+    if (_rs_length > 0) {
       double cards_per_entry_ratio =
-        (double) remset_cards_scanned / (double) _max_rs_length;
+        (double) remset_cards_scanned / (double) _rs_length;
       _analytics->report_cards_per_entry_ratio(cards_per_entry_ratio, this_pause_was_young_only);
     }
 
-    // This is defensive. For a while _max_rs_length could get
+    // This is defensive. For a while _rs_length could get
     // smaller than _recorded_rs_length which was causing
     // rs_length_diff to get very large and mess up the RSet length
     // predictions. The reason was unsafe concurrent updates to the
@@ -774,8 +774,8 @@ void G1Policy::record_collection_pause_end(double pause_time_ms, size_t heap_use
     // conditional below just in case.
     size_t rs_length_diff = 0;
     size_t recorded_rs_length = _collection_set->recorded_rs_length();
-    if (_max_rs_length > recorded_rs_length) {
-      rs_length_diff = _max_rs_length - recorded_rs_length;
+    if (_rs_length > recorded_rs_length) {
+      rs_length_diff = _rs_length - recorded_rs_length;
     }
     _analytics->report_rs_length_diff((double) rs_length_diff);
 
@@ -806,7 +806,7 @@ void G1Policy::record_collection_pause_end(double pause_time_ms, size_t heap_use
     // During mixed gc we do not use them for young gen sizing.
     if (this_pause_was_young_only) {
       _analytics->report_pending_cards((double) _pending_cards_at_gc_start);
-      _analytics->report_rs_length((double) _max_rs_length);
+      _analytics->report_rs_length((double) _rs_length);
     }
   }
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index 218b0d6a2fd..46fb9966d27 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -96,7 +96,7 @@ class G1Policy: public CHeapObj {
 
   uint _free_regions_at_end_of_collection;
 
-  size_t _max_rs_length;
+  size_t _rs_length;
 
   size_t _rs_length_prediction;
 
@@ -136,8 +136,8 @@ public:
     hr->install_surv_rate_group(_survivor_surv_rate_group);
   }
 
-  void record_max_rs_length(size_t rs_length) {
-    _max_rs_length = rs_length;
+  void record_rs_length(size_t rs_length) {
+    _rs_length = rs_length;
   }
 
   double predict_base_elapsed_time_ms(size_t pending_cards) const;

From ba9ce48bd8f8afde12e70f4a01b04e0f179b3e63 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl 
Date: Fri, 25 Oct 2019 12:32:46 +0200
Subject: [PATCH 089/163] 8232776: G1 should always take rs_length_diff into
 account when predicting rs_lengths

Reviewed-by: sangheki, kbarrett
---
 src/hotspot/share/gc/g1/g1Analytics.cpp | 6 +-----
 src/hotspot/share/gc/g1/g1Analytics.hpp | 2 --
 src/hotspot/share/gc/g1/g1Policy.cpp    | 5 ++---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Analytics.cpp b/src/hotspot/share/gc/g1/g1Analytics.cpp
index 976d2d1859c..cd26f3e8508 100644
--- a/src/hotspot/share/gc/g1/g1Analytics.cpp
+++ b/src/hotspot/share/gc/g1/g1Analytics.cpp
@@ -229,10 +229,6 @@ void G1Analytics::report_rs_length(double rs_length) {
   _rs_length_seq->add(rs_length);
 }
 
-size_t G1Analytics::predict_rs_length_diff() const {
-  return get_new_size_prediction(_rs_length_diff_seq);
-}
-
 double G1Analytics::predict_alloc_rate_ms() const {
   return get_new_prediction(_alloc_rate_ms_seq);
 }
@@ -334,7 +330,7 @@ double G1Analytics::predict_cleanup_time_ms() const {
 }
 
 size_t G1Analytics::predict_rs_length() const {
-  return get_new_size_prediction(_rs_length_seq);
+  return get_new_size_prediction(_rs_length_seq) + get_new_prediction(_rs_length_diff_seq);
 }
 
 size_t G1Analytics::predict_pending_cards() const {
diff --git a/src/hotspot/share/gc/g1/g1Analytics.hpp b/src/hotspot/share/gc/g1/g1Analytics.hpp
index 2979be15688..aa012d67fa7 100644
--- a/src/hotspot/share/gc/g1/g1Analytics.hpp
+++ b/src/hotspot/share/gc/g1/g1Analytics.hpp
@@ -115,8 +115,6 @@ public:
   void report_pending_cards(double pending_cards);
   void report_rs_length(double rs_length);
 
-  size_t predict_rs_length_diff() const;
-
   double predict_alloc_rate_ms() const;
   int num_alloc_rate_ms() const;
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 6fdf0e3e918..27a3f28b2f7 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -330,8 +330,7 @@ G1Policy::calculate_young_list_target_length(size_t rs_length,
   const double target_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
   const double survivor_regions_evac_time = predict_survivor_regions_evac_time();
   const size_t pending_cards = _analytics->predict_pending_cards();
-  const size_t adj_rs_length = rs_length + _analytics->predict_rs_length_diff();
-  const size_t scanned_cards = _analytics->predict_card_num(adj_rs_length, true /* for_young_gc */);
+  const size_t scanned_cards = _analytics->predict_card_num(rs_length, true /* for_young_gc */);
   const double base_time_ms =
     predict_base_elapsed_time_ms(pending_cards, scanned_cards) +
     survivor_regions_evac_time;
@@ -951,7 +950,7 @@ double G1Policy::predict_base_elapsed_time_ms(size_t pending_cards,
 }
 
 double G1Policy::predict_base_elapsed_time_ms(size_t pending_cards) const {
-  size_t rs_length = _analytics->predict_rs_length() + _analytics->predict_rs_length_diff();
+  size_t rs_length = _analytics->predict_rs_length();
   size_t card_num = _analytics->predict_card_num(rs_length, collector_state()->in_young_only_phase());
   return predict_base_elapsed_time_ms(pending_cards, card_num);
 }

From db24eb1e6a0b777dc44f44ae3a1d75ad8d23d6d0 Mon Sep 17 00:00:00 2001
From: Ekaterina Pavlova 
Date: Fri, 25 Oct 2019 07:15:09 -0700
Subject: [PATCH 090/163] 8233000: Mark
 vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize test as stress test

Reviewed-by: iveresov, lmesnik
---
 .../vm/mlvm/meth/stress/compiler/deoptimize/Test.java           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java
index a19f7a87266..b6b0a5467af 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java
@@ -24,6 +24,7 @@
 
 /*
  * @test
+ * @key stress
  *
  * @summary converted from VM Testbase vm/mlvm/meth/stress/compiler/deoptimize.
  * VM Testbase keywords: [feature_mlvm, nonconcurrent, quarantine]
@@ -54,6 +55,7 @@
 
 /*
  * @test
+ * @key stress
  *
  * @library /vmTestbase
  *          /test/lib

From 8e546a3fe013f6872e2338ceeb025f39c864ee0c Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev 
Date: Fri, 25 Oct 2019 17:30:25 +0200
Subject: [PATCH 091/163] 8233021: Shenandoah: SBSC2::is_shenandoah_lrb_call
 should match all LRB shapes

Reviewed-by: zgu
---
 .../share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index d10440d0cc4..efdbf291f42 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -297,8 +297,15 @@ bool ShenandoahBarrierSetC2::is_shenandoah_wb_pre_call(Node* call) {
 }
 
 bool ShenandoahBarrierSetC2::is_shenandoah_lrb_call(Node* call) {
-  return call->is_CallLeaf() &&
-          call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier);
+  if (!call->is_CallLeaf()) {
+    return false;
+  }
+
+  address entry_point = call->as_CallLeaf()->entry_point();
+  return (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier)) ||
+         (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup)) ||
+         (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup_narrow)) ||
+         (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native));
 }
 
 bool ShenandoahBarrierSetC2::is_shenandoah_marking_if(PhaseTransform *phase, Node* n) {

From 3c1310a60aac414f5a3ddd90cc28a9fdf4025e89 Mon Sep 17 00:00:00 2001
From: Patrick Concannon 
Date: Fri, 25 Oct 2019 12:05:56 +0100
Subject: [PATCH 092/163] 8231570: (dc) Clarify implicit bind behavior of
 DatagramChannel

Update to DatagramChannel spec to make it clear that SecurityException can be thrown in connect send and receive methods

Reviewed-by: alanb, chegar, dfuchs
---
 .../java/nio/channels/DatagramChannel.java     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
index c582b5e627b..f5d848b095c 100644
--- a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
+++ b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
@@ -305,8 +305,10 @@ public abstract class DatagramChannel
      *          If the type of the given remote address is not supported
      *
      * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit access to the given remote address
+     *          If a security manager has been installed and it does not
+     *          permit access to the given remote address, or if unbound,
+     *          the security manager {@link SecurityManager#checkListen checkListen}
+     *          method denies the operation
      *
      * @throws  IOException
      *          If some other I/O error occurs
@@ -409,6 +411,11 @@ public abstract class DatagramChannel
      *          closing the channel and setting the current thread's
      *          interrupt status
      *
+     * @throws  SecurityException
+     *          If unbound, and a security manager has been installed and
+     *          its {@link SecurityManager#checkListen checkListen} method
+     *          denies the operation
+     *
      * @throws  IOException
      *          If some other I/O error occurs
      */
@@ -480,9 +487,10 @@ public abstract class DatagramChannel
      *          If the type of the given remote address is not supported
      *
      * @throws  SecurityException
-     *          If a security manager has been installed
-     *          and it does not permit datagrams to be sent
-     *          to the given address
+     *          If a security manager has been installed and it does not permit
+     *          datagrams to be sent to the given address, or if unbound, and
+     *          the security manager's {@link SecurityManager#checkListen checkListen}
+     *          method denies the operation
      *
      * @throws  IOException
      *          If some other I/O error occurs

From d8c73de1dfa9b6015f5c95e85c9d7f3a9f0c4445 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov 
Date: Fri, 25 Oct 2019 11:51:48 -0700
Subject: [PATCH 093/163] 8225464: Obsolete TraceNMethodInstalls flag

Reviewed-by: dholmes, thartmann
---
 src/hotspot/share/runtime/arguments.cpp | 2 +-
 src/hotspot/share/runtime/globals.hpp   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index b113f96f7d1..db1f91b2884 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -548,6 +548,7 @@ static SpecialFlag const special_jvm_flags[] = {
   { "SharedMiscDataSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
   { "SharedMiscCodeSize",            JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() },
   { "CompilationPolicyChoice",       JDK_Version::jdk(13),     JDK_Version::jdk(14), JDK_Version::jdk(15) },
+  { "TraceNMethodInstalls",          JDK_Version::jdk(13),     JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "FailOverToOldVerifier",         JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "BindGCTaskThreadsToCPUs",       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
   { "UseGCTaskAffinity",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
@@ -593,7 +594,6 @@ static AliasedLoggingFlag const aliased_logging_flags[] = {
   { "TraceSafepointCleanupTime", LogLevel::Info,  true,  LOG_TAGS(safepoint, cleanup) },
   { "TraceJVMTIObjectTagging",   LogLevel::Debug, true,  LOG_TAGS(jvmti, objecttagging) },
   { "TraceRedefineClasses",      LogLevel::Info,  false, LOG_TAGS(redefine, class) },
-  { "TraceNMethodInstalls",      LogLevel::Info,  true,  LOG_TAGS(nmethod, install) },
   { NULL,                        LogLevel::Off,   false, LOG_TAGS(_NO_TAG) }
 };
 
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 4779617a55d..18e476c7860 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -563,9 +563,6 @@ const size_t minimumSymbolTableSize = 1024;
   product(bool, PrintExtendedThreadInfo, false,                             \
           "Print more information in thread dump")                          \
                                                                             \
-  diagnostic(bool, TraceNMethodInstalls, false,                             \
-          "Trace nmethod installation")                                     \
-                                                                            \
   diagnostic(intx, ScavengeRootsInCode, 2,                                  \
           "0: do not allow scavengable oops in the code cache; "            \
           "1: allow scavenging from the code cache; "                       \

From a2844b54e13cc492b3f83a0f11d1456151b1b36c Mon Sep 17 00:00:00 2001
From: Tom Rodriguez 
Date: Fri, 25 Oct 2019 13:17:31 -0700
Subject: [PATCH 094/163] 8233027: OopMapSet::all_do does oms.next() twice
 during iteration

Reviewed-by: shade, kvn
---
 src/hotspot/share/compiler/oopMap.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp
index b8c0d70699d..5f36de6103b 100644
--- a/src/hotspot/share/compiler/oopMap.cpp
+++ b/src/hotspot/share/compiler/oopMap.cpp
@@ -335,7 +335,6 @@ void OopMapSet::all_do(const frame *fr, const RegisterMap *reg_map,
       if (base_loc != NULL && *base_loc != NULL && !CompressedOops::is_base(*base_loc)) {
         derived_oop_fn(base_loc, derived_loc);
       }
-      oms.next();
     }
   }
 

From 0290476112f326ade809dd309112c94d7cab2180 Mon Sep 17 00:00:00 2001
From: Alan Bateman 
Date: Sun, 27 Oct 2019 12:13:51 +0000
Subject: [PATCH 095/163] 8212132: (dc) Remove DatagramChannelImpl finalize
 method

Reviewed-by: bpb, chegar, dfuchs, martin
---
 .../sun/nio/ch/DatagramChannelImpl.java       |  39 ++--
 .../classes/sun/nio/ch/NioSocketImpl.java     |  68 +++----
 .../nio/channels/DatagramChannel/Unref.java   | 170 ++++++++++++++++++
 3 files changed, 219 insertions(+), 58 deletions(-)
 create mode 100644 test/jdk/java/nio/channels/DatagramChannel/Unref.java

diff --git a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
index d8bc4d9dee5..45379f4c372 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -27,6 +27,8 @@ package sun.nio.ch;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.ref.Cleaner.Cleanable;
 import java.net.DatagramSocket;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -55,6 +57,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
+import jdk.internal.ref.CleanerFactory;
 import sun.net.ResourceManager;
 import sun.net.ext.ExtendedSocketOptions;
 import sun.net.util.IPAddressUtil;
@@ -68,7 +71,7 @@ class DatagramChannelImpl
     implements SelChImpl
 {
     // Used to make native read and write calls
-    private static NativeDispatcher nd = new DatagramDispatcher();
+    private static final NativeDispatcher nd = new DatagramDispatcher();
 
     // The protocol family of the socket
     private final ProtocolFamily family;
@@ -76,6 +79,7 @@ class DatagramChannelImpl
     // Our file descriptor
     private final FileDescriptor fd;
     private final int fdVal;
+    private final Cleanable cleaner;
 
     // Cached InetAddress and port for unconnected DatagramChannels
     // used by receive0
@@ -138,6 +142,7 @@ class DatagramChannelImpl
             ResourceManager.afterUdpClose();
             throw ioe;
         }
+        this.cleaner = CleanerFactory.cleaner().register(this, closerFor(fd));
     }
 
     public DatagramChannelImpl(SelectorProvider sp, ProtocolFamily family)
@@ -164,6 +169,7 @@ class DatagramChannelImpl
             ResourceManager.afterUdpClose();
             throw ioe;
         }
+        this.cleaner = CleanerFactory.cleaner().register(this, closerFor(fd));
     }
 
     public DatagramChannelImpl(SelectorProvider sp, FileDescriptor fd)
@@ -179,6 +185,7 @@ class DatagramChannelImpl
                 : StandardProtocolFamily.INET;
         this.fd = fd;
         this.fdVal = IOUtil.fdVal(fd);
+        this.cleaner = CleanerFactory.cleaner().register(this, closerFor(fd));
         synchronized (stateLock) {
             this.localAddress = Net.localAddress(fd);
         }
@@ -1181,10 +1188,10 @@ class DatagramChannelImpl
         if ((readerThread == 0) && (writerThread == 0) && !isRegistered()) {
             state = ST_CLOSED;
             try {
-                nd.close(fd);
-            } finally {
-                // notify resource manager
-                ResourceManager.afterUdpClose();
+                // close socket
+                cleaner.clean();
+            } catch (UncheckedIOException ioe) {
+                throw ioe.getCause();
             }
             return true;
         } else {
@@ -1283,13 +1290,6 @@ class DatagramChannelImpl
         }
     }
 
-    @SuppressWarnings("deprecation")
-    protected void finalize() throws IOException {
-        // fd is null if constructor threw exception
-        if (fd != null)
-            close();
-    }
-
     /**
      * Translates native poll revent set into a ready operation set
      */
@@ -1377,6 +1377,21 @@ class DatagramChannelImpl
         return fdVal;
     }
 
+    /**
+     * Returns an action to close the given file descriptor.
+     */
+    private static Runnable closerFor(FileDescriptor fd) {
+        return () -> {
+            try {
+                nd.close(fd);
+            } catch (IOException ioe) {
+                throw new UncheckedIOException(ioe);
+            } finally {
+                // decrement
+                ResourceManager.afterUdpClose();
+            }
+        };
+    }
 
     // -- Native methods --
 
diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
index 7c6b5a84ec0..e216b6a4787 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -30,8 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
+import java.lang.ref.Cleaner.Cleanable;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ProtocolFamily;
@@ -106,7 +105,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
 
     // set by SocketImpl.create, protected by stateLock
     private boolean stream;
-    private FileDescriptorCloser closer;
+    private Cleanable cleaner;
 
     // set to true when the socket is in non-blocking mode
     private volatile boolean nonBlocking;
@@ -471,9 +470,10 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
                     ResourceManager.afterUdpClose();
                 throw ioe;
             }
+            Runnable closer = closerFor(fd, stream);
             this.fd = fd;
             this.stream = stream;
-            this.closer = FileDescriptorCloser.create(this);
+            this.cleaner = CleanerFactory.cleaner().register(this, closer);
             this.state = ST_UNCONNECTED;
         }
     }
@@ -777,10 +777,11 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
         }
 
         // set the fields
+        Runnable closer = closerFor(newfd, true);
         synchronized (nsi.stateLock) {
             nsi.fd = newfd;
             nsi.stream = true;
-            nsi.closer = FileDescriptorCloser.create(nsi);
+            nsi.cleaner = CleanerFactory.cleaner().register(nsi, closer);
             nsi.localport = localAddress.getPort();
             nsi.address = isaa[0].getAddress();
             nsi.port = isaa[0].getPort();
@@ -850,7 +851,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
         assert Thread.holdsLock(stateLock) && state == ST_CLOSING;
         if (readerThread == 0 && writerThread == 0) {
             try {
-                closer.run();
+                cleaner.clean();
             } catch (UncheckedIOException ioe) {
                 throw ioe.getCause();
             } finally {
@@ -1193,53 +1194,28 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
     }
 
     /**
-     * A task that closes a SocketImpl's file descriptor. The task runs when the
-     * SocketImpl is explicitly closed and when the SocketImpl becomes phantom
-     * reachable.
+     * Returns an action to close the given file descriptor.
      */
-    private static class FileDescriptorCloser implements Runnable {
-        private static final VarHandle CLOSED;
-        static {
-            try {
-                MethodHandles.Lookup l = MethodHandles.lookup();
-                CLOSED = l.findVarHandle(FileDescriptorCloser.class,
-                                         "closed",
-                                         boolean.class);
-            } catch (Exception e) {
-                throw new InternalError(e);
-            }
-        }
-
-        private final FileDescriptor fd;
-        private final boolean stream;
-        private volatile boolean closed;
-
-        FileDescriptorCloser(FileDescriptor fd, boolean stream) {
-            this.fd = fd;
-            this.stream = stream;
-        }
-
-        static FileDescriptorCloser create(NioSocketImpl impl) {
-            assert Thread.holdsLock(impl.stateLock);
-            var closer = new FileDescriptorCloser(impl.fd, impl.stream);
-            CleanerFactory.cleaner().register(impl, closer);
-            return closer;
-        }
-
-        @Override
-        public void run() {
-            if (CLOSED.compareAndSet(this, false, true)) {
+    private static Runnable closerFor(FileDescriptor fd, boolean stream) {
+        if (stream) {
+            return () -> {
+                try {
+                    nd.close(fd);
+                } catch (IOException ioe) {
+                    throw new UncheckedIOException(ioe);
+                }
+            };
+        } else {
+            return () -> {
                 try {
                     nd.close(fd);
                 } catch (IOException ioe) {
                     throw new UncheckedIOException(ioe);
                 } finally {
-                    if (!stream) {
-                        // decrement
-                        ResourceManager.afterUdpClose();
-                    }
+                    // decrement
+                    ResourceManager.afterUdpClose();
                 }
-            }
+            };
         }
     }
 
diff --git a/test/jdk/java/nio/channels/DatagramChannel/Unref.java b/test/jdk/java/nio/channels/DatagramChannel/Unref.java
new file mode 100644
index 00000000000..999c858bb8f
--- /dev/null
+++ b/test/jdk/java/nio/channels/DatagramChannel/Unref.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8212132
+ * @summary Test that DatagramChannel does not leak file descriptors
+ * @requires os.family != "windows"
+ * @modules jdk.management
+ * @library /test/lib
+ * @run main/othervm Unref
+ */
+
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.net.InetSocketAddress;
+import java.net.StandardProtocolFamily;
+import java.nio.channels.DatagramChannel;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+
+import com.sun.management.UnixOperatingSystemMXBean;
+
+import jtreg.SkippedException;
+import jdk.test.lib.net.IPSupport;
+
+public class Unref {
+
+    interface DatagramChannelSupplier {
+        DatagramChannel get() throws IOException;
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (unixOperatingSystemMXBean() == null)
+            throw new SkippedException("This test requires UnixOperatingSystemMXBean");
+
+        test(DatagramChannel::open);
+        if (IPSupport.hasIPv4())
+            test(() -> DatagramChannel.open(StandardProtocolFamily.INET));
+        if (IPSupport.hasIPv6())
+            test(() -> DatagramChannel.open(StandardProtocolFamily.INET6));
+    }
+
+    static void test(DatagramChannelSupplier supplier) throws Exception {
+        openAndClose(supplier); // warm-up
+
+        try (Selector sel = Selector.open()) {
+            long count = fileDescriptorCount();
+
+            // open+close
+            openAndClose(supplier);
+            assertEquals(fileDescriptorCount(), count);
+
+            // open+unref, file descriptor should be closed by cleaner
+            openAndUnref(supplier);
+            assertEquals(waitForFileDescriptorCount(count), count);
+
+            // open+register+close+flush
+            openRegisterAndClose(supplier, sel);
+            assertEquals(fileDescriptorCount(), count);
+
+            // open+register+flush, file descriptor should be closed by cleaner
+            openRegisterAndUnref(supplier, sel);
+            assertEquals(waitForFileDescriptorCount(count), count);
+        }
+    }
+
+    /**
+     * Create a DatagramChannel and closes it.
+     */
+    static void openAndClose(DatagramChannelSupplier supplier) throws IOException {
+        System.out.println("openAndClose ...");
+        DatagramChannel dc = supplier.get();
+        dc.close();
+    }
+
+    /**
+     * Create a DatagramChannel and exits without closing the channel.
+     */
+    static void openAndUnref(DatagramChannelSupplier supplier) throws IOException {
+        System.out.println("openAndUnref ...");
+        DatagramChannel dc = supplier.get();
+    }
+
+    /**
+     * Create a DatagramChannel, register it with a Selector, close the channel
+     * while register, and then finally flush the channel from the Selector.
+     */
+    static void openRegisterAndClose(DatagramChannelSupplier supplier, Selector sel)
+        throws IOException
+    {
+        System.out.println("openRegisterAndClose ...");
+        try (DatagramChannel dc = supplier.get()) {
+            dc.bind(new InetSocketAddress(0));
+            dc.configureBlocking(false);
+            dc.register(sel, SelectionKey.OP_READ);
+            sel.selectNow();
+        }
+
+        // flush, should close channel
+        sel.selectNow();
+    }
+
+    /**
+     * Creates a DatagramChannel, registers with a Selector, cancels the key
+     * and flushes the channel from the Selector. This method exits without
+     * closing the channel.
+     */
+    static void openRegisterAndUnref(DatagramChannelSupplier supplier, Selector sel)
+        throws IOException
+    {
+        System.out.println("openRegisterAndUnref ...");
+        DatagramChannel dc = supplier.get();
+        dc.bind(new InetSocketAddress(0));
+        dc.configureBlocking(false);
+        SelectionKey key = dc.register(sel, SelectionKey.OP_READ);
+        sel.selectNow();
+        key.cancel();
+        sel.selectNow();
+    }
+
+    /**
+     * If the file descriptor count is higher than the given count then invoke
+     * System.gc() and wait for the file descriptor count to drop.
+     */
+    static long waitForFileDescriptorCount(long target) throws InterruptedException {
+        long actual = fileDescriptorCount();
+        if (actual > target) {
+            System.gc();
+            while ((actual = fileDescriptorCount()) > target) {
+                Thread.sleep(10);
+            }
+        }
+        return actual;
+    }
+
+    static UnixOperatingSystemMXBean unixOperatingSystemMXBean() {
+        return ManagementFactory.getPlatformMXBean(UnixOperatingSystemMXBean.class);
+    }
+
+    static long fileDescriptorCount() {
+        return unixOperatingSystemMXBean().getOpenFileDescriptorCount();
+    }
+
+    static void assertEquals(long actual, long expected) {
+        if (actual != expected)
+            throw new RuntimeException("actual=" + actual + ", expected=" + expected);
+    }
+}
+

From acf447e49e500928386c6e6ec6e751576e0216f2 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:21:23 +0100
Subject: [PATCH 096/163] 8232601: ZGC: Parameterize the ZGranuleMap table size

Reviewed-by: pliden, eosterlund
---
 src/hotspot/share/gc/z/zForwardingTable.cpp   |  3 ++-
 src/hotspot/share/gc/z/zGranuleMap.hpp        |  2 +-
 src/hotspot/share/gc/z/zGranuleMap.inline.hpp | 10 +++++++---
 src/hotspot/share/gc/z/zHeapIterator.cpp      |  2 +-
 src/hotspot/share/gc/z/zPageTable.cpp         |  3 ++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/z/zForwardingTable.cpp b/src/hotspot/share/gc/z/zForwardingTable.cpp
index 4ad3bab84c2..8d70e3283d5 100644
--- a/src/hotspot/share/gc/z/zForwardingTable.cpp
+++ b/src/hotspot/share/gc/z/zForwardingTable.cpp
@@ -25,11 +25,12 @@
 #include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zForwarding.inline.hpp"
 #include "gc/z/zForwardingTable.inline.hpp"
+#include "gc/z/zGlobals.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
 #include "utilities/debug.hpp"
 
 ZForwardingTable::ZForwardingTable() :
-    _map() {}
+    _map(ZAddressOffsetMax) {}
 
 void ZForwardingTable::insert(ZForwarding* forwarding) {
   const uintptr_t addr = ZAddress::good(forwarding->start());
diff --git a/src/hotspot/share/gc/z/zGranuleMap.hpp b/src/hotspot/share/gc/z/zGranuleMap.hpp
index 6f6b5385a66..8c3c72dbade 100644
--- a/src/hotspot/share/gc/z/zGranuleMap.hpp
+++ b/src/hotspot/share/gc/z/zGranuleMap.hpp
@@ -41,7 +41,7 @@ private:
   size_t index_for_addr(uintptr_t addr) const;
 
 public:
-  ZGranuleMap();
+  ZGranuleMap(size_t max_offset);
   ~ZGranuleMap();
 
   T get(uintptr_t addr) const;
diff --git a/src/hotspot/share/gc/z/zGranuleMap.inline.hpp b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp
index e38c04cf7bb..37545924290 100644
--- a/src/hotspot/share/gc/z/zGranuleMap.inline.hpp
+++ b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp
@@ -28,11 +28,15 @@
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zGranuleMap.hpp"
 #include "memory/allocation.inline.hpp"
+#include "utilities/align.hpp"
+#include "utilities/debug.hpp"
 
 template 
-inline ZGranuleMap::ZGranuleMap() :
-    _size(ZAddressOffsetMax >> ZGranuleSizeShift),
-    _map(MmapArrayAllocator::allocate(_size, mtGC)) {}
+inline ZGranuleMap::ZGranuleMap(size_t max_offset) :
+    _size(max_offset >> ZGranuleSizeShift),
+    _map(MmapArrayAllocator::allocate(_size, mtGC)) {
+  assert(is_aligned(max_offset, ZGranuleSize), "Misaligned");
+}
 
 template 
 inline ZGranuleMap::~ZGranuleMap() {
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index 8ce367f12ff..4fc1a48c294 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -126,7 +126,7 @@ public:
 
 ZHeapIterator::ZHeapIterator() :
     _visit_stack(),
-    _visit_map() {}
+    _visit_map(ZAddressOffsetMax) {}
 
 ZHeapIterator::~ZHeapIterator() {
   ZVisitMapIterator iter(&_visit_map);
diff --git a/src/hotspot/share/gc/z/zPageTable.cpp b/src/hotspot/share/gc/z/zPageTable.cpp
index 025ae6abd63..fefd9e9801d 100644
--- a/src/hotspot/share/gc/z/zPageTable.cpp
+++ b/src/hotspot/share/gc/z/zPageTable.cpp
@@ -23,6 +23,7 @@
 
 #include "precompiled.hpp"
 #include "gc/z/zAddress.inline.hpp"
+#include "gc/z/zGlobals.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
 #include "gc/z/zPage.inline.hpp"
 #include "gc/z/zPageTable.inline.hpp"
@@ -30,7 +31,7 @@
 #include "utilities/debug.hpp"
 
 ZPageTable::ZPageTable() :
-    _map() {}
+    _map(ZAddressOffsetMax) {}
 
 void ZPageTable::insert(ZPage* page) {
   const uintptr_t addr = ZAddress::good(page->start());

From 06a479f965d5979101a8a674ecda08c37153442c Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:23:28 +0100
Subject: [PATCH 097/163] 8232602: ZGC: Make ZGranuleMap ZAddress agnostic

Reviewed-by: pliden, eosterlund
---
 src/hotspot/share/gc/z/zForwardingTable.cpp   | 13 ++++++-------
 .../share/gc/z/zForwardingTable.inline.hpp    |  4 +++-
 src/hotspot/share/gc/z/zGranuleMap.hpp        |  8 ++++----
 src/hotspot/share/gc/z/zGranuleMap.inline.hpp | 19 ++++++++-----------
 src/hotspot/share/gc/z/zHeapIterator.cpp      |  7 ++++---
 src/hotspot/share/gc/z/zPageTable.cpp         | 13 ++++++-------
 src/hotspot/share/gc/z/zPageTable.inline.hpp  |  3 ++-
 7 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/hotspot/share/gc/z/zForwardingTable.cpp b/src/hotspot/share/gc/z/zForwardingTable.cpp
index 8d70e3283d5..926ae7fe63e 100644
--- a/src/hotspot/share/gc/z/zForwardingTable.cpp
+++ b/src/hotspot/share/gc/z/zForwardingTable.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zForwarding.inline.hpp"
 #include "gc/z/zForwardingTable.inline.hpp"
 #include "gc/z/zGlobals.hpp"
@@ -33,17 +32,17 @@ ZForwardingTable::ZForwardingTable() :
     _map(ZAddressOffsetMax) {}
 
 void ZForwardingTable::insert(ZForwarding* forwarding) {
-  const uintptr_t addr = ZAddress::good(forwarding->start());
+  const uintptr_t offset = forwarding->start();
   const size_t size = forwarding->size();
 
-  assert(get(addr) == NULL, "Invalid entry");
-  _map.put(addr, size, forwarding);
+  assert(_map.get(offset) == NULL, "Invalid entry");
+  _map.put(offset, size, forwarding);
 }
 
 void ZForwardingTable::remove(ZForwarding* forwarding) {
-  const uintptr_t addr = ZAddress::good(forwarding->start());
+  const uintptr_t offset = forwarding->start();
   const size_t size = forwarding->size();
 
-  assert(get(addr) == forwarding, "Invalid entry");
-  _map.put(addr, size, NULL);
+  assert(_map.get(offset) == forwarding, "Invalid entry");
+  _map.put(offset, size, NULL);
 }
diff --git a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
index d297de3ef92..3561711c43b 100644
--- a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
+++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp
@@ -24,11 +24,13 @@
 #ifndef SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
 #define SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
 
+#include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zForwardingTable.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
 
 inline ZForwarding* ZForwardingTable::get(uintptr_t addr) const {
-  return _map.get(addr);
+  assert(!ZAddress::is_null(addr), "Invalid address");
+  return _map.get(ZAddress::offset(addr));
 }
 
 #endif // SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zGranuleMap.hpp b/src/hotspot/share/gc/z/zGranuleMap.hpp
index 8c3c72dbade..dc21c7bae5b 100644
--- a/src/hotspot/share/gc/z/zGranuleMap.hpp
+++ b/src/hotspot/share/gc/z/zGranuleMap.hpp
@@ -38,15 +38,15 @@ private:
   const size_t _size;
   T* const     _map;
 
-  size_t index_for_addr(uintptr_t addr) const;
+  size_t index_for_offset(uintptr_t offset) const;
 
 public:
   ZGranuleMap(size_t max_offset);
   ~ZGranuleMap();
 
-  T get(uintptr_t addr) const;
-  void put(uintptr_t addr, T value);
-  void put(uintptr_t addr, size_t size, T value);
+  T get(uintptr_t offset) const;
+  void put(uintptr_t offset, T value);
+  void put(uintptr_t offset, size_t size, T value);
 };
 
 template 
diff --git a/src/hotspot/share/gc/z/zGranuleMap.inline.hpp b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp
index 37545924290..802378bc1d8 100644
--- a/src/hotspot/share/gc/z/zGranuleMap.inline.hpp
+++ b/src/hotspot/share/gc/z/zGranuleMap.inline.hpp
@@ -24,7 +24,6 @@
 #ifndef SHARE_GC_Z_ZGRANULEMAP_INLINE_HPP
 #define SHARE_GC_Z_ZGRANULEMAP_INLINE_HPP
 
-#include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zGranuleMap.hpp"
 #include "memory/allocation.inline.hpp"
@@ -44,32 +43,30 @@ inline ZGranuleMap::~ZGranuleMap() {
 }
 
 template 
-inline size_t ZGranuleMap::index_for_addr(uintptr_t addr) const {
-  assert(!ZAddress::is_null(addr), "Invalid address");
-
-  const size_t index = ZAddress::offset(addr) >> ZGranuleSizeShift;
+inline size_t ZGranuleMap::index_for_offset(uintptr_t offset) const {
+  const size_t index = offset >> ZGranuleSizeShift;
   assert(index < _size, "Invalid index");
 
   return index;
 }
 
 template 
-inline T ZGranuleMap::get(uintptr_t addr) const {
-  const size_t index = index_for_addr(addr);
+inline T ZGranuleMap::get(uintptr_t offset) const {
+  const size_t index = index_for_offset(offset);
   return _map[index];
 }
 
 template 
-inline void ZGranuleMap::put(uintptr_t addr, T value) {
-  const size_t index = index_for_addr(addr);
+inline void ZGranuleMap::put(uintptr_t offset, T value) {
+  const size_t index = index_for_offset(offset);
   _map[index] = value;
 }
 
 template 
-inline void ZGranuleMap::put(uintptr_t addr, size_t size, T value) {
+inline void ZGranuleMap::put(uintptr_t offset, size_t size, T value) {
   assert(is_aligned(size, ZGranuleSize), "Misaligned");
 
-  const size_t start_index = index_for_addr(addr);
+  const size_t start_index = index_for_offset(offset);
   const size_t end_index = start_index + (size >> ZGranuleSizeShift);
   for (size_t index = start_index; index < end_index; index++) {
     _map[index] = value;
diff --git a/src/hotspot/share/gc/z/zHeapIterator.cpp b/src/hotspot/share/gc/z/zHeapIterator.cpp
index 4fc1a48c294..2b7fa0fdbde 100644
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp
@@ -24,6 +24,7 @@
 #include "precompiled.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
+#include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zBarrier.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
@@ -148,11 +149,11 @@ static size_t object_index(oop obj) {
 }
 
 ZHeapIteratorBitMap* ZHeapIterator::object_map(oop obj) {
-  const uintptr_t addr = ZOop::to_address(obj);
-  ZHeapIteratorBitMap* map = _visit_map.get(addr);
+  const uintptr_t offset = ZAddress::offset(ZOop::to_address(obj));
+  ZHeapIteratorBitMap* map = _visit_map.get(offset);
   if (map == NULL) {
     map = new ZHeapIteratorBitMap(object_index_max());
-    _visit_map.put(addr, map);
+    _visit_map.put(offset, map);
   }
 
   return map;
diff --git a/src/hotspot/share/gc/z/zPageTable.cpp b/src/hotspot/share/gc/z/zPageTable.cpp
index fefd9e9801d..d462421097b 100644
--- a/src/hotspot/share/gc/z/zPageTable.cpp
+++ b/src/hotspot/share/gc/z/zPageTable.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/z/zAddress.inline.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
 #include "gc/z/zPage.inline.hpp"
@@ -34,21 +33,21 @@ ZPageTable::ZPageTable() :
     _map(ZAddressOffsetMax) {}
 
 void ZPageTable::insert(ZPage* page) {
-  const uintptr_t addr = ZAddress::good(page->start());
+  const uintptr_t offset = page->start();
   const size_t size = page->size();
 
   // Make sure a newly created page is
   // visible before updating the page table.
   OrderAccess::storestore();
 
-  assert(get(addr) == NULL, "Invalid entry");
-  _map.put(addr, size, page);
+  assert(_map.get(offset) == NULL, "Invalid entry");
+  _map.put(offset, size, page);
 }
 
 void ZPageTable::remove(ZPage* page) {
-  const uintptr_t addr = ZAddress::good(page->start());
+  const uintptr_t offset = page->start();
   const size_t size = page->size();
 
-  assert(get(addr) == page, "Invalid entry");
-  _map.put(addr, size, NULL);
+  assert(_map.get(offset) == page, "Invalid entry");
+  _map.put(offset, size, NULL);
 }
diff --git a/src/hotspot/share/gc/z/zPageTable.inline.hpp b/src/hotspot/share/gc/z/zPageTable.inline.hpp
index 36555360a7f..e9eea8caa89 100644
--- a/src/hotspot/share/gc/z/zPageTable.inline.hpp
+++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp
@@ -29,7 +29,8 @@
 #include "gc/z/zPageTable.hpp"
 
 inline ZPage* ZPageTable::get(uintptr_t addr) const {
-  return _map.get(addr);
+  assert(!ZAddress::is_null(addr), "Invalid address");
+  return _map.get(ZAddress::offset(addr));
 }
 
 inline ZPageTableIterator::ZPageTableIterator(const ZPageTable* page_table) :

From 8df718fa820e0b9df2b07934f593d8b6d38f4c26 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:23:48 +0100
Subject: [PATCH 098/163] 8232648: ZGC: Move ATTRIBUTE_ALIGNED to the front of
 declarations

Reviewed-by: pliden, eosterlund
---
 src/hotspot/share/gc/z/zGlobals.hpp               | 1 +
 src/hotspot/share/gc/z/zMarkStack.hpp             | 4 ++--
 src/hotspot/share/gc/z/zMarkStackAllocator.hpp    | 4 ++--
 src/hotspot/share/gc/z/zMarkTerminate.hpp         | 6 +++---
 src/hotspot/share/gc/z/zNMethodTableIteration.hpp | 6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
index b2f5059295f..ada058da9ea 100644
--- a/src/hotspot/share/gc/z/zGlobals.hpp
+++ b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -130,6 +130,7 @@ const size_t      ZNMethodDisarmedOffset        = ZPlatformNMethodDisarmedOffset
 
 // Cache line size
 const size_t      ZCacheLineSize                = ZPlatformCacheLineSize;
+#define           ZCACHE_ALIGNED                ATTRIBUTE_ALIGNED(ZCacheLineSize)
 
 // Mark stack space
 extern uintptr_t  ZMarkStackSpaceStart;
diff --git a/src/hotspot/share/gc/z/zMarkStack.hpp b/src/hotspot/share/gc/z/zMarkStack.hpp
index d99fbfb3c9f..a6770d6c676 100644
--- a/src/hotspot/share/gc/z/zMarkStack.hpp
+++ b/src/hotspot/share/gc/z/zMarkStack.hpp
@@ -73,8 +73,8 @@ typedef ZStackList               ZMarkStackMagazineList;
 
 class ZMarkStripe {
 private:
-  ZMarkStackList _published  ATTRIBUTE_ALIGNED(ZCacheLineSize);
-  ZMarkStackList _overflowed ATTRIBUTE_ALIGNED(ZCacheLineSize);
+  ZCACHE_ALIGNED ZMarkStackList _published;
+  ZCACHE_ALIGNED ZMarkStackList _overflowed;
 
 public:
   ZMarkStripe();
diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.hpp b/src/hotspot/share/gc/z/zMarkStackAllocator.hpp
index c07ddb42629..55ce6e2e581 100644
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.hpp
+++ b/src/hotspot/share/gc/z/zMarkStackAllocator.hpp
@@ -50,8 +50,8 @@ public:
 
 class ZMarkStackAllocator {
 private:
-  ZMarkStackMagazineList _freelist ATTRIBUTE_ALIGNED(ZCacheLineSize);
-  ZMarkStackSpace        _space    ATTRIBUTE_ALIGNED(ZCacheLineSize);
+  ZCACHE_ALIGNED ZMarkStackMagazineList _freelist;
+  ZCACHE_ALIGNED ZMarkStackSpace        _space;
 
   void prime_freelist();
   ZMarkStackMagazine* create_magazine_from_space(uintptr_t addr, size_t size);
diff --git a/src/hotspot/share/gc/z/zMarkTerminate.hpp b/src/hotspot/share/gc/z/zMarkTerminate.hpp
index 871d0d59fe2..ca29566d2c1 100644
--- a/src/hotspot/share/gc/z/zMarkTerminate.hpp
+++ b/src/hotspot/share/gc/z/zMarkTerminate.hpp
@@ -30,9 +30,9 @@
 
 class ZMarkTerminate {
 private:
-  uint          _nworkers;
-  volatile uint _nworking_stage0 ATTRIBUTE_ALIGNED(ZCacheLineSize);
-  volatile uint _nworking_stage1;
+  uint                         _nworkers;
+  ZCACHE_ALIGNED volatile uint _nworking_stage0;
+  volatile uint                _nworking_stage1;
 
   bool enter_stage(volatile uint* nworking_stage);
   void exit_stage(volatile uint* nworking_stage);
diff --git a/src/hotspot/share/gc/z/zNMethodTableIteration.hpp b/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
index 130a30b8abf..fc8acd2589c 100644
--- a/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
+++ b/src/hotspot/share/gc/z/zNMethodTableIteration.hpp
@@ -31,9 +31,9 @@ class ZNMethodTableEntry;
 
 class ZNMethodTableIteration {
 private:
-  ZNMethodTableEntry* _table;
-  size_t              _size;
-  volatile size_t     _claimed ATTRIBUTE_ALIGNED(ZCacheLineSize);
+  ZNMethodTableEntry*            _table;
+  size_t                         _size;
+  ZCACHE_ALIGNED volatile size_t _claimed;
 
 public:
   ZNMethodTableIteration();

From 17a041119ff1fe7e3a5d85e06ecfa881031f4693 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:24:11 +0100
Subject: [PATCH 099/163] 8232649: ZGC: Add callbacks to ZMemoryManager

Reviewed-by: pliden, eosterlund
---
 src/hotspot/share/gc/z/zMemory.cpp | 87 +++++++++++++++++++++++++-----
 src/hotspot/share/gc/z/zMemory.hpp | 28 ++++++++++
 2 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/gc/z/zMemory.cpp b/src/hotspot/share/gc/z/zMemory.cpp
index af58254319c..2b13c9b3650 100644
--- a/src/hotspot/share/gc/z/zMemory.cpp
+++ b/src/hotspot/share/gc/z/zMemory.cpp
@@ -26,6 +26,65 @@
 #include "gc/z/zMemory.inline.hpp"
 #include "memory/allocation.inline.hpp"
 
+ZMemory* ZMemoryManager::create(uintptr_t start, size_t size) {
+  ZMemory* const area = new ZMemory(start, size);
+  if (_callbacks._create != NULL) {
+    _callbacks._create(area);
+  }
+  return area;
+}
+
+void ZMemoryManager::destroy(ZMemory* area) {
+  if (_callbacks._destroy != NULL) {
+    _callbacks._destroy(area);
+  }
+  delete area;
+}
+
+void ZMemoryManager::shrink_from_front(ZMemory* area, size_t size) {
+  if (_callbacks._shrink_from_front != NULL) {
+    _callbacks._shrink_from_front(area, size);
+  }
+  area->shrink_from_front(size);
+}
+
+void ZMemoryManager::shrink_from_back(ZMemory* area, size_t size) {
+  if (_callbacks._shrink_from_back != NULL) {
+    _callbacks._shrink_from_back(area, size);
+  }
+  area->shrink_from_back(size);
+}
+
+void ZMemoryManager::grow_from_front(ZMemory* area, size_t size) {
+  if (_callbacks._grow_from_front != NULL) {
+    _callbacks._grow_from_front(area, size);
+  }
+  area->grow_from_front(size);
+}
+
+void ZMemoryManager::grow_from_back(ZMemory* area, size_t size) {
+  if (_callbacks._grow_from_back != NULL) {
+    _callbacks._grow_from_back(area, size);
+  }
+  area->grow_from_back(size);
+}
+
+ZMemoryManager::Callbacks::Callbacks() :
+    _create(NULL),
+    _destroy(NULL),
+    _shrink_from_front(NULL),
+    _shrink_from_back(NULL),
+    _grow_from_front(NULL),
+    _grow_from_back(NULL) {}
+
+ZMemoryManager::ZMemoryManager() :
+    _freelist(),
+    _callbacks() {}
+
+void ZMemoryManager::register_callbacks(const Callbacks& callbacks) {
+  _callbacks = callbacks;
+}
+
 uintptr_t ZMemoryManager::alloc_from_front(size_t size) {
   ZListIterator iter(&_freelist);
   for (ZMemory* area; iter.next(&area);) {
@@ -34,12 +93,12 @@ uintptr_t ZMemoryManager::alloc_from_front(size_t size) {
         // Exact match, remove area
         const uintptr_t start = area->start();
         _freelist.remove(area);
-        delete area;
+        destroy(area);
         return start;
       } else {
         // Larger than requested, shrink area
         const uintptr_t start = area->start();
-        area->shrink_from_front(size);
+        shrink_from_front(area, size);
         return start;
       }
     }
@@ -57,12 +116,12 @@ uintptr_t ZMemoryManager::alloc_from_front_at_most(size_t size, size_t* allocate
       const uintptr_t start = area->start();
       *allocated = area->size();
       _freelist.remove(area);
-      delete area;
+      destroy(area);
       return start;
     } else {
       // Larger than requested, shrink area
       const uintptr_t start = area->start();
-      area->shrink_from_front(size);
+      shrink_from_front(area, size);
       *allocated = size;
       return start;
     }
@@ -81,11 +140,11 @@ uintptr_t ZMemoryManager::alloc_from_back(size_t size) {
         // Exact match, remove area
         const uintptr_t start = area->start();
         _freelist.remove(area);
-        delete area;
+        destroy(area);
         return start;
       } else {
         // Larger than requested, shrink area
-        area->shrink_from_back(size);
+        shrink_from_back(area, size);
         return area->end();
       }
     }
@@ -103,11 +162,11 @@ uintptr_t ZMemoryManager::alloc_from_back_at_most(size_t size, size_t* allocated
       const uintptr_t start = area->start();
       *allocated = area->size();
       _freelist.remove(area);
-      delete area;
+      destroy(area);
       return start;
     } else {
       // Larger than requested, shrink area
-      area->shrink_from_back(size);
+      shrink_from_back(area, size);
       *allocated = size;
       return area->end();
     }
@@ -129,20 +188,20 @@ void ZMemoryManager::free(uintptr_t start, size_t size) {
       if (prev != NULL && start == prev->end()) {
         if (end == area->start()) {
           // Merge with prev and current area
-          prev->grow_from_back(size + area->size());
+          grow_from_back(prev, size + area->size());
           _freelist.remove(area);
           delete area;
         } else {
           // Merge with prev area
-          prev->grow_from_back(size);
+          grow_from_back(prev, size);
         }
       } else if (end == area->start()) {
         // Merge with current area
-        area->grow_from_front(size);
+        grow_from_front(area, size);
       } else {
         // Insert new area before current area
         assert(end < area->start(), "Areas must not overlap");
-        ZMemory* new_area = new ZMemory(start, size);
+        ZMemory* const new_area = create(start, size);
         _freelist.insert_before(area, new_area);
       }
 
@@ -155,10 +214,10 @@ void ZMemoryManager::free(uintptr_t start, size_t size) {
   ZMemory* const last = _freelist.last();
   if (last != NULL && start == last->end()) {
     // Merge with last area
-    last->grow_from_back(size);
+    grow_from_back(last, size);
   } else {
     // Insert new area last
-    ZMemory* new_area = new ZMemory(start, size);
+    ZMemory* const new_area = create(start, size);
     _freelist.insert_last(new_area);
   }
 }
diff --git a/src/hotspot/share/gc/z/zMemory.hpp b/src/hotspot/share/gc/z/zMemory.hpp
index 9bd089eab1b..b0255b378c3 100644
--- a/src/hotspot/share/gc/z/zMemory.hpp
+++ b/src/hotspot/share/gc/z/zMemory.hpp
@@ -49,14 +49,42 @@ public:
 };
 
 class ZMemoryManager {
+public:
+  typedef void (*CreateDestroyCallback)(const ZMemory* area);
+  typedef void (*ResizeCallback)(const ZMemory* area, size_t size);
+
+  struct Callbacks {
+    CreateDestroyCallback _create;
+    CreateDestroyCallback _destroy;
+    ResizeCallback        _shrink_from_front;
+    ResizeCallback        _shrink_from_back;
+    ResizeCallback        _grow_from_front;
+    ResizeCallback        _grow_from_back;
+
+    Callbacks();
+  };
+
 private:
   ZList _freelist;
+  Callbacks      _callbacks;
+
+  ZMemory* create(uintptr_t start, size_t size);
+  void destroy(ZMemory* area);
+  void shrink_from_front(ZMemory* area, size_t size);
+  void shrink_from_back(ZMemory* area, size_t size);
+  void grow_from_front(ZMemory* area, size_t size);
+  void grow_from_back(ZMemory* area, size_t size);
 
 public:
+  ZMemoryManager();
+
+  void register_callbacks(const Callbacks& callbacks);
+
   uintptr_t alloc_from_front(size_t size);
   uintptr_t alloc_from_front_at_most(size_t size, size_t* allocated);
   uintptr_t alloc_from_back(size_t size);
   uintptr_t alloc_from_back_at_most(size_t size, size_t* allocated);
+
   void free(uintptr_t start, size_t size);
 };
 

From cc72a06c3bd7f48e2d4c96171f0ef0d2aed4bec1 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:26:00 +0100
Subject: [PATCH 100/163] 8232651: Add implementation of os::processor_id() for
 Windows

Reviewed-by: dholmes, stuefe
---
 src/hotspot/os/windows/os_windows.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index c3d508950b1..4ae193a1c61 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -795,6 +795,10 @@ int os::active_processor_count() {
   }
 }
 
+uint os::processor_id() {
+  return (uint)GetCurrentProcessorNumber();
+}
+
 void os::set_native_thread_name(const char *name) {
 
   // See: http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx

From ecb66d2c55b3a46bdaf37c208860da376fb37c17 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:26:53 +0100
Subject: [PATCH 101/163] 8232650: ZGC: Add initialization hooks for OS
 specific code

Reviewed-by: pliden, eosterlund
---
 .../os/posix/gc/z/zInitialize_posix.cpp       | 29 +++++++++++++++++++
 .../os/posix/gc/z/zVirtualMemory_posix.cpp    |  4 +++
 src/hotspot/share/gc/z/zInitialize.cpp        |  2 ++
 src/hotspot/share/gc/z/zInitialize.hpp        |  3 ++
 src/hotspot/share/gc/z/zVirtualMemory.cpp     |  3 ++
 src/hotspot/share/gc/z/zVirtualMemory.hpp     |  2 ++
 6 files changed, 43 insertions(+)
 create mode 100644 src/hotspot/os/posix/gc/z/zInitialize_posix.cpp

diff --git a/src/hotspot/os/posix/gc/z/zInitialize_posix.cpp b/src/hotspot/os/posix/gc/z/zInitialize_posix.cpp
new file mode 100644
index 00000000000..6b47b1e4c6c
--- /dev/null
+++ b/src/hotspot/os/posix/gc/z/zInitialize_posix.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zInitialize.hpp"
+
+void ZInitialize::initialize_os() {
+  // Does nothing
+}
diff --git a/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp b/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
index 8bd2dfda53a..29609524ed7 100644
--- a/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
+++ b/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
@@ -29,6 +29,10 @@
 #include 
 #include 
 
+void ZVirtualMemoryManager::initialize_os() {
+  // Does nothing
+}
+
 static void unmap(uintptr_t start, size_t size) {
   const int res = munmap((void*)start, size);
   assert(res == 0, "Failed to unmap memory");
diff --git a/src/hotspot/share/gc/z/zInitialize.cpp b/src/hotspot/share/gc/z/zInitialize.cpp
index 33ec61fa4cf..b37a187757b 100644
--- a/src/hotspot/share/gc/z/zInitialize.cpp
+++ b/src/hotspot/share/gc/z/zInitialize.cpp
@@ -50,4 +50,6 @@ ZInitialize::ZInitialize(ZBarrierSet* barrier_set) {
   ZTracer::initialize();
   ZLargePages::initialize();
   ZBarrierSet::set_barrier_set(barrier_set);
+
+  initialize_os();
 }
diff --git a/src/hotspot/share/gc/z/zInitialize.hpp b/src/hotspot/share/gc/z/zInitialize.hpp
index fb8bf1af2eb..85470ed0ec3 100644
--- a/src/hotspot/share/gc/z/zInitialize.hpp
+++ b/src/hotspot/share/gc/z/zInitialize.hpp
@@ -29,6 +29,9 @@
 class ZBarrierSet;
 
 class ZInitialize {
+private:
+  void initialize_os();
+
 public:
   ZInitialize(ZBarrierSet* barrier_set);
 };
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.cpp b/src/hotspot/share/gc/z/zVirtualMemory.cpp
index 4942ab3d16a..5d5a958f120 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.cpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.cpp
@@ -47,6 +47,9 @@ ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
     return;
   }
 
+  // Initialize OS specific parts
+  initialize_os();
+
   // Successfully initialized
   _initialized = true;
 }
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
index 0271601b3b1..4f865b7bd9b 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -50,6 +50,8 @@ private:
   ZMemoryManager _manager;
   bool           _initialized;
 
+  void initialize_os();
+
   bool reserve_contiguous_platform(uintptr_t start, size_t size);
   bool reserve_contiguous(size_t size);
   size_t reserve_discontiguous(uintptr_t start, size_t size, size_t min_range);

From 5e549ca805c01535119db2318ce6137cf16f10f6 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson 
Date: Mon, 28 Oct 2019 11:27:27 +0100
Subject: [PATCH 102/163] 8232604: ZGC: Make ZVerifyViews mapping and unmapping
 precise

Reviewed-by: pliden, eosterlund
---
 src/hotspot/share/gc/z/zFuture.hpp           |  5 +-
 src/hotspot/share/gc/z/zFuture.inline.hpp    |  9 +++
 src/hotspot/share/gc/z/zHeap.cpp             | 32 +++-------
 src/hotspot/share/gc/z/zHeap.hpp             |  4 +-
 src/hotspot/share/gc/z/zPage.hpp             |  5 ++
 src/hotspot/share/gc/z/zPageAllocator.cpp    | 65 +++++++++++---------
 src/hotspot/share/gc/z/zPageAllocator.hpp    |  8 ++-
 src/hotspot/share/gc/z/zPageCache.cpp        | 23 +++++++
 src/hotspot/share/gc/z/zPageCache.hpp        |  2 +-
 src/hotspot/share/gc/z/zPageCache.inline.hpp | 24 --------
 src/hotspot/share/gc/z/zVerify.cpp           | 36 +++++++++++
 src/hotspot/share/gc/z/zVerify.hpp           | 11 ++++
 12 files changed, 141 insertions(+), 83 deletions(-)

diff --git a/src/hotspot/share/gc/z/zFuture.hpp b/src/hotspot/share/gc/z/zFuture.hpp
index 525dbb5ded5..5d4efeafe68 100644
--- a/src/hotspot/share/gc/z/zFuture.hpp
+++ b/src/hotspot/share/gc/z/zFuture.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,10 @@ private:
   T         _value;
 
 public:
+  ZFuture();
+
   void set(T value);
+  T peek();
   T get();
 };
 
diff --git a/src/hotspot/share/gc/z/zFuture.inline.hpp b/src/hotspot/share/gc/z/zFuture.inline.hpp
index 41489e07e24..8d7ee5b23d7 100644
--- a/src/hotspot/share/gc/z/zFuture.inline.hpp
+++ b/src/hotspot/share/gc/z/zFuture.inline.hpp
@@ -28,6 +28,10 @@
 #include "runtime/semaphore.inline.hpp"
 #include "runtime/thread.hpp"
 
+template 
+inline ZFuture::ZFuture() :
+    _value() {}
+
 template 
 inline void ZFuture::set(T value) {
   // Set value
@@ -37,6 +41,11 @@ inline void ZFuture::set(T value) {
   _sema.signal();
 }
 
+template 
+inline T ZFuture::peek() {
+  return _value;
+}
+
 template 
 inline T ZFuture::get() {
   // Wait for notification
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index dce19dad628..05d182585c2 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -244,34 +244,14 @@ uint64_t ZHeap::uncommit(uint64_t delay) {
   return _page_allocator.uncommit(delay);
 }
 
-void ZHeap::before_flip() {
-  if (ZVerifyViews) {
-    // Unmap all pages
-    _page_allocator.debug_unmap_all_pages();
-  }
-}
-
-void ZHeap::after_flip() {
-  if (ZVerifyViews) {
-    // Map all pages
-    ZPageTableIterator iter(&_page_table);
-    for (ZPage* page; iter.next(&page);) {
-      _page_allocator.debug_map_page(page);
-    }
-    _page_allocator.debug_map_cached_pages();
-  }
-}
-
 void ZHeap::flip_to_marked() {
-  before_flip();
+  ZVerifyViewsFlip flip(&_page_allocator);
   ZAddress::flip_to_marked();
-  after_flip();
 }
 
 void ZHeap::flip_to_remapped() {
-  before_flip();
+  ZVerifyViewsFlip flip(&_page_allocator);
   ZAddress::flip_to_remapped();
-  after_flip();
 }
 
 void ZHeap::mark_start() {
@@ -460,6 +440,14 @@ void ZHeap::object_iterate(ObjectClosure* cl, bool visit_weaks) {
   iter.objects_do(cl, visit_weaks);
 }
 
+void ZHeap::pages_do(ZPageClosure* cl) {
+  ZPageTableIterator iter(&_page_table);
+  for (ZPage* page; iter.next(&page);) {
+    cl->do_page(page);
+  }
+  _page_allocator.pages_do(cl);
+}
+
 void ZHeap::serviceability_initialize() {
   _serviceability.initialize();
 }
diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
index a771c046b68..7c7c92b8d83 100644
--- a/src/hotspot/share/gc/z/zHeap.hpp
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -63,9 +63,6 @@ private:
   size_t heap_max_size() const;
   size_t heap_max_reserve_size() const;
 
-  void before_flip();
-  void after_flip();
-
   void flip_to_marked();
   void flip_to_remapped();
 
@@ -151,6 +148,7 @@ public:
 
   // Iteration
   void object_iterate(ObjectClosure* cl, bool visit_weaks);
+  void pages_do(ZPageClosure* cl);
 
   // Serviceability
   void serviceability_initialize();
diff --git a/src/hotspot/share/gc/z/zPage.hpp b/src/hotspot/share/gc/z/zPage.hpp
index 4c4d684b674..4cadca1826c 100644
--- a/src/hotspot/share/gc/z/zPage.hpp
+++ b/src/hotspot/share/gc/z/zPage.hpp
@@ -112,4 +112,9 @@ public:
   void print() const;
 };
 
+class ZPageClosure {
+public:
+  virtual void do_page(const ZPage* page) = 0;
+};
+
 #endif // SHARE_GC_Z_ZPAGE_HPP
diff --git a/src/hotspot/share/gc/z/zPageAllocator.cpp b/src/hotspot/share/gc/z/zPageAllocator.cpp
index 9f588c6573b..c92abdc7910 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp
@@ -60,7 +60,9 @@ public:
       _type(type),
       _size(size),
       _flags(flags),
-      _total_collections(total_collections) {}
+      _total_collections(total_collections),
+      _node(),
+      _result() {}
 
   uint8_t type() const {
     return _type;
@@ -78,6 +80,10 @@ public:
     return _total_collections;
   }
 
+  ZPage* peek() {
+    return _result.peek();
+  }
+
   ZPage* wait() {
     return _result.get();
   }
@@ -108,6 +114,7 @@ ZPageAllocator::ZPageAllocator(size_t min_capacity,
     _allocated(0),
     _reclaimed(0),
     _queue(),
+    _satisfied(),
     _safe_delete(),
     _uncommit(false),
     _initialized(false) {
@@ -289,11 +296,7 @@ void ZPageAllocator::destroy_page(ZPage* page) {
 
 void ZPageAllocator::map_page(const ZPage* page) const {
   // Map physical memory
-  if (!page->is_mapped()) {
-    _physical.map(page->physical_memory(), page->start());
-  } else if (ZVerifyViews) {
-    _physical.debug_map(page->physical_memory(), page->start());
-  }
+  _physical.map(page->physical_memory(), page->start());
 }
 
 size_t ZPageAllocator::max_available(bool no_reserve) const {
@@ -433,14 +436,21 @@ ZPage* ZPageAllocator::alloc_page_blocking(uint8_t type, size_t size, ZAllocatio
     } while (page == gc_marker);
 
     {
-      // Guard deletion of underlying semaphore. This is a workaround for a
-      // bug in sem_post() in glibc < 2.21, where it's not safe to destroy
+      //
+      // We grab the lock here for two different reasons:
+      //
+      // 1) Guard deletion of underlying semaphore. This is a workaround for
+      // a bug in sem_post() in glibc < 2.21, where it's not safe to destroy
       // the semaphore immediately after returning from sem_wait(). The
       // reason is that sem_post() can touch the semaphore after a waiting
       // thread have returned from sem_wait(). To avoid this race we are
       // forcing the waiting thread to acquire/release the lock held by the
       // posting thread. https://sourceware.org/bugzilla/show_bug.cgi?id=12674
+      //
+      // 2) Guard the list of satisfied pages.
+      //
       ZLocker locker(&_lock);
+      _satisfied.remove(&request);
     }
   }
 
@@ -462,7 +472,9 @@ ZPage* ZPageAllocator::alloc_page(uint8_t type, size_t size, ZAllocationFlags fl
   }
 
   // Map page if needed
-  map_page(page);
+  if (!page->is_mapped()) {
+    map_page(page);
+  }
 
   // Reset page. This updates the page's sequence number and must
   // be done after page allocation, which potentially blocked in
@@ -500,6 +512,7 @@ void ZPageAllocator::satisfy_alloc_queue() {
     // the dequeue operation must happen first, since the request
     // will immediately be deallocated once it has been satisfied.
     _queue.remove(request);
+    _satisfied.insert_first(request);
     request->satisfy(page);
   }
 }
@@ -686,28 +699,21 @@ void ZPageAllocator::debug_map_page(const ZPage* page) const {
   _physical.debug_map(page->physical_memory(), page->start());
 }
 
-class ZPageCacheDebugMapClosure : public StackObj {
-private:
-  const ZPageAllocator* const _allocator;
-
-public:
-  ZPageCacheDebugMapClosure(const ZPageAllocator* allocator) :
-      _allocator(allocator) {}
-
-  virtual void do_page(const ZPage* page) {
-    _allocator->debug_map_page(page);
-  }
-};
-
-void ZPageAllocator::debug_map_cached_pages() const {
+void ZPageAllocator::debug_unmap_page(const ZPage* page) const {
   assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
-  ZPageCacheDebugMapClosure cl(this);
-  _cache.pages_do(&cl);
+  _physical.debug_unmap(page->physical_memory(), page->start());
 }
 
-void ZPageAllocator::debug_unmap_all_pages() const {
-  assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
-  _physical.debug_unmap(ZPhysicalMemorySegment(0 /* start */, ZAddressOffsetMax), 0 /* offset */);
+void ZPageAllocator::pages_do(ZPageClosure* cl) const {
+  ZListIterator iter(&_satisfied);
+  for (ZPageAllocRequest* request; iter.next(&request);) {
+    const ZPage* const page = request->peek();
+    if (page != NULL) {
+      cl->do_page(page);
+    }
+  }
+
+  _cache.pages_do(cl);
 }
 
 bool ZPageAllocator::is_alloc_stalled() const {
@@ -728,7 +734,8 @@ void ZPageAllocator::check_out_of_memory() {
     }
 
     // Out of memory, fail allocation request
-    _queue.remove_first();
+    _queue.remove(request);
+    _satisfied.insert_first(request);
     request->satisfy(NULL);
   }
 }
diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp
index e59324c1d7d..9bcd08cb6c7 100644
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp
@@ -54,11 +54,12 @@ private:
   size_t                     _allocated;
   ssize_t                    _reclaimed;
   ZList   _queue;
+  ZList   _satisfied;
   mutable ZSafeDelete _safe_delete;
   bool                       _uncommit;
   bool                       _initialized;
 
-  static ZPage* const      gc_marker;
+  static ZPage* const gc_marker;
 
   void prime_cache(size_t size);
 
@@ -117,11 +118,12 @@ public:
   void map_page(const ZPage* page) const;
 
   void debug_map_page(const ZPage* page) const;
-  void debug_map_cached_pages() const;
-  void debug_unmap_all_pages() const;
+  void debug_unmap_page(const ZPage* page) const;
 
   bool is_alloc_stalled() const;
   void check_out_of_memory();
+
+  void pages_do(ZPageClosure* cl) const;
 };
 
 #endif // SHARE_GC_Z_ZPAGEALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/z/zPageCache.cpp b/src/hotspot/share/gc/z/zPageCache.cpp
index 229c47617e5..8fe8699da45 100644
--- a/src/hotspot/share/gc/z/zPageCache.cpp
+++ b/src/hotspot/share/gc/z/zPageCache.cpp
@@ -240,3 +240,26 @@ void ZPageCache::flush(ZPageCacheFlushClosure* cl, ZList* to) {
   flush_list(cl, &_medium, to);
   flush_per_numa_lists(cl, &_small, to);
 }
+
+void ZPageCache::pages_do(ZPageClosure* cl) const {
+  // Small
+  ZPerNUMAConstIterator > iter_numa(&_small);
+  for (const ZList* list; iter_numa.next(&list);) {
+    ZListIterator iter_small(list);
+    for (ZPage* page; iter_small.next(&page);) {
+      cl->do_page(page);
+    }
+  }
+
+  // Medium
+  ZListIterator iter_medium(&_medium);
+  for (ZPage* page; iter_medium.next(&page);) {
+    cl->do_page(page);
+  }
+
+  // Large
+  ZListIterator iter_large(&_large);
+  for (ZPage* page; iter_large.next(&page);) {
+    cl->do_page(page);
+  }
+}
diff --git a/src/hotspot/share/gc/z/zPageCache.hpp b/src/hotspot/share/gc/z/zPageCache.hpp
index 4bf2686ced5..4e983f2ad52 100644
--- a/src/hotspot/share/gc/z/zPageCache.hpp
+++ b/src/hotspot/share/gc/z/zPageCache.hpp
@@ -71,7 +71,7 @@ public:
 
   void flush(ZPageCacheFlushClosure* cl, ZList* to);
 
-  template  void pages_do(Closure* cl) const;
+  void pages_do(ZPageClosure* cl) const;
 };
 
 #endif // SHARE_GC_Z_ZPAGECACHE_HPP
diff --git a/src/hotspot/share/gc/z/zPageCache.inline.hpp b/src/hotspot/share/gc/z/zPageCache.inline.hpp
index 80f29332306..13ba1bf937b 100644
--- a/src/hotspot/share/gc/z/zPageCache.inline.hpp
+++ b/src/hotspot/share/gc/z/zPageCache.inline.hpp
@@ -32,28 +32,4 @@ inline size_t ZPageCache::available() const {
   return _available;
 }
 
-template 
-inline void ZPageCache::pages_do(Closure* cl) const {
-  // Small
-  ZPerNUMAConstIterator > iter_numa(&_small);
-  for (const ZList* list; iter_numa.next(&list);) {
-    ZListIterator iter_small(list);
-    for (ZPage* page; iter_small.next(&page);) {
-      cl->do_page(page);
-    }
-  }
-
-  // Medium
-  ZListIterator iter_medium(&_medium);
-  for (ZPage* page; iter_medium.next(&page);) {
-    cl->do_page(page);
-  }
-
-  // Large
-  ZListIterator iter_large(&_large);
-  for (ZPage* page; iter_large.next(&page);) {
-    cl->do_page(page);
-  }
-}
-
 #endif // SHARE_GC_Z_ZPAGECACHE_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index d5781281335..d1cd2fde5c0 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -26,6 +26,7 @@
 #include "gc/z/zAddress.hpp"
 #include "gc/z/zHeap.inline.hpp"
 #include "gc/z/zOop.hpp"
+#include "gc/z/zPageAllocator.hpp"
 #include "gc/z/zResurrection.hpp"
 #include "gc/z/zRootsIterator.hpp"
 #include "gc/z/zStat.hpp"
@@ -170,3 +171,38 @@ void ZVerify::after_weak_processing() {
   ZStatTimerDisable disable;
   roots_and_objects(true /* verify_weaks */);
 }
+
+template 
+class ZPageDebugMapOrUnmapClosure : public ZPageClosure {
+private:
+  const ZPageAllocator* const _allocator;
+
+public:
+  ZPageDebugMapOrUnmapClosure(const ZPageAllocator* allocator) :
+      _allocator(allocator) {}
+
+  void do_page(const ZPage* page) {
+    if (Map) {
+      _allocator->debug_map_page(page);
+    } else {
+      _allocator->debug_unmap_page(page);
+    }
+  }
+};
+
+ZVerifyViewsFlip::ZVerifyViewsFlip(const ZPageAllocator* allocator) :
+    _allocator(allocator) {
+  if (ZVerifyViews) {
+    // Unmap all pages
+    ZPageDebugMapOrUnmapClosure cl(_allocator);
+    ZHeap::heap()->pages_do(&cl);
+  }
+}
+
+ZVerifyViewsFlip::~ZVerifyViewsFlip() {
+  if (ZVerifyViews) {
+    // Map all pages
+    ZPageDebugMapOrUnmapClosure cl(_allocator);
+    ZHeap::heap()->pages_do(&cl);
+  }
+}
diff --git a/src/hotspot/share/gc/z/zVerify.hpp b/src/hotspot/share/gc/z/zVerify.hpp
index 5f1299faf73..9473cae0cff 100644
--- a/src/hotspot/share/gc/z/zVerify.hpp
+++ b/src/hotspot/share/gc/z/zVerify.hpp
@@ -26,6 +26,8 @@
 
 #include "memory/allocation.hpp"
 
+class ZPageAllocator;
+
 class ZVerify : public AllStatic {
 private:
   template  static void roots();
@@ -45,4 +47,13 @@ public:
   static void after_weak_processing();
 };
 
+class ZVerifyViewsFlip {
+private:
+  const ZPageAllocator* const _allocator;
+
+public:
+  ZVerifyViewsFlip(const ZPageAllocator* allocator);
+  ~ZVerifyViewsFlip();
+};
+
 #endif // SHARE_GC_Z_ZVERIFY_HPP

From 902858e3ceb43bf92ea9fa038b9edcf1ee0c48b5 Mon Sep 17 00:00:00 2001
From: Patric Hedlin 
Date: Wed, 23 Oct 2019 12:51:53 +0200
Subject: [PATCH 103/163] 8231565: More node budget asserts in fuzzed tests

Reviewed-by: neliasso, thartmann
---
 src/hotspot/share/opto/loopnode.hpp           |  2 +-
 src/hotspot/share/opto/loopopts.cpp           | 36 ++++-----
 .../loopopts/LoopRotateBadNodeBudget.java     | 81 +++++++++++++++++++
 3 files changed, 100 insertions(+), 19 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/LoopRotateBadNodeBudget.java

diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index e12792212fd..38f619b2ecd 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1378,7 +1378,7 @@ private:
   bool exceeding_node_budget(uint required = 0) {
     assert(C->live_nodes() < C->max_node_limit(), "sanity");
     uint available = C->max_node_limit() - C->live_nodes();
-    return available < required + _nodes_required;
+    return available < required + _nodes_required + REQUIRE_MIN;
   }
 
   uint require_nodes(uint require, uint minreq = REQUIRE_MIN) {
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 10903b16040..765de246b42 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -3159,7 +3159,8 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
   Node_List worklist(area);
   Node_List sink_list(area);
 
-  if (!may_require_nodes(loop->est_loop_clone_sz(2))) {
+  uint estimate = loop->est_loop_clone_sz(1);
+  if (exceeding_node_budget(estimate)) {
     return false;
   }
 
@@ -3184,8 +3185,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
 
   // Set of non-cfg nodes to peel are those that are control
   // dependent on the cfg nodes.
-  uint i;
-  for(i = 0; i < loop->_body.size(); i++ ) {
+  for (uint i = 0; i < loop->_body.size(); i++) {
     Node *n = loop->_body.at(i);
     Node *n_c = has_ctrl(n) ? get_ctrl(n) : n;
     if (peel.test(n_c->_idx)) {
@@ -3200,7 +3200,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
 
   // Get a post order schedule of nodes in the peel region
   // Result in right-most operand.
-  scheduled_nodelist(loop, peel, peel_list );
+  scheduled_nodelist(loop, peel, peel_list);
 
   assert(is_valid_loop_partition(loop, peel, peel_list, not_peel), "bad partition");
 
@@ -3220,25 +3220,21 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
   // Evacuate nodes in peel region into the not_peeled region if possible
   uint new_phi_cnt = 0;
   uint cloned_for_outside_use = 0;
-  for (i = 0; i < peel_list.size();) {
+  for (uint i = 0; i < peel_list.size();) {
     Node* n = peel_list.at(i);
 #ifndef PRODUCT
   if (TracePartialPeeling) n->dump();
 #endif
     bool incr = true;
-    if ( !n->is_CFG() ) {
-
-      if ( has_use_in_set(n, not_peel) ) {
-
+    if (!n->is_CFG()) {
+      if (has_use_in_set(n, not_peel)) {
         // If not used internal to the peeled region,
         // move "n" from peeled to not_peeled region.
-
-        if ( !has_use_internal_to_set(n, peel, loop) ) {
-
+        if (!has_use_internal_to_set(n, peel, loop)) {
           // if not pinned and not a load (which maybe anti-dependent on a store)
           // and not a CMove (Matcher expects only bool->cmove).
           if (n->in(0) == NULL && !n->is_Load() && !n->is_CMove()) {
-            cloned_for_outside_use += clone_for_use_outside_loop( loop, n, worklist );
+            cloned_for_outside_use += clone_for_use_outside_loop(loop, n, worklist);
             sink_list.push(n);
             peel     >>= n->_idx; // delete n from peel set.
             not_peel <<= n->_idx; // add n to not_peel set.
@@ -3254,7 +3250,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
         } else {
           // Otherwise check for special def-use cases that span
           // the peel/not_peel boundary such as bool->if
-          clone_for_special_use_inside_loop( loop, n, not_peel, sink_list, worklist );
+          clone_for_special_use_inside_loop(loop, n, not_peel, sink_list, worklist);
           new_phi_cnt++;
         }
       }
@@ -3262,7 +3258,11 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
     if (incr) i++;
   }
 
-  if (new_phi_cnt > old_phi_cnt + PartialPeelNewPhiDelta) {
+  estimate += cloned_for_outside_use + new_phi_cnt;
+  bool exceed_node_budget = !may_require_nodes(estimate);
+  bool exceed_phi_limit = new_phi_cnt > old_phi_cnt + PartialPeelNewPhiDelta;
+
+  if (exceed_node_budget || exceed_phi_limit) {
 #ifndef PRODUCT
     if (TracePartialPeeling) {
       tty->print_cr("\nToo many new phis: %d  old %d new cmpi: %c",
@@ -3310,7 +3310,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
 
   const uint clone_exit_idx = 1;
   const uint orig_exit_idx  = 2;
-  assert(is_valid_clone_loop_form( loop, peel_list, orig_exit_idx, clone_exit_idx ), "bad clone loop");
+  assert(is_valid_clone_loop_form(loop, peel_list, orig_exit_idx, clone_exit_idx), "bad clone loop");
 
   Node* head_clone             = old_new[head->_idx];
   LoopNode* new_head_clone     = old_new[new_head->_idx]->as_Loop();
@@ -3318,7 +3318,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
 
   // Add phi if "def" node is in peel set and "use" is not
 
-  for(i = 0; i < peel_list.size(); i++ ) {
+  for (uint i = 0; i < peel_list.size(); i++) {
     Node *def  = peel_list.at(i);
     if (!def->is_CFG()) {
       for (DUIterator_Fast jmax, j = def->fast_outs(jmax); j < jmax; j++) {
@@ -3374,7 +3374,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) {
   //          cloned-not_peeled  in(0)    in(0)
   //          orig-peeled
 
-  for(i = 0; i < loop->_body.size(); i++ ) {
+  for (uint i = 0; i < loop->_body.size(); i++) {
     Node *n = loop->_body.at(i);
     if (!n->is_CFG()           && n->in(0) != NULL        &&
         not_peel.test(n->_idx) && peel.test(n->in(0)->_idx)) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/LoopRotateBadNodeBudget.java b/test/hotspot/jtreg/compiler/loopopts/LoopRotateBadNodeBudget.java
new file mode 100644
index 00000000000..d52ce866798
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/LoopRotateBadNodeBudget.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8231565
+ * @summary Node estimate for loop rotate is not correct/sufficient:
+ *          assert(delta <= 2 * required) failed: Bad node estimate ...
+ *
+ * @requires !vm.graal.enabled
+ *
+ * @run main/othervm -XX:PartialPeelNewPhiDelta=5 LoopRotateBadNodeBudget
+ * @run main/othervm -Xbatch -XX:PartialPeelNewPhiDelta=5 LoopRotateBadNodeBudget
+ *
+ * @run main/othervm LoopRotateBadNodeBudget
+ * @run main/othervm -Xbatch LoopRotateBadNodeBudget
+ *
+ * NOTE: Test-case seldom manifesting the problem on fast machines.
+ */
+
+public class LoopRotateBadNodeBudget {
+
+    int h;
+    float j(int a, int b) {
+        double d = 0.19881;
+        int c, e[] = new int[9];
+        c = 1;
+        while (++c < 12)
+            switch ((c % 7 * 5) + 122) {
+                case 156:
+                case 46128:
+                case 135:
+                case 148:
+                case 127:
+                    break;
+                default:
+            }
+        while ((d += 2) < 62)
+            ;
+        long k = l(e);
+        return k;
+    }
+    long l(int[] a) {
+        long m = 0;
+        for (int i = 0; i < a.length; i++)
+            m = a[i];
+        return m;
+    }
+    void f(String[] g) {
+        int i = 2;
+        for (; i < 20000; ++i)
+            j(3, h);
+    }
+    public static void main(String[] o) {
+        try {
+            LoopRotateBadNodeBudget n = new LoopRotateBadNodeBudget();
+            n.f(o);
+        } catch (Exception ex) {
+        }
+    }
+}

From eedc99c9ab2647f0233e4899a2976eb6f3095319 Mon Sep 17 00:00:00 2001
From: Harold Seigel 
Date: Mon, 28 Oct 2019 12:55:48 +0000
Subject: [PATCH 104/163] 8232890: Remove bad Code attribute parsing code

Remove code that accepts illegal max_stack, max_locals, and length values for Code attribute in old class files.

Reviewed-by: dholmes, lfoltan
---
 .../share/classfile/classFileParser.cpp       | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
index 259532885a1..070bd51be4c 100644
--- a/src/hotspot/share/classfile/classFileParser.cpp
+++ b/src/hotspot/share/classfile/classFileParser.cpp
@@ -2448,17 +2448,10 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
       parsed_code_attribute = true;
 
       // Stack size, locals size, and code size
-      if (_major_version == 45 && _minor_version <= 2) {
-        cfs->guarantee_more(4, CHECK_NULL);
-        max_stack = cfs->get_u1_fast();
-        max_locals = cfs->get_u1_fast();
-        code_length = cfs->get_u2_fast();
-      } else {
-        cfs->guarantee_more(8, CHECK_NULL);
-        max_stack = cfs->get_u2_fast();
-        max_locals = cfs->get_u2_fast();
-        code_length = cfs->get_u4_fast();
-      }
+      cfs->guarantee_more(8, CHECK_NULL);
+      max_stack = cfs->get_u2_fast();
+      max_locals = cfs->get_u2_fast();
+      code_length = cfs->get_u4_fast();
       if (_need_verify) {
         guarantee_property(args_size <= max_locals,
                            "Arguments can't fit into locals in class file %s",
@@ -2489,13 +2482,8 @@ Method* ClassFileParser::parse_method(const ClassFileStream* const cfs,
 
       unsigned int calculated_attribute_length = 0;
 
-      if (_major_version > 45 || (_major_version == 45 && _minor_version > 2)) {
-        calculated_attribute_length =
-            sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length);
-      } else {
-        // max_stack, locals and length are smaller in pre-version 45.2 classes
-        calculated_attribute_length = sizeof(u1) + sizeof(u1) + sizeof(u2);
-      }
+      calculated_attribute_length =
+          sizeof(max_stack) + sizeof(max_locals) + sizeof(code_length);
       calculated_attribute_length +=
         code_length +
         sizeof(exception_table_length) +

From f906a432e9fbac0e8680d60a5a6b0674b70e2f17 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu 
Date: Mon, 28 Oct 2019 11:33:28 -0400
Subject: [PATCH 105/163] 8232992: Shenandoah: Implement self-fixing
 interpreter LRB

Reviewed-by: shade
---
 .../shenandoahBarrierSetAssembler_aarch64.cpp | 49 ++++++++++---
 .../shenandoahBarrierSetAssembler_aarch64.hpp |  4 +-
 .../shenandoahBarrierSetAssembler_x86.cpp     | 70 ++++++++++++++-----
 .../shenandoahBarrierSetAssembler_x86.hpp     |  4 +-
 .../shenandoah/c2/shenandoahBarrierSetC2.cpp  |  3 +-
 .../gc/shenandoah/c2/shenandoahSupport.cpp    |  4 +-
 .../share/gc/shenandoah/shenandoahRuntime.cpp |  8 +--
 .../share/gc/shenandoah/shenandoahRuntime.hpp |  5 +-
 8 files changed, 100 insertions(+), 47 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index af23561f131..13fb8a5f8fe 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -233,9 +233,10 @@ void ShenandoahBarrierSetAssembler::resolve_forward_pointer_not_null(MacroAssemb
   }
 }
 
-void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Register tmp) {
+void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Address load_addr) {
   assert(ShenandoahLoadRefBarrier, "Should be enabled");
   assert(dst != rscratch2, "need rscratch2");
+  assert_different_registers(load_addr.base(), load_addr.index(), rscratch1, rscratch2);
 
   Label done;
   __ enter();
@@ -245,17 +246,38 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembl
   // Check for heap stability
   __ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, done);
 
-  RegSet to_save = RegSet::of(r0);
+  // use r1 for load address
+  Register result_dst = dst;
+  if (dst == r1) {
+    __ mov(rscratch1, dst);
+    dst = rscratch1;
+  }
+
+  RegSet to_save_r1 = RegSet::of(r1);
+  // If outgoing register is r1, we can clobber it
+  if (result_dst != r1) {
+    __ push(to_save_r1, sp);
+  }
+  __ lea(r1, load_addr);
+
+  RegSet to_save_r0 = RegSet::of(r0);
   if (dst != r0) {
-    __ push(to_save, sp);
+    __ push(to_save_r0, sp);
     __ mov(r0, dst);
   }
 
   __ far_call(RuntimeAddress(CAST_FROM_FN_PTR(address, ShenandoahBarrierSetAssembler::shenandoah_lrb())));
 
+  if (result_dst != r0) {
+    __ mov(result_dst, r0);
+  }
+
   if (dst != r0) {
-    __ mov(dst, r0);
-    __ pop(to_save, sp);
+    __ pop(to_save_r0, sp);
+  }
+
+  if (result_dst != r1) {
+    __ pop(to_save_r1, sp);
   }
 
   __ bind(done);
@@ -315,11 +337,11 @@ void ShenandoahBarrierSetAssembler::storeval_barrier(MacroAssembler* masm, Regis
   }
 }
 
-void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm, Register dst, Register tmp) {
+void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm, Register dst, Address load_addr) {
   if (ShenandoahLoadRefBarrier) {
     Label is_null;
     __ cbz(dst, is_null);
-    load_reference_barrier_not_null(masm, dst, tmp);
+    load_reference_barrier_not_null(masm, dst, load_addr);
     __ bind(is_null);
   }
 }
@@ -349,7 +371,7 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d
     if (not_in_heap && !is_traversal_mode) {
       load_reference_barrier_native(masm, dst, src);
     } else {
-      load_reference_barrier(masm, dst, tmp1);
+      load_reference_barrier(masm, dst, src);
     }
 
     if (dst != result_dst) {
@@ -619,9 +641,9 @@ void ShenandoahBarrierSetAssembler::generate_c1_load_reference_barrier_runtime_s
   __ load_parameter(0, r0);
   __ load_parameter(1, r1);
   if (UseCompressedOops) {
-    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup_narrow));
+    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_narrow));
   } else {
-    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup));
+    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier));
   }
   __ blr(lr);
   __ mov(rscratch1, r0);
@@ -646,6 +668,7 @@ address ShenandoahBarrierSetAssembler::shenandoah_lrb() {
 //
 // Input:
 //   r0: OOP to evacuate.  Not null.
+//   r1: load address
 //
 // Output:
 //   r0: Pointer to evacuated OOP.
@@ -681,7 +704,11 @@ address ShenandoahBarrierSetAssembler::generate_shenandoah_lrb(StubCodeGenerator
 
   __ push_call_clobbered_registers();
 
-  __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier));
+  if (UseCompressedOops) {
+    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_narrow));
+  } else {
+    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier));
+  }
   __ blr(lr);
   __ mov(rscratch1, r0);
   __ pop_call_clobbered_registers();
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
index f71e5d83d1a..fbea8ec21a2 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp
@@ -56,8 +56,8 @@ private:
 
   void resolve_forward_pointer(MacroAssembler* masm, Register dst, Register tmp = noreg);
   void resolve_forward_pointer_not_null(MacroAssembler* masm, Register dst, Register tmp = noreg);
-  void load_reference_barrier(MacroAssembler* masm, Register dst, Register tmp);
-  void load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Register tmp);
+  void load_reference_barrier(MacroAssembler* masm, Register dst, Address load_addr);
+  void load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Address load_addr);
   void load_reference_barrier_native(MacroAssembler* masm, Register dst, Address load_addr);
 
   address generate_shenandoah_lrb(StubCodeGenerator* cgen);
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index b6bc10bf6cc..2aca956ba22 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -247,7 +247,7 @@ void ShenandoahBarrierSetAssembler::satb_write_barrier_pre(MacroAssembler* masm,
   __ bind(done);
 }
 
-void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembler* masm, Register dst) {
+void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Address src) {
   assert(ShenandoahLoadRefBarrier, "Should be enabled");
 
   Label done;
@@ -262,26 +262,51 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_not_null(MacroAssembl
   __ push(thread);
   __ get_thread(thread);
 #endif
-  assert_different_registers(dst, thread);
 
   Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
   __ testb(gc_state, ShenandoahHeap::HAS_FORWARDED);
   __ jccb(Assembler::zero, done);
 
-   if (dst != rax) {
-     __ xchgptr(dst, rax); // Move obj into rax and save rax into obj.
-   }
+  // Use rsi for src address
+  const Register src_addr = rsi;
+  // Setup address parameter first, if it does not clobber oop in dst
+  bool need_addr_setup = (src_addr != dst);
 
-   __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, ShenandoahBarrierSetAssembler::shenandoah_lrb())));
+  if (need_addr_setup) {
+    __ push(src_addr);
+    __ lea(src_addr, src);
 
-   if (dst != rax) {
-     __ xchgptr(rax, dst); // Swap back obj with rax.
-   }
+    if (dst != rax) {
+      // Move obj into rax and save rax
+      __ push(rax);
+      __ movptr(rax, dst);
+    }
+  } else {
+    // dst == rsi
+    __ push(rax);
+    __ movptr(rax, dst);
+
+    // we can clobber it, since it is outgoing register
+    __ lea(src_addr, src);
+  }
+
+  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, ShenandoahBarrierSetAssembler::shenandoah_lrb())));
+
+  if (need_addr_setup) {
+    if (dst != rax) {
+      __ movptr(dst, rax);
+      __ pop(rax);
+    }
+    __ pop(src_addr);
+  } else {
+    __ movptr(dst, rax);
+    __ pop(rax);
+  }
 
   __ bind(done);
 
 #ifndef _LP64
-  __ pop(thread);
+    __ pop(thread);
 #endif
 }
 
@@ -410,12 +435,12 @@ void ShenandoahBarrierSetAssembler::storeval_barrier_impl(MacroAssembler* masm,
   }
 }
 
-void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm, Register dst) {
+void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm, Register dst, Address src) {
   if (ShenandoahLoadRefBarrier) {
     Label done;
     __ testptr(dst, dst);
     __ jcc(Assembler::zero, done);
-    load_reference_barrier_not_null(masm, dst);
+    load_reference_barrier_not_null(masm, dst, src);
     __ bind(done);
   }
 }
@@ -454,7 +479,7 @@ void ShenandoahBarrierSetAssembler::load_at(MacroAssembler* masm, DecoratorSet d
     if (not_in_heap && !is_traversal_mode) {
       load_reference_barrier_native(masm, dst, src);
     } else {
-      load_reference_barrier(masm, dst);
+      load_reference_barrier(masm, dst, src);
     }
 
     if (dst != result_dst) {
@@ -864,14 +889,14 @@ void ShenandoahBarrierSetAssembler::generate_c1_load_reference_barrier_runtime_s
   __ load_parameter(0, c_rarg0);
   __ load_parameter(1, c_rarg1);
   if (UseCompressedOops) {
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup_narrow), c_rarg0, c_rarg1);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_narrow), c_rarg0, c_rarg1);
   } else {
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup), c_rarg0, c_rarg1);
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier), c_rarg0, c_rarg1);
   }
 #else
   __ load_parameter(0, rax);
   __ load_parameter(1, rbx);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup), rax, rbx);
+  __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier), rax, rbx);
 #endif
 
   __ restore_live_registers_except_rax(true);
@@ -890,6 +915,11 @@ address ShenandoahBarrierSetAssembler::shenandoah_lrb() {
 
 #define __ cgen->assembler()->
 
+/*
+ *  Incoming parameters:
+ *  rax: oop
+ *  rsi: load address
+ */
 address ShenandoahBarrierSetAssembler::generate_shenandoah_lrb(StubCodeGenerator* cgen) {
   __ align(CodeEntryAlignment);
   StubCodeMark mark(cgen, "StubRoutines", "shenandoah_lrb");
@@ -941,7 +971,6 @@ address ShenandoahBarrierSetAssembler::generate_shenandoah_lrb(StubCodeGenerator
   __ push(rcx);
   __ push(rdx);
   __ push(rdi);
-  __ push(rsi);
 #ifdef _LP64
   __ push(r8);
   __ push(r9);
@@ -956,7 +985,11 @@ address ShenandoahBarrierSetAssembler::generate_shenandoah_lrb(StubCodeGenerator
   __ movptr(rbp, rsp);
   __ andptr(rsp, -StackAlignmentInBytes);
   __ push_FPU_state();
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier), rax);
+  if (UseCompressedOops) {
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_narrow), rax, rsi);
+  } else {
+    __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier), rax, rsi);
+  }
   __ pop_FPU_state();
   __ movptr(rsp, rbp);
   __ pop(rbp);
@@ -970,7 +1003,6 @@ address ShenandoahBarrierSetAssembler::generate_shenandoah_lrb(StubCodeGenerator
   __ pop(r9);
   __ pop(r8);
 #endif
-  __ pop(rsi);
   __ pop(rdi);
   __ pop(rdx);
   __ pop(rcx);
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
index 23f20977fbb..edaa5103e6e 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp
@@ -55,7 +55,7 @@ private:
                                     bool tosca_live,
                                     bool expand_call);
 
-  void load_reference_barrier_not_null(MacroAssembler* masm, Register dst);
+  void load_reference_barrier_not_null(MacroAssembler* masm, Register dst, Address src);
 
   void storeval_barrier_impl(MacroAssembler* masm, Register dst, Register tmp);
 
@@ -72,7 +72,7 @@ public:
   void generate_c1_load_reference_barrier_runtime_stub(StubAssembler* sasm);
 #endif
 
-  void load_reference_barrier(MacroAssembler* masm, Register dst);
+  void load_reference_barrier(MacroAssembler* masm, Register dst, Address src);
   void load_reference_barrier_native(MacroAssembler* masm, Register dst, Address src);
 
   void cmpxchg_oop(MacroAssembler* masm,
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index efdbf291f42..b47497ab60a 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -303,8 +303,7 @@ bool ShenandoahBarrierSetC2::is_shenandoah_lrb_call(Node* call) {
 
   address entry_point = call->as_CallLeaf()->entry_point();
   return (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier)) ||
-         (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup)) ||
-         (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup_narrow)) ||
+         (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_narrow)) ||
          (entry_point == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native));
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
index 11b7de7a491..54eeeb2ba43 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.cpp
@@ -1028,8 +1028,8 @@ void ShenandoahBarrierC2Support::call_lrb_stub(Node*& ctrl, Node*& val, Node* lo
   phase->register_new_node(mm, ctrl);
 
   address target = LP64_ONLY(UseCompressedOops) NOT_LP64(false) ?
-          CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup_narrow) :
-          CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_fixup);
+          CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_narrow) :
+          CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier);
 
   address calladdr = is_native ? CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native)
                                : target;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
index 824de2a611a..c83cec57c94 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
@@ -62,15 +62,11 @@ JRT_LEAF(void, ShenandoahRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaT
   ShenandoahThreadLocalData::satb_mark_queue(thread).enqueue_known_active(orig);
 JRT_END
 
-JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier(oopDesc* src))
-  return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, (oop*)NULL);
-JRT_END
-
-JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_fixup(oopDesc* src, oop* load_addr))
+JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier(oopDesc* src, oop* load_addr))
   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, load_addr);
 JRT_END
 
-JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_fixup_narrow(oopDesc* src, narrowOop* load_addr))
+JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_narrow(oopDesc* src, narrowOop* load_addr))
   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, load_addr);
 JRT_END
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
index 3ce9d63cae1..d4671f3aeb8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
@@ -38,9 +38,8 @@ public:
   static void write_ref_array_pre_duinit_narrow_oop_entry(narrowOop* src, narrowOop* dst, size_t length);
   static void write_ref_field_pre_entry(oopDesc* orig, JavaThread* thread);
 
-  static oopDesc* load_reference_barrier(oopDesc* src);
-  static oopDesc* load_reference_barrier_fixup(oopDesc* src, oop* load_addr);
-  static oopDesc* load_reference_barrier_fixup_narrow(oopDesc* src, narrowOop* load_addr);
+  static oopDesc* load_reference_barrier(oopDesc* src, oop* load_addr);
+  static oopDesc* load_reference_barrier_narrow(oopDesc* src, narrowOop* load_addr);
 
   static oopDesc* load_reference_barrier_native(oopDesc* src, oop* load_addr);
 

From 25d6a33eb54210d4adbe2073d9775be252d4e5b1 Mon Sep 17 00:00:00 2001
From: Bob Vandette 
Date: Mon, 28 Oct 2019 16:06:08 +0000
Subject: [PATCH 106/163] 8232118: Add JVM option to enable JVMCI compilers in
 product mode

Reviewed-by: kvn, dholmes
---
 src/hotspot/share/jvmci/jvmci_globals.cpp   | 50 +++++++++++++++++++++
 src/hotspot/share/jvmci/jvmci_globals.hpp   |  8 ++++
 src/hotspot/share/runtime/arguments.cpp     | 16 +++++++
 src/hotspot/share/runtime/flags/jvmFlag.cpp | 12 +++++
 src/hotspot/share/runtime/flags/jvmFlag.hpp |  2 +
 5 files changed, 88 insertions(+)

diff --git a/src/hotspot/share/jvmci/jvmci_globals.cpp b/src/hotspot/share/jvmci/jvmci_globals.cpp
index cc70cdf32af..09184d537ff 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.cpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.cpp
@@ -57,6 +57,7 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
 
   JVMCI_FLAG_CHECKED(UseJVMCICompiler)
   JVMCI_FLAG_CHECKED(EnableJVMCI)
+  JVMCI_FLAG_CHECKED(EnableJVMCIProduct)
 
   CHECK_NOT_SET(BootstrapJVMCI,   UseJVMCICompiler)
   CHECK_NOT_SET(PrintBootstrap,   UseJVMCICompiler)
@@ -64,6 +65,14 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
   CHECK_NOT_SET(JVMCIHostThreads, UseJVMCICompiler)
 
   if (UseJVMCICompiler) {
+    if (FLAG_IS_DEFAULT(UseJVMCINativeLibrary) && !UseJVMCINativeLibrary) {
+      char path[JVM_MAXPATHLEN];
+      if (os::dll_locate_lib(path, sizeof(path), Arguments::get_dll_dir(), JVMCI_SHARED_LIBRARY_NAME)) {
+        // If a JVMCI native library is present,
+        // we enable UseJVMCINativeLibrary by default.
+        FLAG_SET_DEFAULT(UseJVMCINativeLibrary, true);
+      }
+    }
     if (!FLAG_IS_DEFAULT(EnableJVMCI) && !EnableJVMCI) {
       jio_fprintf(defaultStream::error_stream(),
           "Improperly specified VM option UseJVMCICompiler: EnableJVMCI cannot be disabled\n");
@@ -122,6 +131,47 @@ bool JVMCIGlobals::check_jvmci_flags_are_consistent() {
   return true;
 }
 
+// Convert JVMCI flags from experimental to product
+bool JVMCIGlobals::enable_jvmci_product_mode(JVMFlag::Flags origin) {
+  const char *JVMCIFlags[] = {
+    "EnableJVMCI",
+    "EnableJVMCIProduct",
+    "UseJVMCICompiler",
+    "JVMCIPrintProperties",
+    "EagerJVMCI",
+    "JVMCIThreads",
+    "JVMCICounterSize",
+    "JVMCICountersExcludeCompiler",
+    "JVMCINMethodSizeLimit",
+    "JVMCILibPath",
+    "JVMCILibDumpJNIConfig",
+    "UseJVMCINativeLibrary",
+    NULL
+  };
+
+  for (int i = 0; JVMCIFlags[i] != NULL; i++) {
+    JVMFlag *jvmciFlag = (JVMFlag *)JVMFlag::find_declared_flag(JVMCIFlags[i]);
+    if (jvmciFlag == NULL) {
+      return false;
+    }
+    jvmciFlag->clear_experimental();
+    jvmciFlag->set_product();
+  }
+
+  bool value = true;
+  JVMFlag *jvmciEnableFlag = JVMFlag::find_flag("EnableJVMCIProduct");
+  if (JVMFlag::boolAtPut(jvmciEnableFlag, &value, origin) != JVMFlag::SUCCESS) {
+    return false;
+  }
+  value = true;
+  JVMFlag *jvmciCompilerFlag = JVMFlag::find_flag("UseJVMCICompiler");
+  if (JVMFlag::boolAtPut(jvmciCompilerFlag, &value, origin) != JVMFlag::SUCCESS) {
+    return false;
+  }
+
+  return true;
+}
+
 void JVMCIGlobals::check_jvmci_supported_gc() {
   if (EnableJVMCI) {
     // Check if selected GC is supported by JVMCI and Java compiler
diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp
index c4c6e8cb1dd..c6d6af75823 100644
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp
@@ -25,6 +25,8 @@
 #ifndef SHARE_JVMCI_JVMCI_GLOBALS_HPP
 #define SHARE_JVMCI_JVMCI_GLOBALS_HPP
 
+#include "runtime/flags/jvmFlag.hpp"
+
 class fileStream;
 
 //
@@ -46,6 +48,9 @@ class fileStream;
   experimental(bool, EnableJVMCI, false,                                    \
           "Enable JVMCI")                                                   \
                                                                             \
+  experimental(bool, EnableJVMCIProduct, false,                             \
+          "Allow JVMCI to be used in product mode")                         \
+                                                                            \
   experimental(bool, UseJVMCICompiler, false,                               \
           "Use JVMCI as the default compiler")                              \
                                                                             \
@@ -142,6 +147,9 @@ class JVMCIGlobals {
   // returning false.
   static bool check_jvmci_flags_are_consistent();
 
+  // Convert JVMCI experimental flags to product
+  static bool enable_jvmci_product_mode(JVMFlag::Flags);
+
   // Check and exit VM with error if selected GC is not supported by JVMCI.
   static void check_jvmci_supported_gc();
 
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index db1f91b2884..76695553475 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -2959,6 +2959,22 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
           "ManagementServer is not supported in this VM.\n");
         return JNI_ERR;
 #endif // INCLUDE_MANAGEMENT
+#if INCLUDE_JVMCI
+    } else if (match_option(option, "-XX:+EnableJVMCIProduct")) {
+      JVMFlag *jvmciFlag = JVMFlag::find_flag("EnableJVMCIProduct");
+      // Allow this flag if it has been unlocked.
+      if (jvmciFlag != NULL && jvmciFlag->is_unlocked()) {
+        if (!JVMCIGlobals::enable_jvmci_product_mode(origin)) {
+          jio_fprintf(defaultStream::error_stream(),
+            "Unable to enable JVMCI in product mode");
+          return JNI_ERR;
+        }
+      }
+      // The flag was locked so process normally to report that error
+      else if (!process_argument("EnableJVMCIProduct", args->ignoreUnrecognized, origin)) {
+        return JNI_EINVAL;
+      }
+#endif // INCLUDE_JVMCI
 #if INCLUDE_JFR
     } else if (match_jfr_option(&option)) {
       return JNI_EINVAL;
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.cpp b/src/hotspot/share/runtime/flags/jvmFlag.cpp
index 597c5d070d1..c97be9475dc 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.cpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.cpp
@@ -359,6 +359,18 @@ void JVMFlag::clear_diagnostic() {
   assert(!is_diagnostic(), "sanity");
 }
 
+void JVMFlag::clear_experimental() {
+  assert(is_experimental(), "sanity");
+ _flags = Flags(_flags & ~KIND_EXPERIMENTAL);
+  assert(!is_experimental(), "sanity");
+}
+
+void JVMFlag::set_product() {
+  assert(!is_product(), "sanity");
+ _flags = Flags(_flags | KIND_PRODUCT);
+  assert(is_product(), "sanity");
+}
+
 // Get custom message for this locked flag, or NULL if
 // none is available. Returns message type produced.
 JVMFlag::MsgType JVMFlag::get_locked_message(char* buf, int buflen) const {
diff --git a/src/hotspot/share/runtime/flags/jvmFlag.hpp b/src/hotspot/share/runtime/flags/jvmFlag.hpp
index 68a9b5b48fe..0c1dfa317be 100644
--- a/src/hotspot/share/runtime/flags/jvmFlag.hpp
+++ b/src/hotspot/share/runtime/flags/jvmFlag.hpp
@@ -207,6 +207,8 @@ public:
   bool is_external() const;
 
   void clear_diagnostic();
+  void clear_experimental();
+  void set_product();
 
   JVMFlag::MsgType get_locked_message(char*, int) const;
   JVMFlag::MsgType get_locked_message_ext(char*, int) const;

From f3c76c4742678e6199ea0c396ca9d0827e72ddb9 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai 
Date: Mon, 28 Oct 2019 13:17:54 -0400
Subject: [PATCH 107/163] 8232879: Writing out data with the Zip File System
 leads to a CRC failure

Reviewed-by: lancea, clanger
---
 .../classes/jdk/nio/zipfs/ZipFileSystem.java  |   6 -
 test/jdk/jdk/nio/zipfs/CRCWriteTest.java      | 162 ++++++++++++++++++
 2 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/jdk/nio/zipfs/CRCWriteTest.java

diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
index d2f618b5926..c6041b3637b 100644
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java
@@ -1759,12 +1759,6 @@ class ZipFileSystem extends FileSystem {
             this.crc = new CRC32();
         }
 
-        @Override
-        public synchronized void write(int b) throws IOException {
-            super.write(b);
-            crc.update(b);
-        }
-
         @Override
         public synchronized void write(byte[] b, int off, int len)
                 throws IOException {
diff --git a/test/jdk/jdk/nio/zipfs/CRCWriteTest.java b/test/jdk/jdk/nio/zipfs/CRCWriteTest.java
new file mode 100644
index 00000000000..fd336c350f8
--- /dev/null
+++ b/test/jdk/jdk/nio/zipfs/CRCWriteTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+import org.testng.annotations.Test;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+import static org.testng.Assert.*;
+
+/**
+ * @test
+ * @bug 8232879
+ * @summary Test OutputStream::write with Zip FS
+ * @modules jdk.zipfs
+ * @run testng/othervm CRCWriteTest
+ */
+public class CRCWriteTest {
+
+    // Jar File path used by the test
+    private final Path JAR_FILE = Path.of("CRCWrite.jar");
+
+    /**
+     * Validate that an OutputStream obtained for the Zip FileSystem
+     * can be used successfully with the OutputStream write methods
+     */
+    @Test
+    private void zipFsOsDeflatedWriteTest() throws Exception {
+        Files.deleteIfExists(JAR_FILE);
+        String[] msg = {"Hello ", "Tennis Anyone", "!!!!"};
+        Entry e0 = Entry.of("Entry-0", ZipEntry.DEFLATED, Arrays.toString(msg));
+
+        try (FileSystem zipfs = FileSystems.newFileSystem(JAR_FILE,
+                Map.of("create", "true"))) {
+
+            // Write to the Jar file using the various OutputStream write methods
+            try (OutputStream os = Files.newOutputStream(zipfs.getPath(e0.name))) {
+                for (byte b : msg[0].getBytes(StandardCharsets.UTF_8)) {
+                    os.write(b);
+                }
+                os.write(msg[1].getBytes(StandardCharsets.UTF_8));
+                os.write(msg[2].getBytes(StandardCharsets.UTF_8), 0, msg[2].length());
+            }
+        }
+        verify(JAR_FILE, e0);
+    }
+
+    /**
+     * Represents an entry in a Zip file. An entry encapsulates a name, a
+     * compression method, and its contents/data.
+     */
+    static class Entry {
+        private final String name;
+        private final int method;
+        private final byte[] bytes;
+
+        Entry(String name, int method, String contents) {
+            this.name = name;
+            this.method = method;
+            this.bytes = contents.getBytes(StandardCharsets.UTF_8);
+        }
+
+        static Entry of(String name, int method, String contents) {
+            return new Entry(name, method, contents);
+        }
+
+        /**
+         * Returns a new Entry with the same name and compression method as this
+         * Entry but with the given content.
+         */
+        Entry content(String contents) {
+            return new Entry(name, method, contents);
+        }
+    }
+
+    /**
+     * Verify that the given path is a Zip file containing exactly the
+     * given entries.
+     */
+    private static void verify(Path zipfile, Entry... entries) throws IOException {
+
+        // check entries with ZipFile API
+        try (ZipFile zf = new ZipFile(zipfile.toFile())) {
+            // check entry count
+            assertEquals(entries.length, zf.size());
+
+            // Check compression method and content of each entry
+            for (Entry e : entries) {
+                ZipEntry ze = zf.getEntry(e.name);
+                assertNotNull(ze);
+                assertEquals(e.method, ze.getMethod());
+                try (InputStream in = zf.getInputStream(ze)) {
+                    byte[] bytes = in.readAllBytes();
+                    assertTrue(Arrays.equals(bytes, e.bytes));
+                }
+            }
+        }
+
+        // Check entries using ZipInputStream
+        for (Entry e : entries) {
+            try (ZipInputStream zis =
+                         new ZipInputStream(new FileInputStream(zipfile.toFile()))) {
+                ZipEntry ze;
+                while ((ze = zis.getNextEntry()) != null) {
+                    assertEquals(e.method, ze.getMethod());
+                    byte[] bytes = zis.readAllBytes();
+                    assertTrue(Arrays.equals(bytes, e.bytes));
+                }
+            }
+        }
+
+        // Check entries with FileSystem API
+        try (FileSystem fs = FileSystems.newFileSystem(zipfile)) {
+            // check entry count
+            Path top = fs.getPath("/");
+            long count = Files.find(top, Integer.MAX_VALUE,
+                    (path, attrs) -> attrs.isRegularFile()).count();
+            assertEquals(entries.length, count);
+
+            // check content of each entry
+            for (Entry e : entries) {
+                Path file = fs.getPath(e.name);
+                byte[] bytes = Files.readAllBytes(file);
+                assertTrue(Arrays.equals(bytes, e.bytes));
+            }
+        }
+    }
+}
+
+

From 127c4a4e1b790ee74fde76fc89a981f6d9271c86 Mon Sep 17 00:00:00 2001
From: Naoto Sato 
Date: Mon, 28 Oct 2019 11:06:17 -0700
Subject: [PATCH 108/163] 8231273: Upgrade CLDR to v36

Reviewed-by: rriggs
---
 make/data/cldr/README                         |    2 +-
 make/data/cldr/common/bcp47/timezone.xml      |    2 +-
 make/data/cldr/common/dtd/ldml.dtd            |    6 +-
 make/data/cldr/common/dtd/ldmlBCP47.dtd       |    4 +-
 .../data/cldr/common/dtd/ldmlSupplemental.dtd |    4 +-
 make/data/cldr/common/main/af.xml             | 1416 ++--
 make/data/cldr/common/main/af_NA.xml          |    2 +-
 make/data/cldr/common/main/af_ZA.xml          |    2 +-
 make/data/cldr/common/main/agq.xml            |    5 +-
 make/data/cldr/common/main/agq_CM.xml         |    2 +-
 make/data/cldr/common/main/ak.xml             |    5 +-
 make/data/cldr/common/main/ak_GH.xml          |    2 +-
 make/data/cldr/common/main/am.xml             |  505 +-
 make/data/cldr/common/main/am_ET.xml          |    2 +-
 make/data/cldr/common/main/ar.xml             | 1108 +--
 make/data/cldr/common/main/ar_001.xml         |    2 +-
 make/data/cldr/common/main/ar_AE.xml          |   10 +-
 make/data/cldr/common/main/ar_BH.xml          |   10 +-
 make/data/cldr/common/main/ar_DJ.xml          |    2 +-
 make/data/cldr/common/main/ar_DZ.xml          |    8 +-
 make/data/cldr/common/main/ar_EG.xml          |   10 +-
 make/data/cldr/common/main/ar_EH.xml          |    2 +-
 make/data/cldr/common/main/ar_ER.xml          |    2 +-
 make/data/cldr/common/main/ar_IL.xml          |    2 +-
 make/data/cldr/common/main/ar_IQ.xml          |   10 +-
 make/data/cldr/common/main/ar_JO.xml          |   10 +-
 make/data/cldr/common/main/ar_KM.xml          |    2 +-
 make/data/cldr/common/main/ar_KW.xml          |   10 +-
 make/data/cldr/common/main/ar_LB.xml          |    4 +-
 make/data/cldr/common/main/ar_LY.xml          |    4 +-
 make/data/cldr/common/main/ar_MA.xml          |    8 +-
 make/data/cldr/common/main/ar_MR.xml          |    4 +-
 make/data/cldr/common/main/ar_OM.xml          |   10 +-
 make/data/cldr/common/main/ar_PS.xml          |    2 +-
 make/data/cldr/common/main/ar_QA.xml          |   10 +-
 make/data/cldr/common/main/ar_SA.xml          |  809 +-
 make/data/cldr/common/main/ar_SD.xml          |   10 +-
 make/data/cldr/common/main/ar_SO.xml          |    4 +-
 make/data/cldr/common/main/ar_SS.xml          |    2 +-
 make/data/cldr/common/main/ar_SY.xml          |   10 +-
 make/data/cldr/common/main/ar_TD.xml          |    2 +-
 make/data/cldr/common/main/ar_TN.xml          |    8 +-
 make/data/cldr/common/main/ar_YE.xml          |   10 +-
 make/data/cldr/common/main/as.xml             |  345 +-
 make/data/cldr/common/main/as_IN.xml          |    2 +-
 make/data/cldr/common/main/asa.xml            |    3 +-
 make/data/cldr/common/main/asa_TZ.xml         |    2 +-
 make/data/cldr/common/main/ast.xml            |   62 +-
 make/data/cldr/common/main/ast_ES.xml         |    2 +-
 make/data/cldr/common/main/az.xml             |  681 +-
 make/data/cldr/common/main/az_Cyrl.xml        |    6 +-
 make/data/cldr/common/main/az_Cyrl_AZ.xml     |    2 +-
 make/data/cldr/common/main/az_Latn.xml        |    2 +-
 make/data/cldr/common/main/az_Latn_AZ.xml     |    2 +-
 make/data/cldr/common/main/bas.xml            |    5 +-
 make/data/cldr/common/main/bas_CM.xml         |    2 +-
 make/data/cldr/common/main/be.xml             | 1437 ++--
 make/data/cldr/common/main/be_BY.xml          |    2 +-
 make/data/cldr/common/main/bem.xml            |    2 +-
 make/data/cldr/common/main/bem_ZM.xml         |    2 +-
 make/data/cldr/common/main/bez.xml            |    3 +-
 make/data/cldr/common/main/bez_TZ.xml         |    2 +-
 make/data/cldr/common/main/bg.xml             |  703 +-
 make/data/cldr/common/main/bg_BG.xml          |    2 +-
 make/data/cldr/common/main/bm.xml             |    3 +-
 make/data/cldr/common/main/bm_ML.xml          |    2 +-
 make/data/cldr/common/main/bn.xml             |  885 ++-
 make/data/cldr/common/main/bn_BD.xml          |    2 +-
 make/data/cldr/common/main/bn_IN.xml          |    2 +-
 make/data/cldr/common/main/bo.xml             |    4 +-
 make/data/cldr/common/main/bo_CN.xml          |    2 +-
 make/data/cldr/common/main/bo_IN.xml          |    2 +-
 make/data/cldr/common/main/br.xml             | 3165 ++++++--
 make/data/cldr/common/main/br_FR.xml          |    2 +-
 make/data/cldr/common/main/brx.xml            |    5 +-
 make/data/cldr/common/main/brx_IN.xml         |    2 +-
 make/data/cldr/common/main/bs.xml             |  350 +-
 make/data/cldr/common/main/bs_Cyrl.xml        | 2722 ++++---
 make/data/cldr/common/main/bs_Cyrl_BA.xml     |    2 +-
 make/data/cldr/common/main/bs_Latn.xml        |    2 +-
 make/data/cldr/common/main/bs_Latn_BA.xml     |    2 +-
 make/data/cldr/common/main/ca.xml             |  496 +-
 make/data/cldr/common/main/ca_AD.xml          |    2 +-
 make/data/cldr/common/main/ca_ES.xml          |    2 +-
 make/data/cldr/common/main/ca_ES_VALENCIA.xml |    3 +-
 make/data/cldr/common/main/ca_FR.xml          |    2 +-
 make/data/cldr/common/main/ca_IT.xml          |    2 +-
 make/data/cldr/common/main/ccp.xml            |   35 +-
 make/data/cldr/common/main/ccp_BD.xml         |    2 +-
 make/data/cldr/common/main/ccp_IN.xml         |    2 +-
 make/data/cldr/common/main/ce.xml             |    8 +-
 make/data/cldr/common/main/ce_RU.xml          |    2 +-
 make/data/cldr/common/main/ceb.xml            | 3646 ++++++++-
 make/data/cldr/common/main/ceb_PH.xml         |    2 +-
 make/data/cldr/common/main/cgg.xml            |    3 +-
 make/data/cldr/common/main/cgg_UG.xml         |    2 +-
 make/data/cldr/common/main/chr.xml            |  405 +-
 make/data/cldr/common/main/chr_US.xml         |    2 +-
 make/data/cldr/common/main/ckb.xml            |   18 +-
 make/data/cldr/common/main/ckb_IQ.xml         |    2 +-
 make/data/cldr/common/main/ckb_IR.xml         |    2 +-
 make/data/cldr/common/main/cs.xml             | 3303 ++++++++-
 make/data/cldr/common/main/cs_CZ.xml          |    2 +-
 make/data/cldr/common/main/cu.xml             |    6 +-
 make/data/cldr/common/main/cu_RU.xml          |    2 +-
 make/data/cldr/common/main/cy.xml             | 1685 +++--
 make/data/cldr/common/main/cy_GB.xml          |    2 +-
 make/data/cldr/common/main/da.xml             |  624 +-
 make/data/cldr/common/main/da_DK.xml          |    2 +-
 make/data/cldr/common/main/da_GL.xml          |    2 +-
 make/data/cldr/common/main/dav.xml            |    3 +-
 make/data/cldr/common/main/dav_KE.xml         |    2 +-
 make/data/cldr/common/main/de.xml             | 1360 +++-
 make/data/cldr/common/main/de_AT.xml          |    4 +-
 make/data/cldr/common/main/de_BE.xml          |    2 +-
 make/data/cldr/common/main/de_CH.xml          |   35 +-
 make/data/cldr/common/main/de_DE.xml          |    2 +-
 make/data/cldr/common/main/de_IT.xml          |    2 +-
 make/data/cldr/common/main/de_LI.xml          |    4 +-
 make/data/cldr/common/main/de_LU.xml          |    2 +-
 make/data/cldr/common/main/dje.xml            |    5 +-
 make/data/cldr/common/main/dje_NE.xml         |    2 +-
 make/data/cldr/common/main/dsb.xml            |   48 +-
 make/data/cldr/common/main/dsb_DE.xml         |    2 +-
 make/data/cldr/common/main/dua.xml            |    4 +-
 make/data/cldr/common/main/dua_CM.xml         |    2 +-
 make/data/cldr/common/main/dyo.xml            |    4 +-
 make/data/cldr/common/main/dyo_SN.xml         |    2 +-
 make/data/cldr/common/main/dz.xml             |    8 +-
 make/data/cldr/common/main/dz_BT.xml          |    2 +-
 make/data/cldr/common/main/ebu.xml            |    3 +-
 make/data/cldr/common/main/ebu_KE.xml         |    2 +-
 make/data/cldr/common/main/ee.xml             |   11 +-
 make/data/cldr/common/main/ee_GH.xml          |    2 +-
 make/data/cldr/common/main/ee_TG.xml          |    2 +-
 make/data/cldr/common/main/el.xml             |  743 +-
 make/data/cldr/common/main/el_CY.xml          |    2 +-
 make/data/cldr/common/main/el_GR.xml          |    2 +-
 make/data/cldr/common/main/en.xml             |  292 +-
 make/data/cldr/common/main/en_001.xml         |  251 +-
 make/data/cldr/common/main/en_150.xml         |    2 +-
 make/data/cldr/common/main/en_AE.xml          |    3 +-
 make/data/cldr/common/main/en_AG.xml          |    2 +-
 make/data/cldr/common/main/en_AI.xml          |    2 +-
 make/data/cldr/common/main/en_AS.xml          |    2 +-
 make/data/cldr/common/main/en_AT.xml          |    2 +-
 make/data/cldr/common/main/en_AU.xml          |  919 ++-
 make/data/cldr/common/main/en_BB.xml          |    2 +-
 make/data/cldr/common/main/en_BE.xml          |    2 +-
 make/data/cldr/common/main/en_BI.xml          |    2 +-
 make/data/cldr/common/main/en_BM.xml          |    2 +-
 make/data/cldr/common/main/en_BS.xml          |    2 +-
 make/data/cldr/common/main/en_BW.xml          |    2 +-
 make/data/cldr/common/main/en_BZ.xml          |    2 +-
 make/data/cldr/common/main/en_CA.xml          |  128 +-
 make/data/cldr/common/main/en_CC.xml          |    2 +-
 make/data/cldr/common/main/en_CH.xml          |    2 +-
 make/data/cldr/common/main/en_CK.xml          |    2 +-
 make/data/cldr/common/main/en_CM.xml          |    2 +-
 make/data/cldr/common/main/en_CX.xml          |    2 +-
 make/data/cldr/common/main/en_CY.xml          |    2 +-
 make/data/cldr/common/main/en_DE.xml          |    2 +-
 make/data/cldr/common/main/en_DG.xml          |    2 +-
 make/data/cldr/common/main/en_DK.xml          |    2 +-
 make/data/cldr/common/main/en_DM.xml          |    2 +-
 make/data/cldr/common/main/en_ER.xml          |    2 +-
 make/data/cldr/common/main/en_FI.xml          |    4 +-
 make/data/cldr/common/main/en_FJ.xml          |    2 +-
 make/data/cldr/common/main/en_FK.xml          |    2 +-
 make/data/cldr/common/main/en_FM.xml          |    2 +-
 make/data/cldr/common/main/en_GB.xml          | 1558 +++-
 make/data/cldr/common/main/en_GD.xml          |    2 +-
 make/data/cldr/common/main/en_GG.xml          |    2 +-
 make/data/cldr/common/main/en_GH.xml          |    2 +-
 make/data/cldr/common/main/en_GI.xml          |    2 +-
 make/data/cldr/common/main/en_GM.xml          |    2 +-
 make/data/cldr/common/main/en_GU.xml          |    2 +-
 make/data/cldr/common/main/en_GY.xml          |    2 +-
 make/data/cldr/common/main/en_HK.xml          |    7 +-
 make/data/cldr/common/main/en_IE.xml          |    2 +-
 make/data/cldr/common/main/en_IL.xml          |    2 +-
 make/data/cldr/common/main/en_IM.xml          |    2 +-
 make/data/cldr/common/main/en_IN.xml          |   99 +-
 make/data/cldr/common/main/en_IO.xml          |    2 +-
 make/data/cldr/common/main/en_JE.xml          |    2 +-
 make/data/cldr/common/main/en_JM.xml          |    2 +-
 make/data/cldr/common/main/en_KE.xml          |    2 +-
 make/data/cldr/common/main/en_KI.xml          |    2 +-
 make/data/cldr/common/main/en_KN.xml          |    2 +-
 make/data/cldr/common/main/en_KY.xml          |    2 +-
 make/data/cldr/common/main/en_LC.xml          |    2 +-
 make/data/cldr/common/main/en_LR.xml          |    2 +-
 make/data/cldr/common/main/en_LS.xml          |    2 +-
 make/data/cldr/common/main/en_MG.xml          |    2 +-
 make/data/cldr/common/main/en_MH.xml          |    2 +-
 make/data/cldr/common/main/en_MO.xml          |    2 +-
 make/data/cldr/common/main/en_MP.xml          |    2 +-
 make/data/cldr/common/main/en_MS.xml          |    2 +-
 make/data/cldr/common/main/en_MT.xml          |    2 +-
 make/data/cldr/common/main/en_MU.xml          |    2 +-
 make/data/cldr/common/main/en_MW.xml          |    2 +-
 make/data/cldr/common/main/en_MY.xml          |    2 +-
 make/data/cldr/common/main/en_NA.xml          |    2 +-
 make/data/cldr/common/main/en_NF.xml          |    2 +-
 make/data/cldr/common/main/en_NG.xml          |    2 +-
 make/data/cldr/common/main/en_NL.xml          |    2 +-
 make/data/cldr/common/main/en_NR.xml          |    2 +-
 make/data/cldr/common/main/en_NU.xml          |    2 +-
 make/data/cldr/common/main/en_NZ.xml          |    2 +-
 make/data/cldr/common/main/en_PG.xml          |    2 +-
 make/data/cldr/common/main/en_PH.xml          |    2 +-
 make/data/cldr/common/main/en_PK.xml          |    2 +-
 make/data/cldr/common/main/en_PN.xml          |    2 +-
 make/data/cldr/common/main/en_PR.xml          |    2 +-
 make/data/cldr/common/main/en_PW.xml          |    2 +-
 make/data/cldr/common/main/en_RW.xml          |    2 +-
 make/data/cldr/common/main/en_SB.xml          |    2 +-
 make/data/cldr/common/main/en_SC.xml          |    2 +-
 make/data/cldr/common/main/en_SD.xml          |    2 +-
 make/data/cldr/common/main/en_SE.xml          |    4 +-
 make/data/cldr/common/main/en_SG.xml          |   12 +-
 make/data/cldr/common/main/en_SH.xml          |    2 +-
 make/data/cldr/common/main/en_SI.xml          |    2 +-
 make/data/cldr/common/main/en_SL.xml          |    2 +-
 make/data/cldr/common/main/en_SS.xml          |    2 +-
 make/data/cldr/common/main/en_SX.xml          |    2 +-
 make/data/cldr/common/main/en_SZ.xml          |    2 +-
 make/data/cldr/common/main/en_TC.xml          |    2 +-
 make/data/cldr/common/main/en_TK.xml          |    2 +-
 make/data/cldr/common/main/en_TO.xml          |    2 +-
 make/data/cldr/common/main/en_TT.xml          |    2 +-
 make/data/cldr/common/main/en_TV.xml          |    2 +-
 make/data/cldr/common/main/en_TZ.xml          |    2 +-
 make/data/cldr/common/main/en_UG.xml          |    2 +-
 make/data/cldr/common/main/en_UM.xml          |    2 +-
 make/data/cldr/common/main/en_US.xml          |    2 +-
 make/data/cldr/common/main/en_US_POSIX.xml    |   12 +-
 make/data/cldr/common/main/en_VC.xml          |    2 +-
 make/data/cldr/common/main/en_VG.xml          |    2 +-
 make/data/cldr/common/main/en_VI.xml          |    2 +-
 make/data/cldr/common/main/en_VU.xml          |    2 +-
 make/data/cldr/common/main/en_WS.xml          |    2 +-
 make/data/cldr/common/main/en_ZA.xml          |    4 +-
 make/data/cldr/common/main/en_ZM.xml          |    2 +-
 make/data/cldr/common/main/en_ZW.xml          |    2 +-
 make/data/cldr/common/main/eo.xml             |    5 +-
 make/data/cldr/common/main/eo_001.xml         |    2 +-
 make/data/cldr/common/main/es.xml             | 1021 ++-
 make/data/cldr/common/main/es_419.xml         |  955 +--
 make/data/cldr/common/main/es_AR.xml          |   16 +-
 make/data/cldr/common/main/es_BO.xml          |    7 +-
 make/data/cldr/common/main/es_BR.xml          |    2 +-
 make/data/cldr/common/main/es_BZ.xml          |    2 +-
 make/data/cldr/common/main/es_CL.xml          |   19 +-
 make/data/cldr/common/main/es_CO.xml          |    6 +-
 make/data/cldr/common/main/es_CR.xml          |   16 +-
 make/data/cldr/common/main/es_CU.xml          |    2 +-
 make/data/cldr/common/main/es_DO.xml          |   15 +-
 make/data/cldr/common/main/es_EA.xml          |    2 +-
 make/data/cldr/common/main/es_EC.xml          |    7 +-
 make/data/cldr/common/main/es_ES.xml          |    2 +-
 make/data/cldr/common/main/es_GQ.xml          |    2 +-
 make/data/cldr/common/main/es_GT.xml          |   28 +-
 make/data/cldr/common/main/es_HN.xml          |   16 +-
 make/data/cldr/common/main/es_IC.xml          |    2 +-
 make/data/cldr/common/main/es_MX.xml          |  505 +-
 make/data/cldr/common/main/es_NI.xml          |   16 +-
 make/data/cldr/common/main/es_PA.xml          |   16 +-
 make/data/cldr/common/main/es_PE.xml          |    7 +-
 make/data/cldr/common/main/es_PH.xml          |    2 +-
 make/data/cldr/common/main/es_PR.xml          |    6 +-
 make/data/cldr/common/main/es_PY.xml          |   22 +-
 make/data/cldr/common/main/es_SV.xml          |   10 +-
 make/data/cldr/common/main/es_US.xml          |  505 +-
 make/data/cldr/common/main/es_UY.xml          |    6 +-
 make/data/cldr/common/main/es_VE.xml          |    5 +-
 make/data/cldr/common/main/et.xml             |  501 +-
 make/data/cldr/common/main/et_EE.xml          |    2 +-
 make/data/cldr/common/main/eu.xml             | 1504 ++--
 make/data/cldr/common/main/eu_ES.xml          |    2 +-
 make/data/cldr/common/main/ewo.xml            |    5 +-
 make/data/cldr/common/main/ewo_CM.xml         |    2 +-
 make/data/cldr/common/main/fa.xml             | 1012 ++-
 make/data/cldr/common/main/fa_AF.xml          |   25 +-
 make/data/cldr/common/main/fa_IR.xml          |    2 +-
 make/data/cldr/common/main/ff.xml             |    5 +-
 make/data/cldr/common/main/ff_Latn.xml        |    2 +-
 make/data/cldr/common/main/ff_Latn_BF.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_CM.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_GH.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_GM.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_GN.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_GW.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_LR.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_MR.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_NE.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_NG.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_SL.xml     |    2 +-
 make/data/cldr/common/main/ff_Latn_SN.xml     |    2 +-
 make/data/cldr/common/main/fi.xml             |  836 ++-
 make/data/cldr/common/main/fi_FI.xml          |    2 +-
 make/data/cldr/common/main/fil.xml            | 1651 ++++-
 make/data/cldr/common/main/fil_PH.xml         |    2 +-
 make/data/cldr/common/main/fo.xml             |  482 +-
 make/data/cldr/common/main/fo_DK.xml          |    2 +-
 make/data/cldr/common/main/fo_FO.xml          |    2 +-
 make/data/cldr/common/main/fr.xml             |  664 +-
 make/data/cldr/common/main/fr_BE.xml          |    2 +-
 make/data/cldr/common/main/fr_BF.xml          |    2 +-
 make/data/cldr/common/main/fr_BI.xml          |    2 +-
 make/data/cldr/common/main/fr_BJ.xml          |    2 +-
 make/data/cldr/common/main/fr_BL.xml          |    2 +-
 make/data/cldr/common/main/fr_CA.xml          |  769 +-
 make/data/cldr/common/main/fr_CD.xml          |    2 +-
 make/data/cldr/common/main/fr_CF.xml          |    2 +-
 make/data/cldr/common/main/fr_CG.xml          |    2 +-
 make/data/cldr/common/main/fr_CH.xml          |    9 +-
 make/data/cldr/common/main/fr_CI.xml          |    2 +-
 make/data/cldr/common/main/fr_CM.xml          |    2 +-
 make/data/cldr/common/main/fr_DJ.xml          |    2 +-
 make/data/cldr/common/main/fr_DZ.xml          |    2 +-
 make/data/cldr/common/main/fr_FR.xml          |    2 +-
 make/data/cldr/common/main/fr_GA.xml          |    2 +-
 make/data/cldr/common/main/fr_GF.xml          |    2 +-
 make/data/cldr/common/main/fr_GN.xml          |    2 +-
 make/data/cldr/common/main/fr_GP.xml          |    2 +-
 make/data/cldr/common/main/fr_GQ.xml          |    2 +-
 make/data/cldr/common/main/fr_HT.xml          |    2 +-
 make/data/cldr/common/main/fr_KM.xml          |    2 +-
 make/data/cldr/common/main/fr_LU.xml          |    4 +-
 make/data/cldr/common/main/fr_MA.xml          |    4 +-
 make/data/cldr/common/main/fr_MC.xml          |    2 +-
 make/data/cldr/common/main/fr_MF.xml          |    2 +-
 make/data/cldr/common/main/fr_MG.xml          |    2 +-
 make/data/cldr/common/main/fr_ML.xml          |    2 +-
 make/data/cldr/common/main/fr_MQ.xml          |    2 +-
 make/data/cldr/common/main/fr_MR.xml          |    2 +-
 make/data/cldr/common/main/fr_MU.xml          |    2 +-
 make/data/cldr/common/main/fr_NC.xml          |    2 +-
 make/data/cldr/common/main/fr_NE.xml          |    2 +-
 make/data/cldr/common/main/fr_PF.xml          |    2 +-
 make/data/cldr/common/main/fr_PM.xml          |    2 +-
 make/data/cldr/common/main/fr_RE.xml          |    2 +-
 make/data/cldr/common/main/fr_RW.xml          |    2 +-
 make/data/cldr/common/main/fr_SC.xml          |    2 +-
 make/data/cldr/common/main/fr_SN.xml          |    2 +-
 make/data/cldr/common/main/fr_SY.xml          |    2 +-
 make/data/cldr/common/main/fr_TD.xml          |    2 +-
 make/data/cldr/common/main/fr_TG.xml          |    2 +-
 make/data/cldr/common/main/fr_TN.xml          |    2 +-
 make/data/cldr/common/main/fr_VU.xml          |    2 +-
 make/data/cldr/common/main/fr_WF.xml          |    2 +-
 make/data/cldr/common/main/fr_YT.xml          |    2 +-
 make/data/cldr/common/main/fur.xml            |    6 +-
 make/data/cldr/common/main/fur_IT.xml         |    2 +-
 make/data/cldr/common/main/fy.xml             |   39 +-
 make/data/cldr/common/main/fy_NL.xml          |    2 +-
 make/data/cldr/common/main/ga.xml             |  529 +-
 make/data/cldr/common/main/ga_GB.xml          |   14 +
 make/data/cldr/common/main/ga_IE.xml          |    2 +-
 make/data/cldr/common/main/gd.xml             | 1250 +++-
 make/data/cldr/common/main/gd_GB.xml          |    2 +-
 make/data/cldr/common/main/gl.xml             | 1258 ++--
 make/data/cldr/common/main/gl_ES.xml          |    2 +-
 make/data/cldr/common/main/gsw.xml            |   32 +-
 make/data/cldr/common/main/gsw_CH.xml         |    2 +-
 make/data/cldr/common/main/gsw_FR.xml         |    2 +-
 make/data/cldr/common/main/gsw_LI.xml         |    2 +-
 make/data/cldr/common/main/gu.xml             | 1000 ++-
 make/data/cldr/common/main/gu_IN.xml          |    2 +-
 make/data/cldr/common/main/guz.xml            |    3 +-
 make/data/cldr/common/main/guz_KE.xml         |    2 +-
 make/data/cldr/common/main/gv.xml             |    4 +-
 make/data/cldr/common/main/gv_IM.xml          |    2 +-
 make/data/cldr/common/main/ha.xml             | 2202 +++---
 make/data/cldr/common/main/ha_GH.xml          |    2 +-
 make/data/cldr/common/main/ha_NE.xml          | 2037 +-----
 make/data/cldr/common/main/ha_NG.xml          |    2 +-
 make/data/cldr/common/main/haw.xml            |    4 +-
 make/data/cldr/common/main/haw_US.xml         |    2 +-
 make/data/cldr/common/main/he.xml             | 1191 ++-
 make/data/cldr/common/main/he_IL.xml          |    2 +-
 make/data/cldr/common/main/hi.xml             | 1128 ++-
 make/data/cldr/common/main/hi_IN.xml          |    2 +-
 make/data/cldr/common/main/hr.xml             | 2365 +++++-
 make/data/cldr/common/main/hr_BA.xml          |    2 +-
 make/data/cldr/common/main/hr_HR.xml          |    2 +-
 make/data/cldr/common/main/hsb.xml            |   50 +-
 make/data/cldr/common/main/hsb_DE.xml         |    2 +-
 make/data/cldr/common/main/hu.xml             |  756 +-
 make/data/cldr/common/main/hu_HU.xml          |    2 +-
 make/data/cldr/common/main/hy.xml             |  842 ++-
 make/data/cldr/common/main/hy_AM.xml          |    2 +-
 make/data/cldr/common/main/ia.xml             |   30 +-
 make/data/cldr/common/main/ia_001.xml         |    2 +-
 make/data/cldr/common/main/id.xml             |  665 +-
 make/data/cldr/common/main/id_ID.xml          |    2 +-
 make/data/cldr/common/main/ig.xml             | 1329 +++-
 make/data/cldr/common/main/ig_NG.xml          |    2 +-
 make/data/cldr/common/main/ii.xml             |    4 +-
 make/data/cldr/common/main/ii_CN.xml          |    2 +-
 make/data/cldr/common/main/is.xml             |  510 +-
 make/data/cldr/common/main/is_IS.xml          |    2 +-
 make/data/cldr/common/main/it.xml             |  326 +-
 make/data/cldr/common/main/it_CH.xml          |    4 +-
 make/data/cldr/common/main/it_IT.xml          |    2 +-
 make/data/cldr/common/main/it_SM.xml          |    2 +-
 make/data/cldr/common/main/it_VA.xml          |    2 +-
 make/data/cldr/common/main/ja.xml             |  925 ++-
 make/data/cldr/common/main/ja_JP.xml          |    2 +-
 make/data/cldr/common/main/jgo.xml            |    6 +-
 make/data/cldr/common/main/jgo_CM.xml         |    2 +-
 make/data/cldr/common/main/jmc.xml            |    3 +-
 make/data/cldr/common/main/jmc_TZ.xml         |    2 +-
 make/data/cldr/common/main/jv.xml             |  844 +--
 make/data/cldr/common/main/jv_ID.xml          |    2 +-
 make/data/cldr/common/main/ka.xml             |  520 +-
 make/data/cldr/common/main/ka_GE.xml          |    2 +-
 make/data/cldr/common/main/kab.xml            |  102 +-
 make/data/cldr/common/main/kab_DZ.xml         |    2 +-
 make/data/cldr/common/main/kam.xml            |    3 +-
 make/data/cldr/common/main/kam_KE.xml         |    2 +-
 make/data/cldr/common/main/kde.xml            |    3 +-
 make/data/cldr/common/main/kde_TZ.xml         |    2 +-
 make/data/cldr/common/main/kea.xml            | 1195 ++-
 make/data/cldr/common/main/kea_CV.xml         |    2 +-
 make/data/cldr/common/main/khq.xml            |    5 +-
 make/data/cldr/common/main/khq_ML.xml         |    2 +-
 make/data/cldr/common/main/ki.xml             |    3 +-
 make/data/cldr/common/main/ki_KE.xml          |    2 +-
 make/data/cldr/common/main/kk.xml             |  354 +-
 make/data/cldr/common/main/kk_KZ.xml          |    2 +-
 make/data/cldr/common/main/kkj.xml            |    4 +-
 make/data/cldr/common/main/kkj_CM.xml         |    2 +-
 make/data/cldr/common/main/kl.xml             |  107 +-
 make/data/cldr/common/main/kl_GL.xml          |    2 +-
 make/data/cldr/common/main/kln.xml            |    3 +-
 make/data/cldr/common/main/kln_KE.xml         |    2 +-
 make/data/cldr/common/main/km.xml             |  282 +-
 make/data/cldr/common/main/km_KH.xml          |    2 +-
 make/data/cldr/common/main/kn.xml             | 1186 ++-
 make/data/cldr/common/main/kn_IN.xml          |    2 +-
 make/data/cldr/common/main/ko.xml             |  792 +-
 make/data/cldr/common/main/ko_KP.xml          |    2 +-
 make/data/cldr/common/main/ko_KR.xml          |    2 +-
 make/data/cldr/common/main/kok.xml            | 4102 ++++++++++-
 make/data/cldr/common/main/kok_IN.xml         |    2 +-
 make/data/cldr/common/main/ks.xml             |    9 +-
 make/data/cldr/common/main/ks_IN.xml          |    2 +-
 make/data/cldr/common/main/ksb.xml            |    3 +-
 make/data/cldr/common/main/ksb_TZ.xml         |    2 +-
 make/data/cldr/common/main/ksf.xml            |    5 +-
 make/data/cldr/common/main/ksf_CM.xml         |    2 +-
 make/data/cldr/common/main/ksh.xml            |   38 +-
 make/data/cldr/common/main/ksh_DE.xml         |    2 +-
 make/data/cldr/common/main/ku.xml             |  242 +-
 make/data/cldr/common/main/ku_TR.xml          |    2 +-
 make/data/cldr/common/main/kw.xml             |    2 +-
 make/data/cldr/common/main/kw_GB.xml          |    2 +-
 make/data/cldr/common/main/ky.xml             |   80 +-
 make/data/cldr/common/main/ky_KG.xml          |    2 +-
 make/data/cldr/common/main/lag.xml            |    3 +-
 make/data/cldr/common/main/lag_TZ.xml         |    2 +-
 make/data/cldr/common/main/lb.xml             |   40 +-
 make/data/cldr/common/main/lb_LU.xml          |    2 +-
 make/data/cldr/common/main/lg.xml             |    3 +-
 make/data/cldr/common/main/lg_UG.xml          |    2 +-
 make/data/cldr/common/main/lkt.xml            |    6 +-
 make/data/cldr/common/main/lkt_US.xml         |    2 +-
 make/data/cldr/common/main/ln.xml             |    6 +-
 make/data/cldr/common/main/ln_AO.xml          |    2 +-
 make/data/cldr/common/main/ln_CD.xml          |    2 +-
 make/data/cldr/common/main/ln_CF.xml          |    2 +-
 make/data/cldr/common/main/ln_CG.xml          |    2 +-
 make/data/cldr/common/main/lo.xml             |  339 +-
 make/data/cldr/common/main/lo_LA.xml          |    2 +-
 make/data/cldr/common/main/lrc.xml            |    8 +-
 make/data/cldr/common/main/lrc_IQ.xml         |    2 +-
 make/data/cldr/common/main/lrc_IR.xml         |    2 +-
 make/data/cldr/common/main/lt.xml             | 1011 ++-
 make/data/cldr/common/main/lt_LT.xml          |    2 +-
 make/data/cldr/common/main/lu.xml             |    5 +-
 make/data/cldr/common/main/lu_CD.xml          |    2 +-
 make/data/cldr/common/main/luo.xml            |    3 +-
 make/data/cldr/common/main/luo_KE.xml         |    2 +-
 make/data/cldr/common/main/luy.xml            |    3 +-
 make/data/cldr/common/main/luy_KE.xml         |    2 +-
 make/data/cldr/common/main/lv.xml             |  867 ++-
 make/data/cldr/common/main/lv_LV.xml          |    2 +-
 make/data/cldr/common/main/mas.xml            |    3 +-
 make/data/cldr/common/main/mas_KE.xml         |    2 +-
 make/data/cldr/common/main/mas_TZ.xml         |    2 +-
 make/data/cldr/common/main/mer.xml            |    3 +-
 make/data/cldr/common/main/mer_KE.xml         |    2 +-
 make/data/cldr/common/main/mfe.xml            |    5 +-
 make/data/cldr/common/main/mfe_MU.xml         |    2 +-
 make/data/cldr/common/main/mg.xml             |    5 +-
 make/data/cldr/common/main/mg_MG.xml          |    2 +-
 make/data/cldr/common/main/mgh.xml            |    5 +-
 make/data/cldr/common/main/mgh_MZ.xml         |    2 +-
 make/data/cldr/common/main/mgo.xml            |    4 +-
 make/data/cldr/common/main/mgo_CM.xml         |    2 +-
 make/data/cldr/common/main/mi.xml             |  153 +-
 make/data/cldr/common/main/mi_NZ.xml          |    2 +-
 make/data/cldr/common/main/mk.xml             |  616 +-
 make/data/cldr/common/main/mk_MK.xml          |    2 +-
 make/data/cldr/common/main/ml.xml             |  657 +-
 make/data/cldr/common/main/ml_IN.xml          |    2 +-
 make/data/cldr/common/main/mn.xml             | 1983 +++--
 make/data/cldr/common/main/mn_MN.xml          |    2 +-
 make/data/cldr/common/main/mr.xml             |  629 +-
 make/data/cldr/common/main/mr_IN.xml          |    2 +-
 make/data/cldr/common/main/ms.xml             | 1570 +++-
 make/data/cldr/common/main/ms_BN.xml          |    2 +-
 make/data/cldr/common/main/ms_MY.xml          |    2 +-
 make/data/cldr/common/main/ms_SG.xml          |    2 +-
 make/data/cldr/common/main/mt.xml             |    8 +-
 make/data/cldr/common/main/mt_MT.xml          |    2 +-
 make/data/cldr/common/main/mua.xml            |    5 +-
 make/data/cldr/common/main/mua_CM.xml         |    2 +-
 make/data/cldr/common/main/my.xml             |  115 +-
 make/data/cldr/common/main/my_MM.xml          |    2 +-
 make/data/cldr/common/main/mzn.xml            |    6 +-
 make/data/cldr/common/main/mzn_IR.xml         |    2 +-
 make/data/cldr/common/main/naq.xml            |    3 +-
 make/data/cldr/common/main/naq_NA.xml         |    2 +-
 make/data/cldr/common/main/nb.xml             | 4299 ++++++++++-
 make/data/cldr/common/main/nb_NO.xml          |    2 +-
 make/data/cldr/common/main/nb_SJ.xml          |    2 +-
 make/data/cldr/common/main/nd.xml             |    3 +-
 make/data/cldr/common/main/nd_ZW.xml          |    2 +-
 make/data/cldr/common/main/nds.xml            |    8 +-
 make/data/cldr/common/main/nds_DE.xml         |    2 +-
 make/data/cldr/common/main/nds_NL.xml         |    4 +-
 make/data/cldr/common/main/ne.xml             |  578 +-
 make/data/cldr/common/main/ne_IN.xml          |    2 +-
 make/data/cldr/common/main/ne_NP.xml          |    2 +-
 make/data/cldr/common/main/nl.xml             | 6516 +++++++++++++++--
 make/data/cldr/common/main/nl_AW.xml          |    2 +-
 make/data/cldr/common/main/nl_BE.xml          |    2 +-
 make/data/cldr/common/main/nl_BQ.xml          |    2 +-
 make/data/cldr/common/main/nl_CW.xml          |    2 +-
 make/data/cldr/common/main/nl_NL.xml          |    2 +-
 make/data/cldr/common/main/nl_SR.xml          |    2 +-
 make/data/cldr/common/main/nl_SX.xml          |    2 +-
 make/data/cldr/common/main/nmg.xml            |    5 +-
 make/data/cldr/common/main/nmg_CM.xml         |    2 +-
 make/data/cldr/common/main/nn.xml             |   30 +-
 make/data/cldr/common/main/nn_NO.xml          |    2 +-
 make/data/cldr/common/main/nnh.xml            |    4 +-
 make/data/cldr/common/main/nnh_CM.xml         |    2 +-
 make/data/cldr/common/main/nus.xml            |    4 +-
 make/data/cldr/common/main/nus_SS.xml         |    2 +-
 make/data/cldr/common/main/nyn.xml            |    3 +-
 make/data/cldr/common/main/nyn_UG.xml         |    2 +-
 make/data/cldr/common/main/om.xml             |    4 +-
 make/data/cldr/common/main/om_ET.xml          |    2 +-
 make/data/cldr/common/main/om_KE.xml          |    2 +-
 make/data/cldr/common/main/or.xml             |  228 +-
 make/data/cldr/common/main/or_IN.xml          |    2 +-
 make/data/cldr/common/main/os.xml             |    6 +-
 make/data/cldr/common/main/os_GE.xml          |    2 +-
 make/data/cldr/common/main/os_RU.xml          |    2 +-
 make/data/cldr/common/main/pa.xml             | 1005 ++-
 make/data/cldr/common/main/pa_Arab.xml        |    8 +-
 make/data/cldr/common/main/pa_Arab_PK.xml     |    2 +-
 make/data/cldr/common/main/pa_Guru.xml        |    2 +-
 make/data/cldr/common/main/pa_Guru_IN.xml     |    2 +-
 make/data/cldr/common/main/pl.xml             | 1022 ++-
 make/data/cldr/common/main/pl_PL.xml          |    2 +-
 make/data/cldr/common/main/prg.xml            |    7 +-
 make/data/cldr/common/main/prg_001.xml        |    2 +-
 make/data/cldr/common/main/ps.xml             | 2508 +++++--
 make/data/cldr/common/main/ps_AF.xml          |    2 +-
 make/data/cldr/common/main/ps_PK.xml          |    2 +-
 make/data/cldr/common/main/pt.xml             | 1223 +++-
 make/data/cldr/common/main/pt_AO.xml          |    2 +-
 make/data/cldr/common/main/pt_BR.xml          |    2 +-
 make/data/cldr/common/main/pt_CH.xml          |    2 +-
 make/data/cldr/common/main/pt_CV.xml          |    4 +-
 make/data/cldr/common/main/pt_GQ.xml          |    2 +-
 make/data/cldr/common/main/pt_GW.xml          |    2 +-
 make/data/cldr/common/main/pt_LU.xml          |    2 +-
 make/data/cldr/common/main/pt_MO.xml          |    2 +-
 make/data/cldr/common/main/pt_MZ.xml          |    2 +-
 make/data/cldr/common/main/pt_PT.xml          | 1112 ++-
 make/data/cldr/common/main/pt_ST.xml          |    2 +-
 make/data/cldr/common/main/pt_TL.xml          |    2 +-
 make/data/cldr/common/main/qu.xml             | 2434 +++++-
 make/data/cldr/common/main/qu_BO.xml          |    2 +-
 make/data/cldr/common/main/qu_EC.xml          |    2 +-
 make/data/cldr/common/main/qu_PE.xml          |    2 +-
 make/data/cldr/common/main/rm.xml             |  311 +-
 make/data/cldr/common/main/rm_CH.xml          |    2 +-
 make/data/cldr/common/main/rn.xml             |    5 +-
 make/data/cldr/common/main/rn_BI.xml          |    2 +-
 make/data/cldr/common/main/ro.xml             | 1241 +++-
 make/data/cldr/common/main/ro_MD.xml          |   11 +-
 make/data/cldr/common/main/ro_RO.xml          |    2 +-
 make/data/cldr/common/main/rof.xml            |    3 +-
 make/data/cldr/common/main/rof_TZ.xml         |    2 +-
 make/data/cldr/common/main/root.xml           |  165 +-
 make/data/cldr/common/main/ru.xml             |  864 ++-
 make/data/cldr/common/main/ru_BY.xml          |    2 +-
 make/data/cldr/common/main/ru_KG.xml          |    2 +-
 make/data/cldr/common/main/ru_KZ.xml          |    2 +-
 make/data/cldr/common/main/ru_MD.xml          |    2 +-
 make/data/cldr/common/main/ru_RU.xml          |    2 +-
 make/data/cldr/common/main/ru_UA.xml          |    2 +-
 make/data/cldr/common/main/rw.xml             |    6 +-
 make/data/cldr/common/main/rw_RW.xml          |    2 +-
 make/data/cldr/common/main/rwk.xml            |    3 +-
 make/data/cldr/common/main/rwk_TZ.xml         |    2 +-
 make/data/cldr/common/main/sah.xml            |   10 +-
 make/data/cldr/common/main/sah_RU.xml         |    2 +-
 make/data/cldr/common/main/saq.xml            |    3 +-
 make/data/cldr/common/main/saq_KE.xml         |    2 +-
 make/data/cldr/common/main/sbp.xml            |    5 +-
 make/data/cldr/common/main/sbp_TZ.xml         |    2 +-
 make/data/cldr/common/main/sd.xml             |  505 +-
 make/data/cldr/common/main/sd_PK.xml          |    2 +-
 make/data/cldr/common/main/se.xml             |   37 +-
 make/data/cldr/common/main/se_FI.xml          |    6 +-
 make/data/cldr/common/main/se_NO.xml          |    2 +-
 make/data/cldr/common/main/se_SE.xml          |    2 +-
 make/data/cldr/common/main/seh.xml            |    5 +-
 make/data/cldr/common/main/seh_MZ.xml         |    2 +-
 make/data/cldr/common/main/ses.xml            |    5 +-
 make/data/cldr/common/main/ses_ML.xml         |    2 +-
 make/data/cldr/common/main/sg.xml             |    5 +-
 make/data/cldr/common/main/sg_CF.xml          |    2 +-
 make/data/cldr/common/main/shi.xml            |    5 +-
 make/data/cldr/common/main/shi_Latn.xml       |    5 +-
 make/data/cldr/common/main/shi_Latn_MA.xml    |    2 +-
 make/data/cldr/common/main/shi_Tfng.xml       |    2 +-
 make/data/cldr/common/main/shi_Tfng_MA.xml    |    2 +-
 make/data/cldr/common/main/si.xml             |  425 +-
 make/data/cldr/common/main/si_LK.xml          |    2 +-
 make/data/cldr/common/main/sk.xml             | 1350 +++-
 make/data/cldr/common/main/sk_SK.xml          |    2 +-
 make/data/cldr/common/main/sl.xml             |  498 +-
 make/data/cldr/common/main/sl_SI.xml          |    2 +-
 make/data/cldr/common/main/smn.xml            |    7 +-
 make/data/cldr/common/main/smn_FI.xml         |    2 +-
 make/data/cldr/common/main/sn.xml             |    5 +-
 make/data/cldr/common/main/sn_ZW.xml          |    2 +-
 make/data/cldr/common/main/so.xml             | 1386 +---
 make/data/cldr/common/main/so_DJ.xml          |    2 +-
 make/data/cldr/common/main/so_ET.xml          |    2 +-
 make/data/cldr/common/main/so_KE.xml          |    2 +-
 make/data/cldr/common/main/so_SO.xml          |    2 +-
 make/data/cldr/common/main/sq.xml             |  463 +-
 make/data/cldr/common/main/sq_AL.xml          |    2 +-
 make/data/cldr/common/main/sq_MK.xml          |    2 +-
 make/data/cldr/common/main/sq_XK.xml          |    2 +-
 make/data/cldr/common/main/sr.xml             |  641 +-
 make/data/cldr/common/main/sr_Cyrl.xml        |    2 +-
 make/data/cldr/common/main/sr_Cyrl_BA.xml     |   43 +-
 make/data/cldr/common/main/sr_Cyrl_ME.xml     |   17 +-
 make/data/cldr/common/main/sr_Cyrl_RS.xml     |    2 +-
 make/data/cldr/common/main/sr_Cyrl_XK.xml     |   17 +-
 make/data/cldr/common/main/sr_Latn.xml        |  625 +-
 make/data/cldr/common/main/sr_Latn_BA.xml     |   45 +-
 make/data/cldr/common/main/sr_Latn_ME.xml     |   39 +-
 make/data/cldr/common/main/sr_Latn_RS.xml     |    2 +-
 make/data/cldr/common/main/sr_Latn_XK.xml     |   45 +-
 make/data/cldr/common/main/sv.xml             | 1321 +++-
 make/data/cldr/common/main/sv_AX.xml          |    2 +-
 make/data/cldr/common/main/sv_FI.xml          |   51 +-
 make/data/cldr/common/main/sv_SE.xml          |    2 +-
 make/data/cldr/common/main/sw.xml             |  589 +-
 make/data/cldr/common/main/sw_CD.xml          |    2 +-
 make/data/cldr/common/main/sw_KE.xml          | 1091 ++-
 make/data/cldr/common/main/sw_TZ.xml          |    2 +-
 make/data/cldr/common/main/sw_UG.xml          |    2 +-
 make/data/cldr/common/main/ta.xml             |  977 ++-
 make/data/cldr/common/main/ta_IN.xml          |    2 +-
 make/data/cldr/common/main/ta_LK.xml          |    2 +-
 make/data/cldr/common/main/ta_MY.xml          |    2 +-
 make/data/cldr/common/main/ta_SG.xml          |    2 +-
 make/data/cldr/common/main/te.xml             |  971 ++-
 make/data/cldr/common/main/te_IN.xml          |    2 +-
 make/data/cldr/common/main/teo.xml            |    3 +-
 make/data/cldr/common/main/teo_KE.xml         |    2 +-
 make/data/cldr/common/main/teo_UG.xml         |    2 +-
 make/data/cldr/common/main/tg.xml             |  258 +-
 make/data/cldr/common/main/tg_TJ.xml          |    2 +-
 make/data/cldr/common/main/th.xml             | 1082 ++-
 make/data/cldr/common/main/th_TH.xml          |    2 +-
 make/data/cldr/common/main/ti.xml             |    4 +-
 make/data/cldr/common/main/ti_ER.xml          |    2 +-
 make/data/cldr/common/main/ti_ET.xml          |    2 +-
 make/data/cldr/common/main/tk.xml             |  251 +-
 make/data/cldr/common/main/tk_TM.xml          |    2 +-
 make/data/cldr/common/main/to.xml             | 1102 ++-
 make/data/cldr/common/main/to_TO.xml          |    2 +-
 make/data/cldr/common/main/tr.xml             | 1128 ++-
 make/data/cldr/common/main/tr_CY.xml          |    2 +-
 make/data/cldr/common/main/tr_TR.xml          |    2 +-
 make/data/cldr/common/main/tt.xml             |   24 +-
 make/data/cldr/common/main/tt_RU.xml          |    2 +-
 make/data/cldr/common/main/twq.xml            |    5 +-
 make/data/cldr/common/main/twq_NE.xml         |    2 +-
 make/data/cldr/common/main/tzm.xml            |    5 +-
 make/data/cldr/common/main/tzm_MA.xml         |    2 +-
 make/data/cldr/common/main/ug.xml             |   32 +-
 make/data/cldr/common/main/ug_CN.xml          |    2 +-
 make/data/cldr/common/main/uk.xml             | 1297 +++-
 make/data/cldr/common/main/uk_UA.xml          |    2 +-
 make/data/cldr/common/main/ur.xml             |  797 +-
 make/data/cldr/common/main/ur_IN.xml          |    3 +-
 make/data/cldr/common/main/ur_PK.xml          |    2 +-
 make/data/cldr/common/main/uz.xml             |  579 +-
 make/data/cldr/common/main/uz_Arab.xml        |    8 +-
 make/data/cldr/common/main/uz_Arab_AF.xml     |    3 +-
 make/data/cldr/common/main/uz_Cyrl.xml        |   33 +-
 make/data/cldr/common/main/uz_Cyrl_UZ.xml     |    2 +-
 make/data/cldr/common/main/uz_Latn.xml        |    2 +-
 make/data/cldr/common/main/uz_Latn_UZ.xml     |    2 +-
 make/data/cldr/common/main/vai.xml            |    5 +-
 make/data/cldr/common/main/vai_Latn.xml       |    5 +-
 make/data/cldr/common/main/vai_Latn_LR.xml    |    2 +-
 make/data/cldr/common/main/vai_Vaii.xml       |    2 +-
 make/data/cldr/common/main/vai_Vaii_LR.xml    |    2 +-
 make/data/cldr/common/main/vi.xml             | 2384 +-----
 make/data/cldr/common/main/vi_VN.xml          |    2 +-
 make/data/cldr/common/main/vo.xml             |    4 +-
 make/data/cldr/common/main/vo_001.xml         |    2 +-
 make/data/cldr/common/main/vun.xml            |    3 +-
 make/data/cldr/common/main/vun_TZ.xml         |    2 +-
 make/data/cldr/common/main/wae.xml            |    6 +-
 make/data/cldr/common/main/wae_CH.xml         |    2 +-
 make/data/cldr/common/main/wo.xml             |    4 +-
 make/data/cldr/common/main/wo_SN.xml          |    2 +-
 make/data/cldr/common/main/xh.xml             |    2 +-
 make/data/cldr/common/main/xh_ZA.xml          |    2 +-
 make/data/cldr/common/main/xog.xml            |    3 +-
 make/data/cldr/common/main/xog_UG.xml         |    2 +-
 make/data/cldr/common/main/yav.xml            |    5 +-
 make/data/cldr/common/main/yav_CM.xml         |    2 +-
 make/data/cldr/common/main/yi.xml             |    8 +-
 make/data/cldr/common/main/yi_001.xml         |    2 +-
 make/data/cldr/common/main/yo.xml             | 1063 ++-
 make/data/cldr/common/main/yo_BJ.xml          |  778 +-
 make/data/cldr/common/main/yo_NG.xml          |    2 +-
 make/data/cldr/common/main/yue.xml            |  483 +-
 make/data/cldr/common/main/yue_Hans.xml       |  484 +-
 make/data/cldr/common/main/yue_Hans_CN.xml    |    2 +-
 make/data/cldr/common/main/yue_Hant.xml       |    2 +-
 make/data/cldr/common/main/yue_Hant_HK.xml    |    2 +-
 make/data/cldr/common/main/zgh.xml            |    5 +-
 make/data/cldr/common/main/zgh_MA.xml         |    2 +-
 make/data/cldr/common/main/zh.xml             |  984 +--
 make/data/cldr/common/main/zh_Hans.xml        |    2 +-
 make/data/cldr/common/main/zh_Hans_CN.xml     |    2 +-
 make/data/cldr/common/main/zh_Hans_HK.xml     |   18 +-
 make/data/cldr/common/main/zh_Hans_MO.xml     |    2 +-
 make/data/cldr/common/main/zh_Hans_SG.xml     |    2 +-
 make/data/cldr/common/main/zh_Hant.xml        | 2502 ++++++-
 make/data/cldr/common/main/zh_Hant_HK.xml     |  283 +-
 make/data/cldr/common/main/zh_Hant_MO.xml     |    2 +-
 make/data/cldr/common/main/zh_Hant_TW.xml     |    2 +-
 make/data/cldr/common/main/zu.xml             |  662 +-
 make/data/cldr/common/main/zu_ZA.xml          |    2 +-
 .../supplemental/attributeValueValidity.xml   |    2 +-
 .../cldr/common/supplemental/characters.xml   |    2 +-
 .../common/supplemental/coverageLevels.xml    |   37 +-
 .../cldr/common/supplemental/dayPeriods.xml   |    2 +-
 .../cldr/common/supplemental/genderList.xml   |    2 +-
 .../common/supplemental/languageGroup.xml     |    2 +-
 .../cldr/common/supplemental/languageInfo.xml |  220 +-
 .../common/supplemental/likelySubtags.xml     |   36 +-
 .../cldr/common/supplemental/metaZones.xml    |    6 +-
 .../common/supplemental/numberingSystems.xml  |    2 +-
 .../cldr/common/supplemental/ordinals.xml     |    4 +-
 .../cldr/common/supplemental/pluralRanges.xml |   16 +-
 .../data/cldr/common/supplemental/plurals.xml |   24 +-
 .../data/cldr/common/supplemental/rgScope.xml |    2 +-
 .../cldr/common/supplemental/subdivisions.xml |   13 +-
 .../common/supplemental/supplementalData.xml  |  104 +-
 .../supplemental/supplementalMetadata.xml     |   29 +-
 .../cldr/common/supplemental/windowsZones.xml |   71 +-
 .../build/tools/cldrconverter/Bundle.java     |   38 +-
 .../tools/cldrconverter/CLDRConverter.java    |    2 +-
 .../tools/cldrconverter/LDMLParseHandler.java |  170 +-
 .../ResourceBundleGenerator.java              |    4 +-
 .../TestDateTimeTextProviderWithLocale.java   |   41 +-
 .../java/util/Calendar/CalendarDataTest.java  |   10 +-
 test/jdk/java/util/Locale/Bug8179071.java     |    6 +-
 .../Locale/bcp47u/CurrencyFormatTests.java    |   24 +-
 test/jdk/sun/text/resources/LocaleData.cldr   |  246 +-
 .../sun/text/resources/LocaleDataTest.java    |    2 +-
 792 files changed, 95054 insertions(+), 35403 deletions(-)
 create mode 100644 make/data/cldr/common/main/ga_GB.xml

diff --git a/make/data/cldr/README b/make/data/cldr/README
index 42f4969b8c2..6ab47d937b8 100644
--- a/make/data/cldr/README
+++ b/make/data/cldr/README
@@ -1,4 +1,4 @@
 CLDR - Unicode Common Locale Data Repository
 http://cldr.unicode.org
 
-CLDR version installed: 35.1
+CLDR version installed: 36
diff --git a/make/data/cldr/common/bcp47/timezone.xml b/make/data/cldr/common/bcp47/timezone.xml
index feaf98d6446..861d6383d95 100644
--- a/make/data/cldr/common/bcp47/timezone.xml
+++ b/make/data/cldr/common/bcp47/timezone.xml
@@ -7,7 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->
 
 
-    
+    
     
         
             
diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd
index 6f310d4204e..bae3714f773 100644
--- a/make/data/cldr/common/dtd/ldml.dtd
+++ b/make/data/cldr/common/dtd/ldml.dtd
@@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 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.
-$Revision: 14983 $
+$Revision$
 -->
 
 
@@ -46,7 +46,7 @@ $Revision: 14983 $
 
     
     
-
+
     
     
 
@@ -2543,7 +2543,7 @@ $Revision: 14983 $
 
 
 
-    
+    
 
     
 
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.dtd b/make/data/cldr/common/dtd/ldmlBCP47.dtd
index d3c802f28ed..f35aee360eb 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.dtd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.dtd
@@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 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.
-$Revision: 14983 $
+$Revision$
 -->
 
 
@@ -16,7 +16,7 @@ $Revision: 14983 $
 
 	
     
-
+
 	
     
 
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.dtd b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
index 232fc87faf8..1aaab13f9d7 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.dtd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
@@ -7,7 +7,7 @@ THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 
 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.
 
-    $Revision: 14983 $
+    $Revision$
 -->
 
 
@@ -17,7 +17,7 @@ Except as contained in this notice, the name of a copyright holder shall not be
 
 	
     
-
+
 	
     
 
diff --git a/make/data/cldr/common/main/af.xml b/make/data/cldr/common/main/af.xml
index 3e8aa5a7e54..bc2965b161d 100644
--- a/make/data/cldr/common/main/af.xml
+++ b/make/data/cldr/common/main/af.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -68,6 +68,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Buginees
 			Blin
 			Katalaans
+			Tsjaakma
 			Tsjetsjeens
 			Cebuano
 			Kiga
@@ -90,7 +91,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Dakota
 			Taita
 			Duits
-			Switserse hoog-Duits
 			Dogrib
 			Zarma
 			Benedesorbies
@@ -107,9 +107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Grieks
 			Engels
 			Engels (VK)
-			Engels (VK)
 			Engels (VSA)
-			Engels (VSA)
 			Esperanto
 			Spaans
 			Estnies
@@ -273,7 +271,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Nama
 			Boeknoors
 			Noord-Ndebele
-			Lae Duits
+			Nederduits
 			Nedersaksies
 			Nepalees
 			Newari
@@ -394,7 +392,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Uighur
 			Oekraïens
 			Umbundu
-			Onbekende of ongeldige taal
+			Onbekende taal
 			Oerdoe
 			Oezbeeks
 			Vai
@@ -417,10 +415,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Jiddisj
 			Yoruba
 			Kantonees
+			Kantonese Chinees
 			Standaard Marokkaanse Tamazight
-			Sjinees
-			Chinees (Vereenvoudig)
-			Chinees (Tradisioneel)
+			Chinees
+			Mandarynse Chinees
+			Mandarynse Chinees (Vereenvoudigd)
+			Mandarynse Chinees (Tradisioneel)
 			Zoeloe
 			Zuni
 			Geen taalinhoud nie
@@ -444,7 +444,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -479,7 +479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 		
 		
@@ -561,6 +561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kongo (Republiek die)
 			Switserland
 			Ivoorkus
+			Cote d’Ivoire
 			Cookeilande
 			Chili
 			Kameroen
@@ -670,8 +671,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Martin
 			Madagaskar
 			Marshalleilande
-			Macedonië
-			Macedonië (VJRM)
+			Noord-Macedonië
 			Mali
 			Mianmar (Birma)
 			Mongolië
@@ -743,7 +743,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			El Salvador
 			Sint Maarten
 			Sirië
-			Swaziland
+			Eswatini
+			Eswatini
 			Tristan da Cunha
 			Turks- en Caicoseilande
 			Tsjad
@@ -753,6 +754,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tadjikistan
 			Tokelau
 			Oos-Timor
+			Oos-Timor
 			Turkmenistan
 			Tunisië
 			Tonga
@@ -779,6 +781,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis en Futuna
 			Samoa
+			Pseudoaksente
+			Pseudotweerigting
 			Kosovo
 			Jemen
 			Mayotte
@@ -797,14 +801,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Kalender
 			Geldeenheidformaat
-			Ignoreer simboolsortering
-			Omgekeerde aksentsortering
-			Hoofletters/kleinletters-sortering
-			Kassensitiewe sortering
+			Ignoreer simboolrangskikking
+			Omgekeerde aksentrangskikking
+			Hoofletter-/kleinletter-rangskikking
+			Kassensitiewe rangskikking
 			Rangskikvolgorde
-			Genormaliseerde sortering
-			Numeriese sortering
-			Sorteringssterkte
+			Genormaliseerde rangskikking
+			Numeriese rangskikking
+			Rangskiksterkte
 			Geldeenheid
 			Uursiklus (12 vs 24)
 			Reëlafbreek-styl
@@ -935,8 +939,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á â b c d e é è ê ë f g h i î ï j k l m n o ô ö p q r s t u û v w x y z]
 		[à å ä ã æ ç í ì ó ò ú ù ü ý]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -972,19 +976,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
-							GGGGG y-MM-dd
+							y-MM-dd GGGGG
 						
 					
 				
 				
 					
 						
-							{1} {0}
+							{1} 'om' {0}
 						
 					
 					
 						
-							{1} {0}
+							{1} 'om' {0}
 						
 					
 					
@@ -1047,11 +1051,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							h B – h B
 							h–h B
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
@@ -1133,8 +1132,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d/M – d/M
 						
 						
-							E, d/M – E, d/M
-							E, d/M – E, d/M
+							E d/M – E d/M
+							E d/M – E d/M
 						
 						
 							MMM – MMM
@@ -1144,8 +1143,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d MMM – d MMM
 						
 						
-							E, d MMM – E, d MMM
-							E, d MMM – E, d MMM
+							E d MMM – E d MMM
+							E d MMM – E d MMM
 						
 						
 							y – y G
@@ -1160,23 +1159,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d/M/y – d/M/y GGGGG
 						
 						
-							E, d/M/y – E, d/M/y GGGGG
-							E, d/M/y – E, d/M/y GGGGG
-							E, d/M/y – E, d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
 						
 						
 							MMM–MMM y G
 							MMM y – MMM y G
 						
 						
-							d–d MMM, y G
+							d–d MMM y G
 							d MMM – d MMM y G
-							d MMM, y – d MMM, y G
+							d MMM y – d MMM y G
 						
 						
-							E, d MMM – E, d MMM, y G
-							E, d MMM – E, d MMM, y G
-							E, d MMM y – E, d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
 						
 						
 							MMMM–MMMM y G
@@ -1543,12 +1542,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						h B
-						h:mm B
-						h:mm:ss B
+						hh:mm B
+						hh:mm:ss B
 						d
 						ccc
-						E h:mm B
-						E h:mm:ss B
+						E hh:mm B
+						E hh:mm:ss B
 						E d
 						E hh:mm a
 						E HH:mm
@@ -1766,6 +1765,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				j.
+				verlede j.
+				hierdie j.
+				volgende j.
 				
 					oor {0} j.
 					oor {0} j.
@@ -1777,6 +1779,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				j.
+				verlede j.
+				hierdie j.
+				volgende j.
 				
 					oor {0} j.
 					oor {0} j.
@@ -1838,6 +1843,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				md.
+				verlede md.
+				hierdie md.
+				volgende md.
 				
 					oor {0} md.
 					oor {0} md.
@@ -1849,6 +1857,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				md.
+				verlede md.
+				hierdie md.
+				volgende md.
 				
 					oor {0} md.
 					oor {0} md.
@@ -1875,6 +1886,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				wk.
+				verlede w.
+				hierdie w.
+				volgende w.
 				
 					oor {0} w.
 					oor {0} w.
@@ -1887,6 +1901,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				wk.
+				verlede w.
+				hierdie w.
+				volgende w.
 				
 					oor {0} w.
 					oor {0} w.
@@ -2008,17 +2025,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				verlede Son.
-				dié So.
-				vlg. So.
 				
 					oor {0} So.
 					oor {0} So.
 				
-				
-					{0} Sondae gelede
-					{0} Sondae gelede
-				
 			
 			
 				verlede Maandag
@@ -2054,10 +2064,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					oor {0} Ma.
 					oor {0} Ma.
 				
-				
-					{0} Maandae gelede
-					{0} Maandae gelede
-				
 			
 			
 				verlede Dinsdag
@@ -2093,10 +2099,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					oor {0} Di.
 					oor {0} Di.
 				
-				
-					{0} Dinsdae gelede
-					{0} Dinsdae gelede
-				
 			
 			
 				verlede Woensdag
@@ -2132,10 +2134,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					oor {0} Wo.
 					oor {0} Wo.
 				
-				
-					{0} Woensdae gelede
-					{0} Woensdae gelede
-				
 			
 			
 				verlede Donderdag
@@ -2171,10 +2169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					oor {0} Do.
 					oor {0} Do.
 				
-				
-					{0} Donderdae gelede
-					{0} Donderdae gelede
-				
 			
 			
 				verlede Vrydag
@@ -2191,7 +2185,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				verlede Vr.
-				dié Vr.
+				hierdie Vr.
 				vlg. Vr.
 				
 					oor {0} Vr.
@@ -2204,16 +2198,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				verlede Vr.
-				dié Vr.
-				vlg. Vr.
+				hierdie Vr.
+				volgende Vr.
 				
 					oor {0} Vr.
 					oor {0} Vr.
 				
-				
-					{0} Vrydae gelede
-					{0} Vrydae gelede
-				
 			
 			
 				verlede Saterdag
@@ -2231,7 +2221,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				verlede Sa.
 				dié Sa.
-				vlg. Sa.
+				volgende Sa.
 				
 					oor {0} Sa.
 					oor {0} Sa.
@@ -2243,16 +2233,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				verlede Sa.
-				dié Sa.
-				vlg. Sa.
+				hierdie Sa.
+				volgende Sa.
 				
 					oor {0} Sa.
 					oor {0} Sa.
 				
-				
-					{0} Saterdae gelede
-					{0} Saterdae gelede
-				
 			
 			
 				vm./nm.
@@ -3060,6 +3046,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aqtobe
 			
+			
+				Kostanay
+			
 			
 				Qyzylorda
 			
@@ -3932,7 +3921,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					Colombië-tyd
 					Colombië-standaardtyd
-					Colombië-somertyd
+					Colombia-somertyd
 				
 			
 			
@@ -4592,12 +4581,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			,
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4606,6 +4601,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 duisend
@@ -4719,255 +4719,334 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			
-				Verenigde Arabiese Emirate dirham
-				Verenigde Arabiese Emirate dirham
-				Verenigde Arabiese Emirate dirham
+				Verenigde Arabiese Emirate-dirham
+				VAE-dirham
+				VAE-dirham
+				AED
 			
 			
 				Afgaanse afgani
 				Afgaanse afgani
 				Afgaanse afgani
+				AFN
 			
 			
 				Albanese lek
 				Albanese lek
 				Albanese lek
+				ALL
 			
 			
 				Armeense dram
 				Armeense dram
 				Armeense dram
+				AMD
 			
 			
 				Nederlands-Antilliaanse gulde
 				Nederlands-Antilliaanse gulde
 				Nederlands-Antilliaanse gulde
+				ANG
 			
 			
 				Angolese kwanza
 				Angolese kwanza
 				Angolese kwanza
+				AOA
+				Kz
 			
 			
 				Argentynse peso
 				Argentynse peso
 				Argentynse peso
+				ARS
+				$
 			
 			
 				Australiese dollar
 				Australiese dollar
 				Australiese dollar
+				A$
+				$
 			
 			
 				Arubaanse floryn
 				Arubaanse floryn
 				Arubaanse floryn
+				AWG
 			
 			
 				Azerbeidjaanse manat
 				Azerbeidjaanse manat
 				Azerbeidjaanse manat
+				AZN
 			
 			
 				Bosnies-Herzegowiniese omskakelbare marka
 				Bosnies-Herzegowiniese omskakelbare marka
 				Bosnies-Herzegowiniese omskakelbare marka
+				BAM
+				KM
 			
 			
 				Barbados-dollar
 				Barbados-dollar
 				Barbados-dollar
+				BBD
+				$
 			
 			
 				Bangladesjiese taka
 				Bangladesjiese taka
 				Bangladesjiese taka
+				BDT
+				৳
 			
 			
 				Bulgaarse lev
 				Bulgaarse lev
 				Bulgaarse lev
+				BGN
 			
 			
 				Bahreinse dinar
 				Bahreinse dinar
 				Bahreinse dinar
+				BHD
 			
 			
 				Burundiese frank
 				Burundiese frank
 				Burundiese frank
+				BIF
 			
 			
 				Bermuda-dollar
 				Bermuda-dollar
 				Bermuda-dollar
+				BMD
+				$
 			
 			
 				Broeneise dollar
 				Broeneise dollar
 				Broeneise dollar
+				BND
+				$
 			
 			
 				Boliviaanse boliviano
 				Boliviaanse boliviano
 				Boliviaanse boliviano
+				BOB
+				Bs
 			
 			
 				Brasilliaanse reaal
 				Brasillianse reaal
 				Brasillianse reaal
+				R$
+				R$
 			
 			
 				Bahamiaanse dollar
 				Bahamiaanse dollar
 				Bahamiaanse dollar
+				BSD
+				$
 			
 			
 				Bhoetanese ngoeltroem
 				Bhoetanese ngoeltroem
 				Bhoetanese ngoeltroem
+				BTN
 			
 			
-				Botswana pula
-				Botswana pula
-				Botswana pula
+				Botswana-pula
+				Botswana-pula
+				Botswana-pula
+				BWP
+				P
 			
 			
-				Belo-Russiese roebel
-				Belo-Russiese roebel
-				Belo-Russiese roebel
+				Belarusiese roebel
+				Belarusiese roebel
+				Belarusiese roebel
+				BYN
+				р.
 			
 			
 				Belo-Russiese roebel (2000–2016)
 				Belo-Russiese roebel (2000–2016)
 				Belo-Russiese roebel (2000–2016)
+				BYR
 			
 			
 				Beliziese dollar
 				Beliziese dollar
 				Beliziese dollar
+				BZD
+				$
 			
 			
 				Kanadese dollar
 				Kanadese dollar
 				Kanadese dollar
+				CAD
+				$
 			
 			
 				Kongolese frank
 				Kongolese frank
 				Kongolese frank
+				CDF
 			
 			
 				Switserse frank
 				Switserse frank
 				Switserse frank
+				CHF
 			
 			
 				Chileense peso
 				Chileense peso
 				Chileense peso
+				CLP
+				$
 			
 			
-				Chinese joean
+				Chinese joean (buiteland)
 				Chinese joean (buiteland)
 				Chinese joean (buiteland)
+				CNH
 			
 			
-				Sjinese joean renminbi
-				Sjinese joean renminbi
-				Sjinese joean renminbi
+				Chinese joean
+				Chinese joean
+				Chinese joean
+				CN¥
+				¥
 			
 			
 				Colombiaanse peso
 				Colombiaanse peso
 				Colombiaanse peso
+				COP
+				$
 			
 			
 				Costa Ricaanse colón
 				Costa Ricaanse colón
 				Costa Ricaanse colón
+				CRC
+				₡
 			
 			
 				Kubaanse omskakelbare peso
 				Kubaanse omskakelbare peso
 				Kubaanse omskakelbare peso
+				CUC
+				$
 			
 			
 				Kubaanse peso
 				Kubaanse peso
 				Kubaanse peso
+				CUP
+				$
 			
 			
 				Kaap Verdiese escudo
 				Kaap Verdiese escudo
 				Kaap Verdiese escudo
+				CVE
 			
 			
 				Tsjeggiese kroon
 				Tsjeggiese kroon
 				Tsjeggiese kroon
+				CZK
+				Kč
 			
 			
-				Djiboeti frank
-				Djiboeti frank
-				Djiboeti frank
+				Djiboeti-frank
+				Djiboeti-frank
+				Djiboeti-frank
+				DJF
 			
 			
 				Deense kroon
 				Deense kroon
 				Deense kroon
+				DKK
+				kr
 			
 			
 				Dominikaanse peso
 				Dominikaanse peso
 				Dominikaanse peso
+				DOP
+				$
 			
 			
 				Algeriese dinar
 				Algeriese dinar
 				Algeriese dinar
+				DZD
 			
 			
 				Egiptiese pond
 				Egiptiese pond
 				Egiptiese pond
+				EGP
+				E£
 			
 			
 				Eritrese nakfa
 				Eritrese nakfa
 				Eritrese nakfa
+				ERN
 			
 			
 				Etiopiese birr
 				Etiopiese birr
 				Etiopiese birr
+				ETB
 			
 			
 				euro
 				euro
 				euro
+				€
 				€
 			
 			
 				Fidjiaanse dollar
 				Fidjiaanse dollar
 				Fidjiaanse dollar
+				FJD
+				$
 			
 			
-				Falkland-eilande pond
-				Falkland-eilande pond
-				Falkland-eilande pond
+				Falkland-eilandse pond
+				Falkland-eilandse pond
+				Falkland-eilandse pond
+				FKP
+				£
 			
 			
 				Britse pond
 				Britse pond
 				Britse pond
+				£
+				£
 			
 			
 				Georgiese lari
 				Georgiese lari
 				Georgiese lari
+				GEL
+				₾
 				₾
 			
 			
@@ -4977,21 +5056,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ghanese cedi
 				Ghanese cedi
 				Ghanese cedi
+				GHS
 			
 			
 				Gibraltarese pond
 				Gibraltarese pond
 				Gibraltarese pond
+				GIP
+				£
 			
 			
 				Gambiese dalasi
 				Gambiese dalasi
 				Gambiese dalasi
+				GMD
 			
 			
 				Guinese frank
 				Guinese frank
 				Guinese frank
+				GNF
+				FG
 			
 			
 				Guinese syli
@@ -5000,66 +5085,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guatemalaanse quetzal
 				Guatemalaanse quetzal
 				Guatemalaanse quetzal
+				GTQ
+				Q
 			
 			
 				Guyanese dollar
 				Guyanese dollar
 				Guyanese dollar
+				GYD
+				$
 			
 			
-				Hong Kong dollar
-				Hong Kong dollar
-				Hong Kong dollar
+				Hongkongse dollar
+				Hongkongse dollar
+				Hongkongse dollar
+				HK$
+				$
 			
 			
 				Hondurese lempira
 				Hondurese lempira
 				Hondurese lempira
+				HNL
+				L
 			
 			
 				Kroatiese kuna
 				Kroatiese kuna
 				Kroatiese kuna
+				HRK
+				kn
 			
 			
 				Haïtiaanse gourde
 				Haïtiaanse gourde
 				Haïtiaanse gourde
+				HTG
 			
 			
 				Hongaarse florint
 				Hongaarse florint
 				Hongaarse florint
+				HUF
+				Ft
 			
 			
 				Indonesiese roepia
 				Indonesiese roepia
 				Indonesiese roepia
+				IDR
+				Rp
 			
 			
 				Israeliese nuwe sikkel
 				Israeliese nuwe sikkel
 				Israeliese nuwe sikkel
+				₪
+				₪
 			
 			
 				Indiese roepee
 				Indiese rupee
 				Indiese rupee
+				₹
+				₹
 			
 			
 				Irakse dinar
 				Irakse dinar
 				Irakse dinar
+				IQD
 			
 			
 				Iranse rial
 				Iranse rial
 				Iranse rial
+				IRR
 			
 			
 				Yslandse kroon
 				Yslandse kroon
 				Yslandse kroon
+				ISK
+				kr
 			
 			
 				Italiaanse lier
@@ -5068,81 +5176,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jamaikaanse dollar
 				Jamaikaanse dollar
 				Jamaikaanse dollar
+				JMD
+				$
 			
 			
 				Jordaniese dinar
 				Jordaniese dinar
 				Jordaniese dinar
+				JOD
 			
 			
 				Japannese jen
 				Japannese jen
 				Japannese jen
+				JP¥
+				¥
 			
 			
 				Keniaanse sjieling
 				Keniaanse sjieling
 				Keniaanse sjieling
+				KES
 			
 			
 				Kirgisiese som
 				Kirgisiese som
 				Kirgisiese som
+				KGS
 			
 			
 				Kambodjaanse riel
 				Kambodjaanse riel
 				Kambodjaanse riel
+				KHR
+				៛
 			
 			
 				Comoraanse frank
 				Comoraanse frank
 				Comoraanse frank
+				KMF
+				CF
 			
 			
 				Noord-Koreaanse won
 				Noord-Koreaanse won
 				Noord-Koreaanse won
+				KPW
+				₩
 			
 			
 				Suid-Koreaanse won
 				Suid-Koreaanse won
 				Suid-Koreaanse won
+				₩
+				₩
 			
 			
 				Koeweitse dinar
 				Koeweitse dinar
 				Koeweitse dinar
+				KWD
 			
 			
-				Cayman-eilande dollar
-				Cayman-eilande dollar
-				Cayman-eilande dollar
+				Cayman-eilandse dollar
+				Cayman-eilandse dollar
+				Cayman-eilandse dollar
+				KYD
+				$
 			
 			
 				Kazakse tenge
 				Kazakse tenge
 				Kazakse tenge
+				KZT
+				₸
 			
 			
 				Laosiaanse kip
 				Laosiaanse kip
 				Laosiaanse kip
+				LAK
+				₭
 			
 			
-				Lebanese pond
-				Lebanese pond
-				Lebanese pond
+				Libanese pond
+				Libanese pond
+				Libanese pond
+				LBP
+				L£
 			
 			
 				Sri Lankaanse roepee
 				Sri Lankaanse roepee
 				Sri Lankaanse roepee
+				LKR
+				Rs
 			
 			
 				Liberiese dollar
 				Liberiese dollar
 				Liberiese dollar
+				LRD
+				$
 			
 			
 				Lesotho loti
@@ -5151,85 +5287,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Litause litas
 				Litause litas
 				Litause litas
+				LTL
 			
 			
 				Lettiese lats
+				LVL
 			
 			
 				Libiese dinar
 				Libiese dinar
 				Libiese dinar
+				LYD
 			
 			
 				Marokkaanse dirham
 				Marokkaanse dirham
 				Marokkaanse dirham
+				MAD
 			
 			
 				Moldowiese leu
 				Moldowiese leu
 				Moldowiese leu
+				MDL
 			
 			
 				Malgassiese ariary
 				Malgassiese ariary
 				Malgassiese ariary
+				MGA
+				Ar
 			
 			
 				Macedoniese denar
 				Macedoniese denar
 				Macedoniese denar
+				MKD
 			
 			
 				Mianmese kyat
 				Mianmese kyat
 				Mianmese kyat
+				MMK
+				K
 			
 			
 				Mongoolse toegrik
 				Mongoolse toegrik
 				Mongoolse toegrik
+				MNT
+				₮
 			
 			
 				Macaose pataca
 				Macaose pataca
 				Macaose pataca
+				MOP
 			
 			
 				Mauritaniese ouguiya (1973–2017)
 				Mauritaniese ouguiya (1973–2017)
 				Mauritaniese ouguiya (1973–2017)
+				MRO
 			
 			
 				Mauritaniese ouguiya
 				Mauritaniese ouguiya
 				Mauritaniese ouguiya
+				MRU
 			
 			
-				Mauritiaanse rupee
-				Mauritiaanse rupee
-				Mauritiaanse rupee
+				Mauritiaanse roepee
+				Mauritiaanse roepee
+				Mauritiaanse roepee
+				MUR
+				Rs
 			
 			
 				Malediviese rufia
 				Malediviese rufia
 				Malediviese rufia
+				MVR
 			
 			
 				Malawiese kwacha
 				Malawiese kwacha
 				Malawiese kwacha
+				MWK
 			
 			
 				Meksikaanse peso
 				Meksikaanse peso
 				Meksikaanse peso
 				MXN
+				$
 			
 			
 				Maleisiese ringgit
 				Maleisiese ringgit
 				Maleisiese ringgit
+				MYR
+				RM
 			
 			
 				Mosambiekse metical (1980–2006)
@@ -5238,123 +5396,160 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mosambiekse metical
 				Mosambiekse metical
 				Mosambiekse metical
+				MZN
 			
 			
 				Namibiese dollar
 				Namibiese dollar
 				Namibiese dollar
+				NAD
+				$
 			
 			
 				Nigeriese naira
 				Nigeriese naira
 				Nigeriese naira
+				NGN
+				₦
 			
 			
 				Nicaraguaanse córdoba
 				Nicaraguaanse córdoba
 				Nicaraguaanse córdoba
+				NIO
+				C$
 			
 			
 				Noorse kroon
 				Noorse kroon
 				Noorse kroon
+				NOK
+				kr
 			
 			
 				Nepalese roepee
 				Nepalese roepee
 				Nepalese roepee
+				NPR
+				Rs
 			
 			
-				Nieu-Seeland dollar
-				Nieu-Seeland dollar
-				Nieu-Seeland dollar
+				Nieu-Seelandse dollar
+				Nieu-Seelandse dollar
+				Nieu-Seelandse dollar
+				NZ$
+				$
 			
 			
 				Omaanse rial
 				Omaanse rial
 				Omaanse rial
+				OMR
 			
 			
 				Panamese balboa
 				Panamese balboa
 				Panamese balboa
+				PAB
 			
 			
 				Peruaanse sol
 				Peruaanse sol
 				Peruaanse sol
+				PEN
 			
 			
 				Papoea-Nieu-Guinese kina
 				Papoea-Nieu-Guinese kina
 				Papoea-Nieu-Guinese kina
+				PGK
 			
 			
 				Filippynse peso
 				Filippynse peso
 				Filippynse peso
+				PHP
+				₱
 			
 			
 				Pakistanse roepee
 				Pakistanse roepee
 				Pakistanse roepee
+				PKR
+				Rs
 			
 			
 				Poolse zloty
 				Poolse zloty
 				Poolse zloty
+				PLN
+				zł
 			
 			
 				Paraguaanse guarani
 				Paraguaanse guarani
 				Paraguaanse guarani
+				PYG
+				₲
 			
 			
 				Katarrese rial
 				Katarese rial
 				Katarese rial
+				QAR
 			
 			
 				Roemeense leu
 				Roemeense leu
 				Roemeense leu
+				RON
 				leu
 			
 			
-				Serbiese dinar
-				Serbiese dinar
-				Serbiese dinar
+				Serwiese dinar
+				Serwiese dinar
+				Serwiese dinar
+				RSD
 			
 			
 				Russiese roebel
 				Russiese roebel
 				Russiese roebel
+				RUB
+				₽
 				₽
 			
 			
-				Rwandiese frank
-				Rwandiese frank
-				Rwandiese frank
+				Rwandese frank
+				Rwandese frank
+				Rwandese frank
+				RWF
+				RF
 			
 			
 				Saoedi-Arabiese riyal
 				Saoedi-Arabiese riyal
 				Saoedi-Arabiese riyal
+				SAR
 			
 			
-				Salomonseilande dollar
-				Salomonseilande dollar
-				Salomonseilande dollar
+				Salomonseilandse dollar
+				Salomonseilandse dollar
+				Salomonseilandse dollar
+				SBD
+				$
 			
 			
-				Seychellese rupee
-				Seychellese rupee
-				Seychellese rupee
+				Seychellese roepee
+				Seychellese roepee
+				Seychellese roepee
+				SCR
 			
 			
 				Soedannese pond
 				Soedannese pond
 				Soedannese pond
+				SDG
 			
 			
 				Soedannese pond (1957–1998)
@@ -5363,177 +5558,227 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sweedse kroon
 				Sweedse kroon
 				Sweedse kroon
+				SEK
+				kr
 			
 			
-				Singapoer dollar
-				Singapoer dollar
-				Singapoer dollar
+				Singapoer-dollar
+				Singapoer-dollar
+				Singapoer-dollar
+				SGD
+				$
 			
 			
-				Sint Helena pond
-				Sint Helena pond
-				Sint Helena pond
+				Sint Helena-pond
+				Sint Helena-pond
+				Sint Helena-pond
+				SHP
+				£
 			
 			
 				Sierra Leoniese leone
 				Sierra Leoniese leone
 				Sierra Leoniese leone
+				SLL
 			
 			
 				Somaliese sjieling
 				Somaliese sjieling
 				Somaliese sjieling
+				SOS
 			
 			
 				Surinaamse dollar
 				Surinaamse dollar
 				Surinaamse dollar
+				SRD
+				$
 			
 			
 				Suid-Soedanese pond
 				Suid-Soedanese pond
 				Suid-Soedanese pond
+				SSP
+				£
 			
 			
 				São Tomé en Príncipe dobra (1977–2017)
 				São Tomé en Príncipe dobra (1977–2017)
 				São Tomé en Príncipe dobra (1977–2017)
+				STD
 			
 			
-				São Tomé en Príncipe dobra
-				São Tomé en Príncipe dobra
-				São Tomé en Príncipe dobra
+				São Tomé en Príncipe-dobra
+				São Tomé en Príncipe-dobra
+				São Tomé en Príncipe-dobra
+				STN
 				Db
 			
 			
 				Siriese pond
 				Siriese pond
 				Siriese pond
+				SYP
+				£
 			
 			
 				Swazilandse lilangeni
 				Swazilandse lilangeni
 				Swazilandse lilangeni
+				SZL
 			
 			
 				Thaise baht
 				Thaise baht
 				Thaise baht
 				฿
+				฿
 			
 			
-				Tadjikse roebel
-				Tadjikse roebel
-				Tadjikse roebel
+				Tadjikse somoni
+				Tadjikse somoni
+				Tadjikse somoni
+				TJS
 			
 			
 				Turkmeense manat
 				Turkmeense manat
 				Turkmeense manat
+				TMT
 			
 			
 				Tunisiese dinar
 				Tunisiese dinar
 				Tunisiese dinar
+				TND
 			
 			
 				Tongaanse pa’anga
 				Tongaanse pa’anga
 				Tongaanse pa’anga
+				TOP
+				T$
 			
 			
 				Turkse lier (1922–2005)
 			
 			
-				Turkse lier
-				Turkse lier
-				Turkse lier
+				Turkse lira
+				Turkse lira
+				Turkse lira
+				TRY
+				₺
+				TL
 			
 			
-				Trinidad en Tobago dollar
-				Trinidad en Tobago dollar
-				Trinidad en Tobago dollar
+				Trinidad en Tobago-dollar
+				Trinidad en Tobago-dollar
+				Trinidad en Tobago-dollar
+				TTD
+				$
 			
 			
 				Nuwe Taiwanese dollar
 				Nuwe Taiwanese dollar
 				Nuwe Taiwanese dollar
+				NT$
 				NT$
 			
 			
 				Tanzaniese sjieling
 				Tanzaniese sjieling
 				Tanzaniese sjieling
+				TZS
 			
 			
 				Oekraïnse hriwna
 				Oekraïnse hriwna
 				Oekraïnse hriwna
+				UAH
+				₴
 			
 			
 				Ugandese sjieling
 				Ugandese sjieling
 				Ugandese sjieling
+				UGX
 			
 			
-				Amerikaanse dollar
-				Amerikaanse dollar
-				Amerikaanse dollar
+				VSA-dollar
+				VSA-dollar
+				VSA-dollar
+				USD
+				$
 			
 			
 				Uruguaanse peso
 				Uruguaanse peso
 				Uruguaanse peso
+				UYU
+				$
 			
 			
 				Oezbekiese som
 				Oezbekiese som
 				Oezbekiese som
+				UZS
 			
 			
 				Venezolaanse bolivar
 				Venezolaanse bolívar (2008–2018)
 				Venezolaanse bolívare (2008–2018)
+				VEF
+				Bs
 			
 			
-				Venezolaanse Bolívar
+				Venezolaanse bolívar
 				Venezolaanse bolívar
-				Venezolaanse bolívare
+				Venezolaanse bolívar
+				VES
 			
 			
 				Viëtnamese dong
 				Viëtnamese dong
 				Viëtnamese dong
+				₫
+				₫
 			
 			
 				Vanuatuse vatu
 				Vanuatuse vatu
 				Vanuatuse vatu
+				VUV
 			
 			
 				Samoaanse tala
 				Samoaanse tala
 				Samoaanse tala
+				WST
 			
 			
-				CFA frank BEAC
-				CFA frank BEAC
-				CFA frank BEAC
+				Sentraal Afrikaanse CFA-frank
+				Sentraal Afrikaanse CFA-frank
+				Sentraal Afrikaanse CFA-frank
+				FCFA
 			
 			
-				Oos-Karibbiese dollar
-				Oos-Karibbiese dollar
-				Oos-Karibbiese dollar
+				Oos-Karibiese dollar
+				Oos-Karibiese dollar
+				Oos-Karibiese dollar
+				EC$
+				$
 			
 			
-				CFA frank BCEAO
-				CFA frank BCEAO
-				CFA frank BCEAO
+				Wes-Afrikaanse CFA-frank
+				Wes-Afrikaanse CFA-frank
+				Wes-Afrikaanse CFA-frank
+				CFA
 			
 			
 				CFP-frank
 				CFP-frank
 				CFP-frank
+				CFPF
 			
 			
 				onbekende geldeenheid
@@ -5544,12 +5789,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jemenitiese rial
 				Jemenitiese rial
 				Jemenitiese rial
+				YER
 			
 			
 				Suid-Afrikaanse rand
 				Suid-Afrikaanse rand
 				Suid-Afrikaanse rand
 				R
+				R
 			
 			
 				Zambiese kwacha (1968–2012)
@@ -5558,6 +5805,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zambiese kwacha
 				Zambiese kwacha
 				Zambiese kwacha
+				ZMW
+				ZK
 			
 			
 				Zimbabwiese dollar
@@ -5581,24 +5830,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per {1}
 			
 			
-				swaartekrag van die Aarde
-				{0} swaartekrag van die Aarde
-				{0} swaartekrag van die Aarde
+				swaartekrag
+				{0} swaartekrag
+				{0} swaartekrag
 			
 			
-				m/s²
-				{0} m/s²
-				{0} m/s²
+				meter per vierkante sekonde
+				{0} meter per vierkante sekonde
+				{0} meter per vierkante sekonde
 			
 			
-				rewolusie
-				{0} rewolusie
-				{0} rewolusies
+				omwenteling
+				{0} omwenteling
+				{0} omwentelings
 			
 			
-				radiale
-				{0} radiaal
-				{0} radiale
+				boogmate
+				{0} boogmaat
+				{0} boogmate
 			
 			
 				grade
@@ -5645,9 +5894,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per vierkante myl
 			
 			
-				akker
-				{0} akker
-				{0} akker
+				acre
+				{0} acre
+				{0} acre
 			
 			
 				vierkante jaart
@@ -5666,9 +5915,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per vierkante duim
 			
 			
-				donums
+				donum
 				{0} donum
-				{0} donums
+				{0} donum
 			
 			
 				karaat
@@ -5687,7 +5936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dele per miljoen
-				{0} dele per miljoen
+				{0} deel per miljoen
 				{0} dele per miljoen
 			
 			
@@ -5696,19 +5945,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} persent
 			
 			
-				per mille
-				{0} per mille
-				{0} per mille
+				per duisend
+				{0} per duisend
+				{0} per duisend
 			
 			
-				permiriade
-				{0} permiriade
-				{0} permiriade
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				per tienduisend
+				{0} per tienduisend
+				{0} per tienduisend
 			
 			
 				liter per kilometer
@@ -5716,69 +5960,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} liter per kilometer
 			
 			
-				liter per 100 kilometers
-				{0} liter per 100 kilometers
-				{0} liter per 100 kilometers
+				liter per 100 kilometer
+				{0} liter per 100 kilometer
+				{0} liter per 100 kilometer
 			
 			
-				myl per gelling
-				{0} myl per gelling
-				{0} myl per gelling
+				myl per VSA-gelling
+				{0} myl per VSA-gelling
+				{0} myl per VSA-gelling
 			
 			
-				myl per imp. gelling
-				{0} myl per imp. gelling
-				{0} myl per imp. gelling
+				myl per Britse gelling
+				{0} myl per Britse gelling
+				{0} myl per Britse gelling
 			
 			
-				petagrepe
+				petagreep
 				{0} petagreep
-				{0} petagrepe
+				{0} petagreep
 			
 			
-				TB
-				{0} TB
-				{0} TB
+				teragreep
+				{0} teragreep
+				{0} teragreep
 			
 			
-				Tb
-				{0} Tb
-				{0} Tb
+				terabis
+				{0} terabis
+				{0} terabis
 			
 			
-				GB
-				{0} GB
-				{0} GB
+				gigagreep
+				{0} gigagreep
+				{0} gigagreep
 			
 			
-				Gb
-				{0} Gb
-				{0} Gb
+				gigabis
+				{0} gigabis
+				{0} gigabis
 			
 			
-				MB
-				{0} MB
-				{0} MB
+				megagreep
+				{0} megagreep
+				{0} megagreep
 			
 			
-				Mb
-				{0} Mb
-				{0} Mb
+				megabis
+				{0} megabis
+				{0} megabis
 			
 			
-				kB
-				{0} kB
-				{0} kB
+				kilogreep
+				{0} kilogreep
+				{0} kilogreep
 			
 			
-				kb
-				{0} kb
-				{0} kb
+				kilobis
+				{0} kilobis
+				{0} kilobis
 			
 			
-				grepe
+				greep
 				{0} greep
-				{0} grepe
+				{0} greep
 			
 			
 				bis
@@ -5790,6 +6034,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eeu
 				{0} eeue
 			
+			
+				dekades
+				{0} dekade
+				{0} dekades
+			
 			
 				jaar
 				{0} jaar
@@ -5800,25 +6049,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maande
 				{0} maand
 				{0} maande
-				{0}/md.
+				{0}/maand
 			
 			
 				weke
 				{0} week
 				{0} weke
-				{0}/w.
+				{0} per week
 			
 			
 				dae
 				{0} dag
 				{0} dae
-				{0}/d.
+				{0} per dag
 			
 			
 				uur
 				{0} uur
 				{0} uur
-				{0}/h
+				{0} per uur
 			
 			
 				minute
@@ -5848,14 +6097,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nanosekondes
 			
 			
-				ampere
-				{0} ampere
-				{0} ampere
+				ampère
+				{0} ampère
+				{0} ampère
 			
 			
-				mA
-				{0} mA
-				{0} mA
+				milliampère
+				{0} milliampère
+				{0} milliampère
 			
 			
 				ohm
@@ -5868,24 +6117,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} volt
 			
 			
-				kilokalorië
+				kilokalorieë
 				{0} kilokalorie
-				{0} kilokalorië
+				{0} kilokalorieë
 			
 			
-				kalorië
+				kalorieë
 				{0} kalorie
-				{0} kalorië
+				{0} kalorieë
 			
 			
-				Kalorië
-				{0} Kalorie
-				{0} Kalorië
+				kilokalorieë
+				{0} kilokalorie
+				{0} kilokalorieë
 			
 			
-				kJ
-				{0} kJ
-				{0} kJ
+				kilojoule
+				{0} kilojoule
+				{0} kilojoule
 			
 			
 				joule
@@ -5893,9 +6142,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} joule
 			
 			
-				kWh
-				{0} kWh
-				{0} kWh
+				kilowatt-uur
+				{0} kilowatt-uur
+				{0} kilowatt-uur
 			
 			
 				elektronvolt
@@ -5907,6 +6156,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Britse termiese eenheid
 				{0} Britse termiese eenhede
 			
+			
+				VSA- termiese eenhede
+				{0} VSA- termiese eenheid
+				{0} VSA- termiese eenhede
+			
 			
 				pondkrag
 				{0} pondkrag
@@ -5918,24 +6172,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} newton
 			
 			
-				GHz
-				{0} GHz
-				{0} GHz
+				gigahertz
+				{0} gigahertz
+				{0} gigahertz
 			
 			
-				MHz
-				{0} MHz
-				{0} MHz
+				megahertz
+				{0} megahertz
+				{0} megahertz
 			
 			
-				kHz
-				{0} kHz
-				{0} kHz
+				kilohertz
+				{0} kilohertz
+				{0} kilohertz
 			
 			
-				Hz
-				{0} Hz
-				{0} Hz
+				hertz
+				{0} hertz
+				{0} hertz
+			
+			
+				tipografiese em
+			
+			
+				pieksels
+				{0} pieksel
+				{0} pieksels
+			
+			
+				megapieksels
+				{0} megapieksel
+				{0} megapieksels
+			
+			
+				pieksel per sentimeter
+				{0} pieksel per sentimeter
+				{0} pieksels per sentimeter
+			
+			
+				pieksels per duim
+				{0} pieksel per duim
+				{0} pieksels per duim
+			
+			
+				stippels per sentimeter
+				{0} stippel per sentimeter
+				{0} stippels per sentimeter
+			
+			
+				stippels per duim
+				{0} stippel per duim
+				{0} stippels per duim
 			
 			
 				kilometer
@@ -6009,13 +6296,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ligjare
-				{0} ligjare
+				{0} ligjaar
 				{0} ligjare
 			
 			
-				astronomiese eenheid
+				astronomiese eenhede
 				{0} astronomiese eenheid
-				{0} astronomiese eenheid
+				{0} astronomiese eenhede
 			
 			
 				seemyl
@@ -6023,9 +6310,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} seemyl
 			
 			
-				skandinawiese myl
-				{0} skandinawiese myl
-				{0} skandinawiese myl
+				Skandinawiese myl
+				{0} Skandinawiese myl
+				{0} Skandinawiese myl
 			
 			
 				punte
@@ -6043,9 +6330,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				sonligkrag
-				{0} sonligkrag
-				{0} sonligkrag
+				sonligsterkte
+				{0} sonligsterkte
+				{0} sonligsterkte
 			
 			
 				metrieke ton
@@ -6075,15 +6362,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mikrogram
 			
 			
-				ton
-				{0} ton
-				{0} ton
+				VSA-ton
+				{0} VSA-ton
+				{0} VSA-ton
 			
 			
 				pond
 				{0} pond
 				{0} pond
-				{0}/lb
+				{0} per pond
 			
 			
 				onse
@@ -6102,14 +6389,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karaat
 			
 			
-				daltons
+				dalton
 				{0} dalton
-				{0} daltons
+				{0} dalton
 			
 			
-				Aardmassas
-				{0} aardmassa
-				{0} aardmassas
+				aardemassas
+				{0} aardemassa
+				{0} aardemassas
 			
 			
 				sonmassas
@@ -6117,14 +6404,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sonmassas
 			
 			
-				GW
-				{0} GW
-				{0} GW
+				gigawatt
+				{0} gigawatt
+				{0} gigawatt
 			
 			
-				MW
-				{0} MW
-				{0} MW
+				megawatt
+				{0} megawatt
+				{0} megawatt
 			
 			
 				kilowatt
@@ -6137,20 +6424,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} watt
 			
 			
-				mW
-				{0} mW
-				{0} mW
+				milliwatt
+				{0} milliwatt
+				{0} milliwatt
 			
 			
 				perdekrag
 				{0} perdekrag
 				{0} perdekrag
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				millimeter kwik
 				{0} millimeter kwik
@@ -6176,6 +6458,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfeer
 				{0} atmosfere
 			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
+			
 			
 				kilopascal
 				{0} kilopascal
@@ -6222,9 +6509,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} grade Fahrenheit
 			
 			
-				K
-				{0} K
-				{0} K
+				kelvin
+				{0} kelvin
+				{0} kelvin
 			
 			
 				pondvoet
@@ -6266,7 +6553,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				kubieke voet
 				{0} kubieke voet
-				{0} ft³
+				{0} kubieke voet
 			
 			
 				kubieke duim
@@ -6315,9 +6602,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} metrieke koppies
 			
 			
-				akkervoet
-				{0} akkervoet
-				{0} akkervoet
+				acre-voet
+				{0} acre-voet
+				{0} acre-voet
 			
 			
 				gelling
@@ -6326,15 +6613,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per gelling
 			
 			
-				imp. gelling
-				{0} imp. gelling
-				{0} imp. gelling
-				{0}/imp. gel.
+				Britse gelling
+				{0} Britse gelling
+				{0} Britse gelling
+				{0}/Br. gell.
 			
 			
-				kwarte
-				{0} kwart
-				{0} kwarte
+				VSA-kwartgellings
+				{0} VSA-kwartgelling
+				{0} VSA-kwartgellings
 			
 			
 				pinte
@@ -6347,17 +6634,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} koppies
 			
 			
-				vloeistofonse
+				vloeistofons
 				{0} vloeistofons
-				{0} vloeistofonse
+				{0} vloeistofons
 			
 			
-				Imperiale vloeistofonse
-				{0} imperiale vloeistofons
-				{0}imperiale vloeistofonse
+				Britse vloeistofons
+				{0} Britse vloeistofons
+				{0} Britse vloeistofons
 			
 			
-				eetlepel
+				eetlepels
 				{0} eetlepel
 				{0} eetlepels
 			
@@ -6372,19 +6659,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} vate
 			
 			
-				kardinale rigting
-				{0}O
-				{0}N
-				{0}S
-				{0}W
+				kompasrigting
+				{0} oos
+				{0} noord
+				{0} suid
+				{0} wes
 			
 		
 		
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
-				swaartekrag van die Aarde
+				swaartekrag
 				{0} G
 				{0} G
 			
@@ -6394,12 +6684,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m/s²
 			
 			
-				rew.
-				{0} rew.
-				{0} rew.
+				o.
+				{0} o.
+				{0} o.
 			
 			
-				radiale
+				boogmate
 				{0} rad.
 				{0} rad.
 			
@@ -6448,9 +6738,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/myl²
 			
 			
-				akker
-				{0} ak
-				{0} ak
+				acre
+				{0} acre
+				{0} acre
 			
 			
 				jaart²
@@ -6469,7 +6759,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/dm.²
 			
 			
-				donums
+				donum
 				{0} donum
 				{0} donum
 			
@@ -6499,19 +6789,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}%
 			
 			
-				per mille
+				per duisend
 				{0}‰
 				{0}‰
 			
 			
-				permiriade
-				{0} ‱
-				{0} ‱
+				per tienduisend
+				{0}‱
+				{0}‱
 			
 			
 				mol
-				{0} mol
-				{0} mol
+				{0} mol
+				{0} mol
 			
 			
 				liter/km
@@ -6519,22 +6809,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ℓ/km
 			
 			
-				ℓ/100km
-				{0} ℓ/100km
-				{0} ℓ/100km
+				ℓ/100 km
+				{0} ℓ/100 km
+				{0} ℓ/100 km
 			
 			
-				myl/gel.
-				{0} m.p.g.
-				{0} m.p.g.
+				myl/VSA-gell.
+				{0} m.p.VSA-g.
+				{0} m.p.VSA-g.
 			
 			
-				myl/imp. gel.
-				{0} m.p.imp.g.
-				{0} m.p.imp.g.
+				myl/Br. gelling
+				{0} myl/Br.g.
+				{0} myl/Br.g.
 			
 			
-				PGrepe
+				PB
 				{0} PB
 				{0} PB
 			
@@ -6593,6 +6883,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} e.
 				{0} e.
 			
+			
+				dek.
+				{0} dek.
+				{0} dek.
+			
 			
 				jaar
 				{0} j.
@@ -6624,34 +6919,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/h
 			
 			
-				minute
+				min.
 				{0} min.
 				{0} min.
-				{0}/min
+				{0}/min.
 			
 			
-				sekondes
-				{0} sek.
-				{0} sek.
-				{0}/s
+				s.
+				{0} s.
+				{0} s.
+				{0}/s.
 			
 			
 				millisekondes
-				{0} ms
+				{0} ms.
 				{0} ms
 			
 			
-				μs
-				{0} μs
-				{0} μs
+				μs.
+				{0} μs.
+				{0} μs.
 			
 			
-				ns
-				{0} ns
-				{0} ns
+				ns.
+				{0} ns.
+				{0} ns.
 			
 			
-				ampere
+				A
 				{0} A
 				{0} A
 			
@@ -6681,9 +6976,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kal.
 			
 			
-				kal.
-				{0} kal.
-				{0} kal.
+				kkal.
+				{0} kkal.
+				{0} kkal.
 			
 			
 				kJ
@@ -6702,23 +6997,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektronvolt
-				{0} eV
-				{0} eV
+				{0} eV
+				{0} eV
 			
 			
 				BTE
 				{0} BTE
 				{0} BTE
 			
+			
+				VSA- termiese eenheid
+				{0} VSA-term.
+				{0} VSA-term.
+			
 			
 				pondkrag
-				{0} lbf
-				{0} lbf
+				{0} lb.-krag
+				{0} lb.-krag
 			
 			
 				newton
-				{0} N
-				{0} N
+				{0} N
+				{0} N
 			
 			
 				GHz
@@ -6740,6 +7040,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				pieksels
+				{0} px
+				{0} px
+			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				px/cm
+				{0} px/cm
+				{0} px/cm
+			
+			
+				px/dm.
+				{0} px/dm.
+				{0} px/dm.
+			
+			
+				stip./cm
+				{0} stip./cm
+				{0} stip./cm
+			
+			
+				stip./dm.
+				{0} stip./dm.
+				{0} stip./dm.
+			
 			
 				km
 				{0} km
@@ -6837,18 +7172,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sonradiusse
-				{0} R☉
-				{0} R☉
+				{0} R☉
+				{0} R☉
 			
 			
 				lux
-				{0} lux
-				{0} lux
+				{0} lx
+				{0} lx
 			
 			
-				sonligkrag
-				{0} L☉
-				{0} L☉
+				sonligsterkte
+				{0} L☉
+				{0} L☉
 			
 			
 				t
@@ -6878,12 +7213,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} µg
 			
 			
-				ton
-				{0} tn
-				{0} tn
+				VSA-ton
+				{0} VSA-t.
+				{0} VSA-t.
 			
 			
-				lb.
+				pond
 				{0} lb.
 				{0} lb.
 				{0}/lb
@@ -6905,19 +7240,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kar.
 			
 			
-				daltons
-				{0} D
-				{0} D
+				dalton
+				{0} Da
+				{0} Da
 			
 			
-				Aardmassas
-				{0} M⊕
-				{0} M⊕
+				aardemassas
+				{0} M⊕
+				{0} M⊕
 			
 			
 				sonmassas
-				{0} M☉
-				{0} M☉
+				{0} M☉
+				{0} M☉
 			
 			
 				GW
@@ -6930,7 +7265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} MW
 			
 			
-				kilowatt
 				{0} kW
 				{0} kW
 			
@@ -6945,49 +7279,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mW
 			
 			
-				perdekrag
+				pk.
 				{0} pk.
 				{0} pk.
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
 				{0} mm Hg
 			
 			
-				pond per vierkante duim
+				lb./vk. duim
 				{0} pd.vk.dm.
 				{0} pd.vk.dm.
 			
 			
-				duim kwik
-				{0} dm.Hg
-				{0} dm.Hg
+				duim Hg
+				{0} duim Hg
+				{0} duim Hg
+			
+			
+				bar
+				{0} bar
+				{0} bar
 			
 			
-				millibar
+				mbar
 				{0} mbar
 				{0} mbar
 			
 			
-				atm
-				{0} atm
-				{0} atm
+				atm.
+				{0} atm.
+				{0} atm.
+			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				kPa
-				{0} kPa
-				{0} kPa
+				{0} kPa
+				{0} kPa
 			
 			
 				MPa
-				{0} MPa
-				{0} MPa
+				{0} MPa
+				{0} MPa
 			
 			
 				km/uur
@@ -6995,9 +7339,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} km/h
 			
 			
-				meter per sekonde
-				{0} m/s
-				{0} m/s
+				meter/s.
+				{0} m/s.
+				{0} m/s.
 			
 			
 				myl per uur
@@ -7015,14 +7359,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°
 			
 			
-				grade Celsius
+				°C
 				{0} °C
 				{0} °C
 			
 			
-				grade Fahrenheit
+				°F
 				{0} °F
-				{0}°F
+				{0} °F
 			
 			
 				K
@@ -7067,9 +7411,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} jt.³
 			
 			
-				ft³
-				{0} ft³
-				{0} ft³
+				vt.³
+				{0} vt.³
+				{0} vt.³
 			
 			
 				duim³
@@ -7113,14 +7457,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpt.
 			
 			
-				mkp.
-				{0} mkp.
-				{0} mkp.
+				m. kop
+				{0} m. kop
+				{0} m. kop
 			
 			
-				akkervoet
-				{0} ak.vt.
-				{0} ak.vt.
+				acre-voet
+				{0} acre-vt.
+				{0} acre-vt.
 			
 			
 				gell.
@@ -7129,15 +7473,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/gell.
 			
 			
-				imp. gel.
-				{0} imp. gel.
-				{0} imp. gel.
-				{0}/imp. gel.
+				Br. gell.
+				{0} Br. gell.
+				{0} Br. gell.
+				{0}/Br. gell.
 			
 			
-				kw.
-				{0} kw.
-				{0} kw.
+				VSA-kw.gell.
+				{0} VSA-kw.gell.
+				{0} VSA-kw.gell.
 			
 			
 				pinte
@@ -7150,17 +7494,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kp.
 			
 			
-				vloz.
+				vl.oz.
 				{0} vl.oz.
 				{0} vl.oz.
 			
 			
-				Imp. vl.oz.
-				{0} vl.oz. Imp.
-				{0} vl.oz. Imp.
+				Br. vl.oz.
+				{0} Br. vl.oz.
+				{0} Br. vl.oz.
 			
 			
-				eetl.
+				e.
 				{0} e.
 				{0} e.
 			
@@ -7176,10 +7520,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				rigting
-				{0}O
-				{0}N
-				{0}S
-				{0}W
+				{0} O
+				{0} N
+				{0} S
+				{0} W
 			
 		
 		
@@ -7232,12 +7576,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}%
 			
 			
-				ℓ/100km
-				{0} ℓ/100km
-				{0} ℓ/100km
+				ℓ/100 km
+				{0} ℓ/100 km
+				{0} ℓ/100 km
 			
 			
-				jaar
+				j.
 				{0} j.
 				{0} j.
 			
@@ -7262,19 +7606,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} u.
 			
 			
-				minute
+				min.
 				{0} min.
 				{0} min.
 			
 			
-				sekondes
-				{0} sek.
-				{0} sek.
+				s.
+				{0} s.
+				{0} s.
 			
 			
-				ms
-				{0} ms
-				{0} ms
+				ms.
+				{0} ms.
+				{0} ms.
 			
 			
 				km
@@ -7282,7 +7626,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} km
 			
 			
-				meter
+				m
 				{0} m
 				{0} m
 			
@@ -7350,10 +7694,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}pk.
 				{0}pk.
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0} dm.Hg
 				{0} dm.Hg
@@ -7362,6 +7702,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mbar
 				{0} mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				km/h
 				{0} km/h
@@ -7399,17 +7743,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				rigting
-				{0}O
-				{0}N
-				{0}S
-				{0}W
+				{0} O
+				{0} N
+				{0} S
+				{0} W
 			
 		
 		
-			hh:mm
+			h:mm
 		
 		
-			hh:mm:ss
+			h:mm:ss
 		
 		
 			mm:ss
@@ -7460,103 +7804,103 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
-		{0} – Alle
+		{0} – alle
 		{0}: {1}
-		{0} – Versoenbaarheid
-		{0} – Ingesluit
-		{0} – Uitgebreid
-		{0} – Histories
-		{0} – Allerlei
-		{0} – Ander
-		Skrifte – {0}
-		{0} hale
+		{0} – versoenbaarheid
+		{0} ingeslote
+		{0} – uitgebreid
+		{0} – histories
+		{0} – allerlei
+		{0} – ander
+		skrifte – {0}
+		{0} haal
 		{0} hale
-		Aktiwiteite
-		Afrika-skrifte
-		Amerikaanse skrifte
+		aktiwiteit
+		Afrika-skrif
+		Amerikaanse skrif
 		dier
-		Diere en natuur
-		Pyltjies
+		diere of natuur
+		pyltjie
 		liggaam
-		Bokstekening
+		bokstekening
 		Braille
 		gebou
-		Kolpunte/Sterretjies
-		Konsonantale Jamo
-		Geldeenheidsimbole
-		Koppelteken/Koppelaar
-		Syfers
-		Dingbats
-		Aanwys-simbole
-		Af-pyltjies
-		Af-op-pyltjies
-		Oos-Asiese skrifte
-		Emoji
-		Europese skrifte
+		kolpunt/sterretjie
+		konsonantale jamo
+		geldeenheidsimbool
+		koppelteken/koppelaar
+		syfer
+		dingbat
+		towersimbool
+		af-pyltjie
+		af-op-pyltjie
+		Oos-Asiese skrif
+		emoji
+		Europese skrif
 		vroulik
 		vlag
-		Vlae
-		Kos en drinkgoed
-		Formaat
-		Formaat en witspasie
-		Vollewydte vormvariante
-		Geometriese vorms
-		Halfwydte vormvariante
-		Han-karakters
-		Han-radikale
-		Hanja
+		vlae
+		kos en drinkgoed
+		formatering
+		formatering en witspasie
+		volwye variant
+		geometriese vorm
+		Halfwye variant
+		Han-karakter
+		Han-radikaal
+		hanja
 		Hanzi (vereenvoudig)
 		Hanzi (tradisioneel)
 		hartjie
-		Historiese skrifte
-		Ideografies-beskrywende karakters
-		Japannese Kana
-		Kanbun
-		Kanji
-		sleutelbordtoets
-		Links-pyltjies
-		Links-Regs-pyltjies
-		Letterige simbole
-		Beperkte gebruik
+		historiese skrif
+		ideografiese beskrywende karakter
+		Japannese kana
+		kanbun
+		kanji
+		knoppiesimbool
+		links-pyltjie
+		links-regs-pyltjies
+		letteragtige simbool
+		beperkte gebruik
 		manlik
-		Wiskunde simbole
-		Midde-Oosterse skrifte
-		Allerlei
-		Moderne skrifte
-		Bepaler
-		Musikale simbole
+		wiskundesimbole
+		Midde-Oosterse skrif
+		allerlei
+		moderne skrif
+		bepaler
+		musieksimbool
 		natuur
-		Niespasiëring
-		Nommers
-		Voorwerpe
-		Ander
+		niespasiërend
+		nommers
+		voorwerp
+		ander
 		Saamgevoeg
 		persoon
-		Fonetiese alfabet
-		Piktogram
+		fonetiese alfabet
+		piktogram
 		plek
 		plant
-		Leestekens
-		Regs-pyltjies
-		Teken/Standaard simbool
-		Kleinvormvariante
+		leestekens
+		regs-pyltjie
+		teken of simbool
+		klein variante
 		gesiggie
-		Emosiekone en mense
-		Suid-Asiese skrifte
-		Suidoos-Asiese skrifte
-		Spasiëring
+		emosiekoon of mens
+		Suid-Asiese skrif
+		Suidoos-Asiese skrif
+		spasiëring
 		sport
-		Simbole
-		Tegniese simbole
-		Intonasie-klemtekens
+		simbool
+		tegniese simbool
+		toonteken
 		reis
-		Reis en plekke
-		Op-pyltjies
-		Variantvorms
-		Vokaliese Jamo
+		reis of plek
+		op-pyltjies
+		variant
+		vokaliese jamo
 		weer
-		Wes-Asiese skrifte
-		Witspasie
+		Wes-Asiese skrif
+		witspasie
 	
 	
 		skuinsdruk
diff --git a/make/data/cldr/common/main/af_NA.xml b/make/data/cldr/common/main/af_NA.xml
index 97a21c563ba..8ada9e0b228 100644
--- a/make/data/cldr/common/main/af_NA.xml
+++ b/make/data/cldr/common/main/af_NA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/af_ZA.xml b/make/data/cldr/common/main/af_ZA.xml
index 73ab5b1e984..89b0ef44ac8 100644
--- a/make/data/cldr/common/main/af_ZA.xml
+++ b/make/data/cldr/common/main/af_ZA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/agq.xml b/make/data/cldr/common/main/agq.xml
index dc29f57a58d..e0fe4867624 100644
--- a/make/data/cldr/common/main/agq.xml
+++ b/make/data/cldr/common/main/agq.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mòodovà
 			Màdàgasɨkà
 			Chwɨlà fɨ Mashà
-			Mɨ̀sɨ̀donyìa
 			Malè
 			Mǐanmà
 			Mùŋgolìa
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a à â ǎ ā b c d e è ê ě ē ɛ {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} {ɛ\u0304} f g h i ì î ǐ ī ɨ {ɨ\u0300} {ɨ\u0302} {ɨ\u030C} {ɨ\u0304} k l m n ŋ o ò ô ǒ ō ɔ {ɔ\u0300} {ɔ\u0302} {ɔ\u030C} {ɔ\u0304} p s t u ù û ǔ ū ʉ {ʉ\u0300} {ʉ\u0302} {ʉ\u030C} {ʉ\u0304} v w y z ʔ]
 		[q r x]
 		[A B C D E Ɛ F G H I Ɨ K L M N Ŋ O Ɔ P S T U Ʉ V W Y Z ʔ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		„
diff --git a/make/data/cldr/common/main/agq_CM.xml b/make/data/cldr/common/main/agq_CM.xml
index 71083107629..497a0b65a1f 100644
--- a/make/data/cldr/common/main/agq_CM.xml
+++ b/make/data/cldr/common/main/agq_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ak.xml b/make/data/cldr/common/main/ak.xml
index 70bf6778e6a..13e68037258 100644
--- a/make/data/cldr/common/main/ak.xml
+++ b/make/data/cldr/common/main/ak.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mɔldova
 			Madagaska
 			Marshall Islands
-			Masedonia
 			Mali
 			Miyanma
 			Mɔngolia
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b d e ɛ f g h i k l m n o ɔ p r s t u w y]
 		[c j q v z]
 		[A B C D E Ɛ F G H I J K L M N O Ɔ P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/ak_GH.xml b/make/data/cldr/common/main/ak_GH.xml
index 6a1201439d5..52cdae7e73b 100644
--- a/make/data/cldr/common/main/ak_GH.xml
+++ b/make/data/cldr/common/main/ak_GH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/am.xml b/make/data/cldr/common/main/am.xml
index 8aff3d0f77c..39764cfd71f 100644
--- a/make/data/cldr/common/main/am.xml
+++ b/make/data/cldr/common/main/am.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -97,6 +97,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ካሪብ
 			ካዩጋ
 			አትሳም
+			ቻክማ
 			ችችን
 			ካቡዋኖ
 			ቺጋኛ
@@ -479,12 +480,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ይዲሽኛ
 			ዮሩባዊኛ
 			ካንቶኒዝ
+			ቻይና፤ ካንቶንኛ
 			ዡዋንግኛ
 			ብሊስይምቦልስ
 			መደበኛ የሞሮኮ ታማዚግት
 			ቻይንኛ
+			ማንድሪን ቻይንኛ
 			ቀለል ያለ ቻይንኛ
+			ቀለል ያለ ማንድሪን ቻይንኛ
 			ባህላዊ ቻይንኛ
+			ባህላዊ ማንድሪን ቻይንኛ
 			ዙሉኛ
 			ዙኒ
 			ቋንቋዊ ይዘት አይደለም
@@ -556,8 +561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
-			
+			
 			
 			
 			
@@ -637,7 +641,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ኮኮስ(ኬሊንግ) ደሴቶች
 			ኮንጎ-ኪንሻሳ
 			ኮንጎ (የዲሞክራቲክ ሪፐብሊክ ኮንጎ)
-			የመካከለኛው አፍሪካ ሪፐብሊክ
+			ማዕከላዊ አፍሪካ ሪፑብሊክ
 			ኮንጎ ብራዛቪል
 			ኮንጎ (ሪፐብሊክ)
 			ስዊዘርላንድ
@@ -862,6 +866,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ቫኑአቱ
 			ዋሊስ እና ፉቱና ደሴቶች
 			ሳሞአ
+			የሀሰት ትእምርት
+			የሀሰት ባለሁለት አቅጣጫ
 			ኮሶቮ
 			የመን
 			ሜይኦቴ
@@ -1010,7 +1016,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጷ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ]
 		[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[‐ – , ፡ ፣ ፤ ፥ ፦ ! ? . ። ‹ › « » ( ) \[ \]]
 		{0}…
 		…{0}
@@ -1642,15 +1648,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
@@ -2033,6 +2030,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						ዓ/ዓ
 						ዓ/ም
+						CE
 					
 					
 						ዓ/ዓ
@@ -2150,21 +2148,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMMM y
 						QQQ y
 						QQQQ y
+						'week' w 'of' Y
+						'week' w 'of' Y
 					
 					
 						{0} {1}
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
@@ -3665,6 +3656,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				አኩቶቤ
 			
+			
+				ኮስታናይ
+			
 			
 				ኩይዚሎርዳ
 			
@@ -5188,15 +5182,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ሺ
@@ -5313,37 +5317,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የተባበሩት የአረብ ኤምሬትስ ድርሀም
 				የተባበሩት የአረብ ኤምሬትስ ድርሀም
 				የተባበሩት የአረብ ኤምሬትስ ድርሀም
+				AED
 			
 			
 				የአፍጋን አፍጋኒ
 				የአፍጋን አፍጋኒ
 				የአፍጋን አፍጋኒ
+				AFN
 			
 			
 				የአልባንያ ሌክ
 				የአልባንያ ሌክ
 				የአልባንያ ሌክ
+				ALL
 			
 			
 				የአርመን ድራም
 				የአርመን ድራም
 				የአርመን ድራም
+				AMD
 			
 			
 				ኔዘርላንድስ አንቲሊአን ጊልደር
 				ኔዘርላንድስ አንቲሊአን ጊልደር
 				ኔዘርላንድስ አንቲሊአን ጊልደር
+				ANG
 			
 			
 				የአንጎላ ኩዋንዛ
 				የአንጎላ ኩዋንዛ
 				የአንጎላ ኩዋንዛ
+				AOA
 				Kz
 			
 			
 				የአርጀንቲና ፔሶ
 				የአርጀንቲና ፔሶ
 				የአርጀንቲና ፔሶ
+				ARS
 				$
 			
 			
@@ -5357,123 +5368,145 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				አሩባን ፍሎሪን
 				አሩባን ፍሎሪን
 				አሩባን ፍሎሪን
+				AWG
 			
 			
 				የአዛርባጃን ማናት
 				የአዛርባጃን ማናት
 				የአዛርባጃን ማናት
+				AZN
 			
 			
 				የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ
 				የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ
 				የቦስኒያ ሄርዞጎቪና የሚመነዘር ማርክ
+				BAM
 				KM
 			
 			
 				የባርቤዶስ ዶላር
 				የባርቤዶስ ዶላር
 				የባርቤዶስ ዶላር
+				BBD
 				$
 			
 			
 				የባንግላዲሽ ታካ
 				የባንግላዲሽ ታካ
 				የባንግላዲሽ ታካ
+				BDT
 				৳
 			
 			
 				የቡልጋሪያ ሌቭ
 				የቡልጋሪያ ሌቭ
 				የቡልጋሪያ ሌቭ
+				BGN
 			
 			
 				የባኽሬን ዲናር
 				የባኽሬን ዲናር
 				የባኽሬን ዲናር
+				BHD
 			
 			
 				የብሩንዲ ፍራንክ
 				የብሩንዲ ፍራንክ
 				የብሩንዲ ፍራንክ
+				BIF
 			
 			
 				የቤርሙዳ ዶላር
 				የቤርሙዳ ዶላር
 				የቤርሙዳ ዶላር
+				BMD
 				$
 			
 			
 				የብሩኔ ዶላር
 				የብሩኔ ዶላር
 				የብሩኔ ዶላር
+				BND
 				$
 			
 			
 				የቦሊቪያ ቦሊቪያኖ
 				የቦሊቪያ ቦሊቪያኖ
 				የቦሊቪያ ቦሊቪያኖ
+				BOB
 				Bs
 			
 			
 				የብራዚል ሪል
 				የብራዚል ሪል
 				የብራዚል ሪል
+				R$
 				R$
 			
 			
 				የባሃማስ ዶላር
 				የባሃማስ ዶላር
 				የባሃማስ ዶላር
+				BSD
 				$
 			
 			
 				ብሁታኒዝ ንጉልትረም
 				ብሁታኒዝ ንጉልትረም
 				ብሁታኒዝ ንጉልትረም
+				BTN
 			
 			
 				የቦትስዋና ፑላ
 				የቦትስዋና ፑላ
 				የቦትስዋና ፑላ
+				BWP
 				P
 			
 			
 				የቤላሩስያ ሩብል
 				የቤላሩስያ ሩብል
 				የቤላሩስያ ሩብል
+				BYN
 				р.
 			
 			
 				የቤላሩስያ ሩብል (2000–2016)
 				የቤላሩስያ ሩብል (2000–2016)
 				የቤላሩስያ ሩብል (2000–2016)
+				BYR
 			
 			
 				የቤሊዝ ዶላር
 				የቤሊዝ ዶላር
 				የቤሊዝ ዶላር
+				BZD
 				$
 			
 			
 				የካናዳ ዶላር
 				የካናዳ ዶላር
 				የካናዳ ዶላር
+				CA$
 				$
 			
 			
 				የኮንጐ ፍራንክ ኮንጐሌዝ
 				የኮንጐ ፍራንክ ኮንጐሌዝ
 				የኮንጐ ፍራንክ ኮንጐሌዝ
+				CDF
 			
 			
 				የስዊስ ፍራንክ
 				የስዊስ ፍራንክ
 				የስዊስ ፍራንክ
+				CHF
 			
 			
 				የቺሊ ፔሶ
 				የቺሊ ፔሶ
 				የቺሊ ፔሶ
+				CLP
 				$
 			
 			
@@ -5486,75 +5519,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የቻይና የን
 				የቻይና የን
 				የቻይና የን
+				CN¥
 				¥
 			
 			
 				የኮሎምቢያ ፔሶ
 				የኮሎምቢያ ፔሶ
 				የኮሎምቢያ ፔሶ
+				COP
 				$
 			
 			
 				የኮስታሪካ ኮሎን
 				የኮስታሪካ ኮሎን
 				የኮስታሪካ ኮሎን
+				CRC
 				₡
 			
 			
 				የኩባ የሚመነዘር ፔሶ
 				የኩባ የሚመነዘር ፔሶ
 				የኩባ የሚመነዘር ፔሶ
+				CUC
 				$
 			
 			
 				የኩባ ፔሶ
 				የኩባ ፔሶ
 				የኩባ ፔሶ
+				CUP
 				$
 			
 			
 				የኬፕ ቫርዲ ኤስኩዶ
 				የኬፕ ቫርዲ ኤስኩዶ
 				የኬፕ ቫርዲ ኤስኩዶ
+				CVE
 			
 			
 				ቼክ ሪፐብሊክ ኮሩና
 				ቼክ ሪፐብሊክ ኮሩና
 				ቼክ ሪፐብሊክ ኮሮና
+				CZK
 				Kč
 			
 			
 				የጅቡቲ ፍራንክ
 				የጅቡቲ ፍራንክ
 				የጅቡቲ ፍራንክ
+				DJF
 			
 			
 				የዴንማርክ ክሮን
 				የዴንማርክ ክሮን
 				የዴንማርክ ክሮን
+				DKK
 				kr
 			
 			
 				የዶሚኒክ ፔሶ
 				የዶሚኒክ ፔሶ
 				የዶሚኒክ ፔሶ
+				DOP
 				$
 			
 			
 				የአልጄሪያ ዲናር
 				የአልጄሪያ ዲናር
 				የአልጄሪያ ዲናር
+				DZD
 			
 			
 				የግብጽ ፓውንድ
 				የግብጽ ፓውንድ
 				የግብጽ ፓውንድ
+				EGP
 				E£
 			
 			
 				የኤርትራ ናቅፋ
 				የኤርትራ ናቅፋ
 				የኤርትራ ናቅፋ
+				ERN
 			
 			
 				የኢትዮጵያ ብር
@@ -5566,30 +5612,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ዩሮ
 				ዩሮ
 				ዩሮ
+				€
 				€
 			
 			
 				የፊጂ ዶላር
 				የፊጂ ዶላር
 				የፊጂ ዶላር
+				FJD
 				$
 			
 			
 				የፎክላንድ ደሴቶች ፓውንድ
 				የፎክላንድ ደሴቶች ፓውንድ
 				የፎክላንድ ደሴቶች ፓውንድ
+				FKP
 				£
 			
 			
 				የእንግሊዝ ፓውንድ ስተርሊንግ
 				የእንግሊዝ ፓውንድ ስተርሊንግ
 				የእንግሊዝ ፓውንድ ስተርሊንግ
+				£
 				£
 			
 			
 				የጆርጅያ ላሪ
 				የጆርጅያ ላሪ
 				የጆርጅያ ላሪ
+				GEL
 				₾
 				₾
 			
@@ -5600,189 +5651,221 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የጋና ሲዲ
 				የጋና ሲዲ
 				የጋና ሲዲ
+				GHS
 			
 			
 				ጂብራልተር ፓውንድ
 				ጂብራልተር ፓውንድ
 				ጂብራልተር ፓውንድ
+				GIP
 				£
 			
 			
 				የጋምቢያ ዳላሲ
 				የጋምቢያ ዳላሲ
 				የጋምቢያ ዳላሲ
+				GMD
 			
 			
 				የጊኒ ፍራንክ
 				የጊኒ ፍራንክ
 				የጊኒ ፍራንክ
+				GNF
 				FG
 			
 			
 				ጓቲማላን ኩቲዛል
 				ጓቲማላን ኩቲዛል
 				ጓቲማላን ኩቲዛል
+				GTQ
 				Q
 			
 			
 				የጉየና ዶላር
 				የጉየና ዶላር
 				የጉየና ዶላር
+				GYD
 				$
 			
 			
 				የሆንግኮንግ ዶላር
 				የሆንግኮንግ ዶላር
 				የሆንግኮንግ ዶላር
+				HK$
 				$
 			
 			
 				የሃንዱራ ሌምፓአይራ
 				የሃንዱራ ሌምፓአይራ
 				የሃንዱራ ሌምፓአይራ
+				HNL
 				L
 			
 			
-				HRK
 				የክሮሽያ ኩና
 				የክሮሽያ ኩና
+				HRK
 				kn
 			
 			
 				የሃያቲ ጓርዴ
 				የሃያቲ ጓርዴ
 				የሃያቲ ጓርዴ
+				HTG
 			
 			
 				የሃንጋሪያን ፎሪንት
 				የሃንጋሪያን ፎሪንት
 				የሃንጋሪያን ፎሪንት
+				HUF
 				Ft
 			
 			
 				የኢንዶኔዥያ ሩፒሃ
 				የኢንዶኔዥያ ሩፒሃ
 				የኢንዶኔዥያ ሩፒሃ
+				IDR
 				Rp
 			
 			
 				የእስራኤል አዲስ ሽቅል
 				የእስራኤል አዲስ ሽቅል
 				የእስራኤል አዲስ ሽቅል
+				₪
 				₪
 			
 			
 				የሕንድ ሩፒ
 				የሕንድ ሩፒ
 				የሕንድ ሩፒ
+				₹
 				₹
 			
 			
 				የኢራቅ ዲናር
 				የኢራቅ ዲናር
 				የኢራቅ ዲናር
+				IQD
 			
 			
 				የኢራን ሪአል
 				የኢራን ሪአል
 				የኢራን ሪአል
+				IRR
 			
 			
 				የአይስላንድ ክሮና
 				የአይስላንድ ክሮና
 				የአይስላንድ ክሮና
+				ISK
 				kr
 			
 			
 				የጃማይካ ዶላር
 				የጃማይካ ዶላር
 				የጃማይካ ዶላር
+				JMD
 				$
 			
 			
 				የጆርዳን ዲናር
 				የጆርዳን ዲናር
 				የጆርዳን ዲናር
+				JOD
 			
 			
 				የጃፓን የን
 				የጃፓን የን
 				የጃፓን የን
+				JP¥
 				¥
 			
 			
 				የኬኒያ ሺሊንግ
 				የኬኒያ ሺሊንግ
 				የኬኒያ ሺሊንግ
+				KES
 			
 			
 				የኪርጊስታን ሶም
 				የኪርጊስታን ሶም
 				የኪርጊስታን ሶም
+				KGS
 			
 			
 				የካምቦዲያ ሬል
 				የካምቦዲያ ሬል
 				የካምቦዲያ ሬል
+				KHR
 				៛
 			
 			
 				የኮሞሮ ፍራንክ
 				የኮሞሮ ፍራንክ
 				የኮሞሮ ፍራንክ
+				KMF
 				CF
 			
 			
 				የሰሜን ኮሪያ ዎን
 				የሰሜን ኮሪያ ዎን
 				የሰሜን ኮሪያ ዎን
+				KPW
 				₩
 			
 			
 				የደቡብ ኮሪያ ዎን
 				የደቡብ ኮሪያ ዎን
 				የደቡብ ኮሪያ ዎን
+				₩
 				₩
 			
 			
 				የኩዌት ዲናር
 				የኩዌት ዲናር
 				የኩዌት ዲናር
+				KWD
 			
 			
 				የካይማን ደሴቶች ዶላር
 				የካይማን ደሴቶች ዶላር
 				የካይማን ደሴቶች ዶላር
+				KYD
 				$
 			
 			
 				የካዛኪስታን ተንጌ
 				የካዛኪስታን ተንጌ
 				የካዛኪስታን ተንጌ
+				KZT
 				₸
 			
 			
 				የላኦቲ ኪፕ
 				የላኦቲ ኪፕ
 				የላኦቲ ኪፕ
+				LAK
 				₭
 			
 			
 				የሊባኖስ ፓውንድ
 				የሊባኖስ ፓውንድ
 				የሊባኖስ ፓውንድ
+				LBP
 				L£
 			
 			
 				የሲሪላንካ ሩፒ
 				የሲሪላንካ ሩፒ
 				የሲሪላንካ ሩፒ
+				LKR
 				Rs
 			
 			
 				የላይቤሪያ ዶላር
 				የላይቤሪያ ዶላር
 				የላይቤሪያ ዶላር
+				LRD
 				$
 			
 			
@@ -5792,59 +5875,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ሊቱዌንያን ሊታስ
 				ሊቱዌንያን ሊታስ
 				ሊቱዌንያን ሊታስ
+				LTL
 			
 			
 				የላቲቫ ላትስ
 				የላቲቫ ላትስ
 				የላቲቫ ላትስ
+				LVL
 			
 			
 				የሊቢያ ዲናር
 				የሊቢያ ዲናር
 				የሊቢያ ዲናር
+				LYD
 			
 			
 				የሞሮኮ ዲርሀም
 				የሞሮኮ ዲርሀም
 				የሞሮኮ ዲርሀም
+				MAD
 			
 			
 				ሞልዶቫን ሊኡ
 				ሞልዶቫን ሊኡ
 				ሞልዶቫን ሊኡ
+				MDL
 			
 			
 				የማደጋስካር ማላጋስይ አሪያርይ
 				የማደጋስካር ማላጋስይ አሪያርይ
 				የማደጋስካር ማላጋስይ አሪያርይ
+				MGA
 				Ar
 			
 			
 				የሜቆድንያ ዲናር
 				የሜቆድንያ ዲናር
 				የሜቆድንያ ዲናር
+				MKD
 			
 			
 				የማያናማር ክያት
 				የማያናማር ክያት
 				የማያናማር ክያት
+				MMK
 				K
 			
 			
 				የሞንጎሊያን ቱግሪክ
 				የሞንጎሊያን ቱግሪክ
 				የሞንጎሊያን ቱግሪክ
+				MNT
 				₮
 			
 			
 				የማካኔዝ ፓታካ
 				የማካኔዝ ፓታካ
 				የማካኔዝ ፓታካ
+				MOP
 			
 			
 				የሞሪቴኒያ ኦውጉያ (1973–2017)
 				የሞሪቴኒያ ኦውጉያ (1973–2017)
 				የሞሪቴኒያ ኦውጉያ (1973–2017)
+				MRO
 			
 			
 				የሞሪቴኒያ ኦውጉያ
@@ -5856,163 +5950,192 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የሞሪሸስ ሩፒ
 				የሞሪሸስ ሩፒ
 				የሞሪሸስ ሩፒ
+				MUR
 				Rs
 			
 			
 				የማልዲቫ ሩፊያ
 				የማልዲቫ ሩፊያ
 				የማልዲቫ ሩፊያ
+				MVR
 			
 			
 				የማላዊ ኩዋቻ
 				የማላዊ ኩዋቻ
 				የማላዊ ኩዋቻ
+				MWK
 			
 			
 				የሜክሲኮ ፔሶ
 				የሜክሲኮ ፔሶ
 				የሜክሲኮ ፔሶ
+				MX$
 				$
 			
 			
 				የማሌዥያ ሪንጊት
 				የማሌዥያ ሪንጊት
 				የማሌዥያ ሪንጊት
+				MYR
 				RM
 			
 			
 				የሞዛምቢክ ሜቲካል
 				የሞዛምቢክ ሜቲካል
 				የሞዛምቢክ ሜቲካል
+				MZN
 			
 			
 				የናሚቢያ ዶላር
 				የናሚቢያ ዶላር
 				የናሚቢያ ዶላር
+				NAD
 				$
 			
 			
 				የናይጄሪያ ናይራ
 				የናይጄሪያ ናይራ
 				የናይጄሪያ ናይራ
+				NGN
 				₦
 			
 			
 				የኒካራጓ ኮርዶባ
 				የኒካራጓ ኮርዶባ
 				የኒካራጓ ኮርዶባ
+				NIO
 				C$
 			
 			
 				የኖርዌይ ክሮን
 				የኖርዌይ ክሮን
 				የኖርዌይ ክሮን
+				NOK
 				kr
 			
 			
 				የኔፓል ሩፒ
 				የኔፓል ሩፒ
 				የኔፓል ሩፒ
+				NPR
 				Rs
 			
 			
 				የኒውዚላንድ ዶላር
 				የኒውዚላንድ ዶላር
 				የኒውዚላንድ ዶላር
+				NZ$
 				$
 			
 			
 				የኦማን ሪአል
 				የኦማን ሪአል
 				የኦማን ሪአል
+				OMR
 			
 			
 				ፓናማኒአን ባልቦአ
 				ፓናማኒአን ባልቦአ
 				ፓናማኒአን ባልቦአ
+				PAB
 			
 			
 				የፔሩቪያ ሶል
 				የፔሩቪያ ሶል
 				የፔሩቪያ ሶል
+				PEN
 			
 			
 				የፓፕዋ ኒው ጊኒ ኪና
 				የፓፕዋ ኒው ጊኒ ኪና
 				የፓፕዋ ኒው ጊኒ ኪና
+				PGK
 			
 			
 				የፊሊፒንስ ፔሶ
 				የፊሊፒንስ ፔሶ
 				የፊሊፒንስ ፔሶ
+				PHP
 				₱
 			
 			
 				የፓኪስታን ሩፒ
 				የፓኪስታን ሩፒ
 				የፓኪስታን ሩፒ
+				PKR
 				Rs
 			
 			
 				የፖላንድ ዝሎቲ
 				የፖላንድ ዝሎቲ
 				የፖላንድ ዝሎቲ
+				PLN
 				zł
 			
 			
 				የፓራጓይ ጉአራኒ
 				የፓራጓይ ጉአራኒ
 				የፓራጓይ ጉአራኒ
+				PYG
 				₲
 			
 			
 				የኳታር ሪአል
 				የኳታር ሪአል
 				የኳታር ሪአል
+				QAR
 			
 			
 				የሮማኒያ ለው
 				የሮማኒያ ለው
 				የሮማኒያ ለው
+				RON
 				lei
 			
 			
 				የሰርቢያ ዲናር
 				የሰርቢያ ዲናር
 				የሰርቢያ ዲናር
+				RSD
 			
 			
 				የሩስያ ሩብል
 				የሩስያ ሩብል
 				የሩስያ ሩብል
+				RUB
 				₽
 			
 			
 				የሩዋንዳ ፍራንክ
 				የሩዋንዳ ፍራንክ
 				የሩዋንዳ ፍራንክ
+				RWF
 				RF
 			
 			
 				የሳውዲ ሪያል
 				የሳውዲ ሪያል
 				የሳውዲ ሪያል
+				SAR
 			
 			
 				የሰለሞን ደሴቶች ዶላር
 				የሰለሞን ደሴቶች ዶላር
 				የሰለሞን ደሴቶች ዶላር
+				SBD
 				$
 			
 			
 				የሲሼል ሩፒ
 				የሲሼል ሩፒ
 				የሲሼል ሩፒ
+				SCR
 			
 			
 				የሱዳን ፓውንድ
 				የሱዳን ፓውንድ
 				የሱዳን ፓውንድ
+				SDG
 			
 			
 				የሱዳን ፓውንድ (1957–1998)
@@ -6023,46 +6146,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የስዊድን ክሮና
 				የስዊድን ክሮና
 				የስዊድን ክሮና
+				SEK
 				kr
 			
 			
 				የሲንጋፖር ዶላር
 				የሲንጋፖር ዶላር
 				የሲንጋፖር ዶላር
+				SGD
 				$
 			
 			
 				የሴይንት ሔሌና ፓውንድ
 				የሴይንት ሔሌና ፓውንድ
 				የሴይንት ሔሌና ፓውንድ
+				SHP
 				£
 			
 			
 				የሴራሊዎን ሊዎን
 				የሴራሊዎን ሊዎን
 				የሴራሊዎን ሊዎን
+				SLL
 			
 			
 				የሶማሌ ሺሊንግ
 				የሶማሌ ሺሊንግ
 				የሶማሌ ሺሊንግ
+				SOS
 			
 			
 				የሰርናሜዝ ዶላር
 				የሰርናሜዝ ዶላር
 				የሰርናሜዝ ዶላር
+				SRD
 				$
 			
 			
 				የደቡብ ሱዳን ፓውንድ
 				የደቡብ ሱዳን ፓውንድ
 				የደቡብ ሱዳን ፓውንድ
+				SSP
 				£
 			
 			
 				የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)
 				የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)
 				የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)
+				STD
 			
 			
 				የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ
@@ -6075,12 +6206,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የሲሪያ ፓውንድ
 				የሲሪያ ፓውንድ
 				የሲሪያ ፓውንድ
+				SYP
 				£
 			
 			
 				የስዋዚላንድ ሊላንገኒ
 				የስዋዚላንድ ሊላንገኒ
 				የስዋዚላንድ ሊላንገኒ
+				SZL
 			
 			
 				የታይላንድ ባህት
@@ -6093,27 +6226,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የታጂክስታን ሶሞኒ
 				የታጂክስታን ሶሞኒ
 				የታጂክስታን ሶሞኒ
+				TJS
 			
 			
 				ቱርክሜኒስታኒ ማናት
 				ቱርክሜኒስታኒ ማናት
 				ቱርክሜኒስታኒ ማናት
+				TMT
 			
 			
 				የቱኒዚያ ዲናር
 				የቱኒዚያ ዲናር
 				የቱኒዚያ ዲናር
+				TND
 			
 			
 				ቶንጋን ፓ’አንጋ
 				ቶንጋን ፓ’አንጋ
 				ቶንጋን ፓ’አንጋ
+				TOP
 				T$
 			
 			
 				የቱርክ ሊራ
 				የቱርክ ሊራ
 				የቱርክ ሊራ
+				TRY
 				₺
 				TL
 			
@@ -6121,51 +6259,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የትሪንዳድ እና ቶቤጎዶላር
 				የትሪንዳድ እና ቶቤጎዶላር
 				የትሪንዳድ እና ቶቤጎዶላር
+				TTD
 				$
 			
 			
 				የአዲሷ ታይዋን ዶላር
 				የአዲሷ ታይዋን ዶላር
 				የአዲሷ ታይዋን ዶላር
+				NT$
 				NT$
 			
 			
 				የታንዛኒያ ሺሊንግ
 				የታንዛኒያ ሺሊንግ
 				የታንዛኒያ ሺሊንግ
+				TZS
 			
 			
 				የዩክሬን ሀሪይቭኒአ
 				የዩክሬን ሀሪይቭኒአ
 				የዩክሬን ሀሪይቭኒአ
+				UAH
 				₴
 			
 			
 				የዩጋንዳ ሺሊንግ
 				የዩጋንዳ ሺሊንግ
 				የዩጋንዳ ሺሊንግ
+				UGX
 			
 			
 				የአሜሪካን ዶላር
 				የአሜሪካን ዶላር
 				የአሜሪካን ዶላር
+				US$
 				$
 			
 			
 				የኡራጓይ ፔሶ
 				የኡራጓይ ፔሶ
 				የኡራጓይ ፔሶ
+				UYU
 				$
 			
 			
 				የኡዝፔኪስታን ሶም
 				የኡዝፔኪስታን ሶም
 				የኡዝፔኪስታን ሶም
+				UZS
 			
 			
 				የቬንዝዌላ ቦሊቫር (2008–2018)
 				የቬንዝዌላ ቦሊቫር (2008–2018)
 				የቬንዝዌላ ቦሊቫር (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6178,38 +6325,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የቭየትናም ዶንግ
 				የቭየትናም ዶንግ
 				የቭየትናም ዶንግ
+				₫
 				₫
 			
 			
 				የቫንዋንቱ ቫቱ
 				የቫንዋንቱ ቫቱ
 				የቫንዋንቱ ቫቱ
+				VUV
 			
 			
 				ሳሞአን ታላ
 				ሳሞአን ታላ
 				ሳሞአን ታላ
+				WST
 			
 			
 				የመካከለኛው አፍሪካ ሴፋ ፍራንክ
 				የመካከለኛው አፍሪካ ሴፋ ፍራንክ
 				የመካከለኛው አፍሪካ ሴፋ ፍራንክ
+				FCFA
 			
 			
 				የምዕራብ ካሪብያን ዶላር
 				የምዕራብ ካሪብያን ዶላር
 				የምዕራብ ካሪብያን ዶላር
+				EC$
 				$
 			
 			
 				የምዕራብ አፍሪካ ሴፋ ፍራንክ
 				የምዕራብ አፍሪካ ሴፋ ፍራንክ
 				የምዕራብ አፍሪካ ሴፋ ፍራንክ
+				CFA
 			
 			
 				ሲ ኤፍ ፒ ፍራንክ
 				ሲ ኤፍ ፒ ፍራንክ
 				ሲ ኤፍ ፒ ፍራንክ
+				CFPF
 			
 			
 				ያልታወቀ ገንዘብ
@@ -6220,22 +6374,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				የየመን ሪአል
 				የየመን ሪአል
 				የየመን ሪአል
+				YER
 			
 			
 				የደቡብ አፍሪካ ራንድ
 				የደቡብ አፍሪካ ራንድ
 				የደቡብ አፍሪካ ራንድ
+				ZAR
 				R
 			
 			
 				የዛምቢያ ክዋቻ (1968–2012)
 				የዛምቢያ ክዋቻ (1968–2012)
 				የዛምቢያ ክዋቻ (1968–2012)
+				ZMK
 			
 			
 				የዛምቢያ ክዋቻ
 				የዛምቢያ ክዋቻ
 				የዛምቢያ ክዋቻ
+				ZMW
 				ZK
 			
 			
@@ -6379,16 +6537,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} በማይል
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				ሊ/ኪሜ
 				{0} ሊ/ኪሜ
@@ -6469,6 +6617,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ምዕተ ዓመት
 				{0} ምዕተ ዓመት
 			
+			
+				አስር አመታት
+				{0} አስር አመታት
+				{0} አስር አመታት
+			
 			
 				ዓመታት
 				{0} ዓመት
@@ -6581,16 +6734,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ኤቮ
 				{0} ኤቮ
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
 			
 				ኒ
 				{0} ኒ
@@ -6616,6 +6759,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				ፒክስል
+				{0} ፒክስል
+				{0} ፒክስል
+			
+			
+				ሜጋ ፒክስል
+				{0} ሜጋ ፒክስል
+				{0} ሜጋ ፒክስል
+			
+			
+				ፒበሴሜ
+				{0} ፒበሴሜ
+				{0} ፒበሴሜ
+			
+			
+				ፒበኢ
+				{0} ፒበኢ
+				{0} ፒበኢ
+			
+			
+				ነበሴሜ
+				{0} ነበሴሜ
+				{0} ነበሴሜ
+			
+			
+				ነበኢ
+				{0} ነበኢ
+				{0} ነበኢ
+			
 			
 				ኪሎሜትር
 				{0} ኪሎሜትር
@@ -6711,21 +6884,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ነጥብ
 				{0} ነጥብ
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -6780,21 +6943,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 				{0} CD
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -6825,11 +6973,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} የፈረስ ጉልበት
 				{0} የፈረስ ጉልበት
 			
-			
-				ሄክቶፓስካል
-				{0} ሄክቶፓስካል
-				{0} ሄክቶፓስካል
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6845,6 +6988,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ኢንች ሜርኩሪ
 				{0} ኢንች ሜርኩሪ
 			
+			
+				አሞሌ
+				{0} አሞሌ
+				{0} አሞሌዎች
+			
 			
 				ሚሊባር
 				{0} ሚሊባር
@@ -6855,6 +7003,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ከባቢ አየር
 				{0} ከባቢ አየር
 			
+			
+				ፓስካል
+				{0} ፓስካል
+				{0} ፓስካል
+			
+			
+				ሄክቶፓስካል
+				{0} ሄክቶፓስካል
+				{0} ሄክቶፓስካል
+			
 			
 				ኪሎፓስካል
 				{0} ኪሎፓስካል
@@ -6905,11 +7063,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				ኒ.ሜ
 				{0} ኒ.ሜ
@@ -7030,11 +7183,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -7182,16 +7330,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				ሊ/ኪሜ
 				{0} ሊ/ኪሜ
@@ -7272,6 +7410,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ምዕተ ዓመት
 				{0} ምዕተ ዓመት
 			
+			
+				አስር አመታት
+				{0} አስር አመታት
+				{0} አስር አመታት
+			
 			
 				ዓመታት
 				{0} ዓመት
@@ -7384,16 +7527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ኤቮ
 				{0} ኤቮ
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
 			
 				ኒ
 				{0} ኒ
@@ -7419,6 +7552,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				ፒክስል
+				{0} ፒክስል
+				{0} ፒክስል
+			
+			
+				ሜጋ ፒክስል
+				{0} ሜጋ ፒክስል
+				{0} ሜጋ ፒክስል
+			
+			
+				ፒበሴሜ
+				{0} ፒበሴሜ
+				{0} ፒበሴሜ
+			
+			
+				ፒበኢ
+				{0} ፒበኢ
+				{0} ፒበኢ
+			
+			
+				ነበሴሜ
+				{0} ነበሴሜ
+				{0} ነበሴሜ
+			
+			
+				ነበኢ
+				{0} ነበኢ
+				{0} ነበኢ
+			
 			
 				ኪሎሜትር
 				{0} ኪሜ
@@ -7514,21 +7677,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ነጥብ
 				{0} ነጥብ
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -7583,21 +7736,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 				{0} CD
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -7628,11 +7766,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} የፈጉ
 				{0} የፈጉ
 			
-			
-				ሄክቶፓስካል
-				{0} ሄክቶፓስካል
-				{0} ሄክቶፓስካል
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7648,6 +7781,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ኢሜ
 				{0} ኢንሜር
 			
+			
+				አሞሌ
+				{0} አሞሌ
+				{0} አሞሌዎች
+			
 			
 				ሚሊባር
 				{0} ሚባ
@@ -7658,6 +7796,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ከባቢ አየር
 				{0} ከባቢ አየር
 			
+			
+				ፓስካል
+				{0} ፓስካል
+				{0} ፓስካል
+			
+			
+				ሄክቶፓስካል
+				{0} ሄክቶፓስካል
+				{0} ሄክቶፓስካል
+			
 			
 				ኪሎፓስካል
 				{0} ኪሎፓስካል
@@ -7708,11 +7856,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				ኒ.ሜ
 				{0} ኒ.ሜ
@@ -7833,11 +7976,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -8032,10 +8170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} የፈረስ ኃይል
 				{0} የፈረስ ኃይል
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -8044,6 +8178,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ሚባ
 				{0} ሚባ
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				ኪሎሜትር በሰዓት
 				{0} ኪሜ/ሰ
@@ -8112,7 +8250,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			{0}, {1}
-			{0}፣ {1}
 		
 		
 			{0}፣ {1}
@@ -8244,74 +8381,4 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		ምእራባዊ ኤስያ ስክሪፕት
 		ባዶ ቦታ
 	
-	
-		italic
-		optical size
-		slant
-		width
-		weight
-		cursive
-		caption
-		text
-		titling
-		display
-		poster
-		backslanted
-		upright
-		slanted
-		extra-slanted
-		ultracondensed
-		ultracompressed
-		ultranarrow
-		extra-condensed
-		extra-compressed
-		extra-narrow
-		condensed
-		compressed
-		compressed
-		semicondensed
-		semicompressed
-		seminarrow
-		normal
-		semiexpanded
-		semiextended
-		semiwide
-		expanded
-		extended
-		wide
-		extra-expanded
-		extra-extended
-		extra-wide
-		ultraexpanded
-		ultraextended
-		ultrawide
-		thin
-		extra-light
-		ultralight
-		light
-		semilight
-		book
-		regular
-		medium
-		semibold
-		demibold
-		bold
-		extra-bold
-		black
-		heavy
-		extra-black
-		ultrablack
-		ultraheavy
-		vertical fractions
-		capital spacing
-		optional ligatures
-		diagonal fractions
-		lining numbers
-		old-style figures
-		ordinals
-		proportional numbers
-		small capitals
-		tabular numbers
-		slashed zero
-	
 
diff --git a/make/data/cldr/common/main/am_ET.xml b/make/data/cldr/common/main/am_ET.xml
index b802a369cdb..69212b93c18 100644
--- a/make/data/cldr/common/main/am_ET.xml
+++ b/make/data/cldr/common/main/am_ET.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar.xml b/make/data/cldr/common/main/ar.xml
index f51485a70f2..c1197330043 100644
--- a/make/data/cldr/common/main/ar.xml
+++ b/make/data/cldr/common/main/ar.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -39,7 +39,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			الإنجليزية القديمة
 			الأنجيكا
 			العربية
-			العربية الرسمية الحديثة
+			العربية الفصحى الحديثة
 			الآرامية
 			المابودونغونية
 			الأراباهو
@@ -90,6 +90,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			الكاريبية
 			الكايوجية
 			الأتسام
+			تشاكما
 			الشيشانية
 			السيبيوانية
 			تشيغا
@@ -542,12 +543,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			اليديشية
 			اليوروبا
 			الكَنْتُونية
+			الكَنْتُونية
 			الزهيونج
 			الزابوتيك
 			رموز المعايير الأساسية
 			الزيناجا
 			التمازيغية المغربية القياسية
 			الصينية
+			الصينية
 			الصينية المبسطة
 			الصينية التقليدية
 			الزولو
@@ -743,7 +746,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			بوليفيا
 			هولندا الكاريبية
 			البرازيل
-			البهاما
+			جزر البهاما
 			بوتان
 			جزيرة بوفيه
 			بوتسوانا
@@ -872,7 +875,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			مالي
 			ميانمار (بورما)
 			منغوليا
-			مكاو الصينية (منطقة إدارية خاصة)
+			منطقة ماكاو الإدارية الخاصة
 			مكاو
 			جزر ماريانا الشمالية
 			جزر المارتينيك
@@ -941,6 +944,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			سانت مارتن
 			سوريا
 			إسواتيني
+			سوازيلاند
 			تريستان دا كونا
 			جزر توركس وكايكوس
 			تشاد
@@ -977,7 +981,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			فانواتو
 			جزر والس وفوتونا
 			ساموا
-			XA
 			كوسوفو
 			اليمن
 			مايوت
@@ -1009,22 +1012,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			التقويم
 			تنسيق العملة
-			التصنيف بحسب تجاهل الرموز
-			التصنيف بحسب اللكنة المعكوسة
-			الترتيب بحسب الأحرف الكبيرة/الصغيرة
-			التصنيف بحسب حساسية حالة الأحرف
+			الفرز بحسب تجاهل الرموز
+			الفرز بحسب اللكنة المعكوسة
+			الترتيب بحسب الأحرف الكبيرة/الصغيرة
+			الفرز بحسب حساسية حالة الأحرف
 			ترتيب الفرز
-			التصنيف الموحد
-			التصنيف الرقمي
-			قوة التصنيف
+			الفرز الموحد
+			الفرز الرقمي
+			قوة الفرز
 			العملة
 			نظام التوقيت (12 مقابل 24)
 			نمط فصل السطور
 			نظام القياس
 			الأرقام
-			المنطقة الزمنية
-			متغيرات اللغة
-			استخدام خاص
+			المنطقة الزمنية
+			متغيرات اللغة
+			استخدام خاص
 		
 		
 			التقويم البوذي
@@ -1156,8 +1159,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0670 ء أ ؤ إ ئ ا آ ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]
 		[ـ\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]
 		[ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]
-		[\u061C\u200E \- , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]
-		[\- ‐ – — ، ؛ \: ! ؟ . … ' " « » ( ) \[ \]]
+		[\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]
+		[\- ‐ ‑ – — ، ؛ \: ! ؟ . … ' " « » ( ) \[ \]]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1405,56 +1408,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1978,56 +1934,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2957,9 +2866,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				يوم
 				أول أمس
-				أمس
-				اليوم
-				غدًا
+				أمس
+				اليوم
+				غدًا
 				بعد الغد
 				
 					خلال {0} يوم
@@ -2981,9 +2890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				يوم
 				أول أمس
-				أمس
-				اليوم
-				غدًا
+				أمس
+				اليوم
+				غدًا
 				بعد الغد
 				
 					خلال {0} يوم
@@ -4349,7 +4258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				أكتوب
 			
 			
-				قوستاناي
+				قوستاناي
 			
 			
 				كيزيلوردا
@@ -5889,8 +5798,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			٫
+			٬
 			؛
 			٪؜
+			؜+
+			؜-
 			اس
 			×
 			؉
@@ -5899,6 +5812,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			.
+			,
 			‎%‎
 			‎+
 			‎-
@@ -5909,7 +5824,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ليس رقمًا
 			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ألف
@@ -6390,9 +6317,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				فرنك بلجيكي مالي
 			
-			
-				BGL
-			
 			
 				ليف بلغاري
 				ليف بلغاري
@@ -6485,6 +6409,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ريال برازيلي
 				ريال برازيلي
 				ريال برازيلي
+				R$
 				R$
 			
 			
@@ -6565,6 +6490,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دولار كندي
 				دولار كندي
 				دولار كندي
+				CA$
 				CA$
 			
 			
@@ -6616,6 +6542,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				يوان صيني
 				يوان صيني
 				يوان صيني
+				CN¥
 				CN¥
 			
 			
@@ -6809,6 +6736,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				يورو
 				يورو
 				يورو
+				€
 				€
 			
 			
@@ -6839,8 +6767,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				جنيه جزر فوكلاند
 				جنيه جزر فوكلاند
 				جنيه جزر فوكلاند
-				FKP
-				£
+				FKP
+				£
 			
 			
 				فرنك فرنسي
@@ -6859,6 +6787,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				جنيه إسترليني
 				جنيه إسترليني
 				جنيه إسترليني
+				UK£
 				UK£
 			
 			
@@ -6901,6 +6830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				جنيه جبل طارق
 				جنيه جبل طارق
 				GIP
+				£
 			
 			
 				دلاسي غامبي
@@ -7031,6 +6961,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				روبية إندونيسية
 				روبية إندونيسية
 				روبية إندونيسية
+				IDR
 				Rp
 			
 			
@@ -7070,6 +7001,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				روبية هندي
 				روبية هندي
 				روبية هندي
+				₹
 				₹
 			
 			
@@ -7183,6 +7115,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				فرنك جزر القمر
 				فرنك جزر القمر
 				فرنك جزر القمر
+				KMF
 				CF
 			
 			
@@ -7193,8 +7126,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				وون كوريا الشمالية
 				وون كوريا الشمالية
 				وون كوريا الشمالية
-				KPW
-				₩
+				KPW
+				₩
 			
 			
 				وون كوريا الجنوبية
@@ -7204,8 +7137,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				وون كوريا الجنوبية
 				وون كوريا الجنوبية
 				وون كوريا الجنوبية
-				₩
-				₩
+				₩
+				₩
 			
 			
 				دينار كويتي
@@ -7281,6 +7214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دولارًا ليبيريًا
 				دولار ليبيري
 				LRD
+				$LR
 			
 			
 				لوتي ليسوتو
@@ -7290,7 +7224,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				لوتي ليسوتو
 				لوتي ليسوتو
 				لوتي ليسوتو
-				LSL
 			
 			
 				ليتا ليتوانية
@@ -7493,6 +7426,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				بيزو مكسيكي
 				بيزو مكسيكي
 				بيزو مكسيكي
+				MX$
 				MX$
 			
 			
@@ -7537,6 +7471,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دولار ناميبي
 				دولار ناميبي
 				NAD
+				$
 			
 			
 				نايرا نيجيري
@@ -7664,6 +7599,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				روبية باكستاني
 				روبية باكستاني
 				روبية باكستاني
+				PKR
 				Rs
 			
 			
@@ -7864,8 +7800,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				جنيه سانت هيلين
 				جنيه سانت هيلين
 				جنيه سانت هيلين
-				SHP
-				£
+				SHP
+				£
 			
 			
 				تولار سلوفيني
@@ -8136,6 +8072,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دولار أمريكي
 				دولار أمريكي
 				دولار أمريكي
+				US$
 				US$
 			
 			
@@ -8231,6 +8168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				فرنك وسط أفريقي
 				فرنك وسط أفريقي
 				فرنك وسط أفريقي
+				FCFA
 			
 			
 				فضة
@@ -8294,7 +8232,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دولار شرق الكاريبي
 				دولار شرق الكاريبي
 				دولار شرق الكاريبي
-				$
+				EC$
+				$
 			
 			
 				حقوق السحب الخاصة
@@ -8334,6 +8273,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				فرنك غرب أفريقي
 				فرنك غرب أفريقي
 				فرنك غرب أفريقي
+				CFA
 			
 			
 				بالاديوم
@@ -8417,7 +8357,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				كواشا زامبي - 1968-2012
 				كواشا زامبي - 1968-2012
 				كواشا زامبي - 1968-2012
-				ZMK
 			
 			
 				كواشا زامبي
@@ -8504,8 +8443,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دورة
 				{0} دورة
 				دورة
-				{0} دورة
-				{0} دورة
+				دورتان
+				{0} دورات
 				{0} دورة
 				{0} دورة
 			
@@ -8531,7 +8470,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دقيقة قوسية
 				{0} دقيقة قوسية
 				دقيقة قوسية
-				{0} دقيقة قوسية
+				دقيقتان قوسيتان
 				{0} دقائق قوسية
 				{0} دقيقة قوسية
 				{0} دقيقة قوسية
@@ -8632,21 +8571,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} لكل بوصة مربعة
 			
 			
-				دونم
-				دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
+				دونم
+				دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
 			
 			
 				قيراط
 				{0} قيراط
 				قيراط
-				{0} قيراط
-				{0} قيراط
-				{0} قيراط
+				قيراطان
+				{0} قراريط
+				{0} قيراطًا
 				{0} قيراط
 			
 			
@@ -8671,9 +8610,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				جزء في المليون
 				{0} جزء في المليون
 				{0} جزء في المليون
-				{0} جزء في المليون
-				{0} جزء في المليون
-				{0} جزء في المليون
+				جزآن في المليون
+				{0} أجزاء في المليون
+				{0} جزءًا في المليون
 				{0} جزء في المليون
 			
 			
@@ -8694,58 +8633,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} في الألف
 				{0} في الألف
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-			
 			
-				مول
-				{0} مول
-				{0} مول
-				{0} مول
-				{0} مول
-				{0} مول
-				{0} مول
+				مول
+				{0} مول
+				{0} مول
+				{0} مول
+				{0} مول
+				{0} مول
+				{0} مول
 			
 			
 				لتر لكل كيلومتر
 				{0} لتر لكل كيلومتر
 				{0} لتر لكل كيلومتر
-				{0} لتر لكل كيلومتر
-				{0} لتر لكل كيلومتر
-				{0} لتر لكل كيلومتر
+				لتران لكل كيلومتر
+				{0} لترات لكل كيلومتر
+				{0} لترًا لكل كيلومتر
 				{0} لتر لكل كيلومتر
 			
 			
 				لتر لكل ١٠٠ كيلومتر
 				{0} لتر لكل ١٠٠ كيلومتر
 				{0} لتر لكل ١٠٠ كيلومتر
-				{0} لتر لكل ١٠٠ كيلومتر
-				{0} لتر لكل ١٠٠ كيلومتر
-				{0} لتر لكل ١٠٠ كيلومتر
+				لتران لكل ١٠٠ كيلومتر
+				{0} لترات لكل ١٠٠ كيلومتر
+				{0} لترًا لكل ١٠٠ كيلومتر
 				{0} لتر لكل ١٠٠ كيلومتر
 			
 			
 				ميل لكل غالون
 				{0} ميل لكل غالون
 				{0} ميل لكل غالون
-				{0} ميل لكل غالون
-				{0} ميل لكل غالون
-				{0} ميل لكل غالون
+				ميلان لكل غالون
+				{0} أميال لكل غالون
+				{0} ميلًا لكل غالون
 				{0} ميل لكل غالون
 			
 			
 				ميل لكل غالون إمبراطوري
 				{0} ميل لكل غالون إمبراطوري
 				{0} ميل لكل غالون إمبراطوري
-				{0} ميل لكل غالون إمبراطوري
-				{0} ميل لكل غالون إمبراطوري
-				{0} ميل لكل غالون إمبراطوري
+				ميلان لكل غالون إمبراطوري
+				{0} أميال لكل غالون إمبراطوري
+				{0} ميلًا لكل غالون إمبراطوري
 				{0} ميل لكل غالون إمبراطوري
 			
 			
@@ -8856,6 +8786,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} قرنًا
 				{0} قرن
 			
+			
+				عقود
+				{0} عقد
+				عقد
+				عقدان
+				{0} عقود
+				{0} عقدًا
+				{0} عقد
+			
 			
 				سنوات
 				{0} سنة
@@ -9044,40 +8983,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} كيلو واط/ساعة
 			
 			
-				إلكترون فولت
-				{0} إلكترون فولت
-				{0} إلكترون فولت
-				{0} إلكترون فولت
-				{0} إلكترون فولت
-				{0} إلكترون فولت
-				{0} إلكترون فولت
+				إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
 			
 			
-				وحدة حرارية بريطانية
-				{0} وحدة حرارية بريطانية
-				{0} وحدة حرارية بريطانية
-				{0} وحدة حرارية بريطانية
-				{0} وحدة حرارية بريطانية
-				{0} وحدة حرارية بريطانية
-				{0} وحدة حرارية بريطانية
+				وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				وحدتان حراريتان بريطانيتان
+				{0} وحدات حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+			
+			
+				وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				وحدتان حراريتان أمريكيتان
+				{0} وحدات حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
 			
 			
-				باوند قوة
-				{0} باوند قوة
-				{0} باوند قوة
-				{0} باوند قوة
-				{0} باوند قوة
-				{0} باوند قوة
-				{0} باوند قوة
+				باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
 			
 			
-				نيوتن
-				{0} نيوتن
-				{0} نيوتن
-				{0} نيوتن
-				{0} نيوتن
-				{0} نيوتن
-				{0} نيوتن
+				نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
 			
 			
 				غيغا هرتز
@@ -9115,6 +9063,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} هرتز
 				{0} هرتز
 			
+			
+				إم مطبعي
+				{0} إم
+				{0} إم
+				{0} إم
+				{0} إم
+				{0} إم
+				{0} إم
+			
+			
+				بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+			
+			
+				ميغابكسل
+				{0} ميغابكسل
+				{0} ميغابكسل
+				{0} ميغابكسل
+				{0} ميغابكسل
+				{0} ميغابكسل
+				{0} ميغابكسل
+			
+			
+				بكسل لكل سنتيمتر
+				{0} بكسل لكل سنتيمتر
+				{0} بكسل لكل سنتيمتر
+				{0} بكسل لكل سنتيمتر
+				{0} بكسل لكل سنتيمتر
+				{0} بكسل لكل سنتيمتر
+				{0} بكسل لكل سنتيمتر
+			
+			
+				بكسل لكل بوصة
+				{0} بكسل لكل بوصة
+				{0} بكسل لكل بوصة
+				{0} بكسل لكل بوصة
+				{0} بكسل لكل بوصة
+				{0} بكسل لكل بوصة
+				{0} بكسل لكل بوصة
+			
+			
+				نقطة لكل سنتيمتر
+				{0} نقطة لكل سنتيمتر
+				{0} نقطة لكل سنتيمتر
+				نقطتان لكل سنتيمتر
+				{0} نقاط لكل سنتيمتر
+				{0} نقطة لكل سنتيمتر
+				{0} نقطة لكل سنتيمتر
+			
+			
+				نقطة لكل بوصة
+				{0} نقطة لكل بوصة
+				{0} نقطة لكل بوصة
+				نقطتان لكل بوصة
+				{0} نقاط لكل بوصة
+				{0} نقطة لكل بوصة
+				{0} نقطة لكل بوصة
+			
 			
 				كيلومتر
 				{0} كيلومتر
@@ -9201,7 +9212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ياردة
-				ياردة
+				{0} ياردة
 				ياردة
 				{0} ياردة
 				{0} ياردة
@@ -9274,22 +9285,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ميل اسكندنافي
 			
 			
-				نقطة
-				{0} نقطة
-				نقطة
-				نقطتان
-				{0} نقاط
-				{0} نقطة
-				{0} نقطة
+				نقطة
+				{0} نقطة
+				نقطة
+				نقطتان
+				{0} نقاط
+				{0} نقطة
+				{0} نقطة
 			
 			
-				نصف قطر الشمس
-				{0} نصف قطر الشمس
-				{0} نصف قطر الشمس
-				{0} نصف قطر الشمس
-				{0} نصف قطر الشمس
-				{0} نصف قطر الشمس
-				{0} نصف قطر الشمس
+				نصف قطر شمسي
+				{0} نصف قطر شمسي
+				{0} نصف قطر شمسي
+				{0} نصف قطر شمسي
+				{0} نصف قطر شمسي
+				{0} نصف قطر شمسي
+				{0} نصف قطر شمسي
 			
 			
 				لكس
@@ -9301,13 +9312,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} لكس
 			
 			
-				ضياء شمسي
-				{0} L☉
-				{0} ضياء شمسي
-				{0} ضياء شمسي
-				{0} ضياء شمسي
-				{0} ضياء شمسي
-				{0} ضياء شمسي
+				ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
 			
 			
 				طن متري
@@ -9360,18 +9371,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				طن
 				{0} طن
 				{0} طن
-				{0} طن
-				{0} طن
-				{0} طن
+				طنان
+				{0} أطنان
+				{0} طنًا
 				{0} طن
 			
 			
 				رطل
 				{0} رطل
 				{0} رطل
-				{0} رطل
-				{0} رطل
-				{0} رطل
+				رطلان
+				{0} أرطل
+				{0} رطلًا
 				{0} رطل
 				{0}/رطل
 			
@@ -9398,37 +9409,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				قيراط
 				{0} قيراط
 				قيراط
-				{0} قيراط
-				{0} قيراط
-				{0} قيراط
+				قيراطان
+				{0} قراريط
+				{0} قيراطًا
 				{0} قيراط
 			
 			
-				دالتون
-				{0} Da
-				{0} دالتون
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} دالتون
+				دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
 			
 			
-				كتلة الأرض
-				{0} كتلة الأرض
-				{0} كتلة الأرض
-				{0} كتلة الأرض
-				{0} كتلة الأرض
-				{0} كتلة الأرض
-				{0} كتلة الأرض
+				كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
 			
 			
-				كتلة شمسية
-				{0} كتلة شمسية
-				{0} كتلة شمسية
-				{0} كتلة شمسية
-				{0} كتلة شمسية
-				{0} كتلة شمسية
-				{0} كتلة شمسية
+				كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
 			
 			
 				غيغا واط
@@ -9484,15 +9495,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} قوة حصان
 				{0} قوة حصان
 			
-			
-				هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-			
 			
 				مليمتر زئبقي
 				{0} مليمتر زئبقي
@@ -9520,6 +9522,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} بوصة زئبقية
 				{0} بوصة زئبقية
 			
+			
+				بار
+				{0} بار
+				{0} بار
+				{0} بار
+				{0} بار
+				{0} بار
+				{0} بار
+			
 			
 				ملي بار
 				{0} ملي بار
@@ -9538,23 +9549,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ض.ج
 				{0} ضغط جوي
 			
+			
+				باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+			
+			
+				هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+			
 			
-				كيلوباسكال
-				{0} كيلوباسكال
-				{0} كيلوباسكال
-				{0} كيلوباسكال
-				{0} كيلوباسكال
-				{0} كيلوباسكال
-				{0} كيلوباسكال
+				كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
 			
 			
-				ميغاباسكال
-				{0} ميغاباسكال
-				{0} ميغاباسكال
-				{0} ميغاباسكال
-				{0} ميغاباسكال
-				{0} ميغاباسكال
-				{0} ميغاباسكال
+				ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
 			
 			
 				كيلومتر في الساعة
@@ -9629,22 +9658,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} درجة كلفن
 			
 			
-				باوند قدم
-				{0} باوند قدم
-				{0} باوند قدم
-				{0} باوند قدم
-				{0} باوند قدم
-				{0} باوند قدم
-				{0} باوند قدم
+				باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
 			
 			
-				نيوتن متر
-				{0} نيوتن متر
-				{0} نيوتن متر
-				{0} نيوتن متر
-				{0} نيوتن متر
-				{0} نيوتن متر
-				{0} نيوتن متر
+				نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
 			
 			
 				كيلومتر مكعب
@@ -9850,13 +9879,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} أونصة سائلة
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				أونصة سائلة إمبراطورية
+				{0} أونصة سائلة إمبراطورية
+				{0} أونصة سائلة إمبراطورية
+				أونصتان سائلتان إمبراطوريتان
+				{0} أونصات سائلة إمبراطورية
+				{0} أونصة سائلة إمبراطورية
+				{0} أونصة سائلة إمبراطورية
 			
 			
 				ملعقة كبيرة
@@ -9877,16 +9906,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ملعقة صغيرة
 			
 			
-				برميل
-				{0} برميل
-				{0} برميل
-				{0} برميل
-				{0} برميل
-				{0} برميل
-				{0} برميل
+				برميل
+				{0} برميل
+				برميل
+				برميلان
+				{0} براميل
+				{0} برميلًا
+				{0} برميل
 			
 			
-				اتجاه أساسي
+				اتجاه أساسي
 				{0} شرقًا
 				{0} شمالاً
 				{0} جنوبًا
@@ -9897,6 +9926,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				قوة تسارع
 				{0} قوة تسارع
@@ -10047,13 +10079,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/بوصة²
 			
 			
-				دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
-				{0} دونم
+				دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
+				{0} دونم
 			
 			
 				قيراط
@@ -10102,24 +10134,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				في الألف
-			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
+				{0}؉
+				{0}؉
+				{0}؉
+				{0}؉
+				{0}؉
+				{0}؉
 			
 			
-				مول
-				{0} mol
-				{0} mol
-				{0} mol
-				{0} mol
-				{0} mol
-				{0} mol
+				مول
+				{0} مول
+				{0} مول
+				{0} مول
+				{0} مول
+				{0} مول
+				{0} مول
 			
 			
 				لتر/كم
@@ -10265,12 +10294,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} قرنًا
 				{0} قرن
 			
+			
+				عقد
+				{0} عقد
+				عقد
+				عقدان
+				{0} عقود
+				{0} عقدًا
+				{0} عقد
+			
 			
 				سنة
 				{0} سنة
 				سنة واحدة
 				سنتان
-				{0} سنة
+				{0} سنوات
 				{0} سنة
 				{0} سنة
 				{0}/سنة
@@ -10279,9 +10317,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				شهور
 				{0} شهر
 				شهر
-				{0} شهر
-				{0} شهر
-				{0} شهر
+				شهران
+				{0} أشهر
+				{0} شهرًا
 				{0} شهر
 				{0}/ش
 			
@@ -10300,8 +10338,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} يوم
 				يوم
 				يومان
-				{0} يوم
-				{0} يوم
+				{0} أيام
+				{0} يومًا
 				{0} يوم
 				{0}/ي
 			
@@ -10453,40 +10491,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ك.و.س
 			
 			
-				إلكترون فولت
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
+				إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
+				{0} إلكترون فولت
 			
 			
-				Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
+				وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدات حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+			
+			
+				وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				{0} وحدات حرارية أمريكية
+				{0} وحدة حرارية أمريكية
+				{0} وحدة حرارية أمريكية
 			
 			
-				باوند قوة
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
+				باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
+				{0} باوند قوة
 			
 			
-				نيوتن
-				{0} N
-				{0} N
-				{0} N
-				{0} N
-				{0} N
-				{0} N
+				نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
+				{0} نيوتن
 			
 			
 				غ هرتز
@@ -10524,6 +10571,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} هرتز
 				{0} هرتز
 			
+			
+				إم
+				{0} إم
+				{0} إم
+				{0} إم
+				{0} إم
+				{0} إم
+				{0} إم
+			
+			
+				بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+				{0} بكسل
+			
+			
+				م.بكسل
+				{0} م.بكسل
+				{0} م.بكسل
+				{0} م.بكسل
+				{0} م.بكسل
+				{0} م.بكسل
+				{0} م.بكسل
+			
+			
+				بكسل لكل سنتيمتر
+				{0} بكسل/سم
+				{0} بكسل/سم
+				{0} بكسل/سم
+				{0} بكسل/سم
+				{0} بكسل/سم
+				{0} بكسل/سم
+			
+			
+				بكسل لكل بوصة
+				{0} بكسل/بوصة
+				{0} بكسل/بوصة
+				{0} بكسل/بوصة
+				{0} بكسل/بوصة
+				{0} بكسل/بوصة
+				{0} بكسل/بوصة
+			
+			
+				نقطة لكل سنتيمتر
+				{0} نقطة/سم
+				{0} نقطة/سم
+				نقطتان/سم
+				{0} نقاط/سم
+				{0} نقطة/سم
+				{0} نقطة/سم
+			
+			
+				نقطة لكل بوصة
+				{0} نقطة/بوصة
+				{0} نقطة/بوصة
+				نقطتان/بوصة
+				{0} نقاط/بوصة
+				{0} نقطة/بوصة
+				{0} نقطة/بوصة
+			
 			
 				كم
 				{0} كم
@@ -10683,22 +10793,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ميل اسكندنافي
 			
 			
-				نقطة
-				{0} ن
-				{0} ن
-				{0} ن
-				{0} ن
-				{0} ن
-				{0} ن
+				نقطة
+				{0} نقطة
+				نقطة
+				نقطتان
+				{0} نقاط
+				{0} نقطة
+				{0} نقطة
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
+				نق شمسي
+				{0} نق شمسي
+				{0} نق شمسي
+				{0} نق شمسي
+				{0} نق شمسي
+				{0} نق شمسي
+				{0} نق شمسي
 			
 			
 				لكس
@@ -10710,13 +10820,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} لكس
 			
 			
-				ضياء شمسي
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
+				ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				{0} ضياء شمسي
 			
 			
 				ط.م
@@ -10813,31 +10923,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} قيراط
 			
 			
-				Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
+				دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
+				{0} دالتون
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
+				كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
+				كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
 			
 			
 				غ واط
@@ -10893,15 +11003,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} حصان
 				{0} حصان
 			
-			
-				هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-				{0} هكتوباسكال
-			
 			
 				ملم زئبقي
 				{0} ملم زئبقي
@@ -10929,6 +11030,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ب. زئبقية
 				{0} ب. زئبقية
 			
+			
+				بار
+				{0} بار
+				{0} بار
+				{0} بار
+				{0} بار
+				{0} بار
+				{0} بار
+			
 			
 				م. بار
 				{0} م. بار
@@ -10947,23 +11057,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ض.ج
 				{0} ض.ج
 			
+			
+				باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+				{0} باسكال
+			
+			
+				هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+				{0} هكتوباسكال
+			
 			
-				kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
+				ك.باسكال
+				{0} ك.باسكال
+				{0} ك.باسكال
+				{0} ك.باسكال
+				{0} ك.باسكال
+				{0} ك.باسكال
+				{0} ك.باسكال
 			
 			
-				MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
+				م.باسكال
+				{0} م.باسكال
+				{0} م.باسكال
+				{0} م.باسكال
+				{0} م.باسكال
+				{0} م.باسكال
+				{0} م.باسكال
 			
 			
 				كم/س
@@ -11038,22 +11166,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} د كلفن
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
+				{0} باوند قدم
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
+				{0} نيوتن متر
 			
 			
 				كم³
@@ -11250,22 +11378,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} كوب
 			
 			
-				أونصة س
-				{0} أونصة س
+				أونصة سائلة
+				{0} أونصة سائلة
 				أونصة س
 				{0} أونصة س
-				{0} أونصة س
+				{0} أونصات سائلة
 				{0} أونصة س
-				{0} أونصة س
+				{0} أونصة سائلة
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				أونصة سائلة إمبراطورية
 			
 			
 				ملعقة كبيرة
@@ -11286,13 +11408,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ملعقة ص
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
+				برميل
+				{0} برميل
+				برميل
+				برميلان
+				{0} براميل
+				{0} برميلًا
+				{0} برميل
 			
 			
 				اتجاه
@@ -11417,8 +11539,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				شهر
 				{0} شهر
-				{0} شهر
-				{0} شهر
+				شهر
+				شهران
 				{0} شهر
 				{0} شهر
 				{0} شهر
@@ -11620,14 +11742,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} قوة حصان
 				{0} قوة حصان
 			
-			
-				{0} هكب
-				{0} هكب
-				{0} هكب
-				{0} هكب
-				{0} هكب
-				{0} هكب
-			
 			
 				{0} ب ز
 				{0} ب ز
@@ -11644,6 +11758,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} مللي بار
 				{0} مللي بار
 			
+			
+				{0} هكب
+				{0} هكب
+				{0} هكب
+				{0} هكب
+				{0} هكب
+				{0} هكب
+			
 			
 				كم/س
 				{0} كم/س
@@ -11731,27 +11853,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
-			{0}، {1}
-			{0}، {1}
-			{0}، و{1}
-			{0} و{1}
-		
-		
-			{0} و{1}
-			{0} و{1}
-			{0} أو {1}
-			{0} أو {1}
-		
-		
 			{0} و{1}
 			{0} و{1}
 			{0} و{1}
 			{0} و{1}
 		
+		
+			{0} أو {1}
+			{0} أو {1}
+			{0} أو {1}
+			{0} أو {1}
+		
+		
+			{0} أو {1}
+		
+		
+			{0} أو {1}
+		
+		
+			{0} و{1}
+			{0} و{1}
+			{0} و{1}
+		
 		
-			{0}، و{1}
-			{0}، و{1}
-			{0}، و{1}
+			{0} و{1}
+			{0} و{1}
+			{0} و{1}
 			{0} و{1}
 		
 		
@@ -11761,10 +11888,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} و{1}
 		
 		
-			{0}، {1}
-			{0}، {1}
-			{0}، {1}
-			{0}، {1}
+			{0} و{1}
+			{0} و{1}
+			{0} و{1}
 		
 		
 			{0}، و{1}
diff --git a/make/data/cldr/common/main/ar_001.xml b/make/data/cldr/common/main/ar_001.xml
index f27e153cf3f..5816dcb4eb4 100644
--- a/make/data/cldr/common/main/ar_001.xml
+++ b/make/data/cldr/common/main/ar_001.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_AE.xml b/make/data/cldr/common/main/ar_AE.xml
index b56cebd138e..87395f28d16 100644
--- a/make/data/cldr/common/main/ar_AE.xml
+++ b/make/data/cldr/common/main/ar_AE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -40,14 +40,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 		
 			
 				$
diff --git a/make/data/cldr/common/main/ar_BH.xml b/make/data/cldr/common/main/ar_BH.xml
index 9e8884255e4..3e0fc503eca 100644
--- a/make/data/cldr/common/main/ar_BH.xml
+++ b/make/data/cldr/common/main/ar_BH.xml
@@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_DJ.xml b/make/data/cldr/common/main/ar_DJ.xml
index e6d5d0f737b..1c21b0a62f1 100644
--- a/make/data/cldr/common/main/ar_DJ.xml
+++ b/make/data/cldr/common/main/ar_DJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_DZ.xml b/make/data/cldr/common/main/ar_DZ.xml
index e975f58b229..fe439b1a7ad 100644
--- a/make/data/cldr/common/main/ar_DZ.xml
+++ b/make/data/cldr/common/main/ar_DZ.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
@@ -82,10 +82,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		latn
-		
-			٫
-			٬
-		
 		
 			,
 			.
diff --git a/make/data/cldr/common/main/ar_EG.xml b/make/data/cldr/common/main/ar_EG.xml
index c39271a6dc7..1faacddc30b 100644
--- a/make/data/cldr/common/main/ar_EG.xml
+++ b/make/data/cldr/common/main/ar_EG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -18,13 +18,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_EH.xml b/make/data/cldr/common/main/ar_EH.xml
index 27be9cca1dd..1163c630b40 100644
--- a/make/data/cldr/common/main/ar_EH.xml
+++ b/make/data/cldr/common/main/ar_EH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_ER.xml b/make/data/cldr/common/main/ar_ER.xml
index 0882c3cc950..2414f8f74ef 100644
--- a/make/data/cldr/common/main/ar_ER.xml
+++ b/make/data/cldr/common/main/ar_ER.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_IL.xml b/make/data/cldr/common/main/ar_IL.xml
index 16bdb8cffdd..4c05e8b5fca 100644
--- a/make/data/cldr/common/main/ar_IL.xml
+++ b/make/data/cldr/common/main/ar_IL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_IQ.xml b/make/data/cldr/common/main/ar_IQ.xml
index 3e78c6f0163..344ce08ad3b 100644
--- a/make/data/cldr/common/main/ar_IQ.xml
+++ b/make/data/cldr/common/main/ar_IQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -109,13 +109,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_JO.xml b/make/data/cldr/common/main/ar_JO.xml
index 28219361970..a9183695b0f 100644
--- a/make/data/cldr/common/main/ar_JO.xml
+++ b/make/data/cldr/common/main/ar_JO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -109,13 +109,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_KM.xml b/make/data/cldr/common/main/ar_KM.xml
index bfd51e02e3b..433ccf306e3 100644
--- a/make/data/cldr/common/main/ar_KM.xml
+++ b/make/data/cldr/common/main/ar_KM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_KW.xml b/make/data/cldr/common/main/ar_KW.xml
index bb00eb41045..20f36129a5c 100644
--- a/make/data/cldr/common/main/ar_KW.xml
+++ b/make/data/cldr/common/main/ar_KW.xml
@@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_LB.xml b/make/data/cldr/common/main/ar_LB.xml
index bc6d4c6fe41..6c37638e0df 100644
--- a/make/data/cldr/common/main/ar_LB.xml
+++ b/make/data/cldr/common/main/ar_LB.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/ar_LY.xml b/make/data/cldr/common/main/ar_LY.xml
index 2c23c7e9dad..bccfacff9b2 100644
--- a/make/data/cldr/common/main/ar_LY.xml
+++ b/make/data/cldr/common/main/ar_LY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -30,7 +30,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/ar_MA.xml b/make/data/cldr/common/main/ar_MA.xml
index 56de5c30916..97cb1eccfda 100644
--- a/make/data/cldr/common/main/ar_MA.xml
+++ b/make/data/cldr/common/main/ar_MA.xml
@@ -7,13 +7,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		[\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک ڭ گ ݣ ی]
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
@@ -106,10 +106,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		latn
-		
-			٫
-			٬
-		
 		
 			,
 			.
diff --git a/make/data/cldr/common/main/ar_MR.xml b/make/data/cldr/common/main/ar_MR.xml
index a3ef9192437..3717095628c 100644
--- a/make/data/cldr/common/main/ar_MR.xml
+++ b/make/data/cldr/common/main/ar_MR.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/ar_OM.xml b/make/data/cldr/common/main/ar_OM.xml
index 55389c123c8..e074969a66a 100644
--- a/make/data/cldr/common/main/ar_OM.xml
+++ b/make/data/cldr/common/main/ar_OM.xml
@@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_PS.xml b/make/data/cldr/common/main/ar_PS.xml
index 71aebcdc131..5924a9dff2a 100644
--- a/make/data/cldr/common/main/ar_PS.xml
+++ b/make/data/cldr/common/main/ar_PS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_QA.xml b/make/data/cldr/common/main/ar_QA.xml
index a204cedc137..accdba299a0 100644
--- a/make/data/cldr/common/main/ar_QA.xml
+++ b/make/data/cldr/common/main/ar_QA.xml
@@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_SA.xml b/make/data/cldr/common/main/ar_SA.xml
index 5890f24016c..57120f00c74 100644
--- a/make/data/cldr/common/main/ar_SA.xml
+++ b/make/data/cldr/common/main/ar_SA.xml
@@ -7,26 +7,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
+			العربية الرسمية الحديثة
 			المابودونجونية
+			الألمانية النمساوية
+			الألمانية العليا السويسرية
+			الإنجليزية الأسترالية
+			الإنجليزية الكندية
+			الإنجليزية البريطانية
+			الإنجليزية المملكة المتحدة
+			الإنجليزية الأمريكية
+			الإنجليزية الولايات المتحدة
+			الإسبانية أمريكا اللاتينية
+			الإسبانية الأوروبية
+			الإسبانية المكسيكية
+			الفرنسية الكندية
+			الفرنسية السويسرية
 			الغورانية
 			صوربيا العليا
 			اللاوو
+			السكسونية السفلى
+			الفلمنكية
+			البرتغالية البرازيلية
+			البرتغالية الأوروبية
 			الكرواتية الصربية
 			سامي الجنوبية
 			السواحيلية
 			السواحيلية الكونغولية
 			التيلوجو
 			التيغرينية
+			الصينية المبسطة
+			الصينية التقليدية
 		
 		
 			جزيرة أسينشين
-			جزر البهاما
 			التشيك
 			سبتة ومليلية
 			ماكاو الصينية (منطقة إدارية خاصة)
@@ -34,9 +53,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			مونتيسيرات
 			أوروغواي
 		
+		
+			الولايت المتحدة
+		
 	
 	
-		[\u200E \- , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
@@ -44,25 +66,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
+							فجرًا
+							ص
+							ظهرًا
+							بعد الظهر
+							مساءً
+							منتصف الليل
 							ل
 						
-						
-							فجرًا
-						
-						
-							فجرًا
-						
-					
-					
-						
-							فجرًا
-						
-						
-							فجرًا
-						
-						
-							فجرًا
-						
 					
 				
 			
@@ -74,4 +85,762 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			٪
 		
 	
+	
+		
+			
+				{0} متر في الثانية المربعة
+				{0} متر في الثانية المربعة
+				متران في الثانية المربعة
+				{0} أمتار في الثانية المربعة
+				{0} مترًا في الثانية المربعة
+				{0} متر في الثانية المربعة
+			
+			
+				{0} دقيقة قوسية
+				دقيقة قوسية
+				دقيقتان قوسيتان
+				{0} دقائق قوسية
+				{0} دقيقة قوسية
+				{0} دقيقة قوسية
+			
+			
+				{0} كيلومتر مربع
+				{0} كيلومتر مربع
+				كيلومتران مربعان
+				{0} كيلومترات مربعة
+				{0} كيلومترًا مربعًا
+				{0} كيلومتر مربع
+			
+			
+				{0} هكتار
+				{0} هكتار
+				هكتاران
+				{0} هكتارات
+				{0} هكتارًا
+				{0} هكتار
+			
+			
+				{0} متر مربع
+				{0} متر مربع
+				متران مربعان
+				{0} أمتار مربعة
+				{0} مترًا مربعًا
+				{0} متر مربع
+			
+			
+				{0} سنتيمتر مربع
+				{0} سنتيمتر مربع
+				سنتيمتران مربعان
+				{0} سنتيمترات مربعة
+				{0} سنتيمترًا مربعًا
+				{0} سنتيمتر مربع
+			
+			
+				{0} ميل مربع
+				{0} ميل مربع
+				ميلان مربعان
+				{0} أميال مربعة
+				{0} ميلًا مربعًا
+				{0} ميل مربع
+			
+			
+				{0} فدان
+				فدان
+				{0} فدان
+				{0} أفدنة
+				{0} فدانًا
+				{0} فدان
+			
+			
+				{0} ياردة مربعة
+				{0} ياردة مربعة
+				ياردتان مربعتان
+				{0} ياردات مربعة
+				{0} ياردة مربعة
+				{0} ياردة مربعة
+			
+			
+				{0} قدم مربعة
+				قدم مربعة
+				قدمان مربعتان
+				{0} أقدام مربعة
+				{0} قدمًا مربعة
+				{0} قدم مربعة
+			
+			
+				{0} بوصة مربعة
+				{0} بوصة مربعة
+				بوصتان مربعتان
+				{0} بوصات مربعة
+				{0} بوصة مربعة
+				{0} بوصة مربعة
+			
+			
+				{0} جزء في المليون
+				{0} جزء في المليون
+				جزءان في المليون
+				{0} أجزاء في المليون
+				{0} جزءًا في المليون
+				{0} جزء في المليون
+			
+			
+				{0} ميل لكل غالون
+				{0} ميل لكل غالون
+				{0} ميلان لكل غالون
+				{0} أميال لكل غالون
+				{0} ميلًا لكل غالون
+				{0} ميل لكل غالون
+			
+			
+				{0} ثانية
+				ثانية
+				ثانيتان
+				{0} ثوانٍ
+				{0} ثانية
+				{0} ثانية
+			
+			
+				{0} كيلومتر
+				{0} كيلومتر
+				كيلومتران
+				{0} كيلومترات
+				{0} كيلومترًا
+				{0} كيلومتر
+			
+			
+				{0} سنتيمتر
+				{0} سنتيمتر
+				سنتيمتران
+				{0} سنتيمترات
+				{0} سنتيمترًا
+				{0} سنتيمتر
+			
+			
+				{0} مليمتر
+				{0} مليمتر
+				مليمتران
+				{0} مليمتر
+				{0} مليمترًا
+				{0} مليمتر
+			
+			
+				{0} ياردة
+				ياردة
+				ياردتان
+				{0} ياردات
+				{0} ياردة
+				{0} ياردة
+			
+			
+				{0} قدم
+				قدم
+				قدمان
+				{0} أقدام
+				{0} قدمًا
+				{0} قدم
+			
+			
+				{0} بوصة
+				{0} بوصة
+				بوصتان
+				{0} بوصات
+				{0} بوصة
+				{0} بوصة
+			
+			
+				{0} فرسخ فلكي
+				فرسخ فلكي
+				فرسخان فلكيان
+				{0} فراسخ فلكية
+				{0} فرسخًا فلكيًا
+				{0} فرسخ فلكي
+			
+			
+				{0} وحدة فلكية
+				وحدة فلكية
+				وحدتان فلكيتان
+				{0} وحدات فلكية
+				{0} وحدة فلكية
+				{0} وحدة فلكية
+			
+			
+				{0} ميل بحري
+				ميل بحري
+				ميلان بحريان
+				{0} أميال بحرية
+				{0} ميلًا بحريًا
+				{0} ميل بحري
+			
+			
+				{0} ميل اسكندنافي
+				{0} ميل اسكندنافي
+				ميلان اسكندنافيان
+				{0} أميال اسكندنافية
+				{0} ميلًا اسكندنافيًا
+				{0} ميل اسكندنافي
+			
+			
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				ضياءان شمسيان
+				{0} ضياءات شمسية
+				{0} ضياءً شمسيًا
+				{0} ضياء شمسي
+			
+			
+				{0} طن متري
+				{0} طن متري
+				طنان متريان
+				{0} أطنان مترية
+				{0} طنًا متريًا
+				{0} طن متري
+			
+			
+				{0} كيلوغرام
+				{0} كيلوغرام
+				كيلوغرامان
+				{0} كيلوغرامات
+				{0} كيلوغرامًا
+				{0} كيلوغرام
+			
+			
+				{0} مليغرام
+				{0} مليغرام
+				مليغرامان
+				{0} مليغرامات
+				{0} مليغرامًا
+				{0} مليغرام
+			
+			
+				{0} ميكروغرام
+				{0} ميكروغرام
+				ميكروغرامان
+				{0} ميكروغرامات
+				{0} ميكروغرامًا
+				{0} ميكروغرام
+			
+			
+				{0} رطل
+				{0} رطل
+				رطلان
+				{0} أرطال
+				{0} رطلًا
+				{0} رطل
+			
+			
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				كتلتان أرضيتان
+				{0} كتل أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+			
+			
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				كتلتان شمسيتان
+				{0} كتل شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+			
+			
+				{0} رطل لكل بوصة مربعة
+				{0} رطل لكل بوصة مربعة
+				رطلان لكل بوصة مربعة
+				{0} أرطال لكل بوصة مربعة
+				{0} رطلًا لكل بوصة مربعة
+				{0} رطل لكل بوصة مربعة
+			
+			
+				{0} كيلومتر في الساعة
+				{0} كيلومتر في الساعة
+				كيلومتران في الساعة
+				{0} كيلومترات في الساعة
+				{0} كيلومترًا في الساعة
+				{0} كيلومتر في الساعة
+			
+			
+				{0} متر في الثانية
+				{0} متر في الثانية
+				متران في الثانية
+				{0} أمتار في الثانية
+				{0} مترًا في الثانية
+				{0} متر في الثانية
+			
+			
+				{0} ميل في الساعة
+				{0} ميل في الساعة
+				ميلان في الساعة
+				{0} أميال في الساعة
+				{0} ميلًا في الساعة
+				{0} ميل في الساعة
+			
+			
+				{0} عقدة
+				{0} عقدة
+				عقدتان
+				{0} عقد
+				{0} عقدة
+				{0} عقدة
+			
+			
+				{0} كيلومتر مكعب
+				{0} كيلومتر مكعب
+				كيلومتران مكعبان
+				{0} كيلومترات مكعبة
+				{0} كيلومترًا مكعبًا
+				{0} كيلومتر مكعب
+			
+			
+				{0} متر مكعب
+				{0} متر مكعب
+				متران مكعبان
+				{0} مترات مكعبة
+				{0} مترًا مكعبًا
+				{0} متر مكعب
+			
+			
+				{0} سنتيمتر مكعب
+				{0} سنتيمتر مكعب
+				سنتيمتران مكعبان
+				{0} سنتيمترات مكعبة
+				{0} سنتيمترًا مكعبًا
+				{0} سنتيمتر مكعب
+			
+			
+				{0} ميل مكعب
+				{0} ميل مكعب
+				ميلان مكعبان
+				{0} أميال مكعبة
+				{0} ميلًا مكعبًا
+				{0} ميل مكعب
+			
+			
+				{0} ياردة مكعبة
+				{0} ياردة مكعبة
+				ياردتان مكعبتان
+				{0} ياردات مكعبة
+				{0} ياردة مكعبة
+				{0} ياردة مكعبة
+			
+			
+				{0} قدم مكعبة
+				قدم مكعبة
+				قدمان مكعبتان
+				{0} أقدام مكعبة
+				{0} أقدام مكعبة
+				{0} قدم مكعبة
+			
+			
+				{0} بوصة مكعبة
+				{0} بوصة مكعبة
+				بوصتان مكعبات
+				{0} بوصات مكعبة
+				{0} بوصة مكعبة
+				{0} بوصة مكعبة
+			
+			
+				{0} لتر
+				لتر
+				لتران
+				{0} لترات
+				{0} لترًا
+				{0} لتر
+			
+			
+				{0} مكيال متري
+				{0} مكيال متري
+				مكيالان متريان
+				{0} مكاييل مترية
+				{0} مكيالًا متريًا
+				{0} مكيال متري
+			
+			
+				{0} كوب متري
+				{0} كوب متري
+				كوبان متريان
+				{0} أكواب مترية
+				{0} كوبًا متريًا
+				{0} كوب متري
+			
+			
+				{0} ملعقة كبيرة
+				ملعقة كبيرة
+				ملعقتان كبيرتان
+				{0} ملاعق كبيرة
+				{0} ملعقة كبيرة
+				{0} ملعقة كبيرة
+			
+			
+				{0} ملعقة صغيرة
+				ملعقة صغيرة
+				ملعقتان صغيرتان
+				{0} ملاعق صغيرة
+				{0} ملعقة صغيرة
+				{0} ملعقة صغيرة
+			
+		
+		
+			
+				{0} دورة
+				دورة
+				دورتان
+				{0} دورات
+				{0} دورة
+				{0} دورة
+			
+			
+				{0} هكتار
+				{0} هكتار
+				هكتاران
+				{0} هكتارات
+				{0} هكتارًا
+				{0} هكتار
+			
+			
+				{0} فدان
+				فدان
+				فدانان
+				{0} أفدنة
+				{0} فدانًا
+				{0} فدان
+			
+			
+				{0} قيراط
+				قيراط
+				قيراطان
+				{0} قراريط
+				{0} قيراطًا
+				{0} قيراط
+			
+			
+				{0} جزء/مليون
+				{0} جزء/مليون
+				جزءان/مليون
+				{0} أجزاء/مليون
+				{0} جزءًا/مليون
+				{0} جزء/مليون
+			
+			
+				{0} لتر/كم
+				{0} لتر/كم
+				لتران/كم
+				{0} لترات/كم
+				{0} لترًا/كم
+				{0} لتر/كم
+			
+			
+				{0} لتر/١٠٠ كم
+				{0} لتر/١٠٠ كم
+				لتران/١٠٠ كم
+				{0} لترات/١٠٠ كم
+				{0} لترًا/١٠٠ كم
+				{0} لتر/١٠٠ كم
+			
+			
+				{0} ميل/غالون
+				{0} ميل/غالون
+				ميلان/غالون
+				{0} أميال/غالون
+				{0} ميلًا/غالون
+				{0} ميل/غالون
+			
+			
+				{0} ميل/غ. إمبراطوري
+				{0} ميل/غ. إمبراطوري
+				ميلان/غ. إمبراطوري
+				{0} أميال/غ. إمبراطوري
+				{0} ميلًا/غ. إمبراطوري
+				{0} ميل/غ. إمبراطوري
+			
+			
+				سنوات
+				{0} سنة
+				سنة
+				سنتان
+				{0} سنوات
+				{0} سنة
+				{0} سنة
+			
+			
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدات حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+				{0} وحدة حرارية بريطانية
+			
+			
+				{0} ميل
+				ميل
+				ميلان
+				{0} أميال
+				{0} ميل
+				{0} ميل
+			
+			
+				{0} ياردة
+				ياردة
+				ياردتان
+				{0} ياردات
+				{0} ياردة
+				{0} ياردة
+			
+			
+				{0} قدم
+				قدم
+				قدمان
+				{0} أقدام
+				{0} قدمًا
+				{0} قدم
+			
+			
+				{0} بوصة
+				{0} بوصة
+				بوصتان
+				{0} بوصات
+				{0} بوصة
+				{0} بوصة
+			
+			
+				{0} فرسخ فلكي
+				فرسخ فلكي
+				فرسخان فلكيان
+				{0} فراسخ فلكية
+				{0} فرسخًا فلكيًا
+				{0} فرسخ فلكي
+			
+			
+				{0} ميل بحري
+				ميل بحري
+				ميلان بحريان
+				{0} أميال بحرية
+				{0} ميلًا بحريًا
+				{0} ميل بحري
+			
+			
+				{0} ميل اسكندنافي
+				{0} ميل اسكندنافي
+				ميلان اسكندنافيان
+				{0} أميال اسكندنافية
+				{0} ميلًا اسكندنافيًا
+				{0} ميل اسكندنافي
+			
+			
+				{0} ضياء شمسي
+				{0} ضياء شمسي
+				ضياءان شمسيان
+				{0} ضياءات شمسية
+				{0} ضياءً شمسيًا
+				{0} ضياء شمسي
+			
+			
+				{0} غرام
+				غرام
+				غرامان
+				{0} غرامات
+				{0} غرامًا
+				{0} غرام
+			
+			
+				{0} طن
+				{0} طن
+				طنان
+				{0} أطنان
+				{0} طنًا
+				{0} طن
+			
+			
+				{0} رطل
+				{0} رطل
+				رطلان
+				{0} أرطال
+				{0} رطلُا
+				{0} رطل
+			
+			
+				{0} قيراط
+				{0} قيراط
+				قيراطان
+				{0} قراريط
+				{0} قيراطًا
+				{0} قيراط
+			
+			
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+				كتلتان أرضيتان
+				{0} كتل أرضية
+				{0} كتلة أرضية
+				{0} كتلة أرضية
+			
+			
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+				كتلتان شمسيتان
+				{0} كتل شمسية
+				{0} كتلة شمسية
+				{0} كتلة شمسية
+			
+			
+				{0} رطل/بوصة²
+				{0} رطل/بوصة²
+				رطلان/بوصة²
+				{0} أرطال/بوصة²
+				{0} رطلًا/بوصة²
+				{0} رطل/بوصة²
+			
+			
+				كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+				{0} كيلوباسكال
+			
+			
+				ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+				{0} ميغاباسكال
+			
+			
+				{0} ميل/س
+				{0} ميل/س
+				ميلان/س
+				{0} أميال/س
+				{0} ميلًا/س
+				{0} ميل/س
+			
+			
+				{0} عقدة
+				{0} عقدة
+				عقدتان
+				{0} عقد
+				{0} عقدة
+				{0} عقدة
+			
+			
+				درجة كلفن
+				{0} درجة كلفن
+				{0} درجة كلفن
+				{0} درجة كلفن
+				{0} درجة كلفن
+				{0} درجة كلفن
+				{0} درجة كلفن
+			
+			
+				{0} بوصة³
+				{0} بوصة مكعبة
+				{0} بوصة³
+				{0} بوصة³
+				{0} بوصة³
+				{0} بوصة³
+			
+			
+				{0} لتر
+				لتر
+				لتران
+				{0} لترات
+				{0} لترًا
+				{0} لتر
+			
+			
+				{0} مكيال متري
+				{0} مكيال متري
+				مكيالان متريان
+				{0} مكاييل مترية
+				{0} مكيالًا متريًا
+				{0} مكيال متري
+			
+			
+				{0} كوب متري
+				{0} كوب متري
+				كوبان متريان
+				{0} أكواب مترية
+				{0} كوبًا متريًا
+				{0} كوب متري
+			
+			
+				{0} كوب
+				كوب
+				كوبان
+				{0} أكواب
+				{0} كوبًا
+				{0} كوب
+			
+			
+				{0} أونصة سائلة
+				أونصة س
+				أونصتان سائلتان
+				{0} أونصات سائلة
+				{0} أونصة س
+				{0} أونصة سائلة
+			
+			
+				{0} ملعقة ك.
+				ملعقة ك.
+				{0} ملعقتان ك.
+				{0} ملاعق ك.
+				{0} ملعقة ك.
+				{0} ملعقة ك.
+			
+			
+				{0} ملعقة ص
+				ملعقة ص
+				{0} ملعقتان ص
+				{0} ملاعق ص
+				{0} ملعقة ص
+				{0} ملعقة ص
+			
+			
+				{0} جنوب
+				{0} غرب
+			
+		
+		
+			
+				{0} سنة
+				سنة
+				سنتان
+				{0} سنوات
+				{0} سنة
+				{0} سنة
+			
+			
+				{0} شهر
+				شهر
+				شهران
+				{0} أشهر
+				{0} شهرًا
+				{0} شهر
+			
+			
+				كغم
+				{0} كغم
+				{0} كغم
+				{0} كغم
+				{0} كغم
+				{0} كغم
+				{0} كغم
+			
+			
+				غم
+				{0} غم
+				{0} غم
+				{0} غم
+				{0} غم
+				{0} غم
+				{0} غم
+			
+			
+				{0} جنوب
+				{0} غرب
+			
+		
+	
 
diff --git a/make/data/cldr/common/main/ar_SD.xml b/make/data/cldr/common/main/ar_SD.xml
index d14e78651e5..1436f611700 100644
--- a/make/data/cldr/common/main/ar_SD.xml
+++ b/make/data/cldr/common/main/ar_SD.xml
@@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_SO.xml b/make/data/cldr/common/main/ar_SO.xml
index 474689e9bdb..c1bfd725a69 100644
--- a/make/data/cldr/common/main/ar_SO.xml
+++ b/make/data/cldr/common/main/ar_SO.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\u200E \- , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		arab
diff --git a/make/data/cldr/common/main/ar_SS.xml b/make/data/cldr/common/main/ar_SS.xml
index 7956ba0093e..7e9675a4720 100644
--- a/make/data/cldr/common/main/ar_SS.xml
+++ b/make/data/cldr/common/main/ar_SS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_SY.xml b/make/data/cldr/common/main/ar_SY.xml
index ccc671def4e..98b6c7add81 100644
--- a/make/data/cldr/common/main/ar_SY.xml
+++ b/make/data/cldr/common/main/ar_SY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -109,13 +109,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/ar_TD.xml b/make/data/cldr/common/main/ar_TD.xml
index b245c87a1c1..776eabd69d2 100644
--- a/make/data/cldr/common/main/ar_TD.xml
+++ b/make/data/cldr/common/main/ar_TD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ar_TN.xml b/make/data/cldr/common/main/ar_TN.xml
index 01ff2d342a6..833e4beb25c 100644
--- a/make/data/cldr/common/main/ar_TN.xml
+++ b/make/data/cldr/common/main/ar_TN.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
@@ -82,10 +82,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		latn
-		
-			٫
-			٬
-		
 		
 			,
 			.
diff --git a/make/data/cldr/common/main/ar_YE.xml b/make/data/cldr/common/main/ar_YE.xml
index b60208aae93..e70254aba07 100644
--- a/make/data/cldr/common/main/ar_YE.xml
+++ b/make/data/cldr/common/main/ar_YE.xml
@@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		arab
-		
-			٫
-			٬
-		
-		
-			.
-			,
-		
 	
 
diff --git a/make/data/cldr/common/main/as.xml b/make/data/cldr/common/main/as.xml
index df04128f351..f7626d08869 100644
--- a/make/data/cldr/common/main/as.xml
+++ b/make/data/cldr/common/main/as.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -326,7 +326,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ছাৰ্ডিনিয়ান
 			ছিচিলিয়ান
 			স্কটছ
-			সিন্ধি
+			সিন্ধী
 			উদীচ্য ছামি
 			ছেনা
 			কোইৰাবোৰো চেন্নি
@@ -406,10 +406,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ইদ্দিছ
 			ইউৰুবা
 			কেণ্টোনীজ
+			চাইনিজ, কেণ্টোনীজ
 			ষ্টেণ্ডাৰ্ড মোৰোক্কান তামাজাইট
 			চীনা
+			চীনা, মেণ্ডাৰিন
 			সৰলীকৃত চীনা
+			সৰলীকৃত মেণ্ডাৰিন চীনা
 			পৰম্পৰাগত চীনা
+			পৰম্পৰাগত মেণ্ডাৰিন চীনা
 			ঝুলু
 			ঝুনি
 			কোনো ভাষা সমল নাই
@@ -466,7 +470,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			বিশ্ব
 			আফ্ৰিকা
-			উদীচ্য আমেৰিকা
+			উত্তৰ আমেৰিকা
 			দক্ষিণ আমেৰিকা
 			অ’চেনীয়া
 			পাশ্চাত্য আফ্ৰিকা
@@ -476,7 +480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			মধ্য আফ্ৰিকা
 			দাক্ষিণাত্য আফ্ৰিকা
 			আমেৰিকাছ্
-			উত্তৰীয় আমেৰিকা
+			উদীচ্য আমেৰিকা
 			কেৰিবিয়ান
 			প্ৰাচ্য এছিয়া
 			দাক্ষিণাত্য এছিয়া
@@ -652,13 +656,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ছেইণ্ট মাৰ্টিন
 			মাদাগাস্কাৰ
 			মাৰ্শ্বাল দ্বীপপুঞ্জ
-			মেচিডোনীয়া
-			মেচিডোনীয়া (FYROM)
+			উত্তৰ মেচিডোনীয়া
 			মালি
 			ম্যানমাৰ (বাৰ্মা)
 			মঙ্গোলিয়া
-			মাকাউ এছ. এ. আৰ. চীন
-			মাকাউ
+			মাকাও এছ. এ. আৰ. চীন
+			মাকাও
 			উত্তৰ মাৰিয়ানা দ্বীপপুঞ্জ
 			মাৰ্টিনিক
 			মাউৰিটানিয়া
@@ -867,9 +870,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[\u09BC অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং \u0981 ঃ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC} ঢ {ঢ\u09BC} ণ ত থ দ ধ ন প ফ ব ভ ম য {য\u09BC} ৰ ল ৱ শ ষ স হ {ক\u09CDষ} া ি ী \u09C1 \u09C2 \u09C3 ে ৈ ো ৌ \u09CD]
 		[\u200C\u200D ৲ ৎ র]
-		[অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ৎ ত থ দ ধ ন প ফ ব ভ ম য ৰ ল ৱ শ ষ স হ ঽ]
-		[\- , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯]
-		[\- ‐ – — , ; \: ! ? . … । ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\u09BC অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ং ঃ ক খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ৎ ত থ দ ধ ন প ফ ব ভ ম য ৰ ল ৱ শ ষ স হ \u09CD]
+		[\- ‑ , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯]
+		[\- ‐ ‑ – — , ; \: ! ? . … । ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -881,6 +884,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			['ʼ՚᾽᾿’＇]
 			[%٪﹪％]
 			[؉‰]
@@ -888,9 +892,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[£₤]
 			[¥￥]
 			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1002,10 +1013,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG M/y – GGGGG M/y
 							GGGGG M/y – M/y
@@ -1344,6 +1351,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						খ্ৰীষ্টপূৰ্ব
+						খ্ৰীষ্টপূৰ্ব
 						খ্ৰীষ্টাব্দ
 						চি. ই.
 					
@@ -1643,6 +1651,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				বছৰ
+				যোৱা বছৰ
+				এই বছৰ
+				অহা বছৰ
 				
 					{0} বছৰত
 					{0} বছৰত
@@ -1726,6 +1737,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				মাহ
+				যোৱা মা.
+				এই মা.
+				অহা মাহ
 				
 					{0} মাহত
 					{0} মাহত
@@ -4428,12 +4442,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			beng
 		
-		1
 		
 			.
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4441,7 +4458,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4598,456 +4619,604 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সংযুক্ত আৰব আমিৰাত ডিৰহেম
 				UAE ডিৰহেম
 				UAE ডিৰহেম
+				AED
 			
 			
 				আফগান আফগানী
 				আফগান আফগানী
 				আফগান আফগানী
+				AFN
 			
 			
 				আলবেনীয় লেক
 				আলবেনীয় লেক
 				আলবেনীয় লেক
+				ALL
 			
 			
 				আৰ্মেনিয়ান ড্ৰাম
 				আৰ্মেনিয়ান ড্ৰাম
 				আৰ্মেনিয়ান ড্ৰাম
+				AMD
 			
 			
 				নেডাৰলেণ্ডছ এণ্টিলিয়েন গিল্ডাৰ
 				নেডাৰলেণ্ডছ এণ্টিলিয়েন গিল্ডাৰ
 				নেডাৰলেণ্ডছ এণ্টিলিয়েন গিল্ডাৰ
+				ANG
 			
 			
 				এংগোলান কোৱাঞ্জা
 				এংগোলান কোৱাঞ্জা
 				এংগোলান কোৱাঞ্জা
+				AOA
+				Kz
 			
 			
 				আৰ্জেণ্টাইন পেছো
 				আৰ্জেণ্টাইন পেছো
 				আৰ্জেণ্টাইন পেছো
+				ARS
+				$
 			
 			
 				অষ্ট্ৰেলিয়ান ডলাৰ
 				অষ্ট্ৰেলিয়ান ডলাৰ
 				অষ্ট্ৰেলিয়ান ডলাৰ
+				A$
+				$
 			
 			
 				আৰুবান ফ্ল’ৰিন
 				আৰুবান ফ্ল’ৰিন
 				আৰুবান ফ্ল’ৰিন
+				AWG
 			
 			
 				আজেৰবাইজানী মানাত
 				আজেৰবাইজানী মানাত
 				আজেৰবাইজানী মানাত
+				AZN
 			
 			
 				ব’ছনিয়া আৰু হাৰ্জেগ’ভিনা কনভাৰ্টিব্‌ল মাৰ্ক
 				ব’ছনিয়া আৰু হাৰ্জেগ’ভিনা কনভাৰ্টিব্‌ল মাৰ্ক
 				ব’ছনিয়া আৰু হাৰ্জেগ’ভিনা কনভাৰ্টিব্‌ল মাৰ্ক
+				BAM
+				KM
 			
 			
 				বাৰ্বাডিয়ান ডলাৰ
 				বাৰ্বাডিয়ান ডলাৰ
 				বাৰ্বাডিয়ান ডলাৰ
+				BBD
+				$
 			
 			
 				বাংলাদেশী টাকা
 				বাংলাদেশী টাকা
 				বাংলাদেশী টাকা
+				BDT
+				৳
 			
 			
 				বুলগেৰীয় লেভ
 				বুলগেৰীয় লেভ
 				বুলগেৰীয় লেভ
+				BGN
 			
 			
 				বাহৰেইনী ডিনাৰ
 				বাহৰেইনী ডিনাৰ
 				বাহৰেইনী ডিনাৰ
+				BHD
 			
 			
 				বুৰুণ্ডিয়ান ফ্ৰেংক
 				বুৰুণ্ডিয়ান ফ্ৰেংক
 				বুৰুণ্ডিয়ান ফ্ৰেংক
+				BIF
 			
 			
 				বাৰ্মুডান ডলাৰ
 				বাৰ্মুডান ডলাৰ
 				বাৰ্মুডান ডলাৰ
+				BMD
+				$
 			
 			
 				ব্ৰুনেই ডলাৰ
 				ব্ৰুনেই ডলাৰ
 				ব্ৰুনেই ডলাৰ
+				BND
+				$
 			
 			
 				বলিভিয়ান বলিভিয়ানো
 				বলিভিয়ান বলিভিয়ানো
 				বলিভিয়ান বলিভিয়ানো
+				BOB
+				Bs
 			
 			
 				ব্ৰাজিলিয়ান ৰিয়েল
 				ব্ৰাজিলিয়ান ৰিয়েল
 				ব্ৰাজিলিয়ান ৰিয়েল
+				R$
+				R$
 			
 			
 				বাহামিয়ান ডলাৰ
 				বাহামিয়ান ডলাৰ
 				বাহামিয়ান ডলাৰ
+				BSD
+				$
 			
 			
 				ভুটানী নংগলট্ৰাম
 				ভুটানী নংগলট্ৰাম
 				ভুটানী নংগলট্ৰাম
+				BTN
 			
 			
 				ব’টচোৱানান পুলা
 				ব’টচোৱানান পুলা
 				ব’টচোৱানান পুলা
+				BWP
+				P
 			
 			
 				বেলাৰুছীয় ৰুবেল
 				বেলাৰুছীয় ৰুবেল
 				বেলাৰুছীয় ৰুবেল
+				BYN
+				р.
 			
 			
 				বেলিজ ডলাৰ
 				বেলিজ ডলাৰ
 				বেলিজ ডলাৰ
+				BZD
+				$
 			
 			
 				কানাডিয়ান ডলাৰ
 				কানাডিয়ান ডলাৰ
 				কানাডিয়ান ডলাৰ
+				CA$
+				$
 			
 			
 				কংগো ফ্ৰেংক
 				কংগো ফ্ৰেংক
 				কংগো ফ্ৰেংক
+				CDF
 			
 			
 				চুইছ ফ্ৰেংক
 				চুইছ ফ্ৰেংক
 				চুইছ ফ্ৰেংক
+				CHF
 			
 			
 				চিলিয়ান পেছো
 				চিলিয়ান পেছো
 				চিলিয়ান পেছো
+				CLP
+				$
 			
 			
 				চীনা ইউৱান (অফশ্ব’ৰ)
 				চীনা ইউৱান (অফশ্ব’ৰ)
 				চীনা ইউৱান (অফশ্ব’ৰ)
+				CNH
 			
 			
 				চীনা ইউৱান
 				চীনা ইউৱান
 				চীনা ইউৱান
+				CN¥
+				¥
 			
 			
 				কলম্বিয়ান পেছো
 				কলম্বিয়ান পেছো
 				কলম্বিয়ান পেছো
+				COP
+				$
 			
 			
 				কোষ্টা ৰিকান কোলন
 				কোষ্টা ৰিকান কোলন
 				কোষ্টা ৰিকান কোলন
+				CRC
+				₡
 			
 			
 				কিউবান ৰূপান্তৰযোগ্য পেছো
 				কিউবান ৰূপান্তৰযোগ্য পেছো
 				কিউবান ৰূপান্তৰযোগ্য পেছো
+				CUC
+				$
 			
 			
 				কিউবান পেছো
 				কিউবান পেছো
 				কিউবান পেছো
+				CUP
+				$
 			
 			
 				কেপ ভাৰ্দে এছকুডো
 				কেপ ভাৰ্দে এছকুডো
 				কেপ ভাৰ্দে এছকুডো
+				CVE
 			
 			
 				চেক কোৰুনা
 				চেক কোৰুনা
 				চেক কোৰুনা
+				CZK
+				Kč
 			
 			
 				জিবুটি ফ্ৰেংক
 				জিবুটি ফ্ৰেংক
 				জিবুটি ফ্ৰেংক
+				DJF
 			
 			
 				ডেনিচ ক্ৰোন
 				ডেনিচ ক্ৰোন
 				ডেনিচ ক্ৰোন
+				DKK
+				kr
 			
 			
 				ড’মিনিকান পেছো
 				ড’মিনিকান পেছো
 				ড’মিনিকান পেছো
+				DOP
+				$
 			
 			
 				আলজেৰীয় ডিনাৰ
 				আলজেৰীয় ডিনাৰ
 				আলজেৰীয় ডিনাৰ
+				DZD
 			
 			
 				ইজিপ্তৰ পাউণ্ড
 				ইজিপ্তৰ পাউণ্ড
 				ইজিপ্তৰ পাউণ্ড
+				EGP
+				E£
 			
 			
 				এৰিট্ৰিয়ন নাক্‌ফা
 				এৰিট্ৰিয়ন নাক্‌ফা
 				এৰিট্ৰিয়ন নাক্‌ফা
+				ERN
 			
 			
 				ইথিঅ’পিয়ান বিৰ
 				ইথিঅ’পিয়ান বিৰ
 				ইথিঅ’পিয়ান বিৰ
+				ETB
 			
 			
 				ইউৰো
 				ইউৰো
 				ইউৰো
+				€
+				€
 			
 			
 				ফিজিয়ান ডলাৰ
 				ফিজিয়ান ডলাৰ
 				ফিজিয়ান ডলাৰ
+				FJD
+				$
 			
 			
 				ফকলেণ্ড দ্বীপপুঞ্জৰ পাউণ্ড
 				ফকলেণ্ড দ্বীপপুঞ্জৰ পাউণ্ড
 				ফকলেণ্ড দ্বীপপুঞ্জৰ পাউণ্ড
+				FKP
+				£
 			
 			
 				ব্ৰিটিছ পাউণ্ড
 				ব্ৰিটিছ পাউণ্ড
 				ব্ৰিটিছ পাউণ্ড
+				£
+				£
 			
 			
 				জৰ্জিয়ান লাৰি
 				জৰ্জিয়ান লাৰি
 				জৰ্জিয়ান লাৰি
+				GEL
+				₾
 			
 			
 				ঘানাৰ চেডি
 				ঘানাৰ চেডি
 				ঘানাৰ চেডি
+				GHS
 			
 			
 				জিব্ৰাল্টৰ পাউণ্ড
 				জিব্ৰাল্টৰ পাউণ্ড
 				জিব্ৰাল্টৰ পাউণ্ড
+				GIP
+				£
 			
 			
 				গাম্বিয়া ডালাছি
 				গাম্বিয়া ডালাছি
 				গাম্বিয়া ডালাছি
+				GMD
 			
 			
 				গিনি ফ্ৰেংক
 				গিনি ফ্ৰেংক
 				গিনি ফ্ৰেংক
+				GNF
+				FG
 			
 			
 				গুৱাটেমালা কুৱেৎজাল
 				গুৱাটেমালা কুৱেৎজাল
 				গুৱাটেমালা কুৱেৎজাল
+				GTQ
+				Q
 			
 			
 				গায়ানিজ ডলাৰ
 				গায়ানিজ ডলাৰ
 				গায়ানিজ ডলাৰ
+				GYD
+				$
 			
 			
 				হং কং ডলাৰ
 				হং কং ডলাৰ
 				হং কং ডলাৰ
+				HK$
+				$
 			
 			
 				হোন্দুৰান লেম্পিৰা
 				হোন্দুৰান লেম্পিৰা
 				হোন্দুৰান লেম্পিৰা
+				HNL
+				L
 			
 			
 				ক্ৰোৱেছিয়ান কুনা
 				ক্ৰোৱেছিয়ান কুনা
 				ক্ৰোৱেছিয়ান কুনা
+				HRK
+				kn
 			
 			
 				হাইটিয়ান গৌৰ্ড
 				হাইটিয়ান গৌৰ্ড
 				হাইটিয়ান গৌৰ্ড
+				HTG
 			
 			
 				হাংগেৰীয়ান ফ’ৰিণ্ট
 				হাংগেৰীয়ান ফ’ৰিণ্ট
 				হাংগেৰীয়ান ফ’ৰিণ্ট
+				HUF
+				Ft
 			
 			
 				ইণ্ডোনেচিয়ান ৰুপিয়াহ
 				ইণ্ডোনেচিয়ান ৰুপিয়াহ
 				ইণ্ডোনেচিয়ান ৰুপিয়াহ
+				IDR
+				Rp
 			
 			
 				ইজৰাইলী নিউ শ্বেকেল
 				ইজৰাইলী নিউ শ্বেকেল
 				ইজৰাইলী নিউ শ্বেকেল
+				₪
+				₪
 			
 			
 				ভাৰতীয় ৰুপী
 				ভাৰতীয় ৰুপী
 				ভাৰতীয় ৰুপী
+				₹
+				₹
 			
 			
 				ইৰাকী ডিনাৰ
 				ইৰাকী ডিনাৰ
 				ইৰাকী ডিনাৰ
+				IQD
 			
 			
 				ইৰানীয়ান ৰিয়েল
 				ইৰানীয়ান ৰিয়েল
 				ইৰানীয়ান ৰিয়েল
+				IRR
 			
 			
 				আইচলেণ্ডিক ক্ৰোনা
 				আইচলেণ্ডিক ক্ৰোনা
 				আইচলেণ্ডিক ক্ৰোনাৰ
+				ISK
+				kr
 			
 			
 				জামাইকান ডলাৰ
 				জামাইকান ডলাৰ
 				জামাইকান ডলাৰ
+				JMD
+				$
 			
 			
 				জৰ্ডানিয়ান ডিনাৰ
 				জৰ্ডানিয়ান ডিনাৰ
 				জৰ্ডানিয়ান ডিনাৰ
+				JOD
 			
 			
 				জাপানী য়েন
 				জাপানী য়েন
 				জাপানী য়েন
+				JP¥
+				¥
 			
 			
 				কেনিয়ান শ্বিলিং
 				কেনিয়ান শ্বিলিং
 				কেনিয়ান শ্বিলিং
+				KES
 			
 			
 				কিৰ্গিস্তানী ছোম
 				কিৰ্গিস্তানী ছোম
 				কিৰ্গিস্তানী ছোম
+				KGS
 			
 			
 				কেম্ব’ডিয়ান ৰিয়েল
 				কেম্ব’ডিয়ান ৰিয়েল
 				কেম্ব’ডিয়ান ৰিয়েল
+				KHR
+				៛
 			
 			
 				ক’মোৰিয়ান ফ্ৰেংক
 				ক’মোৰিয়ান ফ্ৰেংক
 				ক’মোৰিয়ান ফ্ৰেংক
+				KMF
+				CF
 			
 			
 				উত্তৰ কোৰিয়াৰ ওৱান
 				উত্তৰ কোৰিয়াৰ ওৱান
 				উত্তৰ কোৰিয়াৰ ওৱান
+				KPW
+				₩
 			
 			
 				দক্ষিণ কোৰিয়াৰ ওৱান
 				দক্ষিণ কোৰিয়াৰ ওৱান
 				দক্ষিণ কোৰিয়াৰ ওৱান
+				₩
+				₩
 			
 			
 				কুৱেইটি ডিনাৰ
 				কুৱেইটি ডিনাৰ
 				কুৱেইটি ডিনাৰ
+				KWD
 			
 			
 				কেইমেন দ্বীপপুঞ্জৰ ডলাৰ
 				কেইমেন দ্বীপপুঞ্জৰ ডলাৰ
 				কেইমেন দ্বীপপুঞ্জৰ ডলাৰ
+				KYD
+				$
 			
 			
 				কাজাখস্তানী তেঞ্জ
 				কাজাখস্তানী তেঞ্জ
 				কাজাখস্তানী তেঞ্জ
+				KZT
+				₸
 			
 			
 				লাওচিয়ান কিপ
 				লাওচিয়ান কিপ
 				লাওচিয়ান কিপ
+				LAK
+				₭
 			
 			
 				লেবানীজ পাউণ্ড
 				লেবানীজ পাউণ্ড
 				লেবানীজ পাউণ্ড
+				LBP
+				L£
 			
 			
 				শ্ৰীলংকান ৰুপী
 				শ্ৰীলংকান ৰুপী
 				শ্ৰীলংকান ৰুপী
+				LKR
+				Rs
 			
 			
 				লাইবেৰিয়ান ডলাৰ
 				লাইবেৰিয়ান ডলাৰ
 				লাইবেৰিয়ান ডলাৰ
+				LRD
+				$
 			
 			
 				লিবিয়ান ডিনাৰ
 				লিবিয়ান ডিনাৰ
 				লিবিয়ান ডিনাৰ
+				LYD
 			
 			
 				মৰোক্কান ডিৰহাম
 				মৰোক্কান ডিৰহাম
 				মৰোক্কান ডিৰহাম
+				MAD
 			
 			
 				মোলডোভান লেউ
 				মোলডোভান লেউ
 				মোলডোভান লেই
+				MDL
 			
 			
 				মালাগাছী এৰিয়াৰী
 				মালাগাছী এৰিয়াৰী
 				মালাগাছী এৰিয়াৰী
+				MGA
+				Ar
 			
 			
 				মেচিডোনীয় ডেনাৰ
 				মেচিডোনীয় ডেনাৰ
 				মেচিডোনীয় ডেনাৰ
+				MKD
 			
 			
 				ম্যানমাৰ কিয়াট
 				ম্যানমাৰ কিয়াট
 				ম্যানমাৰ কিয়াট
+				MMK
+				K
 			
 			
 				মঙ্গোলিয়ান টুৰ্গিক
 				মঙ্গোলিয়ান টুৰ্গিক
 				মঙ্গোলিয়ান টুৰ্গিক
+				MNT
+				₮
 			
 			
 				মেকানীজ পাটাকা
 				মেকানীজ পাটাকা
 				মেকানীজ পাটাকা
+				MOP
 			
 			
 				ম’ৰিটেনিয়ান ঔগুইয়া (1973–2017)
 				ম’ৰিটেনিয়ান ঔগুইয়া (1973–2017)
 				ম’ৰিটেনিয়ান ঔগুইয়া (1973–2017)
+				MRO
 			
 			
 				ম’ৰিটেনিয়ান ঔগুইয়া
@@ -5059,272 +5228,358 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মৰিচিয়ান ৰুপী
 				মৰিচিয়ান ৰুপী
 				মৰিচিয়ান ৰুপী
+				MUR
+				Rs
 			
 			
 				মালডিভিয়ান ৰুফিয়া
 				মালডিভিয়ান ৰুফিয়া
 				মালডিভিয়ান ৰুফিয়া
+				MVR
 			
 			
 				মালাউইয়ান কোৱাচা
 				মালাউইয়ান কোৱাচা
 				মালাউইয়ান কোৱাচা
+				MWK
 			
 			
 				মেক্সিকান পেছো
 				মেক্সিকান পেছো
 				মেক্সিকান পেছো
+				MX$
+				$
 			
 			
 				মালায়েচিয়ান ৰিংগিট
 				মালায়েচিয়ান ৰিংগিট
 				মালায়েচিয়ান ৰিংগিট
+				MYR
+				RM
 			
 			
 				মোজাম্বিকান মেটিকল
 				মোজাম্বিকান মেটিকল
 				মোজাম্বিকান মেটিকল
+				MZN
 			
 			
 				নামিবিয়ান ডলাৰ
 				নামিবিয়ান ডলাৰ
 				নামিবিয়ান ডলাৰ
+				NAD
+				$
 			
 			
 				নাইজেৰিয়ান নাইৰা
 				নাইজেৰিয়ান নাইৰা
 				নাইজেৰিয়ান নাইৰা
+				NGN
+				₦
 			
 			
 				নিকাৰাগুৱান কোৰ্ডোবা
 				নিকাৰাগুৱান কোৰ্ডোবা
 				নিকাৰাগুৱান কোৰ্ডোবা
+				NIO
+				C$
 			
 			
 				নৰৱেজিয়ান ক্ৰোন
 				নৰৱেজিয়ান ক্ৰোন
 				নৰৱেজিয়ান ক্ৰোনাৰ
+				NOK
+				kr
 			
 			
 				নেপালী ৰুপী
 				নেপালী ৰুপী
 				নেপালী ৰুপী
+				NPR
+				Rs
 			
 			
 				নিউজিলেণ্ড ডলাৰ
 				নিউজিলেণ্ড ডলাৰ
 				নিউজিলেণ্ড ডলাৰ
+				NZ$
+				$
 			
 			
 				ওমানি ৰিয়েল
 				ওমানি ৰিয়েল
 				ওমানি ৰিয়েল
+				OMR
 			
 			
 				পানামেনিয়ান বাল্বোৱা
 				পানামেনিয়ান বাল্বোৱা
 				পানামেনিয়ান বাল্বোৱা
+				PAB
 			
 			
 				পেৰুভিয়ান ছ’ল
 				পেৰুভিয়ান ছ’ল
 				পেৰুভিয়ান ছ’ল
+				PEN
 			
 			
 				পাপুৱা নিউ গিনি কিনা
 				পাপুৱা নিউ গিনি কিনা
 				পাপুৱা নিউ গিনি কিনা
+				PGK
 			
 			
 				ফিলিপিন পেইছ’
 				ফিলিপিন পেইছ’
 				ফিলিপিন পেইছ’
+				PHP
+				₱
 			
 			
 				পাকিস্তানী ৰুপী
 				পাকিস্তানী ৰুপী
 				পাকিস্তানী ৰুপী
+				PKR
+				Rs
 			
 			
 				প’লিচ জোল্টী
 				প’লিচ জোল্টী
 				প’লিচ জোল্টী
+				PLN
+				zł
 			
 			
 				পাৰাগুয়ান গুৱাৰানি
 				পাৰাগুয়ান গুৱাৰানি
 				পাৰাগুয়ান গুৱাৰানি
+				PYG
+				₲
 			
 			
 				কাটাৰি ৰিয়েল
 				কাটাৰি ৰিয়েল
 				কাটাৰি ৰিয়েল
+				QAR
 			
 			
 				ৰোমানীয় লেউ
 				ৰোমানীয় লেউ
 				ৰোমানীয় লেউ
+				RON
+				lei
 			
 			
 				চাৰ্বিয়ান ডিনাৰ
 				চাৰ্বিয়ান ডিনাৰ
 				চাৰ্বিয়ান ডিনাৰ
+				RSD
 			
 			
 				ৰাছিয়ান ৰুব্‌ল
 				ৰাছিয়ান ৰুব্‌ল
 				ৰাছিয়ান ৰুব্‌ল
+				RUB
+				₽
 			
 			
 				ৰোৱান্দান ফ্ৰেংক
 				ৰোৱান্দান ফ্ৰেংক
 				ৰোৱান্দান ফ্ৰেংক
+				RWF
+				RF
 			
 			
 				চৌডি ৰিয়েল
 				চৌডি ৰিয়েল
 				চৌডি ৰিয়েল
+				SAR
 			
 			
 				চোলোমোন দ্বীপপুঞ্জৰ ডলাৰ
 				চোলোমোন দ্বীপপুঞ্জৰ ডলাৰ
 				চোলোমোন দ্বীপপুঞ্জৰ ডলাৰ
+				SBD
+				$
 			
 			
 				ছেচেলৱা ৰুপী
 				ছেচেলৱা ৰুপী
 				ছেচেলৱা ৰুপী
+				SCR
 			
 			
 				চুডানী পাউণ্ড
 				চুডানী পাউণ্ড
 				চুডানী পাউণ্ড
+				SDG
 			
 			
 				চুইডিছ ক্ৰোনা
 				চুইডিছ ক্ৰোনা
 				চুইডিছ ক্ৰোনোৰ
+				SEK
+				kr
 			
 			
 				ছিংগাপুৰ ডলাৰ
 				ছিংগাপুৰ ডলাৰ
 				ছিংগাপুৰ ডলাৰ
+				SGD
+				$
 			
 			
 				ছেইণ্ট হেলেনা পাউণ্ড
 				ছেইণ্ট হেলেনা পাউণ্ড
 				ছেইণ্ট হেলেনা পাউণ্ড
+				SHP
+				£
 			
 			
 				চিয়েৰা লিঅ’নৰ লিঅ’ন
 				চিয়েৰা লিঅ’নৰ লিঅ’ন
 				চিয়েৰা লিঅ’নৰ লিঅ’ন
+				SLL
 			
 			
 				চোমালি শ্বিলিং
 				চোমালি শ্বিলিং
 				চোমালি শ্বিলিং
+				SOS
 			
 			
 				ছুৰিনামী ডলাৰ
 				ছুৰিনামী ডলাৰ
 				ছুৰিনামী ডলাৰ
+				SRD
+				$
 			
 			
 				দক্ষিণ চুডানীজ পাউণ্ড
 				দক্ষিণ চুডানীজ পাউণ্ড
 				দক্ষিণ চুডানীজ পাউণ্ড
+				SSP
+				£
 			
 			
 				চাও টোমে আৰু প্ৰিনচিপে ডোব্‌ৰা (1977–2017)
 				চাও টোমে আৰু প্ৰিনচিপে ডোব্‌ৰা (1977–2017)
 				চাও টোমে আৰু প্ৰিনচিপে ডোব্‌ৰা (1977–2017)
+				STD
 			
 			
 				চাও টোমে আৰু প্ৰিনচিপে ডোব্‌ৰা
 				চাও টোমে আৰু প্ৰিনচিপে ডোব্‌ৰা
 				চাও টোমে আৰু প্ৰিনচিপে ডোব্‌ৰা
+				STN
 				Db
 			
 			
 				চিৰিয়ান পাউণ্ড
 				চিৰিয়ান পাউণ্ড
 				চিৰিয়ান পাউণ্ড
+				SYP
+				£
 			
 			
 				স্বাজি লিলেংগেনি
 				স্বাজি লিলেংগেনি
 				স্বাজি এমেলানজেনি
+				SZL
 			
 			
 				থাই বাত
 				থাই বাত
 				থাই বাত
+				THB
+				฿
 			
 			
 				তাজিকিস্তানী ছোমনি
 				তাজিকিস্তানী ছোমনি
 				তাজিকিস্তানী ছোমনি
+				TJS
 			
 			
 				তুৰ্কমেনিস্তানী মানাত
 				তুৰ্কমেনিস্তানী মানাত
 				তুৰ্কমেনিস্তানী মানাত
+				TMT
 			
 			
 				টুনিচিয়ান ডিনাৰ
 				টুনিচিয়ান ডিনাৰ
 				টুনিচিয়ান ডিনাৰ
+				TND
 			
 			
 				টংগান পাআংগা
 				টংগান পাআংগা
 				টংগান পাআংগা
+				TOP
+				T$
 			
 			
 				তুৰ্কীৰ লিৰা
 				তুৰ্কীৰ লিৰা
 				তুৰ্কীৰ লিৰা
+				TRY
+				₺
+				TL
 			
 			
 				ট্ৰিনিডাড আৰু টোবাগো ডলাৰ
 				ট্ৰিনিডাড আৰু টোবাগো ডলাৰ
 				ট্ৰিনিডাড আৰু টোবাগো ডলাৰ
+				TTD
+				$
 			
 			
 				নিউ টাইৱান ডলাৰ
 				নিউ টাইৱান ডলাৰ
 				নিউ টাইৱান ডলাৰ
+				NT$
+				$
 			
 			
 				টানজানিয়ান শ্বিলিং
 				টানজানিয়ান শ্বিলিং
 				টানজানিয়ান শ্বিলিং
+				TZS
 			
 			
 				ইউক্ৰেইনীয় হৃভনিয়া
 				ইউক্ৰেইনীয় হৃভনিয়া
 				ইউক্ৰেইনীয় হৃভনিয়া
+				UAH
+				₴
 			
 			
 				উগাণ্ডান শ্বিলিং
 				উগাণ্ডান শ্বিলিং
 				উগাণ্ডান শ্বিলিং
+				UGX
 			
 			
 				ইউ. এছ. ডলাৰ
 				ইউ. এছ. ডলাৰ
 				ইউ. এছ. ডলাৰ
+				US$
+				$
 			
 			
 				উৰুগুৱেয়ান পেছো
 				উৰুগুৱেয়ান পেছো
 				উৰুগুৱেয়ান পেছো
+				UYU
+				$
 			
 			
 				উজবেকিস্তানী ছোম
 				উজবেকিস্তানী ছোম
 				উজবেকিস্তানী ছোম
+				UZS
 			
 			
 				ভেনিজুৱেলান বলিভাৰ (1871–2008)
@@ -5335,6 +5590,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ভেনিজুৱেলান বলিভাৰ (2008–2018)
 				ভেনিজুৱেলান বলিভাৰ (2008–2018)
 				ভেনিজুৱেলান বলিভাৰ (2008–2018)
+				VEF
+				Bs
 			
 			
 				ভেনিজুৱেলান বলিভাৰ
@@ -5346,36 +5603,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ভিয়েটনামীজ ডং
 				ভিয়েটনামীজ ডং
 				ভিয়েটনামীজ ডং
+				₫
+				₫
 			
 			
 				ভানাটুৰ ভাটু
 				ভানাটুৰ ভাটু
 				ভানাটুৰ ভাটু
+				VUV
 			
 			
 				ছামোৱান টালা
 				ছামোৱান টালা
 				ছামোৱান টালা
+				WST
 			
 			
 				মধ্য আফ্ৰিকান CFA ফ্ৰেংক
 				মধ্য আফ্ৰিকান CFA ফ্ৰেংক
 				মধ্য আফ্ৰিকান CFA ফ্ৰেংক
+				FCFA
 			
 			
 				ইষ্ট কেৰিবিয়ান ডলাৰ
 				ইষ্ট কেৰিবিয়ান ডলাৰ
 				ইষ্ট কেৰিবিয়ান ডলাৰ
+				EC$
+				$
 			
 			
 				পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক
 				পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক
 				পশ্চিম আফ্ৰিকান CFA ফ্ৰেংক
+				CFA
 			
 			
 				CFP ফ্ৰেংক
 				CFP ফ্ৰেংক
 				CFP ফ্ৰেংক
+				CFPF
 			
 			
 				অজ্ঞাত মুদ্ৰা
@@ -5386,21 +5652,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				য়েমেনী ৰিয়েল
 				য়েমেনী ৰিয়েল
 				য়েমেনী ৰিয়েল
+				YER
 			
 			
 				দক্ষিণ আফ্ৰিকাৰ ৰাণ্ড
 				দক্ষিণ আফ্ৰিকাৰ ৰাণ্ড
 				দক্ষিণ আফ্ৰিকাৰ ৰাণ্ড
+				ZAR
+				R
 			
 			
 				জাম্বিয়ান কোৱাচা
 				জাম্বিয়ান কোৱাচা
 				জাম্বিয়ান কোৱাচা
+				ZMW
+				ZK
 			
 		
 		
 			~{0}
-			≥{0}
+			{0}+
 			≤{0}
 			{0}–{1}
 		
@@ -5625,6 +5896,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} শতাব্দী
 				{0} শতাব্দী
 			
+			
+				দশক
+				{0} দশক
+				{0} দশক
+			
 			
 				বছৰ
 				{0} বছৰ
@@ -5742,6 +6018,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ব্ৰিটিশ্ব থাৰ্মেল ইউনিট
 				{0} ব্ৰিটিশ্ব থাৰ্মেল ইউনিট
 			
+			
+				ইউ এচ থাৰ্ণ
+				{0} ইউ এচ থাৰ্ণ
+				{0} ইউ এচ থাৰ্ণ
+			
 			
 				পাউণ্ড-বল
 				{0} পাউণ্ড-বল
@@ -5981,11 +6262,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} অশ্বক্ষমতা
 				{0} অশ্বক্ষমতা
 			
-			
-				হেক্টোপাছকল
-				{0} হেক্টোপাছকল
-				{0} হেক্টোপাছকল
-			
 			
 				মিলিমিটাৰ মাৰ্কিউৰী
 				{0} মিলিমিটাৰ মাৰ্কিউৰী
@@ -6011,6 +6287,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} বতৰ
 				{0} atm
 			
+			
+				হেক্টোপাছকল
+				{0} হেক্টোপাছকল
+				{0} হেক্টোপাছকল
+			
 			
 				কিল’পাস্কেল
 				{0} কিল’পাস্কেল
@@ -6428,6 +6709,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} শতিকা
 				{0} শতিকা
 			
+			
+				দশ.
+				{0} দশ.
+				{0} দশ.
+			
 			
 				বছৰ
 				{0} বছৰ
@@ -6545,6 +6831,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				ইউ এচ থাৰ্ণ
+				{0} ইউ এচ থাৰ্ণ
+				{0} ইউ এচ থাৰ্ণ
+			
 			
 				পাউণ্ড-বল
 				{0} lbf
@@ -6784,11 +7075,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} অশ্বক্ষমতা
 				{0} অশ্বক্ষমতা
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -6814,6 +7100,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				কি. পা.
 				{0} কি. পা.
diff --git a/make/data/cldr/common/main/as_IN.xml b/make/data/cldr/common/main/as_IN.xml
index 6ecba95ffa8..eb9c73e4748 100644
--- a/make/data/cldr/common/main/as_IN.xml
+++ b/make/data/cldr/common/main/as_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/asa.xml b/make/data/cldr/common/main/asa.xml
index 9cecf0c48be..688369b3a31 100644
--- a/make/data/cldr/common/main/asa.xml
+++ b/make/data/cldr/common/main/asa.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Vithiwa vya Marshal
-			Mathedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/asa_TZ.xml b/make/data/cldr/common/main/asa_TZ.xml
index 9e52a839126..e2b8b9e3adc 100644
--- a/make/data/cldr/common/main/asa_TZ.xml
+++ b/make/data/cldr/common/main/asa_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ast.xml b/make/data/cldr/common/main/ast.xml
index 11209e436d6..857b0b86bd7 100644
--- a/make/data/cldr/common/main/ast.xml
+++ b/make/data/cldr/common/main/ast.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -472,7 +472,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			moldavu
 			rombo
 			romaní
-			root
 			rotumanu
 			rusu
 			rusyn
@@ -1002,8 +1001,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Saint Martin
 			Madagascar
 			Islles Marshall
-			Macedonia
-			Macedonia (ARYDM)
 			Malí
 			Myanmar (Birmania)
 			Mongolia
@@ -1135,68 +1132,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			alfabetu turcu llatino unificáu
 			dialectu balanka del anii
 			grupu dialectal barlavento del cabuverdianu
-			BASICENG
-			BAUDDHA
-			BISCAYAN
 			dialectu San Giorgio/Bila
 			alfabetu bohorič
 			boontling
 			convención ortográfica brasilanu-portuguesa de 1945
-			CORNU
 			alfabetu dajnko
 			serbiu con pronunciación ekaviana
 			inglés modernu primitivu
 			fonética IPA
 			fonética UPA
-			FONXSAMP
 			romanización de Hepburn
-			HOGNORSK
 			serbiu con pronunciación Ijekaviana
-			ITIHASA
-			JAUER
-			JYUTPING
 			ortografía común
-			KOCIEWIE
 			ortografía estándar
-			LAUKIKA
 			el dialectu lipovaz del resianu
-			LUNA1918
 			alfabetu metelko
 			monotónicu
 			dialectu ndyuka
 			dialectu natisone
-			NEWFOUND
 			dialectu gniva/njiva
 			volapük modernu
 			dialectu oseacco/osojane
 			ortografía del diccionariu d’inglés d’Oxford
 			dialectu pamaka
-			PETR1708
 			romanización pinyin
 			politónicu
 			ordenador
-			PUTER
 			ortografía revisada
 			volapük clásicu
 			resianu
-			RUMGR
 			saho
 			inglés estándar escocés
 			scouse
-			SIMPLE
 			dialectu stolvizza/solbica
 			grupu dialectal sotavento del cabuverdianu
-			SURMIRAN
-			SURSILV
-			SUTSILV
 			ortografía taraskievica
 			ortografía unificada
 			ortografía unificada revisada
-			ULSTER
 			alfabetu fonéticu Unifon
-			VAIDIKA
 			valencianu
-			VALLADER
 			romanización de Wade-Giles
 		
 		
@@ -1346,8 +1320,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á b c d e é f g h ḥ i í l ḷ m n ñ o ó p q r s t u ú ü v x y z]
 		[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ]
 		[A B C D E F G H I L M N Ñ O P Q R S T U V X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \\ \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \\ \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}… {1}
@@ -9658,11 +9632,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} caballu de fuerza
 				{0} caballos de fuerza
 			
-			
-				hectopascales
-				{0} hectopascal
-				{0} hectopascales
-			
 			
 				milímetros de mercuriu
 				{0} milímetru de mercuriu
@@ -9683,6 +9652,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} milibar
 				{0} milibares
 			
+			
+				hectopascales
+				{0} hectopascal
+				{0} hectopascales
+			
 			
 				quilómetros per hora
 				{0} quilómetru per hora
@@ -10370,11 +10344,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -10395,6 +10364,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -11077,11 +11051,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}hp
 				{0}hp
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mm Hg
 				{0}mm Hg
@@ -11102,6 +11071,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}mb
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/h
 				{0}km/h
diff --git a/make/data/cldr/common/main/ast_ES.xml b/make/data/cldr/common/main/ast_ES.xml
index c603e253b9c..32c2d5ddbf0 100644
--- a/make/data/cldr/common/main/ast_ES.xml
+++ b/make/data/cldr/common/main/ast_ES.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/az.xml b/make/data/cldr/common/main/az.xml
index fea41dd084f..d7d5baf26c2 100644
--- a/make/data/cldr/common/main/az.xml
+++ b/make/data/cldr/common/main/az.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -139,9 +139,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Avstraliya ingiliscəsi
 			Kanada ingiliscəsi
 			Britaniya ingiliscəsi
-			ingilis (BK)
 			Amerika ingiliscəsi
-			ingilis (ABŞ)
 			orta ingilis
 			esperanto
 			ispan
@@ -356,7 +354,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			norveç
 			noqay
 			qədim nors
-			nqo
 			cənubi ndebele
 			şimal soto
 			nuer
@@ -524,14 +521,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			idiş
 			yoruba
 			kanton
+			Çin, kanton
 			çjuan
 			zapotek
 			blisimbols
 			zenaqa
 			tamazi
 			çin
+			Çin, mandarin
 			sadələşmiş çin
+			sadələşmiş mandarin çincəsi
 			ənənəvi çin
+			ənənəvi mandarin çincəsi
 			zulu
 			zuni
 			dil məzmunu yoxdur
@@ -807,7 +808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Quam
 			Qvineya-Bisau
 			Qayana
-			Honq Konq Xüsusi İnzibati Ərazi Çin
+			Honq Konq Xüsusi İnzibati Rayonu Çin
 			Honq Konq
 			Herd və Makdonald adaları
 			Honduras
@@ -862,7 +863,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mali
 			Myanma
 			Monqolustan
-			Makao Xüsusi İnzibati Ərazi Çin
+			Makao XİR Çin
 			Makao
 			Şimali Marian adaları
 			Martinik
@@ -941,7 +942,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tacikistan
 			Tokelau
 			Şərqi Timor
-			Doğu Timor
+			Şərqi Timor
 			Türkmənistan
 			Tunis
 			Tonqa
@@ -1069,8 +1070,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c ç d e ə f g ğ h x ı i İ j k q l m n o ö p r s ş t u ü v y z]
 		[w]
 		[A B C Ç D E Ə F G Ğ H X I İ J K Q L M N O Ö P R S Ş T U Ü V Y Z W]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1079,19 +1080,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1191,22 +1196,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG MM/y– GGGGG MM/y
 							GGGGG MM/y – MM/y
@@ -1409,9 +1401,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							12
 						
 						
-							Yanvar
+							yanvar
 							Fevral
-							Mart
+							mart
 							Aprel
 							May
 							İyun
@@ -1420,7 +1412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Sentyabr
 							Oktyabr
 							Noyabr
-							Dekabr
+							dekabr
 						
 					
 				
@@ -1428,10 +1420,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							B.
-							B.E.
-							Ç.A.
+							B.e.
+							Ç.a.
 							Ç.
-							C.A.
+							C.a.
 							C.
 							Ş.
 						
@@ -1756,22 +1748,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG MM.y – GGGGG MM.y
 							GGGGG MM.y – MM.y
@@ -1898,6 +1877,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						
+							Məh.
+							Səf.
+							Rəb. I
+							Rəb. II
+							Cəm. I
+							Cəm. II
+							Rəc.
+							Şab.
+							Ram.
+							Şəv.
+							Zilq.
+							Zilh.
+						
+						
+							Məhərrəm
+							Səfər
+							Rəbiüləvvəl
+							Rəbiülaxır
+							Cəmadiyələvvəl
+							Cəmadiyəlaxır
+							Rəcəb
+							Şaban
+							Ramazan
+							Şəvval
+							Zilqədə
+							Zilhiccə
+						
+					
+					
+						
+							Məh.
+							Səf.
+							Rəb. I
+							Rəb. II
+							Cəm. I
+							Cəm. II
+							Rəc.
+							Şab.
+							Ram.
+							Şəv.
+							Zilq.
+							Zilh.
+						
+						
+							Məhərrəm
+							Səfər
+							Rəbiüləvvəl
+							Rəbiülaxır
+							Cəmadiyələvvəl
+							Cəmadiyəlaxır
+							Rəcəb
+							Şaban
+							Ramazan
+							Şəvval
+							Zilqədə
+							Zilhiccə
+						
+					
+				
+			
 		
 		
 			
@@ -2537,7 +2580,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} Standart Vaxtı
 			{1} ({0})
 			
-				Santa Isabel
+				Santa İzabel
 			
 			
 				Honolulu
@@ -2647,7 +2690,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vyana
 			
 			
-				Perth
+				Pert
 			
 			
 				Yukla
@@ -2710,7 +2753,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uqaduqu
 			
 			
-				Sofia
+				Sofiya
 			
 			
 				Bəhreyn
@@ -2728,7 +2771,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bermud adaları
 			
 			
-				Brunei
+				Bruney
 			
 			
 				La Pas
@@ -2836,7 +2879,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Recina
 			
 			
-				Vinipeq
+				Vinnipeq
 			
 			
 				Rezolyut
@@ -2944,7 +2987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Milad
 			
 			
-				Nikosia
+				Nikosiya
 			
 			
 				Famaqusta
@@ -3052,7 +3095,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Akkra
 			
 			
-				Gibraltar
+				Cəbəli-Tariq
 			
 			
 				Tul
@@ -3136,7 +3179,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Men Adası
 			
 			
-				Kolkata
+				Kəlkətə
 			
 			
 				Çaqos
@@ -3241,7 +3284,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maseru
 			
 			
-				Vilnyus
+				Vilnüs
 			
 			
 				Lüksemburq
@@ -3298,7 +3341,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makao
 			
 			
-				Saipan
+				Saypan
 			
 			
 				Martinik
@@ -3400,7 +3443,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Çatam
 			
 			
-				Aukland
+				Oklənd
 			
 			
 				Muskat
@@ -3667,7 +3710,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Funafuti
 			
 			
-				Taipei
+				Taybey
 			
 			
 				Dar es Salam
@@ -3736,7 +3779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mərkəz, Şimal Dakota
 			
 			
-				Cikaqo
+				Çikaqo
 			
 			
 				Menomini
@@ -4540,7 +4583,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Reunion Vaxtı
+					Reyunyon
 				
 			
 			
@@ -4717,12 +4760,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			,
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4731,6 +4780,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 min
@@ -4767,24 +4821,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					00K
 					000K
 					000K
-					0M
-					0M
-					00M
-					00M
-					000M
-					000M
-					0G
-					0G
-					00G
-					00G
-					000G
-					000G
-					0T
-					0T
-					00T
-					00T
-					000T
-					000T
+					0 mln
+					0 mln
+					00 mln
+					00 mln
+					000 mln
+					000 mln
+					0 mlrd
+					0 mlrd
+					00 mlrd
+					00 mlrd
+					000 mlrd
+					000 mlrd
+					0 trln
+					0 trln
+					00 trln
+					00 trln
+					000 trln
+					000 trln
 				
 			
 		
@@ -4852,6 +4906,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Birləşmiş Ərəb Əmirlikləri Dirhəmi
 				BƏƏ dirhəmi
 				BƏƏ dirhəmi
+				AED
 			
 			
 				Əfqanıstan Əfqanisi (1927–2002)
@@ -4862,6 +4917,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Əfqanıstan Əfqanisi
 				Əfqanıstan əfqanisi
 				Əfqanıstan əfqanisi
+				AFN
 			
 			
 				Albaniya Leki (1946–1965)
@@ -4872,21 +4928,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Albaniya Leki
 				Albaniya leki
 				Albaniya leki
+				ALL
 			
 			
 				Ermənistan Dramı
 				Ermənistan dramı
 				Ermənistan dramı
+				AMD
 			
 			
 				Niderland Antilyası Gilderi
 				Niderland Antilyası gilderi
 				Niderland Antilya gilderi
+				ANG
 			
 			
 				Anqola Kvanzası
-				Anqola kvanzasi
-				Anqola kvanzasi
+				Anqola kvanzası
+				Anqola kvanzası
+				AOA
+				Kz
 			
 			
 				Anqola Kvanzasi (1977–1990)
@@ -4917,6 +4978,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Argentina Pesosu
 				Argentina pesosu
 				Argentina pesosu
+				ARS
+				$
 			
 			
 				Avstriya Şillinqi
@@ -4927,11 +4990,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Avstraliya Dolları
 				Avstraliya dolları
 				Avstraliya dolları
+				A$
+				$
 			
 			
 				Aruba Florini
 				Aruba florini
 				Aruba florini
+				AWG
 			
 			
 				Azərbaycan Manatı (1993–2006)
@@ -4953,16 +5019,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bosniya-Herseqovina Markası
 				Bosniya-Herseqovina markası
 				Bosniya-Herseqovina markası
+				BAM
+				KM
 			
 			
 				Barbados Dolları
 				Barbados dolları
 				Barbados dolları
+				BBD
+				$
 			
 			
 				Banqladeş Takası
 				Banqladeş takası
 				Banqladeş takası
+				BDT
+				৳
 			
 			
 				Belçika Frankı (deyşirik)
@@ -4988,31 +5060,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolqarıstan Levi
 				Bolqarıstan levi
 				Bolqarıstan levi
+				BGN
 			
 			
 				Bəhreyn Dinarı
 				Bəhreyn dinarı
 				Bəhreyn dinarı
+				BHD
 			
 			
 				Burundi Frankı
 				Burundi frankı
 				Burundi frankı
+				BIF
 			
 			
 				Bermuda Dolları
 				Bermuda dolları
 				Bermuda dolları
+				BMD
+				$
 			
 			
 				Bruney Dolları
 				Bruney dolları
 				Bruney dolları
+				BND
+				$
 			
 			
 				Boliviya Bolivianosu
 				Boliviya bolivianosu
 				Boliviya bolivianosu
+				BOB
+				Bs
 			
 			
 				Boliviya pesosu
@@ -5043,6 +5124,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Braziliya Realı
 				Braziliya realı
 				Braziliya realı
+				R$
+				R$
 			
 			
 				Braziliya kruzado novası
@@ -5055,14 +5138,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Braziliya kruzeyrosu
 			
 			
-				Bahama Dolları
-				Bahama dolları
-				Bahama dolları
+				Baham Dolları
+				Baham dolları
+				Baham dolları
+				BSD
+				$
 			
 			
 				Butan Nqultrumu
 				Butan nqultrumu
 				Butan nqultrumu
+				BTN
 			
 			
 				Burmis Kyatı
@@ -5073,6 +5159,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Botsvana Pulası
 				Botsvana pulası
 				Botsvana pulası
+				BWP
+				P
 			
 			
 				Belarus Yeni Rublu (1994–1999)
@@ -5083,26 +5171,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Belarus Rublu
 				Belarus rublu
 				Belarus rublu
+				BYN
+				р.
 			
 			
 				Belarus Rublu (2000–2016)
 				Belarus rublu (2000–2016)
 				Belarus rublu (2000–2016)
+				BYR
 			
 			
 				Beliz Dolları
 				Beliz dolları
 				Beliz dolları
+				BZD
+				$
 			
 			
 				Kanada Dolları
 				Kanada dolları
 				Kanada dolları
+				CA$
+				$
 			
 			
 				Konqo Frankı
 				Konqo frankı
 				Konqo frankı
+				CDF
 			
 			
 				WIR Avro
@@ -5113,6 +5209,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				İsveçrə Frankı
 				İsveçrə frankı
 				İsveçrə frankı
+				CHF
 			
 			
 				WIR Frankası
@@ -5123,26 +5220,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Çili Pesosu
 				Çili pesosu
 				Çili pesosu
+				CLP
+				$
 			
 			
 				Çin Yuanı (ofşor)
 				Çin yuanı (ofşor)
 				Çin yuanı (ofşor)
+				CNH
 			
 			
 				Çin Yuanı
 				Çin yuanı
 				Çin yuanı
+				CN¥
+				¥
 			
 			
 				Kolumbiya Pesosu
 				Kolombiya pesosu
 				Kolombiya pesosu
+				COP
+				$
 			
 			
 				Kosta Rika Kolonu
 				Kosta Rika kolonu
 				Kosta Rika kolonu
+				CRC
+				₡
 			
 			
 				Serbiya Dinarı (2002–2006)
@@ -5158,16 +5264,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuba Çevrilən Pesosu
 				Kuba çevrilən pesosu
 				Kuba çevrilən pesosu
+				CUC
+				$
 			
 			
 				Kuba Pesosu
 				Kuba pesosu
 				Kuba pesosu
+				CUP
+				$
 			
 			
 				Kape Verde Eskudosu
 				Kape Verde eskudosu
 				Kape Verde eskudosu
+				CVE
 			
 			
 				Kipr Paundu
@@ -5178,6 +5289,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Çexiya Korunası
 				Çexiya korunası
 				Çexiya korunası
+				CZK
+				Kč
 			
 			
 				Şərq Almaniya Ostmarkı
@@ -5193,21 +5306,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cibuti Frankı
 				Cibuti frankı
 				Cibuti frankı
+				DJF
 			
 			
 				Danimarka Kronu
 				Danimarka kronu
 				Danimarka kronu
+				DKK
+				kr
 			
 			
 				Dominika Pesosu
 				Dominika pesosu
 				Dominika pesosu
+				DOP
+				$
 			
 			
 				Əlcəzair Dinarı
 				Əlcəzair dinarı
 				Əlcəzair dinarı
+				DZD
 			
 			
 				Ekvador Sukresi
@@ -5223,11 +5342,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Misir Funtu
 				Misir funtu
 				Misir funtu
+				EGP
+				E£
 			
 			
 				Eritreya Nakfası
 				Eritreya nakfası
 				Eritreya nakfası
+				ERN
 			
 			
 				İspan Pesetası (A account)
@@ -5248,11 +5370,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Efiopiya Bırrı
 				Efiopiya bırrı
 				Efiopiya bırrı
+				ETB
 			
 			
 				Avro
 				Avro
 				Avro
+				€
+				€
 			
 			
 				Fin Markası
@@ -5263,11 +5388,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fici Dolları
 				Fici dolları
 				Fici dolları
+				FJD
+				$
 			
 			
 				Folklend Adaları Funtu
 				Folklend Adaları funtu
 				Folklend Adaları funtu
+				FKP
+				£
 			
 			
 				Fransız Markası
@@ -5275,9 +5404,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fransız markası
 			
 			
-				Britaniya Funt
-				Britaniya funt
-				Britaniya funt
+				Britaniya Funtu
+				Britaniya funtu
+				Britaniya funtu
+				£
+				£
 			
 			
 				Gürcüstan Kupon Lariti
@@ -5288,6 +5419,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gürcüstan Larisi
 				Gürcüstan larisi
 				Gürcüstan larisi
+				GEL
+				₾
 				₾
 			
 			
@@ -5299,21 +5432,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Qana Sedisi
 				Qana sedisi
 				Qana sedisi
+				GHS
 			
 			
-				Gibraltar Funtu
-				Gibraltar funtu
-				Gibraltar funtu
+				Cəbəli-Tariq Funtu
+				Cəbəli-Tariq funtu
+				Cəbəli-Tariq funtu
+				GIP
+				£
 			
 			
 				Qambiya Dalasisi
 				Qambiya dalasisi
 				Qambiya dalasisi
+				GMD
 			
 			
 				Qvineya Frankı
 				Qvineya frankı
 				Qvineya frankı
+				GNF
+				FG
 			
 			
 				Qvineya Sulisi
@@ -5334,6 +5473,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Qvatemala Küetzalı
 				Qvatemala küetzalı
 				Qvatemala küetzalı
+				GTQ
+				Q
 			
 			
 				Portugal Qvineya Eskudosu
@@ -5349,16 +5490,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Qayana Dolları
 				Qayana dolları
 				Qayana dolları
+				GYD
+				$
 			
 			
 				Honq Konq Dolları
 				Honq Konq dolları
 				Honq Konq dolları
+				HK$
+				$
 			
 			
 				Honduras Lempirası
 				Honduras lempirası
 				Honduras lempirası
+				HNL
+				L
 			
 			
 				Xorvatiya Dinarı
@@ -5369,21 +5516,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Xorvatiya Kunası
 				Xorvatiya kunası
 				Xorvatiya kunası
+				HRK
+				kn
 			
 			
 				Haiti Qourdu
 				Haiti qourdu
 				Haiti qourdu
+				HTG
 			
 			
 				Macarıstan Forinti
 				Macarıstan forinti
 				Macarıstan forinti
+				HUF
+				Ft
 			
 			
 				İndoneziya Rupisi
 				İndoneziya rupisi
 				İndoneziya rupisi
+				IDR
+				Rp
 			
 			
 				İrlandiya Paundu
@@ -5404,21 +5558,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				İsrail Yeni Şekeli
 				İsrail yeni şekeli
 				İsrail yeni şekeli
+				₪
+				₪
 			
 			
 				Hindistan Rupisi
 				Hindistan rupisi
 				Hindistan rupisi
+				₹
+				₹
 			
 			
 				İraq Dinarı
 				İraq dinarı
 				İraq dinarı
+				IQD
 			
 			
 				İran Rialı
 				İran rialı
 				İran rialı
+				IRR
 			
 			
 				İslandiya Kronu (1918–1981)
@@ -5429,6 +5589,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				İslandiya Kronu
 				İslandiya kronu
 				İslandiya kronu
+				ISK
+				kr
 			
 			
 				İtaliya Lirası
@@ -5439,81 +5601,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Yamayka Dolları
 				Yamayka dolları
 				Yamayka dolları
+				JMD
+				$
 			
 			
 				İordaniya Dinarı
 				İordaniya dinarı
 				İordaniya dinarı
+				JOD
 			
 			
 				Yaponiya Yeni
 				Yaponiya yeni
 				Yaponiya yeni
+				JP¥
+				¥
 			
 			
 				Keniya Şillinqi
 				Keniya şillinqi
 				Keniya şillinqi
+				KES
 			
 			
-				Kırğızıstan Somu
-				Kırğızıstan somu
-				Kırğızıstan somu
+				Qırğızıstan Somu
+				Qırğızıstan somu
+				Qırğızıstan somu
+				KGS
 			
 			
 				Kamboca Rieli
 				Kamboca rieli
 				Kamboca rieli
+				KHR
+				៛
 			
 			
 				Komor Frankı
 				Komor frankı
 				Komor frankı
+				KMF
+				CF
 			
 			
 				Şimali Koreya Vonu
 				Şimali Koreya vonu
 				Şimali Koreya vonu
+				KPW
+				₩
 			
 			
 				Cənubi Koreya Vonu
 				Cənubi Koreya vonu
 				Cənubi Koreya vonu
+				₩
+				₩
 			
 			
 				Küveyt Dinarı
 				Küveyt dinarı
 				Küveyt dinarı
+				KWD
 			
 			
 				Kayman Adaları Dolları
 				Kayman Adaları dolları
 				Kayman Adaları dolları
+				KYD
+				$
 			
 			
 				Qazaxıstan Tengesi
 				Qazaxıstan tengesi
 				Qazaxıstan tengesi
+				KZT
+				₸
 			
 			
 				Laos Kipi
 				Laos kipi
 				Laos kipi
+				LAK
+				₭
 			
 			
 				Livan Funtu
 				Livan funtu
 				Livan funtu
+				LBP
+				L£
 			
 			
 				Şri Lanka Rupisi
 				Şri Lanka rupisi
 				Şri Lanka rupisi
+				LKR
+				Rs
 			
 			
 				Liberiya Dolları
 				Liberiya dolları
 				Liberiya dolları
+				LRD
+				$
 			
 			
 				Lesoto Lotisi
@@ -5524,6 +5714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Litva Liti
 				Litva liti
 				Litva liti
+				LTL
 			
 			
 				Litva Talonası
@@ -5549,6 +5740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Latviya Latı
 				Latviya latı
 				Latviya latı
+				LVL
 			
 			
 				Latviya Rublu
@@ -5559,11 +5751,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Liviya Dinarı
 				Liviya dinarı
 				Liviya dinarı
+				LYD
 			
 			
 				Mərakeş Dirhəmi
 				Mərakeş dirhəmi
 				Mərakeş dirhəmi
+				MAD
 			
 			
 				Mərakeş Frankası
@@ -5574,11 +5768,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Moldova Leyi
 				Moldova leyi
 				Moldova leyi
+				MDL
 			
 			
 				Madaqaskar Ariarisi
 				Madaqaskar ariarisi
 				Madaqaskar ariarisi
+				MGA
+				Ar
 			
 			
 				Madaqaskar Frankası
@@ -5589,6 +5786,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makedoniya Dinarı
 				Makedoniya dinarı
 				Makedoniya dinarı
+				MKD
 			
 			
 				Makedoniya Dinarı (1992–1993)
@@ -5604,21 +5802,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Myanma Kiyatı
 				Myanmar kiyatı
 				Myanmar kiyatı
+				MMK
+				K
 			
 			
 				Monqoliya Tuqriki
 				Monqoliya tuqriki
 				Monqoliya tuqriki
+				MNT
+				₮
 			
 			
 				Makao Patakası
 				Makao patakası
 				Makao patakası
+				MOP
 			
 			
 				Mavritaniya Ugiyası (1973–2017)
 				Mavritaniya ugiyası (1973–2017)
 				Mavritaniya ugiyası (1973–2017)
+				MRO
 			
 			
 				Mavritaniya Ugiyası
@@ -5635,21 +5839,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mavriki Rupisi
 				Mavriki rupisi
 				Mavriki rupisi
+				MUR
+				Rs
 			
 			
 				Maldiv Rufiyası
 				Maldiv rufiyası
 				Maldiv rufiyası
+				MVR
 			
 			
 				Malavi Kvaçası
 				Malavi kvaçası
 				Malavi kvaçası
+				MWK
 			
 			
 				Meksika Pesosu
 				Meksika pesosu
 				Meksika pesosu
+				MX$
+				$
 			
 			
 				Meksika gümüş pesosu
@@ -5660,6 +5870,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malayziya Ringiti
 				Malayziya ringiti
 				Malayziya ringiti
+				MYR
+				RM
 			
 			
 				Mozambik Eskudosu
@@ -5675,16 +5887,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mozambik Metikalı
 				Mozambik metikalı
 				Mozambik metikalı
+				MZN
 			
 			
 				Namibiya Dolları
 				Namibiya dolları
 				Namibiya dolları
+				NAD
+				$
 			
 			
 				Nigeriya Nairası
 				Nigeriya nairası
 				Nigeriya nairası
+				NGN
+				₦
 			
 			
 				Nikaraqua kordobu
@@ -5695,6 +5912,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nikaraqua Kordobası
 				Nikaraqua kordobası
 				Nikaraqua kordobası
+				NIO
+				C$
 			
 			
 				Hollandiya Gilderi
@@ -5705,26 +5924,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Norveç Kronu
 				Norveç kronu
 				Norveç kronu
+				NOK
+				kr
 			
 			
 				Nepal Rupisi
 				Nepal rupisi
 				Nepal rupisi
+				NPR
+				Rs
 			
 			
 				Yeni Zelandiya Dolları
 				Yeni Zelandiya dolları
 				Yeni Zelandiya dolları
+				NZ$
+				$
 			
 			
 				Oman Rialı
 				Oman rialı
 				Oman rialı
+				OMR
 			
 			
 				Panama Balboası
 				Panama balboası
 				Panama balboası
+				PAB
 			
 			
 				Peru Inti
@@ -5735,6 +5962,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peru Solu
 				Peru solu
 				Peru solu
+				PEN
 			
 			
 				Peru Solu (1863–1965)
@@ -5745,21 +5973,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Papua Yeni Qvineya Kinası
 				Papua Yeni Qvineya kinası
 				Papua Yeni Qvineya kinası
+				PGK
 			
 			
 				Filippin Pesosu
 				Filippin pesosu
 				Filippin pesosu
+				PHP
+				₱
 			
 			
 				Pakistan Rupisi
 				Pakistan rupisi
 				Pakistan rupisi
+				PKR
+				Rs
 			
 			
 				Polşa Zlotısı
 				Polşa zlotısı
 				Polşa zlotısı
+				PLN
+				zł
 			
 			
 				Polşa Zlotısı (1950–1995)
@@ -5775,11 +6010,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Paraqvay Quaranisi
 				Paraqvay quaranisi
 				Paraqvay quaranisi
+				PYG
+				₲
 			
 			
 				Qatar Rialı
 				Qatar rialı
 				Qatar rialı
+				QAR
 			
 			
 				Rodezian Dolları
@@ -5795,17 +6033,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rumıniya Leyi
 				Rumıniya leyi
 				Rumıniya leyi
+				RON
 				ley
 			
 			
 				Serbiya Dinarı
 				Serbiya dinarı
 				Serbiya dinarı
+				RSD
 			
 			
 				Rusiya Rublu
 				Rusiya rublu
 				Rusiya rublu
+				RUB
+				₽
 			
 			
 				Rusiya Rublu (1991–1998)
@@ -5816,41 +6058,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ruanda Frankı
 				Ruanda frankı
 				Ruanda frankı
+				RWF
+				RF
 			
 			
 				Səudiyyə Riyalı
 				Səudiyyə riyalı
 				Səudiyyə riyalı
+				SAR
 			
 			
 				Solomon Adaları Dolları
 				Solomon Adaları dolları
 				Solomon Adaları dolları
+				SBD
+				$
 			
 			
 				Seyşel Rupisi
 				Seyşel rupisi
 				Seyşel rupisi
+				SCR
 			
 			
 				Sudan Funtu
 				Sudan funtu
 				Sudan funtu
+				SDG
 			
 			
 				İsveç Kronu
 				İsveç kronu
 				İsveç kronu
+				SEK
+				kr
 			
 			
 				Sinqapur Dolları
 				Sinqapur dolları
 				Sinqapur dolları
+				SGD
+				$
 			
 			
 				Müqəddəs Yelena Funtu
 				Müqəddəs Yelena funtu
 				Müqəddəs Yelena funtu
+				SHP
+				£
 			
 			
 				Sloveniya Toları
@@ -5866,31 +6121,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sierra Leon Leonu
 				Sierra Leon leonu
 				Sierra Leon leonu
+				SLL
 			
 			
 				Somali Şillinqi
 				Somali şillinqi
 				Somali şillinqi
+				SOS
 			
 			
 				Surinam Dolları
 				Surinam dolları
 				Surinam dolları
+				SRD
+				$
 			
 			
 				Cənubi Sudan Funtu
 				Cənubi Sudan funtu
 				Cənubi Sudan funtu
+				SSP
+				£
 			
 			
 				San Tom və Prinsip Dobrası (1977–2017)
 				San Tom və Prinsip dobrası (1977–2017)
 				San Tom və Prinsip dobrası (1977–2017)
+				STD
 			
 			
 				San Tom və Prinsip Dobrası
 				San Tom və Prinsip dobrası
 				San Tom və Prinsip dobrası
+				STN
 				Db
 			
 			
@@ -5907,18 +6170,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Suriya Funtu
 				Suriya funtu
 				Suriya funtu
+				SYP
 				S£
 			
 			
 				Svazilend Lilangenini
 				Svazilend lilangenini
 				Svazilend emalangenini
+				SZL
 			
 			
 				Tayland Batı
 				Tayland batı
 				Tayland batı
 				฿
+				฿
 			
 			
 				Tacikistan Rublu
@@ -5929,6 +6195,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tacikistan Somonisi
 				Tacikistan somonisi
 				Tacikistan somonisi
+				TJS
 			
 			
 				Türkmənistan Manatı (1993–2009)
@@ -5939,16 +6206,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Türkmənistan Manatı
 				Türkmənistan manatı
 				Türkmənistan manatı
+				TMT
 			
 			
 				Tunis Dinarı
 				Tunis dinarı
 				Tunis dinarı
+				TND
 			
 			
 				Tonqa Panqası
 				Tonqa panqası
 				Tonqa panqası
+				TOP
+				T$
 			
 			
 				Timor Eskudu
@@ -5964,27 +6235,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Türkiyə Lirəsi
 				Türkiyə lirəsi
 				Türkiyə lirəsi
+				TRY
+				₺
+				TL
 			
 			
 				Trinidad və Tobaqo Dolları
 				Trinidad və Tobaqo dolları
 				Trinidad və Tobaqo dolları
+				TTD
+				$
 			
 			
 				Tayvan Yeni Dolları
 				Tayvan yeni dolları
 				Tayvan yeni dolları
+				NT$
 				NT$
 			
 			
 				Tanzaniya Şillinqi
 				Tanzaniya şillinqi
 				Tanzaniya şillinqi
+				TZS
 			
 			
 				Ukrayna Qrivnası
 				Ukrayna qrivnası
 				Ukrayna qrivnası
+				UAH
+				₴
 			
 			
 				Ukrayna Karbovenesası
@@ -6000,11 +6280,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uqanda Şillinqi
 				Uqanda şillinqi
 				Uqanda şillinqi
+				UGX
 			
 			
 				ABŞ Dolları
 				ABŞ dolları
 				ABŞ dolları
+				US$
+				$
 			
 			
 				ABŞ dolları (yeni gün)
@@ -6030,11 +6313,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uruqvay Pesosu
 				Uruqvay pesosu
 				Uruqvay pesosu
+				UYU
+				$
 			
 			
 				Özbəkistan Somu
 				Özbəkistan somu
 				Özbəkistan somu
+				UZS
 			
 			
 				Venesuela Bolivarı (1871–2008)
@@ -6045,16 +6331,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venesuela Bolivarı (2008–2018)
 				Venesuela bolivarı (2008–2018)
 				Venesuela bolivarı (2008–2018)
+				VEF
+				Bs
 			
 			
 				Venesuela Bolivarı
 				Venesuela bolivarı
 				Venesuela bolivarı
+				VES
 			
 			
 				Vyetnam Donqu
 				Vyetnam donqu
 				Vyetnam donqu
+				₫
+				₫
 			
 			
 				Vyetnam Donqu (1978–1985)
@@ -6065,16 +6356,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vanuatu Vatusu
 				Vanuatu vatusu
 				Vanuatu vatusu
+				VUV
 			
 			
 				Samoa Talası
 				Samoa talası
 				Samoa talası
+				WST
 			
 			
 				Kamerun Frankı
 				Kamerun frankı
 				Kamerun frankı
+				FCFA
 			
 			
 				gümüş
@@ -6090,6 +6384,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Şərqi Karib Dolları
 				Şərqi Karib dolları
 				Şərqi Karib dolları
+				EC$
+				$
 			
 			
 				Fransız Gızıl Frankı
@@ -6105,6 +6401,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fil Dişi Sahili Frankı
 				Fil Dişi Sahili frankı
 				Fil Dişi Sahili frankı
+				CFA
 			
 			
 				Palladium
@@ -6115,6 +6412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fransız Polineziyası Frankı
 				Fransız Polineziyası frankı
 				Fransız Polineziyası frankı
+				CFPF
 			
 			
 				Platinum
@@ -6135,6 +6433,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Yəmən Rialı
 				Yəmən rialı
 				Yəmən rialı
+				YER
 			
 			
 				Yuqoslaviya Dinarı (1966–1990)
@@ -6160,6 +6459,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cənubi Afrika Randı
 				Cənubi Afrika randı
 				Cənubi Afrika randı
+				ZAR
+				R
 			
 			
 				Zambiya Kvaçası (1968–2012)
@@ -6170,6 +6471,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zambiya Kvaçası
 				Zambiya kvaçası
 				Zambiya kvaçası
+				ZMW
+				ZK
 			
 			
 				Zair Yeni Zairi (1993–1998)
@@ -6342,11 +6645,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} permiriada
 				{0} permiriada
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				litr/kilometr
 				{0} litr/kilometr
@@ -6427,6 +6725,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} əsr
 				{0} əsr
 			
+			
+				dekada
+				{0} dekada
+				{0} dek
+			
 			
 				il
 				{0} il
@@ -6544,6 +6847,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Britaniya terman vahidi
 				{0} Britaniya terman vahidi
 			
+			
+				ABŞ termal vahidi
+				{0} ABŞ termal vahidi
+				{0} ABŞ termal vahidi
+			
 			
 				güc funtu
 				{0} güc funtu
@@ -6574,6 +6882,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hers
 				{0} hers
 			
+			
+				tipoqraf emi
+			
+			
+				piksel
+				{0} piksel
+				{0} piksel
+			
+			
+				meqapiksel
+				{0} meqapiksel
+				{0} meqapiksel
+			
+			
+				piksel / santimetr
+				{0} piksel / santimetr
+				{0} piksel / santimetr
+			
+			
+				piksel / düym
+				{0} piksel / düym
+				{0} piksel / düym
+			
+			
+				nöqtə / santimetr
+				{0} nöqtə / santimetr
+				{0} nöqtə / santimetr
+			
+			
+				nöqtə / düym
+				{0} nöqtə / düym
+				{0} nöqtə / düym
+			
 			
 				kilometr
 				{0} kilometr
@@ -6788,11 +7129,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} at gücü
 				{0} at gücü
 			
-			
-				hektopaskal
-				{0} hektopaskal
-				{0} hektopaskal
-			
 			
 				millimetr civə sütunu
 				{0} millimetr civə sütunu
@@ -6818,6 +7154,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfer
 				{0} atmosfer
 			
+			
+				paskal
+				{0} paskal
+				{0} paskal
+			
+			
+				hektopaskal
+				{0} hektopaskal
+				{0} hektopaskal
+			
 			
 				kilopaskal
 				{0} kilopaskal
@@ -7010,8 +7356,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				barrel
-				{0} bbl
-				{0} bbl
 			
 			
 				kardinal istiqamət
@@ -7025,6 +7369,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				g qüvvəsi
 				{0} G
@@ -7047,8 +7394,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dərəcə
-				{0}dər
-				{0}dər
+				{0} dər
+				{0} dər
 			
 			
 				dəqiqə
@@ -7147,13 +7494,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				permiriada
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
 			
 			
 				l/km
@@ -7235,6 +7575,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} əsr
 				{0} əsr
 			
+			
+				dek
+				{0} dek
+				{0} dek
+			
 			
 				il
 				{0} il
@@ -7344,23 +7689,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektronvolt
-				{0} eV
-				{0} eV
 			
 			
 				BTV
 				{0} Btv
 				{0} Btv
 			
+			
+				ABŞ tv
+				{0} ABŞ tv
+				{0} ABŞ tv
+			
 			
 				güc funtu
-				{0} lbf
-				{0} lbf
 			
 			
 				nyuton
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -7382,6 +7726,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				piksel
+				{0} px
+				{0} px
+			
+			
+				meqapiksel
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				kilometr
 				{0} km
@@ -7479,8 +7858,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				günəş radiusu
-				{0} R☉
-				{0} R☉
 			
 			
 				lx
@@ -7489,8 +7866,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				gün işığı
-				{0} L☉
-				{0} L☉
 			
 			
 				t
@@ -7553,18 +7928,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dalton
-				{0} Da
-				{0} Da
 			
 			
 				yer kütləsi
-				{0} M⊕
-				{0} M⊕
 			
 			
 				günəş kütləsi
-				{0} M☉
-				{0} M☉
 			
 			
 				GW
@@ -7596,11 +7965,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hektopaskal
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7626,15 +7990,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				Pa
+				{0} Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hektopaskal
+				{0} hPa
+				{0} hPa
 			
 			
 				kilometr/saat
@@ -7676,16 +8040,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -7816,11 +8170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} çyqş
 				{0} çyqş
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-			
 			
 				istiqamət
 				{0}E
@@ -8000,10 +8349,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -8012,6 +8357,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				kilometr/saat
 				{0} km/saat
@@ -8078,9 +8427,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, yaxud {1}
 			{0} yaxud {1}
 		
+		
+			{0}, yaxud {1}
+		
+		
+			{0}, yaxud {1}
+		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -8196,7 +8549,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Sağa Oxlar
 		İşarə/Standart Simvollar
 		Kiçik Forma Variantları
-		smayli
+		təbəssüm
 		Gülüş və Camaat
 		Cənubi Asiya Yazıları
 		Cənub-Şərqi Asiya Yazıları
diff --git a/make/data/cldr/common/main/az_Cyrl.xml b/make/data/cldr/common/main/az_Cyrl.xml
index a95842ea47e..f08c250d1dc 100644
--- a/make/data/cldr/common/main/az_Cyrl.xml
+++ b/make/data/cldr/common/main/az_Cyrl.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 			
 			
-			
+			
 			
 			
 			
@@ -473,7 +491,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 		
 		
@@ -486,11 +504,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Цэнтральная Амерыка
 			Усходняя Афрыка
 			Паўночная Афрыка
-			Цэнтральная Афрыка
+			Сярэдняя Афрыка
 			Паўднёвая Афрыка
 			Паўночная і Паўднёвая Амерыкі
 			Паўночнаамерыканскі рэгіён
-			Карыбскія астравы
+			Карыбскі рэгіён
 			Усходняя Азія
 			Паўднёвая Азія
 			Паўднёва-Усходняя Азія
@@ -561,7 +579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Камерун
 			Кітай
 			Калумбія
-			Востраў Кліпертон
+			Востраў Кліпертан
 			Коста-Рыка
 			Куба
 			Каба-Вердэ
@@ -577,7 +595,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Дамініка
 			Дамініканская Рэспубліка
 			Алжыр
-			Сеўта і Мелілья
+			Сеута і Мелілья
 			Эквадор
 			Эстонія
 			Егіпет
@@ -609,7 +627,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Гвадэлупа
 			Экватарыяльная Гвінея
 			Грэцыя
-			Паўднёвая Джорджыя і Паўднёвыя Сандвічавы астравы
+			Паўднёвая Георгія і Паўднёвыя Сандвічавы астравы
 			Гватэмала
 			Гуам
 			Гвінея-Бісау
@@ -711,7 +729,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Палау
 			Парагвай
 			Катар
-			Знешняя Акіянія
+			Аддаленыя тэрыторыі Акіяніі
 			Рэюньён
 			Румынія
 			Сербія
@@ -737,8 +755,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Сальвадор
 			Сінт-Мартэн
 			Сірыя
-			Свазіленд
-			Каралеўства Свазіленд
+			Эсватыні
+			Свазіленд
 			Трыстан-да-Кунья
 			Астравы Цёркс і Кайкас
 			Чад
@@ -760,8 +778,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Украіна
 			Уганда
 			Малыя Аддаленыя астравы ЗША
-			ААН
-			Злучаныя Штаты Амерыкі
+			Арганізацыя Аб’яднаных Нацый
+			Злучаныя Штаты
 			ЗША
 			Уругвай
 			Узбекістан
@@ -774,6 +792,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Уоліс і Футуна
 			Самоа
+			Псеўдаакцэнты
+			Псеўда-Bidi
 			Косава
 			Емен
 			Маёта
@@ -871,8 +891,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б в г д {дж} {дз} е ё ж з і й к л м н о п р с т у ў ф х ц ч ш ы ь э ю я]
 		[{а\u0301} {е\u0301} {ё\u0301} {і\u0301} {о\u0301} {у\u0301} {ы\u0301} {э\u0301} {ю\u0301} {я\u0301}]
 		[А Б В Г Д Е Ж З І Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Ы Э Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . « » ( ) \[ \] \{ \}]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ; \: ! ? . « » ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1000,10 +1020,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d MMM y G
 						h a
 						HH
-						h.mm a
-						HH.mm
-						h.mm.ss a
-						HH.mm.ss
+						h:mm a
+						HH:mm
+						h:mm:ss a
+						HH:mm:ss
 						L
 						d.M
 						E, d.M
@@ -1025,7 +1045,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
-						{0} - {1}
+						{0} – {1}
 						
 							h B – h B
 							h – h B
@@ -1038,6 +1058,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M.y GGGGG – M.y GGGGG
+							M.y – M.y GGGGG
+							M.y – M.y GGGGG
+						
+						
+							d.M.y – d.M.y GGGGG
+							d.M.y GGGGG – d.M.y GGGGG
+							d.M.y GGGGG – d.M.y GGGGG
+							d.M.y GGGGG – d.M.y GGGGG
+						
+						
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y GGGGG – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h–h a
 						
@@ -1081,41 +1139,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							LLL–LLL
 						
 						
-							d–d MMM
+							d – d MMM
 							d MMM – d MMM
 						
 						
-							E, d – E, d MMM
+							E, d MMM – E, d MMM
 							E, d MMM – E, d MMM
 						
 						
-							y–y G
+							y – y G
 						
 						
-							M.y – M.y G
-							M.y – M.y G
+							M.y – M.y GGGGG
+							M.y – M.y GGGGG
 						
 						
-							d.M.y – d.M.y G
-							d.M.y – d.M.y G
-							d.M.y – d.M.y G
+							d.M.y – d.M.y GGGGG
+							d.M.y – d.M.y GGGGG
+							d.M.y – d.M.y GGGGG
 						
 						
-							E, d.M.y – E, d.M.y G
-							E, d.M.y – E, d.M.y G
-							E, d.M.y – E, d.M.y G
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
 						
 						
 							LLL–LLL y G
 							LLL y – LLL y G
 						
 						
-							d–d MMM y G
+							d – d MMM y G
 							d MMM – d MMM y G
 							d MMM y – d MMM y G
 						
 						
-							E, d – E, d MMM y G
+							E, d MMM – E, d MMM y G
 							E, d MMM – E, d MMM y G
 							E, d MMM y – E, d MMM y G
 						
@@ -1376,7 +1434,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						да н.э.
+						да н.э.
 						н.э.
+						н.э.
 					
 				
 				
@@ -1677,6 +1737,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				г.
+				у мін. годзе
+				у гэтым годзе
+				у наст. годзе
 				
 					праз {0} г.
 					праз {0} г.
@@ -1692,6 +1755,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				г.
+				у мін. годзе
+				у гэтым годзе
+				у наст. годзе
 				
 					праз {0} г.
 					праз {0} г.
@@ -1773,6 +1839,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мес.
+				у мін. мес.
+				у гэтым мес.
+				у наст. мес.
 				
 					праз {0} мес.
 					праз {0} мес.
@@ -1788,6 +1857,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мес.
+				у мін. мес.
+				у гэтым мес.
+				у наст. мес.
 				
 					праз {0} мес.
 					праз {0} мес.
@@ -1822,6 +1894,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				тыд
+				на мін. тыд.
+				на гэтым тыд.
+				на наст. тыд.
 				
 					праз {0} тыд
 					праз {0} тыд
@@ -1838,6 +1913,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				тыд
+				на мін. тыд.
+				на гэтым тыд.
+				на наст. тыд.
 				
 					праз {0} тыд
 					праз {0} тыд
@@ -2453,7 +2531,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
-			+HH.mm;-HH.mm
+			+HH:mm;-HH:mm
 			GMT{0}
 			GMT
 			Час: {0}
@@ -2613,7 +2691,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Аруба
 			
 			
-				Марыехамн
+				Марыянхаміна
 			
 			
 				Баку
@@ -2745,7 +2823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Крэстан
 			
 			
-				Йелаўнайф
+				Елаўнайф
 			
 			
 				Эдмантан
@@ -2787,10 +2865,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ікалуіт
 			
 			
-				Пангніртунг
+				Пангніртанг
 			
 			
-				Манктан
+				Монктан
 			
 			
 				Галіфакс
@@ -2832,10 +2910,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Раратонга
 			
 			
-				Пасхі востраў
+				Вялікадня востраў
 			
 			
-				Пунта Арэнас
+				Пунта-Арэнас
 			
 			
 				Сант’яга
@@ -2919,7 +2997,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Канарскія астравы
 			
 			
-				Сеўта
+				Сеута
 			
 			
 				Мадрыд
@@ -2934,13 +3012,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Фіджы
 			
 			
-				Стэнлі
+				Порт-Стэнлі
 			
 			
-				Чуук
+				Трук
 			
 			
-				Понпеі
+				Панпеі
 			
 			
 				Кусаіе
@@ -2979,19 +3057,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Гібралтар
 			
 			
-				Каанаак
+				Туле
 			
 			
 				Нук
 			
 			
-				Ітакортаарміут
+				Ітакартаарміт
 			
 			
 				Данмарксхаўн
 			
 			
-				Банжул
+				Банджул
 			
 			
 				Конакры
@@ -3006,7 +3084,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Афіны
 			
 			
-				Паўднёвая Джорджыя
+				Паўднёвая Георгія
 			
 			
 				Гватэмала
@@ -3108,7 +3186,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Тарава
 			
 			
-				Камор
+				Каморскія астравы
 			
 			
 				Сент-Кітс
@@ -3137,8 +3215,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Актабэ
 			
+			
+				Кустанай
+			
 			
-				Кзыларда
+				Кзыл-Арда
 			
 			
 				Алматы
@@ -3468,7 +3549,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сахалін
 			
 			
-				Вусць-Нера
+				Усць-Нера
 			
 			
 				Магадан
@@ -3540,7 +3621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сальвадор
 			
 			
-				Лоўэр Прынсіз Квортэр
+				Лоўэр Прынсіз Квотэр
 			
 			
 				Дамаск
@@ -3573,7 +3654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Дылі
 			
 			
-				Ашгабад
+				Ашгабат
 			
 			
 				Туніс
@@ -4022,9 +4103,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Час вострава Пасхі
-					Стандартны час вострава Пасхі
-					Летні час вострава Пасхі
+					Час вострава Вялікадня
+					Стандартны час вострава Вялікадня
+					Летні час вострава Вялікадня
 				
 			
 			
@@ -4378,9 +4459,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Час Фернанду-ды-Наронья
-					Стандартны час Фернанду-ды-Наронья
-					Летні час Фернанду-ды-Наронья
+					Час Фернанду-дзі-Наронья
+					Стандартны час Фернанду-дзі-Наронья
+					Летні час Фернанду-дзі-Наронья
 				
 			
 			
@@ -4454,7 +4535,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Час вострава Понпеі
+					Час вострава Панпеі
 				
 			
 			
@@ -4469,7 +4550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Час станцыі Ратэра
+					Час станцыі Ротэра
 				
 			
 			
@@ -4503,7 +4584,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Час Паўднёвай Джорджыі
+					Час Паўднёвай Георгіі
 				
 			
 			
@@ -4547,7 +4628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Час Чуук
+					Час Трука
 				
 			
 			
@@ -4634,6 +4715,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		2
 		
 			,
@@ -4841,11 +4926,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			
-				дырхем ААЭ
-				дырхем ААЭ
-				дырхемы ААЭ
-				дырхемаў ААЭ
-				дырхема ААЭ
+				дырхам ААЭ
+				дырхам ААЭ
+				дырхамы ААЭ
+				дырхамаў ААЭ
+				дырхама ААЭ
+				AED
 			
 			
 				афганскі афгані
@@ -4853,6 +4939,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				афганскія афгані
 				афганскіх афгані
 				афганскага афгані
+				AFN
 			
 			
 				албанскі лек
@@ -4860,6 +4947,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				албанскія лекі
 				албанскіх лекаў
 				албанскага лека
+				ALL
 			
 			
 				армянскі драм
@@ -4867,6 +4955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				армянскія драмы
 				армянскіх драмаў
 				армянскага драма
+				AMD
 			
 			
 				нідэрландскі антыльскі гульдэн
@@ -4874,6 +4963,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нідэрландскія антыльскія гульдэны
 				нідэрландскіх антыльскіх гульдэнаў
 				нідэрландскага антыльскага гульдэна
+				ANG
 			
 			
 				ангольская кванза
@@ -4881,6 +4971,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ангольскія кванзы
 				ангольскіх кванз
 				ангольскай кванзы
+				AOA
+				Kz
 			
 			
 				аргенцінскае песа
@@ -4888,6 +4980,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				аргенцінскія песа
 				аргенцінскіх песа
 				аргенцінскага песа
+				ARS
+				$
 			
 			
 				аўстралійскі долар
@@ -4895,6 +4989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				аўстралійскія долары
 				аўстралійскіх долараў
 				аўстралійскага долара
+				A$
 				A$
 			
 			
@@ -4903,6 +4998,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				арубанскія фларыны
 				арубанскіх фларынаў
 				арубанскага фларына
+				AWG
 			
 			
 				азербайджанскі манат
@@ -4910,6 +5006,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				азербайджанскія манаты
 				азербайджанскіх манатаў
 				азербайджанскага маната
+				AZN
 			
 			
 				канверсоўная марка Босніі і Герцагавіны
@@ -4917,13 +5014,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				канверсоўныя маркі Босніі і Герцагавіны
 				канверсоўных марак Босніі і Герцагавіны
 				канверсоўнай маркі Босніі і Герцагавіны
+				BAM
+				KM
 			
 			
-				барбадоскі долар
-				барбадоскі долар
-				барбадоскія долары
-				барбадоскіх долараў
-				барбадоскага долара
+				барбадаскі долар
+				барбадаскі долар
+				барбадаскія долары
+				барбадаскіх долараў
+				барбадаскага долара
+				BBD
 				Bds$
 			
 			
@@ -4932,6 +5032,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бангладэшскія такі
 				бангладэшскіх так
 				бангладэшскай такі
+				BDT
+				৳
 			
 			
 				балгарскі леў
@@ -4939,6 +5041,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				балгарскія левы
 				балгарскіх леваў
 				балгарскага лева
+				BGN
 			
 			
 				бахрэйнскі дынар
@@ -4946,6 +5049,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бахрэйнскія дынары
 				бахрэйнскі дынараў
 				бахрэйнскага дынара
+				BHD
 			
 			
 				бурундзійскі франк
@@ -4953,6 +5057,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бурундзійскія франкі
 				бурундзійскіх франкаў
 				бурундзійскага франка
+				BIF
 			
 			
 				бермудскі долар
@@ -4960,6 +5065,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бермудскія долары
 				бермудскіх долараў
 				бермудскага долара
+				BMD
 				BD$
 			
 			
@@ -4968,6 +5074,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				брунейскія долары
 				брунейскіх долараў
 				брунейскага долара
+				BND
+				$
 			
 			
 				балівіяна
@@ -4975,6 +5083,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				балівіяна
 				балівіяна
 				балівіяна
+				BOB
+				Bs
 			
 			
 				бразільскі рэал
@@ -4983,6 +5093,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бразільскіх рэалаў
 				бразільскага рэала
 				BRL
+				R$
 			
 			
 				багамскі долар
@@ -4990,6 +5101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				багамскія долары
 				багамскіх долараў
 				багамскага долара
+				BSD
 				B$
 			
 			
@@ -4998,6 +5110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бутанскія нгултрумы
 				бутанскіх нгултрумаў
 				бутанскага нгултрума
+				BTN
 			
 			
 				батсванская пула
@@ -5005,6 +5118,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				батсванскія пулы
 				батсванскіх пул
 				батсванскай пулы
+				BWP
+				P
 			
 			
 				беларускі рубель
@@ -5029,6 +5144,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белізскія долары
 				белізскіх долараў
 				белізскага долара
+				BZD
 				BZ$
 			
 			
@@ -5046,6 +5162,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кангалезскія франкі
 				кангалезскіх франкаў
 				кангалезскага франка
+				CDF
 			
 			
 				швейцарскі франк
@@ -5053,6 +5170,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				швейцарскія франкі
 				швейцарскіх франкаў
 				швейцарскага франка
+				CHF
 			
 			
 				чылійскае песа
@@ -5060,6 +5178,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чылійскія песа
 				чылійскіх песа
 				чылійскага песа
+				CLP
+				$
 			
 			
 				афшорны кітайскі юань
@@ -5067,6 +5187,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				афшорныя кітайскія юані
 				афшорных кітайскіх юаняў
 				афшорнага кітайскага юаня
+				CNH
 			
 			
 				кітайскі юань
@@ -5074,6 +5195,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кітайскія юані
 				кітайскіх юаняў
 				кітайскага юаня
+				CN¥
+				¥
 			
 			
 				калумбійскае песа
@@ -5081,6 +5204,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				калумбійскія песа
 				калумбійскіх песа
 				калумбійскага песа
+				COP
+				$
 			
 			
 				коста-рыканскі калон
@@ -5088,6 +5213,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				коста-рыканскія калоны
 				коста-рыканскіх калонаў
 				коста-рыканскага калона
+				CRC
+				₡
 			
 			
 				кубінскае канверсоўнае песа
@@ -5095,6 +5222,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубінскія канверсоўныя песа
 				кубінскіх канверсоўных песа
 				кубінскага канверсоўнага песа
+				CUC
 				CUC$
 			
 			
@@ -5103,6 +5231,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубінскія песа
 				кубінскіх песа
 				кубінскага песа
+				CUP
 				$MN
 			
 			
@@ -5111,6 +5240,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				эскуда Каба-Вердэ
 				эскуда Каба-Вердэ
 				эскуда Каба-Вердэ
+				CVE
 			
 			
 				чэшская крона
@@ -5118,6 +5248,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чэшскія кроны
 				чэшскіх крон
 				чэшскай кроны
+				CZK
+				Kč
 			
 			
 				джыбуційскі франк
@@ -5125,6 +5257,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				джыбуційскія франкі
 				джыбуційскіх франкаў
 				джыбуційскага франка
+				DJF
 			
 			
 				дацкая крона
@@ -5132,6 +5265,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				дацкія кроны
 				дацкіх крон
 				дацкай кроны
+				DKK
+				kr
 			
 			
 				дамініканскае песа
@@ -5139,6 +5274,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				дамініканскія песа
 				дамініканскіх песа
 				дамініканскага песа
+				DOP
 				RD$
 			
 			
@@ -5147,6 +5283,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				алжырскія дынары
 				алжырскіх дынараў
 				алжырскага дынара
+				DZD
 			
 			
 				егіпецкі фунт
@@ -5154,6 +5291,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				егіпецкія фунты
 				егіпецкіх фунтаў
 				егіпецкага фунта
+				EGP
+				E£
 			
 			
 				эрытрэйская накфа
@@ -5161,6 +5300,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				эрытрэйскія накфы
 				эрытрэйскіх накфаў
 				эрытрэйскай накфы
+				ERN
 			
 			
 				эфіопскі быр
@@ -5168,6 +5308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				эфіопскія быры
 				эфіопскіх быраў
 				эфіопскага быра
+				ETB
 			
 			
 				еўра
@@ -5175,6 +5316,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				еўра
 				еўра
 				еўра
+				€
+				€
 			
 			
 				фіджыйскі долар
@@ -5182,6 +5325,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фіджыйскія долары
 				фіджыйскіх долараў
 				фіджыйскага долара
+				FJD
 				FJ$
 			
 			
@@ -5190,6 +5334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фунты Фалклендскіх астравоў
 				фунтаў Фалклендскіх астравоў
 				фунта Фалклендскіх астравоў
+				FKP
 				FK£
 			
 			
@@ -5198,6 +5343,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				брытанскія фунты стэрлінгаў
 				брытанскіх фунтаў стэрлінгаў
 				брытанскага фунта стэрлінгаў
+				£
+				£
 			
 			
 				грузінскі лары
@@ -5205,6 +5352,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				грузінскія лары
 				грузінскіх лары
 				грузінскага лары
+				GEL
+				₾
 				₾
 			
 			
@@ -5213,6 +5362,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ганскія седзі
 				ганскіх седзі
 				ганскага седзі
+				GHS
 			
 			
 				гібралтарскі фунт
@@ -5220,6 +5370,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гібралтарскія фунты
 				гібралтарскіх фунтаў
 				гібралтарскага фунта
+				GIP
+				£
 			
 			
 				гамбійскі даласі
@@ -5227,6 +5379,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гамбійскія даласі
 				гамбійскіх даласі
 				гамбійскага даласі
+				GMD
 			
 			
 				гвінейскі франк
@@ -5234,6 +5387,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гвінейскія франкі
 				гвінейскіх франкаў
 				гвінейскага франка
+				GNF
+				FG
 			
 			
 				гватэмальскі кетсаль
@@ -5241,6 +5396,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гватэмальскія кетсалі
 				гватэмальскіх кетсаляў
 				гватэмальскага кетсаля
+				GTQ
+				Q
 			
 			
 				гаянскі долар
@@ -5248,6 +5405,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гаянскія долары
 				гаянскіх долараў
 				гаянскага долара
+				GYD
 				G$
 			
 			
@@ -5256,6 +5414,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ганконгскія долары
 				ганконгскіх долараў
 				ганконгскага долара
+				HK$
+				$
 			
 			
 				гандураская лемпіра
@@ -5263,6 +5423,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гандураскія лемпіры
 				гандураскіх лемпір
 				гандураскай лемпіры
+				HNL
+				L
 			
 			
 				харвацкая куна
@@ -5270,6 +5432,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				харвацкія куны
 				харвацкіх кун
 				харвацкай куны
+				HRK
+				kn
 			
 			
 				гаіцянскі гурд
@@ -5277,6 +5441,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гаіцянскія гурды
 				гаіцянскіх гурдаў
 				гаіцянскага гурда
+				HTG
 			
 			
 				венгерскі форынт
@@ -5284,6 +5449,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венгерскія форынты
 				венгерскіх форынтаў
 				венгерскага форынта
+				HUF
+				Ft
 			
 			
 				інданезійская рупія
@@ -5291,6 +5458,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				інданезійскія рупіі
 				інданезійскіх рупій
 				інданезійскай рупіі
+				IDR
+				Rp
 			
 			
 				новы ізраільскі шэкель
@@ -5298,6 +5467,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				новыя ізраільскія шэкелі
 				новых ізраільскіх шэкеляў
 				новага ізраільскага шэкеля
+				₪
+				₪
 			
 			
 				індыйская рупія
@@ -5305,6 +5476,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				індыйскія рупіі
 				індыйскіх рупій
 				індыйскай рупіі
+				₹
+				₹
 			
 			
 				іракскі дынар
@@ -5312,13 +5485,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				іракскія дынары
 				іракскіх дынараў
 				іракскага дынара
+				IQD
 			
 			
-				іранскі рыал
-				іранскі рыал
-				іранскія рыалы
-				іранскіх рыалаў
-				іранскага рыала
+				іранскі рыял
+				іранскі рыял
+				іранскія рыялы
+				іранскіх рыялаў
+				іранскага рыяла
+				IRR
 			
 			
 				ісландская крона
@@ -5326,6 +5501,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ісландскія кроны
 				ісландскіх крон
 				ісландскай кроны
+				ISK
 				Íkr
 			
 			
@@ -5334,6 +5510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ямайскія долары
 				ямайскіх долараў
 				ямайскага долара
+				JMD
 				J$
 			
 			
@@ -5342,6 +5519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				іарданскія дынары
 				іарданскіх дынараў
 				іарданскага дынара
+				JOD
 			
 			
 				японская іена
@@ -5350,6 +5528,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				японскіх іен
 				японскай іены
 				¥
+				¥
 			
 			
 				кенійскі шылінг
@@ -5357,6 +5536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кенійскія шылінгі
 				кенійскіх шылінгаў
 				кенійскага шылінга
+				KES
 			
 			
 				кіргізскі сом
@@ -5364,13 +5544,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кіргізскія сомы
 				кіргізскіх сомаў
 				кіргізскага сома
+				KGS
 			
 			
-				камбаджыйскі рыэль
-				камбаджыйскі рыэль
-				камбаджыйскія рыэлі
-				камбаджыйскіх рыэляў
-				камбаджыйскага рыэля
+				камбаджыйскі рыель
+				камбаджыйскі рыель
+				камбаджыйскія рыелі
+				камбаджыйскіх рыеляў
+				камбаджыйскага рыеля
+				KHR
+				៛
 			
 			
 				каморскі франк
@@ -5378,6 +5561,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				каморскія франкі
 				каморскіх франкаў
 				каморскага франка
+				KMF
+				CF
 			
 			
 				паўночнакарэйская вона
@@ -5385,6 +5570,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				паўночнакарэйскія воны
 				паўночнакарэйскіх вон
 				паўночнакарэйскай воны
+				KPW
+				₩
 			
 			
 				паўднёвакарэйская вона
@@ -5392,6 +5579,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				паўднёвакарэйскія воны
 				паўднёвакарэйскіх вон
 				паўднёвакарэйскай воны
+				₩
+				₩
 			
 			
 				кувейцкі дынар
@@ -5399,6 +5588,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кувейцкія дынары
 				кувейцкіх дынараў
 				кувейцкага дынара
+				KWD
 			
 			
 				долар Кайманавых астравоў
@@ -5406,14 +5596,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долары Кайманавых астравоў
 				долараў Кайманавых астравоў
 				долара Кайманавых астравоў
+				KYD
 				CI$
 			
 			
-				казахстанскі тэнгэ
-				казахстанскі тэнгэ
-				казахстанскія тэнгэ
-				казахстанскіх тэнгэ
-				казахстанскага тэнгэ
+				казахстанскі тэнге
+				казахстанскі тэнге
+				казахстанскія тэнге
+				казахстанскіх тэнге
+				казахстанскага тэнге
+				KZT
+				₸
 			
 			
 				лаоскі кіп
@@ -5421,6 +5614,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				лаоскія кіпы
 				лаоскіх кіпаў
 				лаоскага кіпа
+				LAK
+				₭
 			
 			
 				ліванскі фунт
@@ -5428,6 +5623,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ліванскія фунты
 				ліванскіх фунтаў
 				ліванскага фунта
+				LBP
+				L£
 			
 			
 				шры-ланкійская рупія
@@ -5435,6 +5632,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шры-ланкійскія рупіі
 				шры-ланкійскіх рупій
 				шры-ланкійскай рупіі
+				LKR
+				Rs
 			
 			
 				ліберыйскі долар
@@ -5442,6 +5641,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ліберыйскія долары
 				ліберыйскіх долараў
 				ліберыйскага долара
+				LRD
 				L$
 			
 			
@@ -5450,6 +5650,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				лівійскія дынары
 				лівійскіх дынараў
 				лівійскага дынара
+				LYD
 			
 			
 				мараканскі дырхам
@@ -5457,6 +5658,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мараканскія дырхамы
 				мараканскіх дырхамаў
 				мараканскага дырхама
+				MAD
 			
 			
 				малдаўскі лей
@@ -5464,6 +5666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малдаўскія леі
 				малдаўскіх леяў
 				малдаўскага лея
+				MDL
 			
 			
 				малагасійскі арыяры
@@ -5471,6 +5674,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малагасійскія арыяры
 				малагасійскіх арыяры
 				малагасійскага арыяры
+				MGA
+				Ar
 			
 			
 				македонскі дэнар
@@ -5478,6 +5683,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				македонскія дэнары
 				македонскіх дэнараў
 				македонскага дэнара
+				MKD
 			
 			
 				м’янманскі к’ят
@@ -5485,6 +5691,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				м’янманскія к’яты
 				м’янманскіх к’ятаў
 				м’янманскага к’ята
+				MMK
+				K
 			
 			
 				мангольскі тугрык
@@ -5492,6 +5700,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мангольскія тугрыкі
 				мангольскіх тугрыкаў
 				мангольскага тугрыка
+				MNT
+				₮
 			
 			
 				патака Макаа
@@ -5499,6 +5709,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				патакі Макаа
 				патак Макаа
 				патакі Макаа
+				MOP
 			
 			
 				маўрытанская ўгія (1973–2017)
@@ -5506,13 +5717,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				маўрытанскія ўгіі (1973–2017)
 				маўрытанскіх угій (1973–2017)
 				маўрытанскай ўгіі (1973–2017)
+				MRO
 			
 			
-				маўрытанская ўгія
-				маўрытанская ўгія
-				маўрытанскія ўгіі
+				маўрытанская угія
+				маўрытанская угія
+				маўрытанскія угіі
 				маўрытанскіх угій
-				маўрытанскай ўгіі
+				маўрытанскай угіі
+				MRU
 			
 			
 				маўрыкійская рупія
@@ -5520,6 +5733,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				маўрыкійскія рупіі
 				маўрыкійскіх рупій
 				маўрыкійскай рупіі
+				MUR
+				Rs
 			
 			
 				мальдыўская руфія
@@ -5527,6 +5742,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мальдыўскія руфіі
 				мальдыўскіх руфій
 				мальдыўскай руфіі
+				MVR
 			
 			
 				малавійская квача
@@ -5534,6 +5750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малавійскія квачы
 				малавійскіх квач
 				малавійскай квачы
+				MWK
 			
 			
 				мексіканскае песа
@@ -5541,6 +5758,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мексіканскія песа
 				мексіканскіх песа
 				мексіканскага песа
+				MX$
 				MX$
 			
 			
@@ -5549,6 +5767,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малайзійскія рынгіты
 				малайзійскіх рынгітаў
 				малайзійскага рынгіта
+				MYR
+				RM
 			
 			
 				мазамбікскі метыкал
@@ -5556,6 +5776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мазамбікскія метыкалы
 				мазамбікскіх метыкалаў
 				мазамбікскага метыкала
+				MZN
 			
 			
 				намібійскі долар
@@ -5563,14 +5784,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				намібійскія долары
 				намібійскіх долараў
 				намібійскага долара
+				NAD
 				N$
 			
 			
-				нігерыйская найра
-				нігерыйская найра
-				нігерыйскія найры
-				нігерыйскіх найр
-				нігерыйскай найры
+				нігерыйская наіра
+				нігерыйская наіра
+				нігерыйскія наіры
+				нігерыйскіх наір
+				нігерыйскай наіры
+				NGN
+				₦
 			
 			
 				нікарагуанская кордаба
@@ -5578,6 +5802,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нікарагуанскія кордабы
 				нікарагуанскіх кордаб
 				нікарагуанскай кордабы
+				NIO
+				C$
 			
 			
 				нарвежская крона
@@ -5585,6 +5811,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нарвежскія кроны
 				нарвежскіх крон
 				нарвежскай кроны
+				NOK
+				kr
 			
 			
 				непальская рупія
@@ -5592,6 +5820,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				непальскія рупіі
 				непальскіх рупій
 				непальскай рупіі
+				NPR
+				Rs
 			
 			
 				новазеландскі долар
@@ -5603,11 +5833,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				NZ$
 			
 			
-				аманскі рыал
-				аманскі рыал
-				аманскія рыалы
-				аманскіх рыалаў
-				аманска рыала
+				аманскі рыял
+				аманскі рыял
+				аманскія рыялы
+				аманскіх рыялаў
+				аманскага рыяла
+				OMR
 			
 			
 				панамскае бальбоа
@@ -5615,6 +5846,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				панамскія бальбоа
 				панамскіх бальбоа
 				панамскага бальбоа
+				PAB
 			
 			
 				перуанскі соль
@@ -5622,13 +5854,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				перуанскія солі
 				перуанскіх соляў
 				перуанскага соля
+				PEN
 			
 			
-				кіна
-				кіна
-				кіна
-				кіна
-				кіна
+				кіна Папуа-Новай Гвінеі
+				кіна Папуа-Новай Гвінеі
+				кіны Папуа-Новай Гвінеі
+				кін Папуа-Новай Гвінеі
+				кіны Папуа-Новай Гвінеі
+				PGK
 			
 			
 				філіпінскае песа
@@ -5636,6 +5870,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				філіпінскія песа
 				філіпінскіх песа
 				філіпінскага песа
+				PHP
+				₱
 			
 			
 				пакістанская рупія
@@ -5643,6 +5879,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				пакістанскія рупіі
 				пакістанскіх рупій
 				пакістанскай рупіі
+				PKR
+				Rs
 			
 			
 				польскі злоты
@@ -5650,6 +5888,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				польскія злотыя
 				польскіх злотых
 				польскага злотага
+				PLN
+				zł
 			
 			
 				парагвайскі гуарані
@@ -5657,13 +5897,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				парагвайскія гуарані
 				парагвайскіх гуарані
 				парагвайскага гуарані
+				PYG
+				₲
 			
 			
-				катарскі рыал
-				катарскі рыал
-				катарскія рыалы
-				катарскіх рыалаў
-				катарскага рыала
+				катарскі рыял
+				катарскі рыял
+				катарскія рыялы
+				катарскіх рыялаў
+				катарскага рыяла
+				QAR
 			
 			
 				румынскі лей
@@ -5671,6 +5914,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				румынскія леі
 				румынскіх леяў
 				румынскага лея
+				RON
+				lei
 			
 			
 				сербскі дынар
@@ -5678,6 +5923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сербскія дынары
 				сербскіх дынараў
 				сербскага дынара
+				RSD
 			
 			
 				расійскі рубель
@@ -5694,6 +5940,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				руандыйскія франкі
 				руандыйскіх франкаў
 				руандыйскага франка
+				RWF
+				RF
 			
 			
 				саудаўскі рыял
@@ -5701,6 +5949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				саудаўскія рыялы
 				саудаўскіх рыялаў
 				саудаўскага рыяла
+				SAR
 			
 			
 				долар Саламонавых астравоў
@@ -5708,6 +5957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долар Саламонавых астравоў
 				долараў Саламонавых астравоў
 				долара Саламонавых астравоў
+				SBD
 				SI$
 			
 			
@@ -5716,6 +5966,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сейшэльскія рупіі
 				сейшэльскіх рупій
 				сейшэльскай рупіі
+				SCR
 			
 			
 				суданскі фунт
@@ -5723,6 +5974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				суданскія фунты
 				суданскіх фунтаў
 				суданскага фунта
+				SDG
 			
 			
 				шведская крона
@@ -5730,6 +5982,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шведскія кроны
 				шведскіх крон
 				шведскай кроны
+				SEK
+				kr
 			
 			
 				сінгапурскі долар
@@ -5737,21 +5991,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сінгапурскія долары
 				сінгапурскіх долараў
 				сінгапурскага долара
+				SGD
 				S$
 			
 			
-				фунт Святой Алены
-				фунт Святой Алены
-				фунты Святой Алены
-				фунтаў Святой Алены
-				фунта Святой Алены
+				фунт в-ва Святой Алены
+				фунт в-ва Святой Алены
+				фунты в-ва Святой Алены
+				фунтаў в-ва Святой Алены
+				фунта в-ва Святой Алены
+				SHP
+				£
 			
 			
-				леонэ
-				леонэ
-				леонэ
-				леонэ
-				леонэ
+				сьера-леонскі леонэ
+				сьера-леонскі леонэ
+				сьера-леонскія леонэ
+				сьера-леонскіх леонэ
+				сьера-леонскага леонэ
+				SLL
 			
 			
 				самалійскі шылінг
@@ -5759,6 +6017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				самалійскія шылінгі
 				самалійскіх шылінгаў
 				самалійскага шылінга
+				SOS
 			
 			
 				сурынамскі долар
@@ -5766,6 +6025,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сурынамскія долары
 				сурынамскіх долараў
 				сурынамскага долара
+				SRD
+				$
 			
 			
 				паўднёвасуданскі фунт
@@ -5773,6 +6034,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				паўднёвасуданскія фунты
 				паўднёвасуданскіх фунтаў
 				паўднёвасуданскага фунта
+				SSP
+				£
 			
 			
 				добра Сан-Тамэ і Прынсіпі (1977–2017)
@@ -5780,6 +6043,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				добры Сан-Тамэ і Прынсіпі (1977–2017)
 				добраў Сан-Тамэ і Прынсіпі (1977–2017)
 				добры Сан-Тамэ і Прынсіпі (1977–2017)
+				STD
 			
 			
 				добра Сан-Тамэ і Прынсіпі
@@ -5787,6 +6051,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				добры Сан-Тамэ і Прынсіпі
 				добраў Сан-Тамэ і Прынсіпі
 				добры Сан-Тамэ і Прынсіпі
+				STN
 				Db
 			
 			
@@ -5795,6 +6060,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сірыйскія фунты
 				сірыйскіх фунтаў
 				сірыйскага фунта
+				SYP
+				£
 			
 			
 				свазілендскі лілангені
@@ -5802,6 +6069,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				свазілендскія лілангені
 				свазілендскіх лілангені
 				свазілендскага лілангені
+				SZL
 			
 			
 				тайскі бат
@@ -5809,6 +6077,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				тайскія баты
 				тайскіх батаў
 				тайскага бата
+				THB
+				฿
 			
 			
 				таджыкскі самані
@@ -5816,6 +6086,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				таджыкскія самані
 				таджыкскіх самані
 				таджыкскага самані
+				TJS
 			
 			
 				туркменскі манат
@@ -5823,6 +6094,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				туркменскія манаты
 				туркменскіх манатаў
 				туркменскага маната
+				TMT
 			
 			
 				туніскі дынар
@@ -5830,6 +6102,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				туніскія дынары
 				туніскіх дынараў
 				туніскага дынара
+				TND
 			
 			
 				танганская паанга
@@ -5837,6 +6110,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				танганскія паангі
 				танганскіх паанг
 				танганскай паангі
+				TOP
+				T$
 			
 			
 				турэцкая ліра
@@ -5844,6 +6119,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				турэцкія ліры
 				турэцкіх лір
 				турэцкай ліры
+				TRY
+				₺
+				TL
 			
 			
 				долар Трынідада і Табага
@@ -5851,6 +6129,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долары Трынідада і Табага
 				долараў Трынідада і Табага
 				долара Трынідада і Табага
+				TTD
 				TT$
 			
 			
@@ -5859,6 +6138,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				новыя тайваньскія долары
 				новых тайваньскіх долараў
 				новага тайваньскага долара
+				NT$
+				$
 			
 			
 				танзанійскі шылінг
@@ -5866,6 +6147,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				танзанійскія шылінгі
 				танзанійскіх шылінгаў
 				танзанійскага шылінга
+				TZS
 			
 			
 				украінская грыўня
@@ -5873,6 +6155,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				украінскія грыўні
 				украінскіх грыўняў
 				украінскай грыўні
+				UAH
+				₴
 			
 			
 				угандыйскі шылінг
@@ -5880,6 +6164,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				угандыйскія шылінгі
 				угандыйскіх шылінгаў
 				угандыйскага шылінга
+				UGX
 			
 			
 				долар ЗША
@@ -5888,6 +6173,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долараў ЗША
 				долара ЗША
 				$
+				$
 			
 			
 				уругвайскае песа
@@ -5895,6 +6181,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				уругвайскія песа
 				уругвайскіх песа
 				уругвайскага песа
+				UYU
 				$U
 			
 			
@@ -5903,6 +6190,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				узбекскія сумы
 				узбекскіх сумаў
 				узбекскага сума
+				UZS
 			
 			
 				венесуальскі балівар (2008–2018)
@@ -5910,13 +6198,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венесуальскія балівары (2008–2018)
 				венесуальскіх балівараў (2008–2018)
 				венесуальскага балівара (2008–2018)
+				VEF
+				Bs
 			
 			
-				венесуальскі балівар
-				венесуальскі балівар
-				венесуальскія балівары
-				венесуальскіх балівараў
-				венесуальскага балівара
+				венесуэльскі балівар
+				венесуэльскі балівар
+				венесуэльскія балівары
+				венесуэльскіх балівараў
+				венесуэльскага балівара
+				VES
 			
 			
 				в’етнамскі донг
@@ -5924,13 +6215,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				в’етнамскія донгі
 				в’етнамскіх донгаў
 				в’етнамскага донга
+				₫
+				₫
 			
 			
-				вату
-				вату
-				вату
-				вату
-				вату
+				вануацкі вату
+				вануацкі вату
+				вануацкія вату
+				вануацкіх вату
+				вануацкага вату
+				VUV
 			
 			
 				самаанская тала
@@ -5938,6 +6232,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				самаанскія талы
 				самаанскіх тал
 				самаанскай талы
+				WST
 			
 			
 				цэнтральнаафрыканскі франк КФА
@@ -5945,6 +6240,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				цэнтральнаафрыканскія франкі КФА
 				цэнтральнаафрыканскіх франкаў КФА
 				цэнтральнаафрыканскага франка КФА
+				FCFA
 			
 			
 				усходнекарыбскі долар
@@ -5952,6 +6248,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				усходнекарыбскія долары
 				усходнекарыбскіх долараў
 				усходнекарыбскага долара
+				EC$
 				EC$
 			
 			
@@ -5960,6 +6257,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				заходнеафрыканскія франкі КФА
 				заходнеафрыканскіх франкаў КФА
 				заходнеафрыканскага франка КФА
+				CFA
 			
 			
 				французскі ціхаакіянскі франк
@@ -5967,6 +6265,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				французскія ціхаакіянскія франкі
 				французскіх ціхаакіянскіх франкаў
 				французскага ціхаакіянскага франка
+				CFPF
 			
 			
 				невядомая валюта
@@ -5977,17 +6276,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				еменскі рыал
-				еменскі рыал
-				еменскія рыалы
-				еменскіх рыалаў
-				еменскага рыала
+				еменскі рыял
+				еменскія рыялы
+				еменскіх рыялаў
+				еменскага рыяла
+				YER
 			
 			
-				паўднёваафрыканскі ранд
-				паўднёваафрыканскі ранд
-				паўднёваафрыканскія ранды
-				паўднёваафрыканскіх рандаў
-				паўднёваафрыканскага ранда
+				паўднёваафрыканскі рэнд
+				паўднёваафрыканскі рэнд
+				паўднёваафрыканскія рэнды
+				паўднёваафрыканскіх рэндаў
+				паўднёваафрыканскага рэнда
+				ZAR
+				R
 			
 			
 				замбійская квача
@@ -5995,6 +6297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				замбійскія квачы
 				замбійскіх квач
 				замбійскай квачы
+				ZMW
+				ZK
 			
 		
 		
@@ -6018,7 +6322,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/{1}
 			
 			
-				перагрузка
+				паскарэнне свабоднага падзення
 				{0} g
 				{0} g
 				{0} g
@@ -6033,23 +6337,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				абарот
-				{0} аб
-				{0} аб
-				{0} аб
-				{0} аб
+				{0} абарот
+				{0} абароты
+				{0} абаротаў
+				{0} абарота
 			
 			
 				радыяны
-				{0} рад
-				{0} рад
-				{0} рад
-				{0} рад
+				{0} радыян
+				{0} радыяны
+				{0} радыянаў
+				{0} радыяна
 			
 			
 				градусы
-				{0}°
-				{0}°
-				{0}°
+				{0} градус
+				{0} градусы
+				{0} градусаў
 				{0} градуса
 			
 			
@@ -6142,25 +6446,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} дунама
 			
 			
-				караты золата
-				{0} кар зол
-				{0} кар зол
-				{0} кар зол
-				{0} кар зол
+				караты
+				{0} карат
+				{0} караты
+				{0} карат
+				{0} карата
 			
 			
 				міліграм на дэцылітр
-				{0} мг на дл
-				{0} мг на дл
-				{0} мг на дл
-				{0} мг на дл
+				{0} міліграм на дэцылітр
+				{0} міліграмы на дэцылітр
+				{0} міліграм на дэцылітр
+				{0} міліграма на дэцылітр
 			
 			
-				мілімоляў на літр
-				{0} ммоль/л
-				{0} ммоль/л
-				{0} ммоль/л
-				{0} ммоль/л
+				мілімолі на літр
+				{0} мілімоль на літр
+				{0} мілімолі на літр
+				{0} мілімоляў на літр
+				{0} мілімоля на літр
 			
 			
 				частак на мільён
@@ -6172,16 +6476,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				працэнтаў
 				{0} працэнт
-				{0}%
-				{0}%
-				{0}%
+				{0} працэнты
+				{0} працэнтаў
+				{0} працэнта
 			
 			
 				праміле
-				{0}‰
-				{0}‰
-				{0}‰
-				{0}‰
+				{0} праміле
+				{0} праміле
+				{0} праміле
+				{0} праміле
 			
 			
 				базісныя пункты
@@ -6199,94 +6503,94 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				літры на кіламетр
-				{0} л/км
-				{0} л/км
-				{0} л/км
-				{0} л/км
+				{0} літр на кіламетр
+				{0} літры на кіламетр
+				{0} літраў на кіламетр
+				{0} літра на кіламетр
 			
 			
 				літры на 100 кіламетраў
-				{0} л/100 км
-				{0} л/100 км
-				{0} л/100 км
-				{0} л/100 км
+				{0} літр на 100 кіламетраў
+				{0} літры на 100 кіламетраў
+				{0} літраў на 100 кіламетраў
+				{0} літра на 100 кіламетраў
 			
 			
 				мілі на галон
-				{0} міля/гал.
-				{0} мілі/гал.
-				{0} міль/гал.
-				{0} мілі/гал.
+				{0} міля на галон
+				{0} мілі на галон
+				{0} міль на галон
+				{0} мілі на галон
 			
 			
 				міль на імп. галон
 				{0} міля на імп. галон
 				{0} мілі на імп. галон
-				{0} міль/імп. галон
+				{0} міль на імп. галон
 				{0} мілі на імп. галон
 			
 			
 				петабайты
-				{0} ПБ
-				{0} ПБ
-				{0} ПБ
-				{0} ПБ
+				{0} петабайт
+				{0} петабайты
+				{0} петабайт
+				{0} петабайта
 			
 			
 				тэрабайты
-				{0} ТБ
-				{0} ТБ
-				{0} ТБ
-				{0} ТБ
+				{0} тэрабайт
+				{0} тэрабайты
+				{0} тэрабайт
+				{0} тэрабайта
 			
 			
 				тэрабіты
-				{0} Тбіт
-				{0} Тбіт
-				{0} Тбіт
-				{0} Тбіт
+				{0} тэрабіт
+				{0} тэрабіты
+				{0} тэрабіт
+				{0} тэрабіта
 			
 			
 				гігабайты
-				{0} ГБ
-				{0} ГБ
-				{0} ГБ
-				{0} ГБ
+				{0} гігабайт
+				{0} гігабайты
+				{0} гігабайт
+				{0} гігабайта
 			
 			
 				гігабіты
-				{0} Гбіт
-				{0} Гбіт
-				{0} Гбіт
-				{0} Гбіт
+				{0} гігабіт
+				{0} гігабіты
+				{0} гігабіт
+				{0} гігабіта
 			
 			
 				мегабайты
-				{0} МБ
-				{0} МБ
-				{0} МБ
-				{0} МБ
+				{0} мегабайт
+				{0} мегабайты
+				{0} мегабайт
+				{0} мегабайта
 			
 			
 				мегабіты
-				{0} Мбіт
-				{0} Мбіт
-				{0} Мбіт
-				{0} Мбіт
+				{0} мегабіт
+				{0} мегабіты
+				{0} мегабіт
+				{0} мегабіта
 			
 			
 				кілабайты
-				{0} КБ
-				{0} КБ
-				{0} КБ
-				{0} КБ
+				{0} кілабайт
+				{0} кілабайты
+				{0} кілабайт
+				{0} кілабайта
 			
 			
 				кілабіты
-				{0} кбіт
-				{0} кбіт
-				{0} кбіт
-				{0} кбіт
+				{0} кілабіт
+				{0} кілабіты
+				{0} кілабіт
+				{0} кілабіта
 			
 			
 				байты
@@ -6309,6 +6613,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} стагоддзяў
 				{0} стагоддзя
 			
+			
+				дзесяцігоддзі
+				{0} дзесяцігоддзе
+				{0} дзесяцігоддзі
+				{0} дзесяцігоддзяў
+				{0} дзесяцігоддзя
+			
 			
 				гады
 				{0} год
@@ -6388,17 +6699,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				амперы
-				{0} A
-				{0} A
-				{0} A
+				{0} ампер
+				{0} амперы
+				{0} ампер
 				{0} ампера
 			
 			
 				міліамперы
-				{0} мА
-				{0} мА
-				{0} мА
-				{0} мА
+				{0} міліампер
+				{0} міліамперы
+				{0} міліампер
+				{0} міліампера
 			
 			
 				омы
@@ -6409,52 +6720,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				вольты
-				{0} В
-				{0} В
-				{0} В
-				{0} В
+				{0} вольт
+				{0} вольты
+				{0} вольт
+				{0} вольта
 			
 			
 				кілакалорыі
-				{0} ккал
-				{0} ккал
-				{0} ккал
-				{0} ккал
+				{0} кілакалорыя
+				{0} кілакалорыі
+				{0} кілакалорый
+				{0} кілакалорыі
 			
 			
 				калорыі
-				{0} кал
-				{0} кал
-				{0} кал
+				{0} калорыя
+				{0} калорыі
+				{0} калорый
 				{0} калорыі
 			
 			
 				калорыі
-				{0} кал
-				{0} кал
-				{0} кал
-				{0} кал
+				{0} калорыя
+				{0} калорыі
+				{0} калорый
+				{0} калорыі
 			
 			
 				кіладжоўлі
-				{0} кДж
-				{0} кДж
-				{0} кДж
-				{0} кДж
+				{0} кіладжоўль
+				{0} кіладжоўлі
+				{0} кіладжоўляў
+				{0} кіладжоўля
 			
 			
 				джоўлі
-				{0} Дж
-				{0} Дж
-				{0} Дж
-				{0} Дж
+				{0} джоўль
+				{0} джоўлі
+				{0} джоўляў
+				{0} джоўля
 			
 			
 				кілават-гадзіны
-				{0} кВт·г
-				{0} кВт·г
-				{0} кВт·г
-				{0} кВт·г
+				{0} кілават-гадзіна
+				{0} кілават-гадзіны
+				{0} кілават-гадзін
+				{0} кілават-гадзіны
 			
 			
 				электрон-вольты
@@ -6470,6 +6781,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} брытанскіх цеплавых адзінак
 				{0} брытанскай цеплавой адзінкі
 			
+			
+				амерыканскія тэрмы
+				{0} амерыканскі тэрм
+				{0} амерыканскія тэрмы
+				{0} амерыканскіх тэрмаў
+				{0} амерыканскага тэрма
+			
 			
 				фунт-сілы
 				{0} фунт-сіла
@@ -6486,31 +6804,80 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				гігагерцы
-				{0} ГГц
-				{0} ГГц
-				{0} ГГц
-				{0} ГГц
+				{0} гігагерц
+				{0} гігагерцы
+				{0} гігагерц
+				{0} гігагерца
 			
 			
 				мегагерцы
-				{0} МГц
-				{0} МГц
-				{0} МГц
-				{0} МГц
+				{0} мегагерц
+				{0} мегагерцы
+				{0} мегагерц
+				{0} мегагерца
 			
 			
 				кілагерцы
-				{0} кГц
-				{0} кГц
-				{0} кГц
-				{0} кГц
+				{0} кілагерц
+				{0} кілагерцы
+				{0} кілагерц
+				{0} кілагерца
 			
 			
 				герцы
-				{0} Гц
-				{0} Гц
-				{0} Гц
-				{0} Гц
+				{0} герц
+				{0} герцы
+				{0} герца
+				{0} герцы
+			
+			
+				эм
+				{0} эм
+				{0} эм
+				{0} эм
+				{0} эм
+			
+			
+				пікселі
+				{0} піксель
+				{0} пікселі
+				{0} пікселяў
+				{0} пікселя
+			
+			
+				мегапікселі
+				{0} мегапіксель
+				{0} мегапіксель
+				{0} мегапіксель
+				{0} мегапікселя
+			
+			
+				пікселі на сантыметр
+				{0} піксель на сантыметр
+				{0} пікселі на сантыметр
+				{0} пікселяў на сантыметр
+				{0} пікселя на сантыметр
+			
+			
+				пікселі на цалю
+				{0} піксель на цалю
+				{0} пікселі на цалю
+				{0} пікселяў на цалю
+				{0} пікселя на цалю
+			
+			
+				кропкі на сантыметр
+				{0} кропка на сантыметр
+				{0} кропкі на сантыметр
+				{0} кропак на сантыметр
+				{0} кропкі на сантыметр
+			
+			
+				кропкі на цалю
+				{0} кропка на цалю
+				{0} кропкі на цалю
+				{0} кропак на цалю
+				{0} кропкі на цалю
 			
 			
 				кіламетры
@@ -6665,11 +7032,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} сонечнай свяцільнасці
 			
 			
-				метрычныя тоны
-				{0} метрычная тона
-				{0} метрычныя тоны
-				{0} метрычных тон
-				{0} метрычнай тоны
+				тоны
+				{0} тона
+				{0} тоны
+				{0} тон
+				{0} тоны
 			
 			
 				кілаграмы
@@ -6702,11 +7069,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мкг
 			
 			
-				тоны
-				{0} тона
-				{0} тоны
-				{0} тон
-				{0} тоны
+				амерыканскія тоны
+				{0} амерыканская тона
+				{0} амерыканскія тоны
+				{0} амерыканскіх тон
+				{0} амерыканскай тоны
 			
 			
 				фунты
@@ -6761,101 +7128,115 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				гігаваты
-				{0} ГВт
-				{0} ГВт
-				{0} ГВт
-				{0} ГВт
+				{0} гігават
+				{0} гігаваты
+				{0} гігават
+				{0} гігавата
 			
 			
 				мегаваты
-				{0} МВт
-				{0} МВт
-				{0} МВт
-				{0} МВт
+				{0} мегават
+				{0} мегаваты
+				{0} мегават
+				{0} мегавата
 			
 			
 				кілаваты
-				{0} кВт
-				{0} кВт
-				{0} кВт
-				{0} кВт
+				{0} кілават
+				{0} кілаваты
+				{0} кілават
+				{0} кілаватаў
 			
 			
 				ваты
-				{0} Вт
-				{0} Вт
-				{0} Вт
-				{0} Вт
+				{0} ват
+				{0} ваты
+				{0} ват
+				{0} вата
 			
 			
 				міліваты
-				{0} мВт
-				{0} мВт
-				{0} мВт
-				{0} мВт
+				{0} міліват
+				{0} міліваты
+				{0} міліват
+				{0} мілівата
 			
 			
 				конская сіла
-				{0} к. с.
-				{0} к. с.
-				{0} к. с.
-				{0} к. с.
-			
-			
-				гектапаскалі
-				{0} гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
+				{0} конская сіла
+				{0} конскія сілы
+				{0} конскіх сіл
+				{0} конскай сілы
 			
 			
 				міліметры ртутнага слупа
-				{0} мм рт. сл.
-				{0} мм рт. сл.
-				{0} мм рт. сл.
-				{0} мм рт. сл.
+				{0} міліметр ртутнага слупа
+				{0} міліметры ртутнага слупа
+				{0} міліметраў ртутнага слупа
+				{0} міліметра ртутнага слупа
 			
 			
 				фунты на квадратную цалю
-				{0} фунт на кв. цалю
-				{0} фунты на кв. цалю
-				{0} фунтаў на кв. цалю
-				{0} фунта на кв. цалю
+				{0} фунт на квадратную цалю
+				{0} фунты на квадратную цалю
+				{0} фунтаў на квадратную цалю
+				{0} фунта на квадратную цалю
 			
 			
 				цалі ртутнага слупа
-				{0} цаля рт. сл.
-				{0} цалі рт. сл.
-				{0} цаляў рт. сл.
-				{0} цалі рт. сл.
+				{0} цаля ртутнага слупа
+				{0} цалі ртутнага слупа
+				{0} цаляў ртутнага слупа
+				{0} цалі ртутнага слупа
+			
+			
+				бары
+				{0} бар
+				{0} бары
+				{0} бар
+				{0} бара
 			
 			
 				мілібары
-				{0} мбар
-				{0} мбар
-				{0} мбар
-				{0} мбар
+				{0} мілібар
+				{0} мілібары
+				{0} мілібар
+				{0} мілібара
 			
 			
 				атмасферы
-				{0} атм
+				{0} атмасфера
 				{0} атм
-				{0} атм
-				{0} атм
+				{0} атмасфер
+				{0} атмасферы
+			
+			
+				паскалі
+				{0} паскаль
+				{0} паскалі
+				{0} паскаляў
+				{0} паскаля
+			
+			
+				гектапаскалі
+				{0} гектапаскаль
+				{0} гектапаскалі
+				{0} гектапаскаляў
+				{0} гектапаскаля
 			
 			
 				кілапаскалі
-				{0} кПа
-				{0} кПа
-				{0} кПа
-				{0} кПа
+				{0} кілапаскаль
+				{0} кілапаскалі
+				{0} кілапаскаляў
+				{0} кілапаскаля
 			
 			
 				мегапаскалі
-				{0} МПа
-				{0} МПа
-				{0} МПа
-				{0} МПа
+				{0} мегапаскаль
+				{0} мегапаскалі
+				{0} мегапаскаляў
+				{0} мегапаскаля
 			
 			
 				кіламетры за гадзіну
@@ -6887,38 +7268,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°
-				{0}°
-				{0}°
-				{0}°
-				{0}°
+				{0} °
+				{0} °
+				{0} °
+				{0} °
 			
 			
 				градусы Цэльсія
-				{0} °C
-				{0} °C
-				{0} °C
-				{0} °C
+				{0} градус Цэльсія
+				{0} градусы Цэльсія
+				{0} градусаў Цэльсія
+				{0} градуса Цэльсія
 			
 			
 				градусы Фарэнгейта
-				{0} °F
-				{0} °F
-				{0} °F
-				{0} °F
+				{0} градус Фарэнгейта
+				{0} градусы Фарэнгейта
+				{0} градусаў Фарэнгейта
+				{0} градуса Фарэнгейта
 			
 			
 				кельвіны
 				{0} К
-				{0} К
-				{0} К
-				{0} К
+				{0} кельвіны
+				{0} кельвінаў
+				{0} кельвіна
 			
 			
-				фунтафуты
-				{0} фунтафут
-				{0} фунтафуты
-				{0} фунтафутаў
-				{0} фунтафута
+				фунт-футы
+				{0} фунт-фут
+				{0} фунт-футы
+				{0} фунт-футаў
+				{0} фунт-фута
 			
 			
 				ньютан-метры
@@ -7116,18 +7497,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				кірунак свету
-				{0} У
-				{0} Пн
-				{0} Пд
-				{0} З
+				{0} усходняй даўгаты
+				{0} паўночнай шыраты
+				{0} паўднёвай шыраты
+				{0} заходняй даўгаты
 			
 		
 		
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
-				перагрузка
+				g
 				{0} g
 				{0} g
 				{0} g
@@ -7252,17 +7636,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				кар золата
-				{0} кар зол
-				{0} кар зол
-				{0} кар зол
-				{0} кар зол
+				{0} кар
+				{0} кар
+				{0} кар
+				{0} кар
 			
 			
-				мг на дл
-				{0} мг на дл
-				{0} мг на дл
-				{0} мг на дл
-				{0} мг на дл
+				мг/дл
+				{0} мг/дл
+				{0} мг/дл
+				{0} мг/дл
+				{0} мг/дл
 			
 			
 				ммоль/л
@@ -7280,24 +7664,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				%
-				{0}%
-				{0}%
-				{0}%
-				{0}%
+				{0} %
+				{0} %
+				{0} %
+				{0} %
 			
 			
 				праміле
-				{0}‰
-				{0}‰
-				{0}‰
-				{0}‰
+				{0} ‰
+				{0} ‰
+				{0} ‰
+				{0} ‰
 			
 			
 				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
+				{0} ‱
+				{0} ‱
+				{0} ‱
+				{0} ‱
 			
 			
 				моль
@@ -7418,6 +7802,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ст.
 				{0} ст.
 			
+			
+				дзесяцігоддзе
+				{0} дзесяцігоддзе
+				{0} дзесяцігоддзі
+				{0} дзесяцігоддзяў
+				{0} дзесяцігоддзя
+			
 			
 				г.
 				{0} г.
@@ -7579,12 +7970,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} BTU
 				{0} BTU
 			
+			
+				амер. тэрмы
+				{0} амер. тэрм
+				{0} амер. тэрмы
+				{0} амер. тэрмаў
+				{0} амер. тэрма
+			
 			
-				lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
+				фунт-сілы
+				{0} фунт-сіла
+				{0} фунт-сілы
+				{0} lbf
+				{0} lbf
 			
 			
 				Н
@@ -7621,6 +8019,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Гц
 				{0} Гц
 			
+			
+				эм
+				{0} эм
+				{0} эм
+				{0} эм
+				{0} эм
+			
+			
+				пікселі
+				{0} піксель
+				{0} пікселі
+				{0} пікселяў
+				{0} пікселя
+			
+			
+				Мпікс
+				{0} Мпікс
+				{0} Мпікс
+				{0} Мпікс
+				{0} Мпікс
+			
+			
+				піксель/см
+				{0} піксель/см
+				{0} пікселі/см
+				{0} пікселяў/см
+				{0} пікселя/см
+			
+			
+				піксель/цалю
+				{0} піксель/цалю
+				{0} пікселі/цалю
+				{0} пікселяў/цалю
+				{0} пікселя/цалю
+			
+			
+				кр/см
+				{0} кр/см
+				{0} кр/см
+				{0} кр/см
+				{0} кр/см
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				км
 				{0} км
@@ -7754,10 +8201,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
+				{0} R☉
+				{0} R☉
+				{0} R☉
+				{0} R☉
 			
 			
 				лк
@@ -7768,17 +8215,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
+				{0} L☉
+				{0} L☉
+				{0} L☉
+				{0} L☉
 			
 			
 				т
-				{0} мет. тона
-				{0} мет. тоны
-				{0} мет. тон
-				{0} мет. тоны
+				{0} т
+				{0} т
+				{0} т
+				{0} т
 			
 			
 				кг
@@ -7811,11 +8258,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мкг
 			
 			
-				тоны
-				{0} тона
-				{0} тоны
-				{0} тон
-				{0} тоны
+				амер. т
+				{0} амер. т
+				{0} амер. т
+				{0} амер. т
+				{0} амер. т
 			
 			
 				фунты
@@ -7856,17 +8303,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
+				{0} M⊕
+				{0} M⊕
+				{0} M⊕
+				{0} M⊕
 			
 			
 				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
+				{0} M☉
+				{0} M☉
+				{0} M☉
+				{0} M☉
 			
 			
 				ГВт
@@ -7910,13 +8357,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к. с.
 				{0} к. с.
 			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-			
 			
 				мм рт. сл.
 				{0} мм рт. сл.
@@ -7938,6 +8378,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} цаляў рт. сл.
 				{0} цалі рт. сл.
 			
+			
+				бар
+				{0} бар
+				{0} бары
+				{0} бар
+				{0} бара
+			
 			
 				мбар
 				{0} мбар
@@ -7952,6 +8399,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атм
 				{0} атм
 			
+			
+				Па
+				{0} Па
+				{0} Па
+				{0} Па
+				{0} Па
+			
+			
+				гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+			
 			
 				кПа
 				{0} кПа
@@ -7996,10 +8457,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°
-				{0}°
-				{0}°
-				{0}°
-				{0}°
+				{0} °
+				{0} °
+				{0} °
+				{0} °
 			
 			
 				°C
@@ -8023,11 +8484,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} К
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				фунт-футы
+				{0} фунт-фут
+				{0} фунт-футы
+				{0} фунт-футаў
+				{0} фунт-фута
 			
 			
 				Н⋅м
@@ -8225,10 +8686,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				кірунак
-				{0} У
-				{0} Пн
-				{0} Пд
-				{0} З
+				{0} усх. д.
+				{0} паўн. ш.
+				{0} паўд. ш.
+				{0} зах. д.
 			
 		
 		
@@ -8356,10 +8817,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°C
-				{0}°C
-				{0}°C
-				{0}°C
-				{0}°C
 			
 			
 				л
@@ -8447,13 +8904,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Віды дзейнасці
 		Афрыканскія пісьмы
 		Амерыканскія пісьмы
-		жывёліна
+		Жывёлы
 		Жывёлы і прырода
 		Стрэлкі
-		цела
+		Цела
 		Рысаванне квадратаў
 		Брайль
-		будынак
+		Будынак
 		Маркеры/Зоркі
 		Кансанантнае чамо
 		Знакі валют
@@ -8462,12 +8919,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Сімвалы-піктаграмы
 		Гадальныя сімвалы
 		Стрэлкі ўніз
-		Стрэлкі ўверх
+		Стрэлкі ўніз і ўверх
 		Усходнеазіяцкія пісьмы
 		Эмодзі
 		Еўрапейскія пісьмы
-		жанчына
-		сцяг
+		Жанчына
+		Сцяг
 		Сцягі
 		Ежа і напоі
 		Фарматаванне
@@ -8480,54 +8937,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Ханча
 		Ханьцзы
 		Ханьцзы (традыцыйнае)
-		сэрца
+		Сэрца
 		Гістарычныя пісьмы
 		Ідэаграфічныя апісальныя сімвалы
 		Японская кана
 		Камбун
 		Кандзі
-		клавіша
+		Клавіша
 		Стрэлкі ўлева
 		Стрэлкі ўлева і ўправа
-		Сімвалы з падабенствам літар
+		Літарападобныя сімвалы
 		Абмежаванае выкарыстанне
-		мужчына
+		Мужчына
 		Матэматычныя сімвалы
 		Блізкаўсходнія пісьмы
 		Рознае
 		Сучасныя пісьмы
 		Знак-мадыфікатар
 		Музычныя сімвалы
-		прырода
+		Прырода
 		Знак без шырыні
 		Лікі
 		Аб’екты
 		Іншае
 		Парныя
-		чалавек
-		Знак з шырынёй
+		Чалавек
+		Фанетычны алфавіт
 		Піктаграмы
-		месца
-		расліна
+		Месца
+		Расліна
 		Пунктуацыя
 		Стрэлкі ўправа
 		Знакі і сімвалы
 		Варыянты малых формаў
-		смайлік
+		Смайлікі
 		Смайлікі і людзі
 		Усходнеазіяцкія пісьмы
 		Паўднёваўсходнеазіяцкія пісьмы
-		Знакі з шырынёй
-		спорт
+		Інтэрвалы
+		Спорт
 		Спецыяльныя сімвалы
 		Тэхнічныя сімвалы
 		Знакі тонаў
-		падарожжа
+		Падарожжа
 		Падарожжы і месцы
 		Стрэлкі ўверх
 		Варыянтныя формы
 		Вакалічнае чамо
-		надвор’е
+		Надвор’е
 		Заходнеазіяцкія пісьмы
 		Недрукаваны знак
 	
@@ -8547,57 +9004,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		прамы
 		з нахілам
 		з моцным нахілам
-		моцна ўшчыльнены
-		моцна сціснуты
-		вельмі вузкі
+		крайне ўшчыльнены
+		крайне сціснуты
+		крайне вузкі
 		надзвычай ўшчыльнены
 		надзвычай сціснуты
-		вельмі вузкі
+		надзвычай вузкі
 		ушчыльнены
 		сціснуты
 		сціснуты
-		паўушчыльнены
-		паўсціснуты
-		паўвузкі
+		напаўушчыльнены
+		напаўсціснуты
+		напаўвузкі
 		нармальны
-		паўразгорнуты
-		паўрасшыраны
-		паўшырокі
+		напаўразгорнуты
+		напаўрасшыраны
+		напаўшырокі
 		разгорнуты
 		расшыраны
 		шырокі
-		моцна разгорнуты
-		моцна расшыраны
-		вельмі шырокі
-		надзвычай разгорнуты
-		надзвычай расшыраны
-		надзвычай шырокі
+		надзвычай разгорнуты
+		надзвычай расшыраны
+		надзвычай шырокі
+		крайне разгорнуты
+		крайне расшыраны
+		крайне шырокі
 		вузкі
 		надзвычай тонкі
 		вельмі тонкі
 		тонкі
-		паўтонкі
+		напаўтонкі
 		кніжны
 		звычайны
 		сярэдні
-		паўтлусты
-		паўтлусты
-		тлусты
-		надзвычай тлусты
+		паўтоўсты
+		паўтоўсты
+		тоўсты
+		надзвычай тоўсты
 		насычаны
-		тлусты насычаны
+		цяжкі
 		надзвычай насычаны
-		вельмі насычаны
-		вельмі тлусты
+		крайне насычаны
+		крайне цяжкі
 		вертыкальныя дробы
-		разрадка паміж вялікімі літарамі
+		інтэрвал паміж вялікімі літарамі
 		дадатковыя лігатуры
 		дыяганальныя дробы
-		лічбы, роўныя па вышыні вялікім літарам
+		маюскульныя лічбы
 		мінускульныя лічбы
 		парадкавыя
 		прапарцыянальныя лічбы
-		маленькія вялікія літары
+		капітэль
 		таблічныя лічбы
 		перакрэслены нуль
 	
diff --git a/make/data/cldr/common/main/be_BY.xml b/make/data/cldr/common/main/be_BY.xml
index e589092c50a..1664a67cc9f 100644
--- a/make/data/cldr/common/main/be_BY.xml
+++ b/make/data/cldr/common/main/be_BY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bem.xml b/make/data/cldr/common/main/bem.xml
index a3cff144842..a681bb7de86 100644
--- a/make/data/cldr/common/main/bem.xml
+++ b/make/data/cldr/common/main/bem.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
diff --git a/make/data/cldr/common/main/bem_ZM.xml b/make/data/cldr/common/main/bem_ZM.xml
index 959268fff30..c674300b784 100644
--- a/make/data/cldr/common/main/bem_ZM.xml
+++ b/make/data/cldr/common/main/bem_ZM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bez.xml b/make/data/cldr/common/main/bez.xml
index 0e81a506eec..b48eceac8fa 100644
--- a/make/data/cldr/common/main/bez.xml
+++ b/make/data/cldr/common/main/bez.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Humoldova
 			Hubukini
 			Ifisima fya Marshal
-			Humasedonia
 			Humali
 			Humyama
 			Humongolia
diff --git a/make/data/cldr/common/main/bez_TZ.xml b/make/data/cldr/common/main/bez_TZ.xml
index 53a67df07f2..d10f92d2640 100644
--- a/make/data/cldr/common/main/bez_TZ.xml
+++ b/make/data/cldr/common/main/bez_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bg.xml b/make/data/cldr/common/main/bg.xml
index 4235f448f72..e3c2d03da9f 100644
--- a/make/data/cldr/common/main/bg.xml
+++ b/make/data/cldr/common/main/bg.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -132,6 +132,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			гръцки
 			еламитски
 			английски
+			английски (Обединено кралство)
 			английски (UK)
 			английски (САЩ)
 			английски (US)
@@ -155,14 +156,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			старофренски
 			северен фризски
 			източнофризийски
-			фриулиански
+			фриулски
 			западнофризийски
 			ирландски
 			га
 			гагаузки
 			гайо
 			гбая
-			шотландски галски
+			шотландски келтски
 			гииз
 			гилбертски
 			галисийски
@@ -201,7 +202,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			индонезийски
 			оксидентал
 			игбо
-			съчуански и
+			съчуански йи
 			инупиак
 			илоко
 			ингушетски
@@ -320,7 +321,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			марвари
 			бирмански
 			ерзиа
-			мазандари
+			мазандерански
 			науру
 			неаполитански
 			нама
@@ -356,7 +357,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			оджибва
 			оромо
 			ория
-			осетски
+			осетински
 			осейджи
 			отомански турски
 			пенджабски
@@ -394,7 +395,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			рва
 			санскрит
 			сандаве
-			якутски
+			сакха
 			самаритански арамейски
 			самбуру
 			сасак
@@ -434,7 +435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			серер
 			свати
 			сахо
-			сесото
+			сото
 			сундански
 			сукума
 			сусу
@@ -515,7 +516,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			зенага
 			стандартен марокански тамазигт
 			китайски
+			китайски, мандарин
 			китайски (опростен)
+			китайски, мандарин (опростен)
+			китайски, мандарин (традиционен)
 			зулуски
 			зуни
 			без лингвистично съдържание
@@ -533,7 +537,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -561,12 +565,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
-			
-			
-			
+			
+			
+			
 			
 			
 			
@@ -642,15 +646,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
-			
+			
+			
 			
 			
 			
 			
 		
 		
-			Свят
+			свят
 			Африка
 			Северноамерикански континент
 			Южна Америка
@@ -728,6 +732,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Конго (Република)
 			Швейцария
 			Кот д’Ивоар
+			Кот д’Ивоар
 			острови Кук
 			Чили
 			Камерун
@@ -758,7 +763,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Испания
 			Етиопия
 			Европейски съюз
-			Еврозона
+			еврозона
 			Финландия
 			Фиджи
 			Фолкландски острови
@@ -909,7 +914,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Салвадор
 			Синт Мартен
 			Сирия
-			Свазиленд
+			Есватини
+			Свазиленд
 			Тристан да Куня
 			острови Търкс и Кайкос
 			Чад
@@ -919,6 +925,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Таджикистан
 			Токелау
 			Източен Тимор
+			Източен Тимор
 			Туркменистан
 			Тунис
 			Тонга
@@ -944,6 +951,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Уолис и Футуна
 			Самоа
+			Псевдоакценти
+			Псевдодвупосочни
 			Косово
 			Йемен
 			Майот
@@ -1034,7 +1043,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Сортиране с различаване на регистъра на буквите
 			Традиционен китайски (Big5)
 			Речников ред на сортиране
-			стандартен ред на сортиране в Уникод
+			ред на сортиране в Unicode по подразбиране
 			Опростен китайски (GB2312)
 			Азбучен ред
 			Фонетичен ред на сортиране
@@ -1126,8 +1135,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б в г д е ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ь ю я]
 		[{а\u0300} ѐ ё ѝ {о\u0300} {у\u0300} {ъ\u0300} ы ѣ э {ю\u0300} {я\u0300} ѫ]
 		[А Б В Г Д Е Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ ( ) \[ \] § * / ″ №]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ ( ) \[ \] § * / ″ №]
 		{0}…
 		…{0}
 		{0}… {1}
@@ -1189,7 +1198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
-						h 'ч' .B
+						h 'ч'. B
 						h:mm 'ч'. B
 						h:mm:ss 'ч'. B
 						d
@@ -1208,7 +1217,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMMM y 'г'. G
 						d MMMM y 'г'. G
 						E, d MMMM y 'г'. G
-						h a
+						h a
 						HH
 						h:mm 'ч'. a
 						HH:mm
@@ -1223,7 +1232,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						LLLL
 						d MMMM
 						E, d MMMM
-						mm:ss
+						mm:ss
 						y 'г'. G
 						y 'г'. G
 						M.y 'г'. G
@@ -1245,13 +1254,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M.y GGGGG – M.y GGGGG
+							M.y – M.y GGGGG
+							M.y – M.y GGGGG
+						
+						
+							d.M.y – d.M.y GGGGG
+							d.M.y GGGGG – d.M.y GGGGG
+							d.M.y – d.M.y GGGGG
+							d.M.y – d.M.y GGGGG
+						
+						
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y GGGGG – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -1681,22 +1727,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							H:mm:ss 'ч'. zzzz
+							H:mm:ss zzzz
 						
 					
 					
 						
-							H:mm:ss 'ч'. z
+							H:mm:ss z
 						
 					
 					
 						
-							H:mm:ss 'ч'.
+							H:mm:ss
 						
 					
 					
 						
-							H:mm 'ч'.
+							H:mm
 						
 					
 				
@@ -1722,18 +1768,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
-						h 'ч'. B
-						h:mm 'ч'. B
-						h:mm:ss 'ч'. B
+						h B
+						h:mm B
+						h:mm:ss B
 						d
 						ccc
-						E, h:mm 'ч'. B
-						E, h:mm:ss 'ч'. B
+						E, h:mm B
+						E, h:mm:ss B
 						E, d
-						E, h:mm 'ч'. a
-						E, HH:mm 'ч'.
-						E, h:mm:ss 'ч'. a
-						E, H:mm:ss 'ч'.
+						E, h:mm a
+						E, HH:mm
+						E, h:mm:ss a
+						E, H:mm:ss
 						y 'г'. G
 						MM.y 'г'. G
 						d.MM.y 'г'. G
@@ -1741,16 +1787,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMMM y 'г'. G
 						d MMMM y 'г'. G
 						E, d MMMM y 'г'. G
-						h 'ч'. a
-						H 'ч'.
-						h:mm 'ч'. a
-						H:mm 'ч'.
-						h:mm:ss 'ч'. a
-						H:mm:ss 'ч'.
-						h:mm:ss 'ч'. a v
-						HH:mm:ss 'ч'. v
-						h:mm 'ч'. a v
-						HH:mm 'ч'. v
+						h a
+						H
+						h:mm a
+						H:mm
+						h:mm:ss a
+						H:mm:ss
+						h:mm:ss a v
+						HH:mm:ss v
+						h:mm a v
+						HH:mm v
 						L
 						d.MM
 						E, d.MM
@@ -1785,11 +1831,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -1835,36 +1879,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, d MMM y – E, d MMM y G
 						
 						
-							h 'ч'. a – h 'ч'. a
-							h – h 'ч'. a
+							h a – h a
+							h – h a
 						
 						
-							H – H 'ч'.
+							H – H
 						
 						
-							h:mm 'ч'. a – h:mm 'ч'. a
-							h:mm 'ч'. – h:mm 'ч'. a
-							h:mm 'ч'. – h:mm 'ч'. a
+							h:mm a – h:mm a
+							h:mm – h:mm a
+							h:mm – h:mm a
 						
 						
-							H:mm 'ч'. – H:mm 'ч'.
-							H:mm 'ч'. – H:mm 'ч'.
+							H:mm – H:mm
+							H:mm – H:mm
 						
 						
-							h:mm 'ч'. a – h:mm 'ч'. a v
-							h:mm 'ч'. a – h:mm 'ч'. a v
-							h:mm 'ч'. a – h:mm 'ч'. a v
+							h:mm a – h:mm a v
+							h:mm a – h:mm a v
+							h:mm a – h:mm a v
 						
 						
-							H:mm 'ч'. – H:mm 'ч'. v
-							H:mm 'ч'. – H:mm 'ч'. v
+							H:mm – H:mm v
+							H:mm – H:mm v
 						
 						
-							h 'ч'. a – h 'ч'. a v
-							h – h 'ч'. a v
+							h a – h a v
+							h – h a v
 						
 						
-							H – H 'ч'. v
+							H – H v
 						
 						
 							M – M
@@ -2163,7 +2207,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				седм.
-				миналата седмица
+				мин. седм.
 				тази седм.
 				следв. седм.
 				
@@ -3354,6 +3398,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Актобе
 			
+			
+				Костанай
+			
 			
 				Къзълорда
 			
@@ -4872,19 +4919,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		2
 		
 			,
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 хил'.'
@@ -5006,6 +5065,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Дирхам на Обединените арабски емирства
 				дирхам на Обединените арабски емирства
 				дирхама на Обединените арабски емирства
+				AED
 			
 			
 				Афганистански афган (1927–2002)
@@ -5016,26 +5076,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Афганистански афган
 				афганистански афган
 				афганистански афгана
+				AFN
 			
 			
 				Албански лек
 				албански лек
 				албански лека
+				ALL
 			
 			
 				Арменски драм
 				арменски драм
 				арменски драма
+				AMD
 			
 			
 				Антилски гулден
 				антилски гулден
 				антилски гулдена
+				ANG
 			
 			
 				Анголска кванза
 				анголска кванза
 				анголски кванзи
+				AOA
+				Kz
 			
 			
 				Анголска кванца (1977–1990)
@@ -5066,6 +5132,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Аржентинско песо
 				аржентинско песо
 				аржентински песо
+				ARS
 				ARS
 			
 			
@@ -5084,6 +5151,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Арубски флорин
 				арубски флорин
 				арубски флорина
+				AWG
 			
 			
 				Азербайджански манат (1993–2006)
@@ -5094,6 +5162,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Азербайджански манат
 				азербайджански манат
 				азербайджански маната
+				AZN
 			
 			
 				Босна и Херцеговина-динар
@@ -5104,17 +5173,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Босненска конвертируема марка
 				босненска конвертируема марка
 				босненски конвертируеми марки
+				BAM
+				KM
 			
 			
 				Барбадоски долар
 				барбадоски долар
 				барбадоски долара
+				BBD
 				BBD
 			
 			
 				Бангладешка така
 				бангладешка така
 				бангладешки таки
+				BDT
 				BDT
 			
 			
@@ -5147,28 +5220,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Бахрейнски динар
 				бахрейнски динар
 				бахрейнски динара
+				BHD
 			
 			
 				Бурундийски франк
 				бурундийски франк
 				бурундийски франка
+				BIF
 			
 			
 				Бермудски долар
 				бермудски долар
 				бермудски долара
+				BMD
 				BMD
 			
 			
 				Брунейски долар
 				брунейски долар
 				брунейски долара
+				BND
 				BND
 			
 			
 				Боливийско боливиано
 				боливийско боливиано
 				боливийски боливиано
+				BOB
+				Bs
 			
 			
 				Боливийско песо
@@ -5208,12 +5287,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Бахамски долар
 				бахамски долар
 				бахамски долара
+				BSD
 				BSD
 			
 			
 				Бутански нгултрум
 				бутански нгултрум
 				бутански нгултрума
+				BTN
 			
 			
 				Бирмански киат
@@ -5222,6 +5303,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ботсванска пула
 				ботсванска пула
 				ботсвански пули
+				BWP
+				P
 			
 			
 				Беларуска нова рубла (1994–1999)
@@ -5239,11 +5322,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Беларуска рубла (2000–2016)
 				беларуска рубла (2000–2016)
 				беларуски рубли (2000–2016)
+				BYR
 			
 			
 				Белизийски долар
 				белизийски долар
 				белизийски долара
+				BZD
 				BZD
 			
 			
@@ -5257,6 +5342,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Конгоански франк
 				конгоански франк
 				конгоански франка
+				CDF
 			
 			
 				WIR евро
@@ -5265,6 +5351,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Швейцарски франк
 				швейцарски франк
 				швейцарски франка
+				CHF
 			
 			
 				WIR франк
@@ -5276,12 +5363,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Чилийско песо
 				чилийско песо
 				чилийски песо
+				CLP
 				CLP
 			
 			
 				Китайски ренминби юан (offshore)
 				китайски ренминби юан (offshore)
 				китайски ренминби юан (offshore)
+				CNH
 			
 			
 				Китайски юан
@@ -5294,6 +5383,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Колумбийско песо
 				колумбийско песо
 				колумбийски песо
+				COP
 				COP
 			
 			
@@ -5303,6 +5393,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Костарикански колон
 				костарикански колон
 				костарикански колона
+				CRC
 				CRC
 			
 			
@@ -5317,17 +5408,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кубинско конвертируемо песо
 				кубинско конвертируемо песо
 				кубински конвертируеми песо
+				CUC
+				$
 			
 			
 				Кубинско песо
 				кубинско песо
 				кубински песо
+				CUP
 				CUP
 			
 			
 				Ескудо на Кабо Верде
 				ескудо на Кабо Верде
 				ескудо на Кабо Верде
+				CVE
 			
 			
 				Кипърска лира
@@ -5338,6 +5433,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Чешка крона
 				чешка крона
 				чешки крони
+				CZK
+				Kč
 			
 			
 				Източногерманска марка
@@ -5351,22 +5448,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Джибутски франк
 				джибутски франк
 				джибутски франка
+				DJF
 			
 			
 				Датска крона
 				датска крона
 				датски крони
+				DKK
+				kr
 			
 			
 				Доминиканско песо
 				доминиканско песо
 				доминикански песо
+				DOP
 				DOP
 			
 			
 				Алжирски динар
 				алжирски динар
 				алжирски динара
+				DZD
 			
 			
 				Еквадорско сукре
@@ -5385,11 +5487,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Египетска лира
 				египетска лира
 				египетски лири
+				EGP
+				E£
 			
 			
 				Еритрейска накфа
 				еритрейска накфа
 				еритрейски накфи
+				ERN
 			
 			
 				Испанска песета
@@ -5400,11 +5505,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Етиопски бир
 				етиопски бир
 				етиопски бира
+				ETB
 			
 			
 				Евро
 				евро
 				евро
+				€
+				€
 			
 			
 				Финландска марка
@@ -5415,12 +5523,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Фиджийски долар
 				фиджийски долар
 				фиджийски долара
+				FJD
 				FJD
 			
 			
 				Фолклендска лира
 				фолклендска лира
 				фолклендски лири
+				FKP
+				FKP
 			
 			
 				Френски франк
@@ -5432,6 +5543,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				британска лира
 				британски лири
 				GBP
+				£
 			
 			
 				Грузински купон
@@ -5440,6 +5552,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Грузински лари
 				грузински лари
 				грузински лари
+				GEL
+				₾
 				₾
 			
 			
@@ -5451,22 +5565,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ганайско седи
 				ганайско седи
 				ганайски седи
+				GHS
 			
 			
 				Гибралтарска лира
 				гибралтарска лира
 				гибралтарски лири
+				GIP
 				GIP
 			
 			
 				Гамбийско даласи
 				гамбийско даласи
 				гамбийски даласи
+				GMD
 			
 			
 				Гвинейски франк
 				гвинейски франк
 				гвинейски франка
+				GNF
+				FG
 			
 			
 				Гвинейска сили
@@ -5483,6 +5602,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Гватемалски кетцал
 				гватемалски кетцал
 				гватемалски кетцала
+				GTQ
+				Q
 			
 			
 				Ескудо от Португалска Гвинея
@@ -5494,6 +5615,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Гаянски долар
 				гаянски долар
 				гаянски долара
+				GYD
 				GYD
 			
 			
@@ -5507,6 +5629,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Хондураска лемпира
 				хондураска лемпира
 				хондураски лемпири
+				HNL
+				L
 			
 			
 				Хърватски динар
@@ -5517,21 +5641,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Хърватска куна
 				хърватска куна
 				хърватски куни
+				HRK
+				kn
 			
 			
 				Хаитски гурд
 				хаитски гурд
 				хаитски гурда
+				HTG
 			
 			
 				Унгарски форинт
 				унгарски форинт
 				унгарски форинта
+				HUF
+				Ft
 			
 			
 				Индонезийска рупия
 				индонезийска рупия
 				индонезийски рупии
+				IDR
+				Rp
 			
 			
 				Ирландска лира
@@ -5561,16 +5692,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Иракски динар
 				иракски динар
 				иракски динара
+				IQD
 			
 			
 				Ирански риал
 				ирански риал
 				ирански риала
+				IRR
 			
 			
 				Исландска крона
 				исландска крона
 				исландски крони
+				ISK
+				kr
 			
 			
 				Италианска лира
@@ -5581,44 +5716,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ямайски долар
 				ямайски долар
 				ямайски долара
+				JMD
 				JMD
 			
 			
 				Йордански динар
 				йордански динар
 				йордански динара
+				JOD
 			
 			
 				Японска йена
 				японска йена
 				японски йени
 				JPY
+				¥
 			
 			
 				Кенийски шилинг
 				кенийски шилинг
 				кенийски шилинга
+				KES
 			
 			
 				Киргизстански сом
 				киргизстански сом
 				киргизстански сома
+				KGS
 			
 			
 				Камбоджански риел
 				камбоджански риел
 				камбоджански риела
+				KHR
 				KHR
 			
 			
 				Коморски франк
 				коморски франк
 				коморски франка
+				KMF
+				CF
 			
 			
 				Севернокорейски вон
 				севернокорейски вон
 				севернокорейски вона
+				KPW
+				₩
 			
 			
 				Южнокорейски вон
@@ -5631,39 +5776,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кувейтски динар
 				кувейтски динар
 				кувейтски динара
+				KWD
 			
 			
 				Кайманов долар
 				кайманов долар
 				кайманови долара
+				KYD
 				KYD
 			
 			
 				Казахстанско тенге
 				казахстанско тенге
 				казахстански тенге
+				KZT
 				KZT
 			
 			
 				Лаоски кип
 				лаоски кип
 				лаоски кипа
+				LAK
 				LAK
 			
 			
 				Ливанска лира
 				ливанска лира
 				ливански лири
+				LBP
+				L£
 			
 			
 				Шриланкска рупия
 				шриланкска рупия
 				шриланкски рупии
+				LKR
+				Rs
 			
 			
 				Либерийски долар
 				либерийски долар
 				либерийски долара
+				LRD
 				LRD
 			
 			
@@ -5675,6 +5829,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Литовски литас
 				литовски литас
 				литовски литаса
+				LTL
 			
 			
 				Литовски талон
@@ -5688,6 +5843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Латвийски лат
 				латвийски лат
 				латвийски лата
+				LVL
 			
 			
 				Латвийска рубла
@@ -5698,11 +5854,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Либийски динар
 				либийски динар
 				либийски динара
+				LYD
 			
 			
 				Марокански дирхам
 				марокански дирхам
 				марокански дирхама
+				MAD
 			
 			
 				Марокански франк
@@ -5713,11 +5871,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Молдовско леу
 				молдовско леу
 				молдовски леу
+				MDL
 			
 			
 				Малгашко ариари
 				малгашко ариари
 				малгашки ариари
+				MGA
+				Ar
 			
 			
 				Малгашки франк - Мадагаскар
@@ -5728,6 +5889,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Македонски денар
 				македонски денар
 				македонски денара
+				MKD
 			
 			
 				Малийски франк
@@ -5736,27 +5898,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мианмарски кият
 				мианмарски кият
 				мианмарски кията
+				MMK
+				K
 			
 			
 				Монголски тугрик
 				монголски тугрик
 				монголски тугрика
+				MNT
 				MNT
 			
 			
 				Патака на Макао
 				патака на Макао
 				патаки на Макао
+				MOP
 			
 			
 				Мавританска угия (1973–2017)
 				мавританска угия (1973–2017)
 				мавритански угии (1973–2017)
+				MRO
 			
 			
 				Мавританска угия
 				мавританска угия
 				мавритански угии
+				MRU
 			
 			
 				Малтийска лира
@@ -5767,16 +5935,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Маврицийска рупия
 				маврицийска рупия
 				маврицийски рупии
+				MUR
+				Rs
 			
 			
 				Малдивска руфия
 				малдивска руфия
 				малдивски руфии
+				MVR
 			
 			
 				Малавийска квача
 				малавийска квача
 				малавийски квачи
+				MWK
 			
 			
 				Мексиканско песо
@@ -5789,14 +5961,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мексиканско сребърно песо (1861–1992)
 				мексиканско сребърно песо (1861–1992)
 				мексикански сребърни песо (1861–1992)
+				MXP
 			
 			
 				Мексиканска конвертируема единица (UDI)
+				MXV
 			
 			
 				Малайзийски рингит
 				малайзийски рингит
 				малайзийски рингита
+				MYR
+				RM
 			
 			
 				Мозамбикско ескудо
@@ -5812,28 +5988,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мозамбикски метикал
 				мозамбикски метикал
 				мозамбикски метикала
+				MZN
 			
 			
 				Намибийски долар
 				намибийски долар
 				намибийски долара
+				NAD
 				NAD
 			
 			
 				Нигерийска найра
 				нигерийска найра
 				нигерийски найри
+				NGN
 				NGN
 			
 			
 				Никарагуанска кордоба (1988–1991)
 				никарагуанска кордоба (1988–1991)
 				никарагуански кордоби (1988–1991)
+				NIC
 			
 			
 				Никарагуанска кордоба
 				никарагуанска кордоба
 				никарагуански кордоби
+				NIO
+				C$
 			
 			
 				Холандски гулден
@@ -5844,11 +6026,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Норвежка крона
 				норвежка крона
 				норвежки крони
+				NOK
+				kr
 			
 			
 				Непалска рупия
 				непалска рупия
 				непалски рупии
+				NPR
+				Rs
 			
 			
 				Новозеландски долар
@@ -5861,11 +6047,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Омански риал
 				омански риал
 				омански риала
+				OMR
 			
 			
 				Панамска балбоа
 				панамска балбоа
 				панамски балбоа
+				PAB
 			
 			
 				Перуанско инти
@@ -5874,6 +6062,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Перуански сол
 				перуански сол
 				перуански сола
+				PEN
 			
 			
 				Перуански сол (1863–1965)
@@ -5884,22 +6073,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Папуа-новогвинейска кина
 				папуа-новогвинейска кина
 				папуа-новогвинейски кини
+				PGK
 			
 			
 				Филипинско песо
 				филипинско песо
 				филипински песо
+				PHP
 				PHP
 			
 			
 				Пакистанска рупия
 				пакистанска рупия
 				пакистански рупии
+				PKR
+				Rs
 			
 			
 				Полска злота
 				полска злота
 				полски злоти
+				PLN
+				zł
 			
 			
 				Полска злота (1950–1995)
@@ -5915,12 +6110,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Парагвайско гуарани
 				парагвайско гуарани
 				парагвайски гуарани
+				PYG
 				PYG
 			
 			
 				Катарски риал
 				катарски риал
 				катарски риала
+				QAR
 			
 			
 				Родезийски долар
@@ -5934,17 +6131,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Румънска лея
 				румънска лея
 				румънски леи
+				RON
 				RON
 			
 			
 				Сръбски динар
 				сръбски динар
 				сръбски динара
+				RSD
 			
 			
 				Руска рубла
 				руска рубла
 				руски рубли
+				RUB
+				₽
 			
 			
 				Руска рубла (1991–1998)
@@ -5955,22 +6156,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Руандски франк
 				руандски франк
 				руандски франка
+				RWF
+				RF
 			
 			
-				Саудитскоарабски риал
-				саудитскоарабски риал
-				саудитскоарабски риала
+				саудитски риал
+				саудитски риал
+				саудитски риала
+				SAR
 			
 			
 				Долар на Соломоновите острови
 				долар на Соломоновите острови
 				долара на Соломоновите острови
+				SBD
 				SBD
 			
 			
 				Сейшелска рупия
 				сейшелска рупия
 				сейшелски рупии
+				SCR
 			
 			
 				Судански динар
@@ -5981,22 +6187,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Суданска лира
 				суданска лира
 				судански лири
+				SDG
 			
 			
 				Шведска крона
 				шведска крона
 				шведски крони
+				SEK
+				kr
 			
 			
 				Сингапурски долар
 				сингапурски долар
 				сингапурски долара
+				SGD
 				SGD
 			
 			
 				Лира на Света Елена
 				лира на Света Елена
 				лири на Света Елена
+				SHP
+				£
 			
 			
 				Словенски толар
@@ -6012,16 +6224,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сиералеонско леоне
 				сиералеонско леоне
 				сиералеонски леоне
+				SLL
 			
 			
 				Сомалийски шилинг
 				сомалийски шилинг
 				сомалийски шилинга
+				SOS
 			
 			
 				Суринамски долар
 				суринамски долар
 				суринамски долара
+				SRD
 				SRD
 			
 			
@@ -6033,17 +6248,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Южносуданска лира
 				южносуданска лира
 				южносудански лири
+				SSP
 				SSP
 			
 			
 				Добра на Сао Томе и Принсипи (1977–2017)
 				добра на Сао Томе и Принсипи (1977–2017)
 				добра на Сао Томе и Принсипи (1977–2017)
+				STD
 			
 			
 				Добра на Сао Томе и Принсипи
 				добра на Сао Томе и Принсипи
 				добра на Сао Томе и Принсипи
+				STN
 				Db
 			
 			
@@ -6055,21 +6273,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Салвадорски колон
 				салвадорски колон
 				салвадорски колона
+				SVC
 			
 			
 				Сирийска лира
 				сирийска лира
 				сирийски лири
+				SYP
+				£
 			
 			
 				Свазилендски лилангени
 				свазилендски лилангени
 				свазилендски лилангени
+				SZL
 			
 			
 				Тайландски бат
 				тайландски бат
 				тайландски бата
+				THB
+				฿
 			
 			
 				Таджикистанска рубла
@@ -6080,6 +6304,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Таджикистански сомони
 				таджикистански сомони
 				таджикистански сомони
+				TJS
 			
 			
 				Туркменистански манат
@@ -6090,16 +6315,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Туркменски манат
 				туркменски манат
 				туркменски маната
+				TMT
 			
 			
 				Тунизийски динар
 				тунизийски динар
 				тунизийски динара
+				TND
 			
 			
 				Тонганска паанга
 				тонганска паанга
 				тонгански паанги
+				TOP
+				T$
 			
 			
 				Тиморско ескудо
@@ -6115,12 +6344,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Турска лира
 				турска лира
 				турски лири
+				TRY
 				TRY
+				TL
 			
 			
 				Долар на Тринидад и Тобаго
 				долар на Тринидад и Тобаго
 				долара на Тринидад и Тобаго
+				TTD
 				TTD
 			
 			
@@ -6134,11 +6366,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Танзанийски шилинг
 				танзанийски шилинг
 				танзанийски шилинга
+				TZS
 			
 			
 				Украинска хривня
 				украинска хривня
 				украински хривни
+				UAH
 				UAH
 			
 			
@@ -6155,12 +6389,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Угандски шилинг
 				угандски шилинг
 				угандски шилинга
+				UGX
 			
 			
 				Щатски долар
 				щатски долар
 				щатски долара
 				щ.д.
+				$
+			
+			
+				USN
+			
+			
+				USS
 			
 			
 				Уругвайско песо (индекс на инфлацията)
@@ -6174,12 +6416,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Уругвайско песо
 				уругвайско песо
 				уругвайски песо
+				UYU
 				UYU
 			
 			
 				Узбекски сум
 				узбекски сум
 				узбекски сума
+				UZS
 			
 			
 				Венецуелски боливар (1871–2008)
@@ -6190,11 +6434,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Венецуелски боливар
 				венецуелски боливар
 				венецуелски боливара
+				VEF
+				Bs
 			
 			
 				Венецуелски боливар (VES)
 				венецуелски боливар (VES)
 				венецуелски боливара (VES)
+				VES
 			
 			
 				Виетнамски донг
@@ -6207,16 +6454,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Вануатско вату
 				вануатско вату
 				вануатски вату
+				VUV
 			
 			
 				Самоанска тала
 				самоанска тала
 				самоански тали
+				WST
 			
 			
 				Централноафрикански франк
 				централноафрикански франк
 				централноафрикански франка
+				FCFA
 			
 			
 				Сребро
@@ -6241,6 +6491,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				източнокарибски долар
 				източнокарибски долара
 				XCD
+				$
 			
 			
 				Специални права на тираж
@@ -6257,14 +6508,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Западноафрикански франк
 				западноафрикански франк
 				западноафрикански франка
+				CFA
 			
 			
 				Паладий
 			
 			
-				Френскополинезийски франк
-				френскополинезийски франк
-				френскополинезийски франка
+				CFP франк
+				CFP франк
+				CFP франка
+				CFPF
 			
 			
 				Платина
@@ -6286,6 +6539,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Йеменски риал
 				йеменски риал
 				йеменски риала
+				YER
 			
 			
 				Югославски твърд динар
@@ -6309,6 +6563,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Южноафрикански ранд
 				южноафрикански ранд
 				южноафрикански ранда
+				ZAR
+				R
 			
 			
 				Замбийска квача (1968–2012)
@@ -6319,6 +6575,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Замбийска куача
 				замбийска куача
 				замбийски куачи
+				ZMW
+				ZK
 			
 			
 				Заирско ново зайре
@@ -6465,8 +6723,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				части на милион
-				{0} ppm
-				{0} ppm
+				{0} част на милион
+				{0} части на милион
 			
 			
 				процент
@@ -6480,6 +6738,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				базисен пункт
+				{0} базисен пункт
+				{0} базисни пункта
 			
 			
 				молове
@@ -6502,9 +6762,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мили с един галон
 			
 			
-				мили с един императорски галон
-				{0} миля с един императорски галон
-				{0} мили с един императорски галон
+				мили с един британски галон
+				{0} миля с един британски галон
+				{0} мили с един британски галон
 			
 			
 				петабайти
@@ -6566,6 +6826,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} век
 				{0} века
 			
+			
+				десетилетия
+				{0} десетилетие
+				{0} десетилетия
+			
 			
 				години
 				{0} година
@@ -6669,7 +6934,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} джаула
 			
 			
-				киловатчаси
+				киловатчасове
 				{0} киловатчас
 				{0} киловатчаса
 			
@@ -6683,6 +6948,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} британска термална единица
 				{0} британски термални единици
 			
+			
+				американски термални единици
+				{0} американска термална единица
+				{0} американски термални единици
+			
 			
 				фунтове сила
 				{0} фунт сила
@@ -6713,6 +6983,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} херц
 				{0} херца
 			
+			
+				типографски ем
+			
+			
+				пиксели
+				{0} пиксел
+				{0} пиксела
+			
+			
+				мегапиксели
+				{0} мегапиксел
+				{0} мегапиксела
+			
+			
+				пиксели на сантиметър
+				{0} пиксел на сантиметър
+				{0} пиксела на сантиметър
+			
+			
+				пиксели на инч
+				{0} пиксел на инч
+				{0} пиксела на инч
+			
+			
+				точки на сантиметър
+				{0} точка на сантиметър
+				{0} точки на сантиметър
+			
+			
+				точки на инч
+				{0} точка на инч
+				{0} точки на инч
+			
 			
 				километри
 				{0} километър
@@ -6776,7 +7079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				инчове
 				{0} инч
 				{0} инча
-				{0}/in
+				{0} на инч
 			
 			
 				парсеци
@@ -6884,6 +7187,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Маси на Земята
+				{0} маса на Земята
+				{0} маси на Земята
 			
 			
 				слънчеви маси
@@ -6920,11 +7225,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} конска сила
 				{0} конски сили
 			
-			
-				хектопаскали
-				{0} хектопаскал
-				{0} хектопаскала
-			
 			
 				милиметри живачен стълб
 				{0} мм живачен стълб
@@ -6940,6 +7240,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} инч живачен стълб
 				{0} инча живачен стълб
 			
+			
+				барове
+				{0} бар
+				{0} бара
+			
 			
 				милибари
 				{0} милибар
@@ -6950,6 +7255,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфера
 				{0} атмосфери
 			
+			
+				паскали
+				{0} паскал
+				{0} паскала
+			
+			
+				хектопаскали
+				{0} хектопаскал
+				{0} хектопаскала
+			
 			
 				килопаскали
 				{0} килопаскал
@@ -7000,6 +7315,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} келвин
 				{0} келвина
 			
+			
+				фунт-футове
+				{0} фунт-фут
+				{0} фунт-фута
+			
 			
 				нютон-метър
 				{0} нютон-метър
@@ -7075,12 +7395,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				метрични пинти
-				{0} метричен пинт
-				{0} метрични пинта
+				{0} метрична пинта
+				{0} метрични пинти
 			
 			
 				метрични чаши
-				{0} mc
+				{0} метрична чаша
 				{0} метрични чаши
 			
 			
@@ -7163,9 +7483,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m/s²
 			
 			
-				оборот
-				{0} оборот
-				{0} оборота
+				об.
+				{0} об.
+				{0} об.
 			
 			
 				rad
@@ -7194,7 +7514,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/km²
 			
 			
-				хектари
+				ha
 				{0} ha
 				{0} ha
 			
@@ -7211,9 +7531,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/cm²
 			
 			
-				кв. мили
-				{0} кв. миля
-				{0} кв. мили
+				{0} mi²
+				{0} mi²
 				{0}/mi²
 			
 			
@@ -7222,19 +7541,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} акра
 			
 			
-				кв. ярдове
-				{0} кв. ярд
-				{0} кв. ярда
+				{0} yd²
+				{0} yd²
 			
 			
-				кв. футове
-				{0} кв. фут
-				{0} кв. фута
+				{0} ft²
+				{0} ft²
 			
 			
-				кв. инчове
-				{0} кв. инч
-				{0} кв. инча
+				{0} in²
+				{0} in²
 				{0}/in²
 			
 			
@@ -7243,14 +7559,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} дюнюма
 			
 			
-				карати
-				{0} карат
-				{0} карата
+				{0} kt
+				{0} kt
 			
 			
 				mg/dL
-				{0} mg/dL
-				{0} mg/dL
+				{0} mg/dl
+				{0} mg/dl
 			
 			
 				mmol/L
@@ -7268,7 +7583,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}%
 			
 			
-				промил
 				{0}‰
 				{0}‰
 			
@@ -7299,8 +7613,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мили/имп. гал.
-				{0} миля/имп. галон
-				{0} мили/имп. галон
+				{0} mpg Imp.
+				{0} mpg Imp.
 			
 			
 				PByte
@@ -7353,9 +7667,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} B
 			
 			
-				б
-				{0} б
-				{0} б
+				b
+				{0} b
+				{0} b
 			
 			
 				в.
@@ -7470,7 +7784,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				електронволт
 				{0} eV
 				{0} eV
 			
@@ -7479,13 +7792,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} BTU
 				{0} BTU
 			
+			
+				амер. термални ед.
+				{0} амер. терм. ед.
+				{0} амер. терм. ед.
+			
 			
-				фунт сила
 				{0} lbf
 				{0} lbf
 			
 			
-				нютон
 				{0} N
 				{0} N
 			
@@ -7509,6 +7825,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				ем
+			
 			
 				km
 				{0} km
@@ -7516,7 +7835,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/km
 			
 			
-				метри
+				m
 				{0} m
 				{0} m
 				{0}/m
@@ -7553,26 +7872,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pm
 			
 			
-				мили
-				{0} миля
-				{0} мили
+				{0} mi
+				{0} mi
 			
 			
-				ярдове
-				{0} ярд
-				{0} ярда
+				{0} yd
+				{0} yd
 			
 			
-				футове
-				{0} фут
-				{0} фута
-				{0}/ft
+				{0} ft
+				{0} ft
 			
 			
-				инчове
-				{0} инч
-				{0} инча
-				{0}/in
+				{0} in
+				{0} in
 			
 			
 				pc
@@ -7605,7 +7918,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				слънчеви радиуси
 				{0} R☉
 				{0} R☉
 			
@@ -7615,14 +7927,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				слънчеви светимости
 				{0} L☉
 				{0} L☉
 			
 			
-				т
-				{0} т
-				{0} т
+				{0} t
+				{0} t
 			
 			
 				kg
@@ -7647,20 +7957,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} µg
 			
 			
-				къси тонове
-				{0} к. т.
-				{0} к. т.
+				{0} tn
+				{0} tn
 			
 			
-				фунтове
-				{0} фунт
-				{0} фунта
+				{0} lb
+				{0} lb
 				{0}/lb
 			
 			
-				унц.
-				{0} унц.
-				{0} унц.
+				{0} oz
+				{0} oz
 				{0}/oz
 			
 			
@@ -7679,12 +7986,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Da
 			
 			
-				Маси на Земята
 				{0} M⊕
 				{0} M⊕
 			
 			
-				слънчеви маси
 				{0} M☉
 				{0} M☉
 			
@@ -7718,11 +8023,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к. с.
 				{0} к. с.
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -7748,6 +8048,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -7769,9 +8074,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m/s
 			
 			
-				мили/ч
-				{0} миля/ч
-				{0} мили/ч
+				mph
+				{0} mph
+				{0} mph
 			
 			
 				kn
@@ -7785,13 +8090,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°C
-				{0} °C
-				{0} °C
+				{0}°C
+				{0}°C
 			
 			
 				°F
-				{0} °F
-				{0} °F
+				{0}°F
+				{0}°F
 			
 			
 				K
@@ -7826,24 +8131,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/cm³
 			
 			
-				куб. мили
-				{0} куб. миля
-				{0} куб. мили
+				{0} mi³
+				{0} mi³
 			
 			
-				куб. ярдове
-				{0} куб. ярд
-				{0} куб. ярда
+				{0} yd³
+				{0} yd³
 			
 			
-				куб. футове
-				{0} куб. фут
-				{0} куб. фута
+				{0} ft³
+				{0} ft³
 			
 			
-				куб. инчове
-				{0} куб. инч
-				{0} куб. инча
+				{0} in³
+				{0} in³
 			
 			
 				Ml
@@ -7856,7 +8157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hl
 			
 			
-				литри
+				l
 				{0} l
 				{0} l
 				{0}/l
@@ -7887,15 +8188,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mc
 			
 			
-				акър-футове
-				{0} акър-фут
-				{0} акър-фута
+				{0} ac ft
+				{0} ac ft
 			
 			
-				галони
-				{0} галон
-				{0} галона
-				{0}/гал.
+				{0} gal US
+				{0} gal US
 			
 			
 				имп. галон
@@ -7904,24 +8202,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/имп. галон
 			
 			
-				кварти
-				{0} кварта
-				{0} кварти
+				{0} qt
+				{0} qt
 			
 			
-				пинти
-				{0} пинта
-				{0} пинти
+				{0} pt
+				{0} pt
 			
 			
-				чаши
-				{0} чаша
-				{0} чаши
+				ч.
+				{0} ч.
+				{0} ч.
 			
 			
-				т. унц.
-				{0} т. унц.
-				{0} т. унц.
+				{0} fl oz US
+				{0} fl oz US
 			
 			
 				Imp. fl oz
@@ -8006,9 +8301,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l/100 km
 			
 			
-				г
-				{0} г
-				{0} г
+				г.
+				{0} г.
+				{0} г.
 			
 			
 				мес.
@@ -8119,10 +8414,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к.с.
 				{0} к.с.
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -8131,6 +8422,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -8146,8 +8441,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°C
-				{0} °C
-				{0} °C
+				{0}°C
+				{0}°C
 			
 			
 				{0} °F
@@ -8197,11 +8492,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} или {1}
 			{0} или {1}
 		
+		
+			{0}, {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
 			{0} и {1}
-			{0} и{1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/bg_BG.xml b/make/data/cldr/common/main/bg_BG.xml
index 0615541e7d0..bda10eb6dfb 100644
--- a/make/data/cldr/common/main/bg_BG.xml
+++ b/make/data/cldr/common/main/bg_BG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bm.xml b/make/data/cldr/common/main/bm.xml
index 3e9d5bbe278..58e1cd6ad0b 100644
--- a/make/data/cldr/common/main/bm.xml
+++ b/make/data/cldr/common/main/bm.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molidavi
 			Madagasikari
 			Marisali Gun
-			Macedɔni
 			Mali
 			Myanimari
 			Moŋoli
diff --git a/make/data/cldr/common/main/bm_ML.xml b/make/data/cldr/common/main/bm_ML.xml
index 6a41fed1016..f524f59d0fe 100644
--- a/make/data/cldr/common/main/bm_ML.xml
+++ b/make/data/cldr/common/main/bm_ML.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bn.xml b/make/data/cldr/common/main/bn.xml
index b0fcd122117..c9f4fc30bfc 100644
--- a/make/data/cldr/common/main/bn.xml
+++ b/make/data/cldr/common/main/bn.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -81,6 +81,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ক্যাডো
 			ক্যারিব
 			আত্সাম
+			চাকমা
 			চেচেন
 			চেবুয়ানো
 			চিগা
@@ -193,7 +194,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			গওইচ্’ইন
 			হাউসা
 			হাইডা
-			hak
 			হাওয়াইয়ান
 			হিব্রু
 			হিন্দি
@@ -337,7 +337,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			এরজিয়া
 			মাজানদেরানি
 			নাউরু
-			nan
 			নেয়াপোলিটান
 			নামা
 			নরওয়েজিয়ান বোকমাল
@@ -527,15 +526,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ইয়েম্বা
 			ইয়েদ্দিশ
 			ইওরুবা
-			ক্যানটোনীজ
+			ক্যান্টোনিজ
+			চীনা, ক্যানটোনীজ
 			ঝু্য়াঙ
 			জাপোটেক
 			চিত্র ভাষা
 			জেনাগা
 			আদর্শ মরক্কোন তামাজিগাত
 			চীনা
+			চীনা, ম্যান্ডারিন
 			সরলীকৃত চীনা
+			চীনা ম্যান্ডারিন সরলীকৃত
 			ঐতিহ্যবাহি চীনা
+			ঐতিহ্যবাহী ম্যান্ডারিন চীনা
 			জুলু
 			জুনি
 			ভাষাভিত্তিক বিষয়বস্তু নেই
@@ -868,8 +871,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			সেন্ট মার্টিন
 			মাদাগাস্কার
 			মার্শাল দ্বীপপুঞ্জ
-			ম্যাসাডোনিয়া
-			ম্যাসিডোনিয়া (FYROM)
+			উত্তর ম্যাসেডোনিয়া
 			মালি
 			মায়ানমার (বার্মা)
 			মঙ্গোলিয়া
@@ -979,6 +981,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ভানুয়াটু
 			ওয়ালিস ও ফুটুনা
 			সামোয়া
+			সিউডো-অ্যাকসেন্ট
+			সিউডো-বিডি
 			কসোভো
 			ইয়েমেন
 			মায়োত্তে
@@ -1176,8 +1180,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u09BC ৺ অ আ ই ঈ উ ঊ ঋ ৠ ঌ ৡ এ ঐ ও ঔ ং ঃ \u0981 ক {ক\u09CDষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড {ড\u09BC} ঢ {ঢ\u09BC} ণ ত ৎ থ দ ধ ন প ফ ব ভ ম য {য\u09BC} র ল শ ষ স হ ঽ া ি ী \u09C1 \u09C2 \u09C3 \u09C4 \u09E2 \u09E3 ে ৈ ো ৌ \u09CD ৗ]
 		[\u200C\u200D ৲ ৳ ৴ ৵ ৶ ৷ ৸ ৹ ৰ ৱ]
 		[অ আ ই ঈ উ ঊ ঋ এ ঐ ও ঔ ক {ক\u09CDষ} খ গ ঘ ঙ চ ছ জ ঝ ঞ ট ঠ ড ঢ ণ ত থ দ ধ ন প ফ ব ভ ম য র ল শ ষ স হ]
-		[\- , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0০ 1১ 2২ 3৩ 4৪ 5৫ 6৬ 7৭ 8৮ 9৯]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0} …
 		… {0}
 		{0} … {1}
@@ -1186,19 +1190,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1209,6 +1217,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1525,55 +1546,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							M/d/y – M/d/y GGGGG
-							M/d/y GGGGG – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
 						
 						
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y GGGGG – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y GGGGG – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							MMM d – d, y G
-							MMM d, y G – MMM d, y G
-							MMM d – MMM d, y G
-							MMM d, y – MMM d, y G
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
 						
 						
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y G – E, MMM d, y G
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M–M
@@ -2049,55 +2093,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							M/d/y – M/d/y GGGGG
-							M/d/y GGGGG – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
 						
 						
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y GGGGG – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							MMM d – d, y G
-							MMM d, y G – MMM d, y G
-							MMM d – MMM d, y G
-							MMM d, y – MMM d, y G
+							d – d MMM, y G
+							d MMM, y G – d MMM, y G
+							d MMM – d MMM, y G
+							d MMM, y – d MMM, y G
 						
 						
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y G – E, MMM d, y G
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y – E, MMM d, y G
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y G – E, d MMM, y G
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y – E, d MMM, y G
 						
 						
 							h a – h a
@@ -2294,6 +2329,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 				
 					
 						
@@ -2317,15 +2363,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						d MMM, y G
 						E, d MMM, y G
+						L
 						d/M
 						E, d-M
 						dd-MM
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -2344,6 +2414,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2701,6 +2807,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -4058,7 +4175,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				আকটোবে
 			
 			
-				কোস্টানয়
+				কোস্টানয়
 			
 			
 				কিজিলর্ডা
@@ -5644,6 +5761,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			.
 			,
 			%
 			+
@@ -5653,9 +5771,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			‰
 			∞
 			NaN
+			:
 		
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5720,8 +5844,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					00 কো
 					000 কো
 					000 কো
-					0000 কো
-					0000 কো
+					00 শত কো
+					00শত কো
 					00000 কো
 					00000 কো
 					0 লা'.'কো'.'
@@ -5816,6 +5940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সংযুক্ত আরব আমিরাত দিরহাম
 				সংযুক্ত আরব আমিরাত দিরহাম
 				সংযুক্ত আরব আমিরাত দিরহাম
+				AED
 			
 			
 				আফগানি (১৯২৭–২০০২)
@@ -5824,26 +5949,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				আফগান আফগানি
 				আফগান আফগানি
 				আফগান আফগানি
+				AFN
 			
 			
 				আলবেনিয়ান লেক
 				আলবেনিয়ান লেক
 				আলবেনিয়ান লেক
+				ALL
 			
 			
 				আরমেনিয়ান দ্রাম
 				আরমেনিয়ান দ্রাম
 				আরমেনিয়ান দ্রাম
+				AMD
 			
 			
 				নেদারল্যান্ড এ্যান্টিলিয়ান গুল্ডের
 				নেদারল্যান্ড এ্যান্টিলিয়ান গুল্ডের
 				নেদারল্যান্ড এ্যান্টিলিয়ান গুল্ডের
+				ANG
 			
 			
 				এ্যাঙ্গোলান কওয়ানজা
 				এ্যাঙ্গোলান কওয়ানজা
 				এ্যাঙ্গোলান কওয়ানজা
+				AOA
 				Kz
 			
 			
@@ -5865,6 +5995,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				আর্জেন্টিনা পেসো
 				আর্জেন্টিনা পেসো
 				আর্জেন্টিনা পেসো
+				ARS
 				$
 			
 			
@@ -5874,12 +6005,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				অস্ট্রেলিয়ান ডলার
 				অস্ট্রেলিয়ান ডলার
 				অস্ট্রেলিয়ান ডলার
+				A$
 				$
 			
 			
 				আরুবা গিল্ডার
 				আরুবা গিল্ডার
 				আরুবা গিল্ডার
+				AWG
 			
 			
 				আজারবাইজান মানাত (১৯৯৩–২০০৬)
@@ -5888,6 +6021,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				আজারবাইজান মানাত
 				আজারবাইজান মানাত
 				আজারবাইজান মানাত
+				AZN
 			
 			
 				বসনিয়া এবং হার্জেগোভিনা দিনার
@@ -5896,12 +6030,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				বসনিয়া এবং হার্জেগোভিনা বিনিমেয় মার্ক
 				বসনিয়া এবং হার্জেগোভিনা বিনিমেয় মার্ক
 				বসনিয়া এবং হার্জেগোভিনা বিনিমেয় মার্ক
+				BAM
 				KM
 			
 			
 				বার্বেডোজ ডলার
 				বার্বেডোজ ডলার
 				বার্বেডোজ ডলার
+				BBD
 				$
 			
 			
@@ -5927,33 +6063,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				বুলগেরীয় লেভ
 				বুলগেরীয় লেভ
 				বুলগেরীয় লেভা
+				BGN
 			
 			
 				বাহরাইনি দিনার
 				বাহরাইনি দিনার
 				বাহরাইনি দিনার
+				BHD
 			
 			
 				বুরুন্ডি ফ্রাঙ্ক
 				বুরুন্ডি ফ্রাঙ্ক
 				বুরুন্ডি ফ্রাঙ্ক
+				BIF
 			
 			
 				বারমিউডান ডলার
 				বারমিউডান ডলার
 				বারমিউডান ডলার
+				BMD
 				$
 			
 			
 				ব্রুনেই ডলার
 				ব্রুনেই ডলার
 				ব্রুনেই ডলার
+				BND
 				$
 			
 			
 				বলিভিয়ানো
 				বলিভিয়ানো
 				বলিভিয়ানো
+				BOB
 				Bs
 			
 			
@@ -5975,6 +6117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ব্রাজিলিয়ান রিয়েল
 				ব্রাজিলিয়ান রিয়েল
 				ব্রাজিলিয়ান রিয়েল
+				R$
 				R$
 			
 			
@@ -5987,12 +6130,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				বাহামিয়ান ডলার
 				বাহামিয়ান ডলার
 				বাহামিয়ান ডলার
+				BSD
 				$
 			
 			
 				ভুটানি এনগুল্ট্রুম
 				ভুটানি এনগুল্ট্রুম
 				ভুটানি এনগুল্ট্রুম
+				BTN
 			
 			
 				বর্মি কিয়াৎ
@@ -6001,6 +6146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				বতসোয়ানা পুলা
 				বতসোয়ানা পুলা
 				বতসোয়ানা পুলা
+				BWP
 				P
 			
 			
@@ -6010,29 +6156,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				বেলারুশিয়ান রুবেল
 				বেলারুশিয়ান রুবেল
 				বেলারুশিয়ান রুবেল
+				BYN
 				р.
 			
 			
 				বেলারুশিয়ান রুবেল (2000–2016)
 				বেলারুশিয়ান রুবেল (2000–2016)
 				বেলারুশিয়ান রুবেল (2000–2016)
+				BYR
 			
 			
 				বেলিজ ডলার
 				বেলিজ ডলার
 				বেলিজ ডলার
+				BZD
 				$
 			
 			
 				কানাডিয়ান ডলার
 				কানাডিয়ান ডলার
 				কানাডিয়ান ডলার
+				CA$
 				$
 			
 			
 				কঙ্গোলিস ফ্র্যাঙ্ক
 				কঙ্গোলিস ফ্র্যাঙ্ক
 				কঙ্গোলিস ফ্র্যাঙ্ক
+				CDF
 			
 			
 				সুইজারল্যান্ড ইউরো
@@ -6041,6 +6192,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সুইস ফ্রাঁ
 				সুইস ফ্রাঁ
 				সুইস ফ্রাঁ
+				CHF
 			
 			
 				সুইজারল্যান্ড ফ্রাঙ্ক
@@ -6052,6 +6204,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				চিলি পেসো
 				চিলি পেসো
 				চিলি পেসো
+				CLP
 				$
 			
 			
@@ -6064,12 +6217,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				চীনা য়ুয়ান
 				চীনা য়ুয়ান
 				চীনা য়ুয়ান
+				CN¥
 				¥
 			
 			
 				কলোম্বিয়ান পেসো
 				কলোম্বিয়ান পেসো
 				কলোম্বিয়ান পেসো
+				COP
 				$
 			
 			
@@ -6079,6 +6234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				কোস্টা রিকা কোলোন
 				কোস্টা রিকা কোলোন
 				কোস্টা রিকা কোলোন
+				CRC
 				₡
 			
 			
@@ -6091,18 +6247,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				কিউবান রূপান্তরযোগ্য পেসো
 				কিউবান রূপান্তরযোগ্য পেসো
 				কিউবান রূপান্তরযোগ্য পেসো
+				CUC
 				$
 			
 			
 				কিউবান পেসো
 				কিউবান পেসো
 				কিউবান পেসো
+				CUP
 				$
 			
 			
 				কেপ ভার্দে এসকুডো
 				কেপ ভার্দে এসকুডো
 				কেপ ভার্দে এসকুডো
+				CVE
 			
 			
 				সাইপ্রাস পাউন্ড
@@ -6111,6 +6270,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				চেক প্রজাতন্ত্র কোরুনা
 				চেক প্রজাতন্ত্র কোরুনা
 				চেক প্রজাতন্ত্র কোরুনা
+				CZK
 				Kč
 			
 			
@@ -6123,23 +6283,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				জিবুতি ফ্রাঙ্ক
 				জিবুতি ফ্রাঙ্ক
 				জিবুতি ফ্রাঙ্ক
+				DJF
 			
 			
 				ড্যানিশ ক্রোন
 				ড্যানিশ ক্রোন
 				ড্যানিশ ক্রৌন
+				DKK
 				kr
 			
 			
 				ডোমিনিকান পেসো
 				ডোমিনিকান পেসো
 				ডোমিনিকান পেসো
+				DOP
 				$
 			
 			
 				আলজেরীয় দিনার
 				আলজেরীয় দিনার
 				আলজেরীয় দিনার
+				DZD
 			
 			
 				ইকুয়াডোর সুক্রে
@@ -6154,12 +6318,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মিশরীয় পাউন্ড
 				মিশরীয় পাউন্ড
 				মিশরীয় পাউন্ড
+				EGP
 				E£
 			
 			
 				এরিট্রিয়েন নাকফা
 				এরিট্রিয়েন নাকফা
 				এরিট্রিয়েন নাকফা
+				ERN
 			
 			
 				স্প্যানিশ পেসেতা (একই হিসাব)
@@ -6174,11 +6340,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ইথিওপিয়ান বির
 				ইথিওপিয়ান বির
 				ইথিওপিয়ান বির
+				ETB
 			
 			
 				ইউরো
 				ইউরো
 				ইউরো
+				€
 				€
 			
 			
@@ -6188,12 +6356,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ফিজি ডলার
 				ফিজি ডলার
 				ফিজি ডলার
+				FJD
 				$
 			
 			
 				ফকল্যান্ড দ্বীপপুঞ্জ পাউন্ড
 				ফকল্যান্ড দ্বীপপুঞ্জ পাউন্ড
 				ফকল্যান্ড দ্বীপপুঞ্জ পাউন্ড
+				FKP
 				£
 			
 			
@@ -6203,6 +6373,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ব্রিটিশ পাউন্ড
 				ব্রিটিশ পাউন্ড
 				ব্রিটিশ পাউন্ড
+				£
 				£
 			
 			
@@ -6212,6 +6383,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				জর্জিয়ান লারি
 				জর্জিয়ান লারি
 				জর্জিয়ান লারি
+				GEL
 				₾
 				₾
 			
@@ -6222,22 +6394,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ঘানা সেডি
 				ঘানা সেডি
 				ঘানা সেডি
+				GHS
 			
 			
 				জিব্রাল্টার পাউন্ড
 				জিব্রাল্টার পাউন্ড
 				জিব্রাল্টার পাউন্ড
+				GIP
 				£
 			
 			
 				গাম্বিয়া ডালাসি
 				গাম্বিয়া ডালাসি
 				গাম্বিয়া ডালাসি
+				GMD
 			
 			
 				গিনি ফ্রাঙ্ক
 				গিনি ফ্রাঙ্ক
 				গিনি ফ্রাঙ্ক
+				GNF
 				FG
 			
 			
@@ -6253,6 +6429,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				গুয়াতেমালা কুয়েৎজাল
 				গুয়াতেমালা কুয়েৎজাল
 				গুয়াতেমালা কুয়েৎজাল
+				GTQ
 				Q
 			
 			
@@ -6265,18 +6442,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				গাইয়েনা ডলার
 				গাইয়েনা ডলার
 				গাইয়েনা ডলার
+				GYD
 				$
 			
 			
 				হংকং ডলার
 				হংকং ডলার
 				হংকং ডলার
+				HK$
 				$
 			
 			
 				হন্ডুরাস লেম্পিরা
 				হন্ডুরাস লেম্পিরা
 				হন্ডুরাস লেম্পিরা
+				HNL
 				L
 			
 			
@@ -6286,23 +6466,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ক্রোয়েশিয়ান কুনা
 				ক্রোয়েশিয়ান কুনা
 				ক্রোয়েশিয়ান কুনা
+				HRK
 				kn
 			
 			
 				হাইতি গৌর্দে
 				হাইতি গৌর্দে
 				হাইতি গৌর্দে
+				HTG
 			
 			
 				হাঙ্গেরিয়ান ফোরিন্ট
 				হাঙ্গেরিয়ান ফোরিন্ট
 				হাঙ্গেরিয়ান ফোরিন্ট
+				HUF
 				Ft
 			
 			
 				ইন্দোনেশিয়ান রুপিয়াহ
 				ইন্দোনেশিয়ান রুপিয়াহ
 				ইন্দোনেশিয়ান রুপিয়াহ
+				IDR
 				Rp
 			
 			
@@ -6315,28 +6499,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ইস্রাইলি নতুন শেকেল
 				ইস্রাইলি নতুন শেকেল
 				ইস্রাইলি নতুন শেকেল
+				₪
 				₪
 			
 			
 				ভারতীয় রুপি
 				ভারতীয় রুপি
 				ভারতীয় রুপি
+				₹
 				₹
 			
 			
 				ইরাকি দিনার
 				ইরাকি দিনার
 				ইরাকি দিনার
+				IQD
 			
 			
 				ইরানিয়ান রিয়াল
 				ইরানিয়ান রিয়াল
 				ইরানিয়ান রিয়াল
+				IRR
 			
 			
 				আইসল্যান্ডীয় ক্রোনা
 				আইসল্যান্ডীয় ক্রোনা
 				আইসল্যান্ড ক্রৌন
+				ISK
 				kr
 			
 			
@@ -6346,92 +6535,108 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				জামাইকান ডলার
 				জামাইকান ডলার
 				জামাইকান ডলার
+				JMD
 				$
 			
 			
 				জর্ডানিয়ান দিনার
 				জর্ডানিয়ান দিনার
 				জর্ডানিয়ান দিনার
+				JOD
 			
 			
 				জাপানি ইয়েন
 				জাপানি ইয়েন
 				জাপানি ইয়েন
+				JP¥
 				¥
 			
 			
 				কেনিয়ান শিলিং
 				কেনিয়ান শিলিং
 				কেনিয়ান শিলিং
+				KES
 			
 			
 				কিরগিজস্তান সোম
 				কিরগিজস্তান সোম
 				কিরগিজস্তান সোম
+				KGS
 			
 			
 				কম্বোডিয়ান রিয়েল
 				কম্বোডিয়ান রিয়েল
 				কম্বোডিয়ান রিয়েল
+				KHR
 				៛
 			
 			
 				কম্বোরো ফ্রাঙ্ক
 				কমোরিয়ান ফ্রাঙ্ক
 				কমোরিয়ান ফ্রাঙ্ক
+				KMF
 				CF
 			
 			
 				উত্তর কোরিয়ার ওন
 				উত্তর কোরিয়ার ওন
 				উত্তর কোরিয়ার ওন
+				KPW
 				₩
 			
 			
 				দক্ষিণ কোরিয়ান ওন
 				দক্ষিণ কোরিয়ান ওন
 				দক্ষিণ কোরিয়ান ওন
+				₩
 				₩
 			
 			
 				কুয়েতি দিনার
 				কুয়েতি দিনার
 				কুয়েতি দিনার
+				KWD
 			
 			
 				কেম্যান দ্বীপপুঞ্জের ডলার
 				কেম্যান দ্বীপপুঞ্জের ডলার
 				কেম্যান দ্বীপপুঞ্জের ডলার
+				KYD
 				$
 			
 			
 				কাজাখাস্তানি টেঙ্গে
 				কাজাখাস্তানি টেঙ্গে
 				কাজাখাস্তানি টেঙ্গে
+				KZT
 				₸
 			
 			
 				লেউশান কিপ
 				লেউশান কিপ
 				লেউশান কিপ
+				LAK
 				₭
 			
 			
 				লেবানিজ পাউন্ড
 				লেবানিজ পাউন্ড
 				লেবানিজ পাউন্ড
+				LBP
 				L£
 			
 			
 				শ্রীলঙ্কান রুপি
 				শ্রীলঙ্কান রুপি
 				শ্রীলঙ্কান রুপি
+				LKR
 				Rs
 			
 			
 				লিবেরিয়ান ডলার
 				লিবেরিয়ান ডলার
 				লিবেরিয়ান ডলার
+				LRD
 				$
 			
 			
@@ -6441,6 +6646,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				লিথুইনিয়ান লিটা
 				লিথুইনিয়ান লিটা
 				লিথুইনিয়ান লিটা
+				LTL
 			
 			
 				লিথুইনিয়ান টালোন্যাস
@@ -6458,6 +6664,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ল্যাটভিয়ান ল্যাট্‌স
 				ল্যাটভিয়ান ল্যাট্‌স
 				ল্যাটভিয়ান ল্যাট্‌স
+				LVL
 			
 			
 				ল্যাটভিয়ান রুবল
@@ -6466,11 +6673,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				লিবিয়ান দিনার
 				লিবিয়ান দিনার
 				লিবিয়ান দিনার
+				LYD
 			
 			
 				মোরোক্কান দিরহাম
 				মোরোক্কান দিরহাম
 				মোরোক্কান দিরহাম
+				MAD
 			
 			
 				মোরোক্কান ফ্রাঙ্ক
@@ -6479,11 +6688,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মোল্ডোভান লেয়ু
 				মোল্ডোভান লেয়ু
 				মোল্ডোভান লেয়ু
+				MDL
 			
 			
 				মাদাগাস্কার আরিয়ারি
 				মাদাগাস্কার আরিয়ারি
 				মাদাগাস্কার আরিয়ারি
+				MGA
 				Ar
 			
 			
@@ -6493,6 +6704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ম্যাসেডোনিয়ান দিনার
 				ম্যাসেডোনিয়ান দিনার
 				ম্যাসেডোনিয়ান দিনার
+				MKD
 			
 			
 				মালি ফ্রাঙ্ক
@@ -6501,28 +6713,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মায়ানমার কিয়াত
 				মায়ানমার কিয়াত
 				মায়ানমার কিয়াত
+				MMK
 				K
 			
 			
 				মঙ্গোলিয়ান তুগরিক
 				মঙ্গোলিয়ান তুগরিক
 				মঙ্গোলিয়ান তুগরিক
+				MNT
 				₮
 			
 			
 				ম্যাক্যাও পাটাকা
 				ম্যাক্যাও পাটাকা
 				ম্যাক্যাও পাটাকা
+				MOP
 			
 			
 				মৌরিতানিয়ান ওউগুইয়া (১৯৭৩–২০১৭)
 				মৌরিতানিয়ান ওউগুইয়া (১৯৭৩–২০১৭)
 				মৌরিতানিয়ান ওউগুইয়া (১৯৭৩–২০১৭)
+				MRO
 			
 			
 				মৌরিতানিয়ান ওউগুইয়া
 				মৌরিতানিয়ান ওউগুইয়া
 				মৌরিতানিয়ান ওউগুইয়া
+				MRU
 			
 			
 				মাল্টা লিরা
@@ -6534,22 +6751,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মৌরিতানিয়ান রুপি
 				মৌরিতানিয়ান রুপি
 				মৌরিতানিয়ান রুপি
+				MUR
 				Rs
 			
 			
 				মালদিভিয়ান রুফিয়া
 				মালদিভিয়ান রুফিয়া
 				মালদিভিয়ান রুফিয়া
+				MVR
 			
 			
 				মালাউইয়ান কওয়াচ
 				মালাউইয়ান কওয়াচ
 				মালাউইয়ান কওয়াচ
+				MWK
 			
 			
 				ম্যাক্সিকান পেসো
 				ম্যাক্সিকান পেসো
 				ম্যাক্সিকান পেসো
+				MX$
 				$
 			
 			
@@ -6562,6 +6783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মালয়েশিয়ান রিঙ্গিৎ
 				মালয়েশিয়ান রিঙ্গিৎ
 				মালয়েশিয়ান রিঙ্গিৎ
+				MYR
 				RM
 			
 			
@@ -6574,17 +6796,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				মোজাম্বিক মেটিকেল
 				মোজাম্বিক মেটিকেল
 				মোজাম্বিক মেটিকেল
+				MZN
 			
 			
 				নামিবিয়া ডলার
 				নামিবিয়া ডলার
 				নামিবিয়া ডলার
+				NAD
 				$
 			
 			
 				নাইজেরিয়ান নায়রা
 				নাইজেরিয়ান নায়রা
 				নাইজেরিয়ান নায়রা
+				NGN
 				₦
 			
 			
@@ -6594,6 +6819,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				নিকারাগুয়ান কর্ডোবা
 				নিকারাগুয়ান কর্ডোবা
 				নিকারাগুয়ান কর্ডোবা
+				NIO
 				C$
 			
 			
@@ -6603,29 +6829,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				নরওয়েজিয়ান ক্রোন
 				নরওয়েজিয়ান ক্রোন
 				নরওয়েজিয়ান ক্রোনার
+				NOK
 				kr
 			
 			
 				নেপালি রুপি
 				নেপালি রুপি
 				নেপালি রুপি
+				NPR
 				Rs
 			
 			
 				নিউজিল্যান্ড ডলার
 				নিউজিল্যান্ড ডলার
 				নিউজিল্যান্ড ডলার
+				NZ$
 				$
 			
 			
 				ওমানি রিয়াল
 				ওমানি রিয়াল
 				ওমানি রিয়াল
+				OMR
 			
 			
 				পানামা বেলবোয়া
 				পানামা বেলবোয়া
 				পানামা বেলবোয়া
+				PAB
 			
 			
 				পেরুভিয়ান ইন্তি
@@ -6634,6 +6865,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				পেরুভিয়ান সোল
 				পেরুভিয়ান সোল
 				পেরুভিয়ান সোল
+				PEN
 			
 			
 				পেরুভিয়ান সোল (1863–1965)
@@ -6644,23 +6876,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				পাপুয়া নিউ গিনিয়ান কিনা
 				পাপুয়া নিউ গিনিয়ান কিনা
 				পাপুয়া নিউ গিনিয়ান কিনা
+				PGK
 			
 			
 				ফিলিপাইন পেসো
 				ফিলিপাইন পেসো
 				ফিলিপাইন পেসো
+				PHP
 				₱
 			
 			
 				পাকিস্তানি রুপি
 				পাকিস্তানি রুপি
 				পাকিস্তানি রুপি
+				PKR
 				Rs
 			
 			
 				পোলিশ জ্লোটি
 				পোলিশ জ্লোটি
 				পোলিশ জ্লোটি
+				PLN
 				zł
 			
 			
@@ -6673,12 +6909,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				প্যারাগুয়ান গুয়ারানি
 				প্যারাগুয়ান গুয়ারানি
 				প্যারাগুয়ান গুয়ারানি
+				PYG
 				₲
 			
 			
 				কাতার রিয়াল
 				কাতার রিয়াল
 				কাতার রিয়াল
+				QAR
 			
 			
 				রোডেশিয়ান ডলার
@@ -6690,17 +6928,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				রুমানিয়া লেয়ু
 				রুমানিয়া লেয়ু
 				রুমানিয়া লেয়ু
+				RON
 				lei
 			
 			
 				সারবিয়ান দিনার
 				সারবিয়ান দিনার
 				সারবিয়ান দিনার
+				RSD
 			
 			
 				রাশিয়ান রুবেল
 				রাশিয়ান রুবেল
 				রাশিয়ান রুবেল
+				RUB
 				₽
 			
 			
@@ -6710,23 +6951,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				রুয়ান্ডান ফ্রাঙ্ক
 				রুয়ান্ডান ফ্রাঙ্ক
 				রুয়ান্ডান ফ্রাঙ্ক
+				RWF
 				RF
 			
 			
 				সৌদি রিয়াল
 				সৌদি রিয়াল
 				সৌদি রিয়াল
+				SAR
 			
 			
 				সলোমন দ্বীপপুঞ্জ ডলার
 				সলোমন দ্বীপপুঞ্জ ডলার
 				সলোমন দ্বীপপুঞ্জ ডলার
+				SBD
 				$
 			
 			
 				সেয়চেল্লোইস রুপি
 				সেয়চেল্লোইস রুপি
 				সেয়চেল্লোইস রুপি
+				SCR
 			
 			
 				প্রাচীন সুদানি দিনার
@@ -6735,6 +6980,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সুদানি পাউন্ড
 				সুদানি পাউন্ড
 				সুদানি পাউন্ড
+				SDG
 			
 			
 				প্রাচীন সুদানি পাউন্ড
@@ -6743,18 +6989,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সুইডিশ ক্রোনা
 				সুইডিশ ক্রোনা
 				সুইডিশ ক্রোনা
+				SEK
 				kr
 			
 			
 				সিঙ্গাপুর ডলার
 				সিঙ্গাপুর ডলার
 				সিঙ্গাপুর ডলার
+				SGD
 				$
 			
 			
 				সেন্ট হেলেনা পাউন্ড
 				সেন্ট হেলেনা পাউন্ড
 				সেন্ট হেলেনা পাউন্ড
+				SHP
 				£
 			
 			
@@ -6767,16 +7016,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সিয়েরালিয়ন লিয়ন
 				সিয়েরালিয়ন লিয়ন
 				সিয়েরালিয়ন লিয়ন
+				SLL
 			
 			
 				সোমালি শিলিং
 				সোমালি শিলিং
 				সোমালি শিলিং
+				SOS
 			
 			
 				সুরিনাম ডলার
 				সুরিনাম ডলার
 				সুরিনাম ডলার
+				SRD
 				$
 			
 			
@@ -6786,17 +7038,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				দক্ষিণ সুদানি পাউন্ড
 				দক্ষিণ সুদানি পাউন্ড
 				দক্ষিণ সুদানি পাউন্ড
+				SSP
 				£
 			
 			
 				সাও টোমে এবং প্রিন্সিপে ডোবরা (১৯৭৭–২০১৭)
 				সাও টোমে এবং প্রিন্সিপে ডোবরা (১৯৭৭–২০১৭)
 				সাও টোমে এবং প্রিন্সিপে ডোবরা (১৯৭৭–২০১৭)
+				STD
 			
 			
 				সাও টোমে এবং প্রিন্সিপে ডোবরা
 				সাও টোমে এবং প্রিন্সিপে ডোবরা
 				সাও টোমে এবং প্রিন্সিপে ডোবরা
+				STN
+				Db
 			
 			
 				সোভিয়েত রুবল
@@ -6808,12 +7064,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সিরিয়ান পাউন্ড
 				সিরিয়ান পাউন্ড
 				সিরিয়ান পাউন্ড
+				SYP
 				£
 			
 			
 				সোয়াজিল্যান্ড লিলাঙ্গেনি
 				সোয়াজিল্যান্ড লিলাঙ্গেনি
 				সোয়াজিল্যান্ড লিলাঙ্গেনি
+				SZL
 			
 			
 				থাই বাত
@@ -6829,6 +7087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				তাজিকিস্তান সোমোনি
 				তাজিকিস্তান সোমোনি
 				তাজিকিস্তান সোমোনি
+				TJS
 			
 			
 				তুর্কমেনিস্টানি মানাত
@@ -6837,16 +7096,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				তুর্কমেনিস্তান মানত
 				তুর্কমেনিস্তান মানত
 				তুর্কমেনিস্তান মানত
+				TMT
 			
 			
 				তিউনেশিয়ান দিনার
 				তিউনেশিয়ান দিনার
 				তিউনেশিয়ান দিনার
+				TND
 			
 			
 				টোঙ্গা পা’আঙ্গা
 				টোঙ্গা পা’আঙ্গা
 				টোঙ্গা পা’আঙ্গা
+				TOP
 				T$
 			
 			
@@ -6859,6 +7121,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				তুর্কি লিরা
 				তুর্কি লিরা
 				তুর্কি লিরা
+				TRY
 				₺
 				TL
 			
@@ -6866,23 +7129,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ত্রিনিদাদ এবং টোবাগো ডলার
 				ত্রিনিদাদ এবং টোবাগো ডলার
 				ত্রিনিদাদ এবং টোবাগো ডলার
+				TTD
 				$
 			
 			
 				নতুন তাইওয়ান ডলার
 				নতুন তাইওয়ান ডলার
 				নতুন তাইওয়ান ডলার
+				NT$
 				NT$
 			
 			
 				তাঞ্জনিয়া শিলিং
 				তাঞ্জনিয়া শিলিং
 				তাঞ্জনিয়া শিলিং
+				TZS
 			
 			
 				ইউক্রেইন হৃভনিয়া
 				ইউক্রেইন হৃভনিয়া
 				ইউক্রেইন হৃভনিয়া
+				UAH
 				₴
 			
 			
@@ -6895,11 +7162,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				উগান্ডান শিলিং
 				উগান্ডান শিলিং
 				উগান্ডান শিলিং
+				UGX
 			
 			
 				মার্কিন ডলার
 				মার্কিন ডলার
 				মার্কিন ডলার
+				US$
 				$
 			
 			
@@ -6918,12 +7187,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				উরুগুয়ে পেসো
 				উরুগুয়ে পেসো
 				উরুগুয়ে পেসো
+				UYU
 				$
 			
 			
 				উজবেকিস্তানি সোম
 				উজবেকিস্তানি সোম
 				উজবেকিস্তানি সোম
+				UZS
 			
 			
 				ভেনিজুয়েলান বলিভার (১৮৭১–২০০৮)
@@ -6932,33 +7203,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ভেনিজুয়েলীয় বলিভার (২০০৮–২০১৮)
 				ভেনিজুয়েলীয় বলিভার (২০০৮–২০১৮)
 				ভেনিজুয়েলীয় বলিভার (২০০৮–২০১৮)
+				VEF
 				Bs
 			
 			
 				ভেনিজুয়েলীয় বলিভার
 				ভেনিজুয়েলীয় বলিভার
 				ভেনিজুয়েলীয় বলিভার
+				VES
 			
 			
 				ভিয়েতনামি ডঙ্গ
 				ভিয়েতনামি ডঙ্গ
 				ভিয়েতনামি ডঙ্গ
+				₫
 				₫
 			
 			
 				ভানুয়াতু ভাতু
 				ভানুয়াতু ভাতু
 				ভানুয়াতু ভাতু
+				VUV
 			
 			
 				সামোয়ান টালা
 				সামোয়ান টালা
 				সামোয়ান টালা
+				WST
 			
 			
 				মধ্য আফ্রিকান [CFA] ফ্র্যাঙ্ক
 				মধ্য আফ্রিকান [CFA] ফ্র্যাঙ্ক
 				মধ্য আফ্রিকান [CFA] ফ্র্যাঙ্ক
+				FCFA
 			
 			
 				সিলভার
@@ -6973,6 +7250,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				পূর্ব ক্যারাবিয়ান ডলার
 				পূর্ব ক্যারাবিয়ান ডলার
 				পূর্ব ক্যারাবিয়ান ডলার
+				EC$
 				$
 			
 			
@@ -6988,6 +7266,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				পশ্চিম আফ্রিকান [CFA] ফ্র্যাঙ্ক
 				পশ্চিম আফ্রিকান [CFA] ফ্র্যাঙ্ক
 				পশ্চিম আফ্রিকান [CFA] ফ্র্যাঙ্ক
+				CFA
 			
 			
 				প্যালেডিয়াম
@@ -6996,6 +7275,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				সিএফপি ফ্র্যাঙ্ক
 				সিএফপি ফ্র্যাঙ্ক
 				সিএফপি ফ্র্যাঙ্ক
+				CFPF
 			
 			
 				প্লাটিনাম
@@ -7012,6 +7292,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ইয়েমেনি রিয়াল
 				ইয়েমেনি রিয়াল
 				ইয়েমেনি রিয়াল
+				YER
 			
 			
 				যুগোশ্লাভিয় হার্ড দিনার
@@ -7029,6 +7310,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				দক্ষিণ আফ্রিকান রেন্ড
 				দক্ষিণ আফ্রিকান রেন্ড
 				দক্ষিণ আফ্রিকান রেন্ড
+				ZAR
 				R
 			
 			
@@ -7038,6 +7320,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				জাম্বিয়ান কওয়াচা
 				জাম্বিয়ান কওয়াচা
 				জাম্বিয়ান কওয়াচা
+				ZMW
 				ZK
 			
 			
@@ -7057,7 +7340,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
@@ -7161,9 +7446,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				প্রতি বর্গ ইঞ্চিতে {0}
 			
 			
-				দুনাম্স
-				{0} দুনাম্স
-				{0} দুনাম্স
+				দুনাম্স
+				{0} দুনাম্স
+				{0} দুনাম্স
 			
 			
 				ক্যারেট
@@ -7186,24 +7471,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ভাগ, প্রতি মিলিয়নে
 			
 			
-				শতাংশ
-				{0}শতাংশ
-				{0}শতাংশ
+				শতাংশ
+				{0}শতাংশ
+				{0}শতাংশ
 			
 			
-				প্রতিমাইল
-				{0} প্রতিমাইল
-				{0}প্রতিমাইল
-			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				প্রতিমাইল
+				{0} প্রতিমাইল
+				{0}প্রতিমাইল
 			
 			
 				লিটার, প্রতি কিলোমিটারে
@@ -7226,9 +7501,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} মাইল, প্রতি ইম্পেরিয়াল গ্যালনে
 			
 			
-				পেটাবাইটস
-				{0} পেটাবাইটস
-				{0} পেটাবাইটস
+				পেটাবাইটস
+				{0} পেটাবাইটস
+				{0} পেটাবাইটস
 			
 			
 				টেরাবাইট
@@ -7285,6 +7560,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} শতাব্দী
 				{0} শতাব্দী
 			
+			
+				দশক
+				{0} দশক
+				{0} দশক
+			
 			
 				বছর
 				{0} বছর
@@ -7393,24 +7673,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} কিলোওয়াট ঘন্টা
 			
 			
-				ইলেকট্রন ভোল্ট
-				{0} ইলেকট্রন ভোল্ট
-				{0} ইলেকট্রন ভোল্ট
+				ইলেকট্রন ভোল্ট
+				{0} ইলেকট্রন ভোল্ট
+				{0} ইলেকট্রন ভোল্ট
 			
 			
-				ব্রিটিশ থার্মাল ইউনিট
-				{0} ব্রিটিশ থার্মাল ইউনিট
-				{0} ব্রিটিশ থার্মাল ইউনিট
+				ব্রিটিশ থার্মাল ইউনিট
+				{0} ব্রিটিশ থার্মাল ইউনিট
+				{0} ব্রিটিশ থার্মাল ইউনিট
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
+			
+				US থার্ম
+				{0} US থার্ম
+				{0} US থার্ম
 			
 			
-				নিউটন্স
-				{0} নিউটন
-				{0} নিউটন্স
+				নিউটন্স
+				{0} নিউটন
+				{0} নিউটন্স
 			
 			
 				গিগাহার্জ
@@ -7432,6 +7712,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} হার্জ
 				{0} হার্জ
 			
+			
+				টাইপোগ্রাফিক em
+			
+			
+				পিক্সেল
+				{0} পিক্সেল
+				{0} পিক্সেল
+			
+			
+				মেগাপিক্সেল
+				{0} মেগাপিক্সেল
+				{0} মেগাপিক্সেল
+			
+			
+				সেন্টিমিটার প্রতি পিক্সেল
+				সেন্টিমিটার প্রতি {0} পিক্সেল
+				সেন্টিমিটার প্রতি {0} পিক্সেল
+			
+			
+				ইঞ্চি প্রতি পিক্সেল
+				ইঞ্চি প্রতি {0} পিক্সেল
+				ইঞ্চি প্রতি {0} পিক্সেল
+			
+			
+				সেন্টিমিটার প্রতি বিন্দু
+				সেন্টিমিটার প্রতি {0} বিন্দু
+				সেন্টিমিটার প্রতি {0} বিন্দু
+			
+			
+				ইঞ্চি প্রতি বিন্দু
+				ইঞ্চি প্রতি {0} বিন্দু
+				ইঞ্চি প্রতি {0} বিন্দু
+			
 			
 				কিলোমিটার
 				{0} কিলোমিটার
@@ -7518,6 +7831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ফার্লং
 			
 			
+				fm
 				{0} fth
 				{0} fth
 			
@@ -7537,20 +7851,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
+				সৌর রেডি
+				{0} সৌর রেডিয়াস
+				{0} সৌর রেডি
 			
 			
 				লাক্স
 				{0} লাক্স
 				{0} লাক্স
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				মেট্রিক টন
 				{0} মেট্রিক টন
@@ -7583,6 +7892,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} টন
 				{0} টন
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				পাউন্ড
 				{0} পাউন্ড
@@ -7606,19 +7920,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ক্যারেট
 			
 			
-				ড্যালটন্স
-				{0} ড্যালটন্স
-				{0} ড্যালটন্স
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+				ড্যালটন্স
+				{0} ড্যালটন্স
+				{0} ড্যালটন্স
 			
 			
 				গিগাওয়াট
@@ -7650,11 +7954,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} হর্সপাওয়ার
 				{0} হর্সপাওয়ার
 			
-			
-				হেক্টোপাসকল
-				{0} হেক্টোপাসকল
-				{0} হেক্টোপাসকল
-			
 			
 				মিলিমিটার পারদ
 				{0} মিলিমিটার পারদ
@@ -7670,20 +7969,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ইঞ্চি পারদ
 				{0} ইঞ্চি পারদ
 			
+			
+				বার
+				{0} বার
+				{0} বার
+			
 			
 				মিলিবার
 				{0} মিলিবার
 				{0} মিলিবার
 			
+			
+				atm
+				{0} atm
+				{0} atm
+			
+			
+				প্যাসকেল
+				{0} প্যাসকেল
+				{0} প্যাসকেল
+			
+			
+				হেক্টোপাসকল
+				{0} হেক্টোপাসকল
+				{0} হেক্টোপাসকল
+			
 			
-				কিলোপ্যাসকেল
-				{0} কিলোপ্যাসকেল
-				{0} কিলোপ্যাসকেল
+				কিলোপ্যাসকেল
+				{0} কিলোপ্যাসকেল
+				{0} কিলোপ্যাসকেল
 			
 			
-				মেগাপাস্কেল
-				{0} মেগাপাস্কাল
-				{0} মেগাপাস্কাল
+				মেগাপাস্কেল
+				{0} মেগাপাস্কাল
+				{0} মেগাপাস্কাল
 			
 			
 				ঘন্টা প্রতি কিলোমিটার
@@ -7725,15 +8044,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} কেলভিন
 				{0} কেলভিন
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
-				নিউটন-একক
-				{0} নিউটন-একক
-				{0} নিউটন-এককগুলি
+				নিউটন-একক
+				{0} নিউটন-একক
+				{0} নিউটন-এককগুলি
 			
 			
 				কিউবিক কিলোমিটার
@@ -7851,9 +8165,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ফ্লুইড আউন্স
 			
 			
-				Imp. fl oz
-				{0} Imp. fl oz
-				{0} Imp. fluid ounces
+				{0} Imp. fl oz
+				{0} Imp. fluid ounces
 			
 			
 				টেবিল-চামচ
@@ -7866,12 +8179,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} চা-চামচ
 			
 			
-				ব্যারেল
-				{0} ব্য়ারেল
-				{0} ব্যারেল
+				ব্যারেল
+				{0} ব্য়ারেল
+				{0} ব্যারেল
 			
 			
-				প্রধান দিকনির্দেশ
+				প্রধান দিকনির্দেশ
 				{0} পূর্ব
 				{0} উত্তর
 				{0} দক্ষিণ
@@ -7968,9 +8281,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in²
 			
 			
-				দুনাম্স
-				{0} দুনাম্স
-				{0} দুনাম
+				দুনাম্স
+				{0} দুনাম্স
+				{0} দুনাম
 			
 			
 				ক্যারেট
@@ -7993,20 +8306,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ppm
 			
 			
-				শতাংশ
+				শতাংশ
+				{0}%
+				{0}%
 			
 			
-				প্রতিমাইল
-			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				প্রতিমাইল
+				{0}‰
+				{0}‰
 			
 			
 				লিটার/কিমি
@@ -8029,7 +8336,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg Imp.
 			
 			
-				PByte
+				PByte
+				{0} PB
+				{0} PB
 			
 			
 				TByte
@@ -8086,6 +8395,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} শতক
 				{0} শতক
 			
+			
+				দশক
+				{0} দশক
+				{0} দশক
+			
 			
 				বছর
 				{0} বছর
@@ -8194,24 +8508,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				ইলেকট্রন ভোল্ট
-				{0} eV
-				{0} eV
+				ইলেকট্রন ভোল্ট
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
+			
+				US থার্ম
+				{0} US থার্ম
+				{0} US থার্ম
 			
 			
-				নিউটন
-				{0} N
-				{0} N
+				নিউটন
 			
 			
 				GHz
@@ -8233,6 +8538,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				পিক্সেল
+			
+			
+				মেগাপিক্সেল
+			
+			
+				ppcm
+			
 			
 				কিলোমিটার
 				{0} কিমি
@@ -8319,6 +8633,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ফার্লং
 			
 			
+				fm
 				{0} fth
 				{0} fth
 			
@@ -8338,20 +8653,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
+				সৌর রেডি
 			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -8384,6 +8692,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tn
 				{0} tn
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				পাউন্ড
 				{0} পাউন্ড
@@ -8407,19 +8720,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 			
 			
-				ড্যালটন্স
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+				ড্যালটন্স
 			
 			
 				GW
@@ -8451,11 +8752,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8471,20 +8767,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				বার
+				{0} বার
+				{0} বার
+			
 			
 				mbar
 				{0} mbar
 				{0} mbar
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				atm
+				{0} atm
+				{0} atm
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -8526,16 +8827,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				কিউবিক কিলোমিটার
 				{0} কিউবিক কিলোমিটার
@@ -8652,9 +8943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				Imp. fl oz
 			
 			
 				tbsp
@@ -8667,12 +8956,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 			
 			
-				ব্যারেল
-				{0} bbl
-				{0} bbl
+				ব্যারেল
 			
 			
-				দিকনির্দেশ
+				দিকনির্দেশ
 				{0}পূ
 				{0} উ
 				{0} দ
@@ -8688,6 +8975,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} জি-বল
 				{0} জি-বল
 			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
+			
 			
 				{0}ডিগ্রী
 				{0}ডিগ্রী
@@ -8725,7 +9017,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} বর্গ ফুট
 			
 			
-				শতাংশ
+				শতাংশ
+				{0}%
+				{0}%
 			
 			
 				L/100km
@@ -8822,6 +9116,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} মিমি
 				{0} মিমি
 			
+			
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+			
 			
 				পিমি
 				{0} পিমি
@@ -8851,23 +9154,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				parsecs
+				{0} pc
+				{0} pc
 			
 			
 				আলোকবর্ষ
 				{0} আলোকবর্ষ
 				{0} আলোকবর্ষ
 			
+			
+				au
+				{0} au
+				{0} au
+			
 			
 				ফার্লং
 				{0} ফার্লং
 				{0} ফার্লং
 			
 			
+				fm
 				{0} fth
 				{0} fth
 			
+			
+				nmi
+				{0} nmi
+				{0} nmi
+			
+			
+				smi
+				{0} smi
+				{0} smi
+			
 			
 				pts
+				{0} pt
+				{0} pt
 			
 			
 				টন
@@ -8891,11 +9214,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/মিগ্রা:
 				{0}/মিগ্রা:
 			
+			
+				µg
+				{0} µg
+				{0} µg
+			
 			
 				টন
 				{0} টন
 				{0} টন
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				পাউন্ড
 				{0} পাউন্ড
@@ -8908,25 +9241,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} আউন্স
 				{0}/আউন্স
 			
+			
+				oz t
+				{0} oz t
+				{0} oz t
+			
 			
 				ক্যারেট
+				{0} CD
+				{0} CD
+			
+			
+				{0} kW
+				{0} kW
 			
 			
 				{0} ওয়াট
 				{0} ওয়াট
 			
-			
-				{0} hPa
-				{0} hPa
+			
+				{0} hp
+				{0} hp
+			
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+				{0} psi
 			
 			
+				inHg
 				{0} inHg
 				{0} inHg
 			
 			
+				mbar
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/hr
 				{0}kph
@@ -8942,15 +9303,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mph
 				{0}mph
 			
+			
+				kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0}°C
 				{0}°C
 			
 			
+				°F
 				{0}°F
 				{0}°F
 			
+			
+				K
+				{0} K
+				{0} K
+			
 			
 				{0}km³
 				{0}km³
@@ -8965,7 +9342,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} লিটার
 			
 			
-				দিকনির্দেশ
+				দিকনির্দেশ
 				{0}পূ
 				{0}উ
 				{0}দ
@@ -8996,10 +9373,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} বা {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0} এবং {1}
-			{0} এবং {1}
+			{0}, {1}
+			{0}, {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/bn_BD.xml b/make/data/cldr/common/main/bn_BD.xml
index 6516d9293a8..4f327a3c1d1 100644
--- a/make/data/cldr/common/main/bn_BD.xml
+++ b/make/data/cldr/common/main/bn_BD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bn_IN.xml b/make/data/cldr/common/main/bn_IN.xml
index 14a178403e5..02ef49e26e1 100644
--- a/make/data/cldr/common/main/bn_IN.xml
+++ b/make/data/cldr/common/main/bn_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bo.xml b/make/data/cldr/common/main/bo.xml
index b3068119d61..0da366fcca3 100644
--- a/make/data/cldr/common/main/bo.xml
+++ b/make/data/cldr/common/main/bo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -279,7 +279,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u0F7E ཿ ཀ {ཀ\u0FB5} \u0F90 {\u0F90\u0FB5} ཁ \u0F91 ག {ག\u0FB7} \u0F92 {\u0F92\u0FB7} ང \u0F94 ཅ \u0F95 ཆ \u0F96 ཇ \u0F97 ཉ \u0F99 ཊ \u0F9A ཋ \u0F9B ཌ {ཌ\u0FB7} \u0F9C {\u0F9C\u0FB7} ཎ \u0F9E ཏ \u0F9F ཐ \u0FA0 ད {ད\u0FB7} \u0FA1 {\u0FA1\u0FB7} ན \u0FA3 པ \u0FA4 ཕ \u0FA5 བ {བ\u0FB7} \u0FA6 {\u0FA6\u0FB7} མ \u0FA8 ཙ \u0FA9 ཚ \u0FAA ཛ {ཛ\u0FB7} \u0FAB {\u0FAB\u0FB7} ཝ \u0FAD \u0FBA ཞ \u0FAE ཟ \u0FAF འ \u0FB0 ཡ \u0FB1 \u0FBB ར ཪ \u0FB2 \u0FBC ལ \u0FB3 ཤ \u0FB4 ཥ \u0FB5 ས \u0FB6 ཧ \u0FB7 ཨ \u0FB8 \u0F72 {\u0F71\u0F72} \u0F80 {\u0F71\u0F80} \u0F74 {\u0F71\u0F74} {\u0FB2\u0F80} \u0F77 {\u0FB3\u0F80} \u0F79 \u0F7A \u0F7B \u0F7C \u0F7D \u0F84]
 		[ༀ]
 		[ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ]
-		[\- , . % ‰ + 0༠ 1༡ 2༢ 3༣ 4༤ 5༥ 6༦ 7༧ 8༨ 9༩]
+		[\- ‑ , . % ‰ + 0༠ 1༡ 2༢ 3༣ 4༤ 5༥ 6༦ 7༧ 8༨ 9༩]
 		[\: ་ །]
 	
 	
diff --git a/make/data/cldr/common/main/bo_CN.xml b/make/data/cldr/common/main/bo_CN.xml
index a0c36b80f53..4376be96be1 100644
--- a/make/data/cldr/common/main/bo_CN.xml
+++ b/make/data/cldr/common/main/bo_CN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bo_IN.xml b/make/data/cldr/common/main/bo_IN.xml
index 1d10254bd4b..2d7036f93eb 100644
--- a/make/data/cldr/common/main/bo_IN.xml
+++ b/make/data/cldr/common/main/bo_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/br.xml b/make/data/cldr/common/main/br.xml
index bbed2bb9c93..392a7b34832 100644
--- a/make/data/cldr/common/main/br.xml
+++ b/make/data/cldr/common/main/br.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -90,6 +90,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			caddo
 			karibeg
 			atsam
+			chakmaeg
 			tchetcheneg
 			cebuano
 			chigaeg
@@ -548,6 +549,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			yiddish
 			yorouba
 			kantoneg
+			sinaeg, kantoneg
 			zhuang
 			zapoteg
 			Bliss
@@ -555,8 +557,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			zenaga
 			tamacheg Maroko standart
 			sinaeg
+			sinaeg, mandarineg
 			sinaeg eeunaet
+			sinaeg mandarinek eeunaet
 			sinaeg hengounel
+			sinaeg mandarinek hengounel
 			zouloueg
 			zuni
 			diyezh
@@ -570,14 +575,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
 			
+			
+			
+			
+			
 			
+			
 			
 			
 			
+			
 			
 			
 			
@@ -588,11 +600,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
-			
+			
 			
-			
+			
 			
 			
 			
@@ -619,6 +631,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -638,6 +651,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -834,8 +848,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Saint Martin
 			Madagaskar
 			Inizi Marshall
-			Makedonia
-			Makedonia (RYKM)
+			Makedonia an Norzh
 			Mali
 			Myanmar (Birmania)
 			Mongolia
@@ -907,7 +920,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Salvador
 			Sint Maarten
 			Siria
-			Swaziland
+			Eswatini
+			Swaziland
 			Tristan da Cunha
 			Inizi Turks ha Caicos
 			Tchad
@@ -943,6 +957,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Vanuatu
 			Wallis ha Futuna
 			Samoa
+			pouez-mouezh gaou
+			BiDi gaou
 			Kosovo
 			Yemen
 			Mayotte
@@ -955,7 +971,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			reizhskrivadur alamanek hengounel
 			reizhskrivadur resianek skoueriekaet
 			reizhskrivadur alamanek 1996
-			krenncʼhalleg
+			krenncʼhalleg diwezhañ
 			galleg rakvodern
 			belaruseg akademek
 			doare reizhskrivañ 1943
@@ -963,9 +979,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			romanekadur ALA-LC 1997
 			rannyezh aloukou
 			emglev 1990 war ar reizhskrivadur portugalek
+			araneg
 			armenianeg ar Reter
 			armenianeg ar Cʼhornôg
 			achanti
+			arverneg
 			lizherenneg latin turkek unvan
 			rannyezh aniiek Balanka
 			rannyezhoù Barlavento kreoleg ar Cʼhab-Glas
@@ -975,27 +993,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			rannyezh San Giorgio/Bila
 			lizherenneg Bohorič
 			boontling
+			kizalpeg
 			emglev 1945 war reizhskrivadur portugaleg Brazil
 			saozneg Kerne-Veur
+			rannyezhoù Creissent
 			lizherenneg Dajnko
 			serbeg gant distagadur ekavian
 			saozneg rakvodern
 			lizherenneg fonetek etrebroadel
-			FONNAPA
+			lizherenneg fonetek Kirshenbaum
+			lizherenneg fonetek Norzh Amerika
 			lizherenneg fonetek ouralek
 			treuzskrivadur X-SAMPA
+			gwaskoneg
+			skritur okitanek klasel
+			skritur okitanek Italia
+			skritur okitanek mistralek
 			romanekadur Hepburn
 			uhelnorvegeg
 			esperanteg sistem H
 			serbeg gant distagadur ijekavian
 			sanskriteg itihâsa
-			reizhskrivadur Ivanchov
+			reizhskrivadur bulgarek Ivanchov
 			rannyezh romañchek Jauer
 			romanekadur kantonek Jyutping
 			kerneveureg kumun
-			Kociewie
+			rannyezh polonek Kociewie
 			kerneveureg standart
 			sanskriteg klasel
+			rannyezh Limousin
+			lengadokeg
 			rannyezh resianek Lipovaz
 			reizhskrivadur rusianek goude 1917
 			lizherenneg Metelko
@@ -1003,18 +1030,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			rannyezh Ndyuka
 			rannyezh Natisone
 			saozneg an Douar-Nevez
+			nisardeg
 			rannyezh Gniva/Njiva
 			volapük modern
 			rannyezh Oseacco/Osojane
 			skritur Oxford English Dictionary
-			PAHAWH2
-			PAHAWH3
-			PAHAWH4
+			reizhskrivadur pahawh hmong lankad 2
+			reizhskrivadur pahawh hmong lankad 3
+			reizhskrivadur pahawh hmong doare diwezhañ
 			rannyezh Pamaka
 			reizhskrivadur rusianek 1708 Pêr I
 			romanekadur pinyin
 			gresianeg liestonel
-			POSIX
+			stlenneg
+			provañseg
 			rannyezh romañchek Puter
 			reizhskrivadur reizhet
 			volapük klasel
@@ -1023,10 +1052,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			saho
 			saozneg standart Skos
 			saozneg Liverpool (scouse)
-			SIMPLE
+			eeunaet
 			rannyezh Stolvizza/Solbica
 			rannyezhoù Sotavento kreoleg ar Cʼhab-Glas
-			SPANGLIS
+			spanglish
 			rannyezh romañchek surmiran
 			rannyezh romañchek sursilvan
 			rannyezh romañchek sutsilvan
@@ -1038,6 +1067,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			sanskriteg vedek
 			valensianeg
 			rannyezh romañchek Vallader
+			vivaroalpeg
 			romanekadur Wade-Giles
 			esperanteg sistem X
 		
@@ -1148,6 +1178,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			sifroù thai
 			sifroù tibetan
 			sifroù vai
+			sifroù warang
+			sifroù wantcho
 		
 		
 			metrek
@@ -1155,17 +1187,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			SU
 		
 		
-			{0}
-			{0}
-			{0}
+			yezh : {0}
+			skritur : {0}
+			rannved : {0}
 		
 	
 	
 		[a b {ch} {cʼh} d e ê f g h i j k l m n ñ o p r s t u ù v w x y z]
 		[á à ă â å ä ã ā æ c ç é è ĕ ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ q ú ŭ û ü ū ÿ]
 		[A B C D E F G H I J K L M N O P R S T U V W X Y Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ( ) \[ \] \{ \}]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ; \: ! ? . ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1174,25 +1206,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
+			['ʼ՚ߴ᾽᾿’＇]
+			[%٪﹪％]
+			[؉‰]
 			[\$﹩＄$]
 			[£₤]
+			[¥￥]
+			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
-		“
-		”
-		«
-		»
+		«
+		»
+		“
+		”
 	
 	
 		
 			
+				
+					
+						amzervezh voudaek
+					
+					
+						A.B.
+					
+					
+						AB
+					
+				
 				
 					
 						
@@ -1231,6 +1288,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							{1}, {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
 					
 						E d
 						y G
@@ -1257,6 +1319,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
+						
+							y G – y G
+							y – y G
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -3253,11 +3324,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							MM–MM
 						
 						
-							MM-dd – MM-dd
+							dd/MM – dd/MM
+							dd/MM – dd/MM
+						
+						
+							E dd/MM – E dd/MM
+							E dd/MM – E dd/MM
 						
 						
 							LLL–LLL
 						
+						
+							d–d MMM
+							d MMM – d MMM
+						
+						
+							E d MMM – E d MMM
+							E d MMM – E d MMM
+						
+						
+							MM/y – MM/y
+							MM/y – MM/y
+						
 					
 				
 			
@@ -3598,6 +3686,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							MM/y GGGGG – MM/y GGGGG
+							MM/y – MM/y GGGGG
+							MM/y – MM/y GGGGG
+						
+						
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y GGGGG – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+						
+						
+							E dd/MM/y – E dd/MM/y GGGGG
+							E dd/MM/y GGGGG – E dd/MM/y GGGGG
+							E dd/MM/y – E dd/MM/y GGGGG
+							E dd/MM/y – E dd/MM/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E d MMM y – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -3934,19 +4060,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						a-raok Jezuz-Krist
-						BCE
+						a-raok an amzervezh kristen
 						goude Jezuz-Krist
-						CE
+						an amzervezh kristen
 					
 					
 						a-raok J.K.
-						BCE
+						AAK
 						goude J.K.
-						CE
+						AK
 					
 					
 						a-raok J.K.
+						AAK
 						goude J.K.
+						AK
 					
 				
 				
@@ -4048,11 +4176,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						d MMM
 						E d MMM
 						d MMMM
-						'sizhun' W MMMM
-						'sizhun' W MMMM
-						'sizhun' W MMMM
-						'sizhun' W MMMM
-						'sizhun' W MMMM
+						'sizhun' W 'miz' MMMM
+						'sizhun' W 'miz' MMMM
+						'sizhun' W 'miz' MMMM
+						'sizhun' W 'miz' MMMM
+						'sizhun' W 'miz' MMMM
 						mm:ss
 						y
 						MM/y
@@ -4078,6 +4206,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							MM/y GGGGG – MM/y GGGGG
+							MM/y – MM/y GGGGG
+							MM/y – MM/y GGGGG
+						
+						
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y GGGGG – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+						
+						
+							E dd/MM/y – E dd/MM/y GGGGG
+							E dd/MM/y GGGGG – E dd/MM/y GGGGG
+							E dd/MM/y – E dd/MM/y GGGGG
+							E dd/MM/y – E dd/MM/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -5884,6 +6050,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				amzervezh
 			
+			
+				amzerv.
+			
+			
+				amzerv.
+			
 			
 				bloaz
 				warlene
@@ -5925,7 +6097,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				bl.
+				b.
 				warlene
 				hevlene
 				ar bl. a zeu
@@ -5985,7 +6157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				trim.
+				t.
 				an trim. diaraok
 				an trim.-mañ
 				an trim. a zeu
@@ -6045,10 +6217,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				miz
-				ar miz diaraok
-				ar miz-mañ
-				ar miz a zeu
+				m.
+				ar m. diaraok
+				ar m.-mañ
+				ar m. a zeu
 				
 					+{0} miz
 					+{0} miz
@@ -6083,6 +6255,58 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} a sizhunioù zo
 					{0} sizhun zo
 				
+				sizhun {0}
+			
+			
+				sizh.
+				ar sizh. diaraok
+				ar sizh.-mañ
+				ar sizh. a zeu
+				
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+				
+				
+					{0} sizh. zo
+					{0} sizh. zo
+					{0} sizh. zo
+					{0} sizh. zo
+					{0} sizh. zo
+				
+				sizh. {0}
+			
+			
+				sizh.
+				ar sizh. diaraok
+				ar sizh.-mañ
+				ar sizh. a zeu
+				
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+					a-benn {0} sizh.
+				
+				
+					{0} sizh. zo
+					{0} sizh. zo
+					{0} sizh. zo
+					{0} sizh. zo
+					{0} sizh. zo
+				
+				sizh. {0}
+			
+			
+				sizhun ar miz
+			
+			
+				sizh. ar miz
+			
+			
+				sizh. ar m.
 			
 			
 				deiz
@@ -6106,7 +6330,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				d
+				d.
 				dercʼhent-decʼh
 				decʼh
 				hiziv
@@ -6127,7 +6351,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				d
+				d.
 				dercʼhent-decʼh
 				decʼh
 				hiziv
@@ -6147,9 +6371,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					-{0} d
 				
 			
+			
+				deiz ar bloaz
+			
+			
+				d. ar bl.
+			
+			
+				d. ar b.
+			
 			
 				deiz ar sizhun
 			
+			
+				d. ar sizh.
+			
+			
+				d. ar sizh.
+			
+			
+				deiz ar miz
+			
+			
+				d. ar miz
+			
+			
+				d. ar m.
+			
 			
 				Disul diwezhañ
 				ar Sul-mañ
@@ -6635,6 +6883,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				takad eur
 			
+			
+				takad
+			
+			
+				takad
+			
 		
 		
 			+HH:mm;-HH:mm
@@ -6647,6 +6901,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Honolulu
 			
+			
+				
+					amzer hollvedel kenurzhiet
+				
+			
 			
 				kêr dianav
 			
@@ -7271,6 +7530,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Irkutsk
 			
+			
+				Tchita
+			
 			
 				Yakutsk
 			
@@ -7280,6 +7542,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Sakhalin
 			
+			
+				Kamtchatka
+			
 			
 				Anadyrʼ
 			
@@ -7487,6 +7752,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv an Amazon
 				
 			
+			
+				
+					eur ar Cʼhreiz
+					eur cʼhoañv ar Cʼhreiz
+					eur hañv ar Cʼhreiz
+				
+			
 			
 				
 					eur ar Reter
@@ -7501,6 +7773,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv ar Menezioù
 				
 			
+			
+				
+					eur an Habask
+					eur cʼhoañv an Habask
+					eur hañv an Habask
+				
+			
 			
 				
 					eur Anadyrʼ
@@ -7543,6 +7822,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Armenia
 				
 			
+			
+				
+					eur an Atlantel
+					eur cʼhoañv an Atlantel
+					eur hañv an Atlantel
+				
+			
 			
 				
 					eur Kreizaostralia
@@ -7621,6 +7907,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv ar Cʼhab-Glas
 				
 			
+			
+				
+					eur Chamorro
+				
+			
 			
 				
 					eur Chatham
@@ -7642,6 +7933,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Sina
 				
 			
+			
+				
+					eur Choibalsan
+					eur cʼhoañv Choibalsan
+					eur hañv Choibalsan
+				
+			
 			
 				
 					eur Enez Christmas
@@ -7673,6 +7971,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Kuba
 				
 			
+			
+				
+					eur Davis
+				
+			
+			
+				
+					eur Dumont-d’Urville
+				
+			
 			
 				
 					eur Timor ar Reter
@@ -7742,7 +8050,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					eur Gambier
+					eur Inizi Gambier
 				
 			
 			
@@ -7752,6 +8060,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Jorjia
 				
 			
+			
+				
+					eur Inizi Gilbert
+				
+			
 			
 				
 					Amzer keitat Greenwich (AKG)
@@ -7793,16 +8106,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Hong Kong
 				
 			
+			
+				
+					eur Hovd
+					eur cʼhoañv Hovd
+					eur hañv Hovd
+				
+			
 			
 				
 					eur cʼhoañv India
 				
 			
+			
+				
+					eur Meurvor Indez
+				
+			
 			
 				
 					eur Indez-Sina
 				
 			
+			
+				
+					eur Kreiz Indonezia
+				
+			
 			
 				
 					eur Indonezia ar Reter
@@ -7858,6 +8188,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Korea
 				
 			
+			
+				
+					eur Kosrae
+				
+			
+			
+				
+					eur Krasnoyarsk
+					eur cʼhoañv Krasnoyarsk
+					eur hañv Krasnoyarsk
+				
+			
 			
 				
 					eur Kyrgyzstan
@@ -7868,6 +8210,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur Sri Lanka
 				
 			
+			
+				
+					eur Line Islands
+				
+			
 			
 				
 					eur Macau
@@ -7880,6 +8227,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur Enez Macquarie
 				
 			
+			
+				
+					eur Magadan
+					eur cʼhoañv Magadan
+					eur hañv Magadan
+				
+			
 			
 				
 					eur Malaysia
@@ -7907,6 +8261,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Moris
 				
 			
+			
+				
+					eur Mawson
+				
+			
 			
 				
 					eur Gwalarn Mecʼhiko
@@ -7974,6 +8333,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur Enez Norfolk
 				
 			
+			
+				
+					eur Fernando de Noronha
+					eur cʼhoañv Fernando de Noronha
+					eur hañv Fernando de Noronha
+				
+			
 			
 				
 					eur Novosibirsk
@@ -7981,6 +8347,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Novosibirsk
 				
 			
+			
+				
+					eur Omsk
+					eur cʼhoañv Omsk
+					eur hañv Omsk
+				
+			
 			
 				
 					eur Pakistan
@@ -7993,6 +8366,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur Palau
 				
 			
+			
+				
+					eur Papoua-Ginea-Nevez
+				
+			
 			
 				
 					eur Paraguay
@@ -8014,6 +8392,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv ar Filipinez
 				
 			
+			
+				
+					eur Inizi Phoenix
+				
+			
 			
 				
 					eur Sant-Pêr-ha-Mikelon
@@ -8026,11 +8409,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur Pitcairn
 				
 			
+			
+				
+					eur Pʼyongyang
+				
+			
 			
 				
 					eur ar Reünion
 				
 			
+			
+				
+					eur Rothera
+				
+			
 			
 				
 					eur Sakhalin
@@ -8070,6 +8463,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur Surinam
 				
 			
+			
+				
+					eur Syowa
+				
+			
 			
 				
 					eur Tahiti
@@ -8099,6 +8497,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Tonga
 				
 			
+			
+				
+					eur Chuuk
+				
+			
 			
 				
 					eur Turkmenistan
@@ -8151,6 +8554,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					eur hañv Volgograd
 				
 			
+			
+				
+					eur Vostok
+				
+			
+			
+				
+					eur Wake Island
+				
+			
 			
 				
 					eur Wallis ha Futuna
@@ -8173,6 +8586,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		latn
+		
+			latn
+		
+		1
 		
 			٫
 			٬
@@ -8185,6 +8603,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			؉
 			∞
 			NaN
+			:
 		
 		
 			٫
@@ -8198,6 +8617,61 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			؉
 			∞
 			NaN
+			٫
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
 		
 		
 			,
@@ -8211,6 +8685,73 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
 		
 		
 			
@@ -8465,6 +9006,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feseta Andorra
 				a besetaoù Andorra
 				peseta Andorra
+				ADP
 			
 			
 				dirham EAU
@@ -8473,6 +9015,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dirham EAU
 				a zirhamoù EAU
 				dirham EAU
+				AED
 			
 			
 				afghani Afghanistan (1927–2002)
@@ -8481,6 +9024,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				afghani Afghanistan (1927–2002)
 				a afghanioù Afghanistan (1927–2002)
 				afghani Afghanistan (1927–2002)
+				AFA
 			
 			
 				afghani Afghanistan
@@ -8489,6 +9033,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				afghani Afghanistan
 				a afghanioù Afghanistan
 				afghani Afghanistan
+				AFN
 			
 			
 				lek Albania (1946–1965)
@@ -8497,6 +9042,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lek Albania (1946–1965)
 				a lekoù Albania (1946–1965)
 				lek Albania (1946–1965)
+				ALK
 			
 			
 				lek Albania
@@ -8505,6 +9051,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lek Albania
 				a lekoù Albania
 				lek Albania
+				ALL
 			
 			
 				dram Armenia
@@ -8513,6 +9060,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dram Armenia
 				a zramoù Armenia
 				dram Armenia
+				AMD
 			
 			
 				florin Antilhez nederlandat
@@ -8521,6 +9069,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				florin Antilhez nederlandat
 				a florinoù Antilhez
 				florin Antilhez nederlandat
+				ANG
 			
 			
 				kwanza Angola
@@ -8529,6 +9078,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhwanza Angola
 				a gwanzaoù Angola
 				kwanza Angola
+				AOA
+				Kz
 			
 			
 				kwanza Angola (1977–1991)
@@ -8537,6 +9088,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhwanza Angola (1977–1991)
 				a gwanzaoù Angola (1977–1991)
 				kwanza Angola (1977–1991)
+				AOK
 			
 			
 				kwanza nevez Angola (1990–2000)
@@ -8545,6 +9097,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhwanza nevez Angola (1990–2000)
 				a gwanzaoù nevez Angola (1990–2000)
 				kwanza nevez Angola (1990–2000)
+				AON
+			
+			
+				AOR
+			
+			
+				ARA
+			
+			
+				ARL
 			
 			
 				peso Arcʼhantina (1881–1970)
@@ -8553,6 +9115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Arcʼhantina (1881–1970)
 				a besoioù Arcʼhantina (1881–1970)
 				peso Arcʼhantina (1881–1970)
+				ARM
 			
 			
 				peso Arcʼhantina (1983–1985)
@@ -8561,6 +9124,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Arcʼhantina (1983–1985)
 				a besoioù Arcʼhantina (1983–1985)
 				peso Arcʼhantina (1983–1985)
+				ARP
 			
 			
 				peso Arcʼhantina
@@ -8569,6 +9133,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Arcʼhantina
 				a pesoioù Arcʼhantina
 				peso Arcʼhantina
+				ARS
 			
 			
 				schilling Aostria
@@ -8577,6 +9142,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				schilling Aostria
 				a schillingoù Aostria
 				schilling Aostria
+				ATS
 			
 			
 				dollar Aostralia
@@ -8586,6 +9152,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù Aostralia
 				dollar Aostralia
 				$A
+				$
 			
 			
 				florin Aruba
@@ -8594,6 +9161,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				florin Aruba
 				a florinoù Aruba
 				florin Aruba
+				AWG
 			
 			
 				manat Azerbaidjan (1993–2006)
@@ -8602,6 +9170,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				manat Azerbaidjan (1993–2006)
 				a vanatoù Azerbaidjan (1993–2006)
 				manat Azerbaidjan (1993–2006)
+				AZM
 			
 			
 				manat Azerbaidjan
@@ -8610,6 +9179,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				manat Azerbaidjan
 				a vanatoù Azerbaidjan
 				manat Azerbaidjan
+				AZN
 			
 			
 				dinar Bosnia ha Herzegovina (1992–1994)
@@ -8618,6 +9188,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Bosnia ha Herzegovina (1992–1994)
 				a zinaroù Bosnia ha Herzegovina (1992–1994)
 				dinar Bosnia ha Herzegovina (1992–1994)
+				BAD
 			
 			
 				mark kemmadus Bosnia ha Herzegovina
@@ -8626,6 +9197,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mark kemmadus Bosnia ha Herzegovina
 				a varkoù kemmadus Bosnia ha Herzegovina
 				mark kemmadus Bosnia ha Herzegovina
+				BAM
+				KM
 			
 			
 				dinar nevez Bosnia ha Herzegovina (1994–1997)
@@ -8634,6 +9207,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar nevez Bosnia ha Herzegovina (1994–1997)
 				a zinaroù nevez Bosnia ha Herzegovina (1994–1997)
 				dinar nevez Bosnia ha Herzegovina (1994–1997)
+				BAN
 			
 			
 				dollar Barbados
@@ -8642,6 +9216,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Barbados
 				a zollaroù Barbados
 				dollar Barbados
+				BBD
+				$
 			
 			
 				taka Bangladesh
@@ -8650,6 +9226,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zaka Bangladesh
 				a dakaoù Bangladesh
 				taka Bangladesh
+				BDT
+				৳
 			
 			
 				lur Belgia (kemmadus)
@@ -8658,6 +9236,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Belgia (kemmadus)
 				a lurioù Belgia (kemmadus)
 				lur Belgia (kemmadus)
+				BEC
 			
 			
 				lur Belgia
@@ -8666,14 +9245,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Belgia
 				a lurioù Belgia
 				lur Belgia
+				BEF
 			
-			
-				BEL
-				BEL
-				BEL
-				BEL
-				BEL
-				BEL
+			
+				BGL
 			
 			
 				lev sokialour Bulgaria
@@ -8682,6 +9257,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev sokialour Bulgaria
 				a levoù sokialour Bulgaria
 				lev sokialour Bulgaria
+				BGM
 			
 			
 				lev Bulgaria
@@ -8690,6 +9266,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev Bulgaria
 				a levoù Bulgaria
 				lev Bulgaria
+				BGN
 			
 			
 				lev Bulgaria (1879–1952)
@@ -8698,6 +9275,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev Bulgaria (1879–1952)
 				a levoù Bulgaria (1879–1952)
 				lev Bulgaria (1879–1952)
+				BGO
 			
 			
 				dinar Bahrein
@@ -8706,6 +9284,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Bahrein
 				a zinaroù Bahrein
 				dinar Bahrein
+				BHD
 			
 			
 				lur Burundi
@@ -8714,6 +9293,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Burundi
 				a lurioù Burundi
 				lur Burundi
+				BIF
 			
 			
 				dollar Bermuda
@@ -8722,6 +9302,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Bermuda
 				a zollaroù Bermuda
 				dollar Bermuda
+				BMD
+				$
 			
 			
 				dollar Brunei
@@ -8730,6 +9312,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Brunei
 				a zollaroù Brunei
 				dollar Brunei
+				BND
+				$
 			
 			
 				boliviano Bolivia
@@ -8738,6 +9322,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				boliviano Bolivia
 				a volivianoioù Bolivia
 				boliviano Bolivia
+				BOB
+				Bs
 			
 			
 				boliviano Bolivia (1863–1963)
@@ -8746,6 +9332,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				boliviano Bolivia (1863–1963)
 				a volivianoioù Bolivia (1863–1963)
 				boliviano Bolivia (1863–1963)
+				BOL
 			
 			
 				peso Bolivia
@@ -8754,6 +9341,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Bolivia
 				a besoioù Bolivia
 				peso Bolivia
+				BOP
+			
+			
+				BOV
+			
+			
+				BRB
+			
+			
+				BRC
+			
+			
+				BRE
 			
 			
 				real Brazil
@@ -8764,6 +9364,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				real Brazil
 				BRL
 			
+			
+				BRN
+			
+			
+				BRR
+			
+			
+				BRZ
+			
 			
 				dollar Bahamas
 				dollar Bahamas
@@ -8771,6 +9380,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Bahamas
 				a zollaroù Bahamas
 				dollar Bahamas
+				BSD
+				$
 			
 			
 				ngultrum Bhoutan
@@ -8779,6 +9390,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ngultrum Bhoutan
 				a ngultrumoù Bhoutan
 				ngultrum Bhoutan
+				BTN
 			
 			
 				kyat Birmania
@@ -8787,6 +9399,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhyat Birmania
 				a gyatoù Birmania
 				kyat Birmania
+				BUK
 			
 			
 				pula Botswana
@@ -8795,6 +9408,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fula Botswana
 				a bulaoù Botswana
 				pula Botswana
+				BWP
+				P
 			
 			
 				roubl nevez Belarus (1994–1999)
@@ -8803,6 +9418,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl nevez Belarus (1994–1999)
 				a roubloù nevez Belarus (1994–1999)
 				roubl nevez Belarus (1994–1999)
+				BYB
 			
 			
 				roubl Belarus
@@ -8821,6 +9437,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl Belarus (2000–2016)
 				a roubloù Belarus (2000–2016)
 				roubl Belarus (2000–2016)
+				BYR
 			
 			
 				dollar Belize
@@ -8829,6 +9446,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Belize
 				a zollaroù Belize
 				dollar Belize
+				BZD
+				$
 			
 			
 				dollar Kanada
@@ -8838,6 +9457,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù Kanada
 				dollar Kanada
 				$CA
+				$
 			
 			
 				lur Kongo
@@ -8846,6 +9466,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Kongo
 				a lurioù Kongo
 				lur Kongo
+				CDF
 			
 			
 				euro WIR
@@ -8854,6 +9475,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				euro WIR
 				a euroioù WIR
 				euro WIR
+				CHE
 			
 			
 				lur Suis
@@ -8862,6 +9484,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Suis
 				a lurioù Suis
 				lur Suis
+				CHF
 			
 			
 				lur WIR
@@ -8870,6 +9493,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur WIR
 				a lurioù WIR
 				lur WIR
+				CHW
 			
 			
 				escudo Chile
@@ -8878,6 +9502,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Chile
 				a escudoioù Chile
 				escudo Chile
+				CLE
 			
 			
 				unanenn jediñ Chile
@@ -8886,6 +9511,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn jediñ Chile
 				a unanennoù jediñ Chile
 				unanenn jediñ Chile
+				CLF
 			
 			
 				peso Chile
@@ -8894,6 +9520,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Chile
 				a besoioù Chile
 				peso Chile
+				CLP
 			
 			
 				dollar Bank poblel Sina
@@ -8902,6 +9529,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Bank poblel Sina
 				a zollaroù Bank poblel Sina
 				dollar Bank poblel Sina
+				CNX
 			
 			
 				yuan Sina
@@ -8911,6 +9539,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a yuanoù Sina
 				yuan Sina
 				CNY
+				¥
 			
 			
 				peso Kolombia
@@ -8919,6 +9548,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Kolombia
 				a besoioù Kolombia
 				peso Kolombia
+				COP
+			
+			
+				COU
 			
 			
 				colón Costa Rica
@@ -8927,6 +9560,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼholón Costa Rica
 				a golónoù Costa Rica
 				colón Costa Rica
+				CRC
+				₡
 			
 			
 				dinar Serbia (2002–2006)
@@ -8935,6 +9570,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Serbia (2002–2006)
 				a zinaroù Serbia (2002–2006)
 				dinar Serbia (2002–2006)
+				CSD
+			
+			
+				CSK
 			
 			
 				peso kemmadus Kuba
@@ -8943,6 +9582,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso kemmadus Kuba
 				a besoioù kemmadus Kuba
 				peso kemmadus Kuba
+				CUC
 			
 			
 				peso Kuba
@@ -8951,6 +9591,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Kuba
 				a besoioù Kuba
 				peso Kuba
+				CUP
 			
 			
 				escudo Kab Glas
@@ -8959,6 +9600,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Kab Glas
 				a escudoioù Kab Glas
 				escudo Kab Glas
+				CVE
 			
 			
 				lur Kiprenez
@@ -8967,6 +9609,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Kiprenez
 				a lurioù Kiprenez
 				lur Kiprenez
+				CYP
 			
 			
 				kurunenn Tchek
@@ -8975,6 +9618,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Tchek
 				a gurunennoù Tchek
 				kurunenn Tchek
+				CZK
+				Kč
 			
 			
 				mark Alamagn ar Reter
@@ -8983,6 +9628,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mark Alamagn ar Reter
 				a varkoù Alamagn ar Reter
 				mark Alamagn ar Reter
+				DDM
 			
 			
 				mark Alamagn
@@ -8991,6 +9637,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mark Alamagn
 				a varkoù Alamagn
 				mark Alamagn
+				DEM
 			
 			
 				lur Djibouti
@@ -8999,6 +9646,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Djibouti
 				a lurioù Djibouti
 				lur Djibouti
+				DJF
 			
 			
 				kurunenn Danmark
@@ -9007,6 +9655,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Danmark
 				a gurunennoù Danmark
 				kurunenn Danmark
+				DKK
+				kr
 			
 			
 				peso Dominikan
@@ -9015,6 +9665,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Dominikan
 				a besoioù Dominikan
 				peso Dominikan
+				DOP
 			
 			
 				dinar Aljeria
@@ -9023,6 +9674,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Aljeria
 				a zinaroù Aljeria
 				dinar Aljeria
+				DZD
+			
+			
+				ECS
+			
+			
+				ECV
 			
 			
 				kurunenn Estonia
@@ -9031,6 +9689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Estonia
 				a gurunennoù Estonia
 				kurunenn Estonia
+				EEK
 			
 			
 				lur Egipt
@@ -9039,6 +9698,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Egipt
 				a lurioù Egipt
 				lur Egipt
+				EGP
 				£ E
 			
 			
@@ -9048,6 +9708,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				nakfa Eritrea
 				a nakfaoù Eritrea
 				nakfa Eritrea
+				ERN
+			
+			
+				ESA
 			
 			
 				peseta gemmadus Spagn
@@ -9056,6 +9720,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feseta gemmadus Spagn
 				a besetaoù kemmadus Spagn
 				peseta gemmadus Spagn
+				ESB
 			
 			
 				peseta Spagn
@@ -9064,6 +9729,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feseta Spagn
 				a besetaoù Spagn
 				peseta Spagn
+				ESP
+				₧
 			
 			
 				birr Etiopia
@@ -9072,6 +9739,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				birr Etiopia
 				a virroù Etiopia
 				birr Etiopia
+				ETB
 			
 			
 				euro
@@ -9080,6 +9748,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				euro
 				a euroioù
 				euro
+				€
+				€
 			
 			
 				mark Finland
@@ -9088,6 +9758,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mark Finland
 				a varkoù Finland
 				mark Finland
+				FIM
 			
 			
 				dollar Fidji
@@ -9096,6 +9767,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Fidji
 				a zollaroù Fidji
 				dollar Fidji
+				FJD
+				$
 			
 			
 				lur Inizi Falkland
@@ -9104,6 +9777,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Inizi Falkland
 				a lurioù Inizi Falkland
 				lur Inizi Falkland
+				FKP
+				£
 			
 			
 				lur gall
@@ -9112,6 +9787,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur gall
 				a lurioù gall
 				lur gall
+				FRF
 			
 			
 				lur Breizh-Veur
@@ -9121,6 +9797,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a lurioù Breizh-Veur
 				lur Breizh-Veur
 				£ RU
+				£
+			
+			
+				GEK
 			
 			
 				lari Jorjia
@@ -9129,6 +9809,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lari Jorjia
 				a larioù Jorjia
 				lari Jorjia
+				GEL
+			
+			
+				GHC
 			
 			
 				cedi Ghana
@@ -9137,6 +9821,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cedi Ghana
 				cedi Ghana
 				cedi Ghana
+				GHS
 			
 			
 				lur Jibraltar
@@ -9145,6 +9830,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Jibraltar
 				a lurioù Jibraltar
 				lur Jibraltar
+				GIP
+				£
 			
 			
 				dalasi Gambia
@@ -9153,6 +9840,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dalasi Gambia
 				a zalasioù Gambia
 				dalasi Gambia
+				GMD
 			
 			
 				lur Ginea
@@ -9161,6 +9849,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Ginea
 				a lurioù Ginea
 				lur Ginea
+				GNF
+				FG
 			
 			
 				syli Ginea
@@ -9169,6 +9859,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				syli Ginea
 				a sylioù Ginea
 				syli Ginea
+				GNS
 			
 			
 				ekwele Ginea ar Cʼheheder
@@ -9177,6 +9868,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ekwele Ginea ar Cʼheheder
 				a ekweleoù Ginea ar Cʼheheder
 				ekwele Ginea ar Cʼheheder
+				GQE
 			
 			
 				drakm Gres
@@ -9185,6 +9877,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				drakm Gres
 				a zrakmoù Gres
 				drakm Gres
+				GRD
 			
 			
 				quetzal Guatemala
@@ -9193,6 +9886,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhuetzal Guatemala
 				a guetzaloù Guatemala
 				quetzal Guatemala
+				GTQ
+				Q
+			
+			
+				GWE
 			
 			
 				peso Ginea-Bissau
@@ -9201,6 +9899,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Ginea-Bissau
 				a besoioù Ginea-Bissau
 				peso Ginea-Bissau
+				GWP
 			
 			
 				dollar Guyana
@@ -9209,6 +9908,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Guyana
 				a zollaroù Guyana
 				dollar Guyana
+				GYD
+				$
 			
 			
 				dollar Hong Kong
@@ -9218,6 +9919,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù Hong Kong
 				dollar Hong Kong
 				$ HK
+				$
 			
 			
 				lempira Honduras
@@ -9226,6 +9928,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lempira Honduras
 				a lempiraoù Honduras
 				lempira Honduras
+				HNL
+				L
 			
 			
 				dinar Kroatia
@@ -9234,6 +9938,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Kroatia
 				a zinaroù Kroatia
 				dinar Kroatia
+				HRD
 			
 			
 				kuna Kroatia
@@ -9242,6 +9947,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhuna Kroatia
 				a gunaoù Kroatia
 				kuna Kroatia
+				HRK
+				kn
 			
 			
 				gourde Haiti
@@ -9250,6 +9957,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				gourde Haiti
 				a cʼhourdeoù Haiti
 				gourde Haiti
+				HTG
 			
 			
 				forint Hungaria
@@ -9258,6 +9966,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				forint Hungaria
 				a forintoù Hungaria
 				forint Hungaria
+				HUF
+				Ft
 			
 			
 				roupi Indonezia
@@ -9266,6 +9976,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi Indonezia
 				a roupioù Indonezia
 				roupi Indonezia
+				IDR
+				Rp
 			
 			
 				lur Iwerzhon
@@ -9274,6 +9986,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Iwerzhon
 				a lurioù Iwerzhon
 				lur Iwerzhon
+				IEP
 			
 			
 				lur Israel
@@ -9282,6 +9995,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Israel
 				a lurioù Israel
 				lur Israel
+				ILP
 			
 			
 				shekel Israel (1980–1985)
@@ -9290,6 +10004,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shekel Israel (1980–1985)
 				shekel Israel (1980–1985)
 				shekel Israel (1980–1985)
+				ILR
 			
 			
 				shekel nevez Israel
@@ -9299,6 +10014,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shekel nevez Israel
 				shekel nevez Israel
 				ILS
+				₪
 			
 			
 				roupi India
@@ -9307,6 +10023,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi India
 				a roupioù India
 				roupi India
+				₹
 			
 			
 				dinar Iraq
@@ -9315,6 +10032,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Iraq
 				a zinaroù Iraq
 				dinar Iraq
+				IQD
 			
 			
 				rial Iran
@@ -9323,6 +10041,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Iran
 				a rialoù Iran
 				rial Iran
+				IRR
 			
 			
 				kurunenn Island (1918–1981)
@@ -9331,6 +10050,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Island (1918–1981)
 				a gurunennoù Island (1918–1981)
 				kurunenn Island (1918–1981)
+				ISJ
 			
 			
 				kurunenn Island
@@ -9339,6 +10059,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Island
 				a gurunennoù Island
 				kurunenn Island
+				ISK
+				kr
 			
 			
 				lur Italia
@@ -9347,6 +10069,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Italia
 				a lurioù Italia
 				lur Italia
+				ITL
 			
 			
 				dollar Jamaika
@@ -9355,6 +10078,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Jamaika
 				a zollaroù Jamaika
 				dollar Jamaika
+				JMD
+				$
 			
 			
 				dinar Jordania
@@ -9363,6 +10088,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Jordania
 				a zinaroù Jordania
 				dinar Jordania
+				JOD
 			
 			
 				yen Japan
@@ -9372,6 +10098,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a yenoù Japan
 				yen Japan
 				JPY
+				¥
 			
 			
 				shilling Kenya
@@ -9380,6 +10107,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Kenya
 				a shillingoù Kenya
 				shilling Kenya
+				KES
 			
 			
 				som Kyrgyzstan
@@ -9388,6 +10116,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				som Kyrgyzstan
 				a somoù Kyrgyzstan
 				som Kyrgyzstan
+				KGS
 			
 			
 				riel Kambodja
@@ -9396,6 +10125,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				riel Kambodja
 				a rieloù Kambodja
 				riel Kambodja
+				KHR
+				៛
 			
 			
 				lur Komorez
@@ -9404,6 +10135,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Komorez
 				a lurioù Komorez
 				lur Komorez
+				KMF
 			
 			
 				won Korea an Norzh
@@ -9412,6 +10144,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				won Korea an Norzh
 				a wonoù Korea an Norzh
 				won Korea an Norzh
+				KPW
+				₩
 			
 			
 				hwan Korea ar Su (1953–1962)
@@ -9420,6 +10154,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hwan Korea ar Su (1953–1962)
 				a hwanoù Korea ar Su (1953–1962)
 				hwan Korea ar Su (1953–1962)
+				KRH
 			
 			
 				won Korea ar Su (1945–1953)
@@ -9428,6 +10163,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				won Korea ar Su (1945–1953)
 				a wonoù Korea ar Su (1945–1953)
 				won Korea ar Su (1945–1953)
+				KRO
 			
 			
 				won Korea ar Su
@@ -9437,6 +10173,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a wonoù Korea ar Su
 				won Korea ar Su
 				KRW
+				₩
 			
 			
 				dinar Koweit
@@ -9445,6 +10182,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Koweit
 				a zinaroù Koweit
 				dinar Koweit
+				KWD
 			
 			
 				dollar Inizi Cayman
@@ -9453,6 +10191,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Inizi Cayman
 				a zollaroù Inizi Cayman
 				dollar Inizi Cayman
+				KYD
+				$
 			
 			
 				tenge Kazakstan
@@ -9461,6 +10201,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zenge Kazakstan
 				a dengeoù Kazakstan
 				tenge Kazakstan
+				KZT
+				₸
 			
 			
 				kip Laos
@@ -9469,6 +10211,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhip Laos
 				a gipoù Laos
 				kip Laos
+				LAK
+				₭
 			
 			
 				lur Liban
@@ -9477,6 +10221,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Liban
 				a lurioù Liban
 				lur Liban
+				LBP
 				£L
 			
 			
@@ -9486,6 +10231,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi Sri Lanka
 				a roupioù Sri Lanka
 				roupi Sri Lanka
+				LKR
+				Rs
 			
 			
 				dollar Liberia
@@ -9494,6 +10241,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Liberia
 				a zollaroù Liberia
 				dollar Liberia
+				LRD
+				$
 			
 			
 				loti Lesotho
@@ -9502,6 +10251,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				loti Lesotho
 				a lotioù Lesotho
 				loti Lesotho
+				LSL
 			
 			
 				litas Lituania
@@ -9510,6 +10260,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				litas Lituania
 				a litasoù Lituania
 				litas Lituania
+				LTL
+				Lt
 			
 			
 				talonas Lituania
@@ -9518,6 +10270,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zalonas Lituania
 				a dalonasoù Lituania
 				talonas Lituania
+				LTT
 			
 			
 				lur kemmadus Luksembourg
@@ -9526,6 +10279,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur kemmadus Luksembourg
 				a lurioù kemmadus Luksembourg
 				lur kemmadus Luksembourg
+				LUC
 			
 			
 				lur Luksembourg
@@ -9534,6 +10288,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Luksembourg
 				a lurioù Luksembourg
 				lur Luksembourg
+				LUF
+			
+			
+				LUL
 			
 			
 				lats Latvia
@@ -9542,6 +10300,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lats Latvia
 				a latsoù Latvia
 				lats Latvia
+				LVL
+				Ls
 			
 			
 				roubl Latvia
@@ -9550,6 +10310,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl Latvia
 				a roubloù Latvia
 				roubl Latvia
+				LVR
 			
 			
 				dinar Libia
@@ -9558,6 +10319,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Libia
 				a zinaroù Libia
 				dinar Libia
+				LYD
 			
 			
 				dirham Maroko
@@ -9566,6 +10328,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dirham Maroko
 				a zirhamoù Maroko
 				dirham Maroko
+				MAD
 			
 			
 				lur Maroko
@@ -9574,6 +10337,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Maroko
 				a lurioù Maroko
 				lur Maroko
+				MAF
 			
 			
 				lur Monaco
@@ -9582,6 +10346,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Monaco
 				a lurioù Monaco
 				lur Monaco
+				MCF
+			
+			
+				MDC
 			
 			
 				leu Moldova
@@ -9590,6 +10358,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leu Moldova
 				leu Moldova
 				leu Moldova
+				MDL
 			
 			
 				ariary Madagaskar
@@ -9598,6 +10367,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ariary Madagaskar
 				a ariaryoù Madagaska
 				ariary Madagaskar
+				MGA
+				Ar
 			
 			
 				lur Madagaskar
@@ -9606,6 +10377,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Madagaskar
 				a lurioù Madagaskar
 				lur Madagaskar
+				MGF
 			
 			
 				denar Makedonia
@@ -9614,6 +10386,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				denar Makedonia
 				a zenaroù Makedonia
 				denar Makedonia
+				MKD
 			
 			
 				denar Makedonia (1992–1993)
@@ -9622,6 +10395,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				denar Makedonia (1992–1993)
 				a zenaroù Makedonia (1992–1993)
 				denar Makedonia (1992–1993)
+				MKN
 			
 			
 				lur Mali
@@ -9630,6 +10404,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Mali
 				a lurioù Mali
 				lur Mali
+				MLF
 			
 			
 				kyat Myanmar
@@ -9638,6 +10413,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhyat Myanmar
 				a gyatoù Myanmar
 				kyat Myanmar
+				MMK
+				K
 			
 			
 				tugrik Mongolia
@@ -9646,6 +10423,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zugrik Mongolia
 				a dugrikoù Mongolia
 				tugrik Mongolia
+				MNT
+				₮
 			
 			
 				pataca Macau
@@ -9654,6 +10433,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fataca Macau
 				a batacaoù Macau
 				pataca Macau
+				MOP
 			
 			
 				ouguiya Maouritania (1973–2017)
@@ -9662,6 +10442,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ouguiya Maouritania (1973–2017)
 				a ouguiyaoù Maouritania (1973–2017)
 				ouguiya Maouritania (1973–2017)
+				MRO
 			
 			
 				ouguiya Maouritania
@@ -9678,6 +10459,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lira Malta
 				a liraoù Malta
 				lira Malta
+				MTL
 			
 			
 				lur Malta
@@ -9686,6 +10468,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Malta
 				a lurioù Malta
 				lur Malta
+				MTP
 			
 			
 				roupi Moris
@@ -9694,6 +10477,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi Moris
 				a roupioù Moris
 				roupi Moris
+				MUR
+				Rs
 			
 			
 				roupi Maldivez
@@ -9710,6 +10495,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rufiyaa Maldivez
 				a rufiyaaoù Maldivez
 				rufiyaa Maldivez
+				MVR
 			
 			
 				kwacha Malawi
@@ -9718,6 +10504,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwacha Malawi
 				a gwachaoù Malawi
 				kwacha Malawi
+				MWK
 			
 			
 				peso Mecʼhiko
@@ -9726,6 +10513,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Mecʼhiko
 				a besoioù Mecʼhiko
 				peso Mecʼhiko
+				MX$
 			
 			
 				peso arcʼhant Mecʼhiko (1861–1992)
@@ -9734,6 +10522,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso arcʼhant Mecʼhiko (1861–1992)
 				a besoioù arcʼhant Mecʼhiko (1861–1992)
 				peso arcʼhant Mecʼhiko (1861–1992)
+				MXP
+			
+			
+				MXV
 			
 			
 				ringgit Malaysia
@@ -9742,6 +10534,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ringgit Malaysia
 				a ringgitoù Malaysia
 				ringgit Malaysia
+				MYR
+				RM
 			
 			
 				escudo Mozambik
@@ -9750,6 +10544,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Mozambik
 				a escudoioù Mozambik
 				escudo Mozambik
+				MZE
 			
 			
 				metical Mozambik (1980–2006)
@@ -9758,6 +10553,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				metical Mozambik (1980–2006)
 				a veticaloù Mozambik (1980–2006)
 				metical Mozambik (1980–2006)
+				MZM
 			
 			
 				metical Mozambik
@@ -9766,6 +10562,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				metical Mozambik
 				a veticaloù Mozambik
 				metical Mozambik
+				MZN
 			
 			
 				dollar Namibia
@@ -9774,6 +10571,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Namibia
 				a zollaroù Namibia
 				dollar Namibia
+				NAD
+				$
 			
 			
 				naira Nigeria
@@ -9782,6 +10581,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				naira Nigeria
 				a nairaoù Nigeria
 				naira Nigeria
+				NGN
+				₦
 			
 			
 				cordoba Nicaragua (1988–1991)
@@ -9790,6 +10591,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhordoba Nicaragua (1988–1991)
 				a gordobaoù Nicaragua (1988–1991)
 				cordoba Nicaragua (1988–1991)
+				NIC
 			
 			
 				cordoba Nicaragua
@@ -9798,6 +10600,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhordoba Nicaragua
 				a gordobaoù Nicaragua
 				cordoba Nicaragua
+				NIO
 			
 			
 				florin an Izelvroioù
@@ -9806,6 +10609,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				florin an Izelvroioù
 				a florinoù an Izelvroioù
 				florin an Izelvroioù
+				NLG
 			
 			
 				kurunenn Norvegia
@@ -9814,6 +10618,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Norvegia
 				a gurunennoù Norvegia
 				kurunenn Norvegia
+				NOK
+				kr
 			
 			
 				roupi Nepal
@@ -9822,6 +10628,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi Nepal
 				a roupioù Nepal
 				roupi Nepal
+				NPR
+				Rs
 			
 			
 				dollar Zeland-Nevez
@@ -9831,6 +10639,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù Zeland-Nevez
 				dollar Zeland-Nevez
 				$ ZN
+				$
 			
 			
 				rial Oman
@@ -9839,6 +10648,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Oman
 				a rialoù Oman
 				rial Oman
+				OMR
 			
 			
 				balboa Panamá
@@ -9847,6 +10657,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				balboa Panamá
 				a valboaoù Panamá
 				balboa Panamá
+				PAB
+			
+			
+				PEI
 			
 			
 				sol Perou
@@ -9855,6 +10669,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sol Perou
 				sol Perou
 				sol Perou
+				PEN
 			
 			
 				sol Perou (1863–1965)
@@ -9863,6 +10678,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sol Perou (1863–1965)
 				a solioù Perou (1863–1965)
 				sol Perou (1863–1965)
+				PES
 			
 			
 				kina Papoua Ginea-Nevez
@@ -9871,6 +10687,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhina Papoua Ginea-Nevez
 				a ginaoù Papoua Ginea-Nevez
 				kina Papoua Ginea-Nevez
+				PGK
 			
 			
 				peso Filipinez
@@ -9879,6 +10696,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Filipinez
 				a besoioù Filipinez
 				peso Filipinez
+				PHP
+				₱
 			
 			
 				roupi Pakistan
@@ -9887,6 +10706,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi Pakistan
 				a roupioù Pakistan
 				roupi Pakistan
+				PKR
+				Rs
 			
 			
 				zloty Polonia
@@ -9895,6 +10716,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zloty Polonia
 				a zlotyoù Polonia
 				zloty Polonia
+				PLN
+				zł
 			
 			
 				zloty Polonia (1950–1995)
@@ -9903,6 +10726,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zloty Polonia (1950–1995)
 				a zlotyoù Polonia (1950–1995)
 				zloty Polonia (1950–1995)
+				PLZ
 			
 			
 				escudo Portugal
@@ -9911,6 +10735,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Portugal
 				a escudoioù Portugal
 				escudo Portugal
+				PTE
 			
 			
 				guarani Paraguay
@@ -9919,6 +10744,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				guarani Paraguay
 				a uaranioù Paraguay
 				guarani Paraguay
+				PYG
+				₲
 			
 			
 				rial Qatar
@@ -9927,6 +10754,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Qatar
 				a rialoù Qatar
 				rial Qatar
+				QAR
 			
 			
 				dollar Rodezia
@@ -9935,6 +10763,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Rodezia
 				a zollaroù Rodezia
 				dollar Rodezia
+				RHD
 			
 			
 				leu Roumania (1952–2006)
@@ -9943,6 +10772,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leu Roumania (1952–2006)
 				leu Roumania (1952–2006)
 				leu Roumania (1952–2006)
+				ROL
 			
 			
 				leu Roumania
@@ -9951,6 +10781,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leu Roumania
 				leu Roumania
 				leu Roumania
+				RON
 			
 			
 				dinar Serbia
@@ -9959,6 +10790,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Serbia
 				a zinaroù Serbia
 				dinar Serbia
+				RSD
 			
 			
 				roubl Rusia
@@ -9967,6 +10799,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl Rusia
 				a roubloù Rusia
 				roubl Rusia
+				RUB
+				₽
 			
 			
 				roubl Rusia (1991–1998)
@@ -9975,6 +10809,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl Rusia (1991–1998)
 				a roubloù Rusia (1991–1998)
 				roubl Rusia (1991–1998)
+				RUR
+				р.
 			
 			
 				lur Rwanda
@@ -9983,6 +10819,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Rwanda
 				a lurioù Rwanda
 				lur Rwanda
+				RWF
 			
 			
 				riyal Arabia Saoudat
@@ -9991,6 +10828,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				riyal Arabia Saoudat
 				a riyaloù Arabia Saoudat
 				riyal Arabia Saoudat
+				SAR
 			
 			
 				dollar Inizi Salomon
@@ -9999,6 +10837,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Inizi Salomon
 				a zollaroù Inizi Salomon
 				dollar Inizi Salomon
+				SBD
+				$
 			
 			
 				roupi Sechelez
@@ -10007,6 +10847,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roupi Sechelez
 				a roupioù Sechelez
 				roupi Sechelez
+				SCR
 			
 			
 				dinar Soudan (1992–2007)
@@ -10015,6 +10856,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Soudan (1992–2007)
 				a zinaroù Soudan (1992–2007)
 				dinar Soudan (1992–2007)
+				SDD
 			
 			
 				lur Soudan
@@ -10023,6 +10865,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Soudan
 				a lurioù Soudan
 				lur Soudan
+				SDG
 			
 			
 				lur Soudan (1957–1998)
@@ -10031,6 +10874,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Soudan (1957–1998)
 				a lurioù Soudan (1957–1998)
 				lur Soudan (1957–1998)
+				SDP
 			
 			
 				kurunenn Sveden
@@ -10039,6 +10883,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Sveden
 				a gurunennoù Sveden
 				kurunenn Sveden
+				SEK
+				kr
 			
 			
 				dollar Singapour
@@ -10047,6 +10893,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Singapour
 				a zollaroù Singapour
 				dollar Singapour
+				SGD
+				$
 			
 			
 				lur Saint-Helena
@@ -10055,6 +10903,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Saint-Helena
 				a lurioù Saint-Helena
 				lur Saint-Helena
+				SHP
+				£
 			
 			
 				tolar Slovenia
@@ -10063,6 +10913,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zolar Slovenia
 				a dolaroù Slovenia
 				tolar Slovenia
+				SIT
 			
 			
 				kurunenn Slovakia
@@ -10071,6 +10922,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼhurunenn Slovakia
 				a gurunennoù Slovakia
 				kurunenn Slovakia
+				SKK
 			
 			
 				leone Sierra Leone
@@ -10079,6 +10931,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leone Sierra Leone
 				a leoneoù Sierra Leone
 				leone Sierra Leone
+				SLL
 			
 			
 				shilling Somalia
@@ -10087,6 +10940,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Somalia
 				a shillingoù Somalia
 				shilling Somalia
+				SOS
 			
 			
 				dollar Surinam
@@ -10095,6 +10949,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Surinam
 				a zollaroù Surinam
 				dollar Surinam
+				SRD
+				$
 			
 			
 				florin Surinam
@@ -10103,6 +10959,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				florin Surinam
 				a florinoù Surinam
 				florin Surinam
+				SRG
 			
 			
 				lur Susoudan
@@ -10111,6 +10968,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Susoudan
 				a lurioù Susoudan
 				lur Susoudan
+				SSP
+				£
 			
 			
 				dobra São Tomé ha Príncipe (1977–2017)
@@ -10119,6 +10978,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dobra São Tomé ha Príncipe (1977–2017)
 				a zobraoù São Tomé ha Príncipe (1977–2017)
 				dobra São Tomé ha Príncipe (1977–2017)
+				STD
 			
 			
 				dobra São Tomé ha Príncipe
@@ -10136,6 +10996,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl soviedel
 				a roubloù soviedel
 				roubl soviedel
+				SUR
 			
 			
 				colón Salvador
@@ -10144,6 +11005,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cʼholón Salvador
 				a golónoù Salvador
 				colón Salvador
+				SVC
 			
 			
 				lur Siria
@@ -10152,6 +11014,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Siria
 				a lurioù Siria
 				lur Siria
+				SYP
+				£
 			
 			
 				lilangeni Swaziland
@@ -10160,6 +11024,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lilangeni Swaziland
 				a lilangenioù Swaziland
 				lilangeni Swaziland
+				SZL
 			
 			
 				baht Thailand
@@ -10168,6 +11033,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				baht Thailand
 				a vahtoù Thailand
 				baht Thailand
+				THB
+				฿
 			
 			
 				roubl Tadjikistan
@@ -10176,6 +11043,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				roubl Tadjikistan
 				a roubloù Tadjikistan
 				roubl Tadjikistan
+				TJR
 			
 			
 				somoni Tadjikistan
@@ -10184,6 +11052,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				somoni Tadjikistan
 				a somonioù Tadjikistan
 				somoni Tadjikistan
+				TJS
 			
 			
 				manat Turkmenistan (1993–2009)
@@ -10192,6 +11061,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				manat Turkmenistan (1993–2009)
 				a vanatoù Turkmenistan (1993–2009)
 				manat Turkmenistan (1993–2009)
+				TMM
 			
 			
 				manat Turkmenistan
@@ -10200,6 +11070,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				manat Turkmenistan
 				a vanatoù Turkmenistan
 				manat Turkmenistan
+				TMT
 			
 			
 				dinar Tunizia
@@ -10208,6 +11079,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Tunizia
 				a zinaroù Tunizia
 				dinar Tunizia
+				TND
 			
 			
 				paʻanga Tonga
@@ -10216,6 +11088,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				faʻanga Tonga
 				a baʻangaoù Tonga
 				paʻanga Tonga
+				TOP
 				$ T
 			
 			
@@ -10225,6 +11098,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Timor
 				a escudoioù Timor
 				escudo Timor
+				TPE
 			
 			
 				lur Turkia (1922–2005)
@@ -10233,6 +11107,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Turkia (1922–2005)
 				a lurioù Turkia (1922–2005)
 				lur Turkia (1922–2005)
+				TRL
 			
 			
 				lur Turkia
@@ -10241,6 +11116,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Turkia
 				a lurioù Turkia
 				lur Turkia
+				TRY
+				₺
 			
 			
 				dollar Trinidad ha Tobago
@@ -10249,6 +11126,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Trinidad ha Tobago
 				a zollaroù Trinidad ha Tobago
 				dollar Trinidad ha Tobago
+				TTD
+				$
 			
 			
 				dollar nevez Taiwan
@@ -10258,6 +11137,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù nevez Taiwan
 				dollar nevez Taiwan
 				TWD
+				$
 			
 			
 				shilling Tanzania
@@ -10266,6 +11146,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Tanzania
 				a shillingoù Tanzania
 				shilling Tanzania
+				TZS
 			
 			
 				hryvnia Ukraina
@@ -10274,6 +11155,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hryvnia Ukraina
 				a hryvniaoù Ukraina
 				hryvnia Ukraina
+				UAH
+				₴
+			
+			
+				UAK
 			
 			
 				shilling Ouganda (1966–1987)
@@ -10282,6 +11168,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Ouganda (1966–1987)
 				a shillingoù Ouganda (1966–1987)
 				shilling Ouganda (1966–1987)
+				UGS
 			
 			
 				shilling Ouganda
@@ -10290,6 +11177,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Ouganda
 				a shillingoù Ouganda
 				shilling Ouganda
+				UGX
 			
 			
 				dollar SU
@@ -10299,6 +11187,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù SU
 				dollar SU
 				$ SU
+				$
+			
+			
+				USN
+			
+			
+				USS
+			
+			
+				UYI
 			
 			
 				peso Uruguay (1975–1993)
@@ -10307,6 +11205,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Uruguay (1975–1993)
 				a besoioù Uruguay (1975–1993)
 				peso Uruguay (1975–1993)
+				UYP
 			
 			
 				peso Uruguay
@@ -10315,6 +11214,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				feso Uruguay
 				a besoioù Uruguay
 				peso Uruguay
+				UYU
 			
 			
 				som Ouzbekistan
@@ -10323,6 +11223,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				som Ouzbekistan
 				a somoù Ouzbekistan
 				som Ouzbekistan
+				UZS
 			
 			
 				bolivar Venezuela (1871–2008)
@@ -10331,6 +11232,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bolivar Venezuela (1871–2008)
 				a volivaroù Venezuela (1871–2008)
 				bolivar Venezuela (1871–2008)
+				VEB
 			
 			
 				bolivar Venezuela (2008–2018)
@@ -10339,6 +11241,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bolivar Venezuela (2008–2018)
 				a volivaroù Venezuela (2008–2018)
 				bolivar Venezuela (2008–2018)
+				VEF
+				Bs
 			
 			
 				bolivar Venezuela
@@ -10356,6 +11260,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zongoù Viêt Nam
 				dong Viêt Nam
 				VND
+				₫
 			
 			
 				dong Viêt Nam (1978–1985)
@@ -10364,6 +11269,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dong Viêt Nam (1978–1985)
 				a zongoù Viêt Nam (1978–1985)
 				dong Viêt Nam (1978–1985)
+				VNN
 			
 			
 				vatu Vanuatu
@@ -10372,6 +11278,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				vatu Vanuatu
 				a vatuoù Vanuatu
 				vatu Vanuatu
+				VUV
 			
 			
 				tala Samoa
@@ -10380,6 +11287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zala Samoa
 				a dalaoù Samoa
 				tala Samoa
+				WST
 			
 			
 				lur CFA Kreizafrika
@@ -10388,12 +11296,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur CFA Kreizafrika
 				lur CFA Kreizafrika
 				lur CFA Kreizafrika
+				FCFA
 			
 			
 				arcʼhant
+				oñs troy arcʼhant
+				oñs troy arcʼhant
+				oñs troy arcʼhant
+				oñs troy arcʼhant
+				oñs troy arcʼhant
+				XAG
 			
 			
 				aour
+				oñs troy aour
+				oñs troy aour
+				oñs troy aour
+				oñs troy aour
+				oñs troy aour
+				XAU
 			
 			
 				unanenn genaoz europat
@@ -10402,6 +11323,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn genaoz europat
 				a unanennoù kenaoz europat
 				unanenn genaoz europat
+				XBA
 			
 			
 				unanenn voneiz europat
@@ -10410,6 +11332,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn voneiz europat
 				a unanennoù moneiz europat
 				unanenn voneiz europat
+				XBB
 			
 			
 				unanenn jediñ europat (XBC)
@@ -10418,6 +11341,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn jediñ europat (XBC)
 				a unanennoù jediñ europat (XBC)
 				unanenn jediñ europat (XBC)
+				XBC
 			
 			
 				unanenn jediñ europat (XBD)
@@ -10426,6 +11350,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn jediñ europat (XBD)
 				a unanennoù jediñ europat (XBD)
 				unanenn jediñ europat (XBD)
+				XBD
 			
 			
 				dollar Karib ar reter
@@ -10435,6 +11360,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				a zollaroù Karib ar reter
 				dollar Karib ar reter
 				XCD
+				$
 			
 			
 				gwirioù tennañ arbennik
@@ -10443,6 +11369,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				gwirioù tennañ arbennik
 				gwirioù tennañ arbennik
 				gwirioù tennañ arbennik
+				XDR
 			
 			
 				unanenn jediñ europat
@@ -10451,6 +11378,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn jediñ europat
 				a unanennoù jediñ europat
 				unanenn jediñ europat
+				XEU
 			
 			
 				lur aour Frañs
@@ -10459,6 +11387,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur aour Frañs
 				a lurioù aour Frañs
 				lur aour Frañs
+				XFO
 			
 			
 				lur Unaniezh etrebroadel an hentoù-houarn
@@ -10467,6 +11396,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur Unaniezh etrebroadel an hentoù-houarn
 				a lurioù Unaniezh etrebroadel an hentoù-houarn
 				lur Unaniezh etrebroadel an hentoù-houarn
+				XFU
 			
 			
 				lur CFA Afrika ar Cʼhornôg
@@ -10475,9 +11405,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur CFA BCEAO
 				a lurioù CFA BCEAO
 				lur CFA Afrika ar Cʼhornôg
+				CFA
 			
 			
 				palladiom
+				oñs troy palladiom
+				oñs troy palladiom
+				oñs troy palladiom
+				oñs troy palladiom
+				oñs troy palladiom
+				XPD
 			
 			
 				lur CFP
@@ -10486,9 +11423,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lur CFP
 				a lurioù CFP
 				lur CFP
+				CFPF
 			
 			
 				platin
+				oñs troy platin
+				oñs troy platin
+				oñs troy platin
+				oñs troy platin
+				oñs troy platin
+				XPT
+			
+			
+				XRE
+			
+			
+				XSU
 			
 			
 				kod moneiz amprouiñ
@@ -10497,6 +11447,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unanenn voneiz amprouiñ
 				a unanennoù voneiz amprouiñ
 				unanenn voneiz amprouiñ
+				XTS
 			
 			
 				moneiz dianav
@@ -10514,6 +11465,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar Yemen
 				a zinaroù Yemen
 				dinar Yemen
+				YDD
 			
 			
 				rial Yemen
@@ -10522,6 +11474,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Yemen
 				a rialoù Yemen
 				rial Yemen
+				YER
+			
+			
+				YUD
 			
 			
 				dinar nevez Yougoslavia (1994–2002)
@@ -10530,6 +11486,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar nevez Yougoslavia (1994–2002)
 				a zinaroù nevez Yougoslavia (1994–2002)
 				dinar nevez Yougoslavia (1994–2002)
+				YUM
 			
 			
 				dinar kemmadus Yougoslavia (1990–1992)
@@ -10538,6 +11495,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar kemmadus Yougoslavia (1990–1992)
 				a zinaroù kemmadus Yougoslavia (1990–1992)
 				dinar kemmadus Yougoslavia (1990–1992)
+				YUN
 			
 			
 				dinar adreizhet Yougoslavia (1992–1993)
@@ -10546,6 +11504,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dinar adreizhet Yougoslavia (1992–1993)
 				a zinaroù adreizhet Yougoslavia (1992–1993)
 				dinar adreizhet Yougoslavia (1992–1993)
+				YUR
+			
+			
+				ZAL
 			
 			
 				rand Suafrika
@@ -10554,6 +11516,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rand Suafrika
 				a randoù Suafrika
 				rand Suafrika
+				ZAR
+				R
 			
 			
 				kwacha Zambia (1968–2012)
@@ -10562,6 +11526,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwacha Zambia (1968–2012)
 				a gwachaoù Zambia (1968–2012)
 				kwacha Zambia (1968–2012)
+				ZMK
 			
 			
 				kwacha Zambia
@@ -10570,6 +11535,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwacha Zambia
 				a gwachaoù Zambia
 				kwacha Zambia
+				ZMW
+			
+			
+				ZRN
+			
+			
+				ZRZ
 			
 			
 				dollar Zimbabwe (1980–2008)
@@ -10578,6 +11550,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Zimbabwe (1980–2008)
 				a zollaroù Zimbabwe (1980–2008)
 				dollar Zimbabwe (1980–2008)
+				ZWD
 			
 			
 				dollar Zimbabwe (2009)
@@ -10586,6 +11559,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Zimbabwe (2009)
 				a zollaroù Zimbabwe (2009)
 				dollar Zimbabwe (2009)
+				ZWL
 			
 			
 				dollar Zimbabwe (2008)
@@ -10594,6 +11568,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dollar Zimbabwe (2008)
 				a zollaroù Zimbabwe (2008)
 				dollar Zimbabwe (2008)
+				ZWR
 			
 		
 		
@@ -10601,6 +11576,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}–{1}
 		
 		
+			{0} cʼhi
+			{0} gi
+			{0} cʼhi-error
+			{0} a chas
+			{0} ki
 			{0}vet
 		
 	
@@ -10609,6 +11589,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0} dre {1}
 			
+			
+				{0}-{1}
+			
 			
 				metroù dre eilenn garrez
 				{0} metr dre eilenn garrez
@@ -10617,6 +11600,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a vetroù dre eilenn garrez
 				{0} metr dre eilenn garrez
 			
+			
+				tro
+				{0} dro
+				{0} dro
+				{0} zro
+				{0} a droioù
+				{0} tro
+			
 			
 				radianoù
 				{0} radian
@@ -10685,6 +11676,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a akroù
 				{0} akr
 			
+			
+				yardoù karrez
+				{0} yard karrez
+				{0} yard karrez
+				{0} yard karrez
+				{0} a yardoù karrez
+				{0} yard karrez
+			
 			
 				troatadoù karrez
 				{0} troatad karrez
@@ -10702,6 +11701,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} meutad karrez
 				{0} dre veutad karrez
 			
+			
+				dounamoù
+				{0} dounam
+				{0} zounam
+				{0} dounam
+				{0} a zounamoù
+				{0} dounam
+			
 			
 				karatoù
 				{0} c'harat
@@ -10719,13 +11726,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} milligramm dre zekilitr
 			
 			
-				millimol dre litr
+				millimoloù dre litr
 				{0} millimol dre litr
 				{0} villimol dre litr
 				{0} millimol dre litr
 				{0} a villimoloù dre litr
 				{0} millimol dre litr
 			
+			
+				dre gant
+				{0} dre gant
+				{0} dre gant
+				{0} dre gant
+				{0} dre gant
+				{0} dre gant
+			
+			
+				dre vil
+				{0} dre vil
+				{0} dre vil
+				{0} dre vil
+				{0} dre vil
+				{0} dre vil
+			
+			
+				dre zek mil
+				{0} dre zek mil
+				{0} dre zek mil
+				{0} dre zek mil
+				{0} dre zek mil
+				{0} dre zek mil
+			
+			
+				moloù
+				{0} mol
+				{0} vol
+				{0} mol
+				{0} a voloù
+				{0} mol
+			
 			
 				litroù dre gilometr
 				{0} litr dre gilometr
@@ -10750,6 +11789,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a viltirioù dre c'hallon
 				{0} miltir dre c'hallon
 			
+			
+				miltirioù dre cʼhallon impalaerel
+				{0} miltir dre cʼhallon impalaerel
+				{0} viltir dre cʼhallon impalaerel
+				{0} miltir dre cʼhallon impalaerel
+				{0} a viltirioù dre cʼhallon impalaerel
+				{0} miltir dre cʼhallon impalaerel
+			
+			
+				petaoktedoù
+				{0} petaokted
+				{0} betaokted
+				{0} fetaokted
+				{0} a betaoktedoù
+				{0} petaokted
+			
 			
 				teraoktedoù
 				{0} teraokted
@@ -10838,6 +11893,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a gantvedoù
 				{0} kantved
 			
+			
+				dekvloavezhiadoù
+				{0} dekvloavezhiad
+				{0} zekvloavezhiad
+				{0} dekvloavezhiad
+				{0} a zekvloavezhiadoù
+				{0} dekvloavezhiad
+			
 			
 				bloazioù
 				{0} bloaz
@@ -10973,6 +12036,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a galoriennoù
 				{0} kalorienn
 			
+			
+				kaloriennoù bras
+				{0} galorienn vras
+				{0} galorienn vras
+				{0} c'halorienn vras
+				{0} a galoriennoù bras
+				{0} kalorienn vras
+			
 			
 				kilojouloù
 				{0} c'hilojoul
@@ -10997,6 +12068,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a gilowattoù-eurioù
 				{0} kilowatt-eur
 			
+			
+				elektron-voltoù
+				{0} elektron-volt
+				{0} elektron-volt
+				{0} elektron-volt
+				{0} a elektron-voltoù
+				{0} elektron-volt
+			
+			
+				British thermal units
+				{0} British thermal unit
+				{0} vBritish thermal unit
+				{0} British thermal unit
+				{0} British thermal unit
+				{0} British thermal unit
+			
+			
+				termiennoù SU
+				{0} dermienn
+				{0} dermienn
+				{0} zermienn
+				{0} a dermiennoù
+				{0} termienn
+			
+			
+				newtonoù
+				{0} newton
+				{0} newton
+				{0} newton
+				{0} a newtonoù
+				{0} newton
+			
 			
 				gigahertzoù
 				{0} gigahertz
@@ -11029,6 +12132,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a hertzoù
 				{0} hertz
 			
+			
+				pikselioù
+				{0} piksel
+				{0} biksel
+				{0} fiksel
+				{0} a bikselioù
+				{0} piksel
+			
+			
+				megapikselioù
+				{0} megapiksel
+				{0} vegapiksel
+				{0} megapiksel
+				{0} a vegapikselioù
+				{0} megapiksel
+			
+			
+				pikselioù dre gentimetr
+				{0} piksel dre gentimetr
+				{0} biksel dre gentimetr
+				{0} fiksel dre gentimetr
+				{0} a bikselioù dre gentimetr
+				{0} piksel dre gentimetr
+			
+			
+				pikselioù dre veutad
+				{0} piksel dre veutad
+				{0} biksel dre veutad
+				{0} fiksel dre veutad
+				{0} a pikselioù dre veutad
+				{0} piksel dre veutad
+			
+			
+				pikoù dre gentimetr
+				{0} pik dre gentimetr
+				{0} bik dre gentimetr
+				{0} fik dre gentimetr
+				{0} a bikoù dre gentimetr
+				{0} pik dre gentimetr
+			
+			
+				pikoù dre veutad
+				{0} pik dre veutad
+				{0} bik dre veutad
+				{0} fik dre veutad
+				{0} a bikoù dre veutad
+				{0} pik dre veutad
+			
 			
 				kilometroù
 				{0} c'hilometr
@@ -11104,6 +12255,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a viltirioù
 				{0} miltir
 			
+			
+				yardoù
+				{0} yard
+				{0} yard
+				{0} yard
+				{0} a yardoù
+				{0} yard
+			
 			
 				troatadoù
 				{0} troatad
@@ -11130,6 +12289,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a barsekoù
 				{0} parsek
 			
+			
+				bloavezhioù-gouloù
+				{0} bloavezh-gouloù
+				{0} vloavezh-gouloù
+				{0} bloavezh-gouloù
+				{0} a vloavezhioù-gouloù
+				{0} bloavezh-gouloù
+			
 			
 				unanennoù steredoniel
 				{0} unanenn steredoniel
@@ -11138,6 +12305,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a unanennoù steredoniel
 				{0} unanenn steredoniel
 			
+			
+				furlongoù
+				{0} furlong
+				{0} furlong
+				{0} furlong
+				{0} a furlongoù
+				{0} furlong
+			
 			
 				gourhedadoù
 				{0} gourhedad
@@ -11154,14 +12329,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a vilmorioù
 				{0} milmor
 			
+			
+				miltirioù skandinaviat
+				{0} miltir skandinaviat
+				{0} miltir skandinaviat
+				{0} miltir skandinaviat
+				{0} a viltirioù skandinaviat
+				{0} miltir skandinaviat
+			
 			
-				poent
+				poentoù
 				{0} poent
 				{0} boent
 				{0} foent
 				{0} a boentoù
 				{0} poent
 			
+			
+				skinoù heol
+				{0} skin heol
+				{0} skin heol
+				{0} skin heol
+				{0} skin heol
+				{0} R☉
+			
 			
 				luksoù
 				{0} luks
@@ -11220,6 +12411,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a donennoù
 				{0} tonenn
 			
+			
+				stonoù
+				{0} ston
+				{0} ston
+				{0} ston
+				{0} ston
+				{0} ston
+			
 			
 				lurioù
 				{0} lur
@@ -11238,6 +12437,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} oñs
 				{0} dre oñs
 			
+			
+				oñsoù troy
+				{0} oñs troy
+				{0} oñs troy
+				{0} oñs troy
+				{0} oñs troy
+				{0} oñs troy
+			
 			
 				karatoù
 				{0} c'harat
@@ -11246,6 +12453,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a garatoù
 				{0} karat
 			
+			
+				daltonoù
+				{0} dalton
+				{0} zalton
+				{0} dalton
+				{0} a zaltonoù
+				{0} dalton
+			
+			
+				tolzadoù douar
+				{0} tolzad douar
+				{0} dolzad douar
+				{0} zolzad douar
+				{0} a dolzadoù douar
+				{0} tolzad douar
+			
+			
+				tolzadoù heol
+				{0} tolzad heol
+				{0} dolzad heol
+				{0} zolzad heol
+				{0} a dolzadoù heol
+				{0} tolzad heol
+			
 			
 				gigawattoù
 				{0} gigawatt
@@ -11294,14 +12525,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a varc'hadoù nerzh
 				{0} marc'had nerzh
 			
-			
-				hektopaskaloù
-				{0} hektopaskal
-				{0} hektopaskal
-				{0} hektopaskal
-				{0} a hektopaskaloù
-				{0} hektopaskal
-			
 			
 				lurioù dre veutad karrez
 				{0} lur dre veutad karrez
@@ -11310,6 +12533,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a lurioù dre veutad karrez
 				{0} lur dre veutad karrez
 			
+			
+				baroù
+				{0} bar
+				{0} var
+				{0} bar
+				{0} a varoù
+				{0} bar
+			
 			
 				milibaroù
 				{0} milibar
@@ -11318,6 +12549,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a vilibaroù
 				{0} milibar
 			
+			
+				paskaloù
+				{0} paskal
+				{0} baskal
+				{0} faskal
+				{0} a baskaloù
+				{0} paskal
+			
+			
+				hektopaskaloù
+				{0} hektopaskal
+				{0} hektopaskal
+				{0} hektopaskal
+				{0} a hektopaskaloù
+				{0} hektopaskal
+			
+			
+				kilopaskaloù
+				{0} c'hilopaskal
+				{0} gilopaskal
+				{0} c'hilopaskal
+				{0} a gilopaskaloù
+				{0} kilopaskal
+			
+			
+				megapaskaloù
+				{0} megapaskal
+				{0} vegapaskal
+				{0} megapaskal
+				{0} a vegapaskaloù
+				{0} megapaskal
+			
 			
 				kilometroù dre eur
 				{0} c'hilometr dre eur
@@ -11382,6 +12645,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a gelvinoù
 				{0} kelvin
 			
+			
+				newton-metroù
+				{0} newton-metr
+				{0} newton-metr
+				{0} newton-metr
+				{0} a newton-metroù
+				{0} newton-metr
+			
 			
 				kilometroù diñs
 				{0} c'hilometr diñs
@@ -11416,6 +12687,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a viltirioù diñs
 				{0} miltir diñs
 			
+			
+				yardoù diñs
+				{0} yard diñs
+				{0} yard diñs
+				{0} yard diñs
+				{0} a yardoù diñs
+				{0} yard diñs
+			
 			
 				troatadoù diñs
 				{0} troatad diñs
@@ -11489,6 +12768,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a bintoù metrek
 				{0} pint metrek
 			
+			
+				tasadoù metrek
+				{0} tasad metrek
+				{0} dasad vetrek
+				{0} zasad metrek
+				{0} a dasadoù metrek
+				{0} tasad metrek
+			
+			
+				akroù-troatadoù
+				{0} akr-troatad
+				{0} akr-troatad
+				{0} akr-troatad
+				{0} akr-troatad
+				{0} akr-troatad
+			
 			
 				poezelladoù
 				{0} poezellad
@@ -11506,6 +12801,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} gallon
 				{0} dre cʼhallon
 			
+			
+				gallonoù impalaerel
+				{0} gallon impalaerel
+				{0} c'hallon impalaerel
+				{0} gallon impalaerel
+				{0} a c'hallonoù impalaerel
+				{0} gallon impalaerel
+				{0} dre cʼhallon impalaerel
+			
 			
 				kardoù
 				{0} c'hard
@@ -11522,6 +12826,54 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a bintoù
 				{0} pint
 			
+			
+				tasadoù
+				{0} tasad
+				{0} tasad
+				{0} zasad
+				{0} a dasadoù
+				{0} tasad
+			
+			
+				oñsoù liñvel
+				{0} oñs liñvel
+				{0} oñs liñvel
+				{0} oñs liñvel
+				{0} a oñsoù liñvel
+				{0} oñs liñvel
+			
+			
+				oñsoù liñvel impalaerel
+				{0} oñs liñvel impalaerel
+				{0} oñs liñvel impalaerel
+				{0} oñs liñvel impalaerel
+				{0} a oñsoù liñvel impalaerel
+				{0} oñs liñvel impalaerel
+			
+			
+				loaiadoù-boued
+				{0} loaiad-voued
+				{0} loaiad-voued
+				{0} loaiad-voued
+				{0} a loaiadoù-boued
+				{0} loaiad-voued
+			
+			
+				loaiadoù-kafe
+				{0} loaiad-gafe
+				{0} loaiad-gafe
+				{0} loaiad-gafe
+				{0} a loaiadoù-kafe
+				{0} loaiad-gafe
+			
+			
+				barilhoù
+				{0} barilh
+				{0} varilh
+				{0} barilh
+				{0} a varilhoù
+				{0} barilh
+			
 			
 				{0} Reter
 				{0} Norzh
@@ -11533,6 +12885,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}/{1}
 			
+			
+				G
+			
 			
 				m/s²
 				{0} m/s²
@@ -11541,6 +12896,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} m/s²
 				{0} m/s²
 			
+			
+				tr
+				{0} tr
+				{0} tr
+				{0} tr
+				{0} tr
+				{0} tr
+			
 			
 				rad
 				{0} rad
@@ -11558,6 +12921,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} deg
 			
 			
+				′
 				{0}′
 				{0}′
 				{0}′
@@ -11565,6 +12929,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}′
 			
 			
+				″
 				{0}″
 				{0}″
 				{0}″
@@ -11640,6 +13005,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} in²
 				{0}/in²
 			
+			
+				dounam
+				{0} dounam
+				{0} dounam
+				{0} dounam
+				{0} dounam
+				{0} dounam
+			
 			
 				kt
 				{0} kt
@@ -11664,6 +13037,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mmol/l
 				{0} mmol/l
 			
+			
+				{0} %
+				{0} %
+				{0} %
+				{0} %
+				{0} %
+			
+			
+				{0} ‰
+				{0} ‰
+				{0} ‰
+				{0} ‰
+				{0} ‰
+			
+			
+				{0} ‱
+				{0} ‱
+				{0} ‱
+				{0} ‱
+				{0} ‱
+			
 			
 				l/km
 				{0} l/km
@@ -11688,6 +13082,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mi/gal
 				{0} mi/gal
 			
+			
+				mi/gal imp.
+				{0} mi/gal imp.
+				{0} mi/gal imp.
+				{0} mi/gal imp.
+				{0} mi/gal imp.
+				{0} mi/gal imp.
+			
+			
+				Po
+				{0} Po
+				{0} Po
+				{0} Po
+				{0} Po
+				{0} Po
+			
 			
 				To
 				{0} To
@@ -11776,6 +13186,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kved
 				{0} kved
 			
+			
+				dek
+				{0} dek
+				{0} dek
+				{0} dek
+				{0} dek
+				{0} dek
+			
 			
 				bl.
 				{0} bl.
@@ -11786,13 +13204,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/bl.
 			
 			
-				mizioù
-				{0} miz
-				{0} viz
-				{0} miz
-				{0} a vizioù
-				{0} miz
-				{0}/miz
+				m.
+				{0} m.
+				{0} m.
+				{0} m.
+				{0} m.
+				{0} m.
+				{0}/m.
+			
+			
+				sizh.
+				{0} sizh.
+				{0} sizh.
+				{0} sizh.
+				{0} sizh.
+				{0} sizh.
+				{0}/sizh.
 			
 			
 				d
@@ -11804,13 +13231,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/d
 			
 			
-				e
-				{0} e
-				{0} e
-				{0} e
-				{0} e
-				{0} e
-				{0}/e
+				h
+				{0} h
+				{0} h
+				{0} h
+				{0} h
+				{0} h
+				{0}/h
 			
 			
 				min
@@ -11934,6 +13361,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kWh
 				{0} kWh
 			
+			
+				thm SU
+				{0} thm SU
+				{0} thm SU
+				{0} thm SU
+				{0} thm SU
+				{0} thm SU
+			
 			
 				GHz
 				{0} GHz
@@ -11966,6 +13401,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Hz
 				{0} Hz
 			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+				{0} Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				px/cm
+				{0} px/cm
+				{0} px/cm
+				{0} px/cm
+				{0} px/cm
+				{0} px/cm
+			
+			
+				px/in
+				{0} px/in
+				{0} px/in
+				{0} px/in
+				{0} px/in
+				{0} px/in
+			
+			
+				pdcm
+				{0} pdcm
+				{0} pdcm
+				{0} pdcm
+				{0} pdcm
+				{0} pdcm
+			
+			
+				pdm
+				{0} pdm
+				{0} pdm
+				{0} pdm
+				{0} pdm
+				{0} pdm
+			
 			
 				km
 				{0} km
@@ -12068,7 +13543,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pc
 			
 			
-				ly
+				b.g.
+				{0} b.g.
+				{0} b.g.
+				{0} b.g.
+				{0} b.g.
+				{0} b.g.
 			
 			
 				au
@@ -12078,13 +13558,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} au
 				{0} au
 			
+			
+				{0} fur
+				{0} fur
+				{0} fur
+				{0} fur
+				{0} fur
+			
 			
-				fm
-				{0} fth
-				{0} fth
-				{0} fth
-				{0} fth
-				{0} fth
+				fth
 			
 			
 				nmi
@@ -12250,14 +13732,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -12290,6 +13764,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -12461,6 +13943,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mpt
 				{0} mpt
 			
+			
+				tm
+				{0} tm
+				{0} tm
+				{0} tm
+				{0} tm
+				{0} tm
+			
 			
 				gal
 				{0} gal
@@ -12470,6 +13960,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} gal
 				{0}/gal
 			
+			
+				gal imp.
+				{0} gal imp.
+				{0} gal imp.
+				{0} gal imp.
+				{0} gal imp.
+				{0} gal imp.
+				{0}/gal imp.
+			
 			
 				qt
 				{0} qt
@@ -12486,6 +13985,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pt
 				{0} pt
 			
+			
+				tas.
+				{0} tas.
+				{0} tas.
+				{0} tas.
+				{0} tas.
+				{0} tas.
+			
+			
+				fl oz
+				{0} fl oz
+				{0} fl oz
+				{0} fl oz
+				{0} fl oz
+				{0} fl oz
+			
+			
+				fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
+			
+			
+				l.-v.
+				{0} l.-v.
+				{0} l.-v.
+				{0} l.-v.
+				{0} l.-v.
+				{0} l.-v.
+			
+			
+				l.-g.
+				{0} l.-g.
+				{0} l.-g.
+				{0} l.-g.
+				{0} l.-g.
+				{0} l.-g.
+			
 			
 				{0} R
 				{0} N
@@ -12497,21 +14036,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}/{1}
 			
+			
+				G
+				{0}G
+				{0}G
+				{0}G
+				{0}G
+				{0}G
+			
 			
 				m/s²
-				{0} m/s²
-				{0} m/s²
-				{0} m/s²
-				{0} m/s²
-				{0} m/s²
+				{0}m/s²
+				{0}m/s²
+				{0}m/s²
+				{0}m/s²
+				{0}m/s²
+			
+			
+				tr
+				{0}tr
+				{0}tr
+				{0}tr
+				{0}tr
+				{0}tr
 			
 			
 				rad
-				{0} rad
-				{0} rad
-				{0} rad
-				{0} rad
-				{0} rad
+				{0}rad
+				{0}rad
+				{0}rad
+				{0}rad
+				{0}rad
 			
 			
 				°
@@ -12522,6 +14077,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}°
 			
 			
+				′
 				{0}′
 				{0}′
 				{0}′
@@ -12529,6 +14085,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}′
 			
 			
+				″
 				{0}″
 				{0}″
 				{0}″
@@ -12537,307 +14094,626 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				km²
-				{0} km²
-				{0} km²
-				{0} km²
-				{0} km²
-				{0} km²
+				{0}km²
+				{0}km²
+				{0}km²
+				{0}km²
+				{0}km²
 				{0}/km²
 			
 			
 				ha
-				{0} ha
-				{0} ha
-				{0} ha
-				{0} ha
-				{0} ha
+				{0}ha
+				{0}ha
+				{0}ha
+				{0}ha
+				{0}ha
 			
 			
 				m²
-				{0} m²
-				{0} m²
-				{0} m²
-				{0} m²
-				{0} m²
+				{0}m²
+				{0}m²
+				{0}m²
+				{0}m²
+				{0}m²
 				{0}/m²
 			
 			
 				cm²
-				{0} cm²
-				{0} cm²
-				{0} cm²
-				{0} cm²
-				{0} cm²
+				{0}cm²
+				{0}cm²
+				{0}cm²
+				{0}cm²
+				{0}cm²
 				{0}/cm²
 			
 			
 				mi²
-				{0} mi²
-				{0} mi²
-				{0} mi²
-				{0} mi²
-				{0} mi²
+				{0}mi²
+				{0}mi²
+				{0}mi²
+				{0}mi²
+				{0}mi²
 				{0}/mi²
 			
 			
 				ac
-				{0} ac
-				{0} ac
-				{0} ac
-				{0} ac
-				{0} ac
+				{0}ac
+				{0}ac
+				{0}ac
+				{0}ac
+				{0}ac
+			
+			
+				{0}yd²
+				{0}yd²
+				{0}yd²
+				{0}yd²
+				{0}yd²
 			
 			
 				ft²
-				{0} ft²
-				{0} ft²
-				{0} ft²
-				{0} ft²
-				{0} ft²
+				{0}ft²
+				{0}ft²
+				{0}ft²
+				{0}ft²
+				{0}ft²
 			
 			
 				in²
-				{0} in²
-				{0} in²
-				{0} in²
-				{0} in²
-				{0} in²
+				{0}in²
+				{0}in²
+				{0}in²
+				{0}in²
+				{0}in²
 				{0}/in²
 			
+			
+				dounam
+				{0}dounam
+				{0}dounam
+				{0}dounam
+				{0}dounam
+				{0}dounam
+			
 			
 				kt
-				{0} kt
-				{0} kt
-				{0} kt
-				{0} kt
-				{0} kt
+				{0}kt
+				{0}kt
+				{0}kt
+				{0}kt
+				{0}kt
 			
 			
 				mg/dl
-				{0} mg/dl
-				{0} mg/dl
-				{0} mg/dl
-				{0} mg/dl
-				{0} mg/dl
+				{0}mg/dl
+				{0}mg/dl
+				{0}mg/dl
+				{0}mg/dl
+				{0}mg/dl
 			
 			
 				mmol/l
-				{0} mmol/l
-				{0} mmol/l
-				{0} mmol/l
-				{0} mmol/l
-				{0} mmol/l
+				{0}mmol/l
+				{0}mmol/l
+				{0}mmol/l
+				{0}mmol/l
+				{0}mmol/l
+			
+			
+				{0}%
+				{0}%
+				{0}%
+				{0}%
+				{0}%
+			
+			
+				{0}‰
+				{0}‰
+				{0}‰
+				{0}‰
+				{0}‰
+			
+			
+				{0}‱
+				{0}‱
+				{0}‱
+				{0}‱
+				{0}‱
+			
+			
+				{0}mol
+				{0}mol
+				{0}mol
+				{0}mol
+				{0}mol
 			
 			
 				l/km
-				{0} l/km
-				{0} l/km
-				{0} l/km
-				{0} l/km
-				{0} l/km
+				{0}l/km
+				{0}l/km
+				{0}l/km
+				{0}l/km
+				{0}l/km
 			
 			
 				l/100km
-				{0} l/100km
-				{0} l/100km
-				{0} l/100km
-				{0} l/100km
-				{0} l/100km
+				{0}l/100km
+				{0}l/100km
+				{0}l/100km
+				{0}l/100km
+				{0}l/100km
 			
 			
 				mi/gal
-				{0} mi/gal
-				{0} mi/gal
-				{0} mi/gal
-				{0} mi/gal
-				{0} mi/gal
+				{0}mi/gal
+				{0}mi/gal
+				{0}mi/gal
+				{0}mi/gal
+				{0}mi/gal
+			
+			
+				mi/gIm
+				{0}mi/gIm
+				{0}mi/gIm
+				{0}mi/gIm
+				{0}mi/gIm
+				{0}mi/gIm
+			
+			
+				Po
+				{0}Po
+				{0}Po
+				{0}Po
+				{0}Po
+				{0}Po
 			
 			
 				To
-				{0} To
-				{0} To
-				{0} To
-				{0} To
-				{0} To
+				{0}To
+				{0}To
+				{0}To
+				{0}To
+				{0}To
 			
 			
-				Tb
-				{0} Tb
-				{0} Tb
-				{0} Tb
-				{0} Tb
-				{0} Tb
+				Tbit
+				{0}Tbit
+				{0}Tbit
+				{0}Tbit
+				{0}Tbit
+				{0}Tbit
 			
 			
 				Go
-				{0} Go
-				{0} Go
-				{0} Go
-				{0} Go
-				{0} Go
+				{0}Go
+				{0}Go
+				{0}Go
+				{0}Go
+				{0}Go
 			
 			
-				Gb
-				{0} Gb
-				{0} Gb
-				{0} Gb
-				{0} Gb
-				{0} Gb
+				Gbit
+				{0}Gbit
+				{0}Gbit
+				{0}Gbit
+				{0}Gbit
+				{0}Gbit
 			
 			
 				Mo
-				{0} Mo
-				{0} Mo
-				{0} Mo
-				{0} Mo
-				{0} Mo
+				{0}Mo
+				{0}Mo
+				{0}Mo
+				{0}Mo
+				{0}Mo
 			
 			
-				Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
+				Mbit
+				{0}Mbit
+				{0}Mbit
+				{0}Mbit
+				{0}Mbit
+				{0}Mbit
 			
 			
 				ko
-				{0} ko
-				{0} ko
-				{0} ko
-				{0} ko
-				{0} ko
+				{0}ko
+				{0}ko
+				{0}ko
+				{0}ko
+				{0}ko
 			
 			
-				kb
-				{0} kb
-				{0} kb
-				{0} kb
-				{0} kb
-				{0} kb
+				kbit
+				{0}kbit
+				{0}kbit
+				{0}kbit
+				{0}kbit
+				{0}kbit
 			
 			
 				o
-				{0} o
-				{0} o
-				{0} o
-				{0} o
+				{0}o
+				{0}o
+				{0}o
+				{0}o
 				{0} o
 			
 			
-				b
-				{0} b
-				{0} b
-				{0} b
-				{0} b
-				{0} b
+				bit
+				{0}bit
+				{0}bit
+				{0}bit
+				{0}bit
+				{0}bit
+			
+			
+				{0}kved
+				{0}kved
+				{0}kved
+				{0}kved
+				{0}kved
+			
+			
+				dek
+				{0}dek
+				{0}dek
+				{0}dek
+				{0}dek
+				{0}dek
 			
 			
 				b
-				{0} b
-				{0} b
-				{0} b
-				{0} b
-				{0} b
+				{0}b
+				{0}b
+				{0}b
+				{0}b
+				{0}b
 				{0}/b
 			
 			
-				mizioù
-				{0} miz
-				{0} m
-				{0} miz
-				{0} a vizioù
-				{0} miz
-				{0}/miz
+				m
+				{0}m
+				{0}m
+				{0}m
+				{0}m
+				{0}m
+				{0}/m
+			
+			
+				sizh.
+				{0}sizh.
+				{0}sizh.
+				{0}sizh.
+				{0}sizh.
+				{0}sizh.
+				{0}/sizh.
 			
 			
+				{0}d
+				{0}d
+				{0}d
+				{0}d
+				{0}d
 				{0}/d
 			
+			
+				h
+				{0}h
+				{0}h
+				{0}h
+				{0}h
+				{0}h
+				{0}/h
+			
 			
+				{0}min
+				{0}min
+				{0}min
+				{0}min
+				{0}min
 				{0}/min
 			
+			
+				{0}s
+				{0}s
+				{0}s
+				{0}s
+				{0}s
+			
+			
+				{0}ms
+				{0}ms
+				{0}ms
+				{0}ms
+				{0}ms
+			
+			
+				{0}μs
+				{0}μs
+				{0}μs
+				{0}μs
+				{0}μs
+			
+			
+				{0}ns
+				{0}ns
+				{0}ns
+				{0}ns
+				{0}ns
+			
+			
+				{0}A
+				{0}A
+				{0}A
+				{0}A
+				{0}A
+			
+			
+				{0}mA
+				{0} mA
+				{0}mA
+				{0}mA
+				{0}mA
+			
 			
 				Ω
-				{0} Ω
-				{0} Ω
-				{0} Ω
-				{0} Ω
-				{0} Ω
+				{0}Ω
+				{0}Ω
+				{0}Ω
+				{0}Ω
+				{0}Ω
+			
+			
+				{0}V
+				{0}V
+				{0}V
+				{0}V
+				{0}V
+			
+			
+				{0}kcal
+				{0}kcal
+				{0}kcal
+				{0}kcal
+				{0}kcal
+			
+			
+				{0}cal
+				{0}cal
+				{0}cal
+				{0}cal
+				{0}cal
+			
+			
+				{0}Cal
+				{0}Cal
+				{0}Cal
+				{0}Cal
+				{0}Cal
+			
+			
+				{0}kJ
+				{0}kJ
+				{0}kJ
+				{0}kJ
+				{0}kJ
+			
+			
+				{0}J
+				{0}J
+				{0}J
+				{0}J
+				{0}J
+			
+			
+				{0}kWh
+				{0}kWh
+				{0}kWh
+				{0}kWh
+				{0}kWh
+			
+			
+				{0}eV
+				{0}eV
+				{0}eV
+				{0}eV
+				{0}eV
+			
+			
+				Btu
+				{0}Btu
+				{0}Btu
+				{0}Btu
+				{0}Btu
+				{0}Btu
+			
+			
+				thm
+				{0}thm
+				{0}thm
+				{0}thm
+				{0}thm
+				{0}thm
+			
+			
+				{0}lbf
+				{0}lbf
+				{0}lbf
+				{0}lbf
+				{0}lbf
+			
+			
+				{0}N
+				{0}N
+				{0}N
+				{0}N
+				{0}N
+			
+			
+				{0}GHz
+				{0}GHz
+				{0}GHz
+				{0}GHz
+				{0}GHz
+			
+			
+				{0}MHz
+				{0}MHz
+				{0}MHz
+				{0}MHz
+				{0}MHz
+			
+			
+				{0}kHz
+				{0}kHz
+				{0}kHz
+				{0}kHz
+				{0}kHz
+			
+			
+				{0}Hz
+				{0}Hz
+				{0}Hz
+				{0}Hz
+				{0}Hz
+			
+			
+				{0}em
+				{0}em
+				{0}em
+				{0}em
+				{0}em
+			
+			
+				{0}px
+				{0}px
+				{0}px
+				{0}px
+				{0}px
+			
+			
+				Mpx
+				{0}Mpx
+				{0}Mpx
+				{0}Mpx
+				{0}Mpx
+				{0}Mpx
+			
+			
+				px/cm
+				{0}px/cm
+				{0}px/cm
+				{0}px/cm
+				{0}px/cm
+				{0}px/cm
+			
+			
+				px/in
+				{0}px/in
+				{0}px/in
+				{0}px/in
+				{0}px/in
+				{0}px/in
+			
+			
+				pdcm
+				{0}pdcm
+				{0}pdcm
+				{0}pdcm
+				{0}pdcm
+				{0}pdcm
+			
+			
+				pdm
+				{0}pdm
+				{0}pdm
+				{0}pdm
+				{0}pdm
+				{0}pdm
 			
 			
 				km
-				{0} km
-				{0} km
-				{0} km
-				{0} km
-				{0} km
+				{0}km
+				{0}km
+				{0}km
+				{0}km
+				{0}km
 				{0}/km
 			
 			
 				m
-				{0} m
-				{0} m
-				{0} m
-				{0} m
-				{0} m
+				{0}m
+				{0}m
+				{0}m
+				{0}m
+				{0}m
 				{0}/m
 			
 			
 				dm
-				{0} dm
-				{0} dm
-				{0} dm
-				{0} dm
-				{0} dm
+				{0}dm
+				{0}dm
+				{0}dm
+				{0}dm
+				{0}dm
 			
 			
 				cm
-				{0} cm
-				{0} cm
-				{0} cm
-				{0} cm
-				{0} cm
+				{0}cm
+				{0}cm
+				{0}cm
+				{0}cm
+				{0}cm
 				{0}/cm
 			
 			
 				mm
-				{0} mm
-				{0} mm
-				{0} mm
-				{0} mm
-				{0} mm
+				{0}mm
+				{0}mm
+				{0}mm
+				{0}mm
+				{0}mm
 			
 			
 				µm
-				{0} µm
-				{0} µm
-				{0} µm
-				{0} µm
-				{0} µm
+				{0}µm
+				{0}µm
+				{0}µm
+				{0}µm
+				{0}µm
 			
 			
 				nm
-				{0} nm
-				{0} nm
-				{0} nm
-				{0} nm
-				{0} nm
+				{0}nm
+				{0}nm
+				{0}nm
+				{0}nm
+				{0}nm
 			
 			
 				pm
-				{0} pm
-				{0} pm
-				{0} pm
-				{0} pm
-				{0} pm
+				{0}pm
+				{0}pm
+				{0}pm
+				{0}pm
+				{0}pm
 			
 			
 				mi
-				{0} mi
-				{0} mi
-				{0} mi
-				{0} mi
-				{0} mi
+				{0}mi
+				{0}mi
+				{0}mi
+				{0}mi
+				{0}mi
+			
+			
+				{0}yd
+				{0}yd
+				{0}yd
+				{0}yd
+				{0}yd
 			
 			
 				′
@@ -12859,161 +14735,258 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				pc
-				{0} pc
-				{0} pc
-				{0} pc
-				{0} pc
-				{0} pc
+				{0}pc
+				{0}pc
+				{0}pc
+				{0}pc
+				{0}pc
+			
+			
+				b.g.
+				{0}b.g.
+				{0}b.g.
+				{0}b.g.
+				{0}b.g.
+				{0}b.g.
 			
 			
 				au
-				{0} au
-				{0} au
-				{0} au
-				{0} au
-				{0} au
+				{0}au
+				{0}au
+				{0}au
+				{0}au
+				{0}au
+			
+			
+				{0}fur
+				{0}fur
+				{0}fur
+				{0}fur
+				{0}fur
 			
 			
-				fm
-				{0} fth
-				{0} fth
-				{0} fth
-				{0} fth
-				{0} fth
+				fth
+				{0}fth
+				{0}fth
+				{0}fth
+				{0}fth
+				{0}fth
 			
 			
 				nmi
-				{0} nmi
-				{0} nmi
-				{0} nmi
-				{0} nmi
-				{0} nmi
+				{0}nmi
+				{0}nmi
+				{0}nmi
+				{0}nmi
+				{0}nmi
 			
 			
 				smi
-				{0} smi
-				{0} smi
-				{0} smi
-				{0} smi
-				{0} smi
+				{0}smi
+				{0}smi
+				{0}smi
+				{0}smi
+				{0}smi
 			
 			
 				pt
-				{0} pt
-				{0} pt
-				{0} pt
-				{0} pt
-				{0} pt
+				{0}pt
+				{0}pt
+				{0}pt
+				{0}pt
+				{0}pt
+			
+			
+				{0}R☉
+				{0}R☉
+				{0}R☉
+				{0}R☉
+				{0}R☉
 			
 			
 				lx
-				{0} lx
-				{0} lx
-				{0} lx
-				{0} lx
-				{0} lx
+				{0}lx
+				{0}lx
+				{0}lx
+				{0}lx
+				{0}lx
+			
+			
+				{0}L☉
+				{0}L☉
+				{0}L☉
+				{0}L☉
+				{0}L☉
 			
 			
 				t
-				{0} t
-				{0} t
-				{0} t
-				{0} t
-				{0} t
+				{0}t
+				{0}t
+				{0}t
+				{0}t
+				{0}t
 			
 			
 				kg
-				{0} kg
-				{0} kg
-				{0} kg
-				{0} kg
-				{0} kg
+				{0}kg
+				{0}kg
+				{0}kg
+				{0}kg
+				{0}kg
 				{0}/kg
 			
 			
 				g
-				{0} g
-				{0} g
-				{0} g
-				{0} g
-				{0} g
+				{0}g
+				{0}g
+				{0}g
+				{0}g
+				{0}g
 				{0}/g
 			
 			
 				mg
-				{0} mg
-				{0} mg
-				{0} mg
-				{0} mg
-				{0} mg
+				{0}mg
+				{0}mg
+				{0}mg
+				{0}mg
+				{0}mg
 			
 			
 				µg
-				{0} µg
-				{0} µg
-				{0} µg
-				{0} µg
-				{0} µg
+				{0}µg
+				{0}µg
+				{0}µg
+				{0}µg
+				{0}µg
 			
 			
 				tn
-				{0} tn
-				{0} tn
-				{0} tn
-				{0} tn
-				{0} tn
+				{0}tn
+				{0}tn
+				{0}tn
+				{0}tn
+				{0}tn
+			
+			
+				{0}st
+				{0}st
+				{0}st
+				{0}st
+				{0}st
 			
 			
 				lb
-				{0} lb
-				{0} lb
-				{0} lb
-				{0} lb
-				{0} lb
+				{0}lb
+				{0}lb
+				{0}lb
+				{0}lb
+				{0}lb
 				{0}/lb
 			
 			
+				{0}oz
+				{0}oz
+				{0}oz
+				{0}oz
+				{0}oz
 				{0}/oz
 			
+			
+				ozt
+				{0}ozt
+				{0}ozt
+				{0}ozt
+				{0}ozt
+				{0}ozt
+			
 			
 				CD
-				{0} CD
-				{0} CD
-				{0} CD
-				{0} CD
-				{0} CD
+				{0}CD
+				{0}CD
+				{0}CD
+				{0}CD
+				{0}CD
+			
+			
+				{0}Da
+				{0}Da
+				{0}Da
+				{0} Da
+				{0}Da
+			
+			
+				{0}M⊕
+				{0}M⊕
+				{0}M⊕
+				{0}M⊕
+				{0}M⊕
+			
+			
+				{0}M☉
+				{0}M☉
+				{0}M☉
+				{0}M☉
+				{0}M☉
+			
+			
+				{0}GW
+				{0}GW
+				{0}GW
+				{0}GW
+				{0}GW
+			
+			
+				{0}MW
+				{0}MW
+				{0}MW
+				{0}MW
+				{0}MW
+			
+			
+				{0}kW
+				{0}kW
+				{0}kW
+				{0}kW
+				{0}kW
+			
+			
+				{0}W
+				{0}W
+				{0}W
+				{0}W
+				{0}W
+			
+			
+				{0}mW
+				{0}mW
+				{0}mW
+				{0}mW
+				{0}mW
 			
 			
 				hp
-				{0} hp
-				{0} hp
-				{0} hp
-				{0} hp
-				{0} hp
-			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
+				{0}hp
+				{0}hp
+				{0}hp
+				{0}hp
+				{0}hp
 			
 			
 				mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
+				{0}mmHg
+				{0}mmHg
+				{0}mmHg
+				{0}mmHg
+				{0}mmHg
 			
 			
 				lb/in²
-				{0} lb/in²
-				{0} lb/in²
-				{0} lb/in²
-				{0} lb/in²
-				{0} lb/in²
+				{0}lb/in²
+				{0}lb/in²
+				{0}lb/in²
+				{0}lb/in²
+				{0}lb/in²
 			
 			
 				″Hg
@@ -13023,45 +14996,88 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}″Hg
 				{0}″Hg
 			
+			
+				{0}bar
+				{0}bar
+				{0}bar
+				{0}bar
+				{0}bar
+			
 			
 				mbar
-				{0} mbar
-				{0} mbar
-				{0} mbar
-				{0} mbar
-				{0} mbar
+				{0}mbar
+				{0}mbar
+				{0}mbar
+				{0}mbar
+				{0}mbar
+			
+			
+				{0}atm
+				{0}atm
+				{0}atm
+				{0}atm
+				{0}atm
+			
+			
+				{0}Pa
+				{0}Pa
+				{0}Pa
+				{0}Pa
+				{0}Pa
+			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
+			
+				{0}kPa
+				{0}kPa
+				{0}kPa
+				{0}kPa
+				{0}kPa
+			
+			
+				{0}MPa
+				{0}MPa
+				{0}MPa
+				{0}MPa
+				{0}MPa
 			
 			
 				km/h
-				{0} km/h
-				{0} km/h
-				{0} km/h
-				{0} km/h
-				{0} km/h
+				{0}km/h
+				{0}km/h
+				{0}km/h
+				{0}km/h
+				{0}km/h
 			
 			
 				m/s
-				{0} m/s
-				{0} m/s
-				{0} m/s
-				{0} m/s
-				{0} m/s
+				{0}m/s
+				{0}m/s
+				{0}m/s
+				{0}m/s
+				{0}m/s
 			
 			
 				mi/h
-				{0} mi/h
-				{0} mi/h
-				{0} mi/h
-				{0} mi/h
-				{0} mi/h
+				{0}mi/h
+				{0}mi/h
+				{0}mi/h
+				{0}mi/h
+				{0}mi/h
 			
 			
-				n
-				{0} n
-				{0} n
-				{0} n
-				{0} n
-				{0} n
+				nd
+				{0}nd
+				{0}nd
+				{0}nd
+				{0}nd
+				{0}nd
 			
 			
 				°
@@ -13089,138 +15105,249 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				K
-				{0} K
-				{0} K
-				{0} K
-				{0} K
-				{0} K
+				{0}K
+				{0}K
+				{0}K
+				{0}K
+				{0}K
+			
+			
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+			
+			
+				{0}N⋅m
+				{0}N⋅m
+				{0}N⋅m
+				{0}N⋅m
+				{0}N⋅m
 			
 			
 				km³
-				{0} km³
-				{0} km³
-				{0} km³
-				{0} km³
-				{0} km³
+				{0}km³
+				{0}km³
+				{0}km³
+				{0}km³
+				{0}km³
 			
 			
 				m³
-				{0} m³
-				{0} m³
-				{0} m³
-				{0} m³
-				{0} m³
+				{0}m³
+				{0}m³
+				{0}m³
+				{0}m³
+				{0}m³
 				{0}/m³
 			
 			
 				cm³
-				{0} cm³
-				{0} cm³
-				{0} cm³
-				{0} cm³
-				{0} cm³
+				{0}cm³
+				{0}cm³
+				{0}cm³
+				{0}cm³
+				{0}cm³
 				{0}/cm³
 			
 			
 				mi³
-				{0} mi³
-				{0} mi³
-				{0} mi³
-				{0} mi³
-				{0} mi³
+				{0}mi³
+				{0}mi³
+				{0}mi³
+				{0}mi³
+				{0}mi³
+			
+			
+				{0}yd³
+				{0}yd³
+				{0}yd³
+				{0}yd³
+				{0}yd³
 			
 			
 				ft³
-				{0} ft³
-				{0} ft³
-				{0} ft³
-				{0} ft³
-				{0} ft³
+				{0}ft³
+				{0}ft³
+				{0}ft³
+				{0}ft³
+				{0}ft³
 			
 			
 				in³
-				{0} in³
-				{0} in³
-				{0} in³
-				{0} in³
-				{0} in³
+				{0}in³
+				{0}in³
+				{0}in³
+				{0}in³
+				{0}in³
 			
 			
 				Ml
-				{0} Ml
-				{0} Ml
-				{0} Ml
-				{0} Ml
-				{0} Ml
+				{0}Ml
+				{0}Ml
+				{0}Ml
+				{0}Ml
+				{0}Ml
 			
 			
 				hl
-				{0} hl
-				{0} hl
-				{0} hl
-				{0} hl
-				{0} hl
+				{0}hl
+				{0}hl
+				{0}hl
+				{0}hl
+				{0}hl
 			
 			
 				l
-				{0} l
-				{0} l
-				{0} l
-				{0} l
-				{0} l
+				{0}l
+				{0}l
+				{0}l
+				{0}l
+				{0}l
 				{0}/l
 			
 			
 				dl
-				{0} dl
-				{0} dl
-				{0} dl
-				{0} dl
-				{0} dl
+				{0}dl
+				{0}dl
+				{0}dl
+				{0}dl
+				{0}dl
 			
 			
 				cl
-				{0} cl
-				{0} cl
-				{0} cl
-				{0} cl
-				{0} cl
+				{0}cl
+				{0}cl
+				{0}cl
+				{0}cl
+				{0}cl
 			
 			
 				ml
-				{0} ml
-				{0} ml
-				{0} ml
-				{0} ml
-				{0} ml
+				{0}ml
+				{0}ml
+				{0}ml
+				{0}ml
+				{0}ml
 			
 			
 				mpt
-				{0} mpt
-				{0} mpt
-				{0} mpt
-				{0} mpt
-				{0} mpt
+				{0}mpt
+				{0}mpt
+				{0}mpt
+				{0}mpt
+				{0}mpt
+			
+			
+				tm
+				{0}tm
+				{0}tm
+				{0}tm
+				{0}tm
+				{0}tm
+			
+			
+				acft
+				{0}acft
+				{0}acft
+				{0}acft
+				{0}acft
+				{0}acft
+			
+			
+				{0}bu
+				{0}bu
+				{0}bu
+				{0}bu
+				{0}bu
 			
 			
+				{0}gal
+				{0}gal
+				{0}gal
+				{0}gal
+				{0}gal
 				{0}/gal
 			
+			
+				galIm
+				{0}galIm
+				{0}galIm
+				{0}galIm
+				{0}galIm
+				{0}galIm
+				{0}/galIm
+			
 			
 				qt
-				{0} qt
-				{0} qt
-				{0} qt
-				{0} qt
-				{0} qt
+				{0}qt
+				{0}qt
+				{0}qt
+				{0}qt
+				{0}qt
 			
 			
 				pt
-				{0} pt
-				{0} pt
-				{0} pt
-				{0} pt
-				{0} pt
+				{0}pt
+				{0}pt
+				{0}pt
+				{0}pt
+				{0}pt
 			
+			
+				tas.
+				{0}tas.
+				{0}tas.
+				{0}tas.
+				{0}tas.
+				{0}tas.
+			
+			
+				fl oz
+				{0}fl oz
+				{0}fl oz
+				{0}fl oz
+				{0}fl oz
+				{0}fl oz
+			
+			
+				fl oz Im
+				{0}fl oz Im
+				{0}fl oz Im
+				{0}fl oz Im
+				{0}fl oz Im
+				{0}fl oz Im
+			
+			
+				l.-v.
+				{0}l.-v.
+				{0}l.-v.
+				{0}l.-v.
+				{0}l.-v.
+				{0}l.-v.
+			
+			
+				l.-g.
+				{0}l.-g.
+				{0}l.-g.
+				{0}l.-g.
+				{0}l.-g.
+				{0}l.-g.
+			
+			
+				{0}bbl
+				{0}bbl
+				{0}bbl
+				{0}bbl
+				{0}bbl
+			
+			
+				{0}R
+				{0}N
+				{0}S
+				{0}K
+			
 		
 		
 			h:mm
@@ -13236,15 +15363,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			{0}, {1}
 			{0}, {1}
-			{0}, {1}
-			{0}, {1}
+			{0} ha {1}
+			{0} ha {1}
 		
 		
 			{0}, {1}
 			{0}, {1}
-			{0}, pe {1}
+			{0} pe {1}
 			{0} pe {1}
 		
+		
+			{0} pe {1}
+		
+		
+			{0} pe {1}
+		
+		
+			{0} & {1}
+			{0} & {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
@@ -13271,6 +15408,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		{0} — kelcʼhiet
+		{0} — astennet
+		{0} — istorel
+		{0} — liesseurt
+		{0} — all
+		skriturioù — {0}
 		obererezh
 		skritur Afrika
 		skritur Amerika
@@ -13278,21 +15421,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		loened pe natur
 		biroù
 		korf
-		braille
+		skritur Braille
 		savadur
+		krug pe steredenn
 		arouez moneiz
 		sifr
+		arouez divinouriezh
+		skritur europat
+		benel
 		banniel
 		bannieloù
+		boued hag evaj
+		furmad
 		gwrizienn han
+		skritur istorel
+		skritur modern
+		kemmañ
 		natur
 		niveroù
 		tra
 		den
+		lizherenneg soniadel
+		piktogramm
+		lecʼh
+		plant
+		poentadur
+		fromlun
 		sport
 		arouez
 		beaj
 		beaj ha lecʼhioù
 		amzer
 	
+	
+		italek
+		ledander
+		tevder
+		red
+		alcʼhwez
+		testenn
+		titlañ
+		diskwel
+		skritell
+		a-serzh
+		niveroù petvediñ
+		pennlizherennoù bihan
+		teskad goullo
+	
 
diff --git a/make/data/cldr/common/main/br_FR.xml b/make/data/cldr/common/main/br_FR.xml
index b5014676830..a38b84379bf 100644
--- a/make/data/cldr/common/main/br_FR.xml
+++ b/make/data/cldr/common/main/br_FR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/brx.xml b/make/data/cldr/common/main/brx.xml
index ec6e6a1d724..fac197a9202 100644
--- a/make/data/cldr/common/main/brx.xml
+++ b/make/data/cldr/common/main/brx.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -745,7 +745,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			सेँ मार्टेँ
 			मदागास्कर
 			मार्शल द्वीप
-			मैसेडोनिया
 			माली
 			म्यानमार
 			मंगोलिया
@@ -912,7 +911,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u093C \u0901 \u0902 अ आ इ ई उ ऊ ऍ ए ऐ ऑ ओ औ क ख ग घ च छ ज झ ञ ट ठ ड {ड\u093C} ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ा ि ी \u0941 \u0942 \u0943 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]
 		[\u200C\u200D]
 		[अ आ इ ई उ ऊ ऍ ए ऐ ऑ ओ औ क ख ग घ च छ ज झ ञ ट ठ ड {ड\u093C} ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/brx_IN.xml b/make/data/cldr/common/main/brx_IN.xml
index 47739d3c26f..acff99e9d1d 100644
--- a/make/data/cldr/common/main/brx_IN.xml
+++ b/make/data/cldr/common/main/brx_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/bs.xml b/make/data/cldr/common/main/bs.xml
index ae58891f92c..bd89110125d 100644
--- a/make/data/cldr/common/main/bs.xml
+++ b/make/data/cldr/common/main/bs.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -89,6 +89,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			karipski
 			kajuga
 			atsam
+			čakma
 			čečenski
 			cebuano
 			čiga
@@ -100,7 +101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			činukski žargon
 			čoktav
 			čipvijanski
-			čiroki
+			čeroki
 			čejenski
 			centralnokurdski
 			korzikanski
@@ -118,7 +119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			dargva
 			taita
 			njemački
-			gornjonjemački (Švicarska)
 			delaver
 			slave
 			dogrib
@@ -141,8 +141,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			grčki
 			elamitski
 			engleski
-			engleski (UK)
-			engleski (SAD)
 			srednjovjekovni engleski
 			esperanto
 			španski
@@ -368,7 +366,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			oksitanski
 			ojibva
 			oromo
-			orijski
+			odija
 			osetski
 			osage
 			osmanski turski
@@ -523,14 +521,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jidiš
 			jorubanski
 			kantonski
+			jue
 			zuang
 			zapotečki
 			blis simboli
 			zenaga
 			standardni marokanski tamazigt
 			kineski
+			kineski (standardni)
 			kineski (pojednostavljeni)
+			kineski (pojednostavljeni standardni)
 			kineski (tradicionalni)
+			kineski (tradicionalni standardni)
 			zulu
 			zuni
 			bez lingvističkog sadržaja
@@ -819,7 +821,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Farska ostrva
 			Francuska
 			Gabon
-			Velika Britanija
+			Ujedinjeno Kraljevstvo
 			UK
 			Grenada
 			Gruzija
@@ -961,8 +963,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Salvador
 			Sint Marten
 			Sirija
-			Svazilend
-			Svazi
+			Esvatini
+			Svazilend
 			Tristan da Cunha
 			Ostrva Turks i Kaikos
 			Čad
@@ -972,7 +974,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tadžikistan
 			Tokelau
 			Istočni Timor
-			TL
 			Turkmenistan
 			Tunis
 			Tonga
@@ -986,7 +987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Američka Vanjska Ostrva
 			Ujedinjene Nacije
 			UN
-			Sjedinjene Američke Države
+			Sjedinjene Države
 			SAD
 			Urugvaj
 			Uzbekistan
@@ -1051,22 +1052,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Kalendar
 			Format valute
-			Zanemarivanje poredavanja simbola
-			Obrnuto poredavanje po naglasku
-			Poredavanje po velikim/malim slovima
-			Poredavanje u skladu s veličinom slova
+			Zanemarivanje poredavanja simbola
+			Obrnuto poredavanje po naglasku
+			Poredavanje po velikim/malim slovima
+			Poredavanje u skladu s veličinom slova
 			Sortiranje
-			Normalizirano poredavanje
-			Numeričko poredavanje
-			Jačina poredavanja
+			Normalizirano poredavanje
+			Numeričko poredavanje
+			Jačina poredavanja
 			Valuta
 			Format vremena (12 ili 24)
 			Stil prijeloma reda
 			Mjerni sistem
 			Brojevi
-			Vremenska zona
-			Varijanta zemlje/jezika
-			Privatna upotreba
+			Vremenska zona
+			Varijanta zemlje/jezika
+			Privatna upotreba
 		
 		
 			budistički kalendar
@@ -1211,9 +1212,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[a b c č ć d {dž} đ e f g h i j k l {lj} m n {nj} o p r s š t u v z ž]
 		[q w x y]
-		[A B C Č Ć D {DŽ} E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / ′ ″]
+		[A B C Č Ć D {DŽ} E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / ′ ″]
 		{0}…
 		…{0}
 		{0}… {1}
@@ -1889,9 +1890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d. MMM
 						d. MMMM
 						E, d. MMMM
-						W. 'sedmica' 'u' MMMM
-						W. 'sedmica' 'u' MMMM
-						W. 'sedmica' 'u' MMMM
+						W. 'sedmica' 'mjesec' MMMM
+						W. 'sedmica' 'mjesec' MMMM
+						W. 'sedmica' 'mjesec' MMMM
 						mm:ss
 						y.
 						MM/y
@@ -3582,11 +3583,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oral
 			
 			
-				Atyrau
+				Atiraj
 			
 			
 				Akutobe
 			
+			
+				Kostanaj
+			
 			
 				Kizilorda
 			
@@ -5180,6 +5184,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			,
@@ -5192,6 +5200,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			‰
 			∞
 			NaN
+			:
 		
 		
 			
@@ -5359,6 +5368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dirham (UAE)
 				dirhama (UAE)
 				dirhama (UAE)
+				AED
 			
 			
 				Avganistanski avgani (1927–2002)
@@ -5371,6 +5381,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afganistanski afgan
 				afganistanska afgana
 				afganistanskih afgana
+				AFN
 			
 			
 				Albanski lek (1946–1965)
@@ -5383,24 +5394,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				albanski lek
 				albanska leka
 				albanskih leka
+				ALL
 			
 			
 				Armenski dram
 				armenski dram
 				armenska drama
 				armenskih drama
+				AMD
 			
 			
 				Holandskoantilski gulden
 				holandskoantilski gulden
 				holandskoantilska guldena
 				holandskoantilskih guldena
+				ANG
 			
 			
 				Angolska kvanza
 				angolska kvanza
 				angolske kvanze
 				angolskih kvanzi
+				AOA
 				Kz
 			
 			
@@ -5448,6 +5463,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinski pezos
 				argentinska pezosa
 				argentinskih pezosa
+				ARS
 				$
 			
 			
@@ -5469,6 +5485,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arubanski florin
 				arubanska florina
 				arubanskih florina
+				AWG
 			
 			
 				Azerbejdžanski manat (1993–2006)
@@ -5481,6 +5498,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				azerbejdžanski manat
 				azerbejdžanska manata
 				azerbejdžanskih manata
+				AZN
 			
 			
 				Bosansko-Hercegovački dinar
@@ -5507,6 +5525,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				barbadoski dolar
 				barbadoska dolara
 				barbadoskih dolara
+				BBD
 				$
 			
 			
@@ -5514,6 +5533,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bangladeška taka
 				bangladeške take
 				bangladeških taka
+				BDT
 				৳
 			
 			
@@ -5551,6 +5571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bugarski lev
 				bugarska leva
 				bugarskih leva
+				BGN
 			
 			
 				Bugarski lev (1879–1952)
@@ -5563,18 +5584,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahreinski dinar
 				bahreinska dinara
 				bahreinskih dinara
+				BHD
 			
 			
 				Burundski franak
 				burundski franak
 				burundska franka
 				burundskih franaka
+				BIF
 			
 			
 				Bermudski dolar
 				bermudski dolar
 				bermudska dolara
 				bermudskih dolara
+				BMD
 				$
 			
 			
@@ -5582,6 +5606,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brunejski dolar
 				brunejska dolara
 				brunejskih dolara
+				BND
 				$
 			
 			
@@ -5589,6 +5614,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolivijski boliviano
 				bolivijska boliviana
 				bolivijskih boliviana
+				BOB
 				Bs
 			
 			
@@ -5658,6 +5684,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahamski dolar
 				bahamska dolara
 				bahamskih dolara
+				BSD
 				$
 			
 			
@@ -5665,6 +5692,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				butanski ngultrum
 				butanska ngultruma
 				butanskih ngultruma
+				BTN
 			
 			
 				Burmanski kjat
@@ -5677,6 +5705,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bocvanska pula
 				bocvanske pule
 				bocvanskih pula
+				BWP
 				P
 			
 			
@@ -5690,6 +5719,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bjeloruska rublja
 				bjeloruske rublje
 				bjeloruskih rubalja
+				BYN
 				р.
 			
 			
@@ -5697,12 +5727,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bjeloruska rublja (2000–2016)
 				bjeloruske rublje (2000–2016)
 				bjeloruskih rubalja (2000–2016)
+				BYR
 			
 			
 				Belizeanski dolar
 				belizeanski dolar
 				belizeanska dolara
 				belizeanskih dolara
+				BZD
 				$
 			
 			
@@ -5718,6 +5750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kongoanski franak
 				kongoanska franka
 				kongoanskih franaka
+				CDF
 			
 			
 				WIR Evro
@@ -5730,6 +5763,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				švicarski franak
 				švicarska franka
 				švicarskih franaka
+				CHF
 			
 			
 				WIR franak
@@ -5754,6 +5788,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				čileanski pezos
 				čileanska pezosa
 				čileanskih pezosa
+				CLP
 				$
 			
 			
@@ -5761,6 +5796,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kineski juan (izvanteritorijalni)
 				kineska juana (izvanteritorijalni)
 				kineskih juana (izvanteritorijalni)
+				CNH
 			
 			
 				Dolar kineske narodne banke
@@ -5781,6 +5817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kolumbijski pezos
 				kolumbijska pezosa
 				kolumbijskih pezosa
+				COP
 				$
 			
 			
@@ -5794,6 +5831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kostarikanski kolon
 				kostarikanska kolona
 				kostarikanskih kolona
+				CRC
 				₡
 			
 			
@@ -5813,6 +5851,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kubanski konvertibilni pezos
 				kubanska konvertibilna pezosa
 				kubanskih konvertibilnih pezosa
+				CUC
 				$
 			
 			
@@ -5820,6 +5859,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kubanski pezos
 				kubanska pezosa
 				kubanskih pezosa
+				CUP
 				$
 			
 			
@@ -5827,6 +5867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zelenortski eskudo
 				zelenortska eskuda
 				zelenortskih eskuda
+				CVE
 			
 			
 				Kipratska funta
@@ -5839,6 +5880,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				češka kruna
 				češke krune
 				čeških kruna
+				CZK
 				Kč
 			
 			
@@ -5858,12 +5900,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				džibutski franak
 				džibutska franka
 				džibutskih franaka
+				DJF
 			
 			
 				Danska kruna
 				danska kruna
 				danske krune
 				danskih kruna
+				DKK
 				kr
 			
 			
@@ -5871,6 +5915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dominikanski pezos
 				dominikanska pezosa
 				dominikanskih pezosa
+				DOP
 				$
 			
 			
@@ -5878,6 +5923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				alžirski dinar
 				alžirska dinara
 				alžirskih dinara
+				DZD
 			
 			
 				Ekvadorijski sukr
@@ -5902,6 +5948,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				egipatska funta
 				egipatske funte
 				egipatskih funti
+				EGP
 				E£
 			
 			
@@ -5909,6 +5956,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				eritrejska nakfa
 				eritrejske nakfe
 				eritrejskih nakfi
+				ERN
 			
 			
 				Španska pezeta (račun) ESA
@@ -5933,12 +5981,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				etiopski bir
 				etiopska bira
 				etiopskih bira
+				ETB
 			
 			
 				Euro
 				euro
 				eura
 				eura
+				€
 				€
 			
 			
@@ -5952,6 +6002,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fidžijski dolar
 				fidžijska dolara
 				fidžijskih dolara
+				FJD
 				$
 			
 			
@@ -5959,6 +6010,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				folklandska funta
 				folklandske funte
 				folklandskih funti
+				FKP
 				£
 			
 			
@@ -5986,6 +6038,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gruzijski lari
 				gruzijska larija
 				gruzijskih larija
+				GEL
 				₾
 			
 			
@@ -5999,12 +6052,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ganski cedi
 				ganska cedija
 				ganskih cedija
+				GHS
 			
 			
 				Gibraltarska funta
 				gibraltarska funta
 				gibraltarske funte
 				gibraltarskih funti
+				GIP
 				£
 			
 			
@@ -6012,12 +6067,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gambijski dalasi
 				gambijska dalasija
 				gambijskih dalasija
+				GMD
 			
 			
 				Gvinejski franak
 				gvinejski franak
 				gvinejska franka
 				gvinejskih franaka
+				GNF
 				FG
 			
 			
@@ -6043,6 +6100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gvatemalski kecal
 				gvatemalska kecala
 				gvatemalskih kecala
+				GTQ
 				Q
 			
 			
@@ -6062,6 +6120,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gvajanski dolar
 				gvajanska dolara
 				gvajanskih dolara
+				GYD
 				$
 			
 			
@@ -6077,6 +6136,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				honduraška lempira
 				honduraške lempire
 				honduraških lempira
+				HNL
 				L
 			
 			
@@ -6098,12 +6158,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				haićanski gurd
 				haićanska gurda
 				haićanskih gurda
+				HTG
 			
 			
 				Mađarska forinta
 				mađarska forinta
 				mađarske forinte
 				mađarskih forinti
+				HUF
 				Ft
 			
 			
@@ -6111,6 +6173,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				indonežanska rupija
 				indonežanske rupije
 				indonežanskih rupija
+				IDR
 				Rp
 			
 			
@@ -6144,6 +6207,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				indijska rupija
 				indijske rupije
 				indijskih rupija
+				₹
 				₹
 			
 			
@@ -6151,12 +6215,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				irački dinar
 				iračka dinara
 				iračkih dinara
+				IQD
 			
 			
 				Iranski rijal
 				iranski rijal
 				iranska rijala
 				iranskih rijala
+				IRR
 			
 			
 				stara islandska kruna
@@ -6169,6 +6235,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				islandska kruna
 				islandske krune
 				islandskih kruna
+				ISK
 				kr
 			
 			
@@ -6182,6 +6249,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jamajčanski dolar
 				jamajčanska dolara
 				jamajčanskih dolara
+				JMD
 				$
 			
 			
@@ -6189,6 +6257,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jordanski dinar
 				jordanska dinara
 				jordanskih dinara
+				JOD
 			
 			
 				Japanski jen
@@ -6203,18 +6272,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kenijski šiling
 				kenijska šilinga
 				kenijskih šilinga
+				KES
 			
 			
 				Kirgistanski som
 				kirgistanski som
 				kirgistanska soma
 				kirgistanskih soma
+				KGS
 			
 			
 				Kambodžanski rijel
 				kambodžanski rijel
 				kambodžanska rijela
 				kambodžanskih rijela
+				KHR
 				៛
 			
 			
@@ -6222,6 +6294,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				komorski franak
 				komorska franka
 				komorskih franaka
+				KMF
 				CF
 			
 			
@@ -6229,6 +6302,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sjevernokorejski von
 				sjevernokorejska vona
 				sjevernokorejskih vona
+				KPW
 				₩
 			
 			
@@ -6248,6 +6322,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				južnokorejski von
 				južnokorejska vona
 				južnokorejskih vona
+				₩
 				₩
 			
 			
@@ -6255,12 +6330,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuvajtski dinar
 				kuvajtska dinara
 				kuvajtskih dinara
+				KWD
 			
 			
 				Kajmanski dolar
 				kajmanski dolar
 				kajmanska dolara
 				kajmanskih dolara
+				KYD
 				$
 			
 			
@@ -6268,6 +6345,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kazahstanski tenge
 				kazahstanska tenga
 				kazahstanskih tenga
+				KZT
 				₸
 			
 			
@@ -6275,6 +6353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				laoski kip
 				laoska kipa
 				laoskih kipa
+				LAK
 				₭
 			
 			
@@ -6282,6 +6361,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libanska funta
 				libanske funte
 				libanskih funti
+				LBP
 				L£
 			
 			
@@ -6289,6 +6369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				šrilankanska rupija
 				šrilankanske rupije
 				šrilankanskih rupija
+				LKR
 				Rs
 			
 			
@@ -6296,6 +6377,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liberijski dolar
 				liberijska dolara
 				liberijskih dolara
+				LRD
 				$
 			
 			
@@ -6353,12 +6435,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libijski dinar
 				libijska dinara
 				libijskih dinara
+				LYD
 			
 			
 				Marokanski dirham
 				marokanski dirham
 				marokanska dirhama
 				marokanskih dirhama
+				MAD
 			
 			
 				Marokanski franak
@@ -6383,12 +6467,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				moldavski lej
 				moldavska leja
 				moldavskih leja
+				MDL
 			
 			
 				Malagaški arijari
 				malagaški arijari
 				malagaška arijarija
 				malagaških arijarija
+				MGA
 				Ar
 			
 			
@@ -6402,6 +6488,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedonski denar
 				makedonska denara
 				makedonskih denara
+				MKD
 			
 			
 				Makedonski denar (1992–1993)
@@ -6420,6 +6507,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mijanmarski kjat
 				mijanmarska kjata
 				mijanmarskih kjata
+				MMK
 				K
 			
 			
@@ -6427,6 +6515,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mongolski tugrik
 				mongolska tugrika
 				mongolskih tugrika
+				MNT
 				₮
 			
 			
@@ -6434,12 +6523,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makaonska pataka
 				makaonske patake
 				makaonskih pataka
+				MOP
 			
 			
 				Mauritanijska ugvija (1973–2017)
 				mauritanijska ugvija (1973–2017)
 				mauritanijske ugvije (1973–2017)
 				mauritanijskih ugvija (1973–2017)
+				MRO
 			
 			
 				Mauritanijska ugvija
@@ -6464,6 +6555,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mauricijska rupija
 				mauricijske rupije
 				mauricijskih rupija
+				MUR
 				Rs
 			
 			
@@ -6471,12 +6563,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maldivska rufija
 				maldivske rufije
 				maldivskih rufija
+				MVR
 			
 			
 				Malavijska kvača
 				malavijska kvača
 				malavijske kvače
 				malavijskih kvača
+				MWK
 			
 			
 				Meksički pezos
@@ -6503,6 +6597,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malezijski ringit
 				malezijska ringita
 				malezijskih ringita
+				MYR
 				RM
 			
 			
@@ -6522,12 +6617,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mozambijski metikal
 				mozambijska metikala
 				mozambijskih metikala
+				MZN
 			
 			
 				Namibijski dolar
 				namibijski dolar
 				namibijska dolara
 				namibijskih dolara
+				NAD
 				$
 			
 			
@@ -6535,6 +6632,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nigerijska naira
 				nigerijske naire
 				nigerijskih naira
+				NGN
 				₦
 			
 			
@@ -6548,6 +6646,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nikaragvanska kordoba
 				nikaragvanske kordobe
 				nikaragvanskih kordoba
+				NIO
 				C$
 			
 			
@@ -6561,6 +6660,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				norveška kruna
 				norveške krune
 				norveških kruna
+				NOK
 				kr
 			
 			
@@ -6568,6 +6668,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nepalska rupija
 				nepalske rupije
 				nepalskih rupija
+				NPR
 				Rs
 			
 			
@@ -6583,12 +6684,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				omanski rijal
 				omanska rijala
 				omanskih rijala
+				OMR
 			
 			
 				Panamska balboa
 				panamska balboa
 				panamske balboe
 				panamskih balboa
+				PAB
 			
 			
 				Peruvijski inti
@@ -6601,6 +6704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peruanski sol
 				peruanska sola
 				peruanskih sola
+				PEN
 			
 			
 				Peruvijski sol (1863–1965)
@@ -6613,12 +6717,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kina Papue Nove Gvineje
 				kine Papue Nove Gvineje
 				kina Papue Nove Gvineje
+				PGK
 			
 			
 				Filipinski pezos
 				filipinski pezos
 				filipinska pezosa
 				filipinskih pezosa
+				PHP
 				₱
 			
 			
@@ -6626,6 +6732,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pakistanska rupija
 				pakistanske rupije
 				pakistanskih rupija
+				PKR
 				Rs
 			
 			
@@ -6633,6 +6740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				poljski zlot
 				poljska zlota
 				poljskih zlota
+				PLN
 				zł
 			
 			
@@ -6652,6 +6760,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paragvajski gvarani
 				paragvajska gvaranija
 				paragvajskih gvaranija
+				PYG
 				₲
 			
 			
@@ -6659,6 +6768,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				katarski rijal
 				katarska rijala
 				katarskih rijala
+				QAR
 			
 			
 				Rodizijski dolar
@@ -6677,6 +6787,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rumunski lej
 				rumunska leja
 				rumunskih leja
+				RON
 				lei
 			
 			
@@ -6691,6 +6802,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruska rublja
 				ruske rublje
 				ruskih rubalja
+				RUB
 				₽
 			
 			
@@ -6704,6 +6816,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruandski franak
 				ruandska franka
 				ruandskih franaka
+				RWF
 				RF
 			
 			
@@ -6711,12 +6824,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				saudijski rijal
 				saudijska rijala
 				saudijskih rijala
+				SAR
 			
 			
 				Solomonski dolar
 				solomonski dolar
 				solomonska dolara
 				solomonskih dolara
+				SBD
 				$
 			
 			
@@ -6724,6 +6839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sejšelska rupija
 				sejšelske rupije
 				sejšelskih rupija
+				SCR
 			
 			
 				Sudanski dinar (1992–2007)
@@ -6736,6 +6852,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sudanska funta
 				sudanske funte
 				sudanskih funti
+				SDG
 			
 			
 				Sudanska funta (1957–1998)
@@ -6748,6 +6865,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				švedska kruna
 				švedske krune
 				švedskih kruna
+				SEK
 				kr
 			
 			
@@ -6755,6 +6873,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				singapurski dolar
 				singapurska dolara
 				singapurskih dolara
+				SGD
 				$
 			
 			
@@ -6762,6 +6881,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svetohelenska funta
 				svetohelenske funte
 				svetohelenskih funti
+				SHP
 				£
 			
 			
@@ -6781,18 +6901,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sijeraleonski leone
 				sijeraleonska leona
 				sijeraleonskih leona
+				SLL
 			
 			
 				Somalski šiling
 				somalski šiling
 				somalska šilinga
 				somalskih šilinga
+				SOS
 			
 			
 				Surinamski dolar
 				surinamski dolar
 				surinamska dolara
 				surinamskih dolara
+				SRD
 				$
 			
 			
@@ -6806,6 +6929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				južnosudanska funta
 				južnosudanske funte
 				južnosudanskih funti
+				SSP
 				£
 			
 			
@@ -6813,12 +6937,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dobra Sao Toma i Principa (1977–2017)
 				dobre Sao Toma i Principa (1977–2017)
 				dobri Sao Toma i Principa (1977–2017)
+				STD
 			
 			
 				Dobra Sao Toma i Principa
 				dobra Sao Toma i Principa
 				dobre Sao Toma i Principa
 				dobri Sao Toma i Principa
+				STN
 				Db
 			
 			
@@ -6838,6 +6964,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sirijska funta
 				sirijske funte
 				sirijskih funti
+				SYP
 				£
 			
 			
@@ -6845,6 +6972,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svazilendski lilangeni
 				svazilendska lilangena
 				svazilendskih lilangena
+				SZL
 			
 			
 				Tajlandski baht
@@ -6865,6 +6993,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tadžikistanski somoni
 				tadžikistanska somonija
 				tadžikistanskih somonija
+				TJS
 			
 			
 				Turkmenistanski manat (1993–2009)
@@ -6877,18 +7006,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turkmenistanski manat
 				turkmenistanska manata
 				turkmenistanskih manata
+				TMT
 			
 			
 				Tuniški dinar
 				tuniški dinar
 				tuniška dinara
 				tuniških dinara
+				TND
 			
 			
 				Tonganska panga
 				tonganska panga
 				tonganske pange
 				tonganskih panga
+				TOP
 				T$
 			
 			
@@ -6908,6 +7040,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turska lira
 				turske lire
 				turskih lira
+				TRY
 				₺
 				TL
 			
@@ -6916,6 +7049,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trinidadtobaški dolar
 				trinidadtobaška dolara
 				trinidadtobaških dolara
+				TTD
 				$
 			
 			
@@ -6923,6 +7057,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				novi tajvanski dolar
 				nova tajvanska dolara
 				novih tajvanskih dolara
+				NT$
 				NT$
 			
 			
@@ -6930,12 +7065,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tanzanijski šiling
 				tanzanijska šilinga
 				tanzanijskih šilinga
+				TZS
 			
 			
 				Ukrajinska hrivnja
 				ukrajinska hrivnja
 				ukrajinske hrivnje
 				ukrajinskih hrivnji
+				UAH
 				₴
 			
 			
@@ -6955,6 +7092,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ugandski šiling
 				ugandska šilinga
 				ugandskih šilinga
+				UGX
 			
 			
 				Američki dolar
@@ -6993,6 +7131,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				urugvajski pezos
 				urugvajska pezosa
 				urugvajskih pezosa
+				UYU
 				$
 			
 			
@@ -7000,6 +7139,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uzbekistanski som
 				uzbekistanska soma
 				uzbekistanskih soma
+				UZS
 			
 			
 				Venecuelanski bolivar (1871–2008)
@@ -7012,19 +7152,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venecuelanski bolivar (2008–2018)
 				venecuelanska bolivara (2008–2018)
 				venecuelanskih bolivara (2008–2018)
+				VEF
 				Bs
 			
 			
-				venecuelanski bolivar
-				venecuelanskih bolivara
+				Venecuelanski bolivar
+				venecuelanski bolivar
 				venecuelanska bolivara
 				venecuelanskih bolivara
+				VES
 			
 			
 				Vijetnamski dong
 				vijetnamski dong
 				vijetnamska donga
 				vijetnamskih donga
+				₫
 				₫
 			
 			
@@ -7038,18 +7181,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vanuatski vatu
 				vanuatska vatua
 				vanuatskih vatua
+				VUV
 			
 			
 				Samoanska tala
 				samoanska tala
 				samoanske tale
 				samoanskih tala
+				WST
 			
 			
 				Centralnoafrički franak (CFA)
 				centralnoafrički franak (CFA)
 				centralnoafrička franka (CFA)
 				centralnoafričkih franaka (CFA)
+				FCFA
 			
 			
 				Srebro
@@ -7124,6 +7270,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zapadnoafrički franak (CFA)
 				zapadnoafrička franka (CFA)
 				zapadnoafričkih franaka (CFA)
+				CFA
 			
 			
 				Paladijum
@@ -7173,6 +7320,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenski rijal
 				jemenska rijala
 				jemenskih rijala
+				YER
 			
 			
 				Jugoslovenski tvrdi dinar
@@ -7209,6 +7357,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				južnoafrički rand
 				južnoafrička randa
 				južnoafričkih randa
+				ZAR
 				R
 			
 			
@@ -7222,6 +7371,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zambijska kvača
 				zambijske kvače
 				zambijskih kvača
+				ZMW
 				ZK
 			
 			
@@ -7262,9 +7412,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} – {1}
 		
 		
-			{0} sat
-			{0} sata
-			{0} sati
+			{0} sat
+			{0} sata
+			{0} sati
 			Skrenite na {0}. križanju desno.
 		
 	
@@ -7325,7 +7475,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				hektari
 				{0} hektar
-				{0} hektra
+				{0} hektara
 				{0} hektara
 			
 			
@@ -7437,7 +7587,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				litri na 100 kilometara
 				{0} litar na 100 kilometara
-				{0} litara na 100 kilometara
+				{0} litra na 100 kilometara
 				{0} litara na 100 kilometara
 			
 			
@@ -7524,6 +7674,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} stoljeća
 				{0} stoljeća
 			
+			
+				decenije
+				{0} decenija
+				{0} decenije
+				{0} decenija
+			
 			
 				godine
 				{0} godina
@@ -7613,7 +7769,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				volti
 				{0} volt
 				{0} volta
-				{0} volta
+				{0} volti
 			
 			
 				kilokalorije
@@ -7699,6 +7855,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} herca
 				{0} herca
 			
+			
+				pikseli
+			
+			
+				megapikseli
+			
 			
 				kilometri
 				{0} kilometar
@@ -7934,7 +8096,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vati
 				{0} vat
 				{0} vata
-				{0} vata
+				{0} vati
 			
 			
 				milivati
@@ -7948,12 +8110,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} konjske snage
 				{0} konjskih snaga
 			
-			
-				hektopaskali
-				{0} hektopaskal
-				{0} hektopaskala
-				{0} hektopaskala
-			
 			
 				milimetri živinog stuba
 				{0} milimetar živinog stuba
@@ -7972,6 +8128,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inča živinog stuba
 				{0} inča žive
 			
+			
+				{0} bar
+				{0} bara
+				{0} bara
+			
 			
 				milibari
 				{0} milibar
@@ -7984,6 +8145,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfere
 				{0} atmosfera
 			
+			
+				paskali
+				{0} paskal
+				{0} paskala
+				{0} paskala
+			
+			
+				hektopaskali
+				{0} hektopaskal
+				{0} hektopaskala
+				{0} hektopaskala
+			
 			
 				kilopaskali
 				{0} kilopaskal
@@ -8229,6 +8402,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				G
 				{0} G
@@ -8480,6 +8656,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} st.
 				{0} st.
 			
+			
+				dec.
+				{0} dec.
+				{0} dec.
+				{0} dec.
+			
 			
 				godine
 				{0} god.
@@ -8619,6 +8801,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} BTU
 				{0} BTU
 			
+			
+				US therm
+				{0} US therm
+				{0} US therm
+				{0} US therm
+			
 			
 				lbf
 				{0} lbf
@@ -8655,6 +8843,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -8904,12 +9134,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ks
 				{0} ks
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8928,6 +9152,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -8940,6 +9170,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -9386,11 +9628,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} KS
 				{0} KS
 			
-			
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -9401,6 +9638,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
diff --git a/make/data/cldr/common/main/bs_Cyrl.xml b/make/data/cldr/common/main/bs_Cyrl.xml
index 40ea85664da..b3cf6f1a164 100644
--- a/make/data/cldr/common/main/bs_Cyrl.xml
+++ b/make/data/cldr/common/main/bs_Cyrl.xml
@@ -7,14 +7,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
-			
+			
 			
 			
 			
@@ -480,7 +530,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
 			
 			
@@ -491,34 +541,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
+			
 			
 			
 			
-			
-			
-			
-			
+			
+			
+			
+			
 			
-			
+			
 			
-			
+			
 			
 			
 			
-			
+			
 			
 			
 			
-			
+			
 			
 			
-			
+			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -541,7 +592,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
 			
 			
@@ -559,7 +610,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
 			
 			
@@ -574,7 +625,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
 			
 			
@@ -585,6 +636,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -593,7 +645,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			Свијет
 			Африка
-			Северноамерички континент
+			Сјеверноамерички континент
 			Јужна Америка
 			Океанија
 			Западна Африка
@@ -602,8 +654,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Сјеверна Африка
 			Централна Африка
 			Јужна Африка
-			Америке
-			Северна Америка
+			Сјеверна и Јужна Америка
+			Сјеверна Америка
 			Кариби
 			Источна Азија
 			Јужна Азија
@@ -620,6 +672,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Источна Европа
 			Сјеверна Европа
 			Западна Европа
+			Подсахарска Африка
 			Латинска Америка
 			Острво Асенсион
 			Андора
@@ -628,7 +681,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Антигва и Барбуда
 			Ангвила
 			Албанија
-			Ерменија
+			Арменија
 			Ангола
 			Антарктик
 			Аргентина
@@ -658,17 +711,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Острво Буве
 			Боцвана
 			Бјелорусија
-			Белиз
+			Белизе
 			Канада
 			Кокос (Келинг) Острва
 			Демократска Република Конго
 			ДР Конго
-			Средњоафричка Република
+			Централноафричка Република
 			Конго
 			Република Конго
 			Швицарска
-			Обала Слоноваче
-			Обала Бјелокости
+			Обала Слоноваче (Кот д’Ивоар)
+			Обала Слоноваче
 			Кукова Острва
 			Чиле
 			Камерун
@@ -702,8 +755,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Еурозона
 			Финска
 			Фиџи
-			Фокландска острва
-			Фокландска (Малвинска) острва
+			Фокландска Острва
+			Фокландска Острва (Малвинска)
 			Микронезија
 			Фарска острва
 			Француска
@@ -720,14 +773,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Гамбија
 			Гвинеја
 			Гваделупе
-			Екваторска Гвинеја
+			Екваторијална Гвинеја
 			Грчка
-			Јужна Џорџија и Јужна Сендвич Острва
+			Јужна Џорџија и Јужна Сендвичка Острва
 			Гватемала
 			Гуам
 			Гвинеја-Бисау
 			Гвајана
-			Хонг Конг (САР Кина)
+			Хонг Конг С. А. Р.
 			Хонг Конг
 			Херд и Мекдоналд Острва
 			Хондурас
@@ -754,7 +807,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Камбоџа
 			Кирибати
 			Комори
-			Свети Кристофор и Невис
+			Свети Китс и Невис
 			Сјеверна Кореја
 			Јужна Кореја
 			Кувајт
@@ -782,9 +835,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Мали
 			Мјанмар
 			Монголија
-			Макао (САР Кина)
+			Макао С. А. Р.
 			Макао
-			Сјеверна Маријанска острва
+			Сјеверна Маријанска Острва
 			Мартиник
 			Мауританија
 			Монсерат
@@ -819,6 +872,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Питкерн
 			Порторико
 			Палестинске територије
+			Палестина
 			Португал
 			Палау
 			Парагвај
@@ -845,10 +899,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Сомалија
 			Суринам
 			Јужни Судан
-			Свети Тома и Принцип
+			Сао Томе и Принципе
 			Салвадор
+			Свети Мартин (Холандија)
 			Сирија
-			Свази
+			Есватини
+			Есватини
 			Тристан да Куња
 			Туркс и Кајкос Острва
 			Чад
@@ -857,7 +913,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Тајланд
 			Таџикистан
 			Токелау
-			Источни Тимор
+			Тимор-Лесте
+			Тимор-Лесте (Источни Тимор)
 			Туркменистан
 			Тунис
 			Тонга
@@ -883,6 +940,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Вануату
 			Валис и Футуна
 			Самоа
+			псеудо акценти
+			псеудо двосмјерно
 			Косово
 			Јемен
 			Мајоте
@@ -926,80 +985,100 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			Календар
-			Сортирање
-			Валута
-			Бројеви
-			Приватна употреба
+			формат валуте
+			сортирање
+			валута
+			сат (12-сати / 24-сата)
+			стил завршетка ретка
+			систем мјерења
+			Бројеви
+			Приватна употреба
 		
 		
-			Будистички календар
-			Кинески календар
+			будистички календар
+			кинески календар
 			коптски календар
-			етиопски календар
+			данги календар
+			етиопски календар
 			етиопски амет алем календар
-			Грегоријански календар
-			Хебрејски календар
+			грегоријански календар
+			хебрејски календар
 			Индијски национални календар
-			Исламски календар
+			исламски календар
 			Исламски цивилни календар
-			Јапански календар
-			персијски календар
+			ISO-8601 календар
+			јапански календар
+			персијски календар
 			Календар Републике Кине
+			рачуноводствени формат валуте
+			стандардни формат валуте
 			Традиционално кинеско сортирање
 			Редослед сортирања у речнику
-			Подразумевани Unicode редослед сортирања
+			задани Unicode редослијед сортирања
 			Поједностављено кинеско сортирање
 			Сортирање као телефонски именик
 			Пињин сортирање
 			Реформисани редослед сортирања
-			Опште намењена претрага
+			претрага опште намене
+			стандардни редослијед сортирања
 			Сортирање по броју црта
 			Традиционално сортирање
 			Редослед сортирања радикалним цртицама
-			пуна ширина
-			пола ширине
+			пуна ширина
+			пола ширине
 			Нумеричка
-			БГН (BGN)
-			УНГЕГН (BGN)
-			арапско-индијске цифре
-			продужене арапско-индијске цифре
-			јерменски бројеви
-			мали јерменски бројеви
-			бенгалске цифре
-			девангари цифре
-			етиопски бројеви
-			цифре пуне ширине
-			грузијски бројеви
-			грчки бројеви
-			мали грчки бројеви
-			гуџаратске цифре
-			гурмуки цифре
-			кинески децимални бројеви
-			поједностављени кинески бројеви
-			поједностављени кинески финансијски бројеви
-			традиционални кинески бројеви
-			традиционални кинески финансијски бројеви
-			хебрејски бројеви
-			јапански бројеви
-			јапански финансијски бројеви
-			кмерске цифре
-			канада цифре
-			лаошке цифре
-			западне цифре
-			малајалам цифре
+			12-сатни систем (0–11)
+			12-сатни систем (1–12)
+			24-сатни систем (0–23)
+			24-сатни систем (1–24)
+			слободан стил завршетка ретка
+			нормални стил завршетка ретка
+			строги стил завршетка ретка
+			БГН (BGN)
+			УНГЕГН (BGN)
+			метрички систем
+			империјални систем мјерења
+			амерички систем мјерења
+			арапско-индијске цифре
+			продужене арапско-индијске цифре
+			јерменски бројеви
+			мали јерменски бројеви
+			бенгалске цифре
+			девангари цифре
+			етиопски бројеви
+			цифре пуне ширине
+			грузијски бројеви
+			грчки бројеви
+			мали грчки бројеви
+			гуџаратске цифре
+			гурмуки цифре
+			кинески децимални бројеви
+			поједностављени кинески бројеви
+			поједностављени кинески финансијски бројеви
+			традиционални кинески бројеви
+			традиционални кинески финансијски бројеви
+			хебрејски бројеви
+			јапански бројеви
+			јапански финансијски бројеви
+			кмерске цифре
+			канада цифре
+			лаоске цифре
+			западне цифре
+			малајалам цифре
 			монголске цифре
-			мијанмарске цифре
-			орија цифре
-			римски бројеви
-			мали римски бројеви
-			тамилски бројеви
-			телугу цифре
-			тајске цифре
-			тибетанске цифре
+			мијанмарске цифре
+			орија цифре
+			римски бројеви
+			мали римски бројеви
+			тамилски бројеви
+			тамилске цифре
+			телугу цифре
+			тајске цифре
+			тибетанске цифре
 		
 		
-			Метрички
-			империјални
+			метрички
+			империјални
 			САД
 		
 		
@@ -1012,7 +1091,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[а б в г д ђ е ж з и ј к л љ м н њ о п р с т ћ у ф х ц ч џ ш]
 		[]
 		[А Б В Г Д Ђ Е Ж З И Ј К Л Љ М Н Њ О П Р С Т Ћ У Ф Х Ц Ч Џ Ш]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		{0}…
 		…{0}
 	
@@ -1097,6 +1176,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d
 						E, d.
@@ -1128,7 +1227,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						G y QQQQ
 					
 					
-						{0} - {1}
 						
 							d–d
 						
@@ -1258,18 +1356,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							јан
-							феб
-							мар
-							апр
-							мај
-							јун
-							јул
-							ауг
-							сеп
-							окт
-							нов
-							дец
+							јан
+							феб
+							мар
+							апр
+							мај
+							јун
+							јул
+							ауг
+							сеп
+							окт
+							нов
+							дец
 						
 						
 							ј
@@ -1286,18 +1384,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							д
 						
 						
-							јануар
-							фебруар
-							март
-							април
-							мај
-							јуни
-							јули
-							аугуст
-							септембар
-							октобар
-							новембар
-							децембар
+							јануар
+							фебруар
+							март
+							април
+							мај
+							јуни
+							јули
+							аугуст
+							септембар
+							октобар
+							новембар
+							децембар
 						
 					
 				
@@ -1333,13 +1431,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							с
 						
 						
-							недјеља
-							понедјељак
-							уторак
-							сриједа
-							четвртак
-							петак
-							субота
+							недјеља
+							понедјељак
+							уторак
+							сриједа
+							четвртак
+							петак
+							субота
 						
 					
 				
@@ -1352,10 +1450,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							К4
 						
 						
-							1.
-							2.
-							3.
-							4.
+							1.
+							2.
+							3.
+							4.
 						
 						
 							Прво тромесечје
@@ -1366,29 +1464,79 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							1.
-							2.
-							3.
-							4.
+							1.
+							2.
+							3.
+							4.
 						
 					
 				
 				
 					
 						
+							поноћ
 							пре подне
+							подне
 							поподне
+							ујутру
+							у подне
+							увече
+							ноћу
+						
+						
+							поноћ
+							подне
+							ујутру
+							у подне
+							увече
+							ноћу
 						
 						
-							пре подне
-							поподне
+							поноћ
+							прије подне
+							подне
+							послије подне
+							ујутру
+							у подне
+							увече
+							ноћу
+						
+					
+					
+						
+							поноћ
+							подне
+							јутро
+							послийеподне
+							вече
+							ноћ
+						
+						
+							поноћ
+							подне
+							јутро
+							послийеподне
+							вече
+							ноћ
+						
+						
+							поноћ
+							прије подне
+							подне
+							послије подне
+							јутро
+							послийеподне
+							вече
+							ноћ
 						
 					
 				
 				
 					
 						прије нове ере
+						п.н.е
 						нове ере
+						н.е.
 					
 					
 						п. н. е.
@@ -1444,6 +1592,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d
 						E, d.
@@ -1451,10 +1619,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMM y. G
 						dd. MMM y. G
 						E, dd. MMM y. G
-						hh a
-						hh:mm a
 						HH:mm
-						hh:mm:ss a
 						HH:mm:ss
 						L
 						dd.MM.
@@ -1462,6 +1627,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						LLL
 						dd. MMM
 						E, dd. MMM
+						d. MMMM
+						'седмица' W 'мјесец' MMMM
+						'седмица' W 'мјесец' MMMM
+						'седмица' W 'мјесец' MMMM
 						mm:ss
 						y.
 						MM.y.
@@ -1470,11 +1639,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMM y.
 						dd. MMM y.
 						E, dd. MMM y.
+						MMMM y.
 						y QQQ
 						y QQQQ
+						'седмица' w 'година' Y
+						'седмица' w 'година' Y
+						'седмица' w 'година' Y
 					
 					
-						{0} - {1}
 						
 							d–d
 						
@@ -2023,53 +2195,169 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ера
 			
+			
+				ера
+			
+			
+				ера
+			
 			
 				година
-				Прошле године
-				Ове године
-				Следеће године
+				прошле године
+				ове године
+				сљедеће године
 				
 					за {0} годину
 					за {0} године
 					за {0} година
 				
 				
-					пре {0} годину
-					пре {0} године
-					пре {0} година
+					прије {0} годину
+					прије {0} године
+					прије {0} година
 				
 			
+			
+				год
+				прош. године
+				ове год.
+				сљед. године
+				
+					прије {0} годину
+					прије {0} године
+					прије {0} година
+				
+			
+			
+				год.
+				прош. године
+				ове год.
+				сљед. године
+				
+					прије {0} годину
+					прије {0} године
+					прије {0} година
+				
+			
+			
+				тромјесечје
+				прошло тромјесечје
+				ово тромјесечје
+				сљедеће тромјесечје
+			
+			
+				тромје.
+			
+			
+				qtr.
+			
 			
-				месец
-				Прошлог месеца
-				Овог месеца
-				Следећег месеца
+				мјесец
+				прошлог мјесеца
+				овог мјесеца
+				сљедећег мјесеца
 				
-					за {0} месец
-					за {0} месеца
-					за {0} месеци
+					за {0} мјесец
+					за {0} мјесеца
+					за {0} мјесеци
 				
 				
-					пре {0} месец
-					пре {0} месеца
-					пре {0} месеци
+					прије {0} мјесец
+					прије {0} мјесеца
+					прије {0} мјесеци
+				
+			
+			
+				мјес.
+				прош. мјесеца
+				овог мјес.
+				сљед. мјесеца
+				
+					за {0} мјесец
+					за {0} мјесеца
+					за {0} мјесеци
+				
+				
+					прије {0} мјесец
+					прије {0} мјесеца
+					прије {0} мјесеци
+				
+			
+			
+				мјес.
+				прош. мјес.
+				ов. мјес.
+				сљ. мјес.
+				
+					за {0} мјес.
+					за {0} мјес.
+					за {0} мјес.
+				
+				
+					прије {0} мјес.
+					прије {0} мјес.
+					прије {0} мјес.
 				
 			
 			
-				недеља
-				Прошле недеље
-				Ове недеље
-				Следеће недеље
+				седмица
+				прошле седмице
+				ове седмице
+				сљедеће седмице
 				
-					за {0} недељу
-					за {0} недеље
-					за {0} недеља
+					за {0} седмицу
+					за {0} седмице
+					за {0} седмица
 				
 				
-					пре {0} недељу
-					пре {0} недеље
-					пре {0} недеља
+					прије {0} седмицу
+					прије {0} седмице
+					прије {0} седмица
 				
+				седмица {0}
+			
+			
+				седм.
+				прош. седм.
+				ове седм.
+				сљ. седм.
+				
+					за {0} седм.
+					за {0} седм.
+					за {0} седм.
+				
+				
+					прије {0} седм.
+					прије {0} седм.
+					прије {0} седм.
+				
+				седмица {0}
+			
+			
+				седм.
+				прош. седм.
+				ове седм.
+				сљ. седм.
+				
+					за {0} седм.
+					за {0} седм.
+					за {0} седм.
+				
+				
+					прије {0} седм.
+					прије {0} седм.
+					прије {0} седм.
+				
+				седмица {0}
+			
+			
+				седмица у мјесецу
+			
+			
+				седм. у мјесецу
+			
+			
+				седм. у мјес.
 			
 			
 				дан
@@ -2084,54 +2372,266 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					за {0} дана
 				
 				
-					пре {0} дан
-					пре {0} дана
-					пре {0} дана
+					прије {0} дан
+					прије {0} дана
+					прије {0} дана
 				
 			
+			
+				дан
+				
+					прије {0} дан
+					прије {0} дана
+					прије {0} дана
+				
+			
+			
+				дан
+				
+					прије {0} дан
+					прије {0} дана
+					прије {0} дана
+				
+			
+			
+				дан у години
+			
+			
+				дан у год.
+			
+			
+				дан у год.
+			
 			
-				дан у недељи
+				дан у седмици
+			
+			
+				дан у седм.
+			
+			
+				дан у седм.
+			
+			
+				радни дан у мјесецу
+			
+			
+				рад. дан у мјесецу
+			
+			
+				рад. дан у мјес.
+			
+			
+				прошле недјеље
+				ове недјеље
+				сљедеће недјеље
+			
+			
+				прошл. недјеље
+				ове недјеље
+				сљ. недјеље
+			
+			
+				пр. недјеље
+				ове недј.
+				сљ. недјеље
+			
+			
+				прошлог понедјељка
+				овог понедјељка
+				сљедећег понедјељка
+			
+			
+				прошл. понедјељка
+				овог понедј.
+				сљ. понедјељка
+			
+			
+				пр. понедј.
+				овог понедј.
+				сљ. понедј.
+			
+			
+				прошлог уторка
+				овог уторка
+				сљедећег уторка
+			
+			
+				прошл. уторка
+				овог утор.
+				сљед. уторка
+			
+			
+				пр. уторка
+				овог утор.
+				сљ. уторка
+			
+			
+				прошле сриједе
+				ове сриједе
+				сљедеће сриједе
+			
+			
+				прошл. сриједе
+				ове сриједе
+				сљед. сриједе
+			
+			
+				пр. сриједе
+				ове сриј.
+				сљ. сриједе
+			
+			
+				прошлог четвртка
+				овог четвртка
+				сљедећег четвртка
+			
+			
+				прошл. чет.
+				овог чет.
+				сљед. чет.
+			
+			
+				пр. чет.
+				овог чет.
+				сљ. чет.
+			
+			
+				прошлог петка
+				овог петка
+				сљедећег петка
+			
+			
+				прошл. петка
+				овог пет.
+				сљед. петка
+			
+			
+				пр. петка
+				овог пет.
+				сљ. петка
+			
+			
+				прошле суботе
+				ове суботе
+				сљедеће суботе
+			
+			
+				прошл. суботе
+				ове суб.
+				сљед. суботе
+			
+			
+				пр. суботе
+				ове суб.
+				сљ. суботе
+			
+			
+				прије подне/послије подне
 			
 			
-				пре подне/поподне
+				прије подне/послије подне
+			
+			
+				прије подне/послије подне
 			
 			
-				час
+				сат
+				овог сата
 				
 					за {0} сат
 					за {0} сата
 					за {0} сати
 				
 				
-					пре {0} сат
-					пре {0} сата
-					пре {0} сати
+					прије {0} сат
+					прије {0} сата
+					прије {0} сати
+				
+			
+			
+				сат
+				
+					прије {0} сат
+					прије {0} сата
+					прије {0} сати
+				
+			
+			
+				сат
+				
+					прије {0} сат
+					прије {0} сата
+					прије {0} сати
 				
 			
 			
 				минут
+				овог минута
 				
 					за {0} минут
 					за {0} минута
 					за {0} минута
 				
 				
-					пре {0} минут
-					пре {0} минута
-					пре {0} минута
+					прије {0} минут
+					прије {0} минута
+					прије {0} минута
+				
+			
+			
+				мин.
+				
+					прије {0} минут
+					прије {0} минута
+					прије {0} минута
+				
+			
+			
+				мин
+				
+					прије {0} мин.
+					прије {0} мин.
+					прије {0} мин.
 				
 			
 			
 				секунд
+				сада
 				
 					за {0} секунд
 					за {0} секунде
 					за {0} секунди
 				
 				
-					пре {0} секунд
-					пре {0} секунде
-					пре {0} секунди
+					прије {0} секунд
+					прије {0} секунде
+					прије {0} секунди
+				
+			
+			
+				сек.
+				
+					за {0} сек.
+					за {0} секунде
+					за {0} секунди
+				
+				
+					прије {0} сек.
+					прије {0} сек.
+					прије {0} сек.
+				
+			
+			
+				сек
+				
+					за {0} сек.
+					за {0} секунде
+					за {0} секунди
+				
+				
+					прије {0} сек.
+					прије {0} сек.
+					прије {0} сек.
 				
 			
 			
@@ -2139,18 +2639,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			+HHmm;-HHmm
 			GMT{0}
-			Време у земљи: {0}
+			Време: {0}
 			{1} ({0})
 			
 				Хонолулу
 			
+			
+				
+					Координисано универзално вријеме
+				
+			
 			
 				Непознат или неважећи град
 			
 			
-				Андора
+				Андора
 			
 			
 				Дубаи
@@ -2165,10 +2669,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ангвила
 			
 			
-				Тирана
+				Тирана
 			
 			
-				Јереван
+				Јереван
 			
 			
 				Луанда
@@ -2179,6 +2683,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Палмер
 			
+			
+				Трол
+			
 			
 				Шова
 			
@@ -2201,7 +2708,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Макмурдо
 			
 			
-				Рио Гелегос
+				Рио Гаљегос
 			
 			
 				Мендоза
@@ -2213,7 +2720,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ушуаија
 			
 			
-				Ла Риоја
+				Ла Риоха
 			
 			
 				Сан Луи
@@ -2225,7 +2732,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Салта
 			
 			
-				Жужуи
+				Хухуј
 			
 			
 				Тукуман
@@ -2240,7 +2747,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Паго Паго
 			
 			
-				Беч
+				Беч
 			
 			
 				Перт
@@ -2275,6 +2782,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Бризбејн
 			
+			
+				Меквори
+			
 			
 				Лорд Хов
 			
@@ -2282,13 +2792,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Аруба
 			
 			
-				Марихамн
+				Марихамн
 			
 			
 				Баку
 			
 			
-				Сарајево
+				Сарајево
 			
 			
 				Барбадос
@@ -2297,13 +2807,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Дака
 			
 			
-				Брисел
+				Брисел
 			
 			
 				Уагадугу
 			
 			
-				Софија
+				Софија
 			
 			
 				Бахреин
@@ -2315,10 +2825,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Порто Ново
 			
 			
-				Св. Бартоломeј
+				Св. Бартоломeј
 			
 			
-				Бермуда
+				Бермуда
 			
 			
 				Брунеји
@@ -2326,6 +2836,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ла Паз
 			
+			
+				Крелендијк
+			
 			
 				Еирунепе
 			
@@ -2360,7 +2873,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Сао Паоло
 			
 			
-				Бахиа
+				Баија
 			
 			
 				Форталеза
@@ -2378,13 +2891,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Насау
 			
 			
-				Тимпу
+				Тимпу
 			
 			
 				Габорон
 			
 			
-				Минск
+				Минск
 			
 			
 				Белизе
@@ -2401,11 +2914,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ванкувер
 			
+			
+				Форт Нелсон
+			
 			
 				Досон Крик
 			
+			
+				Крестон
+			
 			
-				Јелоунајф
+				Јелоунајф
 			
 			
 				Едмонтон
@@ -2432,7 +2951,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ранкин Инлет
 			
 			
-				Корал Харбур
+				Атикокан
 			
 			
 				Тандер Беј
@@ -2468,7 +2987,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Св. Џон
 			
 			
-				Кокос
+				Кокос
 			
 			
 				Киншаса
@@ -2483,7 +3002,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Бразавил
 			
 			
-				Цирих
+				Цирих
 			
 			
 				Абиџан
@@ -2494,6 +3013,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ускршње острво
 			
+			
+				Пунта Аренас
+			
 			
 				Сантијаго
 			
@@ -2516,28 +3038,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Хавана
 			
 			
-				Зеленортска Острва
+				Зеленортска Острва
 			
 			
-				Кирасо
+				Курасао
 			
 			
-				Божић
+				Божић
 			
 			
 				Никозија
 			
+			
+				Фамагуста
+			
 			
-				Праг
+				Праг
+			
+			
+				Бусинген
 			
 			
-				Берлин
+				Берлин
 			
 			
 				Џибути
 			
 			
-				Копенхаген
+				Копенхаген
 			
 			
 				Доминика
@@ -2555,7 +3083,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Гвајакил
 			
 			
-				Талин
+				Талин
 			
 			
 				Каиро
@@ -2573,19 +3101,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Сеута
 			
 			
-				Мадрид
+				Мадрид
 			
 			
 				Адис Абеба
 			
 			
-				Хелсинки
+				Хелсинки
 			
 			
-				Фиџи
+				Фиџи
 			
 			
-				Стенли
+				Стенли
 			
 			
 				Трук
@@ -2597,43 +3125,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Кошре
 			
 			
-				Фарска острва
+				Фарска острва
 			
 			
-				Париз
+				Париз
 			
 			
 				Либревил
 			
 			
-				Лондон
+				
+					Британско љетње вријеме
+				
+				Лондон
 			
 			
 				Гренада
 			
 			
-				Тбилиси
+				Тбилиси
 			
 			
 				Кајен
 			
 			
-				Гернзи
+				Гернзи
 			
 			
 				Акра
 			
 			
-				Гибралтар
+				Гибралтар
 			
 			
 				Туле
 			
 			
-				Готхаб
+				Нук
 			
 			
-				Скорезбисунд
+				Итокортормит
 			
 			
 				Данмарксхаген
@@ -2651,10 +3182,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Малабо
 			
 			
-				Атина
+				Атина
 			
 			
-				Јужна Џорџија
+				Јужна Џорџија
 			
 			
 				Гватемала
@@ -2672,16 +3203,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Хонг Конг
 			
 			
-				Тегусигалпа
+				Тегусигалпа
 			
 			
-				Загреб
+				Загреб
 			
 			
 				Порт-о-Пренс
 			
 			
-				Будимпешта
+				Будимпешта
 			
 			
 				Џакарта
@@ -2696,34 +3227,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Џајапура
 			
 			
-				Даблин
+				
+					Ирско стандардно вријеме
+				
+				Даблин
 			
 			
-				Јерусалим
+				Јерусалим
 			
 			
-				Острво Ман
+				Острво Мен
 			
 			
-				Калкута
+				Калкута
 			
 			
-				Чагос
+				Чагос
 			
 			
 				Багдад
 			
 			
-				Техеран
+				Техеран
 			
 			
-				Рејкјавик
+				Рејкјавик
 			
 			
-				Рим
+				Рим
 			
 			
-				Џерси
+				Џерси
 			
 			
 				Јамајка
@@ -2732,7 +3266,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Аман
 			
 			
-				Токио
+				Токио
 			
 			
 				Најроби
@@ -2753,7 +3287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Тарава
 			
 			
-				Коморо
+				Коморо
 			
 			
 				Сент Китс
@@ -2762,7 +3296,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Пјонгјанг
 			
 			
-				Сеул
+				Сеул
 			
 			
 				Кувајт
@@ -2776,9 +3310,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Орал
 			
+			
+				Атирај
+			
 			
 				Акутобе
 			
+			
+				Костанај
+			
 			
 				Кизилорда
 			
@@ -2786,7 +3326,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Алмати
 			
 			
-				Вијентијан
+				Вијентијан
 			
 			
 				Бејрут
@@ -2795,7 +3335,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Св. Луција
 			
 			
-				Вадуз
+				Вадуз
 			
 			
 				Коломбо
@@ -2807,13 +3347,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Масеру
 			
 			
-				Виљнус
+				Виљнус
 			
 			
-				Луксембург
+				Луксембург
 			
 			
-				Рига
+				Рига
 			
 			
 				Триполи
@@ -2822,19 +3362,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Казабланка
 			
 			
-				Монако
+				Монако
 			
 			
-				Кишињев
+				Кишињев
 			
 			
-				Подгорица
+				Подгорица
 			
 			
-				Мариго
+				Мариго
 			
 			
-				Антананариво
+				Антананариво
 			
 			
 				Кваџалејин
@@ -2843,13 +3383,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Мајуро
 			
 			
-				Скопље
+				Скопље
 			
 			
 				Бамако
 			
 			
-				Рангун
+				Рангун
 			
 			
 				Ховд
@@ -2870,19 +3410,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Мартиник
 			
 			
-				Навакшут
+				Нуакшот
 			
 			
 				Монтсерат
 			
 			
-				Малта
+				Малта
 			
 			
-				Маурицијус
+				Маурицијус
 			
 			
-				Малдиви
+				Малдиви
 			
 			
 				Блантир
@@ -2897,7 +3437,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Мазатлан
 			
 			
-				Чихуахуа
+				Чивава
+			
+			
+				Баија Бандерас
+			
+			
+				Охинага
 			
 			
 				Монтереј
@@ -2905,6 +3451,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Мексико Сити
 			
+			
+				Матаморос
+			
 			
 				Мерида
 			
@@ -2939,10 +3488,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Манагва
 			
 			
-				Амстердам
+				Амстердам
 			
 			
-				Осло
+				Осло
 			
 			
 				Катманду
@@ -2957,7 +3506,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Катхам
 			
 			
-				Окланд
+				Окланд
 			
 			
 				Мускат
@@ -2980,6 +3529,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Порт Морзби
 			
+			
+				Бугенвил
+			
 			
 				Манила
 			
@@ -2987,28 +3539,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Карачи
 			
 			
-				Варшава
+				Варшава
 			
 			
 				Микелон
 			
 			
-				Питкаирн
+				Питкерн
 			
 			
-				Порто Рико
+				Порторико
 			
 			
 				Газа
 			
+			
+				Хеброн
+			
 			
 				Азори
 			
 			
-				Мадера
+				Мадеира
 			
 			
-				Лисабон
+				Лисабон
 			
 			
 				Палау
@@ -3017,22 +3572,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Асунсион
 			
 			
-				Катар
+				Катар
 			
 			
-				Реунион
+				Реунион
 			
 			
-				Букурешт
+				Букурешт
 			
 			
-				Београд
+				Београд
 			
 			
-				Калининград
+				Калињинград
 			
 			
-				Симферопол
+				Симферопољ
 			
 			
 				Москва
@@ -3040,6 +3595,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Волгоград
 			
+			
+				Саратов
+			
+			
+				Астрахан
+			
+			
+				Уљановск
+			
+			
+				Киров
+			
 			
 				Самара
 			
@@ -3052,24 +3619,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Новосибирск
 			
+			
+				Барнаул
+			
+			
+				Томск
+			
+			
+				Новокузњецк
+			
 			
 				Краснојарск
 			
 			
 				Иркуцк
 			
+			
+				Чита
+			
 			
 				Јакутск
 			
 			
 				Владивосток
 			
+			
+				Хандига
+			
 			
 				Сахалин
 			
+			
+				Уст-Нера
+			
 			
 				Магадан
 			
+			
+				Средњеколимск
+			
 			
 				Камчатка
 			
@@ -3080,40 +3668,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Кигали
 			
 			
-				Ријад
+				Ријад
 			
 			
-				Гвадалканал
+				Гвадалканал
 			
 			
-				Махе
+				Махе
 			
 			
 				Картум
 			
 			
-				Стокхолм
+				Стокхолм
 			
 			
-				Сингапур
+				Сингапур
 			
 			
-				Св. Јелена
+				Св. Јелена
 			
 			
-				Љубљана
+				Љубљана
 			
 			
-				Лонгјербјен
+				Лонгјербјен
 			
 			
-				Братислава
+				Братислава
 			
 			
 				Фритаун
 			
 			
-				Сан Марино
+				Сан Марино
 			
 			
 				Дакар
@@ -3122,7 +3710,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Могадиш
 			
 			
-				Парамирбо
+				Парамарибо
+			
+			
+				Џуба
 			
 			
 				Сао Томе
@@ -3130,6 +3721,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Салвадор
 			
+			
+				Лоуер Принс Квортер
+			
 			
 				Дамаск
 			
@@ -3143,7 +3737,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Нџамена
 			
 			
-				Кергелен
+				Кергелен
 			
 			
 				Ломе
@@ -3155,7 +3749,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Душанбе
 			
 			
-				Факаофо
+				Факаофо
 			
 			
 				Дили
@@ -3170,16 +3764,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Тонгатапу
 			
 			
-				Истанбул
+				Истанбул
 			
 			
-				Порт оф Спејн
+				Порт оф Спејн
 			
 			
-				Фунафути
+				Фунафути
 			
 			
-				Тајпеј
+				Тајпеј
 			
 			
 				Дар-ес-Салам
@@ -3215,11 +3809,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Енкориџ
 			
 			
-				Јакутат
+				Јакутат
+			
+			
+				Ситка
 			
 			
 				Жуно
 			
+			
+				Метлакатла
+			
 			
 				Лос Анђелес
 			
@@ -3233,10 +3833,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Денвер
 			
 			
-				Бијула, Северна Дакота
+				Бијула, Северна Дакота
 			
 			
-				Нови Салем, Северна Даткоа
+				Нови Салем, Северна Дакота
 			
 			
 				Центар, Северна Дакота
@@ -3254,7 +3854,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Петерсбург, Индијана
 			
 			
-				Тел Сити
+				Тел Сити, Индијана
 			
 			
 				Кнокс, Индијана
@@ -3269,7 +3869,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Индианаполис
 			
 			
-				Луивиле
+				Луисвил
 			
 			
 				Вевај, Индијана
@@ -3293,7 +3893,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ташкент
 			
 			
-				Ватикан
+				Ватикан
 			
 			
 				Сент Винсент
@@ -3308,22 +3908,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Св. Тома
 			
 			
-				Хо Ши Мин
+				Хо Ши Мин
 			
 			
-				Ефат
+				Ефат
 			
 			
 				Валис
 			
 			
-				Апија
+				Апија
 			
 			
 				Аден
 			
 			
-				Мајот
+				Мајот
 			
 			
 				Јоханесбург
@@ -3343,36 +3943,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Авганистанско време
+					Авганистан вријеме
 				
 			
 			
 				
-					Централно-афричко време
+					Централно-афричко вријеме
 				
 			
 			
 				
-					Источно-афричко време
+					Источно-афричко вријеме
 				
 			
 			
 				
-					Јужно-афричко време
+					Јужно-афричко вријеме
 				
 			
 			
 				
-					Западно-афричко време
-					Западно-афричко стандардно време
-					Западно-афричко летње рачунање времена
+					Западно-афричко вријеме
+					Западно-афричко стандардно вријеме
+					Западно-афричко љетње рачунање времена
 				
 			
 			
 				
-					Аљашко време
-					Аљашко стандардно време
-					Аљашко летње време
+					Аљаска вријеме
+					Аљаска стандардно вријеме
+					Аљаска љетње вријеме
 				
 			
 			
@@ -3384,37 +3984,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Амазон време
-					Амазон стандардно време
-					Амазон летње рачунање времена
+					Амазон вријеме
+					Амазон стандардно вријеме
+					Амазон љетње рачунање времена
 				
 			
 			
 				
-					Централно време
-					Централно стандардно време
-					Централно летње рачунање времена
+					Централно вријеме
+					Централно стандардно вријеме
+					Централно љетње рачунање времена
 				
 			
 			
 				
-					Источно време
-					Источно стандардно време
-					Источно летње рачунање времена
+					Источно вријеме
+					Источно стандардно вријеме
+					Источно љетње рачунање времена
 				
 			
 			
 				
-					Планинско време
-					Планинско стандардно време
-					Планинско летње рачунање времена
+					Планинско вријеме
+					Планинско стандардно вријеме
+					Планинско љетње рачунање времена
 				
 			
 			
 				
-					Пацифичко време
-					Пацифичко стандардно време
-					Пацифичко летње рачунање времена
+					Пацифичко вријеме
+					Пацифичко стандардно вријеме
+					Пацифичко љетње рачунање времена
 				
 			
 			
@@ -3424,6 +4024,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Анадир летње рачунање времена
 				
 			
+			
+				
+					Апија вријеме
+					Апија стандардно вријеме
+					Апија љетње рачунање времена
+				
+			
 			
 				
 					Акватау време
@@ -3440,292 +4047,297 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Арабијско време
-					Арабијско стандардно време
-					Арабијско летње рачунање времена
+					Арабијско вријеме
+					Арабијско стандардно вријеме
+					Арабијско љетње рачунање времена
 				
 			
 			
 				
-					Аргентина време
-					Аргентина стандардно време
-					Аргентина летње рачунање времена
+					Аргентина вријеме
+					Аргентина стандардно вријеме
+					Аргентина љетње рачунање времена
 				
 			
 			
 				
-					Западна Аргентина време
-					Западна Аргентина стандардно време
-					Западна Аргентина летње рачунање времена
+					Западна Аргентина вријеме
+					Западна Аргентина стандардно вријеме
+					Западна Аргентина љетње рачунање времена
 				
 			
 			
 				
-					Арменија време
-					Арменија стандардно време
-					Арменија летње рачунање времена
+					Арменија вријеме
+					Арменија стандардно вријеме
+					Арменија љетње рачунање времена
 				
 			
 			
 				
-					Атланско време
-					Атланско стандардно време
-					Атланско лтње рачунање времена
+					Атланско вријеме
+					Атланско стандардно вријеме
+					Атланско љетње рачунање времена
 				
 			
 			
 				
-					Аустралијско централно време
-					Аустралијско централно стандардно време
-					Аустралијско централно летње рачунање времена
+					Аустралијско централно вријеме
+					Аустралијско централно стандардно вријеме
+					Аустралијско централно љетње рачунање времена
 				
 			
 			
 				
-					Аустралијско централно западно време
-					Аустралијско централно западно стандардно време
-					Аустралијско централно западно летње рачунање времена
+					Аустралијско централно западно вријеме
+					Аустралијско централно западно стандардно вријеме
+					Аустралијско централно западно љетње рачунање времена
 				
 			
 			
 				
-					Аустралијско источно време
-					Аустралијско источно стандардно време
-					Аустралијско источно летње рачунање времена
+					Аустралијско источно вријеме
+					Аустралијско источно стандардно вријеме
+					Аустралијско источно љетње рачунање времена
 				
 			
 			
 				
-					Аустралијско западно време
-					Аустралијско западно стандардно време
-					Аустралијско западно летње рачунање времена
+					Аустралијско западно вријеме
+					Аустралијско западно стандардно вријеме
+					Аустралијско западно љетње рачунање времена
 				
 			
 			
 				
-					Азербејџан време
-					Азербејџан стандардно време
-					Азербејџан летње рачунање времена
+					Азербејџан вријеме
+					Азербејџан стандардно вријеме
+					Азербејџан љетње рачунање времена
 				
 			
 			
 				
-					Азори време
-					Азори стандардно време
-					Азори летње рачунање времена
+					Азори вријеме
+					Азори стандардно вријеме
+					Азори љетње рачунање времена
 				
 			
 			
 				
-					Бангладеш време
-					Бангладеш стандардно време
-					Бангладеш летње рачунање времена
+					Бангладеш вријеме
+					Бангладеш стандардно вријеме
+					Бангладеш љетње рачунање времена
 				
 			
 			
 				
-					Бутан време
+					Бутан вријеме
 				
 			
 			
 				
-					Боливија време
+					Боливија вријеме
 				
 			
 			
 				
-					Бразилија време
-					Бразилија стандардно време
-					Бразилија летње рачунање времена
+					Бразилија вријеме
+					Бразилија стандардно вријеме
+					Бразилија љетње рачунање времена
 				
 			
 			
 				
-					Брунеј Дарусалум време
+					Брунеј Дарусалам вријеме
 				
 			
 			
 				
-					Зелениртско време
-					Зелениртско стандардно време
-					Зеленортско летње рачунање времена
+					Зеленортско вријеме
+					Зеленортско стандардно вријеме
+					Зеленортско љетње рачунање времена
 				
 			
 			
 				
-					Чаморо време
+					Чаморо вријеме
 				
 			
 			
 				
-					Чатам време
-					Чатам стандардно време
-					Чатам летње рачунање времена
+					Чатам вријеме
+					Чатам стандардно вријеме
+					Чатам љетње рачунање времена
 				
 			
 			
 				
-					Чиле време
-					Чиле стандардно време
-					Чиле летње рачунање времена
+					Чиле вријеме
+					Чиле стандардно вријеме
+					Чиле љетње рачунање времена
 				
 			
 			
 				
-					Кина време
-					Кинеско стандардно време
-					Кина летње рачунање времена
+					Кина вријеме
+					Кина стандардно вријеме
+					Кина љетње рачунање времена
 				
 			
 			
 				
-					Чојбалсан време
-					Чојбалсан стандардно време
-					Чојбалсан летње рачунање времена
+					Чојбалсан вријеме
+					Чојбалсан стандардно вријеме
+					Чојбалсан љетње рачунање времена
 				
 			
 			
 				
-					Божићна острва време
+					Божићна острва вријеме
 				
 			
 			
 				
-					Кокос (Келинг) Острва време
+					Кокос (Келинг) Острва вријеме
 				
 			
 			
 				
-					Колумбија време
-					Колумбија стандардно време
-					Колумбија летње рачунање времена
+					Колумбија вријеме
+					Колумбија стандардно вријеме
+					Колумбија љетње рачунање времена
 				
 			
 			
 				
-					Кукова острва време
-					Кукова острва стандардно време
-					Кукова острва полу-летње рачунање времена
+					Кукова острва вријеме
+					Кукова острва стандардно вријеме
+					Кукова острва полу-љетње рачунање времена
 				
 			
 			
 				
-					Куба време
-					Куба стандардно време
-					Куба летње рачунање времена
+					Куба вријеме
+					Куба стандардно вријеме
+					Куба љетње рачунање времена
 				
 			
 			
 				
-					Дејвис време
+					Дејвис вријеме
 				
 			
 			
 				
-					Димон д’Урвил време
+					Димон д’Урвил вријеме
 				
 			
 			
 				
-					Источни тимор време
+					Тимор-Лесте вријеме
 				
 			
 			
 				
-					Ускршња острва време
-					Ускршња острва стандардно време
-					Ускршња острва летње рачунање времена
+					Ускршња острва вријеме
+					Ускршња острва стандардно вријеме
+					Ускршња острва љетње рачунање времена
 				
 			
 			
 				
-					Еквадор време
+					Еквадор вријеме
 				
 			
 			
 				
-					Средњеевропско време
-					Средњеевропско стандардно време
-					Средњеевропско летње рачунање времена
+					Средњеевропско вријеме
+					Средњеевропско стандардно вријеме
+					Средњеевропско љетње рачунање времена
 				
 			
 			
 				
-					Источноевропско време
-					Источноевропско стандардно време
-					Источноевропско летње рачунање времена
+					Источноевропско вријеме
+					Источноевропско стандардно вријеме
+					Источноевропско љетње рачунање времена
+				
+			
+			
+				
+					Даље источноевропско вријеме
 				
 			
 			
 				
-					Западноевропско време
-					Западноевропско стандардно време
-					Западноевропско летње рачунање времена
+					Западноевропско вријеме
+					Западноевропско стандардно вријеме
+					Западноевропско љетње рачунање времена
 				
 			
 			
 				
-					Фолкландска Острва време
-					Фолкландска Острва стандардно време
-					Фолкландска Острва летње рачунање времена
+					Фолкландска Острва вријеме
+					Фолкландска Острва стандардно вријеме
+					Фолкландска Острва љетње рачунање времена
 				
 			
 			
 				
-					Фиџи време
-					Фиџи стандардно време
-					Фиџи летње рачунање времена
+					Фиџи вријеме
+					Фиџи стандардно вријеме
+					Фиџи љетње рачунање времена
 				
 			
 			
 				
-					Француска Гвајана време
+					Француска Гвајана вријеме
 				
 			
 			
 				
-					Француско јужно и антарктичко време
+					Француско јужно и антарктичко вријеме
 				
 			
 			
 				
-					Галапагос време
+					Галапагос вријеме
 				
 			
 			
 				
-					Гамбијер време
+					Гамбијер вријеме
 				
 			
 			
 				
-					Грузија време
-					Грузија стандардно време
-					Грузија летње рачунање времена
+					Грузија вријеме
+					Грузија стандардно вријеме
+					Грузија љетње рачунање времена
 				
 			
 			
 				
-					Гилберт острва време
+					Гилберт острва вријеме
 				
 			
 			
 				
-					Гринвич средње време
+					Гриничко средње вријеме
 				
 			
 			
 				
-					Источни Гренланд време
-					Источни Гренланд стандардно време
-					Источни Гренланд летње рачунање времена
+					Источни Гренланд вријеме
+					Источни Гренланд стандардно вријеме
+					Источни Гренланд љетње рачунање времена
 				
 			
 			
 				
-					Западни Гренланд време
-					Западни Гренланд стандардно време
-					Западни Гренланд летње рачунање времена
+					Западни Гренланд вријеме
+					Западни Гренланд стандардно вријеме
+					Западни Гренланд љетње рачунање времена
 				
 			
 			
@@ -3735,91 +4347,91 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Залив време
+					Заливско вријеме
 				
 			
 			
 				
-					Гвајана време
+					Гвајана вријеме
 				
 			
 			
 				
-					Хавајско-алеутско време
-					Хавајско-алеутско стандардно време
-					Хавајско-алеутско летње рачунање времена
+					Хавајско-алеутско вријеме
+					Хавајско-алеутско стандардно вријеме
+					Хавајско-алеутско љетње рачунање времена
 				
 			
 			
 				
-					Хонг Конг време
-					Хонг Конг стандардно време
-					Хонгконшко летње рачунање времена
+					Хонг Конг вријеме
+					Хонг Конг стандардно вријеме
+					Хонгконшко љетње рачунање времена
 				
 			
 			
 				
-					Ховд време
-					Ховд стандардно време
-					Ховд летње рачунање времена
+					Ховд вријеме
+					Ховд стандардно вријеме
+					Ховд љетње рачунање времена
 				
 			
 			
 				
-					Индијско стандардно време
+					Индијско стандардно вријеме
 				
 			
 			
 				
-					Индијско океанско време
+					Индијско океанско вријеме
 				
 			
 			
 				
-					Индокина време
+					Индокина вријеме
 				
 			
 			
 				
-					Централно-индонезијско време
+					Централно-индонезијско вријеме
 				
 			
 			
 				
-					Источно-индонезијско време
+					Источно-индонезијско вријеме
 				
 			
 			
 				
-					Западно-индонезијско време
+					Западно-индонезијско вријеме
 				
 			
 			
 				
-					Иран време
-					Иран стандардно време
-					Иран летње рачунање времена
+					Иран вријеме
+					Иран стандардно вријеме
+					Иран љетње рачунање времена
 				
 			
 			
 				
-					Иркуцк време
-					Иркуцк стандардно време
-					Иркуцк летње рачунање времена
+					Иркуцк вријеме
+					Иркуцк стандардно вријеме
+					Иркуцк љетње рачунање времена
 				
 			
 			
 				
-					Израелско време
-					Израелско стандардно време
-					Израелско летње рачунање времена
+					Израелско вријеме
+					Израелско стандардно вријеме
+					Израелско љетње рачунање времена
 				
 			
 			
 				
-					Јапанско време
-					Јапанско стандардно време
-					Јапанско летње рачунање времена
+					Јапанско вријеме
+					Јапанско стандардно вријеме
+					Јапанско љетње рачунање времена
 				
 			
 			
@@ -3831,36 +4443,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Источно-казахстанско време
+					Источно-казахстанско вријеме
 				
 			
 			
 				
-					Западно-казахстанско време
+					Западно-казахстанско вријеме
 				
 			
 			
 				
-					Кореја време
-					Корејско стандардно време
-					Корејско летње рачунање времена
+					Корејско вријеме
+					Корејско стандардно вријеме
+					Корејско љетње рачунање времена
 				
 			
 			
 				
-					Кошре време
+					Кошре вријеме
 				
 			
 			
 				
-					Краснојарск време
-					Краснојарск стандардно време
-					Краснојарск летње рачунање времена
+					Краснојарско вријеме
+					Краснојарск стандардно вријеме
+					Краснојарск љетње рачунање времена
 				
 			
 			
 				
-					Киргизстан време
+					Киргистан вријеме
 				
 			
 			
@@ -3870,14 +4482,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Лине Острва време
+					Лине Острва вријеме
 				
 			
 			
 				
-					Лорд Хов време
-					Лорд Хов стандардно време
-					Лорд Хов летње рачунање времена
+					Лорд Хов вријеме
+					Лорд Хов стандардно вријеме
+					Лорд Хов љетње рачунање времена
 				
 			
 			
@@ -3889,113 +4501,127 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Макверијско време
+					Макверијско вријеме
 				
 			
 			
 				
-					Магадан време
-					Магадан стандардно време
-					Магадан летње рачунање вемена
+					Магадан вријеме
+					Магадан стандардно вријеме
+					Магадан љетње рачунање вемена
 				
 			
 			
 				
-					Малезија време
+					Малезија вријеме
 				
 			
 			
 				
-					Малдиви време
+					Малдиви вријеме
 				
 			
 			
 				
-					Маркиз време
+					Маркиз вријеме
 				
 			
 			
 				
-					Маршалска Острва време
+					Маршалска Острва вријеме
 				
 			
 			
 				
-					Маурицијус време
-					Маурицијус стандардно време
-					Маурицијус летње рачунање времена
+					Маурицијус вријеме
+					Маурицијус стандардно вријеме
+					Маурицијус љетње рачунање времена
 				
 			
 			
 				
-					Мосон време
+					Мосон вријеме
+				
+			
+			
+				
+					Сјеверномексичко вријеме
+					Сјеверномексичко стандардно вријеме
+					Сјеверномексичко љетње рачунање времена
+				
+			
+			
+				
+					Мексичко пацифичко вријеме
+					Мексичко пацифичко стандардно вријеме
+					Мексичко пацифичко љетње рачунање времена
 				
 			
 			
 				
-					Улан Батор време
-					Улан Батор стандардно време
-					Улан Батор летње рачунање времена
+					Улан Батор вријеме
+					Улан Батор стандардно вријеме
+					Улан Батор љетње рачунање времена
 				
 			
 			
 				
-					Москва време
-					Москва стандардно време
-					Москва летње рачунање времена
+					Москва вријеме
+					Москва стандардно вријеме
+					Москва љетње рачунање времена
 				
 			
 			
 				
-					Мијанмар време
+					Мијанмар вријеме
 				
 			
 			
 				
-					Науру време
+					Науру вријеме
 				
 			
 			
 				
-					Непал време
+					Непал вријеме
 				
 			
 			
 				
-					Нова Каледонија време
-					Нова Каледонија стандардно време
-					Нова Каледонија летње рачунање времена
+					Нова Каледонија вријеме
+					Нова Каледонија стандардно вријеме
+					Нова Каледонија љетње рачунање времена
 				
 			
 			
 				
-					Нови Зеланд време
-					Нови Зеланд стандардно време
-					Нови Зеланд летње рачунање времена
+					Нови Зеланд вријеме
+					Нови Зеланд стандардно вријеме
+					Нови Зеланд љетње рачунање времена
 				
 			
 			
 				
-					Њуфаундленд време
-					Њуфаундленд стандардно време
-					Њуфаундленд летње рачунање времена
+					Њуфаундленд вријеме
+					Њуфаундленд стандардно вријеме
+					Њуфаундленд љетње рачунање времена
 				
 			
 			
 				
-					Ниуе време
+					Ниуе вријеме
 				
 			
 			
 				
-					Норфолк Острво време
+					Норфолк Острво вријеме
 				
 			
 			
 				
-					Фернандо де Нороња време
-					Фернандо де Нороња стандардно време
-					Фернандо де Нороња летње рачунање времена
+					Фернандо де Нороња вријеме
+					Фернандо де Нороња стандардно вријеме
+					Фернандо де Нороња љетње рачунање времена
 				
 			
 			
@@ -4005,76 +4631,81 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Новосибирск време
-					Новосибирск стандардно време
-					Новосибирск летње рачунање времена
+					Новосибирско вријеме
+					Новосибирск стандардно вријеме
+					Новосибирск љетње рачунање времена
 				
 			
 			
 				
-					Омск време
-					Омск стандардно време
-					Омск летње рачунање времена
+					Омск вријеме
+					Омск стандардно вријеме
+					Омск љетње рачунање времена
 				
 			
 			
 				
-					Пакистан време
-					Пакистан стандардно време
-					Пакистан летње рачунање времена
+					Пакистан вријеме
+					Пакистан стандардно вријеме
+					Пакистан љетње рачунање времена
 				
 			
 			
 				
-					Палау време
+					Палау вријеме
 				
 			
 			
 				
-					Папуа Нова Гвинеја време
+					Папуа Нова Гвинеја вријеме
 				
 			
 			
 				
-					Парагвај време
-					Парагвај стандардно време
-					Парагвај летње рачунање времена
+					Парагвај вријеме
+					Парагвај стандардно вријеме
+					Парагвај љетње рачунање времена
 				
 			
 			
 				
-					Перу време
-					Перу стандардно време
-					Перу летње рачунање времена
+					Перу вријеме
+					Перу стандардно вријеме
+					Перу љетње рачунање времена
 				
 			
 			
 				
-					Филипини време
-					Филипини стандардно време
-					Филипини летње рачунање времена
+					Филипини вријеме
+					Филипини стандардно вријеме
+					Филипини љетње рачунање времена
 				
 			
 			
 				
-					Феникс острва време
+					Феникс острва вријеме
 				
 			
 			
 				
-					Сен Пјер и Микелон време
-					Сен Пјер и Микелон стандардно време
-					Сен Пјер и Микелон летње рачунање вемена
+					Сен Пјер и Микелон вријеме
+					Сен Пјер и Микелон стандардно вријеме
+					Сен Пјер и Микелон љетње рачунање вемена
 				
 			
 			
 				
-					Питкерн време
+					Питкерн вријеме
 				
 			
 			
 				
-					Понапе време
+					Понапе вријеме
+				
+			
+			
+				
+					Пјонгјанг вријеме
 				
 			
 			
@@ -4086,19 +4717,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Реинион време
+					Реинион вријеме
 				
 			
 			
 				
-					Ротера време
+					Ротера вријеме
 				
 			
 			
 				
-					Сахалин време
-					Сахалин стандардно време
-					Сахалин летње рачунање времена
+					Сахалин вријеме
+					Сахалин стандардно вријеме
+					Сахалин љетње рачунање времена
 				
 			
 			
@@ -4110,154 +4741,154 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Самоа време
-					Самоа стандардно време
-					Самоа летње рачунање времена
+					Самоа вријеме
+					Самоа стандардно вријеме
+					Самоа љетње рачунање времена
 				
 			
 			
 				
-					Сејшели време
+					Сејшели вријеме
 				
 			
 			
 				
-					Сингапур стандардно време
+					Сингапур стандардно вријеме
 				
 			
 			
 				
-					Соломонска Острва време
+					Соломонска Острва вријеме
 				
 			
 			
 				
-					Јужна Џорџија време
+					Јужна Џорџија вријеме
 				
 			
 			
 				
-					Суринам време
+					Суринам вријеме
 				
 			
 			
 				
-					Шова време
+					Шова вријеме
 				
 			
 			
 				
-					Тахити време
+					Тахити вријеме
 				
 			
 			
 				
-					Таипеи време
-					Таипеи стандардно веме
-					Таипеи летње рачунање времена
+					Тајпеј вријеме
+					Тајпеј стандардно вријеме
+					Тајпеј љетње рачунање времена
 				
 			
 			
 				
-					Таџикистан време
+					Таџикистан вријеме
 				
 			
 			
 				
-					Токелау време
+					Токелау вријеме
 				
 			
 			
 				
-					Тонга време
-					Тонга стандардно време
-					Тонга летње рачунање времена
+					Тонга вријеме
+					Тонга стандардно вријеме
+					Тонга љетње рачунање времена
 				
 			
 			
 				
-					Трук време
+					Трук вријеме
 				
 			
 			
 				
-					Туркменистан време
-					Туркменистан стандардно време
-					Туркменистан летње рачунање времена
+					Туркменистан вријеме
+					Туркменистан стандардно вријеме
+					Туркменистан љетње рачунање времена
 				
 			
 			
 				
-					Тувалу време
+					Тувалу вријеме
 				
 			
 			
 				
-					Уругвај време
-					Уругвај стандардно време
-					Уругвај летње рачунање времена
+					Уругвај вријеме
+					Уругвај стандардно вријеме
+					Уругвај љетње рачунање времена
 				
 			
 			
 				
-					Узбекистан време
-					Узбекистан стандардно време
-					Узбекистан летње рачунање времена
+					Узбекистан вријеме
+					Узбекистан стандардно вријеме
+					Узбекистан љетње рачунање времена
 				
 			
 			
 				
-					Вануату време
-					Вануату стандардно време
-					Вануату летње рачунање времена
+					Вануату вријеме
+					Вануату стандардно вријеме
+					Вануату љетње рачунање времена
 				
 			
 			
 				
-					Венецуела време
+					Венецуела вријеме
 				
 			
 			
 				
-					Владивосток време
-					Владивосток стандардно време
-					Владивосток летње рачунање времена
+					Владивосток вријеме
+					Владивосток стандардно вријеме
+					Владивосток љетње рачунање времена
 				
 			
 			
 				
-					Волгоград време
-					Волгоград стандардно време
-					Волгоград летње рачунање времена
+					Волгоград вријеме
+					Волгоград стандардно вријеме
+					Волгоград љетње рачунање времена
 				
 			
 			
 				
-					Восток време
+					Восток вријеме
 				
 			
 			
 				
-					Вејк острво време
+					Вејк острво вријеме
 				
 			
 			
 				
-					Валис и Футуна Острва време
+					Валис и Футуна Острва вријеме
 				
 			
 			
 				
-					Јакутск време
-					Јакутск стандардно време
-					Јакутск летње рачунање времена
+					Јакутск вријеме
+					Јакутск стандардно вријеме
+					Јакутск љетње рачунање времена
 				
 			
 			
 				
-					Јекатеринбург време
-					Јекатеринбург стандардно време
-					Јекатеринбург летње рачунање времена
+					Јекатеринбург вријеме
+					Јекатеринбург стандардно вријеме
+					Јекатеринбург љетње рачунање времена
 				
 			
 		
@@ -4274,7 +4905,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			×
 			‰
 			∞
-			NaN
+			NaN
 		
 		
 			
@@ -4385,42 +5016,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					0
-					0
-					0
-					00 хиљ ¤
-					00 хиљ ¤
-					00 хиљ ¤
-					000 хиљ ¤
-					000 хиљ ¤
-					000 хиљ ¤
-					0 мил ¤
-					0 мил ¤
-					0 мил ¤
-					00 мил ¤
-					00 мил ¤
-					00 мил ¤
-					000 мил ¤
-					000 мил ¤
-					000 мил ¤
-					0 млрд ¤
-					0 млрд ¤
-					0 млрд ¤
-					00 млрд ¤
-					00 млрд ¤
-					00 млрд ¤
-					000 млрд ¤
-					000 млрд ¤
-					000 млрд ¤
-					0 бил ¤
-					0 бил ¤
-					0 бил ¤
-					00 бил ¤
-					00 бил ¤
-					00 бил ¤
-					000 бил ¤
-					000 бил ¤
-					000 бил ¤
+					0
+					0
+					0
+					00 хиљ ¤
+					00 хиљ ¤
+					00 хиљ ¤
+					000 хиљ ¤
+					000 хиљ ¤
+					000 хиљ ¤
+					0 мил ¤
+					0 мил ¤
+					0 мил ¤
+					00 мил ¤
+					00 мил ¤
+					00 мил ¤
+					000 мил ¤
+					000 мил ¤
+					000 мил ¤
+					0 млрд ¤
+					0 млрд ¤
+					0 млрд ¤
+					00 млрд ¤
+					00 млрд ¤
+					00 млрд ¤
+					000 млрд ¤
+					000 млрд ¤
+					000 млрд ¤
+					0 бил ¤
+					0 бил ¤
+					0 бил ¤
+					00 бил ¤
+					00 бил ¤
+					00 бил ¤
+					000 бил ¤
+					000 бил ¤
+					000 бил ¤
 				
 			
 			{0} {1}
@@ -4436,9 +5067,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Уједињени арапски емирати дирхам
-				УАЕ дирам
-				УАЕ дирама
-				УАЕ дирама
+				УАЕ дирхам
+				УАЕ дирхама
+				УАЕ дирхама
 			
 			
 				Авганистански авган (1927–2002)
@@ -4447,10 +5078,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				авганистанских авгана (1927–2002)
 			
 			
-				Авганистански авган
-				авганистански авган
-				авганистанска авгана
-				авганистански авгани
+				Афганистански афгани
+				афганистански афгани
+				афганистанска афганија
+				афганистанских афганија
 			
 			
 				стари албански лек
@@ -4460,26 +5091,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Албански лек
 				албански лек
-				Албанске леке
-				албански лек
+				албанска лека
+				албанских лека
 			
 			
-				Јерменски драм
-				јерменски драм
-				Јерменска драма
-				арменијска драма
+				Арменски драм
+				арменски драм
+				арменска драма
+				арменских драма
 			
 			
 				Холандски антили гилдер
 				холандско-антилски гилдер
-				холандска антила
+				холандско-антилска гилдера
 				холандско-антилских гилдера
 			
 			
-				анголска кванза
-				анголијска кванза
-				анголијске кванзе
-				анголијских кванзи
+				Анголска кванза
+				анголска кванза
+				анголске кванзе
+				анголских кванзи
 			
 			
 				анголијска кванза (1977–1990)
@@ -4522,7 +5153,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				аргентинских пезоса (1983–1985)
 			
 			
-				аргентински пезо
+				Аргентински пезос
 				аргентински пезос
 				аргентинска пезоса
 				аргентинских пезоса
@@ -4536,7 +5167,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Аустралијски долар
 				аустралијски долар
-				Аустралијска долара
+				аустралијска долара
 				аустралијских долара
 			
 			
@@ -4566,7 +5197,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Конвертибилна марка
 				босанско-херцеговачка конвертибилна марка
-				босанско-херцеговачке конвертибилне марк
+				босанско-херцеговачке конвертибилне марке
 				босанско-херцеговачких конвертибилних марака
 				КМ
 			
@@ -4576,10 +5207,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				босанско-херцеговачких нових динара
 			
 			
-				Барбадошки долар
-				барбадошки долар
-				барбадошка долара
-				барбадошких долара
+				Барбадоски долар
+				барбадоски долар
+				барбадоска долара
+				барбадоских долара
 			
 			
 				Бангладешка така
@@ -4629,15 +5260,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Бахреински динар
-				бахреинских динара
-				бахреинских динара
+				бахреински динар
+				бахреинска динара
 				бахреинских динара
 			
 			
 				Бурундски франак
 				бурундски франак
 				бурундска франка
-				бурундски франци
+				бурундских франака
 			
 			
 				Бермудски долар
@@ -4652,7 +5283,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				брунејских долара
 			
 			
-				Боливијски Боливиано
+				Боливијски боливиано
 				боливијски боливиано
 				боливијска боливиана
 				боливијских боливиана
@@ -4693,7 +5324,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				бразилских крузеира (1990–1993)
 			
 			
-				Бразилски Реал
+				Бразилски реал
 				бразилски реал
 				бразилска реала
 				бразилских реала
@@ -4725,7 +5356,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Бутански нгултрум
 				бутански нгултрум
 				бутанска нгултрума
-				бутанских нгултра
+				бутанских нгултрума
 			
 			
 				Бурмански кјат
@@ -4749,7 +5380,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Белоруска рубља
 				белоруска рубља
 				белоруске рубље
-				белоруске рубље
+				белоруских рубаља
 			
 			
 				Белоруска рубља (2000–2016)
@@ -4758,7 +5389,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				белоруске рубље (2000–2016)
 			
 			
-				Белизе долар
+				Белизеански долар
 				белизеански долар
 				белизеанска долара
 				белизеанских долара
@@ -4770,10 +5401,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				канадских долара
 			
 			
-				Конголски франак
-				конголски франак
-				конголска франка
-				конголских франака
+				Конгоански франак
+				конгоански франак
+				конгоанска франка
+				конгоанских франака
 			
 			
 				WIR евро
@@ -4805,10 +5436,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				чилеански унидадеси де фоменто
 			
 			
-				Чилеански пезо
-				чилеански пезо
+				Чилеански пезос
+				чилеански пезос
 				чилеанска пезоса
-				чилеански пезоси
+				чилеанских пезоса
+			
+			
+				Кинески јуан (острвски)
+				кинески јуан (острвски)
+				кинеска јуана (острвска)
+				кинеских јуана (острвских)
 			
 			
 				долар кинеске народне банке
@@ -4816,14 +5453,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				долара кинеске народне банке
 			
 			
-				Кинески јуан ренминби
+				Кинески јуан
 				кинески јуан
-				кинеска јуан
+				кинеска јуана
 				кинеских јуана
 			
 			
-				Колумбијски пезо
-				колумбијски пезо
+				Колумбијски пезос
+				колумбијски пезос
 				колумбијска пезоса
 				колумбијских пезоса
 			
@@ -4837,7 +5474,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Костарикански колон
 				костарикански колон
 				костариканска колона
-				костарикански колони
+				костариканских колона
 			
 			
 				Стари српски динар
@@ -4852,13 +5489,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				чехословачких тврдих круна
 			
 			
-				кубански конвертибилни песо
-				кубански конвертибилни песо
-				кубански конвертибилни пезос
-				кубански конвертибилни пезос
+				кубански конвертибилни пезос
+				кубански конвертибилни пезос
+				кубанска конвертибилна пезоса
+				кубанских конвертибилних пезоса
 			
 			
-				Кубански пезо
+				Кубански пезос
 				кубански пезос
 				кубанска пезоса
 				кубанских пезоса
@@ -4879,7 +5516,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Чешка круна
 				чешка круна
 				чешке круне
-				чешких круне
+				чешких круна
 				Кч
 			
 			
@@ -4895,10 +5532,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				немачких марака
 			
 			
-				Џибутански франак
+				Џибутски франак
 				џибутски франак
 				џибутска франка
-				џибутски франци
+				џибутских франака
 			
 			
 				Данска круна
@@ -4907,8 +5544,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				данских круна
 			
 			
-				Доминикански пезо
-				доминикански пезо
+				Доминикански пезос
+				доминикански пезос
 				доминиканска пезоса
 				доминиканских пезоса
 			
@@ -4943,10 +5580,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				египатских фунти
 			
 			
-				Еритреанска накфа
+				Еритрејска накфа
 				еритрејска накфа
 				еритрејске накфе
-				еритреанских накфки
+				еритрејских накфи
 			
 			
 				Шпанска пезета (рачун)
@@ -4967,7 +5604,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				шпанске пезете
 			
 			
-				етиопијски бир
+				Етиопијски бир
 				етиопијски бир
 				етиопијска бира
 				етиопијских бира
@@ -4991,7 +5628,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				фиџи долара
 			
 			
-				Фокландска острва фунта
+				Фолкландска фунта
 				фолкландска фунта
 				фолкландске фунте
 				фолкландских фунти
@@ -5016,9 +5653,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Грузијски лари
-				грузијски ларис
-				грузијска лариса
-				грузијских лариса
+				грузијски лари
+				грузијска ларија
+				грузијских ларија
 			
 			
 				Гански цеди (1979–2007)
@@ -5028,19 +5665,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Гански цеди
-				гански цед
-				ганска цеда
-				ганских цеда
+				гански цеди
+				гански цедиа
+				ганских цедиа
 			
 			
-				Гибралташка фунта
+				Гибралтаска фунта
 				гибралтарска фунта
 				гибралтарске фунте
 				гибралтарских фунти
 			
 			
 				Гамбијски даласи
-				гамбијски далас
+				гамбијски даласи
 				гамбијска даласа
 				гамбијских даласа
 			
@@ -5048,7 +5685,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Гвинејски франак
 				гвинејски франак
 				гвинејска франка
-				гвинејски франци
+				гвинејских франака
 			
 			
 				Гвинејски сили
@@ -5087,7 +5724,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				гвинеја-бисаошких пезоса
 			
 			
-				Гујански долар
+				Гвајански долар
 				гвајански долар
 				гвајанска долара
 				гвајанских долара
@@ -5126,13 +5763,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Мађарска форинта
 				мађарска форинта
 				мађарске форинте
-				мађарске форинте
+				мађарских форинти
 			
 			
-				Индонезијска рупиа
+				Индонежанска рупија
 				индонежанска рупија
 				индонежанске рупије
-				индонежанске рупије
+				индонежанских рупија
 			
 			
 				Ирска фунта
@@ -5159,7 +5796,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				израелских нових шекела
 			
 			
-				Индијски Рупи
+				Индијска рупија
 				индијска рупија
 				индијске рупије
 				индијских рупија
@@ -5168,13 +5805,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ирачки динар
 				ирачки динар
 				ирачка динара
-				ирачки динари
+				ирачких динара
 			
 			
-				Ирански риал
+				Ирански ријал
 				ирански ријал
 				иранска ријала
-				иранијски ријали
+				иранских ријала
 			
 			
 				стара исландска круна
@@ -5186,7 +5823,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Исландска круна
 				исландска круна
 				исландске круне
-				исландске круне
+				исландских круна
 			
 			
 				Италијанска лира
@@ -5202,15 +5839,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Јордански динар
-				јорданских динара
-				јорданских динара
+				јордански динар
+				јорданска динара
 				јорданских динара
 			
 			
 				Јапански јен
 				јапански јен
 				јапанска јена
-				јапански јен
+				јапанских јена
 				¥
 			
 			
@@ -5226,22 +5863,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				киргистанских сома
 			
 			
-				Камбоџијски риел
+				Камбоџански ријел
 				камбоџански ријел
 				камбоџанска ријела
 				камбоџанских ријела
 			
 			
 				Коморски франак
-				коморански франак
-				коморанска франка
-				коморански франци
+				коморски франак
+				коморска франка
+				коморских франака
 			
 			
 				Севернокорејски вон
 				севернокорејски вон
 				севернокорејска вона
-				севернокорејски вон
+				севернокорејских вона
 			
 			
 				јужнокорејски хван
@@ -5254,45 +5891,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				старих јужнокорејских вона
 			
 			
-				Јужнокорејски Вон
+				Јужнокорејски вон
 				јужнокорејски вон
 				јужнокорејска вона
-				јужнокорејски вон
+				јужнокорејских вона
 			
 			
 				Кувајтски динар
-				кувајтских динара
-				кувајтских динара
+				кувајтски динар
+				кувајтска динара
 				кувајтских динара
 			
 			
-				Кајманска острва долар
+				Кајмански долар
 				кајмански долар
 				кајманска долара
 				кајманских долара
 			
 			
-				Казахстански тенџ
-				казахстанска тенџа
-				казахстанске тенџе
-				казахстанских тенџи
+				Казахстански тенге
+				казахстански тенге
+				казахстанска тенга
+				казахстанских тенга
 			
 			
-				Лаошки кип
-				лаошки кип
-				лаошка кипа
-				лаошки кипи
+				Лаоски кип
+				лаоски кип
+				лаоска кипа
+				лаоских кипа
 			
 			
-				Лебанска фунта
-				лебанска фунта
-				лебанске фунте
-				лебанске фунте
+				Либанска фунта
+				либанска фунта
+				либанске фунте
+				либанских фунти
 			
 			
-				Шриланкански рупи
-				шриланкански рупиј
-				шриланканска рупија
+				Шриланканска рупија
+				шриланканска рупија
+				шриланканске рупије
 				шриланканских рупија
 			
 			
@@ -5351,14 +5988,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Либијски динар
-				либијских динара
-				либијских динара
+				либијски динар
+				либијска динара
 				либијских динара
 			
 			
 				Марокански дирхам
-				мароканска дирхама
-				мароканске дирхаме
+				марокански дирхам
+				мароканска дирхама
 				мароканских дирхама
 			
 			
@@ -5378,16 +6015,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				молдованских купона
 			
 			
-				Молдовски љу
-				молдовски леи
-				молдовска леија
-				молдовских леија
+				Молдавски леј
+				молдавски леј
+				молдавска леја
+				молдавских леја
 			
 			
-				Малагасијски ариари
-				малагашајски ариариј
-				малагашајска ариарија
-				малагашајски ариарији
+				Мадагаскарски аријари
+				мадагаскарски аријари
+				мадагаскарска аријарија
+				мадагаскарских аријарија
 			
 			
 				Малагасијски франак
@@ -5399,7 +6036,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Македонски денар
 				македонски денар
 				македонска денара
-				македонских динара
+				македонских денара
 			
 			
 				стари македонски денар
@@ -5413,22 +6050,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				малијских франака
 			
 			
-				Мјанмашки кјат
-				мијанмашки кјат
-				мијанмашка кјата
-				мијанмашки кјати
+				Мијанмарски кјат
+				мијанмарски кјат
+				мијанмарска кјата
+				мијанмарских кјата
 			
 			
 				Монголски тугрик
-				монголијски тугрик
-				монголијска тугрика
-				монголијски тугрици
+				монголски тугрик
+				монголска тугрика
+				монголских тугрика
 			
 			
-				Маканишка патака
-				маканешка патака
-				маканешке патаке
-				маканешких патака
+				Макаоска патака
+				макаоска патака
+				макаоске патаке
+				макаоских патака
 			
 			
 				Мауританијска угвија (1973–2017)
@@ -5437,10 +6074,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				мауританијске угвиље (1973–2017)
 			
 			
-				Мауританијска угвија
-				мауританијска угвиља
-				мауританијске угвиље
-				мауританијске угвиље
+				Мауританска огија
+				мауританска огија
+				мауританске огије
+				мауританских огија
 			
 			
 				Малтешка лира
@@ -5455,16 +6092,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				малтешких фунти
 			
 			
-				Маурицијски рупи
-				мауританијска рупија
-				мауританијске рупије
-				мауританијске рупије
+				Маурицијска рупија
+				маурицијска рупија
+				маурицијске рупије
+				маурицијских рупија
 			
 			
-				Малдивијска руфија
-				малдивски руфијас
-				малдивска руфијаса
-				малдивских руфијаса
+				Малдивска руфија
+				малдивска руфија
+				малдивске руфије
+				малдивских руфија
 			
 			
 				Малавијска квача
@@ -5473,8 +6110,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				малавијских квача
 			
 			
-				Мексички пезо
-				мексички пезо
+				Мексички пезос
+				мексички пезос
 				мексичка пезоса
 				мексичких пезоса
 			
@@ -5491,10 +6128,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				мексичких унидадс де инверзиона
 			
 			
-				Малезијски ринггит
-				малезијски ринггит
-				малезијска ринггита
-				малезијских ринггита
+				Малезијски рингит
+				малезијски рингит
+				малезијска рингита
+				малезијских рингита
 			
 			
 				Мозамбијски ескудо
@@ -5515,7 +6152,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				мозамбијских метикала
 			
 			
-				намбијски долар
+				Намибијски долар
 				намибијски долар
 				намибијска долара
 				намибијских долара
@@ -5551,7 +6188,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				норвешких круна
 			
 			
-				Непалски рупи
+				Непалска рупија
 				непалска рупија
 				непалске рупије
 				непалских рупија
@@ -5564,8 +6201,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Омански ријал
-				оманских ријала
-				оманских ријала
+				омански ријал
+				оманска ријала
 				оманских ријала
 			
 			
@@ -5593,22 +6230,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				перуанских сола (1863–1965)
 			
 			
-				Папуа ново-гвинејшка кина
-				папуа ново гвинејски долар
-				папуа ново гвинејска долара
-				папуа ново гвинејских долара
+				Папуанска кина
+				папуанска кина
+				папуанске кине
+				папуанских кина
 			
 			
-				Филипински пезо
-				филипински пезо
+				Филипински пезос
+				филипински пезос
 				филипинска пезоса
 				филипинских пезоса
 			
 			
-				Пакистански рупи
+				Пакистанска рупија
 				пакистанска рупија
 				пакистанске рупије
-				пакистанске рупије
+				пакистанских рупија
 			
 			
 				Пољски злот
@@ -5630,13 +6267,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				португалских ескуда
 			
 			
-				Парагвајски гуарни
-				парагвајски гвараниј
+				Парагвајски гварани
+				парагвајски гварани
 				парагвајска гваранија
-				парагвајски гваранији
+				парагвајских гваранија
 			
 			
-				Катаршки ријал
+				Катарски ријал
 				катарски ријал
 				катарска ријала
 				катарских ријала
@@ -5654,16 +6291,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				старих румунских леија
 			
 			
-				Румунски леу
-				румунски леи
-				румунска леија
-				румунских леија
+				Румунски леј
+				румунски леј
+				румунска леја
+				румунских леја
 			
 			
 				Српски динар
 				српски динар
 				српска динара
-				српски динари
+				српских динара
 				дин.
 			
 			
@@ -5679,10 +6316,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				руских рубљи (1991–1998)
 			
 			
-				Руандански франак
-				руандански франак
-				руанданска франка
-				руандански франци
+				Руандски франак
+				руандски франак
+				руандска франка
+				руандских франака
 			
 			
 				Саудијски ријал
@@ -5691,10 +6328,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				саудијских ријала
 			
 			
-				Соломонско-острвски долар
-				соломонско-острвски долар
-				соломонско-острвска долара
-				соломонско-острвских долара
+				Соломонски долар
+				соломонски долар
+				соломонска долара
+				соломонских долара
 			
 			
 				Сејшелска рупија
@@ -5733,10 +6370,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				сингапурских долара
 			
 			
-				Св. јеленска фунта
-				св. јеленска фунта
-				св. јеленске фунте
-				св. јеленских фунти
+				Света Јелена фунта
+				Света Јелена фунта
+				Света Јелена фунте
+				Света Јелена фунти
 			
 			
 				Словеначки толар
@@ -5751,19 +6388,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				словачких круна
 			
 			
-				Сијера-леоншки леоне
+				Сијералеонски леоне
 				сијералеонски леоне
 				сијералеонска леона
-				сијералеонски леони
+				сијералеонских леона
 			
 			
-				СОмалијски шилинг
+				Сомалијски шилинг
 				сомалијски шилинг
 				сомалијска шилинга
-				сомалијски шилинзи
+				сомалијских шилинга
 			
 			
-				СУринамски долар
+				Суринамски долар
 				суринамски долар
 				суринамска долара
 				суринамских долара
@@ -5774,6 +6411,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				суринамска гилдера
 				суринамских гилдера
 			
+			
+				Јужносуданска фунта
+				јужносуданска фунта
+				јужносуданске фунте
+				јужносуданских фунти
+			
 			
 				Сао Томе и Принципе добра (1977–2017)
 				сао томе и принципе добар (1977–2017)
@@ -5782,7 +6425,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Сао Томе и Принципе добра
-				сао томе и принципе добар
+				сао томе и принципе добра
 				сао томе и принципе добра
 				сао томе и принципе добри
 			
@@ -5802,19 +6445,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Сиријска фунта
 				сиријска фунта
 				сиријске фунте
-				сиријске фунте
+				сиријских фунти
 			
 			
-				Свази лилангени
-				свази емаланген
-				свази емалангена
-				свази емалангена
+				Свазилендски лилангени
+				свазилендски лилангени
+				свазилендска лилангенија
+				свазилендских лилангенија
 			
 			
-				Таи бахт
-				таи бахт
-				таи бахта
-				таи бахта
+				Тајски бахт
+				тајски бахт
+				тајска бахта
+				тајских бахта
 			
 			
 				Таџихистанска рубља
@@ -5823,10 +6466,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				таџихистанских рубљи
 			
 			
-				Таљихистански сомони
-				таџихистански сомон
-				таџихистанска сомона
-				таџихистанских сомона
+				Таџикистански сомони
+				таџикистански сомони
+				таџикистанска сомонија
+				таџикистанских сомонија
 			
 			
 				Туркменистански манат (1993–2009)
@@ -5837,20 +6480,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Туркменистански манат
 				туркменистански манат
-				туркменистански манат
+				туркменистанска маната
 				туркменистанских маната
 			
 			
-				Тунизијски долар
-				тунежанских динара
-				тунежанских динара
-				тунежанских динара
+				Туниски динар
+				туниски динар
+				туниска динара
+				туниских динара
 			
 			
-				Тонгоншка Панга
-				тонгашка панга
-				тонгашке панге
-				тонгашких панга
+				Тонгоанска панга
+				тонгоанска панга
+				тонгоанске панге
+				тонгоанских панги
 			
 			
 				Тиморшки ескудо
@@ -5872,7 +6515,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Тл
 			
 			
-				Тринидад тобагошки долар
+				Тринидад-тобагошки долар
 				тринидад-тобагошки долар
 				тринидад-тобагошка долара
 				тринидад-тобагошких долара
@@ -5881,19 +6524,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Нови тајвански долар
 				нови тајвански долар
 				нова тајванска долара
-				нови тајвански долари
+				нових тајванских долара
 			
 			
 				Танзанијски шилинг
 				танзанијски шилинг
 				танзанијска шилинга
-				танзанијски шилинзи
+				танзанијских шилинга
 			
 			
 				Украјинска хривња
-				украјинска кривња
-				украјинске кривње
-				украјинских кривњи
+				украјинска хривња
+				украјинске хривње
+				украјинских хривњи
 			
 			
 				Украјински карбованети
@@ -5909,9 +6552,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Угандски шилинг
-				угандијски шилинг
-				угандијска шилинга
-				угандијски шилинзи
+				угандски шилинг
+				угандска шилинга
+				угандских шилинга
 			
 			
 				Амерички долар
@@ -5944,8 +6587,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				уругвајских пезоса (1975–1993)
 			
 			
-				Уругвајски пезо
-				уругвајски пезо
+				Уругвајски пезос
+				уругвајски пезос
 				уругвајска пезоса
 				уругвајских пезоса
 			
@@ -5953,7 +6596,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Узбекистански сом
 				узбекистански сом
 				узбекистанска сома
-				узбекистански сом
+				узбекистанских сома
 			
 			
 				Венецуелански боливар (1871–2008)
@@ -5977,7 +6620,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Вијетнамски донг
 				вијетнамски донг
 				вијетнамска донга
-				вијетнамски донг
+				вијетнамских донга
 			
 			
 				стари вијетнамски донг
@@ -5986,9 +6629,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Вануатски вату
-				вануату вату
-				вануату ватуа
-				вануату ватуи
+				вануатски вату
+				вануатска ватуа
+				вануатских ватуа
 			
 			
 				Самоанска тала
@@ -6000,7 +6643,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				CFA франак BEAC
 				CFA франак BEAC
 				CFA франка BEAC
-				CFA франци BEAC
+				CFA франака BEAC
 			
 			
 				Сребро
@@ -6072,7 +6715,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				CFA франак BCEAO
 				CFA франак BCEAO
 				CFA франка BCEAO
-				CFA франци BCEAO
+				CFA франака BCEAO
 			
 			
 				Паладијум
@@ -6084,7 +6727,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				CFP франак
 				CFP франак
 				CFP франка
-				CFP франци
+				CFP франака
 			
 			
 				Платина
@@ -6117,10 +6760,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				јеменских долара
 			
 			
-				Јеменски риал
+				Јеменски ријал
 				јеменски ријал
 				јеменска ријала
-				јеменски ријали
+				јеменских ријала
 			
 			
 				Југословенски тврди динар
@@ -6152,10 +6795,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				јужноафричких ранда (финансијских)
 			
 			
-				Јужно-афрички ранд
-				јужно-афрички ранд
-				јужно-афричка ранда
-				јужно-афричких ранда
+				Јужноафрички ранд
+				јужноафрички ранд
+				јужноафричка ранда
+				јужноафричких ранда
 			
 			
 				Замбијска квача (1968–2012)
@@ -6167,7 +6810,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Замбијска квача
 				замбијска квача
 				замбијске кваче
-				замбијске кваче
+				замбијских квача
 			
 			
 				Заирски нови заир
@@ -6198,96 +6841,343 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
+			{0} сат
+			{0} сата
+			{0} сати
 			Скрените на {0}. крижању десно.
 		
 	
 	
 		
+			
+				квадратни километри
+				{0} квадратни километар
+				{0} квадратна километра
+				{0} квадратних километара
+				{0} по квадратном километру
+			
+			
+				хектари
+				{0} хектар
+				{0} хектара
+				{0} хектара
+			
+			
+				квадратни метри
+				{0} квадратни метар
+				{0} квадратна метра
+				{0} квадратних метара
+				{0} по квадратном метру
+			
+			
+				квадратни центиметри
+				{0} квадратни центиметар
+				{0} квадратна центиметра
+				{0} квадратних центиметара
+				{0} по квадратном центиметру
+			
+			
+				квадратне миље
+				{0} квадратна миља
+				{0} квадратне миље
+				{0} квадратних миља
+				{0} по квадратној миљи
+			
+			
+				акре
+				{0} акра
+				{0} акре
+				{0} акри
+			
+			
+				квадратни јарди
+				{0} квадратни јард
+				{0} квадратна јарда
+				{0} квадратних јарди
+			
+			
+				квадратне стопе
+			
+			
+				квадратни инчи
+			
+			
+				вијекови
+				{0} вијек
+				{0} вијека
+				{0} вијекова
+			
+			
+				деценије
+				{0} деценија
+				{0} деценије
+				{0} деценија
+			
 			
-				година
+				година
 				{0} година
 				{0} године
 				{0} година
+				{0} годишње
 			
 			
-				месец
-				{0} месец
-				{0} месеца
-				{0} месец
+				мјесец
+				{0} мјесец
+				{0} мјесеца
+				{0} мјесеци
+				{0} мјесечно
 			
 			
-				недеља
-				{0} недеља
-				{0} недеље
-				{0} недеља
+				седмице
+				{0} седмица
+				{0} седмице
+				{0} седмица
+				{0} седмично
 			
 			
-				дан
+				дани
 				{0} дан
 				{0} дана
-				{0} дан
+				{0} дана
+				{0} дневно
 			
 			
-				сат
+				сати
 				{0} сат
 				{0} сата
-				{0} сат
+				{0} сати
+				{0} по сату
 			
 			
-				минут
+				минути
 				{0} минут
 				{0} минута
-				{0} минут
+				{0} минута
+				{0} у минуту
 			
 			
-				секунда
+				секунде
 				{0} секунда
 				{0} секунде
-				{0} секунда
+				{0} секунди
+				{0} у секунди
+			
+			
+				милисекунде
+				{0} милисекунда
+				{0} милисекунде
+				{0} милисекунди
+			
+			
+				микросекунде
+				{0} микросекунда
+				{0} микросекунде
+				{0} микросекунди
+			
+			
+				наносекунде
+				{0} наносекунда
+				{0} наносекунде
+				{0} наносекунди
+			
+			
+				пиксели
+			
+			
+				мегапиксели
+			
+			
+				тачке по центиметру
+			
+			
+				тачке по инчу
+			
+			
+				километри
+				{0} километар
+				{0} километра
+				{0} километара
+				{0} по километру
+			
+			
+				метри
+				{0} метар
+				{0} метра
+				{0} метара
+				{0} по метру
+			
+			
+				дециметри
+				{0} дециметар
+				{0} дециметра
+				{0} дециметара
+			
+			
+				центриметри
+				{0} центиметар
+				{0} центиметра
+				{0} центиметара
+				{0} по центиметру
+			
+			
+				милиметри
+				{0} милиметар
+				{0} милиметра
+				{0} милиметара
+			
+			
+				микрометри
+				{0} микрометар
+				{0} микрометра
+				{0} микрометара
+			
+			
+				нанометри
+				{0} нанометар
+				{0} нанометра
+				{0} нанометара
+			
+			
+				миље
+				{0} миља
+				{0} миље
+				{0} миља
+			
+			
+				јарди
+				{0} јард
+				{0} јарда
+				{0} јарди
+			
+			
+				свјетлосне године
+				{0} свјетлосна година
+				{0} свјетлосне године
+				{0} свјетлосних година
+			
+			
+				астрономске јединице
+				{0} астрономска јединица
+				{0} астрономске јединице
+				{0} астрономских јединица
+			
+			
+				наутичке миље
+				{0} наутичка миља
+				{0} наутичке миље
+				{0} наутичких миља
+			
+			
+				тачке
+				{0} тачка
+				{0} тачке
+				{0} тачака
+			
+			
+				кубни метри
+			
+			
+				кубни центиметри
+			
+			
+				литри
 			
 		
 		
+			
+				хектари
+			
+			
+				акре
+			
+			
+				в.
+				{0} в.
+				{0} в.
+				{0} в.
+			
+			
+				дец
+				{0} дец.
+				{0} дец.
+				{0} дец.
+			
 			
-				година
+				година
 				{0} год
 				{0} год
 				{0} год
+				{0} годиш.
 			
 			
-				месец
-				{0} мес
-				{0} мес
-				{0} мес
+				мјесеци
+				{0} мјес.
+				{0} мјес.
+				{0} мјес.
+				{0} мјесеч.
 			
 			
-				недеља
-				{0} нед
-				{0} нед
-				{0} нед
+				седмице
+				{0} сед.
+				{0} сед.
+				{0} сед.
+				{0} седм.
 			
 			
-				дан
+				дани
 				{0} дан
 				{0} дана
 				{0} дан
+				{0} днев.
 			
 			
-				сат
+				сати
 				{0} сат
 				{0} сата
-				{0} сат
+				{0} сати
+				{0} по сату
 			
 			
-				минут
-				{0} мин
-				{0} мин
-				{0} мин
+				минут
+				{0} мин.
+				{0} мин.
+				{0} мин.
+				{0} у мин.
 			
 			
-				секунда
-				{0} сек
-				{0} сек
-				{0} сек
+				секунде
+				{0} сек.
+				{0} сек.
+				{0} сек.
+				{0} у сек.
+			
+			
+				мс
+				{0} мс
+				{0} мс
+				{0} мс
+			
+			
+				m
+			
+		
+		
+			
+				мјесец
+				{0} мјес.
+				{0} мјес.
+				{0} мјес.
+			
+			
+				седмица
+				{0} сед.
+				{0} сед.
+				{0} сед.
+			
+			
+				{0} сат
+				{0} сата
+				{0} сати
 			
 		
 	
diff --git a/make/data/cldr/common/main/bs_Cyrl_BA.xml b/make/data/cldr/common/main/bs_Cyrl_BA.xml
index 6ecba63c129..031c66616b6 100644
--- a/make/data/cldr/common/main/bs_Cyrl_BA.xml
+++ b/make/data/cldr/common/main/bs_Cyrl_BA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
@@ -56,27 +70,322 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			
 			
 			
+			
+			
 			
 			
 			
 		
 		
+			Kalibutan
+			Africa
+			North America
+			South America
+			Oceania
+			Western Africa
+			Central America
+			Eastern Africa
+			Northern Africa
+			Middle Africa
+			Southern Africa
+			Americas
+			Northern America
+			Caribbean
+			Eastern Asia
+			Southern Asia
+			Southeast Asia
+			Southern Europe
+			Australasia
+			Melanesia
+			Micronesian Region
+			Polynesia
+			Asya
+			Central Asia
+			Western Asia
+			Europe
+			Eastern Europe
+			Northern Europe
+			Western Europe
+			Sub-Saharan Africa
+			Latin America
+			Ascension Island
+			Andorra
+			United Arab Emirates
+			Afghanistan
+			Antigua & Barbuda
+			Anguilla
+			Albania
+			Armenia
+			Angola
+			Antarctica
+			Argentina
+			American Samoa
+			Austria
+			Australia
+			Aruba
+			Aland Islands
+			Azerbaijan
+			Bosnia & Herzegovina
+			Barbados
+			Bangladesh
+			Belgium
+			Burkina Faso
+			Bulgaria
+			Bahrain
+			Burundi
+			Benin
+			St. Barthelemy
+			Bermuda
+			Brunei
+			Bolivia
+			Caribbean Netherlands
 			Brazil
+			Bahamas
+			Bhutan
+			Bouvet Island
+			Botswana
+			Belarus
+			Belize
+			Canada
+			Cocos (Keeling) Islands
+			Congo - Kinshasa
+			Congo (DRC)
+			Central African Republic
+			Congo - Brazzaville
+			Congo (Republic)
+			Switzerland
+			Cote d’Ivoire
+			Ivory Coast
+			Cook Islands
+			Chile
+			Cameroon
 			Tsina
+			Colombia
+			Clipperton Island
+			Costa Rica
+			Cuba
+			Cape Verde
+			Curacao
+			Christmas Island
+			Cyprus
+			Czechia
+			Czech Republic
 			Alemanya
+			Diego Garcia
+			Djibouti
+			Denmark
+			Dominica
+			Dominican Republic
+			Algeria
+			Ceuta & Melilla
+			Ecuador
+			Estonia
+			Egypt
+			Western Sahara
+			Eritrea
+			Spain
+			Ethiopia
+			European Union
+			Eurozone
+			Finland
+			Fiji
+			Falkland Islands
+			Falkland Islands (Islas Malvinas)
+			Micronesia
+			Faroe Islands
 			Pransiya
+			Gabon
 			Hiniusang Gingharian
+			UK
+			Grenada
+			Georgia
+			French Guiana
+			Guernsey
+			Ghana
+			Gibraltar
+			Greenland
+			Gambia
+			Guinea
+			Guadeloupe
+			Equatorial Guinea
+			Greece
+			South Georgia & South Sandwich Islands
+			Guatemala
+			Guam
+			Guinea-Bissau
+			Guyana
+			Hong Kong SAR China
+			Hong Kong
+			Heard & McDonald Islands
+			Honduras
+			Croatia
+			Haiti
+			Hungary
+			Canary Islands
+			Indonesia
+			Ireland
+			Israel
+			Isle of Man
 			India
+			British Indian Ocean Territory
+			Iraq
+			Iran
+			Iceland
 			Italya
+			Jersey
+			Jamaica
+			Jordan
 			Hapon
-			Amihanang Macedonia
+			Kenya
+			Kyrgyzstan
+			Cambodia
+			Kiribati
+			Comoros
+			St. Kitts & Nevis
+			North Korea
+			South Korea
+			Kuwait
+			Cayman Islands
+			Kazakhstan
+			Laos
+			Lebanon
+			St. Lucia
+			Liechtenstein
+			Sri Lanka
+			Liberia
+			Lesotho
+			Lithuania
+			Luxembourg
+			Latvia
+			Libya
+			Morocco
+			Monaco
+			Moldova
+			Montenegro
+			St. Martin
+			Madagascar
+			Marshall Islands
+			North Macedonia
+			Mali
+			Myanmar (Burma)
+			Mongolia
+			Macao SAR China
+			Macao
+			Northern Mariana Islands
+			Martinique
+			Mauritania
+			Montserrat
+			Malta
+			Mauritius
+			Maldives
+			Malawi
+			Mexico
+			Malaysia
+			Mozambique
+			Namibia
+			New Caledonia
+			Niger
+			Norfolk Island
+			Nigeria
+			Nicaragua
+			Netherlands
+			Norway
+			Nepal
+			Nauru
+			Niue
+			New Zealand
+			Oman
+			Panama
+			Peru
+			French Polynesia
+			Papua New Guinea
 			Pilipinas
+			Pakistan
+			Poland
+			St. Pierre & Miquelon
+			Pitcairn Islands
+			Puerto Rico
+			Palestinian Territories
+			Palestine
+			Portugal
+			Palau
+			Paraguay
+			Qatar
+			Outlying Oceania
+			Reunion
+			Romania
+			Serbia
 			Russia
+			Rwanda
+			Saudi Arabia
+			Solomon Islands
+			Seychelles
+			Sudan
+			Sweden
+			Singapore
+			St. Helena
+			Slovenia
+			Svalbard & Jan Mayen
+			Slovakia
+			Sierra Leone
+			San Marino
+			Senegal
+			Somalia
+			Suriname
+			South Sudan
+			Sao Tome & Principe
+			El Salvador
+			Sint Maarten
+			Syria
+			Eswatini
+			Swaziland
+			Tristan da Cunha
+			Turks & Caicos Islands
+			Chad
+			French Southern Territories
+			Togo
+			Thailand
+			Tajikistan
+			Tokelau
+			Timor-Leste
+			East Timor
+			Turkmenistan
+			Tunisia
+			Tonga
+			Turkey
+			Trinidad & Tobago
+			Tuvalu
+			Taiwan
+			Tanzania
+			Ukraine
+			Uganda
+			U.S. Outlying Islands
+			United Nations
 			Estados Unidos
+			Uruguay
+			Uzbekistan
+			Vatican City
+			St. Vincent & Grenadines
+			Venezuela
+			British Virgin Islands
+			U.S. Virgin Islands
+			Vietnam
+			Vanuatu
+			Wallis & Futuna
+			Samoa
+			Pseudo-Accents
+			Pseudo-Bidi
+			Kosovo
+			Yemen
+			Mayotte
+			South Africa
+			Zambia
+			Zimbabwe
 			Wala-mailhing Rehiyon
 		
 		
 			Gregorian nga Kalendaryo
+			Kalendaryo sa ISO-8601
 			Standard nga Paagi sa Pagpihig
 			Kasadpanhong mga Digit
 		
@@ -100,8 +409,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 	
 		[a b d e g h i k l m n o p r s t u w y]
 		[c f j q v x z]
-		[a b d e g h i k l m n {ng} o p r s t u w y]
-		[\- , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]
+		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
+		[\- ‑ , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]
 	
 	
 		“
@@ -155,8 +464,126 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							{1}, {0}
 						
 					
+					
+						d
+						d E
+						E h:mm a
+						E h:mm:ss a
+						y G
+						MMM y G
+						MMM d, y G
+						E, MMM d, y G
+						M/d
+						E, M/d
+						E, MMM d
+						y G
+						y G
+						M/y GGGGG
+						M/d/y GGGGG
+						E, M/d/y GGGGG
+						MMM y G
+						MMM d, y G
+						E, MMM d, y G
+						MMMM y G
+						QQQ y G
+						QQQQ y G
+					
 					
 						{0} – {1}
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+						
+						
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y GGGGG – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
+						
+						
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
+						
+						
+							M – M
+						
+						
+							M/d – M/d
+							M/d – M/d
+						
+						
+							E, M/d – E, M/d
+							E, M/d – E, M/d
+						
+						
+							MMM – MMM
+						
+						
+							MMM d – d
+						
+						
+							E, MMM d – E, MMM d
+							E, MMM d – E, MMM d
+						
+						
+							y – y G
+						
+						
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+						
+						
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+						
+						
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							MMM d – d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
+						
+						
+							E, MMM d – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
+						
+						
+							MMMM – MMMM y G
+							MMMM y – MMMM y G
+						
 					
 				
 			
@@ -195,7 +622,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							Enero
 							Pebrero
 							Marso
-							April
+							Abril
 							Mayo
 							Hunyo
 							Hulyo
@@ -239,7 +666,7 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							Enero
 							Pebrero
 							Marso
-							April
+							Abril
 							Mayo
 							Hunyo
 							Hulyo
@@ -271,6 +698,15 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							B
 							S
 						
+						
+							Dom
+							Lun
+							Mar
+							Miy
+							Huw
+							Biy
+							Sab
+						
 						
 							Domingo
 							Lunes
@@ -302,10 +738,10 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							Q4
 						
 						
-							Una sa matag-tulo ka bulan
-							Ikaduha sa matag-tulo ka bulan
-							Ikatulo sa matag-tulo ka bulan
-							Ikaupat sa matag-tulo ka bulan
+							unang quarter
+							ika-2 nga quarter
+							ika-3 nga quarter
+							ika-4 nga quarter
 						
 					
 					
@@ -315,10 +751,20 @@ the LDML specification (http://unicode.org/reports/tr35/)
 							Q3
 							Q4
 						
+						
+							unang quarter
+							ika-2 nga quarter
+							ika-3 nga quarter
+							ika-4 nga quarter
+						
 					
 				
 				
 					
+						
+							a
+							p
+						
 						
 							AM
 							PM
@@ -326,6 +772,10 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					
 				
 				
+					
+						Sa Wala Pa ang Common Era
+						Common Era
+					
 					
 						WK
 						WKP
@@ -431,6 +881,8 @@ the LDML specification (http://unicode.org/reports/tr35/)
 						MMM d
 						E, MMM d
 						MMMM d
+						'semana' W 'sa' MMMM
+						'semana' W 'sa' MMMM
 						mm:ss
 						y
 						M/y
@@ -442,61 +894,248 @@ the LDML specification (http://unicode.org/reports/tr35/)
 						MMMM y
 						QQQ y
 						QQQQ y
+						'semana' w 'sa' Y
+						'semana' w 'sa' Y
 					
 					
 						{0} – {1}
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+						
+						
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y GGGGG – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
+						
+						
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
+						
+						
+							HH – HH
+						
+						
+							h:mm – h:mm a
+						
+						
+							HH:mm – HH:mm
+							HH:mm – HH:mm
+						
+						
+							h:mm – h:mm a v
+							h:mm – h:mm a v
+						
+						
+							HH:mm – HH:mm v
+							HH:mm – HH:mm v
+						
+						
+							h – h a v
+						
+						
+							HH – HH v
+						
+						
+							M – M
+						
+						
+							M/d – M/d
+							M/d – M/d
+						
+						
+							E, M/d – E, M/d
+							E, M/d – E, M/d
+						
+						
+							MMM – MMM
+						
+						
+							E, MMM d – E, MMM d
+							E, MMM d – E, MMM d
+						
+						
+							M/y – M/y
+							M/y – M/y
+						
+						
+							M/d/y – M/d/y
+							M/d/y – M/d/y
+							M/d/y – M/d/y
+						
+						
+							E, M/d/y – E, M/d/y
+							E, M/d/y – E, M/d/y
+							E, M/d/y – E, M/d/y
+						
+						
+							MMM – MMM y
+							MMM y – MMM y
+						
+						
+							MMM d – d, y
+							MMM d – MMM d, y
+							MMM d, y – MMM d, y
+						
+						
+							E, MMM d – E, MMM d, y
+							E, MMM d – E, MMM d, y
+							E, MMM d, y – E, MMM d, y
+						
+						
+							MMMM – MMMM y
+							MMMM y – MMMM y
+						
 					
 				
 			
 		
 		
 			
-				Panahon
+				era
 			
 			
 				tuig
+				miaging tuig
+				karong tuiga
+				sunod nga tuig
+			
+			
+				miaging tuig
+				karong tuiga
+				sunod nga tuig
+			
+			
+				miaging tuig
+				karong tuiga
+				sunod nga tuig
 			
 			
-				Ikaupat
+				quarter
+			
+			
+				qtr.
+			
+			
+				qtr.
 			
 			
-				Bulan
+				buwan
+				miaging buwan
+				karong buwana
+				sunod nga buwan
 			
 			
-				Bulan
+				buwan
+				miaging buwan
+				karong buwana
+				sunod nga buwan
+			
+			
+				buwan
+				miaging buwan
+				karong buwana
+				sunod nga buwan
 			
 			
-				Semana
+				semana
+				miaging semana
+				karong semanaha
+				sunod nga semana
+				ang semana sa {0}
+			
+			
+				semana
+				miaging semana
+				karong semanaha
+				sunod nga semana
+				ang semana sa {0}
+			
+			
+				semana
+				miaging semana
+				karong semanaha
+				sunod nga semana
+				ang semana sa {0}
 			
 			
-				Adlaw
-				Kagahapon
-				Karon nga Adlaw
-				Ugma
+				adlaw
+				gahapon
+				karong adlawa
+				ugma
 			
 			
-				Adlaw
+				adlaw
+				gahapon
+				karong adlawa
+				ugma
 			
 			
-				Adlaw
+				adlaw
+				gahapon
+				karong adlawa
+				ugma
 			
 			
-				Adlaw sa Semana
+				adlaw sa semana
 			
 			
 				AM/PM
 			
 			
-				Oras
+				oras
+			
+			
+				oras
+			
+			
+				oras
 			
 			
-				Minuto
+				minuto
+			
+			
+				minuto
+			
+			
+				minuto
 			
 			
-				Segundo
+				segundo
+			
+			
+				segundo
+			
+			
+				segundo
 			
 			
-				Sona sa Panahon
+				time zone
 			
 		
 		
@@ -515,6 +1154,57 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			
 				Wala Mailhing Siyudad
 			
+			
+				
+					Oras sa Tag-init sa British
+				
+			
+			
+				
+					Tamdanang Oras sa Irish
+				
+			
+			
+				
+					Oras sa Afghanistan
+				
+			
+			
+				
+					Oras sa Central Africa
+				
+			
+			
+				
+					Oras sa East Africa
+				
+			
+			
+				
+					Tamdanang Oras sa South Africa
+				
+			
+			
+				
+					Oras sa West Africa
+					Tamdanang Oras sa West Africa
+					Oras sa Tag-init sa West Africa
+				
+			
+			
+				
+					Oras sa Alaska
+					Tamdanang Oras sa Alaska
+					Oras sa Adlawan sa Alaska
+				
+			
+			
+				
+					Oras sa Amazon
+					Tamdanang Oras sa Amazon
+					Oras sa Tag-init sa Amazon
+				
+			
 			
 				
 					Taliwala nga Oras Norte Amerika
@@ -543,6 +1233,41 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					Norte Amerika Oras sa Kahayag sa Adlaw sa Pasipiko
 				
 			
+			
+				
+					Oras sa Apia
+					Tamdanang Oras sa Apia
+					Oras sa Adlawan sa Apia
+				
+			
+			
+				
+					Oras sa Arabia
+					Tamdanang Oras sa Arabia
+					Oras sa Adlawan sa Arabia
+				
+			
+			
+				
+					Oras sa Argentina
+					Tamdanang Oras sa Argentina
+					Oras sa Tag-init sa Argentina
+				
+			
+			
+				
+					Oras sa Western Argentina
+					Tamdanang Oras sa Western Argentina
+					Oras sa Tag-init sa Western Argentina
+				
+			
+			
+				
+					Oras sa Armenia
+					Tamdanang Oras sa Armenia
+					Oras sa Tag-init sa Armenia
+				
+			
 			
 				
 					Norte Amerika Oras sa Atlantiko
@@ -550,6 +1275,175 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					Norte Amerika Oras sa Kahayag sa Adlaw sa Atlantiko
 				
 			
+			
+				
+					Oras sa Central Australia
+					Tamdanang Oras sa Central Australia
+					Oras sa Adlawan sa Central Australia
+				
+			
+			
+				
+					Oras sa Central Western Australia
+					Tamdanang Oras sa Central Western Australia
+					Oras sa Adlawan sa Central Western Australia
+				
+			
+			
+				
+					Oras sa Eastern Australia
+					Tamdanang Oras sa Eastern Australia
+					Oras sa Adlawan sa Eastern Australia
+				
+			
+			
+				
+					Oras sa Western Australia
+					Tamdanang Oras sa Western Australia
+					Oras sa Adlawan sa Western Australia
+				
+			
+			
+				
+					Oras sa Azerbaijan
+					Tamdanang Oras sa Azerbaijan
+					Oras sa Tag-init sa Azerbaijan
+				
+			
+			
+				
+					Oras sa Azores
+					Tamdanang Oras sa Azores
+					Oras sa Tag-init sa Azores
+				
+			
+			
+				
+					Oras sa Bangladesh
+					Tamdanang Oras sa Bangladesh
+					Oras sa Tag-init sa Bangladesh
+				
+			
+			
+				
+					Oras sa Bhutan
+				
+			
+			
+				
+					Oras sa Bolivia
+				
+			
+			
+				
+					Oras sa Brasilia
+					Tamdanang Oras sa Brasilia
+					Oras sa Tag-init sa Brasilia
+				
+			
+			
+				
+					Oras sa Brunei Darussalam
+				
+			
+			
+				
+					Oras sa Cape Verde
+					Tamdanang Oras sa Cape Verde
+					Oras sa Tag-init sa Cape Verde
+				
+			
+			
+				
+					Tamdanang Oras sa Chamorro
+				
+			
+			
+				
+					Oras sa Chatham
+					Tamdanang Oras sa Chatham
+					Oras sa Adlawan sa Chatham
+				
+			
+			
+				
+					Oras sa Chile
+					Tamdanang Oras sa Chile
+					Oras sa Tag-init sa Chile
+				
+			
+			
+				
+					Oras sa China
+					Tamdanang Oras sa China
+					Oras sa Adlawan sa China
+				
+			
+			
+				
+					Oras sa Choibalsan
+					Tamdanang Oras sa Choibalsan
+					Oras sa Tag-init sa Choibalsan
+				
+			
+			
+				
+					Oras sa Christmas Island
+				
+			
+			
+				
+					Oras sa Cocos Islands
+				
+			
+			
+				
+					Oras sa Colombia
+					Tamdanang Oras sa Colombia
+					Oras sa Tag-init sa Colombia
+				
+			
+			
+				
+					Oras sa Cook Islands
+					Tamdanang Oras sa Cook Islands
+					Katungang Oras sa Tag-init sa Cook Islands
+				
+			
+			
+				
+					Oras sa Cuba
+					Tamdanang Oras sa Cuba
+					Oras sa Adlawan sa Cuba
+				
+			
+			
+				
+					Oras sa Davis
+				
+			
+			
+				
+					Oras sa Dumont-d’Urville
+				
+			
+			
+				
+					Oras sa East Timor
+				
+			
+			
+				
+					Oras sa Easter Island
+					Tamdanang Oras sa Easter Island
+					Oras sa Tag-init sa Easter Island
+				
+			
+			
+				
+					Oras sa Ecuador
+				
+			
 			
 				
 					Oras sa Europa sa Taliwala sa Adlaw
@@ -564,6 +1458,11 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					Oras sa Taga-Oryente sa Europa sa Tag-int
 				
 			
+			
+				
+					Oras sa Further-eastern Europe
+				
+			
 			
 				
 					Oras sa Kasadpanon sa Europa
@@ -571,11 +1470,579 @@ the LDML specification (http://unicode.org/reports/tr35/)
 					Oras sa Kasadpanon sa Europa sa Tag-init
 				
 			
+			
+				
+					Oras sa Falkland Islands
+					Tamdanang Oras sa Falkland Islands
+					Oras sa Tag-init sa Falkland Islands
+				
+			
+			
+				
+					Oras sa Fiji
+					Tamdanang Oras sa Fiji
+					Oras sa Tag-init sa Fiji
+				
+			
+			
+				
+					Oras sa French Guiana
+				
+			
+			
+				
+					Oras sa French Southern ug Antarctic
+				
+			
+			
+				
+					Oras sa Galapagos
+				
+			
+			
+				
+					Oras sa Gambier
+				
+			
+			
+				
+					Oras sa Georgia
+					Tamdanang Oras sa Georgia
+					Oras sa Tag-init sa Georgia
+				
+			
+			
+				
+					Oras sa Gilbert Islands
+				
+			
 			
 				
 					Kasarangang Oras sa Greenwich
 				
 			
+			
+				
+					Oras sa East Greenland
+					Tamdanang Oras sa East Greenland
+					Oras sa Tag-init sa East Greenland
+				
+			
+			
+				
+					Oras sa West Greenland
+					Tamdanang Oras sa West Greenland
+					Oras sa Tag-init sa West Greenland
+				
+			
+			
+				
+					Tamdanang Oras sa Gulf
+				
+			
+			
+				
+					Oras sa Guyana
+				
+			
+			
+				
+					Oras sa Hawaii-Aleutian
+					Tamdanang Oras sa Hawaii-Aleutian
+					Oras sa Adlawan sa Hawaii-Aleutian
+				
+			
+			
+				
+					Oras sa Hong Kong
+					Tamdanang Oras sa Hong Kong
+					Oras sa Tag-init sa Hong Kong
+				
+			
+			
+				
+					Oras sa Hovd
+					Tamdanang Oras sa Hovd
+					Oras sa Tag-init sa Hovd
+				
+			
+			
+				
+					Tamdanang Oras sa India
+				
+			
+			
+				
+					Oras sa Indian Ocean
+				
+			
+			
+				
+					Oras sa Indochina
+				
+			
+			
+				
+					Oras sa Central Indonesia
+				
+			
+			
+				
+					Oras sa Eastern Indonesia
+				
+			
+			
+				
+					Oras sa Western Indonesia
+				
+			
+			
+				
+					Oras sa Iran
+					Tamdanang Oras sa Iran
+					Oras sa Adlawan sa Iran
+				
+			
+			
+				
+					Oras sa Irkutsk
+					Tamdanang Oras sa Irkutsk
+					Oras sa Tag-init sa Irkutsk
+				
+			
+			
+				
+					Oras sa Israel
+					Tamdanang Oras sa Israel
+					Oras sa Adlawan sa Israel
+				
+			
+			
+				
+					Oras sa Japan
+					Tamdanang Oras sa Japan
+					Oras sa Adlawan sa Japan
+				
+			
+			
+				
+					Oras sa East Kazakhstan
+				
+			
+			
+				
+					Oras sa West Kazakhstan
+				
+			
+			
+				
+					Oras sa Korea
+					Tamdanang Oras sa Korea
+					Oras sa Adlawan sa Korea
+				
+			
+			
+				
+					Oras sa Kosrae
+				
+			
+			
+				
+					Oras sa Krasnoyarsk
+					Tamdanang Oras sa Krasnoyarsk
+					Oras sa Tag-init sa Krasnoyarsk
+				
+			
+			
+				
+					Oras sa Kyrgyzstan
+				
+			
+			
+				
+					Oras sa Line Islands
+				
+			
+			
+				
+					Oras sa Lord Howe
+					Tamdanang Oras sa Lord Howe
+					Oras sa Adlawan sa Lord Howe
+				
+			
+			
+				
+					Oras sa Macquarie Island
+				
+			
+			
+				
+					Oras sa Magadan
+					Tamdanang Oras sa Magadan
+					Oras sa Tag-init sa Magadan
+				
+			
+			
+				
+					Oras sa Malaysia
+				
+			
+			
+				
+					Oras sa Maldives
+				
+			
+			
+				
+					Oras sa Marquesas
+				
+			
+			
+				
+					Oras sa Marshall Islands
+				
+			
+			
+				
+					Oras sa Mauritius
+					Tamdanang Oras sa Mauritius
+					Oras sa Tag-init sa Mauritius
+				
+			
+			
+				
+					Oras sa Mawson
+				
+			
+			
+				
+					Oras sa Northwest Mexico
+					Tamdanang Oras sa Northwest Mexico
+					Oras sa Adlawan sa Northwest Mexico
+				
+			
+			
+				
+					Oras sa Mexican Pacific
+					Tamdanang Oras sa Mexican Pacific
+					Oras sa Adlawan sa Mexican Pacific
+				
+			
+			
+				
+					Oras sa Ulaanbaatar
+					Tamdanang Oras sa Ulaanbaatar
+					Oras sa Tag-init sa Ulaanbaatar
+				
+			
+			
+				
+					Oras sa Moscow
+					Tamdanang Oras sa Moscow
+					Oras sa Tag-init sa Moscow
+				
+			
+			
+				
+					Oras sa Myanmar
+				
+			
+			
+				
+					Oras sa Nauru
+				
+			
+			
+				
+					Oras sa Nepal
+				
+			
+			
+				
+					Oras sa New Caledonia
+					Tamdanang Oras sa New Caledonia
+					Oras sa Tag-init sa New Caledonia
+				
+			
+			
+				
+					Oras sa New Zealand
+					Tamdanang Oras sa New Zealand
+					Oras sa Adlawan sa New Zealand
+				
+			
+			
+				
+					Oras sa Newfoundland
+					Tamdanang Oras sa Newfoundland
+					Oras sa Adlawan sa Newfoundland
+				
+			
+			
+				
+					Oras sa Niue
+				
+			
+			
+				
+					Oras sa Norfolk Island
+				
+			
+			
+				
+					Oras sa Fernando de Noronha
+					Tamdanang Oras sa Fernando de Noronha
+					Oras sa Tag-init sa Fernando de Noronha
+				
+			
+			
+				
+					Oras sa Novosibirsk
+					Tamdanang Oras sa Novosibirsk
+					Oras sa Tag-init sa Novosibirsk
+				
+			
+			
+				
+					Oras sa Omsk
+					Tamdanang Oras sa Omsk
+					Oras sa Tag-init sa Omsk
+				
+			
+			
+				
+					Oras sa Pakistan
+					Tamdanang Oras sa Pakistan
+					Oras sa Tag-init sa Pakistan
+				
+			
+			
+				
+					Oras sa Palau
+				
+			
+			
+				
+					Oras sa Papua New Guinea
+				
+			
+			
+				
+					Oras sa Paraguay
+					Tamdanang Oras sa Paraguay
+					Oras sa Tag-init sa Paraguay
+				
+			
+			
+				
+					Oras sa Peru
+					Tamdanang Oras sa Peru
+					Oras sa Tag-init sa Peru
+				
+			
+			
+				
+					Oras sa Pilipinas
+					Tamdanang Oras sa Pilipinas
+					Oras sa Tag-init sa Pilipinas
+				
+			
+			
+				
+					Oras sa Phoenix Islands
+				
+			
+			
+				
+					Oras sa St. Pierre & Miquelon
+					Tamdanang Oras sa St. Pierre & Miquelon
+					Oras sa Adlawan sa St. Pierre & Miquelon
+				
+			
+			
+				
+					Oras sa Pitcairn
+				
+			
+			
+				
+					Oras sa Ponape
+				
+			
+			
+				
+					Oras sa Pyongyang
+				
+			
+			
+				
+					Oras sa Reunion
+				
+			
+			
+				
+					Oras sa Rothera
+				
+			
+			
+				
+					Oras sa Sakhalin
+					Tamdanang Oras sa Sakhalin
+					Oras sa Tag-init sa Sakhalin
+				
+			
+			
+				
+					Oras sa Samoa
+					Tamdanang Oras sa Samoa
+					Oras sa Adlawan sa Samoa
+				
+			
+			
+				
+					Oras sa Seychelles
+				
+			
+			
+				
+					Tamdanang Oras sa Singapore
+				
+			
+			
+				
+					Oras sa Solomon Islands
+				
+			
+			
+				
+					Oras sa South Georgia
+				
+			
+			
+				
+					Oras sa Suriname
+				
+			
+			
+				
+					Oras sa Syowa
+				
+			
+			
+				
+					Oras sa Tahiti
+				
+			
+			
+				
+					Oras sa Taipei
+					Tamdanang Oras sa Taipei
+					Oras sa Adlawan sa Taipei
+				
+			
+			
+				
+					Oras sa Tajikistan
+				
+			
+			
+				
+					Oras sa Tokelau
+				
+			
+			
+				
+					Oras sa Tonga
+					Tamdanang Oras sa Tonga
+					Oras sa Tag-init sa Tonga
+				
+			
+			
+				
+					Oras sa Chuuk
+				
+			
+			
+				
+					Oras sa Turkmenistan
+					Tamdanang Oras sa Turkmenistan
+					Oras sa Tag-init sa Turkmenistan
+				
+			
+			
+				
+					Oras sa Tuvalu
+				
+			
+			
+				
+					Oras sa Uruguay
+					Tamdanang Oras sa Uruguay
+					Oras sa Tag-init sa Uruguay
+				
+			
+			
+				
+					Oras sa Uzbekistan
+					Tamdanang Oras sa Uzbekistan
+					Oras sa Tag-init sa Uzbekistan
+				
+			
+			
+				
+					Oras sa Vanuatu
+					Tamdanang Oras sa Vanuatu
+					Oras sa Tag-init sa Vanuatu
+				
+			
+			
+				
+					Oras sa Venezuela
+				
+			
+			
+				
+					Oras sa Vladivostok
+					Tamdanang Oras sa Vladivostok
+					Oras sa Tag-init sa Vladivostok
+				
+			
+			
+				
+					Oras sa Volgograd
+					Tamdanang Oras sa Volgograd
+					Oras sa Tag-init sa Volgograd
+				
+			
+			
+				
+					Oras sa Vostok
+				
+			
+			
+				
+					Oras sa Wake Island
+				
+			
+			
+				
+					Oras sa Wallis & Futuna
+				
+			
+			
+				
+					Oras sa Yakutsk
+					Tamdanang Oras sa Yakutsk
+					Oras sa Tag-init sa Yakutsk
+				
+			
+			
+				
+					Oras sa Yekaterinburg
+					Tamdanang Oras sa Yekaterinburg
+					Oras sa Tag-init sa Yekaterinburg
+				
+			
 		
 	
 	
@@ -612,70 +2079,2135 @@ the LDML specification (http://unicode.org/reports/tr35/)
 				
 					¤#,##0.00
 				
+				
+					¤#,##0.00;(¤#,##0.00)
+				
 			
 			{1} {0}
 			{1} {0}
 		
 		
+			
+				United Arab Emirates Dirham
+				UAE dirham
+				Mga UAE dirham
+			
+			
+				Afghan Afghani
+				Afghan Afghani
+				Mga Afghan Afghani
+			
+			
+				Albanian Lek
+				Albanian lek
+				Albanian leke
+			
+			
+				Armenian Dram
+				Armenian dram
+				Mga Armenian dram
+			
+			
+				Netherlands Antillean Guilder
+				Netherlands Antillean guilder
+				Mga Netherlands Antillean guilder
+			
+			
+				Angolan Kwanza
+				Angolan kwanza
+				Mga Angolan kwanza
+			
+			
+				Argentine Peso
+				Argentine peso
+				Mga Argentine peso
+			
+			
+				Australian Dollar
+				Australian dollar
+				Mga Australian dollar
+			
+			
+				Aruban Florin
+				Aruban florin
+				Aruban florin
+			
+			
+				Azerbaijani Manat
+				Azerbaijani manat
+				Mga Azerbaijani manat
+			
+			
+				Bosnia-Herzegovina Convertible Mark
+				Bosnia-Herzegovina convertible mark
+				Mga Bosnia-Herzegovina convertible mark
+			
+			
+				Barbadian Dollar
+				Barbadian dollar
+				Mga Barbadian dollar
+			
+			
+				Bangladeshi Taka
+				Bangladeshi taka
+				Mga Bangladeshi taka
+			
+			
+				Bulgarian Lev
+				Bulgarian lev
+				Bulgarian leva
+			
+			
+				Bahraini Dinar
+				Bahraini dinar
+				Mga Bahraini dinar
+			
+			
+				Burundian Franc
+				Burundian franc
+				Mga Burundian franc
+			
+			
+				Bermudan Dollar
+				Bermudan dollar
+				Mga Bermudan dollar
+			
+			
+				Brunei Dollar
+				Brunei dollar
+				Mga Brunei dollar
+			
+			
+				Bolivian Boliviano
+				Bolivian boliviano
+				Mga Bolivian boliviano
+			
 			
-				BRL
-				BRL
-				BRL
-				R$
-				R$
+				Brazilian Real
+				Brazilian real
+				Brazilian reals
+			
+			
+				Bahamian Dollar
+				Bahamian dollar
+				Mga Bahamian dollar
+			
+			
+				Bhutanese Ngultrum
+				Bhutanese ngultrum
+				Mga Bhutanese ngultrum
+			
+			
+				Botswanan Pula
+				Botswanan pula
+				Mga Botswanan pula
+			
+			
+				Belarusian Ruble
+				Belarusian ruble
+				Mga Belarusian ruble
+			
+			
+				Belize Dollar
+				Belize dollar
+				Mga Belize dollar
+			
+			
+				Canadian Dollar
+				Canadian dollar
+				Mga Canadian dollar
+			
+			
+				Congolese Franc
+				Congolese franc
+				Mga Congolese franc
+			
+			
+				Swiss Franc
+				Swiss franc
+				Swiss francs
+			
+			
+				Chilean Peso
+				Chilean peso
+				Mga Chilean peso
+			
+			
+				Chinese Yuan (layo sa baybayon)
+				Chinese yuan (layo sa baybayon)
+				Chinese yuan (layo sa baybayon)
 			
 			
 				Intsik nga Yuan
 				Intsik ng yuan
 				Intsik ng yuan
 			
+			
+				Colombian Peso
+				Colombian peso
+				Mga Colombian peso
+			
+			
+				Costa Rican Colon
+				Costa Rican colon
+				Mga Costa Rican colon
+			
+			
+				Cuban Convertible Peso
+				Cuban convertible peso
+				Mga Cuban convertible peso
+			
+			
+				Cuban Peso
+				Cuban peso
+				Mga Cuban peso
+			
+			
+				Cape Verdean Escudo
+				Cape Verdean escudo
+				Mga Cape Verdean escudo
+			
+			
+				Czech Koruna
+				Czech koruna
+				Mga Czech koruna
+			
+			
+				Djiboutian Franc
+				Djiboutian franc
+				Mga Djiboutian franc
+			
+			
+				Danish Krone
+				Danish krone
+				Danish kroner
+			
+			
+				Dominican Peso
+				Dominican peso
+				Mga Dominican peso
+			
+			
+				Algerian Dinar
+				Algerian dinar
+				Mga Algerian dinar
+			
+			
+				Egyptian Pound
+				Egyptian pound
+				Mga Egyptian pound
+			
+			
+				Eritrean Nakfa
+				Eritrean nakfa
+				Mga Eritrean nakfa
+			
+			
+				Ethiopian Birr
+				Ethiopian birr
+				Mga Ethiopian birr
+			
 			
 				Euro
 				euro
 				mga euro
-				€
-				€
+			
+			
+				Fijian Dollar
+				Fijian dollar
+				Mga Fijian dollar
+			
+			
+				Falkland Islands Pound
+				Falkland Islands pound
+				Mga Falkland Islands pound
 			
 			
 				Inglatera nga Libra
 				Inglatera nga libra
 				Inglatera nga libra
 			
+			
+				Georgian Lari
+				Georgian lari
+				Mga Georgian lari
+			
+			
+				Ghanaian Cedi
+				Ghanaian cedi
+				Mga Ghanaian cedi
+			
+			
+				Gibraltar Pound
+				Gibraltar pound
+				Mga Gibraltar pound
+			
+			
+				Gambian Dalasi
+				Gambian dalasi
+				Mga Gambian dalasi
+			
+			
+				Guinean Franc
+				Guinean franc
+				Mga Guinean franc
+			
+			
+				Guatemalan Quetzal
+				Guatemalan quetzal
+				Mga Guatemalan quetzal
+			
+			
+				Guyanaese Dollar
+				Guyanaese dollar
+				Mga Guyanaese dollar
+			
+			
+				Hong Kong Dollar
+				Hong Kong dollar
+				Mga Hong Kong dollar
+			
+			
+				Honduran Lempira
+				Honduran lempira
+				Mga Honduran lempira
+			
+			
+				Croatian Kuna
+				Croatian kuna
+				Mga Croatian kuna
+			
+			
+				Haitian Gourde
+				Haitian gourde
+				Mga Haitian gourde
+			
+			
+				Hungarian Forint
+				Hungarian forint
+				Mga Hungarian forint
+			
+			
+				Indonesian Rupiah
+				Indonesian rupiah
+				Mga Indonesian rupiah
+			
+			
+				Israeli New Shekel
+				Israeli new shekel
+				Mga Israeli new shekel
+			
 			
 				Rupee sa India
 				rupee sa India
 				Mga rupee sa India
-				₹
-				₹
+			
+			
+				Iraqi Dinar
+				Iraqi dinar
+				Mga Iraqi dinar
+			
+			
+				Iranian Rial
+				Iranian rial
+				Mga Iranian rial
+			
+			
+				Icelandic Krona
+				Icelandic krona
+				Icelandic kronur
+			
+			
+				Jamaican Dollar
+				Jamaican dollar
+				Mga Jamaican dollar
+			
+			
+				Jordanian Dinar
+				Jordanian dinar
+				Mga Jordanian dinar
 			
 			
 				Hapon nga Yen
 				Hapon nga yen
 				Hapon nga yen
 			
+			
+				Kenyan Shilling
+				Kenyan shilling
+				Mga Kenyan shilling
+			
+			
+				Kyrgystani Som
+				Kyrgystani som
+				Mga Kyrgystani som
+			
+			
+				Cambodian Riel
+				Cambodian riel
+				Mga Cambodian riel
+			
+			
+				Comorian Franc
+				Comorian franc
+				Mga Comorian franc
+			
+			
+				North Korean Won
+				North Korean won
+				North Korean won
+			
+			
+				South Korean Won
+				South Korean won
+				South Korean won
+			
+			
+				Kuwaiti Dinar
+				Kuwaiti dinar
+				Mga Kuwaiti dinar
+			
+			
+				Cayman Islands Dollar
+				Cayman Islands dollar
+				Mga Cayman Islands dollar
+			
+			
+				Kazakhstani Tenge
+				Kazakhstani tenge
+				Mga Kazakhstani tenge
+			
+			
+				Laotian Kip
+				Laotian kip
+				Mga Laotian kip
+			
+			
+				Lebanese Pound
+				Lebanese pound
+				Mga Lebanese pound
+			
+			
+				Sri Lankan Rupee
+				Sri Lankan rupee
+				Mga Sri Lankan rupee
+			
+			
+				Liberian Dollar
+				Liberian dollar
+				Mga Liberian dollar
+			
+			
+				Libyan Dinar
+				Libyan dinar
+				Mga Libyan dinar
+			
+			
+				Moroccan Dirham
+				Moroccan dirham
+				Mga Moroccan dirham
+			
+			
+				Moldovan Leu
+				Moldovan leu
+				Moldovan lei
+			
+			
+				Malagasy Ariary
+				Malagasy ariary
+				Mga Malagasy ariary
+			
+			
+				Macedonian Denar
+				Macedonian denar
+				Macedonian denari
+			
+			
+				Myanmar Kyat
+				Myanmar kyat
+				Mga Myanmar kyat
+			
+			
+				Mongolian Tugrik
+				Mongolian tugrik
+				Mga Mongolian tugrik
+			
+			
+				Macanese Pataca
+				Macanese pataca
+				Mga Macanese pataca
+			
+			
+				Mauritanian Ouguiya
+				Mauritanian ouguiya
+				Mga Mauritanian ouguiya
+			
+			
+				Mauritian Rupee
+				Mauritian rupee
+				Mga Mauritian rupee
+			
+			
+				Maldivian Rufiyaa
+				Maldivian rufiyaa
+				Mga Maldivian rufiyaa
+			
+			
+				Malawian Kwacha
+				Malawian kwacha
+				Mga Malawian kwacha
+			
+			
+				Mexican Peso
+				Mexican peso
+				Mga Mexican peso
+			
+			
+				Malaysian Ringgit
+				Mga Malaysian ringgit
+				Mga Malaysian ringgit
+			
+			
+				Mozambican Metical
+				Mozambican metical
+				Mga Mozambican metical
+			
+			
+				Namibian Dollar
+				Namibian dollar
+				Mga Namibian dollar
+			
+			
+				Nigerian Naira
+				Nigerian naira
+				Mga Nigerian naira
+			
+			
+				Nicaraguan Cordoba
+				Nicaraguan cordoba
+				Mga Nicaraguan cordoba
+			
+			
+				Norwegian Krone
+				Norwegian krone
+				Norwegian kroner
+			
+			
+				Nepalese Rupee
+				Nepalese rupee
+				Mga Nepalese rupee
+			
+			
+				New Zealand Dollar
+				New Zealand dollar
+				Mga New Zealand dollar
+			
+			
+				Omani Rial
+				Omani rial
+				Mga Omani rial
+			
+			
+				Panamanian Balboa
+				Panamanian balboa
+				Mga Panamanian balboa
+			
+			
+				Peruvian Sol
+				Peruvian sol
+				Mga Peruvian sole
+			
+			
+				Papua New Guinean Kina
+				Papua New Guinean kina
+				Papua New Guinean kina
+			
 			
+				Philippine Piso
+				Philippine piso
+				Mga Philippine piso
 				₱
 			
+			
+				Pakistani Rupee
+				Pakistani rupee
+				Mga Pakistani rupee
+			
+			
+				Polish Zloty
+				Polish zloty
+				Mga Polish zloty
+			
+			
+				Paraguayan Guarani
+				Paraguayan guarani
+				Mga Paraguayan guarani
+			
+			
+				Qatari Rial
+				Qatari rial
+				Mga Qatari rial
+			
+			
+				Romanian Leu
+				Romanian leu
+				Romanian lei
+			
+			
+				Serbian Dinar
+				Serbian dinar
+				Mga Serbian dinar
+			
 			
 				Rusong ruble
 				Rusong ruble
 				Rusong ruble
 			
+			
+				Rwandan Franc
+				Rwandan franc
+				Mga Rwandan franc
+			
+			
+				Saudi Riyal
+				Saudi riyal
+				Mga Saudi riyal
+			
+			
+				Solomon Islands Dollar
+				Solomon Islands dollar
+				Mga Solomon Islands dollar
+			
+			
+				Seychellois Rupee
+				Seychellois rupee
+				Mga Seychellois rupee
+			
+			
+				Sudanese Pound
+				Sudanese pound
+				Mga Sudanese pound
+			
+			
+				Swedish Krona
+				Swedish krona
+				Swedish kronor
+			
+			
+				Singapore Dollar
+				Singapore dollar
+				Mga Singapore dollar
+			
+			
+				St. Helena Pound
+				St. Helena pound
+				Mga St. Helena pound
+			
+			
+				Sierra Leonean Leone
+				Sierra Leonean leone
+				Mga Sierra Leonean leone
+			
+			
+				Somali Shilling
+				Somali shilling
+				Mga Somali shilling
+			
+			
+				Surinamese Dollar
+				Surinamese dollar
+				Mga Surinamese dollar
+			
+			
+				South Sudanese Pound
+				South Sudanese pound
+				Mga South Sudanese pound
+			
+			
+				Sao Tome & Principe Dobra
+				Sao Tome & Principe dobra
+				Mga Sao Tome & Principe dobra
+			
+			
+				Syrian Pound
+				Syrian pound
+				Mga Syrian pound
+			
+			
+				Swazi Lilangeni
+				Swazi lilangeni
+				Swazi emalangeni
+			
+			
+				Thai Baht
+				Thai baht
+				Thai baht
+			
+			
+				Tajikistani Somoni
+				Tajikistani somoni
+				Mga Tajikistani somoni
+			
+			
+				Turkmenistani Manat
+				Turkmenistani manat
+				Turkmenistani manat
+			
+			
+				Tunisian Dinar
+				Tunisian dinar
+				Mga Tunisian dinar
+			
+			
+				Tongan Paʻanga
+				Tongan paʻanga
+				Tongan paʻanga
+			
+			
+				Turkish Lira
+				Turkish lira
+				Turkish Lira
+			
+			
+				Trinidad & Tobago Dollar
+				Trinidad & Tobago dollar
+				Mga Trinidad & Tobago dollar
+			
+			
+				New Taiwan Dollar
+				New Taiwan dollar
+				Mga New Taiwan dollar
+			
+			
+				Tanzanian Shilling
+				Tanzanian shilling
+				Mga Tanzanian shilling
+			
+			
+				Ukrainian Hryvnia
+				Ukrainian hryvnia
+				Mga Ukrainian hryvnia
+			
+			
+				Ugandan Shilling
+				Ugandan shilling
+				Mga Ugandan shilling
+			
 			
 				Dolyar sa US
 				dolyar sa US
 				dolyares sa US
 				US $
-				$
+			
+			
+				Uruguayan Peso
+				Uruguayan peso
+				Mga Uruguayan peso
+			
+			
+				Uzbekistani Som
+				Uzbekistani som
+				Uzbekistani som
+			
+			
+				Venezuelan Bolivar
+				Venezuelan bolivar
+				Mga Venezuelan bolivar
+			
+			
+				Vietnamese Dong
+				Vietnamese dong
+				Vietnamese dong
+			
+			
+				Vanuatu Vatu
+				Vanuatu vatu
+				Mga Vanuatu vatu
+			
+			
+				Samoan Tala
+				Samoan tala
+				Samoan tala
+			
+			
+				Central African CFA Franc
+				Central African CFA franc
+				Mga Central African CFA franc
+			
+			
+				East Caribbean Dollar
+				East Caribbean dollar
+				Mga East Caribbean dollar
+			
+			
+				West African CFA Franc
+				West African CFA franc
+				Mga West African CFA franc
+			
+			
+				CFP Franc
+				CFP franc
+				Mga CFP franc
 			
 			
-				XXX
-				XXX
-				XXX
+				Wala Nahibaluan nga Currency
+				(wala nahibaluan nga yunit sa currency)
+				(wala nahibaluan nga currency)
+			
+			
+				Yemeni Rial
+				Yemeni rial
+				Mga Yemeni rial
+			
+			
+				South African Rand
+				South African rand
+				South African rand
+			
+			
+				Zambian Kwacha
+				Zambian kwacha
+				Mga Zambian kwacha
 			
 		
+		
+			{0}+
+		
+		
+			{0} ka adlaw
+			{0} ka mga adlaw
+			Adto sa ika-{0} nga tuo.
+		
 	
 	
+		
+			
+				{0} kada {1}
+			
+			
+				{0} g-force
+				{0} g-force
+			
+			
+				mga metro kada second squared
+				{0} ka metro kada second squared
+				{0} ka mga metro kada second squared
+			
+			
+				rebolusyon
+				{0} ka rebolusyon
+				{0} ka mga rebolusyon
+			
+			
+				mga radian
+				{0} ka radian
+				{0} ka mga radian
+			
+			
+				mga degree
+				{0} ka degree
+				{0} ka mga degree
+			
+			
+				mga arcminute
+				{0} ka arcminute
+				{0} ka mga arcminute
+			
+			
+				mga arcsecond
+				{0} ka arcsecond
+				{0} ka mga arcsecond
+			
+			
+				mga square kilometer
+				{0} ka square kilometer
+				{0} ka mga square kilometer
+				{0} kada square kilometer
+			
+			
+				mga ektarya
+				{0} ka ektarya
+				{0} ka mga ektarya
+			
+			
+				mga square meter
+				{0} ka square meter
+				{0} ka mga square meter
+				{0} kada square meter
+			
+			
+				mga square centimeter
+				{0} ka square centimeter
+				{0} ka mga square centimeter
+				{0} kada square centimeter
+			
+			
+				mga square mile
+				{0} ka square mile
+				{0} ka mga square mile
+				{0} kada square mile
+			
+			
+				mga acre
+				{0} ka acre
+				{0} ka mga acre
+			
+			
+				mga square yard
+				{0} ka square yard
+				{0} ka mga square yard
+			
+			
+				mga square foot
+				{0} ka square foot
+				{0} ka mga square foot
+			
+			
+				mga square inch
+				{0} ka mga square inch
+				{0} ka square inch
+				{0} kada square inch
+			
+			
+				mga dunam
+				{0} ka dunam
+				{0} ka mga dunam
+			
+			
+				mga karat
+				{0} ka karat
+				{0} ka mga karat
+			
+			
+				mga milligram kada deciliter
+				{0} ka milligram kada deciliter
+				{0} ka mga milligram kada deciliter
+			
+			
+				mga millimole kada litro
+				{0} ka millimole kada litro
+				{0} ka mga millimole kada litro
+			
+			
+				mga part per million
+				{0} ka part per million
+				{0} ka mga part per million
+			
+			
+				porsyento
+				{0} ka porsyento
+				{0} ka porsyento
+			
+			
+				permille
+				{0} ka permille
+				{0} ka permille
+			
+			
+				permyriad
+				{0} ka permyriad
+				{0} ka permyriad
+			
+			
+				mga mole
+				{0} ka mole
+				{0} ka mga mole
+			
+			
+				mga litro kada kilometro
+				{0} litro kada kilometro
+				{0} ka mga litro kada kilometro
+			
+			
+				mga litro kada 100 kilometro
+				{0} ka litro kada 100 kilometro
+				{0} ka litro kada 100 kilometro
+			
+			
+				mga milya kada gallon
+				{0} ka milya kada gallon
+				{0} ka mga milya kada gallon
+			
+			
+				mga milya kada Imp. gallon
+				{0} ka milya kada Imp. gallon
+				{0} ka mga milya kada Imp. gallon
+			
+			
+				mga petabyte
+				{0} ka petabyte
+				{0} ka mga petabyte
+			
+			
+				mga terabyte
+				{0} ka terabyte
+				{0} ka mga terabyte
+			
+			
+				mga terabit
+				{0} ka terabit
+				{0} ka mga terabit
+			
+			
+				mga gigabyte
+				{0} ka gigabyte
+				{0} ka mga gigabyte
+			
+			
+				mga gigabit
+				{0} ka gigabit
+				{0} ka mga gigabit
+			
+			
+				mga megabyte
+				{0} ka megabyte
+				{0} ka mga megabyte
+			
+			
+				mga megabit
+				{0} ka megabit
+				{0} ka mga megabit
+			
+			
+				mga kilobyte
+				{0} ka kilobyte
+				{0} ka mga kilobyte
+			
+			
+				mga kilobit
+				{0} ka kilobit
+				{0} ka mga kilobit
+			
+			
+				mga byte
+				{0} ka byte
+				{0} ka mga byte
+			
+			
+				mga bit
+				{0} ka bit
+				{0} ka mga bit
+			
+			
+				mga siglo
+				{0} ka siglo
+				{0} ka mga siglo
+			
+			
+				mga dekada
+				{0} ka dekada
+				{0} ka mga dekada
+			
+			
+				mga tuig
+				{0} ka tuig
+				{0} ka mga tuig
+				{0} kada tuig
+			
+			
+				mga buwan
+				{0} ka buwan
+				{0} ka mga buwan
+				{0} kada buwan
+			
+			
+				mga semana
+				{0} ka semana
+				{0} ka mga semana
+				{0} kada semana
+			
+			
+				mga adlaw
+				{0} ka adlaw
+				{0} ka mga adlaw
+				{0} kada adlaw
+			
+			
+				mga oras
+				{0} ka oras
+				{0} ka mga oras
+				{0} kada oras
+			
+			
+				mga minuto
+				{0} ka minuto
+				{0} ka mga minuto
+				{0} kada minuto
+			
+			
+				mga segundo
+				{0} ka segundo
+				{0} ka mga segundo
+				{0} kada segundo
+			
+			
+				mga millisecond
+				{0} ka millisecond
+				{0} ka mga millisecond
+			
+			
+				mga microsecond
+				{0} ka microsecond
+				{0} ka mga microsecond
+			
+			
+				mga nanosecond
+				{0} ka nanosecond
+				{0} ka mga nanosecond
+			
+			
+				mga ampere
+				{0} ka ampere
+				{0} ka mga ampere
+			
+			
+				mga milliampere
+				{0} milliampere
+				{0} ka mga milliampere
+			
+			
+				mga ohm
+				{0} ka ohm
+				{0} ka mga ohm
+			
+			
+				mga boltahe
+				{0} ka boltahe
+				{0} ka mga boltahe
+			
+			
+				mga kilocalorie
+				{0} ka kilocalorie
+				{0} ka mga kilocalorie
+			
+			
+				mga calorie
+				{0} ka calorie
+				{0} ka mga calorie
+			
+			
+				mga Calorie
+				{0} ka Calorie
+				{0} ka mga Calorie
+			
+			
+				mga kilojoule
+				{0} ka kilojoule
+				{0} ka mga kilojoule
+			
+			
+				mga joule
+				{0} ka joule
+				{0} ka mga joule
+			
+			
+				mga kilowatt-hour
+				{0} ka kilowatt hour
+				{0} ka mga kilowatt-hour
+			
+			
+				mga electronvolt
+				{0} ka electronvolt
+				{0} ka mga electronvolt
+			
+			
+				Mga British thermal unit
+				{0} ka British thermal unit
+				{0} ka mga British thermal unit
+			
+			
+				Mga US therm
+				{0} ka US therm
+				{0} ka mga US therm
+			
+			
+				mga pound sa puwersa
+				{0} ka pound sa puwersa
+				{0} ka mga pound sa puwersa
+			
+			
+				mga newton
+				{0} ka newton
+				{0} ka mga newton
+			
+			
+				gigahertz
+				{0} gigahertz
+				{0} gigahertz
+			
+			
+				megahertz
+				{0} megahertz
+				{0} megahertz
+			
+			
+				kilohertz
+				{0} kilohertz
+				{0} kilohertz
+			
+			
+				hertz
+				{0} hertz
+				{0} hertz
+			
+			
+				typographic em
+				{0} ka em
+				{0} ka mga em
+			
+			
+				mga pixel
+				{0} ka pixel
+				{0} ka mga pixel
+			
+			
+				mga megapixel
+				{0} ka megapixel
+				{0} ka mga megapixel
+			
+			
+				mga pixel kada sentimetro
+				{0} ka pixel kada sentimetro
+				{0} ka mga pixel kada sentimetro
+			
+			
+				mga pixel kada pulgada
+				{0} ka pixel kada pulgada
+				{0} ka mga pixel kada pulgada
+			
+			
+				mga dot kada sentimetro
+				{0} ka dot kada sentimetro
+				{0} ka mga dot kada sentimetro
+			
+			
+				mga dot kada pulgada
+				{0} ka dot kada pulgada
+				{0} ka mga dot kada pulgada
+			
+			
+				mga kilometro
+				{0} ka kilometro
+				{0} ka mga kilometro
+				{0} kada kilometro
+			
+			
+				mga metro
+				{0} ka metro
+				{0} ka mga metro
+				{0} kada metro
+			
+			
+				mga decimeter
+				{0} ka decimeter
+				{0} ka mga decimeter
+			
+			
+				mga sentimetro
+				{0} ka sentimetro
+				{0} ka mga sentimetro
+				{0} kada sentimetro
+			
+			
+				mga millimetro
+				{0} ka millimetro
+				{0} ka millimetro
+			
+			
+				mga micrometer
+				{0} ka micrometer
+				{0} ka mga micrometer
+			
+			
+				mga nanometer
+				{0} ka nanometer
+				{0} ka mga nanometer
+			
+			
+				mga picometer
+				{0} ka picometer
+				{0} ka mga picometer
+			
+			
+				mga milya
+				{0} ka milya
+				{0} ka mga milya
+			
+			
+				mga yarda
+				{0} ka yarda
+				{0} ka mga yarda
+			
+			
+				mga piye
+				{0} ka piye
+				{0} ka mga piye
+				{0} kada piye
+			
+			
+				mga pulgada
+				{0} ka pulgada
+				{0} ka pulgada
+				{0} kada pulgada
+			
+			
+				mga parsec
+				{0} ka parsec
+				{0} ka mga parsec
+			
+			
+				mga light year
+				{0} ka light year
+				{0} ka mga light year
+			
+			
+				mga astronomical unit
+				{0} ka astronomical unit
+				{0} ka mga astronomical unit
+			
+			
+				mga nautical mile
+				{0} ka nautical mile
+				{0} ka mga nautical mile
+			
+			
+				mile-scandinavian
+				{0} ka mile-scandinavian
+				{0} ka mile-scandinavian
+			
+			
+				mga point
+				{0} ka point
+				{0} ka mga point
+			
+			
+				mga solar radius
+				{0} ka solar radius
+				{0} ka mga solar radius
+			
+			
+				lux
+				{0} lux
+				{0} lux
+			
+			
+				mga solar luminosity
+				{0} ka solar luminosity
+				{0}ka mga solar luminosity
+			
+			
+				mga metrikong tonelada
+				{0} ka metrikong tonelada
+				{0} ka mga metrikong tonelada
+			
+			
+				mga kilogramo
+				{0} ka kilogramo
+				{0} ka mga kilogramo
+				{0} kada kilogramo
+			
+			
+				mga gramo
+				{0} ka gramo
+				{0} ka mga gramo
+				{0} kada gramo
+			
+			
+				mga milligram
+				{0} ka milligram
+				{0} ka mga milligram
+			
+			
+				mga microgram
+				{0} ka microgram
+				{0} ka mga microgram
+			
+			
+				mga tonelada
+				{0} ka tonelada
+				{0} ka mga tonelada
+			
+			
+				mga pound
+				{0} ka pound
+				{0} ka mga pound
+				{0} kada pound
+			
+			
+				mga ounce
+				{0} ka ounce
+				{0} ka mga ounce
+				{0} kada ounce
+			
+			
+				mga troy ounce
+				{0} ka troy ounce
+				{0} ka mga troy ounce
+			
+			
+				mga carat
+				{0} ka carat
+				{0} ka mga carat
+			
+			
+				mga dalton
+				{0} ka dalton
+				{0} ka mga dalton
+			
+			
+				mga mass sa Earth
+				{0} ka mass sa Earth
+				{0} ka mga mass sa Earth
+			
+			
+				mga solar mass
+				{0} ka solar mass
+				{0} ka mga solar mass
+			
+			
+				mga gigawatt
+				{0} ka gigawatt
+				{0} ka mga gigawatt
+			
+			
+				mga megawatt
+				{0} ka megawatt
+				{0} ka mga megawatt
+			
+			
+				mga kilowatt
+				{0} ka kilowatt
+				{0} ka mga kilowatt
+			
+			
+				mga watt
+				{0} ka watt
+				{0} ka mga watt
+			
+			
+				mga milliwatt
+				{0} ka milliwatt
+				{0} ka mga milliwatt
+			
+			
+				horsepower
+				{0} ka horsepower
+				{0} ka horsepower
+			
+			
+				mga millimetro sa mercury
+				{0} ka millimetro sa mercury
+				{0} ka mga millimetro sa mercury
+			
+			
+				mga pound kada kuwadradong pulgada
+				{0} ka pound kada kuwadradong pulgada
+				{0} ka mga pound kada kuwadradong pulgada
+			
+			
+				mga pulgada sa mercury
+				{0} ka pulgada sa mercury
+				{0} ka mga pulgada sa mercury
+			
+			
+				mga bar
+				{0} ka bar
+				{0} ka mga bar
+			
+			
+				mga millibar
+				{0} ka millibar
+				{0} ka mga millibar
+			
+			
+				mga atmosphere
+				{0} ka atmosphere
+				{0} ka mga atmosphere
+			
+			
+				mga pascal
+				{0} ka pascal
+				{0} ka mga pascal
+			
+			
+				mga hectopascal
+				{0} ka hectopascal
+				{0} ka mga hectopascal
+			
+			
+				mga kilopascal
+				{0} ka kilopascal
+				{0} ka mga kilopascal
+			
+			
+				mga megapascal
+				{0} ka megapascal
+				{0} ka mga megapascal
+			
+			
+				mga kilometro kada oras
+				{0} ka kilometro kada oras
+				{0} ka mga kilometro kada oras
+			
+			
+				mga metro kada segundo
+				{0} ka metro kada segundo
+				{0} ka mga metro kada segundo
+			
+			
+				mga milya kada oras
+				{0} ka milya kada oras
+				{0} ka mga milya kada oras
+			
+			
+				mga knot
+				{0} ka knot
+				{0} ka mga knot
+			
+			
+				mga degree Celsius
+				{0} ka degree Celsius
+				{0} degree Celsius
+			
+			
+				mga degree Fahrenheit
+				{0} degree Fahrenheit
+				{0} degree Fahrenheit
+			
+			
+				mga kelvin
+				{0} ka kelvin
+				{0} ka mga kelvin
+			
+			
+				mga pound-foot
+				{0} ka pound-foot
+				{0} ka mga pound-foot
+			
+			
+				mga newton-meter
+				{0} ka newton-meter
+				{0} ka mga newton-meter
+			
+			
+				mga cubic kilometer
+				{0} ka cubic kilometer
+				{0} ka mga cubic kilometer
+			
+			
+				mga cubic meter
+				{0} ka cubic meter
+				{0} ka mga cubic meter
+				{0} kada cubic meter
+			
+			
+				mga cubic centimeter
+				{0} ka cubic centimeter
+				{0} ka mga cubic centimeter
+				{0} kada cubic centimeter
+			
+			
+				mga cubic mile
+				{0} ka cubic mile
+				{0} ka mga cubic mile
+			
+			
+				mga cubic yard
+				{0} ka cubic yard
+				{0} ka mga cubic yard
+			
+			
+				mga cubic foot
+				{0} ka cubic foot
+				{0} ka mga cubic foot
+			
+			
+				mga cubic inch
+				{0} ka cubic inch
+				{0} ka mga cubic inch
+			
+			
+				mga megaliter
+				{0} ka megaliter
+				{0} ka mga megaliter
+			
+			
+				mga hectoliter
+				{0} ka hectoliter
+				{0} ka mga hectoliter
+			
+			
+				mga litro
+				{0} ka litro
+				{0} ka mga litro
+				{0} kada litro
+			
+			
+				mga deciliter
+				{0} ka deciliter
+				{0} ka mga deciliter
+			
+			
+				mga centiliter
+				{0} ka centiliter
+				{0} ka mga centiliter
+			
+			
+				mga milliliter
+				{0} ka milliliter
+				{0} ka mga milliliter
+			
+			
+				mga metric pint
+				{0} ka metric pint
+				{0} ka mga metric pint
+			
+			
+				mga metric cup
+				{0} ka metric cup
+				{0} ka metric cup
+			
+			
+				mga acre-foot
+				{0} ka acre-foot
+				{0} ka mga acre-foot
+			
+			
+				mga gallon
+				{0} ka gallon
+				{0} ka mga gallon
+				{0} kada gallon
+			
+			
+				mga Imp. gallon
+				{0} ka Imp. gallon
+				{0} ka mga Imp. gallon
+				{0} kada Imp. gallon
+			
+			
+				mga quart
+				{0} ka quart
+				{0} ka mga quart
+			
+			
+				mga pint
+				{0} ka pint
+				{0} ka mga pint
+			
+			
+				mga tasa
+				{0} ka tasa
+				{0} ka mga tasa
+			
+			
+				mga fluid ounce
+				{0} ka fluid ounce
+				{0} ka mga fluid ounce
+			
+			
+				mga Imp. fluid ounce
+				{0} ka Imp. fluid ounce
+				{0} ka mga Imp. fluid ounce
+			
+			
+				mga kutsara
+				{0} ka kutsara
+				{0} ka kutsara
+			
+			
+				mga kutsarita
+				{0} ka kutsarita
+				{0} ka mga kutsarita
+			
+			
+				mga barrel
+				{0} ka barrel
+				{0} ka mga barrel
+			
+			
+				cardinal nga direksyon
+				{0} sidlakan
+				{0} amihanan
+				{0} habagatan
+				{0} kasadpan
+			
+		
+		
+			
+				mga metro/sec²
+			
+			
+				mga radian
+			
+			
+				mga degree
+				{0} deg
+				{0} deg
+			
+			
+				mga arcmin
+				{0} ka arcmin
+				{0} ka mga arcmin
+			
+			
+				mga arcsec
+				{0} ka arcsec
+				{0} ka mga arcsec
+			
+			
+				mga ektarya
+			
+			
+				mga meter²
+			
+			
+				mga sq mile
+				{0} sq mi
+				{0} sq mi
+			
+			
+				mga acre
+			
+			
+				mga yard²
+			
+			
+				mga sq foot
+				{0} sq ft
+				{0} sq ft
+			
+			
+				mga inch²
+			
+			
+				mga dunam
+				{0} ka dunam
+				{0} ka dunam
+			
+			
+				mga karat
+			
+			
+				{0} mg/dL
+				{0} mg/dL
+			
+			
+				millimol/litro
+			
+			
+				mga part/million
+			
+			
+				porsyento
+			
+			
+				permille
+			
+			
+				permyriad
+			
+			
+				mole
+				{0} mol
+				{0} mol
+			
+			
+				mga litro/km
+			
+			
+				L/100 km
+				{0} L/100 km
+				{0} L/100 km
+			
+			
+				mga milya/gal
+				{0} mpg
+				{0} mpg
+			
+			
+				mga milya/gal Imp.
+				{0} mpg Imp.
+				{0} mpg Imp.
+			
+			
+				PByte
+			
+			
+				TByte
+			
+			
+				Tbit
+			
+			
+				GByte
+			
+			
+				Gbit
+			
+			
+				MByte
+			
+			
+				Mbit
+			
+			
+				kByte
+			
+			
+				kbit
+			
+			
+				{0} ka byte
+				{0} ka byte
+			
+			
+				{0} ka bit
+				{0} ka bit
+			
+			
+				mga tuig
+				{0} ka tuig
+				{0} ka tuig
+				{0}/tuig
+			
+			
+				mga buwan
+				{0} ka buwan
+				{0} ka buwan
+				{0}/buwan
+			
+			
+				mga semana
+				{0} ka semana
+				{0} ka semana
+				{0}/semana
+			
+			
+				mga adlaw
+				{0} ka adlaw
+				{0} ka adlaw
+				{0}/adlaw
+			
+			
+				mga oras
+				{0} ka oras
+				{0} ka oras
+				{0}/oras
+			
+			
+				mga minuto
+				{0} ka minuto
+				{0} ka minuto
+				{0}/minuto
+			
+			
+				mga segundo
+				{0} ka segundo
+				{0} ka segundo
+				{0}/segundo
+			
+			
+				mga millisec
+			
+			
+				μsecs
+			
+			
+				mga nanosec
+			
+			
+				mga amp
+			
+			
+				mga milliamp
+				{0} mA
+				{0} mA
+			
+			
+				mga ohm
+				{0} Ω
+				{0} Ω
+			
+			
+				mga boltahe
+			
+			
+				kilojoule
+			
+			
+				mga joule
+			
+			
+				kW-hour
+			
+			
+				electronvolt
+			
+			
+				BTU
+			
+			
+				{0} ka US therm
+				{0} ka mga US therm
+			
+			
+				pound-force
+			
+			
+				newton
+			
+			
+				MHz
+			
+			
+				{0} ka em
+				{0} ka em
+			
+			
+				mga pixel
+			
+			
+				mga megapixel
+			
+			
+				m
+			
+			
+				mga µmeter
+			
+			
+				mga milya
+			
+			
+				mga yarda
+			
+			
+				mga piye
+			
+			
+				mga pulgada
+			
+			
+				mga parsec
+			
+			
+				mga light yr
+			
+			
+				mga point
+			
+			
+				mga solar radius
+			
+			
+				lux
+			
+			
+				mga solar luminosity
+			
+			
+				mga gramo
+			
+			
+				mga tonelada
+			
+			
+				mga pound
+			
+			
+				oz troy
+			
+			
+				mga carat
+			
+			
+				mga dalton
+			
+			
+				mga mass sa Earth
+			
+			
+				mga solar mass
+			
+			
+				mga watt
+			
+			
+				mmHg
+				{0} mmHg
+				{0} mmHg
+			
+			
+				{0} ka bar
+				{0} ka bar
+			
+			
+				{0} ka mbar
+				{0} ka mbar
+			
+			
+				km/oras
+			
+			
+				mga metro/seg
+			
+			
+				mga milya/oras
+				{0} mph
+				{0} mph
+			
+			
+				deg. C
+			
+			
+				deg. F
+			
+			
+				mga yard³
+			
+			
+				mga foot³
+			
+			
+				mga inch³
+			
+			
+				mga litro
+				{0} L
+				{0} L
+				{0}/L
+			
+			
+				acre ft
+			
+			
+				gal
+				{0} gal
+				{0} gal
+				{0}/gal US
+			
+			
+				qts
+			
+			
+				mga pint
+			
+			
+				mga tasa
+			
+			
+				fl oz
+				{0} fl oz
+				{0} fl oz
+			
+			
+				Imp. fl oz
+				{0} fl oz Imp.
+				{0} fl oz Imp.
+			
+			
+				kutsarita
+				{0} ka kutsarita
+				{0} ka kutsarita
+			
+			
+				barrel
+			
+			
+				direksyon
+				{0} E
+				{0} N
+				{0} S
+				{0} W
+			
+		
+		
+			
+				L/100km
+				{0}L/100km
+				{0}L/100km
+			
+			
+				tuig
+				{0} ka tuig
+				{0} ka tuig
+			
+			
+				buwan
+				{0} buwan
+				{0} buwan
+			
+			
+				semana
+				{0} semana
+				{0}w
+			
+			
+				adlaw
+				{0} adlaw
+				{0} adlaw
+			
+			
+				oras
+				{0} ka oras
+				{0} ka oras
+			
+			
+				minuto
+				{0} minuto
+				{0}minuto
+			
+			
+				segundo
+				{0}segundo
+				{0}segundo
+			
+			
+				msec
+				{0}ms
+				{0}ms
+			
+			
+				{0}km
+				{0}km
+			
+			
+				m
+				{0}m
+				{0}m
+			
+			
+				{0}cm
+				{0}cm
+			
+			
+				{0}mm
+				{0}mm
+			
+			
+				{0}kg
+				{0}kg
+			
+			
+				gramo
+			
+			
+				km/hr
+				{0}km/h
+				{0}km/h
+			
+			
+				°C
+			
+			
+				litro
+				{0}L
+				{0}L
+			
+			
+				direksyon
+			
+		
 		
 			h:mm
 		
@@ -693,6 +4225,40 @@ the LDML specification (http://unicode.org/reports/tr35/)
 			{0}, at {1}
 			{0} at {1}
 		
+		
+			{0}, o {1}
+			{0} o {1}
+		
+		
+			{0}, o {1}
+			{0} o {1}
+		
+		
+			{0}, o {1}
+			{0} o {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
+		
+			{0}, ug {1}
+			{0} ug {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
+		
+			{0} {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
 	
 	
 		
diff --git a/make/data/cldr/common/main/ceb_PH.xml b/make/data/cldr/common/main/ceb_PH.xml
index dc5e36741cc..76c6cb7d2cb 100644
--- a/make/data/cldr/common/main/ceb_PH.xml
+++ b/make/data/cldr/common/main/ceb_PH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/cgg.xml b/make/data/cldr/common/main/cgg.xml
index 431a4c78d17..5010da2424e 100644
--- a/make/data/cldr/common/main/cgg.xml
+++ b/make/data/cldr/common/main/cgg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moridova
 			Madagasika
 			Ebizinga bya Marshaa
-			Masedoonia
 			Mari
 			Myanamar
 			Mongoria
diff --git a/make/data/cldr/common/main/cgg_UG.xml b/make/data/cldr/common/main/cgg_UG.xml
index cc32351184d..b54b10afca8 100644
--- a/make/data/cldr/common/main/cgg_UG.xml
+++ b/make/data/cldr/common/main/cgg_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/chr.xml b/make/data/cldr/common/main/chr.xml
index a3307568267..d190759980f 100644
--- a/make/data/cldr/common/main/chr.xml
+++ b/make/data/cldr/common/main/chr.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -300,7 +300,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ᏆᏍᏙ
 			ᏉᏧᎩᏍ
 			ᏆᏏᎵᎢ ᏉᏧᎩᏍ
-			ᏉᏥᎦᎳ ᏉᏧᎩᏍ
+			ᏳᎳᏈ ᏉᏧᎩᏍ
 			ᎨᏧᏩ
 			ᎩᏤ
 			ᎳᏆᏄᏫ
@@ -406,10 +406,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ᏱᏗᏍ
 			ᏲᏄᏆ
 			ᎨᎾᏙᏂᏏ
+			ᏓᎶᏂᎨ, ᎨᎾᏙᏂᏏ
 			ᎠᏟᎶᏍᏗ ᎼᎶᎪ ᏔᎹᏏᏘ
 			ᏓᎶᏂᎨ
+			ᏓᎶᏂᎨ, ᎹᏓᏈᏂ
 			ᎠᎯᏗᎨ ᏓᎶᏂᎨ
+			ᎠᎯᏗᎨ ᎹᏓᏈᏂ ᏓᎶᏂᎨ
 			ᎤᏦᏍᏗ ᏓᎶᏂᎨ
+			ᎤᏦᏍᏗ ᎹᏓᏈᏂ ᏓᎶᏂᎨ
 			ᏑᎷ
 			ᏑᏂ
 			Ꮭ ᎦᏬᏂᎯᏍᏗ ᎦᎸᏛᎢ ᏱᎩ
@@ -513,7 +517,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ᎠᎷᏆ
 			ᎣᎴᏅᏓ ᏚᎦᏚᏛᎢ
 			ᎠᏎᏆᏣᏂ
-			ᏉᏏᏂᎠ & ᎲᏤᎪᏫ
+			ᏉᏏᏂᎠ & ᎲᏤᎪᏫᎾ
 			ᏆᏇᏙᏍ
 			ᏆᏂᎦᎵᏕᏍ
 			ᏇᎵᏥᎥᎻ
@@ -860,8 +864,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[ꭰ ꭱ ꭲ ꭳ ꭴ ꭵ ꭶ ꭷ ꭸ ꭹ ꭺ ꭻ ꭼ ꭽ ꭾ ꭿ ꮀ ꮁ ꮂ ꮃ ꮄ ꮅ ꮆ ꮇ ꮈ ꮉ ꮊ ꮋ ꮌ ꮍ ꮎ ꮏ ꮐ ꮑ ꮒ ꮓ ꮔ ꮕ ꮖ ꮗ ꮘ ꮙ ꮚ ꮛ ꮜ ꮝ ꮞ ꮟ ꮠ ꮡ ꮢ ꮣ ꮤ ꮥ ꮦ ꮧ ꮨ ꮩ ꮪ ꮫ ꮬ ꮭ ꮮ ꮯ ꮰ ꮱ ꮲ ꮳ ꮴ ꮵ ꮶ ꮷ ꮸ ꮹ ꮺ ꮻ ꮼ ꮽ ꮾ ꮿ ᏸ ᏹ ᏺ ᏻ ᏼ]
 		[]
 		[Ꭰ Ꭶ Ꭽ Ꮃ Ꮉ Ꮎ Ꮖ Ꮜ Ꮣ Ꮬ Ꮳ Ꮹ Ꮿ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -870,19 +874,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1654,6 +1662,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ᎤᏕ.
+				ᎡᏘ. ᏥᎨᏒ
+				ᎯᎠ ᏧᏕᏘᏴᏒᏘ.
+				ᎡᏘᏴᎢ.
 				
 					ᎾᎿ {0} ᎤᏕ.
 					ᎾᎿ {0} ᎤᏕ.
@@ -1665,6 +1676,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ᎤᏕ.
+				ᎡᏘ. ᏥᎨᏒ
+				ᎯᎠ ᏧᏕᏘᏴᏒᏘ.
+				ᎡᏘᏴᎢ.
 				
 					ᎾᎿ {0} ᎤᏕ.
 					ᎾᎿ {0} ᎤᏕ.
@@ -1726,6 +1740,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ᎧᎸ.
+				ᎧᎸ. ᏥᎨᏒ
+				ᎯᎠ ᎧᎸ.
+				ᎯᎠ ᎧᎸ.
 				
 					ᎾᎿ {0} ᎧᎸ.
 					ᎾᎿ {0} ᎧᎸ.
@@ -1737,6 +1754,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ᎧᎸ.
+				ᎧᎸ. ᏥᎨᏒ
+				ᎯᎠ ᎧᎸ.
+				ᏔᎵᏁ ᎧᎸ.
 				
 					ᎾᎿ {0} ᎧᎸ.
 					ᎾᎿ {0} ᎧᎸ.
@@ -1763,6 +1783,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ᏒᎾ.
+				ᏥᏛᎵᏱᎵᏒᎢ.
+				ᎯᎠ ᎠᎵᎵᏌ.
+				ᏐᏆᎴᏅᎲ.
 				
 					ᎾᎿ {0} ᏒᎾ.
 					ᎾᎿ {0} ᏒᎾ.
@@ -1775,6 +1798,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ᏒᎾ.
+				ᏥᏛᎵᏱᎵᏒᎢ.
+				ᎯᎠ ᎠᎵᎵᏌ.
+				ᏐᏆᎴᏅᎲ.
 				
 					ᎾᎿ {0} ᏒᎾ.
 					ᎾᎿ {0} ᏒᎾ.
@@ -2938,6 +2964,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ᎠᎦᏙᏇ
 			
+			
+				ᎧᏍᏔᏁ
+			
 			
 				ᎩᏏᎶᎳᏓ
 			
@@ -4470,6 +4499,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		latn
+		
+			latn
+		
+		1
 		
 			.
 			,
@@ -4482,6 +4516,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			
@@ -4605,782 +4640,1030 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ᏌᏊ ᎢᏳᎾᎵᏍᏔᏅ ᎡᎳᏈ ᎢᎹᎵᏘᏏ ᎠᏕᎳ
 				UAE ᎠᏕᎳ
 				UAE ᎠᏕᎳ
+				AED
 			
 			
 				ᎠᏫᎨᏂᏍᏖᏂ ᎠᏕᎳ
 				ᎠᏫᎨᏂᏍᏖᏂ ᎠᏕᎳ
 				ᎠᏫᎨᏂᏍᏖᏂ ᎠᏕᎳ
+				AFN
 			
 			
 				ᎠᎵᏇᏂᏯ ᎠᏕᎳ
 				ᎠᎵᏇᏂᏯ ᎠᏕᎳ
 				ᎠᎵᏇᏂᏯ ᎠᏕᎳ
+				ALL
 			
 			
 				ᎠᎵᎻᏂᎠ ᎠᏕᎳ
 				ᎠᎵᎻᏂᎠ ᎠᏕᎳ
 				ᎠᎵᎻᏂᎠ ᎠᏕᎳ
+				AMD
 			
 			
 				ᎾᏍᎩᏁᏛᎳᏂ ᎠᏂᏘᎵᏏ ᎠᏕᎳ
 				ᎾᏍᎩᏁᏛᎳᏂ ᎠᏂᏘᎵᏏ ᎠᏕᎳ
 				ᎾᏍᎩᏁᏛᎳᏂ ᎠᏂᏘᎵᏏ ᎠᏕᎳ
+				ANG
 			
 			
 				ᎠᏂᎪᎳ ᎠᏕᎳ
 				ᎠᏂᎪᎳ ᎠᏕᎳ
 				ᎠᏂᎪᎳ ᎠᏕᎳ
+				AOA
+				Kz
 			
 			
 				ᎠᏥᏂᏘᏂᎠ ᎠᏕᎳ
 				ᎠᏥᏂᏘᏂᎠ ᎠᏕᎳ
 				ᎠᏥᏂᏘᏂᎠ ᎠᏕᎳ
+				ARS
+				$
 			
 			
 				ᎡᎳᏗᏜ ᎠᏕᎳ
 				ᎡᎳᏗᏜ ᎠᏕᎳ
 				ᎡᎳᏗᏜ ᎠᏕᎳ
+				A$
+				$
 			
 			
 				ᎠᎷᏆ ᎠᏕᎳ
 				ᎠᎷᏆ ᎠᏕᎳ
 				ᎠᎷᏆ ᎠᏕᎳ
+				AWG
 			
 			
 				ᎠᏏᎵᏆᏌᏂ ᎠᏕᎳ
 				ᎠᏏᎵᏆᏌᏂ ᎠᏕᎳ
 				ᎠᏏᎵᏆᏌᏂ ᎠᏕᎳ
+				AZN
 			
 			
 				ᏉᏏᏂᎠ-ᎲᏤᎪᏫ ᎦᏁᏟᏴᏍᏔᏅ ᎠᏕᎳ
 				ᏉᏏᏂᎠ-ᎲᏤᎪᏫ ᎦᏁᏟᏴᏍᏔᏅ ᎠᏕᎳ
 				ᏉᏏᏂᎠ-ᎲᏤᎪᏫ ᎦᏁᏟᏴᏍᏔᏅ ᎠᏕᎳ
+				BAM
+				KM
 			
 			
 				ᏆᏇᏙᏍ ᎠᏕᎳ
 				ᏆᏇᏙᏍ ᎠᏕᎳ
 				ᏆᏇᏙᏍ ᎠᏕᎳ
+				BBD
+				$
 			
 			
 				ᏆᏂᎦᎵᏕᏍ ᎠᏕᎳ
 				ᏆᏂᎦᎵᏕᏍ ᎠᏕᎳ
 				ᏆᏂᎦᎵᏕᏍ ᎠᏕᎳ
+				BDT
+				৳
 			
 			
 				ᏊᎵᎨᎵᎠ ᎠᏕᎳ
 				ᏊᎵᎨᎵᎠ ᎠᏕᎳ
 				ᏊᎵᎨᎵᎠ ᎠᏕᎳ
+				BGN
 			
 			
 				ᏆᎭᎴᎢᏂ ᎠᏕᎳ
 				ᏆᎭᎴᎢᏂ ᎠᏕᎳ
 				ᏆᎭᎴᎢᏂ ᎠᏕᎳ
+				BHD
 			
 			
 				ᏋᎷᏂᏗ ᎠᏕᎳ
 				ᏋᎷᏂᏗ ᎠᏕᎳ
 				ᏋᎷᏂᏗ ᎠᏕᎳ
+				BIF
 			
 			
 				ᏆᏊᏓ ᎠᏕᎳ
 				ᏆᏊᏓ ᎠᏕᎳ
 				ᏆᏊᏓ ᎠᏕᎳ
+				BMD
+				$
 			
 			
 				ᏊᎾᎢ ᎠᏕᎳ
 				ᏊᎾᎢ ᎠᏕᎳ
 				ᏊᎾᎢ ᎠᏕᎳ
+				BND
+				$
 			
 			
 				ᏉᎵᏫᎠ ᎠᏕᎳ
 				ᏉᎵᏫᎠ ᎠᏕᎳ
 				ᏉᎵᏫᎠ ᎠᏕᎳ
+				BOB
+				Bs
 			
 			
 				ᏆᏏᎵᎢ ᎠᏕᎳ
 				ᏆᏏᎵᎢ ᎠᏕᎳ
 				ᏆᏏᎵᎢ ᎠᏕᎳ
+				R$
+				R$
 			
 			
 				ᏆᎭᎹ ᎠᏕᎳ
 				ᏆᎭᎹ ᎠᏕᎳ
 				ᏆᎭᎹ ᎠᏕᎳ
+				BSD
+				$
 			
 			
 				ᏊᏔᏂ ᎠᏕᎳ
 				ᏊᏔᏂ ᎠᏕᎳ
 				ᏊᏔᏂ ᎠᏕᎳ
+				BTN
 			
 			
 				ᏆᏣᏩᎾ ᎠᏕᎳ
 				ᏆᏣᏩᎾ ᎠᏕᎳ
 				ᏆᏣᏩᎾ ᎠᏕᎳ
+				BWP
+				P
 			
 			
 				ᏇᎳᎷᏍ ᎠᏕᎳ
 				ᏇᎳᎷᏍ ᎠᏕᎳ
 				ᏇᎳᎷᏍ ᎠᏕᎳ
+				BYN
+				р.
 			
 			
 				ᏇᎳᎷᏍ ᎠᏕᎳ (2000–2016)
 				ᏇᎳᎷᏍ ᎠᏕᎳ (2000–2016)
 				ᏇᎳᎷᏍ ᎠᏕᎳ (2000–2016)
+				BYR
 			
 			
 				ᏇᎵᏍ ᎠᏕᎳ
 				ᏇᎵᏍ ᎠᏕᎳ
 				ᏇᎵᏍ ᎠᏕᎳ
+				BZD
+				$
 			
 			
 				ᎨᎾᏓ ᎠᏕᎳ
 				ᎨᎾᏓ ᎠᏕᎳ
 				ᎨᎾᏓ ᎠᏕᎳ
+				CA$
+				$
 			
 			
 				ᎧᏂᎪ ᎠᏕᎳ
 				ᎧᏂᎪ ᎠᏕᎳ
 				ᎧᏂᎪ ᎠᏕᎳ
+				CDF
 			
 			
 				ᏍᏫᏏ ᎠᏕᎳ
 				ᏍᏫᏏ ᎠᏕᎳ
 				ᏍᏫᏏ ᎠᏕᎳ
+				CHF
 			
 			
 				ᏥᎵ ᎠᏕᎳ
 				ᏥᎵ ᎠᏕᎳ
 				ᏥᎵ ᎠᏕᎳ
+				CLP
+				$
 			
 			
 				ᏣᏂᏏ ᎠᏕᎳ (ᏓᎹᏳᏟᏗ)
 				ᏣᏂᏏ ᎠᏕᎳ (ᏓᎹᏳᏟᏗ)
 				ᏣᏂᏏ ᎠᏕᎳ (ᏓᎹᏳᏟᏗ)
+				CNH
 			
 			
 				ᏓᎶᏂᎨ ᎠᏕᎳ
 				ᏓᎶᏂᎨ ᎠᏕᎳ
 				ᏓᎶᏂᎨ ᎠᏕᎳ
+				CN¥
+				¥
 			
 			
 				ᎪᎸᎻᏈᎢᎠ ᎠᏕᎳ
 				ᎪᎸᎻᏈᎢᎠ ᎠᏕᎳ
 				ᎪᎸᎻᏈᎢᎠ ᎠᏕᎳ
+				COP
+				$
 			
 			
 				ᎪᏍᏓᎵᎧ ᎠᏕᎳ
 				ᎪᏍᏓᎵᎧ ᎠᏕᎳ
 				ᎪᏍᏓᎵᎧ ᎠᏕᎳ
+				CRC
+				₡
 			
 			
 				ᎫᏆ ᎦᏁᏟᏴᏍᏔᏅ ᎠᏕᎳ
 				ᎫᏆ ᎦᏁᏟᏴᏍᏔᏅ ᎠᏕᎳ
 				ᎫᏆ ᎦᏁᏟᏴᏍᏔᏅ ᎠᏕᎳ
+				CUC
+				$
 			
 			
 				ᎫᏆ ᎠᏕᎳ
 				ᎫᏆ ᎠᏕᎳ
 				ᎫᏆ ᎠᏕᎳ
+				CUP
+				$
 			
 			
 				ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ ᎠᏕᎳ
 				ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ ᎠᏕᎳ
 				ᎢᎬᎾᏕᎾ ᎢᏤᏳᏍᏗ ᎠᏕᎳ
+				CVE
 			
 			
 				ᏤᎩ ᎠᏕᎳ
 				ᏤᎩ ᎠᏕᎳ
 				ᏤᎩ ᎠᏕᎳ
+				CZK
+				Kč
 			
 			
 				ᏥᏊᏗ ᎠᏕᎳ
 				ᏥᏊᏗ ᎠᏕᎳ
 				ᏥᏊᏗ ᎠᏕᎳ
+				DJF
 			
 			
 				ᏕᏂᏍ ᎠᏕᎳ
 				ᏕᏂᏍ ᎠᏕᎳ
 				ᏕᏂᏍ ᎠᏕᎳ
+				DKK
+				kr
 			
 			
 				ᏙᎻᏂᎧᏂ ᎠᏕᎳ
 				ᏙᎻᏂᎧᏂ ᎠᏕᎳ
 				ᏙᎻᏂᎧᏂ ᎠᏕᎳ
+				DOP
+				$
 			
 			
 				ᎠᎵᏥᎵᏯ ᎠᏕᎳ
 				ᎠᎵᏥᎵᏯ ᎠᏕᎳ
 				ᎠᎵᏥᎵᏯ ᎠᏕᎳ
+				DZD
 			
 			
 				ᎢᏥᏈᎢ ᎠᏕᎳ
 				ᎢᏥᏈᎢ ᎠᏕᎳ
 				ᎢᏥᏈᎢ ᎠᏕᎳ
+				EGP
+				E£
 			
 			
 				ᎡᎵᏟᏯ ᎠᏕᎳ
 				ᎡᎵᏟᏯ ᎠᏕᎳ
 				ᎡᎵᏟᏯ ᎠᏕᎳ
+				ERN
 			
 			
 				ᎢᏗᎣᏈᎠ ᎠᏕᎳ
 				ᎢᏗᎣᏈᎠ ᎠᏕᎳ
 				ᎢᏗᎣᏈᎠ ᎠᏕᎳ
+				ETB
 			
 			
 				ᏳᎳᏛ ᎠᏕᎳ
 				ᏳᎳᏛ ᎠᏕᎳ
 				ᏳᎳᏛ ᎠᏕᎳ
+				€
+				€
 			
 			
 				ᏫᎩ ᎠᏕᎳ
 				ᏫᎩ ᎠᏕᎳ
 				ᏫᎩ ᎠᏕᎳ
+				FJD
+				$
 			
 			
 				ᏩᎩᎤ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
 				ᏩᎩᎤ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
 				ᏩᎩᎤ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
+				FKP
+				£
 			
 			
 				ᎩᎵᏏᏲ ᎠᏕᎳ
 				ᎩᎵᏏᏲ ᎠᏕᎳ
 				ᎩᎵᏏᏲ ᎠᏕᎳ
+				£
+				£
 			
 			
 				ᏣᎠᏥᎢ ᎠᏕᎳ
 				ᏣᎠᏥᎢ ᎠᏕᎳ
 				ᏣᎠᏥᎢ ᎠᏕᎳ
+				GEL
+				₾
 			
 			
 				ᎦᎠᎾ ᎠᏕᎳ
 				ᎦᎠᎾ ᎠᏕᎳ
 				ᎦᎠᎾ ᎠᏕᎳ
+				GHS
 			
 			
 				ᏥᏆᎵᏓ ᎠᏕᎳ
 				ᏥᏆᎵᏓ ᎠᏕᎳ
 				ᏥᏆᎵᏓ ᎠᏕᎳ
+				GIP
+				£
 			
 			
 				ᎦᎹᏈᎢᎠ ᎠᏕᎳ
 				ᎦᎹᏈᎢᎠ ᎠᏕᎳ
 				ᎦᎹᏈᎢᎠ ᎠᏕᎳ
+				GMD
 			
 			
 				ᎩᎢᏂ ᎠᏕᎳ
 				ᎩᎢᏂ ᎠᏕᎳ
 				ᎩᎢᏂ ᎠᏕᎳ
+				GNF
+				FG
 			
 			
 				ᏆᏖᎹᎳ ᎠᏕᎳ
 				ᏆᏖᎹᎳ ᎠᏕᎳ
 				ᏆᏖᎹᎳ ᎠᏕᎳ
+				GTQ
+				Q
 			
 			
 				ᎦᏯᎾ ᎠᏕᎳ
 				ᎦᏯᎾ ᎠᏕᎳ
 				ᎦᏯᎾ ᎠᏕᎳ
+				GYD
+				$
 			
 			
 				ᎰᏂᎩ ᎪᏂᎩ ᎠᏕᎳ
 				ᎰᏂᎩ ᎪᏂᎩ ᎠᏕᎳ
 				ᎰᏂᎩ ᎪᏂᎩ ᎠᏕᎳ
+				HK$
+				$
 			
 			
 				ᎭᏂᏚᎳᏍ ᎠᏕᎳ
 				ᎭᏂᏚᎳᏍ ᎠᏕᎳ
 				ᎭᏂᏚᎳᏍ ᎠᏕᎳ
+				HNL
+				L
 			
 			
 				ᎧᎶᎡᏏᎠ ᎠᏕᎳ
 				ᎧᎶᎡᏏᎠ ᎠᏕᎳ
 				ᎧᎶᎡᏏᎠ ᎠᏕᎳ
+				HRK
+				kn
 			
 			
 				ᎮᏘ ᎠᏕᎳ
 				ᎮᏘ ᎠᏕᎳ
 				ᎮᏘ ᎠᏕᎳ
+				HTG
 			
 			
 				ᎲᏂᎦᎵ ᎠᏕᎳ
 				ᎲᏂᎦᎵ ᎠᏕᎳ
 				ᎲᏂᎦᎵ ᎠᏕᎳ
+				HUF
+				Ft
 			
 			
 				ᎢᏂᏙᏂᏍᏯ ᎠᏕᎳ
 				ᎢᏂᏙᏂᏍᏯ ᎠᏕᎳ
 				ᎢᏂᏙᏂᏍᏯ ᎠᏕᎳ
+				IDR
+				Rp
 			
 			
 				ᎢᏏᎵᏱ ᎢᏤ ᎠᏕᎳ
 				ᎢᏏᎵᏱ ᎢᏤ ᎠᏕᎳ
 				ᎢᏏᎵᏱ ᎢᏤ ᎠᏕᎳ
+				₪
+				₪
 			
 			
 				ᎢᏂᏗᎢᎠ ᎠᏕᎳ
 				ᎢᏂᏗᎢᎠ ᎠᏕᎳ
 				ᎢᏂᏗᎢᎠ ᎠᏕᎳ
+				₹
+				₹
 			
 			
 				ᎢᎳᎩ ᎠᏕᎳ
 				ᎢᎳᎩ ᎠᏕᎳ
 				ᎢᎳᎩ ᎠᏕᎳ
+				IQD
 			
 			
 				ᎢᎴᏂ ᎠᏕᎳ
 				ᎢᎴᏂ ᎠᏕᎳ
 				ᎢᎴᏂ ᎠᏕᎳ
+				IRR
 			
 			
 				ᏧᏁᏍᏓᎸᎯ ᎠᏕᎳ
 				ᏧᏁᏍᏓᎸᎯ ᎠᏕᎳ
 				ᏧᏁᏍᏓᎸᎯ ᎠᏕᎳ
+				ISK
+				kr
 			
 			
 				ᏣᎺᎢᎧ ᎠᏕᎳ
 				ᏣᎺᎢᎧ ᎠᏕᎳ
 				ᏣᎺᎢᎧ ᎠᏕᎳ
+				JMD
+				$
 			
 			
 				ᏦᏓᏂ ᎠᏕᎳ
 				ᏦᏓᏂ ᎠᏕᎳ
 				ᏦᏓᏂ ᎠᏕᎳ
+				JOD
 			
 			
 				ᏣᏩᏂᏏ ᎠᏕᎳ
 				ᏣᏩᏂᏏ ᎠᏕᎳ
 				ᏣᏩᏂᏏ ᎠᏕᎳ
+				JP¥
+				¥
 			
 			
 				ᎨᏂᏯ ᎠᏕᎳ
 				ᎨᏂᏯ ᎠᏕᎳ
 				ᎨᏂᏯ ᎠᏕᎳ
+				KES
 			
 			
 				ᎩᎵᏣᎢᏍ ᎠᏕᎳ
 				ᎩᎵᏣᎢᏍ ᎠᏕᎳ
 				ᎩᎵᏣᎢᏍ ᎠᏕᎳ
+				KGS
 			
 			
 				ᎧᎹᏉᏗᎠᏂ ᎠᏕᎳ
 				ᎧᎹᏉᏗᎠᏂ ᎠᏕᎳ
 				ᎧᎹᏉᏗᎠᏂ ᎠᏕᎳ
+				KHR
+				៛
 			
 			
 				ᎪᎼᎳᏍ ᎠᏕᎳ
 				ᎪᎼᎳᏍ ᎠᏕᎳ
 				ᎪᎼᎳᏍ ᎠᏕᎳ
+				KMF
+				CF
 			
 			
 				ᏧᏴᏢ ᎪᎵᎠ ᎠᏕᎳ
 				ᏧᏴᏢ ᎪᎵᎠ ᎠᏕᎳ
 				ᏧᏴᏢ ᎪᎵᎠ ᎠᏕᎳ
+				KPW
+				₩
 			
 			
 				ᏧᎦᎾᏮ ᎪᎵᎠ ᎠᏕᎳ
 				ᏧᎦᎾᏮ ᎪᎵᎠ ᎠᏕᎳ
 				ᏧᎦᎾᏮ ᎪᎵᎠ ᎠᏕᎳ
+				₩
+				₩
 			
 			
 				ᎫᏪᎢᏘ ᎠᏕᎳ
 				ᎫᏪᎢᏘ ᎠᏕᎳ
 				ᎫᏪᎢᏘ ᎠᏕᎳ
+				KWD
 			
 			
 				ᎨᎢᎹᏂ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
 				ᎨᎢᎹᏂ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
 				ᎨᎢᎹᏂ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
+				KYD
+				$
 			
 			
 				ᎧᏎᎧᏍᏕᏂ ᎠᏕᎳ
 				ᎧᏎᎧᏍᏕᏂ ᎠᏕᎳ
 				ᎧᏎᎧᏍᏕᏂ ᎠᏕᎳ
+				KZT
+				₸
 			
 			
 				ᎳᎣ ᎠᏕᎳ
 				ᎳᎣ ᎠᏕᎳ
 				ᎳᎣ ᎠᏕᎳ
+				LAK
+				₭
 			
 			
 				ᎴᏆᎾᏂ ᎠᏕᎳ
 				ᎴᏆᎾᏂ ᎠᏕᎳ
 				ᎴᏆᎾᏂ ᎠᏕᎳ
+				LBP
+				L£
 			
 			
 				ᏍᎵ ᎳᏂᎧ ᎠᏕᎳ
 				ᏍᎵ ᎳᏂᎧ ᎠᏕᎳ
 				ᏍᎵ ᎳᏂᎧ ᎠᏕᎳ
+				LKR
+				Rs
 			
 			
 				ᎳᏈᎵᏯ ᎠᏕᎳ
 				ᎳᏈᎵᏯ ᎠᏕᎳ
 				ᎳᏈᎵᏯ ᎠᏕᎳ
+				LRD
+				$
 			
 			
 				ᎵᏈᏯ ᎠᏕᎳ
 				ᎵᏈᏯ ᎠᏕᎳ
 				ᎵᏈᏯ ᎠᏕᎳ
+				LYD
 			
 			
 				ᎼᎶᎪ ᎠᏕᎳ
 				ᎼᎶᎪ ᎠᏕᎳ
 				ᎼᎶᎪ ᎠᏕᎳ
+				MAD
 			
 			
 				ᎹᎵᏙᏫᎠ ᎠᏕᎳ
 				ᎹᎵᏙᏫᎠ ᎠᏕᎳ
 				ᎹᎵᏙᏫᎠ ᎠᏕᎳ
+				MDL
 			
 			
 				ᎹᎳᎦᏏ ᎠᏕᎳ
 				ᎹᎳᎦᏏ ᎠᏕᎳ
 				ᎹᎳᎦᏏ ᎠᏕᎳ
+				MGA
+				Ar
 			
 			
 				ᎹᏎᏙᏂᎠ ᎠᏕᎳ
 				ᎹᏎᏙᏂᎠ ᎠᏕᎳ
 				ᎹᏎᏙᏂᎠ ᎠᏕᎳ
+				MKD
 			
 			
 				ᎹᏯᎹᎵ ᎠᏕᎳ
 				ᎹᏯᎹᎵ ᎠᏕᎳ
 				ᎹᏯᎹᎵ ᎠᏕᎳ
+				MMK
+				K
 			
 			
 				ᎹᏂᎪᎵᎠ ᎠᏕᎳ
 				ᎹᏂᎪᎵᎠ ᎠᏕᎳ
 				ᎹᏂᎪᎵᎠ ᎠᏕᎳ
+				MNT
+				₮
 			
 			
 				ᎹᎧᎣ ᎠᏕᎳ
 				ᎹᎧᎣ ᎠᏕᎳ
 				ᎹᎧᎣ ᎠᏕᎳ
+				MOP
 			
 			
 				ᎹᏈᏔᏂᎠ ᎠᏕᎳ (1973–2017)
 				ᎹᏈᏔᏂᎠ ᎠᏕᎳ (1973–2017)
 				ᎹᏈᏔᏂᎠ ᎠᏕᎳ (1973–2017)
+				MRO
 			
 			
 				ᎹᏈᏔᏂᎠ ᎠᏕᎳ
 				ᎹᏈᏔᏂᎠ ᎠᏕᎳ
 				ᎹᏈᏔᏂᎠ ᎠᏕᎳ
+				MRU
 			
 			
 				ᎹᏘᎢᏯ ᎠᏕᎳ
 				ᎹᏘᎢᏯ ᎠᏕᎳ
 				ᎹᏘᎢᏯ ᎠᏕᎳ
+				MUR
+				Rs
 			
 			
 				ᎹᎵᏗᏫᏍ ᎠᏕᎳ
 				ᎹᎵᏗᏫᏍ ᎠᏕᎳ
 				ᎹᎵᏗᏫᏍ ᎠᏕᎳ
+				MVR
 			
 			
 				ᎹᎳᏫ ᎠᏕᎳ
 				ᎹᎳᏫ ᎠᏕᎳ
 				ᎹᎳᏫ ᎠᏕᎳ
+				MWK
 			
 			
 				ᏍᏆᏂ ᎠᏕᎳ
 				ᏍᏆᏂ ᎠᏕᎳ
 				ᏍᏆᏂ ᎠᏕᎳ
+				MX$
+				$
 			
 			
 				ᎹᎴᏏᎢᎠ ᎠᏕᎳ
 				ᎹᎴᏏᎢᎠ ᎠᏕᎳ
 				ᎹᎴᏏᎢᎠ ᎠᏕᎳ
+				MYR
+				RM
 			
 			
 				ᎼᏎᎻᏇᎩ ᎠᏕᎳ
 				ᎼᏎᎻᏇᎩ ᎠᏕᎳ
 				ᎼᏎᎻᏇᎩ ᎠᏕᎳ
+				MZN
 			
 			
 				ᎾᎻᏈᎢᏯ ᎠᏕᎳ
 				ᎾᎻᏈᎢᏯ ᎠᏕᎳ
 				ᎾᎻᏈᎢᏯ ᎠᏕᎳ
+				NAD
+				$
 			
 			
 				ᏂᏥᎵᏯ ᎠᏕᎳ
 				ᏂᏥᎵᏯ ᎠᏕᎳ
 				ᏂᏥᎵᏯ ᎠᏕᎳ
+				NGN
+				₦
 			
 			
 				ᏂᎧᎳᏆ ᎠᏕᎳ
 				ᏂᎧᎳᏆ ᎠᏕᎳ
 				ᏂᎧᎳᏆ ᎠᏕᎳ
+				NIO
+				C$
 			
 			
 				ᏃᏪ ᎠᏕᎳ
 				ᏃᏪ ᎠᏕᎳ
 				ᏃᏪ ᎠᏕᎳ
+				NOK
+				kr
 			
 			
 				ᏁᏆᎵ ᎠᏕᎳ
 				ᏁᏆᎵ ᎠᏕᎳ
 				ᏁᏆᎵ ᎠᏕᎳ
+				NPR
+				Rs
 			
 			
 				ᎢᏤ ᏏᎢᎴᏂᏗ ᎠᏕᎳ
 				ᎢᏤ ᏏᎢᎴᏂᏗ ᎠᏕᎳ
 				ᎢᏤ ᏏᎢᎴᏂᏗ ᎠᏕᎳ
+				NZ$
+				$
 			
 			
 				ᎣᎺᏂ ᎠᏕᎳ
 				ᎣᎺᏂ ᎠᏕᎳ
 				ᎣᎺᏂ ᎠᏕᎳ
+				OMR
 			
 			
 				ᏆᎾᎹ ᎠᏕᎳ
 				ᏆᎾᎹ ᎠᏕᎳ
 				ᏆᎾᎹ ᎠᏕᎳ
+				PAB
 			
 			
 				ᏇᎷ ᎠᏕᎳ
 				ᏇᎷ ᎠᏕᎳ
 				ᏇᎷ ᎠᏕᎳ
+				PEN
 			
 			
 				ᏆᏇ ᎢᏤ ᎩᎢᏂ ᎠᏕᎳ
 				ᏆᏇ ᎢᏤ ᎩᎢᏂ ᎠᏕᎳ
 				ᏆᏇ ᎢᏤ ᎩᎢᏂ ᎠᏕᎳ
+				PGK
 			
 			
 				ᎠᏂᏈᎵᎩᏃ ᎠᏕᎳ
 				ᎠᏂᏈᎵᎩᏃ ᎠᏕᎳ
 				ᎠᏂᏈᎵᎩᏃ ᎠᏕᎳ
+				PHP
+				₱
 			
 			
 				ᏆᎩᏍᏖᏂ ᎠᏕᎳ
 				ᏆᎩᏍᏖᏂ ᎠᏕᎳ
 				ᏆᎩᏍᏖᏂ ᎠᏕᎳ
+				PKR
+				Rs
 			
 			
 				ᏉᎳᏂ ᎠᏕᎳ
 				ᏉᎳᏂ ᎠᏕᎳ
 				ᏉᎳᏂ ᎠᏕᎳ
+				PLN
+				zł
 			
 			
 				ᏆᎳᏇᎢᏯ ᎠᏕᎳ
 				ᏆᎳᏇᎢᏯ ᎠᏕᎳ
 				ᏆᎳᏇᎢᏯ ᎠᏕᎳ
+				PYG
+				₲
 			
 			
 				ᎧᏔᎵ ᎠᏕᎳ
 				ᎧᏔᎵ ᎠᏕᎳ
 				ᎧᏔᎵ ᎠᏕᎳ
+				QAR
 			
 			
 				ᎶᎹᏂᏯ ᎠᏕᎳ
 				ᎶᎹᏂᏯ ᎠᏕᎳ
 				ᎶᎹᏂᏯ ᎠᏕᎳ
+				RON
+				lei
 			
 			
 				ᏒᏈᏯ ᎠᏕᎳ
 				ᏒᏈᏯ ᎠᏕᎳ
 				ᏒᏈᏯ ᎠᏕᎳ
+				RSD
 			
 			
 				ᏲᏂᎢ ᎠᏕᎳ
 				ᏲᏂᎢ ᎠᏕᎳ
 				ᏲᏂᎢ ᎠᏕᎳ
+				RUB
+				₽
 			
 			
 				ᎶᏩᏂᏓ ᎠᏕᎳ
 				ᎶᏩᏂᏓ ᎠᏕᎳ
 				ᎶᏩᏂᏓ ᎠᏕᎳ
+				RWF
+				RF
 			
 			
 				ᏌᎤᏗ ᎠᏕᎳ
 				ᏌᎤᏗ ᎠᏕᎳ
 				ᏌᎤᏗ ᎠᏕᎳ
+				SAR
 			
 			
 				ᏐᎶᎹᏂ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
 				ᏐᎶᎹᏂ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
 				ᏐᎶᎹᏂ ᏚᎦᏚᏛᎢ ᎠᏕᎳ
+				SBD
+				$
 			
 			
 				ᏏᎡᏥᎵᏍ ᎠᏕᎳ
 				ᏏᎡᏥᎵᏍ ᎠᏕᎳ
 				ᏏᎡᏥᎵᏍ ᎠᏕᎳ
+				SCR
 			
 			
 				ᏑᏕᏂ ᎠᏕᎳ
 				ᏑᏕᏂ ᎠᏕᎳ
 				ᏑᏕᏂ ᎠᏕᎳ
+				SDG
 			
 			
 				ᏍᏫᏕᏂ ᎠᏕᎳ
 				ᏍᏫᏕᏂ ᎠᏕᎳ
 				ᏍᏫᏕᏂ ᎠᏕᎳ
+				SEK
+				kr
 			
 			
 				ᏏᏂᎦᏉᎵ ᎠᏕᎳ
 				ᏏᏂᎦᏉᎵ ᎠᏕᎳ
 				ᏏᏂᎦᏉᎵ ᎠᏕᎳ
+				SGD
+				$
 			
 			
 				ᎤᏓᏅᏘ ᎮᎵᎾ ᎠᏕᎳ
 				ᎤᏓᏅᏘ ᎮᎵᎾ ᎠᏕᎳ
 				ᎤᏓᏅᏘ ᎮᎵᎾ ᎠᏕᎳ
+				SHP
+				£
 			
 			
 				ᏏᎡᎳᎴᎣᏂ ᎠᏕᎳ
 				ᏏᎡᎳᎴᎣᏂ ᎠᏕᎳ
 				ᏏᎡᎳᎴᎣᏂ ᎠᏕᎳ
+				SLL
 			
 			
 				ᏐᎹᎵ ᎠᏕᎳ
 				ᏐᎹᎵ ᎠᏕᎳ
 				ᏐᎹᎵ ᎠᏕᎳ
+				SOS
 			
 			
 				ᏒᎵᎾᎻ ᎠᏕᎳ
 				ᏒᎵᎾᎻ ᎠᏕᎳ
 				ᏒᎵᎾᎻ ᎠᏕᎳ
+				SRD
+				$
 			
 			
 				ᏧᎦᎾᏮ ᏑᏕᏂ ᎠᏕᎳ
 				ᏧᎦᎾᏮ ᏑᏕᏂ ᎠᏕᎳ
 				ᏧᎦᎾᏮ ᏑᏕᏂ ᎠᏕᎳ
+				SSP
+				£
 			
 			
 				ᏌᎣᏙᎺ ᎠᎴ ᏈᏂᏏᏇ ᎠᏕᎳ (1977–2017)
 				ᏌᎣᏙᎺ ᎠᎴ ᏈᏂᏏᏇ ᎠᏕᎳ (1977–2017)
 				ᏌᎣᏙᎺ ᎠᎴ ᏈᏂᏏᏇ ᎠᏕᎳ (1977–2017)
+				STD
 			
 			
 				ᏌᎣᏙᎺ & ᏈᏂᏏᏇ ᎠᏕᎳ
 				ᏌᎣᏙᎺ & ᏈᏂᏏᏇ ᎠᏕᎳ
 				ᏌᎣᏙᎺ & ᏈᏂᏏᏇ ᎠᏕᎳ
+				STN
+				Db
 			
 			
 				ᏏᎵᎠ ᎠᏕᎳ
 				ᏏᎵᎠ ᎠᏕᎳ
 				ᏏᎵᎠ ᎠᏕᎳ
+				SYP
+				£
 			
 			
 				ᏍᏩᏏ ᎠᏕᎳ
 				ᏍᏩᏏ ᎠᏕᎳ
 				ᏍᏩᏏ ᎠᏕᎳ
+				SZL
 			
 			
 				ᏔᏯᎴᏂ ᎠᏕᎳ
 				ᏔᏯᎴᏂ ᎠᏕᎳ
 				ᏔᏯᎴᏂ ᎠᏕᎳ
+				THB
+				฿
 			
 			
 				ᏔᏥᎩᏍᏕᏂ ᎠᏕᎳ
 				ᏔᏥᎩᏍᏕᏂ ᎠᏕᎳ
 				ᏔᏥᎩᏍᏕᏂ ᎠᏕᎳ
+				TJS
 			
 			
 				ᏛᎵᎩᎺᏂᏍᏔᏂ ᎠᏕᎳ
 				ᏛᎵᎩᎺᏂᏍᏔᏂ ᎠᏕᎳ
 				ᏛᎵᎩᎺᏂᏍᏔᏂ ᎠᏕᎳ
+				TMT
 			
 			
 				ᏚᏂᏏᏍᎠ ᎠᏕᎳ
 				ᏚᏂᏏᏍᎠ ᎠᏕᎳ
 				ᏚᏂᏏᏍᎠ ᎠᏕᎳ
+				TND
 			
 			
 				ᏔᏂᎪ ᎠᏕᎳ
 				ᏔᏂᎪ ᎠᏕᎳ
 				ᏔᏂᎪ ᎠᏕᎳ
+				TOP
+				T$
 			
 			
 				ᎬᏃ ᎠᏕᎳ
 				ᎬᏃ ᎠᏕᎳ
 				ᎬᏃ ᎠᏕᎳ
+				TRY
+				₺
+				TL
 			
 			
 				ᏟᏂᏕᏗ & ᏙᏆᎪ ᎠᏕᎳ
 				ᏟᏂᏕᏗ & ᏙᏆᎪ ᎠᏕᎳ
 				ᏟᏂᏕᏗ & ᏙᏆᎪ ᎠᏕᎳ
+				TTD
+				$
 			
 			
 				ᎢᏤ ᏔᎢᏩᏂ ᎠᏕᎳ
 				ᎢᏤ ᏔᎢᏩᏂ ᎠᏕᎳ
 				ᎢᏤ ᏔᎢᏩᏂ ᎠᏕᎳ
+				NT$
+				$
 			
 			
 				ᏖᏂᏏᏂᏯ ᎠᏕᎳ
 				ᏖᏂᏏᏂᏯ ᎠᏕᎳ
 				ᏖᏂᏏᏂᏯ ᎠᏕᎳ
+				TZS
 			
 			
 				ᏳᎧᎴᏂ ᎠᏕᎳ
 				ᏳᎧᎴᏂ ᎠᏕᎳ
 				ᏳᎧᎴᏂ ᎠᏕᎳ
+				UAH
+				₴
 			
 			
 				ᏳᎦᏂᏓ ᎠᏕᎳ
 				ᏳᎦᏂᏓ ᎠᏕᎳ
 				ᏳᎦᏂᏓ ᎠᏕᎳ
+				UGX
 			
 			
 				US ᎠᏕᎳ
 				US ᎠᏕᎳ
 				US ᎠᏕᎳ
 				$
+				$
 			
 			
 				ᏳᎷᏇ ᎠᏕᎳ
 				ᏳᎷᏇ ᎠᏕᎳ
 				ᏳᎷᏇ ᎠᏕᎳ
+				UYU
+				$
 			
 			
 				ᎤᏍᏇᎩᏍᏖᏂ ᎠᏕᎳ
 				ᎤᏍᏇᎩᏍᏖᏂ ᎠᏕᎳ
 				ᎤᏍᏇᎩᏍᏖᏂ ᎠᏕᎳ
+				UZS
 			
 			
 				ᏪᏁᏑᏪ ᎠᏕᎳ (2008–2018)
 				ᏪᏁᏑᏪᎳ ᎠᏕᎳ
 				ᏪᏁᏑᏪᎳ ᎠᏕᎳ
+				VEF
+				Bs
 			
 			
 				ᏪᏁᏑᏪ ᎠᏕᎳ
 				ᏪᏁᏑᏪ ᎠᏕᎳ
 				ᏪᏁᏑᏪ ᎠᏕᎳ
+				VES
 			
 			
 				ᏫᎡᏘᎾᎻᏍ ᎠᏕᎳ
 				ᏫᎡᏘᎾᎻᏍ ᎠᏕᎳ
 				ᏫᎡᏘᎾᎻᏍ ᎠᏕᎳ
+				₫
+				₫
 			
 			
 				ᏩᏂᎤᏩᏚ ᎠᏕᎳ
 				ᏩᏂᎤᏩᏚ ᎠᏕᎳ
 				ᏩᏂᎤᏩᏚ ᎠᏕᎳ
+				VUV
 			
 			
 				ᏌᎼᎠ ᎠᏕᎳ
 				ᏌᎼᎠ ᎠᏕᎳ
 				ᏌᎼᎠ ᎠᏕᎳ
+				WST
 			
 			
 				ᎠᏰᏟ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ
 				ᎠᏰᏟ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ
 				ᎠᏰᏟ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ
+				FCFA
 			
 			
 				ᏗᎧᎸᎬ ᎨᏆᏙᏯ ᎠᏕᎳ
 				ᏗᎧᎸᎬ ᎨᏆᏙᏯ ᎠᏕᎳ
 				ᏗᎧᎸᎬ ᎨᏆᏙᏯ ᎠᏕᎳ
+				EC$
+				$
 			
 			
 				ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ
 				ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ
 				ᏭᏕᎵᎬ ᎬᎿᎨᏍᏛ CFA ᎠᏕᎳ
+				CFA
 			
 			
 				CFP ᎠᏕᎳ
 				CFP ᎠᏕᎳ
 				CFP ᎠᏕᎳ
+				CFPF
 			
 			
 				ᏄᏬᎵᏍᏛᎾ ᎠᏕᎳ
@@ -5391,16 +5674,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ᏰᎺᏂ ᎠᏕᎳ
 				ᏰᎺᏂ ᎠᏕᎳ
 				ᏰᎺᏂ ᎠᏕᎳ
+				YER
 			
 			
 				ᏧᎦᎾᏮ ᎬᎿᎨᏍᏛ ᎠᏕᎳ
 				ᏧᎦᎾᏮ ᎬᎿᎨᏍᏛ ᎠᏕᎳ
 				ᏧᎦᎾᏮ ᎬᎿᎨᏍᏛ ᎠᏕᎳ
+				ZAR
+				R
 			
 			
 				ᏏᎻᏆᏇ ᎠᏕᎳ
 				ᏏᎻᏆᏇ ᎠᏕᎳ
 				ᏏᎻᏆᏇ ᎠᏕᎳ
+				ZMW
+				ZK
 			
 		
 		
@@ -5630,6 +5918,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᏍᎪᎯᏧᏈ ᏧᏕᏘᏴᏓ
 				{0} ᏍᎪᎯᏧᏈ ᏧᏕᏘᏴᏓ
 			
+			
+				ᏍᎪᎯ ᏧᏕᏘᏴᏓ
+				{0} ᏍᎪᎯ ᏧᏕᏘᏴᏓ
+				{0} ᏍᎪᎯ ᏧᏕᏘᏴᏓ
+			
 			
 				ᏧᏕᏘᏴᏌᏗᏒᎢ
 				{0} ᎤᏕᏘᏴᏌᏗᏒᎢ
@@ -5747,6 +6040,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᏈᏗᏏ ᏗᎬᏍᎦᏢᏗ ᏂᎨᏒᎾ ᏓᎪᎵᏰᎥ ᏭᏍᏗᎬ ᎧᎵᎨᏒ
 				{0} ᏈᏗᏏ ᏗᎬᏍᎦᏢᏗ ᏂᎨᏒᎾ ᏓᎪᎵᏰᎥ ᏭᏍᏗᎬ ᎧᎵᎨᏒ
 			
+			
+				US ᎤᏗᏞᎬᎢ
+				{0} US ᎤᏗᏞᎬᎢ
+				{0} US ᎤᏗᏞᎬᎢ
+			
 			
 				ᏑᏓᎨᏓ ᎾᎿ ᎦᏌᏙᏯᏍᏗ
 				{0} ᏑᏓᎨᏓ ᎾᎿ ᎦᏌᏙᏯᏍᏗ
@@ -5777,6 +6075,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᎭᏥ
 				{0} ᎭᏥ
 			
+			
+				ᎪᏪᎸ em
+			
+			
+				ᏗᏇᎦᏎᎵ
+				{0} ᏇᎦᏎᎵ
+				{0} ᏗᏇᎦᏎᎵ
+			
+			
+				ᏧᏔᎾ ᏗᏇᎦᏎᎵ
+				{0} ᎤᏔᎾ ᏇᎦᏎᎵ
+				{0} ᏧᏔᎾ ᏗᏇᎦᏎᎵ
+			
+			
+				ᏗᏇᎦᏎᎵ ᎤᏍᏗ ᎠᏟᎶᏗ ᎢᏳᏓᎵ
+				{0} ᏇᎦᏎᎵ ᎤᏍᏗ ᎠᏟᎶᏗ ᎢᏳᏓᎵ
+				{0} ᏗᏇᎦᏎᎵ ᎤᏍᏗ ᎠᏟᎶᏗ ᎢᏳᏓᎵ
+			
+			
+				ᏗᏇᎦᏎᎵ ᎢᏏᎳᏗᏍᏗ ᎢᏳᏓᎵ
+				{0} ᏇᎦᏎᎵ ᎢᏏᎳᏗᏍᏗ ᎢᏳᏓᎵ
+				{0} ᏗᏇᎦᏎᎵ ᎢᏏᎳᏗᏍᏗ ᎢᏳᏓᎵ
+			
+			
+				ᏧᏓᏓᎸ ᎤᏍᏗ ᎠᏟᎶᏗ ᎢᏳᏓᎵ
+				{0} ᎤᏓᏓᎸ ᎤᏍᏗ ᎠᏟᎶᏗ ᎢᏳᏓᎵ
+				{0} ᏧᏓᏓᎸ ᎤᏍᏗ ᎠᏟᎶᏗ ᎢᏳᏓᎵ
+			
+			
+				ᏧᏓᏓᎸ ᎢᏏᎳᏗᏍᏗ ᎢᏳᏓᎵ
+				{0} ᎤᏓᏓᎸ ᎢᏏᎳᏗᏍᏗ ᎢᏳᏓᎵ
+				{0} ᏧᏓᏓᎸ ᎢᏏᎳᏗᏍᏗ ᎢᏳᏓᎵ
+			
 			
 				ᎠᎦᏴᎵ ᏗᏟᎶᏍᏗ
 				{0} ᎠᎦᏴᎵ ᎠᏟᎶᏍᏗ
@@ -5986,11 +6317,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᏐᏈᎵ ᎢᏳᎳᏂᎩᏛ
 				{0} ᏐᏈᎵ ᎢᏳᎳᏂᎩᏛ
 			
-			
-				ᎮᏔ ᏗᏆᏌᎵ
-				{0} ᎮᏔ ᏆᏌᎵ
-				{0} ᎮᏔ ᏗᏆᏌᎵ
-			
 			
 				ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᏗᏟᎶᏗ ᎾᎿ ᎹᎫᎢ
 				{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎠᏟᎶᏗ ᎾᎿ ᎹᎫᎢ
@@ -6006,9 +6332,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᎢᏗᎳᏏᏗ ᎾᎿ ᎹᎫᎢ
 				{0} ᎢᏏᏔᏗᏍᏗ ᎾᎿ ᎹᎫᎢ
 			
+			
+				ᏕᎦᎾᎸᎢ
+				{0} ᎦᎾᎸᎢ
+				{0} ᏕᎦᎾᎸᎢ
+			
 			
 				ᎢᏯᎦᏴᎵ ᏕᎦᎾᎸᎢ
-				{0} ᎢᎦᎦᏴᎵ
+				{0} ᎢᎦᎦᏴᎵ ᎦᎾᎸᎢ
 				{0} ᎢᏯᎦᏴᎵ ᏕᎦᎾᎸᎢ
 			
 			
@@ -6016,6 +6347,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᎦᏃᎴᏍᎬ
 				{0} ᏗᎦᏃᎴᏍᎬ
 			
+			
+				ᏗᏆᏌᎵ
+				{0} ᏆᏌᎵ
+				{0} ᏗᏆᏌᎵ
+			
+			
+				ᎮᏔ ᏗᏆᏌᎵ
+				{0} ᎮᏔ ᏆᏌᎵ
+				{0} ᎮᏔ ᏗᏆᏌᎵ
+			
 			
 				ᎩᎶᏆᏍᎧᎵᏍ
 				{0} ᎩᎶᏆᏍᎧᎵᏍ
@@ -6433,6 +6774,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ᏍᏧ
 				{0} ᏍᏧ
 			
+			
+				ᏍᎪᎯ
+				{0} ᏍᎪᎯ
+				{0} ᏍᎪᎯ
+			
 			
 				ᏧᏕᏘᏴᏌᏗᏒᎢ
 				{0} ᎤᏕ
@@ -6550,6 +6896,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Btu
 				{0} Btu
 			
+			
+				US ᎤᏗᏞᎬᎢ
+				{0} US ᎤᏗᏞᎬ
+				{0} US ᎤᏗᏞᎬ
+			
 			
 				ᏑᏓᎨᏓ-ᎦᏌᏙᏯᏍᏗ
 				{0} lbf
@@ -6580,6 +6931,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Hz
 				{0} Hz
 			
+			
+				ᏗᏇᎦᏎᎵ
+			
+			
+				ᏧᏔᎾ ᏗᏇᎦᏎᎵ
+			
 			
 				ᎠᏗ
 				{0} ᎠᏗ
@@ -6789,11 +7146,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -6819,6 +7171,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -7157,14 +7514,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} ᎠᎴᏱᎩ {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, & {1}
 			{0}, {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, & {1}
 			{0} & {1}
 		
@@ -7199,7 +7551,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} — ᎤᏠᏯᏉᏗᏙᎵᎩ
 		{0} — ᎠᏠᏯᏍᏔᏅ
 		{0} — ᎦᏅᎯᏓ
-		{0} — ᎤᎵᏍᎨᏗ ᏂᏧᎵᏍᏔᏅᏍᏔᏅ
 		{0} — ᏧᏓᎴᏅᏛ
 		{0} — ᏐᎢ
 		ᏗᎧᏁᎢᏍᏗ — {0}
diff --git a/make/data/cldr/common/main/chr_US.xml b/make/data/cldr/common/main/chr_US.xml
index 5acd81531de..39d17ffd9e5 100644
--- a/make/data/cldr/common/main/chr_US.xml
+++ b/make/data/cldr/common/main/chr_US.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ckb.xml b/make/data/cldr/common/main/ckb.xml
index fe20dfbb71a..39c5e566d78 100644
--- a/make/data/cldr/common/main/ckb.xml
+++ b/make/data/cldr/common/main/ckb.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -137,7 +137,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			كرواتی
 			سربیی سەروو
 			کریولی هائیتی
-			هەنگاری (مەجاری)
+			هەنگاری
 			هووپا
 			ئەرمەنی
 			هێرێرۆ
@@ -523,7 +523,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			کەنەدا
 			دوورگەکانی کیلینگ
 			کۆنگۆ کینشاسا
-			کۆماری دیموکراتیکی کۆنگۆ
+			کۆماری دیموکراتیی کۆنگۆ
 			کۆماری ئەفریقای ناوەڕاست
 			کۆنگۆ برازاڤیل
 			کۆماری کۆنگۆ
@@ -561,7 +561,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ناوچەی یۆرۆ
 			فینلاند
 			فیجی
-			دوورگەکانی مالڤیناس
+			دوورگەکانی مالڤیناس (دوورگەکانی فاڵکلاند)
 			مایکرۆنیزیا
 			دوورگەکانی فارەو
 			فەڕەنسا
@@ -608,7 +608,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ئوردن
 			ژاپۆن
 			کینیا
-			قرغیزستان
+			کرگیزستان
 			کەمبۆدیا
 			کیریباس
 			دوورگەکانی کۆمۆر
@@ -636,7 +636,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سەن مارتین
 			ماداگاسکار
 			دوورگەکانی مارشاڵ
-			ماکەدۆنیا
+			مەکدۆنیای باکوور
 			مالی
 			میانمار
 			مەنگۆلیا
@@ -790,7 +790,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ھ ە و ۆ ی ێ]
 		[\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 ء آ أ ؤ إ ة ث ذ ص ض ط ظ ك ه ى ي]
 		[ئ ا ب پ ت ج چ ح خ د ر ز ڕ ژ س ش ع غ ف ڤ ق ک گ ل ڵ م ن ھ ە و ۆ ی ێ]
-		[\u200E\u200F \- , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]
+		[\u200E\u200F \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]
 	
 	
 		
@@ -1550,8 +1550,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			.
 			,
 			%
-			‎+ 
-			- 
+			‎+
+			-
 			E
 			×
 			‰
diff --git a/make/data/cldr/common/main/ckb_IQ.xml b/make/data/cldr/common/main/ckb_IQ.xml
index 79bdb39460c..46dc460ece6 100644
--- a/make/data/cldr/common/main/ckb_IQ.xml
+++ b/make/data/cldr/common/main/ckb_IQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ckb_IR.xml b/make/data/cldr/common/main/ckb_IR.xml
index bdaa21ab1f7..e372aed222f 100644
--- a/make/data/cldr/common/main/ckb_IR.xml
+++ b/make/data/cldr/common/main/ckb_IR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/cs.xml b/make/data/cldr/common/main/cs.xml
index 00e8093021c..0496e49ae69 100644
--- a/make/data/cldr/common/main/cs.xml
+++ b/make/data/cldr/common/main/cs.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -166,7 +166,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			angličtina (Velká Británie)
 			angličtina (VB)
 			angličtina (USA)
-			angličtina (USA)
 			angličtina (středověká)
 			esperanto
 			španělština
@@ -618,6 +617,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jorubština
 			nheengatu
 			kantonština
+			jüe
 			čuangština
 			zapotéčtina
 			bliss systém
@@ -625,7 +625,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			zenaga
 			tamazight (standardní marocký)
 			čínština
+			standardní čínština
 			čínština (zjednodušená)
+			standardní čínština (zjednodušená)
+			standardní čínština (tradiční)
 			zuluština
 			zunijština
 			žádný jazykový obsah
@@ -1064,6 +1067,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Svatý Martin (Nizozemsko)
 			Sýrie
 			Svazijsko
+			Eswatini
 			Tristan da Cunha
 			Turks a Caicos
 			Čad
@@ -1073,6 +1077,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tádžikistán
 			Tokelau
 			Východní Timor
+			Timor-Leste
 			Turkmenistán
 			Tunisko
 			Tonga
@@ -1099,8 +1104,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis a Futuna
 			Samoa
-			simulovaná diakritika
-			simulovaný obousměrný zápis
+			simulovaná diakritika
+			simulovaný obousměrný zápis
 			Kosovo
 			Jemen
 			Mayotte
@@ -1117,13 +1122,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Kalendář
 			Měnový formát
-			Ignorovat řazení symbolů
-			Obrácené řazení akcentů
-			Řazení velkých a malých písmen
-			Rozlišovaní velkých a malých písmen při řazení
+			Ignorovat řazení symbolů
+			Obrácené řazení akcentů
+			Řazení velkých a malých písmen
+			Rozlišování velkých a malých písmen při řazení
 			Řazení
-			Normalizované řazení
-			Číselné řazení
+			Normalizované řazení
+			Číselné řazení
 			Míra řazení
 			Měna
 			Hodinový cyklus (12 vs. 24)
@@ -1290,8 +1295,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á b c č d ď e é ě f g h {ch} i í j k l m n ň o ó p q r ř s š t ť u ú ů v w x y ý z ž]
 		[à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ľ ł ñ ò ŏ ô ö ø ō œ ŕ ù ŭ û ü ū ÿ]
 		[A B C Č D E F G H {CH} I J K L M N O P Q R Ř S Š T U V W X Y Z Ž]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] § @ * / \&]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] § @ * / \&]
 		{0}…
 		… {0}
 		{0}… {1}
@@ -1300,19 +1305,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0}… {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1358,8 +1367,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -1367,8 +1397,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -1388,20 +1420,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -1466,7 +1517,657 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+					
+					
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1634,6 +2335,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 				
 					
 						
@@ -1657,8 +2372,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -1666,8 +2402,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -1687,20 +2425,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -1767,6 +2524,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							První měsíc
 							Druhý měsíc
@@ -1783,6 +2568,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							První měsíc
 							Druhý měsíc
@@ -1799,7 +2612,652 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1982,8 +3440,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -1991,8 +3470,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -2012,20 +3493,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -2233,17 +3733,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E d. M. – E d. M. y G
 							E d. M. y – E d. M. y G
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -2324,6 +3842,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							lis
 							pro
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ledna
 							února
@@ -2354,6 +3886,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							lis
 							pro
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							leden
 							únor
@@ -2565,11 +4111,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						před naším letopočtem
+						před naším letopočtem
 						našeho letopočtu
+						našeho letopočtu
 					
 					
 						př. n. l.
+						př. n. l.
 						n. l.
+						n. l.
 					
 					
 						př.n.l.
@@ -2984,8 +4534,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -2993,8 +4564,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -3014,20 +4587,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -3216,8 +4808,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -3225,8 +4838,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -3246,20 +4861,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -3448,8 +5082,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -3457,8 +5112,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -3478,20 +5135,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -3558,34 +5234,718 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
 						Tenpyō-hōji (757-765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
+						Kahō (1094–1096)
+						Eichō (1096–1097)
+						Jōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
 						Ten-ei (1110-1113)
+						Eikyū (1113–1118)
+						Gen’ei (1118–1120)
+						Hōan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
+						Hōen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
+						Hōgen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
+						Ken’ei (1206–1207)
+						Jōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
+						Jōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
+						Tenpuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
+						En’ō (1239–1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
+						Bun’ō (1260–1261)
+						Kōchō (1261–1264)
+						Bun’ei (1264–1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
+						Enkyō (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
+						Genkō (1321–1324)
+						Shōchū (1324–1326)
+						Karyaku (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
+						Kenmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
+						Bun’an (1444–1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
+						Tenbun (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
+						Genna (1615–1624)
+						Kan’ei (1624–1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
+						Jōō (1652–1655)
+						Meireki (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
+						Tenna (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
+						Kan’en (1748–1751)
+						Hōreki (1751–1764)
+						Meiwa (1764–1772)
+						An’ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
+						Man’en (1860–1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
 						Tenpyō-hōji (757-765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
+						Kahō (1094–1096)
+						Eichō (1096–1097)
+						Jōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
 						Ten-ei (1110-1113)
+						Eikyū (1113–1118)
+						Gen’ei (1118–1120)
+						Hōan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
+						Hōen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
+						Hōgen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
+						Ken’ei (1206–1207)
+						Jōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
+						Jōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
+						Tenpuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
+						En’ō (1239–1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
+						Bun’ō (1260–1261)
+						Kōchō (1261–1264)
+						Bun’ei (1264–1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
+						Enkyō (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
+						Genkō (1321–1324)
+						Shōchū (1324–1326)
+						Karyaku (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
+						Kenmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
+						Bun’an (1444–1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
+						Tenbun (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
+						Genna (1615–1624)
+						Kan’ei (1624–1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
+						Jōō (1652–1655)
+						Meireki (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
+						Tenna (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
+						Kan’en (1748–1751)
+						Hōreki (1751–1764)
+						Meiwa (1764–1772)
+						An’ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
+						Man’en (1860–1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
 						Tenpyō-hōji (757-765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
+						Kahō (1094–1096)
+						Eichō (1096–1097)
+						Jōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
 						Ten-ei (1110-1113)
+						Eikyū (1113–1118)
+						Gen’ei (1118–1120)
+						Hōan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
+						Hōen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
+						Hōgen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
+						Ken’ei (1206–1207)
+						Jōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
+						Jōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
+						Tenpuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
+						En’ō (1239–1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
+						Bun’ō (1260–1261)
+						Kōchō (1261–1264)
+						Bun’ei (1264–1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
+						Enkyō (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
+						Genkō (1321–1324)
+						Shōchū (1324–1326)
+						Karyaku (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
+						Kenmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
+						Bun’an (1444–1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
+						Tenbun (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
+						Genna (1615–1624)
+						Kan’ei (1624–1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
+						Jōō (1652–1655)
+						Meireki (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
+						Tenna (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
+						Kan’en (1748–1751)
+						Hōreki (1751–1764)
+						Meiwa (1764–1772)
+						An’ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
+						Man’en (1860–1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						M
+						T
+						S
+						H
 					
 				
 				
@@ -3611,8 +5971,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -3620,8 +6001,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -3641,20 +6024,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -3843,8 +6245,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						LLLL y G
@@ -3852,8 +6275,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d. M. y G
 						d. MMMM y G
 						E d. MMMM y G
+						L
 						d. M.
 						E d. M.
+						LLL
 						d. M.
 						E d. M.
 						d. MMMM
@@ -3873,20 +6298,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
 						
 							d.–d.
 						
+						
+							h a – h a
+							h–h a
+						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							H:mm–H:mm
 							H:mm–H:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -3987,6 +6431,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+				
 			
 		
 		
@@ -4857,6 +7323,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					Koordinovaný světový čas
 				
+				
+					UTC
+				
 			
 			
 				neznámé město
@@ -5525,7 +7994,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktobe
 			
 			
-				Kostanaj
+				Kostanaj
 			
 			
 				Kyzylorda
@@ -6862,7 +9331,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Norfolský čas
+					Norfolkský čas
 				
 			
 			
@@ -6943,7 +9412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Čas Pitcairnova ostrova
+					Čas Pitcairnových ostrovů
 				
 			
 			
@@ -7147,10 +9616,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			latn
 		
 		1
+		
+			٫
+			٬
+			؛
+			٪؜
+			؜+
+			؜-
+			اس
+			×
+			؉
+			∞
+			NaN
+			:
+		
+		
+			٫
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
 		
 			,
 			 
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -7158,7 +9710,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 			:
 		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
+		
+			:
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tisíc
@@ -7351,6 +9974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				andorrské pesety
 				andorrské pesety
 				andorrských peset
+				ADP
 			
 			
 				SAE dirham
@@ -7358,6 +9982,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				SAE dirhamy
 				SAE dirhamu
 				SAE dirhamů
+				AED
 			
 			
 				afghánský afghán (1927–2002)
@@ -7365,6 +9990,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afghánské afghány (1927–2002)
 				afghánského afghánu (1927–2002)
 				afghánských afghánů (1927–2002)
+				AFA
 			
 			
 				afghánský afghán
@@ -7372,6 +9998,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afghánské afghány
 				afghánského afghánu
 				afghánských afghánů
+				AFN
 			
 			
 				albánský lek (1946–1965)
@@ -7379,6 +10006,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				albánské leky (1946–1965)
 				albánského leku (1946–1965)
 				albánských leků (1946–1965)
+				ALK
 			
 			
 				albánský lek
@@ -7386,6 +10014,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				albánské leky
 				albánského leku
 				albánských leků
+				ALL
 			
 			
 				arménský dram
@@ -7393,6 +10022,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arménské dramy
 				arménského dramu
 				arménských dramů
+				AMD
 			
 			
 				nizozemskoantilský gulden
@@ -7400,6 +10030,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nizozemskoantilské guldeny
 				nizozemskoantilského guldenu
 				nizozemskoantilských guldenů
+				ANG
 			
 			
 				angolská kwanza
@@ -7407,6 +10038,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				angolské kwanzy
 				angolské kwanzy
 				angolských kwanz
+				AOA
 				Kz
 			
 			
@@ -7415,6 +10047,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				angolské kwanzy (1977–1991)
 				angolské kwanzy (1977–1991)
 				angolských kwanz (1977–1991)
+				AOK
 			
 			
 				angolská kwanza (1990–2000)
@@ -7422,6 +10055,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				angolské kwanzy (1990–2000)
 				angolské kwanzy (1990–2000)
 				angolských kwanz (1990–2000)
+				AON
 			
 			
 				angolská kwanza (1995–1999)
@@ -7429,6 +10063,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				angolská kwanza (1995–1999)
 				angolské kwanzy (1995–1999)
 				angolských kwanz (1995–1999)
+				AOR
 			
 			
 				argentinský austral
@@ -7436,6 +10071,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinské australy
 				argentinského australu
 				argentinských australů
+				ARA
 			
 			
 				argentinské peso ley (1970–1983)
@@ -7443,6 +10079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinská pesa ley (1970–1983)
 				argentinského pesa ley (1970–1983)
 				argentinských pes ley (1970–1983)
+				ARL
 			
 			
 				argentinské peso (1881–1970)
@@ -7450,6 +10087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinská pesa (1881–1970)
 				argentinského pesa (1881–1970)
 				argentinských pes (1881–1970)
+				ARM
 			
 			
 				argentinské peso (1983–1985)
@@ -7457,6 +10095,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinská pesa (1983–1985)
 				argentinského pesa (1983–1985)
 				argentinských pes (1983–1985)
+				ARP
 			
 			
 				argentinské peso
@@ -7464,6 +10103,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinská pesa
 				argentinského pesa
 				argentinských pes
+				ARS
 				$
 			
 			
@@ -7472,6 +10112,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rakouské šilinky
 				rakouského šilinku
 				rakouských šilinků
+				ATS
 			
 			
 				australský dolar
@@ -7488,6 +10129,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arubské zlaté
 				arubského zlatého
 				arubských zlatých
+				AWG
 			
 			
 				ázerbájdžánský manat (1993–2006)
@@ -7495,6 +10137,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ázerbájdžánské manaty (1993–2006)
 				ázerbájdžánského manatu (1993–2006)
 				ázerbájdžánských manatů (1993–2006)
+				AZM
 			
 			
 				ázerbájdžánský manat
@@ -7502,6 +10145,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ázerbájdžánské manaty
 				ázerbájdžánského manatu
 				ázerbájdžánských manatů
+				AZN
 			
 			
 				bosenský dinár (1992–1994)
@@ -7509,6 +10153,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bosenské dináry (1992–1994)
 				bosenského dináru (1992–1994)
 				bosenských dinárů (1992–1994)
+				BAD
 			
 			
 				bosenská konvertibilní marka
@@ -7516,6 +10161,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bosenské konvertibilní marky
 				bosenské konvertibilní marky
 				bosenských konvertibilních marek
+				BAM
 				KM
 			
 			
@@ -7524,6 +10170,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bosenské nové dináry (1994–1997)
 				bosenského nového dináru (1994–1997)
 				bosenských nových dinárů (1994–1997)
+				BAN
 			
 			
 				barbadoský dolar
@@ -7531,6 +10178,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				barbadoské dolary
 				barbadoského dolaru
 				barbadoských dolarů
+				BBD
 				$
 			
 			
@@ -7539,6 +10187,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bangladéšské taky
 				bangladéšské taky
 				bangladéšských tak
+				BDT
 				৳
 			
 			
@@ -7547,6 +10196,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				belgické konvertibilní franky
 				belgického konvertibilního franku
 				belgických konvertibilních franků
+				BEC
 			
 			
 				belgický frank
@@ -7554,6 +10204,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				belgické franky
 				belgického franku
 				belgických franků
+				BEF
 			
 			
 				belgický finanční frank
@@ -7561,6 +10212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				belgické finanční franky
 				belgického finančního franku
 				belgických finančních franků
+				BEL
 			
 			
 				bulharský tvrdý leva
@@ -7568,6 +10220,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bulharské tvrdé leva
 				bulharského tvrdého leva
 				bulharských tvrdých leva
+				BGL
 			
 			
 				bulharský socialistický leva
@@ -7575,6 +10228,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bulharské socialistické leva
 				bulharského socialistického leva
 				bulharských socialistických leva
+				BGM
 			
 			
 				bulharský leva
@@ -7582,6 +10236,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bulharské leva
 				bulharského leva
 				bulharských leva
+				BGN
 			
 			
 				bulharský lev (1879–1952)
@@ -7589,6 +10244,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bulharské leva (1879–1952)
 				bulharského leva (1879–1952)
 				bulharských leva (1879–1952)
+				BGO
 			
 			
 				bahrajnský dinár
@@ -7596,6 +10252,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahrajnské dináry
 				bahrajnského dináru
 				bahrajnských dinárů
+				BHD
 			
 			
 				burundský frank
@@ -7603,6 +10260,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				burundské franky
 				burundského franku
 				burundských franků
+				BIF
 			
 			
 				bermudský dolar
@@ -7610,6 +10268,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bermudské dolary
 				bermudského dolaru
 				bermudských dolarů
+				BMD
 				$
 			
 			
@@ -7618,6 +10277,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brunejské dolary
 				brunejského dolaru
 				brunejských dolarů
+				BND
 				$
 			
 			
@@ -7626,6 +10286,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolivijské bolivianos
 				bolivijského boliviana
 				bolivijských bolivianos
+				BOB
 				Bs
 			
 			
@@ -7634,6 +10295,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolivijské bolivianos (1863–1963)
 				bolivijského boliviana (1863–1963)
 				bolivijských bolivianos (1863–1963)
+				BOL
 			
 			
 				bolivijské peso
@@ -7641,6 +10303,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolivijská pesa
 				bolivijského pesa
 				bolivijských pes
+				BOP
 			
 			
 				bolivijský mvdol
@@ -7648,6 +10311,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolivijské mvdoly
 				bolivijského mvdolu
 				bolivijských mvdolů
+				BOV
 			
 			
 				brazilské nové cruzeiro (1967–1986)
@@ -7655,6 +10319,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilská nová cruzeira (1967–1986)
 				brazilského nového cruzeira (1967–1986)
 				brazilských nových cruzeir (1967–1986)
+				BRB
 			
 			
 				brazilské cruzado (1986–1989)
@@ -7662,6 +10327,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilská cruzada (1986–1989)
 				brazilského cruzada (1986–1989)
 				brazilských cruzad (1986–1989)
+				BRC
 			
 			
 				brazilské cruzeiro (1990–1993)
@@ -7669,6 +10335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilská cruzeira (1990–1993)
 				brazilského cruzeira (1990–1993)
 				brazilských cruzeir (1990–1993)
+				BRE
 			
 			
 				brazilský real
@@ -7676,6 +10343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilské realy
 				brazilského realu
 				brazilských realů
+				R$
 				R$
 			
 			
@@ -7684,6 +10352,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilská nová cruzada (1989–1990)
 				brazilského nového cruzada (1989–1990)
 				brazilských nových cruzad (1989–1990)
+				BRN
 			
 			
 				brazilské cruzeiro (1993–1994)
@@ -7691,6 +10360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilská cruzeira (1993–1994)
 				brazilského cruzeira (1993–1994)
 				brazilských cruzeir (1993–1994)
+				BRR
 			
 			
 				brazilské cruzeiro (1942–1967)
@@ -7698,6 +10368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilská cruzeira (1942–1967)
 				brazilského cruzeira (1942–1967)
 				brazilských cruzeir (1942–1967)
+				BRZ
 			
 			
 				bahamský dolar
@@ -7705,6 +10376,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahamské dolary
 				bahamského dolaru
 				bahamských dolarů
+				BSD
 				$
 			
 			
@@ -7713,6 +10385,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bhútánské ngultrumy
 				bhútánského ngultrumu
 				bhútánských ngultrumů
+				BTN
 			
 			
 				barmský kyat
@@ -7720,6 +10393,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				barmské kyaty
 				barmského kyatu
 				barmských kyatů
+				BUK
 			
 			
 				botswanská pula
@@ -7727,6 +10401,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				botswanské puly
 				botswanské puly
 				botswanských pul
+				BWP
 				P
 			
 			
@@ -7735,6 +10410,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				běloruské rubly (1994–1999)
 				běloruského rublu (1994–1999)
 				běloruských rublů (1994–1999)
+				BYB
 			
 			
 				běloruský rubl
@@ -7742,6 +10418,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				běloruské rubly
 				běloruského rublu
 				běloruských rublů
+				BYN
 				р.
 			
 			
@@ -7750,6 +10427,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				běloruské rubly (2000–2016)
 				běloruského rublu (2000–2016)
 				běloruských rublů (2000–2016)
+				BYR
 			
 			
 				belizský dolar
@@ -7757,6 +10435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				belizské dolary
 				belizského dolaru
 				belizských dolarů
+				BZD
 				$
 			
 			
@@ -7765,6 +10444,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kanadské dolary
 				kanadského dolaru
 				kanadských dolarů
+				CA$
 				$
 			
 			
@@ -7773,6 +10453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				konžské franky
 				konžského franku
 				konžských franků
+				CDF
 			
 			
 				švýcarské WIR-euro
@@ -7780,6 +10461,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				švýcarská WIR-eura
 				švýcarského WIR-eura
 				švýcarských WIR-eur
+				CHE
 			
 			
 				švýcarský frank
@@ -7787,6 +10469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				švýcarské franky
 				švýcarského franku
 				švýcarských franků
+				CHF
 			
 			
 				švýcarský WIR-frank
@@ -7794,6 +10477,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				švýcarské WIR-franky
 				švýcarského WIR-franku
 				švýcarských WIR-franků
+				CHW
 			
 			
 				chilské escudo
@@ -7801,6 +10485,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chilská escuda
 				chilského escuda
 				chilských escud
+				CLE
 			
 			
 				chilská účetní jednotka (UF)
@@ -7808,6 +10493,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chilské účetní jednotky (UF)
 				chilské účetní jednotky (UF)
 				chilských účetních jednotek (UF)
+				CLF
 			
 			
 				chilské peso
@@ -7815,6 +10501,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chilská pesa
 				chilského pesa
 				chilských pes
+				CLP
 				$
 			
 			
@@ -7831,6 +10518,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				čínské dolary ČLB
 				čínského dolaru ČLB
 				čínských dolarů ČLB
+				CNX
 			
 			
 				čínský jüan
@@ -7838,6 +10526,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				čínské jüany
 				čínského jüanu
 				čínských jüanů
+				CN¥
 				¥
 			
 			
@@ -7846,6 +10535,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kolumbijská pesa
 				kolumbijského pesa
 				kolumbijských pes
+				COP
 				$
 			
 			
@@ -7854,6 +10544,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kolumbijské jednotky reálné hodnoty
 				kolumbijské jednotky reálné hodnoty
 				kolumbijských jednotek reálné hodnoty
+				COU
 			
 			
 				kostarický colón
@@ -7861,6 +10552,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kostarické colóny
 				kostarického colónu
 				kostarických colónů
+				CRC
 				₡
 			
 			
@@ -7869,6 +10561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				srbské dináry (2002–2006)
 				srbského dináru (2002–2006)
 				srbských dinárů (2002–2006)
+				CSD
 			
 			
 				československá koruna
@@ -7884,6 +10577,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kubánská konvertibilní pesa
 				kubánského konvertibilního pesa
 				kubánských konvertibilních pes
+				CUC
 				$
 			
 			
@@ -7892,6 +10586,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kubánská pesa
 				kubánského pesa
 				kubánských pes
+				CUP
 				$
 			
 			
@@ -7900,6 +10595,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kapverdská escuda
 				kapverdského escuda
 				kapverdských escud
+				CVE
 			
 			
 				kyperská libra
@@ -7907,6 +10603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kyperské libry
 				kyperské libry
 				kyperských liber
+				CYP
 			
 			
 				česká koruna
@@ -7923,6 +10620,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				východoněmecké marky
 				východoněmecké marky
 				východoněmeckých marek
+				DDM
 			
 			
 				německá marka
@@ -7930,6 +10628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				německé marky
 				německé marky
 				německých marek
+				DEM
 			
 			
 				džibutský frank
@@ -7937,6 +10636,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				džibutské franky
 				džibutského franku
 				džibutských franků
+				DJF
 			
 			
 				dánská koruna
@@ -7944,6 +10644,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dánské koruny
 				dánské koruny
 				dánských korun
+				DKK
 				kr
 			
 			
@@ -7952,6 +10653,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dominikánská pesa
 				dominikánského pesa
 				dominikánských pes
+				DOP
 				$
 			
 			
@@ -7960,6 +10662,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				alžírské dináry
 				alžírského dináru
 				alžírských dinárů
+				DZD
 			
 			
 				ekvádorský sucre
@@ -7967,6 +10670,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ekvádorské sucre
 				ekvádorského sucre
 				ekvádorských sucre
+				ECS
 			
 			
 				ekvádorská jednotka konstantní hodnoty
@@ -7974,6 +10678,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ekvádorské jednotky konstantní hodnoty
 				ekvádorské jednotky konstantní hodnoty
 				ekvádorských jednotek konstantní hodnoty
+				ECV
 			
 			
 				estonská koruna
@@ -7981,6 +10686,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				estonské koruny
 				estonské koruny
 				estonských korun
+				EEK
 			
 			
 				egyptská libra
@@ -7988,6 +10694,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				egyptské libry
 				egyptské libry
 				egyptských liber
+				EGP
 				E£
 			
 			
@@ -7996,6 +10703,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				eritrejské nakfy
 				eritrejské nakfy
 				eritrejských nakf
+				ERN
 			
 			
 				španělská peseta („A“ účet)
@@ -8003,6 +10711,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				španělské pesety („A“ účet)
 				španělské pesety („A“ účet)
 				španělských peset („A“ účet)
+				ESA
 			
 			
 				španělská peseta (konvertibilní účet)
@@ -8010,6 +10719,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				španělské pesety (konvertibilní účet)
 				španělské pesety (konvertibilní účet)
 				španělských peset (konvertibilní účet)
+				ESB
 			
 			
 				španělská peseta
@@ -8017,6 +10727,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				španělské pesety
 				španělské pesety
 				španělských peset
+				ESP
 				₧
 			
 			
@@ -8025,6 +10736,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				etiopské birry
 				etiopského birru
 				etiopských birrů
+				ETB
 			
 			
 				euro
@@ -8032,6 +10744,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				eura
 				eura
 				eur
+				€
 				€
 			
 			
@@ -8040,6 +10753,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				finské marky
 				finské marky
 				finských marek
+				FIM
 			
 			
 				fidžijský dolar
@@ -8047,6 +10761,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fidžijské dolary
 				fidžijského dolaru
 				fidžijských dolarů
+				FJD
 				$
 			
 			
@@ -8055,6 +10770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				falklandské libry
 				falklandské libry
 				falklandských liber
+				FKP
 				£
 			
 			
@@ -8063,6 +10779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				francouzské franky
 				francouzského franku
 				francouzských franků
+				FRF
 			
 			
 				britská libra
@@ -8070,6 +10787,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				britské libry
 				britské libry
 				britských liber
+				£
 				£
 			
 			
@@ -8078,6 +10796,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gruzínské kuponové lari
 				gruzínského kuponového lari
 				gruzínských kuponových lari
+				GEK
 			
 			
 				gruzínské lari
@@ -8085,6 +10804,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gruzínské lari
 				gruzínského lari
 				gruzínských lari
+				GEL
 				₾
 				₾
 			
@@ -8094,6 +10814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghanské cedi (1979–2007)
 				ghanského cedi (1979–2007)
 				ghanských cedi (1979–2007)
+				GHC
 			
 			
 				ghanský cedi
@@ -8101,6 +10822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghanské cedi
 				ghanského cedi
 				ghanských cedi
+				GHS
 			
 			
 				gibraltarská libra
@@ -8108,6 +10830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gibraltarské libry
 				gibraltarské libry
 				gibraltarských liber
+				GIP
 				£
 			
 			
@@ -8116,6 +10839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gambijské dalasi
 				gambijského dalasi
 				gambijských dalasi
+				GMD
 			
 			
 				guinejský frank
@@ -8123,6 +10847,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guinejské franky
 				guinejského franku
 				guinejských franků
+				GNF
 				FG
 			
 			
@@ -8131,6 +10856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guinejské syli
 				guinejského syli
 				guinejských syli
+				GNS
 			
 			
 				rovníkovoguinejský ekwele
@@ -8138,6 +10864,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rovníkovoguinejské ekwele
 				rovníkovoguinejského ekwele
 				rovníkovoguinejských ekwele
+				GQE
 			
 			
 				řecká drachma
@@ -8145,6 +10872,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				řecké drachmy
 				řecké drachmy
 				řeckých drachem
+				GRD
 			
 			
 				guatemalský quetzal
@@ -8152,6 +10880,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guatemalské quetzaly
 				guatemalského quetzalu
 				guatemalských quetzalů
+				GTQ
 				Q
 			
 			
@@ -8160,6 +10889,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				portugalskoguinejská escuda
 				portugalskoguinejského escuda
 				portugalskoguinejských escud
+				GWE
 			
 			
 				guinejsko-bissauské peso
@@ -8167,6 +10897,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guinejsko-bissauská pesa
 				guinejsko-bissauského pesa
 				guinejsko-bissauských pes
+				GWP
 			
 			
 				guyanský dolar
@@ -8174,6 +10905,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guyanské dolary
 				guyanského dolaru
 				guyanských dolarů
+				GYD
 				$
 			
 			
@@ -8182,6 +10914,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hongkongské dolary
 				hongkongského dolaru
 				hongkongských dolarů
+				HK$
 				$
 			
 			
@@ -8190,6 +10923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				honduraské lempiry
 				honduraské lempiry
 				honduraských lempir
+				HNL
 				L
 			
 			
@@ -8198,6 +10932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chorvatské dináry
 				chorvatského dináru
 				chorvatských dinárů
+				HRD
 			
 			
 				chorvatská kuna
@@ -8205,6 +10940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chorvatské kuny
 				chorvatské kuny
 				chorvatských kun
+				HRK
 				kn
 			
 			
@@ -8213,6 +10949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				haitské gourde
 				haitského gourde
 				haitských gourde
+				HTG
 			
 			
 				maďarský forint
@@ -8220,6 +10957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maďarské forinty
 				maďarského forintu
 				maďarských forintů
+				HUF
 				Ft
 			
 			
@@ -8228,6 +10966,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				indonéské rupie
 				indonéské rupie
 				indonéských rupií
+				IDR
 				Rp
 			
 			
@@ -8236,6 +10975,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				irské libry
 				irské libry
 				irských liber
+				IEP
 			
 			
 				izraelská libra
@@ -8243,6 +10983,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				izraelské libry
 				izraelské libry
 				izraelských liber
+				ILP
 			
 			
 				izraelský šekel (1980–1985)
@@ -8250,13 +10991,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				izraelské šekely (1980–1985)
 				izraelského šekelu (1980–1985)
 				izraelských šekelů (1980–1985)
+				ILR
 			
 			
 				izraelský nový šekel
 				izraelský nový šekel
 				izraelské nové šekely
 				izraelského nového šekelu
-				izraelských nový šekelů
+				izraelských nových šekelů
 				ILS
 				₪
 			
@@ -8275,6 +11017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				irácké dináry
 				iráckého dináru
 				iráckých dinárů
+				IQD
 			
 			
 				íránský rijál
@@ -8282,6 +11025,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				íránské rijály
 				íránského rijálu
 				íránských rijálů
+				IRR
 			
 			
 				islandská koruna (1918–1981)
@@ -8289,6 +11033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				islandské koruny (1918–1981)
 				islandské koruny (1918–1981)
 				islandských korun (1918–1981)
+				ISJ
 			
 			
 				islandská koruna
@@ -8296,6 +11041,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				islandské koruny
 				islandské koruny
 				islandských korun
+				ISK
 				kr
 			
 			
@@ -8304,6 +11050,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				italské liry
 				italské liry
 				italských lir
+				ITL
 			
 			
 				jamajský dolar
@@ -8311,6 +11058,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jamajské dolary
 				jamajského dolaru
 				jamajských dolarů
+				JMD
 				$
 			
 			
@@ -8319,6 +11067,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jordánské dináry
 				jordánského dináru
 				jordánských dinárů
+				JOD
 			
 			
 				japonský jen
@@ -8326,6 +11075,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				japonské jeny
 				japonského jenu
 				japonských jenů
+				JP¥
 				¥
 			
 			
@@ -8334,6 +11084,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				keňské šilinky
 				keňského šilinku
 				keňských šilinků
+				KES
 			
 			
 				kyrgyzský som
@@ -8341,6 +11092,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kyrgyzské somy
 				kyrgyzského somu
 				kyrgyzských somů
+				KGS
 			
 			
 				kambodžský riel
@@ -8348,6 +11100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kambodžské riely
 				kambodžského rielu
 				kambodžských rielů
+				KHR
 				៛
 			
 			
@@ -8356,6 +11109,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				komorské franky
 				komorského franku
 				komorských franků
+				KMF
 				CF
 			
 			
@@ -8364,6 +11118,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				severokorejské wony
 				severokorejského wonu
 				severokorejských wonů
+				KPW
 				₩
 			
 			
@@ -8388,6 +11143,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jihokorejské wony
 				jihokorejského wonu
 				jihokorejských wonů
+				₩
 				₩
 			
 			
@@ -8396,6 +11152,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuvajtské dináry
 				kuvajtského dináru
 				kuvajtských dinárů
+				KWD
 			
 			
 				kajmanský dolar
@@ -8403,6 +11160,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kajmanské dolary
 				kajmanského dolaru
 				kajmanských dolarů
+				KYD
 				$
 			
 			
@@ -8411,6 +11169,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kazašské tenge
 				kazašského tenge
 				kazašských tenge
+				KZT
 				₸
 			
 			
@@ -8419,6 +11178,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				laoské kipy
 				laoského kipu
 				laoských kipů
+				LAK
 				₭
 			
 			
@@ -8427,6 +11187,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libanonské libry
 				libanonské libry
 				libanonských liber
+				LBP
 				L£
 			
 			
@@ -8435,6 +11196,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				srílanské rupie
 				srílanské rupie
 				srílanských rupií
+				LKR
 				Rs
 			
 			
@@ -8443,6 +11205,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liberijské dolary
 				liberijského dolaru
 				liberijských dolarů
+				LRD
 				$
 			
 			
@@ -8451,6 +11214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lesothské maloti
 				lesothského loti
 				lesothských maloti
+				LSL
 			
 			
 				litevský litas
@@ -8458,6 +11222,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litevské lity
 				litevského litu
 				litevských litů
+				LTL
+				Lt
 			
 			
 				litevský talonas
@@ -8465,6 +11231,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litevské talony
 				litevského talonu
 				litevských talonů
+				LTT
 			
 			
 				lucemburský konvertibilní frank
@@ -8472,6 +11239,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lucemburské konvertibilní franky
 				lucemburského konvertibilního franku
 				lucemburských konvertibilních franků
+				LUC
 			
 			
 				lucemburský frank
@@ -8479,6 +11247,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lucemburské franky
 				lucemburského franku
 				lucemburských franků
+				LUF
 			
 			
 				lucemburský finanční frank
@@ -8486,6 +11255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lucemburské finanční franky
 				lucemburského finančního franku
 				lucemburských finančních franků
+				LUL
 			
 			
 				lotyšský lat
@@ -8493,6 +11263,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lotyšské laty
 				lotyšského latu
 				lotyšských latů
+				LVL
+				Ls
 			
 			
 				lotyšský rubl
@@ -8500,6 +11272,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lotyšské rubly
 				lotyšského rublu
 				lotyšských rublů
+				LVR
 			
 			
 				libyjský dinár
@@ -8507,6 +11280,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libyjské dináry
 				libyjského dináru
 				libyjských dinárů
+				LYD
 			
 			
 				marocký dinár
@@ -8514,6 +11288,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marocké dináry
 				marockého dináru
 				marockých dinárů
+				MAD
 			
 			
 				marocký frank
@@ -8521,6 +11296,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marocké franky
 				marockého franku
 				marockých franků
+				MAF
 			
 			
 				monacký frank
@@ -8528,6 +11304,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				monacké franky
 				monackého franku
 				monackých franků
+				MCF
 			
 			
 				moldavský kupon
@@ -8535,6 +11312,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				moldavské kupony
 				moldavského kuponu
 				moldavských kuponů
+				MDC
 			
 			
 				moldavský leu
@@ -8542,6 +11320,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				moldavské lei
 				moldavského leu
 				moldavských lei
+				MDL
 			
 			
 				madagaskarský ariary
@@ -8549,6 +11328,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				madagaskarské ariary
 				madagaskarského ariary
 				madagaskarských ariary
+				MGA
 				Ar
 			
 			
@@ -8557,6 +11337,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				madagaskarské franky
 				madagaskarského franku
 				madagaskarských franků
+				MGF
 			
 			
 				makedonský denár
@@ -8564,6 +11345,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedonské denáry
 				makedonského denáru
 				makedonských denárů
+				MKD
 			
 			
 				makedonský denár (1992–1993)
@@ -8571,6 +11353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedonské denáry (1992–1993)
 				makedonského denáru (1992–1993)
 				makedonských denárů (1992–1993)
+				MKN
 			
 			
 				malijský frank
@@ -8578,6 +11361,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malijské franky
 				malijského franku
 				malijských franků
+				MLF
 			
 			
 				myanmarský kyat
@@ -8585,6 +11369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				myanmarské kyaty
 				myanmarského kyatu
 				myanmarských kyatů
+				MMK
 				K
 			
 			
@@ -8593,6 +11378,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mongolské tugriky
 				mongolského tugriku
 				mongolských tugriků
+				MNT
 				₮
 			
 			
@@ -8601,6 +11387,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				macajské patacy
 				macajské patacy
 				macajských patac
+				MOP
 			
 			
 				mauritánská ouguiya (1973–2017)
@@ -8608,6 +11395,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mauritánské ouguiye (1973–2017)
 				mauritánské ouguiye (1973–2017)
 				mauritánských ouguiyí (1973–2017)
+				MRO
 			
 			
 				mauritánská ouguiya
@@ -8623,6 +11411,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maltské liry
 				maltské liry
 				maltských lir
+				MTL
 			
 			
 				maltská libra
@@ -8630,6 +11419,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maltské libry
 				maltské libry
 				maltských liber
+				MTP
 			
 			
 				mauricijská rupie
@@ -8637,6 +11427,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mauricijské rupie
 				mauricijské rupie
 				mauricijských rupií
+				MUR
 				Rs
 			
 			
@@ -8645,6 +11436,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maledivské rupie (1947–1981)
 				maledivské rupie (1947–1981)
 				maledivských rupií (1947–1981)
+				MVP
 			
 			
 				maledivská rupie
@@ -8652,6 +11444,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maledivské rupie
 				maledivské rupie
 				maledivských rupií
+				MVR
 			
 			
 				malawijská kwacha
@@ -8659,6 +11452,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malawijské kwachy
 				malawijské kwachy
 				malawijských kwach
+				MWK
 			
 			
 				mexické peso
@@ -8666,6 +11460,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mexická pesa
 				mexického pesa
 				mexických pes
+				MX$
 				$
 			
 			
@@ -8674,6 +11469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mexická stříbrná pesa (1861–1992)
 				mexického stříbrného pesa (1861–1992)
 				mexických stříbrných pes (1861–1992)
+				MXP
 			
 			
 				mexická investiční jednotka
@@ -8681,6 +11477,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mexické investiční jednotky
 				mexické investiční jednotky
 				mexických investičních jednotek
+				MXV
 			
 			
 				malajsijský ringgit
@@ -8688,6 +11485,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malajsijské ringgity
 				malajsijského ringgitu
 				malajsijských ringgitů
+				MYR
 				RM
 			
 			
@@ -8696,6 +11494,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mosambická escuda
 				mosambického escuda
 				mosambických escud
+				MZE
 			
 			
 				mosambický metical (1980–2006)
@@ -8703,6 +11502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mosambické meticaly (1980–2006)
 				mosambického meticalu (1980–2006)
 				mosambických meticalů (1980–2006)
+				MZM
 			
 			
 				mozambický metical
@@ -8710,6 +11510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mozambické meticaly
 				mozambického meticalu
 				mozambických meticalů
+				MZN
 			
 			
 				namibijský dolar
@@ -8717,6 +11518,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				namibijské dolary
 				namibijského dolaru
 				namibijských dolarů
+				NAD
 				$
 			
 			
@@ -8725,6 +11527,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nigerijské nairy
 				nigerijské nairy
 				nigerijských nair
+				NGN
 				₦
 			
 			
@@ -8733,6 +11536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nikaragujské córdoby (1988–1991)
 				nikaragujské córdoby (1988–1991)
 				nikaragujských córdob (1988–1991)
+				NIC
 			
 			
 				nikaragujská córdoba
@@ -8740,6 +11544,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nikaragujské córdoby
 				nikaragujské córdoby
 				nikaragujských córdob
+				NIO
 				C$
 			
 			
@@ -8748,6 +11553,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nizozemské guldeny
 				nizozemského guldenu
 				nizozemských guldenů
+				NLG
 			
 			
 				norská koruna
@@ -8755,6 +11561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				norské koruny
 				norské koruny
 				norských korun
+				NOK
 				kr
 			
 			
@@ -8763,6 +11570,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nepálské rupie
 				nepálské rupie
 				nepálských rupií
+				NPR
 				Rs
 			
 			
@@ -8771,6 +11579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				novozélandské dolary
 				novozélandského dolaru
 				novozélandských dolarů
+				NZ$
 				$
 			
 			
@@ -8779,6 +11588,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ománské rijály
 				ománského rijálu
 				ománských rijálů
+				OMR
 			
 			
 				panamská balboa
@@ -8786,6 +11596,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				panamské balboy
 				panamské balboy
 				panamských balboí
+				PAB
 			
 			
 				peruánská inti
@@ -8793,6 +11604,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peruánské inti
 				peruánské inti
 				peruánských inti
+				PEI
 			
 			
 				peruánský sol
@@ -8800,6 +11612,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peruánské soly
 				peruánského solu
 				peruánských solů
+				PEN
 			
 			
 				peruánský sol (1863–1965)
@@ -8807,6 +11620,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peruánské soly (1863–1965)
 				peruánského solu (1863–1965)
 				peruánských solů (1863–1965)
+				PES
 			
 			
 				papuánská nová kina
@@ -8814,6 +11628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				papuánské nové kiny
 				papuánské nové kiny
 				papuánských nových kin
+				PGK
 			
 			
 				filipínské peso
@@ -8821,6 +11636,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				filipínská pesa
 				filipínského pesa
 				filipínských pes
+				PHP
 				₱
 			
 			
@@ -8829,6 +11645,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pákistánské rupie
 				pákistánské rupie
 				pákistánských rupií
+				PKR
 				Rs
 			
 			
@@ -8837,6 +11654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				polské zloté
 				polského zlotého
 				polských zlotých
+				PLN
 				zł
 			
 			
@@ -8845,6 +11663,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				polské zloté (1950–1995)
 				polského zlotého (1950–1995)
 				polských zlotých (1950–1995)
+				PLZ
 			
 			
 				portugalské escudo
@@ -8852,6 +11671,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				portugalská escuda
 				portugalského escuda
 				portugalských escud
+				PTE
 			
 			
 				paraguajské guarani
@@ -8859,6 +11679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paraguajská guarani
 				paraguajského guarani
 				paraguajských guarani
+				PYG
 				₲
 			
 			
@@ -8867,6 +11688,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				katarské rijály
 				katarského rijálu
 				katarských rijálů
+				QAR
 			
 			
 				rhodéský dolar
@@ -8874,6 +11696,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rhodéské dolary
 				rhodéského dolaru
 				rhodéských dolarů
+				RHD
 			
 			
 				rumunské leu (1952–2006)
@@ -8881,6 +11704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rumunské lei (1952–2006)
 				rumunského leu (1952–2006)
 				rumunských lei (1952–2006)
+				ROL
 			
 			
 				rumunský leu
@@ -8888,6 +11712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rumunské lei
 				rumunského leu
 				rumunských lei
+				RON
 				L
 			
 			
@@ -8896,6 +11721,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				srbské dináry
 				srbského dináru
 				srbských dinárů
+				RSD
 			
 			
 				ruský rubl
@@ -8903,6 +11729,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruské rubly
 				ruského rublu
 				ruských rublů
+				RUB
 				₽
 			
 			
@@ -8911,6 +11738,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruské rubly (1991–1998)
 				ruského rublu (1991–1998)
 				ruských rublů (1991–1998)
+				RUR
 				р.
 			
 			
@@ -8919,6 +11747,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwandské franky
 				rwandského franku
 				rwandských franků
+				RWF
 				RF
 			
 			
@@ -8927,6 +11756,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				saúdské rijály
 				saúdského rijálu
 				saúdských rijálů
+				SAR
 			
 			
 				šalamounský dolar
@@ -8934,6 +11764,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				šalamounské dolary
 				šalamounského dolaru
 				šalamounských dolarů
+				SBD
 				$
 			
 			
@@ -8942,6 +11773,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				seychelské rupie
 				seychelské rupie
 				seychelských rupií
+				SCR
 			
 			
 				súdánský dinár (1992–2007)
@@ -8949,6 +11781,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				súdánské dináry (1992–2007)
 				súdánského dináru (1992–2007)
 				súdánských dinárů (1992–2007)
+				SDD
 			
 			
 				súdánská libra
@@ -8956,6 +11789,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				súdánské libry
 				súdánské libry
 				súdánských liber
+				SDG
 			
 			
 				súdánská libra (1957–1998)
@@ -8963,6 +11797,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				súdánské libry (1957–1998)
 				súdánské libry (1957–1998)
 				súdánských liber (1957–1998)
+				SDP
 			
 			
 				švédská koruna
@@ -8970,6 +11805,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				švédské koruny
 				švédské koruny
 				švédských korun
+				SEK
 				kr
 			
 			
@@ -8978,6 +11814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				singapurské dolary
 				singapurského dolaru
 				singapurských dolarů
+				SGD
 				$
 			
 			
@@ -8986,6 +11823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svatohelenské libry
 				svatohelenské libry
 				svatohelenských liber
+				SHP
 				£
 			
 			
@@ -8994,6 +11832,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				slovinské tolary
 				slovinského tolaru
 				slovinských tolarů
+				SIT
 			
 			
 				slovenská koruna
@@ -9001,6 +11840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				slovenské koruny
 				slovenské koruny
 				slovenských korun
+				SKK
 			
 			
 				sierro-leonský leone
@@ -9008,6 +11848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sierro-leonské leone
 				sierro-leonského leone
 				sierro-leonských leone
+				SLL
 			
 			
 				somálský šilink
@@ -9015,6 +11856,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somálské šilinky
 				somálského šilinku
 				somálských šilinků
+				SOS
 			
 			
 				surinamský dolar
@@ -9022,6 +11864,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				surinamské dolary
 				surinamského dolaru
 				surinamských dolarů
+				SRD
 				$
 			
 			
@@ -9030,6 +11873,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				surinamské zlaté
 				surinamského zlatého
 				surinamských zlatých
+				SRG
 			
 			
 				jihosúdánská libra
@@ -9037,6 +11881,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jihosúdánské libry
 				jihosúdánské libry
 				jihosúdánských liber
+				SSP
 				£
 			
 			
@@ -9045,6 +11890,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svatotomášské dobry (1977–2017)
 				svatotomášské dobry (1977–2017)
 				svatotomášských dober (1977–2017)
+				STD
 			
 			
 				svatotomášská dobra
@@ -9061,6 +11907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sovětské rubly
 				sovětského rublu
 				sovětských rublů
+				SUR
 			
 			
 				salvadorský colón
@@ -9068,6 +11915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				salvadorské colóny
 				salvadorského colónu
 				salvadorských colónů
+				SVC
 			
 			
 				syrská libra
@@ -9075,6 +11923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				syrské libry
 				syrské libry
 				syrských liber
+				SYP
 				£
 			
 			
@@ -9083,6 +11932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svazijské emalangeni
 				svazijského lilangeni
 				svazijských emalangeni
+				SZL
 			
 			
 				thajský baht
@@ -9090,6 +11940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				thajské bahty
 				thajského bahtu
 				thajských bahtů
+				THB
 				฿
 			
 			
@@ -9098,6 +11949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tádžické rubly
 				tádžického rublu
 				tádžických rublů
+				TJR
 			
 			
 				tádžické somoni
@@ -9105,6 +11957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tádžická somoni
 				tádžického somoni
 				tádžických somoni
+				TJS
 			
 			
 				turkmenský manat (1993–2009)
@@ -9112,6 +11965,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turkmenské manaty (1993–2009)
 				turkmenského manatu (1993–2009)
 				turkmenských manatů (1993–2009)
+				TMM
 			
 			
 				turkmenský manat
@@ -9119,6 +11973,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turkmenské manaty
 				turkmenského manatu
 				turkmenských manatů
+				TMT
 			
 			
 				tuniský dinár
@@ -9126,6 +11981,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tuniské dináry
 				tuniského dináru
 				tuniských dinárů
+				TND
 			
 			
 				tonžská paanga
@@ -9133,6 +11989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tonžské paangy
 				tonžské paangy
 				tonžských paang
+				TOP
 				T$
 			
 			
@@ -9141,6 +11998,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				timorská escuda
 				timorského escuda
 				timorských escud
+				TPE
 			
 			
 				turecká lira (1922–2005)
@@ -9148,6 +12006,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turecké liry (1922–2005)
 				turecké liry (1922–2005)
 				tureckých lir (1922–2005)
+				TRL
 			
 			
 				turecká lira
@@ -9155,6 +12014,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turecké liry
 				turecké liry
 				tureckých lir
+				TRY
 				₺
 				TL
 			
@@ -9164,6 +12024,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trinidadské dolary
 				trinidadského dolaru
 				trinidadských dolarů
+				TTD
 				$
 			
 			
@@ -9172,6 +12033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tchajwanské dolary
 				tchajwanského dolaru
 				tchajwanských dolarů
+				NT$
 				NT$
 			
 			
@@ -9180,6 +12042,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tanzanské šilinky
 				tanzanského šilinku
 				tanzanských šilinků
+				TZS
 			
 			
 				ukrajinská hřivna
@@ -9187,6 +12050,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ukrajinské hřivny
 				ukrajinské hřivny
 				ukrajinských hřiven
+				UAH
 				₴
 			
 			
@@ -9195,6 +12059,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ukrajinské karbovance
 				ukrajinského karbovance
 				ukrajinských karbovanců
+				UAK
 			
 			
 				ugandský šilink (1966–1987)
@@ -9202,6 +12067,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ugandské šilinky (1966–1987)
 				ugandského šilinku (1966–1987)
 				ugandských šilinků (1966–1987)
+				UGS
 			
 			
 				ugandský šilink
@@ -9209,6 +12075,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ugandské šilinky
 				ugandského šilinku
 				ugandských šilinků
+				UGX
 			
 			
 				americký dolar
@@ -9216,6 +12083,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				americké dolary
 				amerického dolaru
 				amerických dolarů
+				US$
 				$
 			
 			
@@ -9224,6 +12092,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				americké dolary (příští den)
 				amerického dolaru (příští den)
 				amerických dolarů (příští den)
+				USN
 			
 			
 				americký dolar (týž den)
@@ -9231,6 +12100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				americké dolary (týž den)
 				amerického dolaru (týž den)
 				amerických dolarů (týž den)
+				USS
 			
 			
 				uruguayské peso (v indexovaných jednotkách)
@@ -9238,6 +12108,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguayská pesa (v indexovaných jednotkách)
 				uruguayského pesa (v indexovaných jednotkách)
 				uruguayských pes (v indexovaných jednotkách)
+				UYI
 			
 			
 				uruguayské peso (1975–1993)
@@ -9245,6 +12116,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguayská pesa (1975–1993)
 				uruguayského pesa (1975–1993)
 				uruguayských pes (1975–1993)
+				UYP
 			
 			
 				uruguayské peso
@@ -9252,6 +12124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguayská pesa
 				uruguayského pesa
 				uruguayských pes
+				UYU
 				$
 			
 			
@@ -9260,6 +12133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uzbecké sumy
 				uzbeckého sumu
 				uzbeckých sumů
+				UZS
 			
 			
 				venezuelský bolívar (1871–2008)
@@ -9267,6 +12141,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelské bolívary (1871–2008)
 				venezuelského bolívaru (1871–2008)
 				venezuelských bolívarů (1871–2008)
+				VEB
 			
 			
 				venezuelský bolívar (2008–2018)
@@ -9274,6 +12149,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelské bolívary (2008–2018)
 				venezuelského bolívaru (2008–2018)
 				venezuelských bolívarů (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -9299,6 +12175,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vietnamské dongy (1978–1985)
 				vietnamského dongu (1978–1985)
 				vietnamských dongů (1978–1985)
+				VNN
 			
 			
 				vanuatský vatu
@@ -9306,6 +12183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vanuatské vatu
 				vanuatského vatu
 				vanuatských vatu
+				VUV
 			
 			
 				samojská tala
@@ -9313,6 +12191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				samojské taly
 				samojské taly
 				samojských tal
+				WST
 			
 			
 				CFA/BEAC frank
@@ -9320,6 +12199,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA/BEAC franky
 				CFA/BEAC franku
 				CFA/BEAC franků
+				FCFA
 			
 			
 				stříbro
@@ -9327,6 +12207,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trojské unce stříbra
 				trojské unce stříbra
 				trojských uncí stříbra
+				XAG
 			
 			
 				zlato
@@ -9334,6 +12215,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trojské unce zlata
 				trojské unce zlata
 				trojských uncí zlata
+				XAU
 			
 			
 				evropská smíšená jednotka
@@ -9341,6 +12223,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				evropské smíšené jednotky
 				evropské smíšené jednotky
 				evropských smíšených jednotek
+				XBA
 			
 			
 				evropská peněžní jednotka
@@ -9348,6 +12231,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				evropské peněžní jednotky
 				evropské peněžní jednotky
 				evropských peněžních jednotek
+				XBB
 			
 			
 				evropská jednotka účtu 9 (XBC)
@@ -9355,6 +12239,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				evropské jednotky účtu 9 (XBC)
 				evropské jednotky účtu 9 (XBC)
 				evropských jednotek účtu 9 (XBC)
+				XBC
 			
 			
 				evropská jednotka účtu 17 (XBD)
@@ -9362,6 +12247,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				evropské jednotky účtu 17 (XBD)
 				evropské jednotky účtu 17 (XBD)
 				evropských jednotek účtu 17 (XBD)
+				XBD
 			
 			
 				východokaribský dolar
@@ -9369,10 +12255,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				východokaribské dolary
 				východokaribského dolaru
 				východokaribských dolarů
+				EC$
 				$
 			
 			
 				SDR
+				XDR
 			
 			
 				evropská měnová jednotka
@@ -9388,6 +12276,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				francouzské zlaté franky
 				francouzského zlatého franku
 				francouzských zlatých franků
+				XFO
 			
 			
 				francouzský UIC frank
@@ -9395,6 +12284,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				francouzské UIC franky
 				francouzského UIC franku
 				francouzských UIC franků
+				XFU
 			
 			
 				CFA/BCEAO frank
@@ -9402,6 +12292,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA/BCEAO franky
 				CFA/BCEAO franku
 				CFA/BCEAO franků
+				CFA
 			
 			
 				palladium
@@ -9409,6 +12300,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trojské unce palladia
 				trojské unce palladia
 				trojských uncí palladia
+				XPD
 			
 			
 				CFP frank
@@ -9416,6 +12308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP franky
 				CFP franku
 				CFP franků
+				CFPF
 			
 			
 				platina
@@ -9423,6 +12316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trojské unce platiny
 				trojské unce platiny
 				trojských uncí platiny
+				XPT
 			
 			
 				kód fondů RINET
@@ -9430,6 +12324,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kód fondů RINET
 				kód fondů RINET
 				kód fondů RINET
+				XRE
 			
 			
 				sucre
@@ -9437,6 +12332,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sucre
 				sucre
 				sucre
+				XSU
 			
 			
 				kód zvlášť vyhrazený pro testovací účely
@@ -9444,6 +12340,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kódy zvlášť vyhrazené pro testovací účely
 				kódu zvlášť vyhrazeného pro testovací účely
 				kódů zvlášť vyhrazených pro testovací účely
+				XTS
+			
+			
+				XUA
 			
 			
 				neznámá měna
@@ -9459,6 +12359,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenské dináry
 				jemenského dináru
 				jemenských dinárů
+				YDD
 			
 			
 				jemenský rijál
@@ -9466,6 +12367,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenské rijály
 				jemenského rijálu
 				jemenských rijálů
+				YER
 			
 			
 				jugoslávský dinár (1966–1990)
@@ -9473,6 +12375,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jugoslávské dináry (1966–1990)
 				jugoslávského dináru (1966–1990)
 				jugoslávských dinárů (1966–1990)
+				YUD
 			
 			
 				jugoslávský nový dinár (1994–2002)
@@ -9480,6 +12383,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jugoslávské nové dináry (1994–2002)
 				jugoslávského nového dináru (1994–2002)
 				jugoslávských nových dinárů (1994–2002)
+				YUM
 			
 			
 				jugoslávský konvertibilní dinár (1990–1992)
@@ -9487,6 +12391,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jugoslávské konvertibilní dináry (1990–1992)
 				jugoslávského konvertibilního dináru (1990–1992)
 				jugoslávských konvertibilních dinárů (1990–1992)
+				YUN
 			
 			
 				jugoslávský reformovaný dinár (1992–1993)
@@ -9494,6 +12399,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jugoslávské reformované dináry (1992–1993)
 				jugoslávského reformovaného dináru (1992–1993)
 				jugoslávských reformovaných dinárů (1992–1993)
+				YUR
 			
 			
 				jihoafrický finanční rand
@@ -9501,6 +12407,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jihoafrické finanční randy
 				jihoafrického finančního randu
 				jihoafrických finančních randů
+				ZAL
 			
 			
 				jihoafrický rand
@@ -9508,6 +12415,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jihoafrické randy
 				jihoafrického randu
 				jihoafrických randů
+				ZAR
 				R
 			
 			
@@ -9516,6 +12424,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zambijské kwachy (1968–2012)
 				zambijské kwachy (1968–2012)
 				zambijských kwach (1968–2012)
+				ZMK
 			
 			
 				zambijská kwacha
@@ -9523,6 +12432,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zambijské kwachy
 				zambijské kwachy
 				zambijských kwach
+				ZMW
 				ZK
 			
 			
@@ -9531,6 +12441,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zairské nové zairy (1993–1998)
 				zairského nového zairu (1993–1998)
 				zairských nových zairů (1993–1998)
+				ZRN
 			
 			
 				zairský zaire (1971–1993)
@@ -9538,6 +12449,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zairské zairy (1971–1993)
 				zairského zairu (1971–1993)
 				zairských zairů (1971–1993)
+				ZRZ
 			
 			
 				zimbabwský dolar (1980–2008)
@@ -9545,6 +12457,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zimbabwské dolary (1980–2008)
 				zimbabwského dolaru (1980–2008)
 				zimbabwských dolarů (1980–2008)
+				ZWD
 			
 			
 				zimbabwský dolar (2009)
@@ -9552,6 +12465,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zimbabwské dolary (2009)
 				zimbabwského dolaru (2009)
 				zimbabwských dolarů (2009)
+				ZWL
 			
 			
 				zimbabwský dolar (2008)
@@ -9559,6 +12473,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zimbabwské dolary (2008)
 				zimbabwského dolaru (2008)
 				zimbabwských dolarů (2008)
+				ZWR
 			
 		
 		
@@ -9580,6 +12495,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				gravitační síla
 				{0} G
@@ -9872,6 +12790,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} století
 				{0} století
 			
+			
+				desetiletí
+				{0} desetiletí
+				{0} desetiletí
+				{0} desetiletí
+				{0} desetiletí
+			
 			
 				roky
 				{0} rok
@@ -10027,11 +12952,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} elektronvoltů
 			
 			
-				britské tepelné jednotky
-				{0} britská tepelná jednotka
-				{0} britské tepelné jednotky
-				{0} britské tepelné jednotky
-				{0} britských tepelných jednotek
+				britské tepelné jednotky
+				{0} britská tepelná jednotka
+				{0} britské tepelné jednotky
+				{0} britské tepelné jednotky
+				{0} britských tepelných jednotek
+			
+			
+				thermy
+				{0} therm
+				{0} thermy
+				{0} thermu
+				{0} thermů
 			
 			
 				libry síly
@@ -10075,6 +13007,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertzu
 				{0} hertzů
 			
+			
+				čtverčíky
+				{0} čtverčík
+				{0} čtverčíky
+				{0} čtverčíku
+				{0} čtverčíků
+			
+			
+				pixely
+				{0} pixel
+				{0} pixely
+				{0} pixelu
+				{0} pixelů
+			
+			
+				megapixely
+				{0} megapixel
+				{0} megapixely
+				{0} megapixelu
+				{0} megapixelů
+			
+			
+				pixely na centimetr
+				{0} pixel na centimetr
+				{0} pixely na centimetr
+				{0} pixelu na centimetr
+				{0} pixelů na centimetr
+			
+			
+				pixely na palec
+				{0} pixel na palec
+				{0} pixely na palec
+				{0} pixelu na palec
+				{0} pixelů na palec
+			
+			
+				body na centimetr
+				{0} bod na centimetr
+				{0} body na centimetr
+				{0} bodu na centimetr
+				{0} bodů na centimetr
+			
+			
+				body na palec
+				{0} bod na palec
+				{0} body na palec
+				{0} bodu na palec
+				{0} bodů na palec
+			
 			
 				kilometry
 				{0} kilometr
@@ -10385,13 +13366,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} koňské síly
 				{0} koňských sil
 			
-			
-				hektopascaly
-				{0} hektopascal
-				{0} hektopascaly
-				{0} hektopascalu
-				{0} hektopascalů
-			
 			
 				milimetry rtuti
 				{0} milimetr rtuti
@@ -10413,6 +13387,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} palce rtuti
 				{0} palců rtuti
 			
+			
+				bary
+				{0} bar
+				{0} bary
+				{0} baru
+				{0} barů
+			
 			
 				milibary
 				{0} milibar
@@ -10427,6 +13408,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosféry
 				{0} atmosfér
 			
+			
+				pascaly
+				{0} pascal
+				{0} pascaly
+				{0} pascalu
+				{0} pascalů
+			
+			
+				hektopascaly
+				{0} hektopascal
+				{0} hektopascaly
+				{0} hektopascalu
+				{0} hektopascalů
+			
 			
 				kilopascaly
 				{0} kilopascal
@@ -10717,6 +13712,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				G
 				{0} G
@@ -11009,6 +14007,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} stol.
 				{0} stol.
 			
+			
+				desetil.
+				{0} desetil.
+				{0} desetil.
+				{0} desetil.
+				{0} desetil.
+			
 			
 				roky
 				{0} rok
@@ -11164,11 +14169,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eV
 			
 			
-				BTU
-				{0} BTU
-				{0} BTU
-				{0} BTU
-				{0} BTU
+				BTU
+				{0} BTU
+				{0} BTU
+				{0} BTU
+				{0} BTU
+			
+			
+				therm
+				{0} therm
+				{0} therm
+				{0} therm
+				{0} therm
 			
 			
 				lbf
@@ -11212,6 +14224,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+				{0} px
+				{0} px
+			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				PPCM
+				{0} PPCM
+				{0} PPCM
+				{0} PPCM
+				{0} PPCM
+			
+			
+				PPI
+				{0} PPI
+				{0} PPI
+				{0} PPI
+				{0} PPI
+			
+			
+				DPCM
+				{0} DPCM
+				{0} DPCM
+				{0} DPCM
+				{0} DPCM
+			
+			
+				DPI
+				{0} DPI
+				{0} DPI
+				{0} DPI
+				{0} DPI
+			
 			
 				km
 				{0} km
@@ -11331,10 +14392,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				fm
-				{0} fth
-				{0} fth
-				{0} fth
-				{0} fth
 			
 			
 				nmi
@@ -11522,13 +14579,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -11550,6 +14600,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+				{0} bar
+				{0} bar
+			
 			
 				mb
 				{0} mb
@@ -11564,6 +14621,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -11854,6 +14925,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				G
 				{0} G
@@ -11862,6 +14936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} G
 			
 			
+				m/s²
 				{0} m/s²
 				{0} m/s²
 				{0} m/s²
@@ -11875,6 +14950,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ot.
 			
 			
+				rad
 				{0} rad
 				{0} rad
 				{0} rad
@@ -11902,10 +14978,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 			
 			
+				km²
 				{0} km²
 				{0} km²
 				{0} km²
 				{0} km²
+				{0}/km²
 			
 			
 				ha
@@ -11915,22 +14993,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ha
 			
 			
+				m²
 				{0} m²
 				{0} m²
 				{0} m²
 				{0} m²
+				{0}/m²
 			
 			
+				cm²
 				{0} cm²
 				{0} cm²
 				{0} cm²
 				{0} cm²
+				{0}/cm²
 			
 			
+				mi²
 				{0} mi²
 				{0} mi²
 				{0} mi²
 				{0} mi²
+				{0}/mi²
 			
 			
 				ac
@@ -11940,22 +15024,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ac
 			
 			
+				yd²
 				{0} yd²
 				{0} yd²
 				{0} yd²
 				{0} yd²
 			
 			
+				ft²
 				{0} ft²
 				{0} ft²
 				{0} ft²
 				{0} ft²
 			
 			
+				in²
 				{0} in²
 				{0} in²
 				{0} in²
 				{0} in²
+				{0}/in²
+			
+			
+				kt
+				{0} kt
+				{0} kt
+				{0} kt
+				{0} kt
 			
 			
 				mg/dl
@@ -11971,6 +15066,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 				{0} mmol/l
 			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+				{0} ppm
+				{0} ppm
+			
 			
 				%
 				{0} %
@@ -11999,49 +15101,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg
 				{0} mpg
 			
+			
+				mpg Imp.
+			
 			
+				TB
 				{0} TB
 				{0} TB
 				{0} TB
 				{0} TB
 			
 			
+				Tb
 				{0} Tb
 				{0} Tb
 				{0} Tb
 				{0} Tb
 			
 			
+				GB
 				{0} GB
 				{0} GB
 				{0} GB
 				{0} GB
 			
 			
+				Gb
 				{0} Gb
 				{0} Gb
 				{0} Gb
 				{0} Gb
 			
 			
+				MB
 				{0} MB
 				{0} MB
 				{0} MB
 				{0} MB
 			
 			
+				Mb
 				{0} Mb
 				{0} Mb
 				{0} Mb
 				{0} Mb
 			
 			
+				kB
 				{0} kB
 				{0} kB
 				{0} kB
 				{0} kB
 			
 			
+				kb
 				{0} kb
 				{0} kb
 				{0} kb
@@ -12055,6 +15168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bajtů
 			
 			
+				bit
 				{0} bit
 				{0} bity
 				{0} bitu
@@ -12131,12 +15245,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ms
 			
 			
+				μs
 				{0} μs
 				{0} μs
 				{0} μs
 				{0} μs
 			
 			
+				ns
 				{0} ns
 				{0} ns
 				{0} ns
@@ -12150,6 +15266,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} A
 			
 			
+				mA
 				{0} mA
 				{0} mA
 				{0} mA
@@ -12170,12 +15287,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} V
 			
 			
+				kcal
 				{0} kcal
 				{0} kcal
 				{0} kcal
 				{0} kcal
 			
 			
+				cal
 				{0} cal
 				{0} cal
 				{0} cal
@@ -12189,6 +15308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kcal
 			
 			
+				kJ
 				{0} kJ
 				{0} kJ
 				{0} kJ
@@ -12202,30 +15322,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} J
 			
 			
+				kWh
 				{0} kWh
 				{0} kWh
 				{0} kWh
 				{0} kWh
 			
 			
+				GHz
 				{0} GHz
 				{0} GHz
 				{0} GHz
 				{0} GHz
 			
 			
+				MHz
 				{0} MHz
 				{0} MHz
 				{0} MHz
 				{0} MHz
 			
 			
+				kHz
 				{0} kHz
 				{0} kHz
 				{0} kHz
 				{0} kHz
 			
 			
+				Hz
 				{0} Hz
 				{0} Hz
 				{0} Hz
@@ -12270,18 +15395,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mm
 			
 			
+				µm
 				{0} µm
 				{0} µm
 				{0} µm
 				{0} µm
 			
 			
+				nm
 				{0} nm
 				{0} nm
 				{0} nm
 				{0} nm
 			
 			
+				pm
 				{0} pm
 				{0} pm
 				{0} pm
@@ -12318,18 +15446,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in
 			
 			
+				pc
 				{0} pc
 				{0} pc
 				{0} pc
 				{0} pc
 			
 			
+				ly
 				{0} ly
 				{0} ly
 				{0} ly
 				{0} ly
 			
 			
+				au
 				{0} au
 				{0} au
 				{0} au
@@ -12344,12 +15475,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				fm
-				{0} fth
-				{0} fth
-				{0} fth
-				{0} fth
 			
 			
+				nmi
 				{0} nmi
 				{0} nmi
 				{0} nmi
@@ -12362,7 +15490,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} smi
 				{0} smi
 			
+			
+				pt
+				{0} pt
+				{0} pt
+				{0} pt
+				{0} pt
+			
 			
+				lx
 				{0} lx
 				{0} lx
 				{0} lx
@@ -12392,12 +15528,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/g
 			
 			
+				mg
 				{0} mg
 				{0} mg
 				{0} mg
 				{0} mg
 			
 			
+				µg
 				{0} µg
 				{0} µg
 				{0} µg
@@ -12434,30 +15572,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/oz
 			
 			
+				oz t
 				{0} oz t
 				{0} oz t
 				{0} oz t
 				{0} oz t
 			
 			
+				CD
 				{0} CD
 				{0} CD
 				{0} CD
 				{0} CD
 			
 			
+				GW
 				{0} GW
 				{0} GW
 				{0} GW
 				{0} GW
 			
 			
+				MW
 				{0} MW
 				{0} MW
 				{0} MW
 				{0} MW
 			
 			
+				kW
 				{0} kW
 				{0} kW
 				{0} kW
@@ -12471,24 +15614,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} W
 			
 			
+				mW
 				{0} mW
 				{0} mW
 				{0} mW
 				{0} mW
 			
 			
+				hp
 				{0} hp
 				{0} hp
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -12517,6 +15655,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -12538,6 +15683,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mi/h
 				{0} mi/h
 			
+			
+				kn
+				{0} kn
+				{0} kn
+				{0} kn
+				{0} kn
+			
 			
 				°
 				{0}°
@@ -12567,42 +15719,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
+				km³
 				{0} km³
 				{0} km³
 				{0} km³
 				{0} km³
 			
 			
+				m³
 				{0} m³
 				{0} m³
 				{0} m³
 				{0} m³
+				{0}/m³
 			
 			
+				cm³
 				{0} cm³
 				{0} cm³
 				{0} cm³
 				{0} cm³
+				{0}/cm³
 			
 			
+				mi³
 				{0} mi³
 				{0} mi³
 				{0} mi³
 				{0} mi³
 			
 			
+				yd³
 				{0} yd³
 				{0} yd³
 				{0} yd³
 				{0} yd³
 			
 			
+				ft³
 				{0} ft³
 				{0} ft³
 				{0} ft³
 				{0} ft³
 			
 			
+				in³
 				{0} in³
 				{0} in³
 				{0} in³
@@ -12628,6 +15789,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l
 				{0} l
 				{0} l
+				{0}/l
 			
 			
 				dl
@@ -12650,7 +15812,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				mpt
+				{0} mpt
+				{0} mpt
+				{0} mpt
+				{0} mpt
+			
+			
+				mcup
+				{0} mc
+				{0} mc
+				{0} mc
+				{0} mc
+			
 			
+				ac ft
 				{0} ac ft
 				{0} ac ft
 				{0} ac ft
@@ -12675,12 +15852,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gal Imp.
 			
 			
+				qt
 				{0} qt
 				{0} qt
 				{0} qt
 				{0} qt
 			
 			
+				pt
 				{0} pt
 				{0} pt
 				{0} pt
@@ -12701,12 +15880,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
+				tbsp
 				{0} tbsp
 				{0} tbsp
 				{0} tbsp
 				{0} tbsp
 			
 			
+				tsp
 				{0} tsp
 				{0} tsp
 				{0} tsp
@@ -12744,8 +15925,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} nebo {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/cs_CZ.xml b/make/data/cldr/common/main/cs_CZ.xml
index adb4518f234..e86e73f82e3 100644
--- a/make/data/cldr/common/main/cs_CZ.xml
+++ b/make/data/cldr/common/main/cs_CZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/cu.xml b/make/data/cldr/common/main/cu.xml
index e9b7e48c83c..d1f950387bb 100644
--- a/make/data/cldr/common/main/cu.xml
+++ b/make/data/cldr/common/main/cu.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -114,8 +114,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u0487\uA67D \u0483 ҂ а б \u2DE0 в \u2DE1 г \u2DE2 д \u2DE3 е є ж \u2DE4 \u2DE5 ѕ з ꙁ и й і ї к \u2DE6 л \u2DE7 м \u2DE8 н \u2DE9 ѻ о \u2DEA п р \u2DEC с \u2DED т у ꙋ ф х \u2DEF ѡ ѿ ꙍ ѽ ц ч \u2DF1 ш щ ⸯ ꙿ ъ ы ь ѣ ю ѫ ꙗ ѧ ѯ ѱ ѳ ѵ ѷ \u2DF4]
 		[\u0488\u0489\u200C\u200D\uA670\uA671\uA672\uFE2F \u0484 \uFE2E \uA66F \u2DF6 ꙣ \u2DF7 \uA674 ꙃ ꙅ \uA675 \uA676 ꙇ ꙉ \u2DF8 ꙥ ꙧ ҥ ꙩꙫꙭꙮꚙꚛ \u2DEB ҁ \u2DF5 \u2DEE \uA677 \u2DF9 \uA69E \uA67B \u2DF0 ꙡ џ \u2DF2 \u2DF3 ꙏ \uA678 ꙑ \uA679 \uA67A \u2DFA ꙓ \u2DFB ꙕ \u2DFC ѥ \uA69F \u2DFD ꙙ \u2DFE ꙛ ѩ ꙝ ѭ \u2DFF ꙟ]
 		[А Б В Г Д Є Ж Ѕ З И І К Л М Н Ѻ О П Р С Т Ꙋ Ф Х Ѡ Ѿ Ц Ч Ш Щ Ъ Ы Ь Ѣ Ю Ѫ Ꙗ Ѧ Ѯ Ѱ Ѳ Ѵ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[_ \- ‐ – — ⹃ , ; \: ! ? . ( ) ꙳ / ꙾]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[_ \- ‐ ‑ – — ⹃ , ; \: ! ? . ( ) ꙳ / ꙾]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/cu_RU.xml b/make/data/cldr/common/main/cu_RU.xml
index 6a05cb2f691..72056b30396 100644
--- a/make/data/cldr/common/main/cu_RU.xml
+++ b/make/data/cldr/common/main/cu_RU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/cy.xml b/make/data/cldr/common/main/cy.xml
index 55fd5cc2ed8..6a5311ef5b6 100644
--- a/make/data/cldr/common/main/cy.xml
+++ b/make/data/cldr/common/main/cy.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -144,9 +144,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Saesneg Awstralia
 			Saesneg Canada
 			Saesneg Prydain
-			Saesneg (DU)
 			Saesneg America
-			Saesneg (UDA)
 			Saesneg Canol
 			Esperanto
 			Sbaeneg
@@ -453,7 +451,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Samöeg
 			Sami Deheuol
 			Sami Lwle
-			Sami Inari
+			Inari Sami
 			Sami Scolt
 			Shona
 			Soninceg
@@ -490,7 +488,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tigrinya
 			Tigreg
 			Tifeg
-			Twrcmeneg
+			Tyrcmeneg
 			Tocelaweg
 			Tsakhureg
 			Tagalog
@@ -512,7 +510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tasawaq
 			Tahitïeg
 			Twfwnieg
-			Tamaseit Canolbarth Moroco
+			Tamazight Canol yr Atlas
 			Fotiaceg
 			Uighur
 			Wgariteg
@@ -545,13 +543,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Iddew-Almaeneg
 			Iorwba
 			Cantoneeg
+			Tsieinëeg, Cantoneg
 			Zapoteceg
 			Blisssymbols
 			Zêlandeg
 			Tamaseit Safonol
-			Tsieineeg
-			Tsieineeg Symledig
-			Tsieineeg Traddodiadol
+			Tsieinëeg
+			Tsieinëeg, Mandarin
+			Tsieinëeg Symledig
+			Tsieinëeg Mandarin Symledig
+			Tsieinëeg Traddodiadol
+			Tsieinëeg Mandarin Traddodiadol
 			Swlw
 			Swni
 			Dim cynnwys ieithyddol
@@ -591,7 +593,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
 			
@@ -655,7 +656,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Aruba
 			Ynysoedd Åland
 			Azerbaijan
-			Bosnia & Herzegovina
+			Bosnia a Herzegovina
 			Barbados
 			Bangladesh
 			Gwlad Belg
@@ -923,23 +924,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			tafodiaith Aluku
 			Armeneg Dwyreiniol
 			Armeneg Gorllewinol
-			BAUDDHA
-			BISCAYAN
 			Gwyddor Bohorič
 			gwyddor Dajnko
 			Saesneg Modern Cynnar
 			Seineg IPA
 			Seineg UPA
-			FONXSAMP
-			HOGNORSK
-			ITIHASA
-			JAUER
-			JYUTPING
 			yr Orgraff Gyffredin
-			KOCIEWIE
 			yr Orgraff Safonol
-			LAUKIKA
-			LUNA1918
 			gwyddor Metelko
 			tafodiaith Ndyuka
 			tafodiaith Natisone
@@ -948,17 +939,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			tafodiaith Pamaka
 			Cyfrifiadur
 			Saesneg Safonol yr Alban
-			SURMIRAN
-			SURSILV
-			SUTSILV
-			VAIDIKA
-			VALLADER
 		
 		
 			Calendr
 			Fformat Arian
 			Trefn
-			Arian Breiniol
+			Math o Arian
 			Cylched Awr (12 vs 24)
 			Arddull Toriad Llinell
 			System Fesur
@@ -1057,8 +1043,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á à â ä b c {ch} d {dd} e é è ê ë f {ff} g {ng} h i í ì î ï j l {ll} m n o ó ò ô ö p {ph} r {rh} s t {th} u ú ù û ü w ẃ ẁ ŵ ẅ y ý ỳ ŷ ÿ]
 		[ă å ã ā æ ç ĕ ē ĭ ī k ñ ŏ ø ō œ q ŭ ū v x z]
 		[A B C {CH} D {DD} E F {FF} G {NG} H I J K L {LL} M N O P {PH} Q R {RH} S T {TH} U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1066,30 +1052,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		… {0}
 		{0} … {1}
 		?
-		
-			[\--/]
-			[\:∶︓﹕：]
-		
-		
-			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
-			[\$﹩＄]
-			[£₤￡]
-			[¥￥]
-			[₩￦]
-			[₨₹{Rp}{Rs}]
-		
-		
-			[\-‐‒–⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
-		
-		
-			[,٫︐﹐，]
-			[.․﹒．｡]
-		
 	
 	
 		“
@@ -1188,56 +1150,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h – h a
@@ -1340,7 +1255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Ion
 							Chwef
 							Maw
-							Ebrill
+							Ebr
 							Mai
 							Meh
 							Gorff
@@ -1548,9 +1463,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							canol nos
-							yb
 							canol dydd
-							yh
 							y bore
 							y prynhawn
 							yr hwyr
@@ -1577,27 +1490,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							canol nos
-							yb
+							AM
 							canol dydd
-							yh
+							PM
 							bore
 							prynhawn
 							yr hwyr
 						
 						
 							canol nos
-							yb
+							AM
 							canol dydd
-							yh
+							PM
 							bore
 							prynhawn
 							min nos
 						
 						
 							canol nos
-							yb
 							canol dydd
-							yh
 							y bore
 							y prynhawn
 							yr hwyr
@@ -1751,56 +1662,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h – h a
@@ -3293,9 +3157,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Havana
 			
-			
-				Cabo Verde
-			
 			
 				Curaçao
 			
@@ -3347,9 +3208,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				El Aaiun
 			
-			
-				Asmera
-			
 			
 				Yr Ynysoedd Dedwydd
 			
@@ -3572,6 +3430,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aqtobe
 			
+			
+				Kostanay
+			
 			
 				Qyzylorda
 			
@@ -4037,9 +3898,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kiev
 			
-			
-				Zaporizhzhya
-			
 			
 				Kampala
 			
@@ -4672,7 +4530,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Amser Gorllewin Casachstan
+					Amser Gorllewin Kazakhstan
 				
 			
 			
@@ -5031,9 +4889,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Amser Wsbecistan
-					Amser Safonol Wsbecistan
-					Amser Haf Wsbecistan
+					Amser Uzbekistan
+					Amser Safonol Uzbekistan
+					Amser Haf Uzbekistan
 				
 			
 			
@@ -5094,6 +4952,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			٪؜
@@ -5113,8 +4975,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5123,6 +4989,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 mil
@@ -5391,6 +5262,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dirham yr Emiradau Arabaidd Unedig
 				dirham yr Emiradau Arabaidd Unedig
 				dirham yr Emiradau Arabaidd Unedig
+				AED
 			
 			
 				Afghani Afghanistan (1927–2002)
@@ -5410,6 +5282,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afghani Afghanistan
 				afghani Afghanistan
 				afghani Afghanistan
+				AFN
 			
 			
 				Lek Albania
@@ -5419,6 +5292,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lek Albania
 				lek Albania
 				lek Albania
+				ALL
 			
 			
 				Dram Armenia
@@ -5428,6 +5302,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dram Armenia
 				dram Armenia
 				dram Armenia
+				AMD
 			
 			
 				Guilder Antilles yr Iseldiroedd
@@ -5437,6 +5312,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guilder Antilles yr Iseldiroedd
 				guilder Antilles yr Iseldiroedd
 				guilder Antilles yr Iseldiroedd
+				ANG
 			
 			
 				Kwanza Angola
@@ -5446,6 +5322,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kwanza Angola
 				kwanza Angola
 				kwanza Angola
+				AOA
+				Kz
 			
 			
 				Kwanza Angola (1977–1991)
@@ -5525,6 +5403,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso yr Ariannin
 				peso yr Ariannin
 				peso yr Ariannin
+				ARS
+				$
 			
 			
 				Swllt Awstria
@@ -5539,11 +5419,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Doler Awstralia
 				doler Awstralia
-				ddoler Awstralia
+				doler Awstralia
 				ddoler Awstralia
 				doler Awstralia
 				doler Awstralia
 				doler Awstralia
+				A$
+				$
 			
 			
 				Fflorin Aruba
@@ -5553,6 +5435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fflorin Aruba
 				fflorin Aruba
 				fflorin Aruba
+				AWG
 			
 			
 				Manat Azerbaijan (1993–2006)
@@ -5572,6 +5455,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manat Azerbaijan
 				manat Azerbaijan
 				manat Azerbaijan
+				AZN
 			
 			
 				Marc Trosadwy Bosnia a Hercegovina
@@ -5581,6 +5465,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marc trosadwy Bosnia a Hercegovina
 				marc trosadwy Bosnia a Hercegovina
 				marc trosadwy Bosnia a Hercegovina
+				BAM
+				KM
 			
 			
 				Doler Barbados
@@ -5590,6 +5476,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				doler Barbados
 				doler Barbados
 				doler Barbados
+				BBD
+				$
 			
 			
 				Taka Bangladesh
@@ -5599,6 +5487,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				taka Bangladesh
 				taka Bangladesh
 				taka Bangladesh
+				BDT
 				TK
 			
 			
@@ -5649,6 +5538,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lev Bwlgaria
 				lev Bwlgaria
 				lev Bwlgaria
+				BGN
 			
 			
 				Lev Bwlgaria (1879–1952)
@@ -5668,6 +5558,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Bahrain
 				dinar Bahrain
 				dinar Bahrain
+				BHD
 			
 			
 				Ffranc Burundi
@@ -5677,24 +5568,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc Burundi
 				ffranc Burundi
 				ffranc Burundi
+				BIF
 			
 			
 				Doler Bermuda
 				doler Bermuda
-				ddoler Bermuda
+				doler Bermuda
 				ddoler Bermuda
 				doler Bermuda
 				doler Bermuda
 				doler Bermuda
+				BMD
+				$
 			
 			
 				Doler Brunei
 				doler Brunei
-				ddoler Brunei
+				doler Brunei
 				ddoler Brunei
 				doler Brunei
 				doler Brunei
 				doler Brunei
+				BND
+				$
 			
 			
 				Boliviano Bolifia
@@ -5704,6 +5600,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				boliviano Bolifia
 				boliviano Bolifia
 				boliviano Bolifia
+				BOB
+				Bs
 			
 			
 				Boliviano Bolifia (1863–1963)
@@ -5773,6 +5671,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				real Brasil
 				real Brasil
 				real Brasil
+				R$
+				R$
 			
 			
 				Cruzado Newydd Brasil (1989–1990)
@@ -5812,6 +5712,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				doler y Bahamas
 				doler y Bahamas
 				doler y Bahamas
+				BSD
+				$
 			
 			
 				Ngultrum Bhutan
@@ -5821,6 +5723,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ngultrum Bhutan
 				ngultrum Bhutan
 				ngultrum Bhutan
+				BTN
 			
 			
 				Kyat Byrma
@@ -5840,6 +5743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pula Botswana
 				pula Botswana
 				pula Botswana
+				BWP
 				BWP
 			
 			
@@ -5850,6 +5754,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwbl Belarws
 				rwbl Belarws
 				rwbl Belarws
+				BYN
+				р.
 			
 			
 				Rwbl Belarws (2000–2016)
@@ -5864,20 +5770,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Doler Belize
 				doler Belize
-				ddoler Belize
+				doler Belize
 				ddoler Belize
 				doler Belize
 				doler Belize
 				doler Belize
+				BZD
+				$
 			
 			
 				Doler Canada
 				doler Canada
 				ddoler Canada
-				ddoler Canada
+				doler Canada
 				doler Canada
 				doler Canada
 				doler Canada
+				CA$
+				$
 			
 			
 				Ffranc Congo
@@ -5887,6 +5797,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc Congo
 				ffranc Congo
 				ffranc Congo
+				CDF
 			
 			
 				Ewro WIR
@@ -5906,6 +5817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc y Swistir
 				ffranc y Swistir
 				ffranc y Swistir
+				CHF
 			
 			
 				Ffranc WIR
@@ -5945,6 +5857,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso Chile
 				peso Chile
 				peso Chile
+				CLP
+				$
 			
 			
 				Yuan Tsieina (ar y môr)
@@ -5954,6 +5868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				yuan Tsieina (ar y môr)
 				yuan Tsieina (ar y môr)
 				yuan Tsieina (ar y môr)
+				CNH
 			
 			
 				Doler Banc Pobl Tsieina
@@ -5972,6 +5887,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				yuan Tsieina
 				yuan Tsieina
 				yuan Tsieina
+				CN¥
+				¥
 			
 			
 				Peso Colombia
@@ -5981,6 +5898,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso Colombia
 				peso Colombia
 				peso Colombia
+				COP
+				$
 			
 			
 				Uned Gwir Werth Colombia
@@ -6000,6 +5919,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				colón Costa Rica
 				colón Costa Rica
 				colón Costa Rica
+				CRC
+				₡
 			
 			
 				CSD
@@ -6012,6 +5933,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso trosadwy Ciwba
 				peso trosadwy Ciwba
 				peso trosadwy Ciwba
+				CUC
+				$
 			
 			
 				Peso Ciwba
@@ -6021,6 +5944,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso Ciwba
 				peso Ciwba
 				peso Ciwba
+				CUP
+				$
 			
 			
 				Esgwdo Cabo Verde
@@ -6030,6 +5955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				esgwdo Cabo Verde
 				esgwdo Cabo Verde
 				esgwdo Cabo Verde
+				CVE
 			
 			
 				Punt Cyprus
@@ -6049,6 +5975,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				koruna’r Weriniaeth Tsiec
 				koruna’r Weriniaeth Tsiec
 				koruna’r Weriniaeth Tsiec
+				CZK
+				Kč
 			
 			
 				Marc Dwyrain yr Almaen
@@ -6078,6 +6006,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc Djibouti
 				ffranc Djibouti
 				ffranc Djibouti
+				DJF
 			
 			
 				Krone Denmarc
@@ -6087,6 +6016,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				krone Denmarc
 				krone Denmarc
 				krone Denmarc
+				DKK
+				kr
 			
 			
 				Peso Gweriniaeth Dominica
@@ -6096,6 +6027,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso Gweriniaeth Dominica
 				peso Gweriniaeth Dominica
 				peso Gweriniaeth Dominica
+				DOP
+				$
 			
 			
 				Dinar Algeria
@@ -6105,6 +6038,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Algeria
 				dinar Algeria
 				dinar Algeria
+				DZD
 			
 			
 				Sucre Ecuador
@@ -6140,8 +6074,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bunt yr Aifft
 				bunt yr Aifft
 				punt yr Aifft
-				phunt yr Aifft
+				punt yr Aifft
 				punt yr Aifft
+				EGP
+				E£
 			
 			
 				Nakfa Eritrea
@@ -6151,6 +6087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nakfa Eritrea
 				nakfa Eritrea
 				nakfa Eritrea
+				ERN
 			
 			
 				ESP
@@ -6163,6 +6100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				birr Ethiopia
 				birr Ethiopia
 				birr Ethiopia
+				ETB
 			
 			
 				Ewro
@@ -6172,6 +6110,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ewro
 				ewro
 				ewro
+				€
+				€
 			
 			
 				Markka’r Ffindir
@@ -6186,11 +6126,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Doler Ffiji
 				doler Ffiji
-				ddoler Ffiji
+				doler Ffiji
 				ddoler Ffiji
 				doler Ffiji
 				doler Ffiji
 				doler Ffiji
+				FJD
+				$
 			
 			
 				Punt Ynysoedd Falkland/Malvinas
@@ -6198,8 +6140,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				punt Ynysoedd Falkland/Malvinas
 				bunt Ynysoedd Falkland/Malvinas
 				punt Ynysoedd Falkland/Malvinas
-				phunt Ynysoedd Falkland/Malvinas
+				punt Ynysoedd Falkland/Malvinas
 				punt Ynysoedd Falkland/Malvinas
+				FKP
+				£
 			
 			
 				Ffranc Ffrainc
@@ -6217,8 +6161,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bunt Prydain
 				bunt Prydain
 				punt Prydain
-				phunt Prydain
+				punt Prydain
 				punt Prydain
+				£
+				£
 			
 			
 				Kupon Larit Georgia
@@ -6238,6 +6184,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lari Georgia
 				lari Georgia
 				lari Georgia
+				GEL
+				₾
 				₾
 			
 			
@@ -6258,6 +6206,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cedi Ghana
 				cedi Ghana
 				cedi Ghana
+				GHS
 			
 			
 				Punt Gibraltar
@@ -6265,8 +6214,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				punt Gibraltar
 				bunt Gibraltar
 				punt Gibraltar
-				phunt Gibraltar
+				punt Gibraltar
 				punt Gibraltar
+				GIP
+				£
 			
 			
 				Dalasi Gambia
@@ -6276,6 +6227,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dalasi Gambia
 				dalasi Gambia
 				dalasi Gambia
+				GMD
 			
 			
 				Ffranc Guinée
@@ -6285,6 +6237,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc Guinée
 				ffranc Guinée
 				ffranc Guinée
+				GNF
+				FG
 			
 			
 				Syli Guinée
@@ -6317,6 +6271,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				quetzal Guatemala
 				quetzal Guatemala
 				quetzal Guatemala
+				GTQ
+				Q
 			
 			
 				GWE
@@ -6334,20 +6290,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Doler Guyana
 				doler Guyana
-				ddoler Guyana
+				doler Guyana
 				ddoler Guyana
 				doler Guyana
 				doler Guyana
 				doler Guyana
+				GYD
+				$
 			
 			
 				Doler Hong Kong
 				doler Hong Kong
-				ddoler Hong Kong
+				doler Hong Kong
 				ddoler Hong Kong
 				doler Hong Kong
 				doler Hong Kong
 				doler Hong Kong
+				HK$
 				HK$
 			
 			
@@ -6358,6 +6317,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lempira Honduras
 				lempira Honduras
 				lempira Honduras
+				HNL
+				L
 			
 			
 				HRD
@@ -6370,6 +6331,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuna Croatia
 				kuna Croatia
 				kuna Croatia
+				HRK
+				kn
 			
 			
 				Gourde Haiti
@@ -6379,6 +6342,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gourde Haiti
 				gourde Haiti
 				gourde Haiti
+				HTG
 			
 			
 				Fforint Hwngari
@@ -6388,6 +6352,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fforint Hwngari
 				fforint Hwngari
 				fforint Hwngari
+				HUF
+				Ft
 			
 			
 				Rupiah Indonesia
@@ -6397,6 +6363,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupiah Indonesia
 				rupiah Indonesia
 				rupiah Indonesia
+				IDR
+				Rp
 			
 			
 				Punt Iwerddon
@@ -6435,6 +6403,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				shegel newydd Israel
 				shegel newydd Israel
 				shegel newydd Israel
+				₪
+				₪
 			
 			
 				Rwpî India
@@ -6444,6 +6414,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwpî India
 				rwpî India
 				rwpî India
+				₹
+				₹
 			
 			
 				Dinar Irac
@@ -6453,6 +6425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Irac
 				dinar Irac
 				dinar Irac
+				IQD
 			
 			
 				Rial Iran
@@ -6462,6 +6435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial Iran
 				rial Iran
 				rial Iran
+				IRR
 			
 			
 				Króna Gwlad yr Iâ (1918 – 1981)
@@ -6480,6 +6454,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				króna Gwlad yr Iâ
 				króna Gwlad yr Iâ
 				króna Gwlad yr Iâ
+				ISK
+				kr
 			
 			
 				ITL
@@ -6487,11 +6463,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Doler Jamaica
 				doler Jamaica
-				ddoler Jamaica
+				doler Jamaica
 				ddoler Jamaica
 				doler Jamaica
 				doler Jamaica
 				doler Jamaica
+				JMD
+				$
 			
 			
 				Dinar Gwlad yr Iorddonen
@@ -6501,6 +6479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Gwlad yr Iorddonen
 				dinar Gwlad yr Iorddonen
 				dinar Gwlad yr Iorddonen
+				JOD
 			
 			
 				Yen Japan
@@ -6510,6 +6489,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				yen Japan
 				yen Japan
 				yen Japan
+				JP¥
+				¥
 			
 			
 				Swllt Kenya
@@ -6519,6 +6500,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				swllt Kenya
 				swllt Kenya
 				swllt Kenya
+				KES
 			
 			
 				Som Kyrgyzstan
@@ -6528,6 +6510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				som Kyrgyzstan
 				som Kyrgyzstan
 				som Kyrgyzstan
+				KGS
 			
 			
 				Riel Cambodia
@@ -6537,6 +6520,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riel Cambodia
 				riel Cambodia
 				riel Cambodia
+				KHR
+				៛
 			
 			
 				Ffranc Comoros
@@ -6546,6 +6531,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc Comoros
 				ffranc Comoros
 				ffranc Comoros
+				KMF
+				CF
 			
 			
 				Won Gogledd Corea
@@ -6555,6 +6542,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				won Gogledd Corea
 				won Gogledd Corea
 				won Gogledd Corea
+				KPW
+				₩
 			
 			
 				Hwan De Corea (1953–1962)
@@ -6585,6 +6574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				won De Corea
 				won De Corea
 				KRW
+				₩
 			
 			
 				Dinar Kuwait
@@ -6594,15 +6584,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Kuwait
 				dinar Kuwait
 				dinar Kuwait
+				KWD
 			
 			
 				Doler Ynysoedd Cayman
 				doler Ynysoedd Cayman
-				ddoler Ynysoedd Cayman
+				doler Ynysoedd Cayman
 				ddoler Ynysoedd Cayman
 				doler Ynysoedd Cayman
 				doler Ynysoedd Cayman
 				doler Ynysoedd Cayman
+				KYD
+				$
 			
 			
 				Tenge Kazakstan
@@ -6612,6 +6605,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tenge Kazakstan
 				tenge Kazakstan
 				tenge Kazakstan
+				KZT
+				₸
 			
 			
 				Kip Laos
@@ -6621,6 +6616,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kip Laos
 				kip Laos
 				kip Laos
+				LAK
+				₭
 			
 			
 				Punt Libanus
@@ -6628,8 +6625,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				punt Libanus
 				bunt Libanus
 				punt Libanus
-				phunt Libanus
+				punt Libanus
 				punt Libanus
+				LBP
+				L£
 			
 			
 				Rwpî Sri Lanka
@@ -6639,6 +6638,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwpî Sri Lanka
 				rwpî Sri Lanka
 				rwpî Sri Lanka
+				LKR
+				Rs
 			
 			
 				Doler Liberia
@@ -6648,6 +6649,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				doler Liberia
 				doler Liberia
 				doler Liberia
+				LRD
+				$
 			
 			
 				Loti Lesotho
@@ -6723,6 +6726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Libya
 				dinar Libya
 				dinar Libya
+				LYD
 			
 			
 				Dirham Moroco
@@ -6732,6 +6736,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dirham Moroco
 				dirham Moroco
 				dirham Moroco
+				MAD
 			
 			
 				Ffranc Moroco
@@ -6761,6 +6766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu Moldofa
 				leu Moldofa
 				leu Moldofa
+				MDL
 			
 			
 				Ariary Madagascar
@@ -6770,6 +6776,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ariary Madagascar
 				ariary Madagascar
 				ariary Madagascar
+				MGA
+				Ar
 			
 			
 				Ffranc Madagascar
@@ -6789,6 +6797,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				denar Macedonia
 				denar Macedonia
 				denar Macedonia
+				MKD
 			
 			
 				MKN
@@ -6811,6 +6820,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kyat Myanmar
 				kyat Myanmar
 				kyat Myanmar
+				MMK
+				K
 			
 			
 				Tugrik Mongolia
@@ -6820,6 +6831,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tugrik Mongolia
 				tugrik Mongolia
 				tugrik Mongolia
+				MNT
+				₮
 			
 			
 				Pataca Macau
@@ -6829,6 +6842,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pataca Macau
 				pataca Macau
 				pataca Macau
+				MOP
 			
 			
 				Ouguiya Mauritania (1973–2017)
@@ -6838,6 +6852,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ouguiya Mauritania (1973–2017)
 				ouguiya Mauritania (1973–2017)
 				ouguiya Mauritania (1973–2017)
+				MRO
 			
 			
 				Ouguiya Mauritania
@@ -6863,6 +6878,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwpî Mauritius
 				rwpî Mauritius
 				rwpî Mauritius
+				MUR
+				Rs
 			
 			
 				Rwpî’r Maldives (1947–1981)
@@ -6881,6 +6898,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rufiyaa’r Maldives
 				rufiyaa’r Maldives
 				rufiyaa’r Maldives
+				MVR
 			
 			
 				Kwacha Malawi
@@ -6890,6 +6908,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kwacha Malawi
 				kwacha Malawi
 				kwacha Malawi
+				MWK
 			
 			
 				Peso Mecsico
@@ -6899,6 +6918,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso Mecsico
 				peso Mecsico
 				peso Mecsico
+				MX$
+				$
 			
 			
 				Peso Arian México (1861–1992)
@@ -6928,6 +6949,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ringgit Malaysia
 				ringgit Malaysia
 				ringgit Malaysia
+				MYR
+				RM
 			
 			
 				Escudo Mozambique
@@ -6957,15 +6980,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				metical Mozambique
 				metical Mozambique
 				metical Mozambique
+				MZN
 			
 			
 				Doler Namibia
 				doler Namibia
-				ddoler Namibia
+				doler Namibia
 				ddoler Namibia
 				doler Namibia
 				doler Namibia
 				doler Namibia
+				NAD
+				$
 			
 			
 				Naira Nigeria
@@ -6975,6 +7001,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				naira Nigeria
 				naira Nigeria
 				naira Nigeria
+				NGN
+				₦
 			
 			
 				Córdoba Nicaragua (1988–1991)
@@ -6994,6 +7022,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cordoba Nicaragwa
 				cordoba Nicaragwa
 				cordoba Nicaragwa
+				NIO
+				C$
 			
 			
 				Guilder yr Iseldiroedd
@@ -7013,6 +7043,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				krone Norwy
 				krone Norwy
 				krone Norwy
+				NOK
+				kr
 			
 			
 				Rwpî Nepal
@@ -7022,15 +7054,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwpî Nepal
 				rwpî Nepal
 				rwpî Nepal
+				NPR
+				Rs
 			
 			
 				Doler Seland Newydd
 				doler Seland Newydd
-				ddoler Seland Newydd
+				doler Seland Newydd
 				ddoler Seland Newydd
 				doler Seland Newydd
 				doler Seland Newydd
 				doler Seland Newydd
+				NZ$
+				$
 			
 			
 				Rial Oman
@@ -7040,6 +7076,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial Oman
 				rial Oman
 				rial Oman
+				OMR
 			
 			
 				Balboa Panama
@@ -7049,6 +7086,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				balboa Panama
 				balboa Panama
 				balboa Panama
+				PAB
 			
 			
 				Inti Periw
@@ -7068,6 +7106,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sol Periw
 				sol Periw
 				sol Periw
+				PEN
 			
 			
 				Sol Periw (1863–1965)
@@ -7087,15 +7126,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kina Papua Guinea Newydd
 				kina Papua Guinea Newydd
 				kina Papua Guinea Newydd
+				PGK
 			
 			
-				Peso’r Philipinau
+				Peso Philipinas
 				peso Philipinas
 				peso Philipinas
 				peso Philipinas
 				peso Philipinas
 				peso Philipinas
 				peso Philipinas
+				PHP
+				₱
 			
 			
 				Rwpî Pacistan
@@ -7105,6 +7147,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwpî Pacistan
 				rwpî Pacistan
 				rwpî Pacistan
+				PKR
+				Rs
 			
 			
 				Zloty Gwlad Pwyl
@@ -7114,6 +7158,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zloty Gwlad Pwyl
 				zloty Gwlad Pwyl
 				zloty Gwlad Pwyl
+				PLN
+				zł
 			
 			
 				PTE
@@ -7126,6 +7172,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guarani Paraguay
 				guarani Paraguay
 				guarani Paraguay
+				PYG
+				₲
 			
 			
 				Rial Qatar
@@ -7135,6 +7183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial Qatar
 				rial Qatar
 				rial Qatar
+				QAR
 			
 			
 				Doler Rhodesia
@@ -7154,6 +7203,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu Rwmania
 				leu Rwmania
 				leu Rwmania
+				RON
+				lei
 			
 			
 				Dinar Serbia
@@ -7163,6 +7214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Serbia
 				dinar Serbia
 				dinar Serbia
+				RSD
 			
 			
 				Rwbl Rwsia
@@ -7172,6 +7224,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwbl Rwsia
 				rwbl Rwsia
 				rwbl Rwsia
+				RUB
+				₽
 			
 			
 				Ffranc Rwanda
@@ -7181,6 +7235,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc Rwanda
 				ffranc Rwanda
 				ffranc Rwanda
+				RWF
+				RF
 			
 			
 				Riyal Saudi Arabia
@@ -7190,15 +7246,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riyal Saudi Arabia
 				riyal Saudi Arabia
 				riyal Saudi Arabia
+				SAR
 			
 			
 				Doler Ynysoedd Solomon
 				doler Ynysoedd Solomon
-				ddoler Ynysoedd Solomon
+				doler Ynysoedd Solomon
 				ddoler Ynysoedd Solomon
 				doler Ynysoedd Solomon
 				doler Ynysoedd Solomon
 				doler Ynysoedd Solomon
+				SBD
+				$
 			
 			
 				Rwpî Seychelles
@@ -7208,6 +7267,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rwpî Seychelles
 				rwpî Seychelles
 				rwpî Seychelles
+				SCR
 			
 			
 				Dinar Sudan (1992–2007)
@@ -7225,8 +7285,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bunt Sudan
 				bunt Sudan
 				punt Sudan
-				phunt Sudan
+				punt Sudan
 				punt Sudan
+				SDG
 			
 			
 				Punt Sudan (1957–1998)
@@ -7246,15 +7307,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				krona Sweden
 				krona Sweden
 				krona Sweden
+				SEK
+				kr
 			
 			
 				Doler Singapore
 				doler Singapore
-				ddoler Singapore
+				doler Singapore
 				ddoler Singapore
 				doler Singapore
 				doler Singapore
 				doler Singapore
+				SGD
+				$
 			
 			
 				Punt St Helena
@@ -7262,8 +7327,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bunt St. Helena
 				bunt St. Helena
 				punt St. Helena
-				phunt St. Helena
+				punt St. Helena
 				punt St. Helena
+				SHP
+				£
 			
 			
 				SIT
@@ -7276,6 +7343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leone Sierra Leone
 				leone Sierra Leone
 				leone Sierra Leone
+				SLL
 			
 			
 				Swllt Somalia
@@ -7285,15 +7353,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				swllt Somalia
 				swllt Somalia
 				swllt Somalia
+				SOS
 			
 			
 				Doler Surinam
 				doler Surinam
-				ddoler Surinam
+				doler Surinam
 				ddoler Surinam
 				doler Surinam
 				doler Surinam
 				doler Surinam
+				SRD
+				$
 			
 			
 				Guilder Surinam
@@ -7311,8 +7382,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				punt De Sudan
 				bunt De Sudan
 				punt De Sudan
-				phunt De Sudan
+				punt De Sudan
 				punt De Sudan
+				SSP
+				£
 			
 			
 				Dobra São Tomé a Príncipe (1977–2017)
@@ -7322,6 +7395,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dobra São Tomé a Príncipe (1977–2017)
 				dobra São Tomé a Príncipe (1977–2017)
 				dobra São Tomé a Príncipe (1977–2017)
+				STD
 			
 			
 				Dobra São Tomé a Príncipe
@@ -7352,6 +7426,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				punt Syria
 				punt Syria
 				punt Syria
+				SYP
+				£
 			
 			
 				Lilangeni Gwlad Swazi
@@ -7361,6 +7437,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lilangeni Gwlad Swazi
 				lilangeni Gwlad Swazi
 				lilangeni Gwlad Swazi
+				SZL
 			
 			
 				Baht Gwlad Thai
@@ -7371,6 +7448,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				baht Gwlad Thai
 				baht Gwlad Thai
 				฿
+				฿
 			
 			
 				Rwbl Tajikistan
@@ -7390,6 +7468,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somoni Tajikstan
 				somoni Tajikstan
 				somoni Tajikstan
+				TJS
 			
 			
 				Manat Turkmenistan (1993–2009)
@@ -7409,6 +7488,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manat Turkmenistan
 				manat Turkmenistan
 				manat Turkmenistan
+				TMT
 			
 			
 				Dinar Tunisia
@@ -7418,6 +7498,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar Tunisia
 				dinar Tunisia
 				dinar Tunisia
+				TND
 			
 			
 				Paʻanga Tonga
@@ -7427,6 +7508,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paʻanga Tonga
 				paʻanga Tonga
 				paʻanga Tonga
+				TOP
+				T$
 			
 			
 				Escudo Timor
@@ -7456,24 +7539,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lira Twrci
 				lira Twrci
 				lira Twrci
+				TRY
+				₺
+				TL
 			
 			
 				Doler Trinidad a Tobago
 				doler Trinidad a Tobago
-				ddoler Trinidad a Tobago
+				doler Trinidad a Tobago
 				ddoler Trinidad a Tobago
 				doler Trinidad a Tobago
 				doler Trinidad a Tobago
 				doler Trinidad a Tobago
+				TTD
+				$
 			
 			
 				Doler Newydd Taiwan
 				doler newydd Taiwan
-				ddoler newydd Taiwan
+				doler newydd Taiwan
 				ddoler newydd Taiwan
 				doler newydd Taiwan
 				doler newydd Taiwan
 				doler newydd Taiwan
+				NT$
 				NT$
 			
 			
@@ -7484,6 +7573,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				swllt Tanzania
 				swllt Tanzania
 				swllt Tanzania
+				TZS
 			
 			
 				Hryvnia Wcráin
@@ -7493,6 +7583,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hryvnia Wcráin
 				hryvnia Wcráin
 				hryvnia Wcráin
+				UAH
+				₴
 			
 			
 				Swllt Uganda (1966–1987)
@@ -7512,15 +7604,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				swllt Uganda
 				swllt Uganda
 				swllt Uganda
+				UGX
 			
 			
 				Doler UDA
 				doler UDA
-				ddoler UDA
+				doler UDA
 				ddoler UDA
 				doler UDA
 				doler UDA
 				doler UDA
+				US$
+				$
 			
 			
 				Doler UDA (y diwrnod nesaf)
@@ -7563,6 +7658,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso Uruguay
 				peso Uruguay
 				peso Uruguay
+				UYU
+				$
 			
 			
 				Som Uzbekistan
@@ -7572,6 +7669,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				som Uzbekistan
 				som Uzbekistan
 				som Uzbekistan
+				UZS
 			
 			
 				Bolívar Venezuela (1871–2008)
@@ -7591,6 +7689,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolívar Venezuela (2008–2018)
 				bolívar Venezuela (2008–2018)
 				bolívar Venezuela (2008–2018)
+				VEF
+				Bs
 			
 			
 				Bolívar Venezuela
@@ -7610,6 +7710,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dong Fietnam
 				dong Fietnam
 				dong Fietnam
+				₫
+				₫
 			
 			
 				Dong Fietnam (1978–1985)
@@ -7629,6 +7731,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vatu Vanuatu
 				vatu Vanuatu
 				vatu Vanuatu
+				VUV
 			
 			
 				Tala Samoa
@@ -7638,6 +7741,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tala Samoa
 				tala Samoa
 				tala Samoa
+				WST
 			
 			
 				Ffranc CFA Canol Affrica
@@ -7647,6 +7751,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc CFA Canol Affrica
 				ffranc CFA Canol Affrica
 				ffranc CFA Canol Affrica
+				FCFA
 			
 			
 				Arian
@@ -7675,11 +7780,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Doler Dwyrain y Caribî
 				doler Dwyrain y Caribî
-				ddoler Dwyrain y Caribî
+				doler Dwyrain y Caribî
 				ddoler Dwyrain y Caribî
 				doler Dwyrain y Caribî
 				doler Dwyrain y Caribî
 				doler Dwyrain y Caribî
+				EC$
+				$
 			
 			
 				Uned Arian Cyfred Ewropeaidd
@@ -7699,6 +7806,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc CFA Gorllewin Affrica
 				ffranc CFA Gorllewin Affrica
 				ffranc CFA Gorllewin Affrica
+				CFA
 			
 			
 				Paladiwm
@@ -7711,6 +7819,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ffranc CPF
 				ffranc CPF
 				ffranc CPF
+				CFPF
 			
 			
 				Platinwm
@@ -7752,6 +7861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial Yemen
 				rial Yemen
 				rial Yemen
+				YER
 			
 			
 				YUD
@@ -7783,6 +7893,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rand De Affrica
 				rand De Affrica
 				rand De Affrica
+				ZAR
 				ZAR
 			
 			
@@ -7803,6 +7914,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kwacha Zambia
 				kwacha Zambia
 				kwacha Zambia
+				ZMW
 				ZMW
 			
 			
@@ -7884,20 +7996,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				grym disgyrchedd
-				{0} grym disgyrchedd
+				{0} G
 				{0} grym disgyrchedd
-				{0} rym disgyrchedd
-				{0} grym disgyrchedd
-				{0} grym disgyrchedd
+				{0} G
+				{0} G
+				{0} G
 				{0} grym disgyrchedd
 			
 			
 				metrau yr eiliad sgwâr
-				{0} metr yr eiliad sgwâr
+				{0} m/eil²
 				{0} metr yr eiliad sgwâr
-				{0} fetr yr eiliad sgwâr
-				{0} metr yr eiliad sgwâr
-				{0} metr yr eiliad sgwâr
+				{0} m/eil²
+				{0} m/eil²
+				{0} m/eil²
 				{0} metr yr eiliad sgwâr
 			
 			
@@ -7911,11 +8023,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				radianau
-				{0} radian
+				{0} rad
 				{0} radian
 				{0} radian
 				{0} radian
-				{0} radian
+				{0} rad
 				{0} radian
 			
 			
@@ -7947,40 +8059,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				cilometrau sgwâr
-				{0} cilometr sgwâr
-				{0} cilometr sgwâr
-				{0} gilometr sgwâr
-				{0} chilometr sgwâr
-				{0} chilometr sgwâr
+				{0} km²
+				{0} km²
+				{0} km²
+				{0} km²
+				{0} km²
 				{0} cilometr sgwâr
 				{0} y cilometr sgwâr
 			
 			
 				hectarau
-				{0} hectar
+				{0} ha
 				{0} hectar
-				{0} hectar
-				{0} hectar
-				{0} hectar
+				{0} ha
+				{0} ha
+				{0} ha
 				{0} hectar
 			
 			
 				metrau sgwâr
-				{0} metr sgwâr
+				{0} m²
 				{0} metr sgwâr
-				{0} fetr sgwâr
-				{0} metr sgwâr
-				{0} metr sgwâr
+				{0} m²
+				{0} m²
+				{0} m²
 				{0} metr sgwâr
 				{0} y metr sgwâr
 			
 			
 				centimetrau sgwâr
-				{0} centimetr sgwâr
+				{0} cm²
 				{0} centimetr sgwâr
-				{0} gentimetr sgwâr
-				{0} chentimetr sgwâr
-				{0} chentimetr sgwâr
+				{0} cm²
+				{0} cm²
+				{0} cm²
 				{0} centimetr sgwâr
 				{0} y centimetr sgwâr
 			
@@ -8033,38 +8145,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dunamau
-				{0} dunam
-				{0} dunam
-				{0} ddunam
-				{0} dunam
-				{0} dunam
-				{0} dunam
+				{0} dunam
+				{0} dunam
+				{0} ddunam
+				{0} dunam
+				{0} dunam
+				{0} dunam
 			
 			
 				karatau
 				{0} karat
 				{0} karat
-				{0} karat
-				{0} karat
-				{0} karat
+				{0} kt
+				{0} kt
+				{0} kt
 				{0} karat
 			
 			
 				miligramau y declilitr
-				{0} miligram y decilitr
+				{0} mg/dL
 				{0} miligram y decilitr
-				{0} miligram y decilitr
-				{0} miligram y decilitr
-				{0} miligram y decilitr
+				{0} mg/dL
+				{0} mg/dL
+				{0} mg/dL
 				{0} miligram y decilitr
 			
 			
 				milimolau y litr
-				{0} milimôl y litr
+				{0} mmol/L
 				{0} milimôl y litr
-				{0} milimôl y litr
-				{0} milimôl y litr
-				{0} milimôl y litr
+				{0} mmol/L
+				{0} mmol/L
+				{0} mmol/L
 				{0} milimôl y litr
 			
 			
@@ -8096,12 +8208,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				permyriad
-				{0}‱
-				{0} permyriad
-				{0}‱
-				{0}‱
-				{0}‱
-				{0} permyriad
+				{0}‱
+				{0} permyriad
+				{0}‱
+				{0}‱
+				{0}‱
+				{0} permyriad
 			
 			
 				molau
@@ -8114,38 +8226,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				litrau y cilometr
-				{0} litr y cilometr
+				{0} L/km
 				{0} litr y cilometr
-				{0} litr y cilometr
-				{0} litr y cilometr
-				{0} litr y cilometr
+				{0} L/km
+				{0} L/km
+				{0} L/km
 				{0} litr y cilometr
 			
 			
 				litrau y 100 cilometr
-				{0} litr wrth y 100 cilometr
+				{0} L/100km
 				{0} litr y 100 cilometr
-				{0} litr y 100 cilometr
-				{0} litr y 100 cilometr
-				{0} litr y 100 cilometr
+				{0} L/100km
+				{0} L/100km
+				{0} L/100km
 				{0} litr y 100 cilometr
 			
 			
 				milltiroedd y galwyn
-				{0} milltir y galwyn
+				{0} mpg
 				{0} filltir y galwyn
-				{0} filltir y galwyn
-				{0} milltir y galwyn
-				{0} milltir y galwyn
+				{0} mpg
+				{0} mpg
+				{0} mpg
 				{0} milltir y galwyn
 			
 			
 				milltiroedd y galwyn Imp.
-				{0} milltir y galwyn Imp.
+				{0} mpg Imp.
 				{0} milltir y galwyn Imp.
-				{0} filltir y galwyn Imp.
-				{0} milltir y galwyn Imp.
-				{0} milltir y galwyn Imp.
+				{0} mpg Imp.
+				{0} mpg Imp.
+				{0} mpg Imp.
 				{0} milltir y galwyn Imp.
 			
 			
@@ -8159,74 +8271,74 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				terabeitiau
-				{0} terabeit
+				{0} TB
 				{0} terabeit
-				{0} derabeit
-				{0} terabeit
-				{0} terabeit
+				{0} TB
+				{0} TB
+				{0} TB
 				{0} terabeit
 			
 			
 				teradidau
-				{0} teradid
+				{0} Tb
 				{0} teradid
-				{0} deradid
-				{0} teradid
-				{0} teradid
+				{0} Tb
+				{0} Tb
+				{0} Tb
 				{0} teradid
 			
 			
 				gigabeitiau
-				{0} gigabeit
+				{0} GB
 				{0} gigabeit
-				{0} gigabeit
-				{0} gigabeit
-				{0} gigabeit
+				{0} GB
+				{0} GB
+				{0} GB
 				{0} gigabeit
 			
 			
 				gigadidau
-				{0} gigadid
+				{0} Gb
 				{0} gigadid
-				{0} gigadid
-				{0} gigadid
-				{0} gigadid
+				{0} Gb
+				{0} Gb
+				{0} Gb
 				{0} gigadid
 			
 			
 				megabeitiau
-				{0} megabeit
+				{0} MB
 				{0} megabeit
-				{0} fegabeit
-				{0} megabeit
-				{0} megabeit
+				{0} MB
+				{0} MB
+				{0} MB
 				{0} megabeit
 			
 			
 				megadidau
-				{0} megadid
+				{0} Mb
 				{0} megadid
-				{0} fegadid
-				{0} megadid
-				{0} megadid
+				{0} Mb
+				{0} Mb
+				{0} Mb
 				{0} megadid
 			
 			
 				cilobeitiau
-				{0} cilobeit
+				{0} kB
 				{0} cilobeit
-				{0} gilobeit
-				{0} cilobeit
-				{0} cilobeit
+				{0} kB
+				{0} kB
+				{0} kB
 				{0} cilobeit
 			
 			
 				cilodidau
-				{0} cilodid
+				{0} kb
 				{0} cilodid
-				{0} cilodid
-				{0} cilodid
-				{0} cilodid
+				{0} kb
+				{0} kb
+				{0} kb
 				{0} cilodid
 			
 			
@@ -8242,7 +8354,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				didau
 				{0} did
 				{0} did
-				{0} ddid
+				{0} did
 				{0} did
 				{0} did
 				{0} did
@@ -8256,6 +8368,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} canrif
 				{0} canrif
 			
+			
+				degawdau
+				{0} degawd
+				{0} degawd
+				{0} degawd
+				{0} degawd
+				{0} degawd
+				{0} degawd
+			
 			
 				blynyddoedd
 				{0} mlynedd
@@ -8355,244 +8476,298 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				amperau
-				{0} amper
+				{0} A
 				{0} amper
-				{0} amper
-				{0} amper
-				{0} amper
+				{0} A
+				{0} A
+				{0} A
 				{0} amper
 			
 			
 				miliamperau
-				{0} miliamper
+				{0} mA
 				{0} miliamper
-				{0} filiamper
-				{0} miliamper
-				{0} miliamper
+				{0} mA
+				{0} mA
+				{0} mA
 				{0} miliamper
 			
 			
 				ohmau
-				{0} ohm
+				{0} Ω
 				{0} ohm
-				{0} ohm
-				{0} ohm
-				{0} ohm
+				{0} Ω
+				{0} Ω
+				{0} Ω
 				{0} ohm
 			
 			
 				foltiau
-				{0} folt
+				{0} V
 				{0} folt
-				{0} folt
-				{0} folt
-				{0} folt
+				{0} V
+				{0} V
+				{0} V
 				{0} folt
 			
 			
 				cilocalorïau
-				{0} cilocalori
+				{0} kcal
 				{0} cilocalori
-				{0} gilocalori
-				{0} chilocalori
-				{0} chilocalori
+				{0} kcal
+				{0} kcal
+				{0} kcal
 				{0} cilocalori
 			
 			
 				calorïau
-				{0} calori
+				{0} cal
 				{0} calori
-				{0} galori
-				{0} chalori
-				{0} chalori
+				{0} cal
+				{0} cal
+				{0} cal
 				{0} calori
 			
 			
 				Calorïau
-				{0} Calori
+				{0} Cal
 				{0} Calori
-				{0} Galori
-				{0} Chalori
-				{0} Chalori
+				{0} Cal
+				{0} Cal
+				{0} Cal
 				{0} Calori
 			
 			
 				cilojouleau
-				{0} cilojoule
+				{0} kJ
 				{0} cilojoule
-				{0} gilojoule
-				{0} chilojoule
-				{0} chilojoule
+				{0} kJ
+				{0} kJ
+				{0} kJ
 				{0} cilojoule
 			
 			
 				jouleau
-				{0} joule
+				{0} J
 				{0} joule
-				{0} joule
-				{0} joule
-				{0} joule
+				{0} J
+				{0} J
+				{0} J
 				{0} joule
 			
 			
 				cilowat oriau
-				{0} cilowat awr
+				{0} kW-awr
 				{0} cilowat awr
-				{0} gilowat awr
-				{0} chilowat awr
-				{0} chilowat awr
+				{0} kW-awr
+				{0} kW-awr
+				{0} kW-awr
 				{0} cilowat awr
 			
 			
 				electronfoltiau
-				{0} eV
-				{0} electronfolt
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} electronfolt
+				{0} eV
+				{0} electronfolt
+				{0} eV
+				{0} eV
+				{0} eV
+				{0} electronfolt
 			
 			
 				unedau thermol Prydain
-				{0} Btu
-				{0} uned thermol Prydain
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} uned thermol Prydain
+				{0} Btu
+				{0} uned thermol Prydain
+				{0} Btu
+				{0} Btu
+				{0} Btu
+				{0} uned thermol Prydain
 			
 			
 				pwysau o rym
-				{0} lbf
-				{0} pwys o rym
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} pwys o rym
+				{0} lbf
+				{0} pwys o rym
+				{0} lbf
+				{0} lbf
+				{0} lbf
+				{0} pwysau o rym
 			
 			
 				newtonau
-				{0} N
-				{0} newton
-				{0} N
-				{0} N
-				{0} N
-				{0} newton
+				{0} N
+				{0} newton
+				{0} N
+				{0} N
+				{0} N
+				{0} newton
 			
 			
 				gigaherts
-				{0} gigaherts
+				{0} GHz
 				{0} gigaherts
-				{0} gigaherts
-				{0} gigaherts
-				{0} gigaherts
+				{0} GHz
+				{0} GHz
+				{0} GHz
 				{0} gigaherts
 			
 			
 				megaherts
 				{0} megaherts
 				{0} megaherts
-				{0} fegaherts
-				{0} megaherts
-				{0} megaherts
+				{0} MHz
+				{0} MHz
+				{0} MHz
 				{0} megaherts
 			
 			
 				ciloherts
-				{0} ciloherts
+				{0} kHz
 				{0} ciloherts
-				{0} ciloherts
-				{0} ciloherts
-				{0} ciloherts
+				{0} kHz
+				{0} kHz
+				{0} kHz
 				{0} ciloherts
 			
 			
 				herts
-				{0} herts
+				{0} Hz
 				{0} herts
-				{0} herts
-				{0} herts
-				{0} herts
+				{0} Hz
+				{0} Hz
+				{0} Hz
 				{0} herts
 			
+			
+				picseli
+				{0} px
+				{0} picsel
+				{0} px
+				{0} px
+				{0} px
+				{0} picsel
+			
+			
+				megapicseli
+				{0} MP
+				{0} megapicsel
+				{0} MP
+				{0} MP
+				{0} MP
+				{0} megapicsel
+			
+			
+				picseli mewn centimedr
+				{0} ppcm
+				{0} picsel mewn centimedr
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} picsel mewn centimedr
+			
+			
+				picseli mewn modfedd
+				{0} ppi
+				{0} picsel mewn modfedd
+				{0} ppi
+				{0} ppi
+				{0} ppi
+				{0} picsel mewn modfedd
+			
+			
+				dotiau mewn centimedr
+				{0} dpcm
+				{0} dot mewn centimedr
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} mewn centimedr
+			
+			
+				dotiau mewn modfedd
+				{0} dpi
+				{0} mewn modfedd
+				{0} dpi
+				{0} dpi
+				{0} dpi
+				{0} dot mewn modfedd
+			
 			
 				cilometrau
-				{0} cilometr
+				{0} km
 				{0} cilometr
-				{0} gilometr
-				{0} chilometr
-				{0} chilometr
+				{0} km
+				{0} km
+				{0} km
 				{0} cilometr
 				{0} y cilometr
 			
 			
 				metrau
-				{0} metr
+				{0} m
 				{0} metr
-				{0} fetr
-				{0} metr
-				{0} metr
+				{0} m
+				{0} m
+				{0} m
 				{0} metr
 				{0} y metr
 			
 			
 				decimetrau
-				{0} decimetr
+				{0} dm
 				{0} decimetr
-				{0} decimetr
-				{0} decimetr
-				{0} decimetr
+				{0} dm
+				{0} dm
+				{0} dm
 				{0} decimetr
 			
 			
 				centimetrau
-				{0} centimetr
+				{0} cm
 				{0} centimetr
-				{0} gentimetr
-				{0} chentimetr
-				{0} chentimetr
+				{0} cm
+				{0} cm
+				{0} cm
 				{0} centimetr
 				{0} y centimetr
 			
 			
 				milimetrau
-				{0} milimetr
+				{0} mm
 				{0} milimetr
 				{0} filimetr
-				{0} milimetr
-				{0} milimetr
+				{0} mm
+				{0} mm
 				{0} milimetr
 			
 			
 				micrometrau
-				{0} micrometr
+				{0} µm
 				{0} micrometr
-				{0} ficrometr
-				{0} micrometr
-				{0} micrometr
+				{0} µm
+				{0} µm
+				{0} µm
 				{0} micrometr
 			
 			
 				nanometrau
-				{0} nanometr
+				{0} nm
 				{0} nanometr
-				{0} nanometr
-				{0} nanometr
-				{0} nanometr
+				{0} nm
+				{0} nm
+				{0} nm
 				{0} nanometr
 			
 			
 				picometrau
-				{0} picometr
+				{0} pm
 				{0} picometr
-				{0} bicometr
-				{0} phicometr
-				{0} phicometr
+				{0} pm
+				{0} pm
+				{0} pm
 				{0} picometr
 			
 			
 				milltiroedd
-				{0} milltir
+				{0} mi
 				{0} filltir
 				{0} filltir
 				{0} milltir
@@ -8632,9 +8807,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				parsecau
 				{0} parsec
 				{0} parsec
-				{0} barsec
-				{0} pharsec
-				{0} pharsec
+				{0} pc
+				{0} pc
+				{0} pc
 				{0} parsec
 			
 			
@@ -8696,63 +8871,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pwynt
 				{0} pwynt
 				{0} bwynt
-				{0} phwynt
-				{0} phwynt
+				{0} pt
+				{0} pt
 				{0} pwynt
 			
 			
 				radiysau solar
-				{0} R☉
-				{0} radiws solar
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} radiws solar
+				{0} R☉
+				{0} radiws solar
+				{0} R☉
+				{0} R☉
+				{0} R☉
+				{0} radiws solar
 			
 			
 				lycsau
 				{0} lwcs
 				{0} lwcs
-				{0} lwcs
-				{0} lwcs
-				{0} lwcs
+				{0} lx
+				{0} lx
+				{0} lx
 				{0} lwcs
 			
 			
 				goleueddau solar
-				{0} L☉
-				{0} goleuedd solar
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} goleuedd solar
+				{0} L☉
+				{0} goleuedd solar
+				{0} L☉
+				{0} L☉
+				{0} L☉
+				{0} goleueddau solar
 			
 			
 				tunelli metrig
-				{0} tunnell fetrig
+				{0} t
 				{0} dunnell fetrig
-				{0} dunnell fetrig
-				{0} tunnell fetrig
-				{0} tunnell fetrig
+				{0} t
+				{0} t
+				{0} t
 				{0} tunnell fetrig
 			
 			
 				cilogramau
-				{0} cilogram
+				{0} kg
 				{0} cilogram
-				{0} gilogram
-				{0} chilogram
-				{0} chilogram
+				{0} kg
+				{0} kg
+				{0} kg
 				{0} cilogram
 				{0} y cilogram
 			
 			
 				gramau
-				{0} gram
+				{0} g
 				{0} gram
-				{0} gram
-				{0} gram
-				{0} gram
+				{0} g
+				{0} g
+				{0} g
 				{0} gram
 				{0} y gram
 			
@@ -8761,22 +8936,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} miligram
 				{0} miligram
 				{0} filigram
-				{0} miligram
-				{0} miligram
+				{0} mg
+				{0} mg
 				{0} miligram
 			
 			
 				microgramau
-				{0} microgram
+				{0} µg
 				{0} microgram
-				{0} ficrogram
-				{0} microgram
-				{0} microgram
+				{0} µg
+				{0} µg
+				{0} µg
 				{0} microgram
 			
 			
 				tunelli
-				{0} tunnell
+				{0} tn
 				{0} dunnell
 				{0} dunnell
 				{0} tunnell
@@ -8825,37 +9000,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				caratau
 				{0} carat
 				{0} carat
-				{0} garat
-				{0} charat
-				{0} charat
+				{0} CD
+				{0} CD
+				{0} CD
 				{0} carat
 			
 			
 				daltonau
-				{0} Da
-				{0} dalton
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} dalton
+				{0} Da
+				{0} dalton
+				{0} Da
+				{0} Da
+				{0} Da
+				{0} dalton
 			
 			
 				masau ddaear
-				{0} M⊕
-				{0} más ddaear
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} más ddaear
+				{0} M⊕
+				{0} más ddaear
+				{0} M⊕
+				{0} M⊕
+				{0} M⊕
+				{0} más ddaear
 			
 			
 				masau solar
-				{0} M☉
-				{0} más solar
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} más solar
+				{0} M☉
+				{0} más solar
+				{0} M☉
+				{0} M☉
+				{0} M☉
+				{0} más solar
 			
 			
 				gigawatiau
@@ -8871,17 +9046,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} megawat
 				{0} megawat
 				{0} fegawat
-				{0} megawat
-				{0} megawat
+				{0} MW
+				{0} MW
 				{0} megawat
 			
 			
 				cilowatiau
-				{0} cilowat
+				{0} kW
 				{0} cilowat
-				{0} gilowat
-				{0} chilowat
-				{0} chilowat
+				{0} kW
+				{0} kW
+				{0} kW
 				{0} cilowat
 			
 			
@@ -8895,65 +9070,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				miliwatiau
-				{0} miliwat
+				{0} mW
 				{0} miliwat
-				{0} filiwat
-				{0} miliwat
-				{0} miliwat
+				{0} mW
+				{0} mW
+				{0} mW
 				{0} miliwat
 			
 			
 				marchnerth
-				{0} marchnerth
+				{0} hp
 				{0} marchnerth
-				{0} farchnerth
-				{0} marchnerth
-				{0} marchnerth
+				{0} hp
+				{0} hp
+				{0} hp
 				{0} marchnerth
 			
-			
-				hectopascalau
-				{0} hectopascal
-				{0} hectopascal
-				{0} hectopascal
-				{0} hectopascal
-				{0} hectopascal
-				{0} hectopascal
-			
 			
 				milimetrau o fercwri
-				{0} milimetr o fercwri
+				{0} mm Hg
 				{0} milimetr o fercwri
-				{0} filimetr o fercwri
-				{0} milimetr o fercwri
-				{0} milimetr o fercwri
+				{0} mm Hg
+				{0} mm Hg
+				{0} mm Hg
 				{0} milimetr o fercwri
 			
 			
 				pwysau y fodfedd sgwar
-				{0} pwys y fodfedd sgwar
+				{0} psi
 				{0} pwys y fodfedd sgwar
-				{0} bwys y fodfedd sgwar
-				{0} pwys y fodfedd sgwar
-				{0} pwys y fodfedd sgwar
+				{0} psi
+				{0} psi
+				{0} psi
 				{0} pwys y fodfedd sgwar
 			
 			
 				modfeddi o fercwri
-				{0} modfedd o fercwri
+				{0} ″ Hg
 				{0} fodfedd o fercwri
-				{0} fodfedd o fercwri
-				{0} modfedd o fercwri
-				{0} modfedd o fercwri
+				{0} ″ Hg
+				{0} ″ Hg
+				{0} ″ Hg
 				{0} modfedd o fercwri
 			
 			
 				milibarau
-				{0} milibar
+				{0} mbar
 				{0} milibar
 				{0} filibar
 				{0} milibar
-				{0} milibar
+				{0} mbar
 				{0} milibar
 			
 			
@@ -8965,23 +9131,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atmosffer
 			
+			
+				pascals
+			
+			
+				hectopascalau
+				{0} hPa
+				{0} hectopascal
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hectopascal
+			
 			
 				cilopascalau
-				{0} kPa
-				{0} cilopascal
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} cilopascal
+				{0} kPa
+				{0} cilopascal
+				{0} kPa
+				{0} kPa
+				{0} kPa
+				{0} cilopascalau
 			
 			
 				megapascalau
-				{0} MPa
-				{0} megapascal
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} megapascal
+				{0} MPa
+				{0} megapascal
+				{0} MPa
+				{0} MPa
+				{0} MPa
+				{0} megapascalau
 			
 			
 				cilometrau yr awr
@@ -9032,73 +9210,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				graddau Celsius
 				{0} gradd Celsius
 				{0} radd Celsius
-				{0} radd Celsius
-				{0} gradd Celsius
-				{0} gradd Celsius
+				{0}°C
+				{0}°C
+				{0}°C
 				{0} gradd Celsius
 			
 			
 				gradd Fahrenheit
-				{0} gradd Fahrenheit
+				{0}°F
 				{0} radd Fahrenheit
-				{0} radd Fahrenheit
-				{0} gradd Fahrenheit
-				{0} gradd Fahrenheit
+				{0}°F
+				{0}°F
+				{0}°F
 				{0} gradd Fahrenheit
 			
 			
 				celfinau
-				{0} celfin
+				{0} K
 				{0} celfin
-				{0} gelfin
-				{0} chelfin
-				{0} celfin
+				{0} K
+				{0} K
+				{0} K
 				{0} celfin
 			
 			
 				pwys-troedfeddi
-				{0} lbf⋅ft
-				{0} pwys-troedfedd
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} pwys-troedfedd
+				{0} lbf⋅ft
+				{0} pwys-troedfedd
+				{0} lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
+				{0} pwys-troedfeddi
 			
 			
 				newton-metrau
-				{0} N⋅m
-				{0} newton-metr
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} newton-metr
+				{0} N⋅m
+				{0} newton-metr
+				{0} N⋅m
+				{0} N⋅m
+				{0} N⋅m
+				{0} newton-metrau
 			
 			
 				cilometrau ciwbig
-				{0} cilometr ciwbig
+				{0} km³
 				{0} cilometr ciwbig
-				{0} gilometr ciwbig
-				{0} chilometr ciwbig
-				{0} chilometr ciwbig
+				{0} km³
+				{0} km³
+				{0} km³
 				{0} cilometr ciwbig
 			
 			
 				metrau ciwbig
-				{0} metr ciwbig
+				{0} m³
 				{0} metr ciwbig
-				{0} fetr ciwbig
-				{0} metr ciwbig
-				{0} metr ciwbig
+				{0} m³
+				{0} m³
+				{0} m³
 				{0} metr ciwbig
 				{0} y metr ciwbig
 			
 			
 				centimetrau ciwbig
-				{0} centimetr ciwbig
+				{0} cm³
 				{0} centimetr ciwbig
-				{0} gentimetr ciwbig
-				{0} chentimetr ciwbig
-				{0} centimetr ciwbig
+				{0} cm³
+				{0} cm³
+				{0} cm³
 				{0} chentimetr ciwbig
 				{0} y centimetr ciwbig
 			
@@ -9106,54 +9284,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				milltiroedd ciwbig
 				{0} milltir giwbig
 				{0} filltir giwbig
-				{0} filltir giwbig
-				{0} milltir giwbig
-				{0} milltir giwbig
+				{0} mi³
+				{0} mi³
+				{0} mi³
 				{0} milltir giwbig
 			
 			
 				llathenni ciwbig
-				{0} llath giwbig
+				{0} llath³
 				{0} llathen giwbig
-				{0} lath giwbig
-				{0} llath giwbig
-				{0} llath giwbig
+				{0} lath³
+				{0} llath³
+				{0} llath³
 				{0} llath giwbig
 			
 			
 				troedfeddi ciwbig
-				{0} troedfedd giwbig
+				{0} tr³
 				{0} droedfedd giwbig
-				{0} droedfedd giwbig
-				{0} troedfedd giwbig
-				{0} troedfedd giwbig
+				{0} tr³
+				{0} tr³
+				{0} tr³
 				{0} troedfedd giwbig
 			
 			
 				modfeddi ciwbig
-				{0} modfedd giwbig
+				{0} modfedd³
 				{0} fodfedd giwbig
-				{0} fodfedd giwbig
-				{0} modfedd giwbig
-				{0} modfedd giwbig
+				{0} fodfedd³
+				{0} modfedd³
+				{0} modfedd³
 				{0} modfedd giwbig
 			
 			
 				megalitrau
-				{0} megalitr
+				{0} ML
 				{0} megalitr
-				{0} fegalitr
-				{0} megalitr
-				{0} megalitr
+				{0} ML
+				{0} ML
+				{0} ML
 				{0} megalitr
 			
 			
 				hectolitrau
-				{0} hectolitr
+				{0} hL
 				{0} hectolitr
-				{0} hectolitr
-				{0} hectolitr
-				{0} hectolitr
+				{0} hL
+				{0} hL
+				{0} hL
 				{0} hectolitr
 			
 			
@@ -9161,54 +9339,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} litr
 				{0} litr
 				{0} litr
-				{0} litr
-				{0} litr
+				{0} L
+				{0} L
 				{0} litr
 				{0} y litr
 			
 			
 				decilitrau
-				{0} decilitr
+				{0} dL
 				{0} decilitr
-				{0} decilitr
-				{0} decilitr
-				{0} decilitr
+				{0} dL
+				{0} dL
+				{0} dL
 				{0} decilitr
 			
 			
 				centilitrau
-				{0} centilitr
+				{0} cL
 				{0} centilitr
 				{0} gentilitr
-				{0} chentilitr
-				{0} chentilitr
+				{0} cL
+				{0} cL
 				{0} centilitr
 			
 			
 				mililitrau
-				{0} mililitr
+				{0} mL
 				{0} mililitr
-				{0} mililitr
-				{0} mililitr
-				{0} mililitr
+				{0} mL
+				{0} mL
+				{0} mL
 				{0} mililitr
 			
 			
 				peintiau metrig
-				{0} peint metrig
+				{0} mpt
 				{0} peint metrig
-				{0} peint metrig
-				{0} peint metrig
-				{0} peint metrig
+				{0} mpt
+				{0} mpt
+				{0} mpt
 				{0} peint metrig
 			
 			
 				cwpaneidiau metrig
-				{0} cwpanaid metrig
+				{0} mc
 				{0} cwpanaid metrig
-				{0} gwpanaid metrig
-				{0} cwpanaid metrig
-				{0} cwpanaid metrig
+				{0} mc
+				{0} mc
+				{0} mc
 				{0} cwpanaid metrig
 			
 			
@@ -9287,12 +9465,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Ownsiau hylifol Imp.
-				{0} fl oz Imp.
-				{0} owns hylifol Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} owns hylifol Imp.
+				{0} fl oz Imp.
+				{0} owns hylifol Imp.
+				{0} fl oz Imp.
+				{0} fl oz Imp.
+				{0} fl oz Imp.
+				{0} owns hylifol Imp.
 			
 			
 				llond llwy fwrdd
@@ -9314,12 +9492,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				bareli
-				{0} bbl
-				{0} barel
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} barel
+				{0} bbl
+				{0} barel
+				{0} bbl
+				{0} bbl
+				{0} bbl
+				{0} barel
 			
 			
 				cyfeiriad cardinal
@@ -9335,12 +9513,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				grym disgyrchedd
-				{0} G
-				{0} G
-				{0} G
-				{0} G
-				{0} G
-				{0} G
 			
 			
 				metrau/eil²
@@ -9416,7 +9588,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ha
 			
 			
-				meterau²
 				{0} m²
 				{0} m²
 				{0} m²
@@ -9484,12 +9655,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dunamau
-				{0} dunam
-				{0} dunam
-				{0} ddunam
-				{0} dunam
-				{0} dunam
-				{0} dunam
+				{0} dunam
+				{0} dunam
+				{0} ddunam
+				{0} dunam
+				{0} dunam
+				{0} dunam
 			
 			
 				karatau
@@ -9501,7 +9672,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kt
 			
 			
-				mg/dL
 				{0} mg/dL
 				{0} mg/dL
 				{0} mg/dL
@@ -9547,12 +9717,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				permyriad
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
 			
 			
 				môl
@@ -9636,7 +9800,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} GB
 			
 			
-				Gb
 				{0} Gb
 				{0} Gb
 				{0} Gb
@@ -9646,21 +9809,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				MBeit
-				{0} MB
-				{0} MB
-				{0} MB
-				{0} MB
-				{0} MB
-				{0} MB
-			
-			
-				Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
-				{0} Mb
 			
 			
 				kBeit
@@ -9671,15 +9819,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kB
 				{0} kB
 			
-			
-				kb
-				{0} kb
-				{0} kb
-				{0} kb
-				{0} kb
-				{0} kb
-				{0} kb
-			
 			
 				beit
 				{0} beit
@@ -9707,6 +9846,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} c
 				{0} c
 			
+			
+				deg
+				{0} degawd
+				{0} degawd
+				{0} degawd
+				{0} degawd
+				{0} degawd
+				{0} degawd
+			
 			
 				blynyddoedd
 				{0} bl
@@ -9840,24 +9988,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} V
 				{0} V
 			
-			
-				kcal
-				{0} kcal
-				{0} kcal
-				{0} kcal
-				{0} kcal
-				{0} kcal
-				{0} kcal
-			
-			
-				cal
-				{0} cal
-				{0} cal
-				{0} cal
-				{0} cal
-				{0} cal
-				{0} cal
-			
 			
 				Cal
 				{0} Cal
@@ -9869,12 +9999,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				cilojouleau
-				{0} kJ
-				{0} kJ
-				{0} kJ
-				{0} kJ
-				{0} kJ
-				{0} kJ
 			
 			
 				jouleau
@@ -9896,39 +10020,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				electronfolt
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
 			
 			
 				BTU
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
 			
 			
 				pwys-grym
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
 			
 			
 				newton
-				{0} N
-				{0} N
-				{0} N
-				{0} N
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -9966,6 +10066,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				picseli
+			
+			
+				megapicseli
+			
 			
 				km
 				{0} km
@@ -10147,12 +10253,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				radiysau solar
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
 			
 			
 				lycsau
@@ -10165,12 +10265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				goleueddau solar
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
 			
 			
 				t
@@ -10277,30 +10371,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				daltonau
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
 			
 			
 				masau ddaear
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
 			
 			
 				masau solar
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
 			
 			
 				GW
@@ -10347,35 +10423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mW
 				{0} mW
 			
-			
-				hp
-				{0} hp
-				{0} hp
-				{0} hp
-				{0} hp
-				{0} hp
-				{0} hp
-			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
-			
-				mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
-				{0} mmHg
-			
 			
-				psi
 				{0} psi
 				{0} psi
 				{0} psi
@@ -10384,7 +10432,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} psi
 			
 			
-				modfeddi o fercwri
+				" Hg
 				{0} ″ Hg
 				{0} ″ Hg
 				{0} ″ Hg
@@ -10410,23 +10458,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -10475,51 +10514,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				gradd C
-				{0}°C
-				{0}°C
-				{0}°C
-				{0}°C
-				{0}°C
-				{0}°C
 			
 			
 				gradd F
-				{0}°F
-				{0}°F
-				{0}°F
-				{0}°F
-				{0}°F
-				{0}°F
-			
-			
-				K
-				{0} K
-				{0} K
-				{0} K
-				{0} K
-				{0} K
-				{0} K
-			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
 			
 			
-				cilometrau ciwbig
 				{0} km³
 				{0} km³
 				{0} km³
@@ -10730,15 +10729,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -10759,12 +10749,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				barel
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
 			
 			
 				cyfeiriad
@@ -11351,11 +11335,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				kg
-				{0}kg
-				{0}kg
-				{0}kg
-				{0}kg
-				{0}kg
+				{0} kg
+				{0} kg
+				{0} kg
+				{0} kg
+				{0} kg
 				{0}kg
 				{0}/kg
 			
@@ -11479,15 +11463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0}hp
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
@@ -11524,6 +11499,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mb
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/h
 				{0}km/h
@@ -11572,11 +11556,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				°C
 				{0}°
-				{0}°
-				{0}°
-				{0}°
-				{0}°
-				{0}°
+				{0}°C
+				{0}°C
+				{0}°C
+				{0}°C
+				{0}°C
 			
 			
 				°F
@@ -11906,7 +11890,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Lled-gywasgedig
 		Lled-gul
 		Lled-helaethedig
-		normal
 		Lled-helaethedig
 		Lled-estynedig
 		Lled-lydan
diff --git a/make/data/cldr/common/main/cy_GB.xml b/make/data/cldr/common/main/cy_GB.xml
index 33b59c15d10..d52381fe401 100644
--- a/make/data/cldr/common/main/cy_GB.xml
+++ b/make/data/cldr/common/main/cy_GB.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/da.xml b/make/data/cldr/common/main/da.xml
index 13b63007afd..9576723ad82 100644
--- a/make/data/cldr/common/main/da.xml
+++ b/make/data/cldr/common/main/da.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -90,6 +90,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			caribisk
 			cayuga
 			atsam
+			chakma
 			tjetjensk
 			cebuano
 			chiga
@@ -146,7 +147,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			australsk engelsk
 			canadisk engelsk
 			britisk engelsk
-			engelsk (UK)
 			amerikansk engelsk
 			middelengelsk
 			esperanto
@@ -543,12 +543,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jiddisch
 			yoruba
 			kantonesisk
+			kantonesisk (Kina)
 			zhuang
 			zapotec
 			blissymboler
 			zenaga
 			tamazight
 			kinesisk
+			mandarin (Kina)
 			forenklet kinesisk
 			traditionelt kinesisk
 			zulu
@@ -801,6 +803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Republikken Congo
 			Schweiz
 			Elfenbenskysten
+			Elfenbenskysten
 			Cookøerne
 			Chile
 			Cameroun
@@ -872,7 +875,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Israel
 			Isle of Man
 			Indien
-			Det britiske territorium i Det Indiske Ocean
+			Det Britiske Territorium i Det Indiske Ocean
 			Irak
 			Iran
 			Island
@@ -987,7 +990,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tristan da Cunha
 			Turks- og Caicosøerne
 			Tchad
-			De Franske Besiddelser i Det Sydlige Indiske Ocean
+			De Franske Besiddelser i Det Sydlige Indiske Ocean og Antarktis
 			Togo
 			Thailand
 			Tadsjikistan
@@ -1020,6 +1023,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis og Futuna
 			Samoa
+			pseudo-accenter
+			pseudo-bidi
 			Kosovo
 			Yemen
 			Mayotte
@@ -1059,7 +1064,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			standardortografi
 			laukika
 			lipovaz
-			LUNA1918
 			Metelko-alfabet
 			monotonisk
 			Ndyuka-dialekt
@@ -1068,19 +1072,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			moderne volapük
 			Oseacco-/Osojane-dialekt
 			Pamaka-dialekt
-			PETR1708
 			pinyin
 			polytonisk
 			computer
-			PUTER
 			revideret retskrivning
 			klassisk volapük
 			Resi
-			RUMGR
 			saho
 			skotsk standardengelsk
 			scouse
-			SOLBA
 			surmiran
 			sursilv
 			sutsilv
@@ -1270,8 +1270,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z æ ø å]
 		[á à â ç é è ê ë í î ï ñ ó ô œ ú ù û ÿ ü ä ǿ ö]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1280,14 +1280,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1298,6 +1307,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1459,17 +1481,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0}-{1}
 						
-							h B – h B
-							h – h B
+							h B–h B
 						
 						
-							h.mm B – h.mm B
-							h.mm – h.mm B
-							h.mm – h.mm B
+							h.mm B–h.mm B
 						
 						
 							d.–d.
 						
+						
+							y G–y G
+							y–y G
+						
+						
+							M/y GGGGG–M/y GGGGG
+							M/y–M/y GGGGG
+							M/y–M/y GGGGG
+						
+						
+							d/M/y–d/M/y GGGGG
+							d/M/y GGGGG–d/M/y GGGGG
+							d/M/y–d/M/y GGGGG
+							d/M/y–d/M/y GGGGG
+						
+						
+							E 'den' d/M/y–E 'den' d/M/y GGGGG
+							E 'den' d/M/y GGGGG–E 'den' d/M/y GGGGG
+							E 'den' d/M/y–E 'den' d/M/y GGGGG
+							E 'den' d/M/y–E 'den' d/M/y GGGGG
+						
+						
+							MMM y G–MMM y G
+							MMM–MMM y G
+							MMM y–MMM y G
+						
+						
+							d.–d. MMM y G
+							d. MMM y G–d. MMM y G
+							d. MMM–d. MMM y G
+							d. MMM y–d. MMM y G
+						
+						
+							E 'den' d. MMM–E 'den' d. MMM y G
+							E 'den' d. MMM y G–E 'den' d. MMM y G
+							E 'den' d. MMM–E 'den' d. MMM y G
+							E 'den' d. MMM y–E 'den' d. MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -2005,42 +2062,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d.–d.
 						
 						
-							G y–G y
-							G y–y
+							y G – y G
+							y–y G
 						
 						
-							GGGGG MM.y–GGGGG MM.y
-							GGGGG MM.y–MM.y
-							GGGGG MM.y–MM.y
+							M/y GGGG–M/y GGGG
+							M/y–M/y GGGGG
+							M/y–M/y GGGGG
 						
 						
-							GGGGG dd.MM.y–dd.MM.y
-							GGGGG dd.MM.y–GGGGG dd.MM.y
-							GGGGG dd.MM.y–dd.MM.y
-							GGGGG dd.MM.y–dd.MM.y
+							d/M/y–d/M/y GGGGG
+							d/M/y GGGGG–d/M/y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
 						
 						
-							GGGGG E dd.MM.y–E dd.MM.y
-							GGGGG E dd.MM.y–GGGGG E dd.MM.y
-							GGGGG E dd.MM.y–E dd.MM.y
-							GGGGG E dd.MM.y–E dd.MM.y
+							E dd. MM. y–E dd. MM. y GGGGG
+							E, d/M/y GGGGG–E, d/M/y GGGGG
+							E dd.MM.y–E dd.MM.y GGGGG
+							E dd.MM.y–E dd.MM.y GGGGG
 						
 						
-							G MMM y–G MMM y
-							G MMM y–MMM
-							G MMM y–MMM y
+							MMM y G–MMM y G
+							MMM–MMM y G
+							MMM y–MMM y G
 						
 						
-							G d.–d. MMM y
-							G d. MMM y–G d. MMM y
-							G d. MMM y–d. MMM
-							G d. MMM y–d. MMM y
+							d.–d. MMM y G
+							d. MMM y G–d. MMM y G
+							d. MMM y–d. MMM G
+							d. MMM y–d. MMM y G
 						
 						
-							G E d. MMM y–E d. MMM
-							G E d. MMM y–G E d. MMM y
-							G E d. MMM y–E d. MMM
-							G E d. MMM y–E d. MMM y
+							E d. MMM y–E d. MMM G
+							E d. MMM y G–E d. MMM y G
+							E d. MMM–E d. MMM y G
+							E d. MMM y–E d. MMM y G
 						
 						
 							h a–h a
@@ -2155,6 +2212,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2175,6 +2243,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 			
 			
 				
@@ -2195,6 +2274,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2239,6 +2329,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3333,7 +3434,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Curaçao
 			
 			
-				Juleøerne
+				Juleøen
 			
 			
 				Nicosia
@@ -3605,6 +3706,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktobe
 			
+			
+				Kostanay
+			
 			
 				Kyzylorda
 			
@@ -5205,6 +5309,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5213,6 +5319,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tusind
@@ -5345,6 +5456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afghansk afghani
 				afghansk afghani
 				afghanske afghani
+				AFN
 			
 			
 				albansk lek (1946–1965)
@@ -5355,6 +5467,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				albansk lek
 				albansk lek
 				albanske lek
+				ALL
 			
 			
 				armensk dram
@@ -5366,11 +5479,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nederlandske Antiller-gylden
 				Nederlandsk Antiller-gylden
 				Nederlandske Antiller-gylden
+				ANG
 			
 			
 				angolansk kwanza
 				angolansk kwanza
 				angolanske kwanza
+				AOA
 				Kz
 			
 			
@@ -5412,6 +5527,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinsk peso
 				argentinsk peso
 				argentinske pesos
+				ARS
 				$
 			
 			
@@ -5430,6 +5546,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arubansk florin
 				arubansk florin
 				arubanske floriner
+				AWG
 			
 			
 				Aserbajdsjansk manat (1993–2006)
@@ -5451,6 +5568,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bosnien-hercegovinsk konvertibel mark
 				bosnien-hercegovinsk konvertibel mark
 				bosnien-hercegovinske konvertible mark
+				BAM
 				KM
 			
 			
@@ -5462,12 +5580,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				barbadisk dollar
 				barbadisk dollar
 				barbadiske dollar
+				BBD
 				$
 			
 			
 				bangladeshisk taka
 				bangladeshisk taka
 				bangladeshiske taka
+				BDT
 				৳
 			
 			
@@ -5499,6 +5619,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bulgarsk lev
 				bulgarsk lev
 				bulgarske leva
+				BGN
 			
 			
 				bulgarsk lev (1879–1952)
@@ -5521,18 +5642,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bermudansk dollar
 				bermudansk dollar
 				bermudanske dollar
+				BMD
 				$
 			
 			
 				bruneisk dollar
 				bruneisk dollar
 				bruneiske dollar
+				BND
 				$
 			
 			
 				boliviansk boliviano
 				boliviansk boliviano
 				bolivianske boliviano
+				BOB
 				Bs
 			
 			
@@ -5569,6 +5693,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brasiliansk real
 				brasiliansk real
 				brasilianske realer
+				R$
 				R$
 			
 			
@@ -5590,12 +5715,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahamansk dollar
 				bahamansk dollar
 				bahamanske dollar
+				BSD
 				$
 			
 			
 				bhutansk ngultrum
 				bhutansk ngultrum
 				bhutanske ngultrum
+				BTN
 			
 			
 				Burmesisk kyat
@@ -5618,29 +5745,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hviderussisk rubel
 				hviderussisk rubel
 				hviderussiske rubler
+				BYN
 				р.
 			
 			
 				hviderussisk rubel (2000–2016)
 				hviderussisk rubel (2000–2016)
 				hviderussiske rubler (2000–2016)
+				BYR
 			
 			
 				belizisk dollar
 				belizisk dollar
 				beliziske dollar
+				BZD
 				$
 			
 			
 				canadisk dollar
 				canadisk dollar
 				canadiske dollar
+				CA$
 				$
 			
 			
 				congolesisk franc
 				congolesisk franc
 				congolesiske franc
+				CDF
 			
 			
 				WIR euro
@@ -5651,6 +5783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				schweizerfranc
 				schweizerfranc
 				schweizerfranc
+				CHF
 			
 			
 				WIR franc
@@ -5666,6 +5799,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chilensk peso
 				chilensk peso
 				chilenske pesos
+				CLP
 				$
 			
 			
@@ -5678,18 +5812,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kinesisk yuan
 				kinesisk yuan
 				kinesiske yuan
+				CN¥
 				¥
 			
 			
 				colombiansk peso
 				colombiansk peso
 				colombianske pesos
+				COP
 				$
 			
 			
 				costaricansk colón
 				costaricansk colón
 				costaricanske colón
+				CRC
 				₡
 			
 			
@@ -5704,20 +5841,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				cubansk konvertibel peso
-				cubanske konvertible pesos
+				cubansk konvertibel peso
 				cubanske konvertible pesos
+				CUC
 				$
 			
 			
 				cubansk peso
-				cubanske pesos
+				cubansk peso
 				cubanske pesos
+				CUP
 				$
 			
 			
 				kapverdisk escudo
 				kapverdisk escudo
 				kapverdiske escudos
+				CVE
 			
 			
 				Cypriotisk pund
@@ -5727,7 +5867,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				tjekkisk koruna
 				tjekkisk koruna
-				tjekkiske koruna
+				tjekkiske korunaer
+				CZK
 				Kč
 			
 			
@@ -5757,12 +5898,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dominikansk peso
 				dominikansk peso
 				dominikanske pesos
+				DOP
 				$
 			
 			
 				algerisk dinar
 				algerisk dinar
 				algeriske dinarer
+				DZD
 			
 			
 				Ecuadoriansk sucre
@@ -5778,6 +5921,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				egyptisk pund
 				egyptisk pund
 				egyptiske pund
+				EGP
 				E£
 			
 			
@@ -5811,6 +5955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				euro
 				euro
 				euro
+				€
 				€
 			
 			
@@ -5829,6 +5974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pund fra Falklandsøerne
 				pund fra Falklandsøerne
 				pund fra Falklandsøerne
+				FKP
 				£
 			
 			
@@ -5840,6 +5986,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				britisk pund
 				britisk pund
 				britiske pund
+				£
 				£
 			
 			
@@ -5864,22 +6011,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghanesisk cedi
 				ghanesisk cedi
 				ghanesiske cedi
+				GHS
 			
 			
 				gibraltarisk pund
 				gibraltarisk pund
 				gibraltariske pund
+				GIP
 				£
 			
 			
 				gambisk dalasi
 				gambisk dalasi
 				gambiske dalasi
+				GMD
 			
 			
 				guineansk franc
 				guineansk franc
 				guineanske franc
+				GNF
 				FG
 			
 			
@@ -5901,6 +6052,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guatemalansk quetzal
 				guatemalansk quetzal
 				guatemalanske quetzal
+				GTQ
 				Q
 			
 			
@@ -5917,18 +6069,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guyansk dollar
 				guyansk dollar
 				guyanske dollar
+				GYD
 				$
 			
 			
-				Hongkong dollar
-				Hongkong dollar
-				Hongkong dollar
+				hongkongsk dollar
+				hongkongsk dollar
+				hongkongske dollar
+				HK$
 				$
 			
 			
 				honduransk lempira
 				honduransk lempira
 				honduranske lempira
+				HNL
 				L
 			
 			
@@ -5940,23 +6095,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kroatisk kuna
 				kroatisk kuna
 				kroatiske kuna
+				HRK
 				kn
 			
 			
 				haitisk gourde
 				haitisk gourde
 				haitiske gourde
+				HTG
 			
 			
 				ungarsk forint
 				ungarsk forint
-				ungarske forint
+				ungarske forinter
+				HUF
 				Ft
 			
 			
 				indonesisk rupiah
 				indonesisk rupiah
 				indonesiske rupiah
+				IDR
 				Rp
 			
 			
@@ -5978,12 +6137,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ny israelsk shekel
 				ny israelsk shekel
 				nye israelske shekel
+				₪
 				₪
 			
 			
 				indisk rupee
 				indisk rupee
 				indiske rupees
+				₹
 				₹
 			
 			
@@ -5996,6 +6157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				iransk rial
 				iransk rial
 				iranske rialer
+				IRR
 			
 			
 				islandsk krone (1918–1981)
@@ -6006,6 +6168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				islandsk krone
 				islandsk krone
 				islandske kroner
+				ISK
 				kr.
 			
 			
@@ -6017,6 +6180,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jamaicansk dollar
 				jamaicansk dollar
 				jamaicanske dollar
+				JMD
 				$
 			
 			
@@ -6029,6 +6193,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				japansk yen
 				japansk yen
 				japanske yen
+				JP¥
 				¥
 			
 			
@@ -6047,6 +6212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cambodjansk riel
 				cambodjansk riel
 				cambodjanske riel
+				KHR
 				៛
 			
 			
@@ -6060,6 +6226,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nordkoreansk won
 				nordkoreansk won
 				nordkoreanske won
+				KPW
 				₩
 			
 			
@@ -6076,6 +6243,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sydkoreansk won
 				sydkoreansk won
 				sydkoreanske won
+				₩
 				₩
 			
 			
@@ -6087,7 +6255,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				caymansk dollar
 				caymansk dollar
-				caymansk dollar
+				caymanske dollar
+				KYD
 				$
 			
 			
@@ -6101,6 +6270,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				laotisk kip
 				laotisk kip
 				laotiske kip
+				LAK
 				₭
 			
 			
@@ -6114,12 +6284,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				srilankansk rupee
 				srilankansk rupee
 				srilankanske rupee
+				LKR
 				Rs
 			
 			
 				liberisk dollar
 				liberisk dollar
 				liberiske dollar
+				LRD
 				$
 			
 			
@@ -6131,6 +6303,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Litauisk litas
 				Litauisk litas
 				Litauiske litai
+				LTL
 			
 			
 				Litauisk talonas
@@ -6156,6 +6329,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lettisk lat
 				Lettisk lat
 				Lettiske lats
+				LVL
 			
 			
 				Lettisk rubel
@@ -6166,11 +6340,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libysk dinar
 				libysk dinar
 				libyske dinarer
+				LYD
 			
 			
 				marokkansk dirham
 				marokkansk dirham
 				marokkanske dirham
+				MAD
 			
 			
 				Marokkansk franc
@@ -6190,7 +6366,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				moldovisk leu
 				moldovisk leu
-				moldoviske leu
+				moldoviske lei
+				MDL
 			
 			
 				madagaskisk ariary
@@ -6208,6 +6385,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedonsk denar
 				makedonsk denar
 				makedonske denarer
+				MKD
 			
 			
 				makedonsk denar (1992–1993)
@@ -6223,28 +6401,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				myanmarsk kyat
 				myanmarsk kyat
 				myanmarske kyat
+				MMK
 				K
 			
 			
 				mongolsk tugrik
 				mongolsk tugrik
 				mongolske tugrik
+				MNT
 				₮
 			
 			
 				macaosk pataca
 				macaosk pataca
 				macaoske pataca
+				MOP
 			
 			
 				mauritansk ouguiya (1973–2017)
 				mauritansk ouguiya (1973–2017)
 				mauritanske ouguiya (1973–2017)
+				MRO
 			
 			
 				mauritansk ouguiya
 				mauritansk ouguiya
 				mauritanske ouguiya
+				MRU
 			
 			
 				Maltesisk lira
@@ -6272,6 +6455,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maldivisk rufiyaa
 				maldivisk rufiyaa
 				maldiviske rufiyaa
+				MVR
 			
 			
 				malawisk kwacha
@@ -6283,6 +6467,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mexicansk peso
 				mexicansk peso
 				mexicanske pesos
+				MX$
 				$
 			
 			
@@ -6294,6 +6479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malaysisk ringgit
 				malaysisk ringgit
 				malaysiske ringgit
+				MYR
 				RM
 			
 			
@@ -6323,6 +6509,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nigeriansk naira
 				nigeriansk naira
 				nigerianske naira
+				NGN
 				₦
 			
 			
@@ -6334,6 +6521,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nicaraguansk cordoba
 				nicaraguansk cordoba
 				nicaraguanske cordoba
+				NIO
 				C$
 			
 			
@@ -6345,18 +6533,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				norsk krone
 				norsk krone
 				norske kroner
+				NOK
 				kr.
 			
 			
 				nepalesisk rupee
 				nepalesisk rupee
 				nepalesiske rupees
+				NPR
 				Rs
 			
 			
 				newzealandsk dollar
 				newzealandsk dollar
 				newzealandske dollar
+				NZ$
 				$
 			
 			
@@ -6369,6 +6560,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				panamansk balboa
 				panamansk balboa
 				panamanske balboa
+				PAB
 			
 			
 				peruviansk inti
@@ -6379,6 +6571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peruansk sol
 				peruansk sol
 				peruanske soles
+				PEN
 			
 			
 				peruviansk sol (1863–1965)
@@ -6395,18 +6588,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				filippinsk peso
 				filippinsk peso
 				filippinske pesos
+				PHP
 				₱
 			
 			
 				pakistansk rupee
 				pakistansk rupee
 				pakistanske rupee
+				PKR
 				Rs
 			
 			
 				polsk zloty
 				polsk zloty
 				polske zloty
+				PLN
 				zł
 			
 			
@@ -6423,6 +6619,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paraguaysk guarani
 				paraguaysk guarani
 				paraguayske guarani
+				PYG
 				₲
 			
 			
@@ -6445,17 +6642,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rumænsk leu
 				rumænsk leu
 				rumænske lei
+				RON
 				L
 			
 			
 				serbisk dinar
 				serbisk dinar
 				serbiske dinarer
+				RSD
 			
 			
 				russisk rubel
 				russisk rubel
 				russiske rubler
+				RUB
 				₽
 			
 			
@@ -6498,6 +6698,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sudansk pund
 				sudansk pund
 				sudanske pund
+				SDG
 			
 			
 				Sudansk pund (1957–1998)
@@ -6508,18 +6709,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svensk krone
 				svensk krone
 				svenske kroner
+				SEK
 				kr.
 			
 			
 				singaporeansk dollar
 				singaporeansk dollar
 				singaporeanske dollar
+				SGD
 				$
 			
 			
 				pund fra Saint Helena
 				pund fra Saint Helena
 				pund fra Saint Helena
+				SHP
 				£
 			
 			
@@ -6536,6 +6740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sierraleonsk leone
 				sierraleonsk leone
 				sierraleonske leone
+				SLL
 			
 			
 				somalisk shilling
@@ -6547,6 +6752,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				surinamsk dollar
 				surinamsk dollar
 				surinamske dollar
+				SRD
 				$
 			
 			
@@ -6558,17 +6764,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sydsudansk pund
 				sydsudansk pund
 				sydsudanske pund
+				SSP
 				£
 			
 			
 				dobra fra Sao Tome og Principe (1977–2017)
 				dobra fra Sao Tome og Principe (1977–2017)
 				dobra fra Sao Tome og Principe (1977–2017)
+				STD
 			
 			
 				dobra fra Sao Tome og Principe
 				dobra fra Sao Tome og Principe
 				dobra fra Sao Tome og Principe
+				STN
+				Db
 			
 			
 				Sovjetisk rubel
@@ -6626,11 +6836,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tunesisk dinar
 				tunesisk dinar
 				tunesiske dinarer
+				TND
 			
 			
 				tongansk paʻanga
 				tongansk paʻanga
 				tonganske paʻanga
+				TOP
 				T$
 			
 			
@@ -6655,12 +6867,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dollar fra Trinidad og Tobago
 				dollar fra Trinidad og Tobago
 				dollar fra Trinidad og Tobago
+				TTD
 				$
 			
 			
 				ny taiwansk dollar
 				ny taiwansk dollar
 				nye taiwanske dollar
+				NT$
 				NT$
 			
 			
@@ -6673,6 +6887,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ukrainsk grynia
 				ukrainsk grynia
 				ukrainske grynia
+				UAH
 				₴
 			
 			
@@ -6695,7 +6910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				amerikansk dollar
 				amerikansk dollar
 				amerikanske dollar
-				$
 				$
 			
 			
@@ -6717,6 +6931,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguayansk peso
 				uruguayansk peso
 				uruguayanske pesos
+				UYU
 				$
 			
 			
@@ -6734,6 +6949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelansk bolivar (2008–2018)
 				venezuelansk bolivar (2008–2018)
 				venezuelanske bolivarer (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6746,6 +6962,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vietnamesisk dong
 				vietnamesisk dong
 				vietnamesiske dong
+				₫
 				₫
 			
 			
@@ -6757,16 +6974,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vanuaisk vatu
 				vanuaisk vatu
 				vanuaiske vatu
+				VUV
 			
 			
 				samoansk tala
 				samoansk tala
 				samoanske tala
+				WST
 			
 			
 				CFA-franc (BEAC)
 				beninsk CFA-franc
 				CFA-franc (BEAC)
+				FCFA
 			
 			
 				Sølv
@@ -6788,6 +7008,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				østkaribisk dollar
 				østkaribisk dollar
 				østkaribiske dollar
+				EC$
 				$
 			
 			
@@ -6810,6 +7031,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA-franc BCEAO
 				CFA-franc BCEAO
 				CFA-franc BCEAO
+				CFA
 			
 			
 				Palladium
@@ -6820,6 +7042,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP-franc
 				CFP-franc
 				CFP-franc
+				CFPF
 			
 			
 				Platin
@@ -6938,6 +7161,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} pr. {1}
 			
+			
+				{0} gange {1}
+			
 			
 				G-kraft
 				{0} G-kraft
@@ -7023,11 +7249,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kvadrattommer
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -7058,16 +7279,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} promille
 				{0} promille
 			
-			
-				‱
-				{0} ‱
-				{0} ‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				liter pr. kilometer
 				{0} liter pr. kilometer
@@ -7148,6 +7359,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} århundrede
 				{0} århundreder
 			
+			
+				årtier
+				{0} årti
+				{0} årtier
+			
 			
 				år
 				{0} år
@@ -7260,20 +7476,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} elektronvolt
 				{0} elektronvolt
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
 			
 				newton
-				{0} newton
-				{0} newton
+				{0} newton
+				{0} newton
 			
 			
 				gigahertz
@@ -7295,6 +7501,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				geviert
+				{0} geviert
+				{0} geviert
+			
+			
+				megapixels
+				{0} megapixel
+				{0} megapixels
+			
+			
+				pixels per centimeter
+				{0} pixel per centimeter
+				{0} pixels per centimeter
+			
+			
+				pixels per tomme
+				{0} pixel per tomme
+				{0} pixels per tomme
+			
+			
+				punkter per centimeter
+				{0} punkt per centimeter
+				{0} punkter per centimeter
+			
+			
+				punkter per tomme
+				{0} punkt per tomme
+				{0} punkter per tomme
+			
 			
 				kilometer
 				{0} kilometer
@@ -7391,20 +7627,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} punkt
 			
 			
-				solradier
-				{0} solradius
-				{0} solradier
+				solradier
+				{0} solradius
+				{0} solradier
 			
 			
 				lux
 				{0} lux
 				{0} lux
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				tons
 				{0} ton
@@ -7459,20 +7690,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karat
 				{0} karat
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
 			
 				solmasser
-				{0} solmasse
-				{0} solmasser
+				{0} solmasse
+				{0} solmasser
 			
 			
 				gigawatt
@@ -7504,11 +7725,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hestekraft
 				{0} hestekræfter
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				millimeter kviksølv
 				{0} millimeter kviksølv
@@ -7530,19 +7746,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} millibar
 			
 			
-				atmosfære
-				{0} atmosfære
-				{0} atmosfære
+				atmosfære
+				{0} atmosfære
+				{0} atmosfære
+			
+			
+				pascal
+				{0} pascal
+				{0} pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
 			
 			
 				kilopascal
-				{0} kilopascal
-				{0} kilopascal
+				{0} kilopascal
+				{0} kilopascal
 			
 			
 				megapascal
-				{0} megapascal
-				{0} megapascal
+				{0} megapascal
+				{0} megapascal
 			
 			
 				kilometer i timen
@@ -7584,11 +7810,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvin
 				{0} kelvin
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				newtonmeter
 				{0} newtonmeter
@@ -7710,7 +7931,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} engelske fluid ounces
 			
 			
-				Imp. fl oz
 				{0} Imp. fluid ounce
 				{0} Imp. fluid ounces
 			
@@ -7741,6 +7961,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0} ⋅ {1}
+			
 			
 				G-kraft
 				{0} G
@@ -7757,7 +7980,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} omdr.
 			
 			
-				radian
+				radianer
 				{0} radian
 				{0} radian
 			
@@ -7826,11 +8049,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in²
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} kt.
@@ -7862,15 +8080,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				‱
 				{0} ‱
 				{0} ‱
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				l/km
 				{0} l/km
@@ -7951,6 +8163,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} årh.
 				{0} årh.
 			
+			
+				årti
+				{0} årti
+				{0} årtier
+			
 			
 				år
 				{0} år
@@ -7977,7 +8194,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				timer
-				{0} t
+				{0} t.
 				{0} t
 				{0} /t
 			
@@ -8060,21 +8277,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektronvolt
-				{0} eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
 			
 			
-				newton
+				newton
 				{0} N
 				{0} N
 			
@@ -8194,20 +8399,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pkt.
 			
 			
-				solradier
-				{0} R☉
-				{0} R☉
+				solradier
 			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -8262,20 +8460,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kt.
 				{0} kt.
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
 			
-				solmasser
-				{0} M☉
-				{0} M☉
+				solmasser
 			
 			
 				GW
@@ -8307,11 +8493,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hk
 				{0} hk
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -8332,15 +8513,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				atm
+				{0} atm
+				{0} atm
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/t
@@ -8382,16 +8563,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -8507,11 +8678,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				spsk.
 				{0} spsk.
@@ -8539,6 +8705,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				{0}G
 				{0}G
@@ -8547,6 +8716,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}m/s²
 				{0}m/s²
 			
+			
+				{0}°
+				{0}°
+			
 			
 				{0}′
 				{0}′
@@ -8567,6 +8740,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}m²
 				{0}m²
 			
+			
+				{0} mi²
+				{0} mi²
+			
 			
 				{0}ac
 				{0}ac
@@ -8632,7 +8809,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				min
 				{0} m
-				{0} min
+				{0} m
 			
 			
 				sek
@@ -8656,13 +8833,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				km
 				{0} km
 				{0} km
+				{0}/km
 			
 			
 				meter
 				{0} m
 				{0} m
+				{0}/m
 			
 			
+				dm
 				{0}dm
 				{0}dm
 			
@@ -8670,6 +8850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cm
 				{0} cm
 				{0} cm
+				{0}/cm
 			
 			
 				mm
@@ -8677,6 +8858,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mm
 			
 			
+				µm
 				{0}μm
 				{0}μm
 			
@@ -8702,6 +8884,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fod
 				{0} fod
 				{0} fod
+				{0}/ft
 			
 			
 				tommer
@@ -8744,11 +8927,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kg
 				{0} kg
 				{0} kg
+				{0}/kg
 			
 			
 				g
 				{0} g
 				{0} g
+				{0}/g
 			
 			
 				{0}mg
@@ -8758,14 +8943,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tn
 				{0} tn
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				pund
 				{0} pund
 				{0} pund
+				{0}/lb
 			
 			
+				oz
 				{0} unse
 				{0} unser
+				{0}/oz
 			
 			
 				{0}kW
@@ -8779,30 +8972,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hk
 				{0}hk
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0} mmHg
 				{0} mmHg
 			
+			
+				psi
+				{0} psi
+				{0} psi
+			
 			
 				# Hg
 				{0}" Hg
 				{0}" Hg
 			
 			
+				mbar
 				{0}mbar
 				{0}mbar
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/t
 				{0} km/t
 				{0} km/t
 			
 			
+				m/s
 				{0}m/s
 				{0}m/s
 			
@@ -8811,11 +9012,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mph
 				{0} mph
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0}°C
 				{0}°C
 			
+			
+				°F
+				{0}°F
+				{0}°F
+			
+			
+				K
+				{0} K
+				{0} K
+			
 			
 				{0}km³
 				{0}km³
@@ -8828,6 +9044,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}cm³
 				{0}cm³
 			
+			
+				{0} mi³
+				{0} mi³
+			
 			
 				{0} fod³
 				{0} fod³
@@ -8896,11 +9116,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} eller {1}
 			{0} eller {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} og {1}
-			{0} og {1}
+		
+			{0} el. {1}
+			{0} el. {1}
+		
+		
+			{0} el. {1}
+			{0} el. {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/da_DK.xml b/make/data/cldr/common/main/da_DK.xml
index dd4acf20c1c..45b27e8d57f 100644
--- a/make/data/cldr/common/main/da_DK.xml
+++ b/make/data/cldr/common/main/da_DK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/da_GL.xml b/make/data/cldr/common/main/da_GL.xml
index 06d2d5b99f8..e04a8246df6 100644
--- a/make/data/cldr/common/main/da_GL.xml
+++ b/make/data/cldr/common/main/da_GL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/dav.xml b/make/data/cldr/common/main/dav.xml
index aa3445d7f58..0a3bfd41a67 100644
--- a/make/data/cldr/common/main/dav.xml
+++ b/make/data/cldr/common/main/dav.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/dav_KE.xml b/make/data/cldr/common/main/dav_KE.xml
index 6f70954cec8..8d29f9aa746 100644
--- a/make/data/cldr/common/main/dav_KE.xml
+++ b/make/data/cldr/common/main/dav_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/de.xml b/make/data/cldr/common/main/de.xml
index ba274b2f640..7854d29195e 100644
--- a/make/data/cldr/common/main/de.xml
+++ b/make/data/cldr/common/main/de.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -107,7 +107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Karibisch
 			Cayuga
 			Atsam
-			Chakma
+			Chakma
 			Tschetschenisch
 			Cebuano
 			Rukiga
@@ -164,8 +164,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Griechisch
 			Elamisch
 			Englisch
-			Englisch (GB)
-			Englisch (USA)
 			Mittelenglisch
 			Esperanto
 			Spanisch
@@ -615,6 +613,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yoruba
 			Nheengatu
 			Kantonesisch
+			Chinesisch (Kantonesisch)
 			Zhuang
 			Zapotekisch
 			Bliss-Symbole
@@ -622,7 +621,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Zenaga
 			Tamazight
 			Chinesisch
+			Chinesisch (Mandarin)
 			Chinesisch (vereinfacht)
+			Mandarin (Vereinfacht)
 			Chinesisch (traditionell)
 			Zulu
 			Zuni
@@ -633,10 +634,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
-			
 			
 			
 			
@@ -680,7 +679,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
 			
@@ -744,7 +742,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
 			
@@ -1082,8 +1079,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			El Salvador
 			Sint Maarten
 			Syrien
-			Swasiland
-			Eswatini
+			Eswatini
+			Swasiland
 			Tristan da Cunha
 			Turks- und Caicosinseln
 			Tschad
@@ -1120,8 +1117,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis und Futuna
 			Samoa
-			Pseudo-Akzente
-			Pseudo-Bidi
+			Pseudo-Akzente
+			Pseudo-Bidi
 			Kosovo
 			Jemen
 			Mayotte
@@ -1168,21 +1165,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Kalender
 			Währungsformat
-			Sortierung ohne Symbole
-			Umgekehrte Sortierung von Akzenten
-			Sortierung nach Groß- bzw. Kleinbuchstaben
-			Sortierung nach Groß- oder Kleinschreibung
+			Sortierung ohne Symbole
+			Umgekehrte Sortierung von Akzenten
+			Sortierung nach Groß- bzw. Kleinbuchstaben
+			Sortierung nach Groß- oder Kleinschreibung
 			Sortierung
-			Normierte Sortierung
-			Sortierung nach Zahlen
-			Sortierstärke
+			Normierte Sortierung
+			Sortierung nach Zahlen
+			Sortierstärke
 			Währung
 			Stundenformat (12h/24h)
 			Zeilenumbruchstil
 			Maßsystem
 			Zahlen
-			Zeitzone
-			Lokale Variante
+			Zeitzone
+			Lokale Variante
 			Privatnutzung
 		
 		
@@ -1360,8 +1357,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a ä b c d e f g h i j k l m n o ö p q r s ß t u ü v w x y z]
 		[á à ă â å ã ā æ ç é è ĕ ê ë ē ğ í ì ĭ î ï İ ī ı ñ ó ò ŏ ô ø ō œ ş ú ù ŭ û ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1373,16 +1370,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
-			['ʼ՚ߴ᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
+			['ʼ՚ߴ᾽᾿’＇]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1398,6 +1398,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						B.E.
 					
+					
+						BE
+					
+					
+						BE
+					
 				
 			
 			
@@ -1546,6 +1552,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1614,6 +1634,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1704,15 +1738,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d.–d.
 						
@@ -2026,6 +2051,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							Mitternacht
+							AM
+							PM
 							morgens
 							vorm.
 							mittags
@@ -2035,8 +2062,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							Mitternacht
-							a
-							p
 							morgens
 							vorm.
 							mittags
@@ -2046,6 +2071,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							Mitternacht
+							AM
+							PM
 							morgens
 							vormittags
 							mittags
@@ -2068,8 +2095,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							Mitternacht
-							a
-							p
 							Morgen
 							Vorm.
 							Mittag
@@ -2132,6 +2157,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2214,54 +2261,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h 'Uhr' B – h 'Uhr' B
-							h–h 'Uhr' B
+							h 'Uhr' B – h 'Uhr' B
+							h–h 'Uhr' B
 						
 						
-							h:mm 'Uhr' B – h:mm 'Uhr' B
-							h:mm – h:mm 'Uhr' B
-							h:mm – h:mm 'Uhr' B
+							h:mm 'Uhr' B – h:mm 'Uhr' B
+							h:mm – h:mm 'Uhr' B
+							h:mm – h:mm 'Uhr' B
 						
 						
 							d.–d.
 						
 						
-							y G – y G
-							y–y G
+							y G – y G
+							y–y G
 						
 						
-							MM.y GGGGG – MM.y GGGGG
-							MM.y – MM.y GGGGG
-							MM.y – MM.y GGGGG
+							MM.y GGGGG – MM.y GGGGG
+							MM.y – MM.y GGGGG
+							MM.y – MM.y GGGGG
 						
 						
-							dd.–dd.MM.y GGGGG
-							dd.MM.y GGGGG – dd.MM.y GGGGG
-							dd.MM. – dd.MM.y GGGGG
-							dd.MM.y – dd.MM.y GGGGG
+							dd.–dd.MM.y GGGGG
+							dd.MM.y GGGGG – dd.MM.y GGGGG
+							dd.MM. – dd.MM.y GGGGG
+							dd.MM.y – dd.MM.y GGGGG
 						
 						
-							E, dd.MM.y – E, dd.MM.y GGGGG
-							E, dd.MM.y GGGGG – E, dd.MM.y GGGGG
-							E, dd.MM. – E, dd.MM.y GGGGG
-							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y GGGGG – E, dd.MM.y GGGGG
+							E, dd.MM. – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM–MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
 						
 						
-							d.–d. MMM y G
-							d. MMM y G – d. MMM y G
-							d. MMM – d. MMM y G
-							d. MMM y – d. MMM y G
+							d.–d. MMM y G
+							d. MMM y G – d. MMM y G
+							d. MMM – d. MMM y G
+							d. MMM y – d. MMM y G
 						
 						
-							E, d. – E, d. MMM y G
-							E, d. MMM y G – E E, d. MMM y G
-							E, d. MMM – E, d. MMM y G
-							E, d. MMM y – E, d. MMM y G
+							E, d. – E, d. MMM y G
+							E, d. MMM y G – E E, d. MMM y G
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y – E, d. MMM y G
 						
 						
 							h 'Uhr' a – h 'Uhr' a
@@ -2361,6 +2408,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						
+							Tischri
+							Cheschwan
+							Kislew
+							Tevet
+							Schevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Ijjar
+							Siwan
+							Tammus
+							Aw
+							Elul
+						
 						
 							Tischri
 							Cheschwan
@@ -2379,6 +2442,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						
+							Tischri
+							Cheschwan
+							Kislew
+							Tevet
+							Schevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Ijjar
+							Siwan
+							Tammus
+							Aw
+							Elul
+						
 						
 							Tischri
 							Cheschwan
@@ -2397,6 +2476,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2461,10 +2551,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 			
 			
 				
 					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
 						
 							Muharram
 							Safar
@@ -2481,6 +2596,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
 						
 							Muharram
 							Safar
@@ -2497,8 +2626,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
+				
+					
+						Taika (645–650)
+					
+				
 				
 					
 						
@@ -2585,6 +2730,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3948,6 +4104,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktobe
 			
+			
+				Qostanai
+			
 			
 				Qysylorda
 			
@@ -5553,6 +5712,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			E
 			·
 			‰
@@ -5561,6 +5722,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 Tausend
@@ -5677,21 +5843,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Andorranische Pesete
 				Andorranische Pesete
 				Andorranische Peseten
+				ADP
 			
 			
 				VAE-Dirham
 				VAE-Dirham
 				VAE-Dirham
+				AED
 			
 			
 				Afghanische Afghani (1927–2002)
 				Afghanische Afghani (1927–2002)
 				Afghanische Afghani (1927–2002)
+				AFA
 			
 			
 				Afghanischer Afghani
 				Afghanischer Afghani
 				Afghanische Afghani
+				AFN
 			
 			
 				Albanischer Lek (1946–1965)
@@ -5702,62 +5872,74 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Albanischer Lek
 				Albanischer Lek
 				Albanische Lek
+				ALL
 			
 			
 				Armenischer Dram
 				Armenischer Dram
 				Armenische Dram
+				AMD
 			
 			
 				Niederländische-Antillen-Gulden
 				Niederländische-Antillen-Gulden
 				Niederländische-Antillen-Gulden
+				ANG
 			
 			
 				Angolanischer Kwanza
 				Angolanischer Kwanza
 				Angolanische Kwanza
+				AOA
 				Kz
 			
 			
 				Angolanischer Kwanza (1977–1990)
 				Angolanischer Kwanza (1977–1990)
 				Angolanische Kwanza (1977–1990)
+				AOK
 			
 			
 				Angolanischer Neuer Kwanza (1990–2000)
 				Angolanischer Neuer Kwanza (1990–2000)
 				Angolanische Neue Kwanza (1990–2000)
+				AON
 			
 			
 				Angolanischer Kwanza Reajustado (1995–1999)
 				Angolanischer Kwanza Reajustado (1995–1999)
 				Angolanische Kwanza Reajustado (1995–1999)
+				AOR
 			
 			
 				Argentinischer Austral
 				Argentinischer Austral
 				Argentinische Austral
+				ARA
 			
 			
 				Argentinischer Peso Ley (1970–1983)
 				Argentinischer Peso Ley (1970–1983)
 				Argentinische Pesos Ley (1970–1983)
+				ARL
 			
 			
 				Argentinischer Peso (1881–1970)
 				Argentinischer Peso (1881–1970)
 				Argentinische Pesos (1881–1970)
+				ARM
 			
 			
 				Argentinischer Peso (1983–1985)
 				Argentinischer Peso (1983–1985)
 				Argentinische Peso (1983–1985)
+				ARP
 			
 			
 				Argentinischer Peso
 				Argentinischer Peso
 				Argentinische Pesos
+				ARS
 				$
 			
 			
@@ -5777,59 +5959,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aruba-Florin
 				Aruba-Florin
 				Aruba-Florin
+				AWG
 			
 			
 				Aserbaidschan-Manat (1993–2006)
 				Aserbaidschan-Manat (1993–2006)
 				Aserbaidschan-Manat (1993–2006)
+				AZM
 			
 			
 				Aserbaidschan-Manat
 				Aserbaidschan-Manat
 				Aserbaidschan-Manat
+				AZN
 			
 			
 				Bosnien und Herzegowina Dinar (1992–1994)
 				Bosnien und Herzegowina Dinar (1992–1994)
 				Bosnien und Herzegowina Dinar (1992–1994)
+				BAD
 			
 			
 				Bosnien und Herzegowina Konvertierbare Mark
 				Bosnien und Herzegowina Konvertierbare Mark
 				Bosnien und Herzegowina Konvertierbare Mark
+				BAM
 				KM
 			
 			
 				Bosnien und Herzegowina Neuer Dinar (1994–1997)
 				Bosnien und Herzegowina Neuer Dinar (1994–1997)
 				Bosnien und Herzegowina Neue Dinar (1994–1997)
+				BAN
 			
 			
 				Barbados-Dollar
 				Barbados-Dollar
 				Barbados-Dollar
+				BBD
 				$
 			
 			
 				Bangladesch-Taka
 				Bangladesch-Taka
 				Bangladesch-Taka
+				BDT
 				৳
 			
 			
 				Belgischer Franc (konvertibel)
 				Belgischer Franc (konvertibel)
 				Belgische Franc (konvertibel)
+				BEC
 			
 			
 				Belgischer Franc
 				Belgischer Franc
 				Belgische Franc
+				BEF
 			
 			
 				Belgischer Finanz-Franc
 				Belgischer Finanz-Franc
 				Belgische Finanz-Franc
+				BEL
 			
 			
 				Bulgarische Lew (1962–1999)
@@ -5846,6 +6039,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bulgarischer Lew
 				Bulgarischer Lew
 				Bulgarische Lew
+				BGN
 			
 			
 				Bulgarischer Lew (1879–1952)
@@ -5857,91 +6051,108 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahrain-Dinar
 				Bahrain-Dinar
 				Bahrain-Dinar
+				BHD
 			
 			
 				Burundi-Franc
 				Burundi-Franc
 				Burundi-Francs
+				BIF
 			
 			
 				Bermuda-Dollar
 				Bermuda-Dollar
 				Bermuda-Dollar
+				BMD
 				$
 			
 			
 				Brunei-Dollar
 				Brunei-Dollar
 				Brunei-Dollar
+				BND
 				$
 			
 			
 				Bolivianischer Boliviano
 				Bolivianischer Boliviano
 				Bolivianische Bolivianos
+				BOB
 				Bs
 			
 			
 				Bolivianischer Boliviano (1863–1963)
 				Bolivianischer Boliviano (1863–1963)
 				Bolivianische Bolivianos (1863–1963)
+				BOL
 			
 			
 				Bolivianischer Peso
 				Bolivianischer Peso
 				Bolivianische Peso
+				BOP
 			
 			
 				Boliviansiche Mvdol
 				Boliviansiche Mvdol
 				Bolivianische Mvdol
+				BOV
 			
 			
 				Brasilianischer Cruzeiro Novo (1967–1986)
 				Brasilianischer Cruzeiro Novo (1967–1986)
 				Brasilianische Cruzeiro Novo (1967–1986)
+				BRB
 			
 			
 				Brasilianischer Cruzado (1986–1989)
 				Brasilianischer Cruzado (1986–1989)
 				Brasilianische Cruzado (1986–1989)
+				BRC
 			
 			
 				Brasilianischer Cruzeiro (1990–1993)
 				Brasilianischer Cruzeiro (1990–1993)
 				Brasilianische Cruzeiro (1990–1993)
+				BRE
 			
 			
 				Brasilianischer Real
 				Brasilianischer Real
 				Brasilianische Real
+				R$
 				R$
 			
 			
 				Brasilianischer Cruzado Novo (1989–1990)
 				Brasilianischer Cruzado Novo (1989–1990)
 				Brasilianische Cruzado Novo (1989–1990)
+				BRN
 			
 			
 				Brasilianischer Cruzeiro (1993–1994)
 				Brasilianischer Cruzeiro (1993–1994)
 				Brasilianische Cruzeiro (1993–1994)
+				BRR
 			
 			
 				Brasilianischer Cruzeiro (1942–1967)
 				Brasilianischer Cruzeiro (1942–1967)
 				Brasilianischer Cruzeiro (1942–1967)
+				BRZ
 			
 			
 				Bahamas-Dollar
 				Bahamas-Dollar
 				Bahamas-Dollar
+				BSD
 				$
 			
 			
 				Bhutan-Ngultrum
 				Bhutan-Ngultrum
 				Bhutan-Ngultrum
+				BTN
 			
 			
 				Birmanischer Kyat
@@ -5952,70 +6163,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Botswanischer Pula
 				Botswanischer Pula
 				Botswanische Pula
+				BWP
 				P
 			
 			
 				Belarus-Rubel (1994–1999)
 				Belarus-Rubel (1994–1999)
 				Belarus-Rubel (1994–1999)
+				BYB
 			
 			
 				Weißrussischer Rubel
 				Weißrussischer Rubel
 				Weißrussische Rubel
+				BYN
 				р.
 			
 			
 				Weißrussischer Rubel (2000–2016)
 				Weißrussischer Rubel (2000–2016)
 				Weißrussische Rubel (2000–2016)
+				BYR
 			
 			
 				Belize-Dollar
 				Belize-Dollar
 				Belize-Dollar
+				BZD
 				$
 			
 			
 				Kanadischer Dollar
 				Kanadischer Dollar
 				Kanadische Dollar
+				CA$
 				$
 			
 			
 				Kongo-Franc
 				Kongo-Franc
 				Kongo-Francs
+				CDF
 			
 			
 				WIR-Euro
 				WIR-Euro
 				WIR-Euro
+				CHE
 			
 			
 				Schweizer Franken
 				Schweizer Franken
 				Schweizer Franken
+				CHF
 			
 			
 				WIR Franken
 				WIR Franken
 				WIR Franken
+				CHW
 			
 			
 				Chilenischer Escudo
 				Chilenischer Escudo
 				Chilenische Escudo
+				CLE
 			
 			
 				Chilenische Unidades de Fomento
 				Chilenische Unidades de Fomento
 				Chilenische Unidades de Fomento
+				CLF
 			
 			
 				Chilenischer Peso
 				Chilenischer Peso
 				Chilenische Pesos
+				CLP
 				$
 			
 			
@@ -6028,72 +6252,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dollar der Chinesischen Volksbank
 				Dollar der Chinesischen Volksbank
 				Dollar der Chinesischen Volksbank
+				CNX
 			
 			
 				Renminbi Yuan
 				Chinesischer Yuan
 				Renminbi Yuan
+				CN¥
 				¥
 			
 			
 				Kolumbianischer Peso
 				Kolumbianischer Peso
 				Kolumbianische Pesos
+				COP
 				$
 			
 			
 				Kolumbianische Unidades de valor real
 				Kolumbianische Unidad de valor real
 				Kolumbianische Unidades de valor real
+				COU
 			
 			
 				Costa-Rica-Colón
 				Costa-Rica-Colón
 				Costa-Rica-Colón
+				CRC
 				₡
 			
 			
 				Serbischer Dinar (2002–2006)
 				Serbischer Dinar (2002–2006)
 				Serbische Dinar (2002–2006)
+				CSD
 			
 			
 				Tschechoslowakische Krone
 				Tschechoslowakische Kronen
 				Tschechoslowakische Kronen
+				CSK
 			
 			
 				Kubanischer Peso (konvertibel)
 				Kubanischer Peso (konvertibel)
 				Kubanische Pesos (konvertibel)
+				CUC
 				Cub$
 			
 			
 				Kubanischer Peso
 				Kubanischer Peso
 				Kubanische Pesos
+				CUP
 				$
 			
 			
 				Cabo-Verde-Escudo
 				Cabo-Verde-Escudo
 				Cabo-Verde-Escudos
+				CVE
 			
 			
 				Zypern-Pfund
 				Zypern Pfund
 				Zypern Pfund
+				CYP
 			
 			
 				Tschechische Krone
 				Tschechische Krone
 				Tschechische Kronen
+				CZK
 				Kč
 			
 			
 				Mark der DDR
 				Mark der DDR
 				Mark der DDR
+				DDM
 			
 			
 				Deutsche Mark
@@ -6105,102 +6342,122 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dschibuti-Franc
 				Dschibuti-Franc
 				Dschibuti-Franc
+				DJF
 			
 			
 				Dänische Krone
 				Dänische Krone
 				Dänische Kronen
+				DKK
 				kr
 			
 			
 				Dominikanischer Peso
 				Dominikanischer Peso
 				Dominikanische Pesos
+				DOP
 				$
 			
 			
 				Algerischer Dinar
 				Algerischer Dinar
 				Algerische Dinar
+				DZD
 			
 			
 				Ecuadorianischer Sucre
 				Ecuadorianischer Sucre
 				Ecuadorianische Sucre
+				ECS
 			
 			
 				Verrechnungseinheit für Ecuador
 				Verrechnungseinheiten für Ecuador
 				Verrechnungseinheiten für Ecuador
+				ECV
 			
 			
 				Estnische Krone
 				Estnische Krone
 				Estnische Kronen
+				EEK
 			
 			
 				Ägyptisches Pfund
 				Ägyptisches Pfund
 				Ägyptische Pfund
+				EGP
 				E£
 			
 			
 				Eritreischer Nakfa
 				Eritreischer Nakfa
 				Eritreische Nakfa
+				ERN
 			
 			
 				Spanische Peseta (A–Konten)
 				Spanische Peseta (A–Konten)
 				Spanische Peseten (A–Konten)
+				ESA
 			
 			
 				Spanische Peseta (konvertibel)
 				Spanische Peseta (konvertibel)
 				Spanische Peseten (konvertibel)
+				ESB
 			
 			
 				Spanische Peseta
 				Spanische Peseta
 				Spanische Peseten
+				ESP
+				₧
 			
 			
 				Äthiopischer Birr
 				Äthiopischer Birr
 				Äthiopische Birr
+				ETB
 			
 			
 				Euro
 				Euro
 				Euro
+				€
 				€
 			
 			
 				Finnische Mark
 				Finnische Mark
 				Finnische Mark
+				FIM
 			
 			
 				Fidschi-Dollar
 				Fidschi-Dollar
 				Fidschi-Dollar
+				FJD
 				$
 			
 			
 				Falkland-Pfund
 				Falkland-Pfund
 				Falkland-Pfund
+				FKP
 				Fl£
 			
 			
 				Französischer Franc
 				Französischer Franc
 				Französische Franc
+				FRF
 			
 			
 				Britisches Pfund
 				Britisches Pfund
 				Britische Pfund
+				£
 				£
 			
 			
@@ -6212,6 +6469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Georgischer Lari
 				Georgischer Lari
 				Georgische Lari
+				GEL
 				₾
 				₾
 			
@@ -6219,48 +6477,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ghanaischer Cedi (1979–2007)
 				Ghanaischer Cedi (1979–2007)
 				Ghanaische Cedi (1979–2007)
+				GHC
 			
 			
 				Ghanaischer Cedi
 				Ghanaischer Cedi
 				Ghanaische Cedi
+				GHS
 			
 			
 				Gibraltar-Pfund
 				Gibraltar-Pfund
 				Gibraltar-Pfund
+				GIP
 				£
 			
 			
 				Gambia-Dalasi
 				Gambia-Dalasi
 				Gambia-Dalasi
+				GMD
 			
 			
 				Guinea-Franc
 				Guinea-Franc
 				Guinea-Franc
+				GNF
 				F.G.
 			
 			
 				Guineischer Syli
 				Guineischer Syli
 				Guineische Syli
+				GNS
 			
 			
 				Äquatorialguinea-Ekwele
 				Äquatorialguinea-Ekwele
 				Äquatorialguinea-Ekwele
+				GQE
 			
 			
 				Griechische Drachme
 				Griechische Drachme
 				Griechische Drachmen
+				GRD
 			
 			
 				Guatemaltekischer Quetzal
 				Guatemaltekischer Quetzal
 				Guatemaltekische Quetzales
+				GTQ
 				Q
 			
 			
@@ -6272,62 +6539,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guinea-Bissau Peso
 				Guinea-Bissau Peso
 				Guinea-Bissau Pesos
+				GWP
 			
 			
 				Guyana-Dollar
 				Guyana-Dollar
 				Guyana-Dollar
+				GYD
 				$
 			
 			
 				Hongkong-Dollar
 				Hongkong-Dollar
 				Hongkong-Dollar
+				HK$
 				$
 			
 			
 				Honduras-Lempira
 				Honduras-Lempira
 				Honduras-Lempira
+				HNL
 				L
 			
 			
 				Kroatischer Dinar
 				Kroatischer Dinar
 				Kroatische Dinar
+				HRD
 			
 			
 				Kroatischer Kuna
 				Kroatischer Kuna
 				Kroatische Kuna
+				HRK
 				kn
 			
 			
 				Haitianische Gourde
 				Haitianische Gourde
 				Haitianische Gourdes
+				HTG
 			
 			
 				Ungarischer Forint
 				Ungarischer Forint
 				Ungarische Forint
+				HUF
 				Ft
 			
 			
 				Indonesische Rupiah
 				Indonesische Rupiah
 				Indonesische Rupiah
+				IDR
 				Rp
 			
 			
 				Irisches Pfund
 				Irisches Pfund
 				Irische Pfund
+				IEP
 			
 			
 				Israelisches Pfund
 				Israelisches Pfund
 				Israelische Pfund
+				ILP
 			
 			
 				Israelischer Schekel (1980–1985)
@@ -6338,23 +6616,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Israelischer Neuer Schekel
 				Israelischer Neuer Schekel
 				Israelische Neue Schekel
+				₪
 				₪
 			
 			
 				Indische Rupie
 				Indische Rupie
 				Indische Rupien
+				₹
 				₹
 			
 			
 				Irakischer Dinar
 				Irakischer Dinar
 				Irakische Dinar
+				IQD
 			
 			
 				Iranischer Rial
 				Iranischer Rial
 				Iranische Rial
+				IRR
 			
 			
 				Isländische Krone (1918–1981)
@@ -6365,23 +6647,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Isländische Krone
 				Isländische Krone
 				Isländische Kronen
+				ISK
 				kr
 			
 			
 				Italienische Lira
 				Italienische Lira
 				Italienische Lire
+				ITL
 			
 			
 				Jamaika-Dollar
 				Jamaika-Dollar
 				Jamaika-Dollar
+				JMD
 				$
 			
 			
 				Jordanischer Dinar
 				Jordanischer Dinar
 				Jordanische Dinar
+				JOD
 			
 			
 				Japanischer Yen
@@ -6394,204 +6680,242 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kenia-Schilling
 				Kenia-Schilling
 				Kenia-Schilling
+				KES
 			
 			
 				Kirgisischer Som
 				Kirgisischer Som
 				Kirgisische Som
+				KGS
 			
 			
 				Kambodschanischer Riel
 				Kambodschanischer Riel
 				Kambodschanische Riel
+				KHR
 				៛
 			
 			
 				Komoren-Franc
 				Komoren-Franc
 				Komoren-Francs
+				KMF
 				FC
 			
 			
 				Nordkoreanischer Won
 				Nordkoreanischer Won
 				Nordkoreanische Won
+				KPW
 				₩
 			
 			
 				Südkoreanischer Hwan (1953–1962)
 				Südkoreanischer Hwan (1953–1962)
 				Südkoreanischer Hwan (1953–1962)
+				KRH
 			
 			
 				Südkoreanischer Won (1945–1953)
 				Südkoreanischer Won (1945–1953)
 				Südkoreanischer Won (1945–1953)
+				KRO
 			
 			
 				Südkoreanischer Won
 				Südkoreanischer Won
 				Südkoreanische Won
+				₩
 				₩
 			
 			
 				Kuwait-Dinar
 				Kuwait-Dinar
 				Kuwait-Dinar
+				KWD
 			
 			
 				Kaiman-Dollar
 				Kaiman-Dollar
 				Kaiman-Dollar
+				KYD
 				$
 			
 			
 				Kasachischer Tenge
 				Kasachischer Tenge
 				Kasachische Tenge
+				KZT
 				₸
 			
 			
 				Laotischer Kip
 				Laotischer Kip
 				Laotische Kip
+				LAK
 				₭
 			
 			
 				Libanesisches Pfund
 				Libanesisches Pfund
 				Libanesische Pfund
+				LBP
 				L£
 			
 			
 				Sri-Lanka-Rupie
 				Sri-Lanka-Rupie
 				Sri-Lanka-Rupien
+				LKR
 				Rs
 			
 			
 				Liberianischer Dollar
 				Liberianischer Dollar
 				Liberianische Dollar
+				LRD
 				$
 			
 			
 				Loti
 				Loti
 				Loti
+				LSL
 			
 			
 				Litauischer Litas
 				Litauischer Litas
 				Litauische Litas
+				LTL
 			
 			
 				Litauischer Talonas
 				Litauische Talonas
 				Litauische Talonas
+				LTT
 			
 			
 				Luxemburgischer Franc (konvertibel)
 				Luxemburgische Franc (konvertibel)
 				Luxemburgische Franc (konvertibel)
+				LUC
 			
 			
 				Luxemburgischer Franc
 				Luxemburgische Franc
 				Luxemburgische Franc
+				LUF
 			
 			
 				Luxemburgischer Finanz-Franc
 				Luxemburgische Finanz-Franc
 				Luxemburgische Finanz-Franc
+				LUL
 			
 			
 				Lettischer Lats
 				Lettischer Lats
 				Lettische Lats
+				LVL
 			
 			
 				Lettischer Rubel
 				Lettische Rubel
 				Lettische Rubel
+				LVR
 			
 			
 				Libyscher Dinar
 				Libyscher Dinar
 				Libysche Dinar
+				LYD
 			
 			
 				Marokkanischer Dirham
 				Marokkanischer Dirham
 				Marokkanische Dirham
+				MAD
 			
 			
 				Marokkanischer Franc
 				Marokkanische Franc
 				Marokkanische Franc
+				MAF
 			
 			
 				Monegassischer Franc
 				Monegassischer Franc
 				Monegassische Franc
+				MCF
 			
 			
 				Moldau-Cupon
 				Moldau-Cupon
 				Moldau-Cupon
+				MDC
 			
 			
 				Moldau-Leu
 				Moldau-Leu
 				Moldau-Leu
+				MDL
 			
 			
 				Madagaskar-Ariary
 				Madagaskar-Ariary
 				Madagaskar-Ariary
+				MGA
 				Ar
 			
 			
 				Madagaskar-Franc
 				Madagaskar-Franc
 				Madagaskar-Franc
+				MGF
 			
 			
 				Mazedonischer Denar
 				Mazedonischer Denar
 				Mazedonische Denari
+				MKD
 			
 			
 				Mazedonischer Denar (1992–1993)
 				Mazedonischer Denar (1992–1993)
 				Mazedonische Denar (1992–1993)
+				MKN
 			
 			
 				Malischer Franc
 				Malische Franc
 				Malische Franc
+				MLF
 			
 			
 				Myanmarischer Kyat
 				Myanmarischer Kyat
 				Myanmarische Kyat
+				MMK
 				K
 			
 			
 				Mongolischer Tögrög
 				Mongolischer Tögrög
 				Mongolische Tögrög
+				MNT
 				₮
 			
 			
 				Macao-Pataca
 				Macao-Pataca
 				Macao-Pataca
+				MOP
 			
 			
 				Mauretanischer Ouguiya (1973–2017)
 				Mauretanischer Ouguiya (1973–2017)
 				Mauretanische Ouguiya (1973–2017)
+				MRO
 			
 			
 				Mauretanischer Ouguiya
@@ -6603,16 +6927,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maltesische Lira
 				Maltesische Lira
 				Maltesische Lira
+				MTL
 			
 			
 				Maltesisches Pfund
 				Maltesische Pfund
 				Maltesische Pfund
+				MTP
 			
 			
 				Mauritius-Rupie
 				Mauritius-Rupie
 				Mauritius-Rupien
+				MUR
 				Rs
 			
 			
@@ -6624,32 +6951,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malediven-Rufiyaa
 				Malediven-Rufiyaa
 				Malediven-Rupien
+				MVR
 			
 			
 				Malawi-Kwacha
 				Malawi-Kwacha
 				Malawi-Kwacha
+				MWK
 			
 			
 				Mexikanischer Peso
 				Mexikanischer Peso
 				Mexikanische Pesos
+				MX$
 				$
 			
 			
 				Mexikanischer Silber-Peso (1861–1992)
 				Mexikanische Silber-Peso (1861–1992)
 				Mexikanische Silber-Pesos (1861–1992)
+				MXP
 			
 			
 				Mexicanischer Unidad de Inversion (UDI)
 				Mexicanischer Unidad de Inversion (UDI)
 				Mexikanische Unidad de Inversion (UDI)
+				MXV
 			
 			
 				Malaysischer Ringgit
 				Malaysischer Ringgit
 				Malaysische Ringgit
+				MYR
 				RM
 			
 			
@@ -6661,104 +6994,123 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mosambikanischer Metical (1980–2006)
 				Mosambikanischer Metical (1980–2006)
 				Mosambikanische Meticais (1980–2006)
+				MZM
 			
 			
 				Mosambikanischer Metical
 				Mosambikanischer Metical
 				Mosambikanische Meticais
+				MZN
 			
 			
 				Namibia-Dollar
 				Namibia-Dollar
 				Namibia-Dollar
+				NAD
 				$
 			
 			
 				Nigerianischer Naira
 				Nigerianischer Naira
 				Nigerianische Naira
+				NGN
 				₦
 			
 			
 				Nicaraguanischer Córdoba (1988–1991)
 				Nicaraguanischer Córdoba (1988–1991)
 				Nicaraguanische Córdoba (1988–1991)
+				NIC
 			
 			
 				Nicaragua-Córdoba
 				Nicaragua-Córdoba
 				Nicaragua-Córdobas
+				NIO
 				C$
 			
 			
 				Niederländischer Gulden
 				Niederländischer Gulden
 				Niederländische Gulden
+				NLG
 			
 			
 				Norwegische Krone
 				Norwegische Krone
 				Norwegische Kronen
+				NOK
 				kr
 			
 			
 				Nepalesische Rupie
 				Nepalesische Rupie
 				Nepalesische Rupien
+				NPR
 				Rs
 			
 			
 				Neuseeland-Dollar
 				Neuseeland-Dollar
 				Neuseeland-Dollar
+				NZ$
 				$
 			
 			
 				Omanischer Rial
 				Omanischer Rial
 				Omanische Rials
+				OMR
 			
 			
 				Panamaischer Balboa
 				Panamaischer Balboa
 				Panamaische Balboas
+				PAB
 			
 			
 				Peruanischer Inti
 				Peruanische Inti
 				Peruanische Inti
+				PEI
 			
 			
 				Peruanischer Sol
 				Peruanischer Sol
 				Peruanische Sol
+				PEN
 			
 			
 				Peruanischer Sol (1863–1965)
 				Peruanischer Sol (1863–1965)
 				Peruanische Sol (1863–1965)
+				PES
 			
 			
 				Papua-Neuguineischer Kina
 				Papua-Neuguineischer Kina
 				Papua-Neuguineische Kina
+				PGK
 			
 			
 				Philippinischer Peso
 				Philippinischer Peso
 				Philippinische Pesos
+				PHP
 				₱
 			
 			
 				Pakistanische Rupie
 				Pakistanische Rupie
 				Pakistanische Rupien
+				PKR
 				Rs
 			
 			
 				Polnischer Złoty
 				Polnischer Złoty
 				Polnische Złoty
+				PLN
 				zł
 			
 			
@@ -6770,146 +7122,174 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Portugiesischer Escudo
 				Portugiesische Escudo
 				Portugiesische Escudo
+				PTE
 			
 			
 				Paraguayischer Guaraní
 				Paraguayischer Guaraní
 				Paraguayische Guaraníes
+				PYG
 				₲
 			
 			
 				Katar-Riyal
 				Katar-Riyal
 				Katar-Riyal
+				QAR
 			
 			
 				Rhodesischer Dollar
 				Rhodesische Dollar
 				Rhodesische Dollar
+				RHD
 			
 			
 				Rumänischer Leu (1952–2006)
 				Rumänischer Leu (1952–2006)
 				Rumänische Leu (1952–2006)
+				ROL
 			
 			
 				Rumänischer Leu
 				Rumänischer Leu
 				Rumänische Leu
+				RON
 				L
 			
 			
 				Serbischer Dinar
 				Serbischer Dinar
 				Serbische Dinaren
+				RSD
 			
 			
 				Russischer Rubel
 				Russischer Rubel
 				Russische Rubel
+				RUB
 				₽
 			
 			
 				Russischer Rubel (1991–1998)
 				Russischer Rubel (1991–1998)
 				Russische Rubel (1991–1998)
+				RUR
+				р.
 			
 			
 				Ruanda-Franc
 				Ruanda-Franc
 				Ruanda-Francs
+				RWF
 				F.Rw
 			
 			
 				Saudi-Rial
 				Saudi-Rial
 				Saudi-Rial
+				SAR
 			
 			
 				Salomonen-Dollar
 				Salomonen-Dollar
 				Salomonen-Dollar
+				SBD
 				$
 			
 			
 				Seychellen-Rupie
 				Seychellen-Rupie
 				Seychellen-Rupien
+				SCR
 			
 			
 				Sudanesischer Dinar (1992–2007)
 				Sudanesischer Dinar (1992–2007)
 				Sudanesische Dinar (1992–2007)
+				SDD
 			
 			
 				Sudanesisches Pfund
 				Sudanesisches Pfund
 				Sudanesische Pfund
+				SDG
 			
 			
 				Sudanesisches Pfund (1957–1998)
 				Sudanesisches Pfund (1957–1998)
 				Sudanesische Pfund (1957–1998)
+				SDP
 			
 			
 				Schwedische Krone
 				Schwedische Krone
 				Schwedische Kronen
+				SEK
 				kr
 			
 			
 				Singapur-Dollar
 				Singapur-Dollar
 				Singapur-Dollar
+				SGD
 				$
 			
 			
 				St. Helena-Pfund
 				St. Helena-Pfund
 				St. Helena-Pfund
+				SHP
 				£
 			
 			
 				Slowenischer Tolar
 				Slowenischer Tolar
 				Slowenische Tolar
+				SIT
 			
 			
 				Slowakische Krone
 				Slowakische Kronen
 				Slowakische Kronen
+				SKK
 			
 			
 				Sierra-leonischer Leone
 				Sierra-leonischer Leone
 				Sierra-leonische Leones
+				SLL
 			
 			
 				Somalia-Schilling
 				Somalia-Schilling
 				Somalia-Schilling
+				SOS
 			
 			
 				Suriname-Dollar
 				Suriname-Dollar
 				Suriname-Dollar
+				SRD
 				$
 			
 			
 				Suriname Gulden
 				Suriname-Gulden
 				Suriname-Gulden
+				SRG
 			
 			
 				Südsudanesisches Pfund
 				Südsudanesisches Pfund
 				Südsudanesische Pfund
+				SSP
 				£
 			
 			
 				São-toméischer Dobra (1977–2017)
 				São-toméischer Dobra (1977–2017)
 				São-toméische Dobra (1977–2017)
+				STD
 			
 			
 				São-toméischer Dobra
@@ -6922,22 +7302,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sowjetischer Rubel
 				Sowjetische Rubel
 				Sowjetische Rubel
+				SUR
 			
 			
 				El Salvador Colon
 				El Salvador-Colon
 				El Salvador-Colon
+				SVC
 			
 			
 				Syrisches Pfund
 				Syrisches Pfund
 				Syrische Pfund
+				SYP
 				SYP
 			
 			
 				Swasiländischer Lilangeni
 				Swasiländischer Lilangeni
 				Swasiländische Emalangeni
+				SZL
 			
 			
 				Thailändischer Baht
@@ -6950,47 +7334,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tadschikistan Rubel
 				Tadschikistan-Rubel
 				Tadschikistan-Rubel
+				TJR
 			
 			
 				Tadschikistan-Somoni
 				Tadschikistan-Somoni
 				Tadschikistan-Somoni
+				TJS
 			
 			
 				Turkmenistan-Manat (1993–2009)
 				Turkmenistan-Manat (1993–2009)
 				Turkmenistan-Manat (1993–2009)
+				TMM
 			
 			
 				Turkmenistan-Manat
 				Turkmenistan-Manat
 				Turkmenistan-Manat
+				TMT
 			
 			
 				Tunesischer Dinar
 				Tunesischer Dinar
 				Tunesische Dinar
+				TND
 			
 			
 				Tongaischer Paʻanga
 				Tongaischer Paʻanga
 				Tongaische Paʻanga
+				TOP
 				T$
 			
 			
 				Timor-Escudo
 				Timor-Escudo
 				Timor-Escudo
+				TPE
 			
 			
 				Türkische Lira (1922–2005)
 				Türkische Lira (1922–2005)
 				Türkische Lira (1922–2005)
+				TRL
 			
 			
 				Türkische Lira
 				Türkische Lira
 				Türkische Lira
+				TRY
 				₺
 				TL
 			
@@ -6998,39 +7391,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Trinidad und Tobago-Dollar
 				Trinidad und Tobago-Dollar
 				Trinidad und Tobago-Dollar
+				TTD
 				$
 			
 			
 				Neuer Taiwan-Dollar
 				Neuer Taiwan-Dollar
 				Neue Taiwan-Dollar
+				NT$
 				NT$
 			
 			
 				Tansania-Schilling
 				Tansania-Schilling
 				Tansania-Schilling
+				TZS
 			
 			
 				Ukrainische Hrywnja
 				Ukrainische Hrywnja
 				Ukrainische Hrywen
+				UAH
 				₴
 			
 			
 				Ukrainischer Karbovanetz
 				Ukrainische Karbovanetz
 				Ukrainische Karbovanetz
+				UAK
 			
 			
 				Uganda-Schilling (1966–1987)
 				Uganda-Schilling (1966–1987)
 				Uganda-Schilling (1966–1987)
+				UGS
 			
 			
 				Uganda-Schilling
 				Uganda-Schilling
 				Uganda-Schilling
+				UGX
 			
 			
 				US-Dollar
@@ -7043,42 +7443,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				US Dollar (Nächster Tag)
 				US-Dollar (Nächster Tag)
 				US-Dollar (Nächster Tag)
+				USN
 			
 			
 				US Dollar (Gleicher Tag)
 				US-Dollar (Gleicher Tag)
 				US-Dollar (Gleicher Tag)
+				USS
 			
 			
 				Uruguayischer Peso (Indexierte Rechnungseinheiten)
 				Uruguayischer Peso (Indexierte Rechnungseinheiten)
 				Uruguayische Pesos (Indexierte Rechnungseinheiten)
+				UYI
 			
 			
 				Uruguayischer Peso (1975–1993)
 				Uruguayischer Peso (1975–1993)
 				Uruguayische Pesos (1975–1993)
+				UYP
 			
 			
 				Uruguayischer Peso
 				Uruguayischer Peso
 				Uruguayische Pesos
+				UYU
 				$
 			
 			
 				Usbekistan-Sum
 				Usbekistan-Sum
 				Usbekistan-Sum
+				UZS
 			
 			
 				Venezolanischer Bolívar (1871–2008)
 				Venezolanischer Bolívar (1871–2008)
 				Venezolanische Bolívares (1871–2008)
+				VEB
 			
 			
 				Venezolanischer Bolívar (2008–2018)
 				Venezolanischer Bolívar (2008–2018)
 				Venezolanische Bolívares (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -7091,123 +7499,147 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vietnamesischer Dong
 				Vietnamesischer Dong
 				Vietnamesische Dong
+				₫
 				₫
 			
 			
 				Vietnamesischer Dong(1978–1985)
 				Vietnamesischer Dong(1978–1985)
 				Vietnamesische Dong(1978–1985)
+				VNN
 			
 			
 				Vanuatu-Vatu
 				Vanuatu-Vatu
 				Vanuatu-Vatu
+				VUV
 			
 			
 				Samoanischer Tala
 				Samoanischer Tala
 				Samoanische Tala
+				WST
 			
 			
 				CFA-Franc (BEAC)
 				CFA-Franc (BEAC)
 				CFA-Franc (BEAC)
+				FCFA
 			
 			
 				Unze Silber
 				Unze Silber
 				Unzen Silber
+				XAG
 			
 			
 				Unze Gold
 				Unze Gold
 				Unzen Gold
+				XAU
 			
 			
 				Europäische Rechnungseinheit
 				Europäische Rechnungseinheiten
 				Europäische Rechnungseinheiten
+				XBA
 			
 			
 				Europäische Währungseinheit (XBB)
 				Europäische Währungseinheiten (XBB)
 				Europäische Währungseinheiten (XBB)
+				XBB
 			
 			
 				Europäische Rechnungseinheit (XBC)
 				Europäische Rechnungseinheiten (XBC)
 				Europäische Rechnungseinheiten (XBC)
+				XBC
 			
 			
 				Europäische Rechnungseinheit (XBD)
 				Europäische Rechnungseinheiten (XBD)
 				Europäische Rechnungseinheiten (XBD)
+				XBD
 			
 			
 				Ostkaribischer Dollar
 				Ostkaribischer Dollar
 				Ostkaribische Dollar
+				EC$
 				$
 			
 			
 				Sonderziehungsrechte
 				Sonderziehungsrechte
 				Sonderziehungsrechte
+				XDR
 			
 			
 				Europäische Währungseinheit (XEU)
 				Europäische Währungseinheiten (XEU)
 				Europäische Währungseinheiten (XEU)
+				XEU
 			
 			
 				Französischer Gold-Franc
 				Französische Gold-Franc
 				Französische Gold-Franc
+				XFO
 			
 			
 				Französischer UIC-Franc
 				Französische UIC-Franc
 				Französische UIC-Franc
+				XFU
 			
 			
 				CFA-Franc (BCEAO)
 				CFA-Franc (BCEAO)
 				CFA-Francs (BCEAO)
+				CFA
 			
 			
 				Unze Palladium
 				Unze Palladium
 				Unzen Palladium
+				XPD
 			
 			
 				CFP-Franc
 				CFP-Franc
 				CFP-Franc
+				CFPF
 			
 			
 				Unze Platin
 				Unze Platin
 				Unzen Platin
+				XPT
 			
 			
 				RINET Funds
 				RINET Funds
 				RINET Funds
+				XRE
 			
 			
 				SUCRE
 				SUCRE
 				SUCRE
+				XSU
 			
 			
 				Testwährung
 				Testwährung
 				Testwährung
+				XTS
 			
 			
 				Rechnungseinheit der AfEB
 				Rechnungseinheit der AfEB
 				Rechnungseinheiten der AfEB
+				XUA
 			
 			
 				Unbekannte Währung
@@ -7219,78 +7651,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jemen-Dinar
 				Jemen-Dinar
 				Jemen-Dinar
+				YDD
 			
 			
 				Jemen-Rial
 				Jemen-Rial
 				Jemen-Rial
+				YER
 			
 			
 				Jugoslawischer Dinar (1966–1990)
 				Jugoslawischer Dinar (1966–1990)
 				Jugoslawische Dinar (1966–1990)
+				YUD
 			
 			
 				Jugoslawischer Neuer Dinar (1994–2002)
 				Jugoslawischer Neuer Dinar (1994–2002)
 				Jugoslawische Neue Dinar (1994–2002)
+				YUM
 			
 			
 				Jugoslawischer Dinar (konvertibel)
 				Jugoslawische Dinar (konvertibel)
 				Jugoslawische Dinar (konvertibel)
+				YUN
 			
 			
 				Jugoslawischer reformierter Dinar (1992–1993)
 				Jugoslawischer reformierter Dinar (1992–1993)
 				Jugoslawische reformierte Dinar (1992–1993)
+				YUR
 			
 			
 				Südafrikanischer Rand (Finanz)
 				Südafrikanischer Rand (Finanz)
 				Südafrikanischer Rand (Finanz)
+				ZAL
 			
 			
 				Südafrikanischer Rand
 				Südafrikanischer Rand
 				Südafrikanische Rand
+				ZAR
 				R
 			
 			
 				Kwacha (1968–2012)
 				Kwacha (1968–2012)
 				Kwacha (1968–2012)
+				ZMK
 			
 			
 				Kwacha
 				Kwacha
 				Kwacha
+				ZMW
 				K
 			
 			
 				Zaire-Neuer Zaïre (1993–1998)
 				Zaire-Neuer Zaïre (1993–1998)
 				Zaire-Neue Zaïre (1993–1998)
+				ZRN
 			
 			
 				Zaire-Zaïre (1971–1993)
 				Zaire-Zaïre (1971–1993)
 				Zaire-Zaïre (1971–1993)
+				ZRZ
 			
 			
 				Simbabwe-Dollar (1980–2008)
 				Simbabwe-Dollar (1980–2008)
 				Simbabwe-Dollar (1980–2008)
+				ZWD
 			
 			
 				Simbabwe-Dollar (2009)
 				Simbabwe-Dollar (2009)
 				Simbabwe-Dollar (2009)
+				ZWL
 			
 			
 				Simbabwe-Dollar (2008)
 				Simbabwe-Dollar (2008)
 				Simbabwe-Dollar (2008)
+				ZWR
 			
 		
 		
@@ -7394,9 +7841,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pro Quadratzoll
 			
 			
-				Dunams
-				{0} Dunam
-				{0} Dunams
+				Dunams
+				{0} Dunam
+				{0} Dunams
 			
 			
 				Karat
@@ -7419,24 +7866,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Parts per million
 			
 			
-				Prozent
-				{0} Prozent
-				{0} Prozent
+				Prozent
+				{0} Prozent
+				{0} Prozent
 			
 			
-				Promille
-				{0} Promille
-				{0} Promille
-			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				Promille
+				{0} Promille
+				{0} Promille
 			
 			
 				Liter pro Kilometer
@@ -7459,9 +7896,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Meilen pro Imp. Gallone
 			
 			
-				Petabytes
-				{0} Petabyte
-				{0} Petabytes
+				Petabytes
+				{0} Petabyte
+				{0} Petabytes
 			
 			
 				Terabytes
@@ -7518,6 +7955,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Jahrhundert
 				{0} Jahrhunderte
 			
+			
+				Jahrzehnte
+				{0} Jahrzehnt
+				{0} Jahrzehnte
+			
 			
 				Jahre
 				{0} Jahr
@@ -7626,24 +8068,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Kilowattstunden
 			
 			
-				eV
-				{0} eV
-				{0} eV
+				Elektronenvolt
+				{0} Elektronenvolt
+				{0} Elektronenvolt
 			
 			
-				British thermal units
-				{0} British thermal unit
-				{0} Btu
+				British thermal units
+				{0} British thermal unit
+				{0} British thermal units
+			
+			
+				US thermal units
+				{0} US thermal unit
+				{0} US thermal units
 			
 			
-				lbf
-				Pound-force
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+				Pound-force
+				{0} lbf
 			
 			
 				Gigahertz
@@ -7665,6 +8106,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hertz
 				{0} Hertz
 			
+			
+				Pixel
+				{0} Pixel
+				{0} Pixel
+			
+			
+				Megapixel
+				{0} Megapixel
+				{0} Megapixel
+			
+			
+				Pixel pro Zentimeter
+				{0} Pixel pro Zentimeter
+				{0} Pixel pro Zentimeter
+			
+			
+				Pixel pro Inch
+				{0} Pixel pro Inch
+				{0} Pixel pro Inch
+			
+			
+				Punkte pro Zentimeter
+				{0} Punkt pro Zentimeter
+				{0} Punkte pro Zentimeter
+			
+			
+				Punkte pro Inch
+				{0} Punkt pro Inch
+				{0} Punkte pro Inch
+			
 			
 				Kilometer
 				{0} Kilometer
@@ -7742,8 +8213,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Astronomische Einheiten
-				{0} AE
-				{0} AE
+				{0} Astronomische Einheit
+				{0} Astronomische Einheiten
 			
 			
 				Furlong
@@ -7771,20 +8242,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Punkte
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
+				Sonnenradius
+				{0} Sonnenradius
+				{0} Sonnenradien
 			
 			
 				Lux
 				{0} Lux
 				{0} Lux
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				Tonnen
 				{0} Tonne
@@ -7845,19 +8311,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Karat
 			
 			
-				atomare Masseneinheit
-				{0} Dalton
-				{0} Da
+				Dalton
+				{0} Dalton
+				{0} Dalton
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				Erdmasse
+				{0} Erdmasse
+				{0} Erdmasse
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
+				Sonnenmasse
+				{0} Sonnenmasse
+				{0} Sonnenmasse
 			
 			
 				Gigawatt
@@ -7889,11 +8355,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Pferdestärke
 				{0} Pferdestärken
 			
-			
-				Hektopascal
-				{0} Hektopascal
-				{0} Hektopascal
-			
 			
 				Millimeter Quecksilbersäule
 				{0} Millimeter Quecksilbersäule
@@ -7909,25 +8370,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Zoll Quecksilbersäule
 				{0} Zoll Quecksilbersäule
 			
+			
+				Bar
+				{0} Bar
+				{0} Bar
+			
 			
 				Millibar
 				{0} Millibar
 				{0} Millibar
 			
 			
-				Atmosphären
-				{0} Atmosphäre
-				{0} Atmosphären
+				Atmosphären
+				{0} Atmosphäre
+				{0} Atmosphären
+			
+			
+				Pascal
+				{0} Pascal
+				{0} Pascal
+			
+			
+				Hektopascal
+				{0} Hektopascal
+				{0} Hektopascal
 			
 			
-				kPa
-				{0} kPa
-				{0} kPa
+				Kilopascal
+				{0} Kilopascal
+				{0} Kilopascal
 			
 			
-				MPa
-				{0} MPa
-				{0} MPa
+				Megapascal
+				{0} Megapascal
+				{0} Megapascal
 			
 			
 				Kilometer pro Stunde
@@ -7969,16 +8445,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Kelvin
 				{0} Kelvin
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				Kubikkilometer
 				{0} Kubikkilometer
@@ -8100,9 +8566,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Flüssigunzen
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				Imp. Flüssigunzen
+				{0} Imp. Flüssigunze
+				{0} Imp. Flüssigunzen
 			
 			
 				Esslöffel
@@ -8115,9 +8581,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Teelöffel
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
+				Barrel
+				{0} Barrel
+				{0} Barrel
 			
 			
 				Himmelsrichtung
@@ -8162,13 +8628,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Hektar
 			
+			
+				mi²
+				{0} mi²
+				{0} mi²
+				{0}/mi²
+			
 			
 				Acres
+				{0} ac
+				{0} ac
+			
+			
+				yd²
+				{0} yd²
+				{0} yd²
+			
+			
+				ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				in²
+				{0} in²
+				{0} in²
+				{0}/in²
 			
 			
-				Dunams
-				{0} Dunam
-				{0} Dunam
+				Dunams
+				{0} Dunam
+				{0} Dunam
 			
 			
 				Karat
@@ -8199,16 +8689,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 				{0} ‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				l/km
 				{0} l/km
@@ -8284,6 +8764,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Jh.
 				{0} Jh.
 			
+			
+				Jz.
+				{0} Jz.
+				{0} Jz.
+			
 			
 				J
 				{0} J
@@ -8323,6 +8808,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Sek.
 				{0} Sek.
 			
+			
+				μs
+				{0} μs
+				{0} μs
+			
+			
+				{0} ns
+				{0} ns
+			
 			
 				Ampere
 			
@@ -8332,6 +8826,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Volt
 			
+			
+				kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+				{0} cal
+			
 			
 				kcal
 				{0} kcal
@@ -8339,35 +8843,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Kilojoule
+				{0} kJ
+				{0} kJ
 			
 			
 				Joule
 				{0} J
 				{0} J
 			
-			
-				eV
-				{0} eV
-				{0} eV
+			
+				kWh
+				{0} kWh
+				{0} kWh
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+			
+				MHz
 			
 			
 				Meter
 			
+			
+				mm
+				{0} mm
+				{0} mm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+			
 			
 				Pikometer
 			
@@ -8381,16 +8885,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fuß
 			
 			
-				Zoll
-				{0} Zoll
-				{0} Zoll
-				{0}/Zoll
+				{0} in
+				{0} in
 			
 			
-				Parsec
+				{0} pc
+				{0} pc
 			
 			
-				Lichtjahre
+				Lj
 				{0} Lj
 				{0} Lj
 			
@@ -8401,6 +8904,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Furlong
+				{0} fur
+				{0} fur
 			
 			
 				Faden
@@ -8412,35 +8917,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sm
 				{0} sm
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				Lux
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				Gramm
 			
-			
-				Tons
-			
 			
 				Stones
-			
-			
-				Pfund
-			
-			
-				Unzen
+				{0} st
+				{0} st
 			
 			
 				oz.tr.
@@ -8448,38 +8936,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} oz.tr.
 			
 			
-				Karat
+				Kt
 				{0} Kt
 				{0} Kt
 			
-			
-				Da
-				{0} Da
-				{0} Da
+			
+				GW
+				{0} GW
+				{0} GW
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+			
+				MW
+				{0} MW
+				{0} MW
 			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+			
+				{0} kW
+				{0} kW
 			
 			
 				Watt
+				{0} W
+				{0} W
 			
 			
-				Pferdestärken
+				PS
 				{0} PS
 				{0} PS
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8500,15 +8984,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				atm
+				{0} atm
+				{0} atm
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
+			
+				kn
 			
 			
 				°
@@ -8530,15 +9017,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+			
+				cm³
+				{0} cm³
+				{0} cm³
+				{0}/cm³
 			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+			
+				mi³
+				{0} mi³
+				{0} mi³
+			
+			
+				yd³
+				{0} yd³
+				{0} yd³
+			
+			
+				ft³
+				{0} ft³
+				{0} ft³
+			
+			
+				in³
+				{0} in³
+				{0} in³
 			
 			
 				Ml
@@ -8568,9 +9071,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
-			
-				metr. Pints
-			
 			
 				Acre-Feet
 				{0} ac ft
@@ -8578,6 +9078,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Bushel
+				{0} bu
+				{0} bu
 			
 			
 				gal
@@ -8591,10 +9093,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pro Imp. gal
 			
 			
-				Quart
-			
-			
-				Pints
+				{0} qt
+				{0} qt
 			
 			
 				Cups
@@ -8606,11 +9106,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				EL
 				{0} EL
@@ -8621,13 +9116,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} TL
 				{0} TL
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-			
 			
-				Richtung
+				Richtung
 				{0} O
 				{0} N
 				{0} S
@@ -8640,12 +9130,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				g-Kraft
+				{0} G
+				{0} G
+			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
 			
 			
 				rad
 				{0} rad
 				{0} rad
 			
+			
+				{0}°
+				{0}°
+			
+			
+				{0}′
+				{0}′
+			
+			
+				{0}″
+				{0}″
+			
+			
+				{0} km²
+				{0} km²
+			
+			
+				{0} ha
+				{0} ha
+			
+			
+				{0} m²
+				{0} m²
+			
+			
+				{0} cm²
+				{0} cm²
+			
+			
+				{0} mi²
+				{0} mi²
+			
+			
+				{0} ac
+				{0} ac
+			
+			
+				{0} yd²
+				{0} yd²
+			
+			
+				{0} ft²
+				{0} ft²
+			
+			
+				{0} in²
+				{0} in²
+			
 			
 				{0} kt
 				{0} kt
@@ -8679,6 +9224,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg
 				{0} mpg
 			
+			
+				{0} TB
+				{0} TB
+			
+			
+				{0} Tb
+				{0} Tb
+			
 			
 				{0} GB
 				{0} GB
@@ -8687,6 +9240,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Gb
 				{0} Gb
 			
+			
+				{0} MB
+				{0} MB
+			
+			
+				{0} Mb
+				{0} Mb
+			
+			
+				{0} kB
+				{0} kB
+			
+			
+				{0} kb
+				{0} kb
+			
 			
 				{0} Byte
 				{0} Bytes
@@ -8728,25 +9297,128 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Std.
 				{0} Std.
 				{0} Std.
+				{0}/h
 			
 			
 				Min.
 				{0} Min.
 				{0} Min.
+				{0}/min
 			
 			
 				Sek.
+				{0}/s
+			
+			
+				μs
+				{0} μs
+				{0} μs
+			
+			
+				{0} ns
+				{0} ns
+			
+			
+				{0} A
+				{0} A
+			
+			
+				{0} mA
+				{0} mA
+			
+			
+				{0} Ω
+				{0} Ω
+			
+			
+				{0} V
+				{0} V
+			
+			
+				{0} kcal
+				{0} kcal
+			
+			
+				{0} cal
+				{0} cal
 			
 			
 				{0} kcal
 				{0} kcal
 			
+			
+				{0} kJ
+				{0} kJ
+			
 			
 				{0} J
 				{0} J
 			
+			
+				{0} kWh
+				{0} kWh
+			
+			
+				{0} GHz
+				{0} GHz
+			
+			
+				{0} MHz
+				{0} MHz
+			
+			
+				{0} kHz
+				{0} kHz
+			
+			
+				{0} Hz
+				{0} Hz
+			
+			
+				{0}/km
+			
 			
 				Meter
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
+			
+			
+				{0}/cm
+			
+			
+				µm
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+			
+			
+				{0} pm
+				{0} pm
+			
+			
+				{0} mi
+				{0} mi
+			
+			
+				{0} yd
+				{0} yd
+			
+			
+				{0} ft
+				{0} ft
+				{0}/ft
+			
+			
+				{0} pc
+				{0} pc
 			
 			
 				{0} ly
@@ -8758,6 +9430,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Furlong
+				{0} fur
+				{0} fur
 			
 			
 				Faden
@@ -8768,20 +9442,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sm
 				{0} sm
 			
+			
+				smi
+				{0} smi
+				{0} smi
+			
+			
+				{0} lx
+				{0} lx
+			
+			
+				t
+				{0} t
+				{0} t
+			
+			
+				{0}/kg
+			
 			
 				Gramm
+				{0}/g
+			
+			
+				mg
+				{0} mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
+				{0} µg
 			
 			
 				Tons
+				{0} tn
+				{0} tn
 			
 			
 				Stones
+				{0} st
+				{0} st
 			
 			
 				Pfund
+				{0} lb
+				{0} lb
+				{0}/lb
 			
 			
 				Unzen
+				{0} oz
+				{0} oz
+				{0}/oz
 			
 			
 				oz.tr.
@@ -8793,21 +9505,119 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Kt
 				{0} Kt
 			
+			
+				{0} GW
+				{0} GW
+			
+			
+				{0} MW
+				{0} MW
+			
+			
+				{0} kW
+				{0} kW
+			
+			
+				{0} W
+				{0} W
+			
+			
+				{0} mW
+				{0} mW
+			
 			
 				{0} PS
 				{0} PS
 			
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+				{0} psi
+			
+			
+				inHg
+				{0} inHg
+				{0} inHg
+			
 			
 				Millibar
+				{0} mbar
+				{0} mbar
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
+			
+				m/s
+				{0} m/s
+				{0} m/s
+			
+			
+				mi/h
+				{0} mi/h
+				{0} mi/h
+			
+			
+				kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
 			
 			
 				°C
 				{0}°
 				{0}°
 			
+			
+				°F
+				{0}°F
+				{0}°F
+			
+			
+				K
+				{0} K
+				{0} K
+			
+			
+				{0} km³
+				{0} km³
+			
+			
+				{0} m³
+				{0} m³
+			
 			
+				{0} cm³
+				{0} cm³
 				{0}/cm³
 			
+			
+				{0} mi³
+				{0} mi³
+			
+			
+				{0} yd³
+				{0} yd³
+			
+			
+				{0} ft³
+				{0} ft³
+			
+			
+				{0} in³
+				{0} in³
+			
 			
 				{0} Ml
 				{0} Ml
@@ -8831,13 +9641,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				{0} ac ft
+				{0} ac ft
+			
 			
 				Bushel
+				{0} bu
+				{0} bu
 			
 			
 				{0} gal
 				{0} gal
 			
+			
+				{0} qt
+				{0} qt
+			
+			
+				{0} pt
+				{0} pt
+			
 			
 				{0} Cup
 				{0} Cups
@@ -8855,7 +9679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} TL
 			
 			
-				NOSW
+				NOSW
 				{0}O
 				{0} N
 				{0} S
@@ -8885,12 +9709,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} oder {1}
 			{0} oder {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} und {1}
-			{0} und {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/de_AT.xml b/make/data/cldr/common/main/de_AT.xml
index 1484a5ffa8f..8b41199d4c3 100644
--- a/make/data/cldr/common/main/de_AT.xml
+++ b/make/data/cldr/common/main/de_AT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -38,7 +38,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		[A Ä B C D E F G H I J K L M N O Ö P Q R S T U Ü V W X Y Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/de_BE.xml b/make/data/cldr/common/main/de_BE.xml
index 5fd049d724f..210a139efd7 100644
--- a/make/data/cldr/common/main/de_BE.xml
+++ b/make/data/cldr/common/main/de_BE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/de_CH.xml b/make/data/cldr/common/main/de_CH.xml
index 9e9ab479c09..a646d3ebf2c 100644
--- a/make/data/cldr/common/main/de_CH.xml
+++ b/make/data/cldr/common/main/de_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -15,18 +15,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			Aceh-Sprache
 			Acholi-Sprache
+			Modernes Hocharabisch
 			Nadschd-Arabisch
 			Basaa-Sprache
 			Weissrussisch
 			Bikol-Sprache
 			Bini-Sprache
 			Chibcha-Sprache
+			Schweizer Hochdeutsch
 			Dinka-Sprache
 			Pangwe-Sprache
 			Gbaya-Sprache
 			Kimbundu-Sprache
 			Muskogee-Sprache
+			Flämisch
 			Altpreussisch
+			Chinesisch (vereinfacht)
+			Chinesisch (traditionell)
 		
 		
 			Brunei
@@ -40,8 +45,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Zimbabwe
 		
 		
-			Sortierung nach Gross- bzw. Kleinbuchstaben
-			Sortierung nach Gross- oder Kleinschreibung
+			Sortierung nach Gross- bzw. Kleinbuchstaben
+			Sortierung nach Gross- oder Kleinschreibung
 			Mass-System
 		
 		
@@ -54,7 +59,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		[a ä b c d e f g h i j k l m n o ö p q r s t u ü v w x y z]
-		[\- . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		
 			['ʼ՚᾽᾿’＇]
 		
@@ -81,10 +86,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Epoche
 			
-			
-				letztes Quartal
-				dieses Quartal
-			
 			
 				Woche im Monat
 			
@@ -162,11 +163,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Weissrussischer Rubel (2000–2016)
 				Weissrussische Rubel (2000–2016)
 			
-			
-				CHF
-			
 			
-				EUR
+				EUR
 				EUR
 			
 			
@@ -174,16 +172,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				São-toméischer Dobra (2018)
 				São-toméischer Dobra (2018)
 			
-			
-				Venezolanischer Bolívar
-				Venezolanischer Bolívar
-				Venezolanische Bolívares
-			
-			
-				VES
-				VES
-				VES
-			
 		
 	
 	
@@ -231,9 +219,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		Schaugrösse
 		Plakatgrösse
 		Ferngrösse
-		ultralight
 		medium
-		demibold
-		heavy
 	
 
diff --git a/make/data/cldr/common/main/de_DE.xml b/make/data/cldr/common/main/de_DE.xml
index d2b0762b700..598236a4a9d 100644
--- a/make/data/cldr/common/main/de_DE.xml
+++ b/make/data/cldr/common/main/de_DE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/de_IT.xml b/make/data/cldr/common/main/de_IT.xml
index a59dccea593..3823a13cab5 100644
--- a/make/data/cldr/common/main/de_IT.xml
+++ b/make/data/cldr/common/main/de_IT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/de_LI.xml b/make/data/cldr/common/main/de_LI.xml
index ddca64896ba..b5da8f7828f 100644
--- a/make/data/cldr/common/main/de_LI.xml
+++ b/make/data/cldr/common/main/de_LI.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\- . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/de_LU.xml b/make/data/cldr/common/main/de_LU.xml
index bdf42f0d3e1..a5705707b0f 100644
--- a/make/data/cldr/common/main/de_LU.xml
+++ b/make/data/cldr/common/main/de_LU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/dje.xml b/make/data/cldr/common/main/dje.xml
index 12c5dee12eb..714063ebfa6 100644
--- a/make/data/cldr/common/main/dje.xml
+++ b/make/data/cldr/common/main/dje.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldovi
 			Madagascar
 			Maršal gungey
-			Maacedooni
 			Maali
 			Maynamar
 			Mongooli
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]
 		[v]
 		[A B C D E F G H I J K L M N Ɲ Ŋ O P Q R S T U W X Y Z]
-		[  \- . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/dje_NE.xml b/make/data/cldr/common/main/dje_NE.xml
index 26bfdce4f8f..a6b58d68e8b 100644
--- a/make/data/cldr/common/main/dje_NE.xml
+++ b/make/data/cldr/common/main/dje_NE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/dsb.xml b/make/data/cldr/common/main/dsb.xml
index 21ee5d50b79..527d7cb5ba0 100644
--- a/make/data/cldr/common/main/dsb.xml
+++ b/make/data/cldr/common/main/dsb.xml
@@ -10,7 +10,7 @@ terms of use, see http://www.unicode.org/copyright.html
 -->
 
 	
-		
+		
 		
 	
 	
@@ -516,8 +516,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			St. Martin
 			Madagaskar
 			Marshallowe kupy
-			Makedońska
-			Makedońska (PRJ)
 			Mali
 			Myanmar
 			Mongolska
@@ -710,8 +708,8 @@ terms of use, see http://www.unicode.org/copyright.html
 		[a b c č ć d e ě f g h {ch} i j k ł l m n ń o ó p q r ŕ s š ś t u v w x y z ž ź]
 		[á à ă â å ä ã ą ā æ ç ď đ é è ĕ ê ë ė ę ē ğ í ì ĭ î ï İ ī ı ĺ ľ ň ñ ò ŏ ô ö ő ø ō œ ř ş ß ť ú ù ŭ û ů ü ű ū ý ÿ ż]
 		[A B C Č Ć D E F G H {Ch} I J K Ł L M N O P Q R S Š Ś T U V W X Y Z Ž Ź]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 	
 	
 		„
@@ -5195,13 +5193,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} kónjece mócy
 				{0} kónjecych mócow
 			
-			
-				hektopascale
-				{0} hektopascal
-				{0} hektopascala
-				{0} hektopascale
-				{0} hektopascalow
-			
 			
 				milimetry słupika žywego slobra
 				{0} milimeter słupika žywego slobra
@@ -5230,6 +5221,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} milibary
 				{0} milibarow
 			
+			
+				hektopascale
+				{0} hektopascal
+				{0} hektopascala
+				{0} hektopascale
+				{0} hektopascalow
+			
 			
 				kilometry na góźinu
 				{0} kilometer na góźinu
@@ -6018,13 +6016,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} PS
 				{0} PS
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6053,6 +6044,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -6468,12 +6466,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} PS
 				{0} PS
 			
-			
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -6486,6 +6478,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
diff --git a/make/data/cldr/common/main/dsb_DE.xml b/make/data/cldr/common/main/dsb_DE.xml
index 00e85e4c09f..48f3984cf70 100644
--- a/make/data/cldr/common/main/dsb_DE.xml
+++ b/make/data/cldr/common/main/dsb_DE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/dua.xml b/make/data/cldr/common/main/dua.xml
index 13a3e681111..f8e479c4653 100644
--- a/make/data/cldr/common/main/dua.xml
+++ b/make/data/cldr/common/main/dua.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -22,7 +22,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á b ɓ c d ɗ e é ɛ {ɛ\u0301} f g i í j k l m n {ny} ŋ o ó ɔ {ɔ\u0301} p r s t u ú ū w y]
 		[h q v x z]
 		[A B Ɓ C D Ɗ E Ɛ F G I J K L M N Ŋ O Ɔ P S T U W Y]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/dua_CM.xml b/make/data/cldr/common/main/dua_CM.xml
index 43ebcbe0248..172d270ef92 100644
--- a/make/data/cldr/common/main/dua_CM.xml
+++ b/make/data/cldr/common/main/dua_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/dyo.xml b/make/data/cldr/common/main/dyo.xml
index 9ad84ce84fc..270bf4f1ae4 100644
--- a/make/data/cldr/common/main/dyo.xml
+++ b/make/data/cldr/common/main/dyo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -173,7 +173,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á b c d e é f g h i í j k l m n ñ ŋ o ó p q r s t u ú v w x y]
 		[z]
 		[A B C D E F G H I J K L M N Ñ Ŋ O P Q R S T U V W X Y]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/dyo_SN.xml b/make/data/cldr/common/main/dyo_SN.xml
index 32aa4cac470..cca0607303b 100644
--- a/make/data/cldr/common/main/dyo_SN.xml
+++ b/make/data/cldr/common/main/dyo_SN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/dz.xml b/make/data/cldr/common/main/dz.xml
index 290ccfaffd5..fead92c47b9 100644
--- a/make/data/cldr/common/main/dz.xml
+++ b/make/data/cldr/common/main/dz.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -390,8 +390,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			སེནཊ་ མཱར་ཊིན
 			མ་དཱ་གེས་ཀར
 			མར་ཤེལ་གླིང་ཚོམ
-			མ་སེ་ཌོ་ནི་ཡ
-			མ་སེ་ཌོ་ནི་ཡ་ (ཡུ་གོ་སླཱ་བི་ཡ)
 			མཱ་ལི
 			མི་ཡཱན་མར་ (བྷར་མ)
 			སོག་པོ་ཡུལ
@@ -565,8 +563,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ \u0F72 \u0F74 \u0F7A \u0F7C \u0F90 \u0F91 \u0F92 \u0F94 \u0F97 \u0F99 \u0F9F \u0FA0 \u0FA1 \u0FA3 \u0FA4 \u0FA5 \u0FA6 \u0FA8 \u0FA9 \u0FAA \u0FAB \u0FAD \u0FB1 \u0FB2 \u0FB3 \u0FB5 \u0FB6 \u0FB7]
 		[\u0F84 ཊ ཋ ཌ ཎ \u0F7E ཥ \u0F80 \u0F7B \u0F7D \u0F9A \u0F9B \u0F9C \u0F9E \u0FBA \u0FBB \u0FBC]
 		[ཀ ཁ ག ང ཅ ཆ ཇ ཉ ཏ ཐ ད ན པ ཕ བ མ ཙ ཚ ཛ ཝ ཞ ཟ འ ཡ ར ལ ཤ ས ཧ ཨ]
-		[\- , . % ‰ + 0༠ 1༡ 2༢ 3༣ 4༤ 5༥ 6༦ 7༧ 8༨ 9༩]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] ༼ ༽ § @ * / \& # † ‡ ༄ ༅ ༆ ༈ ༉ ༊ ࿐ ࿑ ༒ ࿒ ࿓ ࿔ ༶ ྾ ྿ ༌ ། ༎ ༏ ༐ ༑ ༔ ༴]
+		[\- ‑ , . % ‰ + 0༠ 1༡ 2༢ 3༣ 4༤ 5༥ 6༦ 7༧ 8༨ 9༩]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] ༼ ༽ § @ * / \& # † ‡ ༄ ༅ ༆ ༈ ༉ ༊ ࿐ ࿑ ༒ ࿒ ࿓ ࿔ ༶ ྾ ྿ ༌ ། ༎ ༏ ༐ ༑ ༔ ༴]
 		{0}་་་་
 		་་་་{0}
 		{0}་་་་་་ {1}
diff --git a/make/data/cldr/common/main/dz_BT.xml b/make/data/cldr/common/main/dz_BT.xml
index cc6a23cbacc..9a64f5b105d 100644
--- a/make/data/cldr/common/main/dz_BT.xml
+++ b/make/data/cldr/common/main/dz_BT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ebu.xml b/make/data/cldr/common/main/ebu.xml
index 79f50f58dbf..60b47fa684c 100644
--- a/make/data/cldr/common/main/ebu.xml
+++ b/make/data/cldr/common/main/ebu.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/ebu_KE.xml b/make/data/cldr/common/main/ebu_KE.xml
index 45e18c712fb..3f4451eb2f2 100644
--- a/make/data/cldr/common/main/ebu_KE.xml
+++ b/make/data/cldr/common/main/ebu_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ee.xml b/make/data/cldr/common/main/ee.xml
index 18b6f7ca2ca..0a79f694aaa 100644
--- a/make/data/cldr/common/main/ee.xml
+++ b/make/data/cldr/common/main/ee.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -74,9 +74,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Yevugbe (Australia)
 			Yevugbe (Canada)
 			Yevugbe (Britain)
-			Yevugbe (GB)
 			Yevugbe (America)
-			Yevugbe (US)
 			esperantogbe
 			Spanishgbe
 			Spanishgbe (Latin America)
@@ -600,8 +598,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Saint Martin nutome
 			Madagaska nutome
 			Marshal ƒudomekpowo nutome
-			Makedonia nutome
-			Makedonia (FYROM) nutome
 			Mali nutome
 			Myanmar (Burma) nutome
 			Mongolia nutome
@@ -818,8 +814,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à ã b d ɖ e é è ẽ ɛ {ɛ\u0301} {ɛ\u0300} {ɛ\u0303} f ƒ g ɣ h x i í ì ĩ k l m n ŋ o ó ò õ ɔ {ɔ\u0301} {ɔ\u0300} {ɔ\u0303} p r s t u ú ù ũ v ʋ w y z]
 		[ă â å ä ā æ c ç ĕ ê ë ĭ î ï j ñ ŏ ô ö ø œ q ŭ û ü ÿ]
 		[A B D Ɖ E Ɛ F Ƒ G Ɣ H X I K L M N Ŋ O Ɔ P R S T U V Ʋ W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] \{ \} § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] \{ \} § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -5169,7 +5165,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ethiopiaga birr
 			
 			
-				EUR
 				euro
 				euro
 				€
diff --git a/make/data/cldr/common/main/ee_GH.xml b/make/data/cldr/common/main/ee_GH.xml
index 7a065e1cf02..437bbc6c813 100644
--- a/make/data/cldr/common/main/ee_GH.xml
+++ b/make/data/cldr/common/main/ee_GH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ee_TG.xml b/make/data/cldr/common/main/ee_TG.xml
index 5a44d176f99..97b15875a97 100644
--- a/make/data/cldr/common/main/ee_TG.xml
+++ b/make/data/cldr/common/main/ee_TG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/el.xml b/make/data/cldr/common/main/el.xml
index 3d1807b3dc2..53a9abdb194 100644
--- a/make/data/cldr/common/main/el.xml
+++ b/make/data/cldr/common/main/el.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -90,7 +90,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Καρίμπ
 			Καγιούγκα
 			Ατσάμ
-			Τσάκμα
+			Τσάκμα
 			Τσετσενικά
 			Σεμπουάνο
 			Τσίγκα
@@ -540,14 +540,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Γίντις
 			Γιορούμπα
 			Καντονέζικα
+			Κινεζικά, Καντονέζικα
 			Ζουάνγκ
 			Ζάποτεκ
 			Σύμβολα Bliss
 			Ζενάγκα
 			Τυπικά Ταμαζίτ Μαρόκου
 			Κινεζικά
+			Κινεζικά, Μανδαρινικά
 			Απλοποιημένα Κινεζικά
+			Απλοποιημένα Μανδαρινικά Κινεζικά
 			Παραδοσιακά Κινεζικά
+			Παραδοσιακά Μανδαρινικά Κινεζικά
 			Ζουλού
 			Ζούνι
 			Χωρίς γλωσσολογικό περιεχόμενο
@@ -770,6 +774,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Κονγκό (Δημοκρατία)
 			Ελβετία
 			Ακτή Ελεφαντοστού
+			Ακτή Ελεφαντοστού
 			Νήσοι Κουκ
 			Χιλή
 			Καμερούν
@@ -952,6 +957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Άγιος Μαρτίνος (Ολλανδικό τμήμα)
 			Συρία
 			Σουαζιλάνδη
+			Σουαζιλάνδη
 			Τριστάν ντα Κούνια
 			Νήσοι Τερκς και Κάικος
 			Τσαντ
@@ -988,8 +994,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Βανουάτου
 			Γουάλις και Φουτούνα
 			Σαμόα
-			Ψευδο-προφορές
-			Ψευδο-αμφικατευθυντικό
+			Ψευδο-προφορές
+			Ψευδο-αμφικατευθυντικό
 			Κοσσυφοπέδιο
 			Υεμένη
 			Μαγιότ
@@ -1036,22 +1042,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Ημερολόγιο
 			Μορφή νομίσματος
-			Ταξινόμηση με αγνόηση συμβόλων
-			Ταξινόμηση με αντεστραμμένο τονισμό
-			Ταξινόμηση με κεφαλαίους/πεζούς χαρακτήρες
-			Ταξινόμηση με διάκριση χαρακτήρων
+			Ταξινόμηση με αγνόηση συμβόλων
+			Ταξινόμηση με αντεστραμμένο τονισμό
+			Ταξινόμηση με κεφαλαίους/πεζούς χαρακτήρες
+			Ταξινόμηση με διάκριση χαρακτήρων
 			Σειρά ταξινόμησης
-			Κανονικοποιημένη ταξινόμηση
-			Αριθμητική ταξινόμηση
-			Ισχύς ταξινόμησης
+			Κανονικοποιημένη ταξινόμηση
+			Αριθμητική ταξινόμηση
+			Ισχύς ταξινόμησης
 			Νόμισμα
 			Κύκλος ωρών (12 ή 24)
 			Στιλ αλλαγής γραμμών
 			Σύστημα μέτρησης
 			Αριθμοί
-			Ζώνη ώρας
-			Παραλλαγή τοπικών ρυθμίσεων
-			Προσωπική χρήση
+			Ζώνη ώρας
+			Παραλλαγή τοπικών ρυθμίσεων
+			Ιδιωτική χρήση
 		
 		
 			Βουδιστικό ημερολόγιο
@@ -1185,8 +1191,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[α ά β γ δ ε έ ζ η ή θ ι ί ϊ ΐ κ λ μ ν ξ ο ό π ρ σ ς τ υ ύ ϋ ΰ φ χ ψ ω ώ]
 		[ἀ ἄ ἂ ἆ ἁ ἅ ἃ ἇ ὰ ᾶ ἐ ἔ ἒ ἑ ἕ ἓ ὲ ἠ ἤ ἢ ἦ ἡ ἥ ἣ ἧ ὴ ῆ ἰ ἴ ἲ ἶ ἱ ἵ ἳ ἷ ὶ ῖ ῒ ῗ ὄ ὂ ὃ ὸ ὐ ὔ ὒ ὖ ὑ ὕ ὓ ὗ ὺ ῦ ῢ ῧ ὤ ὢ ὦ ὥ ὣ ὧ ὼ ῶ]
 		[Α Β Γ Δ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο Π Ρ Σ Τ Υ Φ Χ Ψ Ω]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! . … " « » ( ) \[ \] § @ * / \\ \&]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! . … " « » ( ) \[ \] § @ * / \\ \&]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1195,19 +1201,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		;
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1274,13 +1284,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E, d MMM y G
+						L
 						d/M
 						E, d/M
+						LLL
 						d MMM
 						E, d MMM
 						d MMMM
@@ -1294,9 +1308,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d MMM y G
 						E, d MMM y G
 						MMMM y G
+						G y QQQ
+						G y QQQQ
 					
 					
 						{0} - {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -1424,6 +1475,102 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
+			
+			
+				
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
+				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1889,10 +2036,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							π.μ.
 							μ.μ.
-							πρωί
-							μεσημέρι
-							απόγευμα
-							βράδυ
+							το πρωί
+							το μεσημέρι
+							το απόγευμα
+							το βράδυ
 						
 					
 					
@@ -2270,8 +2417,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
+				
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+				
 				
 					
 						Σάκα
@@ -2285,6 +2505,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+				
 				
 					
 						Ε.Ε.
@@ -2346,16 +2628,94 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
+			
 			
 				
 					
 						προ R.O.C.
+						R.O.C.
 					
 					
 						προ R.O.C.
+						R.O.C.
 					
 					
 						προ R.O.C.
+						R.O.C.
 					
 				
 			
@@ -2481,6 +2841,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				μήν.
+				προηγ. μήνας
+				τρέχ. μήνας
+				επόμ. μήνας
 				
 					σε {0} μ.
 					σε {0} μ.
@@ -2507,6 +2870,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				εβδ.
+				προηγ. εβδομάδα
+				τρέχ. εβδομάδα
+				επόμ. εβδομάδα
 				
 					σε {0} εβδ.
 					σε {0} εβδ.
@@ -2519,6 +2885,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				εβδ.
+				προηγ. εβδ.
+				τρέχ. εβδ.
+				επόμ. εβδ.
 				
 					σε {0} εβδ.
 					σε {0} εβδ.
@@ -3308,7 +3677,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κέμπριτζ Μπέι
 			
 			
-				Ρετζίνα
+				Ρετζάινα
 			
 			
 				Γουίνιπεγκ
@@ -3683,7 +4052,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Οράλ
 			
 			
-				Aτιράου
+				Ατιράου
 			
 			
 				Ακτόμπε
@@ -4148,7 +4517,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ταϊπέι
 			
 			
-				Νταρ Ες Σαλάμ
+				Νταρ ες Σαλάμ
 			
 			
 				Ούζχοροντ
@@ -4181,7 +4550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Άνκορατζ
 			
 			
-				Γιακούτατ
+				Γιάκουτατ
 			
 			
 				Σίτκα
@@ -5037,7 +5406,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Ώρα Νήσων Φoίνιξ
+					Ώρα Νήσων Φοίνιξ
 				
 			
 			
@@ -5241,7 +5610,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
+			latn
 			grek
 		
 		1
@@ -5250,6 +5621,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			e
 			×
 			‰
@@ -5258,6 +5631,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 χιλιάδα
@@ -5379,6 +5757,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ντιράμ Ηνωμένων Αραβικών Εμιράτων
 				ντιράμ Ηνωμένων Αραβικών Εμιράτων
 				ντιράμ Ηνωμένων Αραβικών Εμιράτων
+				AED
 			
 			
 				Αφγανί Αφγανιστάν (1927–2002)
@@ -5389,6 +5768,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Αφγάνι Αφγανιστάν
 				αφγάνι Αφγανιστάν
 				αφγάνια Αφγανιστάν
+				AFN
 			
 			
 				Παλαιό λεκ Αλβανίας
@@ -5398,21 +5778,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λεκ Αλβανίας
 				λεκ Αλβανίας
 				λεκ Αλβανίας
+				ALL
 			
 			
 				Ντραμ Αρμενίας
 				ντραμ Αρμενίας
 				ντραμ Αρμενίας
+				AMD
 			
 			
 				Γκίλντα Ολλανδικών Αντιλλών
 				γκίλντα Ολλανδικών Αντιλλών
 				γκίλντες Ολλανδικών Αντιλλών
+				ANG
 			
 			
 				Κουάνζα Ανγκόλας
 				κουάνζα Ανγκόλας
 				κουάνζα Ανγκόλας
+				AOA
 				Kz
 			
 			
@@ -5443,6 +5827,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Πέσο Αργεντινής
 				πέσο Αργεντινής
 				πέσο Αργεντινής
+				ARS
 				$
 			
 			
@@ -5454,12 +5839,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Αυστραλίας
 				δολάριο Αυστραλίας
 				δολάρια Αυστραλίας
+				A$
 				$
 			
 			
 				Φλορίνι Αρούμπας
 				φλορίνι Αρούμπας
 				φλορίνια Αρούμπας
+				AWG
 			
 			
 				Μανάτ Αζερμπαϊτζάν (1993–2006)
@@ -5470,6 +5857,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μανάτ Αζερμπαϊτζάν
 				μανάτ Αζερμπαϊτζάν
 				μανάτ Αζερμπαϊτζάν
+				AZN
 			
 			
 				Δηνάριο Βοσνίας-Ερζεγοβίνης
@@ -5480,6 +5868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μετατρέψιμο Μάρκο Βοσνίας-Ερζεγοβίνης
 				μετατρέψιμο μάρκο Βοσνίας-Ερζεγοβίνης
 				μετατρέψιμα μάρκα Βοσνίας-Ερζεγοβίνης
+				BAM
 				KM
 			
 			
@@ -5490,12 +5879,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Μπαρμπέιντος
 				δολάριο Μπαρμπέιντος
 				δολάρια Μπαρμπέιντος
+				BBD
 				$
 			
 			
 				Τάκα Μπαγκλαντές
 				τάκα Μπαγκλαντές
 				τάκα Μπαγκλαντές
+				BDT
 				৳
 			
 			
@@ -5526,6 +5917,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λεβ Βουλγαρίας
 				λεβ Βουλγαρίας
 				λεβ Βουλγαρίας
+				BGN
 			
 			
 				Παλαιό λεβ Βουλγαρίας
@@ -5535,28 +5927,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δηνάριο Μπαχρέιν
 				δηνάριο Μπαχρέιν
 				δηνάρια Μπαχρέιν
+				BHD
 			
 			
 				Φράγκο Μπουρούντι
 				φράγκο Μπουρούντι
 				φράγκα Μπουρούντι
+				BIF
 			
 			
 				Δολάριο Βερμούδων
 				δολάριο Βερμούδων
 				δολάρια Βερμούδων
+				BMD
 				$
 			
 			
 				Δολάριο Μπρουνέι
 				δολάριο Μπρουνέι
 				δολάρια Μπρουνέι
+				BND
 				$
 			
 			
 				Μπολιβιάνο Βολιβίας
 				μπολιβιάνο Βολιβίας
 				μπολιβιάνο Βολιβίας
+				BOB
 				Bs
 			
 			
@@ -5592,6 +5989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ρεάλ Βραζιλίας
 				ρεάλ Βραζιλίας
 				ρεάλ Βραζιλίας
+				R$
 				R$
 			
 			
@@ -5612,12 +6010,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Μπαχαμών
 				δολάριο Μπαχαμών
 				δολάρια Μπαχαμών
+				BSD
 				$
 			
 			
 				Νγκούλτρουμ Μπουτάν
 				νγκούλτρουμ Μπουτάν
 				νγκούλτρουμ Μπουτάν
+				BTN
 			
 			
 				Κιατ Βιρμανίας
@@ -5628,6 +6028,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Πούλα Μποτσουάνας
 				πούλα Μποτσουάνας
 				πούλα Μποτσουάνας
+				BWP
 				P
 			
 			
@@ -5639,29 +6040,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ρούβλι Λευκορωσίας
 				ρούβλι Λευκορωσίας
 				ρούβλια Λευκορωσίας
+				BYN
 				р.
 			
 			
 				Ρούβλι Λευκορωσίας (2000–2016)
 				ρούβλι Λευκορωσίας (2000–2016)
 				ρούβλια Λευκορωσίας (2000–2016)
+				BYR
 			
 			
 				Δολάριο Μπελίζ
 				δολάριο Μπελίζ
 				δολάρια Μπελίζ
+				BZD
 				$
 			
 			
 				Δολάριο Καναδά
 				δολάριο Καναδά
 				δολάρια Καναδά
+				CA$
 				$
 			
 			
 				Φράγκο Κονγκό
 				φράγκο Κονγκό
 				φράγκα Κονγκό
+				CDF
 			
 			
 				Ευρώ WIR
@@ -5672,6 +6078,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Φράγκο Ελβετίας
 				φράγκο Ελβετίας
 				φράγκα Ελβετίας
+				CHF
 			
 			
 				Φράγκο WIR
@@ -5692,6 +6099,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Πέσο Χιλής
 				πέσο Χιλής
 				πέσο Χιλής
+				CLP
 				$
 			
 			
@@ -5708,18 +6116,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Γουάν Κίνας
 				γουάν Κίνας
 				γουάν Κίνας
+				CN¥
 				¥
 			
 			
 				Πέσο Κολομβίας
 				πέσο Κολομβίας
 				πέσο Κολομβίας
+				COP
 				$
 			
 			
 				Κολόν Κόστα Ρίκα
 				κολόν Κόστα Ρίκα
 				κολόν Κόστα Ρίκα
+				CRC
 				₡
 			
 			
@@ -5736,18 +6147,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μετατρέψιμο πέσο Κούβας
 				μετατρέψιμο πέσο Κούβας
 				μετατρέψιμα πέσο Κούβας
+				CUC
 				$
 			
 			
 				Πέσο Κούβας
 				πέσο Κούβας
 				πέσο Κούβας
+				CUP
 				$
 			
 			
 				Εσκούδο Πράσινου Ακρωτηρίου
 				εσκούδο Πράσινου Ακρωτηρίου
 				εσκούδο Πράσινου Ακρωτηρίου
+				CVE
 			
 			
 				Λίρα Κύπρου
@@ -5758,6 +6172,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κορόνα Τσεχίας
 				κορόνα Τσεχίας
 				κορόνες Τσεχίας
+				CZK
 				Kč
 			
 			
@@ -5774,23 +6189,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Φράγκο Τζιμπουτί
 				φράγκο Τζιμπουτί
 				φράγκα Τζιμπουτί
+				DJF
 			
 			
 				Κορόνα Δανίας
 				κορόνα Δανίας
 				κορόνες Δανίας
+				DKK
 				kr
 			
 			
 				Πέσο Δομινικανής Δημοκρατίας
 				πέσο Δομινικανής Δημοκρατίας
 				πέσο Δομινικανής Δημοκρατίας
+				DOP
 				$
 			
 			
 				Δηνάριο Αλγερίας
 				δηνάριο Αλγερίας
 				δηνάρια Αλγερίας
+				DZD
 			
 			
 				Σούκρε Εκουαδόρ
@@ -5806,12 +6225,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίρα Αιγύπτου
 				λίρα Αιγύπτου
 				λίρες Αιγύπτου
+				EGP
 				E£
 			
 			
 				Νάκφα Ερυθραίας
 				νάκφα Ερυθραίας
 				νάκφα Ερυθραίας
+				ERN
 			
 			
 				πεσέτα Ισπανίας (λογαριασμός Α)
@@ -5832,11 +6253,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μπιρ Αιθιοπίας
 				μπιρ Αιθιοπίας
 				μπιρ Αιθιοπίας
+				ETB
 			
 			
 				Ευρώ
 				ευρώ
 				ευρώ
+				€
 				€
 			
 			
@@ -5848,12 +6271,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Φίτζι
 				δολάριο Φίτζι
 				δολάρια Φίτζι
+				FJD
 				$
 			
 			
 				Λίρα Νήσων Φόκλαντ
 				λίρα Νήσων Φόκλαντ
 				λίρες Νήσων Φόκλαντ
+				FKP
 				£
 			
 			
@@ -5865,6 +6290,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίρα Στερλίνα Βρετανίας
 				λίρα στερλίνα Βρετανίας
 				λίρες στερλίνες Βρετανίας
+				£
 				£
 			
 			
@@ -5876,6 +6302,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λάρι Γεωργίας
 				λάρι Γεωργίας
 				λάρι Γεωργίας
+				GEL
 				₾
 				₾
 			
@@ -5888,22 +6315,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Σέντι Γκάνας
 				σέντι Γκάνας
 				σέντι Γκάνας
+				GHS
 			
 			
 				Λίρα Γιβραλτάρ
 				λίρα Γιβραλτάρ
 				λίρες Γιβραλτάρ
+				GIP
 				£
 			
 			
 				Νταλάσι Γκάμπιας
 				νταλάσι Γκάμπιας
 				νταλάσι Γκάμπιας
+				GMD
 			
 			
 				Φράγκο Γουινέας
 				φράγκο Γουινέας
 				φράγκα Γουινέας
+				GNF
 				FG
 			
 			
@@ -5929,6 +6360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κουετσάλ Γουατεμάλας
 				κουετσάλ Γουατεμάλας
 				κουετσάλ Γουατεμάλας
+				GTQ
 				Q
 			
 			
@@ -5945,18 +6377,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Γουιάνας
 				δολάριο Γουιάνας
 				δολάρια Γουιάνας
+				GYD
 				$
 			
 			
 				Δολάριο Χονγκ Κονγκ
 				δολάριο Χονγκ Κονγκ
 				δολάρια Χονγκ Κονγκ
+				HK$
 				$
 			
 			
 				Λεμπίρα Ονδούρας
 				λεμπίρα Ονδούρας
 				λεμπίρα Ονδούρας
+				HNL
 				L
 			
 			
@@ -5968,23 +6403,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κούνα Κροατίας
 				κούνα Κροατίας
 				κούνα Κροατίας
+				HRK
 				kn
 			
 			
 				Γκουρντ Αϊτής
 				γκουρντ Αϊτής
 				γκουρντ Αϊτής
+				HTG
 			
 			
 				Φιορίνι Ουγγαρίας
 				φιορίνι Ουγγαρίας
 				φιορίνια Ουγγαρίας
+				HUF
 				Ft
 			
 			
 				Ρουπία Ινδονησίας
 				ρουπία Ινδονησίας
 				ρουπία Ινδονησίας
+				IDR
 				Rp
 			
 			
@@ -6006,23 +6445,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Νέο Σέκελ Ισραήλ
 				νέο σέκελ Ισραήλ
 				νέα σέκελ Ισραήλ
+				₪
 				₪
 			
 			
 				Ρουπία Ινδίας
 				ρουπία Ινδίας
 				ρουπίες Ινδίας
+				₹
 				₹
 			
 			
 				Δηνάριο Ιράκ
 				δηνάριο Ιράκ
 				δηνάρια Ιράκ
+				IQD
 			
 			
 				Ριάλ Ιράν
 				ριάλ Ιράν
 				ριάλ Ιράν
+				IRR
 			
 			
 				Παλιά κορόνα Ισλανδίας
@@ -6033,6 +6476,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κορόνα Ισλανδίας
 				κορόνα Ισλανδίας
 				κορόνες Ισλανδίας
+				ISK
 				kr
 			
 			
@@ -6044,45 +6488,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Τζαμάικας
 				δολάριο Τζαμάικας
 				δολάρια Τζαμάικας
+				JMD
 				$
 			
 			
 				Δηνάριο Ιορδανίας
 				δηνάριο Ιορδανίας
 				δηνάρια Ιορδανίας
+				JOD
 			
 			
 				Γιεν Ιαπωνίας
 				γιεν Ιαπωνίας
 				γιεν Ιαπωνίας
+				JP¥
 				¥
 			
 			
 				Σελίνι Κένυας
 				σελίνι Κένυας
 				σελίνια Κένυας
+				KES
 			
 			
 				Σομ Κιργιζίας
 				σομ Κιργιζίας
 				σομ Κιργιζίας
+				KGS
 			
 			
 				Ρίελ Καμπότζης
 				ρίελ Καμπότζης
 				ρίελ Καμπότζης
+				KHR
 				៛
 			
 			
 				Φράγκο Κομορών
 				φράγκο Κομορών
 				φράγκα Κομορών
+				KMF
 				CF
 			
 			
 				Γουόν Βόρειας Κορέας
 				γουόν Βόρειας Κορέας
 				γουόν Βόρειας Κορέας
+				KPW
 				₩
 			
 			
@@ -6093,47 +6545,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Γουόν Νότιας Κορέας
 				γουόν Νότιας Κορέας
 				γουόν Νότιας Κορέας
+				₩
 				₩
 			
 			
 				Δηνάριο Κουβέιτ
 				δηνάριο Κουβέιτ
 				δηνάρια Κουβέιτ
+				KWD
 			
 			
 				Δολάριο Νήσων Κέιμαν
 				δολάριο Νήσων Κέιμαν
 				δολάρια Νήσων Κέιμαν
+				KYD
 				$
 			
 			
 				Τένγκε Καζακστάν
 				τένγκε Καζακστάν
 				τένγκε Καζακστάν
+				KZT
 				₸
 			
 			
 				Κιπ Λάος
 				κιπ Λάος
 				κιπ Λάος
+				LAK
 				₭
 			
 			
 				Λίρα Λιβάνου
 				λίρα Λιβάνου
 				λίρες Λιβάνου
+				LBP
 				L£
 			
 			
 				Ρουπία Σρι Λάνκα
 				ρουπία Σρι Λάνκα
 				ρουπίες Σρι Λάνκα
+				LKR
 				Rs
 			
 			
 				Δολάριο Λιβερίας
 				δολάριο Λιβερίας
 				δολάρια Λιβερίας
+				LRD
 				$
 			
 			
@@ -6145,6 +6605,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίτα Λιθουανίας
 				λίτα Λιθουανίας
 				λίτα Λιθουανίας
+				LTL
 			
 			
 				Ταλόνας Λιθουανίας
@@ -6166,6 +6627,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λατς Λετονίας
 				λατς Λετονίας
 				λατς Λετονίας
+				LVL
 			
 			
 				Ρούβλι Λετονίας
@@ -6176,11 +6638,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δηνάριο Λιβύης
 				δηνάριο Λιβύης
 				δηνάρια Λιβύης
+				LYD
 			
 			
 				Ντιράμ Μαρόκου
 				ντιράμ Μαρόκου
 				ντιράμ Μαρόκου
+				MAD
 			
 			
 				Φράγκο Μαρόκου
@@ -6199,11 +6663,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λέου Μολδαβίας
 				λέου Μολδαβίας
 				λέου Μολδαβίας
+				MDL
 			
 			
 				Αριάρι Μαδαγασκάρης
 				αριάρι Μαδαγασκάρης
 				αριάρι Μαδαγασκάρης
+				MGA
 				Ar
 			
 			
@@ -6215,6 +6681,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δηνάριο ΠΓΔΜ
 				δηνάριο ΠΓΔΜ
 				δηνάρια ΠΓΔΜ
+				MKD
 			
 			
 				Παλιό δηνάριο ΠΓΔΜ
@@ -6229,23 +6696,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κιάτ Μιανμάρ
 				κιάτ Μιανμάρ
 				κιάτ Μιανμάρ
+				MMK
 				K
 			
 			
 				Τουγκρίκ Μογγολίας
 				τουγκρίκ Μογγολίας
 				τουγκρίκ Μογγολίας
+				MNT
 				₮
 			
 			
 				Πατάκα Μακάο
 				πατάκα Μακάο
 				πατάκα Μακάο
+				MOP
 			
 			
 				Ουγκίγια Μαυριτανίας (1973–2017)
 				ουγκίγια Μαυριτανίας (1973–2017)
 				ουγκίγια Μαυριτανίας (1973–2017)
+				MRO
 			
 			
 				Ουγκίγια Μαυριτανίας
@@ -6267,22 +6738,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ρουπία Μαυρικίου
 				ρουπία Μαυρικίου
 				ρουπίες Μαυρικίου
+				MUR
 				Rs
 			
 			
 				Ρουφίγια Μαλδίβων
 				ρουφίγια Μαλδίβων
 				ρουφίγιες Μαλδίβων
+				MVR
 			
 			
 				Κουάτσα Μαλάουι
 				κουάτσα Μαλάουι
 				κουάτσα Μαλάουι
+				MWK
 			
 			
 				Πέσο Μεξικού
 				πέσο Μεξικού
 				πέσο Μεξικού
+				MX$
 				$
 			
 			
@@ -6294,6 +6769,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ρινγκίτ Μαλαισίας
 				ρινγκίτ Μαλαισίας
 				ρινγκίτ Μαλαισίας
+				MYR
 				RM
 			
 			
@@ -6310,17 +6786,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μετικάλ Μοζαμβίκης
 				μετικάλ Μοζαμβίκης
 				μετικάλ Μοζαμβίκης
+				MZN
 			
 			
 				Δολάριο Ναμίμπιας
 				δολάριο Ναμίμπιας
 				δολάρια Ναμίμπιας
+				NAD
 				$
 			
 			
 				Νάιρα Νιγηρίας
 				νάιρα Νιγηρίας
 				νάιρα Νιγηρίας
+				NGN
 				₦
 			
 			
@@ -6332,6 +6811,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Χρυσή Κόρδοβα Νικαράγουας
 				χρυσή κόρδοβα Νικαράγουας
 				χρυσές κόρδοβα Νικαράγουας
+				NIO
 				C$
 			
 			
@@ -6343,29 +6823,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κορόνα Νορβηγίας
 				κορόνα Νορβηγίας
 				κορόνες Νορβηγίας
+				NOK
 				kr
 			
 			
 				Ρουπία Νεπάλ
 				ρουπία Νεπάλ
 				ρουπίες Νεπάλ
+				NPR
 				Rs
 			
 			
 				Δολάριο Νέας Ζηλανδίας
 				δολάριο Νέας Ζηλανδίας
 				δολάρια Νέας Ζηλανδίας
+				NZ$
 				$
 			
 			
 				Ριάλ Ομάν
 				ριάλ Ομάν
 				ριάλ Ομάν
+				OMR
 			
 			
 				Μπαλμπόα Παναμά
 				μπαλμπόα Παναμά
 				μπαλμπόα Παναμά
+				PAB
 			
 			
 				Ίντι Περού
@@ -6376,6 +6861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Σολ Περού
 				σολ Περού
 				σολ Περού
+				PEN
 			
 			
 				Σολ Περού (1863–1965)
@@ -6386,23 +6872,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κίνα Παπούας Νέας Γουινέας
 				κίνα Παπούας Νέας Γουινέας
 				κίνα Παπούας Νέας Γουινέας
+				PGK
 			
 			
 				Πέσο Φιλιππίνων
 				πέσο Φιλιππίνων
 				πέσο Φιλιππίνων
+				PHP
 				₱
 			
 			
 				Ρουπία Πακιστάν
 				ρουπία Πακιστάν
 				ρουπίες Πακιστάν
+				PKR
 				Rs
 			
 			
 				Ζλότι Πολωνίας
 				ζλότι Πολωνίας
 				ζλότι Πολωνίας
+				PLN
 				zł
 			
 			
@@ -6419,12 +6909,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Γκουαρανί Παραγουάης
 				γκουαρανί Παραγουάης
 				γκουαρανί Παραγουάης
+				PYG
 				₲
 			
 			
 				Ριάλ Κατάρ
 				ριάλ Κατάρ
 				ριάλ Κατάρ
+				QAR
 			
 			
 				Δολάριο Ροδεσίας
@@ -6440,17 +6932,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λέου Ρουμανίας
 				λέου Ρουμανίας
 				λέου Ρουμανίας
+				RON
 				lei
 			
 			
 				Δηνάριο Σερβίας
 				δηνάριο Σερβίας
 				δηνάρια Σερβίας
+				RSD
 			
 			
 				Ρούβλι Ρωσίας
 				ρούβλι Ρωσίας
 				ρούβλια Ρωσίας
+				RUB
 				₽
 			
 			
@@ -6462,23 +6957,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Φράγκο Ρουάντας
 				φράγκο Ρουάντας
 				φράγκα Ρουάντας
+				RWF
 				RF
 			
 			
 				Ριάλ Σαουδικής Αραβίας
 				ριάλ Σαουδικής Αραβίας
 				ριάλ Σαουδικής Αραβίας
+				SAR
 			
 			
 				Δολάριο Νήσων Σολομώντος
 				δολάριο Νήσων Σολομώντος
 				δολάρια Νήσων Σολομώντος
+				SBD
 				$
 			
 			
 				Ρουπία Σεϋχελλών
 				ρουπία Σεϋχελλών
 				ρουπίες Σεϋχελλών
+				SCR
 			
 			
 				Δηνάριο Σουδάν
@@ -6489,6 +6988,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίρα Σουδάν
 				λίρα Σουδάν
 				λίρες Σουδάν
+				SDG
 			
 			
 				Παλαιά Λίρα Σουδάν
@@ -6499,18 +6999,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κορόνα Σουηδίας
 				κορόνα Σουηδίας
 				κορόνες Σουηδίας
+				SEK
 				kr
 			
 			
 				Δολάριο Σιγκαπούρης
 				δολάριο Σιγκαπούρης
 				δολάρια Σιγκαπούρης
+				SGD
 				$
 			
 			
 				Λίρα Αγίας Ελένης
 				λίρα Αγίας Ελένης
 				λίρες Αγίας Ελένης
+				SHP
 				£
 			
 			
@@ -6527,16 +7030,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λεόνε Σιέρα Λεόνε
 				λεόνε Σιέρα Λεόνε
 				λεόνε Σιέρα Λεόνε
+				SLL
 			
 			
 				Σελίνι Σομαλίας
 				σελίνι Σομαλίας
 				σελίνια Σομαλίας
+				SOS
 			
 			
 				Δολάριο Σουρινάμ
 				δολάριο Σουρινάμ
 				δολάρια Σουρινάμ
+				SRD
 				$
 			
 			
@@ -6548,12 +7054,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίρα Νότιου Σουδάν
 				λίρα Νότιου Σουδάν
 				λίρες Νότιου Σουδάν
+				SSP
 				£
 			
 			
 				Ντόμπρα Σάο Τομέ και Πρίνσιπε (1977–2017)
 				ντόμπρα Σάο Τομέ και Πρίνσιπε (1977–2017)
 				ντόμπρα Σάο Τομέ και Πρίνσιπε (1977–2017)
+				STD
 			
 			
 				Ντόμπρα Σάο Τομέ και Πρίνσιπε
@@ -6576,12 +7084,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίρα Συρίας
 				λίρα Συρίας
 				λίρες Συρίας
+				SYP
 				£
 			
 			
 				Λιλανγκένι Σουαζιλάνδης
 				λιλανγκένι Σουαζιλάνδης
 				λιλανγκένι Σουαζιλάνδης
+				SZL
 			
 			
 				Μπατ Ταϊλάνδης
@@ -6599,6 +7109,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Σομόνι Τατζικιστάν
 				σομόνι Τατζικιστάν
 				σομόνι Τατζικιστάν
+				TJS
 			
 			
 				Μανάτ Τουρκμενιστάν
@@ -6609,22 +7120,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μάνατ Τουρκμενιστάν
 				μάνατ Τουρκμενιστάν
 				μάνατ Τουρκμενιστάν
+				TMT
 			
 			
 				Δηνάριο Τυνησίας
 				δηνάριο Τυνησίας
 				δηνάρια Τυνησίας
+				TND
 			
 			
 				Παάγκα Τόνγκα
 				παάγκα Τόνγκα
 				παάγκα Τόνγκα
+				TOP
 				T$
 			
 			
 				Εσκούδο Τιμόρ
 				εσκούδο Τιμόρ
 				εσκούδο Τιμόρ
+				TPE
 			
 			
 				Παλιά Λίρα Τουρκίας
@@ -6635,6 +7150,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Λίρα Τουρκίας
 				λίρα Τουρκίας
 				λίρες Τουρκίας
+				TRY
 				₺
 				TL
 			
@@ -6642,23 +7158,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Τρινιντάντ και Τομπάγκο
 				δολάριο Τρινιντάντ και Τομπάγκο
 				δολάρια Τρινιντάντ και Τομπάγκο
+				TTD
 				$
 			
 			
 				Νέο δολάριο Ταϊβάν
 				νέο δολάριο Ταϊβάν
 				νέα δολάρια Ταϊβάν
+				NT$
 				$
 			
 			
 				Σελίνι Τανζανίας
 				σελίνι Τανζανίας
 				σελίνια Τανζανίας
+				TZS
 			
 			
 				Γρίβνα Ουκρανίας
 				γρίβνα Ουκρανίας
 				γρίβνα Ουκρανίας
+				UAH
 				₴
 			
 			
@@ -6675,6 +7195,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Σελίνι Ουγκάντας
 				σελίνι Ουγκάντας
 				σελίνια Ουγκάντας
+				UGX
 			
 			
 				Δολάριο ΗΠΑ
@@ -6702,12 +7223,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Πέσο Ουρουγουάης
 				πέσο Ουρουγουάης
 				πέσο Ουρουγουάης
+				UYU
 				$
 			
 			
 				Σομ Ουζμπεκιστάν
 				σομ Ουζμπεκιστάν
 				σομ Ουζμπεκιστάν
+				UZS
 			
 			
 				Μπολιβάρ Βενεζουέλας (1871–2008)
@@ -6718,6 +7241,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Μπολιβάρ Βενεζουέλας (2008–2018)
 				μπολιβάρ Βενεζουέλας (2008–2018)
 				μπολιβάρ Βενεζουέλας (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6730,6 +7254,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ντονγκ Βιετνάμ
 				ντονγκ Βιετνάμ
 				ντονγκ Βιετνάμ
+				₫
 				₫
 			
 			
@@ -6740,16 +7265,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Βατού Βανουάτου
 				βατού Βανουάτου
 				βατού Βανουάτου
+				VUV
 			
 			
 				Τάλα Σαμόα
 				τάλα Σαμόα
 				τάλα Σαμόα
+				WST
 			
 			
 				Φράγκο CFA Κεντρικής Αφρικής
 				φράγκο CFA Κεντρικής Αφρικής
 				φράγκα CFA Κεντρικής Αφρικής
+				FCFA
 			
 			
 				Ευρωπαϊκή Σύνθετη Μονάδα
@@ -6775,6 +7303,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Δολάριο Ανατολικής Καραϊβικής
 				δολάριο Ανατολικής Καραϊβικής
 				δολάρια Ανατολικής Καραϊβικής
+				EC$
 				$
 			
 			
@@ -6801,11 +7330,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Φράγκο CFA Δυτικής Αφρικής
 				φράγκο CFA Δυτικής Αφρικής
 				φράγκα CFA Δυτικής Αφρικής
+				CFA
 			
 			
 				Φράγκο CFP
 				φράγκο CFP
 				φράγκα CFP
+				CFPF
 			
 			
 				Ταμείο RINET
@@ -6825,6 +7356,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ριάλ Υεμένης
 				ριάλ Υεμένης
 				ριάλ Υεμένης
+				YER
 			
 			
 				Μεταλλικό Δηνάριο Γιουγκοσλαβίας
@@ -6854,6 +7386,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ραντ Νότιας Αφρικής
 				ραντ Νότιας Αφρικής
 				ραντ Νότιας Αφρικής
+				ZAR
 				R
 			
 			
@@ -6865,6 +7398,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Κουάτσα Ζάμπιας
 				κουάτσα Ζάμπιας
 				κουάτσα Ζάμπιας
+				ZMW
 				ZK
 			
 			
@@ -6927,7 +7461,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ακτίνια
 				{0} ακτίνιο
-				{0} ακτίνιο
+				{0} ακτίνια
 			
 			
 				μοίρες
@@ -7010,7 +7544,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} χιλιοστόγραμμα ανά δεκατόλιτρο
 			
 			
-				χιλιοστογραμμομόριο ανά λίτρο
+				χιλιοστογραμμομόρια ανά λίτρο
 				{0} χιλιοστογραμμομόριο ανά λίτρο
 				{0} χιλιοστογραμμομόρια ανά λίτρο
 			
@@ -7119,6 +7653,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} αιώνας
 				{0} αιώνες
 			
+			
+				δεκαετίες
+				{0} δεκαετία
+				{0} δεκαετίες
+			
 			
 				έτη
 				{0} έτος
@@ -7236,6 +7775,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} βρετανική μονάδα θερμότητας
 				{0} βρετανικές μονάδες θερμότητας
 			
+			
+				θερμικές μονάδες ΗΠΑ
+				{0} θερμ. μονάδα ΗΠΑ
+				{0} θερμικές μονάδες ΗΠΑ
+			
 			
 				λίβρες δύναμης
 				{0} λίβρα δύναμης
@@ -7266,6 +7810,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} χερτζ
 				{0} χερτζ
 			
+			
+				τυπογραφικό em
+				{0} τυπογραφικό em
+				{0} τυπογραφικά em
+			
+			
+				pixel
+				{0} pixel
+				{0} pixel
+			
+			
+				megapixel
+				{0} megapixel
+				{0} megapixel
+			
+			
+				pixel ανά εκατοστό
+				{0} pixel ανά εκατοστό
+				{0} pixel ανά εκατοστό
+			
+			
+				pixel ανά ίντσα
+				{0} pixel ανά ίντσα
+				{0} pixel ανά ίντσα
+			
+			
+				κουκκίδες ανά εκατοστό
+				{0} κουκκίδα ανά εκατοστό
+				{0} κουκκίδες ανά εκατοστό
+			
+			
+				κουκκίδες ανά ίντσα
+				{0} κουκκίδα ανά ίντσα
+				{0} κουκκίδες ανά ίντσα
+			
 			
 				χιλιόμετρα
 				{0} χιλιόμετρο
@@ -7295,7 +7874,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} χιλιοστόμετρα
 			
 			
-				µm
 				{0} μικρόμετρο
 				{0} μικρόμετρα
 			
@@ -7357,12 +7935,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} σκανδιναβικά μίλια
 			
 			
-				στιγμή
 				{0} στιγμή
 				{0} στιγμές
 			
 			
-				ακτίνες Ήλιου
+				ακτίνες του Ήλιου
 				{0} ακτίνα του Ήλιου
 				{0} ακτίνες του Ήλιου
 			
@@ -7372,7 +7949,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} λουξ
 			
 			
-				ηλιακές φωτεινότητες
 				{0} ηλιακή φωτεινότητα
 				{0} ηλιακές φωτεινότητες
 			
@@ -7385,7 +7961,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				χιλιόγραμμα
 				{0} χιλιόγραμμο
 				{0} χιλιόγραμμα
-				{0} ανά κιλό
+				{0} ανά χιλιόγραμμο
 			
 			
 				γραμμάρια
@@ -7475,18 +8051,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ίππος
 				{0} ίπποι
 			
-			
-				εκτοπασκάλ
-				{0} εκτοπασκάλ
-				{0} εκτοπασκάλ
-			
 			
 				χιλιοστόμετρα στήλης υδραργύρου
-				{0} χιλιοστόμετρα στήλης υδραργύρου
+				{0} χιλιοστόμετρο στήλης υδραργύρου
 				{0} χιλιοστόμετρα στήλης υδραργύρου
 			
 			
-				λίβρα ανά τετραγωνική ίντσα
+				λίβρες ανά τετραγωνική ίντσα
 				{0} λίβρα ανά τετραγωνική ίντσα
 				{0} λίβρες ανά τετραγωνική ίντσα
 			
@@ -7495,6 +8066,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ίντσα στήλης υδραργύρου
 				{0} ίντσες στήλης υδραργύρου
 			
+			
+				μπαρ
+				{0} μπαρ
+				{0} μπαρ
+			
 			
 				μιλιμπάρ
 				{0} μιλιμπάρ
@@ -7505,6 +8081,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ατμόσφαιρα
 				{0} ατμόσφαιρες
 			
+			
+				πασκάλ
+				{0} πασκάλ
+				{0} πασκάλ
+			
+			
+				εκτοπασκάλ
+				{0} εκτοπασκάλ
+				{0} εκτοπασκάλ
+			
 			
 				κιλοπασκάλ
 				{0} κιλοπασκάλ
@@ -7573,7 +8159,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				κυβικά μέτρα
 				{0} κυβικό μέτρο
-				{0} κυβικό μέτρο
+				{0} κυβικά μέτρα
 				{0} ανά κυβικό μέτρο
 			
 			
@@ -7696,9 +8282,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} κουταλιές του γλυκού
 			
 			
-				βαρέλι
+				βαρέλια
 				{0} βαρέλι
-				{0} βαρέλι
+				{0} βαρέλια
 			
 			
 				σημεία ορίζοντα
@@ -7922,6 +8508,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} αιών.
 				{0} αιών.
 			
+			
+				δεκ.
+				{0} δεκ.
+				{0} δεκ.
+			
 			
 				έτη
 				{0} έτ.
@@ -7980,22 +8571,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ns
 			
 			
-				αμπέρ
+				A
 				{0} A
 				{0} A
 			
 			
-				μιλιαμπέρ
 				{0} mA
 				{0} mA
 			
 			
-				ωμ
+				Ω
 				{0} Ω
 				{0} Ω
 			
 			
-				βολτ
+				V
 				{0} V
 				{0} V
 			
@@ -8039,6 +8629,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} BTU
 				{0} BTU
 			
+			
+				θερμ. μονάδες ΗΠΑ
+				{0} θερμ. μονάδα ΗΠΑ
+				{0} θερμ. μονάδες ΗΠΑ
+			
 			
 				λίβρες δύναμης
 				{0} lbf
@@ -8050,25 +8645,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} N
 			
 			
-				γιγαχέρτζ
 				{0} GHz
 				{0} GHz
 			
 			
-				μεγαχέρτζ
 				{0} MHz
 				{0} MHz
 			
 			
-				κιλοχέρτζ
 				{0} kHz
 				{0} kHz
 			
 			
-				χερτζ
 				{0} Hz
 				{0} Hz
 			
+			
+				megapixel
+			
 			
 				χλμ.
 				{0} χλμ.
@@ -8093,7 +8687,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/εκ.
 			
 			
-				χιλιοστόμ.
+				χλστ.
 				{0} χλστ.
 				{0} χλστ.
 			
@@ -8166,8 +8760,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ακτίνες Ήλιου
-				{0} R☉
-				{0} R☉
 			
 			
 				λουξ
@@ -8185,7 +8777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} μ.τ.
 			
 			
-				kg
+				κιλά
 				{0} κιλό
 				{0} κιλά
 				{0}/κιλό
@@ -8235,8 +8827,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Ντάλτον
-				{0} Da
-				{0} Da
+				{0} Da
+				{0} Da
 			
 			
 				μάζες Γης
@@ -8278,11 +8870,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ίπ.
 				{0} ίπ.
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -8298,6 +8885,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				μπαρ
+				{0} μπαρ
+				{0} μπαρ
+			
 			
 				mbar
 				{0} mbar
@@ -8308,6 +8900,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8679,10 +9280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -8691,6 +9288,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				χλμ/ώ.
 				{0} χλμ/ώ.
@@ -8760,8 +9361,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} ή {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/el_CY.xml b/make/data/cldr/common/main/el_CY.xml
index 44f1fa11e5e..b6b20e985a0 100644
--- a/make/data/cldr/common/main/el_CY.xml
+++ b/make/data/cldr/common/main/el_CY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/el_GR.xml b/make/data/cldr/common/main/el_GR.xml
index 65713b2c2e5..891e1d07d1b 100644
--- a/make/data/cldr/common/main/el_GR.xml
+++ b/make/data/cldr/common/main/el_GR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en.xml b/make/data/cldr/common/main/en.xml
index 660106d22f4..3d79744b50a 100644
--- a/make/data/cldr/common/main/en.xml
+++ b/make/data/cldr/common/main/en.xml
@@ -12,7 +12,7 @@ annotations.
 -->
 
 	
-		
+		
 		
 	
 	
@@ -124,6 +124,7 @@ annotations.
 			Chipewyan
 			Cherokee
 			Cheyenne
+			Chickasaw
 			Central Kurdish
 			Corsican
 			Coptic
@@ -395,7 +396,7 @@ annotations.
 			Maltese
 			Mundang
 			Multiple languages
-			Creek
+			Muscogee
 			Mirandese
 			Marwari
 			Mentawai
@@ -635,6 +636,7 @@ annotations.
 			Yoruba
 			Nheengatu
 			Cantonese
+			Chinese, Cantonese
 			Zhuang
 			Zapotec
 			Blissymbols
@@ -643,8 +645,11 @@ annotations.
 			Standard Moroccan Tamazight
 			Chinese
 			Mandarin Chinese
+			Chinese, Mandarin
 			Simplified Chinese
+			Simplified Mandarin Chinese
 			Traditional Chinese
+			Traditional Mandarin Chinese
 			Zulu
 			Zuni
 			No linguistic content
@@ -788,6 +793,7 @@ annotations.
 			
 			
 			
+			
 			
 			
 			
@@ -848,7 +854,6 @@ annotations.
 		
 		
 			World
-			
 			Africa
 			North America
 			South America
@@ -1554,8 +1559,8 @@ annotations.
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
 		[á à ă â å ä ã ā æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 	
 	
 		“
@@ -2652,9 +2657,6 @@ annotations.
 				
 			
 			
-				
 				
 					
 						
@@ -2791,7 +2793,7 @@ annotations.
 					{0} week ago
 					{0} weeks ago
 				
-				the week of {0} 
+				the week of {0}
 			
 			
 				wk.
@@ -6156,6 +6158,11 @@ annotations.
 				{0} century
 				{0} centuries
 			
+			
+				decades
+				{0} decade
+				{0} decades
+			
 			
 				years
 				{0} year
@@ -6273,6 +6280,11 @@ annotations.
 				{0} British thermal unit
 				{0} British thermal units
 			
+			
+				US therms
+				{0} US therm
+				{0} US therms
+			
 			
 				pounds of force
 				{0} pound of force
@@ -6303,6 +6315,41 @@ annotations.
 				{0} hertz
 				{0} hertz
 			
+			
+				typographic em
+				{0} em
+				{0} ems
+			
+			
+				pixels
+				{0} pixel
+				{0} pixels
+			
+			
+				megapixels
+				{0} megapixel
+				{0} megapixels
+			
+			
+				pixels per centimeter
+				{0} pixel per centimeter
+				{0} pixels per centimeter
+			
+			
+				pixels per inch
+				{0} pixel per inch
+				{0} pixels per inch
+			
+			
+				dots per centimeter
+				{0} dot per centimeter
+				{0} dots per centimeter
+			
+			
+				dots per inch
+				{0} dot per inch
+				{0} dots per inch
+			
 			
 				kilometers
 				{0} kilometer
@@ -6527,11 +6574,6 @@ annotations.
 				{0} horsepower
 				{0} horsepower
 			
-			
-				hectopascals
-				{0} hectopascal
-				{0} hectopascals
-			
 			
 				millimeters of mercury
 				{0} millimeter of mercury
@@ -6547,6 +6589,11 @@ annotations.
 				{0} inch of mercury
 				{0} inches of mercury
 			
+			
+				bars
+				{0} bar
+				{0} bars
+			
 			
 				millibars
 				{0} millibar
@@ -6557,6 +6604,16 @@ annotations.
 				{0} atmosphere
 				{0} atmospheres
 			
+			
+				pascals
+				{0} pascal
+				{0} pascals
+			
+			
+				hectopascals
+				{0} hectopascal
+				{0} hectopascals
+			
 			
 				kilopascals
 				{0} kilopascal
@@ -6974,6 +7031,11 @@ annotations.
 				{0} c
 				{0} c
 			
+			
+				dec
+				{0} dec
+				{0} dec
+			
 			
 				years
 				{0} yr
@@ -7091,6 +7153,11 @@ annotations.
 				{0} Btu
 				{0} Btu
 			
+			
+				US therm
+				{0} US therm
+				{0} US therms
+			
 			
 				pound-force
 				{0} lbf
@@ -7121,6 +7188,41 @@ annotations.
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				pixels
+				{0} px
+				{0} px
+			
+			
+				megapixels
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -7345,11 +7447,6 @@ annotations.
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -7365,6 +7462,11 @@ annotations.
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bars
+			
 			
 				mbar
 				{0} mbar
@@ -7375,6 +7477,16 @@ annotations.
 				{0} atm
 				{0} atm
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -7766,6 +7878,11 @@ annotations.
 				{0}bit
 				{0}bit
 			
+			
+				dec
+				{0}dec
+				{0}dec
+			
 			
 				yr
 				{0}y
@@ -7876,6 +7993,11 @@ annotations.
 				{0}Btu
 				{0}Btu
 			
+			
+				US therm
+				{0}US therm
+				{0}US therms
+			
 			
 				lbf
 				{0}lbf
@@ -7906,6 +8028,41 @@ annotations.
 				{0}Hz
 				{0}Hz
 			
+			
+				em
+				{0}em
+				{0}em
+			
+			
+				px
+				{0}px
+				{0}px
+			
+			
+				MP
+				{0}MP
+				{0}MP
+			
+			
+				ppcm
+				{0}ppcm
+				{0}ppcm
+			
+			
+				ppi
+				{0}ppi
+				{0}ppi
+			
+			
+				dpcm
+				{0}dpcm
+				{0}dpcm
+			
+			
+				dpi
+				{0}dpi
+				{0}dpi
+			
 			
 				km
 				{0}km
@@ -8121,11 +8278,6 @@ annotations.
 				{0}hp
 				{0}hp
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
@@ -8141,6 +8293,11 @@ annotations.
 				{0}″ Hg
 				{0}″ Hg
 			
+			
+				bar
+				{0}bar
+				{0}bars
+			
 			
 				mbar
 				{0}mb
@@ -8151,6 +8308,16 @@ annotations.
 				{0}atm
 				{0}atm
 			
+			
+				Pa
+				{0}Pa
+				{0}Pa
+			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				kPa
 				{0}kPa
@@ -8416,7 +8583,6 @@ annotations.
 		scripts — {0}
 		{0} stroke
 		{0} strokes
-		
 		activity
 		African script
 		American script
@@ -8575,79 +8741,3 @@ annotations.
 		slashed zero
 	
 
-
diff --git a/make/data/cldr/common/main/en_001.xml b/make/data/cldr/common/main/en_001.xml
index 828c7567707..8aa5d9a68e2 100644
--- a/make/data/cldr/common/main/en_001.xml
+++ b/make/data/cldr/common/main/en_001.xml
@@ -9,11 +9,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 		
 	
 	
+		
+			Creek
+			West Low German
+		
+		
+			St Barthélemy
+			St Kitts & Nevis
+			St Lucia
+			St Martin
+			St Pierre & Miquelon
+			St Helena
+			US Outlying Islands
+			St Vincent & Grenadines
+			US Virgin Islands
+		
 		
 			Case-Sensitive Sorting
 			Normalised Sorting
@@ -153,7 +168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d MMM y G
 						LL
 						dd/MM
-						E, d/M
+						E, dd/MM
 						d MMM
 						E, d MMM
 						d MMMM
@@ -164,6 +179,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d MMM y G
 					
 					
+						
+							d–d
+						
+						
+							y–y G
+						
+						
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y GGGGG – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+						
+						
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y GGGGG – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+						
+						
+							d–d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
+						
+							M–M
+						
 						
 							dd/MM – dd/MM
 							dd/MM – dd/MM
@@ -173,13 +221,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E dd/MM – E dd/MM
 						
 						
-							d – d MMM
+							d–d MMM
 							d MMM – d MMM
 						
 						
 							E d – E d MMM
 							E d MMM – E d MMM
 						
+						
+							y–y G
+						
 						
 							MM/y – MM/y GGGGG
 							MM/y – MM/y GGGGG
@@ -195,7 +246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, dd/MM/y – E, dd/MM/y GGGGG
 						
 						
-							d – d MMM y G
+							d–d MMM y G
 							d MMM – d MMM y G
 							d MMM y – d MMM y G
 						
@@ -212,15 +263,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							am
-							noon
 							pm
 						
-						
-							n
-						
 						
 							am
-							noon
 							pm
 						
 					
@@ -280,6 +326,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d MMM y
 					
 					
+						
+							d–d
+						
+						
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y GGGGG – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+						
+						
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y GGGGG – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
+						
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h–h a v
+						
+						
+							HH–HH v
+						
+						
+							M–M
+						
 						
 							dd/MM – dd/MM
 							dd/MM – dd/MM
@@ -289,13 +385,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E dd/MM – E dd/MM
 						
 						
-							d – d MMM
+							d–d MMM
 							d MMM – d MMM
 						
 						
 							E d – E d MMM
 							E d MMM – E d MMM
 						
+						
+							y–y
+						
 						
 							MM/y – MM/y
 							MM/y – MM/y
@@ -311,7 +410,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, dd/MM/y – E, dd/MM/y
 						
 						
-							d – d MMM y
+							d–d MMM y
 							d MMM – d MMM y
 							d MMM y – d MMM y
 						
@@ -323,10 +422,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						E dd/MM
+						E d MMM
+					
+				
+			
 		
 		
 			
 				yr
+				last yr
+				this yr
+				next yr
 				
 					in {0} yr
 					in {0} yr
@@ -337,6 +447,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				last yr
+				this yr
+				next yr
 				
 					in {0} yr
 					in {0} yr
@@ -370,6 +483,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mo
+				last mo
+				this mo
+				next mo
 				
 					in {0} mo
 					in {0} mo
@@ -381,6 +497,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mo
+				last mo
+				this mo
+				next mo
 				
 					in {0} mo
 					in {0} mo
@@ -392,6 +511,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				wk
+				last wk
+				this wk
+				next wk
 				
 					in {0} wk
 					in {0} wk
@@ -403,6 +525,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				wk
+				last wk
+				this wk
+				next wk
 				
 					in {0} wk
 					in {0} wk
@@ -609,6 +734,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					∅∅∅
 				
 			
+			
+				St Barthélemy
+			
+			
+				St John’s
+			
+			
+				St Kitts
+			
+			
+				St Lucia
+			
+			
+				St Helena
+			
+			
+				St Vincent
+			
+			
+				St Thomas
+			
 			
 				
 					∅∅∅
@@ -658,6 +804,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					∅∅∅
 				
 			
+			
+				
+					St Pierre & Miquelon Time
+					St Pierre & Miquelon Standard Time
+					St Pierre & Miquelon Daylight Time
+				
+			
 		
 	
 	
@@ -695,6 +848,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Russian rouble (1991–1998)
 				Russian roubles (1991–1998)
 			
+			
+				St Helena Pound
+				St Helena pound
+				St Helena pounds
+			
 			
 				Tajikistani Rouble
 				Tajikistani rouble
@@ -745,6 +903,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} millimole per litre
 				{0} millimoles per litre
 			
+			
+				per cent
+				{0} per cent
+				{0} per cent
+			
+			
+				per mille
+				{0} per mille
+				{0} per mille
+			
 			
 				litres per kilometre
 				{0} litre per kilometre
@@ -765,6 +933,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mile per gallon
 				{0} miles per gallon
 			
+			
+				pixels per centimetre
+				{0} pixel per centimetre
+				{0} pixels per centimetre
+			
+			
+				dots per centimetre
+				{0} dot per centimetre
+				{0} dots per centimetre
+			
 			
 				kilometres
 				{0} kilometre
@@ -809,7 +987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} picometres
 			
 			
-				tonne
+				tonnes
 				{0} tonne
 				{0} tonnes
 			
@@ -838,6 +1016,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvin
 				{0} kelvin
 			
+			
+				newton metres
+				{0} newton metre
+				{0} newton metres
+			
 			
 				cubic kilometres
 				{0} cubic kilometre
@@ -898,6 +1081,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gallons
 				{0} per gallon
 			
+			
+				US fluid ounces
+				{0} US fluid ounce
+				{0} US fluid ounces
+			
 		
 		
 			
@@ -921,6 +1109,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 				{0} mmol/l
 			
+			
+				per cent
+			
+			
+				per mille
+			
 			
 				litres/km
 				{0} l/km
@@ -944,7 +1138,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} hr
 				{0} hrs
-				{0}ph
 			
 			
 				{0} min
@@ -953,7 +1146,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} sec
 				{0} secs
-				{0}ps
 			
 			
 				metres
@@ -964,13 +1156,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				stone
 			
-			
-				mm Hg
-				{0} mm Hg
-				{0} mm Hg
-			
 			
-				in Hg
+				inHG
 			
 			
 				metres/sec
@@ -1017,6 +1204,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gal
 				{0}/gal
 			
+			
+				US fl oz
+				{0} US fl oz
+				{0} US fl oz
+			
 		
 		
 			
@@ -1115,6 +1307,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 	
+	
+		
+			{0} and {1}
+		
+		
+			{0} or {1}
+		
+		
+			{0} or {1}
+		
+		
+			{0} or {1}
+		
+		
+			{0} and {1}
+			{0} and {1}
+		
+	
 	
 		{0} – all
 		{0} – compatibility
@@ -1124,5 +1334,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} – miscellaneous
 		{0} – other
 		scripts – {0}
+		maths symbol
 	
 
diff --git a/make/data/cldr/common/main/en_150.xml b/make/data/cldr/common/main/en_150.xml
index b86f818dcb2..bcfb9631205 100644
--- a/make/data/cldr/common/main/en_150.xml
+++ b/make/data/cldr/common/main/en_150.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_AE.xml b/make/data/cldr/common/main/en_AE.xml
index 27bbfcd3a05..2d20c416932 100644
--- a/make/data/cldr/common/main/en_AE.xml
+++ b/make/data/cldr/common/main/en_AE.xml
@@ -10,7 +10,7 @@ UAE English locale, based on US English orthography, formats from en_001
 -->
 
 	
-		
+		
 		
 		
 	
@@ -348,7 +348,6 @@ UAE English locale, based on US English orthography, formats from en_001
 	
 		
 			
-				
 				AED
 			
 		
diff --git a/make/data/cldr/common/main/en_AG.xml b/make/data/cldr/common/main/en_AG.xml
index 372f5b06e37..154cb3f2da4 100644
--- a/make/data/cldr/common/main/en_AG.xml
+++ b/make/data/cldr/common/main/en_AG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_AI.xml b/make/data/cldr/common/main/en_AI.xml
index 55cdae7199e..d602552fa4b 100644
--- a/make/data/cldr/common/main/en_AI.xml
+++ b/make/data/cldr/common/main/en_AI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_AS.xml b/make/data/cldr/common/main/en_AS.xml
index a879983675a..b3ace2d4c02 100644
--- a/make/data/cldr/common/main/en_AS.xml
+++ b/make/data/cldr/common/main/en_AS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_AT.xml b/make/data/cldr/common/main/en_AT.xml
index 4a94e52ff8e..5d8e92c1cc3 100644
--- a/make/data/cldr/common/main/en_AT.xml
+++ b/make/data/cldr/common/main/en_AT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_AU.xml b/make/data/cldr/common/main/en_AU.xml
index a48fa689ca3..66e05519e01 100644
--- a/make/data/cldr/common/main/en_AU.xml
+++ b/make/data/cldr/common/main/en_AU.xml
@@ -7,22 +7,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
+			Modern Standard Arabic
 			Bengali
+			Austrian German
+			Swiss High German
+			Australian English
+			Canadian English
+			British English
+			UK English
 			United States English
+			US English
+			Latin American Spanish
+			European Spanish
+			Mexican Spanish
+			Canadian French
+			Swiss French
 			frc
 			lou
+			Brazilian Portuguese
+			European Portuguese
 			Moldovan
+			Montenegrin
+			Simplified Chinese
+			Traditional Chinese
 		
 		
 			
-			
 		
+		
+			St. Barthélemy
+			St. Kitts & Nevis
+			St. Lucia
+			St. Martin
+			St. Vincent & Grenadines
+		
 		
 			Korean Calendar
 			Ethiopian Calendar
@@ -37,6 +61,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
+							1
+							2
+							3
+							4
 							5
 							6
 							7
@@ -57,8 +85,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Mo6
 							Mo7
 							Mo8
+							Mo9
+							Mo10
+							Mo11
+							Mo12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
 						
 						
+							First Month
+							Second Month
 							Third Month
 							Fourth Month
 							Fifth Month
@@ -96,9 +144,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					
+						
+							J
+							F
+							M
+							A
+							M
+							J
+							J
+							A
+							S
+							O
+							N
+							D
+						
+					
 					
 						
+							Jan
+							Feb
+							Mar
+							Apr
 							May
+							Jun
+							Jul
+							Aug
+							Sep
+							Oct
+							Nov
+							Dec
+						
+						
+							January
+							February
+							March
+							April
+							May
+							June
+							July
+							August
+							September
+							October
+							November
+							December
 						
 					
 				
@@ -124,6 +213,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
+						
+							Sun
+							Mon
+							Tue
+							Wed
+							Thu
+							Fri
+							Sat
+						
 						
 							Su.
 							M.
@@ -134,13 +232,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Sa.
 						
 						
+							Su
 							Mon
+							Tu
 							Wed
+							Th
 							Fri
 							Sat
 						
+						
+							Sunday
+							Monday
+							Tuesday
+							Wednesday
+							Thursday
+							Friday
+							Saturday
+						
 					
 				
+				
+					
+						
+							1
+							2
+							3
+							4
+						
+					
+					
+						
+							Q1
+							Q2
+							Q3
+							Q4
+						
+						
+							1st quarter
+							2nd quarter
+							3rd quarter
+							4th quarter
+						
+					
+				
 				
 					
 						
@@ -175,7 +309,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							midday
 						
 						
+							midnight
+							am
 							midday
+							pm
+							morning
+							afternoon
+							evening
+							night
 						
 						
 							midday
@@ -183,24 +324,338 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							EEEE, d MMMM y
+						
+					
+					
+						
+							d MMMM y
+						
+					
+					
+						
+							d MMM y
+						
+					
 					
 						
 							d/M/yy
 						
 					
 				
+				
+					
+						
+							h:mm:ss a zzzz
+						
+					
+					
+						
+							h:mm:ss a z
+						
+					
+					
+						
+							h:mm:ss a
+						
+					
+					
+						
+							h:mm a
+						
+					
+				
 				
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
 					
 						d/M
 						E, d/M
 					
+					
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+						
+						
+							d – d MMM, y G
+							d MMM, y G – d MMM, y G
+							d MMM – d MMM, y G
+							d MMM, y – d MMM, y G
+						
+						
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y G – E, d MMM, y G
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y – E, d MMM, y G
+						
+						
+							d – d MMM
+						
+					
 				
 			
+			
+				
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+				
+			
 			
+				
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+				
+				
+					
+						
+							EEEE, d MMMM y G
+						
+					
+					
+						
+							d MMMM y G
+						
+					
+					
+						
+							d MMM y G
+						
+					
+					
+						
+							dd/MM/y GGGGG
+						
+					
+				
 				
 					
+						d
+						ccc
+						E d
+						y G
+						MMM y G
+						d MMM y G
+						E, d MMM y G
+						LL
+						dd/MM
+						LLL
+						d MMM
+						E, d MMM
+						d MMMM
+						y G
 						dd/MM/y
 						E, dd/MM/y
+						y G
+						MM/y GGGGG
+						dd/MM/y GGGGG
+						E, dd/MM/y GGGGG
+						MMM y G
+						d MMM y G
+						E, d MMM y G
+						MMMM y G
+						QQQ y G
+						QQQQ y G
 					
 				
 			
@@ -208,22 +663,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
+					in {0} yr
 					in {0} yrs
 				
 				
+					{0} yr ago
 					{0} yrs ago
 				
 			
 			
 				
+					in {0} yr
 					in {0} yrs
 				
 				
+					{0} yr ago
 					{0} yrs ago
 				
 			
 			
 				
+					in {0} qtr
 					in {0} qtrs
 				
 				
@@ -233,6 +693,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					in {0} qtr
 					in {0} qtrs
 				
 				
@@ -264,32 +725,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					in {0} wk
 					in {0} wks
 				
 				
+					{0} wk ago
 					{0} wks ago
 				
 			
 			
 				
+					in {0} wk
 					in {0} wks
 				
 				
+					{0} wk ago
 					{0} wks ago
 				
 			
 			
 				wk of mo.
 			
-			
-				yesterday
-				today
-				tomorrow
-			
 			
 				
+					in {0} day
 					in {0} days
 				
+				
+					{0} day ago
+					{0} days ago
+				
 			
 			
 				wkday of mo.
@@ -334,11 +799,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} Wed. ago
 				
 			
-			
-				
-					{0} W ago
-				
-			
 			
 				
 					in {0} Thu.
@@ -372,18 +832,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				h
 				
+					in {0} hr
 					in {0} hrs
 				
 				
+					{0} hr ago
 					{0} hrs ago
 				
 			
 			
 				h
 				
+					in {0} hr
 					in {0} hrs
 				
 				
+					{0} hr ago
 					{0} hrs ago
 				
 			
@@ -433,23 +897,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				St Barthélemy
-			
+			GMT
 			
 				Rangoon
 			
+			
+				Johnston
+			
 			
 				
 					Eastern Africa Time
 				
 			
-			
-				
-					Amazon Standard Time
-					Amazon Summer Time
-				
-			
 			
 				
 					Arabia Time
@@ -502,6 +961,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					China Time
 					China Standard Time
 					China Summer Time
 				
@@ -513,24 +973,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Cook Island Summer Time
 				
 			
-			
-				
-					Eastern European Standard Time
-					Eastern European Summer Time
-				
-			
-			
-				
-					Iran Time
-					Iran Standard Time
-				
-			
-			
-				
-					Israel Time
-					Israel Standard Time
-				
-			
 			
 				
 					Japan Time
@@ -587,13 +1029,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			e
 		
 		
+			
+				AED
+			
+			
+				AFN
+			
+			
+				ALL
+			
+			
+				AMD
+			
+			
+				AOA
+			
+			
+				ARS
+				$
+			
 			
 				$
+				$
+			
+			
+				AZN
 			
 			
 				Bosnia-Herzegovina Convertible Marka
 				Bosnia-Herzegovina convertible marka
 				Bosnia-Herzegovina convertible marka
+				BAM
 			
 			
 				Barbados Dollar
@@ -601,25 +1067,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Barbados dollars
 			
 			
+				BDT
 				Tk
 			
+			
+				BGN
+			
+			
+				BHD
+			
+			
+				BIF
+			
 			
 				Bermuda Dollar
 				Bermuda dollar
 				Bermuda dollars
 			
+			
+				BND
+				$
+			
 			
 				Boliviano
 				boliviano
 				bolivianos
+				BOB
 				$b
 			
 			
 				BRL
+				R$
+			
+			
+				BTN
+			
+			
+				BWP
 			
 			
 				CAD
 			
+			
+				CDF
+			
+			
+				CHF
+			
+			
+				CLP
+				$
+			
 			
 				CNH
 				CNH
@@ -627,17 +1125,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				CNY
+				¥
+			
+			
+				COP
+				$
 			
 			
 				₱
 			
+			
+				CVE
+			
+			
+				CZK
+			
+			
+				DJF
+			
+			
+				DZD
+			
 			
+				EGP
 				£
 			
+			
+				ERN
+			
+			
+				ETB
+			
 			
 				euro
 				euro
 				EUR
+				€
+			
+			
+				FJD
+				$
+			
+			
+				FKP
 			
 			
 				GBP
@@ -645,9 +1175,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Georgian lari
 				Georgian lari
+				GEL
+			
+			
+				GHS
+			
+			
+				GIP
+				£
+			
+			
+				GMD
+			
+			
+				GNF
+			
+			
+				GYD
+				$
 			
 			
 				HKD
+				$
+			
+			
+				HRK
+			
+			
+				HUF
+			
+			
+				IDR
 			
 			
 				Israeli Shekel
@@ -657,81 +1215,274 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				INR
+				₹
+			
+			
+				IQD
+			
+			
+				IRR
 			
 			
+				ISK
 				Kr
 			
+			
+				JOD
+			
 			
 				JPY
+				¥
+			
+			
+				KES
+			
+			
+				KGS
+			
+			
+				KHR
+				៛
+			
+			
+				KMF
+			
+			
+				KPW
 			
 			
 				KRW
+				₩
+			
+			
+				KWD
 			
 			
 				Kazakhstani tenge
 				Kazakhstani tenge
+				KZT
 			
 			
 				Laotian kip
 				Laotian kip
+				LAK
+				₭
+			
+			
+				LBP
+			
+			
+				LKR
+			
+			
+				LRD
+				$
+			
+			
+				LSL
+			
+			
+				LYD
+			
+			
+				MAD
+			
+			
+				MDL
 			
 			
-				Malagasy ariary
+				MGA
 			
 			
 				Macedonian denar
 				Macedonian denar
+				MKD
+			
+			
+				MMK
+			
+			
+				MNT
+				₮
+			
+			
+				MOP
+			
+			
+				MRO
+			
+			
+				MUR
+			
+			
+				MVR
+			
+			
+				MWK
 			
 			
 				MXN
 			
+			
+				MYR
+			
+			
+				MZN
+			
+			
+				NAD
+			
+			
+				NGN
+				₦
+			
+			
+				NOK
+			
+			
+				NPR
+			
 			
 				NZD
+				$
+			
+			
+				OMR
+			
+			
+				PEN
 			
 			
 				Papua New Guinean kina
 				Papua New Guinean kinas
+				PGK
+			
+			
+				PHP
+				₱
+			
+			
+				PLN
 			
 			
+				PYG
 				Gs
 			
 			
 				Qatari Riyal
 				Qatari riyal
 				Quatari riyals
+				QAR
+			
+			
+				RON
+			
+			
+				RSD
+			
+			
+				RUB
+			
+			
+				RWF
+			
+			
+				SAR
+			
+			
+				SBD
+				$
 			
 			
 				Rs
 			
+			
+				SDG
+			
 			
+				SEK
 				Kr
 			
+			
+				SGD
+				$
+			
+			
+				SHP
+			
+			
+				SLL
+			
+			
+				SOS
+			
 			
 				Suriname Dollar
 				Suriname dollar
 				Suriname dollars
+				SRD
+				$
+			
+			
+				SSP
+				£
+			
+			
+				SYP
+			
+			
+				SZL
+			
+			
+				฿
+			
+			
+				TJS
+			
+			
+				TMT
+			
+			
+				TND
+			
+			
+				TOP
 			
 			
 				Turkish lira
 				Turkish lire
+				TRY
 			
 			
 				TWD
 			
+			
+				TZS
+			
+			
+				UAH
+				₴
+			
+			
+				UGX
+			
 			
 				USD
 			
 			
 				Peso Uruguayo
+				UYU
 				$U
 			
 			
 				Uzbekistani som
 				Uzbekistani soms
+				UZS
 			
 			
 				Venezuelan bolívar
 				Venezuelan bolívars
+				VEF
 			
 			
 				VES
@@ -742,10 +1493,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Vietnamese dong
 				Vietnamese dongs
 				VND
+				₫
+			
+			
+				VUV
 			
 			
 				Samoan tala
 				Samoan talas
+				WST
 			
 			
 				XAF
@@ -759,18 +1515,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				CFP
 			
-			
-				(unknown currency)
+			
+				YER
+			
+			
+				ZAR
+			
+			
+				ZMW
 			
 		
+		
+			{0}–{1}
+		
 	
 	
 		
-			
-				per cent
-				{0} per cent
-				{0} per cent
-			
 			
 				per mill
 				{0} per mill
@@ -788,18 +1548,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				micrometres
 			
 			
-				tonnes
 				tonne
 				{0} tonnes
 			
-			
-				{0} stone
-			
 			
 				degrees
 				{0} degree
 				{0} degrees
 			
+			
+				fluid ounces
+				{0} fluid ounce
+				{0} fluid ounces
+			
 		
 		
 			
@@ -816,9 +1577,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} arcsec.
 				{0} arcsec.
 			
-			
-				{0} m²
-			
 			
 				mg/dL
 				{0} mg/dL
@@ -828,9 +1586,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mmol/L
 				{0} mmol/L
 			
-			
-				per cent
-			
 			
 				per mill
 			
@@ -907,6 +1662,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} CM
 				{0} CM
 			
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				in Hg
+			
 			
 				mb
 				{0} mb
@@ -923,12 +1686,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				deg.
-			
-			
-				{0} cm³
-			
-			
-				{0} mi³
+				{0}°
+				{0}°
 			
 			
 				ML
@@ -976,8 +1735,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} gal.
 				{0}/gal.
 			
+			
+				fl oz
+				{0} fl oz
+				{0} fl oz
+			
 		
 		
+			
+				{0}/{1}
+			
 			
 				mg/dL
 				{0}mg/dL
@@ -998,9 +1765,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}L/100km
 				{0}L/100km
 			
-			
-				{0}y
-			
 			
 				min.
 				{0}min.
@@ -1013,8 +1777,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				msec.
-				{0}ms
-				{0}ms
 			
 			
 				{0} km/h
@@ -1064,19 +1826,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} bus.
 			
 		
+		
+			h:mm
+		
+		
+			h:mm:ss
+		
+		
+			m:ss
+		
 	
-	
-		
-			{0} and {1}
-		
-		
-			{0} or {1}
-		
-		
-			{0} and {1}
-			{0} and {1}
-		
-	
 	
 		downward arrow
 		downward upward arrow
diff --git a/make/data/cldr/common/main/en_BB.xml b/make/data/cldr/common/main/en_BB.xml
index e3dfe3b6512..d8c884de3dc 100644
--- a/make/data/cldr/common/main/en_BB.xml
+++ b/make/data/cldr/common/main/en_BB.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_BE.xml b/make/data/cldr/common/main/en_BE.xml
index 2862ff9efd6..eae228d1a53 100644
--- a/make/data/cldr/common/main/en_BE.xml
+++ b/make/data/cldr/common/main/en_BE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_BI.xml b/make/data/cldr/common/main/en_BI.xml
index c61427eac7d..bcdc8b8b418 100644
--- a/make/data/cldr/common/main/en_BI.xml
+++ b/make/data/cldr/common/main/en_BI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_BM.xml b/make/data/cldr/common/main/en_BM.xml
index 4eba12f10fb..e7a923e455e 100644
--- a/make/data/cldr/common/main/en_BM.xml
+++ b/make/data/cldr/common/main/en_BM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_BS.xml b/make/data/cldr/common/main/en_BS.xml
index 549411395e5..b681385fdfb 100644
--- a/make/data/cldr/common/main/en_BS.xml
+++ b/make/data/cldr/common/main/en_BS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_BW.xml b/make/data/cldr/common/main/en_BW.xml
index af34981ca1b..c9890340fa0 100644
--- a/make/data/cldr/common/main/en_BW.xml
+++ b/make/data/cldr/common/main/en_BW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_BZ.xml b/make/data/cldr/common/main/en_BZ.xml
index b1a05fbfd77..12807e02222 100644
--- a/make/data/cldr/common/main/en_BZ.xml
+++ b/make/data/cldr/common/main/en_BZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_CA.xml b/make/data/cldr/common/main/en_CA.xml
index 64a63856381..34a48bd4f7f 100644
--- a/make/data/cldr/common/main/en_CA.xml
+++ b/make/data/cldr/common/main/en_CA.xml
@@ -7,17 +7,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
+			Modern Standard Arabic
 			Bengali
+			Austrian German
+			Swiss High German
+			Australian English
+			Canadian English
+			British English
+			UK English
+			American English
+			US English
+			Latin American Spanish
+			European Spanish
+			Mexican Spanish
+			Dari
+			Canadian French
+			Swiss French
 			Mauritian
+			Flemish
+			Brazilian Portuguese
+			European Portuguese
 			Moldovan
+			Montenegrin
+			Congo Swahili
 			Tuvaluan
+			Simplified Chinese
+			Simplified Mandarin Chinese
+			Traditional Chinese
+			Traditional Mandarin Chinese
 		
+		
+			Normalized Sorting
+		
 		
 			Korean Calendar
 			Ethiopian Calendar
@@ -161,6 +188,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
 					
 						d E
 						MMM d, y G
@@ -244,6 +291,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Feb.
 							Mar.
 							Apr.
+							May
 							Jun.
 							Jul.
 							Aug.
@@ -276,6 +324,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							mid
 							am
+							n
 							pm
 							mor
 							aft
@@ -294,11 +343,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							mid
-							a.m.
-							pm
+							a.m.
+							pm
 							mor
 							aft
 							eve
+							night
 						
 						
 							a.m.
@@ -329,7 +379,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 				
+				
+					
+						
+							h:mm:ss a zzzz
+						
+					
+					
+						
+							h:mm:ss a z
+						
+					
+					
+						
+							h:mm:ss a
+						
+					
+					
+						
+							h:mm a
+						
+					
+				
 				
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
 					
 						MMM d, y G
 						E, MMM d, y G
@@ -409,6 +501,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					
+						
+							EEEE, MMMM d, y G
+						
+					
 					
 						
 							MMMM d, y G
@@ -419,6 +516,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							MMM d, y G
 						
 					
+					
+						
+							GGGGG y-MM-dd
+						
+					
 				
 				
 					
@@ -537,9 +639,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					in {0} Su
 					in {0} Su’s
 				
 				
+					{0} Su ago
 					{0} Su’s ago
 				
 			
@@ -565,9 +669,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					in {0} Tu
 					in {0} Tu’s
 				
 				
+					{0} Tu ago
 					{0} Tu’s ago
 				
 			
@@ -606,9 +712,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					in {0} Th
 					in {0} Th’s
 				
 				
+					{0} Th ago
 					{0} Th’s ago
 				
 			
@@ -647,9 +755,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					in {0} Sa
 					in {0} Sa’s
 				
 				
+					{0} Sa ago
 					{0} Sa’s ago
 				
 			
@@ -730,6 +840,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
+			GMT
 			{0} Daylight Saving Time
 			
 				
@@ -811,6 +922,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Israeli new sheqel
 				Israeli new sheqels
 			
+			
+				VES
+			
 		
 	
 	
@@ -822,6 +936,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				{0} kilowatt-hour
+				{0} kilowatt-hours
 			
 			
 				newton-metres
@@ -916,6 +1031,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} c.
 				{0} c.
 			
+			
+				dec.
+				{0} dec.
+				{0} dec.
+			
 			
 				yrs.
 				{0} yr.
@@ -1298,7 +1418,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			{0}, and {1}
-			{0} and {1}
 		
 	
 	
@@ -1308,6 +1427,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		leftward rightward arrow
 		letter-like symbol
 		limited use
+		math symbol
 		non-spacing
 		rightward arrow
 		upward arrows
diff --git a/make/data/cldr/common/main/en_CC.xml b/make/data/cldr/common/main/en_CC.xml
index 18f0ee1a7b8..f2f29aafd4e 100644
--- a/make/data/cldr/common/main/en_CC.xml
+++ b/make/data/cldr/common/main/en_CC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_CH.xml b/make/data/cldr/common/main/en_CH.xml
index 34dc379f150..3cee7413e85 100644
--- a/make/data/cldr/common/main/en_CH.xml
+++ b/make/data/cldr/common/main/en_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_CK.xml b/make/data/cldr/common/main/en_CK.xml
index 153acf0bf97..73d227d671f 100644
--- a/make/data/cldr/common/main/en_CK.xml
+++ b/make/data/cldr/common/main/en_CK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_CM.xml b/make/data/cldr/common/main/en_CM.xml
index a753e9103ff..1480be2f5b4 100644
--- a/make/data/cldr/common/main/en_CM.xml
+++ b/make/data/cldr/common/main/en_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_CX.xml b/make/data/cldr/common/main/en_CX.xml
index 897c5a42763..e18381aa1c1 100644
--- a/make/data/cldr/common/main/en_CX.xml
+++ b/make/data/cldr/common/main/en_CX.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_CY.xml b/make/data/cldr/common/main/en_CY.xml
index 1fd29438744..91ec4b4592a 100644
--- a/make/data/cldr/common/main/en_CY.xml
+++ b/make/data/cldr/common/main/en_CY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_DE.xml b/make/data/cldr/common/main/en_DE.xml
index e5c5d208cfe..d6cc5f07c1a 100644
--- a/make/data/cldr/common/main/en_DE.xml
+++ b/make/data/cldr/common/main/en_DE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_DG.xml b/make/data/cldr/common/main/en_DG.xml
index 0f1ffeb1efe..e27b7b38b2e 100644
--- a/make/data/cldr/common/main/en_DG.xml
+++ b/make/data/cldr/common/main/en_DG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_DK.xml b/make/data/cldr/common/main/en_DK.xml
index 7dfcaba2cbb..2d4e8fcbff5 100644
--- a/make/data/cldr/common/main/en_DK.xml
+++ b/make/data/cldr/common/main/en_DK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_DM.xml b/make/data/cldr/common/main/en_DM.xml
index 1b6dbec6cb3..d69526890b8 100644
--- a/make/data/cldr/common/main/en_DM.xml
+++ b/make/data/cldr/common/main/en_DM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_ER.xml b/make/data/cldr/common/main/en_ER.xml
index 764e74b975b..ac65c7b037d 100644
--- a/make/data/cldr/common/main/en_ER.xml
+++ b/make/data/cldr/common/main/en_ER.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_FI.xml b/make/data/cldr/common/main/en_FI.xml
index cb58c7202bf..a8411655083 100644
--- a/make/data/cldr/common/main/en_FI.xml
+++ b/make/data/cldr/common/main/en_FI.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/en_FJ.xml b/make/data/cldr/common/main/en_FJ.xml
index 8d5f00e89f1..8d9830ec72f 100644
--- a/make/data/cldr/common/main/en_FJ.xml
+++ b/make/data/cldr/common/main/en_FJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_FK.xml b/make/data/cldr/common/main/en_FK.xml
index f04295cef46..6dc9e1b70a8 100644
--- a/make/data/cldr/common/main/en_FK.xml
+++ b/make/data/cldr/common/main/en_FK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_FM.xml b/make/data/cldr/common/main/en_FM.xml
index 2661397bab8..b63e7066000 100644
--- a/make/data/cldr/common/main/en_FM.xml
+++ b/make/data/cldr/common/main/en_FM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GB.xml b/make/data/cldr/common/main/en_GB.xml
index 25e93e13f92..9ad4e76a415 100644
--- a/make/data/cldr/common/main/en_GB.xml
+++ b/make/data/cldr/common/main/en_GB.xml
@@ -7,29 +7,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
+			Modern Standard Arabic
+			Austrian German
+			Swiss High German
+			Australian English
+			Canadian English
+			British English
+			UK English
+			American English
+			US English
+			Latin American Spanish
+			European Spanish
+			Mexican Spanish
+			Dari
+			Canadian French
+			Swiss French
 			West Low German
+			Flemish
+			Brazilian Portuguese
+			European Portuguese
+			Moldavian
+			Congo Swahili
+			Simplified Chinese
+			Simplified Mandarin Chinese
+			Traditional Chinese
+			Traditional Mandarin Chinese
 		
-		
-			
-		
-		
-			St Barthélemy
-			St Kitts & Nevis
-			St Lucia
-			St Martin
-			St Pierre & Miquelon
-			St Helena
-			US Outlying Islands
-			US
-			St Vincent & Grenadines
-			US Virgin Islands
-		
 	
 	
 		
@@ -40,47 +49,164 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						E d MMM
 					
 					
-						
-							d–d
-						
-						
-							M–M
-						
 						
 							dd/MM–dd/MM
 							dd/MM–dd/MM
 						
-						
-							d–d MMM
+						
+							E d MMM – E d MMM
 						
-						
-							y–y G
-						
-						
-							d–d MMM y G
+						
+							E, d MMM – E, d MMM y G
 						
 					
 				
 			
 			
+				
+					
+						
+							J
+							F
+							M
+							A
+							M
+							J
+							J
+							A
+							S
+							O
+							N
+							D
+						
+					
+					
+						
+							Jan
+							Feb
+							Mar
+							Apr
+							May
+							Jun
+							Jul
+							Aug
+							Sep
+							Oct
+							Nov
+							Dec
+						
+						
+							January
+							February
+							March
+							April
+							May
+							June
+							July
+							August
+							September
+							October
+							November
+							December
+						
+					
+				
+				
+					
+						
+							S
+							M
+							T
+							W
+							T
+							F
+							S
+						
+					
+					
+						
+							Sun
+							Mon
+							Tue
+							Wed
+							Thu
+							Fri
+							Sat
+						
+						
+							Su
+							Mo
+							Tu
+							We
+							Th
+							Fr
+							Sa
+						
+						
+							Sunday
+							Monday
+							Tuesday
+							Wednesday
+							Thursday
+							Friday
+							Saturday
+						
+					
+				
+				
+					
+						
+							1
+							2
+							3
+							4
+						
+					
+					
+						
+							Q1
+							Q2
+							Q3
+							Q4
+						
+						
+							1st quarter
+							2nd quarter
+							3rd quarter
+							4th quarter
+						
+					
+				
 				
-					
-						
-							noon
-						
-						
-							n
-						
-						
-							noon
-						
-					
 					
 						
-							pm
+							midnight
+							noon
 						
 					
 				
+				
+					
+						
+							EEEE, d MMMM y
+						
+					
+					
+						
+							d MMMM y
+						
+					
+					
+						
+							d MMM y
+						
+					
+					
+						
+							dd/MM/y
+						
+					
+				
 				
 					
 						
@@ -104,108 +230,1243 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						E h:mm B
+						E h:mm:ss B
+					
 					
-						
-							d–d
+						
+							E d MMM – E d MMM
 						
-						
-							h–h a
-						
-						
-							HH–HH
-						
-						
-							HH:mm–HH:mm
-							HH:mm–HH:mm
-						
-						
-							HH:mm–HH:mm v
-							HH:mm–HH:mm v
-						
-						
-							h–h a v
-						
-						
-							HH–HH v
-						
-						
-							M–M
-						
-						
-							d–d MMM
-						
-						
-							y–y
-						
-						
-							d–d MMM y
+						
+							E, d MMM – E, d MMM y
 						
 					
 				
 			
-			
-				
-					
-						E dd/MM
-						E d MMM
-					
-				
-			
 		
 		
-			
-				yesterday
-				today
-				tomorrow
+			
+				yr
 			
-			
-				yesterday
+			
 				
+					in {0} day
 					in {0} days
 				
 				
+					{0} day ago
 					{0} days ago
 				
 			
-			
-				yesterday
-				today
-				tomorrow
+			
+				hr
+			
+			
+				sec
 			
 		
 		
-			
-				St Barthélemy
+			GMT
+			
+				Andorra
 			
-			
-				St John’s
+			
+				Dubai
+			
+			
+				Kabul
+			
+			
+				Antigua
+			
+			
+				Anguilla
+			
+			
+				Tirane
+			
+			
+				Yerevan
+			
+			
+				Luanda
+			
+			
+				Rothera
+			
+			
+				Palmer
+			
+			
+				Troll
+			
+			
+				Syowa
+			
+			
+				Mawson
+			
+			
+				Davis
+			
+			
+				Vostok
+			
+			
+				Casey
+			
+			
+				McMurdo
+			
+			
+				Rio Gallegos
+			
+			
+				Mendoza
+			
+			
+				San Juan
+			
+			
+				Ushuaia
+			
+			
+				La Rioja
+			
+			
+				San Luis
+			
+			
+				Catamarca
+			
+			
+				Salta
+			
+			
+				Jujuy
+			
+			
+				Tucuman
+			
+			
+				Cordoba
+			
+			
+				Buenos Aires
+			
+			
+				Pago Pago
+			
+			
+				Vienna
+			
+			
+				Perth
+			
+			
+				Eucla
+			
+			
+				Darwin
+			
+			
+				Adelaide
+			
+			
+				Broken Hill
+			
+			
+				Currie
+			
+			
+				Melbourne
+			
+			
+				Hobart
+			
+			
+				Lindeman
+			
+			
+				Sydney
+			
+			
+				Brisbane
+			
+			
+				Macquarie
+			
+			
+				Lord Howe
+			
+			
+				Aruba
+			
+			
+				Mariehamn
+			
+			
+				Baku
+			
+			
+				Sarajevo
+			
+			
+				Barbados
+			
+			
+				Dhaka
+			
+			
+				Brussels
+			
+			
+				Ouagadougou
+			
+			
+				Sofia
+			
+			
+				Bahrain
+			
+			
+				Bujumbura
+			
+			
+				Porto-Novo
+			
+			
+				Bermuda
+			
+			
+				Brunei
+			
+			
+				La Paz
+			
+			
+				Kralendijk
+			
+			
+				Eirunepe
+			
+			
+				Rio Branco
+			
+			
+				Porto Velho
+			
+			
+				Boa Vista
+			
+			
+				Manaus
+			
+			
+				Cuiaba
+			
+			
+				Santarem
+			
+			
+				Campo Grande
+			
+			
+				Belem
+			
+			
+				Araguaina
+			
+			
+				Sao Paulo
+			
+			
+				Bahia
+			
+			
+				Fortaleza
+			
+			
+				Maceio
+			
+			
+				Recife
+			
+			
+				Noronha
+			
+			
+				Nassau
+			
+			
+				Thimphu
+			
+			
+				Gaborone
+			
+			
+				Minsk
+			
+			
+				Belize
+			
+			
+				Dawson
+			
+			
+				Whitehorse
+			
+			
+				Inuvik
+			
+			
+				Vancouver
+			
+			
+				Dawson Creek
+			
+			
+				Creston
+			
+			
+				Yellowknife
+			
+			
+				Edmonton
+			
+			
+				Swift Current
+			
+			
+				Cambridge Bay
+			
+			
+				Regina
+			
+			
+				Winnipeg
+			
+			
+				Resolute
+			
+			
+				Rainy River
+			
+			
+				Rankin Inlet
+			
+			
+				Atikokan
+			
+			
+				Thunder Bay
+			
+			
+				Nipigon
+			
+			
+				Toronto
+			
+			
+				Iqaluit
+			
+			
+				Pangnirtung
+			
+			
+				Moncton
+			
+			
+				Halifax
+			
+			
+				Goose Bay
+			
+			
+				Glace Bay
+			
+			
+				Blanc-Sablon
+			
+			
+				Cocos
+			
+			
+				Kinshasa
+			
+			
+				Lubumbashi
+			
+			
+				Bangui
+			
+			
+				Brazzaville
+			
+			
+				Zurich
+			
+			
+				Abidjan
+			
+			
+				Rarotonga
+			
+			
+				Easter
+			
+			
+				Santiago
+			
+			
+				Douala
+			
+			
+				Urumqi
+			
+			
+				Shanghai
+			
+			
+				Bogota
+			
+			
+				Costa Rica
+			
+			
+				Havana
+			
+			
+				Cape Verde
+			
+			
+				Christmas
+			
+			
+				Nicosia
+			
+			
+				Prague
+			
+			
+				Busingen
+			
+			
+				Berlin
+			
+			
+				Djibouti
+			
+			
+				Copenhagen
+			
+			
+				Dominica
+			
+			
+				Santo Domingo
+			
+			
+				Algiers
+			
+			
+				Galapagos
+			
+			
+				Guayaquil
+			
+			
+				Tallinn
+			
+			
+				Cairo
+			
+			
+				El Aaiun
+			
+			
+				Asmara
+			
+			
+				Canary
+			
+			
+				Ceuta
+			
+			
+				Madrid
+			
+			
+				Addis Ababa
+			
+			
+				Helsinki
+			
+			
+				Fiji
+			
+			
+				Stanley
+			
+			
+				Chuuk
+			
+			
+				Pohnpei
+			
+			
+				Kosrae
+			
+			
+				Faroe
+			
+			
+				Paris
+			
+			
+				Libreville
 			
 			
 				
 					BST
 				
+				London
 			
-			
-				St Kitts
+			
+				Grenada
 			
-			
-				St Lucia
+			
+				Tbilisi
 			
-			
-				St Helena
+			
+				Cayenne
 			
-			
-				St Vincent
+			
+				Guernsey
 			
-			
-				St Thomas
+			
+				Accra
+			
+			
+				Gibraltar
+			
+			
+				Thule
+			
+			
+				Nuuk
+			
+			
+				Ittoqqortoormiit
+			
+			
+				Danmarkshavn
+			
+			
+				Banjul
+			
+			
+				Conakry
+			
+			
+				Guadeloupe
+			
+			
+				Malabo
+			
+			
+				Athens
+			
+			
+				South Georgia
+			
+			
+				Guatemala
+			
+			
+				Guam
+			
+			
+				Bissau
+			
+			
+				Guyana
+			
+			
+				Hong Kong
+			
+			
+				Tegucigalpa
+			
+			
+				Zagreb
+			
+			
+				Port-au-Prince
+			
+			
+				Budapest
+			
+			
+				Jakarta
+			
+			
+				Pontianak
+			
+			
+				Makassar
+			
+			
+				Jayapura
+			
+			
+				Dublin
+			
+			
+				Jerusalem
+			
+			
+				Isle of Man
+			
+			
+				Kolkata
+			
+			
+				Chagos
+			
+			
+				Baghdad
+			
+			
+				Tehran
+			
+			
+				Reykjavik
+			
+			
+				Rome
+			
+			
+				Jersey
+			
+			
+				Jamaica
+			
+			
+				Amman
+			
+			
+				Tokyo
+			
+			
+				Nairobi
+			
+			
+				Bishkek
+			
+			
+				Phnom Penh
+			
+			
+				Enderbury
+			
+			
+				Kiritimati
+			
+			
+				Tarawa
+			
+			
+				Comoro
+			
+			
+				Pyongyang
+			
+			
+				Seoul
+			
+			
+				Kuwait
+			
+			
+				Cayman
+			
+			
+				Aqtau
+			
+			
+				Oral
+			
+			
+				Aqtobe
+			
+			
+				Qyzylorda
+			
+			
+				Almaty
+			
+			
+				Vientiane
+			
+			
+				Beirut
+			
+			
+				Vaduz
+			
+			
+				Colombo
+			
+			
+				Monrovia
+			
+			
+				Maseru
+			
+			
+				Vilnius
+			
+			
+				Luxembourg
+			
+			
+				Riga
+			
+			
+				Tripoli
+			
+			
+				Casablanca
+			
+			
+				Monaco
+			
+			
+				Chisinau
+			
+			
+				Podgorica
+			
+			
+				Marigot
+			
+			
+				Antananarivo
+			
+			
+				Kwajalein
+			
+			
+				Majuro
+			
+			
+				Skopje
+			
+			
+				Bamako
+			
+			
+				Hovd
+			
+			
+				Ulaanbaatar
+			
+			
+				Choibalsan
+			
+			
+				Saipan
+			
+			
+				Martinique
+			
+			
+				Nouakchott
+			
+			
+				Montserrat
+			
+			
+				Malta
+			
+			
+				Mauritius
+			
+			
+				Maldives
+			
+			
+				Blantyre
+			
+			
+				Tijuana
+			
+			
+				Hermosillo
+			
+			
+				Mazatlan
+			
+			
+				Chihuahua
+			
+			
+				Bahia Banderas
+			
+			
+				Ojinaga
+			
+			
+				Monterrey
+			
+			
+				Mexico City
+			
+			
+				Matamoros
+			
+			
+				Merida
+			
+			
+				Cancun
+			
+			
+				Kuala Lumpur
+			
+			
+				Kuching
+			
+			
+				Maputo
+			
+			
+				Windhoek
+			
+			
+				Noumea
+			
+			
+				Niamey
+			
+			
+				Norfolk
+			
+			
+				Lagos
+			
+			
+				Managua
+			
+			
+				Amsterdam
+			
+			
+				Oslo
+			
+			
+				Kathmandu
+			
+			
+				Nauru
+			
+			
+				Niue
+			
+			
+				Chatham
+			
+			
+				Auckland
+			
+			
+				Muscat
+			
+			
+				Panama
+			
+			
+				Lima
+			
+			
+				Tahiti
+			
+			
+				Marquesas
+			
+			
+				Gambier
+			
+			
+				Port Moresby
+			
+			
+				Manila
+			
+			
+				Karachi
+			
+			
+				Warsaw
+			
+			
+				Miquelon
+			
+			
+				Pitcairn
+			
+			
+				Puerto Rico
+			
+			
+				Gaza
+			
+			
+				Hebron
+			
+			
+				Azores
+			
+			
+				Madeira
+			
+			
+				Lisbon
+			
+			
+				Palau
+			
+			
+				Qatar
+			
+			
+				Bucharest
+			
+			
+				Belgrade
+			
+			
+				Kaliningrad
+			
+			
+				Simferopol
+			
+			
+				Moscow
+			
+			
+				Volgograd
+			
+			
+				Samara
+			
+			
+				Yekaterinburg
+			
+			
+				Omsk
+			
+			
+				Novosibirsk
+			
+			
+				Novokuznetsk
+			
+			
+				Krasnoyarsk
+			
+			
+				Irkutsk
+			
+			
+				Yakutsk
+			
+			
+				Vladivostok
+			
+			
+				Khandyga
+			
+			
+				Sakhalin
+			
+			
+				Ust-Nera
+			
+			
+				Magadan
+			
+			
+				Kamchatka
+			
+			
+				Anadyr
+			
+			
+				Kigali
+			
+			
+				Riyadh
+			
+			
+				Guadalcanal
+			
+			
+				Mahe
+			
+			
+				Khartoum
+			
+			
+				Stockholm
+			
+			
+				Singapore
+			
+			
+				Ljubljana
+			
+			
+				Longyearbyen
+			
+			
+				Bratislava
+			
+			
+				Freetown
+			
+			
+				San Marino
+			
+			
+				Dakar
+			
+			
+				Mogadishu
+			
+			
+				Paramaribo
+			
+			
+				Juba
+			
+			
+				El Salvador
+			
+			
+				Lower Prince’s Quarter
+			
+			
+				Damascus
+			
+			
+				Mbabane
+			
+			
+				Grand Turk
+			
+			
+				Ndjamena
+			
+			
+				Kerguelen
+			
+			
+				Lome
+			
+			
+				Bangkok
+			
+			
+				Dushanbe
+			
+			
+				Fakaofo
+			
+			
+				Dili
+			
+			
+				Ashgabat
+			
+			
+				Tunis
+			
+			
+				Tongatapu
+			
+			
+				Istanbul
+			
+			
+				Port of Spain
+			
+			
+				Funafuti
+			
+			
+				Taipei
+			
+			
+				Dar es Salaam
+			
+			
+				Zaporozhye
+			
+			
+				Kampala
+			
+			
+				Midway
+			
+			
+				Wake
+			
+			
+				Adak
+			
+			
+				Nome
+			
+			
+				Anchorage
+			
+			
+				Yakutat
+			
+			
+				Sitka
+			
+			
+				Juneau
+			
+			
+				Metlakatla
+			
+			
+				Los Angeles
+			
+			
+				Boise
+			
+			
+				Phoenix
+			
+			
+				Denver
+			
+			
+				Beulah, North Dakota
+			
+			
+				New Salem, North Dakota
+			
+			
+				Center, North Dakota
+			
+			
+				Chicago
+			
+			
+				Menominee
+			
+			
+				Vincennes, Indiana
+			
+			
+				Petersburg, Indiana
+			
+			
+				Tell City, Indiana
+			
+			
+				Knox, Indiana
+			
+			
+				Winamac, Indiana
+			
+			
+				Marengo, Indiana
+			
+			
+				Indianapolis
+			
+			
+				Louisville
+			
+			
+				Vevay, Indiana
+			
+			
+				Monticello, Kentucky
+			
+			
+				Detroit
+			
+			
+				New York
+			
+			
+				Montevideo
+			
+			
+				Samarkand
+			
+			
+				Tashkent
+			
+			
+				Vatican
+			
+			
+				Caracas
+			
+			
+				Tortola
+			
+			
+				Efate
+			
+			
+				Wallis
+			
+			
+				Apia
+			
+			
+				Aden
+			
+			
+				Johannesburg
+			
+			
+				Lusaka
+			
+			
+				Harare
 			
-			
-				
-					Central Australia Time
-					Australian Central Standard Time
-				
-			
 			
 				
 					CET
@@ -227,68 +1488,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					WEST
 				
 			
-			
-				
-					St Pierre & Miquelon Time
-					St Pierre & Miquelon Standard Time
-					St Pierre & Miquelon Daylight Time
-				
-			
 		
 	
 	
-		
-			
-				Malagasy ariary
-			
-			
-				St Helena Pound
-				St Helena pound
-				St Helena pounds
-			
-		
+		1
+		
+			{0}–{1}
+		
 	
 	
 		
-			
-				per cent
-				{0} per cent
-				{0} per cent
-			
-			
-				per mille
-				{0} per mille
-				{0} per mille
+			
+				fluid ounces
+				{0} fluid ounce
+				{0} fluid ounces
 			
 		
 		
-			
-				per cent
-			
-			
-				per mille
-			
-			
-				{0} st
-			
-			
-				{0} Ml
+			
+				fl oz
+				{0} fl oz
+				{0} fl oz
 			
 		
+		
+			h:mm
+		
+		
+			h:mm:ss
+		
+		
+			m:ss
+		
 	
-	
-		
-			{0} and {1}
-		
-		
-			{0} or {1}
-		
-		
-			{0} and {1}
-			{0} and {1}
-		
-	
-	
-		maths symbol
-	
 
diff --git a/make/data/cldr/common/main/en_GD.xml b/make/data/cldr/common/main/en_GD.xml
index 9915b18516b..b64ab9f017e 100644
--- a/make/data/cldr/common/main/en_GD.xml
+++ b/make/data/cldr/common/main/en_GD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GG.xml b/make/data/cldr/common/main/en_GG.xml
index d5366b4aab5..156205a08a7 100644
--- a/make/data/cldr/common/main/en_GG.xml
+++ b/make/data/cldr/common/main/en_GG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GH.xml b/make/data/cldr/common/main/en_GH.xml
index 8a6aa615f86..8b11f6cf6de 100644
--- a/make/data/cldr/common/main/en_GH.xml
+++ b/make/data/cldr/common/main/en_GH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GI.xml b/make/data/cldr/common/main/en_GI.xml
index 990e7a73fc3..8233f4cd071 100644
--- a/make/data/cldr/common/main/en_GI.xml
+++ b/make/data/cldr/common/main/en_GI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GM.xml b/make/data/cldr/common/main/en_GM.xml
index b845b4818ac..a599d189e09 100644
--- a/make/data/cldr/common/main/en_GM.xml
+++ b/make/data/cldr/common/main/en_GM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GU.xml b/make/data/cldr/common/main/en_GU.xml
index f8f96e327e6..e7a487b21d8 100644
--- a/make/data/cldr/common/main/en_GU.xml
+++ b/make/data/cldr/common/main/en_GU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_GY.xml b/make/data/cldr/common/main/en_GY.xml
index 8defbfd7648..552d29275d3 100644
--- a/make/data/cldr/common/main/en_GY.xml
+++ b/make/data/cldr/common/main/en_GY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_HK.xml b/make/data/cldr/common/main/en_HK.xml
index 281f896f647..a1597b61807 100644
--- a/make/data/cldr/common/main/en_HK.xml
+++ b/make/data/cldr/common/main/en_HK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -128,11 +128,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				next week
-			
-		
 		
 			
 				
diff --git a/make/data/cldr/common/main/en_IE.xml b/make/data/cldr/common/main/en_IE.xml
index fdfd01576e9..b08ac079d1a 100644
--- a/make/data/cldr/common/main/en_IE.xml
+++ b/make/data/cldr/common/main/en_IE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_IL.xml b/make/data/cldr/common/main/en_IL.xml
index 8ce935cc0a5..9c2bb8c41a1 100644
--- a/make/data/cldr/common/main/en_IL.xml
+++ b/make/data/cldr/common/main/en_IL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_IM.xml b/make/data/cldr/common/main/en_IM.xml
index 20e98b51e01..3446c3b5ede 100644
--- a/make/data/cldr/common/main/en_IM.xml
+++ b/make/data/cldr/common/main/en_IM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_IN.xml b/make/data/cldr/common/main/en_IN.xml
index 0a02cc16ba7..6f2f0f23ecc 100644
--- a/make/data/cldr/common/main/en_IN.xml
+++ b/make/data/cldr/common/main/en_IN.xml
@@ -7,13 +7,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
 			Bengali
+			Moldavian
 		
 		
 			
@@ -50,11 +51,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
 					
 						MMM, y G
 						d MMM, y G
 						E, d MMM, y G
 						d/M
+						E, d/M
 						M/y GGGGG
 						d/M/y G
 						E, d/M/y GGGGG
@@ -105,6 +127,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							EEEE, d MMMM, y
 						
 					
+					
+						
+							d MMMM y
+						
+					
 					
 						
 							dd-MMM-y
@@ -116,7 +143,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 				
+				
+					
+						
+							h:mm:ss a zzzz
+						
+					
+					
+						
+							h:mm:ss a z
+						
+					
+					
+						
+							h:mm:ss a
+						
+					
+					
+						
+							h:mm a
+						
+					
+				
 				
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1} 'at' {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
 					
 						E, h:mm a
 						E, HH:mm
@@ -139,13 +208,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				
-					
-						
-							Rabiʻ II
-						
-					
-				
 				
 					
 						
@@ -174,6 +236,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						d MMM, y G
 						E, d MMM, y G
 						d/M
+						E, d/M
 						M/y GGGGG
 						d/M/y G
 						E d/M/y G
@@ -219,7 +282,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
-					¤ #,##,##0.00
+					¤#,##,##0.00
 				
 			
 			
@@ -263,13 +326,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				VES
 			
 		
+		
+			{0}–{1}
+		
 	
 	
+		
+			
+				°
+				{0}°
+				{0}°
+			
+		
 		
 			
 				{0} kph
 				{0} kph
 			
+			
+				°
+				{0}°
+				{0}°
+			
+			
+				{0}/cm³
+			
 		
 		
 			
diff --git a/make/data/cldr/common/main/en_IO.xml b/make/data/cldr/common/main/en_IO.xml
index 3ed81684006..f371410d618 100644
--- a/make/data/cldr/common/main/en_IO.xml
+++ b/make/data/cldr/common/main/en_IO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_JE.xml b/make/data/cldr/common/main/en_JE.xml
index dc2a40dca9c..39ba487fc91 100644
--- a/make/data/cldr/common/main/en_JE.xml
+++ b/make/data/cldr/common/main/en_JE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_JM.xml b/make/data/cldr/common/main/en_JM.xml
index b37a2a78620..f923c5241f1 100644
--- a/make/data/cldr/common/main/en_JM.xml
+++ b/make/data/cldr/common/main/en_JM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_KE.xml b/make/data/cldr/common/main/en_KE.xml
index bda4cf17724..12d0b17cd51 100644
--- a/make/data/cldr/common/main/en_KE.xml
+++ b/make/data/cldr/common/main/en_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_KI.xml b/make/data/cldr/common/main/en_KI.xml
index 61b3daf82c3..411ab4d9931 100644
--- a/make/data/cldr/common/main/en_KI.xml
+++ b/make/data/cldr/common/main/en_KI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_KN.xml b/make/data/cldr/common/main/en_KN.xml
index e75dba09be1..e12b7f68717 100644
--- a/make/data/cldr/common/main/en_KN.xml
+++ b/make/data/cldr/common/main/en_KN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_KY.xml b/make/data/cldr/common/main/en_KY.xml
index 2bab299cd59..e785432a225 100644
--- a/make/data/cldr/common/main/en_KY.xml
+++ b/make/data/cldr/common/main/en_KY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_LC.xml b/make/data/cldr/common/main/en_LC.xml
index 06335febfc9..3b38e1d0fa1 100644
--- a/make/data/cldr/common/main/en_LC.xml
+++ b/make/data/cldr/common/main/en_LC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_LR.xml b/make/data/cldr/common/main/en_LR.xml
index f063ad004e9..2480e85cafc 100644
--- a/make/data/cldr/common/main/en_LR.xml
+++ b/make/data/cldr/common/main/en_LR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_LS.xml b/make/data/cldr/common/main/en_LS.xml
index 2dc5574dadb..799abafae03 100644
--- a/make/data/cldr/common/main/en_LS.xml
+++ b/make/data/cldr/common/main/en_LS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MG.xml b/make/data/cldr/common/main/en_MG.xml
index 293b80ed48e..fd2ed64d22e 100644
--- a/make/data/cldr/common/main/en_MG.xml
+++ b/make/data/cldr/common/main/en_MG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MH.xml b/make/data/cldr/common/main/en_MH.xml
index e1af36a9a61..546a2c73fa3 100644
--- a/make/data/cldr/common/main/en_MH.xml
+++ b/make/data/cldr/common/main/en_MH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MO.xml b/make/data/cldr/common/main/en_MO.xml
index 9fe549e42e8..7c213e70225 100644
--- a/make/data/cldr/common/main/en_MO.xml
+++ b/make/data/cldr/common/main/en_MO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MP.xml b/make/data/cldr/common/main/en_MP.xml
index dcfa083758f..243a5b63de9 100644
--- a/make/data/cldr/common/main/en_MP.xml
+++ b/make/data/cldr/common/main/en_MP.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MS.xml b/make/data/cldr/common/main/en_MS.xml
index a9d773462f3..92771c85c61 100644
--- a/make/data/cldr/common/main/en_MS.xml
+++ b/make/data/cldr/common/main/en_MS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MT.xml b/make/data/cldr/common/main/en_MT.xml
index f18be57acae..fa8db97996e 100644
--- a/make/data/cldr/common/main/en_MT.xml
+++ b/make/data/cldr/common/main/en_MT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MU.xml b/make/data/cldr/common/main/en_MU.xml
index 3826cf096d9..57d57cd7fba 100644
--- a/make/data/cldr/common/main/en_MU.xml
+++ b/make/data/cldr/common/main/en_MU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MW.xml b/make/data/cldr/common/main/en_MW.xml
index 1ed4d6fea36..dff9a96880a 100644
--- a/make/data/cldr/common/main/en_MW.xml
+++ b/make/data/cldr/common/main/en_MW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_MY.xml b/make/data/cldr/common/main/en_MY.xml
index 7628cca344f..a46201f8f74 100644
--- a/make/data/cldr/common/main/en_MY.xml
+++ b/make/data/cldr/common/main/en_MY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NA.xml b/make/data/cldr/common/main/en_NA.xml
index 91312794216..58dca0384b7 100644
--- a/make/data/cldr/common/main/en_NA.xml
+++ b/make/data/cldr/common/main/en_NA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NF.xml b/make/data/cldr/common/main/en_NF.xml
index d28f2bc8048..aa8bdee75cb 100644
--- a/make/data/cldr/common/main/en_NF.xml
+++ b/make/data/cldr/common/main/en_NF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NG.xml b/make/data/cldr/common/main/en_NG.xml
index 36b1cb937c6..63e3183c7e3 100644
--- a/make/data/cldr/common/main/en_NG.xml
+++ b/make/data/cldr/common/main/en_NG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NL.xml b/make/data/cldr/common/main/en_NL.xml
index 1ae2f72351c..7e1c703f485 100644
--- a/make/data/cldr/common/main/en_NL.xml
+++ b/make/data/cldr/common/main/en_NL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NR.xml b/make/data/cldr/common/main/en_NR.xml
index 66036e3d559..b32572ed625 100644
--- a/make/data/cldr/common/main/en_NR.xml
+++ b/make/data/cldr/common/main/en_NR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NU.xml b/make/data/cldr/common/main/en_NU.xml
index 275b779d86b..1745831a8b1 100644
--- a/make/data/cldr/common/main/en_NU.xml
+++ b/make/data/cldr/common/main/en_NU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_NZ.xml b/make/data/cldr/common/main/en_NZ.xml
index bb20639605c..366a018cb2b 100644
--- a/make/data/cldr/common/main/en_NZ.xml
+++ b/make/data/cldr/common/main/en_NZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_PG.xml b/make/data/cldr/common/main/en_PG.xml
index 273620085ef..cdfb8d4eac7 100644
--- a/make/data/cldr/common/main/en_PG.xml
+++ b/make/data/cldr/common/main/en_PG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_PH.xml b/make/data/cldr/common/main/en_PH.xml
index 3e61b4c1d60..f3c7333d1c2 100644
--- a/make/data/cldr/common/main/en_PH.xml
+++ b/make/data/cldr/common/main/en_PH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_PK.xml b/make/data/cldr/common/main/en_PK.xml
index 82916eb34c1..d92e63c49c3 100644
--- a/make/data/cldr/common/main/en_PK.xml
+++ b/make/data/cldr/common/main/en_PK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_PN.xml b/make/data/cldr/common/main/en_PN.xml
index e6275aa8dfb..50695a03c26 100644
--- a/make/data/cldr/common/main/en_PN.xml
+++ b/make/data/cldr/common/main/en_PN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_PR.xml b/make/data/cldr/common/main/en_PR.xml
index d22face67dd..6238c50dd19 100644
--- a/make/data/cldr/common/main/en_PR.xml
+++ b/make/data/cldr/common/main/en_PR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_PW.xml b/make/data/cldr/common/main/en_PW.xml
index a06409c76d1..d7da3503a2b 100644
--- a/make/data/cldr/common/main/en_PW.xml
+++ b/make/data/cldr/common/main/en_PW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_RW.xml b/make/data/cldr/common/main/en_RW.xml
index 6ed6f014edf..20882081330 100644
--- a/make/data/cldr/common/main/en_RW.xml
+++ b/make/data/cldr/common/main/en_RW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SB.xml b/make/data/cldr/common/main/en_SB.xml
index 2e12bc3a06f..a21c826c2fd 100644
--- a/make/data/cldr/common/main/en_SB.xml
+++ b/make/data/cldr/common/main/en_SB.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SC.xml b/make/data/cldr/common/main/en_SC.xml
index 7c61ea424c1..3ee15530715 100644
--- a/make/data/cldr/common/main/en_SC.xml
+++ b/make/data/cldr/common/main/en_SC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SD.xml b/make/data/cldr/common/main/en_SD.xml
index 9f536651609..2eef4180d3c 100644
--- a/make/data/cldr/common/main/en_SD.xml
+++ b/make/data/cldr/common/main/en_SD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SE.xml b/make/data/cldr/common/main/en_SE.xml
index f4d7e551717..44826f8df61 100644
--- a/make/data/cldr/common/main/en_SE.xml
+++ b/make/data/cldr/common/main/en_SE.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/en_SG.xml b/make/data/cldr/common/main/en_SG.xml
index 961133d0ee3..bcc1c2be05c 100644
--- a/make/data/cldr/common/main/en_SG.xml
+++ b/make/data/cldr/common/main/en_SG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -94,11 +94,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				last yr
-				this yr
-				next yr
-			
 			
 				last qtr
 				this qtr
@@ -126,11 +121,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} mth ago
 				
 			
-			
-				last wk
-				this wk
-				next wk
-			
 		
 		
 			
diff --git a/make/data/cldr/common/main/en_SH.xml b/make/data/cldr/common/main/en_SH.xml
index c2e946f766f..9f0a63112ae 100644
--- a/make/data/cldr/common/main/en_SH.xml
+++ b/make/data/cldr/common/main/en_SH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SI.xml b/make/data/cldr/common/main/en_SI.xml
index 79ded22f145..7827b71fc62 100644
--- a/make/data/cldr/common/main/en_SI.xml
+++ b/make/data/cldr/common/main/en_SI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SL.xml b/make/data/cldr/common/main/en_SL.xml
index 36a1335b689..1ae14a90dd1 100644
--- a/make/data/cldr/common/main/en_SL.xml
+++ b/make/data/cldr/common/main/en_SL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SS.xml b/make/data/cldr/common/main/en_SS.xml
index 3ff086cd713..93f5b69e76f 100644
--- a/make/data/cldr/common/main/en_SS.xml
+++ b/make/data/cldr/common/main/en_SS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SX.xml b/make/data/cldr/common/main/en_SX.xml
index 0ba8502cc71..1de8fcb550a 100644
--- a/make/data/cldr/common/main/en_SX.xml
+++ b/make/data/cldr/common/main/en_SX.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_SZ.xml b/make/data/cldr/common/main/en_SZ.xml
index 046d75239e7..8357eb86351 100644
--- a/make/data/cldr/common/main/en_SZ.xml
+++ b/make/data/cldr/common/main/en_SZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_TC.xml b/make/data/cldr/common/main/en_TC.xml
index 7bd39c89ef3..08973cc59cc 100644
--- a/make/data/cldr/common/main/en_TC.xml
+++ b/make/data/cldr/common/main/en_TC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_TK.xml b/make/data/cldr/common/main/en_TK.xml
index c5eb5c33512..055a86393e8 100644
--- a/make/data/cldr/common/main/en_TK.xml
+++ b/make/data/cldr/common/main/en_TK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_TO.xml b/make/data/cldr/common/main/en_TO.xml
index e4b0b6f5969..a59238c4d5e 100644
--- a/make/data/cldr/common/main/en_TO.xml
+++ b/make/data/cldr/common/main/en_TO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_TT.xml b/make/data/cldr/common/main/en_TT.xml
index fd7e239fc77..4ec900aabea 100644
--- a/make/data/cldr/common/main/en_TT.xml
+++ b/make/data/cldr/common/main/en_TT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_TV.xml b/make/data/cldr/common/main/en_TV.xml
index 30b35c47802..17e13dd75b8 100644
--- a/make/data/cldr/common/main/en_TV.xml
+++ b/make/data/cldr/common/main/en_TV.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_TZ.xml b/make/data/cldr/common/main/en_TZ.xml
index c5072f2d085..b451ec52281 100644
--- a/make/data/cldr/common/main/en_TZ.xml
+++ b/make/data/cldr/common/main/en_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_UG.xml b/make/data/cldr/common/main/en_UG.xml
index dd8d5542b36..cc58aba2c36 100644
--- a/make/data/cldr/common/main/en_UG.xml
+++ b/make/data/cldr/common/main/en_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_UM.xml b/make/data/cldr/common/main/en_UM.xml
index 4f41a96be71..542c94e7b67 100644
--- a/make/data/cldr/common/main/en_UM.xml
+++ b/make/data/cldr/common/main/en_UM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_US.xml b/make/data/cldr/common/main/en_US.xml
index 25c2420d0d7..abfc0df81dd 100644
--- a/make/data/cldr/common/main/en_US.xml
+++ b/make/data/cldr/common/main/en_US.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_US_POSIX.xml b/make/data/cldr/common/main/en_US_POSIX.xml
index 0f120f4b1dd..7de2a800810 100644
--- a/make/data/cldr/common/main/en_US_POSIX.xml
+++ b/make/data/cldr/common/main/en_US_POSIX.xml
@@ -6,22 +6,14 @@ Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
-	
 	
-		
+		
 		
 		
 		
 	
 	
-		[\- , . / % + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . / % + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/en_VC.xml b/make/data/cldr/common/main/en_VC.xml
index 79315937f65..5c38871d7a6 100644
--- a/make/data/cldr/common/main/en_VC.xml
+++ b/make/data/cldr/common/main/en_VC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_VG.xml b/make/data/cldr/common/main/en_VG.xml
index 5d0f55a2afe..67dcf621586 100644
--- a/make/data/cldr/common/main/en_VG.xml
+++ b/make/data/cldr/common/main/en_VG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_VI.xml b/make/data/cldr/common/main/en_VI.xml
index 3e8b388a82d..a4b107dba9b 100644
--- a/make/data/cldr/common/main/en_VI.xml
+++ b/make/data/cldr/common/main/en_VI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_VU.xml b/make/data/cldr/common/main/en_VU.xml
index da65d081a40..dddfc5a541e 100644
--- a/make/data/cldr/common/main/en_VU.xml
+++ b/make/data/cldr/common/main/en_VU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_WS.xml b/make/data/cldr/common/main/en_WS.xml
index df3aebcf484..0d8013a6382 100644
--- a/make/data/cldr/common/main/en_WS.xml
+++ b/make/data/cldr/common/main/en_WS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_ZA.xml b/make/data/cldr/common/main/en_ZA.xml
index 4d509a34a9b..0a444364b9a 100644
--- a/make/data/cldr/common/main/en_ZA.xml
+++ b/make/data/cldr/common/main/en_ZA.xml
@@ -7,13 +7,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		[á à ă â å ä ā æ ç ḓ é è ĕ ê ë ē í ì ĭ î ï ī ḽ ñ ṅ ṋ ó ò ŏ ô ö ø ō œ š ṱ ú ù ŭ û ü ū ÿ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/en_ZM.xml b/make/data/cldr/common/main/en_ZM.xml
index c1757f14291..bb7fcd1c99b 100644
--- a/make/data/cldr/common/main/en_ZM.xml
+++ b/make/data/cldr/common/main/en_ZM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/en_ZW.xml b/make/data/cldr/common/main/en_ZW.xml
index 67917819afd..b19a0a7cfdd 100644
--- a/make/data/cldr/common/main/en_ZW.xml
+++ b/make/data/cldr/common/main/en_ZW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/eo.xml b/make/data/cldr/common/main/eo.xml
index 4eccccaa08a..9b4aae992b4 100644
--- a/make/data/cldr/common/main/eo.xml
+++ b/make/data/cldr/common/main/eo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -337,7 +337,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldavujo
 			Madagaskaro
 			Marŝaloj
-			Makedonujo
 			Malio
 			Mjanmao
 			Mongolujo
@@ -458,7 +457,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[q w x y]
 		[A B C Ĉ D E F G Ĝ H Ĥ I J Ĵ K L M N O P R S Ŝ T U Ŭ V Z]
 		[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] \{ \} /]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] \{ \} /]
 		{0}…
 		…{0}
 		{0}…{1}
diff --git a/make/data/cldr/common/main/eo_001.xml b/make/data/cldr/common/main/eo_001.xml
index 2e5853a2180..fe3717ec927 100644
--- a/make/data/cldr/common/main/eo_001.xml
+++ b/make/data/cldr/common/main/eo_001.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es.xml b/make/data/cldr/common/main/es.xml
index 7810bb61a85..45fff5a6773 100644
--- a/make/data/cldr/common/main/es.xml
+++ b/make/data/cldr/common/main/es.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -90,6 +90,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			caribe
 			cayuga
 			atsam
+			chakma
 			checheno
 			cebuano
 			chiga
@@ -146,9 +147,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			inglés australiano
 			inglés canadiense
 			inglés británico
-			inglés (RU)
 			inglés estadounidense
-			inglés (EE. UU.)
 			inglés medio
 			esperanto
 			español
@@ -388,7 +387,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			osético
 			osage
 			turco otomano
-			panyabí
+			punyabí
 			pangasinán
 			pahlavi
 			pampanga
@@ -544,14 +543,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			yidis
 			yoruba
 			cantonés
+			chino cantonés
 			zhuang
 			zapoteco
 			símbolos Bliss
 			zenaga
 			tamazight estándar marroquí
 			chino
+			chino mandarín
 			chino simplificado
+			chino mandarín simplificado
 			chino tradicional
+			chino mandarín tradicional
 			zulú
 			zuñi
 			sin contenido lingüístico
@@ -949,7 +952,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Siria
 			Esuatini
-			Suazilandia
+			Suazilandia
 			Tristán de Acuña
 			Islas Turcas y Caicos
 			Chad
@@ -985,6 +988,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis y Futuna
 			Samoa
+			Pseudoacentos
+			Pseudobidi
 			Kosovo
 			Yemen
 			Mayotte
@@ -1031,22 +1036,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			calendario
 			formato de moneda
-			Orden ignorando símbolos
-			Orden de acentos con inversión
-			Orden de mayúsculas/minúsculas
-			Orden con distinción entre mayúsculas y minúsculas
+			orden ignorando símbolos
+			orden de acentos con inversión
+			orden de mayúsculas/minúsculas
+			orden con distinción entre mayúsculas y minúsculas
 			orden
-			Orden con normalización
-			Orden numérico
-			Intensidad de orden
+			orden con normalización
+			orden numérico
+			intensidad de orden
 			moneda
 			ciclo horario (12 o 24 horas)
 			estilo de salto de línea
 			sistema de medición
 			números
-			Zona horaria
-			Variante local
-			Uso privado
+			zona horaria
+			variante local
+			uso privado
 		
 		
 			calendario budista
@@ -1195,11 +1200,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
-		[a á b c d e é f g h i í ï j k l m n ñ o ó p q r s t u ú ü v w x y ý z]
-		[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ī º ò ŏ ô ö ø ō œ ù ŭ û ū ÿ]
+		[a á b c d e é f g h i í j k l m n ñ o ó p q r s t u ú ü v w x y z]
+		[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī º ò ŏ ô ö ø ō œ ù ŭ û ū ý ÿ]
 		[A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \\ \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \\ \& # † ‡ ′ ″]
 		{0}…
 		… {0}
 		{0}… {1}
@@ -1208,14 +1213,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0}… {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1226,6 +1239,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1302,6 +1328,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mesra
 							nasie
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tout
 							baba
@@ -1334,6 +1375,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mesra
 							nasie
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tout
 							baba
@@ -1351,6 +1407,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1370,6 +1440,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							nehasse
 							pagumen
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							meskerem
 							tekemt
@@ -1402,6 +1487,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							nehasse
 							pagumen
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							meskerem
 							tekemt
@@ -1419,6 +1519,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1515,58 +1629,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0}–{1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M-y GGGGG – M-y GGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+							M-y GGGGG – M-y GGGG
+							M-y – M-y GGGGG
+							M-y – M-y GGGGG
 						
 						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
+							d-M-y GGGGG – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
 						
 						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
+							E d-M-y GGGGG – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
 						
 						
-							MMM 'de' y G – MMM 'de' y G
-							MMM–MMM 'de' y G
-							MMM 'de' y – MMM 'de' y G
+							MMM 'de' y G – MMM 'de' y G
+							MMM–MMM 'de' y G
+							MMM 'de' y – MMM 'de' y G
 						
 						
-							d–d 'de' MMM 'de' y G
-							d 'de' MMM 'de' y G – d 'de' MMM 'de' y G
-							d 'de' MMM – d 'de' MMM 'de' y G
-							d 'de' MMM 'de' y – d 'de' MMM 'de' y G
+							d–d 'de' MMM 'de' y G
+							d 'de' MMM 'de' y G – d 'de' MMM 'de' y G
+							d 'de' MMM – d 'de' MMM 'de' y G
+							d 'de' MMM 'de' y – d 'de' MMM 'de' y G
 						
 						
-							E d 'de' MMM – E d 'de' MMM 'de' y G
-							E d 'de' MMM 'de' y G – E d 'de' MMM 'de' y G
-							E d 'de' MMM – E d 'de' MMM 'de' y G
-							E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G
+							E d 'de' MMM – E d 'de' MMM 'de' y G
+							E d 'de' MMM 'de' y G – E d 'de' MMM 'de' y G
+							E d 'de' MMM – E d 'de' MMM 'de' y G
+							E d 'de' MMM 'de' y – E d 'de' MMM 'de' y G
 						
 						
 							h a – h a
+							h–h a
 						
 						
 							HH–HH
@@ -1591,6 +1697,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a – h a v
+							h–h a v
 						
 						
 							HH–HH v
@@ -2071,55 +2178,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0}–{1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y–y G
+							y G – y G
+							y–y G
 						
 						
-							y-MM GGGGG – y-MM GGGGG
-							y-MM – y-MM GGGGG
-							y-MM – y-MM GGGGG
+							y-MM GGGGG – y-MM GGGGG
+							y-MM – y-MM GGGGG
+							y-MM – y-MM GGGGG
 						
 						
-							y-MM-dd – y-MM-dd GGGGG
-							y-MM-dd GGGGG – y-MM-dd GGGGG
-							y-MM-dd – y-MM-dd GGGGG
-							y-MM-dd – y-MM-dd GGGGG
+							y-MM-dd – y-MM-dd GGGGG
+							y-MM-dd GGGGG – y-MM-dd GGGGG
+							y-MM-dd – y-MM-dd GGGGG
+							y-MM-dd – y-MM-dd GGGGG
 						
 						
-							E y-MM-dd – E y-MM-dd GGGGG
-							E y-MM-dd GGGGG – E y-MM-dd GGGGG
-							E y-MM-dd – E y-MM-dd GGGGG
-							E y-MM-dd – E y-MM-dd GGGGG
+							E y-MM-dd – E y-MM-dd GGGGG
+							E y-MM-dd GGGGG – E y-MM-dd GGGGG
+							E y-MM-dd – E y-MM-dd GGGGG
+							E y-MM-dd – E y-MM-dd GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM–MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
 						
 						
-							MMM d–d y G
-							MMM d y G – MMM d y G
-							MMM d – MMM d y G
-							MMM d y – MMM d y G
+							MMM d–d y G
+							MMM d y G – MMM d y G
+							MMM d – MMM d y G
+							MMM d y – MMM d y G
 						
 						
-							E d MMM – E d MMM, y G
-							E, MMM d, y G – E, MMM d, y G
-							E d MMM – E d MMM, y G
-							E d MMM, y – E d MMM, y G
+							E d MMM – E d MMM, y G
+							E, MMM d, y G – E, MMM d, y G
+							E d MMM – E d MMM, y G
+							E d MMM, y – E d MMM, y G
 						
 						
 							h a – h a
@@ -2250,6 +2348,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							av
 							elul
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tishri
 							heshvan
@@ -2284,6 +2398,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							av
 							elul
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tishri
 							heshvan
@@ -2302,6 +2432,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2320,6 +2461,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							magha
 							phalguna
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							chaitra
 							vaisakha
@@ -2350,6 +2505,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							magha
 							phalguna
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							chaitra
 							vaisakha
@@ -2395,6 +2564,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							dhuʻl-q.
 							dhuʻl-h.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							muharram
 							safar
@@ -2425,6 +2608,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							dhuʻl-q.
 							dhuʻl-h.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							muharram
 							safar
@@ -2441,6 +2638,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2483,6 +2691,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							bahman
 							esfand
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							farvardin
 							ordibehesht
@@ -2513,6 +2735,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							bahman
 							esfand
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							farvardin
 							ordibehesht
@@ -2529,6 +2765,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -2694,6 +2941,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
+				sem. ant.
+				esta sem.
+				próx. sem.
 				
 					dentro de {0} sem.
 					dentro de {0} sem.
@@ -2706,6 +2956,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
+				sem. ant.
+				esta sem.
+				próx. sem.
 				
 					dentro de {0} sem.
 					dentro de {0} sem.
@@ -3658,7 +3911,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Asmara
 			
 			
-				Islas Canarias
+				Canarias
 			
 			
 				Ceuta
@@ -3880,7 +4133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktobe
 			
 			
-				Kostanái
+				Kostanái
 			
 			
 				Kyzylorda
@@ -4867,7 +5120,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					hora de las Tierras Australes y Antárticas Francesas
+					hora de Antártida y Territorios Australes Franceses
 				
 			
 			
@@ -5147,7 +5400,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					hora de Myanmar (Birmania)
+					hora de Myanmar
 				
 			
 			
@@ -5478,6 +5731,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5486,6 +5741,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 mil
@@ -5607,6 +5867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dírham de los Emiratos Árabes Unidos
 				dírham de los Emiratos Árabes Unidos
 				dírhams de los Emiratos Árabes Unidos
+				AED
 			
 			
 				afgani (1927–2002)
@@ -5615,16 +5876,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afgani
 				afgani
 				afganis
+				AFN
 			
 			
 				lek
 				lek
 				lekes
+				ALL
 			
 			
 				dram
 				dram
 				drams
+				AMD
 			
 			
 				florín de las Antillas Neerlandesas
@@ -5636,6 +5900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuanza
 				kuanza
 				kuanzas
+				AOA
 				Kz
 			
 			
@@ -5661,6 +5926,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso argentino
 				peso argentino
 				pesos argentinos
+				ARS
 				$
 			
 			
@@ -5679,6 +5945,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				florín arubeño
 				florín arubeño
 				florines arubeños
+				AWG
 			
 			
 				manat azerí (1993–2006)
@@ -5687,6 +5954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manat azerbaiyano
 				manat azerbaiyano
 				manat azerbaiyanos
+				AZN
 			
 			
 				dinar bosnio
@@ -5697,18 +5965,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marco convertible de Bosnia y Herzegovina
 				marco convertible de Bosnia y Herzegovina
 				marcos convertibles de Bosnia y Herzegovina
+				BAM
 				KM
 			
 			
 				dólar barbadense
 				dólar barbadense
 				dólares barbadenses
+				BBD
 				$
 			
 			
 				taka
 				taka
 				takas
+				BDT
 				৳
 			
 			
@@ -5735,33 +6006,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lev búlgaro
 				lev búlgaro
 				levas búlgaras
+				BGN
 			
 			
 				dinar bahreiní
 				dinar bahreiní
 				dinares bahreiníes
+				BHD
 			
 			
 				franco burundés
 				franco burundés
 				francos burundeses
+				BIF
 			
 			
 				dólar de Bermudas
 				dólar de Bermudas
 				dólares de Bermudas
+				BMD
 				$
 			
 			
 				dólar bruneano
 				dólar bruneano
 				dólares bruneanos
+				BND
 				$
 			
 			
 				boliviano
 				boliviano
 				bolivianos
+				BOB
 				Bs
 			
 			
@@ -5810,12 +6087,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dólar bahameño
 				dólar bahameño
 				dólares bahameños
+				BSD
 				$
 			
 			
 				gultrum
 				gultrum
 				gultrums
+				BTN
 			
 			
 				kyat birmano
@@ -5826,6 +6105,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pula
 				pula
 				pulas
+				BWP
 				P
 			
 			
@@ -5837,29 +6117,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rublo bielorruso
 				rublo bielorruso
 				rublos bielorrusos
+				BYN
 				р.
 			
 			
 				rublo bielorruso (2000–2016)
 				rublo bielorruso (2000–2016)
 				rublos bielorrusos (2000–2016)
+				BYR
 			
 			
 				dólar beliceño
 				dólar beliceño
 				dólares beliceños
+				BZD
 				$
 			
 			
 				dólar canadiense
 				dólar canadiense
 				dólares canadienses
+				CA$
 				$
 			
 			
 				franco congoleño
 				franco congoleño
 				francos congoleños
+				CDF
 			
 			
 				euro WIR
@@ -5870,6 +6155,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franco suizo
 				franco suizo
 				francos suizos
+				CHF
 			
 			
 				franco WIR
@@ -5885,6 +6171,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso chileno
 				peso chileno
 				pesos chilenos
+				CLP
 				$
 			
 			
@@ -5904,6 +6191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso colombiano
 				peso colombiano
 				pesos colombianos
+				COP
 				$
 			
 			
@@ -5915,6 +6203,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				colón costarricense
 				colón costarricense
 				colones costarricenses
+				CRC
 				₡
 			
 			
@@ -5931,18 +6220,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso cubano convertible
 				peso cubano convertible
 				pesos cubanos convertibles
+				CUC
 				$
 			
 			
 				peso cubano
 				peso cubano
 				pesos cubanos
+				CUP
 				$
 			
 			
 				escudo de Cabo Verde
 				escudo de Cabo Verde
 				escudos de Cabo Verde
+				CVE
 			
 			
 				libra chipriota
@@ -5953,6 +6245,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				corona checa
 				corona checa
 				coronas checas
+				CZK
 				Kč
 			
 			
@@ -5969,23 +6262,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franco yibutiano
 				franco yibutiano
 				francos yibutianos
+				DJF
 			
 			
 				corona danesa
 				corona danesa
 				coronas danesas
+				DKK
 				kr
 			
 			
 				peso dominicano
 				peso dominicano
 				pesos dominicanos
+				DOP
 				$
 			
 			
 				dinar argelino
 				dinar argelino
 				dinares argelinos
+				DZD
 			
 			
 				sucre ecuatoriano
@@ -6006,12 +6303,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libra egipcia
 				libra egipcia
 				libras egipcias
+				EGP
 				EGP
 			
 			
 				nakfa
 				nakfa
 				nakfas
+				ERN
 			
 			
 				peseta española (cuenta A)
@@ -6033,6 +6332,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bir
 				bir
 				bires
+				ETB
 			
 			
 				euro
@@ -6050,12 +6350,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dólar fiyiano
 				dólar fiyiano
 				dólares fiyianos
+				FJD
 				$
 			
 			
 				libra malvinense
 				libra malvinense
 				libras malvinenses
+				FKP
 				£
 			
 			
@@ -6077,6 +6379,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lari
 				lari
 				laris
+				GEL
 				₾
 				₾
 			
@@ -6087,21 +6390,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cedi
 				cedi
 				cedis
+				GHS
 			
 			
 				libra gibraltareña
 				libra gibraltareña
 				libras gibraltareñas
+				GIP
+				£
 			
 			
 				dalasi
 				dalasi
 				dalasis
+				GMD
 			
 			
 				franco guineano
 				franco guineano
 				francos guineanos
+				GNF
 				FG
 			
 			
@@ -6121,6 +6429,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				quetzal guatemalteco
 				quetzal guatemalteco
 				quetzales guatemaltecos
+				GTQ
 				Q
 			
 			
@@ -6133,6 +6442,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dólar guyanés
 				dólar guyanés
 				dólares guyaneses
+				GYD
 				$
 			
 			
@@ -6146,6 +6456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lempira hondureño
 				lempira hondureño
 				lempiras hondureños
+				HNL
 				L
 			
 			
@@ -6157,23 +6468,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuna
 				kuna
 				kunas
+				HRK
 				kn
 			
 			
 				gourde haitiano
 				gourde haitiano
 				gourdes haitianos
+				HTG
 			
 			
 				forinto húngaro
 				forinto húngaro
 				forintos húngaros
+				HUF
 				Ft
 			
 			
 				rupia indonesia
 				rupia indonesia
 				rupias indonesias
+				IDR
 				Rp
 			
 			
@@ -6204,16 +6519,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar iraquí
 				dinar iraquí
 				dinares iraquíes
+				IQD
 			
 			
 				rial iraní
 				rial iraní
 				riales iraníes
+				IRR
 			
 			
 				corona islandesa
 				corona islandesa
 				coronas islandesas
+				ISK
 				kr
 			
 			
@@ -6225,12 +6543,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dólar jamaicano
 				dólar jamaicano
 				dólares jamaicanos
+				JMD
 				$
 			
 			
 				dinar jordano
 				dinar jordano
 				dinares jordanos
+				JOD
 			
 			
 				yen
@@ -6243,27 +6563,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chelín keniano
 				chelín keniano
 				chelines kenianos
+				KES
 			
 			
 				som
 				som
 				soms
+				KGS
 			
 			
 				riel
 				riel
 				rieles
+				KHR
 				៛
 			
 			
 				franco comorense
 				franco comorense
 				francos comorenses
+				KMF
+				CF
 			
 			
 				won norcoreano
 				won norcoreano
 				wons norcoreanos
+				KPW
 				₩
 			
 			
@@ -6277,41 +6603,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar kuwaití
 				dinar kuwaití
 				dinares kuwaitíes
+				KWD
 			
 			
 				dólar de las Islas Caimán
 				dólar de las Islas Caimán
 				dólares de las Islas Caimán
+				KYD
 				$
 			
 			
 				tenge kazako
 				tenge kazako
 				tenges kazakos
+				KZT
 				₸
 			
 			
 				kip
 				kip
 				kips
+				LAK
 				₭
 			
 			
 				libra libanesa
 				libra libanesa
 				libras libanesas
+				LBP
 				L£
 			
 			
 				rupia esrilanquesa
 				rupia esrilanquesa
 				rupias esrilanquesas
+				LKR
 				Rs
 			
 			
 				dólar liberiano
 				dólar liberiano
 				dólares liberianos
+				LRD
 				$
 			
 			
@@ -6321,6 +6654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litas lituano
 				litas lituana
 				litas lituanas
+				LTL
 			
 			
 				talonas lituano
@@ -6346,6 +6680,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lats letón
 				lats letón
 				lats letónes
+				LVL
 			
 			
 				rublo letón
@@ -6356,11 +6691,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar libio
 				dinar libio
 				dinares libios
+				LYD
 			
 			
 				dírham marroquí
 				dírham marroquí
 				dírhams marroquíes
+				MAD
 			
 			
 				franco marroquí
@@ -6371,11 +6708,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu moldavo
 				leu moldavo
 				lei moldavos
+				MDL
 			
 			
 				ariari
 				ariari
 				ariaris
+				MGA
 				Ar
 			
 			
@@ -6385,6 +6724,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar macedonio
 				dinar macedonio
 				dinares macedonios
+				MKD
 			
 			
 				franco malí
@@ -6393,28 +6733,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kiat
 				kiat
 				kiats
+				MMK
 				K
 			
 			
 				tugrik
 				tugrik
 				tugriks
+				MNT
 				₮
 			
 			
 				pataca de Macao
 				pataca de Macao
 				patacas de Macao
+				MOP
 			
 			
 				uguiya (1973–2017)
 				uguiya (1973–2017)
 				uguiyas (1973–2017)
+				MRO
 			
 			
 				uguiya
 				uguiya
 				uguiyas
+				MRU
 			
 			
 				lira maltesa
@@ -6430,17 +6775,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupia mauriciana
 				rupia mauriciana
 				rupias mauricianas
+				MUR
 				Rs
 			
 			
 				rufiya
 				rufiya
 				rufiyas
+				MVR
 			
 			
-				kwacha malauí
-				kwacha malauí
-				kwachas malauís
+				kuacha malauí
+				kuacha malauí
+				kuachas malauís
+				MWK
 			
 			
 				peso mexicano
@@ -6463,6 +6811,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ringit
 				ringit
 				ringits
+				MYR
 				RM
 			
 			
@@ -6477,17 +6826,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				metical
 				metical
 				meticales
+				MZN
 			
 			
 				dólar namibio
 				dólar namibio
 				dólares namibios
+				NAD
 				$
 			
 			
 				naira
 				naira
 				nairas
+				NGN
 				₦
 			
 			
@@ -6499,6 +6851,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				córdoba nicaragüense
 				córdoba nicaragüense
 				córdobas nicaragüenses
+				NIO
 				C$
 			
 			
@@ -6510,12 +6863,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				corona noruega
 				corona noruega
 				coronas noruegas
+				NOK
 				kr
 			
 			
 				rupia nepalí
 				rupia nepalí
 				rupias nepalíes
+				NPR
 				Rs
 			
 			
@@ -6529,11 +6884,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial omaní
 				rial omaní
 				riales omaníes
+				OMR
 			
 			
 				balboa panameño
 				balboa panameño
 				balboas panameños
+				PAB
 			
 			
 				inti peruano
@@ -6544,6 +6901,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sol peruano
 				sol peruano
 				soles peruanos
+				PEN
 			
 			
 				sol peruano (1863–1965)
@@ -6554,23 +6912,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kina
 				kina
 				kinas
+				PGK
 			
 			
 				peso filipino
 				peso filipino
 				pesos filipinos
+				PHP
 				₱
 			
 			
 				rupia pakistaní
 				rupia pakistaní
 				rupias pakistaníes
+				PKR
 				Rs
 			
 			
 				esloti
 				esloti
 				eslotis
+				PLN
 				zł
 			
 			
@@ -6587,12 +6949,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guaraní paraguayo
 				guaraní paraguayo
 				guaraníes paraguayos
+				PYG
 				₲
 			
 			
 				rial catarí
 				rial catarí
 				riales cataríes
+				QAR
 			
 			
 				dólar rodesiano
@@ -6606,17 +6970,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu rumano
 				leu rumano
 				lei rumanos
+				RON
 				L
 			
 			
 				dinar serbio
 				dinar serbio
 				dinares serbios
+				RSD
 			
 			
 				rublo ruso
 				rublo ruso
 				rublos rusos
+				RUB
 				₽
 			
 			
@@ -6628,23 +6995,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franco ruandés
 				franco ruandés
 				francos ruandeses
+				RWF
 				RF
 			
 			
 				rial saudí
 				rial saudí
 				riales saudíes
+				SAR
 			
 			
 				dólar salomonense
 				dólar salomonense
 				dólares salomonenses
+				SBD
 				$
 			
 			
 				rupia seychellense
 				rupia seychellense
 				rupias seychellenses
+				SCR
 			
 			
 				dinar sudanés
@@ -6655,6 +7026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libra sudanesa
 				libra sudanesa
 				libras sudanesas
+				SDG
 			
 			
 				libra sudanesa antigua
@@ -6665,18 +7037,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				corona sueca
 				corona sueca
 				coronas suecas
+				SEK
 				kr
 			
 			
 				dólar singapurense
 				dólar singapurense
 				dólares singapurenses
+				SGD
 				$
 			
 			
 				libra de Santa Elena
 				libra de Santa Elena
 				libras de Santa Elena
+				SHP
 				£
 			
 			
@@ -6693,16 +7068,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leona
 				leona
 				leonas
+				SLL
 			
 			
 				chelín somalí
 				chelín somalí
 				chelines somalíes
+				SOS
 			
 			
 				dólar surinamés
 				dólar surinamés
 				dólares surinameses
+				SRD
 				$
 			
 			
@@ -6712,12 +7090,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libra sursudanesa
 				libra sursudanesa
 				libras sursudanesas
+				SSP
 				£
 			
 			
 				dobra (1977–2017)
 				dobra (1977–2017)
 				dobras (1977–2017)
+				STD
 			
 			
 				dobra
@@ -6740,12 +7120,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libra siria
 				libra siria
 				libras sirias
+				SYP
 				£
 			
 			
 				lilangeni
 				lilangeni
 				lilangenis
+				SZL
 			
 			
 				bat
@@ -6761,6 +7143,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somoni tayiko
 				somoni tayiko
 				somonis tayikos
+				TJS
 			
 			
 				manat turcomano (1993–2009)
@@ -6771,16 +7154,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manat turcomano
 				manat turcomano
 				manat turcomanos
+				TMT
 			
 			
 				dinar tunecino
 				dinar tunecino
 				dinares tunecinos
+				TND
 			
 			
 				paanga
 				paanga
 				paangas
+				TOP
 				T$
 			
 			
@@ -6795,6 +7181,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lira turca
 				lira turca
 				liras turcas
+				TRY
 				₺
 				TL
 			
@@ -6802,6 +7189,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dólar de Trinidad y Tobago
 				dólar de Trinidad y Tobago
 				dólares de Trinidad y Tobago
+				TTD
 				$
 			
 			
@@ -6815,11 +7203,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chelín tanzano
 				chelín tanzano
 				chelines tanzanos
+				TZS
 			
 			
 				grivna
 				grivna
 				grivnas
+				UAH
 				₴
 			
 			
@@ -6834,11 +7224,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chelín ugandés
 				chelín ugandés
 				chelines ugandeses
+				UGX
 			
 			
 				dólar estadounidense
 				dólar estadounidense
 				dólares estadounidenses
+				US$
 				$
 			
 			
@@ -6865,6 +7257,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso uruguayo
 				peso uruguayo
 				pesos uruguayos
+				UYU
 				$
 			
 			
@@ -6877,6 +7270,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sum
 				sum
 				sums
+				UZS
 			
 			
 				bolívar venezolano (1871–2008)
@@ -6887,6 +7281,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolívar venezolano (2008–2018)
 				bolívar venezolano (2008–2018)
 				bolívares venezolanos (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6899,17 +7294,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dong
 				dong
 				dongs
+				₫
 				₫
 			
 			
 				vatu
 				vatu
 				vatus
+				VUV
 			
 			
 				tala
 				tala
 				talas
+				WST
 			
 			
 				franco CFA de África Central
@@ -6987,6 +7385,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franco CFP
 				franco CFP
 				francos CFP
+				CFPF
 			
 			
 				platino
@@ -7011,6 +7410,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial yemení
 				rial yemení
 				riales yemeníes
+				YER
 			
 			
 				dinar fuerte yugoslavo
@@ -7030,6 +7430,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rand
 				rand
 				rands
+				ZAR
 				R
 			
 			
@@ -7038,9 +7439,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kwachas zambianos (1968–2012)
 			
 			
-				kwacha zambiano
-				kwacha zambiano
-				kwachas zambianos
+				kuacha zambiano
+				kuacha zambiano
+				kuachas zambianos
 				ZMW
 				ZK
 			
@@ -7074,6 +7475,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} por {1}
 			
+			
+				{0}⋅{1}
+			
 			
 				fuerza G
 				{0} unidad de fuerza gravitacional
@@ -7160,9 +7564,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} por pulgada cuadrada
 			
 			
-				dunumes
-				{0} dunum
-				{0} dunumes
+				dunams
+				{0} dunam
+				{0} dunams
 			
 			
 				quilates
@@ -7195,14 +7599,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} por mil
 			
 			
-				por diez mil
-				{0} por diez mil
-				{0} por diez mil
+				por diez mil
+				{0} por diez mil
+				{0} por diez mil
 			
 			
-				moles
-				{0} moles
-				{0} moles
+				moles
+				{0} moles
+				{0} moles
 			
 			
 				litros por kilómetro
@@ -7284,6 +7688,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} siglo
 				{0} siglos
 			
+			
+				décadas
+				{0} década
+				{0} décadas
+			
 			
 				años
 				{0} año
@@ -7392,24 +7801,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilovatios-hora
 			
 			
-				electronvoltios
-				{0} electronvoltio
-				{0} electronvoltios
+				electronvoltios
+				{0} electronvoltio
+				{0} electronvoltios
 			
 			
-				unidades térmicas británicas
-				{0} unidad térmica británica
-				{0} unidades térmicas británicas
+				unidades térmicas británicas
+				{0} unidad térmica británica
+				{0} unidades térmicas británicas
+			
+			
+				termia estadounidense
+				{0} termia estadounidense
+				{0} termias estadounidenses
 			
 			
-				libras de fuerza
-				{0} libra de fuerza
-				{0} libras de fuerza
+				libras de fuerza
+				{0} libra de fuerza
+				{0} libras de fuerza
 			
 			
-				newtons
-				{0} newton
-				{0} newtons
+				newtons
+				{0} newton
+				{0} newtons
 			
 			
 				gigahercios
@@ -7431,6 +7845,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hercio
 				{0} hercios
 			
+			
+				espacios eme
+				{0} espacio eme
+				{0} espacios eme
+			
+			
+				píxeles
+				{0} píxel
+				{0} píxeles
+			
+			
+				megapíxeles
+				{0} megapíxel
+				{0} megapíxeles
+			
+			
+				píxeles por centímetro
+				{0} píxel por centímetro
+				{0} píxeles por centímetro
+			
+			
+				píxeles por pulgada
+				{0} píxel por pulgada
+				{0} píxeles por pulgada
+			
+			
+				puntos por centímetro
+				{0} punto por centímetro
+				{0} puntos por centímetro
+			
+			
+				puntos por pulgada
+				{0} punto por pulgada
+				{0} puntos por pulgada
+			
 			
 				kilómetros
 				{0} kilómetro
@@ -7527,9 +7976,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} puntos
 			
 			
-				radios solares
-				{0} radio solar
-				{0} radios solares
+				radios solares
+				{0} radio solar
+				{0} radios solares
 			
 			
 				luxes
@@ -7537,9 +7986,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} luxes
 			
 			
-				luminosidades solares
-				{0} luminosidad solar
-				{0} luminosidades solares
+				luminosidades solares
+				{0} luminosidad solar
+				{0} luminosidades solares
 			
 			
 				toneladas métricas
@@ -7596,19 +8045,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilates
 			
 			
-				daltones
-				{0} dalton
-				{0} daltones
+				daltones
+				{0} dalton
+				{0} daltones
 			
 			
-				masas terrestres
-				{0} masa terrestre
-				{0} masas terrestres
+				masas terrestres
+				{0} masa terrestre
+				{0} masas terrestres
 			
 			
-				masas solares
-				{0} masa solar
-				{0} masas solares
+				masas solares
+				{0} masa solar
+				{0} masas solares
 			
 			
 				gigavatios
@@ -7640,11 +8089,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} caballo de vapor
 				{0} caballos de vapor
 			
-			
-				hectopascales
-				{0} hectopascal
-				{0} hectopascales
-			
 			
 				milímetros de mercurio
 				{0} milímetro de mercurio
@@ -7660,6 +8104,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pulgada de mercurio
 				{0} pulgadas de mercurio
 			
+			
+				bares
+				{0} bar
+				{0} bares
+			
 			
 				milibares
 				{0} milibar
@@ -7670,15 +8119,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmósfera
 				{0} atmósferas
 			
+			
+				pascales
+				{0} pascal
+				{0} pascales
+			
+			
+				hectopascales
+				{0} hectopascal
+				{0} hectopascales
+			
 			
-				kilopascales
-				{0} kilopascal
-				{0} kilopascales
+				kilopascales
+				{0} kilopascal
+				{0} kilopascales
 			
 			
-				megapascales
-				{0} megapascal
-				{0} megapascales
+				megapascales
+				{0} megapascal
+				{0} megapascales
 			
 			
 				kilómetros por hora
@@ -7721,14 +8180,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvin
 			
 			
-				libra pies
-				{0} libra pie
-				{0} libras pies
+				libra pies
+				{0} libra pie
+				{0} libras pies
 			
 			
-				newton metro
-				{0} newton metro
-				{0} newton metros
+				newton metro
+				{0} newton metro
+				{0} newton metros
 			
 			
 				kilómetros cúbicos
@@ -7841,14 +8300,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tazas
 			
 			
-				onzas fluidas
-				{0} onza fluida
-				{0} onzas fluidas
+				onzas líquidas
+				{0} onza líquida
+				{0} onzas líquidas
 			
 			
-				onzas fluidas imperiales
-				{0} onza fluida imperial
-				{0} onzas fluidas imperiales
+				onzas líquidas imperiales
+				{0} onza líquida imperial
+				{0} onzas líquidas imperiales
 			
 			
 				cucharadas
@@ -7861,9 +8320,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cucharaditas
 			
 			
-				barriles
-				{0} barril
-				{0} barriles
+				barriles
+				{0} barril
+				{0} barriles
 			
 			
 				punto cardinal
@@ -7877,6 +8336,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				Fg
 				{0} Fg
@@ -7963,9 +8425,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in²
 			
 			
-				dunumes
-				{0} dunum
-				{0} dunumes
+				dunams
+				{0} dunam
+				{0} dunams
 			
 			
 				ct
@@ -7998,14 +8460,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				por diez mil
-				{0} ‱
-				{0} ‱
+				por diez mil
+				{0} ‱
+				{0} ‱
 			
 			
-				mol
-				{0} moles
-				{0} moles
+				{0} moles
+				{0} moles
 			
 			
 				l/km
@@ -8083,9 +8544,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} b
 			
 			
-				sig.
-				{0} sig.
-				{0} sig.
+				s.
+				{0} s.
+				{0} s.
+			
+			
+				déc.
+				{0} déc.
+				{0} déc.
 			
 			
 				a
@@ -8195,24 +8661,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				electronvoltio
-				{0} eV
-				{0} eV
+				electronvoltio
 			
 			
-				BTU
-				{0} BTU
-				{0} BTU
+				BTU
+				{0} BTU
+				{0} BTU
+			
+			
+				thm EE. UU.
+				{0} thm EE. UU.
+				{0} thm EE. UU.
 			
 			
-				libra fuerza
-				{0} lbf
-				{0} lbf
+				libra fuerza
 			
 			
-				newton
-				{0} N
-				{0} N
+				newton
 			
 			
 				GHz
@@ -8234,6 +8699,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				px/cm
+				{0} px/cm
+				{0} px/cm
+			
+			
+				px/in
+				{0} px/in
+				{0} px/in
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppp
+				{0} ppp
+				{0} ppp
+			
 			
 				km
 				{0} km
@@ -8330,9 +8830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ptos.
 			
 			
-				radios solares
-				{0} R☉
-				{0} R☉
+				radios solares
 			
 			
 				lx
@@ -8340,9 +8838,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				luminosidades solares
-				{0} L☉
-				{0} L☉
+				luminosidades solares
 			
 			
 				tm
@@ -8399,19 +8895,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} c
 			
 			
-				daltones
-				{0} Da
-				{0} Da
+				daltones
 			
 			
-				masas terrestres
-				{0} M⊕
-				{0} M⊕
+				masas terrestres
 			
 			
-				masas solares
-				{0} M☉
-				{0} M☉
+				masas solares
 			
 			
 				GW
@@ -8443,11 +8933,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CV
 				{0} CV
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -8463,6 +8948,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -8473,15 +8963,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				Pa
+				{0} Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -8524,14 +9014,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				lbf ft
-				{0} lbf ft
-				{0} lbf ft
+				lbf ft
+				{0} lbf ft
+				{0} lbf ft
 			
 			
-				Nm
-				{0} Nm
-				{0} Nm
+				Nm
+				{0} Nm
+				{0} Nm
 			
 			
 				km³
@@ -8649,9 +9139,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				fl oz imp.
-				{0} fl oz imp.
-				{0} fl oz imp.
+				fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
 			
 			
 				cda
@@ -8664,7 +9154,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cdta
 			
 			
-				barril
+				barril
 				{0} bbl
 				{0} bbl
 			
@@ -8680,6 +9170,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				{0}G
 				{0}G
@@ -8737,51 +9230,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				a
-				{0}a
-				{0}a
+				{0} a
+				{0} a
 				{0}/a
 			
 			
-				m
-				{0}m
-				{0}m
+				m.
+				{0} m.
+				{0} m.
 			
 			
-				sem
-				{0}sem
-				{0}sem
+				{0} sem.
+				{0} sem.
 				{0}/sem
 			
 			
 				d
-				{0}d
-				{0}d
+				{0}/d
 			
 			
 				h
-				{0}h
-				{0}h
+				{0}/h
 			
 			
 				min
-				{0}min
-				{0}min
+				{0}/min
 			
 			
 				s
-				{0}s
-				{0}s
+				{0}/s
 			
 			
 				ms
-				{0}ms
-				{0}ms
 			
 			
+				μs
 				{0}μs
 				{0}μs
 			
 			
+				ns
 				{0}ns
 				{0}ns
 			
@@ -8789,13 +9277,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				km
 				{0}km
 				{0}km
+				{0}/km
 			
 			
 				m
-				{0}m
-				{0}m
+				{0}/m
 			
 			
+				dm
 				{0}dm
 				{0}dm
 			
@@ -8803,6 +9292,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cm
 				{0}cm
 				{0}cm
+				{0}/cm
 			
 			
 				mm
@@ -8810,34 +9300,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mm
 			
 			
+				µm
 				{0}µm
 				{0}µm
 			
 			
+				nm
 				{0}nm
 				{0}nm
 			
 			
+				pm
 				{0}pm
 				{0}pm
 			
 			
+				mi
 				{0}mi
 				{0}mi
 			
 			
+				yd
 				{0}yd
 				{0}yd
 			
 			
+				ft
 				{0}ft
 				{0}ft
+				{0}/ft
 			
 			
+				in
 				{0}in
 				{0}in
+				{0}/in
 			
 			
+				pc
 				{0}pc
 				{0}pc
 			
@@ -8847,6 +9347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}a.l.
 			
 			
+				au
 				{0}au
 				{0}au
 			
@@ -8859,23 +9360,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kg
 				{0}kg
 				{0}kg
+				{0}/kg
 			
 			
 				g
 				{0}g
 				{0}g
+				{0}/g
 			
 			
+				st
 				{0}st
 				{0}st
 			
 			
+				lb
 				{0}lb
 				{0}lb
+				{0}/lb
 			
 			
+				oz
 				{0}oz
 				{0}oz
+				{0}/oz
 			
 			
 				{0}kW
@@ -8889,46 +9397,63 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0}hp
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
 				{0}mmHg
 			
 			
+				psi
 				{0}psi
 				{0}psi
 			
 			
+				inHg
 				{0}inHg
 				{0}inHg
 			
 			
+				mbar
 				{0}mbar
 				{0}mbar
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/h
 				{0}km/h
 				{0}km/h
 			
 			
+				m/s
 				{0}m/s
 				{0}m/s
 			
 			
+				mi/h
 				{0}mi/h
 				{0}mi/h
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0}°C
 				{0}°C
 			
+			
+				°F
+				{0} °F
+				{0} °F
+			
 			
+				K
 				{0}K
 				{0}K
 			
@@ -8945,10 +9470,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}l
 				{0}l
 			
-			
-				{0} bbl
-				{0} bbl
-			
 			
 				punto
 				{0}E
@@ -8980,12 +9501,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} o {1}
 			{0} o {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} y {1}
-			{0} y {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml
index 0949b33bb79..402f1d095ae 100644
--- a/make/data/cldr/common/main/es_419.xml
+++ b/make/data/cldr/common/main/es_419.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 		
 	
@@ -18,12 +18,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			achenés
 			adigeo
 			altái del sur
+			árabe estándar moderno
 			arapajó
 			árabe de Néyed
 			siksiká
-			chakma
-			inglés (R.U.)
+			alemán austríaco
+			alto alemán suizo
+			inglés australiano
+			inglés canadiense
+			inglés británico
+			inglés estadounidense
+			español latinoamericano
+			español de España
+			español de México
 			vasco
+			francés canadiense
+			francés suizo
 			alemán de la alta edad antigua
 			griego clásico
 			gujarati
@@ -31,12 +41,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			cabardiano
 			karachái-bálkaro
 			laosiano
-			luo
+			flamenco
 			ndebele del sur
 			sesotho del norte
+			panyabí
 			prusiano antiguo
 			pashtún
+			portugués de Brasil
+			portugués de Portugal
 			retorrománico
+			moldavo
 			árabe (Chad)
 			sami del sur
 			sesotho del sur
@@ -45,12 +59,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			siríaco
 			tetun
 			tuvano
-			tamazight del Marruecos Central
-			uighur
-			vai
+			uighur
 			walamo
 			wu
 			calmuco
+			chino simplificado
+			chino mandarín simplificado
+			chino tradicional
+			chino mandarín tradicional
 			zuni
 		
 		
@@ -69,7 +85,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Asia del Sur
 			Asia sudoriental
 			Europa del Sur
-			región de Micronesia
 			Asia del Oeste
 			Europa del Este
 			Europa del Norte
@@ -84,19 +99,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Guernesey
 			Islas Canarias
 			Islas Ultramarinas
-			Suazilandia
 			Tristán da Cunha
-			Timor Oriental
 			Islas Ultramarinas de EE.UU.
-			Islas Vírgenes de los Estados Unidos
 		
 		
-			orden ignorando símbolos
-			orden de acentos con inversión
-			orden de mayúsculas/minúsculas
-			orden con distinción entre mayúsculas y minúsculas
-			salto de línea
-			sm
+			orden normalizado
 		
 		
 			islamic-umalqura
@@ -112,18 +119,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			orden anterior, para compatibilidad
 			reglas de orden europeas
 			orden de agenda telefónica
-			salto de línea flexible
-			salto de línea estricto
-			Sistema Métrico de Unidades
-			sistema inglés
-			Sistema Anglosajón de Unidades
 			dígitos en tirh
 			números traducionales
 			dígitos en Warang Citi
 		
-		
-			anglosajón
-		
 		
 			Alfabeto: {0}
 		
@@ -131,8 +130,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		“
 		”
-		‘
-		’
+		‘
+		’
 	
 	
 		
@@ -206,6 +205,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y G
+						
+					
+					
+						
+							d 'de' MMMM 'de' y G
+						
+					
 					
 						
 							d 'de' MMM 'de' y G
@@ -218,6 +227,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						MMM 'de' y G
 						d 'de' MMM 'de' y G
@@ -284,12 +313,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
+							ene.
+							feb.
+							mar.
+							abr.
+							may.
+							jun.
+							jul.
+							ago.
 							sep.
+							oct.
+							nov.
+							dic.
 						
 					
 					
 						
+							ene.
+							feb.
+							mar.
+							abr.
+							may.
+							jun.
+							jul.
+							ago.
 							sep.
+							oct.
+							nov.
+							dic.
 						
 					
 				
@@ -307,7 +358,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
+							D
+							L
+							M
 							M
+							J
+							V
+							S
 						
 					
 				
@@ -317,6 +374,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							1.º trimestre
 							2.º trimestre
 							3.º trimestre
+							4.º trimestre
 						
 					
 					
@@ -336,7 +394,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							a.m.
-							del mediodía
 							p.m.
 						
 					
@@ -345,17 +402,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							a.m.
 							p.m.
 						
-						
-							a.m.
-							p.m.
-						
 						
 							a.m.
 							p.m.
-							madrugada
 						
 					
 				
+				
+					
+						
+							EEEE, d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d MMM y
+						
+					
+					
+						
+							d/M/yy
+						
+					
+				
 				
 					
 						
@@ -379,6 +453,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} 'a' 'las' {0}
+						
+					
+					
+						
+							{1} 'a' 'las' {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						E, HH:mm
 						E, HH:mm:ss
@@ -403,7 +497,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							dd/MM/y – dd/MM/y GGGGG
 							dd/MM/y GGGGG – dd/MM/y GGGGG
 							dd/MM/y – dd/MM/y GGGGG
-							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
 						
 						
 							E, dd/MM/y – E, dd/MM/y GGGGG
@@ -412,16 +506,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, dd/MM/y – E, dd/MM/y GGGGG
 						
 						
-							d–d MMM 'de' y G
-							d MMM 'de' y G – d MMM 'de' y G
-							d MMM – d MMM 'de' y G
-							d MMM 'de' y – d MMM 'de' y G
+							d–d MMM 'de' y G
+							d MMM 'de' y G – d MMM 'de' y G
+							d MMM – d MMM 'de' y G
+							d MMM 'de' y – d MMM 'de' y G
 						
 						
-							E d MMM – E d MMM 'de' y G
-							E d MMM 'de' y G – E d MMM 'de' y G
-							E d MMM – E d MMM 'de' y G
-							E d MMM 'de' y – E d MMM 'de' y G
+							E d MMM – E d MMM 'de' y G
+							E d MMM 'de' y G – E d MMM 'de' y G
+							E d MMM – E d MMM 'de' y G
+							E d MMM 'de' y – E d MMM 'de' y G
 						
 						
 							h a–h a
@@ -518,6 +612,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Iyar
 							Sivan
 							Tamuz
+							av
+							elul
 						
 						
 							Tishri
@@ -695,21 +791,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
-			
-				el año pasado
-				este año
-			
-			
-				la semana pasada
-				esta semana
-			
 			
+				sem. pas.
+				esta sem.
+				próx. sem.
 				la semana del {0}
 			
 			
-				
-					hace {0} sem.
-				
+				sem. pas.
+				esta sem.
+				próx. sem.
 				la semana del {0}
 			
 			
@@ -718,12 +809,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				sem. del mes
 			
-			
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
 			
 				día del año
 			
@@ -745,97 +830,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					en {0} domingos
 				
 			
-			
-				
-					dentro de {0} DO
-					en {0} DO
-				
-				
-					hace {0} domingo
-					hace {0} domingos
-				
-			
-			
-				
-					en {0} lunes
-					en {0} lunes
-				
-			
-			
-				
-					en {0} lun.
-					dentro de {0} lun.
-				
-				
-					hace {0} lunes
-					hace {0} lunes
-				
-			
-			
-				
-					en {0} lunes
-					en {0} lunes
-				
-				
-					hace {0} lunes
-					hace {0} lunes
-				
-			
 			
 				
 					dentro de {0} martes
 					en {0} martes
 				
 			
-			
-				
-					en {0} miércoles
-					dentro de {0} miércoles
-				
-			
-			
-				
-					en {0} mié.
-					en {0} mié.
-				
-				
-					hace {0} miércoles
-					hace {0} miércoles
-				
-			
-			
-				
-					en {0} MI
-					en {0} MI
-				
-				
-					hace {0} miércoles
-					hace {0} miércoles
-				
-			
-			
-				
-					en {0} jueves
-					dentro de {0} jueves
-				
-			
-			
-				
-					dentro de {0} JU
-					en {0} JU
-				
-			
-			
-				
-					dentro de {0} viernes
-					en {0} viernes
-				
-			
 			
-				
-					dentro de {0} vie.
-					en {0} vie.
-				
 				
 					hace {0} viernes
 					hace {0} viernes
@@ -847,16 +848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					hace {0} viernes
 				
 			
-			
-				
-					en {0} sábado
-					en {0} sábados
-				
-			
 			
-				
-					en {0} SA
-				
 				
 					hace {0} sábados
 					hace {0} sábados
@@ -880,23 +872,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					Hora Universal Coordinada
 				
 			
-			
-				San Pablo
-			
 			
-				Nasáu
+				Nasáu
 			
 			
 				Fuerte Nelson
 			
+			
+				Santiago
+			
 			
 				Büsingen
 			
-			
-				Accra
+			
+				Islas Canarias
 			
-			
-				Duchanbé
+			
+				
+					hora estándar de Irlanda
+				
 			
 			
 				Isla Wake
@@ -913,7 +907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					hora de Islas Cocos
+					hora de Islas Cocos
 				
 			
 			
@@ -973,6 +967,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					hora de verano de las Islas Malvinas
 				
 			
+			
+				
+					hora de las Tierras Australes y Antárticas Francesas
+				
+			
 			
 				
 					hora de Islas Gilbert
@@ -995,7 +994,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					hora de Islas Marshall
+					hora de Islas Marshall
+				
+			
+			
+				
+					hora de Myanmar (Birmania)
 				
 			
 			
@@ -1010,12 +1014,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					hora de Islas Salomón
+					hora de Islas Salomón
 				
 			
 			
 				
-					hora de Isla Wake
+					hora de Isla Wake
 				
 			
 		
@@ -1024,15 +1028,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			.
 			,
-			+
-			-
 		
 		
-			
-				
-					#,##0.###
-				
-			
 			
 				
 					0 billón
@@ -1051,12 +1048,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					00 k
 					000 k
 					000 k
-					0k M
-					0k M
-					00k M
-					00k M
-					000k M
-					000k M
 				
 			
 		
@@ -1071,12 +1062,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					¤0 K
-					¤0 K
-					¤00 K
-					¤00 K
-					¤000 K
-					¤000 K
+					¤0 K
+					¤0 K
+					¤00 K
+					¤00 K
+					¤000 K
+					¤000 K
 					¤0 M
 					¤0 M
 					¤00 M
@@ -1085,10 +1076,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤000 M
 					¤0000 M
 					¤0000 M
-					¤00 MRD
-					¤00 MRD
-					¤000 MRD
-					¤000 MRD
+					¤00 MRD
+					¤00 MRD
+					¤000 MRD
+					¤000 MRD
 					¤0 B
 					¤0 B
 					¤00 B
@@ -1099,571 +1090,130 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
-			
-				AED
-			
-			
-				AFN
-			
-			
-				ALL
-			
-			
-				dram armenio
-				AMD
-			
-			
-				AOA
-			
-			
-				ARS
-			
-			
-				AWG
-			
-			
-				AZN
-			
-			
-				BAM
-			
-			
-				BBD
-			
-			
-				BDT
-			
 			
 				lev búlgaro
 				leva búlgaros
-				BGN
-			
-			
-				BHD
-			
-			
-				BIF
-			
-			
-				BMD
-			
-			
-				BND
-			
-			
-				BOB
-			
-			
-				BSD
-			
-			
-				BTN
-			
-			
-				BWP
-			
-			
-				BYR
-			
-			
-				BZD
 			
 			
 				CAD
 			
-			
-				CDF
-			
-			
-				CLP
-			
-			
-				COP
-			
-			
-				CRC
-			
-			
-				CUC
-			
-			
-				CUP
-			
-			
-				CVE
-			
-			
-				CZK
-			
-			
-				DJF
-			
-			
-				DKK
-			
-			
-				DOP
-			
-			
-				DZD
-			
 			
-				EGP
 				E£
 			
-			
-				nafka
-				ERN
-			
-			
-				ETB
-			
 			
 				EUR
 			
-			
-				FJD
-			
 			
-				FKP
 				FK£
 			
-			
-				GEL
-			
-			
-				GHS
-			
-			
-				GIP
-				£
-			
-			
-				GMD
-			
-			
-				GNF
-			
-			
-				GTQ
-			
-			
-				HNL
-			
-			
-				HRK
-			
-			
-				HTG
-			
-			
-				IDR
-			
-			
-				IQD
-			
-			
-				IRR
-			
-			
-				ISK
-			
-			
-				JMD
-			
-			
-				JOD
-			
-			
-				KES
-			
-			
-				KGS
-			
-			
-				KHR
-			
-			
-				KMF
-			
-			
-				KPW
-			
-			
-				KWD
-			
-			
-				KYD
-			
-			
-				KZT
-			
-			
-				LAK
-			
-			
-				LBP
-			
-			
-				LKR
-			
-			
-				LRD
-			
-			
-				MGA
-			
-			
-				MKD
-			
-			
-				MMK
-			
-			
-				MNT
-			
-			
-				MOP
-			
-			
-				MRO
-			
-			
-				MUR
-			
-			
-				MVR
-			
 			
-				MWK
-			
-			
-				ringgit malayo
-				ringgit malayo
-				ringgits malayos
-				MYR
-			
-			
-				MZN
-			
-			
-				NAD
-			
-			
-				NGN
-			
-			
-				NIO
-			
-			
-				NOK
-			
-			
-				NPR
-			
-			
-				OMR
-			
-			
-				PAB
-			
-			
-				PGK
-			
-			
-				PHP
-			
-			
-				PKR
-			
-			
-				PYG
-			
-			
-				QAR
-			
-			
-				RON
-			
-			
-				RSD
-			
-			
-				RUB
-			
-			
-				RWF
-			
-			
-				SAR
-			
-			
-				SBD
-			
-			
-				SCR
-			
-			
-				SEK
-			
-			
-				SGD
-			
-			
-				SHP
-			
-			
-				SLL
-			
-			
-				SOS
-			
-			
-				SRD
+				kwacha malauí
+				kwacha malauí
+				kwachas malauís
 			
 			
-				SSP
 				SD£
 			
-			
-				STD
-			
 			
-				SYP
 				S£
 			
-			
-				SZL
-			
 			
-				baht tailandes
-				baht tailandes
-				bahts tailandeses
+				baht tailandes
+				baht tailandes
+				bahts tailandeses
 				THB
 			
-			
-				TJS
-			
-			
-				TMT
-			
-			
-				TND
-			
-			
-				TOP
-			
-			
-				TRY
-			
-			
-				TTD
-			
-			
-				TZS
-			
-			
-				UAH
-			
-			
-				UGX
-			
 			
 				USD
 			
-			
-				UYU
-			
 			
-				som uzbeko
-				som uzbeko
-				soms uzbekos
-				UZS
+				som uzbeko
+				som uzbeko
+				soms uzbekos
 			
 			
-				bolívar venezolano
-				bolívar venezolano
-				bolívares venezolanos
 				BsF
 			
-			
-				VES
-				VES
-				VES
-			
 			
 				VND
 			
-			
-				VUV
-			
-			
-				WST
-			
-			
-				franco CFA BEAC
-				franco CFA BEAC
-				francos CFA BEAC
-			
-			
-				franco CFA BCEAO
-				franco CFA BCEAO
-				francos CFA BCEAO
-			
-			
-				CFPF
-			
 			
 				(unidad de moneda desconocida)
 				(moneda desconocida)
 			
-			
-				YER
-			
-			
-				ZAR
-			
-			
-				kuacha zambiano
-				kuacha zambiano
-				kuachas zambianos
-			
 		
 	
 	
 		
-			
-				revolución
-			
 			
 				mg/dL
 			
-			
-				mmol/L
-				{0} mmol/L
-				{0} mmol/L
-			
-			
-				ppm
-				{0} ppm
-				{0} ppm
-			
 			
 				amperes
 				{0} ampere
 				{0} amperes
 			
 			
-				miliamperes
-				{0} miliampere
-				{0} miliamperes
+				miliamperes
+				{0} miliampere
+				{0} miliamperes
 			
 			
-				ohms
+				ohms
 				{0} ohm
 				{0} ohms
 			
-			
-				volts
-				{0} volt
-				{0} volts
-			
 			
 				kilojoules
-				{0} kilojule
-				{0} kilojules
+				{0} kilojule
+				{0} kilojules
 			
 			
 				joules
 				{0} joule
 				{0} joules
 			
-			
-				kilowatts-hora
-				{0} kilowatt-hora
-				{0} kilowatts-hora
-			
-			
-				{0} gigahertz
-				{0} gigahertz
-			
-			
-				megahertz
-				{0} megahertz
-				{0} megahertz
-			
-			
-				kilohertz
-				{0} kilohertz
-				{0} kilohertz
-			
-			
-				hertz
-				{0} hertz
-				{0} hertz
+			
+				em tipográfico
 			
 			
-				milla escandinava
+				milla escandinava
 			
 			
 				stones
 				{0} stone
 				{0} stones
 			
-			
-				gigawatts
-				{0} gigawatt
-				{0} gigawatts
-			
-			
-				megawatts
-				{0} megawatt
-				{0} megawatts
-			
-			
-				kilowatts
-				{0} kilowatt
-				{0} kilowatts
-			
-			
-				watts
-				{0} watt
-				{0} watts
-			
-			
-				miliwatts
-				{0} miliwatt
-				{0} miliwatts
-			
 			
-				caballos de fuerza
-				caballo de fuerza
-				{0} caballos de fuerza
+				caballos de fuerza
+				caballo de fuerza
+				{0} caballos de fuerza
 			
 			
-				kelvins
-				{0} kelvins
+				kelvins
+				{0} kelvin
+				{0} kelvins
 			
 			
 				acre-pies
 				{0} acre pie
 				{0} acres pies
 			
+			
+				onzas fluidas
+				{0} onza fluida
+				{0} onzas fluidas
+			
 		
 		
 			
-				G
-				{0} G
-				{0} G
+				G
+				{0} G
+				{0} G
 			
 			
 				grados
 			
-			
-				c
-				{0} c
-				{0} c
-			
 			
 				{0} mpg imp.
 				{0} mpg imp.
@@ -1672,24 +1222,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				aa.
 				{0} a.
 				{0} aa.
-				{0}/a.
+				{0}/a.
 			
 			
 				mm.
+				{0} m.
 				{0} mm.
 			
 			
 				sems.
+				{0} sem.
 				{0} sems.
 			
 			
 				dd.
 				{0} d.
 				{0} dd.
-				{0}/d.
-			
-			
-				volts
+				{0}/d.
 			
 			
 				yardas
@@ -1703,9 +1252,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} aa. l.
 			
 			
-				ua
-				{0} ua
-				{0} ua
+				ua
+				{0} ua
+				{0} ua
 			
 			
 				nmi
@@ -1713,7 +1262,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nmi
 			
 			
-				pto.
+				pto.
 			
 			
 				t
@@ -1729,25 +1278,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				stones
 			
 			
-				ozt
-				{0} ozt
-				{0} ozt
+				ozt
+				{0} ozt
+				{0} ozt
 			
 			
-				ct
-				{0} ct
-				{0} ct
-			
-			
-				watts
+				ct
+				{0} ct
+				{0} ct
 			
 			
-				hp
-				{0} hp
-				{0} hp
+				hp
+				{0} hp
+				{0} hp
 			
 			
-				{0}/gal Imp.
+				{0}/gal Imp.
 			
 			
 				pintas
@@ -1768,31 +1314,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				G
 			
 			
+				m/s²
 				{0}m/s²
 				{0}m/s²
 			
 			
 				a.
-				{0}a.
-				{0}aa.
+				{0}a.
+				{0}aa.
 			
 			
-				m.
-				{0}m.
-				{0}mm.
+				{0}m.
+				{0}mm.
+				{0}/m.
 			
 			
 				sem.
-				{0}sem.
-				{0}sems.
+				{0}sem.
+				{0}sems.
 				{0}/sem.
 			
 			
 				d.
-				{0}d.
-				{0}dd.
+				{0}d.
+				{0}dd.
 				{0}/d.
 			
+			
+				{0}h
+				{0}h
+			
+			
+				{0}min
+				{0}min
+			
 			
 				parsec
 			
@@ -1810,10 +1365,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}t
 			
 			
+				mg
 				{0}mg
 				{0}mg
 			
 			
+				µg
 				{0}µg
 				{0}µg
 			
@@ -1833,6 +1390,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ct
 			
 			
+				kn
 				{0}kn
 				{0}kn
 			
@@ -1859,11 +1417,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		símbolos de monedas
 		Guión/conector
 		dígitos
-		Símbolos y viñetas
 		Flechas hacia arriba y hacia abajo
 		Símbolos de escritura de Europa
-		femenino
-		bandera
+		femenino
+		bandera
 		banderas
 		Formato
 		formato y espacio duro
@@ -1874,11 +1431,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Radicales Han
 		Hanzi (simplificado)
 		Hanzi (tradicional)
-		corazón
+		corazón
 		Símbolos de escritura históricos
-		Caracteres descriptivos ideográficos
 		Kana japonés
-		tecla mayus
+		tecla mayus
 		Flechas hacia la derecha y hacia la izquierda
 		símbolos con letras
 		uso limitado
@@ -1911,11 +1467,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		espacio duro
 	
 	
+		ancho
 		estándar
 		normal
-		mediana
 		seminegrita
-		extranegrita
+		seminegrita demi
+		extranegrita
 		ultra
 		pesada
 		extranegra
diff --git a/make/data/cldr/common/main/es_AR.xml b/make/data/cldr/common/main/es_AR.xml
index cfe275ab75a..6314981d3a8 100644
--- a/make/data/cldr/common/main/es_AR.xml
+++ b/make/data/cldr/common/main/es_AR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,9 +32,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
-			Islas Vírgenes de EE. UU.
 		
 	
 	
@@ -165,9 +163,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p. m.
 						
 						
-							a. m.
 							m.
-							p. m.
 						
 						
 							a. m.
@@ -379,10 +375,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ohmio
 				{0} ohmios
 			
-			
-				{0} voltio
-				{0} voltios
-			
 			
 				kilojulios
 				{0} kilojulio
@@ -415,12 +407,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} seg.
 				{0}/seg.
 			
-			
-				voltios
-			
-			
-				vatios
-			
 		
 		
 			
diff --git a/make/data/cldr/common/main/es_BO.xml b/make/data/cldr/common/main/es_BO.xml
index 526b8f0ff8a..e137aab0486 100644
--- a/make/data/cldr/common/main/es_BO.xml
+++ b/make/data/cldr/common/main/es_BO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -55,10 +54,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
diff --git a/make/data/cldr/common/main/es_BR.xml b/make/data/cldr/common/main/es_BR.xml
index aed72a21418..9e8c3526431 100644
--- a/make/data/cldr/common/main/es_BR.xml
+++ b/make/data/cldr/common/main/es_BR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_BZ.xml b/make/data/cldr/common/main/es_BZ.xml
index 2890d77b015..87fb8cb2650 100644
--- a/make/data/cldr/common/main/es_BZ.xml
+++ b/make/data/cldr/common/main/es_BZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_CL.xml b/make/data/cldr/common/main/es_CL.xml
index 2ae7df15ebe..75777023ec0 100644
--- a/make/data/cldr/common/main/es_CL.xml
+++ b/make/data/cldr/common/main/es_CL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -34,7 +34,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			RU
 			Territorio Palestino
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 		
@@ -193,10 +192,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -328,18 +323,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ohmio
 				{0} ohmios
 			
-			
-				{0} voltio
-				{0} voltios
-			
-		
-		
-			
-				voltios
-			
-			
-				vatios
-			
 		
 		
 			hh:mm:ss
diff --git a/make/data/cldr/common/main/es_CO.xml b/make/data/cldr/common/main/es_CO.xml
index 625b71210d9..315cd604999 100644
--- a/make/data/cldr/common/main/es_CO.xml
+++ b/make/data/cldr/common/main/es_CO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,9 +32,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
-			Islas Vírgenes de EE. UU.
 		
 	
 	
@@ -218,9 +216,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p. m.
 						
 						
-							a. m.
 							m.
-							p. m.
 						
 						
 							a. m.
diff --git a/make/data/cldr/common/main/es_CR.xml b/make/data/cldr/common/main/es_CR.xml
index 4cbf9cef134..f5ac3cf6667 100644
--- a/make/data/cldr/common/main/es_CR.xml
+++ b/make/data/cldr/common/main/es_CR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,12 +32,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
 	
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
@@ -58,10 +57,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -71,13 +66,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
 			
 				a. m./p. m.
 			
diff --git a/make/data/cldr/common/main/es_CU.xml b/make/data/cldr/common/main/es_CU.xml
index 5ab7a665f11..90b985797f4 100644
--- a/make/data/cldr/common/main/es_CU.xml
+++ b/make/data/cldr/common/main/es_CU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_DO.xml b/make/data/cldr/common/main/es_DO.xml
index 6ef4a63f135..433f8869884 100644
--- a/make/data/cldr/common/main/es_DO.xml
+++ b/make/data/cldr/common/main/es_DO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -103,9 +102,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p. m.
 						
 						
-							a. m.
 							m.
-							p. m.
 						
 						
 							a. m.
@@ -214,10 +211,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ohmio
 				{0} ohmios
 			
-			
-				{0} voltio
-				{0} voltios
-			
 		
 		
 			
@@ -228,12 +221,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} seg.
 				{0} seg.
 			
-			
-				voltios
-			
-			
-				vatios
-			
 		
 		
 			
diff --git a/make/data/cldr/common/main/es_EA.xml b/make/data/cldr/common/main/es_EA.xml
index e7f390bba25..5a045707b5e 100644
--- a/make/data/cldr/common/main/es_EA.xml
+++ b/make/data/cldr/common/main/es_EA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_EC.xml b/make/data/cldr/common/main/es_EC.xml
index 9f2c20bf879..09c2def4d04 100644
--- a/make/data/cldr/common/main/es_EC.xml
+++ b/make/data/cldr/common/main/es_EC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -130,10 +129,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
diff --git a/make/data/cldr/common/main/es_ES.xml b/make/data/cldr/common/main/es_ES.xml
index ed5e900b624..7a95003ebf0 100644
--- a/make/data/cldr/common/main/es_ES.xml
+++ b/make/data/cldr/common/main/es_ES.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_GQ.xml b/make/data/cldr/common/main/es_GQ.xml
index 5ee4e10766e..a902d5f18dc 100644
--- a/make/data/cldr/common/main/es_GQ.xml
+++ b/make/data/cldr/common/main/es_GQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_GT.xml b/make/data/cldr/common/main/es_GT.xml
index 063ba2746ae..b314d404f7f 100644
--- a/make/data/cldr/common/main/es_GT.xml
+++ b/make/data/cldr/common/main/es_GT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -133,10 +132,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -210,13 +205,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
 			
 				a. m./p. m.
 			
@@ -283,10 +271,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ohmio
 				{0} ohmios
 			
-			
-				{0} voltio
-				{0} voltios
-			
 			
 				kilojulios
 				{0} kilojulio
@@ -306,19 +290,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				{0} ct
-				{0} ct
-			
-			
-				voltios
-			
 			
 				pie
 			
-			
-				vatios
-			
 			
 				acre pie
 			
diff --git a/make/data/cldr/common/main/es_HN.xml b/make/data/cldr/common/main/es_HN.xml
index 47969c256fa..68420497022 100644
--- a/make/data/cldr/common/main/es_HN.xml
+++ b/make/data/cldr/common/main/es_HN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -137,10 +136,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -224,15 +219,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
-		
 	
 	
 		
diff --git a/make/data/cldr/common/main/es_IC.xml b/make/data/cldr/common/main/es_IC.xml
index d85446eae87..920531649b2 100644
--- a/make/data/cldr/common/main/es_IC.xml
+++ b/make/data/cldr/common/main/es_IC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml
index 6a8cd264728..8b238d45f67 100644
--- a/make/data/cldr/common/main/es_MX.xml
+++ b/make/data/cldr/common/main/es_MX.xml
@@ -7,13 +7,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
 			acehnés
+			árabe estándar moderno
 			arapaho
 			basa
 			bamun
@@ -40,14 +41,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lushai
 			irlandés medieval
 			min nan (Chino)
+			flamenco
 			ndebele meridional
 			sotho septentrional
 			punyabí
 			pcm
-			kiroundi
 			árabe chadiano
 			siswati
-			sesotho meridional
 			suajili
 			suajili del Congo
 			siriaco
@@ -55,15 +55,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			setswana
 			tuviniano
 			uyghur
-			wolof
 			wuu
 			kalmyk
 			tamazight marroquí estándar
+			chino simplificado
+			chino mandarín simplificado
+			chino tradicional
+			chino mandarín tradicional
 		
 		
 			
 			
-			
 		
 		
 			África Occidental
@@ -74,7 +76,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Asia meridional
 			Sudeste Asiático
 			Europa meridional
-			Región de Micronesia
 			Asia Occidental
 			Europa Oriental
 			Europa septentrional
@@ -84,61 +85,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			zona euro
 			RU
 			Guernsey
+			Rumania
 			Arabia Saudita
 			Eswatini
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
-			UN
-			Islas Vírgenes de EE. UU.
+			ONU
 		
-		
-			Calendario
-			Orden
-			Moneda
-		
 		
-			Calendario gregoriano
 			calendario minguo
 			orden de clasificación de Unicode predeterminado
-			Orden estándar
-			Orden tradicional
-			Ancho completo
-			Ancho medio
 			salto de línea normal
-			BGN
-			UNGEGN
-			sistema métrico
-			sistema imperial
-			sistema estadounidense
-			Dígitos en arábigo-índico
-			Dígitos en árabigo-índico extendido
-			Números en armenio
-			Números en armenio en minúscula
-			Números en etíope
-			Números en georgiano
-			Números en griego
-			Números en griego en minúscula
 			dígitos en gujarati
-			Dígitos en gurmuji
-			Numeros decimales en chino
-			Números en chino simplificado
-			Números financieros en chino simplificado
-			Números en chino tradicional
-			Números financieros en chino tradicional
-			Números en hebreo
-			Números financieros en japonés
-			números en kannada
-			Dígitos en lao
-			Dígitos en malabar
-			Números en tamil
-			Dígitos en tamil
-			Dígitos en telugú
-			Dígitos en tibetano
 		
 		
 			imperial
-			estadounidense
 		
 	
 	
@@ -148,13 +109,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y G
+						
+					
+					
+						
+							d 'de' MMMM 'de' y G
+						
+					
 					
 						
 							d MMM, y G
 						
 					
+					
+						
+							dd/MM/yy GGGGG
+						
+					
 				
 				
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						MMM y G
 						d MMM y G
@@ -164,7 +160,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						hh:mm:ss a
 						d MMM
 						E d MMM
-						d 'de' MMMM
 						E, d/M/y GGGGG
 						MMM y G
 						d MMM y G
@@ -172,7 +167,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						QQQ y G
 					
 					
-						{0} – {1}
+						{0} – {1}
 						
 							d/M – d/M
 							d/M – d/M
@@ -210,32 +205,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
-						
-							1er. trim.
-							2º. trim.
-							3er. trim.
-							4º trim.
-						
-						
-							1T
-							2T
-							3T
-							4T
-						
 						
 							1.er trimestre
-							2º. trimestre
+							2.º trimestre
 							3.er trimestre
-							4o. trimestre
+							4.º trimestre
 						
 					
 					
-						
-							1er. trim.
-							2º. trim.
-							3er. trim.
-							4º trim.
-						
 						
 							1T
 							2T
@@ -244,9 +221,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							1.er trimestre
-							2º. trimestre
+							2.º trimestre
 							3.er trimestre
-							4º trimestre
+							4.º trimestre
 						
 					
 				
@@ -273,10 +250,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -284,6 +257,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d MMM y
+						
+					
 					
 						
 							dd/MM/yy
@@ -313,6 +301,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'a' 'las' {0}
+						
+					
+					
+						
+							{1} 'a' 'las' {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						E h:mm a
 						E HH:mm
@@ -334,9 +342,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
-						
-							dd/MM/y – dd/M M/y GGGGG
-						
 						
 							MMM 'de' y G – MMM 'de' y G
 							MMM–MMM 'de' y G
@@ -382,8 +387,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							HH–HH v
 						
 						
-							d/M – d/M
-							d/M – d/M
+							d/M – d/M
+							d/M – d/M
 						
 						
 							E, d/M – E, d/M
@@ -397,13 +402,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E d 'de' MMM – E d 'de' MMM
 						
 						
-							M/y – M/y
-							M/y – M/y
+							M/y – M/y
+							M/y – M/y
 						
 						
-							d/M/y – d/M/y
-							d/M/y – d/M/y
-							d/M/y – d/M/y
+							d/M/y – d/M/y
+							d/M/y – d/M/y
+							d/M/y – d/M/y
 						
 						
 							E, d/M/y – E, d/M/y
@@ -453,7 +458,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					dentro de {0} trimetre
+					en {0} trimestre
 					dentro de {0} trimetres
 				
 			
@@ -465,8 +470,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					+{0} T
-					+{0} T
+					en {0} trim.
+					en {0} trim.
 				
 				
 					-{0} T
@@ -515,13 +520,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				sem. de m
 			
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
 			
 				
 					en {0} día
@@ -531,7 +529,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				
 					+{0} día
-					+{0} días
+					en {0} días
 				
 			
 			
@@ -549,51 +547,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					dentro de {0} domingos
 				
 			
-			
-				
-					dentro de {0} DO
-				
-				
-					hace {0} DO
-					hace {0} DO
-				
-			
 			
 				el lunes pasado
 				este lunes
 				el lunes próximo
-				
-					dentro de {0} lunes
-					dentro de {0} lunes
-				
-				
-					hace {0} lunes
-				
-			
-			
-				
-					dentro de {0} lun.
-				
-				
-					hace {0} lun.
-					hace {0} lun.
-				
-			
-			
-				
-					dentro de {0} LU
-					dentro de {0} LU
-				
-				
-					hace {0} LU
-					hace {0} LU
-				
 			
 			
 				el martes pasado
 				este martes
 				el martes próximo
 				
+					dentro de {0} martes
 					dentro de {0} martes
 				
 			
@@ -601,61 +565,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				el miércoles pasado
 				este miércoles
 				el miércoles próximo
-				
-					dentro de {0} miércoles
-				
 			
 			
 				el miér. pasado
 				este miér.
 				el próximo miér.
-				
-					dentro de {0} mié.
-					dentro de {0} mié.
-				
-				
-					hace {0} mié.
-					hace {0} mié.
-				
-			
-			
-				
-					dentro de {0} MI
-					dentro de {0} MI
-				
-				
-					hace {0} MI
-					hace {0} MI
-				
 			
 			
 				el jueves pasado
 				este jueves
 				el jueves próximo
-				
-					dentro de {0} jueves
-				
-			
-			
-				
-					dentro de {0} JU
-				
 			
 			
 				el viernes pasado
 				este viernes
 				el viernes próximo
-				
-					dentro de {0} viernes
-				
 			
 			
 				el vier. pasado
 				este vier.
 				el próximo vier.
-				
-					dentro de {0} vie.
-				
 				
 					hace {0} vie.
 					hace {0} vie.
@@ -671,15 +600,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				el sábado pasado
 				este sábado
 				el sábado próximo
-				
-					dentro de {0} sábado
-					dentro de {0} sábados
-				
 			
 			
-				
-					dentro de {0} SA
-				
 				
 					hace {0} SA
 					hace {0} SA
@@ -708,12 +630,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					+{0} min
-					+{0} min
-				
-				
-					-{0} min
-					-{0} min
+					en {0} min
+					en {0} min
 				
 			
 			
@@ -735,7 +653,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Tiempo Universal Coordinado
+					hora universal coordinada
 				
 			
 			
@@ -744,24 +662,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Rio Branco
 			
-			
-				São Paulo
-			
-			
-				Nassau
-			
 			
 				Fort Nelson
 			
-			
-				Acra
-			
 			
 				Conakri
 			
-			
-				Piongyang
-			
 			
 				Atirau
 			
@@ -771,18 +677,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Almatý
 			
-			
-				Qatar
-			
-			
-				Kirov
-			
 			
 				Jartum
 			
-			
-				Dusambé
-			
 			
 				Dar es-Salaam
 			
@@ -799,12 +696,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					hora de verano de Apia
 				
 			
-			
-				
-					hora de Argentina occidental
-					hora estándar de Argentina occidental
-				
-			
 			
 				
 					hora de la isla de Navidad
@@ -903,7 +794,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
+					0 billón
 					0 billones
+					00 billones
+					00 billones
+					000 billones
+					000 billones
 				
 			
 			
@@ -914,12 +810,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					00 k
 					000 k
 					000 k
-					0000 M
-					0000 M
-					00 mil M
-					00 mil M
-					000 mil M
-					000 mil M
 				
 			
 		
@@ -963,9 +853,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				taka bangladesí
 				takas bangladesíes
 			
-			
-				levas búlgaras
-			
 			
 				ngultrum butanés
 				ngultrum butanés
@@ -974,14 +861,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				p.
 			
-			
-				CNH
-				CNH
-				CNH
-			
-			
-				nakfa
-			
 			
 				£
 			
@@ -1015,17 +894,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupia de Maldivas
 				rupias de Maldivas
 			
-			
-				kwacha malauí
-			
 			
 				$
 			
-			
-				ringit
-				ringit
-				ringits
-			
 			
 				lei
 			
@@ -1043,24 +914,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				baht tailandés
 				baht tailandés
-				bahts tailandeses
+				bahts tailandeses
 			
 			
+				manat turcomano
 				manats turcomanos
 			
-			
-				sum
-				sum
-				sums
-			
 			
-				bolívar venezolano (2008–2018)
-				bolívar venezolano (2008–2018)
-				bolívares venezolanos (2008–2018)
 				Bs
 			
 			
-				bolívar venezolano
 				bolívar venezolano
 				bolivares venezolanos
 			
@@ -1071,6 +934,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				(moneda desconocida)
+				(moneda desconocida)
 			
 			
 				kwacha zambiano
@@ -1081,61 +945,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		
-			
-				revoluciones
-			
-			
-				arcominutos
-				{0} minuto
-				{0} minutos
-			
-			
-				arcosegundos
-				{0} segundo
-				{0} segundos
-			
 			
 				{0} mg/dL
 				{0} mg/dL
 			
-			
-				mpg Imp.
-				{0} mpg Imp.
-				{0} mpg Imp.
+			
+				mmol/L
+			
+			
+				ppm
 			
 			
 				ohmios
 				{0} ohmio
 				{0} ohmios
 			
-			
-				voltios
-				{0} voltio
-				{0} voltios
-			
 			
+				kilowatts-hora
 				kilowatt-hora
 				{0} kilowatts-hora
 			
-			
-				{0} gigahercio
-				{0} gigahercios
-			
-			
-				megahercios
-				{0} megahercio
-				{0} megahercios
-			
-			
-				kilohercios
-				{0} kilohercio
-				{0} kilohercios
-			
-			
-				hercios
-				{0} hercio
-				{0} hercios
-			
 			
 				micrometros
 				{0} micrometro
@@ -1154,44 +983,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				millas escandinavas
 			
-			
-				pt
-				{0} pt
-				{0} pt
-			
 			
-				lux
-			
-			
-				{0} microgramos
-			
-			
-				gigavatios
-				{0} gigavatio
-				{0} gigavatios
-			
-			
-				megavatios
-				{0} megavatio
-				{0} megavatios
-			
-			
-				kilovatios
-				{0} kilovatio
-				{0} kilovatios
-			
-			
-				vatios
-				{0} vatio
-				{0} vatios
-			
-			
-				milivatios
-				{0} milivatio
-				{0} milivatios
+				lux
 			
 			
 				{0} caballo de fuerza
+				{0} caballos de fuerza
 			
 			
 				kelvines
@@ -1199,18 +996,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kelvines
 			
 			
-				newton metros
+				newton metros
 			
 			
 				{0} acre-pie
 				{0} acre-pies
 			
-			
-				Imp. gal
-				{0} gal Imp.
-				{0} gal Imp.
-				{0}/gal Imp.
-			
 			
 				onzas líquidas
 				{0} onza líquida
@@ -1219,19 +1010,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			
-				fuerza G
+				fuerza G
 			
 			
 				º
 			
-			
-				{0} min
-				{0} min
-			
 			
 				arcseg
-				{0} s
-				{0} s
 			
 			
 				kt
@@ -1245,19 +1030,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				‰
 			
 			
-				mpg Imp.
-				{0} mpg Imp.
-				{0} mpg Imp.
-			
-			
-				byte
-				{0} byte
-				{0} byte
-			
-			
-				bit
-				{0} bit
-				{0} bit
+				{0} mi/gal imp.
+				{0} mi/gal imp.
 			
 			
 				a
@@ -1271,7 +1045,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} m
 			
 			
-				sem
+				sem
 				{0} sem
 				{0} sem
 			
@@ -1304,43 +1078,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} au
 			
 			
-				M
-				{0} M
-				{0} M
+				M
+				{0} M
+				{0} M
 			
 			
-				pt
-				{0} pt
-				{0} pt
+				pt
+				{0} pt
+				{0} pt
 			
 			
-				c
-				{0} c
-				{0} c
+				c
+				{0} c
+				{0} c
 			
 			
-				CV
-				{0} CV
-				{0} CV
+				CV
+				{0} CV
+				{0} CV
 			
 			
-				km/hora
-			
-			
-				{0} °C
+				km/hora
 			
 			
 				N⋅m
 				{0} N⋅m
 				{0} N⋅m
 			
-			
-				Imp. gal
-				{0} gal Imp.
-				{0} gal Imp.
-			
 			
-				pt
+				pt
 			
 			
 				tza.
@@ -1400,7 +1166,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		Espacio duro
 	
 	
-		ancho
+		mediana
+		seminegra
 		ultranegrita
 	
 
diff --git a/make/data/cldr/common/main/es_NI.xml b/make/data/cldr/common/main/es_NI.xml
index caba8724df6..72927e7d216 100644
--- a/make/data/cldr/common/main/es_NI.xml
+++ b/make/data/cldr/common/main/es_NI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -55,10 +54,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -67,15 +62,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
-		
 	
 	
 		
diff --git a/make/data/cldr/common/main/es_PA.xml b/make/data/cldr/common/main/es_PA.xml
index adcdd61f34f..7bcba1591f5 100644
--- a/make/data/cldr/common/main/es_PA.xml
+++ b/make/data/cldr/common/main/es_PA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -149,10 +148,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -231,15 +226,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
-		
 	
 	
 		
diff --git a/make/data/cldr/common/main/es_PE.xml b/make/data/cldr/common/main/es_PE.xml
index 830df289337..dd0cb9ba6a1 100644
--- a/make/data/cldr/common/main/es_PE.xml
+++ b/make/data/cldr/common/main/es_PE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -193,10 +192,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
diff --git a/make/data/cldr/common/main/es_PH.xml b/make/data/cldr/common/main/es_PH.xml
index bcebcb3b91e..6a6428d1232 100644
--- a/make/data/cldr/common/main/es_PH.xml
+++ b/make/data/cldr/common/main/es_PH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/es_PR.xml b/make/data/cldr/common/main/es_PR.xml
index 594c8dee431..91cf89f3374 100644
--- a/make/data/cldr/common/main/es_PR.xml
+++ b/make/data/cldr/common/main/es_PR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -127,10 +127,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
diff --git a/make/data/cldr/common/main/es_PY.xml b/make/data/cldr/common/main/es_PY.xml
index 52776ab78d5..9f3cf3cedb6 100644
--- a/make/data/cldr/common/main/es_PY.xml
+++ b/make/data/cldr/common/main/es_PY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -114,9 +113,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p. m.
 						
 						
-							a. m.
 							m.
-							p. m.
 						
 						
 							a. m.
@@ -160,13 +157,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				anteayer
-				ayer
-				hoy
-				mañana
-				pasado mañana
-			
 			
 				el dom. pasado
 				este dom.
@@ -242,10 +232,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ohmio
 				{0} ohmios
 			
-			
-				{0} voltio
-				{0} voltios
-			
 		
 		
 			
@@ -272,12 +258,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} seg.
 				{0}/seg.
 			
-			
-				voltios
-			
-			
-				vatios
-			
 		
 		
 			
diff --git a/make/data/cldr/common/main/es_SV.xml b/make/data/cldr/common/main/es_SV.xml
index 81c46cb1c5d..00676271cd3 100644
--- a/make/data/cldr/common/main/es_SV.xml
+++ b/make/data/cldr/common/main/es_SV.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -44,10 +44,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -59,10 +55,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				antier
-				ayer
-				hoy
-				mañana
-				pasado mañana
 			
 			
 				a. m./p. m.
diff --git a/make/data/cldr/common/main/es_US.xml b/make/data/cldr/common/main/es_US.xml
index b23c93af8e2..56ad72afdf7 100644
--- a/make/data/cldr/common/main/es_US.xml
+++ b/make/data/cldr/common/main/es_US.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -22,7 +22,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			siksika
 			buriat
 			neerlandés medieval
-			inglés (RU)
 			inglés medieval
 			euskera
 			francés medieval
@@ -31,14 +30,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			griego antiguo
 			gurayatí
 			hak
+			hiligainón
 			xiang (China)
 			criollo haitiano
+			ingusetio
 			kabardiano
 			karachay-balkar
 			lao
 			lushai
 			irlandés medieval
 			nan
+			flamenco
 			ndebele meridional
 			sotho septentrional
 			pcm
@@ -53,14 +55,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			tetún
 			setchwana
 			tuviniano
-			tamazight del Atlas Central
 			wolof
 			wuu
 			kalmyk
+			chino simplificado
+			chino tradicional
 		
 		
 			
 			
+			
 		
 		
 			África occidental
@@ -71,7 +75,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Asia meridional
 			Sudeste asiático
 			Europa meridional
-			Región de Micronesia
 			Asia occidental
 			Europa oriental
 			Europa septentrional
@@ -84,21 +87,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			RU
 			Guernsey
 			Territorios alejados de Oceanía
-			Timor-Leste
+			Tristán de Acuña
 			TL
 			Islas menores alejadas de EE. UU.
-			Islas Vírgenes de EE. UU.
+			UN
 		
 		
+			calendario minguo
 			orden de clasificación de Unicode predeterminado
 			salto de línea normal
-			sistema imperial
 			dígitos en gujarati
 			números en kannada
 			números en lao
 		
 		
-			estadounidense
+			imperial
 		
 	
 	
@@ -114,20 +117,62 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y G
+						
+					
+					
+						
+							d 'de' MMMM 'de' y G
+						
+					
 					
 						
 							d MMM, y G
 						
 					
+					
+						
+							dd/MM/yy GGGGG
+						
+					
 				
 				
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1}, {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						MMM y G
 						d MMM y G
+						E, d MMM y G
+						hh a
+						hh:mm a
+						hh:mm:ss a
 						d MMM
 						E d MMM
 						E, d/M/y GGGGG
 						MMM y G
+						d MMM y G
+						EEE, d MMM y G
+						QQQ y G
 					
 					
 						{0} – {1}
@@ -153,22 +198,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				
-					
-						
-							ene.
-							feb.
-							mar.
-							abr.
-							may.
-							jun.
-							jul.
-							ago.
-							sep.
-							oct.
-						
-					
-				
 				
 					
 						
@@ -184,15 +213,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
+						
+							1er. trim.
+							2º. trim.
+							3er. trim.
+							4º trim.
+						
+						
+							1T
+							2T
+							3T
+							4T
+						
 						
 							1.er trimestre
+							2º. trimestre
 							3.er trimestre
+							4o. trimestre
 						
 					
 					
+						
+							1er. trim.
+							2º. trim.
+							3er. trim.
+							4º trim.
+						
+						
+							1T
+							2T
+							3T
+							4T
+						
 						
 							1.er trimestre
+							2º. trimestre
 							3.er trimestre
+							4º trimestre
 						
 					
 				
@@ -203,7 +260,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p. m.
 						
 						
+							del mediodía
+							de la madrugada
 							mañana
+							de la tarde
+							de la noche
 						
 						
 							a. m.
@@ -215,10 +276,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
@@ -226,6 +283,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d MMM y
+						
+					
 					
 						
 							d/M/y
@@ -255,6 +327,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'a' 'las' {0}
+						
+					
+					
+						
+							{1} 'a' 'las' {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						E h:mm a
 						E HH:mm
@@ -273,6 +365,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						QQQ y
 					
 					
+						{0} – {1}
 						
 							h a – h a
 						
@@ -332,12 +425,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			
+				el año pasado
+				este año
 				el año próximo
 			
+			
+				
+					dentro de {0} trimetre
+					dentro de {0} trimetres
+				
+			
 			
+				el mes pasado
+				este mes
 				el mes próximo
 			
 			
+				la semana pasada
+				esta semana
 				la semana próxima
 			
 			
@@ -362,95 +467,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				día de sem. de mes
 			
 			
+				el domingo pasado
+				este domingo
+				el domingo próximo
 				
 					dentro de {0} domingo
 					dentro de {0} domingos
 				
 			
-			
-				
-					dentro de {0} DO
-				
-				
-					hace {0} DO
-					hace {0} DO
-				
-			
 			
-				
-					dentro de {0} lunes
-					dentro de {0} lunes
-				
-			
-			
-				
-					dentro de {0} lun.
-				
-				
-					hace {0} lun.
-					hace {0} lun.
-				
-			
-			
-				
-					dentro de {0} LU
-					dentro de {0} LU
-				
-				
-					hace {0} LU
-					hace {0} LU
-				
+				el lunes pasado
+				este lunes
+				el lunes próximo
 			
 			
+				el martes pasado
+				este martes
+				el martes próximo
 				
+					dentro de {0} martes
 					dentro de {0} martes
 				
 			
 			
-				
-					dentro de {0} miércoles
-				
+				el miércoles pasado
+				este miércoles
+				el miércoles próximo
 			
 			
 				el mie. pasado
-				
-					dentro de {0} mié.
-					dentro de {0} mié.
-				
-				
-					hace {0} mié.
-					hace {0} mié.
-				
-			
-			
-				
-					dentro de {0} MI
-					dentro de {0} MI
-				
-				
-					hace {0} MI
-					hace {0} MI
-				
+				este miér.
+				el próximo miér.
 			
 			
-				
-					dentro de {0} jueves
-				
-			
-			
-				
-					dentro de {0} JU
-				
+				el jueves pasado
+				este jueves
+				el jueves próximo
 			
 			
-				
-					dentro de {0} viernes
-				
+				el viernes pasado
+				este viernes
+				el viernes próximo
 			
 			
-				
-					dentro de {0} vie.
-				
+				el vier. pasado
+				este vier.
+				el próximo vier.
 			
 			
 				
@@ -459,15 +521,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				
-					dentro de {0} sábado
-					dentro de {0} sábados
-				
+				el sábado pasado
+				este sábado
+				el sábado próximo
 			
 			
-				
-					dentro de {0} SA
-				
 				
 					hace {0} SA
 					hace {0} SA
@@ -490,14 +548,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					HST
 					HDT
 				
+				Honolulu
 			
 			
 				
 					hora universal coordinada
 				
 			
-			
-				São Paulo
+			
+				Rio Branco
 			
 			
 				Nassau
@@ -505,8 +564,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Fort Nelson
 			
-			
-				Acra
+			
+				Piongyang
+			
+			
+				Almatý
 			
 			
 				Astrakhan
@@ -520,8 +582,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Barnaul
 			
-			
-				Dusambé
+			
+				Wake
 			
 			
 				St. Thomas
@@ -568,6 +630,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					hora de Apia
+					hora estándar de Apia
 					hora de verano de Apia
 				
 			
@@ -583,11 +647,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					hora de Chamorro
 				
 			
+			
+				
+					hora de la isla de Navidad
+				
+			
 			
 				
 					hora de las Islas Cocos
 				
 			
+			
+				
+					hora de las Islas Cook
+					hora estándar de las Islas Cook
+					hora de verano media de las Islas Cook
+				
+			
 			
 				
 					hora de la isla de Pascua
@@ -638,6 +714,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					hora del Océano Índico
 				
 			
+			
+				
+					hora de Irkutsk
+					hora estándar de Irkutsh
+					hora de verano de Irkutsh
+				
+			
 			
 				
 					hora de la isla Macquarie
@@ -700,6 +783,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					0 K
+					0 K
 					00 K
 					00 K
 					000 K
@@ -751,7 +836,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			
-				dram
+				dram armenio
+				drams armenios
+			
+			
+				taka bangladesí
+				taka bangladesí
+				takas bangladesíes
+			
+			
+				ngultrum butanés
+				ngultrum butanés
+				gultrums bultaneses
+			
+			
+				p.
 			
 			
 				£
@@ -759,16 +858,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				¥
 			
-			
-				kwacha malauí
+			
+				som kirguís
 			
-			
-				ringit
-				ringit
-				ringits
+			
+				riel camboyano
+				rieles camboyanos
+			
+			
+				kip laosiano
+				kip laosiano
+				kips laosianos
 			
 			
-				leu rumano
 				lei
 			
 			
@@ -798,27 +900,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Bs
 			
+			
+				bolívar venezolano
+				bolivares venezolanos
+			
+			
+				dong vietnamita
+				dong vietnamita
+				dongs vietnamitas
+			
 			
 				franco CFA de África central
 				franco CFA de África central
 				francos CFA de África central
 			
-			
-				franco CFA de África Occidental
-				franco CFA de África Occidental
-				francos CFA de África Occidental
+			
+				kwacha zambiano
+				kwacha zambiano
+				kwachas zambianos
 			
 		
 	
 	
 		
-			
-				revoluciones
+			
+				arcominutos
+				{0} minuto
+				{0} minutos
+			
+			
+				arcosegundos
+				{0} segundo
+				{0} segundos
 			
 			
 				{0} mg/dL
 				{0} mg/dL
 			
+			
+				mmol/L
+			
+			
+				ppm
+			
 			
 				mpg Imp.
 				{0} mpg Imp.
@@ -829,34 +953,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ohmio
 				{0} ohmios
 			
-			
-				voltios
-				{0} voltio
-				{0} voltios
-			
 			
 				kilovatios hora
 				{0} kilovatio hora
 				{0} kilovatios hora
 			
-			
-				{0} gigahercio
-				{0} gigahercios
-			
-			
-				megahercios
-				{0} megahercio
-				{0} megahercios
-			
-			
-				kilohercios
-				{0} kilohercio
-				{0} kilohercios
-			
-			
-				hercios
-				{0} hercio
-				{0} hercios
+			
+				millas naúticas
+				{0} milla naútica
+				{0} millas naúticas
 			
 			
 				millas escandinavas
@@ -866,33 +971,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pt
 				{0} pt
 			
-			
-				{0} microgramos
-			
-			
-				gigavatios
-				{0} gigavatio
-				{0} gigavatios
-			
-			
-				megavatios
-				{0} megavatio
-				{0} megavatios
-			
-			
-				kilovatios
-				{0} kilovatio
-				{0} kilovatios
-			
-			
-				vatios
-				{0} vatio
-				{0} vatios
-			
-			
-				milivatios
-				{0} milivatio
-				{0} milivatios
+			
+				lux
 			
 			
 				{0} caballo de vapor
@@ -900,10 +980,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				kelvin
+				kelvin
 				{0} kelvin
 			
 			
 				acres-pies
+				{0} acre-pie
+				{0} acre-pies
 			
 			
 				Imp. gal
@@ -911,6 +994,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} gal Imp.
 				{0}/gal Imp.
 			
+			
+				onzas líquidas
+				{0} onza líquida
+				{0} onzas líquidas
+			
 		
 		
 			
@@ -921,18 +1009,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				grad.
 			
+			
+				{0} min
+				{0} min
+			
+			
+				arcseg
+				{0} s
+				{0} s
+			
+			
+				%
+			
+			
+				‰
+			
 			
 				mpg Imp.
 				{0} mpg Imp.
 				{0} mpg Imp.
 			
+			
+				byte
+			
+			
+				bit
+			
 			
+				a
+				{0} a
+				{0} a
 				{0}/a
 			
+			
+				{0} m
+				{0} m
+			
+			
+				{0} sem
+				{0} sem
+			
 			
+				días
+				{0} día
+				{0} días
 				{0}/d
 			
+			
+				yd
+			
 			
+				{0} a. l.
 				{0} a. l.
 			
 			
@@ -940,6 +1067,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} au
 				{0} au
 			
+			
+				M
+				{0} M
+				{0} M
+			
 			
 				pt
 				{0} pt
@@ -960,16 +1092,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} CV
 				{0} CV
 			
-			
-				{0} °C
-			
 			
 				Imp. gal
 				{0} gal Imp.
 				{0} gal Imp.
 			
+			
+				tza.
+				{0} tza.
+				{0} tzas.
+			
 		
 		
+			
+				a
+				{0}a
+				{0}a
+			
+			
+				m
+				{0}m
+				{0}m
+			
+			
+				sem
+				{0}sem
+				{0}sem
+			
+			
+				días
+				{0}d
+				{0}d
+			
 			
 				{0}°
 				{0}°
@@ -1007,6 +1161,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		text
 		extraligera
 		semiligera
+		mediana
 		demibold
 		ultranegrita
 	
diff --git a/make/data/cldr/common/main/es_UY.xml b/make/data/cldr/common/main/es_UY.xml
index 7c288887b61..0c781762bd5 100644
--- a/make/data/cldr/common/main/es_UY.xml
+++ b/make/data/cldr/common/main/es_UY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -92,10 +92,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							a. m.
 							p. m.
 						
-						
-							a. m.
-							p. m.
-						
 						
 							a. m.
 							p. m.
diff --git a/make/data/cldr/common/main/es_VE.xml b/make/data/cldr/common/main/es_VE.xml
index 6fc72632036..aeac9f83d68 100644
--- a/make/data/cldr/common/main/es_VE.xml
+++ b/make/data/cldr/common/main/es_VE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -32,7 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bosnia y Herzegovina
 			RU
 			Tristán de Acuña
-			Timor-Leste
 			Islas menores alejadas de EE. UU.
 		
 	
@@ -132,9 +131,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p. m.
 						
 						
-							a. m.
 							m.
-							p. m.
 						
 						
 							a. m.
diff --git a/make/data/cldr/common/main/et.xml b/make/data/cldr/common/main/et.xml
index cdcc89d0f0a..5144b5227bc 100644
--- a/make/data/cldr/common/main/et.xml
+++ b/make/data/cldr/common/main/et.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -105,7 +105,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			kariibi
 			kajuka
 			aitšami
-			Chakma
+			tšaakma
 			tšetšeeni
 			sebu
 			tšiga
@@ -251,7 +251,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			indoneesia
 			interlingue
 			ibo
-			Sichuani jii
+			nuosu
 			injupiaki
 			iloko
 			inguši
@@ -340,7 +340,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			põhjaluri
 			leedu
 			latgali
-			luba
+			Katanga luba
 			lulua
 			luisenjo
 			lunda
@@ -423,7 +423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			vananevari
 			njandža
 			njamvesi
-			nkole
+			njankole
 			njoro
 			nzima
 			oksitaani
@@ -599,7 +599,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			võru
 			vundžo
 			vallooni
-			walseri
+			valsi
 			volaita
 			varai
 			vašo
@@ -618,6 +618,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			joruba
 			njengatu
 			kantoni
+			kantoni hiina
 			tšuangi
 			sapoteegi
 			Blissi sümbolid
@@ -625,8 +626,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			zenaga
 			tamasikti (Maroko)
 			hiina
+			mandariinihiina
 			lihtsustatud hiina
+			lihtsustatud mandariinihiina
 			traditsiooniline hiina
+			traditsiooniline mandariinihiina
 			suulu
 			sunji
 			mittekeeleline
@@ -1096,7 +1100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Ukraina
 			Uganda
 			Ühendriikide hajasaared
-			Ühendatud Rahvaste Organisatsioon
+			Ühinenud Rahvaste Organisatsioon
 			ÜRO
 			Ameerika Ühendriigid
 			USA
@@ -1111,15 +1115,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis ja Futuna
 			Samoa
-			pseudo-aktsent
-			pseudo-Bidi
+			pseudo-aktsent
+			pseudo-Bidi
 			Kosovo
 			Jeemen
 			Mayotte
 			Lõuna-Aafrika Vabariik
 			Sambia
 			Zimbabwe
-			Tundmatu piirkond
+			tundmatu piirkond
 		
 		
 			saksa traditsiooniline kirjaviis
@@ -1340,10 +1344,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		[a b c d e f g h i j k l m n o p q r s š z ž t u v w õ ä ö ü x y]
-		[á à â å ā æ ç é è ê ë ē í ì î ï ī ñ ó ò ŏ ô ø ō œ ú ù û ū]
-		[A B C D E F G H I J K L M N O P Q R S Š Z Ž T U V Õ Ä Ö Ü X Y]
+		[á à â å ã ā æ ç é è ê ë ē í ì î ï ī ñ ó ò ŏ ô ø ō œ ú ù û ū]
+		[A B C D E F G H I J K L M N O P Q R S Š Z Ž T U V W Õ Ä Ö Ü X Y]
 		[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . “ „ ( ) \[ \] \{ \} @]
+		[\- ‑ – , ; \: ! ? . “ „ ( ) \[ \] \{ \} @]
 		{0}…
 		…{0}
 		{0} … {1}
@@ -1355,13 +1359,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
@@ -1533,55 +1532,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0}–{1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
 						
-							MMM y G – MMM y G
-							MMM–MMM y G
-							MMM y G – MMM y
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y G – MMM y
 						
 						
-							d.–d. MMM y G
-							d. MMM y G – d. MMM y G
-							d. MMM y G – d. MMM
-							d. MMM y G – d. MMM y
+							d.–d. MMM y G
+							d. MMM y G – d. MMM y G
+							d. MMM y G – d. MMM
+							d. MMM y G – d. MMM y
 						
 						
-							E, d. MMM y G – E, d. MMM
-							E, d. MMM y G – E, d. MMM y G
-							E, d. MMM y G – E, d. MMM
-							E, d. MMM y G – E, d. MMM y
+							E, d. MMM y G – E, d. MMM
+							E, d. MMM y G – E, d. MMM y G
+							E, d. MMM y G – E, d. MMM
+							E, d. MMM y G – E, d. MMM y
 						
 						
 							h–h a
@@ -1606,6 +1575,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							HH:mm–HH:mm v
 							HH:mm–HH:mm v
 						
+						
+							h–h a v
+						
 						
 							HH–HH v
 						
@@ -2088,55 +2060,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y–y G
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							y G – y G
+							y–y G
 						
 						
-							MMM y G – MMM y G
-							MMM–MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
 						
 						
-							d.–d. MMM y G
-							d. MMM y G – d. MMM y G
-							d. MMM – d. MMM y G
-							d. MMM y – d. MMM y G
+							d.–d. MMM y G
+							d. MMM y G – d. MMM y G
+							d. MMM – d. MMM y G
+							d. MMM y – d. MMM y G
 						
 						
-							E, d. MMM – E, d. MMM y G
-							E, d. MMM y G – E, d. MMM y G
-							E, d. MMM – E, d. MMM y G
-							E, d. MMM y – E, d. MMM y G
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y G – E, d. MMM y G
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y – E, d. MMM y G
 						
 						
 							h a – h a
@@ -2257,6 +2203,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				a
+				eelmine a
+				käesolev a
+				järgmine a
 				
 					{0} a pärast
 					{0} a pärast
@@ -2268,6 +2217,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				a
+				eelm. a
+				see a
+				järgm. a
 				
 					{0} a pärast
 					{0} a pärast
@@ -2335,6 +2287,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				k
+				eelm. kuu
+				see kuu
+				järgm. kuu
 				
 					{0} kuu pärast
 					{0} kuu pärast
@@ -2346,6 +2301,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				k
+				eelm. k
+				see k
+				järgm. k
 				
 					{0} k pärast
 					{0} k pärast
@@ -2372,6 +2330,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				näd
+				eelm. näd
+				see näd
+				järgm. näd
 				
 					{0} näd pärast
 					{0} näd pärast
@@ -2384,6 +2345,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				näd
+				eelm. n
+				see n
+				järgm. n
 				
 					{0} näd pärast
 					{0} näd pärast
@@ -3548,7 +3512,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktöbe
 			
 			
-				Kostanaj
+				Kostanaj
 			
 			
 				Kõzõlorda
@@ -4749,7 +4713,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Malaisia ​​aeg
+					Malaisia aeg
 				
 			
 			
@@ -5139,14 +5103,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			,
 			 
 			%
+			+
 			−
 			×10^
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tuhat
@@ -5247,12 +5218,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					00 mld ¤
 					000 mld ¤
 					000 mld ¤
-					0 trl ¤
-					0 trl ¤
-					00 trl ¤
-					00 trl ¤
-					000 trl ¤
-					000 trl ¤
+					0 trln ¤
+					0 trln ¤
+					00 trln ¤
+					00 trln ¤
+					000 trln ¤
+					000 trln ¤
 				
 			
 			{0} {1}
@@ -5268,6 +5239,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Araabia Ühendemiraatide dirhem
 				Araabia Ühendemiraatide dirhem
 				Araabia Ühendemiraatide dirhemit
+				AED
 			
 			
 				Afganistani afgaani (1927–2002)
@@ -5278,6 +5250,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afganistani afgaani
 				Afganistani afgaani
 				Afganistani afgaanit
+				AFN
 			
 			
 				Albaania lekk (1946–1965)
@@ -5288,21 +5261,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Albaania lekk
 				Albaania lekk
 				Albaania lekki
+				ALL
 			
 			
 				Armeenia dramm
 				Armeenia dramm
 				Armeenia drammi
+				AMD
 			
 			
 				Hollandi Antillide kulden
 				Hollandi Antillide kulden
 				Hollandi Antillide kuldnat
+				ANG
 			
 			
 				Angola kvanza
 				Angola kvanza
 				Angola kvanzat
+				AOA
 			
 			
 				Angola kvanza (1977–1990)
@@ -5334,6 +5311,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Argentina peeso
 				Argentina peeso
 				Argentina peesot
+				ARS
 				$
 			
 			
@@ -5352,6 +5330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aruba kulden
 				Aruba kulden
 				Aruba kuldnat
+				AWG
 			
 			
 				Aserbaidžaani manat (1993–2006)
@@ -5362,6 +5341,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aserbaidžaani manat
 				Aserbaidžaani manat
 				Aserbaidžaani manatit
+				AZN
 			
 			
 				Bosnia ja Hertsegoviina dinaar (1992–1994)
@@ -5372,6 +5352,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bosnia ja Hertsegoviina konverteeritav mark
 				Bosnia ja Hertsegoviina konverteeritav mark
 				Bosnia ja Hertsegoviina konverteeritavat marka
+				BAM
 			
 			
 				Bosnia ja Hertsegoviina uus dinaar (1994–1997)
@@ -5382,12 +5363,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Barbadose dollar
 				Barbadose dollar
 				Barbadose dollarit
+				BBD
 				$
 			
 			
 				Bangladeshi taka
 				Bangladeshi taka
 				Bangladeshi takat
+				BDT
 				৳
 			
 			
@@ -5410,6 +5393,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bulgaaria leev
 				Bulgaaria leev
 				Bulgaaria leevi
+				BGN
 			
 			
 				Bulgaaria leev (1879–1952)
@@ -5420,28 +5404,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahreini dinaar
 				Bahreini dinaar
 				Bahreini dinaari
+				BHD
 			
 			
 				Burundi frank
 				Burundi frank
 				Burundi franki
+				BIF
 			
 			
 				Bermuda dollar
 				Bermuda dollar
 				Bermuda dollarit
+				BMD
 				$
 			
 			
 				Brunei dollar
 				Brunei dollar
 				Brunei dollarit
+				BND
 				$
 			
 			
 				Boliivia boliviaano
 				Boliivia boliviaano
 				Boliivia boliviaanot
+				BOB
 			
 			
 				Boliivia boliviaano (1863–1963)
@@ -5470,6 +5459,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Brasiilia reaal
 				Brasiilia reaal
 				Brasiilia reaali
+				R$
 				R$
 			
 			
@@ -5486,12 +5476,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahama dollar
 				Bahama dollar
 				Bahama dollarit
+				BSD
 				$
 			
 			
 				Bhutani ngultrum
 				Bhutani ngultrum
 				Bhutani ngultrumit
+				BTN
 			
 			
 				Birma kjatt
@@ -5502,6 +5494,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Botswana pula
 				Botswana pula
 				Botswana pulat
+				BWP
 			
 			
 				Valgevene uus rubla (1994–1999)
@@ -5512,33 +5505,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Valgevene rubla
 				Valgevene rubla
 				Valgevene rubla
+				BYN
 			
 			
 				Valgevene rubla (2000–2016)
 				Valgevene rubla (2000–2016)
 				Valgevene rubla (2000–2016)
+				BYR
 			
 			
 				Belize’i dollar
 				Belize’i dollar
 				Belize’i dollarit
+				BZD
 				$
 			
 			
 				Kanada dollar
 				Kanada dollar
 				Kanada dollarit
+				CA$
 				$
 			
 			
 				Kongo frank
 				Kongo frank
 				Kongo franki
+				CDF
 			
 			
 				Šveitsi frank
 				Šveitsi frank
 				Šveitsi franki
+				CHF
 			
 			
 				Tšiili eskuudo
@@ -5549,29 +5548,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tšiili peeso
 				Tšiili peeso
 				Tšiili peesot
+				CLP
 				$
 			
 			
 				Hiina jüaan (välismaine turg)
 				Hiina jüaan (välismaine turg)
 				Hiina jüaani (välismaine turg)
+				CNH
 			
 			
 				Hiina jüaan
 				Hiina jüaan
 				Hiina jüaani
+				CN¥
 				¥
 			
 			
 				Colombia peeso
 				Colombia peeso
 				Colombia peesot
+				COP
 				$
 			
 			
 				Costa Rica koloon
 				Costa Rica koloon
 				Costa Rica kolooni
+				CRC
 				₡
 			
 			
@@ -5583,17 +5587,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuuba konverteeritav peeso
 				Kuuba konverteeritav peeso
 				Kuuba konverteeritavat peesot
+				CUC
 			
 			
 				Kuuba peeso
 				Kuuba peeso
 				Kuuba peesot
+				CUP
 				$
 			
 			
 				Cabo Verde eskuudo
 				Cabo Verde eskuudo
 				Cabo Verde eskuudot
+				CVE
 			
 			
 				Küprose nael
@@ -5604,6 +5611,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tšehhi kroon
 				Tšehhi kroon
 				Tšehhi krooni
+				CZK
 			
 			
 				Ida-Saksa mark
@@ -5619,23 +5627,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Djibouti frank
 				Djibouti frank
 				Djibouti franki
+				DJF
 			
 			
 				Taani kroon
 				Taani kroon
 				Taani krooni
+				DKK
 				kr
 			
 			
 				Dominikaani peeso
 				Dominikaani peeso
 				Dominikaani peesot
+				DOP
 				$
 			
 			
 				Alžeeria dinaar
 				Alžeeria dinaar
 				Alžeeria dinaari
+				DZD
 			
 			
 				Ecuadori sukre
@@ -5654,11 +5666,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Egiptuse nael
 				Egiptuse nael
 				Egiptuse naela
+				EGP
 			
 			
 				Eritrea nakfa
 				Eritrea nakfa
 				Eritrea nakfat
+				ERN
 			
 			
 				Hispaania peseeta
@@ -5669,11 +5683,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Etioopia birr
 				Etioopia birr
 				Etioopia birri
+				ETB
 			
 			
 				euro
 				euro
 				eurot
+				€
 				€
 			
 			
@@ -5685,12 +5701,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fidži dollar
 				Fidži dollar
 				Fidži dollarit
+				FJD
 				$
 			
 			
 				Falklandi saarte nael
 				Falklandi saarte nael
 				Falklandi saarte naela
+				FKP
 			
 			
 				Prantsuse frank
@@ -5701,12 +5719,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Suurbritannia naelsterling
 				Suurbritannia naelsterling
 				Suurbritannia naelsterlingit
+				£
 				£
 			
 			
 				Gruusia lari
 				Gruusia lari
 				Gruusia lari
+				GEL
 			
 			
 				Ghana sedi (1979–2007)
@@ -5717,22 +5737,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ghana sedi
 				Ghana sedi
 				Ghana sedit
+				GHS
 			
 			
 				Gibraltari nael
 				Gibraltari nael
 				Gibraltari naela
+				GIP
 				£
 			
 			
 				Gambia dalasi
 				Gambia dalasi
 				Gambia dalasit
+				GMD
 			
 			
 				Guinea frank
 				Guinea frank
 				Guinea franki
+				GNF
 			
 			
 				Guinea syli
@@ -5746,6 +5770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guatemala ketsaal
 				Guatemala ketsaal
 				Guatemala ketsaali
+				GTQ
 			
 			
 				Portugali Guinea eskuudo
@@ -5761,18 +5786,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guyana dollar
 				Guyana dollar
 				Guyana dollarit
+				GYD
 				$
 			
 			
 				Hongkongi dollar
 				Hongkongi dollar
 				Hongkongi dollarit
+				HK$
 				$
 			
 			
 				Hondurase lempiira
 				Hondurase lempiira
 				Hondurase lempiirat
+				HNL
 			
 			
 				Horvaatia dinaar
@@ -5783,21 +5811,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Horvaatia kuna
 				Horvaatia kuna
 				Horvaatia kuna
+				HRK
 			
 			
 				Haiti gurd
 				Haiti gurd
 				Haiti gurdi
+				HTG
 			
 			
 				Ungari forint
 				Ungari forint
 				Ungari forintit
+				HUF
 			
 			
 				Indoneesia ruupia
 				Indoneesia ruupia
 				Indoneesia ruupiat
+				IDR
 			
 			
 				Iiri nael
@@ -5818,23 +5850,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Iisraeli uus seekel
 				Iisraeli uus seekel
 				Iisraeli uut seeklit
+				₪
 				₪
 			
 			
 				India ruupia
 				India ruupia
 				India ruupiat
+				₹
 				₹
 			
 			
 				Iraagi dinaar
 				Iraagi dinaar
 				Iraagi dinaari
+				IQD
 			
 			
 				Iraani riaal
 				Iraani riaal
 				Iraani riaali
+				IRR
 			
 			
 				Islandi kroon (1918–1981)
@@ -5845,6 +5881,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Islandi kroon
 				Islandi kroon
 				Islandi krooni
+				ISK
 				kr
 			
 			
@@ -5856,12 +5893,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jamaica dollar
 				Jamaica dollar
 				Jamaica dollarit
+				JMD
 				$
 			
 			
 				Jordaania dinaar
 				Jordaania dinaar
 				Jordaania dinaari
+				JOD
 			
 			
 				Jaapani jeen
@@ -5874,27 +5913,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Keenia šilling
 				Keenia šilling
 				Keenia šillingit
+				KES
 			
 			
 				Kõrgõzstani somm
 				Kõrgõzstani somm
 				Kõrgõzstani sommi
+				KGS
 			
 			
 				Kambodža riaal
 				Kambodža riaal
 				Kambodža riaali
+				KHR
 				៛
 			
 			
 				Komoori frank
 				Komoori frank
 				Komoori franki
+				KMF
 			
 			
 				Põhja-Korea vonn
 				Põhja-Korea vonn
 				Põhja-Korea vonni
+				KPW
 			
 			
 				Lõuna-Korea vonn (1945–1953)
@@ -5905,45 +5949,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lõuna-Korea vonn
 				Lõuna-Korea vonn
 				Lõuna-Korea vonni
+				₩
 				₩
 			
 			
 				Kuveidi dinaar
 				Kuveidi dinaar
 				Kuveidi dinaari
+				KWD
 			
 			
 				Kaimanisaarte dollar
 				Kaimanisaarte dollar
 				Kaimanisaarte dollarit
+				KYD
 				$
 			
 			
 				Kasahstani tenge
 				Kasahstani tenge
 				Kasahstani tenget
+				KZT
 				₸
 			
 			
 				Laose kiip
 				Laose kiip
 				Laose kiipi
+				LAK
 				₭
 			
 			
 				Liibanoni nael
 				Liibanoni nael
 				Liibanoni naela
+				LBP
 			
 			
 				Sri Lanka ruupia
 				Sri Lanka ruupia
 				Sri Lanka ruupiat
+				LKR
 			
 			
 				Libeeria dollar
 				Libeeria dollar
 				Libeeria dollarit
+				LRD
 				$
 			
 			
@@ -5980,11 +6032,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Liibüa dinaar
 				Liibüa dinaar
 				Liibüa dinaari
+				LYD
 			
 			
 				Maroko dirhem
 				Maroko dirhem
 				Maroko dirhemit
+				MAD
 			
 			
 				Maroko frank
@@ -6000,11 +6054,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Moldova leu
 				Moldova leu
 				Moldova leud
+				MDL
 			
 			
 				Madagaskari ariari
 				Madagaskari ariari
 				Madagaskari ariarit
+				MGA
 			
 			
 				Madagaskar frank
@@ -6015,6 +6071,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makedoonia dinaar
 				Makedoonia dinaar
 				Makedoonia dinaari
+				MKD
 			
 			
 				Makedoonia dinaar (1992–1993)
@@ -6030,27 +6087,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Myanmari kjatt
 				Myanmari kjatt
 				Myanmari kjatti
+				MMK
 			
 			
 				Mongoolia tugrik
 				Mongoolia tugrik
 				Mongoolia tugrikut
+				MNT
 				₮
 			
 			
 				Macau pataaka
 				Macau pataaka
 				Macau pataakat
+				MOP
 			
 			
 				Mauritaania ugia (1973–2017)
 				Mauritaania ugia (1973–2017)
 				Mauritaania ugiat (1973–2017)
+				MRO
 			
 			
 				Mauritaania ugia
 				Mauritaania ugia
 				Mauritaania ugiat
+				MRU
 			
 			
 				Malta liir
@@ -6066,6 +6128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mauritiuse ruupia
 				Mauritiuse ruupia
 				Mauritiuse ruupiat
+				MUR
 			
 			
 				Maldiivi ruupia (1947–1981)
@@ -6076,16 +6139,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maldiivi ruupia
 				Maldiivi ruupia
 				Maldiivi ruupiat
+				MVR
 			
 			
 				Malawi kvatša
 				Malawi kvatša
 				Malawi kvatšat
+				MWK
 			
 			
 				Mehhiko peeso
 				Mehhiko peeso
 				Mehhiko peesot
+				MX$
 				$
 			
 			
@@ -6097,6 +6163,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malaisia ringgit
 				Malaisia ringgit
 				Malaisia ringgitit
+				MYR
 			
 			
 				Mosambiigi eskuudo
@@ -6112,17 +6179,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mosambiigi metikal
 				Mosambiigi metikal
 				Mosambiigi metikali
+				MZN
 			
 			
 				Namiibia dollar
 				Namiibia dollar
 				Namiibia dollarit
+				NAD
 				$
 			
 			
 				Nigeeria naira
 				Nigeeria naira
 				Nigeeria nairat
+				NGN
 				₦
 			
 			
@@ -6133,7 +6203,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Nicaragua kordoba
 				Nicaragua kordoba
-				Nicaragua kordobad
+				Nicaragua kordobat
+				NIO
 			
 			
 				Hollandi kulden
@@ -6144,27 +6215,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Norra kroon
 				Norra kroon
 				Norra krooni
+				NOK
 			
 			
 				Nepali ruupia
 				Nepali ruupia
 				Nepali ruupiat
+				NPR
 			
 			
 				Uus-Meremaa dollar
 				Uus-Meremaa dollar
 				Uus-Meremaa dollarit
+				NZ$
 				$
 			
 			
 				Omaani riaal
 				Omaani riaal
 				Omaani riaali
+				OMR
 			
 			
 				Panama balboa
 				Panama balboa
 				Panama balboad
+				PAB
 			
 			
 				Peruu inti
@@ -6173,6 +6249,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peruu soll
 				Peruu soll
 				Peruu solli
+				PEN
 			
 			
 				Peruu soll (1863–1965)
@@ -6183,22 +6260,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Paapua Uus-Guinea kina
 				Paapua Uus-Guinea kina
 				Paapua Uus-Guinea kinat
+				PGK
 			
 			
 				Filipiini peeso
 				Filipiini peeso
 				Filipiini peesot
+				PHP
 				₱
 			
 			
 				Pakistani ruupia
 				Pakistani ruupia
 				Pakistani ruupiat
+				PKR
 			
 			
 				Poola zlott
 				Poola zlott
 				Poola zlotti
+				PLN
 			
 			
 				Poola zlott (1950–1995)
@@ -6214,12 +6295,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Paraguay guaranii
 				Paraguay guaranii
 				Paraguay guaraniid
+				PYG
 				₲
 			
 			
 				Katari riaal
 				Katari riaal
 				Katari riaali
+				QAR
 			
 			
 				Rodeesia dollar
@@ -6235,16 +6318,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rumeenia leu
 				Rumeenia leu
 				Rumeenia leud
+				RON
 			
 			
 				Serbia dinaar
 				Serbia dinaar
 				Serbia dinaari
+				RSD
 			
 			
 				Venemaa rubla
 				Venemaa rubla
 				Venemaa rubla
+				RUB
 			
 			
 				Venemaa rubla (1991–1998)
@@ -6253,22 +6339,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rwanda frank
 				Rwanda frank
 				Rwanda franki
+				RWF
 			
 			
 				Saudi Araabia riaal
 				Saudi Araabia riaal
 				Saudi Araabia riaali
+				SAR
 			
 			
 				Saalomoni Saarte dollar
 				Saalomoni Saarte dollar
 				Saalomoni Saarte dollarit
+				SBD
 				$
 			
 			
 				Seišelli ruupia
 				Seišelli ruupia
 				Seišelli ruupiat
+				SCR
 			
 			
 				Sudaani dinaar (1992–2007)
@@ -6279,6 +6369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sudaani nael
 				Sudaani nael
 				Sudaani naela
+				SDG
 			
 			
 				Sudaani nael (1957–1998)
@@ -6289,17 +6380,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rootsi kroon
 				Rootsi kroon
 				Rootsi krooni
+				SEK
 			
 			
 				Singapuri dollar
 				Singapuri dollar
 				Singapuri dollarit
+				SGD
 				$
 			
 			
 				Saint Helena nael
 				Saint Helena nael
 				Saint Helena naela
+				SHP
 			
 			
 				Sloveenia tolar
@@ -6315,16 +6409,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sierra Leone leoone
 				Sierra Leone leoone
 				Sierra Leone leoonet
+				SLL
 			
 			
 				Somaalia šilling
 				Somaalia šilling
 				Somaalia šillingit
+				SOS
 			
 			
 				Suriname dollar
 				Suriname dollar
 				Suriname dollarit
+				SRD
 				$
 			
 			
@@ -6336,17 +6433,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lõuna-Sudaani nael
 				Lõuna-Sudaani nael
 				Lõuna-Sudaani naela
+				SSP
 				£
 			
 			
 				São Tomé ja Príncipe dobra (1977–2017)
 				São Tomé ja Príncipe dobra (1977–2017)
 				São Tomé ja Príncipe dobrat (1977–2017)
+				STD
 			
 			
 				São Tomé ja Príncipe dobra
 				São Tomé ja Príncipe dobra
 				São Tomé ja Príncipe dobrat
+				STN
 			
 			
 				NSVL-i rubla
@@ -6360,11 +6460,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Süüria nael
 				Süüria nael
 				Süüria naela
+				SYP
 			
 			
 				Svaasimaa lilangeni
 				Svaasimaa lilangeni
 				Svaasimaa lilangenit
+				SZL
 			
 			
 				Tai baat
@@ -6382,6 +6484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tadžikistani somoni
 				Tadžikistani somoni
 				Tadžikistani somonit
+				TJS
 			
 			
 				Türkmenistani manat (1993–2009)
@@ -6392,16 +6495,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Türkmenistani manat
 				Türkmenistani manat
 				Türkmenistani manatit
+				TMT
 			
 			
 				Tuneesia dinaar
 				Tuneesia dinaar
 				Tuneesia dinaari
+				TND
 			
 			
 				Tonga pa’anga
 				Tonga pa’anga
 				Tonga pa’angat
+				TOP
 			
 			
 				Timori eskuudo
@@ -6417,29 +6523,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Türgi liir
 				Türgi liir
 				Türgi liiri
+				TRY
 				₺
 			
 			
 				Trinidadi ja Tobago dollar
 				Trinidadi ja Tobago dollar
 				Trinidadi ja Tobago dollarit
+				TTD
 				$
 			
 			
 				uus Taiwani dollar
 				uus Taiwani dollar
 				uut Taiwani dollarit
+				NT$
 				NT$
 			
 			
 				Tansaania šilling
 				Tansaania šilling
 				Tansaania šillingit
+				TZS
 			
 			
 				Ukraina grivna
 				Ukraina grivna
 				Ukraina grivnat
+				UAH
 				₴
 			
 			
@@ -6454,6 +6565,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uganda šilling
 				Uganda šilling
 				Uganda šillingit
+				UGX
 			
 			
 				USA dollar
@@ -6477,12 +6589,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uruguay peeso
 				Uruguay peeso
 				Uruguay peesot
+				UYU
 				$
 			
 			
 				Usbekistani somm
 				Usbekistani somm
 				Usbekistani sommi
+				UZS
 			
 			
 				Venezuela boliivar (1871–2008)
@@ -6493,16 +6607,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venezuela boliivar (2008–2018)
 				Venezuela boliivar (2008–2018)
 				Venezuela boliivarit (2008–2018)
+				VEF
 			
 			
 				Venezuela boliivar
 				Venezuela boliivar
 				Venezuela boliivarit
+				VES
 			
 			
 				Vietnami dong
 				Vietnami dong
 				Vietnami dongi
+				₫
 				₫
 			
 			
@@ -6514,16 +6631,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vanuatu vatu
 				Vanuatu vatu
 				Vanuatu vatut
+				VUV
 			
 			
 				Samoa taala
 				Samoa taala
 				Samoa taalat
+				WST
 			
 			
 				Kesk-Aafrika CFA frank
 				Kesk-Aafrika CFA frank
 				Kesk-Aafrika CFA franki
+				FCFA
 			
 			
 				hõbe
@@ -6551,6 +6671,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ida-Kariibi dollar
 				Ida-Kariibi dollar
 				Ida-Kariibi dollarit
+				EC$
 			
 			
 				Rahvusvahelise Valuutafondi arvestusühik
@@ -6572,6 +6693,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lääne-Aafrika CFA frank
 				Lääne-Aafrika CFA frank
 				Lääne-Aafrika CFA franki
+				CFA
 			
 			
 				pallaadium
@@ -6582,6 +6704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP frank
 				CFP frank
 				CFP franki
+				CFPF
 			
 			
 				plaatina
@@ -6605,6 +6728,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jeemeni riaal
 				Jeemeni riaal
 				Jeemeni riaali
+				YER
 			
 			
 				Jugoslaavia uus dinaar (1994–2002)
@@ -6620,6 +6744,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lõuna-Aafrika rand
 				Lõuna-Aafrika rand
 				Lõuna-Aafrika randi
+				ZAR
 			
 			
 				Sambia kvatša (1968–2012)
@@ -6630,6 +6755,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sambia kvatša
 				Sambia kvatša
 				Sambia kvatšat
+				ZMW
 			
 			
 				Sairi zaire
@@ -6667,6 +6793,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} {1} kohta
 			
+			
+				{0}⋅{1}
+			
 			
 				Maa raskuskiirendus
 				{0} Maa raskuskiirendus
@@ -6877,6 +7006,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sajand
 				{0} sajandit
 			
+			
+				dekaadid
+				{0} dekaad
+				{0} dekaadi
+			
 			
 				aastad
 				{0} aasta
@@ -6994,6 +7128,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Briti soojusühik
 				{0} Briti soojusühikut
 			
+			
+				USA termid
+				{0} USA term
+				{0} USA termi
+			
 			
 				jõunaelad
 				{0} jõunael
@@ -7024,6 +7163,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} herts
 				{0} hertsi
 			
+			
+				tüpograafiline emm
+				{0} emm
+				{0} emmi
+			
+			
+				pikslid
+				{0} piksel
+				{0} pikslit
+			
+			
+				megapikslid
+				{0} megapiksel
+				{0} megapikslit
+			
+			
+				piksleid sentimeetri kohta
+				{0} piksel sentimeetri kohta
+				{0} pikslit sentimeetri kohta
+			
+			
+				piksleid tolli kohta
+				{0} piksel tolli kohta
+				{0} pikslit tolli kohta
+			
+			
+				punkte sentimeetri kohta
+				{0} punkt sentimeetri kohta
+				{0} punkti sentimeetri kohta
+			
+			
+				punkte tolli kohta
+				{0} punkt tolli kohta
+				{0} punkti tolli kohta
+			
 			
 				kilomeetrid
 				{0} kilomeeter
@@ -7141,8 +7315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Päikese heledus
-				{0} L☉
-				{0} L☉
 			
 			
 				tonnid
@@ -7248,11 +7420,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hobujõud
 				{0} hobujõudu
 			
-			
-				hektopaskalid
-				{0} hektopaskal
-				{0} hektopaskalit
-			
 			
 				millimeetrid elavhõbedasammast
 				{0} millimeeter elavhõbedasammast
@@ -7268,6 +7435,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} toll elavhõbedasammast
 				{0} tolli elavhõbedasammast
 			
+			
+				baarid
+				{0} baar
+				{0} baari
+			
 			
 				millibaarid
 				{0} millibaar
@@ -7278,6 +7450,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfäär
 				{0} atmosfääri
 			
+			
+				paskalid
+				{0} paskal
+				{0} paskalit
+			
+			
+				hektopaskalid
+				{0} hektopaskal
+				{0} hektopaskalit
+			
 			
 				kilopaskalid
 				{0} kilopaskal
@@ -7490,6 +7672,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				Maa raskuskiirendus
 				{0} G
@@ -7636,7 +7821,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg
 			
 			
-				miil/gal imp.
+				miil / gal imp.
 				{0} mpg imp.
 				{0} mpg imp.
 			
@@ -7700,6 +7885,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} saj
 				{0} saj
 			
+			
+				dek
+				{0} dek
+				{0} dek
+			
 			
 				aastad
 				{0} a
@@ -7817,6 +8007,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				USA term
+				{0} USA term
+				{0} USA termi
+			
 			
 				jõunael
 				{0} lbf
@@ -7847,6 +8042,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				emm
+				{0} emm
+				{0} emmi
+			
+			
+				pikslid
+				{0} px
+				{0} px
+			
+			
+				megapikslid
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -8067,11 +8294,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hj
 				{0} hj
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8087,6 +8309,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in Hg
 				{0} in Hg
 			
+			
+				baar
+				{0} baar
+				{0} baari
+			
 			
 				mbar
 				{0} mbar
@@ -8097,6 +8324,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8307,6 +8539,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				Maa raskuskiirendus
 				{0}G
@@ -8320,10 +8555,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}″
 			
+			
+				{0} km²
+				{0} km²
+			
+			
+				{0} ha
+				{0} ha
+			
+			
+				{0} m²
+				{0} m²
+			
 			
 				{0} aaker
 				{0} aakrit
 			
+			
+				{0} ct
+				{0} ct
+			
 			
 				%
 				{0}%
@@ -8485,10 +8736,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hj
 				{0} hj
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8504,6 +8751,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -8568,8 +8819,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} või {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/et_EE.xml b/make/data/cldr/common/main/et_EE.xml
index 1999bd213cb..739ba63d5bd 100644
--- a/make/data/cldr/common/main/et_EE.xml
+++ b/make/data/cldr/common/main/et_EE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/eu.xml b/make/data/cldr/common/main/eu.xml
index 7d5dc724bf1..6c5e82e5c4b 100644
--- a/make/data/cldr/common/main/eu.xml
+++ b/make/data/cldr/common/main/eu.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -39,7 +39,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			maputxe
 			arapaho
 			assamera
-			asua
+			asu
 			asturiera
 			avarera
 			awadhiera
@@ -66,6 +66,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			buginera
 			bilena
 			katalan
+			chakmera
 			txetxenera
 			cebuera
 			chigera
@@ -75,7 +76,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			choctaw
 			txerokiera
 			cheyennera
-			sorania
+			erdialdeko kurduera
 			korsikera
 			Seychelleetako kreolera
 			txekiera
@@ -129,7 +130,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Suitzako frantses
 			friuliera
 			frisiera
-			gaeliko
+			irlandera
 			ga
 			gagauzera
 			Eskoziako gaeliko
@@ -172,7 +173,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			japoniera
 			lojbanera
 			ngomba
-			machamera
+			machame
 			javera
 			georgiera
 			kabilera
@@ -181,16 +182,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			kambera
 			kabardiera
 			kataba
-			makondera
+			makondeera
 			Cabo Verdeko kreolera
 			koroa
 			kikongoa
 			kashia
-			koyra chiiniera
+			koyra chiini
 			kikuyuera
 			kuanyama
 			kazakhera
-			kakoa
+			kako
 			groenlandiera
 			kalenjinera
 			khemerera
@@ -226,7 +227,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			loziera
 			iparraldeko lurera
 			lituaniera
-			luba-katangera
+			Katangako lubera
 			txilubera
 			lundera
 			luoera
@@ -244,7 +245,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mauritaniako kreolera
 			malgaxe
 			makhuwa-meettoera
-			metera
+			metaʼera
 			marshallera
 			maoriera
 			mikmakera
@@ -270,6 +271,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			namera
 			bokmål (norvegiera)
 			iparraldeko ndebeleera
+			behe-aleman
 			behe-saxoiera
 			nepalera
 			newarera
@@ -314,12 +316,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			rundiera
 			errumaniera
 			moldaviera
-			romboera
+			rombo
 			erroa
 			errusiera
 			aromaniera
 			kinyaruanda
-			rwaera
+			rwera
 			sanskrito
 			sandaweera
 			sakhera
@@ -333,10 +335,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			sindhi
 			iparraldeko samiera
 			senera
-			koyraboro sennia
+			koyraboro senni
 			sango
 			serbokroaziera
-			tachelhita
+			tachelhit
 			shanera
 			sinhala
 			eslovakiera
@@ -361,7 +363,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			swahilia
 			Kongoko swahilia
 			komoreera
-			siriera
+			asiriera
 			tamilera
 			telugu
 			temnea
@@ -408,15 +410,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			kalmykera
 			xhosera
 			sogera
-			jangbenera
+			yangbenera
 			yemba
 			yiddish
 			jorubera
 			kantonera
+			Kantongo txinera
 			amazigera estandarra
 			txinera
+			mandarin
 			txinera soildua
+			mandarin sinplifikatu
 			txinera tradizionala
+			mandarin tradizional
 			zuluera
 			zuñia
 			ez dago eduki linguistikorik
@@ -768,6 +774,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis eta Futuna
 			Samoa
+			Sasiazentuak
+			pseudobidia
 			Kosovo
 			Yemen
 			Mayotte
@@ -890,7 +898,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Zenbaki hebrearrak
 			Zenbaki japoniarrak
 			Finantzetarako zenbaki japoniarrak
-			Digitu khmerarrak
+			Digitu khemerarrak
 			Digitu kannadarrak
 			Digitu laostarrak
 			Digitu mendebaldarrak
@@ -925,7 +933,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ó ò ŏ ô ö ø ō œ ú ù ŭ û ü ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
 		[, . % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -975,31 +983,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
+						B h('r')('a')'k'
+						B h:mm
+						B h:mm:s
 						d
 						ccc
-						E h:mm B
+						E B h:mm
 						E h:mm:ss B
 						d, EEEE
 						E h:mm a
@@ -1020,24 +1028,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MM/dd
 						MM/dd, EEEE
 						LLL
-						MMM d
-						MMM d, EEEE
-						MMMM d
+						MMM'k' d
+						MMM'k' d, EEEE
+						MMMM'k' d
 						mm:ss
 						y
 						y/MM
 						y/MM/dd
 						y/MM/dd, EEEE
 						y('e')'ko' MMMM
-						y('e')'ko' MMMM d
-						y('e')'ko' MMMM d, EEEE
-						y QQQ
+						y('e')'ko' MMMM'k' d
+						y('e')'ko' MMMM'k' d, EEEE
+						y('e')'ko' QQQ
 						y('e')'ko' QQQQ
 						G y
 						G y/MM
-						G y/MM/dd
-						G y/MM/dd, EEEE
-						G y MMM
+						G('e')'ko' y/MM/dd
+						G('e')'ko' y/MM/dd, EEEE
+						G, y('e')'ko' MMM
 						G y MMM d
 						G y MMM d, EEEE
 						G y('e')'ko' MMMM
@@ -1060,27 +1068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							dd–dd
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
 						
 							G y, MMM – G y, MMM
 							G y, MMM–MMM
@@ -1146,11 +1133,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							MMMM d–d
-							MMMM d – MMMM d
+							MMM'k' d – MMMM'k' d
 						
 						
-							MMMM d, EEEE – MMMM d, EEEE
-							MMMM d, EEEE – MMMM d, EEEE
+							MMM'k' d, EEEE – MMM'k' d, EEEE
+							MMM'k' d, EEEE – MMM'k' d, EEEE
 						
 						
 							G y–y
@@ -1621,27 +1608,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
 						
 							G y, MMM – G y, MMM
 							G y, MMM–MMM
@@ -2407,7 +2373,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Ordu Unibertsal Koordinatua
+					ordu unibertsal koordinatua
 				
 			
 			
@@ -3157,9 +3123,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Txoibalsan
 			
-			
-				Macao
-			
 			
 				Saipan
 			
@@ -4625,6 +4588,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0000
@@ -4744,153 +4712,153 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				AED
 			
 			
-				Afganistango afghania
-				Afganistango afghani
-				Afganistango afghani
+				afgani afganiarra
+				afgani afganiar
+				afgani afganiar
 				AFN
 			
 			
-				Albaniako leka
-				Albaniako lek
-				Albaniako lek
+				lek albaniarra
+				lek albaniar
+				lek albaniar
 				ALL
 			
 			
-				Armeniako drama
-				Armeniako dram
-				Armeniako dram
+				dram armeniarra
+				dram armeniar
+				dram armeniar
 				AMD
 			
 			
-				Holandarren Antilletako guilderra
-				Holandarren Antilletako guilder
-				Holandarren Antilletako guilder
+				Holandarren Antilletako florina
+				Holandarren Antilletako florin
+				Holandarren Antilletako florin
 				ANG
 			
 			
-				Angolako kwanza
-				Angolako kwanza
-				Angolako kwanza
+				kwanza angolarra
+				kwanza angolar
+				kwanza angolar
 				AOA
 				Kz
 			
 			
-				Argentinako pesoa
-				Argentinako peso
-				Argentinako peso
+				peso argentinarra
+				peso argentinar
+				peso argentinar
 				ARS
 				$
 			
 			
-				Australiako dolarra
-				Australiako dolar
-				Australiako dolar
+				dolar australiarra
+				dolar australiar
+				dolar australiar
 				A$
 				$
 			
 			
-				Arubako florina
-				Arubako florin
-				Arubako florin
+				florin arubarra
+				florin arubar
+				florin arubar
 				AWG
 			
 			
-				Azerbaijango manata
-				Azerbaijango manat
-				Azerbaijango manat
+				manat azerbaijandarra
+				manat azerbaijandar
+				manat azerbaijandar
 				AZN
 			
 			
-				Bosnia-Herzegovinako marko trukakorra
-				Bosnia-Herzegovinako marko trukakor
-				Bosnia-Herzegovinako marko trukakor
+				marko bihurgarri bosniarra
+				marko bihurgarri bosniar
+				marko bihurgarri bosniar
 				BAM
 				KM
 			
 			
-				Barbadosetako dolarra
-				Barbadosetako dolar
-				Barbadosetako dolar
+				dolar barbadostarra
+				dolar barbadostar
+				dolar barbadostar
 				BBD
 				$
 			
 			
-				Bangladesheko taka
-				Bangladesheko taka
-				Bangladesheko taka
+				taka bangladeshtarra
+				taka bangladeshtar
+				taka bangladeshtar
 				BDT
 				৳
 			
 			
-				Bulgariako leva
-				Bulgariako lev
-				Bulgariako lev
+				lev bulgariarra
+				lev bulgariar
+				lev bulgariar
 				BGN
 			
 			
-				Bahraingo dinarra
-				Bahraingo dinar
-				Bahraingo dinar
+				dinar bahraindarra
+				dinar bahraindar
+				dinar bahraindar
 				BHD
 			
 			
-				Burundiko frankoa
-				Burundiko franko
-				Burundiko franko
+				franko burundiarra
+				franko burundiar
+				franko burundiar
 				BIF
 			
 			
-				Bermudetako dolarra
-				Bermudetako dolar
-				Bermudetako dolar
+				dolar bermudarra
+				dolar bermudar
+				dolar bermudar
 				BMD
 				$
 			
 			
-				Bruneiko dolarra
-				Bruneiko dolar
-				Bruneiko dolar
+				dolar bruneitarra
+				dolar bruneitar
+				dolar bruneitar
 				BND
 				$
 			
 			
-				Boliviako bolivianoa
-				Boliviako boliviano
-				Boliviako boliviano
+				boliviano boliviarra
+				boliviano boliviar
+				boliviano boliviar
 				BOB
 				Bs
 			
 			
-				Brasilgo erreala
-				Brasilgo erreal
-				Brasilgo erreal
+				erreal brasildarra
+				erreal brasildar
+				erreal brasildar
 				R$
 				R$
 			
 			
-				Bahametako dolarra
-				Bahametako dolar
-				Bahametako dolar
+				dolar bahamarra
+				dolar bahamar
+				dolar bahamar
 				BSD
 				$
 			
 			
-				Bhutango ngultruma
-				Bhutango ngultrum
-				Bhutango ngultrum
+				ngultrum bhutandarra
+				ngultrum bhutandar
+				ngultrum bhutandar
 				BTN
 			
 			
-				Bosniako pula
-				Bosniako pula
-				Bosniako pula
+				pula botswanarra
+				pula botswanar
+				pula botswanar
 				BWP
 				P
 			
 			
-				Bielorrusiako errubloa
-				Bielorrusiako errublo
-				Bielorrusiako errublo
+				errublo bielorrusiarra
+				errublo bielorrusiar
+				errublo bielorrusiar
 				BYN
 				р.
 			
@@ -4901,54 +4869,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				BYR
 			
 			
-				Belizeko dolarra
-				Belizeko dolar
-				Belizeko dolar
+				dolar belizetarra
+				dolar belizetar
+				dolar belizetar
 				BZD
 				$
 			
 			
-				Kanadako dolarra
-				Kanadako dolar
-				Kanadako dolar
+				dolar kanadarra
+				dolar kanadar
+				dolar kanadar
 				CA$
 				$
 			
 			
-				Kongoko frankoa
-				Kongoko franko
-				Kongoko franko
+				franko kongoarra
+				franko kongoar
+				franko kongoar
 				CDF
 			
 			
-				Suitzako frankoa
-				Suitzako franko
-				Suitzako franko
+				franko suitzarra
+				franko suitzar
+				franko suitzar
 				CHF
 			
 			
-				Txileko pesoa
-				Txileko peso
-				Txileko peso
+				peso txiletarra
+				peso txiletar
+				peso txiletar
 				CLP
 				$
 			
 			
-				yuan txinatar (itsasoz haraindikoa)
+				yuan txinatarra (itsasoz haraindikoa)
 				yuan txinatar (itsasoz haraindikoa)
 				yuan txinatar (itsasoz haraindikoa)
+				CNH
 			
 			
-				Txinako yuana
-				Txinako yuan
-				Txinako yuan
+				yuan txinatarra
+				yuan txinatar
+				yuan txinatar
 				CN¥
 				¥
 			
 			
-				Kolonbiako pesoa
-				Kolonbiako peso
-				Kolonbiako peso
+				peso kolonbiarra
+				peso kolonbiar
+				peso kolonbiar
 				COP
 				$
 			
@@ -4960,69 +4929,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				₡
 			
 			
-				Kubako peso trukakorra
-				Kubako peso trukakor
-				Kubako peso trukakor
+				peso bihurgarri kubatarra
+				peso bihurgarri kubatar
+				peso bihurgarri kubatar
 				CUC
 				$
 			
 			
-				Kubako pesoa
-				Kubako peso
-				Kubako peso
+				peso kubatarra
+				peso kubatar
+				peso kubatar
 				CUP
 				$
 			
 			
-				Cabo Verdeko ezkutua
-				Cabo Verdeko ezkutu
-				Cabo Verdeko ezkutu
+				ezkutu caboverdetarra
+				ezkutu caboverdetar
+				ezkutu caboverdetar
 				CVE
 			
 			
-				Txekiar Errepublikako koroa
-				Txekiar Errepublikako koroa
-				Txekiar Errepublikako koroa
+				koroa txekiarra
+				koroa txekiar
+				koroa txekiar
 				CZK
 				Kč
 			
 			
-				Djibutiko frankoa
-				Djibutiko franko
-				Djibutiko franko
+				franko djibutiarra
+				franko djibutiar
+				franko djibutiar
 				DJF
 			
 			
-				Danimarkako koroa
-				Danimarkako koroa
-				Danimarkako koroa
+				koroa danimarkarra
+				koroa danimarkar
+				koroa danimarkar
 				DKK
 				kr
 			
 			
-				Dominikar Errepublikako pesoa
-				Dominikar Errepublikako peso
-				Dominikar Errepublikako peso
+				peso dominikarra
+				peso dominikar
+				peso dominikar
 				DOP
 				$
 			
 			
-				Aljeriako dinarra
-				Aljeriako dinar
-				Aljeriako dinar
+				dinar aljeriarra
+				dinar aljeriar
+				dinar aljeriar
 				DZD
 			
 			
-				Egiptoko libera
-				Egiptoko libera
-				Egiptoko libera
+				libera egiptoarra
+				libera egiptoar
+				libera egiptoar
 				EGP
 				E£
 			
 			
-				Eritreako nakfa
-				Eritreako nakfa
-				Eritreako nakfa
+				nakfa eritrearra
+				nakfa eritrear
+				nakfa eritrear
 				ERN
 			
 			
@@ -5032,9 +5001,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				.
 			
 			
-				Etiopiako birra
-				Etiopiako birr
-				Etiopiako birr
+				birr etiopiarra
+				birr etiopiar
+				birr etiopiar
 				ETB
 			
 			
@@ -5045,252 +5014,252 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				€
 			
 			
-				Fijiko dolarra
-				Fijiko dolar
-				Fijiko dolar
+				dolar fijiarra
+				dolar fijiar
+				dolar fijiar
 				FJD
 				$
 			
 			
-				Falkland uharteetako libera
-				Falkland uharteetako libera
-				Falkland uharteetako libera
+				libera falklandarra
+				libera falklandar
+				libera falklandar
 				FKP
 				£
 			
 			
-				Libera esterlina
-				Libera esterlina
-				Libera esterlina
+				libera esterlina
+				libera esterlina
+				libera esterlina
 				£
 				£
 			
 			
-				Georgiako laria
-				Georgiako lari
-				Georgiako lari
+				lari georgiarra
+				lari georgiar
+				lari georgiar
 				GEL
 				₾
 			
 			
-				Ghanako cedia
-				Ghanako cedi
-				Ghanako cedi
+				cedi ghanatarra
+				cedi ghanatar
+				cedi ghanatar
 				GHS
 			
 			
-				Gibraltarreko libera
-				Gibraltarreko libera
-				Gibraltarreko libera
+				libera gibraltartarra
+				libera gibraltartar
+				libera gibraltartar
 				GIP
 				£
 			
 			
-				Ganbiako dalasia
-				Ganbiako dalasi
-				Ganbiako dalasi
+				dalasi ganbiarra
+				dalasi ganbiar
+				dalasi ganbiar
 				GMD
 			
 			
-				Gineako frankoa
-				Gineako franko
-				Gineako franko
+				franko ginearra
+				franko ginear
+				franko ginear
 				GNF
 				FG
 			
 			
-				Guatemalako quetzala
-				Guatemalako quetzal
-				Guatemalako quetzal
+				ketzal guatemalarra
+				ketzal guatemalar
+				ketzal guatemalar
 				GTQ
 				Q
 			
 			
-				Guyanako dolarra
-				Guyanako dolar
-				Guyanako dolar
+				dolar guyanarra
+				dolar guyanar
+				dolar guyanar
 				GYD
 				$
 			
 			
-				Hong Kongeko dolarra
-				Hong Kongeko dolar
-				Hong Kongeko dolar
+				dolar hongkongtarra
+				dolar hongkongtar
+				dolar hongkongtar
 				HK$
 				$
 			
 			
-				Hondurasko lempira
-				Hondurasko lempira
-				Hondurasko lempira
+				lempira hodurastarra
+				lempira hodurastar
+				lempira hodurastar
 				HNL
 				L
 			
 			
-				Kroaziako kuna
-				Kroaziako kuna
-				Kroaziako kuna
+				kuna kroaziarra
+				kuna kroaziar
+				kuna kroaziar
 				HRK
 				kn
 			
 			
-				Haitiko gourdea
-				Haitiko gourde
-				Haitiko gourde
+				gourde haitiarra
+				gourde haitiar
+				gourde haitiar
 				HTG
 			
 			
-				Hungariako florina
-				Hungariako florin
-				Hungariako florin
+				florin hungariarra
+				florin hungariar
+				florin hungariar
 				HUF
 				Ft
 			
 			
-				Indonesiako errupia
-				Indonesiako errupia
-				Indonesiako errupia
+				errupia indonesiarra
+				errupia indonesiar
+				errupia indonesiar
 				IDR
 				Rp
 			
 			
-				Israelgo shekel berria
-				Israelgo shekel berri
-				Israelgo shekel berri
+				shekel israeldar berria
+				shekel israeldar berri
+				shekel israeldar berri
 				₪
 				₪
 			
 			
-				Indiako errupia
-				Indiako errupia
-				Indiako errupia
+				errupia indiarra
+				errupia indiar
+				errupia indiar
 				₹
 				₹
 			
 			
-				Irakeko dinarra
-				Irakeko dinar
-				Irakeko dinar
+				dinar irakiarra
+				dinar irakiar
+				dinar irakiar
 				IQD
 			
 			
-				Irango riala
-				Irango rial
-				Irango rial
+				rial irandarra
+				rial irandar
+				rial irandar
 				IRR
 			
 			
-				Islandiako koroa
-				Islandiako koroa
-				Islandiako koroa
+				koroa islandiarra
+				koroa islandiar
+				koroa islandiar
 				ISK
 				kr
 			
 			
 				Jamaikako dolarra
-				Jamaikako dolar
-				Jamaikako dolar
+				dolar jamaikar
+				dolar jamaikar
 				JMD
 				$
 			
 			
-				Jordaniako dinarra
-				Jordaniako dinar
-				Jordaniako dinar
+				dinar jordaniarra
+				dinar jordaniar
+				dinar jordaniar
 				JOD
 			
 			
-				Japoniako yena
-				Japoniako yen
-				Japoniako yen
+				yen japoniarra
+				yen japoniar
+				yen japoniar
 				JP¥
 				¥
 			
 			
-				Kenyako txelina
-				Kenyako txelin
-				Kenyako txelin
+				txelin kenyarra
+				txelin kenyar
+				txelin kenyar
 				KES
 			
 			
-				Kirgizistango soma
-				Kirgizistango som
-				Kirgizistango som
+				som kirgizistandarra
+				som kirgizistandar
+				som kirgizistandar
 				KGS
 			
 			
-				Kanbodiako riela
-				Kanbodiako riel
-				Kanbodiako riel
+				riel kanbodiarra
+				riel kanbodiar
+				riel kanbodiar
 				KHR
 				៛
 			
 			
-				Komoreetako frankoa
-				Komoreetako franko
-				Komoreetako franko
+				franko komoretarra
+				franko komoretar
+				franko komoretar
 				KMF
 				CF
 			
 			
-				Ipar Koreako wona
-				Ipar Koreako won
-				Ipar Koreako won
+				won iparkorearra
+				won iparkorear
+				won iparkorear
 				KPW
 				₩
 			
 			
-				Hego Koreako wona
-				Hego Koreako won
-				Hego Koreako won
+				won hegokorearra
+				won hegokorear
+				won hegokorear
 				₩
 				₩
 			
 			
-				Kuwaiteko dinarra
-				Kuwaiteko dinar
-				Kuwaiteko dinar
+				dinar kuwaitarra
+				dinar kuwaitar
+				dinar kuwaitar
 				KWD
 			
 			
-				Kaiman uharteetako dolarra
-				Kaiman uharteetako dolar
-				Kaiman uharteetako dolar
+				dolar kaimandarra
+				dolar kaimandar
+				dolar kaimandar
 				KYD
 				$
 			
 			
-				Kazakhstango tengea
-				Kazakhstango tenge
-				Kazakhstango tenge
+				tenge kazakhstandarra
+				tenge kazakhstandar
+				tenge kazakhstandar
 				KZT
 				₸
 			
 			
-				Laoseko kipa
-				Laoseko kip
-				Laoseko kip
+				kip laostarra
+				kip laostar
+				kip laostar
 				LAK
 				₭
 			
 			
-				Libanoko libera
-				Libanoko libera
-				Libanoko libera
+				libera libanoarra
+				libera libanoar
+				libera libanoar
 				LBP
 				L£
 			
 			
-				Sri Lankako errupia
-				Sri Lankako errupia
-				Sri Lankako errupia
+				errupia srilankarra
+				errupia srilankar
+				errupia srilankar
 				LKR
 				Rs
 			
 			
-				Liberiako dolarra
-				Liberiako dolar
-				Liberiako dolar
+				dolar liberiarra
+				dolar liberiar
+				dolar liberiar
 				LRD
 				$
 			
@@ -5310,54 +5279,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				LVL
 			
 			
-				Libiako dinarra
-				Libiako dinar
-				Libiako dinar
+				dinar libiarra
+				dinar libiar
+				dinar libiar
 				LYD
 			
 			
-				Marokoko dirhama
-				Marokoko dirham
-				Marokoko dirham
+				dirham marokoarra
+				dirham marokoar
+				dirham marokoar
 				MAD
 			
 			
-				Moldaviako leua
-				Moldaviako leu
-				Moldaviako leu
+				leu moldaviarra
+				leu moldaviar
+				leu moldaviar
 				MDL
 			
 			
-				Madagaskarreko ariarya
-				Madagaskarreko ariary
-				Madagaskarreko ariary
+				ariary madagaskartarra
+				ariary madagaskartar
+				ariary madagaskartar
 				MGA
 				Ar
 			
 			
-				Mazedoniako dinarra
-				Mazedoniako dinar
-				Mazedoniako dinar
+				dinar mazedoniarra
+				dinar mazedoniar
+				dinar mazedoniar
 				MKD
 			
 			
-				Myanmarreko kyata
-				Myanmarreko kyat
-				Myanmarreko kyat
+				kyat myanmartarra
+				kyat myanmartar
+				kyat myanmartar
 				MMK
 				K
 			
 			
-				Mongoliako tugrika
-				Mongoliako tugrik
-				Mongoliako tugrik
+				tugrik mongoliarra
+				tugrik mongoliar
+				tugrik mongoliar
 				MNT
 				₮
 			
 			
-				Macanako pataca
-				Macanako pataca
-				Macanako pataca
+				pataca macauarra
+				pataca macauar
+				pataca macauar
 				MOP
 			
 			
@@ -5367,211 +5336,212 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				MRO
 			
 			
-				Mauritaniako ouguiya
-				Mauritaniako ouguiya
-				Mauritaniako ouguiya
+				uguiya mauritaniarra
+				uguiya mauritaniar
+				uguiya mauritaniar
+				MRU
 			
 			
-				Maurizio uharteetako errupia
-				Maurizio uharteetako errupia
-				Maurizio uharteetako errupia
+				errupia mauriziarra
+				errupia mauriziar
+				errupia mauriziar
 				MUR
 				Rs
 			
 			
-				Maldivetako rufiyaa
-				Maldivetako rufiyaa
-				Maldivetako rufiyaa
+				errupia maldivarra
+				errupia maldivar
+				errupia maldivar
 				MVR
 			
 			
-				Malawiko kwacha
-				Malawiko kwacha
-				Malawiko kwacha
+				kwacha malawiarra
+				kwacha malawiar
+				kwacha malawiar
 				MWK
 			
 			
-				Mexikoko pesoa
-				Mexikoko peso
-				Mexikoko peso
+				peso mexikarra
+				peso mexikar
+				peso mexikar
 				MX$
 				$
 			
 			
-				Malaysiako ringgita
-				Malaysiako ringgit
-				Malaysiako ringgit
+				ringgit malaysiarra
+				ringgit malaysiar
+				ringgit malaysiar
 				MYR
 				RM
 			
 			
-				Mozambikeko metikala
-				Mozambikeko metikal
-				Mozambikeko metikal
+				metical mozambiketarra
+				metical mozambiketar
+				metical mozambiketar
 				MZN
 			
 			
-				Namibiako dolarra
-				Namibiako dolar
-				Namibiako dolar
+				dolar namibiarra
+				dolar namibiar
+				dolar namibiar
 				NAD
 				$
 			
 			
-				Nigeriako naira
-				Nigeriako naira
-				Nigeriako naira
+				naira nigeriarra
+				naira nigeriar
+				naira nigeriar
 				NGN
 				₦
 			
 			
-				Nikaraguako cordoba
-				Nikaraguako cordoba
-				Nikaraguako cordoba
+				córdoba nikaraguarra
+				córdoba nikaraguar
+				córdoba nikaraguar
 				NIO
 				C$
 			
 			
-				Norvegiako koroa
-				Norvegiako koroa
-				Norvegiako koroa
+				koroa norvegiarra
+				koroa norvegiar
+				koroa norvegiar
 				NOK
 				kr
 			
 			
-				Nepalgo errupia
-				Nepalgo errupia
-				Nepalgo errupia
+				errupia nepaldarra
+				errupia nepaldar
+				errupia nepaldar
 				NPR
 				Rs
 			
 			
-				Zeelanda Berriko dolarra
-				Zeelanda Berriko dolar
-				Zeelanda Berriko dolar
+				dolar zeelandaberritarra
+				dolar zeelandaberritar
+				dolar zeelandaberritar
 				NZ$
 				$
 			
 			
-				Omango riala
-				Omango rial
-				Omango rial
+				rial omandarra
+				rial omandar
+				rial omandar
 				OMR
 			
 			
-				Panamako balboa
-				Panamako balboa
-				Panamako balboa
+				balboa panamarra
+				balboa panamar
+				balboa panamar
 				PAB
 			
 			
-				Peruko sol
-				Peruko sol
+				sol perutarra
+				sol perutar
 				Peruko sol
 				PEN
 			
 			
-				Papua Ginea Berriko kina
-				Papua Ginea Berriko kina
-				Papua Ginea Berriko kina
+				kina gineaberriarra
+				kina gineaberriar
+				kina gineaberriar
 				PGK
 			
 			
-				Filipinetako pesoa
-				Filipinetako peso
-				Filipinetako peso
+				peso filipinarra
+				peso filipinar
+				peso filipinar
 				PHP
 				₱
 			
 			
-				Pakistango errupia
-				Pakistango errupia
-				Pakistango errupia
+				errupia pakistandarra
+				errupia pakistandar
+				errupia pakistandar
 				PKR
 				Rs
 			
 			
-				Poloniako zlotya
-				Poloniako zloty
-				Poloniako zloty
+				zloty poloniarra
+				zloty poloniar
+				zloty poloniar
 				PLN
 				zł
 			
 			
-				Paraguaiko guarania
-				Paraguaiko guarani
-				Paraguaiko guarani
+				guarani paraguaitarra
+				guarani paraguaitar
+				guarani paraguaitar
 				PYG
 				₲
 			
 			
-				Qatarreko riala
-				Qatarreko rial
-				Qatarreko rial
+				riyal qatartarra
+				riyal qatartar
+				riyal qatartar
 				QAR
 			
 			
-				Errumaniako leua
-				Errumaniako leu
-				Errumaniako leu
+				leu errumaniarra
+				leu errumaniar
+				leu errumaniar
 				RON
 			
 			
-				Serbiako dinarra
-				Serbiako dinar
-				Serbiako dinar
+				dinar serbiarra
+				dinar serbiar
+				dinar serbiar
 				RSD
 			
 			
-				Errusiako errubloa
-				Errusiako errublo
-				Errusiako errublo
+				errublo errusiarra
+				errublo errusiar
+				errublo errusiar
 				RUB
 				₽
 			
 			
-				Ruandako frankoa
-				Ruandako franko
-				Ruandako franko
+				franko ruandarra
+				franko ruandar
+				franko ruandar
 				RWF
 				RF
 			
 			
-				Arabia Saudiko riala
-				Arabia Saudiko rial
-				Arabia Saudiko rial
+				riyal saudiarabiarra
+				riyal saudiarabiar
+				riyal saudiarabiar
 				SAR
 			
 			
-				Salomon uharteetako dolarra
-				Salomon uharteetako dolar
-				Salomon uharteetako dolar
+				dolar salomondarra
+				dolar salomondar
+				dolar salomondar
 				SBD
 				$
 			
 			
-				Seychelleetako errupia
-				Seychelleetako errupia
-				Seychelleetako errupia
+				errupia seychelletarra
+				errupia seychelletar
+				errupia seychelletar
 				SCR
 			
 			
-				Sudango libera
-				Sudango libera
-				Sudango libera
+				libera sudandarra
+				libera sudandar
+				libera sudandar
 				SDG
 			
 			
-				Suediako koroa
-				Suediako koroa
-				Suediako koroa
+				koroa suediarra
+				koroa suediar
+				koroa suediar
 				SEK
 				kr
 			
 			
-				Singapurreko dolarra
-				Singapurreko dolar
-				Singapurreko dolar
+				dolar singapurtarra
+				dolar singapurtar
+				dolar singapurtar
 				SGD
 				$
 			
@@ -5583,28 +5553,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				£
 			
 			
-				Sierra Leonako leona
-				Sierra Leonako leona
-				Sierra Leonako leona
+				leone sierraleonarra
+				leone sierraleonar
+				leone sierraleonar
 				SLL
 			
 			
-				Somaliako txelina
-				Somaliako txelin
-				Somaliako txelin
+				txelin somaliarra
+				txelin somaliar
+				txelin somaliar
 				SOS
 			
 			
-				Surinameko dolarra
-				Surinameko dolar
-				Surinameko dolar
+				dolar surinamdarra
+				dolar surinamdar
+				dolar surinamdar
 				SRD
 				$
 			
 			
-				Hego Sudango libera
-				Hego Sudango libera
-				Hego Sudango libera
+				libera hegosudandarra
+				libera hegosudandar
+				libera hegosudandar
 				SSP
 				£
 			
@@ -5615,47 +5585,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				STD
 			
 			
-				Sao Tome eta Principeko dobra
-				Sao Tome eta Principeko dobra
-				Sao Tome eta Principeko dobra
+				dobra saotometarra
+				dobra saotometar
+				dobra saotometar
+				STN
 				Db
 			
 			
-				Siriako libera
-				Siriako libera
-				Siriako libera
+				libera siriarra
+				libera siriar
+				libera siriar
 				SYP
 				£
 			
 			
-				Swazilandiako lilangenia
-				Swazilandiako lilangeni
-				Swazilandiako lilangeni
+				lilangeni swazilandiarra
+				lilangeni swazilandiar
+				lilangeni swazilandiar
 				SZL
 			
 			
-				Thailandiako bahta
-				Thailandiako baht
-				Thailandiako baht
+				baht thailandiarra
+				baht thailandiar
+				baht thailandiar
 				฿
 				฿
 			
 			
-				Tajikistango somonia
-				Tajikistango somoni
-				Tajikistango somoni
+				somoni tajikistandarra
+				somoni tajikistandar
+				somoni tajikistandar
 				TJS
 			
 			
-				Turkmenistango manata
-				Turkmenistango manat
-				Turkmenistango manat
+				manat turkmenistandarra
+				manat turkmenistandar
+				manat turkmenistandar
 				TMT
 			
 			
-				Tunisiako dinarra
-				Tunisiako dinar
-				Tunisiako dinar
+				dinar tunisiarra
+				dinar tunisiar
+				dinar tunisiar
 				TND
 			
 			
@@ -5666,9 +5637,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				T$
 			
 			
-				Turkiako lira
-				Turkiako lira
-				Turkiako lira
+				lira turkiarra
+				lira turkiar
+				lira turkiar
 				TRY
 				₺
 				TL
@@ -5681,16 +5652,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				$
 			
 			
-				Taiwango dolar berria
-				Taiwango dolar berri
-				Taiwango dolar berri
+				dolar taiwandar berria
+				dolar taiwandar berri
+				dolar taiwandar berri
 				NT$
 				NT$
 			
 			
-				Tanzaniako txelina
-				Tanzaniako txelin
-				Tanzaniako txelin
+				txelin tanzaniarra
+				txelin tanzaniar
+				txelin tanzaniar
 				TZS
 			
 			
@@ -5701,29 +5672,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				₴
 			
 			
-				Ugandako txelina
-				Ugandako txelin
-				Ugandako txelin
+				txelin ugandarra
+				txelin ugandar
+				txelin ugandar
 				UGX
 			
 			
-				AEBko dolarra
-				AEBko dolar
-				AEBko dolar
+				dolar estatubatuarra
+				dolar estatubatuar
+				dolar estatubatuar
 				US$
 				$
 			
 			
-				Uruguaiko pesoa
-				Uruguaiko peso
-				Uruguaiko peso
+				peso uruguaitarra
+				peso uruguaitar
+				peso uruguaitar
 				UYU
 				$
 			
 			
-				Uzbekistango soma
-				Uzbekistango som
-				Uzbekistango som
+				sum uzbekistandarra
+				sum uzbekistandar
+				sum uzbekistandar
 				UZS
 			
 			
@@ -5734,27 +5705,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bs
 			
 			
-				Venezuelako bolivarra
-				Venezuelako bolivar
-				Venezuelako bolivar
+				bolivar venezuelarra
+				bolivar venezuelar
+				bolivar venezuelar
+				VES
 			
 			
-				Vietnameko donga
-				Vietnameko dong
-				Vietnameko dong
+				dong vietnamdarra
+				dong vietnamdar
+				dong vietnamdar
 				₫
 				₫
 			
 			
-				Vanuatuko vatua
-				Vanuatuko vatu
-				Vanuatuko vatu
+				vatu vanuatuarra
+				vatu vanuatuar
+				vatu vanuatuar
 				VUV
 			
 			
-				Samoko tala
-				Samoko tala
-				Samoko tala
+				tala samoarra
+				tala samoar
+				tala samoar
 				WST
 			
 			
@@ -5783,20 +5755,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFPF
 			
 			
-				Moneta ezezaguna
+				moneta ezezaguna
 				(moneta ezezaguna)
 				(moneta ezezaguna)
 			
 			
-				Yemengo riala
-				Yemengo rial
-				Yemengo rial
+				rial yemendarra
+				rial yemendar
+				rial yemendar
 				YER
 			
 			
-				Hegoafrikako randa
-				Hegoafrikako randa
-				Hegoafrikako randa
+				rand hegoafrikarra
+				rand hegoafrikar
+				rand hegoafrikar
 				ZAR
 				R
 			
@@ -5804,8 +5776,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zambiako kwacha (1968–2012)
 			
 			
-				Zambiako kwacha
-				Zambiako kwacha
+				kwacha zambiarra
+				kwacha zambiar
 				Zambiako kwacha
 				ZMW
 				ZK
@@ -5828,6 +5800,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}-{1}
+			
 			
 				grabitate-indar
 				{0} grabitate-indar
@@ -5883,7 +5858,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				cm²
 				{0} zentimetro karratu
-				{0} cm²
+				{0} zentimetro karratu
 				{0} zentimetro karratu bakoitzeko
 			
 			
@@ -5913,11 +5888,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hazbete karratu
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				kilateak
 				{0} kilate
@@ -5939,25 +5909,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} zati milioi bakoitzeko
 			
 			
-				%
-				% {0}
-				% {0}
+				ehuneko
+				ehuneko {0}
+				ehuneko {0}
 			
 			
-				‰
-				‰ {0}
-				‰ {0}
+				milako
+				milako {0}
+				milako {0}
 			
 			
-				‱
 				‱ {0}
 				‱ {0}
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				litro kilometro bakoitzeko
 				{0} litro kilometro bakoitzeko
@@ -5979,9 +5943,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} milia galoi britainiar bakoitzeko
 			
 			
-				PB
-				{0} PB
-				{0} PB
+				petabyte
+				{0} petabyte
+				{0} petabyte
 			
 			
 				terabyte-ak
@@ -6038,60 +6002,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mende
 				{0} mende
 			
+			
+				hamarkadak
+				{0} hamarkada
+				{0} hamarkada
+			
 			
-				urte
+				urteak
 				{0} urte
 				{0} urte
 				{0} urte bakoitzeko
 			
 			
-				hilabete
+				hilabeteak
 				{0} hilabete
 				{0} hilabete
 				{0} hilabete bakoitzeko
 			
 			
-				aste
+				asteak
 				{0} aste
 				{0} aste
 				{0} aste bakoitzeko
 			
 			
-				egun
+				egunak
 				{0} egun
 				{0} egun
 				{0} egun bakoitzeko
 			
 			
-				ordu
+				orduak
 				{0} ordu
 				{0} ordu
-				{0}/h
+				{0} ordu bakoitzeko
 			
 			
-				minutu
+				minutuak
 				{0} minutu
 				{0} minutu
 				{0} minutu bakoitzeko
 			
 			
-				segundo
+				segundoak
 				{0} segundo
 				{0} segundo
-				{0}/s
+				{0} segundo bakoitzeko
 			
 			
-				milisegundo
+				milisegundoak
 				{0} milisegundo
 				{0} milisegundo
 			
 			
-				mikrosegundo
+				mikrosegundoak
 				{0} mikrosegundo
 				{0} mikrosegundo
 			
 			
-				nanosegundo
+				nanosegundoak
 				{0} nanosegundo
 				{0} nanosegundo
 			
@@ -6145,25 +6114,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowatt-ordu
 				{0} kilowatt-ordu
 			
-			
-				eV
-				{0} eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				AEBko termiak
+				{0} AEBko termia
+				{0} AEBko termia
 			
 			
-				lbf
-				{0} lbf
-				{0} lbf
+				libra indar
+				{0} libra indar
+				{0} libra indar
 			
 			
-				N
-				{0} N
-				{0} N
+				newton
+				{0} newton
+				{0} newton
 			
 			
 				gigahertz
@@ -6185,6 +6149,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				em tipografikoa
+				{0} em
+				{0} em
+			
+			
+				pixel
+				{0} pixel
+				{0} pixel
+			
+			
+				megapixel
+				{0} megapixel
+				{0} megapixel
+			
+			
+				pixel zentimetroko
+				{0} pixel zentimetroko
+				{0} pixel zentimetroko
+			
+			
+				pixel hazbeteko
+				{0} pixel hazbeteko
+				{0} pixel hazbeteko
+			
+			
+				puntu zentimetroko
+				{0} puntu zentimetroko
+				{0} puntu zentimetroko
+			
+			
+				puntu hazbeteko
+				{0} puntu hazbeteko
+				{0} puntu hazbeteko
+			
 			
 				kilometro
 				{0} kilometro
@@ -6281,9 +6280,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} puntu
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
+				{0} eguzki-erradio
+				{0} eguzki-erradio
 			
 			
 				lux
@@ -6291,9 +6289,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				L☉
-				{0} L☉
-				{0} L☉
+				eguzki-argitasun
+				{0} eguzki-argitasun
+				{0} eguzki-argitasun
 			
 			
 				tonak
@@ -6350,19 +6348,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilate
 			
 			
-				Da
-				{0} Da
-				{0} Da
+				{0} dalton
+				{0} daltons
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				{0} lur-masa
+				{0} lur-masa
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
+				{0} eguzki-masa
+				{0} eguzki-masa
 			
 			
 				gigawatt-ak
@@ -6394,11 +6389,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} zaldi-potentzia
 				{0} zaldi-potentzia
 			
-			
-				hektopascalak
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				merkurio-milimetroak
 				{0} merkurio-milimetro
@@ -6414,23 +6404,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} merkurio-hazbete
 				{0} merkurio-hazbete
 			
+			
+				{0} bar
+				{0} bar
+			
 			
 				milibarrak
 				{0} milibar
 				{0} milibar
 			
 			
-				atm
-				{0} atm
-				{0} atm
+				atmosfera
+				{0} atmosfera
+				{0} atmosfera
+			
+			
+				pascal
+				{0} pascal
+				{0} pascal
+			
+			
+				hektopascalak
+				{0} hektopascal
+				{0} hektopascal
 			
 			
-				kilopascalak
+				kilopascal
 				{0} kilopascal
 				{0} kilopascal
 			
 			
-				megapascalak
+				megapascal
 				{0} megapascal
 				{0} megapascal
 			
@@ -6451,8 +6455,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				knot
-				{0} knot
-				{0} knot
+				{0} korapilo
+				{0} korapilo
 			
 			
 				°
@@ -6475,14 +6479,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvin gradu
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				oin-libra
+				{0} oin-libra
+				{0} oin-libra
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				newton-metro
+				{0} newton-metro
+				{0} newton-metro
 			
 			
 				kilometro kubiko
@@ -6559,8 +6563,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				katilu metrikoak
-				{0} katilu metriko
-				{0} katilu metriko
+				{0} katilukada metriko
+				{0} katilukada metriko
 			
 			
 				akre-oin
@@ -6596,13 +6600,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ontza likido
-				{0} ontza likido
-				{0} ontza likido
+				{0} likido-ontza
+				{0} likido-ontza
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				{0} likido-ontza inperial
+				{0} likido-ontza inperial
 			
 			
 				koilarakada
@@ -6615,9 +6618,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} koilaratxokada
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
+				{0} upel
+				{0} upel
 			
 			
 				puntu kardinala
@@ -6631,6 +6633,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				G
 				{0} G
@@ -6690,15 +6695,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/cm²
 			
 			
-				mi²
+				milia karratu
 				{0} mi²
 				{0} mi²
 				{0}/mi²
 			
 			
 				akre
-				{0} ac
-				{0} ac
+				{0} akre
+				{0} akre
 			
 			
 				yd²
@@ -6716,11 +6721,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in²
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				kt
 				{0} kt
@@ -6752,15 +6752,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				‰ {0}
 			
 			
-				‱
 				‱ {0}
 				‱ {0}
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				l/km
 				{0} l/km
@@ -6841,6 +6835,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m.
 				{0} m.
 			
+			
+				hamarkada
+				{0} hamarkada
+				{0} hamarkada
+			
 			
 				urte
 				{0} urte
@@ -6851,7 +6850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hilabete
 				{0} hilabete
 				{0} hilabete
-				{0}/hilabete
+				{0}/hil
 			
 			
 				aste
@@ -6878,13 +6877,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/min
 			
 			
-				seg
+				segundo
 				{0} s
 				{0} s
 				{0}/s
 			
 			
-				miliseg.
+				milisegundo
 				{0} ms
 				{0} ms
 			
@@ -6945,28 +6944,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				kWh
-				{0} kW/h
-				{0} kW/h
+				{0} kWh
+				{0} kWh
 			
-			
-				eV
-				{0} eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				AEBko termia
+				{0} AEBko termia
+				{0} AEBko termia
 			
 			
-				lbf
-				{0} lbf
-				{0} lbf
+				libra indar
 			
 			
-				N
-				{0} N
-				{0} N
+				newton
 			
 			
 				GHz
@@ -6988,6 +6978,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				pixel
+				{0} p
+				{0} p
+			
+			
+				megapixel
+				{0} Mp
+				{0} Mp
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -7074,19 +7099,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nmi
 			
 			
-				smi
+				milia eskandinaviar
 				{0} smi
 				{0} smi
 			
 			
-				pt
-				{0} pt
-				{0} pt
+				puntu
+				{0} puntu
+				{0} puntu
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
+				eguzki-erradio
 			
 			
 				lux
@@ -7094,9 +7117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				L☉
-				{0} L☉
-				{0} L☉
+				eguzki-argitasun
 			
 			
 				t
@@ -7126,9 +7147,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} µg
 			
 			
-				tn
-				{0} tn
-				{0} tn
+				AEBko tona
+				{0} AEBko tona
+				{0} AEBko tona
 			
 			
 				lb
@@ -7137,35 +7158,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/lb
 			
 			
-				oz
-				{0} oz
-				{0} oz
-				{0}/oz
+				ontza
+				{0} ontza
+				{0} ontza
+				{0}/ontza
 			
 			
-				oz t
-				{0} oz t
-				{0} oz t
+				troy ontza
+				{0} troy ontza
+				{0} troy ontza
 			
 			
-				CD
-				{0} CD
-				{0} CD
+				kilate
+				{0} kilate
+				{0} kilate
 			
 			
-				Da
-				{0} Da
-				{0} Da
+				dalton
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				lur-masa
+				{0} lur-masa
+				{0} lur-masa
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
+				eguzki-masa
+				{0} eguzki-masa
+				{0} eguzki-masa
 			
 			
 				GW
@@ -7197,11 +7216,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7217,15 +7231,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+			
 			
 				mb
 				{0} mb
 				{0} mb
 			
 			
-				atm
-				{0} atm
-				{0} atm
+				atmosfera
+				{0} atmosfera
+				{0} atmosfera
+			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				kPa
@@ -7253,9 +7282,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mph
 			
 			
-				kn
-				{0} kn
-				{0} kn
+				korapilo
+				{0} korapilo
+				{0} korapilo
 			
 			
 				°
@@ -7278,14 +7307,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				oin-libra
+				{0} oin-libra
+				{0} oin-libra
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				newton-metro
+				{0} Nm
+				{0} Nm
 			
 			
 				km³
@@ -7356,24 +7385,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 			
 			
-				m/pt
-				{0} m/pt
-				{0} m/pt
+				pinta metriko
+				{0} pinta metriko
+				{0} pinta metriko
 			
 			
-				mc
-				{0} mc
-				{0} mc
+				katilukada metriko
+				{0} katilukada metriko
+				{0} katilukada metriko
 			
 			
-				ac ft
-				{0} ac ft
-				{0} ac ft
+				akre-oin
+				{0} akre-oin
+				{0} akre-oin
 			
 			
-				gal
-				{0} gal
-				{0} gal
+				galoi
+				{0} galoi
+				{0} galoi
 				{0}/galoi estatubatuar
 			
 			
@@ -7383,44 +7412,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/gal brit.
 			
 			
-				qt
-				{0} qt
-				{0} qt
+				galoi-laurden
+				{0} galoi-laurden
+				{0} galoi-laurden
 			
 			
-				pt
-				{0} pt
-				{0} pt
+				pinta
+				{0} pinta
+				{0} pinta
 			
 			
-				c
-				{0} c
-				{0} c
+				katilukada
+				{0} katilukada
+				{0} katilukada
 			
 			
-				fl oz
-				{0} fl oz
-				{0} fl oz
+				likido-ontza
+				{0} likido-ontza
+				{0} likido-ontza
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				likido-ontza inperial
+				{0} likido-ontza inperial
+				{0} likido-ontza inperial
 			
 			
-				tbsp
-				{0} tbsp
-				{0} tbsp
+				koilarakada
+				{0} koilarakada
+				{0} koilarakada
 			
 			
-				tsp
-				{0} tsp
-				{0} tsp
+				koilaratxokada
+				{0} koilaratxokada
+				{0} koilaratxokada
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
+				upel
+				{0} upel
+				{0} upel
 			
 			
 				norabidea
@@ -7434,6 +7463,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				{0} G
 				{0} G
@@ -7486,13 +7518,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				urte
-				{0} urte
-				{0} urte
+				{0} u.
+				{0} u.
 			
 			
 				hilabete
-				{0} hil.
-				{0} hil.
+				{0} hil
+				{0} hil
 			
 			
 				aste
@@ -7501,8 +7533,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				egun
-				{0} egun
-				{0} egun
+				{0} e.
+				{0} e.
 			
 			
 				ordu
@@ -7515,12 +7547,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} min
 			
 			
-				seg
+				s
 				{0} s
 				{0} s
 			
 			
-				mseg.
+				ms
 				{0} ms
 				{0} ms
 			
@@ -7598,10 +7630,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -7610,6 +7638,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -7676,6 +7708,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} edo {1}
 			{0} edo {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/eu_ES.xml b/make/data/cldr/common/main/eu_ES.xml
index 8913168316d..9ea270a3d73 100644
--- a/make/data/cldr/common/main/eu_ES.xml
+++ b/make/data/cldr/common/main/eu_ES.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ewo.xml b/make/data/cldr/common/main/ewo.xml
index f687d944eea..a361ceae756 100644
--- a/make/data/cldr/common/main/ewo.xml
+++ b/make/data/cldr/common/main/ewo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molədaví
 			Madagasəkárə
 			Minlán Mí Maresál
-			Masedónia
 			Malí
 			Mianəmár
 			Mɔngɔ́lia
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à â ǎ b d {dz} e é è ê ě ə {ə\u0301} {ə\u0300} {ə\u0302} {ə\u030C} ɛ {ɛ\u0301} {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} f g h i í ì î ǐ k {kp} l m n ń ǹ {ng} {nk} ŋ o ó ò ô ǒ ɔ {ɔ\u0301} {ɔ\u0300} {ɔ\u0302} {ɔ\u030C} p r s t {ts} u ú ù û ǔ v w y z]
 		[c j q x]
 		[A B D E Ə Ɛ F G H I K L M N Ŋ O Ɔ P R S T U V W Y Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/ewo_CM.xml b/make/data/cldr/common/main/ewo_CM.xml
index a170f22d92b..e9c1b10d9a0 100644
--- a/make/data/cldr/common/main/ewo_CM.xml
+++ b/make/data/cldr/common/main/ewo_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fa.xml b/make/data/cldr/common/main/fa.xml
index 3fcd1973fe0..bcaf7551c6d 100644
--- a/make/data/cldr/common/main/fa.xml
+++ b/make/data/cldr/common/main/fa.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -91,7 +91,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			کاتالان
 			کادویی
 			کاریبی
-			چاکما
+			چاکما
 			چچنی
 			سبویی
 			چیگا
@@ -364,7 +364,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			فلمنگی
 			کوازیو
 			نروژی نی‌نُشک
-			انگیمبونی
+			نیامبون
 			نروژی
 			نغایی
 			نرس باستان
@@ -542,13 +542,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			یدی
 			یوروبایی
 			کانتونی
+			چینی کانتونی
 			چوانگی
 			زاپوتکی
 			زناگا
 			آمازیغی معیار مراکش
 			چینی
+			چینی، ماندارین
 			چینی ساده‌شده
+			چینی ماندارین ساده‌شده
 			چینی سنتی
+			چینی ماندارین سنتی
 			زولویی
 			زونیایی
 			بدون محتوای زبانی
@@ -590,7 +594,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -712,7 +716,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			شرق اروپا
 			شمال اروپا
 			غرب اروپا
-			افریقای سیاه
+			افریقای جنوب صحرا
 			امریکای لاتین
 			جزایر آسنسیون
 			آندورا
@@ -761,7 +765,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			کنگو (جمهوری)
 			سوئیس
 			ساحل عاج
-			ساحل‌عاج
 			جزایر کوک
 			شیلی
 			کامرون
@@ -774,7 +777,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			کوراسائو
 			جزیرهٔ کریسمس
 			قبرس
-			جمهوری چک
+			چک
+			جمهوری چک
 			آلمان
 			دیه‌گو گارسیا
 			جیبوتی
@@ -791,7 +795,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			اسپانیا
 			اتیوپی
 			اتحادیهٔ اروپا
-			منطقه یورو
+			منطقهٔ یورو
 			فنلاند
 			فیجی
 			جزایر فالکلند
@@ -814,14 +818,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			گوادلوپ
 			گینهٔ استوایی
 			یونان
-			جزایر جورجیای جنوبی و ساندویچ جنوبی
+			جورجیای جنوبی و جزایر ساندویچ جنوبی
 			گواتمالا
 			گوام
 			گینهٔ بیسائو
 			گویان
-			هنگ‌کنگ، منطقۀ ویژۀ اداری چین
+			هنگ‌کنگ، منطقهٔ ویژهٔ اداری چین
 			هنگ‌کنگ
-			جزیرهٔ هرد و جزایر مک‌دونالد
+			هرد و جزایر مک‌دونالد
 			هندوراس
 			کرواسی
 			هائیتی
@@ -874,7 +878,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			مالی
 			میانمار (برمه)
 			مغولستان
-			ماکائو، منطقۀ ویژۀ اداری چین
+			ماکائو، منطقهٔ ویژهٔ اداری چین
 			ماکائو
 			جزایر ماریانای شمالی
 			مارتینیک
@@ -931,7 +935,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			سنگاپور
 			سنت هلن
 			اسلوونی
-			اسوالبارد و جان‌ماین
+			سوالبارد و یان ماین
 			اسلواکی
 			سیرالئون
 			سان‌مارینو
@@ -981,6 +985,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			وانواتو
 			والیس و فوتونا
 			ساموآ
+			انگلیسی با لهجه خارجی
+			مجازی - دوجهته
 			کوزوو
 			یمن
 			مایوت
@@ -994,8 +1000,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			رسم‌الخط آلمانی ۱۹۹۶ میلادی
 			ارمنی شرقی
 			ارمنی غربی
+			کنوانسیون رسم‌الخط پرتغال و برزیل در ۱۹۴۵
 			فونتیک IPA
 			فونتیک UPA
+			رسم‌الخط استاندارد
+			املای فرهنگ انگلیسی آکسفورد
 			کامپیوتری
 			رسم‌الخط تجدیدنظرشده
 			روژان
@@ -1015,7 +1024,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			قدرت مرتب‌سازی
 			واحد پول
 			دور ساعت (۱۲ در مقابل ۲۴)
-			شیوهٔ اعمال سرخط
+			شیوهٔ سطرشکنی
 			دستگاه اندازه‌گیری
 			اعداد
 			منطقهٔ زمانی
@@ -1069,6 +1078,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ترتیب حرکتی
 			ترتیب سنتی
 			ترتیب رادیکالی-حرکتی
+			ترتیب ژویین
 			مرتب‌سازی بدون عادی‌سازی
 			مرتب‌سازی یونی‌کد نرمال‌شده
 			مرتب‌سازی ارقام بصورت مجزا
@@ -1085,9 +1095,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			سیستم ۱۲ ساعته (۱ تا ۱۲)
 			سیستم ۲۴ ساعته (۰ تا ۲۳)
 			سیستم ۲۴ ساعته (۱ تا ۲۴)
-			شیوهٔ ضعیف اعمال سرخط
-			شیوهٔ عادی اعمال سرخط
-			شیوهٔ قوی اعمال سرخط
+			شیوهٔ سطرشکنی سهل‌گیرانه
+			شیوهٔ سطرشکنی عادی
+			شیوهٔ سطرشکنی سخت‌گیرانه
 			ترانویسی انجمن نام‌های جغرافیایی ایالات متحده
 			ترانویسی گروه نام‌های جغرافیایی سازمان ملل
 			دستگاه متریک
@@ -1099,6 +1109,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			اعداد ارمنی با حروف کوچک
 			ارقام بالیایی
 			ارقام بنگالی
+			ارقام برهمایی
 			ارقام سیریلیک
 			ارقام دوناگری
 			اعداد اتیوپیایی
@@ -1122,6 +1133,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ارقام کاناده‌ای
 			ارقام لائوسی
 			ارقام غربی
+			ارقام ریاضی سیاه
+			ارقام ریاضی سیاه بی‌سریف
+			ارقام ریاضی بی‌سریف
 			ارقام مالایالامی
 			ارقام مغولی
 			ارقام میانماری
@@ -1159,22 +1173,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[ـ\u200C\u200D\u200E\u200F \u064E \u0650 \u064F \u0652 \u0656 \u0670 إ ك ى ي]
 		[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ه ی]
 		[\u200E , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
-		[\- ‐ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]
+		[\- ‐ ‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]
 		؟
-		
-			[\:∶]
-		
-		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
-			[\$﹩＄$]
-			[£₤]
-			[¥￥]
-			[₩￦]
-		
 		
-			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1403,7 +1409,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
-							y/M/d G
+							y/M/d GGGGG
 						
 					
 				
@@ -1436,11 +1442,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						ccc
 						E h:mm B
 						E h:mm:ss B
-						E d
+						E dم
 						E h:mm a
-						E HH:mm
+						E H:mm
 						E h:mm:ss a
-						E HH:mm:ss
+						E H:mm:ss
 						y G
 						MMM y G
 						d MMM y G
@@ -1460,17 +1466,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d LLL
 						d LLLL
 						E d LLLL
-						mm:ss
+						m:ss
 						y G
 						y G
-						y/M G
-						y/M/d G
-						E y/M/d G
+						y/M GGGGG
+						y/M/d GGGGG
+						E y/M/d GGGGG
 						MMM y G
 						d MMM y G
 						E d MMM y G
 						y MMMM G
-						QQQQ y G
+						QQQ y G
 						QQQQ y G
 					
 					
@@ -1492,42 +1498,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d تا d
 						
 						
-							G y – G y
-							G y–y
+							y G تا y G
+							y تا y G
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							y/M GGGGG تا y/M GGGGG
+							y/M تا y/M GGGGG
+							y/M تا y/M GGGGG
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							y/M/d تا y/M/d GGGGG
+							y/M/d GGGGG تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d GGGGG تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G تا MMM y G
+							LLL تا MMM y G
+							MMM y تا MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d تا d MMM y G
+							d MMM y G تا d MMM y G
+							d LLL تا d MMM y G
+							d MMM y تا d MMM y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E d LLL تا E d MMM y G
+							E d MMM y G تا E d MMM y G
+							E d LLL تا E d MMM y G
+							E d MMM y تا E d MMM y G
 						
 						
 							h a تا h a
@@ -1573,7 +1579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E M/d تا E M/d
 						
 						
-							MMM تا MMM
+							LLL تا LLL
 						
 						
 							d تا d LLL
@@ -1587,18 +1593,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							y تا y G
 						
 						
-							y/M تا y/M G
-							y/M تا y/M G
+							y/M تا y/M GGGGG
+							y/M تا y/M GGGGG
 						
 						
-							y/M/d تا y/M/d G
-							y/M/d تا y/M/d G
-							y/M/d تا y/M/d G
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
 						
 						
-							E y/M/d تا E y/M/d G
-							E y/M/d تا E y/M/d G
-							E y/M/d تا E y/M/d G
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
 						
 						
 							LLL تا MMM y G
@@ -2008,9 +2014,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						h:mm:ss a
 						H:mm:ss
 						h:mm:ss a v
-						HH:mm:ss v
+						H:mm:ss v
 						h:mm a v
-						HH:mm v
+						H:mm v
 						L
 						M/d
 						E M/d
@@ -2019,10 +2025,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E d LLL
 						d LLLL
 						E d LLLL
-						هفتۀ W از LLLL
-						هفتۀ W از LLLL
+						هفتهٔ Wم LLLL
+						هفتهٔ Wم LLLL
 						mm:ss
-						mm:ss
+						m:ss
 						y
 						y/M
 						y/M/d
@@ -2034,8 +2040,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						EEEE d MMMM y
 						QQQQ y
 						QQQQ y
-						هفته w از Y
-						هفته w از Y
+						هفتهٔ wم Y
+						هفتهٔ wم Y
 					
 					
 						{1} {0}
@@ -2056,42 +2062,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d تا d
 						
 						
-							G y – G y
-							G y–y
+							y G تا y G
+							y تا y G
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							y/M GGGGG تا y/M GGGGG
+							y/M تا y/M GGGGG
+							y/M تا y/M GGGGG
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							y/M/d تا y/M/d GGGGG
+							y/M/d GGGGG تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d GGGGG تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G تا MMM y G
+							LLL تا MMM y G
+							MMM y تا MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d تا d MMM y G
+							d MMM y G تا d MMM y G
+							d LLL تا d MMM y G
+							d MMM y تا d MMM y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E d LLL تا E d MMM y G
+							E d MMM y G تا E d MMM y G
+							E d LLL تا E d MMM y G
+							E d MMM y تا E d MMM y G
 						
 						
 							h a تا h a
@@ -2393,18 +2399,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ذیحجهٔ
 						
 						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
+							م
+							ص
+							ر
+							ر
+							ج
+							ج
+							ر
+							ش
+							ر
+							ش
+							ذ
+							ذ
 						
 						
 							محرم
@@ -2437,26 +2443,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ذیحجه
 						
 						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
+							م
+							ص
+							ر
+							ر
+							ج
+							ج
+							ر
+							ش
+							ر
+							ش
+							ذ
+							ذ
 						
 						
 							محرم
 							صفر
 							ربیع‌الاول
-							ربیع الثانی
-							جمادی الاول
-							جمادی الثانی
+							ربیع‌الثانی
+							جمادی‌الاول
+							جمادی‌الثانی
 							رجب
 							شعبان
 							رمضان
@@ -2500,10 +2506,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1}، ساعت {0}
+						
+					
+					
+						
+							{1}، ساعت {0}
+						
+					
 					
 						d
 						ccc
-						E d
+						E dم
 						y G
 						MMM y G
 						d MMM y G
@@ -2533,24 +2549,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQ y G
 						QQQQ y G
 						y G
-						y/M G
-						y/M/d G
-						E y/M/d G
+						y/M GGGGG
+						y/M/d GGGGG
+						E y/M/d GGGGG
 						MMM y G
 						d MMM y G
 						E d MMM y G
-						y MMMM G
+						MMMM y G
 						QQQ y G
 						QQQQ y G
 					
+					
+						
+							y G تا y G
+							y تا y G
+						
+						
+							y/M GGGGG تا y/M GGGGG
+							y/M تا y/M GGGGG
+							y/M تا y/M GGGGG
+						
+						
+							y/M/d تا y/M/d GGGGG
+							y/M/d GGGGG تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+						
+						
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d GGGGG تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+						
+						
+							MMM y G تا MMM y G
+							LLL تا MMM y G
+							MMM y تا MMM y G
+						
+						
+							d تا d MMM y G
+							d MMM y G تا d MMM y G
+							d LLL تا d MMM y G
+							d MMM y تا d MMM y G
+						
+						
+							E d LLL تا E d MMM y G
+							E d MMM y G تا E d MMM y G
+							E d LLL تا E d MMM y G
+							E d MMM y تا E d MMM y G
+						
+						
+							LLL تا LLL
+						
+						
+							y/M تا y/M GGGGG
+							y/M تا y/M GGGGG
+						
+						
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+						
+						
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+						
+					
 				
 			
 			
 				
+					
+						هیسی
+					
 					
-						هیسه‌ای
+						هیسی
 						ریوا
 					
+					
+						ه‍
+						ر
+					
 				
 			
 			
@@ -2678,7 +2758,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1}، ساعت {0}
+						
+					
+					
+						
+							{1}، ساعت {0}
+						
+					
 					
+						E dم
 						y
 						y
 						y/M
@@ -2692,6 +2783,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y
 					
 					
+						
+							y G تا y G
+							y تا y G
+						
+						
+							y/M GGGGG تا y/M GGGGG
+							y/M تا y/M GGGGG
+							y/M تا y/M GGGGG
+						
+						
+							y/M/d تا y/M/d GGGGG
+							y/M/d GGGGG تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+							y/M/d تا y/M/d GGGGG
+						
+						
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d GGGGG تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+							E y/M/d تا E y/M/d GGGGG
+						
+						
+							MMM y G تا MMM y G
+							LLL تا MMM y G
+							MMM y تا MMM y G
+						
+						
+							d تا d MMM y G
+							d MMM y G تا d MMM y G
+							d LLL تا d MMM y G
+							d MMM y تا d MMM y G
+						
+						
+							E d LLL تا E d MMM y G
+							E d MMM y G تا E d MMM y G
+							E d LLL تا E d MMM y G
+							E d MMM y تا E d MMM y G
+						
+						
+							LLL تا LLL
+						
 						
 							y تا y
 						
@@ -2857,7 +2989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ماه
-				ماه پیش
+				ماه گذشته
 				این ماه
 				ماه آینده
 				
@@ -2871,7 +3003,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ماه
-				ماه پیش
+				ماه گذشته
 				این ماه
 				ماه آینده
 				
@@ -4098,7 +4230,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				آقتوبه
 			
 			
-				قوستانای
+				قوستانای
 			
 			
 				قیزیل‌اوردا
@@ -4539,7 +4671,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				عشق‌آباد
 			
 			
-				شهر تونس
+				تونس
 			
 			
 				تونگاتاپو
@@ -5374,7 +5506,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					وقت جزایر نورفولک
+					وقت جزیرهٔ نورفولک
 				
 			
 			
@@ -5477,7 +5609,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					وقت ریونیون
+					وقت رئونیون
 				
 			
 			
@@ -5670,6 +5802,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			٫
+			٬
 			٪
 			‎+
 			‎−
@@ -5690,6 +5824,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			‰
 			∞
 			ناعدد
+			:
 		
 		
 			
@@ -5738,9 +5873,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					0 م
 					00 م
 					00 م
-					000 میلیارد
+					000 ب
 					000 میلیارد
-					0 تریلیون
+					0 ت
 					0 تریلیون
 					00 ت
 					00 ت
@@ -5841,14 +5976,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			
 				پزتای آندورا
+				پزتای آندورا
+				پزتای آندورا
 			
 			
 				درهم امارات متحدهٔ عربی
 				درهم امارات متحدهٔ عربی
 				درهم امارات متحدهٔ عربی
+				AED
 			
 			
 				افغانی افغانستان (۱۹۲۷ تا ۲۰۰۲)
+				افغانی افغانستان (۱۹۲۷ تا ۲۰۰۲)
+				افغانی افغانستان (۱۹۲۷ تا ۲۰۰۲)
 			
 			
 				افغانی افغانستان
@@ -5856,33 +5996,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				افغانی افغانستان
 				؋
 			
+			
+				لک آلبانی (۱۹۴۶ تا ۱۹۶۵)
+				لک آلبانی (۱۹۴۶ تا ۱۹۶۵)
+				لک آلبانی (۱۹۴۶ تا ۱۹۶۵)
+			
 			
 				لک آلبانی
 				لک آلبانی
 				لک آلبانی
+				ALL
 			
 			
 				درام ارمنستان
 				درام ارمنستان
 				درام ارمنستان
+				AMD
 			
 			
 				گیلدر آنتیل هلند
 				گیلدر آنتیل هلند
 				گیلدر آنتیل هلند
+				ANG
 			
 			
 				کوانزای آنگولا
 				کوانزای آنگولا
 				کوانزای آنگولا
+				AOA
+				Kz
+			
+			
+				پزوی آرژانتین (۱۸۸۱ تا ۱۹۷۰)
+				پزوی آرژانتین (۱۸۸۱ تا ۱۹۷۰)
+				پزوی آرژانتین (۱۸۸۱ تا ۱۹۷۰)
 			
 			
 				پزوی آرژانتین (۱۹۸۳ تا ۱۹۸۵)‏
+				پزوی آرژانتین (۱۹۸۳ تا ۱۹۸۵)
+				پزوی آرژانتین (۱۹۸۳ تا ۱۹۸۵)
 			
 			
 				پزوی آرژانتین
 				پزوی آرژانتین
 				پزوی آرژانتین
+				ARS
+				$
 			
 			
 				شیلینگ اتریش
@@ -5893,37 +6052,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دلار استرالیا
 				دلار استرالیا
 				دلار استرالیا
+				A$
+				$
 			
 			
 				فلورین آروبا
 				فلورین آروبا
 				فلورین آروبا
+				AWG
 			
 			
 				منات جمهوری آذربایجان (۱۹۹۳ تا ۲۰۰۶)
+				منات جمهوری آذربایجان (۱۹۹۳ تا ۲۰۰۶)
+				منات جمهوری آذربایجان (۱۹۹۳ تا ۲۰۰۶)
 			
 			
 				منات جمهوری آذربایجان
 				منات جمهوری آذربایجان
 				منات جمهوری آذربایجان
+				AZN
 			
 			
 				دینار بوسنی و هرزگوین (۱۹۹۲ تا ۱۹۹۴)
+				دینار بوسنی و هرزگوین (۱۹۹۲ تا ۱۹۹۴)
+				دینار بوسنی و هرزگوین (۱۹۹۲ تا ۱۹۹۴)
 			
 			
 				مارک تبدیل‌پذیر بوسنی و هرزگوین
 				مارک تبدیل‌پذیر بوسنی و هرزگوین
 				مارک تبدیل‌پذیر بوسنی و هرزگوین
+				BAM
+				KM
 			
 			
 				دلار باربادوس
 				دلار باربادوس
 				دلار باربادوس
+				BBD
+				$
 			
 			
 				تاکای بنگلادش
 				تاکای بنگلادش
 				تاکای بنگلادش
+				BDT
+				৳
 			
 			
 				فرانک بلژیک
@@ -5939,31 +6112,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				لف بلغارستان
 				لف بلغارستان
 				لف بلغارستان
+				BGN
 			
 			
 				دینار بحرین
 				دینار بحرین
 				دینار بحرین
+				BHD
 			
 			
 				فرانک بوروندی
 				فرانک بوروندی
 				فرانک بوروندی
+				BIF
 			
 			
 				دلار برمودا
 				دلار برمودا
 				دلار برمودا
+				BMD
+				$
 			
 			
 				دلار برونئی
 				دلار برونئی
 				دلار برونئی
+				BND
+				$
 			
 			
 				بولیویانوی بولیوی
 				بولیویانوی بولیوی
 				بولیویانوی بولیوی
+				BOB
+				Bs
 			
 			
 				پزوی بولیوی
@@ -5972,21 +6154,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				رئال برزیل
 				رئال برزیل
 				رئال برزیل
+				R$
+				R$
 			
 			
 				دلار باهاما
 				دلار باهاما
 				دلار باهاما
+				BSD
+				$
 			
 			
 				انگولتروم بوتان
 				انگولتروم بوتان
 				انگولتروم بوتان
+				BTN
 			
 			
 				پولای بوتسوانا
 				پولای بوتسوانا
 				پولای بوتسوانا
+				BWP
+				P
 			
 			
 				روبل جدید بیلوروسی (۱۹۹۴ تا ۱۹۹۹)
@@ -5995,87 +6184,116 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				روبل بلاروسی
 				روبل بلاروسی
 				روبل بلاروسی
+				BYN
+				р.
 			
 			
 				روبل بلاروسی (۲۰۱۶–۲۰۰۰)
 				روبل بلاروسی (۲۰۱۶–۲۰۰۰)
 				روبل بلاروسی (۲۰۱۶–۲۰۰۰)
+				BYR
 			
 			
 				دلار بلیز
 				دلار بلیز
 				دلار بلیز
+				BZD
+				$
 			
 			
 				دلار کانادا
 				دلار کانادا
 				دلار کانادا
 				$CA
+				$
 			
 			
 				فرانک کنگو
 				فرانک کنگو
 				فرانک کنگو
+				CDF
 			
 			
 				فرانک سوئیس
 				فرانک سوئیس
 				فرانک سوئیس
+				CHF
 			
 			
 				پزوی شیلی
 				پزوی شیلی
 				پزوی شیلی
+				CLP
+				$
 			
 			
 				یوآن چین (برون‌مرزی)
 				یوآن چین (برون‌مرزی)
 				یوآن چین (برون‌مرزی)
+				CNH
 			
 			
 				یوآن چین
 				یوآن چین
 				یوآن چین
 				¥CN
+				¥
 			
 			
 				پزوی کلمبیا
 				پزوی کلمبیا
 				پزوی کلمبیا
+				COP
+				$
 			
 			
 				کولون کاستاریکا
 				کولون کاستاریکا
 				کولون کاستاریکا
+				CRC
+				₡
 			
 			
 				دینار صربستان (۲۰۰۲ تا ۲۰۰۶)
+				دینار صربستان (۲۰۰۲ تا ۲۰۰۶)
+				دینار صربستان (۲۰۰۲ تا ۲۰۰۶)
 			
 			
 				پزوی تبدیل‌پذیر کوبا
 				پزوی تبدیل‌پذیر کوبا
 				پزوی تبدیل‌پذیر کوبا
+				CUC
+				$
 			
 			
 				پزوی کوبا
 				پزوی کوبا
 				پزوی کوبا
+				CUP
+				$
 			
 			
 				اسکودوی کیپ‌ورد
 				اسکودوی کیپ‌ورد
 				اسکودوی کیپ‌ورد
+				CVE
 			
 			
 				پوند قبرس
+				پوند قبرس
+				پوند قبرس
 			
 			
 				کورونای جمهوری چک
 				کورونای جمهوری چک
 				کورونای جمهوری چک
+				CZK
+				Kč
 			
 			
 				مارک آلمان شرقی
+				مارک آلمان شرقی
+				مارک آلمان شرقی
 			
 			
 				مارک آلمان
@@ -6086,51 +6304,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				فرانک جیبوتی
 				فرانک جیبوتی
 				فرانک جیبوتی
+				DJF
 			
 			
 				کرون دانمارک
 				کرون دانمارک
 				کرون دانمارک
+				DKK
+				kr
 			
 			
 				پزوی جمهوری دومینیکن
 				پزوی جمهوری دومینیکن
 				پزوی جمهوری دومینیکن
+				DOP
+				$
 			
 			
 				دینار الجزایر
 				دینار الجزایر
 				دینار الجزایر
+				DZD
+			
+			
+				کرون استونی
+				کرون استونی
+				کرون استونی
 			
 			
 				پوند مصر
 				پوند مصر
 				پوند مصر
+				EGP
+				E£
 			
 			
 				ناکفای اریتره
 				ناکفای اریتره
 				ناکفای اریتره
+				ERN
+			
+			
+				پزتای اسپانیا
+				پزتای اسپانیا
+				پزتای اسپانیا
 			
 			
 				بیر اتیوپی
 				بیر اتیوپی
 				بیر اتیوپی
+				ETB
 			
 			
 				یورو
 				یورو
 				یورو
+				€
+				€
 			
 			
 				دلار فیجی
 				دلار فیجی
 				دلار فیجی
+				FJD
+				$
 			
 			
 				پوند جزایر فالکلند
 				پوند جزایر فالکلند
 				پوند جزایر فالکلند
+				FKP
+				£
 			
 			
 				فرانک فرانسه
@@ -6141,40 +6385,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				پوند بریتانیا
 				پوند بریتانیا
 				پوند بریتانیا
+				£
+				£
 			
 			
 				لاری گرجستان
 				لاری گرجستان
 				لاری گرجستان
+				GEL
+				₾
 				₾
 			
 			
 				سدی غنا
 				سدی غنا
 				سدی غنا
+				GHS
 			
 			
 				پوند جبل‌الطارق
 				پوند جبل‌الطارق
 				پوند جبل‌الطارق
+				GIP
+				£
 			
 			
 				دالاسی گامبیا
 				دالاسی گامبیا
 				دالاسی گامبیا
+				GMD
 			
 			
 				فرانک گینه
 				فرانک گینه
 				فرانک گینه
+				GNF
+				FG
 			
 			
 				دراخمای یونان
+				دراخمای یونان
+				دراخمای یونان
 			
 			
 				کتزال گواتمالا
 				کتزال گواتمالا
 				کتزال گواتمالا
+				GTQ
+				Q
 			
 			
 				پزوی گینهٔ بیسائو
@@ -6183,58 +6441,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دلار گویانا
 				دلار گویانا
 				دلار گویانا
+				GYD
+				$
 			
 			
 				دلار هنگ‌کنگ
 				دلار هنگ‌کنگ
 				دلار هنگ‌کنگ
 				$HK
+				$
 			
 			
 				لمپیرای هندوراس
 				لمپیرای هندوراس
 				لمپیرای هندوراس
+				HNL
+				L
 			
 			
 				دینار کرواسی
+				دینار کرواسی
+				دینار کرواسی
 			
 			
 				کونای کرواسی
 				کونای کرواسی
 				کونای کرواسی
+				HRK
+				kn
 			
 			
 				گورد هائیتی
 				گورد هائیتی
 				گورد هائیتی
+				HTG
 			
 			
 				فورینت مجارستان
 				فورینت مجارستان
 				فورینت مجارستان
+				HUF
+				Ft
 			
 			
 				روپیهٔ اندونزی
 				روپیهٔ اندونزی
 				روپیهٔ اندونزی
+				IDR
+				Rp
 			
 			
 				پوند ایرلند
+				پوند ایرلند
+				پوند ایرلند
+			
+			
+				پوند اسرائیل
+				پوند اسرائیل
+				پوند اسرائیل
+			
+			
+				شقل اسرائیل (۱۹۸۰ تا ۱۹۸۵)
+				شقل اسرائیل (۱۹۸۰ تا ۱۹۸۵)
+				شقل اسرائیل (۱۹۸۰ تا ۱۹۸۵)
 			
 			
 				شقل جدید اسرائیل
 				شقل جدید اسرائیل
 				شقل جدید اسرائیل
+				₪
+				₪
 			
 			
 				روپیهٔ هند
 				روپیهٔ هند
 				روپیهٔ هند
+				₹
+				₹
 			
 			
 				دینار عراق
 				دینار عراق
 				دینار عراق
+				IQD
 			
 			
 				ریال ایران
@@ -6242,94 +6531,135 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ریال ایران
 				ریال
 			
+			
+				کرونای ایسلند (۱۹۱۸ تا ۱۹۸۱)
+				کرونای ایسلند (۱۹۱۸ تا ۱۹۸۱)
+				کرونای ایسلند (۱۹۱۸ تا ۱۹۸۱)
+			
 			
 				کرونای ایسلند
 				کرونای ایسلند
 				کرونای ایسلند
+				ISK
+				kr
 			
 			
 				لیرهٔ ایتالیا
+				لیرهٔ ایتالیا
+				لیرهٔ ایتالیا
 			
 			
 				دلار جامائیکا
 				دلار جامائیکا
 				دلار جامائیکا
+				JMD
+				$
 			
 			
 				دینار اردن
 				دینار اردن
 				دینار اردن
+				JOD
 			
 			
 				ین ژاپن
 				ین ژاپن
 				ین ژاپن
 				¥
+				¥
 			
 			
 				شیلینگ کنیا
 				شیلینگ کنیا
 				شیلینگ کنیا
+				KES
 			
 			
 				سوم قرقیزستان
 				سوم قرقیزستان
 				سوم قرقیزستان
+				KGS
 			
 			
 				ری‌یل کامبوج
 				ری‌یل کامبوج
 				ری‌یل کامبوج
+				KHR
+				៛
 			
 			
 				فرانک کومورو
 				فرانک کومورو
 				فرانک کومورو
+				KMF
+				CF
 			
 			
 				وون کرهٔ شمالی
 				وون کرهٔ شمالی
 				وون کرهٔ شمالی
+				KPW
+				₩
+			
+			
+				وون کرهٔ جنوبی (۱۹۴۵ تا ۱۹۵۳)
+				وون کرهٔ جنوبی (۱۹۴۵ تا ۱۹۵۳)
+				وون کرهٔ جنوبی (۱۹۴۵ تا ۱۹۵۳)
 			
 			
 				وون کرهٔ جنوبی
 				وون کرهٔ جنوبی
 				وون کرهٔ جنوبی
+				₩
+				₩
 			
 			
 				دینار کویت
 				دینار کویت
 				دینار کویت
+				KWD
 			
 			
 				دلار جزایر کِیمن
 				دلار جزایر کِیمن
 				دلار جزایر کِیمن
+				KYD
+				$
 			
 			
 				تنگهٔ قزاقستان
 				تنگهٔ قزاقستان
 				تنگهٔ قزاقستان
+				KZT
+				₸
 			
 			
 				کیپ لائوس
 				کیپ لائوس
 				کیپ لائوس
+				LAK
+				₭
 			
 			
 				لیرهٔ لبنان
 				لیرهٔ لبنان
 				لیرهٔ لبنان
+				LBP
+				L£
 			
 			
 				روپیهٔ سری‌لانکا
 				روپیهٔ سری‌لانکا
 				روپیهٔ سری‌لانکا
+				LKR
+				Rs
 			
 			
 				دلار لیبریا
 				دلار لیبریا
 				دلار لیبریا
+				LRD
+				$
 			
 			
 				لوتی لسوتو
@@ -6338,6 +6668,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				لیتاس لیتوانی
+				لیتاس لیتوانی
+				لیتاس لیتوانی
 				LTL
 			
 			
@@ -6350,33 +6682,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				لاتس لتونی
+				لاتس لتونی
+				لاتس لتونی
 				LVL
 			
 			
 				روبل لتونی
+				روبل لتونی
+				روبل لتونی
 			
 			
 				دینار لیبی
 				دینار لیبی
 				دینار لیبی
+				LYD
 			
 			
 				درهم مراکش
 				درهم مراکش
 				درهم مراکش
+				MAD
 			
 			
 				فرانک مراکش
+				فرانک مراکش
+				فرانک مراکش
+			
+			
+				فرانک موناکو
+				فرانک موناکو
+				فرانک موناکو
 			
 			
 				لئوی مولداوی
 				لئوی مولداوی
 				لئوی مولداوی
+				MDL
 			
 			
 				آریاری مالاگاسی
 				آریاری مالاگاسی
 				آریاری مالاگاسی
+				MGA
+				Ar
 			
 			
 				فرانک ماداگاسکار
@@ -6385,6 +6733,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دینار مقدونیه
 				دینار مقدونیه
 				دینار مقدونیه
+				MKD
+			
+			
+				دینار مقدونیه (۱۹۹۲ تا ۱۹۹۳)
+				دینار مقدونیه (۱۹۹۲ تا ۱۹۹۳)
+				دینار مقدونیه (۱۹۹۲ تا ۱۹۹۳)
 			
 			
 				فرانک مالی
@@ -6393,26 +6747,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				کیات میانمار
 				کیات میانمار
 				کیات میانمار
+				MMK
+				K
 			
 			
 				توگریک مغولستان
 				توگریک مغولستان
 				توگریک مغولستان
+				MNT
+				₮
 			
 			
 				پاتاکای ماکائو
 				پاتاکای ماکائو
 				پاتاکای ماکائو
+				MOP
 			
 			
 				اوگوئیای موریتانی (۱۹۷۳ تا ۲۰۱۷)
 				اوگوئیای موریتانی (۱۹۷۳ تا ۲۰۱۷)
 				اوگوئیای موریتانی (۱۹۷۳ تا ۲۰۱۷)
+				MRO
 			
 			
 				اوگوئیای موریتانی
 				اوگوئیای موریتانی
 				اوگوئیای موریتانی
+				MRU
 			
 			
 				لیرهٔ مالت
@@ -6424,22 +6785,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				روپیهٔ موریس
 				روپیهٔ موریس
 				روپیهٔ موریس
+				MUR
+				Rs
+			
+			
+				روپیهٔ مالدیو (۱۹۴۷ تا ۱۹۸۱)
+				روپیهٔ مالدیو (۱۹۴۷ تا ۱۹۸۱)
+				روپیهٔ مالدیو (۱۹۴۷ تا ۱۹۸۱)
 			
 			
 				روپیهٔ مالدیو
 				روپیهٔ مالدیو
 				روپیهٔ مالدیو
+				MVR
 			
 			
 				کواچای مالاوی
 				کواچای مالاوی
 				کواچای مالاوی
+				MWK
 			
 			
 				پزوی مکزیک
 				پزوی مکزیک
 				پزوی مکزیک
 				$MX
+				$
 			
 			
 				پزوی نقرهٔ مکزیک (۱۸۶۱ تا ۱۹۹۲)
@@ -6451,6 +6822,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				رینگیت مالزی
 				رینگیت مالزی
 				رینگیت مالزی
+				MYR
+				RM
 			
 			
 				اسکودوی موزامبیک
@@ -6459,21 +6832,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				متیکال موزامبیک
 				متیکال موزامبیک
 				متیکال موزامبیک
+				MZN
 			
 			
 				دلار نامیبیا
 				دلار نامیبیا
 				دلار نامیبیا
+				NAD
+				$
 			
 			
 				نایرای نیجریه
 				نایرای نیجریه
 				نایرای نیجریه
+				NGN
+				₦
 			
 			
 				کوردوبای نیکاراگوئه
 				کوردوبای نیکاراگوئه
 				کوردوبای نیکاراگوئه
+				NIO
+				C$
 			
 			
 				گیلدر هلند
@@ -6484,65 +6864,95 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				کرون نروژ
 				کرون نروژ
 				کرون نروژ
+				NOK
+				kr
 			
 			
 				روپیهٔ نپال
 				روپیهٔ نپال
 				روپیهٔ نپال
+				NPR
+				Rs
 			
 			
 				دلار زلاند نو
 				دلار زلاند نو
 				دلار زلاند نو
 				$NZ
+				$
 			
 			
 				ریال عمان
 				ریال عمان
 				ریال عمان
+				OMR
 			
 			
 				بالبوای پاناما
 				بالبوای پاناما
 				بالبوای پاناما
+				PAB
+			
+			
+				اینتی پرو
+				اینتی پرو
+				اینتی پرو
 			
 			
-				نوئووسول پرو
-				نوئووسول پرو
-				نوئووسول پرو
+				سول پرو
+				سول پرو
+				سول پرو
+				PEN
+			
+			
+				سول پرو (۱۸۶۳ تا ۱۹۶۵)
+				سول پرو (۱۸۶۳ تا ۱۹۶۵)
+				سول پرو (۱۸۶۳ تا ۱۹۶۵)
 			
 			
 				کینای پاپوا گینهٔ نو
 				کینای پاپوا گینهٔ نو
 				کینای پاپوا گینهٔ نو
+				PGK
 			
 			
 				پزوی فیلیپین
 				پزوی فیلیپین
 				پزوی فیلیپین
+				PHP
+				₱
 			
 			
 				روپیهٔ پاکستان
 				روپیهٔ پاکستان
 				روپیهٔ پاکستان
+				PKR
+				Rs
 			
 			
 				زواتی لهستان
 				زواتی لهستان
 				زواتی لهستان
+				PLN
+				zł
 			
 			
 				اسکودوی پرتغال
+				اسکودوی پرتغال
+				اسکودوی پرتغال
 			
 			
 				گوارانی پاراگوئه
 				گوارانی پاراگوئه
 				گوارانی پاراگوئه
+				PYG
+				₲
 			
 			
 				ریال قطر
 				ریال قطر
 				ریال قطر
+				QAR
 			
 			
 				دلار رودزیا
@@ -6551,172 +6961,232 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				لئوی رومانی
 				لئوی رومانی
 				لئوی رومانی
+				RON
+				lei
 			
 			
 				دینار صربستان
 				دینار صربستان
 				دینار صربستان
+				RSD
 			
 			
 				روبل روسیه
 				روبل روسیه
 				روبل روسیه
+				RUB
+				₽
 				₽
 			
 			
 				روبل روسیه (۱۹۹۱ تا ۱۹۹۸)
+				روبل روسیه (۱۹۹۱ تا ۱۹۹۸)
+				روبل روسیه (۱۹۹۱ تا ۱۹۹۸)
 			
 			
 				فرانک رواندا
 				فرانک رواندا
 				فرانک رواندا
+				RWF
+				RF
 			
 			
 				ریال سعودی
 				ریال سعودی
 				ریال سعودی
+				SAR
 			
 			
 				دلار جزایر سلیمان
 				دلار جزایر سلیمان
 				دلار جزایر سلیمان
+				SBD
+				$
 			
 			
 				روپیهٔ سیشل
 				روپیهٔ سیشل
 				روپیهٔ سیشل
+				SCR
 			
 			
 				دینار سودان (۱۹۹۲ تا ۲۰۰۷)
+				دینار سودان (۱۹۹۲ تا ۲۰۰۷)
+				دینار سودان (۱۹۹۲ تا ۲۰۰۷)
 			
 			
 				پوند سودان
 				پوند سودان
 				پوند سودان
+				SDG
 			
 			
 				کرون سوئد
 				کرون سوئد
 				کرون سوئد
+				SEK
+				kr
 			
 			
 				دلار سنگاپور
 				دلار سنگاپور
 				دلار سنگاپور
+				SGD
+				$
 			
 			
 				پوند سنت هلن
 				پوند سنت هلن
 				پوند سنت هلن
+				SHP
+				£
 			
 			
 				لئون سیرالئون
 				لئون سیرالئون
 				لئون سیرالئون
+				SLL
 			
 			
 				شیلینگ سومالی
 				شیلینگ سومالی
 				شیلینگ سومالی
+				SOS
 			
 			
 				دلار سورینام
 				دلار سورینام
 				دلار سورینام
+				SRD
+				$
 			
 			
 				گیلدر سورینام
+				گیلدر سورینام
+				گیلدر سورینام
 			
 			
 				پوند سودان جنوبی
 				پوند سودان جنوبی
 				پوند سودان جنوبی
+				SSP
+				£
 			
 			
 				دوبرای سائوتومه و پرنسیپ (۱۹۷۷ تا ۲۰۱۷)
 				دوبرای سائوتومه و پرنسیپ (۱۹۷۷ تا ۲۰۱۷)
 				دوبرای سائوتومه و پرنسیپ (۱۹۷۷ تا ۲۰۱۷)
+				STD
 			
 			
 				دوبرای سائوتومه و پرنسیپ
 				دوبرای سائوتومه و پرنسیپ
 				دوبرای سائوتومه و پرنسیپ
+				STN
+				Db
 			
 			
 				روبل شوروی
+				روبل شوروی
+				روبل شوروی
 			
 			
 				لیرهٔ سوریه
 				لیرهٔ سوریه
 				لیرهٔ سوریه
+				SYP
+				£
 			
 			
 				لیلانگنی سوازیلند
 				لیلانگنی سوازیلند
 				لیلانگنی سوازیلند
+				SZL
 			
 			
 				بات تایلند
 				بات تایلند
 				بات تایلند
 				฿
+				฿
 			
 			
 				روبل تاجیکستان
+				روبل تاجیکستان
+				روبل تاجیکستان
 			
 			
 				سامانی تاجیکستان
 				سامانی تاجیکستان
 				سامانی تاجیکستان
+				TJS
 			
 			
 				منات ترکمنستان (۱۹۹۳ تا ۲۰۰۹)
+				منات ترکمنستان (۱۹۹۳ تا ۲۰۰۹)
+				منات ترکمنستان (۱۹۹۳ تا ۲۰۰۹)
 			
 			
 				منات ترکمنستان
 				منات ترکمنستان
 				منات ترکمنستان
+				TMT
 			
 			
 				دینار تونس
 				دینار تونس
 				دینار تونس
+				TND
 			
 			
 				پاآنگای تونگا
 				پاآنگای تونگا
 				پاآنگای تونگا
+				TOP
+				T$
 			
 			
 				اسکودوی تیمور
 			
 			
 				لیرهٔ ترکیه (۱۹۲۲ تا ۲۰۰۵)
+				لیرهٔ ترکیه (۱۹۲۲ تا ۲۰۰۵)
+				لیرهٔ ترکیه (۱۹۲۲ تا ۲۰۰۵)
 			
 			
 				لیرهٔ ترکیه
 				لیرهٔ ترکیه
 				لیرهٔ ترکیه
+				TRY
+				₺
+				TL
 			
 			
 				دلار ترینیداد و توباگو
 				دلار ترینیداد و توباگو
 				دلار ترینیداد و توباگو
+				TTD
+				$
 			
 			
 				دلار جدید تایوان
 				دلار جدید تایوان
 				دلار جدید تایوان
+				NT$
+				$
 			
 			
 				شیلینگ تانزانیا
 				شیلینگ تانزانیا
 				شیلینگ تانزانیا
+				TZS
 			
 			
 				هریونیای اوکراین
 				هریونیای اوکراین
 				هریونیای اوکراین
+				UAH
+				₴
 			
 			
 				شیلینگ اوگاندا (۱۹۶۶ تا ۱۹۸۷)
@@ -6725,12 +7195,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				شیلینگ اوگاندا
 				شیلینگ اوگاندا
 				شیلینگ اوگاندا
+				UGX
 			
 			
 				دلار امریکا
 				دلار امریکا
 				دلار امریکا
 				$
+				$
 			
 			
 				دلار امریکا (روز بعد)
@@ -6751,11 +7223,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				پزوی اوروگوئه
 				پزوی اوروگوئه
 				پزوی اوروگوئه
+				UYU
+				$
 			
 			
 				سوم ازبکستان
 				سوم ازبکستان
 				سوم ازبکستان
+				UZS
 			
 			
 				بولیوار ونزوئلا (۱۸۷۱ تا ۲۰۰۸)
@@ -6766,51 +7241,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				بولیوار ونزوئلا (۲۰۰۸ تا ۲۰۱۸)
 				بولیوار ونزوئلا (۲۰۰۸ تا ۲۰۱۸)
 				بولیوار ونزوئلا (۲۰۰۸ تا ۲۰۱۸)
+				VEF
+				Bs
 			
 			
 				بولیوار ونزوئلا
 				بولیوار ونزوئلا
 				بولیوار ونزوئلا
+				VES
 			
 			
 				دانگ ویتنام
 				دانگ ویتنام
 				دانگ ویتنام
+				₫
+				₫
 			
 			
 				واتوی وانوواتو
 				واتوی وانوواتو
 				واتوی وانوواتو
+				VUV
 			
 			
 				تالای ساموا
 				تالای ساموا
 				تالای ساموا
+				WST
 			
 			
 				فرانک CFA مرکز افریقا
 				فرانک CFA مرکز افریقا
 				فرانک CFA مرکز افریقا
+				FCFA
 			
 			
 				نقره
+				اونس تروا نقره
+				اونس تروا نقره
 			
 			
 				طلا
+				اونس تروا طلا
+				اونس تروا طلا
 			
 			
 				دلار شرق کارائیب
 				دلار شرق کارائیب
 				دلار شرق کارائیب
 				$EC
+				$
 			
 			
 				فرانک طلای فرانسه
+				فرانک طلای فرانسه
+				فرانک طلای فرانسه
 			
 			
 				فرانک CFA غرب افریقا
 				فرانک CFA غرب افریقا
 				فرانک CFA غرب افریقا
+				CFA
 			
 			
 				پالادیم
@@ -6819,9 +7310,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				فرانک اقیانوسیه
 				فرانک اقیانوسیه
 				فرانک اقیانوسیه
+				CFPF
 			
 			
 				پلاتین
+				اونس تروا پلاتین
+				اونس تروا پلاتین
+			
+			
+				ارز آزمایشی
+				واحد ارز آزمایشی
+				واحد ارز آزمایشی
 			
 			
 				ارز نامشخص
@@ -6830,16 +7329,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				دینار یمن
+				دینار یمن
+				دینار یمن
 			
 			
 				ریال یمن
 				ریال یمن
 				ریال یمن
+				YER
 			
 			
 				راند افریقای جنوبی
 				راند افریقای جنوبی
 				راند افریقای جنوبی
+				ZAR
+				R
 			
 			
 				کواچای زامبیا (۱۹۶۸ تا ۲۰۱۲)
@@ -6848,6 +7352,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				کواچای زامبیا
 				کواچای زامبیا
 				کواچای زامبیا
+				ZMW
+				ZK
 			
 			
 				دلار زیمبابوه (۱۹۸۰ تا ۲۰۰۸)
@@ -6866,8 +7372,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}–{1}
 		
 		
-			او {0} فیلم در هفته می‌بیند که کمدی است.
-			او {0} فیلم در هفته می‌بیند که کمدی‌اند.
+			{0} نفر در بازی شرکت کرد.
+			{0} نفر در بازی شرکت کردند.
 			در پیچ {0}ام سمت راست بپیچید.
 		
 	
@@ -6915,7 +7421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				کیلومتر مربع
 				{0} کیلومتر مربع
 				{0} کیلومتر مربع
-				کیلومتر مربع در {0}
+				{0} در کیلومتر مربع
 			
 			
 				هکتار
@@ -6963,8 +7469,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				دونوم
-				{0} دونوم
-				{0} دونوم
 			
 			
 				عیار
@@ -7086,6 +7590,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} سده
 				{0} سده
 			
+			
+				دهه
+				{0} دهه
+				{0} دهه
+			
 			
 				سال
 				{0} سال
@@ -7195,7 +7704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				الکترون ولت
-				{0} الکترون ولت
+				{0} الکترون‌ولت
 				{0} الکترون‌ولت
 			
 			
@@ -7203,6 +7712,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} بی‌تی‌یو
 				{0} بی‌تی‌یو
 			
+			
+				ترم آمریکایی
+				{0} ترم آمریکایی
+				{0} ترم آمریکایی
+			
 			
 				پوند-نیرو
 				{0} پوند-نیرو
@@ -7233,17 +7747,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} هرتز
 				{0} هرتز
 			
+			
+				پیکسل
+				{0} پیکسل
+				{0} پیکسل
+			
+			
+				مگاپیکسل
+				{0} مگاپیکسل
+				{0} مگاپیکسل
+			
+			
+				پیکسل در سانتی‌متر
+				{0} پیکسل در سانتی‌متر
+				{0} پیکسل در سانتی‌متر
+			
+			
+				پیکسل در اینچ
+				{0} پیکسل در اینچ
+				{0} پیکسل در اینچ
+			
+			
+				نقطه در سانتی‌متر
+				{0} نقطه در سانتی‌متر
+				{0} نقطه در سانتی‌متر
+			
+			
+				نقطه در اینچ
+				{0} نقطه در اینچ
+				{0} نقطه در اینچ
+			
 			
 				کیلومتر
 				{0} کیلومتر
 				{0} کیلومتر
-				{0}/کیلومتر
+				{0} در کیلومتر
 			
 			
 				متر
 				{0} متر
 				{0} متر
-				{0}/متر
+				{0} در متر
 			
 			
 				دسی‌متر
@@ -7254,7 +7798,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				سانتی‌متر
 				{0} سانتی‌متر
 				{0} سانتی‌متر
-				{0}/سانتی‌متر
+				{0} در سانتی‌متر
 			
 			
 				میلی‌متر
@@ -7296,7 +7840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				اینچ
 				{0} اینچ
 				{0} اینچ
-				{0}/اینچ
+				{0} در اینچ
 			
 			
 				پارسک
@@ -7324,14 +7868,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} مایل اسکاندیناوی
 			
 			
-				امتیاز
-				{0} امتیاز
-				{0} امتیاز
+				پونت
+				{0} پونت
+				{0} پونت
 			
 			
-				شعاع خورشید
-				{0} شعاع خورشید
-				{0} شعاع خورشید
+				شعاع خورشید
+				{0} شعاع خورشید
+				{0} شعاع خورشید
 			
 			
 				لوکس
@@ -7442,11 +7986,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} اسب بخار
 				{0} اسب بخار
 			
-			
-				هکتوپاسکال
-				{0} هکتوپاسکال
-				{0} هکتوپاسکال
-			
 			
 				میلی‌متر جیوه
 				{0} میلی‌متر جیوه
@@ -7462,6 +8001,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} اینچ جیوه
 				{0} اینچ جیوه
 			
+			
+				بار
+				{0} بار
+				{0} بار
+			
 			
 				میلی‌بار
 				{0} میلی‌بار
@@ -7472,6 +8016,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} اتمسفر
 				{0} اتمسفر
 			
+			
+				پاسکال
+				{0} پاسکال
+				{0} پاسکال
+			
+			
+				هکتوپاسکال
+				{0} هکتوپاسکال
+				{0} هکتوپاسکال
+			
 			
 				کیلوپاسکال
 				{0} کیلوپاسکال
@@ -7502,6 +8056,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} گره
 				{0} گره
 			
+			
+				{0}°
+				{0}°
+			
 			
 				درجهٔ سلسیوس
 				{0} درجهٔ سلسیوس
@@ -7671,6 +8229,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}⋅{1}
+			
 			
 				نیروی جاذبه
 				{0} جاذبه
@@ -7710,6 +8274,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				کیلومتر مربع
 				{0}‎ km²
 				{0}‎ km²
+				{0}/km²
 			
 			
 				هکتار
@@ -7732,6 +8297,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				مایل مربع
 				{0} مایل مربع
 				{0} مایل مربع
+				{0}/mi²
 			
 			
 				جریب
@@ -7756,8 +8322,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				دونوم
-				{0} دونوم
-				{0} دونوم
+				{0} دونوم
+				{0} دونوم
 			
 			
 				عیار
@@ -7766,12 +8332,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				میلی‌گرم در دسی‌لیتر
+				{0} mg/dL
+				{0} mg/dL
 			
 			
 				میلی‌مول/لیتر
+				{0} mmol/L
+				{0} mmol/L
 			
 			
 				بخش/میلیون
+				{0} ppm
+				{0} ppm
 			
 			
 				درصد
@@ -7780,6 +8352,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				هزارم
+				{0}‰
+				{0}‰
 			
 			
 				ده‌هزارم
@@ -7808,6 +8382,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				مایل/امپریال گالن
+				{0} mpg Imp.
+				{0} mpg Imp.
 			
 			
 				پتابایت
@@ -7869,6 +8445,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} سده
 				{0} سده
 			
+			
+				دهه
+				{0} دهه
+				{0} دهه
+			
 			
 				سال
 				{0} سال
@@ -7973,8 +8554,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ک.وات‌ساعت
-				{0} ک.وات‌ساعت
-				{0} ک.وات‌ساعت
+				{0} ک.و.ساعت
+				{0} ک.و.ساعت
 			
 			
 				الکترون‌ولت
@@ -7986,6 +8567,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} بی‌تی‌یو
 				{0} بی‌تی‌یو
 			
+			
+				ترم آمریکایی
+				{0} ترم آمریکایی
+				{0} ترم آمریکایی
+			
 			
 				پوند-نیرو
 				{0} پوند-نیرو
@@ -8016,17 +8602,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} هرتز
 				{0} هرتز
 			
+			
+				dpcm
+			
 			
 				کیلومتر
 				{0} کیلومتر
 				{0} کیلومتر
-				{0}/کیلومتر
+				{0} در کیلومتر
 			
 			
 				متر
 				{0} متر
 				{0} متر
-				{0}/متر
+				{0} در متر
 			
 			
 				دسی‌متر
@@ -8107,14 +8696,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‎ smi
 			
 			
-				امتیاز
+				پونت
 				{0} امتیاز
 				{0} امتیاز
 			
 			
-				شعاع خورشید
-				{0} ☉R
-				{0} ☉R
+				شعاع خورشید
+				{0} ☉R
+				{0} ☉R
 			
 			
 				لوکس
@@ -8225,11 +8814,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} اسب بخار
 				{0} اسب بخار
 			
-			
-				هکتوپاسکال
-				{0}‎ hPa
-				{0}‎ hPa
-			
 			
 				میلی‌متر جیوه
 				{0} م‌م جیوه
@@ -8245,6 +8829,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} اینچ جیوه
 				{0} اینچ جیوه
 			
+			
+				بار
+				{0} بار
+				{0} بار
+			
 			
 				میلی‌بار
 				{0} میلی‌بار
@@ -8252,6 +8841,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				اتمسفر
+				{0} atm
+				{0} atm
+			
+			
+				هکتوپاسکال
+				{0}‎ hPa
+				{0}‎ hPa
 			
 			
 				ک.پاسکال
@@ -8283,11 +8879,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} گره
 				{0} گره
 			
+			
+				{0}°
+				{0}°
+			
 			
 				درجهٔ سلسیوس
+				{0}°C
+				{0}°C
 			
 			
 				درجهٔ فارنهایت
+				{0}°F
+				{0}°F
 			
 			
 				درجهٔ کلوین
@@ -8448,6 +9052,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				نیروی جاذبه
 				{0}G
@@ -8723,11 +9330,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0}hp
 			
-			
-				هکتوپاسکال
-				{0}hPa
-				{0}hPa
-			
 			
 				میلی‌متر جیوه
 				{0} م‌م جیوه
@@ -8748,6 +9350,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mbar
 				{0}mbar
 			
+			
+				هکتوپاسکال
+				{0}hPa
+				{0}hPa
+			
 			
 				کیلومتر/ساعت
 				{0}‎ km/h
@@ -8768,11 +9375,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} گره
 				{0} گره
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				‎°C
+				{0}°C
+				{0}°C
 			
 			
 				‎°F
+				{0}°F
+				{0}°F
 			
 			
 				{0}K
@@ -8817,16 +9433,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} و {1}
 		
 		
-			{0}، {1}
-			{0}، {1}
+			{0}،‏ {1}
+			{0}،‏ {1}
 			{0}، یا {1}
 			{0} یا {1}
 		
+		
+			{0}،‏ {1}
+			{0}،‏ {1}
+		
+		
+			{0}،‏ {1}
+			{0}،‏ {1}
+		
 		
 			{0}،‏ {1}
 			{0}،‏ {1}
-			{0}، و {1}
-			{0}، {1}
+			{0}،‏ {1}
+			{0}،‏ {1}
 		
 		
 			{0}،‏ {1}
@@ -8954,7 +9578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		پیکان‌های رو به بالا
 		گونه‌ها
 		جاموی آوایی
-		هوا
+		آب‌وهوا
 		دبیره‌های آسیای غربی
 		فضای سفید
 	
diff --git a/make/data/cldr/common/main/fa_AF.xml b/make/data/cldr/common/main/fa_AF.xml
index 232c13209a9..39c01ea753c 100644
--- a/make/data/cldr/common/main/fa_AF.xml
+++ b/make/data/cldr/common/main/fa_AF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -77,8 +77,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			کولمبیا
 			کاستریکا
 			کیوبا
-			چک
-			جمهوری چک
 			دنمارک
 			سئوتا و ملیلا
 			استونیا
@@ -174,9 +172,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							ج
+							ف
+							م
 							ا
+							م
 							ج
 							ج
+							ا
+							س
+							ا
+							ن
+							د
 						
 						
 							جنوری
@@ -210,9 +216,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							ج
+							ف
+							م
 							ا
+							م
 							ج
 							ج
+							ا
+							س
+							ا
+							ن
+							د
 						
 						
 							جنوری
@@ -267,6 +281,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							صبح
 							ظهر
 							بعدازچاشت
+							شب
 							نیمه‌شب
 						
 						
@@ -274,6 +289,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							صبح
 							ظهر
 							بعدازچاشت
+							شب
 							نیمه‌شب
 						
 					
@@ -283,10 +299,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							صبح
 							ظهر
 							بعدازچاشت
+							شب
 							نیمه‌شب
 						
 						
+							ب
 							بعد از چاشت
+							ش
 						
 						
 							بامداد
diff --git a/make/data/cldr/common/main/fa_IR.xml b/make/data/cldr/common/main/fa_IR.xml
index fbed4a1dabe..0dc3c95022a 100644
--- a/make/data/cldr/common/main/fa_IR.xml
+++ b/make/data/cldr/common/main/fa_IR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ff.xml b/make/data/cldr/common/main/ff.xml
index e5868257909..fb8460d188b 100644
--- a/make/data/cldr/common/main/ff.xml
+++ b/make/data/cldr/common/main/ff.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldawii
 			Madagaskaar
 			Duuɗe Marsaal
-			Meceduwaan
 			Maali
 			Miyamaar
 			Monngolii
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b ɓ c d ɗ e f g h i j k l m n ñ ŋ o p r s t u w y ƴ]
 		[q v x z]
 		[A B Ɓ C D Ɗ E F G H I J K L M N Ñ Ŋ O P R S T U W Y Ƴ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		„
diff --git a/make/data/cldr/common/main/ff_Latn.xml b/make/data/cldr/common/main/ff_Latn.xml
index ecbc28030b2..ce19f684150 100644
--- a/make/data/cldr/common/main/ff_Latn.xml
+++ b/make/data/cldr/common/main/ff_Latn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 			
 			
+			
 			
 			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -690,6 +692,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -709,6 +712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -740,10 +744,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -756,6 +762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -778,7 +785,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
+			
 			
 			
 			
@@ -791,8 +800,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
+			
 			
-			
+			
 			
 			
 			
@@ -819,11 +830,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -1094,6 +1106,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Syyria
 			Swazimaa
+			Eswatini
 			Tristan da Cunha
 			Turks- ja Caicossaaret
 			Tšad
@@ -1146,11 +1159,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			varhaisnykyranska
 			valkovenäjän virallinen oikeinkirjoitus
 			portugalin oikeinkirjoitus 1943
+			akanin akuapem-murre
 			amerikkalainen kirjastolatinaistus 1997
 			alukun kreolimurre
 			portugalin oikeinkirjoitussopimus 1990
+			oksitaanin Aranin laakson variantti
 			itäarmenialainen
 			länsiarmenialainen
+			akanin asante-variantti
+			oksitaanin Auvergnen variantti
 			yhtenäistetty turkkilainen latinalainen aakkosto
 			aniin balankalaismurre
 			kapverdenkreolin barlaventolainen murreryhmä
@@ -1160,27 +1177,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			sloveenin resian San Giorgion/Bilan alamurre
 			sloveenin Bohorič-aakkosto
 			englannin boontling-murre
+			oksitaanin luoteisitalialainen variantti
 			portugalin oikeinkirjoitus 1945
 			englannin cornu-murre
+			oksitaanin Croissantin variantti
 			sloveenin Dajnko-aakkosto
 			serbian ekavialainen ääntämys
 			varhaisnykyenglanti
 			kansainvälinen foneettinen aakkosto IPA
-			pohjoisamerikkalainen foneettinen aakkosto NAPA
+			Kirshenbaumin foneettinen aakkosto
+			pohjoisamerikkalainen foneettinen aakkosto NAPA
 			uralilainen foneettinen aakkosto UPA
 			suomalais-ugrilainen tarkekirjoitus
 			foneettinen X-SAMPA-merkistö
+			oksitaanin Gasconyn variantti
+			oksitaanin klassinen ortografia
+			oksitaanin italialaisvaikutteinen ortografia
+			oksitaanin Mistral-vaikutteinen ortografia
 			japanin Hepburn-latinaistus
 			norjan högnorsk
-			esperanton h-kirjoitus
+			esperanton h-kirjoitus
 			serbian ijekavialainen ääntämys
 			sanskriitin eeppinen muoto
+			bulgarian 1899 ortografia
 			retoromaanin jauer-murre
 			kantoninkiinan jyutping-latinaistus
 			kornin yleiskirjoitus
 			puolan kociewielainen murre
 			kornin Kernowek-ortografia
 			klassinen sanskriitti
+			oksitaanin Limousin-alueen variantti
 			sloveenin resian Lipovazin/Lipovecin alamurre
 			venäjän ortografia 1918
 			sloveenin Metelko-aakkosto
@@ -1192,9 +1218,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			nykyvolapük
 			sloveenin resian Oseaccon/Osojanen alamurre
 			englannin Oxfordin sanakirjan oikeinkirjoitus
-			pahawh-hmongin tavukirjoituksen toinen vaihe
-			pahawh-hmongin tavukirjoituksen kolmas vaihe
-			pahawh-hmongin tavukirjoituksen viimeinen vaihe
+			pahawh-hmongin tavukirjoituksen toinen vaihe
+			pahawh-hmongin tavukirjoituksen kolmas vaihe
+			pahawh-hmongin tavukirjoituksen viimeinen vaihe
 			pamakan kreolimurre
 			venäjän Pietarin siviiliaakkosto 1708
 			kiinan pinyin-latinaistus
@@ -1211,7 +1237,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			yksinkertaistettu kielimuoto
 			sloveenin resian Stolvizzan/Solbican alamurre
 			kapverdenkreolin sotaventolainen murreryhmä
-			spanglish
+			spanglish
 			retoromaanin surmiran-muoto
 			retoromaanin sursilvan-muoto
 			retoromaanin sutsilvan-muoto
@@ -1224,17 +1250,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			katalaanin valencian murre
 			reoromaanin vallader-muoto
 			kiinan Wade-Giles-latinaistus
-			esperanton x-kirjoitus
+			esperanton x-kirjoitus
 		
 		
 			kalenteri
 			valuuttojen esitysmuoto
-			symbolien lajittelu
+			symbolit ohittava lajittelu
 			painomerkkien lajittelu
 			isojen ja pienten kirjainten järjestys
 			aakkoslajien lajittelu
 			lajittelujärjestys
-			lajittelun normalisointi
+			normalisoitu lajittelu
 			numeroiden lajittelu
 			lajittelun taso
 			valuutta
@@ -1334,6 +1360,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			talousnumerot
 			ideografin levyiset numerot
 			georgialaiset numerot
+			gondin gunjala-numerot
+			gondin masaram-numerot
 			kreikkalaiset numerot
 			kreikkalaiset piennumerot
 			gudžaratilaiset numerot
@@ -1345,6 +1373,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			perinteiset kiinalaiset talousnumerot
 			heprealaiset numerot
 			pahawh hmong -numerot
+			hmongin nyiakeng puachue -numerot
 			jaavalaiset numerot
 			japanilaiset numerot
 			japanilaiset talousnumerot
@@ -1394,6 +1423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			perinteiset numerot
 			vai-numerot
 			varang kshiti -numerot
+			wancholaiset numerot
 		
 		
 			metrinen
@@ -1423,7 +1453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[á à ă â ã ą ā ć č ċ ç ď ð đ é è ê ě ë ė ę ē ğ ǧ ģ ǥ ȟ ħ í î ï İ į ī ı ǩ ķ ĺ ľ ļ ł ń ň ñ ņ ŋ ó ò ô ő õ œ ŕ ř ś ŝ ş ș ß ť ţ ț ŧ ú ù û ů ű ų ū ý ÿ ü ź ż ʒ ǯ þ æ ø]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]
 		[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – , ; \: ! ? . … ’ ” » ( ) \[ \] § @ * / \\ \& #]
+		[\- ‐ ‑ – , ; \: ! ? . … ’ ” » ( ) \[ \] § @ * / \\ \& #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1437,13 +1467,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1791,55 +1816,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0}–{1}
-						
-							h B – h B
-							h–h B
-						
 						
-							h.mm B – h.mm B
-							h.mm–h.mm B
-							h.mm–h.mm B
+							h.mm B – h.mm B
+							h.mm–h.mm B
+							h.mm–h.mm B
 						
 						
 							d.–d.
 						
 						
-							y G – y G
-							y–y G
+							y G – y G
+							y–y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y–M/y GGGGG
-							M/y–M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y–M/y GGGGG
+							M/y–M/y GGGGG
 						
 						
-							d.M.y–d.M.y GGGGG
-							d.M.y GGGGG – d.M.y GGGGG
-							d.M.y–d.M.y GGGGG
-							d.M.y–d.M.y GGGGG
+							d.M.y–d.M.y GGGGG
+							d.M.y GGGGG – d.M.y GGGGG
+							d.M.y–d.M.y GGGGG
+							d.M.y–d.M.y GGGGG
 						
 						
-							E d.M.y – E d.M.y GGGGG
-							E d.M.y GGGGG – E d.M.y GGGGG
-							E d.M.y – E d.M.y GGGGG
-							E d.M.y – E d.M.y GGGGG
+							E d.M.y – E d.M.y GGGGG
+							E d.M.y GGGGG – E d.M.y GGGGG
+							E d.M.y – E d.M.y GGGGG
+							E d.M.y – E d.M.y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM–MMM y G
-							MMM y – MMM y G
+							M.y G – M.y G
+							M.–M.y G
+							M.y–M.y G
 						
 						
-							d.–d. MMM, y G
-							d. MMM y G – d. MMM y G
-							d. MMM – d. MMM y G
-							d. MMM y – d. MMM y G
+							d.–d.M.y G
+							d.M.y G – d.M.y G
+							d.M.–d.M.y G
+							d.M.y – d.M.y G
 						
 						
-							E d. MMM – E d. MMM y G
-							E d. MMM y – E d. MMM y G
-							E d. MMM – E d. MMM y G
-							E d. MMM y – E d. MMM y G
+							E d.M. – E d.M.y G
+							E d.M.y – E d.M.y G
+							E d.M. – E d.M.y G
+							E d.M.y – E d.M.y G
 						
 						
 							h a – h a
@@ -2366,10 +2387,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0}–{1}
-						
-							h B – h B
-							h–h B
-						
 						
 							h.mm B – h.mm B
 							h.mm–h.mm B
@@ -2379,42 +2396,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d.–d.
 						
 						
-							y G – y G
-							y–y G
+							y G – y G
+							y–y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y–M/y GGGGG
-							M/y–M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y–M/y GGGGG
+							M/y–M/y GGGGG
 						
 						
-							d.M.y–d.M.y GGGGG
-							d.M.y GGGGG – d.M.y GGGGG
-							d.M.y–d.M.y GGGGG
-							d.M.y–d.M.y GGGGG
+							d.M.y–d.M.y GGGGG
+							d.M.y GGGGG – d.M.y GGGGG
+							d.M.y–d.M.y GGGGG
+							d.M.y–d.M.y GGGGG
 						
 						
-							E d.M.y – E d.M.y GGGGG
-							E d.M.y GGGGG – E d.M.y GGGGG
-							E d.M.y – E d.M.y GGGGG
-							E d.M.y – E d.M.y GGGGG
+							E d.M.y – E d.M.y GGGGG
+							E d.M.y GGGGG – E d.M.y GGGGG
+							E d.M.y – E d.M.y GGGGG
+							E d.M.y – E d.M.y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM–MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
 						
 						
-							d.–d. MMM, y G
-							d.–d. MMM, y G
-							d. MMM – d. MMM y G
-							d. MMM y – d. MMM y G
+							d.–d.M.y G
+							d.M.y. G – d.M.y G
+							d.M–d.M.y G
+							d.M.y–d.M.y G
 						
 						
-							E d. MMM – E d. MMM y G
-							E d. MMM y – E d. MMM y G
-							E d. MMM – E d. MMM y G
-							E d. MMM y – E d. MMM y G
+							E d.M – E d.M.y G
+							E d.M.y – E d.M.y G
+							E d.M. – E d.M.y G
+							E d.M.y – E d.M.y G
 						
 						
 							h a – h a
@@ -5776,10 +5793,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
+		1
 		
 			,
 			 
+			;
 			%
+			+
 			−
 			E
 			×
@@ -5789,6 +5813,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tuhat
@@ -5911,6 +5940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Arabiemiirikuntien dirhami
 				Arabiemiirikuntien dirhami
 				Arabiemiirikuntien dirhamia
+				AED
 			
 			
 				Afganistanin afgaani (1927–2002)
@@ -5922,78 +5952,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afganistanin afgaani
 				Afganistanin afgaani
 				Afganistanin afgaania
+				AFN
 			
 			
 				Albanian lek (1946–1965)
 				Albanian lek (1946–1965)
 				Albanian lekiä (1946–1965)
+				ALK
 			
 			
 				Albanian lek
 				Albanian lek
 				Albanian lekiä
+				ALL
 			
 			
 				Armenian dram
 				Armenian dram
 				Armenian dramia
+				AMD
 			
 			
 				Alankomaiden Antillien guldeni
 				Alankomaiden Antillien guldeni
 				Alankomaiden Antillien guldenia
+				ANG
 			
 			
 				Angolan kwanza
 				Angolan kwanza
 				Angolan kwanzaa
+				AOA
 				AOA
 			
 			
 				Angolan kwanza (1977–1991)
 				Angolan kwanza (1977–1990)
 				Angolan kwanzaa (1977–1990)
+				AOK
 			
 			
 				Angolan uusi kwanza (1990–2000)
 				Angolan uusi kwanza (1990–2000)
 				Angolan uutta kwanzaa (1990–2000)
+				AON
 			
 			
 				Angolan kwanza reajustado (1995–1999)
 				Angolan kwanza reajustado (1995–1999)
 				Angolan kwanza reajustadoa (1995–1999)
+				AOR
 			
 			
 				Argentiinan austral
 				Argentiinan austral
 				Argentiinan australia
+				ARA
 			
 			
 				Argentiinan ley-peso (1970–1983)
 				Argentiinan ley-peso (1970–1983)
 				Argentiinan ley-pesoa (1970–1983)
+				ARL
 			
 			
 				Argentiinan peso (1881–1970)
 				Argentiinan peso (1881–1970)
 				Argentiinan pesoa (1881–1970)
+				ARM
 			
 			
 				Argentiinan peso (1983–1985)
 				Argentiinan peso (1983–1985)
 				Argentiinan pesoa (1983–1985)
+				ARP
 			
 			
 				Argentiinan peso
 				Argentiinan peso
 				Argentiinan pesoa
+				ARS
 				ARS
 			
 			
 				Itävallan šillinki
 				Itävallan šillinki
 				Itävallan šillinkiä
+				ATS
 			
 			
 				Australian dollari
@@ -6006,6 +6051,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aruban floriini
 				Aruban floriini
 				Aruban floriinia
+				AWG
 			
 			
 				Azerbaidžanin manat (1993–2006)
@@ -6017,49 +6063,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Azerbaidžanin manat
 				Azerbaidžanin manat
 				Azerbaidžanin manatia
+				AZN
 			
 			
 				Bosnia-Hertsegovinan dinaari (1992–1994)
 				Bosnia-Hertsegovinan dinaari (1992–1994)
 				Bosnia-Hertsegovinan dinaaria (1992–1994)
+				BAD
 			
 			
 				Bosnia-Hertsegovinan vaihdettava markka
 				Bosnia-Hertsegovinan vaihdettava markka
 				Bosnia-Hertsegovinan vaihdettavaa markkaa
+				BAM
 				BAM
 			
 			
 				Bosnia-Hertsegovinan uusi dinaari (1994–1997)
 				Bosnia-Hertsegovinan uusi dinaari (1994–1997)
 				Bosnia-Hertsegovinan uutta dinaaria (1994–1997)
+				BAN
 			
 			
 				Barbadosin dollari
 				Barbadosin dollari
 				Barbadosin dollaria
+				BBD
 				BBD
 			
 			
 				Bangladeshin taka
 				Bangladeshin taka
 				Bangladeshin takaa
+				BDT
 				BDT
 			
 			
 				Belgian vaihdettava frangi
 				Belgian vaihdettava frangi
 				Belgian vaihdettavaa frangia
+				BEC
 			
 			
 				Belgian frangi
 				Belgian frangi
 				Belgian frangia
+				BEF
 			
 			
 				Belgian rahoitusfrangi
 				Belgian rahoitusfrangi
 				Belgian rahoitusfrangia
+				BEL
 			
 			
 				Bulgarian kova lev
@@ -6077,69 +6132,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bulgarian lev
 				Bulgarian lev
 				Bulgarian leviä
+				BGN
 			
 			
 				Bulgarian lev (1879–1952)
 				Bulgarian lev (1879–1952)
 				Bulgarian leviä (1879–1952)
+				BGO
 			
 			
 				Bahrainin dinaari
 				Bahrainin dinaari
 				Bahrainin dinaaria
+				BHD
 			
 			
 				Burundin frangi
 				Burundin frangi
 				Burundin frangia
+				BIF
 			
 			
 				Bermudan dollari
 				Bermudan dollari
 				Bermudan dollaria
+				BMD
 				BMD
 			
 			
 				Brunein dollari
 				Brunein dollari
 				Brunein dollaria
+				BND
 				BND
 			
 			
 				Bolivian boliviano
 				Bolivian boliviano
 				Bolivian bolivianoa
+				BOB
 				BOB
 			
 			
 				Bolivian boliviano (1863–1963)
 				Bolivian boliviano (1863–1963)
 				Bolivian bolivianoa (1863–1963)
+				BOL
 			
 			
 				Bolivian peso
 				Bolivian peso
 				Bolivian pesoa
+				BOP
 			
 			
 				Bolivian mvdol
 				Bolivian mvdol
 				Bolivian mvdol’ia
+				BOV
 			
 			
 				Brasilian uusi cruzeiro (1967–1986)
 				Brasilian uusi cruzeiro (1967–1986)
 				Brasilian uutta cruzeiroa (1967–1986)
+				BRB
 			
 			
 				Brasilian cruzado (1986–1989)
 				Brasilian cruzado (1986–1989)
 				Brasilian cruzadoa (1986–1989)
+				BRC
 			
 			
 				Brasilian cruzeiro (1990–1993)
 				Brasilian cruzeiro (1990–1993)
 				Brasilian cruzeiroa (1990–1993)
+				BRE
 			
 			
 				Brasilian real
@@ -6152,27 +6220,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Brasilian uusi cruzado (1989–1990)
 				Brasilian uusi cruzado (1989–1990)
 				Brasilian uutta cruzadoa (1989–1990)
+				BRN
 			
 			
 				Brasilian cruzeiro (1993–1994)
 				Brasilian cruzeiro (1993–1994)
 				Brasilian cruzeiroa (1993–1994)
+				BRR
 			
 			
 				Brasilian cruzeiro (1942–1967)
 				Brasilian cruzeiro (1942–1967)
 				Brasilian cruzeiroa (1942–1967)
+				BRZ
 			
 			
 				Bahaman dollari
 				Bahaman dollari
 				Bahaman dollaria
+				BSD
 				BSD
 			
 			
 				Bhutanin ngultrum
 				Bhutanin ngultrum
 				Bhutanin ngultrumia
+				BTN
 			
 			
 				Burman kyat
@@ -6184,12 +6257,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Botswanan pula
 				Botswanan pula
 				Botswanan pulaa
+				BWP
 				BWP
 			
 			
 				Valko-Venäjän uusi rupla (1994–1999)
 				Valko-Venäjän uusi rupla (1994–1999)
 				Valko-Venäjän uutta ruplaa (1994–1999)
+				BYB
 			
 			
 				Valko-Venäjän rupla
@@ -6201,11 +6276,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Valko-Venäjän rupla (2000–2016)
 				Valko-Venäjän rupla (2000–2016)
 				Valko-Venäjän ruplaa (2000–2016)
+				BYR
 			
 			
 				Belizen dollari
 				Belizen dollari
 				Belizen dollaria
+				BZD
 				BZD
 			
 			
@@ -6219,36 +6296,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kongon frangi
 				Kongon frangi
 				Kongon frangia
+				CDF
 			
 			
 				Sveitsin WIR-euro
 				Sveitsin WIR-euro
 				Sveitsin WIR-euroa
+				CHE
 			
 			
 				Sveitsin frangi
 				Sveitsin frangi
 				Sveitsin frangia
+				CHF
 			
 			
 				Sveitsin WIR-frangi
 				Sveitsin WIR-frangi
 				Sveitsin WIR-frangia
+				CHW
 			
 			
 				Chilen escudo
 				Chilen escudo
 				Chilen escudoa
+				CLE
 			
 			
 				Chilen unidades de fomento
 				Chilen unidades de fomento
 				Chilen unidades de fomentoa
+				CLF
 			
 			
 				Chilen peso
 				Chilen peso
 				Chilen pesoa
+				CLP
 				CLP
 			
 			
@@ -6274,23 +6358,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kolumbian peso
 				Kolumbian peso
 				Kolumbian pesoa
+				COP
 				COP
 			
 			
 				Kolumbian unidad de valor real
 				Kolumbian unidad de valor real
 				Kolumbian unidad de valor realia
+				COU
 			
 			
 				Costa Rican colón
 				Costa Rican colón
 				Costa Rican colónia
+				CRC
 				CRC
 			
 			
 				Serbian dinaari (2002–2006)
 				Serbian dinaari (2002–2006)
 				Serbian dinaaria (2002–2006)
+				CSD
 			
 			
 				Tšekkoslovakian kova koruna
@@ -6302,18 +6390,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuuban vaihdettava peso
 				Kuuban vaihdettava peso
 				Kuuban vaihdettavaa pesoa
+				CUC
 				CUC
 			
 			
 				Kuuban peso
 				Kuuban peso
 				Kuuban pesoa
+				CUP
 				CUP
 			
 			
 				Kap Verden escudo
 				Kap Verden escudo
 				Kap Verden escudoa
+				CVE
 			
 			
 				Kyproksen punta
@@ -6325,91 +6416,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tšekin koruna
 				Tšekin koruna
 				Tšekin korunaa
+				CZK
 				CZK
 			
 			
 				Itä-Saksan markka
 				Itä-Saksan markka
 				Itä-Saksan markkaa
+				DDM
 			
 			
 				Saksan markka
 				Saksan markka
 				Saksan markkaa
+				DEM
 			
 			
 				Djiboutin frangi
 				Djiboutin frangi
 				Djiboutin frangia
+				DJF
 			
 			
 				Tanskan kruunu
 				Tanskan kruunu
 				Tanskan kruunua
+				DKK
 				DKK
 			
 			
 				Dominikaanisen tasavallan peso
 				Dominikaanisen tasavallan peso
 				Dominikaanisen tasavallan pesoa
+				DOP
 				DOP
 			
 			
 				Algerian dinaari
 				Algerian dinaari
 				Algerian dinaaria
+				DZD
 			
 			
 				Ecuadorin sucre
 				Ecuadorin sucre
 				Ecuadorin sucrea
+				ECS
 			
 			
 				Ecuadorin UVC
 				Ecuadorin UVC
 				Ecuadorin UVC’ta
+				ECV
 			
 			
 				Viron kruunu
 				Viron kruunu
 				Viron kruunua
+				EEK
 			
 			
 				Egyptin punta
 				Egyptin punta
 				Egyptin puntaa
+				EGP
 				EGP
 			
 			
 				Eritrean nakfa
 				Eritrean nakfa
 				Eritrean nakfaa
+				ERN
 			
 			
 				Espanjan peseta (A-tili)
 				Espanjan peseta (A-tili)
 				Espanjan pesetaa (A-tili)
+				ESA
 			
 			
 				Espanjan peseta (vaihdettava tili)
 				Espanjan peseta (vaihdettava tili)
 				Espanjan pesetaa (vaihdettava tili)
+				ESB
 			
 			
 				Espanjan peseta
 				Espanjan peseta
 				Espanjan pesetaa
+				ESP
 				ESP
 			
 			
 				Etiopian birr
 				Etiopian birr
 				Etiopian birriä
+				ETB
 			
 			
 				euro
 				euro
 				euroa
+				€
+				€
 			
 			
 				Suomen markka
@@ -6421,23 +6530,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fidžin dollari
 				Fidžin dollari
 				Fidžin dollaria
+				FJD
 				FJD
 			
 			
 				Falklandinsaarten punta
 				Falklandinsaarten punta
 				Falklandinsaarten puntaa
+				FKP
 				FKP
 			
 			
 				Ranskan frangi
 				Ranskan frangi
 				Ranskan frangia
+				FRF
 			
 			
 				Englannin punta
 				Englannin punta
 				Englannin puntaa
+				£
+				£
 			
 			
 				Georgian kuponkilari
@@ -6449,33 +6563,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Georgian lari
 				Georgian lari
 				Georgian laria
+				GEL
 				GEL
 			
 			
 				Ghanan cedi (1979–2007)
 				Ghanan cedi (1979–2007)
 				Ghanan cediä (1979–2007)
+				GHC
 			
 			
 				Ghanan cedi
 				Ghanan cedi
 				Ghanan cediä
+				GHS
 			
 			
 				Gibraltarin punta
 				Gibraltarin punta
 				Gibraltarin puntaa
+				GIP
 				GIP
 			
 			
 				Gambian dalasi
 				Gambian dalasi
 				Gambian dalasia
+				GMD
 			
 			
 				Guinean frangi
 				Guinean frangi
 				Guinean frangia
+				GNF
 				GNF
 			
 			
@@ -6500,6 +6620,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guatemalan quetzal
 				Guatemalan quetzal
 				Guatemalan quetzalia
+				GTQ
 				GTQ
 			
 			
@@ -6518,6 +6639,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guyanan dollari
 				Guyanan dollari
 				Guyanan dollaria
+				GYD
 				GYD
 			
 			
@@ -6531,6 +6653,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hondurasin lempira
 				Hondurasin lempira
 				Hondurasin lempiraa
+				HNL
 				HNL
 			
 			
@@ -6549,23 +6672,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Haitin gourde
 				Haitin gourde
 				Haitin gourdea
+				HTG
 			
 			
 				Unkarin forintti
 				Unkarin forintti
 				Unkarin forinttia
+				HUF
 				HUF
 			
 			
 				Indonesian rupia
 				Indonesian rupia
 				Indonesian rupiaa
+				IDR
 				IDR
 			
 			
 				Irlannin punta
 				Irlannin punta
 				Irlannin puntaa
+				IEP
 			
 			
 				Israelin punta
@@ -6597,21 +6724,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Irakin dinaari
 				Irakin dinaari
 				Irakin dinaaria
+				IQD
 			
 			
 				Iranin rial
 				Iranin rial
 				Iranin rialia
+				IRR
 			
 			
 				Islannin kruunu (1918–1981)
 				Islannin kruunu (1918–1981)
 				Islannin kruunua (1918–1981)
+				ISJ
 			
 			
 				Islannin kruunu
 				Islannin kruunu
 				Islannin kruunua
+				ISK
 				ISK
 			
 			
@@ -6624,45 +6755,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jamaikan dollari
 				Jamaikan dollari
 				Jamaikan dollaria
+				JMD
 				JMD
 			
 			
 				Jordanian dinaari
 				Jordanian dinaari
 				Jordanian dinaaria
+				JOD
 			
 			
 				Japanin jeni
 				Japanin jeni
 				Japanin jeniä
 				¥
+				¥
 			
 			
 				Kenian šillinki
 				Kenian šillinki
 				Kenian šillinkiä
+				KES
 			
 			
 				Kirgisian som
 				Kirgisian som
 				Kirgisian somia
+				KGS
 			
 			
 				Kambodžan riel
 				Kambodžan riel
 				Kambodžan rieliä
+				KHR
 				KHR
 			
 			
 				Komorien frangi
 				Komorien frangi
 				Komorien frangia
+				KMF
 				KMF
 			
 			
 				Pohjois-Korean won
 				Pohjois-Korean won
 				Pohjois-Korean wonia
+				KPW
 				KPW
 			
 			
@@ -6688,41 +6827,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuwaitin dinaari
 				Kuwaitin dinaari
 				Kuwaitin dinaaria
+				KWD
 			
 			
 				Caymansaarten dollari
 				Caymansaarten dollari
 				Caymansaarten dollaria
+				KYD
 				KYD
 			
 			
 				Kazakstanin tenge
 				Kazakstanin tenge
 				Kazakstanin tengeä
+				KZT
 				KZT
 			
 			
 				Laosin kip
 				Laosin kip
 				Laosin kipiä
+				LAK
 				LAK
 			
 			
 				Libanonin punta
 				Libanonin punta
 				Libanonin puntaa
+				LBP
 				LBP
 			
 			
 				Sri Lankan rupia
 				Sri Lankan rupia
 				Sri Lankan rupiaa
+				LKR
 				LKR
 			
 			
 				Liberian dollari
 				Liberian dollari
 				Liberian dollaria
+				LRD
 				LRD
 			
 			
@@ -6735,48 +6881,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Liettuan liti
 				Liettuan liti
 				Liettuan litiä
+				LTL
 				LTL
 			
 			
 				Liettuan talonas
 				Liettuan talonas
 				Liettuan talonasia
+				LTT
 			
 			
 				Luxemburgin vaihdettava frangi
 				Luxemburgin vaihdettava frangi
 				Luxemburgin vaihdettavaa frangia
+				LUC
 			
 			
 				Luxemburgin frangi
 				Luxemburgin frangi
 				Luxemburgin frangia
+				LUF
 			
 			
 				Luxemburgin rahoitusfrangi
 				Luxemburgin rahoitusfrangi
 				Luxemburgin rahoitusfrangia
+				LUL
 			
 			
 				Latvian lati
 				Latvian lati
 				Latvian latia
+				LVL
 				LVL
 			
 			
 				Latvian rupla
 				Latvian rupla
 				Latvian ruplaa
+				LVR
 			
 			
 				Libyan dinaari
 				Libyan dinaari
 				Libyan dinaaria
+				LYD
 			
 			
 				Marokon dirhami
 				Marokon dirhami
 				Marokon dirhamia
+				MAD
 			
 			
 				Marokon frangi
@@ -6788,6 +6943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Monacon frangi
 				Monacon frangi
 				Monacon frangia
+				MCF
 			
 			
 				Moldovan kuponkileu
@@ -6799,11 +6955,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Moldovan leu
 				Moldovan leu
 				Moldovan leuta
+				MDL
 			
 			
 				Madagaskarin ariary
 				Madagaskarin ariary
 				Madagaskarin ariarya
+				MGA
 				MGA
 			
 			
@@ -6816,11 +6974,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makedonian denaari
 				Makedonian denaari
 				Makedonian denaaria
+				MKD
 			
 			
 				Makedonian dinaari (1992–1993)
 				Makedonian dinaari (1992–1993)
 				Makedonian dinaaria (1992–1993)
+				MKN
 			
 			
 				Malin frangi
@@ -6832,23 +6992,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Myanmarin kyat
 				Myanmarin kyat
 				Myanmarin kyatia
+				MMK
 				MMK
 			
 			
 				Mongolian tugrik
 				Mongolian tugrik
 				Mongolian tugrikia
+				MNT
 				MNT
 			
 			
 				Macaon pataca
 				Macaon pataca
 				Macaon patacaa
+				MOP
 			
 			
 				Mauritanian ouguiya (1973–2017)
 				Mauritanian ouguiya (1973–2017)
 				Mauritanian ouguiyaa (1973–2017)
+				MRO
 			
 			
 				Mauritanian ouguiya
@@ -6871,6 +7035,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mauritiuksen rupia
 				Mauritiuksen rupia
 				Mauritiuksen rupiaa
+				MUR
 				MUR
 			
 			
@@ -6883,11 +7048,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malediivien rufiyaa
 				Malediivien rufiyaa
 				Malediivien rufiyaata
+				MVR
 			
 			
 				Malawin kwacha
 				Malawin kwacha
 				Malawin kwachaa
+				MWK
 			
 			
 				Meksikon peso
@@ -6912,6 +7079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malesian ringgit
 				Malesian ringgit
 				Malesian ringgitiä
+				MYR
 				MYR
 			
 			
@@ -6930,45 +7098,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mosambikin metical
 				Mosambikin metical
 				Mosambikin meticalia
+				MZN
 			
 			
 				Namibian dollari
 				Namibian dollari
 				Namibian dollaria
+				NAD
 				NAD
 			
 			
 				Nigerian naira
 				Nigerian naira
 				Nigerian nairaa
+				NGN
 				NGN
 			
 			
 				Nicaraguan córdoba (1988–1991)
 				Nicaraguan córdoba (1988–1991)
 				Nicaraguan córdobaa (1988–1991)
+				NIC
 			
 			
 				Nicaraguan córdoba
 				Nicaraguan córdoba
 				Nicaraguan córdobaa
+				NIO
 				NIO
 			
 			
 				Alankomaiden guldeni
 				Alankomaiden guldeni
 				Alankomaiden guldenia
+				NLG
 			
 			
 				Norjan kruunu
 				Norjan kruunu
 				Norjan kruunua
+				NOK
 				NOK
 			
 			
 				Nepalin rupia
 				Nepalin rupia
 				Nepalin rupiaa
+				NPR
 				NPR
 			
 			
@@ -6982,48 +7158,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Omanin rial
 				Omanin rial
 				Omanin rialia
+				OMR
 			
 			
 				Panaman balboa
 				Panaman balboa
 				Panaman balboaa
+				PAB
 			
 			
 				Perun inti
 				Perun inti
 				Perun intiä
+				PEI
 			
 			
 				Perun sol
 				Perun sol
 				Perun solia
+				PEN
 			
 			
 				Perun sol (1863–1965)
 				Perun sol (1863–1965)
 				Perun solia (1863–1965)
+				PES
 			
 			
 				Papua-Uuden-Guinean kina
 				Papua-Uuden-Guinean kina
 				Papua-Uuden-Guinean kinaa
+				PGK
 			
 			
 				Filippiinien peso
 				Filippiinien peso
 				Filippiinien pesoa
+				PHP
 				PHP
 			
 			
 				Pakistanin rupia
 				Pakistanin rupia
 				Pakistanin rupiaa
+				PKR
 				PKR
 			
 			
 				Puolan złoty
 				Puolan złoty
 				Puolan złotya
+				PLN
 				PLN
 			
 			
@@ -7042,12 +7227,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Paraguayn guarani
 				Paraguayn guarani
 				Paraguayn guarania
+				PYG
 				PYG
 			
 			
 				Qatarin rial
 				Qatarin rial
 				Qatarin rialia
+				QAR
 			
 			
 				Rhodesian dollari
@@ -7059,88 +7246,105 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Romanian leu (1952–2006)
 				Romanian leu (1952–2006)
 				Romanian leuta (1952–2006)
+				ROL
 			
 			
 				Romanian leu
 				Romanian leu
 				Romanian leuta
+				RON
 				RON
 			
 			
 				Serbian dinaari
 				Serbian dinaari
 				Serbian dinaaria
+				RSD
 			
 			
 				Venäjän rupla
 				Venäjän rupla
 				Venäjän ruplaa
+				RUB
+				₽
 			
 			
 				Venäjän rupla (1991–1998)
 				Venäjän rupla (1991–1998)
 				Venäjän ruplaa (1991–1998)
+				RUR
 				RUR
 			
 			
 				Ruandan frangi
 				Ruandan frangi
 				Ruandan frangia
+				RWF
 				RWF
 			
 			
 				Saudi-Arabian rial
 				Saudi-Arabian rial
 				Saudi-Arabian rialia
+				SAR
 			
 			
 				Salomonsaarten dollari
 				Salomonsaarten dollari
 				Salomonsaarten dollaria
+				SBD
 				SBD
 			
 			
 				Seychellien rupia
 				Seychellien rupia
 				Seychellien rupiaa
+				SCR
 			
 			
 				Sudanin dinaari (1992–2007)
 				Sudanin dinaari (1992–2007)
 				Sudanin dinaaria (1992–2007)
+				SDD
 			
 			
 				Sudanin punta
 				Sudanin punta
 				Sudanin puntaa
+				SDG
 			
 			
 				Sudanin punta (1957–1998)
 				Sudanin punta (1957–1998)
 				Sudanin puntaa (1957–1998)
+				SDP
 			
 			
 				Ruotsin kruunu
 				Ruotsin kruunu
 				Ruotsin kruunua
+				SEK
 				SEK
 			
 			
 				Singaporen dollari
 				Singaporen dollari
 				Singaporen dollaria
+				SGD
 				SGD
 			
 			
 				Saint Helenan punta
 				Saint Helenan punta
 				Saint Helenan puntaa
+				SHP
 				SHP
 			
 			
 				Slovenian tolar
 				Slovenian tolar
 				Slovenian tolaria
+				SIT
 			
 			
 				Slovakian koruna
@@ -7152,16 +7356,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sierra Leonen leone
 				Sierra Leonen leone
 				Sierra Leonen leonea
+				SLL
 			
 			
 				Somalian šillinki
 				Somalian šillinki
 				Somalian šillinkiä
+				SOS
 			
 			
 				Surinamen dollari
 				Surinamen dollari
 				Surinamen dollaria
+				SRD
 				SRD
 			
 			
@@ -7174,12 +7381,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Etelä-Sudanin punta
 				Etelä-Sudanin punta
 				Etelä-Sudanin puntaa
+				SSP
 				SSP
 			
 			
 				São Tomén ja Príncipen dobra (1977–2017)
 				São Tomén ja Príncipen dobra (1977–2017)
 				São Tomén ja Príncipen dobraa (1977–2017)
+				STD
 			
 			
 				São Tomén ja Príncipen dobra
@@ -7204,17 +7413,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Syyrian punta
 				Syyrian punta
 				Syyrian puntaa
+				SYP
 				SYP
 			
 			
 				Swazimaan lilangeni
 				Swazimaan lilangeni
 				Swazimaan lilangenia
+				SZL
 			
 			
 				Thaimaan baht
 				Thaimaan baht
 				Thaimaan bahtia
+				THB
 				THB
 			
 			
@@ -7227,6 +7439,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tadžikistanin somoni
 				Tadžikistanin somoni
 				Tadžikistanin somonia
+				TJS
 			
 			
 				Turkmenistanin manat (1993–2009)
@@ -7238,16 +7451,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turkmenistanin manat
 				Turkmenistanin manat
 				Turkmenistanin manatia
+				TMT
 			
 			
 				Tunisian dinaari
 				Tunisian dinaari
 				Tunisian dinaaria
+				TND
 			
 			
 				Tongan pa’anga
 				Tongan pa’anga
 				Tongan pa’angaa
+				TOP
 				TOP
 			
 			
@@ -7266,6 +7482,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turkin liira
 				Turkin liira
 				Turkin liiraa
+				TRY
 				TRY
 				TL
 			
@@ -7273,6 +7490,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Trinidadin ja Tobagon dollari
 				Trinidadin ja Tobagon dollari
 				Trinidadin ja Tobagon dollaria
+				TTD
 				TTD
 			
 			
@@ -7286,11 +7504,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tansanian šillinki
 				Tansanian šillinki
 				Tansanian šillinkiä
+				TZS
 			
 			
 				Ukrainan hryvnia
 				Ukrainan hryvnia
 				Ukrainan hryvniaa
+				UAH
 				UAH
 			
 			
@@ -7309,12 +7529,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ugandan šillinki
 				Ugandan šillinki
 				Ugandan šillinkiä
+				UGX
 			
 			
 				Yhdysvaltain dollari
 				Yhdysvaltain dollari
 				Yhdysvaltain dollaria
 				$
+				$
 			
 			
 				Yhdysvaltain dollari (seuraava päivä)
@@ -7332,32 +7554,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uruguayn peso en unidades indexadas
 				Uruguayn peso en unidades indexadas
 				Uruguayn pesoa en unidades indexadas
+				UYI
 			
 			
 				Uruguayn peso (1975–1993)
 				Uruguayn peso (1975–1993)
 				Uruguayn pesoa (1975–1993)
+				UYP
 			
 			
 				Uruguayn peso
 				Uruguayn peso
 				Uruguayn pesoa
+				UYU
 				UYU
 			
+			
+				Uruguayn nimellinen palkkaindeksiyksikkö
+				Uruguayn nimellinen palkkaindeksiyksikkö
+				Uruguayn nimellistä palkkaindeksiyksikköä
+			
 			
 				Uzbekistanin som
 				Uzbekistanin som
 				Uzbekistanin somia
+				UZS
 			
 			
 				Venezuelan bolívar (1871–2008)
 				Venezuelan bolivar (1871–2008)
 				Venezuelan bolivaria (1871–2008)
+				VEB
 			
 			
 				Venezuelan bolívar (2008–2018)
 				Venezuelan bolívar (2008–2018)
 				Venezuelan bolívaria (2008–2018)
+				VEF
 				VEF
 			
 			
@@ -7383,16 +7616,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vanuatun vatu
 				Vanuatun vatu
 				Vanuatun vatua
+				VUV
 			
 			
 				Samoan tala
 				Samoan tala
 				Samoan talaa
+				WST
 			
 			
 				CFA-frangi BEAC
 				CFA-frangi BEAC
 				CFA-frangia BEAC
+				FCFA
 			
 			
 				hopea
@@ -7465,6 +7701,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA-frangi BCEAO
 				CFA-frangi BCEAO
 				CFA-frangia BCEAO
+				CFA
 			
 			
 				palladium
@@ -7506,6 +7743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afrikkalainen AfDB-laskentayksikkö
 				AfDB-laskentayksikkö
 				AfDB-laskentayksikköä
+				XUA
 			
 			
 				tuntematon rahayksikkö
@@ -7523,26 +7761,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jemenin rial
 				Jemenin rial
 				Jemenin rialia
+				YER
 			
 			
 				Jugoslavian kova dinaari (1966–1990)
 				Jugoslavian kova dinaari (1966–1990)
 				Jugoslavian kovaa dinaaria (1966–1990)
+				YUD
 			
 			
 				Jugoslavian uusi dinaari (1994–2002)
 				Jugoslavian uusi dinaari (1994–2002)
 				Jugoslavian uutta dinaaria (1994–2002)
+				YUM
 			
 			
 				Jugoslavian vaihdettava dinaari (1990–1992)
 				Jugoslavian vaihdettava dinaari (1990–1992)
 				Jugoslavian vaihdettavaa dinaaria (1990–1992)
+				YUN
 			
 			
 				Jugoslavian uudistettu dinaari (1992–1993)
 				Jugoslavian uudistettu dinaari (1992–1993)
 				Jugoslavian uudistettua dinaaria (1992–1993)
+				YUR
 			
 			
 				Etelä-Afrikan rahoitusrandi
@@ -7554,28 +7797,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Etelä-Afrikan randi
 				Etelä-Afrikan randi
 				Etelä-Afrikan randia
+				ZAR
 				ZAR
 			
 			
 				Sambian kwacha (1968–2012)
 				Sambian kwacha (1968–2012)
 				Sambian kwachaa (1968–2012)
+				ZMK
 			
 			
 				Sambian kwacha
 				Sambian kwacha
 				Sambian kwachaa
+				ZMW
 				ZMW
 			
 			
 				Zairen uusi zaire (1993–1998)
 				Zairen uusi zaire (1993–1998)
 				Zairen uutta zairea (1993–1998)
+				ZRN
 			
 			
 				Zairen zaire (1971–1993)
 				Zairen zaire (1971–1993)
 				Zairen zairea (1971–1993)
+				ZRZ
 			
 			
 				Zimbabwen dollari (1980–2008)
@@ -7699,9 +7947,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} / neliötuuma
 			
 			
-				dunamit
-				{0} dunam
-				{0} dunamia
+				dunamit
+				{0} dunam
+				{0} dunamia
 			
 			
 				karaatit
@@ -7724,14 +7972,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ppm
 			
 			
-				prosentit
-				{0} prosentti
-				{0} prosenttia
+				prosentit
+				{0} prosentti
+				{0} prosenttia
 			
 			
-				promillet
-				{0} promille
-				{0} promillea
+				promillet
+				{0} promille
+				{0} promillea
 			
 			
 				peruspiste
@@ -7764,9 +8012,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mailia / br. gallona
 			
 			
-				petatavut
-				{0} petatavu
-				{0} petatavua
+				petatavut
+				{0} petatavu
+				{0} petatavua
 			
 			
 				teratavut
@@ -7931,24 +8179,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowattituntia
 			
 			
-				elektronivoltit
-				{0} elektronivoltti
-				{0} elektronivolttia
+				elektronivoltit
+				{0} elektronivoltti
+				{0} elektronivolttia
 			
 			
-				brittiläiset termiset yksiköt
-				{0} brittiläinen terminen yksikkö
-				{0} brittiläistä termistä yksikköä
+				brittiläiset termiset yksiköt
+				{0} brittiläinen terminen yksikkö
+				{0} brittiläistä termistä yksikköä
 			
 			
-				pauna-voimat
-				{0} pauna-voima
-				{0} pauna-voimaa
+				pauna-voimat
+				{0} pauna-voima
+				{0} pauna-voimaa
 			
 			
-				newtonit
-				{0} newton
-				{0} newtonia
+				newtonit
+				{0} newton
+				{0} newtonia
 			
 			
 				gigahertsit
@@ -8086,9 +8334,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} luksia
 			
 			
-				Auringon luminositeetit
-				{0} Auringon luminositeetti
-				{0} Auringon luminositeettia
+				Auringon luminositeetit
+				{0} Auringon luminositeetti
+				{0} Auringon luminositeettia
 			
 			
 				tonnit
@@ -8150,14 +8398,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karaattia
 			
 			
-				atomimassayksiköt
-				{0} atomimassayksikkö
-				{0} atomimassayksikköä
+				atomimassayksiköt
+				{0} atomimassayksikkö
+				{0} atomimassayksikköä
 			
 			
-				Maan massat
-				{0} Maan massa
-				{0} Maan massaa
+				Maan massat
+				{0} Maan massa
+				{0} Maan massaa
 			
 			
 				auringon massat
@@ -8194,11 +8442,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hevosvoima
 				{0} hevosvoimaa
 			
-			
-				hehtopascalit
-				{0} hehtopascal
-				{0} hehtopascalia
-			
 			
 				elohopeamillimetrit
 				{0} millimetri elohopeaa
@@ -8214,25 +8457,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tuuma elohopeaa
 				{0} tuumaa elohopeaa
 			
+			
+				baarit
+				{0} baari
+				{0} baaria
+			
 			
 				millibaarit
 				{0} millibaari
 				{0} millibaaria
 			
 			
-				normaali-ilmakehät
-				{0} normaali-ilmakehä
-				{0} normaali-ilmakehää
+				normaali-ilmakehät
+				{0} normaali-ilmakehä
+				{0} normaali-ilmakehää
+			
+			
+				pascalit
+				{0} pascal
+				{0} pascalia
+			
+			
+				hehtopascalit
+				{0} hehtopascal
+				{0} hehtopascalia
 			
 			
-				kilopascalit
-				{0} kilopascal
-				{0} kilopascalia
+				kilopascalit
+				{0} kilopascal
+				{0} kilopascalia
 			
 			
-				megapascalit
-				{0} megapascal
-				{0} megapascalia
+				megapascalit
+				{0} megapascal
+				{0} megapascalia
 			
 			
 				kilometrit tunnissa
@@ -8275,14 +8533,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelviniä
 			
 			
-				pauna-jalat
-				{0} pauna-jalka
-				{0} pauna-jalkaa
+				pauna-jalat
+				{0} pauna-jalka
+				{0} pauna-jalkaa
 			
 			
-				newtonmetrit
-				{0} newtonmetri
-				{0} newtonmetriä
+				newtonmetrit
+				{0} newtonmetri
+				{0} newtonmetriä
 			
 			
 				kuutiokilometrit
@@ -8405,9 +8663,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nesteunssia
 			
 			
-				imp. nesteunssit
-				{0} imp. nesteunssi
-				{0} imp. nesteunssia
+				imp. nesteunssit
+				{0} imp. nesteunssi
+				{0} imp. nesteunssia
 			
 			
 				ruokalusikat
@@ -8420,12 +8678,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} teelusikkaa
 			
 			
-				barrelit
-				{0} barreli
-				{0} barrelia
+				barrelit
+				{0} barreli
+				{0} barrelia
 			
 			
-				pääilmansuunta
+				pääilmansuunta
 				{0}I
 				{0}P
 				{0}E
@@ -8522,9 +8780,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in²
 			
 			
-				dunamit
-				{0} dunam
-				{0} dunamia
+				dunamit
+				{0} dunam
+				{0} dunamia
 			
 			
 				ka
@@ -8547,12 +8805,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ppm
 			
 			
-				{0} %
-				{0} %
+				{0} %
+				{0} %
 			
 			
-				{0} ‰
-				{0} ‰
+				{0} ‰
+				{0} ‰
 			
 			
 				peruspiste
@@ -8752,24 +9010,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				elektronivoltti
-				{0} eV
-				{0} eV
+				elektronivoltti
+				{0} eV
+				{0} eV
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+				{0} Btu
+				{0} Btu
 			
 			
-				pauna-voima
-				{0} lbf
-				{0} lbf
+				pauna-voima
+				{0} lbf
+				{0} lbf
 			
 			
-				newton
-				{0} N
-				{0} N
+				newton
 			
 			
 				GHz
@@ -8878,7 +9134,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				fm
-				{0} fth
+				{0} fm
 				{0} fth
 			
 			
@@ -8898,8 +9154,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				auringon säteet
-				{0} R☉
-				{0} R☉
 			
 			
 				lx
@@ -8907,9 +9161,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				Auringon luminositeetit
-				{0} L☉
-				{0} L☉
+				Auringon luminositeetit
+				{0} L☉
+				{0} L☉
 			
 			
 				t
@@ -8971,14 +9225,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ka
 			
 			
-				atomimassayksiköt
-				{0} Da
-				{0} Da
+				atomimassayksiköt
 			
 			
-				Maan massat
-				{0} M⊕
-				{0} M⊕
+				Maan massat
 			
 			
 				auringon massat
@@ -9015,11 +9265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hv
 				{0} hv
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -9040,15 +9285,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -9091,14 +9331,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
 			
 			
-				Nm
-				{0} Nm
-				{0} Nm
+				Nm
+				{0} Nm
+				{0} Nm
 			
 			
 				km³
@@ -9221,9 +9461,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				imp. nesteunssi
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				imp. nesteunssi
 			
 			
 				rkl
@@ -9236,12 +9474,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tl
 			
 			
-				barrelit
-				{0} bbl
-				{0} bbl
+				barrelit
 			
 			
-				ilmansuunta
+				ilmansuunta
 				{0}I
 				{0}P
 				{0}E
@@ -9337,6 +9573,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}in²
 				{0}/in²
 			
+			
+				{0}dunam
+				{0}dunam
+			
 			
 				ka
 				{0}ka
@@ -9358,8 +9598,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ppm
 			
 			
-				{0} %
-				{0} %
+				{0} %
+				{0} %
+			
+			
+				{0}‰
+				{0}‰
+			
+			
+				‱
+				{0}‱
+				{0}‱
+			
+			
+				mol
+				{0}mol
+				{0}mol
 			
 			
 				l/km
@@ -9475,11 +9729,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				min
 				{0}min
 				{0}min
+				{0}/min
 			
 			
 				s
 				{0}s
 				{0}s
+				{0}/s
 			
 			
 				ms
@@ -9487,10 +9743,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ms
 			
 			
+				μs
 				{0}μs
 				{0}μs
 			
 			
+				ns
 				{0}ns
 				{0}ns
 			
@@ -9544,6 +9802,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}kWh
 				{0}kWh
 			
+			
+				eV
+				{0}eV
+				{0}eV
+			
+			
+				{0}Btu
+				{0}Btu
+			
+			
+				lbf
+				{0}lbf
+				{0}lbf
+			
+			
+				N
+				{0}N
+				{0}N
+			
 			
 				GHz
 				{0}GHz
@@ -9564,6 +9841,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}Hz
 				{0}Hz
 			
+			
+				{0}em
+				{0}em
+			
+			
+				{0}px
+				{0}px
+			
+			
+				{0}MP
+				{0}MP
+			
+			
+				{0}ppcm
+				{0}ppcm
+			
+			
+				{0}ppi
+				{0}ppi
+			
+			
+				{0}dpcm
+				{0}dpcm
+			
+			
+				{0}dpi
+				{0}dpi
+			
 			
 				km
 				{0}km
@@ -9664,11 +9969,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}pnk
 				{0}pnk
 			
+			
+				{0}pt
+				{0}pt
+			
+			
+				R☉
+				{0}R☉
+				{0}R☉
+			
 			
 				lx
 				{0}lx
 				{0}lx
 			
+			
+				L☉
+				{0}L☉
+				{0}L☉
+			
 			
 				t
 				{0}t
@@ -9728,6 +10047,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ka
 				{0}ka
 			
+			
+				Da
+				{0}Da
+				{0}Da
+			
+			
+				M⊕
+				{0}M⊕
+				{0}M⊕
+			
+			
+				M☉
+				{0}M☉
+				{0}M☉
+			
 			
 				GW
 				{0}GW
@@ -9736,7 +10070,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				MW
 				{0}MW
-				{0} MW
+				{0}MW
 			
 			
 				kW
@@ -9758,11 +10092,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hv
 				{0}hv
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
@@ -9778,11 +10107,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″ Hg
 				{0}″ Hg
 			
+			
+				bar
+				{0}bar
+				{0}bar
+			
 			
 				mbar
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}atm
+				{0}atm
+			
+			
+				{0}Pa
+				{0}Pa
+			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
+			
+				{0}kPa
+				{0}kPa
+			
+			
+				{0}MPa
+				{0}MPa
+			
 			
 				km/h
 				{0}km/h
@@ -9823,12 +10178,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}K
 				{0}K
 			
+			
+				{0}Nm
+				{0}Nm
+			
 			
 				km³
 				{0}km³
 				{0}km³
 			
 			
+				m³
 				{0}m³
 				{0}m³
 				{0}/m³
@@ -9942,6 +10302,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}fl oz
 				{0}fl oz
 			
+			
+				Imp. fl oz
+			
 			
 				rkl
 				{0}rkl
@@ -9952,8 +10315,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}tl
 				{0}tl
 			
+			
+				bbl
+				{0}bbl
+				{0}bbl
+			
 			
-				suunta
+				suunta
 				{0}I
 				{0}P
 				{0}E
@@ -9983,12 +10351,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} tai {1}
 			{0} tai {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} ja {1}
-			{0} ja {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
@@ -10127,54 +10489,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		paksuus
 		kursiivi
 		kuvateksti
-		teksti
-		otsikko
+		leipäteksti
+		otsikointi
 		näyttö
 		juliste
 		taaksepäin kallistettu
 		pysty
-		vino
-		extravino
+		kallistettu
+		ekstrakallistettu
 		ultrakapea
 		ultratiivis
-		ultrakapea
-		extrakapea
-		extratiivis
-		extrakapea
+		ultrakavennettu
+		erikoiskapea
+		erikoistiivis
+		erikoiskapea
 		kavennettu
-		pakattu
+		tiivistetty
 		kapea
-		semikapea
-		semikapea
-		semikapea
+		semikavennettu
+		puolitiivistetty
+		puolikapea
 		normaalilevyinen
 		semilaaja
 		semilaajennettu
-		semileveä
-		laajennettu
+		puolileveä
+		levennetty
 		laajennettu
 		leveä
-		extralaaja
+		erikoisleveä
 		extralaajennettu
 		extraleveä
-		ultralaaja
+		ultraleveä
 		ultralaajennettu
 		ultraleveä
-		kapea
-		extraohut
+		laiha
+		erikoislaiha
 		ultraohut
 		ohut
 		semiohut
 		kirja
 		normaali
 		keskipaksu
-		semilihava
-		demilihava
-		lihavoitu
+		puolilihava
+		puolilihava
+		lihava
 		extralihava
 		ultralihava
 		musta
-		paksu
+		erikoislihava
 		extramusta
 		ultramusta
 		ultrapaksu
@@ -10182,10 +10544,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		versaalivälistys
 		valinnaiset ligatuurit
 		vinoviivaiset murtoluvut
-		otsikkonumerot
+		versaalinumerot
 		gemenanumerot
 		järjestysluvut
-		suhteelliset numerot
+		tekstinumerot
 		kapiteelit
 		sarkautuvat numerot
 		lävistetty nolla
diff --git a/make/data/cldr/common/main/fi_FI.xml b/make/data/cldr/common/main/fi_FI.xml
index 9b7813e590d..91e8016b4ac 100644
--- a/make/data/cldr/common/main/fi_FI.xml
+++ b/make/data/cldr/common/main/fi_FI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fil.xml b/make/data/cldr/common/main/fil.xml
index 93d2641c281..37cb99c886e 100644
--- a/make/data/cldr/common/main/fil.xml
+++ b/make/data/cldr/common/main/fil.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -67,7 +67,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Buginese
 			Blin
 			Catalan
-			Chakma
+			Chakma
 			Chechen
 			Cebuano
 			Chiga
@@ -422,10 +422,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yiddish
 			Yoruba
 			Cantonese
+			Chinese, Cantonese
 			Standard Moroccan Tamazight
 			Chinese
+			Chinese, Mandarin
 			Pinasimpleng Chinese
+			Pinasimpleng Mandarin Chinese
 			Tradisyonal na Chinese
+			Tradisyonal na Mandarin Chinese
 			Zulu
 			Zuni
 			Walang nilalaman na ukol sa wika
@@ -590,7 +594,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Spain
 			Ethiopia
 			European Union
-			Eurozone
+			Eurozone
 			Finland
 			Fiji
 			Falkland Islands
@@ -742,6 +746,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Syria
 			Swaziland
+			Swaziland
 			Tristan de Cunha
 			Turks & Caicos Islands
 			Chad
@@ -778,8 +783,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis & Futuna
 			Samoa
-			Mga Pseudo-Accent
-			Pseudo-Bidi
+			Mga Pseudo-Accent
+			Pseudo-Bidi
 			Kosovo
 			Yemen
 			Mayotte
@@ -965,8 +970,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c d e f g h i j k l m n ñ {ng} o p q r s t u v w x y z]
 		[á à â é è ê í ì î ó ò ô ú ù û]
 		[A B C D E F G H I J K L M N Ñ {Ng} O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § * / \& # ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § * / \& # ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -975,19 +980,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -999,6 +1008,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
 				
 					
 						
@@ -1043,14 +1063,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -1066,6 +1092,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -1080,6 +1142,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -1123,6 +1189,116 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+					
+					
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+					
+				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 				
 					
 						
@@ -1167,14 +1343,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -1190,6 +1372,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -1204,6 +1422,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -1247,6 +1469,116 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
+				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 				
 					
 						
@@ -1291,14 +1623,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -1314,6 +1652,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -1328,6 +1702,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -1461,55 +1839,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							M/d/y – M/d/y GGGGG
-							M/d/y GGGGG – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
 						
 						
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y GGGGG – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y GGGGG – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							MMM d – d, y G
-							MMM d, y G – MMM d, y G
-							MMM d – MMM d, y G
-							MMM d, y – MMM d, y G
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
 						
 						
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y G – E, MMM d, y G
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M–M
@@ -1990,15 +2391,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
@@ -2133,6 +2525,119 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+					
+					
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+					
+				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 				
 					
 						
@@ -2177,14 +2682,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						MMM d
 						E, MMM d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y
 						y G
@@ -2200,6 +2711,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2214,6 +2761,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -2257,6 +2808,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 				
 					
 						
@@ -2301,14 +2953,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -2324,6 +2982,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2338,6 +3032,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -2381,6 +3079,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 				
 					
 						
@@ -2425,14 +3224,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -2448,6 +3253,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2462,6 +3303,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -2505,6 +3350,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 				
 					
 						
@@ -2549,14 +3495,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -2572,6 +3524,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2586,6 +3574,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -2687,14 +3679,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						d E
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
+						L
 						M/d
 						E, M/d
+						LLL
+						MMM d
 						E, MMM d
+						MMMM d
 						E, MMMM d
 						y G
 						y G
@@ -2710,6 +3708,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2724,6 +3758,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							MMM–MMM
 						
+						
+							MMM d–d
+							MMM d – MMM d
+						
 						
 							E, MMM d – E, MMM d
 							E, MMM d – E, MMM d
@@ -3442,7 +4480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Coordinated Universal Time
+					Coordinated Universal Time
 				
 			
 			
@@ -4112,7 +5150,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aqtobe
 			
 			
-				Kostanay
+				Kostanay
 			
 			
 				Qyzylorda
@@ -5638,7 +6676,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5647,6 +6690,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 libo
@@ -5769,11 +6817,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afghan Afghani
 				Afghan Afghani
 				Afghan Afghanis
+				AFN
 			
 			
 				Albanian Lek
 				Albanian lek
 				Albanian leke
+				ALL
 			
 			
 				Armenian Dram
@@ -5785,6 +6835,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Antillean Guilder ng Netherlands
 				Antillean guilder ng Netherlands
 				Antillean guilders ng Netherlands
+				ANG
 			
 			
 				Angolan Kwanza
@@ -5797,18 +6848,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Piso ng Argentina
 				piso ng Argentina
 				piso ng Argentina
+				ARS
 				$
 			
 			
 				Dolyar ng Australya
 				dolyar ng Australya
 				dolyares ng Australya
+				A$
 				$
 			
 			
 				Florin ng Aruba
 				florin ng Aruba
 				florin ng Aruba
+				AWG
 			
 			
 				Azerbaijani Manat
@@ -5820,24 +6874,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bosnia-Herzegovina Convertible Mark
 				Bosnia-Herzegovina convertible mark
 				Bosnia-Herzegovina convertible marks
+				BAM
 				KM
 			
 			
 				Dolyar ng Barbados
 				dolyar ng Barbados
 				dolyares ng Barbados
+				BBD
 				$
 			
 			
 				Bangladeshi Taka
 				Bangladeshi taka
 				Bangladeshi takas
+				BDT
 				৳
 			
 			
 				Bulgarian Lev
 				Bulgarian lev
 				Bulgarian leva
+				BGN
 			
 			
 				Bahraini Dinar
@@ -5855,36 +6913,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dolyar ng Bermuda
 				dolyar ng Bermuda
 				dolyares ng Bermuda
+				BMD
 				$
 			
 			
 				Dolyar ng Brunei
 				dolyar ng Brunei
 				dolyar ng Brunei
+				BND
 				$
 			
 			
 				Boliviano ng Bolivia
 				boliviano ng Bolivia
 				bolivianos ng Bolivia
+				BOB
 				Bs
 			
 			
 				Real ng Barzil
 				real ng Brazil
 				reals ng Brazil
+				R$
 				R$
 			
 			
 				Dolyar ng Bahamas
 				dolyar ng Bahamas
 				dolyares ng Bahamas
+				BSD
 				$
 			
 			
 				Bhutanese Ngultrum
 				Bhutanese ngultrum
 				Bhutanese ngultrums
+				BTN
 			
 			
 				Botswanan Pula
@@ -5897,22 +6961,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Belarusian Ruble
 				Belarusian ruble
 				Belarusian rubles
+				BYN
+				р.
 			
 			
 				Belarusian Ruble (2000–2016)
 				Belarusian ruble (2000–2016)
 				Belarusian rubles (2000–2016)
+				BYR
 			
 			
 				Dolyar ng Belize
 				dolyar ng Belize
 				dolyares ng Belize
+				BZD
 				$
 			
 			
 				Dolyar ng Canada
 				dolyar ng Canada
 				Dolyares ng Canada
+				CA$
 				$
 			
 			
@@ -5925,41 +6994,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Swiss Franc
 				Swiss franc
 				Swiss francs
+				CHF
 			
 			
 				Piso ng Chile
 				piso ng Chile
 				piso ng Chile
+				CLP
 				$
 			
+			
+				Chinese Yuan (offshore)
+				Chinese yuan (offshore)
+				Chinese yuan (offshore)
+				CNH
+			
 			
 				Chinese Yuan
 				Chinese yuan
 				Chinese yuan
+				CN¥
 				¥
 			
 			
 				Piso ng Colombia
 				piso ng Colombia
 				Piso ng Colombia
+				COP
 				$
 			
 			
 				Colón ng Costa Rica
 				colón ng Costa Rica
 				colóns ng Costa Rica
+				CRC
 				₡
 			
 			
 				Convertible na Piso ng Cuba
 				Convertible na piso ng Cuba
 				Convertible na Piso ng Cuba
+				CUC
 				$
 			
 			
 				Piso ng Cuba
 				piso ng Cuba
 				piso ng Cuba
+				CUP
 				$
 			
 			
@@ -5972,6 +7054,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Czech Republic Koruna
 				Czech Republic koruna
 				Czech Republic korunas
+				CZK
 				Kč
 			
 			
@@ -5987,12 +7070,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Danish Krone
 				Danish krone
 				Danish kroner
+				DKK
 				kr
 			
 			
 				Piso ng Dominican
 				Piso ng Dominican
 				piso ng Dominican
+				DOP
 				$
 			
 			
@@ -6027,6 +7112,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Euro
 				euro
 				euros
+				€
 				€
 			
 			
@@ -6040,6 +7126,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pound ng Falkland Islands
 				pound ng Falkland Islands
 				pounds ng Falkland Islands
+				FKP
 				£
 			
 			
@@ -6049,6 +7136,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				British Pound
 				British pound
 				British pounds
+				£
 				£
 			
 			
@@ -6056,6 +7144,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Georgian lari
 				Georgian laris
 				GEL
+				₾
 				₾
 			
 			
@@ -6068,6 +7157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gibraltar Pound
 				Gibraltar pound
 				Gibraltar pounds
+				GIP
 				£
 			
 			
@@ -6087,59 +7177,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Quetzal ng Guatemala
 				quetzal ng Guatemala
 				quetzals ng Guatemala
+				GTQ
 				Q
 			
 			
 				Dolyar ng Guyanese
 				dolyar ng Guyanese
 				dolyares ng Guyanese
+				GYD
 				$
 			
 			
 				Dolyar ng Hong Kong
 				dolyar ng Hong Kong
 				dolyares ng Hong Kong
+				HK$
 				$
 			
 			
 				Lempira ng Honduras
 				lempira ng Honduras
 				lempiras ng Honduras
+				HNL
 				L
 			
 			
 				Croatian Kuna
 				Croatian kuna
 				Croatian kunas
+				HRK
 				kn
 			
 			
 				Gourde ng Haiti
 				gourde ng Haiti
 				gourdes ng Haiti
+				HTG
 			
 			
 				Hungarian Forint
 				Hungarian forint
 				Hungarian forints
+				HUF
 				Ft
 			
 			
 				Indonesian Rupiah
 				Indonesian rupiah
 				Indonesian rupiahs
+				IDR
 				Rp
 			
 			
 				Israeli New Sheqel
 				Israeli new sheqel
 				Israeli new sheqels
+				₪
 				₪
 			
 			
 				Indian Rupee
 				Indian rupee
 				Indian rupees
+				₹
 				₹
 			
 			
@@ -6152,17 +7252,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Iranian Rial
 				Iranian rial
 				Iranian rials
+				IRR
 			
 			
 				Icelandic Króna
 				Icelandic króna
 				Icelandic krónur
+				ISK
 				kr
 			
 			
 				Dolyar ng Jamaica
 				dolyar ng Jamaica
 				dolyares ng Jamaica
+				JMD
 				$
 			
 			
@@ -6194,6 +7297,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cambodian Riel
 				Cambodian riel
 				Cambodian riels
+				KHR
 				៛
 			
 			
@@ -6207,12 +7311,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Won ng Hilagang Korea
 				won ng Hilagang Korea
 				won ng Hilagang Korea
+				KPW
 				₩
 			
 			
 				Won ng Timog Korea
 				won ng Timog Korea
 				won ng Timog Korea
+				₩
 				₩
 			
 			
@@ -6225,6 +7331,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dolyar ng Cayman Islands
 				dolyar ng Cayman Islands
 				dolyares ng Cayman Islands
+				KYD
 				$
 			
 			
@@ -6238,6 +7345,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Laotian Kip
 				Laotian kip
 				Laotian kips
+				LAK
 				₭
 			
 			
@@ -6251,6 +7359,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sri Lankan Rupee
 				Sri Lankan rupee
 				Sri Lankan rupees
+				LKR
 				Rs
 			
 			
@@ -6267,11 +7376,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lithuanian Litas
 				Lithuanian litas
 				Lithuanian litai
+				LTL
 			
 			
 				Latvian Lats
 				Latvian lats
 				Latvian lati
+				LVL
 			
 			
 				Libyan Dinar
@@ -6289,6 +7400,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Moldovan Leu
 				Moldovan leu
 				Moldovan lei
+				MDL
 			
 			
 				Malagasy Ariary
@@ -6301,23 +7413,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Macedonian Denar
 				Macedonian denar
 				Macedonian denari
+				MKD
 			
 			
 				Myanmar Kyat
 				Myanmar kyat
 				Myanmar kyats
+				MMK
 				K
 			
 			
 				Mongolian Tugrik
 				Mongolian tugrik
 				Mongolian tugriks
+				MNT
 				₮
 			
 			
 				Macanese Pataca
 				Macanese pataca
 				Macanese patacas
+				MOP
 			
 			
 				Mauritanian Ouguiya (1973–2017)
@@ -6329,6 +7445,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ouguiya ng Mauritania
 				Mauritanian ouguiya
 				Mauritanian ouguiyas
+				MRU
 			
 			
 				Mauritian Rupee
@@ -6341,6 +7458,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maldivian Rufiyaa
 				Maldivian rufiyaa
 				Maldivian rufiyaas
+				MVR
 			
 			
 				Malawian Kwacha
@@ -6352,12 +7470,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Piso ng Mexico
 				piso ng Mexico
 				piso ng Mexico
+				MX$
 				$
 			
 			
 				Malaysian Ringgit
 				Malaysian ringgit
 				Malaysian ringgits
+				MYR
 				RM
 			
 			
@@ -6384,24 +7504,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Córdoba ng Nicaragua
 				córdoba ng Nicaragua
 				Nicaraguan córdobas
+				NIO
 				C$
 			
 			
 				Norwegian Krone
 				Norwegian krone
 				Norwegian kroner
+				NOK
 				kr
 			
 			
 				Nepalese Rupee
 				Nepalese rupee
 				Nepalese rupees
+				NPR
 				Rs
 			
 			
 				Dolyar ng New Zealand
 				dolyares ng New Zealand
 				dolyares ng New Zealand
+				NZ$
 				$
 			
 			
@@ -6414,11 +7538,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Balboa ng Panama
 				balboa ng Panama
 				Balboas ng Panama
+				PAB
 			
 			
 				Peruvian Sol
 				Peruvian sol
 				Peruvian soles
+				PEN
 			
 			
 				Papua New Guinean Kina
@@ -6437,18 +7563,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pakistani Rupee
 				Pakistani rupee
 				Pakistani rupees
+				PKR
 				Rs
 			
 			
 				Polish Zloty
 				Polish zloty
 				Polish zlotys
+				PLN
 				zł
 			
 			
 				Paraguayan Guarani
 				Paraguayan guarani
 				Paraguayan guaranis
+				PYG
 				₲
 			
 			
@@ -6461,16 +7590,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Romanian Leu
 				Romanian leu
 				Romanian lei
+				RON
+				lei
 			
 			
 				Serbian Dinar
 				Serbian dinar
 				Serbian dinars
+				RSD
 			
 			
 				Russian Ruble
 				Russian ruble
 				Russian rubles
+				RUB
 				₽
 			
 			
@@ -6509,12 +7642,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Swedish Krona
 				Swedish krona
 				Swedish kronor
+				SEK
 				kr
 			
 			
 				Dolyar ng Singapore
 				dolyar ng Singapore
 				dolyares ng Singapore
+				SGD
 				$
 			
 			
@@ -6546,6 +7681,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dolyar ng Suriname
 				dolyar ng Suriname
 				dolyares ng Suriname
+				SRD
 				$
 			
 			
@@ -6565,6 +7701,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				São Tomé & Príncipe Dobra (2018)
 				São Tomé & Príncipe dobra
 				São Tomé & Príncipe dobras
+				STN
+				Db
 			
 			
 				Syrian Pound
@@ -6623,12 +7761,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dolyar ng Trinidad and Tobago
 				dolyar ng Trinidad and Tobago
 				dolyares ng Trinidad and Tobago
+				TTD
 				$
 			
 			
 				Dolyar ng New Taiwan
 				dolyar ng New Taiwan
 				dolyares ng New Taiwan
+				NT$
 				NT$
 			
 			
@@ -6641,6 +7781,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ukrainian Hryvnia
 				Ukrainian hryvnia
 				Ukrainian hryvnias
+				UAH
 				₴
 			
 			
@@ -6660,6 +7801,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Piso ng Uruguay
 				piso ng Uruguay
 				piso ng Uruguay
+				UYU
 				$
 			
 			
@@ -6675,17 +7817,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolívar ng Venezuela (2008–2018)
 				bolívar ng Venezuela (2008–2018)
 				bolívars ng Venezuela (2008–2018)
+				VEF
 				Bs
 			
 			
 				Bolívar ng Venezuela
 				bolívar ng Venezuela
 				bolívars ng Venezuela
+				VES
 			
 			
 				Vietnamese Dong
 				Vietnamese dong
 				Vietnamese dong
+				₫
 				₫
 			
 			
@@ -6704,22 +7849,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA Franc BEAC
 				CFA franc BEAC
 				CFA francs BEAC
+				FCFA
 			
 			
 				Dolyar ng Silangang Caribbean
 				dolyar ng Silangang Caribbean
 				dolyares ng Silangang Caribbean
+				EC$
 				$
 			
 			
 				CFA Franc ng Kanlurang Africa
 				CFA franc ng Kanlurang Africa
 				CFA francs ng Kanlurang Africa
+				CFA
 			
 			
 				CFP Franc
 				CFP franc
 				CFP francs
+				CFPF
 			
 			
 				Hindi Kilalang Pera
@@ -6805,6 +7954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kilometro kwadrado
 				{0} kilometro kwadrado
 				{0} na kilometro kwadrado
+				{0}/km²
 			
 			
 				hektarya
@@ -6827,6 +7977,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				milya kwadrado
 				{0} milya kwadrado
 				{0} na milya kwadrado
+				{0}/mi²
 			
 			
 				acres
@@ -6849,21 +8000,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na pulgada kwadrado
 				{0} kada pulgada kwadrado
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
 				{0} na karat
 			
 			
+				mg/dL
 				{0} milligram per deciliter
 				{0} milligrams per deciliter
 			
 			
+				mmol/L
 				{0} millimole per liter
 				{0} millimoles per liter
 			
@@ -6883,14 +8031,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na permille
 			
 			
-				permyriad
-				{0} permyriad
-				{0} permyriad
+				permyriad
+				{0} permyriad
+				{0} permyriad
 			
 			
-				mole
-				{0} mole
-				{0} mole
+				mole
+				{0} mole
+				{0} mole
 			
 			
 				litro kada kilometro
@@ -6972,6 +8120,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} siglo
 				{0} siglo
 			
+			
+				dekada
+				{0} dekada
+				{0} dekada
+			
 			
 				mga taon
 				{0} taon
@@ -7080,24 +8233,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na kilowatt-hour
 			
 			
-				electronvolt
-				{0} electronvolt
-				{0} electronvolt
+				electronvolt
+				{0} electronvolt
+				{0} electronvolt
 			
 			
-				British thermal unit
-				{0} British thermal unit
-				{0} British thermal unit
+				British thermal unit
+				{0} British thermal unit
+				{0} British thermal unit
 			
 			
-				pound of force
-				{0} pound of force
-				{0} pound of force
+				pound of force
+				{0} pound of force
+				{0} pound of force
 			
 			
-				newton
-				{0} newton
-				{0} newton
+				newton
+				{0} newton
+				{0} newton
 			
 			
 				gigahertz
@@ -7119,6 +8272,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} na hertz
 			
+			
+				tipograpikang em
+			
+			
+				mga pixel
+				{0} pixel
+				{0} pixel
+			
+			
+				megapixels
+				{0} megapixel
+				{0} megapixels
+			
+			
+				mga pixel bawat sentimetro
+				{0} pixel bawat sentimetro
+				{0} pixel bawat sentimetro
+			
+			
+				mga pixel bawat pulgada
+				{0} pixel bawat pulgada
+				{0} pixel bawat pulgada
+			
+			
+				tuldok bawat sentimetro
+				{0} tuldok bawat sentimetro
+				{0} tuldok bawat sentimetro
+			
+			
+				tuldok bawat pulgada
+				{0} tuldok bawat pulgada
+				{0} tuldok bawat pulgada
+			
 			
 				kilometro
 				{0} kilometro
@@ -7220,14 +8406,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na milya-scandinavian
 			
 			
-				puntos
-				{0} puntos
-				{0} puntos
+				puntos
+				{0} puntos
+				{0} puntos
 			
 			
-				solar radii
-				{0} solar radius
-				{0} solar radii
+				solar radii
+				{0} solar radius
+				{0} solar radii
 			
 			
 				lux
@@ -7235,9 +8421,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na lux
 			
 			
-				solar luminosity
-				{0} solar luminosity
-				{0} solar luminosity
+				solar luminosity
+				{0} solar luminosity
+				{0} solar luminosity
 			
 			
 				toneladang metriko
@@ -7299,19 +8485,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karat
 			
 			
-				dalton
-				{0} dalton
-				{0} dalton
+				dalton
+				{0} dalton
+				{0} dalton
 			
 			
-				Earth mass
-				{0} Earth mass
-				{0} Earth mass
+				Earth mass
+				{0} Earth mass
+				{0} Earth mass
 			
 			
-				solar mass
-				{0} solar mass
-				{0} solar mass
+				solar mass
+				{0} solar mass
+				{0} solar mass
 			
 			
 				gigawatts
@@ -7343,11 +8529,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} horsepower
 				{0} horsepower
 			
-			
-				hectopascals
-				{0} hectopascal
-				{0} na hectopascal
-			
 			
 				milimetro ng asoge
 				{0} millimetro ng mercury
@@ -7373,6 +8554,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosphere
 				{0} atmospheres
 			
+			
+				{0} pascal
+				{0} pascals
+			
+			
+				hectopascals
+				{0} hectopascal
+				{0} na hectopascal
+			
 			
 				kilopascal
 				{0} kilopascal
@@ -7424,14 +8614,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} degrees kelvin
 			
 			
-				pound-feet
-				{0} pound-foot
-				{0} pound-feet
+				pound-feet
+				{0} pound-foot
+				{0} pound-feet
 			
 			
-				newton-meter
-				{0} newton-meter
-				{0} newton-meter
+				newton-meter
+				{0} newton-meter
+				{0} newton-meter
 			
 			
 				kubiko kilometro
@@ -7522,6 +8712,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na galon
 				{0} kada galon
 			
+			
+				Imp. gal
+				{0} gal Imp.
+				{0} gal Imp.
+				{0} kada Imp. galon
+			
 			
 				quarts
 				{0} quart
@@ -7543,9 +8739,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na fluid ounce
 			
 			
-				Imp. fluid ounce
-				{0} Imp. fluid ounce
-				{0} Imp. fluid ounce
+				Imp. fluid ounce
+				{0} Imp. fluid ounce
+				{0} Imp. fluid ounce
 			
 			
 				kutsara
@@ -7559,8 +8755,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				bariles
-				{0} bariles
-				{0} bariles
+				{0} bariles
+				{0} bariles
 			
 			
 				cardinal direction
@@ -7574,6 +8770,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				g-force
 				{0} G
@@ -7610,8 +8809,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na arcsec
 			
 			
+				km²
 				{0} km²
 				{0} km²
+				{0}/km²
 			
 			
 				hektarya
@@ -7625,12 +8826,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kada m²
 			
 			
+				cm²
+				{0} cm²
+				{0} cm²
 				{0} kada cm²
 			
 			
 				sq mile
 				{0} sq mi
 				{0} sq mi
+				{0}/mi²
 			
 			
 				acres
@@ -7639,6 +8844,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				yarda²
+				{0} yd²
+				{0} yd²
 			
 			
 				sq feet
@@ -7647,18 +8854,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				pulgada²
+				{0} in²
+				{0} in²
 				{0} kada in²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
+				{0} kt
+				{0} kt
+			
+			
+				mg/dL
+				{0} mg/dL
+				{0} mg/dL
+			
+			
+				mmol/L
+				{0} mmol/L
+				{0} mmol/L
 			
 			
 				parts/million
+				{0} ppm
+				{0} ppm
 			
 			
 				%
@@ -7671,14 +8889,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				permyriad
-				{0}‱
-				{0}‱
+				permyriad
+				{0}‱
+				{0}‱
 			
 			
-				mole
-				{0} mol
-				{0} mol
+				mole
 			
 			
 				litro/km
@@ -7695,6 +8911,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg
 				{0} na mpg
 			
+			
+				milya/gal Imp.
+				{0} mpg Imp.
+				{0} mpg Imp.
+			
 			
 				PByte
 				{0} PB
@@ -7755,6 +8976,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} siglo
 				{0} siglo
 			
+			
+				dec
+				{0} dec
+				{0} dec
+			
 			
 				taon
 				{0} taon
@@ -7863,24 +9089,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				electronvolt
-				{0} eV
-				{0} eV
+				electronvolt
+				{0} eV
+				{0} eV
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+				{0} Btu
+				{0} Btu
+			
+			
+				US therm
+				{0} US therm
+				{0} US therm
 			
 			
-				pound-force
-				{0} lbf
-				{0} lbf
+				pound-force
+				{0} lbf
+				{0} lbf
 			
 			
-				newton
-				{0} N
-				{0} N
+				newton
+				{0} N
+				{0} N
 			
 			
 				GHz
@@ -7902,6 +9133,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				mga pixel
+			
 			
 				km
 				{0} km
@@ -7984,6 +9218,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				furlongs
+				{0} fur
+				{0} fur
 			
 			
 				fathoms
@@ -8001,12 +9237,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} smi
 			
 			
-				puntos
+				puntos
+				{0} pt
+				{0} pt
 			
 			
-				solar radii
-				{0} R☉
-				{0} R☉
+				solar radii
 			
 			
 				lux
@@ -8014,9 +9250,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				solar luminosity
-				{0} L☉
-				{0} L☉
+				solar luminosity
+				{0} L☉
+				{0} L☉
 			
 			
 				t
@@ -8052,6 +9288,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				stones
+				{0} st
+				{0} st
 			
 			
 				libra
@@ -8076,19 +9314,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} KD
 			
 			
-				dalton
-				{0} Da
-				{0} Da
+				dalton
+				{0} Da
+				{0} Da
 			
 			
-				Earth mass
-				{0} M⊕
-				{0} M⊕
+				Earth mass
+				{0} M⊕
+				{0} M⊕
 			
 			
-				solar mass
-				{0} M☉
-				{0} M☉
+				solar mass
+				{0} M☉
+				{0} M☉
 			
 			
 				GW
@@ -8120,11 +9358,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				milimetro ng asoge
 				{0} mm Hg
@@ -8150,6 +9383,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8201,14 +9439,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°K
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				N⋅m
+				{0} N⋅m
+				{0} N⋅m
 			
 			
 				km³
@@ -8299,6 +9537,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} na gal
 				{0}/gal
 			
+			
+				Imp. gal
+				{0} gal Imp.
+				{0} gal Imp.
+				{0}/gal Imp.
+			
 			
 				qts
 				{0} qt
@@ -8319,11 +9563,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -8335,9 +9574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 			
 			
-				bariles
-				{0} bbl
-				{0} bbl
+				bariles
 			
 			
 				direction
@@ -8352,6 +9589,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/{1}
 			
 			
+				g-force
 				{0}G
 				{0}G
 			
@@ -8375,6 +9613,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ha
 				{0}ha
 			
+			
+				{0} m²
+				{0} m²
+			
 			
 				{0}mi²
 				{0}mi²
@@ -8428,11 +9670,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				min.
 				{0}m
 				{0}m
+				{0}/min
 			
 			
 				seg.
 				{0}s
 				{0}s
+				{0}/s
 			
 			
 				mseg
@@ -8441,24 +9685,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				μseg
+				{0} μs
+				{0} μs
 			
 			
 				nanoseg
+				{0} ns
+				{0} ns
 			
 			
 				km
 				{0}km
 				{0}km
+				{0}/km
 			
 			
 				metro
 				{0}m
 				{0}m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
 			
 			
 				cm
 				{0}cm
 				{0}cm
+				{0}/cm
 			
 			
 				mm
@@ -8467,8 +9723,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				µmetro
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
 			
 			
+				pm
 				{0}pm
 				{0}pm
 			
@@ -8483,10 +9747,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}′
 				{0}′
+				{0}/ft
 			
 			
 				{0}″
 				{0}″
+				{0}/in
 			
 			
 				parsecs
@@ -8498,6 +9764,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ly
 			
 			
+				au
 				{0}au
 				{0}au
 			
@@ -8512,10 +9779,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}fth
 			
 			
+				nmi
 				{0}nmi
 				{0}nmi
 			
 			
+				smi
 				{0}smi
 				{0}smi
 			
@@ -8525,6 +9794,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}pt
 			
 			
+				t
 				{0}t
 				{0}t
 			
@@ -8532,17 +9802,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kg
 				{0}kg
 				{0}kg
+				{0}/kg
 			
 			
 				gramo
 				{0}g
 				{0}g
+				{0}/g
 			
 			
+				mg
 				{0}mg
 				{0}mg
 			
 			
+				µg
 				{0}µg
 				{0}µg
 			
@@ -8559,10 +9833,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}#
 				{0}#
+				{0}/lb
 			
 			
+				oz
 				{0}oz
 				{0}oz
+				{0}/oz
 			
 			
 				{0}oz t
@@ -8585,16 +9862,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0}hp
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
 				{0}mmHg
 			
 			
+				psi
 				{0}psi
 				{0}psi
 			
@@ -8604,9 +9878,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}" Hg
 			
 			
+				mbar
 				{0}mb
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/hr
 				{0}kph
@@ -8623,14 +9903,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mph
 			
 			
+				kn
 				{0}kn
 				{0}kn
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				⁰C
 				{0}°C
 				{0}°C
 			
+			
+				{0}°F
+				{0}°F
+			
 			
 				{0}K
 				{0}K
@@ -8680,14 +9970,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} o {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, at {1}
 			{0} at {1}
 		
@@ -8727,7 +10013,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} — iba pa
 		mga script — {0}
 		{0} stroke
-		{0} strokes
+		{0} (na) stroke
 		aktibidad
 		African script
 		American script
@@ -8748,7 +10034,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		pababang arrow
 		pababa at pataas na arrow
 		Script ng Silangang Asya
-		Emoji
 		Script sa Europa
 		babae
 		bandila
@@ -8796,7 +10081,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		bantas
 		pakanang arrow
 		tanda o simbolo
-		maliliit na baryante
+		maliliit na variant
 		smiley
 		smiley o tao
 		Script sa Timog-asya
@@ -8809,7 +10094,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		paglalakbay
 		paglalakbay o lugar
 		mga pataas na arrow
-		baryante
+		variant
 		vocalic jamo
 		panahon
 		Script sa Kanlurang Asya
diff --git a/make/data/cldr/common/main/fil_PH.xml b/make/data/cldr/common/main/fil_PH.xml
index 6cef9beabde..75a7f9cab6c 100644
--- a/make/data/cldr/common/main/fil_PH.xml
+++ b/make/data/cldr/common/main/fil_PH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fo.xml b/make/data/cldr/common/main/fo.xml
index d178d0a08d3..37960929a50 100644
--- a/make/data/cldr/common/main/fo.xml
+++ b/make/data/cldr/common/main/fo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -65,6 +65,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			buginesiskt
 			blin
 			katalani
+			khakma
 			tjetjenskt
 			cebuano
 			chiga
@@ -101,8 +102,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ekajuk
 			grikskt
 			enskt
-			enskt (UK)
-			enskt (USA)
 			esperanto
 			spanskt
 			estiskt
@@ -410,10 +409,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			jiddiskt
 			yoruba
 			kantonesiskt
+			kinesiskt, kantonesiskt
 			vanligt marokanskt tamazight
 			kinesiskt
+			kinesiskt, mandarin
 			einkult kinesiskt
+			mandarin kinesiskt (einkult)
 			vanligt kinesiskt
+			mandarin kinesiskt (vanligt)
 			sulu
 			zuni
 			einki málsligt innihald
@@ -541,10 +544,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Kanada
 			Kokosoyggjar
 			Kongo, Dem. Lýðveldið
+			Kongo, Dem. Lýðveldið
 			Miðafrikalýðveldið
 			Kongo
+			Kongo
 			Sveis
 			Fílabeinsstrondin
+			Fílabeinsstrondin
 			Cooksoyggjar
 			Kili
 			Kamerun
@@ -558,6 +564,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Jólaoyggjin
 			Kýpros
 			Kekkia
+			Kekkia
 			Týskland
 			Diego Garcia
 			Djibuti
@@ -653,8 +660,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			St-Martin
 			Madagaskar
 			Marshalloyggjar
-			Makedónia
-			Makedónia (FJM)
 			Mali
 			Myanmar (Burma)
 			Mongolia
@@ -726,7 +731,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			El Salvador
 			Sint Maarten
 			Sýria
-			Svasiland
+			Esvatini
+			Svasiland
 			Tristan da Cunha
 			Turks- og Caicosoyggjar
 			Kjad
@@ -736,6 +742,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Tadsjikistan
 			Tokelau
 			Eysturtimor
+			Eysturtimor
 			Turkmenistan
 			Tunesia
 			Tonga
@@ -761,6 +768,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Vanuatu
 			Wallis- og Futunaoyggjar
 			Samoa
+			óekta tónalag
+			óektaður BIDI tekstur
 			Kosovo
 			Jemen
 			Mayotte
@@ -865,7 +874,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[c q w x z]
 		[A Á B C D Ð E F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Æ Ø]
 		[, . % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ′ ″]
+		[\- ‐ ‑ – , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -998,9 +1007,56 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
+						
+							h B – h B
+							h–h B
+						
+						
+							h:mm B – h:mm B
+							h:mm–h:mm B
+							h:mm–h:mm B
+						
 						
 							d.–d.
 						
+						
+							y G – y G
+							y–y G
+						
+						
+							MM.y GGGGG – MM.y GGGGG
+							MM.y–MM.y GGGGG
+							MM.y–MM.y GGGGG
+						
+						
+							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y GGGGG – dd.MM.y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
+						
+						
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y GGGGG – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
+						
+						
+							d.–d. MMM y G
+							d. MMM y G – d. MMM y G
+							d. MMM – d. MMM y G
+							d. MMM y – d. MMM y G
+						
+						
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y G – E, d. MMM y G
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y – E, d. MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -1474,9 +1530,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
+						
+							h B – h B
+						
+						
+							h:mm B – h:mm B
+							h:mm–h:mm B
+							h:mm–h:mm B
+						
 						
 							d.–d.
 						
+						
+							y G – y G
+							y–y G
+						
+						
+							MM.y GGGGG – MM.y GGGGG
+							MM.y–MM.y GGGGG
+							MM.y–MM.y GGGGG
+						
+						
+							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y GGGGG – dd.MM.y GGGGG
+							dd.MM.y – dd.MM.y GGGGG
+							dd.MM.y – dd.MM.y GGGGG
+						
+						
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y GGGGG – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
+						
+						
+							d.–d. MMM y G
+							d. MMM y G – d. MMM y G
+							d. MMM – d. MMM y G
+							d. MMM y – d. MMM y G
+						
+						
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y G – E, d. MMM y G
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y – E, d. MMM y G
+						
 						
 							h a–h a
 							h–h a
@@ -1668,6 +1770,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				mnð.
+				seinasta mnð.
+				henda mnð.
+				næsta mnð.
 				
 					um {0} mnð.
 					um {0} mnð.
@@ -1679,6 +1784,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				mnð.
+				seinasta mnð.
+				henda mnð.
+				næsta mnð.
 				
 					um {0} mnð.
 					um {0} mnð.
@@ -1705,6 +1813,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				vi.
+				seinastu vi.
+				hesu vi.
+				næstu vi.
 				
 					um {0} vi.
 					um {0} vi.
@@ -1717,6 +1828,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				v.
+				seinastu v.
+				hesu v.
+				næstu v.
 				
 					um {0} v.
 					um {0} v.
@@ -2886,6 +3000,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Aqtobe
 			
+			
+				Kostanay
+			
 			
 				Qyzylorda
 			
@@ -4393,8 +4510,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			.
 			;
 			%
-			+
-			−
+			+
+			−
 			E
 			×
 			‰
@@ -4405,7 +4522,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
-					#,##0.###
+					#,##0.###
 				
 			
 			
@@ -4553,7 +4670,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Angola kwanza
 				Angola kwanza
-				Angola kwanza
+				Angola kwanzar
 				AOA
 				Kz
 			
@@ -4666,7 +4783,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Botsvana pula
 				Botsvana pula
-				Botsvana pula
+				Botsvana pular
 				BWP
 				P
 			
@@ -4806,7 +4923,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Eritrea nakfa
 				Eritrea nakfa
-				Eritrea nakfa
+				Eritrea nakfar
 				ERN
 			
 			
@@ -5132,7 +5249,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Móritania ouguiya
 				Móritania ouguiya
-				Móritania ouguiya
+				Móritania ouguiyar
 			
 			
 				Móritius rupi
@@ -5381,7 +5498,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Sao Tome & Prinsipi dobra
 				Sao Tome & Prinsipi dobra
-				Sao Tome & Prinsipi dobra
+				Sao Tome & Prinsipi dobrar
 				STN
 				Db
 			
@@ -5594,7 +5711,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			{0} ella meira
+			~{0}
+			{0}+
 			{0}–{1}
 		
 		
@@ -5713,6 +5831,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} partur fyri hvørja millión
 				{0} partar fyri hvørja millión
 			
+			
+				prosent
+				{0} prosent
+				{0} prosent
+			
+			
+				promillur
+				{0} promilla
+				{0} promillur
+			
+			
+				promyriad
+				{0} promyriad
+				{0} promyriad
+			
 			
 				litrar fyri hvønn kilometrar
 				{0} litur fyri hvønn kilometrar
@@ -5733,6 +5866,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} míl fyri hvønn bretska gallon
 				{0} míl fyri hvønn bretska gallon
 			
+			
+				petabýt
+				{0} petabýt
+				{0} petabýt
+			
 			
 				terabýt
 				{0} terabýt
@@ -5788,6 +5926,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} øld
 				{0} øldir
 			
+			
+				áratíggju
+				{0} áratíggju
+				{0} áratíggju
+			
 			
 				ár
 				{0} ár
@@ -5895,6 +6038,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kilowatttími
 				{0} kilowatttímar
 			
+			
+				elektronvolt
+				{0} elektronvolt
+				{0} elektronvolt
+			
+			
+				bretskar hitaeindir
+				{0} bretsk hitaeind
+				{0} bretskar hitaeindir
+			
+			
+				hitaeindir
+				{0} hitaeind
+				{0} hitaeindir
+			
+			
+				pund av kraft
+				{0} pund av kraft
+				{0} pund av kraft
+			
+			
+				newton
+				{0} newton
+				{0} newton
+			
 			
 				gigahertz
 				{0} gigahertz
@@ -5915,6 +6083,39 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hertz
 				{0} hertz
 			
+			
+				prent em
+			
+			
+				skíggjadeplar
+				{0} skíggjadeplar
+				{0} skíggjadeplar
+			
+			
+				megaskíggjadeplar
+				{0} megaskíggjadepil
+				{0} megaskíggjadeplar
+			
+			
+				skíggjadeplar fyri hvønn sentimetur
+				{0} skíggjadeplar fyri hvønn sentimetur
+				{0} skíggjadeplar fyri hvønn sentimetur
+			
+			
+				skíggjadeplar fyri hvønn tunna
+				{0} skíggjadepil fyri hvønn tunna
+				{0} skíggjadeplar fyri hvønn tunna
+			
+			
+				punkt fyri hvønn sentimetur
+				{0} punkt fyri hvønn sentimetur
+				{0} punkt fyri hvønn sentimetur
+			
+			
+				punkt fyri hvønn tumma
+				{0} punkt fyri hvønn tumma
+				{0} punkt fyri hvønn tumma
+			
 			
 				kilometrar
 				{0} kilometur
@@ -6010,11 +6211,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} punkt
 				{0} punkt
 			
+			
+				sólarradii
+				{0} sólarradius
+				{0} sólarradii
+			
 			
 				luks
 				{0} luks
 				{0} luks
 			
+			
+				sólarljósmegi
+				{0} sólarljósmegi
+				{0} sólarljósmegi
+			
 			
 				tons
 				{0} tons
@@ -6069,6 +6280,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} karat
 				{0} karat
 			
+			
+				dalton
+				{0} dalton
+				{0} dalton
+			
+			
+				jarðmassi
+				{0} jarðmassi
+				{0} jarðmassar
+			
+			
+				sólarmassi
+				{0} sólarmassi
+				{0} sólarmassar
+			
 			
 				gigawatt
 				{0} gigawatt
@@ -6099,11 +6325,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hestakraft
 				{0} hestakreftur
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				millimetrar av kviksilvur
 				{0} millimetur av kviksilvur
@@ -6124,6 +6345,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} millibar
 				{0} millibar
 			
+			
+				lufttrýst
+				{0} lufttrýst
+				{0} lufttrýst
+			
+			
+				pascal
+				{0} Pascal
+				{0} Pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
+			
+			
+				kilopascal
+				{0} kilopascal
+				{0} kilopascal
+			
+			
+				megapascal
+				{0} megapascal
+				{0} megapascal
+			
 			
 				kilometrar um tíman
 				{0} kilometur um tíman
@@ -6164,6 +6410,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Kelvin
 				{0} Kelvin
 			
+			
+				pund føtur
+				{0} pund fótur
+				{0} pund føtur
+			
+			
+				newtonmetur
+				{0} newtonmetur
+				{0} newtonmetrar
+			
 			
 				kubikkkilometrar
 				{0} kubikkkilometur
@@ -6279,6 +6535,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} flótandi unsa
 				{0} flótandi unsur
 			
+			
+				bretskar flótandi unsur
+				{0} bretsk flótandi unsa
+				{0} bretskar flótandi unsur
+			
 			
 				súpiskeiðir
 				{0} súpiskeið
@@ -6289,7 +6550,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} teskeið
 				{0} teskeiðir
 			
+			
+				tunnur
+				{0} tunna
+				{0} tunnur
+			
 			
+				ætt
 				{0} eystur
 				{0} norður
 				{0} suður
@@ -6405,6 +6672,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} partur/mill.
 				{0} partar/mill.
 			
+			
+				prosent
+				{0} %
+				{0} %
+			
+			
+				promillur
+				{0} ‰
+				{0} ‰
+			
+			
+				promyriad
+				{0} ‱
+				{0} ‱
+			
 			
 				l/km
 				{0} l/km
@@ -6480,6 +6762,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ø.
 				{0} ø.
 			
+			
+				áratí.
+				{0} áratí.
+				{0} áratí.
+			
 			
 				ár
 				{0} ár
@@ -6487,9 +6774,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/ár
 			
 			
-				mán.
-				{0} mán.
-				{0} mán.
+				mnð.
+				{0} mnð.
+				{0} mnð.
 				{0}/m.
 			
 			
@@ -6587,6 +6874,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kWh
 				{0} kWh
 			
+			
+				elektronvolt
+			
+			
+				bretskar hitaeindir
+			
+			
+				hitaeindir
+				{0} thm
+				{0} thm
+			
+			
+				newton
+			
 			
 				GHz
 				{0} GHz
@@ -6607,6 +6908,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Hz
 				{0} Hz
 			
+			
+				skíggjadeplar
+			
+			
+				megaskíggjadeplar
+			
 			
 				km
 				{0} km
@@ -6702,11 +7009,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pkt
 				{0} pkt
 			
+			
+				sólarradii
+			
 			
 				luks
 				{0} lx
 				{0} lx
 			
+			
+				sólarljósmegi
+			
 			
 				t
 				{0} t
@@ -6761,6 +7074,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} CD
 				{0} CD
 			
+			
+				dalton
+			
+			
+				jarðmassi
+			
+			
+				sólarmassi
+			
 			
 				gigawatt
 				{0} GW
@@ -6791,11 +7113,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hk
 				{0} hk
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -6816,6 +7133,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mb
 				{0} mb
 			
+			
+				lufttrýst
+				{0} lufttrýst
+				{0} lufttrýst
+			
+			
+				pascal
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/t
 				{0} km/t
@@ -6971,6 +7301,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} flótandi unsa
 				{0} flótandi unsur
 			
+			
+				bretskar flótandi unsur
+				{0} bretsk flótandi unsa
+				{0} bretskar flót. unsur
+			
 			
 				súpisk.
 				{0} súpisk.
@@ -6981,7 +7316,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} tesk.
 				{0} tesk.
 			
+			
+				tunna
+				{0} tunna
+				{0} tunnur
+			
 			
+				ætt
 				{0} E
 				{0} N
 				{0} S
@@ -7035,6 +7376,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ppm
 				{0} ppm
 			
+			
+				{0} %
+				{0} %
+			
 			
 				l/100km
 				{0}l/100km
@@ -7129,14 +7474,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}W
 				{0}W
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				km/t
 				{0}km/t
@@ -7165,6 +7510,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}l
 			
 			
+				ætt
 				{0}E
 				{0}N
 				{0}S
@@ -7324,4 +7670,74 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		Vesturasiatiskar skriftir
 		Hvíttglopp
 	
+	
+		skákskrift
+		sjónarstødd
+		skák
+		breidd
+		vekt
+		skák
+		yvirskrift
+		tekstur
+		heiti
+		sýn
+		uppslag
+		á skák aftureftir
+		beinur
+		á sk´ák
+		eyka á skák
+		ultratætt
+		ultrastappa
+		ultrasmalt
+		eykatætt
+		eykastappa
+		eykasmalt
+		tætt
+		stappa
+		stappa
+		hálvtætt
+		hálvstappa
+		hálvsmalt
+		normalt
+		hálvvíðka
+		hálvútrætt
+		hálvbreitt
+		víðka
+		útrætt
+		breitt
+		eykavíðka
+		eykaútrætt
+		eykabreitt
+		ultravíðka
+		ultraútrætt
+		ultrabreitt
+		tunt
+		eykalætt
+		ultralætt
+		lætt
+		hálvlætt
+		bók
+		vanligt
+		miðal
+		hálvfeitir
+		eitt sindur feitir
+		feitir
+		eykafeitir
+		svart
+		tungt
+		eykasvart
+		ultrasvart
+		ultratungt
+		loddrætt brot
+		spjaldrastavatenjing
+		sjálvbodnir samanstoyptir stavir
+		diagonalt brot
+		nútíðar tøl
+		gamaldags tøl
+		raðtøl
+		lutfalslig tøl
+		lítlir kapitelur
+		talvuskapa tøl
+		null við skrástriku
+	
 
diff --git a/make/data/cldr/common/main/fo_DK.xml b/make/data/cldr/common/main/fo_DK.xml
index 380a6f743a7..7abb55c5736 100644
--- a/make/data/cldr/common/main/fo_DK.xml
+++ b/make/data/cldr/common/main/fo_DK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fo_FO.xml b/make/data/cldr/common/main/fo_FO.xml
index 783197b1d4d..e7965f63798 100644
--- a/make/data/cldr/common/main/fo_FO.xml
+++ b/make/data/cldr/common/main/fo_FO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr.xml b/make/data/cldr/common/main/fr.xml
index 2971cc95005..a1b0b0b485c 100644
--- a/make/data/cldr/common/main/fr.xml
+++ b/make/data/cldr/common/main/fr.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -167,9 +167,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			anglais australien
 			anglais canadien
 			anglais britannique
-			anglais (R.-U.)
 			anglais américain
-			anglais (É.-U.)
 			moyen anglais
 			espéranto
 			espagnol
@@ -628,6 +626,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			yoruba
 			nheengatou
 			cantonais
+			chinois cantonais
 			zhuang
 			zapotèque
 			symboles Bliss
@@ -635,8 +634,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			zenaga
 			amazighe standard marocain
 			chinois
+			chinois mandarin
 			chinois simplifié
+			mandarin simplifié
 			chinois traditionnel
+			mandarin traditionnel
 			zoulou
 			zuñi
 			sans contenu linguistique
@@ -1252,22 +1254,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			calendrier
 			format de devise
-			Tri ne tenant pas compte des symboles
-			Tri inversé des caractères accentués
-			Classement basé sur les majuscules et les minuscules
-			Tri sensible à la casse
+			tri ne tenant pas compte des symboles
+			tri inversé des caractères accentués
+			classement basé sur les majuscules et les minuscules
+			tri sensible à la casse
 			ordre de tri
-			Tri normalisé
-			Tri numérique
-			Priorité du tri
+			tri normalisé
+			tri numérique
+			priorité du tri
 			devise
 			système horaire (12 ou 24 heures)
 			style de saut de ligne
 			système de mesure
 			nombres
-			Fuseau horaire
-			Variante locale
-			Usage privé
+			fuseau horaire
+			variante locale
+			usage privé
 		
 		
 			calendrier bouddhiste
@@ -1459,8 +1461,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a à â æ b c ç d e é è ê ë f g h i î ï j k l m n o ô œ p q r s t u ù û ü v w x y ÿ z]
 		[á å ä ã ā ć ē í ì ī ij ñ ó ò ö õ ø ř š ſ ß ú ǔ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[  \- , . % ‰ + − 0 1 2 ² 3 ³ 4 5 6 7 8 9 ᵈ ᵉ ʳ ˢ]
-		[\- ‐ – — , ; \: ! ? . … ’ " “ ” « » ( ) \[ \] § @ * / \& # † ‡]
+		[  \- ‑ , . % ‰ + − 0 1 2 ² 3 ³ 4 5 6 7 8 9 ᵈ ᵉ ʳ ˢ]
+		[\- ‐ ‑ – — , ; \: ! ? . … ’ " “ ” « » ( ) \[ \] § @ * / \& # † ‡]
 		{0}…
 		… {0}
 		{0}… {1}
@@ -1548,11 +1550,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -1806,12 +1806,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							h B – h B
-							h–h B
 						
 						
 							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
 						
 					
 				
@@ -1834,6 +1831,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mis.
 							al-n.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tout
 							bâbâ
@@ -1866,6 +1878,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mis.
 							al-n.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tout
 							bâbâ
@@ -1900,11 +1927,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -2130,14 +2155,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 				
 					
-						
-							h B – h B
-							h–h B
-						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
-							h:mm–h:mm B
 						
 					
 				
@@ -2160,6 +2179,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							näh.
 							pag.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							mäskäräm
 							teqemt
@@ -2192,6 +2226,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							näh.
 							pag.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							mäskäräm
 							teqemt
@@ -2226,11 +2275,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -2787,6 +2834,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -3024,6 +3093,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							av
 							él.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tichri
 							hèchvan
@@ -3058,6 +3143,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							av
 							él.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							tichri
 							hèchvan
@@ -3109,11 +3210,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -3137,6 +3236,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							māgh
 							phāl.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							chaitra
 							vaishākh
@@ -3167,6 +3280,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							māgh
 							phāl.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							chaitra
 							vaishākh
@@ -3187,15 +3314,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						ère Saka
 					
+					
+						Saka
+					
+					
+						Saka
+					
 				
 				
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -3356,11 +3487,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -4156,11 +4285,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -4184,6 +4311,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							bah.
 							esf.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							farvardin
 							ordibehešt
@@ -4214,6 +4355,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							bah.
 							esf.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							farvardin
 							ordibehešt
@@ -4241,11 +4396,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -4270,11 +4423,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							h B – h B
 							h–h B
 						
 						
-							h:mm B – h:mm B
 							h:mm–h:mm B
 							h:mm–h:mm B
 						
@@ -4308,9 +4459,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				an
-				l’année dernière
-				cette année
-				l’année prochaine
+				l’année dernière
+				cette année
+				l’année prochaine
 				
 					dans {0} a
 					dans {0} a
@@ -4322,9 +4473,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				a
-				l’année dernière
-				cette année
-				l’année prochaine
+				l’année dernière
+				cette année
+				l’année prochaine
 				
 					+{0} a
 					+{0} a
@@ -4392,9 +4543,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				m.
-				le mois dernier
-				ce mois-ci
-				le mois prochain
+				le mois dernier
+				ce mois-ci
+				le mois prochain
 				
 					dans {0} m.
 					dans {0} m.
@@ -4406,9 +4557,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				m.
-				le mois dernier
-				ce mois-ci
-				le mois prochain
+				le mois dernier
+				ce mois-ci
+				le mois prochain
 				
 					+{0} m.
 					+{0} m.
@@ -4435,9 +4586,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
-				la semaine dernière
-				cette semaine
-				la semaine prochaine
+				la semaine dernière
+				cette semaine
+				la semaine prochaine
 				
 					dans {0} sem.
 					dans {0} sem.
@@ -4450,9 +4601,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
-				la semaine dernière
-				cette semaine
-				la semaine prochaine
+				la semaine dernière
+				cette semaine
+				la semaine prochaine
 				
 					+{0} sem.
 					+{0} sem.
@@ -5639,7 +5790,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktioubinsk
 			
 			
-				Kostanaï
+				Kostanaï
 			
 			
 				Kzyl Orda
@@ -7399,6 +7550,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -7476,6 +7629,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 millier
@@ -7610,6 +7768,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afghani afghan
 				afghani afghan
 				afghanis afghan
+				AFN
 			
 			
 				lek albanais (1947–1961)
@@ -7745,12 +7904,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dollar barbadien
 				dollar barbadien
 				dollars barbadiens
+				BBD
 				$
 			
 			
 				taka bangladeshi
 				taka bangladeshi
 				takas bangladeshis
+				BDT
 				৳
 			
 			
@@ -7799,6 +7960,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar bahreïni
 				dinar bahreïni
 				dinars bahreïnis
+				BHD
 			
 			
 				franc burundais
@@ -7931,6 +8093,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rouble biélorusse (2000–2016)
 				rouble biélorusse (2000–2016)
 				roubles biélorusses (2000–2016)
+				BYR
 			
 			
 				dollar bélizéen
@@ -7962,6 +8125,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franc suisse
 				franc suisse
 				francs suisses
+				CHF
 			
 			
 				franc WIR
@@ -8050,12 +8214,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso cubain
 				peso cubain
 				pesos cubains
+				CUP
 				$
 			
 			
 				escudo capverdien
 				escudo capverdien
 				escudos capverdiens
+				CVE
 			
 			
 				livre chypriote
@@ -8092,6 +8258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				couronne danoise
 				couronne danoise
 				couronnes danoises
+				DKK
 				kr
 			
 			
@@ -8105,6 +8272,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar algérien
 				dinar algérien
 				dinars algériens
+				DZD
 			
 			
 				sucre équatorien
@@ -8128,6 +8296,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				livre égyptienne
 				livre égyptienne
 				livres égyptiennes
+				EGP
 				£E
 			
 			
@@ -8165,6 +8334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				euro
 				euro
 				euros
+				€
 				€
 			
 			
@@ -8224,6 +8394,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cédi ghanéen
 				cédi ghanéen
 				cédis ghanéens
+				GHS
 			
 			
 				livre de Gibraltar
@@ -8236,11 +8407,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dalasi gambien
 				dalasi gambien
 				dalasis gambiens
+				GMD
 			
 			
 				franc guinéen
 				franc guinéen
 				francs guinéens
+				GNF
 				FG
 			
 			
@@ -8331,6 +8504,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				roupie indonésienne
 				roupie indonésienne
 				roupies indonésiennes
+				IDR
 				Rp
 			
 			
@@ -8355,12 +8529,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nouveau shekel israélien
 				nouveau shekel israélien
 				nouveaux shekels israéliens
+				₪
 				₪
 			
 			
 				roupie indienne
 				roupie indienne
 				roupies indiennes
+				₹
 				₹
 			
 			
@@ -8385,6 +8561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				couronne islandaise
 				couronne islandaise
 				couronnes islandaises
+				ISK
 				kr
 			
 			
@@ -8443,6 +8620,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				won nord-coréen
 				won nord-coréen
 				wons nord-coréens
+				KPW
 				₩
 			
 			
@@ -8461,6 +8639,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				won sud-coréen
 				won sud-coréen
 				wons sud-coréens
+				₩
 				₩
 			
 			
@@ -8501,12 +8680,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				roupie srilankaise
 				roupie srilankaise
 				roupies srilankaises
+				LKR
 				Rs
 			
 			
 				dollar libérien
 				dollar libérien
 				dollars libériens
+				LRD
 				$
 			
 			
@@ -8519,6 +8700,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litas lituanien
 				litas lituanien
 				litas lituaniens
+				LTL
 				Lt
 			
 			
@@ -8549,6 +8731,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lats letton
 				lats letton
 				lats lettons
+				LVL
 				Ls
 			
 			
@@ -8561,11 +8744,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar libyen
 				dinar libyen
 				dinars libyens
+				LYD
 			
 			
 				dirham marocain
 				dirham marocain
 				dirhams marocains
+				MAD
 			
 			
 				franc marocain
@@ -8626,23 +8811,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kyat myanmarais
 				kyat myanmarais
 				kyats myanmarais
+				MMK
 				K
 			
 			
 				tugrik mongol
 				tugrik mongol
 				tugriks mongols
+				MNT
 				₮
 			
 			
 				pataca macanaise
 				pataca macanaise
 				patacas macanaises
+				MOP
 			
 			
 				ouguiya mauritanien (1973–2017)
 				ouguiya mauritanien (1973–2017)
 				ouguiyas mauritaniens (1973–2017)
+				MRO
 			
 			
 				ouguiya mauritanien
@@ -8679,6 +8868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rufiyaa maldivien
 				rufiyaa maldivienne
 				rufiyaas maldiviennes
+				MVR
 			
 			
 				kwacha malawite
@@ -8709,6 +8899,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ringgit malais
 				ringgit malais
 				ringgits malais
+				MYR
 				RM
 			
 			
@@ -8740,6 +8931,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				naira nigérian
 				naira nigérian
 				nairas nigérians
+				NGN
 				₦
 			
 			
@@ -8765,12 +8957,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				couronne norvégienne
 				couronne norvégienne
 				couronnes norvégiennes
+				NOK
 				kr
 			
 			
 				roupie népalaise
 				roupie népalaise
 				roupies népalaises
+				NPR
 				Rs
 			
 			
@@ -8802,6 +8996,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sol péruvien
 				sol péruvien
 				sols péruviens
+				PEN
 			
 			
 				sol péruvien (1863–1985)
@@ -8813,6 +9008,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kina papouan-néo-guinéen
 				kina papouan-néo-guinéen
 				kinas papouan-néo-guinéens
+				PGK
 			
 			
 				peso philippin
@@ -8825,6 +9021,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				roupie pakistanaise
 				roupie pakistanaise
 				roupies pakistanaises
+				PKR
 				Rs
 			
 			
@@ -8934,6 +9131,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				livre soudanaise
 				livre soudanaise
 				livres soudanaises
+				SDG
 			
 			
 				livre soudanaise (1956–2007)
@@ -8945,6 +9143,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				couronne suédoise
 				couronne suédoise
 				couronnes suédoises
+				SEK
 				kr
 			
 			
@@ -8958,6 +9157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				livre de Sainte-Hélène
 				livre de Sainte-Hélène
 				livres de Sainte-Hélène
+				SHP
 				£
 			
 			
@@ -8976,6 +9176,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leone sierra-léonais
 				leone sierra-léonais
 				leones sierra-léonais
+				SLL
 			
 			
 				shilling somalien
@@ -9000,12 +9201,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				livre sud-soudanaise
 				livre sud-soudanaise
 				livres sud-soudanaises
+				SSP
 				£
 			
 			
 				dobra santoméen (1977–2017)
 				dobra santoméen (1977–2017)
 				dobras santoméens (1977–2017)
+				STD
 			
 			
 				dobra santoméen
@@ -9043,6 +9246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				baht thaïlandais
 				baht thaïlandais
 				bahts thaïlandais
+				THB
 				฿
 			
 			
@@ -9055,6 +9259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somoni tadjik
 				somoni tadjik
 				somonis tadjiks
+				TJS
 			
 			
 				manat turkmène
@@ -9072,13 +9277,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar tunisien
 				dinar tunisien
 				dinars tunisiens
+				TND
 			
 			
 				pa’anga tongan
 				pa’anga tongan
 				pa’angas tongans
 				TOP
-				T$
+				$T
 			
 			
 				escudo timorais
@@ -9218,6 +9424,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dông vietnamien
 				dông vietnamien
 				dôngs vietnamiens
+				₫
 				₫
 			
 			
@@ -9236,12 +9443,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tala samoan
 				tala samoan
 				talas samoans
-				WS$
+				$WS
 			
 			
 				franc CFA (BEAC)
 				franc CFA (BEAC)
 				francs CFA (BEAC)
+				FCFA
 			
 			
 				argent
@@ -9314,6 +9522,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franc CFA (BCEAO)
 				franc CFA (BCEAO)
 				francs CFA (BCEAO)
+				CFA
 			
 			
 				palladium
@@ -9684,6 +9893,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} siècle
 				{0} siècles
 			
+			
+				décennies
+				{0} décennie
+				{0} décennies
+			
 			
 				ans
 				{0} an
@@ -9792,14 +10006,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowattheures
 			
 			
-				électronvolts
-				{0} électronvolt
-				{0} électronvolts
+				électronvolts
+				{0} électronvolt
+				{0} électronvolts
 			
 			
-				British Thermal Units
-				{0} British Thermal Unit
-				{0} British Thermal Units
+				British Thermal Units
+				{0} British Thermal Unit
+				{0} British Thermal Units
+			
+			
+				therms US
+				{0} therm US
+				{0} therms US
 			
 			
 				livres-force
@@ -9831,6 +10050,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				cadratin
+				{0} cadratin
+				{0} cadratins
+			
+			
+				pixels
+				{0} pixel
+				{0} pixels
+			
+			
+				mégapixels
+				{0} mégapixel
+				{0} mégapixels
+			
+			
+				pixels par centimètre
+				{0} pixel par centimètre
+				{0} pixels par centimètre
+			
+			
+				pixels par pouce
+				{0} pixel par pouce
+				{0} pixels par pouce
+			
+			
+				points par centimètre
+				{0} point par centimètre
+				{0} points par centimètre
+			
+			
+				points par pouce
+				{0} point par pouce
+				{0} points par pouce
+			
 			
 				kilomètres
 				{0} kilomètre
@@ -9937,9 +10191,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} points
 			
 			
-				rayons solaires
-				{0} rayon solaire
-				{0} rayons solaires
+				rayons solaires
+				{0} rayon solaire
+				{0} rayons solaires
 			
 			
 				lux
@@ -10012,18 +10266,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				daltons
-				{0} dalton
-				{0} daltons
+				{0} dalton
+				{0} daltons
 			
 			
-				masses terrestres
-				{0} masse terrestre
-				{0} masses terrestres
+				masses terrestres
+				{0} masse terrestre
+				{0} masses terrestres
 			
 			
-				masses solaires
-				{0} masse solaire
-				{0} masses solaires
+				masses solaires
+				{0} masse solaire
+				{0} masses solaires
 			
 			
 				gigawatts
@@ -10055,11 +10309,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cheval-vapeur
 				{0} chevaux-vapeur
 			
-			
-				hectopascals
-				{0} hectopascal
-				{0} hectopascals
-			
 			
 				millimètres de mercure
 				{0} millimètre de mercure
@@ -10075,6 +10324,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pouce de mercure
 				{0} pouces de mercure
 			
+			
+				bars
+				{0} bar
+				{0} bars
+			
 			
 				millibars
 				{0} millibar
@@ -10085,6 +10339,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosphère
 				{0} atmosphères
 			
+			
+				pascals
+				{0} pascal
+				{0} pascals
+			
+			
+				hectopascals
+				{0} hectopascal
+				{0} hectopascals
+			
 			
 				kilopascals
 				{0} kilopascal
@@ -10266,9 +10530,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} onces liquides
 			
 			
-				onces liquides impériales
-				{0} once liquide impériale
-				{0} onces liquides impériales
+				onces liquides impériales
+				{0} once liquide impériale
+				{0} onces liquides impériales
 			
 			
 				cuillères à soupe
@@ -10281,11 +10545,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cuillères à café
 			
 			
-				barils
-				{0} baril
-				{0} barils
+				barils
+				{0} baril
+				{0} barils
 			
 			
+				direction
 				{0} est
 				{0} nord
 				{0} sud
@@ -10296,6 +10561,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				force g
 				{0} force g
@@ -10417,12 +10685,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				‱
 				{0} ‱
 				{0} ‱
 			
 			
-				mol
 				{0} mol
 				{0} mol
 			
@@ -10506,6 +10772,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} siècle
 				{0} siècles
 			
+			
+				décennies
+				{0} décennie
+				{0} décennies
+			
 			
 				ans
 				{0} an
@@ -10614,22 +10885,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				eV
-				{0} eV
-				{0} eV
+				{0} eV
+				{0} eV
 			
 			
 				BTU
-				{0} Btu
-				{0} Btu
+				{0} Btu
+				{0} Btu
+			
+			
+				therm US
+				{0} therm US
+				{0} therms US
 			
 			
-				lbf
 				{0} lbf
 				{0} lbf
 			
 			
-				N
 				{0} N
 				{0} N
 			
@@ -10653,6 +10926,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				px/cm
+				{0} px/cm
+				{0} px/cm
+			
+			
+				px/po
+				{0} px/po
+				{0} px/po
+			
+			
+				pt/cm
+				{0} pt/cm
+				{0} pt/cm
+			
+			
+				pt/po
+				{0} pt/po
+				{0} pt/po
+			
 			
 				km
 				{0} km
@@ -10733,7 +11041,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ua
 				{0} ua
 			
+			
+				fur
+				{0} fur
+				{0} fur
+			
 			
+				fm
 				{0} fth
 				{0} fth
 			
@@ -10753,9 +11067,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
+				R☉
+				{0} R☉
+				{0} R☉
 			
 			
 				lx
@@ -10799,6 +11113,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sh tn
 				{0} sh tn
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				lb
 				{0} lb
@@ -10822,19 +11141,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ct
 			
 			
-				Da
-				{0} Da
-				{0} Da
+				{0} Da
+				{0} Da
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				M⊕
+				{0} M⊕
+				{0} M⊕
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
+				M☉
+				{0} M☉
+				{0} M☉
 			
 			
 				GW
@@ -10866,11 +11184,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ch
 				{0} ch
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -10886,6 +11199,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				{0} bar
+				{0} bars
+			
 			
 				mbar
 				{0} mbar
@@ -10896,13 +11213,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
-				kPa
 				{0} kPa
 				{0} kPa
 			
 			
-				MPa
 				{0} MPa
 				{0} MPa
 			
@@ -10952,7 +11276,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lbf⋅ft
 			
 			
-				N⋅m
 				{0} N⋅m
 				{0} N⋅m
 			
@@ -11077,9 +11400,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				fl oz imp.
-				{0} fl oz imp.
-				{0} fl oz imp.
+				fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
 			
 			
 				c. à s.
@@ -11092,9 +11415,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} c. à c.
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
+				{0} bbl
+				{0} bbl
 			
 			
 				direction
@@ -11108,11 +11430,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}{1}
+			
 			
 				G
 				{0}G
 				{0}G
 			
+			
+				m/s²
+			
 			
 				tr
 				{0}tr
@@ -11215,6 +11543,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				%
+				{0} %
+				{0} %
 			
 			
 				‰
@@ -11339,22 +11669,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				h
 				{0}h
 				{0}h
+				{0}/h
 			
 			
 				min
 				{0}min
 				{0}min
+				{0}/min
 			
 			
 				s
 				{0}s
 				{0}s
+				{0}/s
 			
 			
 				ms
 				{0}ms
 				{0}ms
 			
+			
+				μs
+			
+			
+				ns
+			
 			
 				A
 				{0}A
@@ -11449,31 +11788,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				km
 				{0}km
 				{0}km
+				{0}/km
 			
 			
 				m
 				{0}m
 				{0}m
+				{0}/m
+			
+			
+				dm
 			
 			
 				cm
 				{0}cm
 				{0}cm
+				{0}/cm
 			
 			
 				mm
 				{0}mm
 				{0}mm
 			
+			
+				µm
+			
+			
+				nm
+			
 			
+				pm
 				{0}pm
 				{0}pm
 			
 			
+				mi
 				{0}mi
 				{0}mi
 			
 			
+				yd
 				{0}yd
 				{0}yd
 			
@@ -11489,6 +11843,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}/po
 			
+			
+				pc
+			
 			
 				al
 				{0}a.l.
@@ -11499,10 +11856,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ua
 				{0}ua
 			
+			
+				fur
+				{0} fur
+				{0} fur
+			
 			
+				fm
 				{0} fth
 				{0} fth
 			
+			
+				nmi
+			
+			
+				smi
+			
 			
 				R☉
 				{0}R☉
@@ -11518,28 +11887,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}L☉
 				{0}L☉
 			
+			
+				t
+			
 			
 				kg
 				{0}kg
 				{0}kg
+				{0}/kg
 			
 			
 				g
 				{0}g
 				{0}g
+				{0}/g
+			
+			
+				mg
+			
+			
+				µg
 			
 			
 				sh tn
 				{0} sh tn
 				{0} sh tn
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
+				lb
 				{0}lb
 				{0}lb
+				{0}/lb
 			
 			
+				oz
 				{0}oz
 				{0}oz
+				{0}/oz
 			
 			
 				oz t
@@ -11596,10 +11985,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ch
 				{0}ch
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -11616,6 +12001,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″ Hg
 			
 			
+				mbar
 				{0}mbar
 				{0}mbar
 			
@@ -11624,6 +12010,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}atm
 				{0}atm
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				kPa
 				{0}kPa
@@ -11640,10 +12031,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}km/h
 			
 			
+				m/s
 				{0}m/s
 				{0}m/s
 			
 			
+				mi/h
 				{0}mi/h
 				{0}mi/h
 			
@@ -11652,11 +12045,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nd
 				{0} nd
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0}°C
 				{0}°C
 			
+			
+				°F
+			
+			
+				K
+			
 			
 				lbf⋅ft
 				{0}lbf⋅ft
diff --git a/make/data/cldr/common/main/fr_BE.xml b/make/data/cldr/common/main/fr_BE.xml
index 89c55eb741b..d2e651d351a 100644
--- a/make/data/cldr/common/main/fr_BE.xml
+++ b/make/data/cldr/common/main/fr_BE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_BF.xml b/make/data/cldr/common/main/fr_BF.xml
index a61a6ec0816..faa1341f412 100644
--- a/make/data/cldr/common/main/fr_BF.xml
+++ b/make/data/cldr/common/main/fr_BF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_BI.xml b/make/data/cldr/common/main/fr_BI.xml
index 9faa2caac8e..672316a34a0 100644
--- a/make/data/cldr/common/main/fr_BI.xml
+++ b/make/data/cldr/common/main/fr_BI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_BJ.xml b/make/data/cldr/common/main/fr_BJ.xml
index 4ad97f31b82..a3abd2005ef 100644
--- a/make/data/cldr/common/main/fr_BJ.xml
+++ b/make/data/cldr/common/main/fr_BJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_BL.xml b/make/data/cldr/common/main/fr_BL.xml
index be9b5fe4796..5bd7abb790d 100644
--- a/make/data/cldr/common/main/fr_BL.xml
+++ b/make/data/cldr/common/main/fr_BL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_CA.xml b/make/data/cldr/common/main/fr_CA.xml
index 5b6c91ebede..df9f179a868 100644
--- a/make/data/cldr/common/main/fr_CA.xml
+++ b/make/data/cldr/common/main/fr_CA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -18,6 +18,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			adygué
 			vieil anglais
+			arabe standard moderne
 			assou
 			azerbaïdjanais
 			ghomala
@@ -29,13 +30,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			chinook
 			kurde central
 			cri
+			allemand autrichien
+			allemand suisse
 			slave
 			tlicho
+			anglais australien
+			anglais canadien
+			anglais britannique
+			anglais américain
 			yupik central
 			ewondo
+			français canadien
+			français suisse
 			cajun
-			franco-provençal
-			dari
+			franco-provençal
+			dari
 			vieux haut-allemand
 			gujarati
 			yi de Sichuan
@@ -47,16 +56,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			kölsch
 			live
 			luba-katanga
-			luo
 			chinois classique
 			makhuwa-meetto
 			meta’
 			marathe
 			marwari
 			mentawai
-			bas allemand
 			bas saxon
 			ao naga
+			flamand
 			kwasio
 			newari classique
 			nkole
@@ -66,20 +74,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			vieux perse
 			palatin
 			ancien occitan
+			portugais brésilien
+			portugais européen
 			k’iche’
 			rarotonga
+			moldave
 			sangu
 			kurde méridional
 			seri
 			vieil irlandais
 			selayar
 			sami d’Inari
-			frison de Saterland
-			sosso
+			frison de Saterland
+			sosso
 			swahili congolais
 			turoyo
 			tamazight
 			ouïghour
+			chinois, cantonais
+			chinois, mandarin
+			chinois simplifié
+			chinois, mandarin simplifié
+			chinois traditionnel
+			chinois, mandarin traditionnel
 		
 		
 			
@@ -153,7 +170,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		[á å ä ã ā ē í ì ī ñ ó ò ö ø ú ǔ]
+		[á å ä ã ā ē í ì ī ñ ó ò ö ø ú ǔ]
 	
 	
 		”
@@ -180,7 +197,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							N
 						
 						
+							tout
+							bâbâ
+							hâtour
 							kyakh
+							toubah
+							amshîr
+							barmahât
+							barmoudah
+							bashans
+							ba’ounah
+							abîb
+							misra
+							al-nasi
 						
 					
 					
@@ -200,7 +229,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							N
 						
 						
+							tout
+							bâbâ
+							hâtour
 							kyakh
+							toubah
+							amshîr
+							barmahât
+							barmoudah
+							bashans
+							ba’ounah
+							abîb
+							misra
+							al-nasi
 						
 					
 				
@@ -245,6 +286,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
+					
+						
+							EEEE d MMMM y G
+						
+					
+					
+						
+							d MMMM y G
+						
+					
+					
+						
+							d MMM y G
+						
+					
 					
 						
 							yy-MM-dd GGGGG
@@ -252,6 +308,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'à' {0}
+						
+					
+					
+						
+							{1} 'à' {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						h 'h' B
 						h 'h' mm B
@@ -280,16 +356,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							h 'h' B – h 'h' B
-							h – h 'h' B
+							h 'h' B – h 'h' B
+							h – h 'h' B
 						
 						
-							h 'h' mm B – h 'h' mm B
-							h 'h' mm – h 'h' mm B
-							h 'h' mm – h 'h' mm B
+							h 'h' mm B – h 'h' mm B
+							h 'h' mm – h 'h' mm B
+							h 'h' mm – h 'h' mm B
 						
 						
-							y G – y G
+							y G – y G
 						
 						
 							y-MM GGGGG – y-MM GGGGG
@@ -297,21 +373,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							y-MM – y-MM GGGGG
 						
 						
-							y-MM-dd – y-MM-dd GGGGG
-							y-MM-dd GGGGG – y-MM-dd GGGGG
-							y-MM-dd – y-MM-dd GGGGG
-							y-MM-dd – y-MM-dd GGGGG
+							y-MM-dd – y-MM-dd GGGGG
+							y-MM-dd GGGGG – y-MM-dd GGGGG
+							y-MM-dd – y-MM-dd GGGGG
+							y-MM-dd – y-MM-dd GGGGG
 						
 						
 							E y-MM-dd – E y-MM-dd GGGGG
 							E y-MM-dd GGGGG – E y-MM-dd GGGGG
 							E y-MM-dd GGGGG – E y-MM-dd GGGGG
-							E y-MM-dd – E y-MM-dd GGGGG
+							E y-MM-dd – E y-MM-dd GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM y – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM y – MMM y G
+							MMM y – MMM y G
 						
 						
 							d MMM y G – d MMM y G
@@ -424,10 +500,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							du mat.
 						
 						
+							minuit
 							a
 							midi
 							p
+							mat.
 							après-midi
+							soir
 							mat.
 						
 						
@@ -441,10 +520,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							p.m.
 							mat.
 							après-midi
+							soir
+							nuit
 						
 						
 							a.m.
 							p.m.
+							mat.
 							après-midi
 							soir
 							mat.
@@ -462,9 +544,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							EEEE d MMMM y
+						
+					
+					
+						
+							d MMMM y
+						
+					
+					
+						
+							d MMM y
+						
+					
 					
 						
-							yy-MM-dd
+							y-MM-dd
 						
 					
 				
@@ -491,11 +588,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							{1} 'à' {0}
+						
+					
+					
+						
+							{1} 'à' {0}
+						
+					
 					
 						
 							{1} {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
 					
 						h 'h' B
 						h 'h' mm B
@@ -533,7 +645,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							h 'h' mm B – h 'h' mm B
 							h 'h' mm – h 'h' mm B
-							h 'h' mm – h 'h' mm B
+							h 'h' mm – h 'h' mm B
 						
 						
 							d – d
@@ -542,9 +654,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							y G – y G
 						
 						
-							y-MM GGGGG – y-MM GGGGG
-							y-MM – y-MM GGGGG
-							y-MM – y-MM GGGGG
+							y-MM GGGGG – y-MM GGGGG
+							y-MM – y-MM GGGGG
+							y-MM – y-MM GGGGG
 						
 						
 							y-MM-dd – y-MM-dd GGGGG
@@ -561,15 +673,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							MMM y G – MMM y G
 							MMM y – MMM y G
-							MMM y – MMM y G
+							MMM y – MMM y G
 						
 						
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
 						
 						
-							E d MMM – E d MMM y G
+							E d MMM – E d MMM y G
 							E d MMM y G – E d MMM y G
 							E d MMM – E d MMM y G
 							E d MMM y – E d MMM y G
@@ -652,8 +764,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							tis.
 							hes.
+							kis.
 							téb.
 							sché.
+							ad.I
+							adar
+							ad.II
+							nis.
+							iyar
+							siv.
+							tam.
+							av
 							ell.
 						
 						
@@ -677,8 +798,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							tis.
 							hes.
+							kis.
 							téb.
 							sché.
+							ad.I
+							adar
+							ad.II
+							nis.
+							iyar
+							siv.
+							tam.
+							av
 							ell.
 						
 						
@@ -744,12 +874,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 						Saka
 					
-					
-						Saka
-					
-					
-						Saka
-					
 				
 			
 			
@@ -762,6 +886,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 				
+					
+						
+							EEEE d MMMM y G
+						
+					
+					
+						
+							d MMMM y G
+						
+					
+					
+						
+							d MMM y G
+						
+					
 					
 						
 							y-MM-dd GGGGG
@@ -852,16 +991,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				
-					Dans {0} an
-					Dans {0} ans
-				
-				
-					Il y a {0} an
-					Il y a {0} ans
-				
-			
 			
 				a
 			
@@ -872,10 +1001,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				trim. dernier
+				ce trim.
 				trim. prochain
 			
 			
 				trim. dernier
+				ce trim.
 				trim.prochain
 			
 			
@@ -887,18 +1018,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				sem. (mois)
 			
-			
-				avant-hier
-				hier
-				aujourd’hui
-				demain
-				après-demain
-			
-			
-				
-					dans {0} j
-				
-			
 			
 				jour de l’année
 			
@@ -1020,9 +1139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				île de Pâques
 			
-			
-				îles Canaries
-			
 			
 				îles Féroé
 			
@@ -1709,38 +1825,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		
 			 
-			+
-			-
 		
 		
-			
-				
-					#,##0.###
-				
-			
 			
 				
 					0 mille
 					0 mille
+					00 mille
 					00 mille
+					000 mille
 					000 mille
-					0 million
-					0 millions
-					00 million
-					00 millions
-					000 millions
 				
 			
 			
 				
-					0 k
-					0 k
-					00 k
-					000 k
-					0 M
-					0 M
-					00 M
-					000 M
 					0 G
 					0 G
 					00 G
@@ -1787,9 +1885,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				AFN
-			
 			
 				ARS
 			
@@ -1801,15 +1896,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				manat azerbaïdjanais
 				manats azerbaïdjanais
 			
-			
-				BBD
-			
-			
-				BDT
-			
-			
-				BHD
-			
 			
 				BMD
 			
@@ -1819,18 +1905,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Br
 			
-			
-				BYR
-			
 			
 				BZD
 			
 			
 				$
 			
-			
-				CHF
-			
 			
 				CLP
 			
@@ -1840,26 +1920,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				COP
 			
-			
-				CUP
-			
 			
 				escudo cap-verdien
 				escudo cap-verdien
 				escudos cap-verdiens
-				CVE
-			
-			
-				DKK
-			
-			
-				DZD
-			
-			
-				EGP
-			
-			
-				€
 			
 			
 				FJD
@@ -1874,21 +1938,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				£
 			
 			
-				lari géorgien
 				GEL
 			
-			
-				GHS
-			
 			
 				GIP
 			
-			
-				GMD
-			
-			
-				GNF
-			
 			
 				dollar guyanien
 				dollars guyaniens
@@ -1896,9 +1950,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				$ HK
 			
-			
-				IDR
-			
 			
 				ILS
 			
@@ -1910,18 +1961,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial iranien
 				rials iraniens
 			
-			
-				ISK
-			
 			
 				¥
 			
 			
 				CF
 			
-			
-				KPW
-			
 			
 				KRW
 			
@@ -1933,60 +1978,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				LBP
 			
-			
-				LKR
-			
-			
-				LRD
-			
-			
-				LTL
-			
-			
-				LVL
-			
-			
-				LYD
-			
-			
-				MAD
-			
-			
-				MMK
-			
-			
-				MNT
-			
-			
-				MOP
-			
-			
-				MRO
-			
-			
-				MVR
-			
 			
 				MXN
 			
-			
-				MYR
-			
 			
 				NAD
 			
-			
-				NGN
-			
 			
 				C$
 			
-			
-				NOK
-			
-			
-				NPR
-			
 			
 				$ NZ
 			
@@ -1999,16 +1999,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				nouveau sol péruvien
 				nouveau sol péruvien
 				nouveaux sols péruviens
-				PEN
 			
 			
 				kina papou-néo-guinéen
 				kina papou-néo-guinéen
 				kinas papou-néo-guinéens
-				PGK
-			
-			
-				PKR
 			
 			
 				riyal du Qatar
@@ -2023,42 +2018,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				SBD
 			
-			
-				SDG
-			
-			
-				SEK
-			
 			
 				$ SG
 			
-			
-				SHP
-			
-			
-				SLL
-			
 			
 				dollar du Suriname
 				dollar du Suriname
 				dollars du Suriname
 				SRD
 			
-			
-				SSP
-			
-			
-				STD
-			
-			
-				THB
-			
-			
-				TJS
-			
-			
-				TND
-			
 			
 				pa’anga
 				pa’anga
@@ -2119,8 +2087,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				force G
-				{0} fois la gravitation terrestre
-				{0} fois la gravitation terrestre
 			
 			
 				{0} mètre par seconde carrée
@@ -2161,7 +2127,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0} mille carré
 				{0} milles carrés
-				{0} par mille carré
+				{0} par mille carré
 			
 			
 				acres
@@ -2186,9 +2152,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} partie par million
 				{0} parties par million
 			
-			
-				{0} pour cent
-			
 			
 				{0} pour mille
 				{0} pour mille
@@ -2253,37 +2216,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ans
 			
 			
-				{0} mois
-				{0} mois
+				{0} mois
+				{0} mois
 			
 			
-				{0} semaine
-				{0} semaines
+				{0} semaine
+				{0} semaines
 			
 			
-				{0} jour
-				{0} jours
+				{0} jour
+				{0} jours
 			
 			
-				{0} heure
-				{0} heures
+				{0} heure
+				{0} heures
 			
 			
-				{0} seconde
-				{0} secondes
-				{0} à la seconde
+				{0} seconde
+				{0} secondes
+				{0} à la seconde
 			
 			
-				{0} milliseconde
-				{0} millisecondes
+				{0} milliseconde
+				{0} millisecondes
 			
 			
-				{0} microseconde
-				{0} microsecondes
+				{0} microseconde
+				{0} microsecondes
 			
 			
-				{0} nanoseconde
-				{0} nanosecondes
+				{0} nanoseconde
+				{0} nanosecondes
 			
 			
 				{0} ampère
@@ -2326,9 +2289,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kilowattheures
 			
 			
-				Unités thermiques britanniques
-				{0} unité thermique britannique
-				{0} unités thermiques britanniques
+				Unités thermiques britanniques
+				{0} unité thermique britannique
+				{0} unités thermiques britanniques
+			
+			
+				therms américains
+				{0} therm américain
+				{0} therms américains
 			
 			
 				{0} gigahertz
@@ -2347,36 +2315,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hertz
 			
 			
-				{0} kilomètre
-				{0} kilomètres
+				{0} kilomètre
+				{0} kilomètres
 			
 			
-				{0} mètre
-				{0} mètres
+				{0} mètre
+				{0} mètres
 			
 			
-				{0} décimètre
-				{0} décimètres
+				{0} décimètre
+				{0} décimètres
 			
 			
-				{0} centimètre
-				{0} centimètres
+				{0} centimètre
+				{0} centimètres
 			
 			
 				{0} millimètre
 				{0} millimètres
 			
 			
-				{0} micromètre
-				{0} micromètres
+				{0} micromètre
+				{0} micromètres
 			
 			
 				{0} nanomètre
 				{0} nanomètres
 			
 			
-				{0} picomètre
-				{0} picomètres
+				{0} picomètre
+				{0} picomètres
 			
 			
 				mille
@@ -2384,32 +2352,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} milles
 			
 			
-				verges
-				{0} verge
-				{0} verges
+				verges
+				{0} verge
+				{0} verges
 			
 			
-				{0} pied
+				{0} pied
+				{0} pieds
 			
 			
-				{0} pouce
-				{0} pouces
+				{0} pouce
+				{0} pouces
 			
 			
-				{0} parsec
-				{0} parsecs
+				{0} parsec
+				{0} parsecs
 			
 			
-				{0} année-lumière
-				{0} années-lumière
+				{0} année-lumière
+				{0} années-lumière
 			
 			
-				{0} unité astronomique
-				{0} unités astronomiques
+				{0} unité astronomique
+				{0} unités astronomiques
 			
 			
-				{0} mille marin
-				{0} milles marins
+				{0} mille marin
+				{0} milles marins
 			
 			
 				{0} lux
@@ -2425,31 +2394,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} par kilogramme
 			
 			
-				{0} gramme
-				{0} grammes
+				{0} gramme
+				{0} grammes
 			
 			
-				{0} milligramme
-				{0} milligrammes
+				{0} milligramme
+				{0} milligrammes
 			
 			
 				{0} tonne courte
 				{0} tonnes courtes
 			
 			
+				{0} stone
 				{0} stone
 			
 			
-				{0} livre
-				{0} livres
+				{0} livre
+				{0} livres
 			
 			
-				{0} once
-				{0} onces
+				{0} once
+				{0} onces
 			
 			
-				{0} once troy
-				{0} onces troy
+				{0} once troy
+				{0} onces troy
 			
 			
 				{0} carat
@@ -2479,10 +2449,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} cheval-vapeur
 				{0} chevaux-vapeur
 			
-			
-				{0} hectopascal
-				{0} hectopascals
-			
 			
 				{0} pouce de mercure
 				{0} pouces de mercure
@@ -2495,6 +2461,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atmosphère
 				{0} atmosphères
 			
+			
+				{0} hectopascal
+				{0} hectopascals
+			
 			
 				kilomètres à l’heure
 				{0} kilomètre par heure
@@ -2527,12 +2497,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kilomètres cubes
 			
 			
-				{0} mètre cube
-				{0} mètres cubes
+				{0} mètre cube
+				{0} mètres cubes
 			
 			
-				{0} centimètre cube
-				{0} centimètres cubes
+				{0} centimètre cube
+				{0} centimètres cubes
 			
 			
 				{0} mille cube
@@ -2544,27 +2514,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} verges cubes
 			
 			
-				{0} pied cube
-				{0} pieds cubes
+				{0} pied cube
+				{0} pieds cubes
 			
 			
-				{0} pouce cube
-				{0} pouces cubes
+				{0} pouce cube
+				{0} pouces cubes
 			
 			
-				{0} mégalitre
-				{0} mégalitres
+				{0} mégalitre
+				{0} mégalitres
 			
 			
 				{0} hectolitre
 				{0} hectolitres
 			
 			
-				{0} litre
-				{0} litres
+				{0} litre
+				{0} litres
 			
 			
-				gallon impérial
+				gallon impérial
 			
 			
 				pintes
@@ -2582,7 +2552,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} cuillères à thé
 			
 			
-				point cardinal
+				point cardinal
 				{0} ouest
 			
 		
@@ -2625,7 +2595,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ac
 			
 			
-				vg²
+				vg²
 				{0} vg²
 				{0} vg²
 			
@@ -2664,8 +2634,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				mi/gal Imp
-				{0} mi/gal Imp
-				{0} mi/gal Imp
 			
 			
 				{0} To
@@ -2712,43 +2680,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} bit
 			
 			
-				si
+				s.
 			
 			
 				{0} an
 				{0} ans
 			
 			
-				{0} m.
-				{0} m.
+				{0} m.
+				{0} m.
 			
 			
-				{0} sem.
-				{0} sem.
+				{0} sem.
+				{0} sem.
 			
 			
-				{0} j
-				{0} j
+				{0} j
+				{0} j
 			
 			
-				{0} h
-				{0} h
+				{0} h
+				{0} h
 			
 			
-				{0} min
-				{0} min
+				{0} min
+				{0} min
 			
 			
 				{0} s
 				{0} s
 			
 			
-				{0} ms
-				{0} ms
+				{0} ms
+				{0} ms
 			
 			
-				{0} μs
-				{0} μs
+				{0} μs
+				{0} μs
 			
 			
 				{0} ns
@@ -2795,8 +2763,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kWh
 			
 			
-				{0} BTU
-				{0} BTU
+				{0} BTU
+				{0} BTU
 			
 			
 				{0} GHz
@@ -2815,82 +2783,82 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Hz
 			
 			
-				{0} km
-				{0} km
+				{0} km
+				{0} km
 			
 			
-				{0} m
-				{0} m
+				{0} m
+				{0} m
 			
 			
-				{0} dm
-				{0} dm
+				{0} dm
+				{0} dm
 			
 			
-				{0} cm
-				{0} cm
+				{0} cm
+				{0} cm
 			
 			
 				{0} mm
 				{0} mm
 			
 			
-				{0} µm
-				{0} µm
+				{0} µm
+				{0} µm
 			
 			
 				{0} nm
 				{0} nm
 			
 			
-				{0} pm
-				{0} pm
+				{0} pm
+				{0} pm
 			
 			
 				{0} mi
 				{0} mi
 			
 			
-				vg
-				{0} vg
-				{0} vg
+				vg
+				{0} vg
+				{0} vg
 			
 			
-				{0} pi
-				{0} pi
+				{0} pi
+				{0} pi
 			
 			
-				{0} po
-				{0} po
+				{0} po
+				{0} po
 			
 			
-				{0} pc
-				{0} pc
+				{0} pc
+				{0} pc
 			
 			
-				{0} al
-				{0} al
+				{0} al
+				{0} al
 			
 			
-				{0} ua
-				{0} ua
+				{0} ua
+				{0} ua
 			
 			
-				NM
-				{0} NM
-				{0} NM
+				NM
+				{0} NM
+				{0} NM
 			
 			
 				{0} lx
 				{0} lx
 			
 			
-				{0} t
-				{0} t
+				{0} t
+				{0} t
 			
 			
-				{0} kg
-				{0} kg
+				{0} kg
+				{0} kg
 			
 			
 				{0} g
@@ -2901,8 +2869,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mg
 			
 			
-				{0} µg
-				{0} µg
+				{0} µg
+				{0} µg
 			
 			
 				tc
@@ -2910,20 +2878,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} tc
 			
 			
-				{0} lb
-				{0} lb
+				{0} lb
+				{0} lb
 			
 			
-				{0} oz
-				{0} oz
+				{0} oz
+				{0} oz
 			
 			
-				{0} oz t
-				{0} oz t
+				{0} oz t
+				{0} oz t
 			
 			
-				{0} ct
-				{0} ct
+				{0} ct
+				{0} ct
 			
 			
 				{0} GW
@@ -2949,10 +2917,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ch
 				{0} ch
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -2972,9 +2936,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
-				{0} km/h
-				{0} km/h
+				{0} km/h
+				{0} km/h
 			
 			
 				{0} m/s
@@ -2984,9 +2952,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mi/h
 				{0} mi/h
 			
-			
-				{0}°
-			
 			
 				{0} °C
 				{0} °C
@@ -3000,25 +2965,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} K
 			
 			
-				lb-pi
-				{0} lb-pi
-				{0} lb-pi
+				lb-pi
+				{0} lb-pi
+				{0} lb-pi
 			
 			
 				{0} km³
 				{0} km³
 			
 			
-				{0} m³
-				{0} m³
+				{0} m³
+				{0} m³
 			
 			
-				{0} cm³
-				{0} cm³
+				{0} cm³
+				{0} cm³
 			
 			
-				{0} mi³
-				{0} mi³
+				{0} mi³
+				{0} mi³
 			
 			
 				vg³
@@ -3039,33 +3004,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ML
 			
 			
-				hL
-				{0} hL
-				{0} hL
+				hL
+				{0} hL
+				{0} hL
 			
 			
-				L
-				{0} L
-				{0} L
+				L
+				{0} L
+				{0} L
 				{0}/L
 			
 			
-				dL
-				{0} dL
-				{0} dL
+				dL
+				{0} dL
+				{0} dL
 			
 			
-				cL
-				{0} cL
-				{0} cL
+				cL
+				{0} cL
+				{0} cL
 			
 			
-				mL
-				{0} mL
-				{0} mL
+				mL
+				{0} mL
+				{0} mL
 			
 			
-				gal Imp
+				gal Imp
 				{0} gal Imp
 				{0} gal Imp
 				{0}/gal Imp
@@ -3086,7 +3051,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} oz liq.
 			
 			
-				oz liq imp.
+				oz liq imp.
 				{0} oz liq imp.
 				{0} oz liq imp.
 			
@@ -3106,28 +3071,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} %
 			
 			
-				L/100 km
-				{0} L/100 km
-				{0} L/100 km
+				L/100 km
+				{0} L/100 km
+				{0} L/100 km
 			
 			
 				´{0}s.
 				´{0}s.
 			
 			
-				{0}m
-				{0}m
+				{0}m
+				{0}m
 				{0}/m
 			
 			
 				sem
-				{0}sem
-				{0}sem
+				{0}sem
+				{0}sem
 				{0}/sem
 			
 			
-				{0}m
-				{0}m
+				{0}m
+				{0}m
 				{0}/m
 			
 			
@@ -3230,9 +3195,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}K
 			
 			
-				L
-				{0}L
-				{0}L
+				L
+				{0}L
+				{0}L
 			
 		
 	
diff --git a/make/data/cldr/common/main/fr_CD.xml b/make/data/cldr/common/main/fr_CD.xml
index a4af57ac7b6..b1dd1a35a0f 100644
--- a/make/data/cldr/common/main/fr_CD.xml
+++ b/make/data/cldr/common/main/fr_CD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_CF.xml b/make/data/cldr/common/main/fr_CF.xml
index f2ab18c3d45..dc01ac801d7 100644
--- a/make/data/cldr/common/main/fr_CF.xml
+++ b/make/data/cldr/common/main/fr_CF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_CG.xml b/make/data/cldr/common/main/fr_CG.xml
index 43458af31e7..704d7edcfc5 100644
--- a/make/data/cldr/common/main/fr_CG.xml
+++ b/make/data/cldr/common/main/fr_CG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_CH.xml b/make/data/cldr/common/main/fr_CH.xml
index 51fbeeaaac1..6a740920704 100644
--- a/make/data/cldr/common/main/fr_CH.xml
+++ b/make/data/cldr/common/main/fr_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -217,12 +217,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				
-					#,##0.00 ¤
-				
-			
-		
 	
 
diff --git a/make/data/cldr/common/main/fr_CI.xml b/make/data/cldr/common/main/fr_CI.xml
index 4c2fec37633..e41c0714977 100644
--- a/make/data/cldr/common/main/fr_CI.xml
+++ b/make/data/cldr/common/main/fr_CI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_CM.xml b/make/data/cldr/common/main/fr_CM.xml
index 53f269580cd..5e72012b6b8 100644
--- a/make/data/cldr/common/main/fr_CM.xml
+++ b/make/data/cldr/common/main/fr_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_DJ.xml b/make/data/cldr/common/main/fr_DJ.xml
index 0cc838239ea..21a7fd4391c 100644
--- a/make/data/cldr/common/main/fr_DJ.xml
+++ b/make/data/cldr/common/main/fr_DJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_DZ.xml b/make/data/cldr/common/main/fr_DZ.xml
index 175edeae629..f6a9655bcb4 100644
--- a/make/data/cldr/common/main/fr_DZ.xml
+++ b/make/data/cldr/common/main/fr_DZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_FR.xml b/make/data/cldr/common/main/fr_FR.xml
index 9227912d77a..f68d742a03c 100644
--- a/make/data/cldr/common/main/fr_FR.xml
+++ b/make/data/cldr/common/main/fr_FR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_GA.xml b/make/data/cldr/common/main/fr_GA.xml
index 41967507a7c..46a49b9fc12 100644
--- a/make/data/cldr/common/main/fr_GA.xml
+++ b/make/data/cldr/common/main/fr_GA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_GF.xml b/make/data/cldr/common/main/fr_GF.xml
index d3eb0c6ec83..73c139a6828 100644
--- a/make/data/cldr/common/main/fr_GF.xml
+++ b/make/data/cldr/common/main/fr_GF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_GN.xml b/make/data/cldr/common/main/fr_GN.xml
index e18505272ba..edbf92e1910 100644
--- a/make/data/cldr/common/main/fr_GN.xml
+++ b/make/data/cldr/common/main/fr_GN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_GP.xml b/make/data/cldr/common/main/fr_GP.xml
index b2bfe4fa60f..a0bba1e5e99 100644
--- a/make/data/cldr/common/main/fr_GP.xml
+++ b/make/data/cldr/common/main/fr_GP.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_GQ.xml b/make/data/cldr/common/main/fr_GQ.xml
index 954ba930919..1571c7a72dc 100644
--- a/make/data/cldr/common/main/fr_GQ.xml
+++ b/make/data/cldr/common/main/fr_GQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_HT.xml b/make/data/cldr/common/main/fr_HT.xml
index 06c0786d047..3b64535c545 100644
--- a/make/data/cldr/common/main/fr_HT.xml
+++ b/make/data/cldr/common/main/fr_HT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_KM.xml b/make/data/cldr/common/main/fr_KM.xml
index bcba49dba3b..fde850777f9 100644
--- a/make/data/cldr/common/main/fr_KM.xml
+++ b/make/data/cldr/common/main/fr_KM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_LU.xml b/make/data/cldr/common/main/fr_LU.xml
index 28f7cd7efa4..c011eaeb4e6 100644
--- a/make/data/cldr/common/main/fr_LU.xml
+++ b/make/data/cldr/common/main/fr_LU.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/fr_MA.xml b/make/data/cldr/common/main/fr_MA.xml
index 2d507980b7e..b7d33f0b043 100644
--- a/make/data/cldr/common/main/fr_MA.xml
+++ b/make/data/cldr/common/main/fr_MA.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/fr_MC.xml b/make/data/cldr/common/main/fr_MC.xml
index 2d89c46842e..8224cb6446a 100644
--- a/make/data/cldr/common/main/fr_MC.xml
+++ b/make/data/cldr/common/main/fr_MC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_MF.xml b/make/data/cldr/common/main/fr_MF.xml
index c5f3385a739..28f8e3afd57 100644
--- a/make/data/cldr/common/main/fr_MF.xml
+++ b/make/data/cldr/common/main/fr_MF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_MG.xml b/make/data/cldr/common/main/fr_MG.xml
index 058cfde23be..4372603ad11 100644
--- a/make/data/cldr/common/main/fr_MG.xml
+++ b/make/data/cldr/common/main/fr_MG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_ML.xml b/make/data/cldr/common/main/fr_ML.xml
index 50306bcf3d1..726222cc5a4 100644
--- a/make/data/cldr/common/main/fr_ML.xml
+++ b/make/data/cldr/common/main/fr_ML.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_MQ.xml b/make/data/cldr/common/main/fr_MQ.xml
index 92fe8901a92..d120ebe8d2c 100644
--- a/make/data/cldr/common/main/fr_MQ.xml
+++ b/make/data/cldr/common/main/fr_MQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_MR.xml b/make/data/cldr/common/main/fr_MR.xml
index 86d7cce9bd5..d98f754975e 100644
--- a/make/data/cldr/common/main/fr_MR.xml
+++ b/make/data/cldr/common/main/fr_MR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_MU.xml b/make/data/cldr/common/main/fr_MU.xml
index ae89ea46043..837e9db9663 100644
--- a/make/data/cldr/common/main/fr_MU.xml
+++ b/make/data/cldr/common/main/fr_MU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_NC.xml b/make/data/cldr/common/main/fr_NC.xml
index 8eb44c49819..ab64f2fe897 100644
--- a/make/data/cldr/common/main/fr_NC.xml
+++ b/make/data/cldr/common/main/fr_NC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_NE.xml b/make/data/cldr/common/main/fr_NE.xml
index edab6a348e1..a74136a27ee 100644
--- a/make/data/cldr/common/main/fr_NE.xml
+++ b/make/data/cldr/common/main/fr_NE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_PF.xml b/make/data/cldr/common/main/fr_PF.xml
index 844d6ad5a61..685b56a7b86 100644
--- a/make/data/cldr/common/main/fr_PF.xml
+++ b/make/data/cldr/common/main/fr_PF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_PM.xml b/make/data/cldr/common/main/fr_PM.xml
index 44d2be6a47f..1a37ed884a9 100644
--- a/make/data/cldr/common/main/fr_PM.xml
+++ b/make/data/cldr/common/main/fr_PM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_RE.xml b/make/data/cldr/common/main/fr_RE.xml
index 2509cebb706..950a780d7c0 100644
--- a/make/data/cldr/common/main/fr_RE.xml
+++ b/make/data/cldr/common/main/fr_RE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_RW.xml b/make/data/cldr/common/main/fr_RW.xml
index cdd8f1fb90a..408eebc7731 100644
--- a/make/data/cldr/common/main/fr_RW.xml
+++ b/make/data/cldr/common/main/fr_RW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_SC.xml b/make/data/cldr/common/main/fr_SC.xml
index d37d7918559..3fb44ab9a2a 100644
--- a/make/data/cldr/common/main/fr_SC.xml
+++ b/make/data/cldr/common/main/fr_SC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_SN.xml b/make/data/cldr/common/main/fr_SN.xml
index e643f57065c..d0f8be69bee 100644
--- a/make/data/cldr/common/main/fr_SN.xml
+++ b/make/data/cldr/common/main/fr_SN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_SY.xml b/make/data/cldr/common/main/fr_SY.xml
index 08ebe4e18bb..4cb62af4475 100644
--- a/make/data/cldr/common/main/fr_SY.xml
+++ b/make/data/cldr/common/main/fr_SY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_TD.xml b/make/data/cldr/common/main/fr_TD.xml
index 1745cd7dbfd..df656b2c824 100644
--- a/make/data/cldr/common/main/fr_TD.xml
+++ b/make/data/cldr/common/main/fr_TD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_TG.xml b/make/data/cldr/common/main/fr_TG.xml
index f14c2d264a8..1b0c037e1f3 100644
--- a/make/data/cldr/common/main/fr_TG.xml
+++ b/make/data/cldr/common/main/fr_TG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_TN.xml b/make/data/cldr/common/main/fr_TN.xml
index 3f53717de9f..b33222f1aed 100644
--- a/make/data/cldr/common/main/fr_TN.xml
+++ b/make/data/cldr/common/main/fr_TN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_VU.xml b/make/data/cldr/common/main/fr_VU.xml
index 21614b8b4e0..b7560cfb5a2 100644
--- a/make/data/cldr/common/main/fr_VU.xml
+++ b/make/data/cldr/common/main/fr_VU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_WF.xml b/make/data/cldr/common/main/fr_WF.xml
index ac98b661222..e5a5f2c9680 100644
--- a/make/data/cldr/common/main/fr_WF.xml
+++ b/make/data/cldr/common/main/fr_WF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fr_YT.xml b/make/data/cldr/common/main/fr_YT.xml
index d02db8c8432..11e1e040131 100644
--- a/make/data/cldr/common/main/fr_YT.xml
+++ b/make/data/cldr/common/main/fr_YT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fur.xml b/make/data/cldr/common/main/fur.xml
index 0e63be885ba..aa16dcb6661 100644
--- a/make/data/cldr/common/main/fur.xml
+++ b/make/data/cldr/common/main/fur.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -446,8 +446,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Sant Martin
 			Madagascar
 			Isulis Marshall
-			Macedonie
-			Macedonie (FYROM)
 			Mali
 			Birmanie
 			Mongolie
@@ -613,7 +611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a à â b c ç d e è ê f g h i ì î j k l m n o ò ô p q r s t u ù û v w x y z]
 		[å č é ë ğ ï ñ ó š ü]
 		[A B C Ç D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		‘
diff --git a/make/data/cldr/common/main/fur_IT.xml b/make/data/cldr/common/main/fur_IT.xml
index d8c104e79bd..2eeee960565 100644
--- a/make/data/cldr/common/main/fur_IT.xml
+++ b/make/data/cldr/common/main/fur_IT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/fy.xml b/make/data/cldr/common/main/fy.xml
index 25e19051712..cb2e7a57224 100644
--- a/make/data/cldr/common/main/fy.xml
+++ b/make/data/cldr/common/main/fy.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -881,8 +881,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Saint-Martin
 			Madeiaskar
 			Marshalleilannen
-			Macedonië
-			Macedonië (FYROM)
 			Mali
 			Myanmar (Birma)
 			Mongolië
@@ -1206,8 +1204,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à â ä b c d e é è ê ë f g h i í ï {ij} {íj\u0301} j k l m n o ó ô ö p r s t u ú û ü v w y ý z]
 		[æ ò ù]
 		[A B C D E F G H I J K L M N O P R S T U V W X Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -2896,9 +2894,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				
 				
 					
 						
@@ -6464,11 +6459,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hynstekrêft
 				{0} hynstekrêften
 			
-			
-				hektopaskal
-				{0} hektopaskal
-				{0} hektopaskal
-			
 			
 				inHg
 				{0} inHg
@@ -6479,6 +6469,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} millibar
 				{0} millibar
 			
+			
+				hektopaskal
+				{0} hektopaskal
+				{0} hektopaskal
+			
 			
 				kilometer de oere
 				{0} kilometer de oere
@@ -6699,11 +6694,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pk
 				{0} pk
 			
-			
-				hektopaskal
-				{0} hPa
-				{0} hPa
-			
 			
 				inHg
 				{0} inHg
@@ -6714,6 +6704,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hektopaskal
+				{0} hPa
+				{0} hPa
+			
 			
 				kilometer de oere
 				{0} km/h
@@ -6899,10 +6894,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pk
 				{0} pk
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -6911,6 +6902,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				{0} km/h
 				{0} km/h
diff --git a/make/data/cldr/common/main/fy_NL.xml b/make/data/cldr/common/main/fy_NL.xml
index 55a358ddc26..4c004c54004 100644
--- a/make/data/cldr/common/main/fy_NL.xml
+++ b/make/data/cldr/common/main/fy_NL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ga.xml b/make/data/cldr/common/main/ga.xml
index b30b4dd317c..6968dfc26b3 100644
--- a/make/data/cldr/common/main/ga.xml
+++ b/make/data/cldr/common/main/ga.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -71,7 +71,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Buiginis
 			byn
 			Catalóinis
-			ccp
 			Seisnis
 			Seabúáinis
 			cgg
@@ -196,30 +195,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Ionúitis
 			Seapáinis
 			Lojban
-			jgo
-			jmc
+			Ngomba
+			Machame
 			Iútlainnis
 			Iáivis
 			Seoirsis
 			Cara-Chalpáis
-			kab
+			Caibílis
 			kac
 			kaj
-			kam
+			Cambais
 			kbd
 			kcg
-			kde
+			Makonde
 			Kabuverdianu
 			kfo
 			Congóis
 			kha
-			khq
+			Koyra Chiini
 			Ciocúis
 			Cuainiáimis
 			Casaicis
-			kkj
+			Kako
 			Kalaallisut
-			kln
+			Kalenjin
 			Ciméiris
 			kmb
 			Cannadais
@@ -241,7 +240,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Cirgisis
 			Laidin
 			Laidínis
-			lag
+			Langi
 			Puinseáibis Iartharach
 			Lucsambuirgis
 			lez
@@ -249,33 +248,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Liombuirgis
 			Liogúiris
 			Liovóinis
-			lkt
+			Lakota
 			Lombairdis
 			Liongáilis
 			Laoisis
 			loz
-			lrc
+			Luri Thuaidh
 			Liotuáinis
 			Lúba-Cataingis
 			lua
 			lun
-			luo
+			Lúóis
 			lus
-			luy
+			Luyia
 			Laitvis
 			mad
 			mag
 			mai
 			mak
-			mas
+			Másais
 			mdf
 			Meindis
-			mer
-			mfe
+			Meru
+			Morisyen
 			Malagáisis
 			Meán-Ghaeilge
-			mgh
-			mgo
+			Makhuwa-Meetto
+			Metaʼ
 			Mairsillis
 			Maorais
 			mic
@@ -290,18 +289,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mairis Iartharach
 			Malaeis
 			Máltais
-			mua
+			Mundang
 			Ilteangacha
 			mus
 			Mioraindéis
 			Marmhairis
 			Burmais
 			myv
-			mzn
+			Mazanderani
 			Nárúis
 			Sínis Min Nan
 			Napóilis
-			naq
+			Nama
 			Ioruais Bokmål
 			Ndeibéilis an Tuaiscirt
 			Gearmáinis Íochtarach
@@ -313,19 +312,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Níobhais
 			Ollainnis
 			Pléimeannais
-			nmg
+			Kwasio
 			Nua-Ioruais
-			nnh
+			Ngiemboon
 			Ioruais
 			nog
 			Sean-Lochlainnis
 			nqo
 			Ndeibéilis an Deiscirt
 			Sútúis an Tuaiscirt
-			nus
+			Nuer
 			Navachóis
 			Siséivis
-			nyn
+			Niancóilis
 			Ocsatáinis
 			Óisibis
 			Oraimis
@@ -374,7 +373,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sindis
 			Sáimis Thuaidh
 			seh
-			ses
+			Koyraboro Senni
 			Sangóis
 			Sean-Ghaeilge
 			Seirbea-Chróitis
@@ -461,6 +460,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Giúdais
 			Iarúibis
 			Cantainis
+			Sínis, Cantainis
 			Siuáingis
 			Séalainnis
 			Tamazight Caighdeánach Mharacó
@@ -894,8 +894,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			an tSalvadóir
 			Sint Maarten
 			an tSiria
-			an tSuasalainn
-			Ríocht na Suasalainne
+			eSuaitíní
+			an tSuasalainn
 			Tristan da Cunha
 			Oileáin na dTurcach agus Caicos
 			Sead
@@ -917,7 +917,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			an Úcráin
 			Uganda
 			Oileáin Imeallacha S.A.M.
-			na Náisiúin Aontaiteh
+			na Náisiúin Aontaithe
 			NA
 			Stáit Aontaithe Mheiriceá
 			SAM
@@ -932,8 +932,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatú
 			Vailís agus Futúna
 			Samó
-			XA
-			XB
+			Bréagdhiaicriticí
+			Bréag-Bidi
 			an Chosaiv
 			Éimin
 			Mayotte
@@ -1176,38 +1176,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[a á b c d e é f g h i í l m n o ó p r s t u ú]
 		[å ḃ ċ ḋ ḟ ġ j k ṁ ṗ q ṡ ṫ v w x y z]
-		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
-		{0}…
-		…{0}
-		{0}…{1}
-		{0} …
-		… {0}
-		{0} … {1}
-		?
+		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		
 			[\:∶]
 		
-		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
-			[\$﹩＄$]
-			[£₤]
-			[¥￥]
-			[₩￦]
-		
-		
-			[\-‒⁻₋−➖﹣－]
-		
 	
-	
-		“
-		”
-		‘
-		’
-	
 	
 		
 			
@@ -1490,44 +1465,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1837,27 +1774,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							r.n.
 							i.n.
 						
-						
-							a
-							p
-						
 						
 							r.n.
 							i.n.
 						
 					
 					
-						
-							a.m.
-							p.m.
-						
 						
-							a
-							p
+							r.n.
+							i.n.
 						
 						
-							a.m.
-							p.m.
+							r.n.
+							i.n.
 						
 					
 				
@@ -2019,44 +1948,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h – h a
@@ -5385,6 +5276,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			,
 			%
 			E
 			×
@@ -5624,6 +5516,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheseta Andóra
 				bpeseta Andóra
 				peseta Andóra
+				ADP
 			
 			
 				Dirham Aontas na nÉimíríochtaí Arabacha
@@ -5640,6 +5533,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afgainí (1927–2002)
 				Afgainí (1927–2002)
 				Afgainí (1927–2002)
+				AFA
 			
 			
 				Afghani na hAfganastáine
@@ -5656,6 +5550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lek na hAlbáine (1946–1965)
 				lek na hAlbáine (1946–1965)
 				lek na hAlbáine (1946–1965)
+				ALK
 			
 			
 				Lek na hAlbáine
@@ -5697,6 +5592,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwanza Angólach (1977–1990)
 				Kwanza Angólach (1977–1990)
 				Kwanza Angólach (1977–1990)
+				AOK
 			
 			
 				Kwanza Nua Angólach (1990–2000)
@@ -5705,6 +5601,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwanza Nua Angólach (1990–2000)
 				Kwanza Nua Angólach (1990–2000)
 				Kwanza Nua Angólach (1990–2000)
+				AON
 			
 			
 				Kwanza Reajustado Angólach (1995–1999)
@@ -5713,6 +5610,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwanza Reajustado Angólach (1995–1999)
 				Kwanza Reajustado Angólach (1995–1999)
 				Kwanza Reajustado Angólach (1995–1999)
+				AOR
 			
 			
 				Austral Airgintíneach
@@ -5721,6 +5619,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Austral Airgintíneach
 				Austral Airgintíneach
 				Austral Airgintíneach
+				ARA
+			
+			
+				ARL
 			
 			
 				Peso na hAirgintíne (1881–1970)
@@ -5729,6 +5631,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheso na hAirgintíne (1881–1970)
 				bpeso na hAirgintíne (1881–1970)
 				peso na hAirgintíne (1881–1970)
+				ARM
 			
 			
 				Peso na hAirgintíne (1983–1985)
@@ -5737,6 +5640,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheso na hAirgintíne (1983–1985)
 				bpeso na hAirgintíne (1983–1985)
 				peso na hAirgintíne (1983–1985)
+				ARP
 			
 			
 				Peso na hAirgintíne
@@ -5754,6 +5658,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Scilling Ostarach
 				Scilling Ostarach
 				Scilling Ostarach
+				ATS
 			
 			
 				Dollar na hAstráile
@@ -5779,6 +5684,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mhanat na hAsarbaiseáine (1993–2006)
 				manat na hAsarbaiseáine (1993–2006)
 				manat na hAsarbaiseáine (1993–2006)
+				AZM
 			
 			
 				Manat na hAsarbaiseáine
@@ -5795,6 +5701,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dínear Bhoisnia-Heirseagaivéin (1992–1994)
 				Dínear Bhoisnia-Heirseagaivéin (1992–1994)
 				Dínear Bhoisnia-Heirseagaivéin (1992–1994)
+				BAD
 			
 			
 				Marg Inmhalartaithe na Boisnia-Heirseagaivéine
@@ -5805,6 +5712,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marg inmhalartaithe na Boisnia-Heirseagaivéine
 				KM
 			
+			
+				BAN
+			
 			
 				Dollar Bharbadós
 				dollar Bharbadós
@@ -5830,6 +5740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Beilgeach (inathraithe)
 				Franc Beilgeach (inathraithe)
 				Franc Beilgeach (inathraithe)
+				BEC
 			
 			
 				Franc Beilgeach
@@ -5838,6 +5749,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Beilgeach
 				Franc Beilgeach
 				Franc Beilgeach
+				BEF
 			
 			
 				BEL
@@ -5846,6 +5758,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Beilgeach (airgeadúil)
 				Franc Beilgeach (airgeadúil)
 				Franc Beilgeach (airgeadúil)
+				BEL
 			
 			
 				Lev Crua na Bulgáire
@@ -5854,6 +5767,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lev chrua na Bulgáire
 				lev chrua na Bulgáire
 				lev crua na Bulgáire
+				BGL
 			
 			
 				Lev na Bulgáire
@@ -5870,6 +5784,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lev na Bulgáire (1879–1952)
 				lev na Bulgáire (1879–1952)
 				lev na Bulgáire (1879–1952)
+				BGO
 			
 			
 				Dinar Bhairéin
@@ -5914,6 +5829,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				boliviano
 				Bs
 			
+			
+				BOL
+			
 			
 				Peso na Bolaive
 				pheso na Bolaive
@@ -5921,6 +5839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheso na Bolaive
 				bpeso na Bolaive
 				peso na Bolaive
+				BOP
 			
 			
 				Mvdol na Bolaive
@@ -5929,6 +5848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mvdol na Bolaive
 				mvdol na Bolaive
 				mvdol na Bolaive
+				BOV
 			
 			
 				Cruzeiro Nua na Brasaíle (1967–1986)
@@ -5937,6 +5857,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chruzeiro nua na Brasaíle (1967–1986)
 				gcruzeiro nua na Brasaíle (1967–1986)
 				cruzeiro nua na Brasaíle (1967–1986)
+				BRB
 			
 			
 				Cruzado na Brasaíle (1986–1989)
@@ -5945,6 +5866,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chruzado na Brasaíle (1986–1989)
 				gcruzado na Brasaíle (1986–1989)
 				cruzado na Brasaíle (1986–1989)
+				BRC
 			
 			
 				Cruzeiro na Brasaíle (1990–1993)
@@ -5953,6 +5875,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chruzeiro na Brasaíle (1990–1993)
 				gcruzeiro na Brasaíle (1990–1993)
 				cruzeiro na Brasaíle (1990–1993)
+				BRE
 			
 			
 				Real na Brasaíle
@@ -5970,6 +5893,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chruzado nua na Brasaíle (1989–1990)
 				gcruzado nua na Brasaíle (1989–1990)
 				cruzado nua na Brasaíle (1989–1990)
+				BRN
 			
 			
 				Cruzeiro na Brasaíle (1993–1994)
@@ -5978,6 +5902,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chruzeiro na Brasaíle (1993–1994)
 				gcruzeiro na Brasaíle (1993–1994)
 				cruzeiro na Brasaíle (1993–1994)
+				BRR
 			
 			
 				Cruzeiro na Brasaíle (1942–1967)
@@ -5986,6 +5911,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chruzeiro na Brasaíle (1942–1967)
 				gcruzeiro na Brasaíle (1942–1967)
 				cruzeiro na Brasaíle (1942–1967)
+				BRZ
 			
 			
 				Dollar na mBahámaí
@@ -6011,6 +5937,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kyat Bhurma
 				kyat Bhurma
 				kyat Bhurma
+				BUK
 			
 			
 				Pula na Botsuáine
@@ -6028,6 +5955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúbal nua na Bealarúise (1994–1999)
 				rúbal nua na Bealarúise (1994–1999)
 				rúbal nua na Bealarúise (1994–1999)
+				BYB
 			
 			
 				Rúbal na Bealarúise
@@ -6044,6 +5972,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúbal na Bealarúise (2000–2016)
 				rúbal na Bealarúise (2000–2016)
 				rúbal na Bealarúise (2000–2016)
+				BYR
 			
 			
 				Dollar na Beilíse
@@ -6086,6 +6015,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				escudo na Sile
 				n-escudo na Sile
 				escudo na Sile
+				CLE
 			
 			
 				Unidades de Fomento na Sile
@@ -6094,6 +6024,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidades de Fomento na Sile
 				Unidades de Fomento na Sile
 				Unidades de Fomento na Sile
+				CLF
 			
 			
 				Peso na Sile
@@ -6111,7 +6042,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CNH
 				CNH
 				CNH
-				CNH
 			
 			
 				Yuan na Síne
@@ -6131,6 +6061,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso na Colóime
 				$
 			
+			
+				COU
+			
 			
 				Colón Chósta Ríce
 				cholón Chósta Ríce
@@ -6147,6 +6080,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhinar na Seirbia (2002–2006)
 				ndinar na Seirbia (2002–2006)
 				dinar na Seirbia (2002–2006)
+				CSD
 			
 			
 				Koruna Crua na Seicslóvaice
@@ -6155,6 +6089,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				koruna chrua na Seicslóvaice
 				koruna chrua na Seicslóvaice
 				koruna crua na Seicslóvaice
+				CSK
 			
 			
 				Peso Inmhalartaithe Chúba
@@ -6189,6 +6124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				phunt na Cipire
 				bpunt na Cipire
 				punt na Cipire
+				CYP
 			
 			
 				Koruna Phoblacht na Seice
@@ -6206,6 +6142,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ostmark na hOirGhearmáine
 				Ostmark na hOirGhearmáine
 				Ostmark na hOirGhearmáine
+				DDM
 			
 			
 				Deutsche Mark
@@ -6214,6 +6151,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Deutsche Mark
 				Deutsche Mark
 				Deutsche Mark
+				DEM
 			
 			
 				Franc Djibouti
@@ -6256,6 +6194,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sucre Eacuadóir
 				Sucre Eacuadóir
 				Sucre Eacuadóir
+				ECS
 			
 			
 				Unidad de Valor Constante (UVC) Eacuadóir
@@ -6264,6 +6203,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidad de Valor Constante (UVC) Eacuadóir
 				Unidad de Valor Constante (UVC) Eacuadóir
 				Unidad de Valor Constante (UVC) Eacuadóir
+				ECV
 			
 			
 				Kroon na hEastóine
@@ -6272,6 +6212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kroon na hEastóine
 				Kroon na hEastóine
 				Kroon na hEastóine
+				EEK
 			
 			
 				Punt na hÉigipte
@@ -6290,6 +6231,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nakfa na hEiritré
 				nakfa na hEiritré
 			
+			
+				ESA
+			
+			
+				ESB
+			
 			
 				Peseta na Spáinne
 				pheseta na Spáinne
@@ -6297,6 +6244,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheseta na Spáinne
 				bpeseta na Spáinne
 				peseta na Spáinne
+				ESP
 				₧
 			
 			
@@ -6314,6 +6262,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				euro
 				euro
 				euro
+				€
 				€
 			
 			
@@ -6323,6 +6272,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Markka Fionnlannach
 				Markka Fionnlannach
 				Markka Fionnlannach
+				FIM
 			
 			
 				Dollar Fhidsí
@@ -6349,6 +6299,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Francach
 				Franc Francach
 				Franc Francach
+				FRF
 			
 			
 				Punt Steirling
@@ -6366,6 +6317,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kupon Larit na Grúise
 				Kupon Larit na Grúise
 				Kupon Larit na Grúise
+				GEK
 			
 			
 				Lari na Seoirsia
@@ -6383,6 +6335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chedi Ghána (1979–2007)
 				gcedi Ghána (1979–2007)
 				cedi Ghána (1979–2007)
+				GHC
 			
 			
 				Cedi Ghána
@@ -6425,6 +6378,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Syli Guine
 				Syli Guine
 				Syli Guine
+				GNS
 			
 			
 				Ekwele Guineana na Guine Meánchiorclaí
@@ -6433,6 +6387,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ekwele Guineana na Guine Meánchiorclaí
 				Ekwele Guineana na Guine Meánchiorclaí
 				Ekwele Guineana na Guine Meánchriosaí
+				GQE
 			
 			
 				Drachma Gréagach
@@ -6441,6 +6396,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Drachma Gréagach
 				Drachma Gréagach
 				Drachma Gréagach
+				GRD
 			
 			
 				Quetzal Ghuatamala
@@ -6458,6 +6414,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Escudo na Guine Portaingéalaí
 				Escudo na Guine Portaingéalaí
 				Escudo na Guine Portaingéalaí
+				GWE
 			
 			
 				Peso Guine-Bhissau
@@ -6466,6 +6423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peso Guine-Bhissau
 				Peso Guine-Bhissau
 				Peso Guine-Bhissau
+				GWP
 			
 			
 				Dollar na Guáine
@@ -6501,6 +6459,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dínear na Cróite
 				Dínear na Cróite
 				Dínear na Cróite
+				HRD
 			
 			
 				Kuna na Cróite
@@ -6544,6 +6503,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Punt Éireannach
 				Punt Éireannach
 				Punt Éireannach
+				IEP
 			
 			
 				Punt Iosraelach
@@ -6552,6 +6512,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Punt Iosraelach
 				Punt Iosraelach
 				Punt Iosraelach
+				ILP
 			
 			
 				Seiceal Nua Iosrael
@@ -6603,6 +6564,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lira na hIodáile
 				lira na hIodáile
 				lira na hIodáile
+				ITL
 			
 			
 				Dollar na hIamáice
@@ -6674,6 +6636,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				won na Cóiré Thuaidh
 				₩
 			
+			
+				KRH
+			
+			
+				KRO
+			
 			
 				Won na Cóiré Theas
 				won na Cóiré Theas
@@ -6752,6 +6720,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Loti Leosóta
 				Loti Leosóta
 				Loti Leosóta
+				LSL
 			
 			
 				Litas na Liotuáine
@@ -6760,6 +6729,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litas na Liotuáine
 				litas na Liotuáine
 				litas na Liotuáine
+				LTL
+				Lt
 			
 			
 				Talonas Liotuánach
@@ -6768,6 +6739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Talonas Liotuánach
 				Talonas Liotuánach
 				Talonas Liotuánach
+				LTT
 			
 			
 				LUC
@@ -6776,6 +6748,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				LUC
 				LUC
 				LUC
+				LUC
 			
 			
 				Franc Lucsamburg
@@ -6784,6 +6757,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Lucsamburg
 				Franc Lucsamburg
 				Franc Lucsamburg
+				LUF
 			
 			
 				Lats na Laitvia
@@ -6792,6 +6766,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lats na Laitvia
 				lats na Laitvia
 				lats na Laitvia
+				LVL
+				Ls
 			
 			
 				LVR
@@ -6800,6 +6776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rúbal Laitviach
 				Rúbal Laitviach
 				Rúbal Laitviach
+				LVR
 			
 			
 				Dinar na Libia
@@ -6824,6 +6801,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fhranc Mharacó
 				bhfranc Mharacó
 				franc Mharacó
+				MAF
 			
 			
 				Leu na Moldóive
@@ -6849,6 +6827,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Madagascar
 				Franc Madagascar
 				Franc Madagascar
+				MGF
 			
 			
 				Denar na Macadóine
@@ -6858,6 +6837,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ndenar na Macadóine
 				denar na Macadóine
 			
+			
+				MKN
+			
 			
 				Franc Mhailí
 				Franc Mhailí
@@ -6865,6 +6847,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Mhailí
 				Franc Mhailí
 				Franc Mhailí
+				MLF
 			
 			
 				Kyat Mhaenmar
@@ -6899,6 +6882,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ouguiya na Máratáine (1973–2017)
 				n-ouguiya na Máratáine (1973–2017)
 				ouguiya na Máratáine (1973–2017)
+				MRO
 			
 			
 				Ouguiya na Máratáine
@@ -6907,7 +6891,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ouguiya na Máratáine
 				n-ouguiya na Máratáine
 				ouguiya na Máratáine
-				MRU
 			
 			
 				Lira Mhálta
@@ -6916,6 +6899,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lira Mhálta
 				lira Mhálta
 				lira Mhálta
+				MTL
 			
 			
 				Punt Mhálta
@@ -6924,6 +6908,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				phunt Mhálta
 				bpunt Mhálta
 				punt Mhálta
+				MTP
 			
 			
 				Rúipí Oileán Mhuirís
@@ -6941,6 +6926,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúipí Oileáin Mhaildíve
 				rúipí Oileáin Mhaildíve
 				rúipí Oileáin Mhaildíve
+				MVP
 			
 			
 				Rufiyaa Oileáin Mhaildíve
@@ -6974,6 +6960,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheso airgid Mheicsiceo (1861–1992)
 				bpeso airgid Mheicsiceo (1861–1992)
 				peso airgid Mheicsiceo (1861–1992)
+				MXP
 			
 			
 				MXV
@@ -6982,6 +6969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidad de Inversion (UDI) Meicsiceo
 				Unidad de Inversion (UDI) Meicsiceo
 				Unidad de Inversion (UDI) Meicsiceo
+				MXV
 			
 			
 				Ringgit na Malaeisia
@@ -6999,6 +6987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Escudo Mósaimbíce
 				Escudo Mósaimbíce
 				Escudo Mósaimbíce
+				MZE
 			
 			
 				Metical Mósaimbíce
@@ -7007,6 +6996,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Metical Mósaimbíce
 				Metical Mósaimbíce
 				Metical Mósaimbíce
+				MZM
 			
 			
 				Metical Mhósaimbíc
@@ -7041,6 +7031,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chórdoba Nicearagua (1988–1991)
 				gcórdoba Nicearagua (1988–1991)
 				córdoba Nicearagua (1988–1991)
+				NIC
 			
 			
 				Córdoba Nicearagua
@@ -7058,6 +7049,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guilder Ísiltíreach
 				Guilder Ísiltíreach
 				Guilder Ísiltíreach
+				NLG
 			
 			
 				Coróin na hIorua
@@ -7109,6 +7101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Inti Pheiriú
 				Inti Pheiriú
 				Inti Pheiriú
+				PEI
 			
 			
 				Sol Pheiriú
@@ -7125,6 +7118,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				shol Pheiriú (1863–1965)
 				sol Pheiriú (1863–1965)
 				sol Pheiriú (1863–1965)
+				PES
 			
 			
 				Kina Nua-Ghuine Phapua
@@ -7168,6 +7162,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zloty Polannach (1950–1995)
 				Zloty Polannach (1950–1995)
 				Zloty Polannach (1950–1995)
+				PLZ
 			
 			
 				Escudo na Portaingéile
@@ -7176,6 +7171,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				escudo na Portaingéile
 				n-escudo na Portaingéile
 				escudo na Portaingéile
+				PTE
 			
 			
 				Guaraní Pharagua
@@ -7201,6 +7197,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu na Rómáine (1952–2006)
 				leu na Rómáine (1952–2006)
 				leu na Rómáine (1952–2006)
+				ROL
 			
 			
 				Leu na Rómáine
@@ -7235,6 +7232,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúbal na Rúise (1991–1998)
 				rúbal na Rúise (1991–1998)
 				rúbal na Rúise (1991–1998)
+				RUR
 				р.
 			
 			
@@ -7278,6 +7276,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhinar na Súdáine (1992–2007)
 				ndinar na Súdáine (1992–2007)
 				dinar na Súdáine (1992–2007)
+				SDD
 			
 			
 				Punt na Súdáine
@@ -7294,6 +7293,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				phunt na Súdáine (1957–1998)
 				bpunt na Súdáine (1957–1998)
 				punt na Súdáine (1957–1998)
+				SDP
 			
 			
 				Coróin na Sualainne
@@ -7329,6 +7329,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tholar na Slóivéine
 				dtolar na Slóivéine
 				tolar na Slóivéine
+				SIT
 			
 			
 				Koruna na Slóvaice
@@ -7337,6 +7338,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				koruna na Slóvaice
 				koruna na Slóvaice
 				koruna na Slóvaice
+				SKK
 			
 			
 				Leone Shiarra Leon
@@ -7370,6 +7372,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghildear Shuranam
 				ngildear Shuranam
 				gildear Shuranam
+				SRG
 			
 			
 				Punt na Súdáine Theas
@@ -7387,6 +7390,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhobra São Tomé agus Príncipe (1977–2017)
 				ndobra São Tomé agus Príncipe (1977–2017)
 				dobra São Tomé agus Príncipe (1977–2017)
+				STD
 			
 			
 				Dobra São Tomé agus Príncipe
@@ -7395,7 +7399,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhobra São Tomé agus Príncipe
 				ndobra São Tomé agus Príncipe
 				dobra São Tomé agus Príncipe
-				STN
 				Db
 			
 			
@@ -7405,6 +7408,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúbal an Aontais Shóivéadaigh
 				rúbal an Aontais Shóivéadaigh
 				rúbal an Aontais Shóivéadaigh
+				SUR
 			
 			
 				Colón na Salvadóire
@@ -7413,6 +7417,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cholón na Salvadóire
 				gcolón na Salvadóire
 				colón na Salvadóire
+				SVC
 			
 			
 				Punt na Siria
@@ -7448,6 +7453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rúbal na Táidsíceastáine
 				Rúbal na Táidsíceastáine
 				Rúbal na Táidsíceastáine
+				TJR
 			
 			
 				Somoni na Táidsíceastáine
@@ -7464,6 +7470,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Manat na Tuircméanastáine (1993–2009)
 				Manat na Tuircméanastáine (1993–2009)
 				Manat na Tuircméanastáine (1993–2009)
+				TMM
 			
 			
 				Manat na Tuircméanastáine
@@ -7497,6 +7504,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Escudo Tíomóir
 				Escudo Tíomóir
 				Escudo Tíomóir
+				TPE
 			
 			
 				Lira na Tuirce (1922–2005)
@@ -7505,6 +7513,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lira na Tuirce (1922–2005)
 				lira na Tuirce (1922–2005)
 				lira na Tuirce (1922–2005)
+				TRL
 			
 			
 				Lira na Tuirce
@@ -7558,6 +7567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Karbovanets Úcránach
 				Karbovanets Úcránach
 				Karbovanets Úcránach
+				UAK
 			
 			
 				Scilling Uganda (1966–1987)
@@ -7566,6 +7576,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Scilling Uganda (1966–1987)
 				Scilling Uganda (1966–1987)
 				Scilling Uganda (1966–1987)
+				UGS
 			
 			
 				Scilling Uganda
@@ -7592,6 +7603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhollar S.A.M. (an chéad lá eile)
 				ndollar S.A.M. (an chéad lá eile)
 				dollar S.A.M. (an chéad lá eile)
+				USN
 			
 			
 				Dollar S.A.M. (an lá céanna)
@@ -7600,6 +7612,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhollar S.A.M. (an lá céanna)
 				ndollar S.A.M. (an lá céanna)
 				dollar S.A.M. (an lá céanna)
+				USS
 			
 			
 				Peso Uragua (1975–1993)
@@ -7608,6 +7621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pheso Uragua (1975–1993)
 				bpeso Uragua (1975–1993)
 				peso Uragua (1975–1993)
+				UYP
 			
 			
 				Peso Uragua
@@ -7633,6 +7647,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bholívar Veiniséala (1871–2008)
 				mbolívar Veiniséala (1871–2008)
 				bolívar Veiniséala (1871–2008)
+				VEB
 			
 			
 				Bolívar Veiniséala (2008–2018)
@@ -7641,6 +7656,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bholívar Veiniséala (2008–2018)
 				mbolívar Veiniséala (2008–2018)
 				bolívar Veiniséala (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -7650,6 +7666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bholívar Veiniséala
 				mbolívar Veiniséala
 				bolívar Veiniséala
+				VES
 			
 			
 				Dong Vítneam
@@ -7667,6 +7684,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dhong Vítneam (1978–1985)
 				ndong Vítneam (1978–1985)
 				dong Vítneam (1978–1985)
+				VNN
 			
 			
 				Vatu Vanuatú
@@ -7699,6 +7717,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				unsaí troí airgid
 				unsaí troí airgid
 				unsaí troí airgid
+				XAG
 			
 			
 				Ór
@@ -7707,6 +7726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				unsaí troí óir
 				unsaí troí óir
 				unsaí troí óir
+				XAU
 			
 			
 				Aonad Ilchodach Eorpach
@@ -7715,6 +7735,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aonad Ilchodach Eorpach
 				Aonad Ilchodach Eorpach
 				Aonad Ilchodach Eorpach
+				XBA
 			
 			
 				Aonad Airgeadaíochta Eorpach
@@ -7723,6 +7744,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aonad Airgeadaíochta Eorpach
 				Aonad Airgeadaíochta Eorpach
 				Aonad Airgeadaíochta Eorpach
+				XBB
 			
 			
 				Aonad Cuntais Eorpach (XBC)
@@ -7731,6 +7753,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aonad Cuntais Eorpach (XBC)
 				Aonad Cuntais Eorpach (XBC)
 				Aonad Cuntais Eorpach (XBC)
+				XBC
 			
 			
 				Aonad Cuntais Eorpach (XBD)
@@ -7739,6 +7762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aonad Cuntais Eorpach (XBD)
 				Aonad Cuntais Eorpach (XBD)
 				Aonad Cuntais Eorpach (XBD)
+				XBD
 			
 			
 				Dollar na Cairibe Thoir
@@ -7756,6 +7780,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cearta Speisialta Tarraingthe
 				Cearta Speisialta Tarraingthe
 				Cearta Speisialta Tarraingthe
+				XDR
 			
 			
 				Aonad Airgeadra Eorpach
@@ -7764,6 +7789,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aonad Airgeadra Eorpach
 				Aonad Airgeadra Eorpach
 				Aonad Airgeadra Eorpach
+				XEU
 			
 			
 				Franc Ór Francach
@@ -7772,6 +7798,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franc Ór Francach
 				Franc Ór Francach
 				Franc Ór Francach
+				XFO
 			
 			
 				UIC-Franc Francach
@@ -7780,6 +7807,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				UIC-Franc Francach
 				UIC-Franc Francach
 				UIC-Franc Francach
+				XFU
 			
 			
 				Franc CFA Iarthar na hAfraice
@@ -7796,6 +7824,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				unsaí troí pallaidiam
 				unsaí troí pallaidiam
 				unsaí troí pallaidiam
+				XPD
 			
 			
 				Franc CFP
@@ -7812,6 +7841,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				unsaí troí platanaim
 				unsaí troí platanaim
 				unsaí troí platanaim
+				XPT
+			
+			
+				XRE
+			
+			
+				XSU
 			
 			
 				Airgeadra Anaithnid
@@ -7829,6 +7865,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dínear Éimin
 				Dínear Éimin
 				Dínear Éimin
+				YDD
 			
 			
 				Rial Éimin
@@ -7845,6 +7882,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dínear Crua Iúgslavach (1966–1990)
 				Dínear Crua Iúgslavach (1966–1990)
 				Dínear Crua Iúgslavach (1966–1990)
+				YUD
 			
 			
 				Dínear Nua Iúgslavach (1994–2002)
@@ -7853,6 +7891,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dínear Nua Iúgslavach (1994–2002)
 				Dínear Nua Iúgslavach (1994–2002)
 				Dínear Nua Iúgslavach (1994–2002)
+				YUM
 			
 			
 				YUN
@@ -7861,6 +7900,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dínear Inathraithe Iúgslavach
 				Dínear Inathraithe Iúgslavach
 				Dínear Inathraithe Iúgslavach
+				YUN
+			
+			
+				YUR
 			
 			
 				Rand na hAfraice Theas (airgeadúil)
@@ -7869,6 +7912,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rand na hAfraice Theas (airgeadúil)
 				Rand na hAfraice Theas (airgeadúil)
 				Rand na hAfraice Theas (airgeadúil)
+				ZAL
 			
 			
 				Rand na hAfraice Theas
@@ -7886,6 +7930,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwacha Saimbiach (1968–2012)
 				Kwacha Saimbiach (1968–2012)
 				Kwacha Saimbiach (1968–2012)
+				ZMK
 			
 			
 				Kwacha na Saimbia
@@ -7903,6 +7948,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zaire Nua Sáíreach
 				Zaire Nua Sáíreach
 				Zaire Nua Sáíreach
+				ZRN
 			
 			
 				Zaire Sáíreach
@@ -7911,6 +7957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zaire Sáíreach
 				Zaire Sáíreach
 				Zaire Sáíreach
+				ZRZ
 			
 			
 				Dollar Siombábach (1980–2008)
@@ -7919,6 +7966,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dollar Siombábach (1980–2008)
 				Dollar Siombábach (1980–2008)
 				Dollar Siombábach (1980–2008)
+				ZWD
 			
 		
 		
@@ -8275,6 +8323,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gcéad bliain
 				{0} céad bliain
 			
+			
+				deicheanna blianta
+				{0} deich mbliana
+				{0} dec
+				{0} dec
+				{0} dec
+				{0} deich mbliana
+			
 			
 				blianta
 				{0} bhliain
@@ -8458,6 +8514,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} aonad teirmeach Briotanach
 			
+			
+				teirmeacha US
+				{0} teirm US
+				{0} theirm US
+				{0} theirm US
+				{0} dteirm US
+				{0} teirm US
+			
 			
 				puint fórsa
 				{0} punt fórsa
@@ -8506,6 +8570,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} heirts
 				{0} heirts
 			
+			
+				eim chlógrafach
+			
+			
+				picteilíní
+				{0} picteilín
+				{0} px
+				{0} px
+				{0} px
+				{0} picteilín
+			
+			
+				meigiphicteilíní
+				{0} meigiphicteilín
+				{0} MP
+				{0} MP
+				{0} MP
+				{0} meigiphicteilín
+			
+			
+				picteilíní sa cheintiméadar
+				{0} picteilín sa cheintiméadar
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} picteilíní sa cheintiméadar
+			
+			
+				picteilíní san orlach
+				{0} picteilín san orlach
+				{0} ppi
+				{0} ppi
+				{0} ppi
+				{0} picteilín san orlach
+			
+			
+				poncanna sa cheintiméadar
+				{0} ponc sa cheintiméadar
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} poncanna sa cheintiméadar
+			
+			
+				poncanna san orlach
+				{0} ponc san orlach
+				{0} dpi
+				{0} dpi
+				{0} dpi
+				{0} poncanna san orlach
+			
 			
 				ciliméadair
 				{0} chiliméadar
@@ -8790,26 +8905,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				daltúin
 				{0} daltún
-				{0} Da
-				{0} Da
-				{0} Da
+				{0} dhaltún
+				{0} dhaltún
+				{0} ndaltún
 				{0} daltún
 			
 			
 				maiseanna an Domhain
 				mais an Domhain
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
+				{0} mhais an Domhain
+				{0} mhais an Domhain
+				{0} mais an Domhain
+				{0} mais an Domhain
 			
 			
 				maiseanna gréine
 				{0} mais ghréine
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} maiseanna gréine
+				{0} mhais ghréine
+				{0} mhais ghréine
+				{0} mais ghréine
+				{0} mais ghréine
 			
 			
 				gigeavatanna
@@ -8859,14 +8974,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} n-each-chumhacht
 				{0} each-chumhacht
 			
-			
-				heicteapascail
-				{0} heicteapascal
-				{0} heicteapascal
-				{0} heicteapascal
-				{0} heicteapascal
-				{0} heicteapascal
-			
 			
 				milliméadair mhearcair
 				{0} mhilliméadar mearcair
@@ -8891,6 +8998,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} n-orlach mearcair
 				{0} orlach mearcair
 			
+			
+				barraí
+				{0} bharra
+				{0} bharra
+				{0} bharra
+				{0} mbarra
+				{0} barra
+			
 			
 				milleabair
 				{0} mhilleabar
@@ -8907,6 +9022,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atmaisféar
 			
+			
+				heicteapascail
+				{0} heicteapascal
+				{0} heicteapascal
+				{0} heicteapascal
+				{0} heicteapascal
+				{0} heicteapascal
+			
 			
 				cileapascail
 				{0} cileapascal
@@ -9225,11 +9348,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bbl
 			
 			
-				treo chairdinéil
-				{0}O
-				{0}T
-				{0}D
-				{0}I
+				príomhaird
+				{0} oirthear
+				{0} thuaidh
+				{0} theas
+				{0} iarthar
 			
 		
 		
@@ -9752,6 +9875,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				teirmeacha US
+				{0} teirm US
+				{0} theirm US
+				{0} theirm US
+				{0} dteirm US
+				{0} teirm US
+			
 			
 				punt-fhórsa
 				{0} lbf
@@ -9800,6 +9931,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				picteilíní
+			
+			
+				meigiphicteilíní
+			
 			
 				km
 				{0} km
@@ -10153,14 +10290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ec
 				{0} ec
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -10185,6 +10314,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} n-or. Hg
 				{0} or. Hg
 			
+			
+				barra
+				{0} bharra
+				{0} bharra
+				{0} bharra
+				{0} mbarra
+				{0} barra
+			
 			
 				mbar
 				{0} mbar
@@ -10201,6 +10338,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -11335,14 +11480,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ec
 				{0}ec
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mm Hg
 				{0}mmHg
@@ -11375,6 +11512,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mb
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/u
 				{0}km/u
diff --git a/make/data/cldr/common/main/ga_GB.xml b/make/data/cldr/common/main/ga_GB.xml
new file mode 100644
index 00000000000..470466e974f
--- /dev/null
+++ b/make/data/cldr/common/main/ga_GB.xml
@@ -0,0 +1,14 @@
+
+
+
+
+	
+		
+		
+		
+	
+
diff --git a/make/data/cldr/common/main/ga_IE.xml b/make/data/cldr/common/main/ga_IE.xml
index 2e00229273e..9fe6dffbeee 100644
--- a/make/data/cldr/common/main/ga_IE.xml
+++ b/make/data/cldr/common/main/ga_IE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gd.xml b/make/data/cldr/common/main/gd.xml
index cedb42e6760..ed44f43ed37 100644
--- a/make/data/cldr/common/main/gd.xml
+++ b/make/data/cldr/common/main/gd.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -78,7 +78,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Bhojpuri
 			Bislama
 			Bikol
-			Bini
+			Edo
 			Banjar
 			Kom
 			Siksika
@@ -103,6 +103,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Carib
 			Cayuga
 			Atsam
+			Chakma
 			Deideanais
 			Cebuano
 			Chiga
@@ -600,6 +601,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Yoruba
 			Nheengatu
 			Cantonais
+			Sìnis, Cantonais
 			Zhuang
 			Zapotec
 			Comharran Bliss
@@ -607,8 +609,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Zenaga
 			Tamazight Stannardach Moroco
 			Sìnis
+			Sìnis, Mandairinis
 			Sìnis Shimplichte
+			Mandairinis Shimplichte
 			Sìnis Thradaiseanta
+			Mandairinis Thradaiseanta
 			Zulu
 			Zuñi
 			Susbaint nach eil ’na chànan
@@ -651,6 +656,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -674,6 +680,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -720,6 +727,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -741,6 +749,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -782,6 +791,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -1056,7 +1066,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			An Salbhador
 			Sint Maarten
 			Siridhea
-			Dùthaich nan Suasaidh
+			eSwatini
+			Dùthaich nan Suasaidh
 			Tristan da Cunha
 			Na h-Eileanan Turcach is Caiceo
 			An t-Seàd
@@ -1092,6 +1103,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Vanuatu
 			Uallas agus Futuna
 			Samotha
+			Sràcan fuadain
+			Dà-chomhaireach fuadain
 			A’ Chosobho
 			An Eaman
 			Mayotte
@@ -1281,6 +1294,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Àireamhan ionmhasail na Sìnise Thradaiseanta
 			Àireamhan na h-Eabhra
 			Àireamhan Pahawh Hmong
+			Àireamhan Nyiakeng Puachue
 			Àireamhan na Deàbhanaise
 			Àireamhan na Seapanaise
 			Àireamhan ionmhasail na Seapanaise
@@ -1329,6 +1343,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Àireamhan Tirhuta
 			Àireamhan Vai
 			Àireamhan Warang Citi
+			Àireamhan Wancho
 		
 		
 			Meatrach
@@ -1345,8 +1360,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a à b c d e è f g h i ì l m n o ò p r s t u ù]
 		[á ă â å ä ã ā æ ċ ç ḋ é ĕ ê ë ē ḟ ġ í ĭ î ï ī ı j k ł ṁ ñ ó ŏ ô ö ø ō œ ṗ q ṡ ş ș ṫ ú ŭ û ü ū v w x y ÿ z]
 		[A B C D E F G H I L M N O P R S T U]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ¡ ? . … · ' ‘ ’ " “ ” ( ) \[ \] \{ \} § ¶ @ * / \& ⁊ # % † ‡ ‧ ° © ® ™]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ¡ ? . … · ' ‘ ’ " “ ” ( ) \[ \] \{ \} § ¶ @ * / \& ⁊ # % † ‡ ‧ ° © ® ™]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1355,14 +1370,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -4858,6 +4882,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Aqtöbe
 			
+			
+				Qostanaı
+			
 			
 				Qızılorda
 			
@@ -6491,6 +6518,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		latn
+		
+			latn
+		
+		1
 		
 			٫
 			٬
@@ -6503,6 +6535,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			؉
 			∞
 			NaN
+			:
 		
 		
 			٫
@@ -6516,6 +6549,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			؉
 			∞
 			NaN
+			٫
 		
 		
 			.
@@ -6529,6 +6563,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6542,6 +6577,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6555,6 +6591,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6568,6 +6605,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6581,6 +6619,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6594,6 +6633,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6607,6 +6647,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6620,6 +6661,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6633,6 +6675,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6646,6 +6689,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6659,6 +6703,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6672,6 +6717,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6685,6 +6731,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6698,6 +6745,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6711,6 +6759,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6724,6 +6773,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6737,6 +6787,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6750,6 +6801,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6763,6 +6815,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6776,6 +6829,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6789,6 +6843,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6802,6 +6857,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6815,6 +6871,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6828,6 +6885,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6841,6 +6899,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6854,6 +6913,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6867,6 +6927,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6880,6 +6941,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6893,6 +6955,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6906,6 +6969,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6919,6 +6983,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6932,6 +6997,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6945,6 +7011,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6958,6 +7025,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6971,6 +7039,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6984,6 +7053,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -6997,6 +7067,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -7010,6 +7081,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -7023,6 +7095,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -7036,6 +7109,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -7049,6 +7123,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -7062,6 +7137,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			.
@@ -7075,6 +7151,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			‰
 			∞
 			NaN
+			:
 		
 		
 			
@@ -7413,6 +7490,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheseta Andorrach
 				peseta Andorrach
 				peseta Andorrach
+				ADP
 			
 			
 				Dirham nan Iomaratan Arabach Aonaichte
@@ -7420,6 +7498,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhirham nan IAA
 				dirham nan IAA
 				dirham nan IAA
+				AED
 			
 			
 				Afghani Afghanach (1927–2002)
@@ -7427,6 +7506,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				afghani Afghanach (1927–2002)
 				afghani Afghanach (1927–2002)
 				afghani Afghanach (1927–2002)
+				AFA
 			
 			
 				Afghani Afghanach
@@ -7434,6 +7514,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				afghani Afghanach
 				afghani Afghanach
 				afghani Afghanach
+				AFN
 			
 			
 				Lek Albàineach (1946–1965)
@@ -7441,6 +7522,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lek Albàineach (1946–1965)
 				lek Albàineach (1946–1965)
 				lek Albàineach (1946–1965)
+				ALK
 			
 			
 				Lek Albàineach
@@ -7448,6 +7530,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lek Albàineach
 				lek Albàineach
 				lek Albàineach
+				ALL
 			
 			
 				Dram Airmeineach
@@ -7455,6 +7538,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhram Airmeineach
 				dram Airmeineach
 				dram Airmeineach
+				AMD
 			
 			
 				Gulden Eileanan Aintilia nan Tìrean Ìsle
@@ -7462,6 +7546,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ghulden Eileanan Aintilia nan Tìrean Ìsle
 				gulden Eileanan Aintilia nan Tìrean Ìsle
 				gulden Eileanan Aintilia nan Tìrean Ìsle
+				ANG
 			
 			
 				Kwanza Angòlach
@@ -7469,6 +7554,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwanza Angòlach
 				kwanza Angòlach
 				kwanza Angòlach
+				AOA
+				Kz
 			
 			
 				Kwanza Angòlach (1977–1991)
@@ -7476,6 +7563,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwanza Angòlach (1977–1991)
 				kwanza Angòlach (1977–1991)
 				kwanza Angòlach (1977–1991)
+				AOK
 			
 			
 				Kwanza ùr Angòlach (1990–2000)
@@ -7483,6 +7571,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwanza ùr Angòlach (1990–2000)
 				kwanza ùr Angòlach (1990–2000)
 				kwanza ùr Angòlach (1990–2000)
+				AON
 			
 			
 				Kwanza ath-ghleusaichte Angòlach (1995–1999)
@@ -7490,6 +7579,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwanza ath-ghleusaichte Angòlach (1995–1999)
 				kwanza ath-ghleusaichte Angòlach (1995–1999)
 				kwanza ath-ghleusaichte Angòlach (1995–1999)
+				AOR
 			
 			
 				Austral Argantaineach
@@ -7497,6 +7587,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				austral Argantaineach
 				austral Argantaineach
 				austral Argantaineach
+				ARA
 			
 			
 				Peso ley Argantaineach (1970–1983)
@@ -7504,6 +7595,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso ley Argantaineach (1970–1983)
 				pesothan ley Argantaineach (1970–1983)
 				peso ley Argantaineach (1970–1983)
+				ARL
 			
 			
 				Peso Argantaineach (1881–1970)
@@ -7511,6 +7603,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Argantaineach (1881–1970)
 				pesothan Argantaineach (1881–1970)
 				peso Argantaineach (1881–1970)
+				ARM
 			
 			
 				Peso Argantaineach (1983–1985)
@@ -7518,6 +7611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Argantaineach (1983–1985)
 				pesothan Argantaineach (1983–1985)
 				peso Argantaineach (1983–1985)
+				ARP
 			
 			
 				Peso Argantaineach
@@ -7525,6 +7619,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Argantaineach
 				pesothan Argantaineach
 				peso Argantaineach
+				ARS
+				$
 			
 			
 				Schilling Ostaireach
@@ -7532,6 +7628,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				schilling Ostaireach
 				schilling Ostaireach
 				schilling Ostaireach
+				ATS
 			
 			
 				Dolar Astràilianach
@@ -7539,6 +7636,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Astràilianach
 				dolaran Astràilianach
 				dolar Astràilianach
+				A$
+				$
 			
 			
 				Florin Arùbach
@@ -7546,6 +7645,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhlorin Arùbach
 				florin Arùbach
 				florin Arùbach
+				AWG
 			
 			
 				Manat Asarbaideànach (1993–2006)
@@ -7553,6 +7653,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhanat Asarbaideànach (1993–2006)
 				manat Asarbaideànach (1993–2006)
 				manat Asarbaideànach (1993–2006)
+				AZM
 			
 			
 				Manat Asarbaideànach
@@ -7560,6 +7661,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhanat Asarbaideànach
 				manat Asarbaideànach
 				manat Asarbaideànach
+				AZN
 			
 			
 				Dinar Bhosna agus Hearsagobhana (1992–1994)
@@ -7567,6 +7669,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Bhosna agus Hearsagobhana (1992–1994)
 				dinar Bhosna agus Hearsagobhana (1992–1994)
 				dinar Bhosna agus Hearsagobhana (1992–1994)
+				BAD
 			
 			
 				Mark iompachail Bhosna agus Hearsagobhana
@@ -7574,6 +7677,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhark iompachail Bhosna agus Hearsagobhana
 				mark iompachail Bhosna agus Hearsagobhana
 				mark iompachail Bhosna agus Hearsagobhana
+				BAM
+				KM
 			
 			
 				Dinar ùr Bhosna agus Hearsagobhana (1994–1997)
@@ -7581,6 +7686,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar ùr Bhosna agus Hearsagobhana (1994–1997)
 				dinar ùr Bhosna agus Hearsagobhana (1994–1997)
 				dinar ùr Bhosna agus Hearsagobhana (1994–1997)
+				BAN
 			
 			
 				Dolar Barbadach
@@ -7588,6 +7694,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Barbadach
 				dolaran Barbadach
 				dolar Barbadach
+				BBD
+				$
 			
 			
 				Taka Bangladaiseach
@@ -7595,6 +7703,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				thaka Bangladaiseach
 				taka Bangladaiseach
 				taka Bangladaiseach
+				BDT
+				৳
 			
 			
 				Franc Beilgeach (iompachail)
@@ -7602,6 +7712,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Beilgeach (iompachail)
 				franc Beilgeach (iompachail)
 				franc Beilgeach (iompachail)
+				BEC
 			
 			
 				Franc Beilgeach
@@ -7609,6 +7720,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Beilgeach
 				franc Beilgeach
 				franc Beilgeach
+				BEF
 			
 			
 				Franc Beilgeach (ionmhasail)
@@ -7616,6 +7728,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Beilgeach (ionmhasail)
 				franc Beilgeach (ionmhasail)
 				franc Beilgeach (ionmhasail)
+				BEL
 			
 			
 				Lev cruaidh Bulgarach
@@ -7623,6 +7736,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev cruaidh Bulgarach
 				lev cruaidh Bulgarach
 				lev cruaidh Bulgarach
+				BGL
 			
 			
 				Lev sòisealach Bulgarach
@@ -7630,6 +7744,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev sòisealach Bulgarach
 				lev sòisealach Bulgarach
 				lev sòisealach Bulgarach
+				BGM
 			
 			
 				Lev Bulgarach
@@ -7637,6 +7752,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev Bulgarach
 				lev Bulgarach
 				lev Bulgarach
+				BGN
 			
 			
 				Lev Bulgarach (1879–1952)
@@ -7644,6 +7760,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lev Bulgarach (1879–1952)
 				lev Bulgarach (1879–1952)
 				lev Bulgarach (1879–1952)
+				BGO
 			
 			
 				Dinar Bachraineach
@@ -7651,6 +7768,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Bachraineach
 				dinar Bachraineach
 				dinar Bachraineach
+				BHD
 			
 			
 				Franc Burundaidheach
@@ -7658,6 +7776,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Burundaidheach
 				franc Burundaidheach
 				franc Burundaidheach
+				BIF
 			
 			
 				Dolar Bearmùdach
@@ -7665,6 +7784,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Bearmùdach
 				dolaran Bearmùdach
 				dolar Bearmùdach
+				BMD
+				$
 			
 			
 				Dolar Brùnaigheach
@@ -7672,6 +7793,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Brùnaigheach
 				dolaran Brùnaigheach
 				dolar Brùnaigheach
+				BND
+				$
 			
 			
 				Boliviano Boilibhiach
@@ -7679,6 +7802,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bholiviano Boilibhiach
 				boliviano Boilibhiach
 				boliviano Boilibhiach
+				BOB
+				Bs
 			
 			
 				Boliviano Boilibhiach (1863–1963)
@@ -7686,6 +7811,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bholiviano Boilibhiach (1863–1963)
 				boliviano Boilibhiach (1863–1963)
 				boliviano Boilibhiach (1863–1963)
+				BOL
 			
 			
 				Peso Boilibhiach
@@ -7693,6 +7819,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Boilibhiach
 				pesothan Boilibhiach
 				peso Boilibhiach
+				BOP
 			
 			
 				Mvdol Boilibhiach
@@ -7700,6 +7827,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mvdol Boilibhiach
 				mvdol Boilibhiach
 				mvdol Boilibhiach
+				BOV
 			
 			
 				Cruzeiro ùr Braisileach (1967–1986)
@@ -7707,6 +7835,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chruzeiro ùr Braisileach (1967–1986)
 				cruzeiro ùr Braisileach (1967–1986)
 				cruzeiro ùr Braisileach (1967–1986)
+				BRB
 			
 			
 				Cruzado Braisileach (1986–1989)
@@ -7714,6 +7843,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chruzado Braisileach (1986–1989)
 				cruzado Braisileach (1986–1989)
 				cruzado Braisileach (1986–1989)
+				BRC
 			
 			
 				Cruzeiro Braisileach (1990–1993)
@@ -7721,6 +7851,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chruzeiro Braisileach (1990–1993)
 				cruzeiro Braisileach (1990–1993)
 				cruzeiro Braisileach (1990–1993)
+				BRE
 			
 			
 				Real Braisileach
@@ -7728,6 +7859,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				real Braisileach
 				real Braisileach
 				real Braisileach
+				R$
+				R$
 			
 			
 				Cruzado ùr Braisileach (1989–1990)
@@ -7735,6 +7868,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chruzado ùr Braisileach (1989–1990)
 				cruzado ùr Braisileach (1989–1990)
 				cruzado ùr Braisileach (1989–1990)
+				BRN
 			
 			
 				Cruzeiro Braisileach (1993–1994)
@@ -7742,6 +7876,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chruzeiro Braisileach (1993–1994)
 				cruzeiro Braisileach (1993–1994)
 				cruzeiro Braisileach (1993–1994)
+				BRR
 			
 			
 				Cruzeiro Braisileach (1942–1967)
@@ -7749,6 +7884,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chruzeiro Braisileach (1942–1967)
 				cruzeiro Braisileach (1942–1967)
 				cruzeiro Braisileach (1942–1967)
+				BRZ
 			
 			
 				Dolar Bathamach
@@ -7756,6 +7892,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Bathamach
 				dolaran Bathamach
 				dolar Bathamach
+				BSD
+				$
 			
 			
 				Ngultrum Butànach
@@ -7763,6 +7901,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ngultrum Butànach
 				ngultrum Butànach
 				ngultrum Butànach
+				BTN
 			
 			
 				Kyat Burmach
@@ -7770,6 +7909,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kyat Burmach
 				kyat Burmach
 				kyat Burmach
+				BUK
 			
 			
 				Pula Botsuanach
@@ -7777,6 +7917,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phula Botsuanach
 				pula Botsuanach
 				pula Botsuanach
+				BWP
+				P
 			
 			
 				Rùbal ùr Bealaruiseach (1994–1999)
@@ -7784,6 +7926,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal ùr Bealaruiseach (1994–1999)
 				rùbalan ùra Bealaruiseach (1994–1999)
 				rùbal ùr Bealaruiseach (1994–1999)
+				BYB
 			
 			
 				Rùbal Bealaruiseach
@@ -7791,6 +7934,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Bealaruiseach
 				rùbalan Bealaruiseach
 				rùbal Bealaruiseach
+				BYN
+				р.
 			
 			
 				Rùbal Bealaruiseach (2000–2016)
@@ -7798,6 +7943,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Bealaruiseach (2000–2016)
 				rùbalan Bealaruiseach (2000–2016)
 				rùbal Bealaruiseach (2000–2016)
+				BYR
 			
 			
 				Dolar Beilìseach
@@ -7805,6 +7951,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Beilìseach
 				dolaran Beilìseach
 				dolar Beilìseach
+				BZD
+				$
 			
 			
 				Dolar Canadach
@@ -7812,6 +7960,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Canadach
 				dolaran Canadach
 				dolar Canadach
+				CA$
+				$
 			
 			
 				Franc Congothach
@@ -7819,6 +7969,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Congothach
 				franc Congothach
 				franc Congothach
+				CDF
 			
 			
 				Eòro WIR
@@ -7826,6 +7977,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Eòro WIR
 				Eòrothan WIR
 				Eòro WIR
+				CHE
 			
 			
 				Franc Eilbheiseach
@@ -7833,6 +7985,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Eilbheiseach
 				franc Eilbheiseach
 				franc Eilbheiseach
+				CHF
 			
 			
 				Franc WIR
@@ -7840,6 +7993,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc WIR
 				franc WIR
 				franc WIR
+				CHW
 			
 			
 				Escudo Sileach
@@ -7847,6 +8001,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Sileach
 				escudo Sileach
 				escudo Sileach
+				CLE
 			
 			
 				Aonad cunntasachd Sileach (UF)
@@ -7854,6 +8009,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad cunntasachd Sileach (UF)
 				aonadan cunntasachd Sileach (UF)
 				aonad cunntasachd Sileach (UF)
+				CLF
 			
 			
 				Peso Sileach
@@ -7861,6 +8017,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Sileach
 				pesothan Sileach
 				peso Sileach
+				CLP
+				$
 			
 			
 				Yuan Sìneach (far-thìreach)
@@ -7868,6 +8026,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				yuan Sìneach (far-thìreach)
 				yuan Sìneach (far-thìreach)
 				yuan Sìneach (far-thìreach)
+				CNH
 			
 			
 				Dolar an t-sluagh-bhanca Shìnich
@@ -7875,6 +8034,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar an t-sluagh-bhanca Shìnich
 				dolaran an t-sluagh-bhanca Shìnich
 				dolar an t-sluagh-bhanca Shìnich
+				CNX
 			
 			
 				Yuan Sìneach
@@ -7882,6 +8042,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				yuan Sìneach
 				yuan Sìneach
 				yuan Sìneach
+				CN¥
+				¥
 			
 			
 				Peso Coloimbeach
@@ -7889,6 +8051,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Coloimbeach
 				pesothan Coloimbeach
 				peso Coloimbeach
+				COP
+				$
 			
 			
 				Aonad fìor-luach Coloimbeach
@@ -7896,6 +8060,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad fìor-luach Coloimbeach
 				aonadan fìor-luach Coloimbeach
 				aonad fìor-luach Coloimbeach
+				COU
 			
 			
 				Colón Costa Rìceach
@@ -7903,6 +8068,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cholón Costa Rìceach
 				colón Costa Rìceach
 				colón Costa Rìceach
+				CRC
+				₡
 			
 			
 				Dinar Sèirbeach (2002–2006)
@@ -7910,6 +8077,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Sèirbeach (2002–2006)
 				dinar Sèirbeach (2002–2006)
 				dinar Sèirbeach (2002–2006)
+				CSD
 			
 			
 				Koruna cruaidh Seic-Slòbhacach
@@ -7917,6 +8085,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				koruna cruaidh Seic-Slòbhacach
 				koruna cruaidh Seic-Slòbhacach
 				koruna cruaidh Seic-Slòbhacach
+				CSK
 			
 			
 				Peso iompachail Cùbach
@@ -7924,6 +8093,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso iompachail Cùbach
 				pesothan iompachail Cùbach
 				peso iompachail Cùbach
+				CUC
+				$
 			
 			
 				Peso Cùbach
@@ -7931,6 +8102,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Cùbach
 				pesothan Cùbach
 				peso Cùbach
+				CUP
+				$
 			
 			
 				Escudo a’ Chip Uaine
@@ -7938,6 +8111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo a’ Chip Uaine
 				escudo a’ Chip Uaine
 				escudo a’ Chip Uaine
+				CVE
 			
 			
 				Punnd Cìoprasach
@@ -7945,6 +8119,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Cìoprasach
 				puinnd Chìoprasach
 				punnd Cìoprasach
+				CYP
 			
 			
 				Koruna Seiceach
@@ -7952,6 +8127,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				koruna Seiceach
 				koruna Seiceach
 				koruna Seiceach
+				CZK
+				Kč
 			
 			
 				Mark na Gearmailte an Ear
@@ -7959,6 +8136,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhark na Gearmailte an Ear
 				mark na Gearmailte an Ear
 				mark na Gearmailte an Ear
+				DDM
 			
 			
 				Mark Gearmailteach
@@ -7966,6 +8144,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhark Gearmailteach
 				mark Gearmailteach
 				mark Gearmailteach
+				DEM
 			
 			
 				Franc Diobùtaidheach
@@ -7973,6 +8152,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Diobùtaidheach
 				franc Diobùtaidheach
 				franc Diobùtaidheach
+				DJF
 			
 			
 				Krone Danmhairgeach
@@ -7980,6 +8160,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				krone Danmhairgeach
 				kroner Danmhairgeach
 				krone Danmhairgeach
+				DKK
+				kr
 			
 			
 				Peso Doiminiceach
@@ -7987,6 +8169,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Doiminiceach
 				pesothan Doiminiceach
 				peso Doiminiceach
+				DOP
+				$
 			
 			
 				Dinar Aildireach
@@ -7994,6 +8178,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Aildireach
 				dinar Aildireach
 				dinar Aildireach
+				DZD
 			
 			
 				Sucre Eacuadorach
@@ -8001,6 +8186,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shucre Eacuadorach
 				sucre Eacuadorach
 				sucre Eacuadorach
+				ECS
 			
 			
 				Aonad luach chunbhalaich Eacuadorach
@@ -8008,6 +8194,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad luach chunbhalaich Eacuadorach
 				aonadan luach chunbhalaich Eacuadorach
 				aonad luach chunbhalaich Eacuadorach
+				ECV
 			
 			
 				Kroon Eastoineach
@@ -8015,6 +8202,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kroon Eastoineach
 				kroon Eastoineach
 				kroon Eastoineach
+				EEK
 			
 			
 				Punnd Èipheiteach
@@ -8022,6 +8210,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Èipheiteach
 				puinnd Èipheiteach
 				punnd Èipheiteach
+				EGP
+				E£
 			
 			
 				Nakfa Eartrach
@@ -8029,6 +8219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				nakfa Eartrach
 				nakfa Eartrach
 				nakfa Eartrach
+				ERN
 			
 			
 				Peseta Spàinnteach (cunntas A)
@@ -8036,6 +8227,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheseta Spàinnteach (cunntas A)
 				peseta Spàinnteach (cunntas A)
 				peseta Spàinnteach (cunntas A)
+				ESA
 			
 			
 				Peseta Spàinnteach (cunntas iompachail)
@@ -8043,6 +8235,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheseta Spàinnteach (cunntas iompachail)
 				peseta Spàinnteach (cunntas iompachail)
 				peseta Spàinnteach (cunntas iompachail)
+				ESB
 			
 			
 				Peseta Spàinnteach
@@ -8050,6 +8243,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheseta Spàinnteach
 				peseta Spàinnteach
 				peseta Spàinnteach
+				ESP
+				₧
 			
 			
 				Birr Itiopach
@@ -8057,6 +8252,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bhirr Itiopach
 				birr Itiopach
 				birr Itiopach
+				ETB
 			
 			
 				Eòro
@@ -8064,6 +8260,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Eòro
 				Eòrothan
 				Eòro
+				€
+				€
 			
 			
 				Markka Fionnlannach
@@ -8071,6 +8269,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mharkka Fionnlannach
 				markka Fionnlannach
 				markka Fionnlannach
+				FIM
 			
 			
 				Dolar Fìditheach
@@ -8078,6 +8277,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Fìditheach
 				dolaran Fìditheach
 				dolar Fìditheach
+				FJD
+				$
 			
 			
 				Punnd Fàclannach
@@ -8085,6 +8286,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Fàclannach
 				puinnd Fhàclannach
 				punnd Fàclannach
+				FKP
+				£
 			
 			
 				Franc Frangach
@@ -8092,6 +8295,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Frangach
 				franc Frangach
 				franc Frangach
+				FRF
 			
 			
 				Punnd Sasannach
@@ -8099,6 +8303,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Sasannach
 				puinnd Shasannach
 				punnd Sasannach
+				£
+				£
 			
 			
 				Kupon larit Cairtbheileach
@@ -8106,6 +8312,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kupon larit Cairtbheileach
 				kupon larit Cairtbheileach
 				kupon larit Cairtbheileach
+				GEK
 			
 			
 				Lari Cairtbheileach
@@ -8113,6 +8320,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lari Cairtbheileach
 				lari Cairtbheileach
 				lari Cairtbheileach
+				GEL
+				₾
 			
 			
 				Cedi Gànach (1979–2007)
@@ -8120,6 +8329,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chedi Gànach (1979–2007)
 				cedi Gànach (1979–2007)
 				cedi Gànach (1979–2007)
+				GHC
 			
 			
 				Cedi Gànach
@@ -8127,6 +8337,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chedi Gànach
 				cedi Gànach
 				cedi Gànach
+				GHS
 			
 			
 				Punnd Diobraltarach
@@ -8134,6 +8345,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Diobraltarach
 				puinnd Dhiobraltarach
 				punnd Diobraltarach
+				GIP
+				£
 			
 			
 				Dalasi Gaimbitheach
@@ -8141,6 +8354,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhalasi Gaimbitheach
 				dalasi Gaimbitheach
 				dalasi Gaimbitheach
+				GMD
 			
 			
 				Franc Ginitheach
@@ -8148,6 +8362,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Ginitheach
 				franc Ginitheach
 				franc Ginitheach
+				GNF
+				FG
 			
 			
 				Syli Ginitheach
@@ -8155,6 +8371,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shyli Ginitheach
 				syli Ginitheach
 				syli Ginitheach
+				GNS
 			
 			
 				Ekwele Gini Meadhan-Chriosaich
@@ -8162,6 +8379,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ekwele Gini Meadhan-Chriosaich
 				ekwele Gini Meadhan-Chriosaich
 				ekwele Gini Meadhan-Chriosaich
+				GQE
 			
 			
 				Drachma Greugach
@@ -8169,6 +8387,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhrachma Greugach
 				drachma Greugach
 				drachma Greugach
+				GRD
 			
 			
 				Quetzal Guatamalach
@@ -8176,6 +8395,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				quetzal Guatamalach
 				quetzal Guatamalach
 				quetzal Guatamalach
+				GTQ
+				Q
 			
 			
 				Escudo Gini na Portagaile
@@ -8183,6 +8404,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Gini na Portagaile
 				escudo Gini na Portagaile
 				escudo Gini na Portagaile
+				GWE
 			
 			
 				Peso Gini-Biosothach
@@ -8190,6 +8412,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Gini-Biosothach
 				pesothan Gini-Biosothach
 				peso Gini-Biosothach
+				GWP
 			
 			
 				Dolar Guidheànach
@@ -8197,6 +8420,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Guidheànach
 				dolaran Guidheànach
 				dolar Guidheànach
+				GYD
+				$
 			
 			
 				Dolar Hong Kong
@@ -8204,6 +8429,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Hong Kong
 				dolaran Hong Kong
 				dolar Hong Kong
+				HK$
+				$
 			
 			
 				Lempira Hondùrach
@@ -8211,6 +8438,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lempira Hondùrach
 				lempira Hondùrach
 				lempira Hondùrach
+				HNL
+				L
 			
 			
 				Dinar Cròthaiseach
@@ -8218,6 +8447,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Cròthaiseach
 				dinar Cròthaiseach
 				dinar Cròthaiseach
+				HRD
 			
 			
 				Kuna Cròthaiseach
@@ -8225,6 +8455,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kuna Cròthaiseach
 				kuna Cròthaiseach
 				kuna Cròthaiseach
+				HRK
+				kn
 			
 			
 				Gourde Haidhteach
@@ -8232,6 +8464,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ghourde Haidhteach
 				gourde Haidhteach
 				gourde Haidhteach
+				HTG
 			
 			
 				Forint Ungaireach
@@ -8239,6 +8472,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhorint Ungaireach
 				forint Ungaireach
 				forint Ungaireach
+				HUF
+				Ft
 			
 			
 				Rupiah Innd-Innseach
@@ -8246,6 +8481,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupiah Innd-Innseach
 				rupiah Innd-Innseach
 				rupiah Innd-Innseach
+				IDR
+				Rp
 			
 			
 				Punnd Èireannach
@@ -8253,6 +8490,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Èireannach
 				puinnd Èireannach
 				punnd Èireannach
+				IEP
 			
 			
 				Punnd Iosraeleach
@@ -8260,6 +8498,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Iosraeleach
 				puinnd Iosraeleach
 				punnd Iosraeleach
+				ILP
 			
 			
 				Sheqel Iosraeleach (1980–1985)
@@ -8267,6 +8506,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sheqel Iosraeleach (1980–1985)
 				sheqel Iosraeleach (1980–1985)
 				sheqel Iosraeleach (1980–1985)
+				ILR
 			
 			
 				Sheqel ùr Iosraeleach
@@ -8274,6 +8514,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sheqel ùr Iosraeleach
 				sheqel ùr Iosraeleach
 				sheqel ùr Iosraeleach
+				₪
+				₪
 			
 			
 				Rupee Innseanach
@@ -8281,6 +8523,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Innseanach
 				rupee Innseanach
 				rupee Innseanach
+				₹
+				₹
 			
 			
 				Dinar Ioràcach
@@ -8288,6 +8532,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Ioràcach
 				dinar Ioràcach
 				dinar Ioràcach
+				IQD
 			
 			
 				Rial Iorànach
@@ -8295,6 +8540,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Iorànach
 				rial Iorànach
 				rial Iorànach
+				IRR
 			
 			
 				Króna Innis Tìleach (1918–1981)
@@ -8302,6 +8548,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				króna Innis Tìleach (1918–1981)
 				krónur Innis Tìleach (1918–1981)
 				króna Innis Tìleach (1918–1981)
+				ISJ
 			
 			
 				Króna Innis Tìleach
@@ -8309,6 +8556,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				króna Innis Tìleach
 				krónur Innis Tìleach
 				króna Innis Tìleach
+				ISK
+				kr
 			
 			
 				Lira Eadailteach
@@ -8316,6 +8565,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lira Eadailteach
 				lira Eadailteach
 				lira Eadailteach
+				ITL
 			
 			
 				Dolar Diameugach
@@ -8323,6 +8573,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Diameugach
 				dolaran Diameugach
 				dolar Diameugach
+				JMD
+				$
 			
 			
 				Dinar Iòrdanach
@@ -8330,6 +8582,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Iòrdanach
 				dinar Iòrdanach
 				dinar Iòrdanach
+				JOD
 			
 			
 				Yen Seapanach
@@ -8337,6 +8590,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				yen Seapanach
 				yen Seapanach
 				yen Seapanach
+				JP¥
+				¥
 			
 			
 				Shilling Ceineach
@@ -8344,6 +8599,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Ceineach
 				shilling Ceineach
 				shilling Ceineach
+				KES
 			
 			
 				Som Cìorgasach
@@ -8351,6 +8607,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shom Cìorgasach
 				som Cìorgasach
 				som Cìorgasach
+				KGS
 			
 			
 				Riel Cambuideach
@@ -8358,6 +8615,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				riel Cambuideach
 				riel Cambuideach
 				riel Cambuideach
+				KHR
+				៛
 			
 			
 				Franc Comorosach
@@ -8365,6 +8624,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Comorosach
 				franc Comorosach
 				franc Comorosach
+				KMF
+				CF
 			
 			
 				Won Choirèa a Tuath
@@ -8372,6 +8633,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				won Choirèa a Tuath
 				won Choirèa a Tuath
 				won Choirèa a Tuath
+				KPW
+				₩
 			
 			
 				Hwan Choirèa a Deas (1953–1962)
@@ -8379,6 +8642,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hwan Choirèa a Deas (1953–1962)
 				hwan Choirèa a Deas (1953–1962)
 				hwan Choirèa a Deas (1953–1962)
+				KRH
 			
 			
 				Won Choirèa a Deas (1945–1953)
@@ -8386,6 +8650,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				won Choirèa a Deas (1945–1953)
 				won Choirèa a Deas (1945–1953)
 				won Choirèa a Deas (1945–1953)
+				KRO
 			
 			
 				Won Choirèa a Deas
@@ -8393,6 +8658,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				won Choirèa a Deas
 				won Choirèa a Deas
 				won Choirèa a Deas
+				₩
+				₩
 			
 			
 				Dinar Cuibhèiteach
@@ -8400,6 +8667,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Cuibhèiteach
 				dinar Cuibhèiteach
 				dinar Cuibhèiteach
+				KWD
 			
 			
 				Dolar Caimeanach
@@ -8407,6 +8675,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Caimeanach
 				dolaran Caimeanach
 				dolar Caimeanach
+				KYD
+				$
 			
 			
 				Tenge Casachach
@@ -8414,6 +8684,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				thenge Casachach
 				tenge Casachach
 				tenge Casachach
+				KZT
+				₸
 			
 			
 				Kip Làthosach
@@ -8421,6 +8693,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kip Làthosach
 				kip Làthosach
 				kip Làthosach
+				LAK
+				₭
 			
 			
 				Punnd Leabanach
@@ -8428,6 +8702,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Leabanach
 				puinnd Leabanach
 				punnd Leabanach
+				LBP
+				L£
 			
 			
 				Rupee Sri Lancach
@@ -8435,6 +8711,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Sri Lancach
 				rupee Sri Lancach
 				rupee Sri Lancach
+				LKR
+				Rs
 			
 			
 				Dolar Libèireach
@@ -8442,6 +8720,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Libèireach
 				dolaran Libèireach
 				dolar Libèireach
+				LRD
+				$
 			
 			
 				Loti Leasotach
@@ -8449,6 +8729,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				loti Leasotach
 				loti Leasotach
 				loti Leasotach
+				LSL
 			
 			
 				Litas Liotuaineach
@@ -8456,6 +8737,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				litas Liotuaineach
 				litas Liotuaineach
 				litas Liotuaineach
+				LTL
+				Lt
 			
 			
 				Talonas Liotuaineach
@@ -8463,6 +8746,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				thalonas Liotuaineach
 				talonas Liotuaineach
 				talonas Liotuaineach
+				LTT
 			
 			
 				Franc iompachail Lugsamburgach
@@ -8470,6 +8754,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc iompachail Lugsamburgach
 				franc iompachail Lugsamburgach
 				franc iompachail Lugsamburgach
+				LUC
 			
 			
 				Franc Lugsamburgach
@@ -8477,6 +8762,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Lugsamburgach
 				franc Lugsamburgach
 				franc Lugsamburgach
+				LUF
 			
 			
 				Franc ionmhasail Lugsamburgach
@@ -8484,6 +8770,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc ionmhasail Lugsamburgach
 				franc ionmhasail Lugsamburgach
 				franc ionmhasail Lugsamburgach
+				LUL
 			
 			
 				Lats Laitbheach
@@ -8491,6 +8778,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lats Laitbheach
 				lats Laitbheach
 				lats Laitbheach
+				LVL
+				Ls
 			
 			
 				Rùbal Laitbheach
@@ -8498,6 +8787,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Laitbheach
 				rùbalan Laitbheach
 				rùbal Laitbheach
+				LVR
 			
 			
 				Dinar Libitheach
@@ -8505,6 +8795,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Libitheach
 				dinar Libitheach
 				dinar Libitheach
+				LYD
 			
 			
 				Dirham Morocach
@@ -8512,6 +8803,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhirham Morocach
 				dirham Morocach
 				dirham Morocach
+				MAD
 			
 			
 				Franc Morocach
@@ -8519,6 +8811,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Morocach
 				franc Morocach
 				franc Morocach
+				MAF
 			
 			
 				Franc Monacach
@@ -8526,6 +8819,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Monacach
 				franc Monacach
 				franc Monacach
+				MCF
 			
 			
 				Cupon Moldobhach
@@ -8533,6 +8827,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chupon Moldobhach
 				cupon Moldobhach
 				cupon Moldobhach
+				MDC
 			
 			
 				Leu Moldobhach
@@ -8540,6 +8835,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leu Moldobhach
 				leu Moldobhach
 				leu Moldobhach
+				MDL
 			
 			
 				Ariary Madagasgarach
@@ -8547,6 +8843,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ariary Madagasgarach
 				ariary Madagasgarach
 				ariary Madagasgarach
+				MGA
+				Ar
 			
 			
 				Franc Madagasgarach
@@ -8554,6 +8852,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Madagasgarach
 				franc Madagasgarach
 				franc Madagasgarach
+				MGF
 			
 			
 				Denar Masadonach
@@ -8561,6 +8860,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhenar Masadonach
 				denar Masadonach
 				denar Masadonach
+				MKD
 			
 			
 				Denar Masadonach (1992–1993)
@@ -8568,6 +8868,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhenar Masadonach (1992–1993)
 				denar Masadonach (1992–1993)
 				denar Masadonach (1992–1993)
+				MKN
 			
 			
 				Franc Màilitheach
@@ -8575,6 +8876,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Màilitheach
 				franc Màilitheach
 				franc Màilitheach
+				MLF
 			
 			
 				Kyat Miànmarach
@@ -8582,6 +8884,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kyat Miànmarach
 				kyat Miànmarach
 				kyat Miànmarach
+				MMK
+				K
 			
 			
 				Tugrik Mongolach
@@ -8589,6 +8893,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				thugrik Mongolach
 				tugrik Mongolach
 				tugrik Mongolach
+				MNT
+				₮
 			
 			
 				Pataca Macàthuach
@@ -8596,6 +8902,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phataca Macàthuach
 				pataca Macàthuach
 				pataca Macàthuach
+				MOP
 			
 			
 				Ouguiya Moratàineach (1973–2017)
@@ -8603,6 +8910,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ouguiya Moratàineach (1973–2017)
 				ouguiya Moratàineach (1973–2017)
 				ouguiya Moratàineach (1973–2017)
+				MRO
 			
 			
 				Ouguiya Moratàineach
@@ -8610,6 +8918,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ouguiya Moratàineach
 				ouguiya Moratàineach
 				ouguiya Moratàineach
+				MRU
 			
 			
 				Lira Maltach
@@ -8617,6 +8926,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lira Maltach
 				lira Maltach
 				lira Maltach
+				MTL
 			
 			
 				Punnd Maltach
@@ -8624,6 +8934,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Maltach
 				puinnd Mhaltach
 				punnd Maltach
+				MTP
 			
 			
 				Rupee Moiriseasach
@@ -8631,6 +8942,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Moiriseasach
 				rupee Moiriseasach
 				rupee Moiriseasach
+				MUR
+				Rs
 			
 			
 				Rupee Maladaibheach
@@ -8638,6 +8951,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Maladaibheach
 				rupee Maladaibheach
 				rupee Maladaibheach
+				MVP
 			
 			
 				Rufiyaa Maladaibheach
@@ -8645,6 +8959,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rufiyaa Maladaibheach
 				rufiyaa Maladaibheach
 				rufiyaa Maladaibheach
+				MVR
 			
 			
 				Kwacha Malabhaidheach
@@ -8652,6 +8967,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwacha Malabhaidheach
 				kwacha Malabhaidheach
 				kwacha Malabhaidheach
+				MWK
 			
 			
 				Peso Meagsagach
@@ -8659,6 +8975,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Meagsagach
 				pesothan Meagsagach
 				peso Meagsagach
+				MX$
+				$
 			
 			
 				Peso airgid Meagsagach (1861–1992)
@@ -8666,6 +8984,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso airgid Meagsagach (1861–1992)
 				pesothan airgid Meagsagach (1861–1992)
 				peso airgid Meagsagach (1861–1992)
+				MXP
 			
 			
 				Aonad inbheistidh Meagsagach
@@ -8673,6 +8992,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad inbheistidh Meagsagach
 				aonadan inbheistidh Meagsagach
 				aonad inbheistidh Meagsagach
+				MXV
 			
 			
 				Ringgit Malaidheach
@@ -8680,6 +9000,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ringgit Malaidheach
 				ringgit Malaidheach
 				ringgit Malaidheach
+				MYR
+				RM
 			
 			
 				Escudo Mòsaimbiceach
@@ -8687,6 +9009,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Mòsaimbiceach
 				escudo Mòsaimbiceach
 				escudo Mòsaimbiceach
+				MZE
 			
 			
 				Metical Mòsaimbiceach (1980–2006)
@@ -8694,6 +9017,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhetical Mòsaimbiceach (1980–2006)
 				metical Mòsaimbiceach (1980–2006)
 				metical Mòsaimbiceach (1980–2006)
+				MZM
 			
 			
 				Metical Mòsaimbiceach
@@ -8701,6 +9025,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhetical Mòsaimbiceach
 				metical Mòsaimbiceach
 				metical Mòsaimbiceach
+				MZN
 			
 			
 				Dolar Naimibitheach
@@ -8708,6 +9033,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Naimibitheach
 				dolaran Naimibitheach
 				dolar Naimibitheach
+				NAD
+				$
 			
 			
 				Naira Nigèiriach
@@ -8715,6 +9042,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				naira Nigèiriach
 				naira Nigèiriach
 				naira Nigèiriach
+				NGN
+				₦
 			
 			
 				Córdoba Niocaragach (1988–1991)
@@ -8722,6 +9051,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chórdoba Niocaragach (1988–1991)
 				córdoba Niocaragach (1988–1991)
 				córdoba Niocaragach (1988–1991)
+				NIC
 			
 			
 				Córdoba Niocaragach
@@ -8729,6 +9059,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chórdoba Niocaragach
 				córdoba Niocaragach
 				córdoba Niocaragach
+				NIO
+				C$
 			
 			
 				Gulden Duitseach
@@ -8736,6 +9068,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ghulden Duitseach
 				gulden Duitseach
 				gulden Duitseach
+				NLG
 			
 			
 				Krone Nirribheach
@@ -8743,6 +9076,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				krone Nirribheach
 				kroner Nirribheach
 				krone Nirribheach
+				NOK
+				kr
 			
 			
 				Rupee Neapàlach
@@ -8750,6 +9085,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Neapàlach
 				rupee Neapàlach
 				rupee Neapàlach
+				NPR
+				Rs
 			
 			
 				Dolar Shealainn Nuaidh
@@ -8757,6 +9094,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Shealainn Nuaidh
 				dolaran Shealainn Nuaidh
 				dolar Shealainn Nuaidh
+				NZ$
+				$
 			
 			
 				Rial Omànach
@@ -8764,6 +9103,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Omànach
 				rial Omànach
 				rial Omànach
+				OMR
 			
 			
 				Balboa Panamach
@@ -8771,6 +9111,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bhalboa Panamach
 				balboa Panamach
 				balboa Panamach
+				PAB
 			
 			
 				Inti Pearùthach
@@ -8778,6 +9119,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				inti Pearùthach
 				inti Pearùthach
 				inti Pearùthach
+				PEI
 			
 			
 				Sol Pearùthach
@@ -8785,6 +9127,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shol Pearùthach
 				sol Pearùthach
 				sol Pearùthach
+				PEN
 			
 			
 				Sol Pearùthach (1863–1965)
@@ -8792,6 +9135,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shol Pearùthach (1863–1965)
 				sol Pearùthach (1863–1965)
 				sol Pearùthach (1863–1965)
+				PES
 			
 			
 				Kina Ghini Nuaidh Paputhaiche
@@ -8799,6 +9143,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kina Ghini Nuaidh Paputhaiche
 				kina Ghini Nuaidh Paputhaiche
 				kina Ghini Nuaidh Paputhaiche
+				PGK
 			
 			
 				Peso Filipineach
@@ -8806,6 +9151,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Filipineach
 				pesothan Filipineach
 				peso Filipineach
+				PHP
+				₱
 			
 			
 				Rupee Pagastànach
@@ -8813,6 +9160,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Pagastànach
 				rupee Pagastànach
 				rupee Pagastànach
+				PKR
+				Rs
 			
 			
 				Złoty Pòlainneach
@@ -8820,6 +9169,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				złoty Pòlainneach
 				złoty Pòlainneach
 				złoty Pòlainneach
+				PLN
+				zł
 			
 			
 				Złoty Pòlainneach (1950–1995)
@@ -8827,6 +9178,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				złoty Pòlainneach (1950–1995)
 				złoty Pòlainneach (1950–1995)
 				złoty Pòlainneach (1950–1995)
+				PLZ
 			
 			
 				Escudo Portagaileach
@@ -8834,6 +9186,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Portagaileach
 				escudo Portagaileach
 				escudo Portagaileach
+				PTE
 			
 			
 				Guaraní Paraguaidheach
@@ -8841,6 +9194,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ghuaraní Paraguaidheach
 				guaraní Paraguaidheach
 				guaraní Paraguaidheach
+				PYG
+				₲
 			
 			
 				Rial Catarach
@@ -8848,6 +9203,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Catarach
 				rial Catarach
 				rial Catarach
+				QAR
 			
 			
 				Dolar Rhodesiach
@@ -8855,6 +9211,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Rhodesiach
 				dolaran Rhodesiach
 				dolar Rhodesiach
+				RHD
 			
 			
 				Leu Romàineach (1952–2006)
@@ -8862,6 +9219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leu Romàineach (1952–2006)
 				leu Romàineach (1952–2006)
 				leu Romàineach (1952–2006)
+				ROL
 			
 			
 				Leu Romàineach
@@ -8869,6 +9227,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leu Romàineach
 				leu Romàineach
 				leu Romàineach
+				RON
 				leu
 			
 			
@@ -8877,6 +9236,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Sèirbeach
 				dinar Sèirbeach
 				dinar Sèirbeach
+				RSD
 			
 			
 				Rùbal Ruiseach
@@ -8884,6 +9244,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Ruiseach
 				rùbalan Ruiseach
 				rùbal Ruiseach
+				RUB
+				₽
 			
 			
 				Rùbal Ruiseach (1991–1998)
@@ -8891,6 +9253,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Ruiseach (1991–1998)
 				rùbalan Ruiseach (1991–1998)
 				rùbal Ruiseach (1991–1998)
+				RUR
+				р.
 			
 			
 				Franc Rubhandach
@@ -8898,6 +9262,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc Rubhandach
 				franc Rubhandach
 				franc Rubhandach
+				RWF
+				RF
 			
 			
 				Riyal Sabhdach
@@ -8905,6 +9271,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				riyal Sabhdach
 				riyal Sabhdach
 				riyal Sabhdach
+				SAR
 			
 			
 				Dolar Eileanan Sholaimh
@@ -8912,6 +9279,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Eileanan Sholaimh
 				dolaran Eileanan Sholaimh
 				dolar Eileanan Sholaimh
+				SBD
+				$
 			
 			
 				Rupee Seiseallach
@@ -8919,6 +9288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rupee Seiseallach
 				rupee Seiseallach
 				rupee Seiseallach
+				SCR
 			
 			
 				Dinar Sudànach (1992–2007)
@@ -8926,6 +9296,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Sudànach (1992–2007)
 				dinar Sudànach (1992–2007)
 				dinar Sudànach (1992–2007)
+				SDD
 			
 			
 				Punnd Sudànach
@@ -8933,6 +9304,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Sudànach
 				puinnd Shudànach
 				punnd Sudànach
+				SDG
 			
 			
 				Punnd Sudànach (1957–1998)
@@ -8940,6 +9312,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Sudànach (1957–1998)
 				puinnd Shudànach (1957–1998)
 				punnd Sudànach (1957–1998)
+				SDP
 			
 			
 				Krona Suaineach
@@ -8947,6 +9320,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				krona Suaineach
 				kronor Suaineach
 				krona Suaineach
+				SEK
+				kr
 			
 			
 				Dolar Singeapòrach
@@ -8954,6 +9329,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Singeapòrach
 				dolaran Singeapòrach
 				dolar Singeapòrach
+				SGD
+				$
 			
 			
 				Punnd Eilean Naomh Eilidh
@@ -8961,6 +9338,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Eilean Naomh Eilidh
 				puinnd Eilean Naomh Eilidh
 				punnd Eilean Naomh Eilidh
+				SHP
+				£
 			
 			
 				Tolar Slòbhaineach
@@ -8968,6 +9347,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				tholar Slòbhaineach
 				tolar Slòbhaineach
 				tolar Slòbhaineach
+				SIT
 			
 			
 				Koruna Slòbhacach
@@ -8975,6 +9355,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				koruna Slòbhacach
 				koruna Slòbhacach
 				koruna Slòbhacach
+				SKK
 			
 			
 				Leone Siarra Leòmhannach
@@ -8982,6 +9363,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				leone Siarra Leòmhannach
 				leone Siarra Leòmhannach
 				leone Siarra Leòmhannach
+				SLL
 			
 			
 				Shilling Somàilitheach
@@ -8989,6 +9371,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Somàilitheach
 				shilling Somàilitheach
 				shilling Somàilitheach
+				SOS
 			
 			
 				Dolar Suranamach
@@ -8996,6 +9379,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Suranamach
 				dolaran Suranamach
 				dolar Suranamach
+				SRD
+				$
 			
 			
 				Gulden Suranamach
@@ -9003,6 +9388,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ghulden Suranamach
 				gulden Suranamach
 				gulden Suranamach
+				SRG
 			
 			
 				Punnd Sudàin a Deas
@@ -9010,6 +9396,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Sudàin a Deas
 				puinnd Shudàin a Deas
 				punnd Sudàin a Deas
+				SSP
+				£
 			
 			
 				Dobra São Tomé agus Príncipe (1977–2017)
@@ -9017,6 +9405,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhobra São Tomé agus Príncipe (1977–2017)
 				dobra São Tomé agus Príncipe (1977–2017)
 				dobra São Tomé agus Príncipe (1977–2017)
+				STD
 			
 			
 				Dobra São Tomé agus Príncipe
@@ -9024,6 +9413,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhobra São Tomé agus Príncipe
 				dobra São Tomé agus Príncipe
 				dobra São Tomé agus Príncipe
+				STN
+				Db
 			
 			
 				Rùbal Sovietach
@@ -9031,6 +9422,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Sovietach
 				rùbalan Sovietach
 				rùbal Sovietach
+				SUR
 			
 			
 				Colón Salbhadorach
@@ -9038,6 +9430,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				cholón Salbhadorach
 				colón Salbhadorach
 				colón Salbhadorach
+				SVC
 			
 			
 				Punnd Siridheach
@@ -9045,6 +9438,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phunnd Siridheach
 				puinnd Shiridheach
 				punnd Siridheach
+				SYP
+				£
 			
 			
 				Lilangeni Suasaidheach
@@ -9052,6 +9447,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lilangeni Suasaidheach
 				lilangeni Suasaidheach
 				lilangeni Suasaidheach
+				SZL
 			
 			
 				Baht Tàidheach
@@ -9060,6 +9456,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				baht Tàidheach
 				baht Tàidheach
 				฿
+				฿
 			
 			
 				Rùbal Taidigeach
@@ -9067,6 +9464,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rùbal Taidigeach
 				rùbalan Taidigeach
 				rùbal Taidigeach
+				TJR
 			
 			
 				Somoni Taidigeach
@@ -9074,6 +9472,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shomoni Taidigeach
 				somoni Taidigeach
 				somoni Taidigeach
+				TJS
 			
 			
 				Manat Turcmanach (1993–2009)
@@ -9081,6 +9480,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhanat Turcmanach (1993–2009)
 				manat Turcmanach (1993–2009)
 				manat Turcmanach (1993–2009)
+				TMM
 			
 			
 				Manat Turcmanach
@@ -9088,6 +9488,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mhanat Turcmanach
 				manat Turcmanach
 				manat Turcmanach
+				TMT
 			
 			
 				Dinar Tuiniseach
@@ -9095,6 +9496,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Tuiniseach
 				dinar Tuiniseach
 				dinar Tuiniseach
+				TND
 			
 			
 				Paʻanga Tongach
@@ -9102,6 +9504,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				phaʻanga Tongach
 				paʻanga Tongach
 				paʻanga Tongach
+				TOP
+				T$
 			
 			
 				Escudo Tìomorach
@@ -9109,6 +9513,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				escudo Tìomorach
 				escudo Tìomorach
 				escudo Tìomorach
+				TPE
 			
 			
 				Lira Turcach (1922–2005)
@@ -9116,6 +9521,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lira Turcach (1922–2005)
 				lira Turcach (1922–2005)
 				lira Turcach (1922–2005)
+				TRL
 			
 			
 				Lira Turcach
@@ -9123,6 +9529,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				lira Turcach
 				lira Turcach
 				lira Turcach
+				TRY
+				₺
+				TL
 			
 			
 				Dolar Thrianaid agus Thobago
@@ -9130,6 +9539,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Thrianaid agus Thobago
 				dolaran Thrianaid agus Thobago
 				dolar Thrianaid agus Thobago
+				TTD
+				$
 			
 			
 				Dolar ùr Taidh-Bhànach
@@ -9137,6 +9548,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar ùr Taidh-Bhànach
 				dolaran ùra Taidh-Bhànach
 				dolar ùr Taidh-Bhànach
+				NT$
 				NT$
 			
 			
@@ -9145,6 +9557,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Tansanaidheach
 				shilling Tansanaidheach
 				shilling Tansanaidheach
+				TZS
 			
 			
 				Hryvnia Ucràineach
@@ -9152,6 +9565,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hryvnia Ucràineach
 				hryvnia Ucràineach
 				hryvnia Ucràineach
+				UAH
+				₴
 			
 			
 				Karbovanets Ucràineach
@@ -9159,6 +9574,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				karbovanets Ucràineach
 				karbovanets Ucràineach
 				karbovanets Ucràineach
+				UAK
 			
 			
 				Shilling Ugandach (1966–1987)
@@ -9166,6 +9582,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Ugandach (1966–1987)
 				shilling Ugandach (1966–1987)
 				shilling Ugandach (1966–1987)
+				UGS
 			
 			
 				Shilling Ugandach
@@ -9173,6 +9590,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shilling Ugandach
 				shilling Ugandach
 				shilling Ugandach
+				UGX
 			
 			
 				Dolar nan Stàitean Aonaichte
@@ -9181,6 +9599,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dolaran nan Stàitean Aonaichte
 				dolar nan Stàitean Aonaichte
 				$
+				$
 			
 			
 				Dolar nan SA (an ath–latha)
@@ -9188,6 +9607,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar nan SA (an ath–latha)
 				dolaran nan SA (an ath–latha)
 				dolar nan SA (an ath–latha)
+				USN
 			
 			
 				Dolar nan SA (an aon latha)
@@ -9195,6 +9615,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar nan SA (an aon latha)
 				dolaran nan SA (an aon latha)
 				dolar nan SA (an aon latha)
+				USS
 			
 			
 				Peso Uruguaidheach (aonadan inneacsaichte)
@@ -9202,6 +9623,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Uruguaidheach (aonadan inneacsaichte)
 				pesothan Uruguaidheach (aonadan inneacsaichte)
 				peso Uruguaidheach (aonadan inneacsaichte)
+				UYI
 			
 			
 				Peso Uruguaidheach (1975–1993)
@@ -9209,6 +9631,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Uruguaidheach (1975–1993)
 				pesothan Uruguaidheach (1975–1993)
 				peso Uruguaidheach (1975–1993)
+				UYP
 			
 			
 				Peso Uruguaidheach
@@ -9216,6 +9639,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				pheso Uruguaidheach
 				pesothan Uruguaidheach
 				peso Uruguaidheach
+				UYU
+				$
+			
+			
+				aonad inneacs tuarastail ainmeach Uruguaidh
+				aonad inneacs tuarastail ainmeach Uruguaidh
+				aonad inneacs tuarastail ainmeach Uruguaidh
+				aonadan inneacs tuarastail ainmeach Uruguaidh
+				aonad inneacs tuarastail ainmeach Uruguaidh
 			
 			
 				Som Usbagach
@@ -9223,6 +9655,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				shom Usbagach
 				som Usbagach
 				som Usbagach
+				UZS
 			
 			
 				Bolívar Bheinisealach (1871–2008)
@@ -9230,6 +9663,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bholívar Bheinisealach (1871–2008)
 				bolívar Bheinisealach (1871–2008)
 				bolívar Bheinisealach (1871–2008)
+				VEB
 			
 			
 				Bolívar Bheinisealach (2008–2018)
@@ -9237,6 +9671,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bholívar Bheinisealach (2008–2018)
 				bolívar Bheinisealach (2008–2018)
 				bolívar Bheinisealach (2008–2018)
+				VEF
+				Bs
 			
 			
 				Bolívar Bheinisealach
@@ -9244,6 +9680,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				bholívar Bheinisealach
 				bolívar Bheinisealach
 				bolívar Bheinisealach
+				VES
 			
 			
 				Dong Bhiet-Namach
@@ -9251,6 +9688,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhong Bhiet-Namach
 				dong Bhiet-Namach
 				dong Bhiet-Namach
+				₫
+				₫
 			
 			
 				Dong Bhiet-Namach (1978–1985)
@@ -9258,6 +9697,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhong Bhiet-Namach (1978–1985)
 				dong Bhiet-Namach (1978–1985)
 				dong Bhiet-Namach (1978–1985)
+				VNN
 			
 			
 				Vatu Vanuatuthach
@@ -9265,6 +9705,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				vatu Vanuatuthach
 				vatu Vanuatuthach
 				vatu Vanuatuthach
+				VUV
 			
 			
 				Tala Samothach
@@ -9272,6 +9713,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				thala Samothach
 				tala Samothach
 				tala Samothach
+				WST
 			
 			
 				Franc CFA Meadhan-Afragach
@@ -9279,6 +9721,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc CFA Meadhan-Afragach
 				franc CFA Meadhan-Afragach
 				franc CFA Meadhan-Afragach
+				FCFA
 			
 			
 				Airgead
@@ -9286,6 +9729,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unnsa tròidh airgid
 				unnsachan tròidh airgid
 				unnsa tròidh airgid
+				XAG
 			
 			
 				Òr
@@ -9293,6 +9737,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unnsa tròidh òir
 				unnsachan tròidh òir
 				unnsa tròidh òir
+				XAU
 			
 			
 				Aonad co-dhèanta Eòrpach
@@ -9300,6 +9745,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad co-dhèanta Eòrpach
 				aonadan co-dhèanta Eòrpach
 				aonad co-dhèanta Eòrpach
+				XBA
 			
 			
 				Aonad airgid Eòrpach
@@ -9307,6 +9753,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad airgid Eòrpach
 				aonadan airgid Eòrpach
 				aonad airgid Eòrpach
+				XBB
 			
 			
 				Aonad cunntasachd Eòrpach (XBC)
@@ -9314,6 +9761,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad cunntasachd Eòrpach (XBC)
 				aonadan cunntasachd Eòrpach (XBC)
 				aonad cunntasachd Eòrpach (XBC)
+				XBC
 			
 			
 				Aonad cunntasachd Eòrpach (XBD)
@@ -9321,6 +9769,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad cunntasachd Eòrpach (XBD)
 				aonadan cunntasachd Eòrpach (XBD)
 				aonad cunntasachd Eòrpach (XBD)
+				XBD
 			
 			
 				Dolar Caraibeach earach
@@ -9328,6 +9777,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Caraibeach earach
 				dolaran Caraibeach earach
 				dolar Caraibeach earach
+				EC$
+				$
 			
 			
 				Còir tarraing shònraichte
@@ -9335,6 +9786,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				chòir tarraing shònraichte
 				còirichean tarraing sònraichte
 				còir tarraing shònraichte
+				XDR
 			
 			
 				Aonad airgeadra Eòrpach
@@ -9342,6 +9794,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad airgeadra Eòrpach
 				aonadan airgeadra Eòrpach
 				aonad airgeadra Eòrpach
+				XEU
 			
 			
 				Franc òir Frangach
@@ -9349,6 +9802,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc òir Frangach
 				franc òir Frangach
 				franc òir Frangach
+				XFO
 			
 			
 				Franc UIC Frangach
@@ -9356,6 +9810,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc UIC Frangach
 				franc UIC Frangach
 				franc UIC Frangach
+				XFU
 			
 			
 				Franc CFA Afraga an Iar
@@ -9363,6 +9818,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc CFA Afraga an Iar
 				franc CFA Afraga an Iar
 				franc CFA Afraga an Iar
+				CFA
 			
 			
 				Pallaideam
@@ -9370,6 +9826,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unnsa tròidh pallaideim
 				unnsachan tròidh pallaideim
 				unnsa tròidh pallaideim
+				XPD
 			
 			
 				Franc CFP
@@ -9377,6 +9834,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				fhranc CFP
 				franc CFP
 				franc CFP
+				CFPF
 			
 			
 				Platanam
@@ -9384,6 +9842,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				unnsa tròidh platanaim
 				unnsachan tròidh platanaim
 				unnsa tròidh platanaim
+				XPT
 			
 			
 				Aonad maoine RINET
@@ -9391,6 +9850,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad maoine RINET
 				aonadan maoine RINET
 				aonad maoine RINET
+				XRE
 			
 			
 				Sucre
@@ -9398,6 +9858,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sucre
 				sucre
 				sucre
+				XSU
 			
 			
 				Còd airgeadra fo dheuchainn
@@ -9405,6 +9866,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad airgeadra fo dheuchainn
 				aonadan airgeadra fo dheuchainn
 				aonad airgeadra fo dheuchainn
+				XTS
 			
 			
 				Aonad cunntasachd ADB
@@ -9412,6 +9874,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				aonad cunntasachd ADB
 				aonadan cunntasachd ADB
 				aonad cunntasachd ADB
+				XUA
 			
 			
 				Airgeadra neo-aithnichte
@@ -9427,6 +9890,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar Eamanach
 				dinar Eamanach
 				dinar Eamanach
+				YDD
 			
 			
 				Rial Eamanach
@@ -9434,6 +9898,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rial Eamanach
 				rial Eamanach
 				rial Eamanach
+				YER
 			
 			
 				Dinar cruaidh Iùgoslabhach (1966–1990)
@@ -9441,6 +9906,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar cruaidh Iùgoslabhach (1966–1990)
 				dinar cruaidh Iùgoslabhach (1966–1990)
 				dinar cruaidh Iùgoslabhach (1966–1990)
+				YUD
 			
 			
 				Dinar ùr Iùgoslabhach (1994–2002)
@@ -9448,6 +9914,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar ùr Iùgoslabhach (1994–2002)
 				dinar ùr Iùgoslabhach (1994–2002)
 				dinar ùr Iùgoslabhach (1994–2002)
+				YUM
 			
 			
 				Dinar iompachail Iùgoslabhach (1990–1992)
@@ -9455,6 +9922,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar iompachail Iùgoslabhach (1990–1992)
 				dinar iompachail Iùgoslabhach (1990–1992)
 				dinar iompachail Iùgoslabhach (1990–1992)
+				YUN
 			
 			
 				Dinar ath-leasaichte Iùgoslabhach (1992–1993)
@@ -9462,6 +9930,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dhinar ath-leasaichte Iùgoslabhach (1992–1993)
 				dinar ath-leasaichte Iùgoslabhach (1992–1993)
 				dinar ath-leasaichte Iùgoslabhach (1992–1993)
+				YUR
 			
 			
 				Rand Afraga a Deas (ionmhasail)
@@ -9469,6 +9938,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rand Afraga a Deas (ionmhasail)
 				rand Afraga a Deas (ionmhasail)
 				rand Afraga a Deas (ionmhasail)
+				ZAL
 			
 			
 				Rand Afraga a Deas
@@ -9476,6 +9946,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rand Afraga a Deas
 				rand Afraga a Deas
 				rand Afraga a Deas
+				ZAR
+				R
 			
 			
 				Kwacha Sàimbitheach (1968–2012)
@@ -9483,6 +9955,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwacha Sàimbitheach (1968–2012)
 				kwacha Sàimbitheach (1968–2012)
 				kwacha Sàimbitheach (1968–2012)
+				ZMK
 			
 			
 				Kwacha Sàimbitheach
@@ -9490,6 +9963,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kwacha Sàimbitheach
 				kwacha Sàimbitheach
 				kwacha Sàimbitheach
+				ZMW
+				ZK
 			
 			
 				Zaïre ùr Zaïreach (1993–1998)
@@ -9497,6 +9972,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zaïre ùr Zaïreach (1993–1998)
 				zaïre ùr Zaïreach (1993–1998)
 				zaïre ùr Zaïreach (1993–1998)
+				ZRN
 			
 			
 				Zaïre Zaïreach (1971–1993)
@@ -9504,6 +9980,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				zaïre Zaïreach (1971–1993)
 				zaïre Zaïreach (1971–1993)
 				zaïre Zaïreach (1971–1993)
+				ZRZ
 			
 			
 				Dolar Sìombabuthach (1980–2008)
@@ -9511,6 +9988,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Sìombabuthach (1980–2008)
 				dolaran Sìombabuthach (1980–2008)
 				dolar Sìombabuthach (1980–2008)
+				ZWD
 			
 			
 				Dolar Sìombabuthach (2009)
@@ -9518,6 +9996,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Sìombabuthach (2009)
 				dolaran Sìombabuthach (2009)
 				dolar Sìombabuthach (2009)
+				ZWL
 			
 			
 				Dolar Sìombabuthach (2008)
@@ -9525,6 +10004,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				dholar Sìombabuthach (2008)
 				dolaran Sìombabuthach (2008)
 				dolar Sìombabuthach (2008)
+				ZWR
 			
 		
 		
@@ -9532,14 +10012,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}–{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
-			{0} dealbh, {0} mhionaid
-			{0} dhealbh, {0} mhionaid
-			{0} dealbhan, {0} mionaidean
-			{0} dealbh, {0} mionaid
+			{0} bhròg
+			{0}  bhròig
+			{0} brògan
+			{0} bròg
 		
 	
 	
@@ -9664,6 +10146,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} òirleach cheàrnagach
 				{0} san òirleach cheàrnagach
 			
+			
+				dönüm
+				{0} dönüm
+				{0} dhönüm
+				{0} dönüm
+				{0} dönüm
+			
 			
 				karat
 				{0} karat
@@ -9672,18 +10161,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} karat
 			
 			
-				mille-ghrama san deicheamh-liotair
-				{0} mhille-ghrama san deicheamh-liotair
-				{0} mhille-ghrama san deicheamh-liotair
-				{0} mille-ghramaichean san deicheamh-liotair
-				{0} mille-ghrama san deicheamh-liotair
+				miligram san deicheamh-liotair
+				{0} mhiligram san deicheamh-liotair
+				{0} mhiligram san deicheamh-liotair
+				{0} miligramaichean san deicheamh-liotair
+				{0} miligram san deicheamh-liotair
 			
 			
-				mille-mhòl san liotair
-				{0} mhille-mhòl san liotair
-				{0} mhille-mhòl san liotair
-				{0} mille-mhòlaichean san liotair
-				{0} mille-mhòl san liotair
+				milimòl san liotair
+				{0} mhilimòl san liotair
+				{0} mhilimòl san liotair
+				{0} milimòlaichean san liotair
+				{0} milimòl san liotair
 			
 			
 				pàirt sa mhillean
@@ -9706,6 +10195,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} sa mhìle
 				{0} sa mhìle
 			
+			
+				sna deich mìltean
+				{0} sna deich mìltean
+				{0} sna deich mìltean
+				{0} sna deich mìltean
+				{0} sna deich mìltean
+			
+			
+				mòl
+				{0} mhòl
+				{0} mhòl
+				{0} mòlaichean
+				{0} mòl
+			
 			
 				liotair sa chilemeatair
 				{0} liotair sa chilemeatair
@@ -9728,11 +10231,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mìle sa ghalan
 			
 			
-				mìle sa ghalan impireil
-				{0} mhìle sa ghalan impireil
-				{0} mhìle sa ghalan impireil
-				{0} mìltean sa ghalan impireil
-				{0} mìle sa ghalan impireil
+				mìle sa ghalan ìmpireil
+				{0} mhìle sa ghalan ìmpireil
+				{0} mhìle sa ghalan ìmpireil
+				{0} mìltean sa ghalan ìmpireil
+				{0} mìle sa ghalan ìmpireil
 			
 			
 				peta-baidht
@@ -9818,6 +10321,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} linntean
 				{0} linn
 			
+			
+				deichead
+				{0} deichead
+				{0} dheichead
+				{0} deicheadan
+				{0} deichead
+			
 			
 				bliadhna
 				{0} bhliadhna
@@ -9875,11 +10385,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} san diog
 			
 			
-				mille-dhiog
-				{0} mhille-dhiog
-				{0} mhille-dhiog
-				{0} mille-dhiogan
-				{0} mille-dhiog
+				mili-diog
+				{0} mhili-diog
+				{0} mhili-diog
+				{0} mili-diogan
+				{0} mili-diog
 			
 			
 				micreo-diog
@@ -9889,11 +10399,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} micreo-diog
 			
 			
-				nano-dhiog
-				{0} nano-dhiog
-				{0} nano-dhiog
-				{0} nano-dhiogan
-				{0} nano-dhiog
+				nano-diog
+				{0} nano-diog
+				{0} nano-diog
+				{0} nano-diogan
+				{0} nano-diog
 			
 			
 				ampère
@@ -9965,6 +10475,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} cilea-watt san uair
 				{0} cilea-watt san uair
 			
+			
+				volt-eleactroin
+				{0} volt-eleactroin
+				{0} volt-eleactroin
+				{0} voltaichean-eleactroin
+				{0} volt-eleactroin
+			
+			
+				aonad-teasa Breatannach
+				{0} aonad-teasa Breatannach
+				{0} aonad-teasa Breatannach
+				{0} aonadan-teasa Breatannach
+				{0} aonad-teasa Breatannach
+			
+			
+				aonad-teasa nan SA
+				{0} aonad-teasa nan SA
+				{0} aonad-teasa nan SA
+				{0} aonadan-teasa nan SA
+				{0} aonad-teasa nan SA
+			
+			
+				punnd de dh’fhorsa
+				{0} phunnd de dh’fhorsa
+				{0} phunnd de dh’fhorsa
+				{0} puinnd de dh’fhorsa
+				{0} punnd de dh’fhorsa
+			
+			
+				newton
+				{0} newton
+				{0} newton
+				{0} newtonaichean
+				{0} newton
+			
 			
 				giga-hertz
 				{0} ghiga-hertz
@@ -9993,6 +10538,51 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hertz
 				{0} hertz
 			
+			
+				em chlò-ghrafach
+			
+			
+				piogsail
+				{0} phiogsail
+				{0} phiogsail
+				{0} piogsailean
+				{0} piogsail
+			
+			
+				meaga-piogsail
+				{0} mheaga-piogsail
+				{0} mheaga-piogsail
+				{0} meaga-piogsailean
+				{0} meaga-piogsail
+			
+			
+				piogsail sa cheudameatair
+				{0} phiogsail sa cheudameatair
+				{0} phiogsail sa cheudameatair
+				{0} piogsailean sa cheudameatair
+				{0} piogsail sa cheudameatair
+			
+			
+				piogsail san òirleach
+				{0} phiogsail san òirleach
+				{0} phiogsail san òirleach
+				{0} piogsailean san òirleach
+				{0} piogsail san òirleach
+			
+			
+				dotag sa cheudameatair
+				{0} dotag sa cheudameatair
+				{0} dhotag sa cheudameatair
+				{0} dotagan sa cheudameatair
+				{0} dotag sa cheudameatair
+			
+			
+				dotag san òirleach
+				{0} dotag san òirleach
+				{0} dhotag san òirleach
+				{0} dotagan san òirleach
+				{0} dotag san òirleach
+			
 			
 				cilemeatair
 				{0} chilemeatair
@@ -10025,32 +10615,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} sa cheudameatair
 			
 			
-				mille-mheatair
-				{0} mhille-mheatair
-				{0} mhille-mheatair
-				{0} mille-mheatairean
-				{0} mille-mheatair
+				mili-meatair
+				{0} mhili-meatair
+				{0} mhili-meatair
+				{0} mili-meatairean
+				{0} mili-meatair
 			
 			
-				micreo-mheatair
-				{0} mhicreo-mheatair
-				{0} mhicreo-mheatair
-				{0} micreo-mheatairean
-				{0} micreo-mheatair
+				micreo-meatair
+				{0} mhicreo-meatair
+				{0} mhicreo-meatair
+				{0} micreo-meatairean
+				{0} micreo-meatair
 			
 			
-				nano-mheatair
-				{0} nano-mheatair
-				{0} nano-mheatair
-				{0} nano-mheatairean
-				{0} nano-mheatair
+				nano-meatair
+				{0} nano-meatair
+				{0} nano-meatair
+				{0} nano-meatairean
+				{0} nano-meatair
 			
 			
-				piceo-mheatair
-				{0} phiceo-mheatair
-				{0} phiceo-mheatair
-				{0} piceo-mheatairean
-				{0} piceo-mheatair
+				piceo-meatair
+				{0} phiceo-meatair
+				{0} phiceo-meatair
+				{0} piceo-meatairean
+				{0} piceo-meatair
 			
 			
 				mìle
@@ -10138,6 +10728,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} puingean
 				{0} puing
 			
+			
+				rèideas-grèine
+				{0} rèideas-grèine
+				{0} rèideas-grèine
+				{0} rèideasan-grèine
+				{0} rèideas-grèine
+			
 			
 				lux
 				{0} lux
@@ -10145,6 +10742,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} lux
 				{0} lux
 			
+			
+				boillsgeachd-ghrèine
+				{0} bhoillsgeachd-ghrèine
+				{0} bhoillsgeachd-ghrèine
+				{0} boillsgeachdan-grèine
+				{0} boillsgeachd-ghrèine
+			
 			
 				tunna meatrach
 				{0} tunna meatrach
@@ -10161,26 +10765,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} sa chileagram
 			
 			
-				grama
-				{0} ghrama
-				{0} ghrama
+				gram
+				{0} ghram
+				{0} ghram
 				{0} gramaichean
-				{0} grama
-				{0} sa ghrama
+				{0} gram
+				{0} sa ghram
 			
 			
-				mille-ghrama
-				{0} mhille-ghrama
-				{0} mhille-ghrama
-				{0} mille-ghramaichean
-				{0} mille-ghrama
+				miligram
+				{0} mhiligram
+				{0} mhiligram
+				{0} miligramaichean
+				{0} miligram
 			
 			
-				micreo-ghrama
-				{0} mhicreo-ghrama
-				{0} mhicreo-ghrama
-				{0} micreo-ghramaichean
-				{0} micreo-ghrama
+				micreo-gram
+				{0} mhicreo-gram
+				{0} mhicreo-gram
+				{0} micreo-gramaichean
+				{0} micreo-gram
 			
 			
 				tunna
@@ -10226,6 +10830,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} carataichean
 				{0} carat
 			
+			
+				dalton
+				{0} dalton
+				{0} dhalton
+				{0} daltonaichean
+				{0} dalton
+			
+			
+				tomad-talmhainn
+				{0} tomad-talmhainn
+				{0} thomad-talmhainn
+				{0} tomadan-talmhainn
+				{0} tomad-talmhainn
+			
+			
+				tomad-grèine
+				{0} tomad-grèine
+				{0} thomad-grèine
+				{0} tomadan-grèine
+				{0} tomad-grèine
+			
 			
 				giga-watt
 				{0} ghiga-watt
@@ -10255,11 +10880,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} watt
 			
 			
-				mille-watt
-				{0} mhille-watt
-				{0} mhille-watt
-				{0} mille-watt
-				{0} mille-watt
+				mili-watt
+				{0} mhili-watt
+				{0} mhili-watt
+				{0} mili-watt
+				{0} mili-watt
 			
 			
 				cumhachd-eich
@@ -10268,19 +10893,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} cumhachdan-eich
 				{0} cumhachd-eich
 			
-			
-				heacta pascal
-				{0} heacta pascal
-				{0} heacta pascal
-				{0} heacta pascal
-				{0} heacta pascal
-			
 			
-				mille-mheatair de dh’airgead-beò
-				{0} mhille-mheatair de dh’airgead-beò
-				{0} mhille-mheatair de dh’airgead-beò
-				{0} mille-mheatairean de dh’airgead-beò
-				{0} mille-mheatair de dh’airgead-beò
+				milimeatair de dh’airgead-beò
+				{0} mhilimeatair de dh’airgead-beò
+				{0} mhilimeatair de dh’airgead-beò
+				{0} milimeatairean de dh’airgead-beò
+				{0} milimeatair de dh’airgead-beò
 			
 			
 				punnd san òirleach cheàrnagach
@@ -10296,12 +10914,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} òirlich de dh’airgead-beò
 				{0} òirleach de dh’airgead-beò
 			
+			
+				bàr
+				{0} bhar
+				{0} bhàr
+				{0} bàraichean
+				{0} bàr
+			
 			
-				mille-bhàr
-				{0} mhille-bhàr
-				{0} mhille-bhàr
-				{0} mille-bhàraichean
-				{0} mille-bhàr
+				milibàr
+				{0} mhilibàr
+				{0} mhilibàr
+				{0} milibàraichean
+				{0} milibàr
 			
 			
 				brùthadh-àile
@@ -10310,6 +10935,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} brùthadh-àile
 				{0} brùthadh-àile
 			
+			
+				pascal
+				{0} phascal
+				{0} phascal
+				{0} pascal
+				{0} pascal
+			
+			
+				heacta-pascal
+				{0} heacta-pascal
+				{0} heacta-pascal
+				{0} heacta-pascal
+				{0} heacta-pascal
+			
+			
+				cileapascal
+				{0} chileapascal
+				{0} chileapascal
+				{0} cileapascal
+				{0} cileapascal
+			
+			
+				meaga-pascal
+				{0} mheaga-pascal
+				{0} mheaga-pascal
+				{0} meaga-pascal
+				{0} meaga-pascal
+			
 			
 				cilemeatair san uair
 				{0} chilemeatair san uair
@@ -10366,6 +11019,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ceuman Kelvin
 				{0} ceum Kelvin
 			
+			
+				troigh-phuinnd
+				{0} troigh-phuinnd
+				{0} throigh-phuinnd
+				{0} troighean-puinnd
+				{0} troigh-phuinnd
+			
+			
+				newton-mheatair
+				{0} newton-mheatair
+				{0} newton-mheatair
+				{0} newton-mheatairean
+				{0} newton-mheatair
+			
 			
 				cilemeatair ciùbach
 				{0} chilemeatair ciùbach
@@ -10425,11 +11092,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} meaga-liotair
 			
 			
-				heactailiotair
-				{0} heactailiotair
-				{0} heactailiotair
-				{0} heactailiotairean
-				{0} heactailiotair
+				heacta-liotair
+				{0} heacta-liotair
+				{0} heacta-liotair
+				{0} heacta-liotairean
+				{0} heacta-liotair
 			
 			
 				liotair
@@ -10454,11 +11121,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ceudailiotair
 			
 			
-				mille-liotair
-				{0} mhille-liotair
-				{0} mhille-liotair
-				{0} mille-liotairean
-				{0} mille-liotair
+				mililiotair
+				{0} mhililiotair
+				{0} mhililiotair
+				{0} mililiotairean
+				{0} mililiotair
 			
 			
 				pinnt meatrach
@@ -10497,12 +11164,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} sa ghalan
 			
 			
-				galan impireil
-				{0} ghalan impireil
-				{0} ghalan impireil
-				{0} galanan impireil
-				{0} galan impireil
-				{0} sa ghalan impireil
+				galan ìmpireil
+				{0} ghalan ìmpireil
+				{0} ghalan ìmpireil
+				{0} galanan ìmpireil
+				{0} galan ìmpireil
+				{0} sa ghalan ìmpireil
 			
 			
 				càrt
@@ -10532,6 +11199,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} unnsachan-dighe
 				{0} unnsa-dighe
 			
+			
+				unnsa-dighe ìmpireil
+				{0} unnsa-dighe ìmpireil
+				{0} unnsa-dighe ìmpireil
+				{0} unnsachan-dighe ìmpireil
+				{0} unnsa-dighe ìmpireil
+			
 			
 				spàin-bhùird
 				{0} spàin-bhùird
@@ -10546,6 +11220,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} spàinean-teatha
 				{0} spàin-teatha
 			
+			
+				baraill
+				{0} bharaill
+				{0} bharaill
+				{0} baraillean
+				{0} baraill
+			
 			
 				comhair combaist
 				{0}E
@@ -10675,6 +11356,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} òirl²
 				{0}/òirl²
 			
+			
+				dönüm
+				{0} dönüm
+				{0} dhönüm
+				{0} dönüm
+				{0} dönüm
+			
 			
 				karat
 				{0} kt
@@ -10717,6 +11405,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}‰
 				{0}‰
 			
+			
+				sna deich mìltean
+			
+			
+				mòl
+				{0} mòl
+				{0} mòl
+				{0} mòl
+				{0} mòl
+			
 			
 				liotair/km
 				{0} L/km
@@ -10739,11 +11437,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mì/g
 			
 			
-				mìle/gal imp.
-				{0} mhì/gal imp.
-				{0} mhì/gal imp.
-				{0} mì/gal imp.
-				{0} mì/gal imp.
+				mìle/gal ìmp.
+				{0} mhì/gal ìmp.
+				{0} mhì/gal ìmp.
+				{0} mì/gal ìmp.
+				{0} mì/gal ìmp.
 			
 			
 				PB
@@ -10829,6 +11527,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} li
 				{0} li
 			
+			
+				deich
+				{0} deich
+				{0} dheich
+				{0} deich
+				{0} deich
+			
 			
 				bliadhna
 				{0} bhlia
@@ -10886,7 +11591,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/d
 			
 			
-				m-dhiog
+				mili-diog
 				{0} ms
 				{0} ms
 				{0} ms
@@ -10900,7 +11605,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} μs
 			
 			
-				n-dhiog
+				nano-diog
 				{0} ns
 				{0} ns
 				{0} ns
@@ -10976,6 +11681,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kWh
 				{0} kWh
 			
+			
+				volt-eleactroin
+			
+			
+				aonad-teasa Breatannach
+			
+			
+				aonad-teasa nan SA
+			
+			
+				punnd-fhorsa
+			
+			
+				newton
+			
 			
 				GHz
 				{0} GHz
@@ -11004,6 +11724,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Hz
 				{0} Hz
 			
+			
+				meaga-piogsail
+			
 			
 				km
 				{0} km
@@ -11043,7 +11766,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mm
 			
 			
-				µ-mheatair
+				µ-meatair
 				{0} µm
 				{0} µm
 				{0} µm
@@ -11149,6 +11872,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pt
 				{0} pt
 			
+			
+				rèideas-grèine
+			
 			
 				lux
 				{0} lx
@@ -11156,6 +11882,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} lx
 				{0} lx
 			
+			
+				boillsgeachd-ghrèine
+			
 			
 				t
 				{0} t
@@ -11172,7 +11901,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/kg
 			
 			
-				grama
+				gram
 				{0} g
 				{0} g
 				{0} g
@@ -11237,6 +11966,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} CD
 				{0} CD
 			
+			
+				dalton
+				{0} Da
+				{0} Da
+				{0} Da
+				{0} Da
+			
+			
+				tomad-talmhainn
+			
+			
+				tomad-grèine
+			
 			
 				GW
 				{0} GW
@@ -11279,13 +12021,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -11307,6 +12042,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} inHg
 				{0} inHg
 			
+			
+				bàr
+				{0} bhàr
+				{0} bhàr
+				{0} bàr
+				{0} bàr
+			
 			
 				mbàr
 				{0} mbàr
@@ -11321,6 +12063,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} àile
 				{0} àile
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
+			
+				{0} kPa
+				{0} kPa
+				{0} kPa
+				{0} kPa
+			
 			
 				km/uair
 				{0} km/h
@@ -11377,6 +12132,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} K
 				{0} K
 			
+			
+				lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
+			
 			
 				km³
 				{0} km³
@@ -11508,12 +12270,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/gal
 			
 			
-				gal imp.
-				{0} ghal imp.
-				{0} ghal imp.
-				{0} gal imp.
-				{0} gal imp.
-				{0}/gal imp.
+				gal ìmp.
+				{0} ghal ìmp.
+				{0} ghal ìmp.
+				{0} gal ìmp.
+				{0} gal ìmp.
+				{0}/gal ìmp.
 			
 			
 				càrt
@@ -11543,6 +12305,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} fl oz
 				{0} fl oz
 			
+			
+				fl oz ìmp.
+				{0} fl oz ìmp.
+				{0} fl oz ìmp.
+				{0} fl oz ìmp.
+				{0} fl oz ìmp.
+			
 			
 				spàin
 				{0} spàin
@@ -11557,6 +12326,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} sp-t
 				{0} sp-t
 			
+			
+				baraill
+			
 			
 				comhair
 				{0}E
@@ -11686,6 +12458,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}in²
 				{0}/in²
 			
+			
+				dönüm
+				{0}dönüm
+				{0}dhönüm
+				{0}dönüm
+				{0}dönüm
+			
 			
 				karat
 				{0}kt
@@ -11728,6 +12507,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}‰
 				{0}‰
 			
+			
+				{0}‱
+				{0}‱
+				{0}‱
+				{0}‱
+			
+			
+				mòl
+				{0}mòl
+				{0}mòl
+				{0}mòl
+				{0}mòl
+			
 			
 				L/km
 				{0}L/km
@@ -11840,6 +12632,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}li
 				{0}li
 			
+			
+				deich
+				{0}deich
+				{0}dheich
+				{0}deich
+				{0}deich
+			
 			
 				blia
 				{0}bl
@@ -11987,6 +12786,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}kWh
 				{0}kWh
 			
+			
+				{0}eV
+				{0}eV
+				{0}eV
+				{0}eV
+			
+			
+				{0}Btu
+				{0}Btu
+				{0}Btu
+				{0}Btu
+			
+			
+				{0}US therm
+				{0}US therm
+				{0}US therm
+				{0}US therm
+			
+			
+				{0}lbf
+				{0}lbf
+				{0}lbf
+				{0}lbf
+			
+			
+				{0}N
+				{0}N
+				{0}N
+				{0}N
+			
 			
 				GHz
 				{0}GHz
@@ -12015,6 +12844,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}Hz
 				{0}Hz
 			
+			
+				{0}em
+				{0}em
+				{0}em
+				{0}em
+			
+			
+				{0}px
+				{0}px
+				{0}px
+				{0}px
+			
+			
+				MP
+				{0}MP
+				{0}MP
+				{0}MP
+				{0}MP
+			
+			
+				{0}ppcm
+				{0}ppcm
+				{0}ppcm
+				{0}ppcm
+			
+			
+				{0}ppi
+				{0}ppi
+				{0}ppi
+				{0}ppi
+			
+			
+				{0}dpcm
+				{0}dpcm
+				{0}dpcm
+				{0}dpcm
+			
+			
+				{0}dpi
+				{0}dpi
+				{0}dpi
+				{0}dpi
+			
 			
 				km
 				{0}km
@@ -12134,10 +13006,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				aitheamh
-				{0}fth
-				{0}fth
-				{0}fth
-				{0}fth
+				{0}aith
+				{0}aith
+				{0}aith
+				{0}aith
 			
 			
 				nmi
@@ -12160,6 +13032,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}pt
 				{0}pt
 			
+			
+				{0}R☉
+				{0}R☉
+				{0}R☉
+				{0}R☉
+			
 			
 				lux
 				{0}lx
@@ -12167,6 +13045,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}lx
 				{0}lx
 			
+			
+				{0}L☉
+				{0}L☉
+				{0}L☉
+				{0}L☉
+			
 			
 				t
 				{0}t
@@ -12183,7 +13067,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/kg
 			
 			
-				grama
+				gram
 				{0}g
 				{0}g
 				{0}g
@@ -12248,6 +13132,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}CD
 				{0}CD
 			
+			
+				Da
+				{0}Da
+				{0}Da
+				{0}Da
+				{0}Da
+			
+			
+				{0}M⊕
+				{0}M⊕
+				{0}M⊕
+				{0}M⊕
+			
+			
+				{0}M☉
+				{0}M☉
+				{0}M☉
+				{0}M☉
+			
 			
 				GW
 				{0}GW
@@ -12290,13 +13193,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}hp
 				{0}hp
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mm Hg
 				{0}mm Hg
@@ -12318,6 +13214,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}″ Hg
 				{0}″ Hg
 			
+			
+				bàr
+				{0}bhàr
+				{0}bhàr
+				{0}bàr
+				{0}bàr
+			
 			
 				mbàr
 				{0}mb
@@ -12332,6 +13235,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}atm
 				{0}atm
 			
+			
+				{0}Pa
+				{0}Pa
+				{0}Pa
+				{0}Pa
+			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
+			
+				{0}kPa
+				{0}kPa
+				{0}kPa
+				{0}kPa
+			
+			
+				{0}MPa
+				{0}MPa
+				{0}MPa
+				{0}MPa
+			
 			
 				km/h
 				{0}km/h
@@ -12388,6 +13316,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}K
 				{0}K
 			
+			
+				lbf⋅ft
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+				{0}lbf⋅ft
+			
+			
+				{0}N⋅m
+				{0}N⋅m
+				{0}N⋅m
+				{0}N⋅m
+			
 			
 				km³
 				{0}km³
@@ -12519,12 +13460,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/gal
 			
 			
-				gal imp.
-				{0} ghal i.
-				{0} ghal i.
-				{0} gal i.
-				{0} gal i.
-				{0}/gal i.
+				gal ìmp.
+				{0} ghal ì.
+				{0} ghal ì.
+				{0} gal ì.
+				{0} gal ì.
+				{0}/gal ì.
 			
 			
 				càrt
@@ -12554,6 +13495,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}fl oz
 				{0}fl oz
 			
+			
+				fl oz ìmp.
+				{0}fl oz ì.
+				{0}fl oz ì.
+				{0}fl oz ì.
+				{0}fl oz ì.
+			
 			
 				sp
 				{0}sp
@@ -12568,6 +13516,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}sp-t
 				{0}sp-t
 			
+			
+				{0}bbl
+				{0}bbl
+				{0}bbl
+				{0}bbl
+			
 			
 				comhair
 				{0}E
@@ -12600,6 +13554,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} no {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/gd_GB.xml b/make/data/cldr/common/main/gd_GB.xml
index 38d12549e64..fa567d7a320 100644
--- a/make/data/cldr/common/main/gd_GB.xml
+++ b/make/data/cldr/common/main/gd_GB.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gl.xml b/make/data/cldr/common/main/gl.xml
index 8f84c8a1915..077e9b9e7d8 100644
--- a/make/data/cldr/common/main/gl.xml
+++ b/make/data/cldr/common/main/gl.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -50,7 +50,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			baxkir
 			balinés
 			basaa
-			bielorruso
+			belaruso
 			bemba
 			bena
 			búlgaro
@@ -68,6 +68,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			buginés
 			blin
 			catalán
+			chakma
 			checheno
 			cebuano
 			kiga
@@ -77,7 +78,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			choctaw
 			cherokee
 			cheyenne
-			kurdo soraní
+			kurdo central
 			corso
 			seselwa (crioulo das Seychelles)
 			checo
@@ -109,9 +110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			inglés australiano
 			inglés canadense
 			inglés británico
-			inglés (RU)
 			inglés estadounidense
-			inglés (EUA)
 			esperanto
 			español
 			español de América
@@ -192,7 +191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			koyra chiini
 			kikuyu
 			kuanyama
-			casaco
+			kazako
 			kako
 			groenlandés
 			kalenjin
@@ -292,7 +291,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			sesotho do norte
 			nuer
 			navajo
-			nyanja
+			chewa
 			nyankole
 			occitano
 			oromo
@@ -376,7 +375,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			tailandés
 			tigriña
 			tigré
-			turcomán
+			turkmeno
 			tagalo
 			klingon
 			tswana
@@ -399,7 +398,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			umbundu
 			lingua descoñecida
 			urdú
-			uzbeco
+			uzbeko
 			vai
 			venda
 			vietnamita
@@ -419,10 +418,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			yiddish
 			ioruba
 			cantonés
+			chinés cantonés
 			tamazight marroquí estándar
 			chinés
+			chinés mandarín
 			chinés simplificado
+			chinés mandarín simplificado
 			chinés tradicional
+			chinés mandarín tradicional
 			zulú
 			zuni
 			sen contido lingüístico
@@ -441,9 +444,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
-			
+			
 			
 			
 			
@@ -457,14 +460,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -476,13 +479,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 		
 		
 			Mundo
 			África
-			Norteamérica
-			Suramérica
+			América do Norte
+			América do Sur
 			Oceanía
 			África Occidental
 			América Central
@@ -491,7 +494,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			África Central
 			África Meridional
 			América
-			América do Norte
+			América Setentrional
 			Caribe
 			Asia Oriental
 			Asia Meridional
@@ -499,7 +502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Europa Meridional
 			Australasia
 			Melanesia
-			Rexión da Micronesia
+			Rexión de Micronesia
 			Polinesia
 			Asia
 			Asia Central
@@ -556,8 +559,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			República do Congo
 			Congo (RC)
 			Suíza
-			Costa do Marfil
-			CI
+			Côte d’Ivoire
+			Costa do Marfil
 			Illas Cook
 			Chile
 			Camerún
@@ -648,7 +651,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Corea do Sur
 			Kuwait
 			Illas Caimán
-			Casaquistán
+			Kazakistán
 			Laos
 			O Líbano
 			Santa Lucía
@@ -739,7 +742,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			O Salvador
 			Sint Maarten
 			Siria
-			Suazilandia
+			Eswatini
 			Suacilandia
 			Tristán da Cunha
 			Illas Turks e Caicos
@@ -767,7 +770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Os Estados Unidos
 			EUA
 			O Uruguai
-			Uzbequistán
+			Uzbekistán
 			Cidade do Vaticano
 			San Vicente e As Granadinas
 			Venezuela
@@ -777,6 +780,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis e Futuna
 			Samoa
+			Pseudoacentos
+			Pseudobidireccional
 			Kosovo
 			O Iemen
 			Mayotte
@@ -801,9 +806,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			estilo de quebra de liña
 			sistema internacional de unidades
 			números
-			Fuso horario
-			Variante local
-			Uso privado
+			fuso horario
+			variante rexional
+			uso privado
 		
 		
 			calendario budista
@@ -863,7 +868,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			sistema de 12 horas (1–12)
 			sistema de 24 horas (0–23)
 			sistema de 24 horas (1–24)
-			estilo de quebra de liña separada
+			estilo de quebra de liña flexible
 			estilo de quebra de liña normal
 			estilo de quebra de liña estrita
 			transliteración do BGN
@@ -871,8 +876,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			sistema métrico decimal
 			sistema imperial de unidades
 			sistema estadounidense de unidades
-			díxitos arábigo-índicos
-			díxitos arábigo-índicos ampliados
+			díxitos indoarábigos
+			díxitos indoarábigos ampliados
 			numeración armenia
 			numeración armenia en minúscula
 			díxitos bengalís
@@ -883,7 +888,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			numeración xeorxiana
 			numeración grega
 			numeración grega en minúscula
-			díxitos guxaratís
+			díxitos guxaratis
 			díxitos do gurmukhi
 			numeración decimal chinesa
 			numeración chinesa simplificada
@@ -894,14 +899,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			numeración xaponesa
 			numeración financeira xaponesa
 			díxitos khmer
-			díxitos canareses
+			díxitos kannarás
 			díxitos laosianos
 			díxitos occidentais
 			díxitos malabares
 			Díxitos mongoles
 			díxitos birmanos
 			Díxitos orixinais
-			díxitos do oriá
+			díxitos do odiá
 			numeración romana
 			numeración romana en minúsculas
 			numeración támil tradicional
@@ -919,7 +924,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			Idioma: {0}
-			Alfabeto: {0}
+			Sistema de escritura: {0}
 			Rexión: {0}
 		
 	
@@ -927,8 +932,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á b c d e é f g h i í j k l m n ñ o ó p q r s t u ú ü v w x y z]
 		[ª à â å ä ã ç è ê ë ì î ï º ò ô ö õ ù û]
 		[A B C D E F G H I J K L M N Ñ O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -937,14 +942,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0}… {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -959,7 +973,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							cccc, d 'de' MMMM 'de' Y G
+							EEEE, d 'de' MMMM 'de' Y G
 						
 					
 					
@@ -1014,8 +1028,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, HH:mm:ss
 						y G
 						MMM 'de' y G
-						d /MM/y G
-						ccc, d 'de' MMM 'de' y G
+						d 'de' MMM 'de' y G
+						E, d 'de' MMM 'de' y G
 						h a
 						HH
 						h:mm a
@@ -1045,11 +1059,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ 'de' y
 						y G
 						M/y GGGGG
-						M/d/y GGGGG
-						ccc, M/d/y GGGGG
+						d/M/y GGGGG
+						E, d/M/y GGGGG
 						MMM 'de' y G
-						d 'de' MMMM 'de' y G
-						ccc, d 'de' MMMM 'de' y G
+						d 'de' MMM 'de' y G
+						E, d 'de' MMM 'de' y G
 						MMMM 'de' y G
 						QQQ y G
 						QQQQ 'de' y G
@@ -1070,7 +1084,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							y G – y G
-							y – y G
+							y–y G
 						
 						
 							MM/y GGGGG – MM/y GGGGG
@@ -1150,18 +1164,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, d/M – E, d/M
 						
 						
-							MMMM–MMMM
+							MMM–MMM
 						
 						
-							d–d 'de' MMMM
-							d 'de' MMMM – d 'de' MMMM
+							d–d 'de' MMM
+							d 'de' MMM – d 'de' MMM
 						
 						
-							E, d MMM – E, d MMM
-							E, d 'de' MMMM – E, d 'de' MMMM
+							E, d 'de' MMM – E, d 'de' MMM
+							E, d 'de' MMM – E, d 'de' MMM
 						
 						
-							y–y
+							y–y G
 						
 						
 							M/y – M/y GGGGG
@@ -1178,16 +1192,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, dd/MM/y – E, dd/MM/y GGGGG
 						
 						
-							MMMM–MMMM 'de' y G
+							MMM–MMM 'de' y G
 							MMM 'de' y – MMM 'de' y G
 						
 						
 							d–d 'de' MMM 'de' y G
-							d MMM – d MMM y G
+							d 'de' MMM – d 'de' MMM 'de' y G
 							d 'de' MMM 'de' y – d 'de' MMM 'de' y G
 						
 						
-							E, d MMM – E, d MMM y G
+							E, d 'de' MMM – E, d 'de' MMM 'de' y G
 							E, d 'de' MMM – E, d 'de' MMM 'de' y G
 							E, d 'de' MMM 'de' y – E, d 'de' MMM 'de' y G
 						
@@ -1569,7 +1583,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, HH:mm:ss
 						y G
 						MMM 'de' y G
-						d 'de' MMMM 'de' y G
+						d 'de' MMM 'de' y G
 						E, d 'de' MMM 'de' y G
 						h a
 						HH
@@ -1599,8 +1613,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d/M/y
 						MM/y
 						MMM 'de' y
-						d/MM/y
-						EEE, d/MM/y
+						d 'de' MMM 'de' y
+						E, d 'de' MMM 'de' y
 						MMMM 'de' y
 						QQQ y
 						QQQQ 'de' y
@@ -1710,11 +1724,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							d–d 'de' MMM
-							d MMM – d MMM
+							d 'de' MMM – d 'de' MMM
 						
 						
 							E, d 'de' MMM – E, d 'de' MMM
-							E, d MMM – E, d MMM
+							E, d 'de' MMM – E, d 'de' MMM
 						
 						
 							y–y
@@ -1739,8 +1753,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							d–d 'de' MMMM 'de' y
-							d MMM – d MMM 'de' y
-							d MMM y – d MMM y
+							d 'de' MMM – d 'de' MMM 'de' y
+							d 'de' MMM 'de' y – d 'de' MMM 'de' y
 						
 						
 							E, d MMM – E, d MMM y
@@ -1781,9 +1795,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ano
-				ano pasado
+				o ano pasado
 				este ano
-				seguinte ano
+				o próximo ano
 				
 					en {0} ano
 					en {0} anos
@@ -1795,9 +1809,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ano
-				ano pasado
+				o ano pas.
 				este ano
-				seguinte ano
+				o próx. ano
 				
 					en {0} ano
 					en {0} anos
@@ -1865,9 +1879,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mes
-				m. pasado
-				este m.
-				m. seguinte
 				
 					en {0} mes
 					en {0} meses
@@ -1879,6 +1890,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mes
+				o mes pas.
+				este mes
+				o próx. mes
 				
 					en {0} mes
 					en {0} meses
@@ -1905,9 +1919,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
-				sem. pasada
+				a sem. pasada
 				esta sem.
-				sem. seguinte
+				a próxima sem.
 				
 					en {0} sem.
 					en {0} sem.
@@ -1920,6 +1934,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
+				a sem. pas.
+				esta sem.
+				a próx. sem.
 				
 					en {0} sem.
 					en {0} sem.
@@ -2429,9 +2446,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Cabul
 			
-			
-				Antiga
-			
 			
 				Anguila
 			
@@ -2454,7 +2468,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Troll
 			
 			
-				Syowa
+				Showa
 			
 			
 				Mawson
@@ -2565,7 +2579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bacú
 			
 			
-				Saraxevo
+				Saraievo
 			
 			
 				Barbados
@@ -2595,7 +2609,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Saint Barthélemy
 			
 			
-				Bermudas
+				Illas Bermudas
 			
 			
 				Brunei
@@ -2657,9 +2671,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Nassau
 			
-			
-				Thimbu
-			
 			
 				Gaborone
 			
@@ -2790,7 +2801,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Douala
 			
 			
-				Urumqi
+				Ürümqi
 			
 			
 				Shanghai
@@ -2811,7 +2822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Curaçao
 			
 			
-				Illa de Nadal
+				Illa Christmas
 			
 			
 				Nicosia
@@ -2877,7 +2888,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Helsinqui
 			
 			
-				Fidxi
+				Fixi
 			
 			
 				Stanley
@@ -3054,7 +3065,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tarawa
 			
 			
-				Illas Comores
+				Comores
 			
 			
 				Saint Kitts
@@ -3069,7 +3080,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuwait
 			
 			
-				Caimán
+				Illas Caimán
 			
 			
 				Aktau
@@ -3083,6 +3094,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktobe
 			
+			
+				Qostanai
+			
 			
 				Kyzylorda
 			
@@ -3252,7 +3266,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Managua
 			
 			
-				Ámsterdan
+				Ámsterdam
 			
 			
 				Oslo
@@ -3411,7 +3425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Chandyga
 			
 			
-				Sakhalin
+				Sakhalín
 			
 			
 				Ust-Nera
@@ -3543,7 +3557,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dar es Salaam
 			
 			
-				Úzhgorod
+				Uzghorod
 			
 			
 				Kiev
@@ -3715,7 +3729,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario estándar de África do Sur
+					Horario de África Meridional
 				
 			
 			
@@ -3748,23 +3762,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario do leste, Norteamérica
-					Horario estándar do leste, Norteamérica
-					Horario de verán do leste, Norteamérica
+					Horario do leste, América do Norte
+					Horario estándar do leste, América do Norte
+					Horario de verán do leste, América do Norte
 				
 			
 			
 				
-					Horario da montaña, Norteamérica
-					Horario estándar da montaña, Norteamérica
-					Horario de verán da montaña, Norteamérica
+					Horario da montaña, América do Norte
+					Horario estándar da montaña, América do Norte
+					Horario de verán da montaña, América do Norte
 				
 			
 			
 				
-					Horario do Pacífico, Norteamérica
-					Horario estándar do Pacífico, Norteamérica
-					Horario de verán do Pacífico, Norteamérica
+					Horario do Pacífico, América do Norte
+					Horario estándar do Pacífico, América do Norte
+					Horario de verán do Pacífico, América do Norte
 				
 			
 			
@@ -3853,9 +3867,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario das Azores
-					Horario estándar das Azores
-					Horario de verán das Azores
+					Horario dos Azores
+					Horario estándar dos Azores
+					Horario de verán dos Azores
 				
 			
 			
@@ -3929,7 +3943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario da Illa de Nadal
+					Horario da Illa Christmas
 				
 			
 			
@@ -4035,9 +4049,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Fidxi
-					Horario estándar de Fidxi
-					Horario de verán de Fidxi
+					Horario de Fixi
+					Horario estándar de Fixi
+					Horario de verán de Fixi
 				
 			
 			
@@ -4096,7 +4110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario estándar do Golfo
+					Horario do Golfo
 				
 			
 			
@@ -4106,9 +4120,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Hawai-Aleutiano
-					Horario estándar de Hawai-Aleutiano
-					Horario de verán de Hawai-Aleutiano
+					Horario de Hawai-illas Aleutianas
+					Horario estándar de Hawai-illas Aleutianas
+					Horario de verán de Hawai-illas Aleutianas
 				
 			
 			
@@ -4127,7 +4141,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario estándar da India
+					Horario da India
 				
 			
 			
@@ -4192,12 +4206,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Casaquistán Oriental
+					Horario de Kazakistán Oriental
 				
 			
 			
 				
-					Horario de Casaquistán Occidental
+					Horario de Kazakistán Occidental
 				
 			
 			
@@ -4214,9 +4228,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Krasnoyarsk
-					Horario estándar de Krasnoyarsk
-					Horario de verán de Krasnoyarsk
+					Horario de Krasnoiarsk
+					Horario estándar de Krasnoiarsk
+					Horario de verán de Krasnoiarsk
 				
 			
 			
@@ -4310,7 +4324,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Birmania
+					Horario de Myanmar
 				
 			
 			
@@ -4339,9 +4353,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Terranova
-					Horario estándar de Terranova
-					Horario de verán de Terranova
+					Horario de Terra Nova
+					Horario estándar de Terra Nova
+					Horario de verán de Terra Nova
 				
 			
 			
@@ -4351,7 +4365,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario das Illas Norfolk
+					Horario da Illa Norfolk
 				
 			
 			
@@ -4394,9 +4408,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Paraguai
-					Horario estándar de Paraguai
-					Horario de verán de Paraguai
+					Horario do Paraguai
+					Horario estándar do Paraguai
+					Horario de verán do Paraguai
 				
 			
 			
@@ -4452,9 +4466,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Sakhalin
+					Horario de Sakhalín
 					Horario estándar de Sakhalín
-					Horario de verán de Sakhalin
+					Horario de verán de Sakhalín
 				
 			
 			
@@ -4478,7 +4492,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario estándar de Singapur
+					Horario de Singapur
 				
 			
 			
@@ -4537,9 +4551,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Turcomenistán
-					Horario estándar de Turcomenistán
-					Horario de verán de Turcomenistán
+					Horario de Turkmenistán
+					Horario estándar de Turkmenistán
+					Horario de verán de Turkmenistán
 				
 			
 			
@@ -4556,9 +4570,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horario de Uzbequistán
-					Horario estándar de Uzbequistán
-					Horario de verán de Uzbequistán
+					Horario de Uzbekistán
+					Horario estándar de Uzbekistán
+					Horario de verán de Uzbekistán
 				
 			
 			
@@ -4619,19 +4633,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			,
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0
@@ -4750,34 +4776,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesetas andorranas
 			
 			
-				Dirham dos Emiratos Árabes Unidos
+				dirham dos Emiratos Árabes Unidos
 				dirham dos Emiratos Árabes Unidos
 				dirhams dos Emiratos Árabes Unidos
+				AED
 			
 			
-				Afgani afgano
-				afgani afgano
-				afganis afganos
+				afgani afgán
+				afgani afgán
+				afganis afgáns
+				AFN
 			
 			
-				Lek albanés
+				lek albanés
 				lek albanés
-				leks albaneses
+				lekë albaneses
+				ALL
 			
 			
-				Dram armenio
+				dram armenio
 				dram armenio
 				drams armenios
+				AMD
 			
 			
-				Florín das Antillas Neerlandesas
+				florín das Antillas Neerlandesas
 				florín das Antillas Neerlandesas
 				floríns das Antillas Neerlandesas
+				ANG
 			
 			
-				Kwanza angolano
+				kwanza angolano
 				kwanza angolano
 				kwanzas angolanos
+				AOA
+				Kz
 			
 			
 				Peso arxentino (1983–1985)
@@ -4785,39 +4818,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos arxentinos (ARP)
 			
 			
-				Peso arxentino
+				peso arxentino
 				peso arxentino
 				pesos arxentinos
+				ARS
+				$
 			
 			
-				Dólar australiano
+				dólar australiano
 				dólar australiano
 				dólares australianos
+				A$
+				$
 			
 			
-				Florín de Aruba
+				florín de Aruba
 				florín de Aruba
 				floríns de Aruba
+				AWG
 			
 			
-				Manat acerbaixano
+				manat acerbaixano
 				manat acerbaixano
 				manats acerbaixanos
+				AZN
 			
 			
-				Marco convertible de Bosnia e Hercegovina
+				marco convertible de Bosnia e Hercegovina
 				marco convertible de Bosnia e Hercegovina
 				marcos convertibles de Bosnia e Hercegovina
+				BAM
+				KM
 			
 			
-				Dólar de Barbados
+				dólar de Barbados
 				dólar de Barbados
 				dólares de Barbados
+				BBD
+				$
 			
 			
-				Taka de Bangladés
-				taka de Bangladés
-				takas de Bangladés
+				taka de Bangladesh
+				taka de Bangladesh
+				takas de Bangladesh
+				BDT
+				৳
 			
 			
 				Franco belga (convertible)
@@ -4835,34 +4880,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				francos belgas (financeiros)
 			
 			
-				Lev búlgaro
+				lev búlgaro
 				lev búlgaro
-				levs búlgaros
+				leva búlgaros
+				BGN
 			
 			
-				Dinar de Bahrain
+				dinar de Bahrain
 				dinar de Bahrain
 				dinares de Bahrain
+				BHD
 			
 			
-				Franco burundiano
+				franco burundiano
 				franco burundiano
 				francos burundianos
+				BIF
 			
 			
-				Dólar das Bemudas
-				dólar das Bermudas
-				dólares das Bermudas
+				dólar bermudano
+				dólar bermudano
+				dólares bermudanos
+				BMD
+				$
 			
 			
-				Dólar de Brunei
+				dólar de Brunei
 				dólar de Brunei
 				dólares de Brunei
+				BND
+				$
 			
 			
-				Boliviano
+				boliviano
 				boliviano
 				bolivianos
+				BOB
+				Bs
 			
 			
 				Peso boliviano
@@ -4888,9 +4942,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cruzeiros brasileiros (BRE)
 			
 			
-				Real brasileiro
+				real brasileiro
 				real brasileiro
 				reais brasileiros
+				R$
+				R$
 			
 			
 				Cruzado novo brasileiro
@@ -4903,49 +4959,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cruzeiros brasileiros
 			
 			
-				Dólar das Bahamas
-				dólar das Bahamas
-				dólares das Bahamas
+				dólar bahamés
+				dólar bahamés
+				dólares bahameses
+				BSD
+				$
 			
 			
-				Ngultrum butanés
+				ngultrum butanés
 				ngultrum butanés
 				ngultrums butaneses
+				BTN
 			
 			
-				Pula botsuaniano
-				pula botsuaniano
-				pulas botsuanianos
+				pula botswaniano
+				pula botswaniano
+				pulas botswanianos
+				BWP
+				P
 			
 			
-				Rublo bielorruso
-				rublo bielorruso
-				rublos bielorrusos
+				rublo belaruso
+				rublo belaruso
+				rublos belarusos
+				BYN
+				Br
 			
 			
 				Rublo bielorruso (2000–2016)
 				rublo bielorruso (2000–2016)
 				rublos bielorrusos (2000–2016)
+				BYR
 			
 			
-				Dólar belizense
+				dólar belizense
 				dólar belizense
 				dólares belizenses
+				BZD
+				$
 			
 			
-				Dólar canadense
+				dólar canadense
 				dólar canadense
 				dólares canadenses
+				$
 			
 			
-				Franco congolés
+				franco congolés
 				franco congolés
 				francos congoleses
+				CDF
 			
 			
-				Franco suízo
+				franco suízo
 				franco suízo
-				francos suizos
+				francos suízos
+				CHF
 			
 			
 				Unidades de fomento chilenas
@@ -4953,49 +5022,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				unidades de fomento chilenas
 			
 			
-				Peso chileno
+				peso chileno
 				peso chileno
 				pesos chilenos
+				CLP
+				$
 			
 			
-				Iuán chinés (extracontinental)
+				iuán chinés (extracontinental)
 				iuán chinés (extracontinental)
 				iuáns chineses (extracontinentais)
+				CNH
 			
 			
-				Iuán chinés
+				iuán chinés
 				iuán chinés
 				iuáns chineses
+				CN¥
+				¥
 			
 			
-				Peso colombiano
+				peso colombiano
 				peso colombiano
 				pesos colombianos
+				COP
+				$
 			
 			
-				Colón costarriqueño
+				colón costarriqueño
 				colón costarriqueño
 				colóns costarriqueños
+				CRC
+				₡
 			
 			
-				Peso cubano convertible
+				peso cubano convertible
 				peso cubano convertible
 				pesos cubanos convertibles
+				CUC
+				$
 			
 			
-				Peso cubano
+				peso cubano
 				peso cubano
 				pesos cubanos
+				CUP
+				$
 			
 			
-				Escudo caboverdiano
+				escudo caboverdiano
 				escudo caboverdiano
 				escudos caboverdianos
+				CVE
 			
 			
-				Coroa checa
+				coroa checa
 				coroa checa
 				coroas checas
+				CZK
+				Kč
 			
 			
 				Marco alemán
@@ -5003,24 +5088,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marcos alemáns
 			
 			
-				Franco xibutiano
-				franco xibutiano
-				francos xibutianos
+				franco djibutiano
+				franco djibutiano
+				francos djibutianos
+				DJF
 			
 			
-				Coroa dinamarquesa
+				coroa dinamarquesa
 				coroa dinamarquesa
 				coroas dinamarquesas
+				DKK
+				kr
 			
 			
-				Peso dominicano
+				peso dominicano
 				peso dominicano
 				pesos dominicanos
+				DOP
+				$
 			
 			
-				Dinar alxeriano
+				dinar alxeriano
 				dinar alxeriano
 				dinares alxerianos
+				DZD
 			
 			
 				Sucre ecuatoriano
@@ -5031,14 +5122,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidade de valor constante ecuatoriana
 			
 			
-				Libra exipcia
+				libra exipcia
 				libra exipcia
 				libras exipcias
+				EGP
+				E£
 			
 			
-				Nakfa eritreo
+				nakfa eritreo
 				nakfa eritreo
 				nakfas eritreos
+				ERN
 			
 			
 				Peseta española (conta A)
@@ -5056,24 +5150,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				.
 			
 			
-				Birr etíope
+				birr etíope
 				birr etíope
 				birres etíopes
+				ETB
 			
 			
-				Euro
+				euro
 				euro
 				euros
+				€
+				€
 			
 			
-				Dólar fidxiano
-				dólar fidxiano
-				dólares fidxianos
+				dólar fixiano
+				dólar fixiano
+				dólares fixianos
+				FJD
+				$
 			
 			
-				Libra das Malvinas
-				libra das Malvinas
-				libras das Malvinas
+				libra das Illas Malvinas
+				libra das Illas Malvinas
+				libras das Illas Malvinas
+				FKP
+				£
 			
 			
 				Franco francés
@@ -5081,35 +5182,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				francos franceses
 			
 			
-				Libra esterlina
+				libra esterlina
 				libra esterlina
 				libras esterlinas
+				£
+				£
 			
 			
-				Lari xeorxiano
+				lari xeorxiano
 				lari xeorxiano
 				laris xeorxianos
+				GEL
+				₾
 				₾
 			
 			
-				Cedi de Ghana
-				cedi de Ghana
-				cedis de Ghana
+				cedi ghanés
+				cedi ghanés
+				cedis ghaneses
+				GHS
 			
 			
-				Libra xibraltareña
+				libra xibraltareña
 				libra xibraltareña
 				libras xibraltareñas
+				GIP
+				£
 			
 			
-				Dalasi gambiano
+				dalasi gambiano
 				dalasi gambiano
 				dalasis gambianos
+				GMD
 			
 			
-				Franco guineano
+				franco guineano
 				franco guineano
 				francos guineanos
+				GNF
+				FG
 			
 			
 				Syli guineano
@@ -5121,44 +5232,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dracma grego
 			
 			
-				Quetzal guatemalteco
+				quetzal guatemalteco
 				quetzal guatemalteco
-				quetzal guatemaltecos
+				quetzais guatemaltecos
+				GTQ
+				Q
 			
 			
-				Dólar güianés
+				dólar güianés
 				dólar güianés
 				dólares güianeses
+				GYD
+				$
 			
 			
-				Dólar de Hong Kong
+				dólar de Hong Kong
 				dólar de Hong Kong
 				dólares de Hong Kong
+				HK$
+				$
 			
 			
-				Lempira hondureño
+				lempira hondureño
 				lempira hondureño
 				lempiras hondureños
+				HNL
+				L
 			
 			
-				Kuna croata
+				kuna croata
 				kuna croata
 				kunas croatas
+				HRK
+				kn
 			
 			
-				Gourde haitiano
-				gourde haitiano
-				gourdes haitianos
+				gourde haitiana
+				gourde haitiana
+				gourdes haitianas
+				HTG
 			
 			
-				Florín húngaro
+				florín húngaro
 				florín húngaro
 				floríns húngaros
+				HUF
+				Ft
 			
 			
-				Rupia indonesia
+				rupia indonesia
 				rupia indonesia
 				rupias indonesias
+				IDR
+				Rp
 			
 			
 				Libra irlandesa
@@ -5166,113 +5292,148 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libras irlandesas
 			
 			
-				Novo shequel israelí
+				novo shequel israelí
 				novo shequel israelí
 				novos shequeis israelís
+				₪
+				₪
 			
 			
-				Rupia india
+				rupia india
 				rupia india
 				rupias indias
+				₹
+				₹
 			
 			
-				Dinar iraquí
+				dinar iraquí
 				dinar iraquí
 				dinares iraquíes
+				IQD
 			
 			
-				Rial iraniano
+				rial iraniano
 				rial iraniano
-				riais iranianos
+				riales iranianos
+				IRR
 			
 			
-				Coroa islandesa
+				coroa islandesa
 				coroa islandesa
 				coroas islandesas
+				ISK
+				kr
 			
 			
 				Lira italiana
 			
 			
-				Dólar xamaicano
+				dólar xamaicano
 				dólar xamaicano
 				dólares xamaicanos
+				JMD
+				$
 			
 			
-				Dinar xordano
+				dinar xordano
 				dinar xordano
 				dinares xordanos
+				JOD
 			
 			
-				Ien xaponés
+				ien xaponés
 				ien xaponés
 				iens xaponeses
+				JP¥
+				¥
 			
 			
-				Xilin kenyano
+				xilin kenyano
 				xilin kenyano
 				xilins kenyanos
+				KES
 			
 			
-				Som quirguicistano
-				som quirguicistano
-				soms quirguicistanos
+				som kirguiz
+				som kirguiz
+				soms kirguiz
+				KGS
 			
 			
-				Riel camboxano
+				riel camboxano
 				riel camboxano
 				rieis camboxanos
+				KHR
+				៛
 			
 			
-				Franco comoriano
+				franco comoriano
 				franco comoriano
 				francos comorianos
+				KMF
 				FC
 			
 			
-				Won norcoreano
+				won norcoreano
 				won norcoreano
 				wons norcoreanos
+				KPW
+				₩
 			
 			
-				Won surcoreano
+				won surcoreano
 				won surcoreano
 				wons surcoreanos
+				₩
+				₩
 			
 			
-				Dinar kuwaití
+				dinar kuwaití
 				dinar kuwaití
 				dinares kuwaitís
+				KWD
 			
 			
-				Dólar das Illas Caimán
+				dólar das Illas Caimán
 				dólar das Illas Caimán
 				dólares das Illas Caimán
+				KYD
+				$
 			
 			
-				Tenge casaco
-				tenge casaco
-				tenges casacos
+				tenge kazako
+				tenge kazako
+				tenges kazakos
+				KZT
+				₸
 			
 			
-				Kip laosiano
+				kip laosiano
 				kip laosiano
 				kips laosianos
+				LAK
+				₭
 			
 			
-				Libra libanesa
+				libra libanesa
 				libra libanesa
 				libras libanesas
+				LBP
+				L£
 			
 			
-				Rupia de Sri Lanka
-				rupia de Sri Lanka
-				rupias de Sri Lanka
+				rupia srilankesa
+				rupia srilankesa
+				rupias srilankesas
+				LKR
+				Rs
 			
 			
-				Dólar liberiano
+				dólar liberiano
 				dólar liberiano
 				dólares liberianos
+				LRD
+				$
 			
 			
 				Loti de Lesoto
@@ -5299,14 +5460,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				LVL
 			
 			
-				Dinar libio
+				dinar libio
 				dinar libio
 				dinares libios
+				LYD
 			
 			
-				Dirham marroquí
+				dirham marroquí
 				dirham marroquí
 				dirhams marroquís
+				MAD
 			
 			
 				Franco marroquí
@@ -5315,62 +5478,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Leu moldavo
 				leu moldavo
 				leus moldavos
+				MDL
 			
 			
-				Ariary malgaxe
+				ariary malgaxe
 				ariary malgaxe
 				ariarys malgaxes
+				MGA
+				Ar
 			
 			
-				Dinar macedonio
+				dinar macedonio
 				dinar macedonio
 				dinares macedonios
+				MKD
 			
 			
-				Kyat birmano
+				kyat birmano
 				kyat birmano
 				kyats birmanos
+				MMK
+				K
 			
 			
-				Tugrik mongol
+				tugrik mongol
 				tugrik mongol
-				tugriks mongoles
+				tugriks mongois
+				MNT
+				₮
 			
 			
-				Pataca de Macau
-				pataca de Macau
-				patacas de Macau
+				pataca macaense
+				pataca macaense
+				patacas macaenses
+				MOP
 			
 			
 				Ouguiya mauritano (1973–2017)
 				ouguiya mauritano (1973–2017)
 				ouguiyas mauritanos (1973–2017)
+				MRO
 			
 			
-				Ouguiya mauritano
+				ouguiya mauritano
 				ouguiya mauritano
 				ouguiyas mauritanos
+				MRU
 			
 			
-				Rupia mauriciana
+				rupia mauriciana
 				rupia mauriciana
 				rupias mauricianas
+				MUR
+				Rs
 			
 			
-				Rupia maldivana
+				rupia maldivana
 				rupia maldivana
 				rupias maldivanas
+				MVR
 			
 			
-				Kwacha de Malaui
-				kwacha de Malaui
-				kwachas de Malaui
+				kwacha de Malawi
+				kwacha de Malawi
+				kwachas de Malawi
+				MWK
 			
 			
-				Peso mexicano
+				peso mexicano
 				peso mexicano
 				pesos mexicanos
 				$MX
+				$
 			
 			
 				Peso de prata mexicano (1861–1992)
@@ -5379,68 +5558,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidade de inversión mexicana
 			
 			
-				Ringgit malaio
+				ringgit malaio
 				ringgit malaio
 				ringgits malaios
+				MYR
+				RM
 			
 			
-				Metical de Mozambique
-				metical de Mozambique
-				meticais de Mozambique
+				metical mozambicano
+				metical mozambicano
+				meticais mozambicanos
+				MZN
 			
 			
-				Dólar namibio
+				dólar namibio
 				dólar namibio
 				dólares namibios
+				NAD
+				$
 			
 			
-				Naira nixeriano
+				naira nixeriano
 				naira nixeriano
 				nairas nixerianos
+				NGN
+				₦
 			
 			
 				Córdoba nicaragüense
 			
 			
-				Córdoba de ouro nicaraguano
-				córdoba de ouro nicaraguano
-				córdobas de ouro nicaraguanos
+				córdoba nicaraguano
+				córdoba nicaraguano
+				córdobas nicaraguanos
+				NIO
+				C$
 			
 			
 				Florín holandés
 			
 			
-				Coroa norueguesa
+				coroa norueguesa
 				coroa norueguesa
 				coroas norueguesas
+				NOK
+				kr
 			
 			
-				Rupia nepalesa
+				rupia nepalesa
 				rupia nepalesa
 				rupias nepalesas
+				NPR
+				Rs
 			
 			
-				Dólar neozelandés
+				dólar neozelandés
 				dólar neozelandés
 				dólares neozelandeses
+				NZ$
+				$
 			
 			
-				Rial omaní
+				rial omaní
 				rial omaní
 				riais omanís
+				OMR
 			
 			
-				Balboa panameño
+				balboa panameño
 				balboa panameño
 				balboas panameños
+				PAB
 			
 			
 				Inti peruano
 			
 			
-				Sol peruano
+				sol peruano
 				sol peruano
 				soles peruanos
+				PEN
 			
 			
 				Sol peruano (1863–1965)
@@ -5448,24 +5645,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				soles peruanos (1863–1965)
 			
 			
-				Kina de Papúa-Nova Guinea
+				kina de Papúa-Nova Guinea
 				kina de Papúa-Nova Guinea
 				kinas de Papúa-Nova Guinea
+				PGK
 			
 			
-				Peso filipino
+				peso filipino
 				peso filipino
 				pesos filipinos
+				PHP
+				₱
 			
 			
-				Rupia paquistaní
+				rupia paquistaní
 				rupia paquistaní
 				rupias paquistanís
+				PKR
+				Rs
 			
 			
-				Zloty polaco
+				zloty polaco
 				zloty polaco
 				zlotys polacos
+				PLN
+				zł
 			
 			
 				Escudo portugués
@@ -5473,103 +5677,132 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				escudos portugueses
 			
 			
-				Guaraní paraguaio
+				guaraní paraguaio
 				guaraní paraguaio
 				guaranís paraguaios
+				PYG
+				₲
 			
 			
-				Rial qatarí
+				rial qatarí
 				rial qatarí
 				riais qatarís
+				QAR
 			
 			
-				Leu romanés
+				leu romanés
 				leu romanés
-				leus romaneses
+				lei romaneses
+				RON
+				lei
 			
 			
-				Dinar serbio
+				dinar serbio
 				dinar serbio
 				dinares serbios
+				RSD
 			
 			
-				Rublo ruso
+				rublo ruso
 				rublo ruso
 				rublos rusos
+				RUB
 				руб
 			
 			
 				Rublo ruso (1991–1998)
 			
 			
-				Franco ruandés
+				franco ruandés
 				franco ruandés
 				francos ruandeses
+				RWF
+				RF
 			
 			
-				Rial saudita
+				rial saudita
 				rial saudita
 				riais sauditas
+				SAR
 			
 			
-				Dólar das Illas Salomón
+				dólar das Illas Salomón
 				dólar das Illas Salomón
 				dólares das Illas Salomón
+				SBD
+				$
 			
 			
-				Rupia de Seixeles
-				rupia de Seixeles
-				rupias de Seixeles
+				rupia de Seychelles
+				rupia de Seychelles
+				rupias de Seychelles
+				SCR
 			
 			
-				Libra sudanesa
+				libra sudanesa
 				libra sudanesa
 				libras sudanesas
+				SDG
 			
 			
-				Coroa sueca
+				coroa sueca
 				coroa sueca
 				coroas suecas
+				SEK
+				kr
 			
 			
-				Dólar de Singapur
+				dólar de Singapur
 				dólar de Singapur
 				dólares de Singapur
+				SGD
+				$
 			
 			
-				Libra de Santa Helena
+				libra de Santa Helena
 				libra de Santa Helena
 				libras de Santa Helena
+				SHP
+				£
 			
 			
-				Leone de Serra Leoa
+				leone de Serra Leoa
 				leone de Serra Leoa
 				leones de Serra Leoa
+				SLL
 			
 			
-				Xilin somalí
+				xilin somalí
 				xilin somalí
-				xilins somalíes
+				xilins somalís
+				SOS
 			
 			
-				Dólar surinamés
+				dólar surinamés
 				dólar surinamés
 				dólares surinamés
+				SRD
+				$
 			
 			
-				Libra sursudanesa
+				libra sursudanesa
 				libra sursudanesa
 				libras sursudanesa
+				SSP
+				£
 			
 			
 				Dobra de São Tomé e Príncipe (1977–2017)
 				dobra de São Tomé e Príncipe (1977–2017)
 				dobras de São Tomé e Príncipe (1977–2017)
+				STD
 			
 			
-				Dobra de São Tomé e Príncipe
-				dobra de São Tomé e Príncipe
-				dobras de São Tomé e Príncipe
+				dobra de San Tomé e Príncipe
+				dobra de San Tomé e Príncipe
+				dobras de San Tomé e Príncipe
+				STN
+				Db
 			
 			
 				Rublo soviético
@@ -5582,77 +5815,97 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				colóns salvadoreños
 			
 			
-				Libra siria
+				libra siria
 				libra siria
 				libras sirias
+				SYP
+				£
 			
 			
-				Lilangeni de Suacilandia
+				lilangeni de Eswatini
 				lilangeni de Suacilandia
-				lilangenis de Suacilandia
+				lilangenis de Eswatini
+				SZL
 			
 			
-				Baht tailandés
+				baht tailandés
 				baht tailandés
 				bahts tailandeses
 				฿
+				฿
 			
 			
-				Somoni taxiquistano
+				somoni taxiquistano
 				somoni taxiquistano
 				somonis taxiquistanos
+				TJS
 			
 			
-				Manat turcomán
-				manat turcomán
-				manats turcománs
+				manat turkmeno
+				manat turkmeno
+				manats turkmenos
+				TMT
 			
 			
-				Dinar tunisiano
+				dinar tunisiano
 				dinar tunisiano
 				dinares tunisianos
+				TND
 			
 			
-				Paʻanga de Tonga
-				paʻanga de Tonga
-				pa’angas de Tonga
+				paʻanga tongano
+				paʻanga tongano
+				pa’angas tonganos
+				TOP
+				T$
 			
 			
-				Lira turca
+				lira turca
 				lira turca
 				liras turcas
+				TRY
+				₺
+				TL
 			
 			
-				Dólar de Trinidad e Tobago
-				dólar de Trinidad e Tobago
-				dólares de Trinidad e Tobago
+				dólar trinitense
+				dólar trinitense
+				dólares trinitenses
+				TTD
+				$
 			
 			
-				Novo dólar taiwanés
+				novo dólar taiwanés
 				novo dólar taiwanés
 				novos dólares taiwaneses
+				NT$
 				NT$
 			
 			
-				Xilin tanzano
+				xilin tanzano
 				xilin tanzano
 				xilins tanzanos
+				TZS
 			
 			
-				Hrivna ucraína
+				hrivna ucraína
 				hrivna ucraína
 				hrivnas ucraínas
+				UAH
+				₴
 			
 			
-				Xilin ugandés
+				xilin ugandés
 				xilin ugandés
 				xilins ugandeses
+				UGX
 			
 			
-				Dólar estadounidense
+				dólar estadounidense
 				dólar estadounidense
 				dólares estadounidenses
 				$
+				$
 			
 			
 				Peso en unidades indexadas uruguaio
@@ -5661,14 +5914,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peso uruguaio (1975–1993)
 			
 			
-				Peso uruguaio
+				peso uruguaio
 				peso uruguaio
 				pesos uruguaios
+				UYU
+				$
 			
 			
-				Som usbeco
-				som usbeco
-				soms usbecos
+				som uzbeko
+				som uzbeko
+				soms uzbekos
+				UZS
 			
 			
 				Bolívar venezolano (1871–2008)
@@ -5679,31 +5935,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolívar venezolano (2008–2018)
 				bolívar venezolano (2008–2018)
 				bolívares venezolanos (2008–2018)
+				VEF
+				Bs
 			
 			
-				Bolívar venezolano
+				bolívar venezolano
 				bolívar venezolano
 				bolívares venezolanos
+				VES
 			
 			
-				Dong vietnamita
+				dong vietnamita
 				dong vietnamita
 				dongs vietnamitas
+				₫
+				₫
 			
 			
-				Vatu vanuatiano
+				vatu vanuatiano
 				vatu vanuatiano
 				vatus vanuatianos
+				VUV
 			
 			
-				Tala samoano
+				tala samoano
 				tala samoano
 				talas samoanos
+				WST
 			
 			
-				Franco CFA (BEAC)
+				franco CFA (BEAC)
 				franco CFA (BEAC)
 				francos CFA (BEAC)
+				FCFA
 			
 			
 				Prata
@@ -5712,48 +5976,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ouro
 			
 			
-				Dólar do Caribe Oriental
+				dólar do Caribe Oriental
 				dólar do Caribe Oriental
 				dólares do Caribe Oriental
+				XCD
+				$
 			
 			
-				Franco CFA (BCEAO)
+				franco CFA (BCEAO)
 				franco CFA (BCEAO)
 				francos CFA (BCEAO)
+				CFA
 			
 			
 				Paladio
 			
 			
-				Franco CFP
+				franco CFP
 				franco CFP
 				francos CFP
+				CFPF
 			
 			
 				Platino
 			
 			
-				Moeda descoñecida
+				moeda descoñecida
 				(moeda descoñecida)
 				(moedas descoñecidas)
 			
 			
-				Rial iemení
+				rial iemení
 				rial iemení
 				riais iemenís
+				YER
 			
 			
-				Rand surafricano
+				rand surafricano
 				rand surafricano
 				rands surafricanos
+				ZAR
+				R
 			
 			
 				Kwacha zambiano (1968–2012)
 			
 			
-				Kwacha zambiano
+				kwacha zambiano
 				kwacha zambiano
 				kwachas zambianos
+				ZMW
+				ZK
 			
 		
 		
@@ -5784,7 +6057,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} metros por segundo cadrado
 			
 			
-				revoluciones
+				revolucións
 				{0} revolución
 				{0} revolucións
 			
@@ -5983,6 +6256,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} século
 				{0} séculos
 			
+			
+				décadas
+				{0} década
+				{0} décadas
+			
 			
 				anos
 				{0} ano
@@ -6041,14 +6319,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nanosegundos
 			
 			
-				amperios
-				{0} amperio
-				{0} amperios
+				amperes
+				{0} ampere
+				{0} amperes
 			
 			
-				miliamperios
-				{0} miliamperio
-				{0} miliamperios
+				miliamperes
+				{0} miliampere
+				{0} miliamperes
 			
 			
 				ohms
@@ -6086,20 +6364,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} joules
 			
 			
-				quilowatts/hora
-				{0} quilowatt/hora
-				{0} quilowatts/hora
+				quilowatts hora
+				{0} quilowatt hora
+				{0} quilowatts hora
 			
 			
-				electrón-volts
-				{0} electrón-volt
-				{0} electrón-volts
+				electronvolts
+				{0} electronvolt
+				{0} electronvolts
 			
 			
 				unidades térmicas británicas
 				{0} unidade térmica británica
 				{0} unidades térmicas británicas
 			
+			
+				therms estadounidenses
+				{0} therm estadounidense
+				{0} therms estadounidenses
+			
 			
 				libras de forza
 				{0} libra de forza
@@ -6111,24 +6394,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} newtons
 			
 			
-				xigahertz
+				xigahertzs
 				{0} xigahertz
-				{0} xigahertz
+				{0} xigahertzs
 			
 			
-				megahertz
+				megahertzs
 				{0} megahertz
-				{0} megahertz
+				{0} megahertzs
 			
 			
-				kilohertz
-				{0} kilohertz
-				{0} kilohertz
+				quilohertzs
+				{0} quilohertz
+				{0} quilohertzs
 			
 			
-				hertz
+				hertzs
 				{0} hertz
-				{0} hertz
+				{0} hertzs
+			
+			
+				cuadratíns
+				{0} cuadratín
+				{0} cuadratíns
+			
+			
+				píxeles
+				{0} píxel
+				{0} píxeles
+			
+			
+				megapíxeles
+				{0} megapíxel
+				{0} megapíxeles
+			
+			
+				píxeles por centímetro
+				{0} píxel por centímetro
+				{0} píxeles por centímetro
+			
+			
+				píxeles por polgada
+				{0} píxel por polgada
+				{0} píxeles por polgada
+			
+			
+				puntos por centímetro
+				{0} punto por centímetro
+				{0} puntos por centímetro
+			
+			
+				puntos por polgada
+				{0} punto por polgada
+				{0} puntos por polgada
 			
 			
 				quilómetros
@@ -6196,9 +6514,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} por polgada
 			
 			
-				pársecs
-				{0} pársec
-				{0} pársecs
+				parsecs
+				{0} parsec
+				{0} parsecs
 			
 			
 				anos luz
@@ -6231,9 +6549,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} raios solares
 			
 			
-				luxes
+				lux
 				{0} lux
-				{0} luxes
+				{0} lux
 			
 			
 				luminosidades solares
@@ -6330,20 +6648,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} watts
 			
 			
-				milliwatts
-				{0} milliwatt
-				{0} milliwatts
+				miliwatts
+				{0} miliwatt
+				{0} miliwatts
 			
 			
 				cabalo de potencia
 				{0} cabalo de potencia
 				{0} cabalos de potencia
 			
-			
-				hectopascais
-				{0} hectopascal
-				{0} hectopascais
-			
 			
 				milímetros de mercurio
 				{0} milímetro de mercurio
@@ -6359,6 +6672,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} polgada de mercurio
 				{0} polgadas de mercurio
 			
+			
+				bares
+				{0} bar
+				{0} bares
+			
 			
 				milibares
 				{0} milibar
@@ -6369,6 +6687,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfera
 				{0} atmosferas
 			
+			
+				pascais
+				{0} pascal
+				{0} pascais
+			
+			
+				hectopascais
+				{0} hectopascal
+				{0} hectopascais
+			
 			
 				quilopascais
 				{0} quilopascal
@@ -6415,9 +6743,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} graos Fahrenheit
 			
 			
-				graos Kelvin
-				{0} grao Kelvin
-				{0} graos Kelvin
+				kelvins
+				{0} kelvin
+				{0} kelvins
 			
 			
 				libras pés
@@ -6555,9 +6883,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} culleradas
 			
 			
-				culleriñas
-				{0} culleriña
-				{0} culleriñas
+				culleradiñas
+				{0} culleradiña
+				{0} culleradiñas
 			
 			
 				barrís
@@ -6566,10 +6894,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				punto cardinal
-				{0} L
-				{0} N
-				{0} S
-				{0} O
+				{0} leste
+				{0} norte
+				{0} sur
+				{0} oeste
 			
 		
 		
@@ -6664,12 +6992,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				dunams
 				{0} dunam
-				{0} dunam
+				{0} dunams
 			
 			
 				quilates
-				{0} CT
-				{0} CT
+				{0} kt
+				{0} kt
 			
 			
 				mg/dl
@@ -6697,14 +7025,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				‱
 				{0} ‱
 				{0} ‱
 			
 			
-				mol
-				{0} moles
-				{0} moles
+				{0} mol
+				{0} mol
 			
 			
 				litros/km
@@ -6778,14 +7104,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				bit
-				{0} bit
-				{0} bit
+				{0} b
+				{0} b
 			
 			
 				séc.
 				{0} séc.
 				{0} séc.
 			
+			
+				déc.
+				{0} déc.
+				{0} déc.
+			
 			
 				anos
 				{0} ano
@@ -6806,9 +7137,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				días
-				{0} d
-				{0} d
-				{0}/d
+				{0} día
+				{0} días
+				{0}/día
 			
 			
 				h
@@ -6844,7 +7175,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ns
 			
 			
-				amp
+				A
 				{0} A
 				{0} A
 			
@@ -6889,29 +7220,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} J
 			
 			
-				kW/h
-				{0} kW/h
-				{0} kW/h
-			
-			
-				electrón-volt
-				{0} eV
-				{0} eV
+				{0} kWh
+				{0} kWh
 			
 			
 				BTU
 				{0} BTU
 				{0} BTU
 			
+			
+				thm U.S.
+				{0} thm U.S.
+				{0} thm U.S.
+			
 			
 				libra forza
-				{0} lbf
-				{0} lbf
 			
 			
 				newton
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -6933,6 +7259,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				px/cm
+				{0} px/cm
+				{0} px/cm
+			
+			
+				px/in
+				{0} px/in
+				{0} px/in
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppp
+				{0} ppp
+				{0} ppp
+			
 			
 				km
 				{0} km
@@ -6999,14 +7350,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in
 			
 			
-				pársecs
+				parsecs
 				{0} pc
 				{0} pc
 			
 			
 				anos luz
-				{0} al
-				{0} al
+				{0} a.l.
+				{0} a.l.
 			
 			
 				ua
@@ -7030,18 +7381,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				raios solares
-				{0} R☉
-				{0} R☉
 			
 			
-				luxes
+				lux
 				{0} lx
 				{0} lx
 			
 			
 				luminosidades solares
-				{0} L☉
-				{0} L☉
 			
 			
 				t
@@ -7056,7 +7403,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				gramos
-				{0} gram
+				{0} g
 				{0} g
 				{0}/g
 			
@@ -7094,23 +7441,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				quilates
-				{0} CT
-				{0} CT
+				{0} ct
+				{0} ct
 			
 			
 				daltons
-				{0} Da
-				{0} Da
 			
 			
 				masas da Terra
-				{0} M⊕
-				{0} M⊕
 			
 			
 				masas solares
-				{0} M☉
-				{0} M☉
 			
 			
 				GW
@@ -7142,15 +7483,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
-				mm Hg
-				{0} mm Hg
-				{0} mm Hg
+				mmHg
+				{0} mmHg
+				{0} mmHg
 			
 			
 				psi
@@ -7162,6 +7498,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -7172,15 +7513,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -7228,9 +7564,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lbf ft
 			
 			
-				Nm
-				{0} Nm
-				{0} Nm
+				N⋅m
+				{0} N⋅m
+				{0} N⋅m
 			
 			
 				km³
@@ -7353,22 +7689,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz imp.
 			
 			
-				tbsp
-				{0} tbsp
-				{0} tbsp
+				cull.
+				{0} cull.
+				{0} cull.
 			
 			
-				tsp
-				{0} tsp
-				{0} tsp
+				cullña.
+				{0} cullña.
+				{0} cullña.
 			
 			
 				barril
-				{0} bbl
-				{0} bbl
 			
 			
-				dirección
+				punto
 				{0} L
 				{0} N
 				{0} S
@@ -7399,7 +7733,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} a.
 			
 			
-				m.
+				mes
 				{0} m.
 				{0} m.
 			
@@ -7409,7 +7743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sem.
 			
 			
-				d
+				día
 				{0} d
 				{0} d
 			
@@ -7483,7 +7817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l
 			
 			
-				dirección
+				punto
 				{0} L
 				{0} N
 				{0} S
@@ -7513,6 +7847,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} ou {1}
 			{0} ou {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/gl_ES.xml b/make/data/cldr/common/main/gl_ES.xml
index 4c1ec52a5df..7c71c528c11 100644
--- a/make/data/cldr/common/main/gl_ES.xml
+++ b/make/data/cldr/common/main/gl_ES.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gsw.xml b/make/data/cldr/common/main/gsw.xml
index c76e44c4d3c..8a3ee70887c 100644
--- a/make/data/cldr/common/main/gsw.xml
+++ b/make/data/cldr/common/main/gsw.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -767,8 +767,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			St. Martin
 			Madagaschkar
 			Marshallinsle
-			Mazedoonie
-			Mazedoonie (EJRM)
 			Maali
 			Myanmar (Burma)
 			Mongolei
@@ -3572,11 +3570,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Pferdestärke
 				{0} Pferdestärke
 			
-			
-				Hektopascal
-				{0} Hektopascal
-				{0} Hektopascal
-			
 			
 				Zoll Quecksilbersüüle
 				{0} Zoll Quecksilbersüüle
@@ -3587,6 +3580,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Millibar
 				{0} Millibar
 			
+			
+				Hektopascal
+				{0} Hektopascal
+				{0} Hektopascal
+			
 			
 				Kilometer pro Stund
 				{0} Kilometer pro Stund
@@ -3801,11 +3799,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} PS
 				{0} PS
 			
-			
-				Hektopascal
-				{0} hPa
-				{0} hPa
-			
 			
 				Zoll Quecksilbersüüle
 				{0} inHg
@@ -3816,6 +3809,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				Hektopascal
+				{0} hPa
+				{0} hPa
+			
 			
 				Kilometer pro Stund
 				{0} km/h
@@ -3989,10 +3987,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} PS
 				{0} PS
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -4001,6 +3995,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				{0}km/h
 				{0}km/h
diff --git a/make/data/cldr/common/main/gsw_CH.xml b/make/data/cldr/common/main/gsw_CH.xml
index 2f66989cc25..93a5bd7e6bd 100644
--- a/make/data/cldr/common/main/gsw_CH.xml
+++ b/make/data/cldr/common/main/gsw_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gsw_FR.xml b/make/data/cldr/common/main/gsw_FR.xml
index 72b221a2ad7..55946178dda 100644
--- a/make/data/cldr/common/main/gsw_FR.xml
+++ b/make/data/cldr/common/main/gsw_FR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gsw_LI.xml b/make/data/cldr/common/main/gsw_LI.xml
index f12311cc5fb..24721934c8d 100644
--- a/make/data/cldr/common/main/gsw_LI.xml
+++ b/make/data/cldr/common/main/gsw_LI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gu.xml b/make/data/cldr/common/main/gu.xml
index 32df3229f71..aa49eefe221 100644
--- a/make/data/cldr/common/main/gu.xml
+++ b/make/data/cldr/common/main/gu.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -87,6 +87,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			કડ્ડો
 			કરિબ
 			અત્સમ
+			ચકમા
 			ચેચન
 			સિબુઆનો
 			ચિગા
@@ -541,14 +542,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			યિદ્દિશ
 			યોરૂબા
 			કેંટોનીઝ
+			ચાઇનીઝ, કેન્ટોનીઝ
 			ઝુઆગ
 			ઝેપોટેક
 			બ્લિસિમ્બોલ્સ
 			ઝેનાગા
 			માનક મોરોક્કન તામાઝિટ
 			ચાઇનીઝ
+			ચાઇનીઝ, મેન્ડેરિન
 			સરળીકૃત ચાઇનીઝ
+			સરળીકૃત મેન્ડેરિન ચાઇનીઝ
 			પારંપરિક ચાઇનીઝ
+			પરંપરાગત મેન્ડેરિન ચાઇનીઝ
 			ઝુલુ
 			ઝૂની
 			કોઇ ભાષાશાસ્ત્રીય સામગ્રી નથી
@@ -952,8 +957,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			એલ સેલ્વાડોર
 			સિંટ માર્ટેન
 			સીરિયા
-			સ્વાઝિલેન્ડ
-			સ્વાઝીલેન્ડ
+			એસ્વાટીની
+			સ્વાઝીલેન્ડ
 			ત્રિસ્તાન દા કુન્હા
 			તુર્ક્સ અને કેકોઝ આઇલેન્ડ્સ
 			ચાડ
@@ -990,6 +995,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			વાનુઆતુ
 			વૉલિસ અને ફ્યુચુના
 			સમોઆ
+			સ્યુડો-ઍક્સન્ટ
+			સ્યુડો-દ્વિદિશ
 			કોસોવો
 			યમન
 			મેયોટ
@@ -1148,8 +1155,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u0ABC ૐ \u0A82 \u0A81 ઃ અ આ ઇ ઈ ઉ ઊ ઋ ૠ ઍ એ ઐ ઑ ઓ ઔ ક ખ ગ ઘ ઙ ચ છ જ ઝ ઞ ટ ઠ ડ ઢ ણ ત થ દ ધ ન પ ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ ઽ ા િ ી \u0AC1 \u0AC2 \u0AC3 \u0AC4 \u0AC5 \u0AC7 \u0AC8 ૉ ો ૌ \u0ACD]
 		[\u200C\u200D ૰]
 		[અ {અ\u0A82} {અઃ} આ ઇ ઈ ઉ ઊ ઋ ઍ એ ઐ ઑ ઓ ઔ ક {ક\u0ACDષ} ખ ગ ઘ ઙ ચ છ જ {જ\u0ACDઞ} ઝ ઞ ટ ઠ ડ ઢ ણ ત {ત\u0ACDર} થ દ ધ ન પ ફ બ ભ મ ય ર લ વ શ ષ સ હ ળ]
-		[\- , . % ‰ + 0૦ 1૧ 2૨ 3૩ 4૪ 5૫ 6૬ 7૭ 8૮ 9૯]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0૦ 1૧ 2૨ 3૩ 4૪ 5૫ 6૬ 7૭ 8૮ 9૯]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1161,16 +1168,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1181,6 +1191,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1199,6 +1222,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							મેસ્રા
 							નાસીઈ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ટૉટ
 							બાબા
@@ -1231,6 +1269,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							મેસ્રા
 							નાસીઈ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ટૉટ
 							બાબા
@@ -1281,6 +1334,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							નેહાસ્સે
 							પેગુમેન
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							મેસ્કેરેમ
 							ટેકેમ્ટ
@@ -1313,6 +1381,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							નેહાસ્સે
 							પેગુમેન
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							મેસ્કેરેમ
 							ટેકેમ્ટ
@@ -1436,57 +1519,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
 						
-							GGGGG y-dd-MM – y-dd-MM
-							GGGGG y-dd-MM – GGGGG y-dd-MM
-							GGGGG y-dd-MM – y-dd-MM
-							GGGGG y-dd-MM – y-dd-MM
+							GGGGG y-dd-MM – y-dd-MM
+							GGGGG y-dd-MM – GGGGG y-dd-MM
+							GGGGG y-dd-MM – y-dd-MM
+							GGGGG y-dd-MM – y-dd-MM
 						
 						
-							E, M/d/y – E, M/d/y GGGGG
-							GGGGG y-dd-MM, E – GGGGG y-dd-MM, E
-							GGGGG y-dd-MM, E – y-dd-MM, E
-							GGGGG y-dd-MM, E – y-dd-MM, E
+							E, M/d/y – E, M/d/y GGGGG
+							GGGGG y-dd-MM, E – GGGGG y-dd-MM, E
+							GGGGG y-dd-MM, E – y-dd-MM, E
+							GGGGG y-dd-MM, E – y-dd-MM, E
 						
 						
-							G y MMM – G y MMM
-							G y MMM – MMM
-							G y MMM – y MMM
+							G y MMM – MMM
 						
 						
-							G y d–d MMM
-							G y d MMM – G y d MMM
-							G y d MMM – d MMM
-							G y d MMM – y d MMM
+							G y d–d MMM
+							G y d MMM – G y d MMM
+							G y d MMM – d MMM
+							G y d MMM – y d MMM
 						
 						
-							G y d MMM, E – d MMM, E
-							G y d MMM, E – G y d MMM, E
-							G y d MMM, E – d MMM, E
-							G y d MMM, E – y d MMM , E
+							G y d MMM, E – d MMM, E
+							G y d MMM, E – G y d MMM, E
+							G y d MMM, E – d MMM, E
+							G y d MMM, E – y d MMM , E
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
 						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
 							h:mm–h:mm a v
 						
 						
@@ -1949,8 +2030,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d MMM
 						E, d MMM
 						d MMMM
-						MMMM ના W અઠવાડિયા
-						MMMM ના W અઠવાડિયા
+						MMMMના W અઠવાડિયા
+						MMMMના W અઠવાડિયા
 						mm:ss
 						y
 						M/y
@@ -1972,54 +2053,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
 						
-							GGGGG y-dd-MM – y-dd-MM
-							GGGGG y-dd-MM – GGGGG y-dd-MM
-							GGGGG y-dd-MM – y-dd-MM
-							GGGGG y-dd-MM – y-dd-MM
+							GGGGG y-dd-MM – y-dd-MM
+							GGGGG y-dd-MM – GGGGG y-dd-MM
+							GGGGG y-dd-MM – y-dd-MM
+							GGGGG y-dd-MM – y-dd-MM
 						
 						
-							GGGGG y-dd-MM, E – y-dd-MM, E
-							GGGGG y-dd-MM, E – GGGGG y-dd-MM, E
-							GGGGG y-dd-MM, E – y-dd-MM, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							GGGGG y-dd-MM, E – y-dd-MM, E
+							GGGGG y-dd-MM, E – GGGGG y-dd-MM, E
+							GGGGG y-dd-MM, E – y-dd-MM, E
 						
 						
-							G y d–d MMM
-							G y d MMM – G y d MMM
-							G y d MMM – d MMM
-							G y d MMM – y d MMM
+							G y d–d MMM
+							G y d MMM – G y d MMM
+							G y d MMM – d MMM
+							G y d MMM – y d MMM
 						
 						
-							G y d MMM, E – d MMM, E
-							G y d MMM, E – G y d MMM, E
-							G y d MMM, E – d MMM, E
-							G y d MMM, E – y d MMM , E
+							G y d MMM, E – d MMM, E
+							G y d MMM, E – G y d MMM, E
+							G y d MMM, E – d MMM, E
+							G y d MMM, E – y d MMM , E
 						
 						
 							h a – h a
@@ -2132,6 +2196,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							આવ
 							ઈલુલ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							તીશ્રી
 							હેશવાન
@@ -2166,6 +2246,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							આવ
 							ઈલુલ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							તીશ્રી
 							હેશવાન
@@ -2184,6 +2280,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2202,6 +2309,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							મહા
 							ફાલ્ગુન
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ચૈત્ર
 							વૈશાખ
@@ -2232,6 +2353,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							મહા
 							ફાલ્ગુન
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ચૈત્ર
 							વૈશાખ
@@ -2287,6 +2422,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ધુʻલ-ક્યુ.
 							ધુʻલ-એચ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							મુહર્રમ
 							સફર
@@ -2317,6 +2466,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ધુʻલ-ક્યુ.
 							ધુʻલ-એચ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							મુહર્રમ
 							સફર
@@ -2333,6 +2496,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2351,6 +2525,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							બાહમેન
 							એસ્ફાન્ડ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ફાર્વાર્દિન
 							ઓરડીબેહેશ્ટ
@@ -2381,6 +2569,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							બાહમેન
 							એસ્ફાન્ડ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ફાર્વાર્દિન
 							ઓરડીબેહેશ્ટ
@@ -2397,6 +2599,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3130,7 +3343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				મોસન
 			
 			
-				ડૅવિસ
+				ડેવિસ
 			
 			
 				વોસ્ટૉક
@@ -3424,7 +3637,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				સેંટ જ્હોન્સ
 			
 			
-				કૉકોસ
+				કોકોઝ
 			
 			
 				કિંશાસા
@@ -3622,7 +3835,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				એથેંસ
 			
 			
-				સાઉથ જ્યોર્જિયા
+				દક્ષિણ જ્યોર્જિયા
 			
 			
 				ગ્વાટેમાલા
@@ -3754,7 +3967,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ઍક્ટોબ
 			
 			
-				કોસ્ટાને
+				કોસ્ટાને
 			
 			
 				કિઝિલોર્ડા
@@ -4012,7 +4225,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				કતાર
 			
 			
-				રિયુનિયન
+				રીયુનિયન
 			
 			
 				બુકરેસ્ટ
@@ -4519,29 +4732,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					કેન્દ્રીય ઓસ્ટ્રેલિયન સમય
-					ઓસ્ટ્રેલિયન કેન્દ્રીય માનક સમય
+					કેન્દ્રીય ઑસ્ટ્રેલિયન સમય
+					ઑસ્ટ્રેલિયન કેન્દ્રીય માનક સમય
 					ઓસ્ટ્રેલિયન કેન્દ્રીય દિવસ સમય
 				
 			
 			
 				
-					ઓસ્ટ્રેલિયન કેન્દ્રીય પશ્ચિમી સમય
-					ઓસ્ટ્રેલિયન કેન્દ્રીય પશ્ચિમી માનક સમય
+					ઑસ્ટ્રેલિયન કેન્દ્રીય પશ્ચિમી સમય
+					ઑસ્ટ્રેલિયન કેન્દ્રીય પશ્ચિમી માનક સમય
 					ઓસ્ટ્રેલિયન કેન્દ્રીય પશ્ચિમી દિવસ સમય
 				
 			
 			
 				
-					પૂર્વીય ઓસ્ટ્રેલિયા સમય
-					ઓસ્ટ્રેલિયન પૂર્વીય માનક સમય
+					પૂર્વીય ઑસ્ટ્રેલિયા સમય
+					ઑસ્ટ્રેલિયન પૂર્વીય માનક સમય
 					ઓસ્ટ્રેલિયન પૂર્વીય દિવસ સમય
 				
 			
 			
 				
-					પશ્ચિમી ઓસ્ટ્રેલિયા સમય
-					ઓસ્ટ્રેલિયન પશ્ચિમી માનક સમય
+					પશ્ચિમી ઑસ્ટ્રેલિયા સમય
+					ઑસ્ટ્રેલિયન પશ્ચિમી માનક સમય
 					ઓસ્ટ્રેલિયન પશ્ચિમી દિવસ સમય
 				
 			
@@ -4585,7 +4798,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					બ્રૂનેઈ દારુસલામ સમય
+					બ્રુનેઇ દરુસલામ સમય
 				
 			
 			
@@ -4640,9 +4853,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					કોલંબિયા સમય
-					કોલંબિયા માનક સમય
-					કોલંબિયા ગ્રીષ્મ સમય
+					કોલમ્બિયા સમય
+					કોલમ્બિયા માનક સમય
+					કોલમ્બિયા ગ્રીષ્મ સમય
 				
 			
 			
@@ -4714,9 +4927,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					ફોકલૅંડ આઇલેન્ડ્સ સમય
-					ફોકલૅંડ આઇલેન્ડ્સ માનક સમય
-					ફોકલૅંડ આઇલેન્ડ્સ ગ્રીષ્મ સમય
+					ફૉકલેન્ડ આઇલેન્ડ્સ સમય
+					ફૉકલેન્ડ આઇલેન્ડ્સ માનક સમય
+					ફૉકલેન્ડ આઇલેન્ડ્સ ગ્રીષ્મ સમય
 				
 			
 			
@@ -4912,7 +5125,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					કિર્ગિઝતાન સમય
+					કિર્ગિઝ્સ્તાન સમય
 				
 			
 			
@@ -5203,7 +5416,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					સાઉથ જ્યોર્જિયા સમય
+					દક્ષિણ જ્યોર્જિયા સમય
 				
 			
 			
@@ -5334,20 +5547,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			gujr
 		
 		1
+		
+			٫
+		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5505,279 +5732,330 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				યુનાઈટેડ આરબ અમિરાત દિરહામ
 				[UAE] દિરહામ
 				[UAE] દિરહામ
+				AED
 			
 			
 				અફ્ગાન અફ્ગાની
 				અફ્ગાન અફ્ગાની
 				અફ્ગાન અફ્ગાની
+				AFN
 			
 			
 				અલ્બેનિયન લેક
 				અલ્બેનિયન લેક
 				અલ્બેનિયન લેક
+				ALL
 			
 			
 				અર્મેનિયન ડ્રેમ
 				અર્મેનિયન ડ્રેમ
 				અર્મેનિયન ડ્રેમ
+				AMD
 			
 			
 				નેધરલેંડ એંટિલિન ગિલ્ડર
 				નેધરલેંડ એંટિલિન ગિલ્ડર
 				નેધરલેંડ એંટિલિન ગિલ્ડર
+				ANG
 			
 			
 				અંગોલિયન ક્વાન્ઝા
 				અંગોલિયન ક્વાન્ઝા
 				અંગોલિયન ક્વાન્ઝા
+				AOA
 				Kz
 			
 			
 				અર્જેન્ટીના પેસો
 				અર્જેન્ટીના પેસો
 				અર્જેન્ટીના પેસો
+				ARS
 				$
 			
 			
 				ઑસ્ટ્રેલિયન ડૉલર
 				ઑસ્ટ્રેલિયન ડૉલર
 				ઑસ્ટ્રેલિયન ડૉલર
+				A$
 				$
 			
 			
 				અરુબન ફ્લોરિન
 				અરુબન ફ્લોરિન
 				અરુબન ફ્લોરિન
+				AWG
 			
 			
 				અઝરબૈજાની મનાત
 				અઝરબૈજાની મનાત
 				અઝરબૈજાની મનાત
+				AZN
 			
 			
 				બોસ્નિયા અને હર્ઝેગોવિના રૂપાંતર યોગ્ય માર્ક
 				બોસ્નિયા અને હર્ઝેગોવિના રૂપાંતર યોગ્ય માર્ક
 				બોસ્નિયા અને હર્ઝેગોવિના રૂપાંતર યોગ્ય માર્ક
+				BAM
 				KM
 			
 			
 				બાર્બાડિયન ડોલર
 				બાર્બાડિયન ડોલર
 				બાર્બાડિયન ડોલર
+				BBD
 				$
 			
 			
-				બાંગલાદેશી ટાકા
-				બાંગલાદેશી ટાકા
+				બાંગ્લાદેશી ટાકા
+				બાંગ્લાદેશી ટાકા
 				બાંગલાદેશી ટાકા
+				BDT
 				৳
 			
 			
 				બલ્ગેરીયન લેવ
 				બલ્ગેરીયન લેવ
 				બલ્ગેરીયન લેવ
+				BGN
 			
 			
 				બેહરિની દિનાર
 				બેહરિની દિનાર
 				બેહરિની દિનાર
+				BHD
 			
 			
 				બુરુન્ડિયન ફ્રેંક
 				બુરુન્ડિયન ફ્રેંક
 				બુરુન્ડિયન ફ્રેંક
+				BIF
 			
 			
 				બર્મુડન ડોલર
 				બર્મુડન ડોલર
 				બર્મુડન ડોલર
+				BMD
 				$
 			
 			
 				બ્રુનેઇ ડોલર
 				બ્રુનેઇ ડોલર
 				બ્રુનેઇ ડોલર
+				BND
 				$
 			
 			
 				બોલિવિયન બોલિવિયાનો
 				બોલિવિયન બોલિવિયાનો
 				બોલિવિયન બોલિવિયાનો
+				BOB
 				Bs
 			
 			
 				બ્રાઝિલીયન રિઆલ
 				બ્રાઝિલીયન રિઆલ
 				બ્રાઝિલીયન રિઆલ
+				R$
 				R$
 			
 			
 				બહામિયન ડોલર
 				બહામિયન ડોલર
 				બહામિયન ડોલર
+				BSD
 				$
 			
 			
 				ભુતાનિઝ એંગુલ્ત્રમ
 				ભુતાનિઝ એંગુલ્ત્રમ
 				ભુતાનિઝ એંગુલ્ત્રમ
+				BTN
 			
 			
 				બોત્સવાનન પુલા
 				બોત્સવાનન પુલા
 				બોત્સવાનન પુલા
+				BWP
 				P
 			
 			
 				બેલારુશિયન રૂબલ
 				બેલારુશિયન રૂબલ
 				બેલારુશિયન રૂબલ
+				BYN
+				р.
 			
 			
 				બેલારુશિયન રૂબલ (2000–2016)
 				બેલારુશિયન રૂબલ (2000–2016)
 				બેલારુશિયન રૂબલ (2000–2016)
+				BYR
 			
 			
 				બેલિઝ ડોલર
 				બેલિઝ ડોલર
 				બેલિઝ ડોલર
+				BZD
 				$
 			
 			
 				કેનેડિયન ડૉલર
 				કેનેડિયન ડૉલર
 				કેનેડિયન ડૉલર
+				CA$
 				$
 			
 			
 				કોંગોલિઝ ફ્રેંક
 				કોંગોલિઝ ફ્રેંક
 				કોંગોલિઝ ફ્રેંક
+				CDF
 			
 			
 				સ્વિસ ફ્રેંક
 				સ્વિસ ફ્રેંક
 				સ્વિસ ફ્રેંક
+				CHF
 			
 			
 				ચિલિઅન પેસો
 				ચિલિઅન પેસો
 				ચિલિઅન પેસો
+				CLP
 				$
 			
 			
 				ચાઇનીઝ યુઆન (ઑફશોર)
 				ચાઇનીઝ યુઆન (ઑફશોર)
 				ચાઇનીઝ યુઆન (ઑફશોર)
+				CNH
 			
 			
 				ચાઇનિઝ યુઆન
 				ચાઇનિઝ યુઆન
 				ચાઇનિઝ યુઆન
+				CN¥
 				¥
 			
 			
 				કોલમ્બિયન પેસો
 				કોલમ્બિયન પેસો
 				કોલમ્બિયન પેસો
+				COP
 				$
 			
 			
 				કોસ્ટા રિકન કોલોન
 				કોસ્ટા રિકન કોલોન
 				કોસ્ટા રિકન કોલોન
+				CRC
 				₡
 			
 			
 				ક્યુબન રૂપાંતર યોગ્ય પેસો
 				ક્યુબન રૂપાંતર યોગ્ય પેસો
 				ક્યુબન રૂપાંતર યોગ્ય પેસો
+				CUC
 				$
 			
 			
 				ક્યુબન પેસો
 				ક્યુબન પેસો
 				ક્યુબન પેસો
+				CUP
 				$
 			
 			
 				કેપ વર્દિયન એસ્કુડો
 				કેપ વર્દિયન એસ્કુડો
 				કેપ વર્દિયન એસ્કુડો
+				CVE
 			
 			
 				ચેક રીપબ્લિક કોરુના
 				ચેક રીપબ્લિક કોરુના
 				ચેક રીપબ્લિક કોરુના
+				CZK
 				Kč
 			
 			
 				જિબુટિયન ફ્રેંક
 				જિબુટિયન ફ્રેંક
 				જિબુટિયન ફ્રેંક
+				DJF
 			
 			
 				ડેનિશ ક્રોન
 				ડેનિશ ક્રોન
 				ડેનિશ ક્રોન
+				DKK
 				kr
 			
 			
 				ડોમિનિકન પેસો
 				ડોમિનિકન પેસો
 				ડોમિનિકન પેસો
+				DOP
 				$
 			
 			
 				અલ્જિરિયન દિનાર
 				અલ્જિરિયન દિનાર
 				અલ્જિરિયન દિનાર
+				DZD
 			
 			
 				ઇજિપ્તિયન પાઉન્ડ
 				ઇજિપ્તિયન પાઉન્ડ
 				ઇજિપ્તિયન પાઉન્ડ
+				EGP
 				E£
 			
 			
 				એરિટ્રેયન નક્ફા
 				એરિટ્રેયન નક્ફા
 				એરિટ્રેયન નક્ફા
+				ERN
 			
 			
 				ઇથિયોપીયન બિર
 				ઇથિયોપીયન બિર
 				ઇથિયોપીયન બિર
+				ETB
 			
 			
 				યુરો
 				યુરો
 				યુરો
+				€
 				€
 			
 			
 				ફિજિઅન ડોલર
 				ફિજિઅન ડોલર
 				ફિજિઅન ડોલર
+				FJD
 				$
 			
 			
 				ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ
 				ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ
 				ફૉકલેન્ડ આઇલેંડ્સ પાઉન્ડ
+				FKP
 				£
 			
 			
 				બ્રિટિશ પાઉન્ડ
 				બ્રિટિશ પાઉન્ડ
 				બ્રિટિશ પાઉન્ડ્સ
+				£
 				£
 			
 			
 				જ્યોર્જિઅન લારી
 				જ્યોર્જિઅન લારી
 				જ્યોર્જિઅન લારી
+				GEL
 				₾
 				₾
 			
@@ -5785,188 +6063,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ઘાનાઇયન સેડી
 				ઘાનાઇયન સેડી
 				ઘાનાઇયન સેડી
+				GHS
 			
 			
 				જીબ્રાલ્ટર પાઉન્ડ
 				જીબ્રાલ્ટર પાઉન્ડ
 				જીબ્રાલ્ટર પાઉન્ડ
+				GIP
 				£
 			
 			
 				ગેમ્બિયન દલાસી
 				ગેમ્બિયન દલાસી
 				ગેમ્બિયન દલાસી
+				GMD
 			
 			
 				ગિનીયન ફ્રેંક
 				ગિનીયન ફ્રેંક
 				ગિનીયન ફ્રેંક
+				GNF
 				FG
 			
 			
 				ગ્વાટેમાલા કુઇટ્ઝલ
 				ગ્વાટેમાલા કુઇટ્ઝલ
 				ગ્વાટેમાલા કુઇટ્ઝલ
+				GTQ
 				Q
 			
 			
 				ગયાનિઝ ડોલર
 				ગયાનિઝ ડોલર
 				ગયાનિઝ ડોલર
+				GYD
 				$
 			
 			
 				હોંગ કોંગ ડૉલર
 				હોંગ કોંગ ડૉલર
 				હોંગ કોંગ ડૉલર
+				HK$
 				$
 			
 			
 				હોન્ડ્યુરન લેમ્પિરા
 				હોન્ડ્યુરન લેમ્પિરા
 				હોન્ડ્યુરન લેમ્પિરા
+				HNL
 				L
 			
 			
 				ક્રોએશિયન ક્યુના
 				ક્રોએશિયન ક્યુના
 				ક્રોએશિયન ક્યુના
+				HRK
 				kn
 			
 			
 				હાઇટિઇન ગોર્ડ
 				હાઇટિઇન ગોર્ડ
 				હાઇટિઇન ગોર્ડ
+				HTG
 			
 			
 				હંગેરીયન ફોરિન્ત
 				હંગેરીયન ફોરિન્ત
 				હંગેરીયન ફોરિન્ત
+				HUF
 				Ft
 			
 			
 				ઇન્ડોનેશિયન રૂપિયા
 				ઇન્ડોનેશિયન રૂપિયા
 				ઇન્ડોનેશિયન રૂપિયા
+				IDR
 				Rp
 			
 			
 				ઇઝરાયેલી ન્યુ શેકલ
 				ઇઝરાયેલી ન્યુ શેકલ
 				ઇઝરાયેલી ન્યુ શેકલ
+				₪
 				₪
 			
 			
 				ભારતીય રૂપિયા
 				ભારતીય રૂપિયા
 				ભારતીય રૂપિયા
+				₹
 				₹
 			
 			
 				ઇરાકી દિનાર
 				ઇરાકી દિનાર
 				ઇરાકી દિનાર
+				IQD
 			
 			
 				ઇરાનિયન રિયાલ
 				ઇરાનિયન રિયાલ
 				ઇરાનિયન રિયાલ
+				IRR
 			
 			
 				આઇસલેન્ડિક ક્રોના
 				આઇસલેન્ડિક ક્રોના
 				આઇસલેન્ડિક ક્રોના
+				ISK
 				kr
 			
 			
 				જમૈકિયન ડોલર
 				જમૈકિયન ડોલર
 				જમૈકિયન ડોલર
+				JMD
 				$
 			
 			
 				જોર્ડનિયન દિનાર
 				જોર્ડનિયન દિનાર
 				જોર્ડનિયન દિનાર
+				JOD
 			
 			
 				જાપાનીઝ યેન
 				જાપાનીઝ યેન
 				જાપાનીઝ યેન
+				JP¥
 				¥
 			
 			
 				કેન્યેન શિલિંગ
 				કેન્યેન શિલિંગ
 				કેન્યેન શિલિંગ
+				KES
 			
 			
 				કિર્ગિસ્તાની સોમ
 				કિર્ગિસ્તાની સોમ
 				કિર્ગિસ્તાની સોમ
+				KGS
 			
 			
 				કેમ્બોડિયન રીઅલ
 				કેમ્બોડિયન રીઅલ
 				કેમ્બોડિયન રીઅલ
+				KHR
 				៛
 			
 			
 				કોમોરિઅન ફ્રેંક
 				કોમોરિઅન ફ્રેંક
 				કોમોરિઅન ફ્રેંક
+				KMF
 				CF
 			
 			
 				ઉત્તર કોરિયન વન
 				ઉત્તર કોરિયન વન
 				ઉત્તર કોરિયન વન
+				KPW
 				₩
 			
 			
 				દક્ષિણ કોરિયન વન
 				દક્ષિણ કોરિયન વન
 				દક્ષિણ કોરિયન વન
+				₩
 				₩
 			
 			
 				કુવૈતી દિનાર
 				કુવૈતી દિનાર
 				કુવૈતી દિનાર
+				KWD
 			
 			
 				કેયમેન આઇલેંડ્સ ડોલર
 				કેયમેન આઇલેંડ્સ ડોલર
 				કેયમેન આઇલેંડ્સ ડોલર
+				KYD
 				$
 			
 			
 				કઝાકિસ્તાની ટેંગ
 				કઝાકિસ્તાની ટેંગ
 				કઝાકિસ્તાની ટેંગ
+				KZT
 				₸
 			
 			
 				લાઓશિયન કિપ
 				લાઓશિયન કિપ
 				લાઓશિયન કિપ
+				LAK
 				₭
 			
 			
 				લેબેનિઝ પાઉન્ડ
 				લેબેનિઝ પાઉન્ડ
 				લેબેનિઝ પાઉન્ડ
+				LBP
 				L£
 			
 			
 				શ્રી લંકન રૂપી
 				શ્રી લંકન રૂપી
 				શ્રી લંકન રૂપી
+				LKR
+				Rs
 			
 			
 				લિબેરિયન ડોલર
 				લિબેરિયન ડોલર
 				લિબેરિયન ડોલર
+				LRD
 				$
 			
 			
@@ -5976,284 +6288,339 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				લિથુએનિયન લિતાસ
 				લિથુએનિયન લિતાસ
 				લિથુએનિયન લિતાસ
+				LTL
 			
 			
 				લાતવિયન લેત્સ
 				લાતવિયન લેત્સ
 				લાતવિયન લેત્સ
+				LVL
 			
 			
 				લિબ્યન દિનાર
 				લિબ્યન દિનાર
 				લિબ્યન દિનાર
+				LYD
 			
 			
 				મોરોક્કન દિરહામ
 				મોરોક્કન દિરહામ
 				મોરોક્કન દિરહામ
+				MAD
 			
 			
 				મોલડોવેન લિયુ
 				મોલડોવેન લિયુ
 				મોલડોવેન લિયુ
+				MDL
 			
 			
 				માલાગેસી અરીઆરી
 				માલાગેસી અરીઆરી
 				માલાગેસી અરીઆરી
+				MGA
 				Ar
 			
 			
 				મેસેડોનિયન દિનાર
 				મેસેડોનિયન દિનાર
 				મેસેડોનિયન દિનાર
+				MKD
 			
 			
 				મ્યાંમાર ક્યાત
 				મ્યાંમાર ક્યાત
 				મ્યાંમાર ક્યાત
+				MMK
 				K
 			
 			
 				મોંગોલિયન ટગરિક
 				મોંગોલિયન ટગરિક
 				મોંગોલિયન ટગરિક
+				MNT
 				₮
 			
 			
 				માકાનિઝ પતાકા
 				માકાનિઝ પતાકા
 				માકાનિઝ પતાકા
+				MOP
 			
 			
 				મોરીશેનિયન ઓગુયા (1973–2017)
 				મોરીશેનિયન ઓગુયા (1973–2017)
 				મોરીશેનિયન ઓગુયા (1973–2017)
+				MRO
 			
 			
 				મોરીશેનિયન ઓગુયા
 				મોરીશેનિયન ઓગુયા
 				મોરીશેનિયન ઓગુયા
+				MRU
 			
 			
 				મોરેશીઅન રૂપી
 				મોરેશીઅન રૂપી
 				મોરેશીઅન રૂપી
+				MUR
 				રૂ.
 			
 			
 				માલ્દિવિયન રુફિયા
 				માલ્દિવિયન રુફિયા
 				માલ્દિવિયન રુફિયા
+				MVR
 			
 			
 				માલાવિયન ક્વાચા
 				માલાવિયન ક્વાચા
 				માલાવિયન ક્વાચા
+				MWK
 			
 			
 				મેક્સિકન પેસો
 				મેક્સિકન પેસો
 				મેક્સિકન પેસો
+				MX$
 				$
 			
 			
 				મલેશિયન રિંગ્ગેટ
 				મલેશિયન રિંગ્ગેટ
 				મલેશિયન રિંગ્ગેટ
+				MYR
 				RM
 			
 			
 				મોઝામ્બિકન મેટિકલ
 				મોઝામ્બિકન મેટિકલ
 				મોઝામ્બિકન મેટિકલ
+				MZN
 			
 			
 				નામિબિયન ડોલર
 				નામિબિયન ડોલર
 				નામિબિયન ડોલર
+				NAD
 				$
 			
 			
 				નાઇજીરિયન નૈરા
 				નાઇજીરિયન નૈરા
 				નાઇજીરિયન નૈરા
+				NGN
 				₦
 			
 			
 				નિકારાગુઅન કોર્ડોબા
 				નિકારાગુઅન કોર્ડોબા
 				નિકારાગુઅન કોર્ડોબા
+				NIO
 				C$
 			
 			
 				નૉર્વેજિયન ક્રોન
 				નૉર્વેજિયન ક્રોન
 				નૉર્વેજિયન ક્રોન
+				NOK
 				kr
 			
 			
 				નેપાલિઝ રૂપી
 				નેપાલિઝ રૂપી
 				નેપાલિઝ રૂપી
+				NPR
+				Rs
 			
 			
 				ન્યૂઝિલેંડ ડૉલર
 				ન્યૂઝિલેંડ ડૉલર
 				ન્યૂઝિલેંડ ડૉલર
+				NZ$
 				$
 			
 			
 				ઓમાની રિયાલ
 				ઓમાની રિયાલ
 				ઓમાની રિયાલ
+				OMR
 			
 			
 				પનામેનિયન બાલ્બોઆ
 				પનામેનિયન બાલ્બોઆ
 				પનામેનિયન બાલ્બોઆ
+				PAB
 			
 			
 				પેરુવિયન સોલ
 				પેરુવિયન સોલ
 				પેરુવિયન સોલ
+				PEN
 			
 			
 				પાપુઆ ન્યૂ ગિનીયન કિના
 				પાપુઆ ન્યૂ ગિનીયન કિના
 				પાપુઆ ન્યૂ ગિનીયન કિના
+				PGK
 			
 			
 				ફિલીપાઇન પેસો
 				ફિલીપાઇન પેસો
 				ફિલીપાઇન પેસો
+				PHP
 				₱
 			
 			
 				પાકિસ્તાની રૂપી
 				પાકિસ્તાની રૂપી
 				પાકિસ્તાની રૂપી
+				PKR
+				Rs
 			
 			
 				પોલિસ ઝ્લોટી
 				પોલિસ ઝ્લોટી
 				પોલિસ ઝ્લોટી
+				PLN
 				zł
 			
 			
 				પરાગ્વેયન ગુઆરાની
 				પરાગ્વેયન ગુઆરાની
 				પરાગ્વેયન ગુઆરાની
+				PYG
 				₲
 			
 			
 				કતારી રિયાલ
 				કતારી રિયાલ
 				કતારી રિયાલ
+				QAR
 			
 			
 				રોમાનિયન લેઉ
 				રોમાનિયન લેઉ
 				રોમાનિયન લેઉ
+				RON
 			
 			
 				સર્બિયન દિનાર
 				સર્બિયન દિનાર
 				સર્બિયન દિનાર
+				RSD
 			
 			
 				રશિયન રૂબલ
 				રશિયન રૂબલ
 				રશિયન રૂબલ્સ
+				RUB
 				₽
 			
 			
 				રવાંડન ફ્રેંક
 				રવાંડન ફ્રેંક
 				રવાંડન ફ્રેંક
+				RWF
 				RF
 			
 			
 				સાઉદી રિયાલ
 				સાઉદી રિયાલ
 				સાઉદી રિયાલ
+				SAR
 			
 			
 				સોલોમન આઇલેંડ્સ ડોલર
 				સોલોમન આઇલેંડ્સ ડોલર
 				સોલોમન આઇલેંડ્સ ડોલર
+				SBD
 				$
 			
 			
 				સેશેલોઈ રૂપી
 				સેશેલોઈ રૂપી
 				સેશેલોઈ રૂપી
+				SCR
 			
 			
 				સુદાનિઝ પાઉન્ડ
 				સુદાનિઝ પાઉન્ડ
 				સુદાનિઝ પાઉન્ડ
+				SDG
 			
 			
 				સ્વીડિશ ક્રોના
 				સ્વીડિશ ક્રોના
 				સ્વીડિશ ક્રોના
+				SEK
 				kr
 			
 			
 				સિંગાપુર ડૉલર
 				સિંગાપુર ડૉલર
 				સિંગાપુર ડૉલર
+				SGD
 				$
 			
 			
 				સેંટ હેલેના પાઉન્ડ
 				સેંટ હેલેના પાઉન્ડ
 				સેંટ હેલેના પાઉન્ડ
+				SHP
 				£
 			
 			
 				સિએરા લિઓનિઅન લિઓન
 				સિએરા લિઓનિઅન લિઓન
 				સિએરા લિઓનિઅન લિઓન
+				SLL
 			
 			
 				સોમાલી શિલિંગ
 				સોમાલી શિલિંગ
 				સોમાલી શિલિંગ
+				SOS
 			
 			
 				સૂરીનામિઝ ડોલર
 				સૂરીનામિઝ ડોલર
 				સૂરીનામિઝ ડોલર
+				SRD
 				$
 			
 			
 				દક્ષિણ સુદાનિઝ પાઉન્ડ
 				દક્ષિણ સુદાનિઝ પાઉન્ડ
 				દક્ષિણ સુદાનિઝ પાઉન્ડ
+				SSP
 				£
 			
 			
 				સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા (1977–2017)
 				સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા (1977–2017)
 				સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા (1977–2017)
+				STD
 			
 			
 				સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા
 				સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા
 				સાઓ ટૉમ એન્ડ પ્રિંસાઇપ ડોબ્રા
+				STN
+				Db
 			
 			
 				સાઇરિયન પાઉન્ડ
 				સાઇરિયન પાઉન્ડ
 				સાઇરિયન પાઉન્ડ
+				SYP
 				£
 			
 			
 				સ્વાઝી લિલાન્ગેની
 				સ્વાઝી લિલાન્ગેની
 				સ્વાઝી લિલાન્ગેની
+				SZL
 			
 			
 				થાઇ બાહ્ત
@@ -6266,27 +6633,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				તાજિકિસ્તાની સોમોની
 				તાજિકિસ્તાની સોમોની
 				તાજિકિસ્તાની સોમોની
+				TJS
 			
 			
 				તુર્કમેનિસ્તાની મનત
 				તુર્કમેનિસ્તાની મનત
 				તુર્કમેનિસ્તાની મનત
+				TMT
 			
 			
 				ટ્યુનિશિયન દિનાર
 				ટ્યુનિશિયન દિનાર
 				ટ્યુનિશિયન દિનાર
+				TND
 			
 			
 				ટોંગન પ’અંગા
 				ટોંગન પ’અંગા
 				ટોંગન પ’અંગા
+				TOP
 				T$
 			
 			
 				તુર્કિશ લિરા
 				તુર્કિશ લિરા
 				તુર્કિશ લિરા
+				TRY
 				₺
 				TL
 			
@@ -6294,94 +6666,111 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ત્રિનિદાદ અને ટોબેગો ડોલર
 				ત્રિનિદાદ અને ટોબેગો ડોલર
 				ત્રિનિદાદ અને ટોબેગો ડોલર
+				TTD
 				$
 			
 			
 				ન્યુ તાઇવાન ડૉલર
 				ન્યુ તાઇવાન ડૉલર
 				ન્યુ તાઇવાન ડૉલર
+				NT$
 				NT$
 			
 			
 				તાન્ઝાનિયન શિલિંગ
 				તાન્ઝાનિયન શિલિંગ
 				તાન્ઝાનિયન શિલિંગ
+				TZS
 			
 			
 				યુક્રેનિયન હ્રિવિનિયા
 				યુક્રેનિયન હ્રિવિનિયા
 				યુક્રેનિયન હ્રિવિનિયા
+				UAH
 				₴
 			
 			
 				યુગાંડન શિલિંગ
 				યુગાંડન શિલિંગ
 				યુગાંડન શિલિંગ
+				UGX
 			
 			
 				યુઍસ ડોલર
 				યુઍસ ડોલર
 				યુઍસ ડોલર
+				US$
 				$
 			
 			
 				ઉરુગ્વેયન પેસો
 				ઉરુગ્વેયન પેસો
 				ઉરુગ્વેયન પેસો
+				UYU
 				$
 			
 			
 				ઉઝ્બેકિસ્તાન સોમ
 				ઉઝ્બેકિસ્તાન સોમ
 				ઉઝ્બેકિસ્તાન સોમ
+				UZS
 			
 			
 				વેનેઝુએલન બોલિવર (2008–2018)
 				વેનેઝુએલન બોલિવર (2008–2018)
 				વેનેઝુએલન બોલિવર (2008–2018)
+				VEF
 				Bs
 			
 			
 				વેનેઝુએલન બોલિવર
 				વેનેઝુએલન બોલિવર
 				વેનેઝુએલન બોલિવર
+				VES
 			
 			
 				વિયેતનામીસ ડોંગ
 				વિયેતનામીસ ડોંગ
 				વિયેતનામીસ ડોંગ
+				₫
 				₫
 			
 			
 				વનૌતુ વાતુ
 				વનૌતુ વાતુ
 				વનૌતુ વાતુ
+				VUV
 			
 			
 				સમોઅન તાલા
 				સમોઅન તાલા
 				સમોઅન તાલા
+				WST
 			
 			
 				મધ્ય આફ્રિકન [CFA] ફ્રેંક
 				મધ્ય આફ્રિકન [CFA] ફ્રેંક
 				મધ્ય આફ્રિકન [CFA] ફ્રેંક્સ
+				FCFA
 			
 			
 				ઇસ્ટ કેરિબિયન ડોલર
 				ઇસ્ટ કેરિબિયન ડોલર
 				ઇસ્ટ કેરિબિયન ડોલર
+				EC$
 				$
 			
 			
 				પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક
 				પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક
 				પશ્ચિમી આફ્રિકન [CFA] ફ્રેંક્સ
+				CFA
 			
 			
 				[CFP] ફ્રેંક
 				[CFP] ફ્રેંક
 				[CFP] ફ્રેંક
+				CFPF
 			
 			
 				અજ્ઞાત ચલણ
@@ -6392,11 +6781,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				યેમેની રિઆલ
 				યેમેની રિઆલ
 				યેમેની રિઆલ
+				YER
 			
 			
 				દક્ષિણ આફ્રિકી રેંડ
 				દક્ષિણ આફ્રિકી રેંડ
 				દક્ષિણ આફ્રિકી રેંડ
+				ZAR
 				R
 			
 			
@@ -6406,11 +6797,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ઝામ્બિયન ક્વાચા
 				ઝામ્બિયન ક્વાચા
 				ઝામ્બિયન ક્વાચા
+				ZMW
 				ZK
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
@@ -6428,6 +6822,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} પ્રતિ {1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ગુ-બળ
 				{0} ગુ-બળ
@@ -6514,9 +6911,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પ્રતિ ચોરસ ઈંચ
 			
 			
-				ડનમ
-				{0} ડનમ
-				{0} ડનમ
+				ડનમ
+				{0} ડનમ
+				{0} ડનમ
 			
 			
 				કૅરેટ
@@ -6539,24 +6936,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} કણ પ્રતિ મિલિયન
 			
 			
-				ટકા
-				{0} ટકા
-				{0} ટકા
+				ટકા
+				{0} ટકા
+				{0} ટકા
 			
 			
-				પ્રતિમાઈલ
-				{0} પ્રતિમાઈલ
-				{0} પ્રતિમાઈલ
+				પ્રતિમાઈલ
+				{0} પ્રતિમાઈલ
+				{0} પ્રતિમાઈલ
 			
 			
-				પરમિરિયડ
-				{0} પરમિરિયડ
-				{0} પરમિરિયડ
+				પરમિરિયડ
+				{0} પરમિરિયડ
+				{0} પરમિરિયડ
 			
 			
-				મોલ
-				{0} મોલ
-				{0} મોલ
+				મોલ
+				{0} મોલ
+				{0} મોલ
 			
 			
 				લીટર પ્રતિ કિલોમીટર
@@ -6579,9 +6976,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} માઈલ પ્રતિ ઈમ્પે. ગેલન
 			
 			
-				પેટાબાઈટ્સ
-				{0} પેટાબાઈટ
-				{0} પેટાબાઈટ્સ
+				પેટાબાઈટ્સ
+				{0} પેટાબાઈટ
+				{0} પેટાબાઈટ્સ
 			
 			
 				ટેરાબાઇટ
@@ -6638,6 +7035,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} સદી
 				{0} સદીઓ
 			
+			
+				દાયકા
+				{0} દાયકો
+				{0} દાયકા
+			
 			
 				વર્ષ
 				{0} વર્ષ
@@ -6746,24 +7148,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} કિલોવૉટ-કલાક
 			
 			
-				ઇલેક્ટ્રોનવૉલ્ટ
-				{0} ઇલેક્ટ્રોનવૉલ્ટ
-				{0} ઇલેક્ટ્રોનવૉલ્ટ
+				ઇલેક્ટ્રોનવૉલ્ટ
+				{0} ઇલેક્ટ્રોનવૉલ્ટ
+				{0} ઇલેક્ટ્રોનવૉલ્ટ
 			
 			
-				બ્રિટીશ થર્મલ યુનિટ
-				{0} બ્રિટીશ થર્મલ યુનિટ
-				{0} બ્રિટીશ થર્મલ યુનિટ
+				બ્રિટીશ થર્મલ યુનિટ
+				{0} બ્રિટીશ થર્મલ યુનિટ
+				{0} બ્રિટીશ થર્મલ યુનિટ
+			
+			
+				યુએસ થર્મ
+				{0} યુએસ થર્મ
+				{0} યુએસ થર્મ
 			
 			
-				પાઉન્ડ બળ
-				{0} પાઉન્ડ બળ
-				{0} પાઉન્ડ બળ
+				પાઉન્ડ બળ
+				{0} પાઉન્ડ બળ
+				{0} પાઉન્ડ બળ
 			
 			
-				ન્યૂટન
-				{0} ન્યૂટન
-				{0} ન્યૂટન
+				ન્યૂટન
+				{0} ન્યૂટન
+				{0} ન્યૂટન
 			
 			
 				ગીગાહર્ટ્ઝ
@@ -6785,6 +7192,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} હર્ટ્ઝ
 				{0} હર્ટ્ઝ
 			
+			
+				ટાઇપોગ્રાફિક એમ
+			
+			
+				પિક્સેલ
+				{0} પિક્સેલ
+				{0} પિક્સેલ
+			
+			
+				પિક્સેલ પ્રતિ સેન્ટિમીટર
+				{0} પિક્સેલ પ્રતિ સેન્ટિમીટર
+				{0} પિક્સેલ પ્રતિ સેન્ટિમીટર
+			
+			
+				પિક્સેલ પ્રતિ ઇંચ
+				{0} પિક્સેલ પ્રતિ ઇંચ
+				{0} પિક્સેલ પ્રતિ ઇંચ
+			
+			
+				ડૉટ્સ પ્રતિ સેન્ટિમીટર
+				{0} ડૉટ પ્રતિ સેન્ટિમીટર
+				{0} ડૉટ્સ પ્રતિ સેન્ટિમીટર
+			
+			
+				ડૉટ્સ પ્રતિ ઇંચ
+				{0} ડૉટ પ્રતિ ઇંચ
+				{0} ડૉટ્સ પ્રતિ ઇંચ
+			
 			
 				કિલોમીટર
 				{0} કિલોમીટર
@@ -6881,9 +7316,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પોઈન્ટ્સ
 			
 			
-				સૌર ત્રિજ્યા
-				{0} સૌર ત્રિજ્યા
-				{0} સૌર ત્રિજ્યા
+				સૌર ત્રિજ્યા
+				{0} સૌર ત્રિજ્યા
+				{0} સૌર ત્રિજ્યા
 			
 			
 				લક્સ
@@ -6891,9 +7326,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} લક્સ
 			
 			
-				સૌર તેજસ્વિતા
-				{0} સૌર તેજસ્વિતા
-				{0} સૌર તેજસ્વિતા
+				સૌર તેજસ્વિતા
+				{0} સૌર તેજસ્વિતા
+				{0} સૌર તેજસ્વિતા
 			
 			
 				મેટ્રિક ટન
@@ -6955,19 +7390,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} કેરેટ
 			
 			
-				ડાલ્ટન
-				{0} ડાલ્ટન
-				{0} ડાલ્ટન
+				ડાલ્ટન
+				{0} ડાલ્ટન
+				{0} ડાલ્ટન
 			
 			
-				પૃથ્વી ઘનતા
-				{0} પૃથ્વી ઘનતા
-				{0} પૃથ્વી ઘનતા
+				પૃથ્વી ઘનતા
+				{0} પૃથ્વી ઘનતા
+				{0} પૃથ્વી ઘનતા
 			
 			
-				સૌર ઘનતા
-				{0} સૌર ઘનતા
-				{0} સૌર ઘનતા
+				સૌર ઘનતા
+				{0} સૌર ઘનતા
+				{0} સૌર ઘનતા
 			
 			
 				ગીગાવૉટ
@@ -6999,11 +7434,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} હોર્સપાવર
 				{0} હોર્સપાવર
 			
-			
-				હેક્ટૉપાસ્કલ
-				{0} હેક્ટૉપાસ્કલ
-				{0} હેક્ટૉપાસ્કલ
-			
 			
 				પારાનું મિલિમીટર
 				{0} પારાનું મિલિમીટર
@@ -7019,25 +7449,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પારાના ઇંચ
 				{0} પારાના ઇંચ
 			
+			
+				બાર
+				{0} બાર
+				{0} બાર
+			
 			
 				મિલિબાર
 				{0} મિલિબાર
 				{0} મિલિબાર
 			
 			
-				વાતાવરણ
-				{0} વાતાવરણ
-				{0} વાતાવરણ
+				વાતાવરણ
+				{0} વાતાવરણ
+				{0} વાતાવરણ
+			
+			
+				પાસ્કલ
+				{0} પાસ્કલ
+				{0} પાસ્કલ
+			
+			
+				હેક્ટૉપાસ્કલ
+				{0} હેક્ટૉપાસ્કલ
+				{0} હેક્ટૉપાસ્કલ
 			
 			
-				કિલોપાસ્કલ
-				{0} કિલોપાસ્કલ
-				{0} કિલોપાસ્કલ
+				કિલોપાસ્કલ
+				{0} કિલોપાસ્કલ
+				{0} કિલોપાસ્કલ
 			
 			
-				મેગાપાસ્કલ
-				{0} મેગાપાસ્કલ
-				{0} મેગાપાસ્કલ
+				મેગાપાસ્કલ
+				{0} મેગાપાસ્કલ
+				{0} મેગાપાસ્કલ
 			
 			
 				કિલોમીટર પ્રતિ કલાક
@@ -7080,14 +7525,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} કેલ્વિન
 			
 			
-				પાઉન્ડ ફૂટ
-				{0} પાઉન્ડ ફૂટ
-				{0} પાઉન્ડ ફૂટ
+				પાઉન્ડ ફૂટ
+				{0} પાઉન્ડ ફૂટ
+				{0} પાઉન્ડ ફૂટ
 			
 			
-				ન્યૂટન-મીટર
-				{0} ન્યૂટન-મીટર
-				{0} ન્યૂટન-મીટર
+				ન્યૂટન-મીટર
+				{0} ન્યૂટન-મીટર
+				{0} ન્યૂટન-મીટર
 			
 			
 				ઘન કિલોમીટર
@@ -7205,9 +7650,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પ્રવાહી ઔંસ
 			
 			
-				ઇમ્પીરિયલ પ્રવાહી ઔંસ
-				{0} ઇમ્પીરિયલ પ્રવાહી ઔંસ
-				{0} ઇમ્પીરિયલ પ્રવાહી ઔંસ
+				ઇમ્પીરિયલ પ્રવાહી ઔંસ
+				{0} ઇમ્પીરિયલ પ્રવાહી ઔંસ
+				{0} ઇમ્પીરિયલ પ્રવાહી ઔંસ
 			
 			
 				ટેબલસ્પૂન
@@ -7220,12 +7665,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ટીસ્પૂન
 			
 			
-				બેરલ
-				{0} બેરલ
-				{0} બેરલ
+				બેરલ
+				{0} બેરલ
+				{0} બેરલ
 			
 			
-				મુખ્ય દિશા
+				મુખ્ય દિશા
 				{0}પૂર્વ
 				{0}ઉત્તર
 				{0}દક્ષિણ
@@ -7322,9 +7767,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પ્રતિ ચો. ઈંચ
 			
 			
-				ડનમ
-				{0} ડનમ
-				{0} ડનમ
+				ડનમ
+				{0} ડનમ
+				{0} ડનમ
 			
 			
 				કૅરેટ
@@ -7347,20 +7792,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પીપીએમ
 			
 			
-				ટકા
+				ટકા
+				{0}%
+				{0}%
 			
 			
-				પ્રતિમાઈલ
+				પ્રતિમાઈલ
+				{0}‰
+				{0}‰
 			
 			
-				પરમિરિયડ
-				{0}‱
-				{0}‱
+				પરમિરિયડ
+				{0}‱
+				{0}‱
 			
 			
-				મોલ
-				{0} મોલ
-				{0} મોલ
+				મોલ
+				{0} મોલ
+				{0} મોલ
 			
 			
 				લીટર/કિમી
@@ -7383,9 +7832,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg Imp.
 			
 			
-				પીબાઈટ
-				{0} પીબી
-				{0} પીબી
+				પીબાઈટ
+				{0} પીબી
+				{0} પીબી
 			
 			
 				TB
@@ -7442,6 +7891,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} સદી
 				{0} સદી
 			
+			
+				દાયકા
+				{0} દા
+				{0} દા
+			
 			
 				વર્ષ
 				{0} વર્ષ
@@ -7550,24 +8004,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				ઇલેક્ટ્રોનવૉલ્ટ
-				{0} eV
-				{0} eV
+				ઇલેક્ટ્રોનવૉલ્ટ
+				{0} eV
+				{0} eV
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+				{0} Btu
+				{0} Btu
+			
+			
+				યુએસ થર્મ
+				{0} યુએસ થર્મ
+				{0} યુએસ થર્મ
 			
 			
-				પાઉન્ડ બળ
-				{0} lbf
-				{0} lbf
+				પાઉન્ડ બળ
+				{0} lbf
+				{0} lbf
 			
 			
-				ન્યૂટન
-				{0} N
-				{0} N
+				ન્યૂટન
+				{0} N
+				{0} N
 			
 			
 				GHz
@@ -7589,6 +8048,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				પિક્સેલ
+			
 			
 				કિમી
 				{0} કિમી
@@ -7685,9 +8147,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પોઈન્ટ
 			
 			
-				સૌર ત્રિજ્યા
-				{0} R☉
-				{0} R☉
+				સૌર ત્રિજ્યા
+				{0} R☉
+				{0} R☉
 			
 			
 				લક્સ
@@ -7695,9 +8157,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} લક્સ
 			
 			
-				સૌર તેજસ્વિતા
-				{0} L☉
-				{0} L☉
+				સૌર તેજસ્વિતા
+				{0} L☉
+				{0} L☉
 			
 			
 				t
@@ -7759,19 +8221,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} કેરેટ
 			
 			
-				ડાલ્ટન
-				{0} Da
-				{0} Da
+				ડાલ્ટન
+				{0} Da
+				{0} Da
 			
 			
-				પૃથ્વી ઘનતા
-				{0} M⊕
-				{0} M⊕
+				પૃથ્વી ઘનતા
+				{0} M⊕
+				{0} M⊕
 			
 			
-				સૌર ઘનતા
-				{0} M☉
-				{0} M☉
+				સૌર ઘનતા
+				{0} M☉
+				{0} M☉
 			
 			
 				GW
@@ -7789,7 +8251,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kW
 			
 			
-				watt
+				વૉટ
 				{0} W
 				{0} W
 			
@@ -7803,11 +8265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7823,20 +8280,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				બાર
+				{0} બાર
+				{0} બાર
+			
 			
 				mbar
 				{0} mbar
 				{0} mbar
 			
+			
+				atm
+				{0} atm
+				{0} atm
+			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
-				kPa
-				{0} kPa
-				{0} kPa
+				kPa
+				{0} kPa
+				{0} kPa
 			
 			
-				MPa
-				{0} MPa
-				{0} MPa
+				MPa
+				{0} MPa
+				{0} MPa
 			
 			
 				કિમી/કલાક
@@ -7879,14 +8356,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				lbf⋅ft
+				{0} lbf⋅ft
+				{0} lbf⋅ft
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				N⋅m
+				{0} N⋅m
+				{0} N⋅m
 			
 			
 				ઘન કિમી
@@ -8004,9 +8481,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} પ્રવાહી ઔંસ
 			
 			
-				ઇમ્પીરિયલ પ્રવાહી ઔંસ
-				{0} પ્રવાહી ઔંસ ઇમ્પીરિયલ
-				{0} પ્રવાહી ઔંસ ઇમ્પીરિયલ
+				ઇમ્પીરિયલ પ્રવાહી ઔંસ
+				{0} પ્રવાહી ઔંસ ઇમ્પીરિયલ
+				{0} પ્રવાહી ઔંસ ઇમ્પીરિયલ
 			
 			
 				ટેબલસ્પૂન
@@ -8019,12 +8496,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ટીસ્પૂન
 			
 			
-				બેરલ
-				{0} bbl
-				{0} bbl
+				બેરલ
+				{0} bbl
+				{0} bbl
 			
 			
-				દિશા
+				દિશા
 				{0}પૂ
 				{0}ઉ
 				{0}દ
@@ -8050,6 +8527,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}″
 			
+			
+				%
+				{0}%
+				{0}%
+			
 			
 				લિ/100 કિમી
 				{0}લિ/100કિમી
@@ -8158,6 +8640,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}પ્રકાશવર્ષ
 			
 			
+				smi
 				{0}smi
 				{0}smi
 			
@@ -8190,6 +8673,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ઔંશ
 				{0}/ઔંસ
 			
+			
+				{0} kW
+				{0} kW
+			
+			
+				{0} W
+				{0} W
+			
+			
+				{0} hp
+				{0} hp
+			
 			
 				{0} inHg
 				{0} inHg
@@ -8198,6 +8693,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}મિલીબાર
 				{0}મિલીબાર
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				કિમી/કલાક
 				{0} કિપ્રક
@@ -8214,13 +8713,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°C
 				{0}°C
 			
+			
+				{0}°F
+				{0}°F
+			
 			
 				લિટર
 				{0} લિ
 				{0} લિ
 			
 			
-				દિશા
+				દિશા
 				{0}પૂ
 				{0}ઉ
 				{0}દ
@@ -8250,11 +8753,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, અથવા {1}
 			{0} અથવા {1}
 		
+		
+			{0} અથવા {1}
+		
 		
-			{0}, {1}
-			{0}, {1}
-			{0} અને {1}
-			{0} અને {1}
+			{0}, {1}
+			{0}, {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/gu_IN.xml b/make/data/cldr/common/main/gu_IN.xml
index 3b0993814a3..92c0469f3bd 100644
--- a/make/data/cldr/common/main/gu_IN.xml
+++ b/make/data/cldr/common/main/gu_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/guz.xml b/make/data/cldr/common/main/guz.xml
index 67ab06f1789..c4b8bbff0aa 100644
--- a/make/data/cldr/common/main/guz.xml
+++ b/make/data/cldr/common/main/guz.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/guz_KE.xml b/make/data/cldr/common/main/guz_KE.xml
index 47350a89fb2..205fc8d5188 100644
--- a/make/data/cldr/common/main/guz_KE.xml
+++ b/make/data/cldr/common/main/guz_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/gv.xml b/make/data/cldr/common/main/gv.xml
index 8b79570f014..5e9c51429a4 100644
--- a/make/data/cldr/common/main/gv.xml
+++ b/make/data/cldr/common/main/gv.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -22,7 +22,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a b c ç d e f g h i j k l m n o p q r s t u v w x y z]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 	
 	
 		
diff --git a/make/data/cldr/common/main/gv_IM.xml b/make/data/cldr/common/main/gv_IM.xml
index 000b34454d5..865e628fd91 100644
--- a/make/data/cldr/common/main/gv_IM.xml
+++ b/make/data/cldr/common/main/gv_IM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ha.xml b/make/data/cldr/common/main/ha.xml
index 736627832e8..bf0ef62a648 100644
--- a/make/data/cldr/common/main/ha.xml
+++ b/make/data/cldr/common/main/ha.xml
@@ -7,34 +7,56 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
-		
-			{0} ({1})
-			{0}, {1}
-			{0}: {1}
-		
 		
-			Afirkanci
+			Afirkanci
+			Aghem
 			Akan
 			Amharik
 			Larabci
-			Asamisanci
-			Azerbaijanci
+			Larabci Asali Na Zamani
+			Asamisanci
+			Asu
+			Asturian
+			Azerbaijanci
+			Azeri
+			Basaa
 			Belarusanci
+			Bemba
+			Bena
 			Bulgaranci
+			Bambara
 			Bengali
-			Buretananci
-			Bosniyanci
-			Kataloniyanci
+			Tibetan
+			Buretananci
+			Bodo
+			Bosniyanci
+			Kataloniyanci
+			Chakma
+			Chechen
+			Cebuano
+			Chiga
+			Cherokee
+			Kurdish na Tsaka
+			Corsican
 			Harshen Cak
-			Kabilar Welsh
-			Danish
+			Church Slavic
+			Kabilar Welsh
+			Danish
+			Taita
 			Jamusanci
 			Jamusanci Ostiriya
 			Jamusanci Suwizalan
+			Zarma
+			Lower Sorbian
+			Duala
+			Jola-Fonyi
+			Dzongkha
+			Embu
+			Ewe
 			Girkanci
 			Turanci
 			Turanci Ostareliya
@@ -43,119 +65,249 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Turanci Ingila
 			Turanci Amirka
 			Amirka Turanci
-			Dʼan/ʼYar Kabilar Andalus
+			Dʼan/ʼYar Kabilar Andalus
 			Sifaniyanci
 			Sifaniyancin Latin Amirka
 			Sifaniyanci Turai
 			Sifaniyanci Mesiko
-			Istoniyanci
-			Dan/ʼYar Kabilar Bas
+			Istoniyanci
+			Basque
+			Ewondo
 			Parisanci
-			Yaren mutanen Finland
-			Dan Filifin
-			Faroese
+			Fulah
+			Yaren mutanen Finland
+			Dan Filifin
+			Faroese
 			Faransanci
 			Farasanci Kanada
 			Farasanci Suwizalan
-			Kʼabilan Firsi
-			Dan Ailan
-			Kʼabilan Scots Gaelic
-			Bagalike
+			Friulian
+			Kʼabilan Firsi
+			Dan Ailan
+			Kʼabilan Scots Gaelic
+			Bagalike
 			Guwaraniyanci
-			Gujarati
+			Jamusanci Swiss
+			Gujarati
+			Gusii
+			Manx
 			Hausa
-			Yahudanci
+			Hawaiian
+			Ibrananci
 			Harshen Hindi
-			Kuroshiyan
+			Hmong
+			Kuroshiyan
+			Sorbianci ta Sama
+			Haitian Creole
 			Harshen Hungari
-			Armeniyanci
-			Yare Tsakanin Kasashe
+			Armeniyanci
+			Yare Tsakanin Kasashe
 			Harshen Indunusiya
 			Intagulanci
 			Inyamuranci
-			Yaren mutanen Iceland
+			Sichuan Yi
+			Yaren mutanen Iceland
 			Italiyanci
 			Japananci
+			Ngomba
+			Machame
 			Jabananci
-			Jojiyanci
+			Jojiyanci
+			Kabyle
+			Kamba
+			Makonde
+			Kabuverdianu
+			Koyra Chiini
+			Kikuyu
+			Kazakh
+			Kako
+			Kalaallisut
+			Kalenjin
 			Harshen Kimar
-			Dan/ʼYar Kabilar Kannada
+			Kannada
 			Harshen Koreya
-			Kurdanci
-			Kirgizanci
-			Dan Kabilar Latin
-			Lingala
-			Laothian
-			Lituweniyanci
-			Latbiyanci
-			Dan Masedoniya
-			Kabilar Maleyalam
-			Mongolian
-			Kʼabilan Marathi
+			Konkani
+			Kashmiri
+			Shambala
+			Bafia
+			Colognian
+			Kurdanci
+			Cornish
+			Kirgizanci
+			Dan Kabilar Latin
+			Langi
+			Luxembourgish
+			Ganda
+			Lakota
+			Lingala
+			Laothian
+			Northern Luri
+			Lituweniyanci
+			Luba-Katanga
+			Luo
+			Luyia
+			Latbiyanci
+			Harshen Masai
+			Meru
+			Morisyen
+			Malagasy
+			Makhuwa-Meetto
+			Metaʼ
+			Maori
+			Dan Masedoniya
+			Kabilar Maleyalam
+			Mongolian
+			Kʼabilan Marathi
 			Harshen Malai
-			Harshen Maltis
+			Harshen Maltis
+			Mundang
+			Harsuna masu yawa
 			Burmanci
+			Mazanderani
+			Nama
+			Norwegian Bokmål
+			North Ndebele
+			Low German
 			Nepali
 			Holanci
-			Yaren Kasar Norway
+			Kwasio
+			Norwegian Nynorsk
+			Ngiemboon
 			Yaren mutanen Norway
+			Nuer
+			Nyanja
+			Nyankole
 			Ositanci
-			Oriyanci
+			Oromo
+			Oriyanci
+			Ossetic
 			Punjabi
 			Harshen Polan
-			Pashtanci
+			Ferusawa
+			Pashtanci
 			Harshen Fotugis
-			Fotugis Kasashen Birazil
 			Fotugis kasashen Turai
+			Quechua
+			Romansh
+			Rundi
 			Romaniyanci
+			Rombo
 			Rashanci
 			Kiniyaruwanda
-			sanskrit
-			Sindiyanci
+			Sanskrit
+			Sakha
+			Samburu
+			Sangu
+			Sindiyanci
+			Northern Sami
+			Sena
+			Koyraboro Senni
+			Sango
 			Kuroweshiyancin-Sabiya
-			Sinhalanci
-			Basulake
-			Basulabe
-			Somali
-			Dʼan/ʼYar Kabilar Albaniya
-			Sabiyan
-			Sesotanci
-			Sundanese
+			Tachelhit
+			Sinhalanci
+			Basulke
+			Basulabe
+			Samoan
+			Inari Sami
+			Shona
+			Somalianci
+			Albanian
+			Sabiyan
+			Sesotanci
+			Sudananci
 			Harshen Suwedan
-			Harshen Suwahili
+			Harshen Suwahili
 			Tamil
-			Dʼan/ʼYar Kabilar Telug
+			Dʼan/ʼYar Kabilar Telug
+			Teso
+			Tajik
 			Thai
-			Tigriyanci
-			Tukmenistanci
+			Tigriyanci
+			Tukmenistanci
 			Klingon
+			Tongan
 			Harshen Turkiyya
+			Tatar
 			Tiwiniyanci
-			Ugiranci
+			Tasawaq
+			Tamazight na Atlas Tsaka
+			Ugiranci
 			Harshen Yukuren
 			Harshen da ba a sani ba
-			Harshen Urdu
-			Uzbek
+			Urdawa
+			Uzbek
+			Vai
 			Harshen Biyetinam
-			Bazosa
+			Volapük
+			Vunjo
+			Walser
+			Wolof
+			Bazosa
+			Soga
+			Yangben
+			Yiddish
 			Yarbanci
+			Cantonese
+			Sinanci
+			Standard Moroccan Tamazight
 			Harshen Sinanci
+			Harshen, Sinanci
 			Sauƙaƙaƙƙen Sinanci
 			Sinanci na gargajiya
 			Harshen Zulu
 		
 		
 			
-			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
 			
 			
 			
+			
 			
+			
 			
 			
 		
 		
+			Duniya
+			Afirka
+			North America
+			South America
+			Oceania
+			Afirka ta Yamma
+			Central America
+			Afirka ta Gabas
+			Arewacin Africa
+			Afirka ta Tsakiya
+			Kudancin Afirka
+			nahiyoyin Amurka
+			Arewacin Amurka
+			Caribbean
+			Gabashin Asiya
+			kudancin Asiya
+			Kudu Maso Gabashin Asiya
+			Kudancin Turai
+			Asiya
+			Asiya ta Tsakiya
+			Yammacin Asiya
+			Turai
+			Gabashin Turai
+			Arewacin Turai
+			Yammacin Turai
+			Sub-Saharan Africa
+			Latin America
 			Andora
 			Haɗaɗɗiyar Daular Larabawa
 			Afaganistan
@@ -164,6 +316,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Albaniya
 			Armeniya
 			Angola
+			Antatika
 			Arjantiniya
 			Samowa Ta Amurka
 			Ostiriya
@@ -179,9 +332,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Baharan
 			Burundi
 			Binin
+			St. Barthélemy
 			Barmuda
 			Burune
 			Bolibiya
+			Caribbean Netherlands
 			Birazil
 			Bahamas
 			Butan
@@ -189,19 +344,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Belarus
 			Beliz
 			Kanada
+			Tsibirai Cocos (Keeling)
 			Jamhuriyar Dimokuraɗiyyar Kongo
+			Kongo (DRC)
 			Jamhuriyar Afirka Ta Tsakiya
 			Kongo
+			Jamhuriyar Kongo
 			Suwizalan
 			Aibari Kwas
+			Aibari Kwas
 			Tsibiran Kuku
 			Cayile
 			Kamaru
-			Caina, Sin
+			Sin
 			Kolambiya
 			Kwasta Rika
 			Kyuba
 			Tsibiran Kap Barde
+			Kasar Curaçao
+			Tsibirin Kirsmati
 			Sifurus
 			Jamhuriyar Cak
 			Jamus
@@ -216,6 +377,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Eritireya
 			Sipen
 			Habasha
+			Tarayyar Turai
+			Sashin Turai
 			Finlan
 			Fiji
 			Tsibiran Falkilan
@@ -260,8 +423,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Kiribati
 			Kwamoras
 			San Kiti Da Nebis
-			Koreya Ta Arewa
-			Koreya Ta Kudu
+			Koriya Ta Arewa
+			Koriya Ta Kudu
 			Kwiyat
 			Tsibiran Kaiman
 			Kazakistan
@@ -279,9 +442,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Maroko
 			Monako
 			Maldoba
+			Mantanegara
+			St. Martin
 			Madagaskar
 			Tsibiran Marshal
-			Masedoniya
+			Macedonia ta Arewa
 			Mali
 			Burma, Miyamar
 			Mangoliya
@@ -310,7 +475,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Nuzilan
 			Oman
 			Panama
-			Peru
+			Feru
 			Folinesiya Ta Faransa
 			Papuwa Nugini
 			Filipin
@@ -320,17 +485,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Pitakarin
 			Porto Riko
 			Palasɗinu
+			Palasɗinu
 			Portugal
 			Palau
-			Paragai
-			Kwatar
+			Faragwai
+			Katar
 			Rawuniyan
 			Romaniya
+			Sabiya
 			Rasha
 			Ruwanda
-			Ƙasar Makka
+			Saudiyya
 			Tsibiran Salaman
-			Saishal
+			Seychelles
 			Sudan
 			Suwedan
 			Singapur
@@ -339,15 +506,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Sulobakiya
 			Salewo
 			San Marino
-			Sinigal
+			Sanigal
 			Somaliya
 			Suriname
+			Sudan ta kudu
 			Sawo Tome Da Paransip
 			El Salbador
+			Sint Maarten
 			Sham, Siriya
-			Suwazilan
+			Eswatini
+			Tritan da Kunha
 			Turkis Da Tsibiran Kaikwas
 			Cadi
+			Yankin Faransi ta Kudu
 			Togo
 			Tailan
 			Tajikistan
@@ -355,7 +526,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Timor Ta Gabas
 			Turkumenistan
 			Tunisiya
-			Tanga
+			Tonga
 			Turkiyya
 			Tirinidad Da Tobago
 			Tubalu
@@ -363,8 +534,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Tanzaniya
 			Yukaran
 			Yuganda
-			Amirka
-			Yurugai
+			Majalisar Dinkin Duniya
+			Amurka
+			Yurigwai
 			Uzubekistan
 			Batikan
 			San Binsan Da Girnadin
@@ -374,7 +546,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Biyetinam
 			Banuwatu
 			Walis Da Futuna
-			Samowa
+			Samoa
 			Yamal
 			Mayoti
 			Afirka Ta Kudu
@@ -382,9 +554,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Zimbabuwe
 			Yanki da ba a sani ba
 		
+		
+			Kalanda
+			Yanayin Kudi
+			Kudin Kasa
+			Zagayen Awowi
+			Lambobi
+		
 		
+			Kalanda Buddist
+			Kalanda Sin
+			Kalanda Dangi
+			Kalanda Etiofic
 			Gregorian Kalanda
+			Kalanda Ibrananci
+			Kalandar Musulunci
+			Kalanda ISO-8601
+			Kalanda Jafan
+			Kalanda Farisa
 			Daidai ta ce Kasà
+			Tsarin Awowi 12(0–11)
+			Tsarin Awowi 12(1–12)
+			Tsarin Awowi 24(0–23)
+			Tsarin Awowi 24(1–24)
 			Lambobi na larabawan a gabas
 			Lambobi na yammacin
 		
@@ -400,18 +592,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		[a b ɓ c d ɗ e f g h i j k ƙ l m n o r s {sh} t {ts} u w y {ƴ} z ʼ]
+		[a b ɓ c d ɗ e f g h i j k ƙ l m n o r s {sh} t {ts} u w y ƴ z ʼ]
 		[á à â é è ê í ì î ó ò ô p q {r\u0303} ú ù û v x]
 		[A B Ɓ C D Ɗ E F G H I J K Ƙ L M N O R S T U W Y Ƴ Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \} ′ ″]
+		[\- ‑ , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \} ′ ″]
 	
-	
-		“
-		”
-		‘
-		’
-	
 	
 		
 			
@@ -459,37 +644,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						d, E
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
-						G y
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
-						L
 						M/d
 						E, M/d
-						LLL
-						MMM d
 						E, MMM d
-						MMMM d
 						E, MMMM d
-						mm:ss
 						y
 						M/y
 						E, M/d/y
@@ -498,127 +656,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMMM y
 						QQQ y
 						QQQQ y
-						G y
-						GGGGG y-MM
-						GGGGG y-MM-dd
-						GGGGG y-MM-dd, E
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						G y MMMM
-						G y QQQ
-						G y QQQQ
 					
-					
-						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
-						
-							d–d
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-						
-							MM–MM
-						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
-						
-							MM-dd, E – MM-dd, E
-							MM-dd, E – MM-dd, E
-						
-						
-							LLL–LLL
-						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
-						
-							G y–y
-						
-						
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-						
-							G y MMMM–MMMM
-							G y MMMM – y MMMM
-						
-					
 				
 			
 			
@@ -838,10 +876,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							AM
 							PM
 						
-						
-							AM
-							PM
-						
 						
 							Safiya
 							Yamma
@@ -865,7 +899,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						Kafin haihuwar annab
-						K.H.Y
 						Bayan haihuwar annab
 						sananne Zamani
 					
@@ -942,32 +975,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
 						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
 						E, d
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
-						G y
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						h a
-						HH
 						h:mm a
 						HH:mm
 						h:mm:ss a
 						HH:mm:ss
-						h:mm:ss a v
-						HH:mm:ss v
-						h:mm a v
-						HH:mm v
 						L
 						M/d
 						E, M/d
@@ -976,8 +989,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						E, MMM d
 						MMMM d
 						E, MMMM d
-						'week' W 'of' MMMM
-						'week' W 'of' MMMM
 						mm:ss
 						y
 						M/y
@@ -989,120 +1000,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMMM y
 						QQQ y
 						QQQQ y
-						'week' w 'of' Y
-						'week' w 'of' Y
 					
-					
-						{0} {1}
-					
 					
-						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
-						
-							d–d
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
-							h–h a
 						
 						
 							HH–HH
 						
 						
 							h:mm a – h:mm a
-							h:mm–h:mm a
-							h:mm–h:mm a
 						
 						
 							HH:mm–HH:mm
 							HH:mm–HH:mm
 						
-						
-							h:mm a – h:mm a v
-							h:mm–h:mm a v
-							h:mm–h:mm a v
-						
-						
-							HH:mm–HH:mm v
-							HH:mm–HH:mm v
-						
-						
-							h a – h a v
-							h–h a v
-						
-						
-							HH–HH v
-						
-						
-							MM–MM
-						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
 						
 							E, dd/M – E, dd/M
-							MM-dd, E – MM-dd, E
-						
-						
-							LLL–LLL
-						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
-						
-							y–y
 						
 						
 							MM/y – MM/y
@@ -1111,29 +1025,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							dd/MM/y – dd/MM/y
 							dd/MM/y – dd/MM/y
-							y-MM-dd – y-MM-dd
 						
 						
-							y-MM-dd, E – y-MM-dd, E
 							y-MM-dd, E – y-MM-dd, E
 							y-MM-dd, E – y-MM-dd, E
 						
 						
-							y MMM–MMM
 							y MMM – y MMM
 						
 						
-							y MMM d–d
-							y MMM d – MMM d
 							y MMM d – y MMM d
 						
 						
-							y MMM d, E – MMM d, E
-							y MMM d, E – MMM d, E
 							y MMM d, E – y MMM d, E
 						
 						
-							y MMMM–MMMM
 							y MMMM – y MMMM
 						
 					
@@ -1146,484 +1052,734 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Shekara
+				bara
+				bana
+				badi
 			
 			
-				Shekara
+				bara
+				bana
+				badi
 			
 			
-				Shekara
+				bara
+				bana
+				badi
 			
 			
 				Kwata
-			
-			
-				Kwata
-			
-			
-				Kwata
+				kwatan karshe
+				wannan kwatan
+				kwata na gaba
 			
 			
 				Wata
+				watan daya gabata
+				wannan watan
+				wata na gaba
 			
 			
-				Wata
+				watan da ya gabata
+				wannan watan
+				wata na gaba
 			
 			
-				Wata
+				watan da ya gabata
+				wannan watan
+				wata na gaba
 			
 			
 				Mako
+				satin da ya gabata
+				wannan satin
+				sati na gaba
 			
 			
-				Mako
+				satin da ya gabata
+				wannan satin
+				sati na gaba
 			
 			
-				Mako
+				satin da ya gabata
+				wannan satin
+				sati na gaba
+				sati na {0}
+			
+			
+				Makon Wata
+			
+			
+				Makon Wata
+			
+			
+				Makon Wata
 			
 			
 				Kwana
-				Jiya
-				Yau
-				Gobe
+				jiya
+				yau
+				gobe
 			
-			
-				Kwana
-				Jiya
-				Yau
-				Gobe
+			
+				Kwanan Shekara
 			
-			
-				Kwana
-				Jiya
-				Yau
-				Gobe
+			
+				Kwanan Shekara
+			
+			
+				Kwanan Shekara
 			
 			
 				Rana mako
 			
+			
+				Ranar Aikin Wata
+			
+			
+				Ranar Aikin Wata
+			
+			
+				Ranar Aikin Wata
+			
+			
+				Lahadin da ya gabata
+				wanan Lahadi
+				Lahadi mai zuwa
+				
+					cikin {0} Lahadi
+					cikin {0} Lahadi
+				
+				
+					{0} Lahadin da ta gabata
+					{0} Lahadin da ta gabata
+				
+			
+			
+				Lahadin da ya gabata
+				wanan Lahadi
+				Lahadi mai zuwa
+				
+					cikin {0} Lahadi
+					cikin {0} Lahadi
+				
+				
+					{0} Lahadin da ta gabata
+					{0} Lahadin da ta gabata
+				
+			
+			
+				Lahadin da ya gabata
+				wanan Lahadi
+				Lahadi mai zuwa
+				
+					cikin {0} Lahadi
+					cikin {0} Lahadi
+				
+				
+					{0} Lahadin da ta gabata
+					{0} Lahadin da ta gabata
+				
+			
+			
+				Litinin din da ta gabata
+				wannan Litinin din
+				Litinin din da ya gabata
+				
+					cikin {0} Litinin
+					cikin {0} Litinin
+				
+				
+					{0} Litinin din da ta gabata
+					{0} Litinin din da ta gabata
+				
+			
+			
+				Litinin din da ta gabata
+				wannan Litinin din
+				Litinin din da ya gabata
+				
+					cikin {0} Litinin
+					cikin {0} Litinin
+				
+				
+					{0} Litinin din da ta gabata
+					{0} Litinin din da ta gabata
+				
+			
+			
+				Litinin din da ta gabata
+				wannan Litinin din
+				Litinin din da ya gabata
+				
+					cikin {0} Litinin
+					cikin {0} Litinin
+				
+				
+					{0} Litinin din da ta
+					{0} Litinin din da ta
+				
+			
+			
+				Talata da ta gabata
+				wannan Talata
+				Talata mai zuwa
+				
+					cikin {0} Talata
+					cikin {0} Talata
+				
+				
+					{0} Talatar da ta gabata
+					{0} Talatar da ta gabata
+				
+			
+			
+				Talata da ta gabata
+				wannan Talata
+				Talata mai zuwa
+				
+					cikin {0} Talata
+					cikin {0} Talata
+				
+				
+					{0} Talatar da ta gabata
+					{0} Talatar da ta gabata
+				
+			
+			
+				Talata da ta gabata
+				wannan Talata
+				Talata mai zuwa
+				
+					cikin {0} Talata
+					cikin {0} Talata
+				
+				
+					{0} Talatar da ta gabata
+					{0} Talatar da ta gabata
+				
+			
+			
+				Laraba da ta gabata
+				wannan Larabar
+				Laraba mai zuwa
+				
+					cikin {0} Laraba
+					cikin {0} Laraba
+				
+				
+					{0} Laraba da ta gabata
+					{0} Laraba da ta gabata
+				
+			
+			
+				Laraba da ta gabata
+				wannan Larabar
+				Laraba mai zuwa
+				
+					cikin {0} Laraba
+					cikin {0} Laraba
+				
+				
+					{0} Laraba da ta gabata
+					{0} Laraba da ta gabata
+				
+			
+			
+				Laraba da ta gabata
+				wannan Larabar
+				Laraba mai zuwa
+				
+					cikin {0} Laraba
+					cikin {0} Laraba
+				
+				
+					{0} Laraba da ta gabata
+					{0} Laraba da ta gabata
+				
+			
+			
+				Alhamis din da ya Gabata
+				wannan Alhamis din
+				Alhamis din mai zuwa
+				
+					cikin {0} Alhamis
+					cikin {0} Alhamis
+				
+				
+					{0} Alhamis din da ya gabata
+					{0} Alhamis din da ya gabata
+				
+			
+			
+				Alhamis din da ya Gabata
+				wannan Alhamis din
+				Alhamis din mai zuwa
+				
+					cikin {0} Alhamis
+					cikin {0} Alhamis
+				
+				
+					{0} Alhamis din da ya gabata
+					{0} Alhamis din da ya gabata
+				
+			
+			
+				Alhamis din da ya Gabata
+				wannan Alhamis din
+				Alhamis din mai zuwa
+				
+					cikin {0} Alhamis
+					cikin {0} Alhamis
+				
+				
+					{0} Alhamis din da ya gabata
+					{0} Alhamis din da ya gabata
+				
+			
+			
+				Jumaʼa da ta gabata
+				wannan Jumaʼar
+				Jumaʼa mai zuwa
+				
+					cikin {0} Jumaʼa
+					cikin {0} Jumaʼa
+				
+				
+					{0} Jumaʼa da ta wuce
+					{0} Jumaʼa da ta wuce
+				
+			
+			
+				Jumaʼa da ta gabata
+				wannan Jumaʼar
+				Jumaʼa mai zuwa
+				
+					cikin {0} Jumaʼa
+					cikin {0} Jumaʼa
+				
+				
+					{0} Jumaʼa da ta wuce
+					{0} Jumaʼa da ta wuce
+				
+			
+			
+				Jumaʼa da ta gabata
+				wannan Jumaʼar
+				Jumaʼa mai zuwa
+				
+					cikin {0} Jumaʼa
+					cikin {0} Jumaʼa
+				
+				
+					{0} Jumaʼa da ta wuce
+					{0} Jumaʼa da ta wuce
+				
+			
+			
+				Asabar din da ya gabata
+				wannan Asabar din
+				Asabar mai zuwa
+				
+					cikin {0} Asabar
+					cikin {0} Asabar
+				
+				
+					{0} Asabar din da ya wuce
+					{0} Asabar din da ya wuce
+				
+			
+			
+				Asabar din da ya gabata
+				wannan Asabar din
+				Asabar mai zuwa
+				
+					cikin {0} Asabar
+					cikin {0} Asabar
+				
+				
+					{0} Asabar din da ya wuce
+					{0} Asabar din da ya wuce
+				
+			
+			
+				Asabar din da ya gabata
+				wannan Asabar din
+				Asabar mai zuwa
+				
+					cikin {0} Asabar
+					cikin {0} Asabar
+				
+				
+					{0} Asabar din da ya wuce
+					{0} Asabar din da ya wuce
+				
+			
 			
 				Lokuttan rana
 			
 			
 				Awa
+				wannan awa
+				
+					cikin {0} awa
+					cikin {0} awa
+				
+				
+					{0} awa da ya gabata
+					{0} awa da ya gabata
+				
 			
 			
-				Awa
+				
+					cikin {0} awa
+					cikin {0} awa
+				
+				
+					{0} awa da ya gabata
+					{0} awa da ya gabata
+				
 			
 			
-				Awa
+				
+					cikin {0} awa
+					cikin {0} awa
+				
+				
+					{0} awa da ya gabata
+					{0} awa da ya gabata
+				
 			
 			
 				Minti
+				wannan mintin
+				
+					cikin {0} minti
+					cikin {0} minti
+				
+				
+					{0} minti da ya gabata
+					{0} minti da ya gabata
+				
 			
 			
-				Minti
+				
+					cikin {0} minti
+					cikin {0} minti
+				
+				
+					{0} minti da ya gabata
+					{0} minti da ya gabata
+				
 			
 			
-				Minti
+				
+					cikin {0} minti
+					cikin {0} minti
+				
+				
+					{0} minti da ya gabata
+					{0} minti da ya gabata
+				
 			
 			
 				Daƙiƙa
+				yanzu
+				
+					cikin {0} dakika
+					cikin {0} dakika
+				
+				
+					{0} dakika da ya gabata
+					{0} dakika da ya gabata
+				
 			
 			
-				Daƙiƙa
+				
+					cikin {0} dakika
+					cikin {0} dakika
+				
+				
+					{0} dakika da ya gabata
+					{0} dakika da ya gabata
+				
 			
 			
-				Daƙiƙa
+				
+					cikin {0} dakika
+					cikin {0} dakika
+				
+				
+					{0} dakika da ya gabata
+					{0} dakika da ya gabata
+				
 			
 			
 				Lokacin yanki
 			
 		
 		
-			+HH:mm;-HH:mm
-			GMT{0}
-			GMT
 			{0} Lokaci
-			{0} Lokaci rana
+			{0} Lokacin rana
 			{0} Daidai ta ce lokaci
-			{1} ({0})
 			
 				
-					Hadewa duniya lokaci
+					Hadewa Lokaci na Duniya
 				
 			
 			
 				Birni da ba a sani ba
 			
-			
-				Antigua
+			
+				Baku
 			
-			
-				Anguilla
+			
+				Bahrain
 			
-			
-				Aruba
+			
+				Baghdad
 			
-			
-				Barbados
+			
+				Amman
 			
-			
-				St. Barthelemy
+			
+				Beirut
 			
-			
-				Bermuda
-			
-			
-				Kralendijk
-			
-			
-				Nassau
-			
-			
-				Belize
-			
-			
-				Dawson
-			
-			
-				Whitehorse
-			
-			
-				Inuvik
-			
-			
-				Vancouver
-			
-			
-				Fort Nelson
-			
-			
-				Dawson Creek
-			
-			
-				Creston
-			
-			
-				Yellowknife
-			
-			
-				Edmonton
-			
-			
-				Swift Current
-			
-			
-				Cambridge Bay
-			
-			
-				Regina
-			
-			
-				Winnipeg
-			
-			
-				Resolute
-			
-			
-				Rainy River
-			
-			
-				Rankin Inlet
-			
-			
-				Atikokan
-			
-			
-				Thunder Bay
-			
-			
-				Nipigon
-			
-			
-				Toronto
-			
-			
-				Iqaluit
-			
-			
-				Pangnirtung
-			
-			
-				Moncton
-			
-			
-				Halifax
-			
-			
-				Goose Bay
-			
-			
-				Glace Bay
-			
-			
-				Blanc-Sablon
-			
-			
-				St. John’s
-			
-			
-				Costa Rica
-			
-			
-				Havana
-			
-			
-				Curacao
-			
-			
-				Dominica
-			
-			
-				Santo Domingo
-			
-			
-				Grenada
-			
-			
-				Thule
-			
-			
-				Nuuk
-			
-			
-				Ittoqqortoormiit
-			
-			
-				Danmarkshavn
-			
-			
-				Guadeloupe
-			
-			
-				Guatemala
-			
-			
-				Tegucigalpa
-			
-			
-				Port-au-Prince
-			
-			
-				Jamaica
-			
-			
-				St. Kitts
-			
-			
-				Cayman
-			
-			
-				St. Lucia
-			
-			
-				Marigot
-			
-			
-				Martinique
-			
-			
-				Montserrat
-			
-			
-				Tijuana
-			
-			
-				Hermosillo
-			
-			
-				Mazatlan
-			
-			
-				Chihuahua
-			
-			
-				Bahia Banderas
-			
-			
-				Ojinaga
-			
-			
-				Monterrey
-			
-			
-				Mexico City
-			
-			
-				Matamoros
-			
-			
-				Merida
-			
-			
-				Cancun
-			
-			
-				Managua
-			
-			
-				Panama
-			
-			
-				Miquelon
-			
-			
-				Puerto Rico
-			
-			
-				El Salvador
-			
-			
-				Lower Prince’s Quarter
-			
-			
-				Grand Turk
-			
-			
-				Port of Spain
-			
-			
-				Adak
-			
-			
-				Nome
-			
-			
-				Anchorage
-			
-			
-				Yakutat
-			
-			
-				Sitka
-			
-			
-				Juneau
-			
-			
-				Metlakatla
-			
-			
-				Los Angeles
-			
-			
-				Boise
-			
-			
-				Phoenix
-			
-			
-				Denver
+			
+				Bangkok
 			
 			
-				Beulah, North Dakota
+				Beulah, Arewacin Dakota
 			
 			
-				New Salem, North Dakota
+				New Salem, Arewacin Dakota
 			
 			
-				Center, North Dakota
+				Center, Arewacin Dakota
 			
-			
-				Chicago
-			
-			
-				Menominee
-			
-			
-				Vincennes, Indiana
-			
-			
-				Petersburg, Indiana
-			
-			
-				Tell City, Indiana
-			
-			
-				Knox, Indiana
-			
-			
-				Winamac, Indiana
-			
-			
-				Marengo, Indiana
-			
-			
-				Indianapolis
-			
-			
-				Louisville
-			
-			
-				Vevay, Indiana
-			
-			
-				Monticello, Kentucky
-			
-			
-				Detroit
-			
-			
-				New York
-			
-			
-				St. Vincent
-			
-			
-				Tortola
-			
-			
-				St. Thomas
+			
+				Aden
 			
+			
+				
+					Afghanistan Time
+				
+			
+			
+				
+					Central Africa Time
+				
+			
+			
+				
+					East Africa Time
+				
+			
+			
+				
+					South Africa Standard Time
+				
+			
+			
+				
+					West Africa Time
+					West Africa Standard Time
+					West Africa Summer Time
+				
+			
 			
 				
-					Lokaci ta Alaska
-					Ida Lokaci ta Alaska
-					Lokaci rana ta Alaska
+					Lokacin Alaska
+					Tsayayyen Lokacin Alaska
+					Lokacin Rana na Alaska
 				
 			
 			
 				
 					Lokaci dake Amurika arewa ta tsakiyar
-					Ida Lokaci dake Amurika arewa ta tsakiyar
-					Lokaci rana dake Amurika arewa ta tsakiyar
+					Tsayayyen Lokaci dake Arewacin Amurika ta Tsakiya
+					Lokacin Rana dake Arewacin Amurika ta Tsakiya
 				
 			
 			
 				
-					Lokaci gabas a arewacin da Amirka
-					Lokaci daidai ta ce a arewacin da Amirka
-					Lokaci rana a arewacin da Amirka
+					Lokacin Gabas dake Arewacin Amurikaa
+					Tsayayyen Lokacin Gabas dake Arewacin Amurika
+					Lokacin Rana ta Gabas dake Arewacin Amurika
 				
 			
 			
 				
 					Lokaci tsauni a arewacin da Amirka
-					Lokacin daidai ta ce tsauni a arewacin da Amirka
+					Lokaci tsayayye na tsauni a Arewacin Amurica
 					Lokaci rana tsauni a arewacin da Amirka
 				
 			
 			
 				
-					Amurika da arewa a lokaci lafiya
-					Ida Amurika da arewa a lokaci lafiya
-					Ida Amurika da arewa a lokaci rana
+					Lokacin Arewacin Amurika
+					Lokaci Tsayayye na Arewacin Amurika
+					Lokaci da rana a Arewacin Amurika
+				
+			
+			
+				
+					Apia Time
+					Apia Standard Time
+					Apia Daylight Time
+				
+			
+			
+				
+					Arabian Time
+					Arabian Standard Time
+					Arabian Daylight Time
+				
+			
+			
+				
+					Armenia Time
+					Armenia Standard Time
+					Armenia Summer Time
 				
 			
 			
 				
-					Lokaci da Kanada, Puerto Rico da Virgin Islands
-					Ida Lokaci da Kanada, Puerto Rico da Virgin Islands
-					Lokaci rana da amfani da shi Kanada, Puerto rico da Virgin Islands
+					Lokacin Kanada, Puerto Rico da Virgin Islands
+					Lokaci Tsayayye na Kanada, Puerto Rico da Virgin Islands
+					Lokacin Rana na Kanada, Puerto Rico da Virgin Islands
+				
+			
+			
+				
+					Central Australia Time
+					Australian Central Standard Time
+					Australian Central Daylight Time
+				
+			
+			
+				
+					Australian Central Western Time
+					Australian Central Western Standard Time
+					Australian Central Western Daylight Time
+				
+			
+			
+				
+					Eastern Australia Time
+					Australian Eastern Standard Time
+					Australian Eastern Daylight Time
+				
+			
+			
+				
+					Western Australia Time
+					Australian Western Standard Time
+					Australian Western Daylight Time
+				
+			
+			
+				
+					Azerbaijan Time
+					Azerbaijan Standard Time
+					Azerbaijan Summer Time
+				
+			
+			
+				
+					Azores Time
+					Azores Standard Time
+					Azores Summer Time
+				
+			
+			
+				
+					Bangladesh Time
+					Bangladesh Standard Time
+					Bangladesh Summer Time
+				
+			
+			
+				
+					Bhutan Time
+				
+			
+			
+				
+					Brunei Darussalam Time
+				
+			
+			
+				
+					Cape Verde Time
+					Cape Verde Standard Time
+					Cape Verde Summer Time
+				
+			
+			
+				
+					Chamorro Standard Time
+				
+			
+			
+				
+					Chatham Time
+					Chatham Standard Time
+					Chatham Daylight Time
+				
+			
+			
+				
+					China Time
+					China Standard Time
+					China Daylight Time
+				
+			
+			
+				
+					Choibalsan Time
+					Choibalsan Standard Time
+					Choibalsan Summer Time
+				
+			
+			
+				
+					Christmas Island Time
+				
+			
+			
+				
+					Cocos Islands Time
+				
+			
+			
+				
+					Cook Islands Time
+					Cook Islands Standard Time
+					Cook Islands Half Summer Time
 				
 			
 			
 				
 					Lokaci ta Kuba
-					Ida Lokaci ta Kuba
+					Lokaci Tsayayye na Kuba
 					Lokaci rana ta Kuba
 				
 			
+			
+				
+					Davis Time
+				
+			
+			
+				
+					Dumont-d’Urville Time
+				
+			
+			
+				
+					East Timor Time
+				
+			
 			
 				
 					Tsakiyar a lokaci turai
@@ -1645,6 +1801,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Ida lokaci ta yammacin turai da bazara
 				
 			
+			
+				
+					Fiji Time
+					Fiji Standard Time
+					Fiji Summer Time
+				
+			
+			
+				
+					French Southern & Antarctic Time
+				
+			
+			
+				
+					Gambier Time
+				
+			
+			
+				
+					Georgia Time
+					Georgia Standard Time
+					Georgia Summer Time
+				
+			
+			
+				
+					Gilbert Islands Time
+				
+			
 			
 				
 					Lokacin Greenwhich a London
@@ -1653,15 +1838,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				
 					Lokaci a gabas ta Greeland
-					Ida Lokaci a gabas ta Greeland
+					Lokaci Tsayayye a gabashin ta Greenland
 					Lokaci rana a gabas ta Greeland
 				
 			
 			
 				
-					Lokaci a yammacin ta Greeland
-					Ida Lokaci a yammacin ta Greeland
-					Lokaci rana a yammacin ta Greeland
+					Lokaci a yammacin Greeland
+					Lokaci Tsayayye a yammacin Greeland
+					Lokacin rana a yammacin Greeland
+				
+			
+			
+				
+					Gulf Standard Time [translation hint: translate as just "Gulf Time"]
 				
 			
 			
@@ -1671,54 +1861,451 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Lokaci rana ta Hawaii-Aleutian
 				
 			
+			
+				
+					Hong Kong Time
+					Hong Kong Standard Time
+					Hong Kong Summer Time
+				
+			
+			
+				
+					Hovd Time
+					Hovd Standard Time
+					Hovd Summer Time
+				
+			
+			
+				
+					India Standard Time
+				
+			
+			
+				
+					Indian Ocean Time
+				
+			
+			
+				
+					Indochina Time
+				
+			
+			
+				
+					Central Indonesia Time
+				
+			
+			
+				
+					Eastern Indonesia Time
+				
+			
+			
+				
+					Western Indonesia Time
+				
+			
+			
+				
+					Iran Time
+					Iran Standard Time
+					Iran Daylight Time
+				
+			
+			
+				
+					Irkutsk Time
+					Irkutsk Standard Time
+					Irkutsk Summer Time
+				
+			
+			
+				
+					Israel Time
+					Israel Standard Time
+					Israel Daylight Time
+				
+			
+			
+				
+					Japan Time
+					Japan Standard Time
+					Japan Daylight Time
+				
+			
+			
+				
+					East Kazakhstan Time
+				
+			
+			
+				
+					West Kazakhstan Time
+				
+			
+			
+				
+					Korean Time
+					Korean Standard Time
+					Korean Daylight Time
+				
+			
+			
+				
+					Kosrae Time
+				
+			
+			
+				
+					Krasnoyarsk Time
+					Krasnoyarsk Standard Time
+					Krasnoyarsk Summer Time
+				
+			
+			
+				
+					Kyrgyzstan Time
+				
+			
+			
+				
+					Line Islands Time
+				
+			
+			
+				
+					Lord Howe Time
+					Lord Howe Standard Time
+					Lord Howe Daylight Time
+				
+			
+			
+				
+					Macquarie Island Time
+				
+			
+			
+				
+					Magadan Time
+					Magadan Standard Time
+					Magadan Summer Time
+				
+			
+			
+				
+					Malaysia Time
+				
+			
+			
+				
+					Maldives Time
+				
+			
+			
+				
+					Marquesas Time
+				
+			
+			
+				
+					Marshall Islands Time
+				
+			
+			
+				
+					Mawson Time
+				
+			
 			
 				
-					Lokaci a arewa da yammacin ta Mesiko
-					Ida Lokaci a arewa da yammacin ta Mesiko
-					Lokaci rana a arewa da yammacin ta Mesiko
+					Lokacin arewa maso gabashin mesiko
+					Lokaci Tsayayye na arewa maso gabashin Mesiko
+					Lokacin rana na arewa maso gabashin Mesiko
 				
 			
 			
 				
-					Lokaci a lafiya ta Mesiko
-					Ida Lokaci a lafiya ta Mesiko
-					Lokaci rana a lafiya ta Mesiko
+					Lokaci na Mesiko Pacific
+					Lokaci Tsayayye na Mesiko Pacific
+					Lokaci na rana na Mesiko Pacific
+				
+			
+			
+				
+					Ulaanbaatar Time
+					Ulaanbaatar Standard Time
+					Ulaanbaatar Summer Time
+				
+			
+			
+				
+					Moscow Time
+					Moscow Standard Time
+					Moscow Summer Time
+				
+			
+			
+				
+					Myanmar Time
+				
+			
+			
+				
+					Nauru Time
+				
+			
+			
+				
+					Nepal Time
+				
+			
+			
+				
+					New Caledonia Time
+					New Caledonia Standard Time
+					New Caledonia Summer Time
+				
+			
+			
+				
+					New Zealand Time
+					New Zealand Standard Time
+					New Zealand Daylight Time
 				
 			
 			
 				
 					Lokaci ta Newfoundland
-					Ida Lokaci ta Newfoundland
+					Lokaci Tsayayye ta Newfoundland
 					Lokaci rana ta Newfoundland
 				
 			
+			
+				
+					Niue Time
+				
+			
+			
+				
+					Norfolk Island Time
+				
+			
+			
+				
+					Novosibirsk Time
+					Novosibirsk Standard Time
+					Novosibirsk Summer Time
+				
+			
+			
+				
+					Omsk Time
+					Omsk Standard Time
+					Omsk Summer Time
+				
+			
+			
+				
+					Pakistan Time
+					Pakistan Standard Time
+					Pakistan Summer Time
+				
+			
+			
+				
+					Palau Time
+				
+			
+			
+				
+					Papua New Guinea Time
+				
+			
+			
+				
+					Philippine Time
+					Philippine Standard Time
+					Philippine Summer Time
+				
+			
+			
+				
+					Phoenix Islands Time
+				
+			
 			
 				
 					Lokaci ta St. Pierre da Miquelon
-					Ida Lokaci ta St. Pierre da Miquelon
+					Lokaci tsayayye St. Pierre da Miquelon
 					Lokaci rana ta St. Pierre da Miquelon
 				
 			
+			
+				
+					Pitcairn Time
+				
+			
+			
+				
+					Ponape Time
+				
+			
+			
+				
+					Pyongyang Time
+				
+			
+			
+				
+					Réunion Time
+				
+			
+			
+				
+					Rothera Time
+				
+			
+			
+				
+					Sakhalin Time
+					Sakhalin Standard Time
+					Sakhalin Summer Time
+				
+			
+			
+				
+					Samoa Time
+					Samoa Standard Time
+					Samoa Daylight Time
+				
+			
+			
+				
+					Seychelles Time
+				
+			
+			
+				
+					Singapore Standard Time
+				
+			
+			
+				
+					Solomon Islands Time
+				
+			
+			
+				
+					Syowa Time
+				
+			
+			
+				
+					Tahiti Time
+				
+			
+			
+				
+					Taipei Time
+					Taipei Standard Time
+					Taipei Daylight Time
+				
+			
+			
+				
+					Tajikistan Time
+				
+			
+			
+				
+					Tokelau Time
+				
+			
+			
+				
+					Tonga Time
+					Tonga Standard Time
+					Tonga Summer Time
+				
+			
+			
+				
+					Chuuk Time
+				
+			
+			
+				
+					Turkmenistan Time
+					Turkmenistan Standard Time
+					Turkmenistan Summer Time
+				
+			
+			
+				
+					Tuvalu Time
+				
+			
+			
+				
+					Uzbekistan Time
+					Uzbekistan Standard Time
+					Uzbekistan Summer Time
+				
+			
+			
+				
+					Vanuatu Time
+					Vanuatu Standard Time
+					Vanuatu Summer Time
+				
+			
+			
+				
+					Vladivostok Time
+					Vladivostok Standard Time
+					Vladivostok Summer Time
+				
+			
+			
+				
+					Volgograd Time
+					Volgograd Standard Time
+					Volgograd Summer Time
+				
+			
+			
+				
+					Vostok Time
+				
+			
+			
+				
+					Wake Island Time
+				
+			
+			
+				
+					Wallis & Futuna Time
+				
+			
+			
+				
+					Yakutsk Time
+					Yakutsk Standard Time
+					Yakutsk Summer Time
+				
+			
+			
+				
+					Yekaterinburg Time
+					Yekaterinburg Standard Time
+					Yekaterinburg Summer Time
+				
+			
 		
 	
 	
-		latn
-		
-			latn
-		
-		
-			.
-			,
-			%
-			+
-			-
-		
 		
-			
-				
-					#,##0.###
-				
-			
 			
 				
 					Dubu 0
@@ -1776,26 +2363,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				
-					#E0
-				
-			
-		
-		
-			
-				
-					#,##0%
-				
-			
-		
 		
-			
-				
-					¤ #,##0.00
-				
-			
 			
 				
 					¤ 0D
@@ -1824,8 +2392,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					¤000T
 				
 			
-			{0} {1}
-			{0} {1}
 		
 		
 			
@@ -1836,6 +2402,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Dalar Ostareliya
+				$
 			
 			
 				Kuɗin Baharan
@@ -1847,8 +2414,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ril Kudin Birazil
 				Ril Kudin Birazil
 				Ril Kudin Birazil
-				R$
-				R$
 			
 			
 				Kuɗin Baswana
@@ -1864,10 +2429,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Yuwan kasar Sin
-				Yuwan kasar Sin
-				Yuwan kasar Sin
-				CN¥
-				¥
+				Yuwan kasar Sin
+				Yuwan kasar Sin
 			
 			
 				Kuɗin Tsibiran Kap Barde
@@ -1889,15 +2452,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Yuro
-				€
-				€
 			
 			
 				Fam na Ingila
 				Fam na Ingila
-				Faman na Ingila
-				£
-				£
+				Fam na Ingila
 			
 			
 				Cedi
@@ -1910,15 +2469,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Kuɗin Indiya
-				₹
-				₹
 			
 			
 				Yen kasar Japan
 				Yen kasar Japan
 				Yen kasar Japan
 				¥
-				¥
 			
 			
 				Sulen Kenya
@@ -1960,15 +2516,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Dalar Namibiya
 			
 			
-				Naira
+				Nairar Najeriya
+				Nairar Najeriya
+				Nairorin Najeriya
 				₦
 			
 			
 				Ruble kasar Rasha
-				Ruble kasar Rasha
-				Ruble kasar Rasha
-				RUB
-				₽
+				Ruble kasar Rasha
+				Ruble kasar Rasha
 			
 			
 				Kuɗin Ruwanda
@@ -2011,10 +2567,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Dalar Amirka
-				Dalar Amirka
-				Dalar Amirka
+				Dalar Amirka
+				Dalar Amirka
 				$
-				$
 			
 			
 				Kuɗin Sefa na Afirka Ta Tsakiya
@@ -2041,24 +2596,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 	
-	
-		
-			h:mm
-		
-		
-			h:mm:ss
-		
-		
-			m:ss
-		
-	
 	
 		
-			{0}, {1}
-			{0}, {1}
 			{0} da {1}
 			{0} da {1}
 		
+		
+			{0} ko {1}
+			{0} ko {1}
+		
+		
+			{0} ko {1}
+			{0} ko {1}
+		
+		
+			{0} ko {1}
+			{0} ko {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
 	
 	
 		
diff --git a/make/data/cldr/common/main/ha_GH.xml b/make/data/cldr/common/main/ha_GH.xml
index 007b311ebba..de83c91e5d7 100644
--- a/make/data/cldr/common/main/ha_GH.xml
+++ b/make/data/cldr/common/main/ha_GH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ha_NE.xml b/make/data/cldr/common/main/ha_NE.xml
index 09b38723a7d..a6c033c92a1 100644
--- a/make/data/cldr/common/main/ha_NE.xml
+++ b/make/data/cldr/common/main/ha_NE.xml
@@ -7,2064 +7,35 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		
-			{0} ({1})
-			{0}, {1}
-			{0}: {1}
-		
 		
-			Afirkanci
-			Akan
-			Amharik
-			Larabci
-			Asamisanci
-			Azerbaijanci
-			Belarusanci
-			Bulgaranci
-			Bengali
-			Buretananci
-			Bosniyanci
-			Kataloniyanci
-			Harshen Cak
-			Kabilar Welsh
-			Danish
-			Jamusanci
+			Larabci Asali Na Zamani
 			Jamusanci Ostiriya
 			Jamusanci Suwizalan
-			Girkanci
-			Turanci
 			Turanci Ostareliya
 			Turanci Kanada
 			Turanci Biritaniya
 			Turanci Ingila
 			Turanci Amirka
 			Amirka Turanci
-			Dʼan/Ƴar Kabilar Andalus
-			Sifaniyanci
+			Dʼan/Ƴar Kabilar Andalus
 			Sifaniyancin Latin Amirka
 			Sifaniyanci Turai
 			Sifaniyanci Mesiko
-			Istoniyanci
-			Dan/Ƴar Kabilar Bas
-			Parisanci
-			Yaren mutanen Finland
-			Dan Filifin
-			Faroese
-			Faransanci
 			Farasanci Kanada
 			Farasanci Suwizalan
-			Kʼabilan Firsi
-			Dan Ailan
-			Kʼabilan Scots Gaelic
-			Bagalike
-			Guwaraniyanci
-			Gujarati
-			Hausa
-			Yahudanci
-			Harshen Hindi
-			Kuroshiyan
-			Harshen Hungari
-			Armeniyanci
-			Yare Tsakanin Kasashe
-			Harshen Indunusiya
-			Intagulanci
-			Inyamuranci
-			Yaren mutanen Iceland
-			Italiyanci
-			Japananci
-			Jabananci
-			Jojiyanci
-			Harshen Kimar
-			Dan/Ƴar Kabilar Kannada
-			Harshen Koreya
-			Kurdanci
-			Kirgizanci
-			Dan Kabilar Latin
-			Lingala
-			Laothian
-			Lituweniyanci
-			Latbiyanci
-			Dan Masedoniya
-			Kabilar Maleyalam
-			Mongolian
-			Kʼabilan Marathi
-			Harshen Malai
-			Harshen Maltis
-			Burmanci
-			Nepali
-			Holanci
-			Yaren Kasar Norway
-			Yaren mutanen Norway
-			Ositanci
-			Oriyanci
-			Punjabi
-			Harshen Polan
-			Pashtanci
-			Harshen Fotugis
-			Fotugis Kasashen Birazil
 			Fotugis kasashen Turai
-			Romaniyanci
-			Rashanci
-			Kiniyaruwanda
-			sanskrit
-			Sindiyanci
-			Kuroweshiyancin-Sabiya
-			Sinhalanci
-			Basulake
-			Basulabe
-			Somali
-			Dʼan/Ƴar Kabilar Albaniya
-			Sabiyan
-			Sesotanci
-			Sundanese
-			Harshen Suwedan
-			Harshen Suwahili
-			Tamil
-			Dʼan/Ƴar Kabilar Telug
-			Thai
-			Tigriyanci
-			Tukmenistanci
-			Klingon
-			Harshen Turkiyya
-			Tiwiniyanci
-			Ugiranci
-			Harshen Yukuren
-			Harshen da ba a sani ba
-			Harshen Urdu
-			Uzbek
-			Harshen Biyetinam
-			Bazosa
-			Yarbanci
-			Harshen Sinanci
+			Dʼan/Ƴar Kabilar Telug
 			Sauƙaƙaƙƙen Sinanci
 			Sinanci na gargajiya
-			Harshen Zulu
 		
-		
-			
-			
-			
-			
-			
-			
-			
-			
-			
-		
-		
-			Andora
-			Haɗaɗɗiyar Daular Larabawa
-			Afaganistan
-			Antigwa da Barbuba
-			Angila
-			Albaniya
-			Armeniya
-			Angola
-			Arjantiniya
-			Samowa Ta Amurka
-			Ostiriya
-			Ostareliya
-			Aruba
-			Azarbaijan
-			Bosniya Harzagobina
-			Barbadas
-			Bangiladas
-			Belgiyom
-			Burkina Faso
-			Bulgariya
-			Baharan
-			Burundi
-			Binin
-			Barmuda
-			Burune
-			Bolibiya
-			Birazil
-			Bahamas
-			Butan
-			Baswana
-			Belarus
-			Beliz
-			Kanada
-			Jamhuriyar Dimokuraɗiyyar Kongo
-			Jamhuriyar Afirka Ta Tsakiya
-			Kongo
-			Suwizalan
-			Aibari Kwas
-			Tsibiran Kuku
-			Cayile
-			Kamaru
-			Caina, Sin
-			Kolambiya
-			Kwasta Rika
-			Kyuba
-			Tsibiran Kap Barde
-			Sifurus
-			Jamhuriyar Cak
-			Jamus
-			Jibuti
-			Danmark
-			Dominika
-			Jamhuriyar Dominika
-			Aljeriya
-			Ekwador
-			Estoniya
-			Misira
-			Eritireya
-			Sipen
-			Habasha
-			Finlan
-			Fiji
-			Tsibiran Falkilan
-			Mikuronesiya
-			Faransa
-			Gabon
-			Biritaniya
-			Girnada
-			Jiwarjiya
-			Gini Ta Faransa
-			Gana
-			Jibaraltar
-			Grinlan
-			Gambiya
-			Gini
-			Gwadaluf
-			Gini Ta Ikwaita
-			Girka
-			Gwatamala
-			Gwam
-			Gini Bisau
-			Guyana
-			Honduras
-			Kurowaishiya
-			Haiti
-			Hungari
-			Indunusiya
-			Ayalan
-			Iziraʼila
-			Indiya
-			Yankin Birtaniya Na Tekun Indiya
-			Iraƙi
-			Iran
-			Aisalan
-			Italiya
-			Jamaika
-			Jordan
-			Jàpân
-			Kenya
-			Kirgizistan
-			Kambodiya
-			Kiribati
-			Kwamoras
-			San Kiti Da Nebis
-			Koreya Ta Arewa
-			Koreya Ta Kudu
-			Kwiyat
-			Tsibiran Kaiman
-			Kazakistan
-			Lawas
-			Labanan
-			San Lusiya
-			Licansitan
-			Siri Lanka
-			Laberiya
-			Lesoto
-			Lituweniya
-			Lukusambur
-			latibiya
-			Libiya
-			Maroko
-			Monako
-			Maldoba
-			Madagaskar
-			Tsibiran Marshal
-			Masedoniya
-			Mali
-			Burma, Miyamar
-			Mangoliya
-			Tsibiran Mariyana Na Arewa
-			Martinik
-			Moritaniya
-			Manserati
-			Malta
-			Moritus
-			Maldibi
-			Malawi
-			Makasiko
-			Malaisiya
-			Mozambik
-			Namibiya
-			Kaledoniya Sabuwa
-			Nijar
-			Tsibirin Narfalk
-			Najeriya
-			Nikaraguwa
-			Holan
-			Norwe
-			Nefal
-			Nauru
-			Niyu
-			Nuzilan
-			Oman
-			Panama
-			Peru
-			Folinesiya Ta Faransa
-			Papuwa Nugini
-			Filipin
-			Pakistan
-			Polan
-			San Piyar Da Mikelan
-			Pitakarin
-			Porto Riko
-			Palasɗinu
-			Portugal
-			Palau
-			Paragai
-			Kwatar
-			Rawuniyan
-			Romaniya
-			Rasha
-			Ruwanda
-			Ƙasar Makka
-			Tsibiran Salaman
-			Saishal
-			Sudan
-			Suwedan
-			Singapur
-			San Helena
-			Sulobeniya
-			Sulobakiya
-			Salewo
-			San Marino
-			Sinigal
-			Somaliya
-			Suriname
-			Sawo Tome Da Paransip
-			El Salbador
-			Sham, Siriya
-			Suwazilan
-			Turkis Da Tsibiran Kaikwas
-			Cadi
-			Togo
-			Tailan
-			Tajikistan
-			Takelau
-			Timor Ta Gabas
-			Turkumenistan
-			Tunisiya
-			Tanga
-			Turkiyya
-			Tirinidad Da Tobago
-			Tubalu
-			Taiwan
-			Tanzaniya
-			Yukaran
-			Yuganda
-			Amirka
-			Yurugai
-			Uzubekistan
-			Batikan
-			San Binsan Da Girnadin
-			Benezuwela
-			Tsibirin Birjin Na Birtaniya
-			Tsibiran Birjin Ta Amurka
-			Biyetinam
-			Banuwatu
-			Walis Da Futuna
-			Samowa
-			Yamal
-			Mayoti
-			Afirka Ta Kudu
-			Zambiya
-			Zimbabuwe
-			Yanki da ba a sani ba
-		
-		
-			Gregorian Kalanda
-			Daidai ta ce Kasà
-			Lambobi na larabawan a gabas
-			Lambobi na yammacin
-		
-		
-			Tsarin awo
-			Tsarin awo kasar Ingila
-			Tsarin awo kasar Amirka
-		
-		
-			Harshe: {0}
-			Rubutu: {0}
-			Yanki/Sashe: {0}
-		
 	
 	
-		[a b ɓ c d ɗ e f g h i j k ƙ l m n o r s {sh} t {ts} u w y ƴ z ʼ]
 		[á à â é è ê í ì î ó ò ô p q {r\u0303} ú ù û v x {ʼy}]
 		[A B Ɓ C D Ɗ E F G H I J K Ƙ L M N O P Q R S T U V W X Y Ƴ Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \} ′ ″]
 	
-	
-		“
-		”
-		‘
-		’
-	
-	
-		
-			
-				
-					
-						
-							EEEE, d MMMM, y G
-						
-					
-					
-						
-							d MMMM, y G
-						
-					
-					
-						
-							d MMM, y G
-						
-					
-					
-						
-							d/M/yy GGGGG
-						
-					
-				
-				
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						d, E
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
-						G y
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
-						L
-						M/d
-						E, M/d
-						LLL
-						MMM d
-						E, MMM d
-						MMMM d
-						E, MMMM d
-						mm:ss
-						y
-						M/y
-						E, M/d/y
-						MMM y
-						E, MMM d, y
-						MMMM y
-						QQQ y
-						QQQQ y
-						G y
-						GGGGG y-MM
-						GGGGG y-MM-dd
-						GGGGG y-MM-dd, E
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						G y MMMM
-						G y QQQ
-						G y QQQQ
-					
-					
-						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
-						
-							d–d
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-						
-							MM–MM
-						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
-						
-							MM-dd, E – MM-dd, E
-							MM-dd, E – MM-dd, E
-						
-						
-							LLL–LLL
-						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
-						
-							G y–y
-						
-						
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-						
-							G y MMMM–MMMM
-							G y MMMM – y MMMM
-						
-					
-				
-			
-			
-				
-					
-						
-							Jan
-							Fab
-							Mar
-							Afi
-							May
-							Yun
-							Yul
-							Agu
-							Sat
-							Okt
-							Nuw
-							Dis
-						
-						
-							J
-							F
-							M
-							A
-							M
-							Y
-							Y
-							A
-							S
-							O
-							N
-							D
-						
-						
-							Janairu
-							Faburairu
-							Maris
-							Afirilu
-							Mayu
-							Yuni
-							Yuli
-							Agusta
-							Satumba
-							Oktoba
-							Nuwamba
-							Disamba
-						
-					
-					
-						
-							Jan
-							Fab
-							Mar
-							Afi
-							May
-							Yun
-							Yul
-							Agu
-							Sat
-							Okt
-							Nuw
-							Dis
-						
-						
-							J
-							F
-							M
-							A
-							M
-							Y
-							Y
-							A
-							S
-							O
-							N
-							D
-						
-						
-							Janairu
-							Faburairu
-							Maris
-							Afirilu
-							Mayu
-							Yuni
-							Yuli
-							Agusta
-							Satumba
-							Oktoba
-							Nuwamba
-							Disamba
-						
-					
-				
-				
-					
-						
-							Lah
-							Lit
-							Tal
-							Lar
-							Alh
-							Jum
-							Asa
-						
-						
-							L
-							L
-							T
-							L
-							A
-							J
-							A
-						
-						
-							Lh
-							Li
-							Ta
-							Lr
-							Al
-							Ju
-							As
-						
-						
-							Lahadi
-							Litinin
-							Talata
-							Laraba
-							Alhamis
-							Jummaʼa
-							Asabar
-						
-					
-					
-						
-							Lah
-							Lit
-							Tal
-							Lar
-							Alh
-							Jum
-							Asa
-						
-						
-							L
-							L
-							T
-							L
-							A
-							J
-							A
-						
-						
-							Lh
-							Li
-							Ta
-							Lr
-							Al
-							Ju
-							As
-						
-						
-							Lahadi
-							Litinin
-							Talata
-							Laraba
-							Alhamis
-							Jummaʼa
-							Asabar
-						
-					
-				
-				
-					
-						
-							K1
-							K2
-							K3
-							K4
-						
-						
-							1
-							2
-							3
-							4
-						
-						
-							Kwata na ɗaya
-							Kwata na biyu
-							Kwata na uku
-							Kwata na huɗu
-						
-					
-					
-						
-							K1
-							K2
-							K3
-							K4
-						
-						
-							1
-							2
-							3
-							4
-						
-						
-							Kwata na ɗaya
-							Kwata na biyu
-							Kwata na uku
-							Kwata na huɗu
-						
-					
-				
-				
-					
-						
-							AM
-							PM
-						
-						
-							AM
-							PM
-						
-						
-							Safiya
-							Yamma
-						
-					
-					
-						
-							AM
-							PM
-						
-						
-							AM
-							PM
-						
-						
-							AM
-							PM
-						
-					
-				
-				
-					
-						Kafin haihuwar annab
-						K.H.Y
-						Bayan haihuwar annab
-						sananne Zamani
-					
-					
-						K.H
-						K.H.Y
-						BHAI
-						B.H.Y
-					
-				
-				
-					
-						
-							EEEE d MMMM, y
-						
-					
-					
-						
-							d MMMM, y
-						
-					
-					
-						
-							d MMM, y
-						
-					
-					
-						
-							d/M/yy
-						
-					
-				
-				
-					
-						
-							HH:mm:ss zzzz
-						
-					
-					
-						
-							HH:mm:ss z
-						
-					
-					
-						
-							HH:mm:ss
-						
-					
-					
-						
-							HH:mm
-						
-					
-				
-				
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						E, d
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
-						G y
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
-						h:mm:ss a v
-						HH:mm:ss v
-						h:mm a v
-						HH:mm v
-						L
-						M/d
-						E, M/d
-						LLL
-						MMM d
-						E, MMM d
-						MMMM d
-						E, MMMM d
-						'week' W 'of' MMMM
-						'week' W 'of' MMMM
-						mm:ss
-						y
-						M/y
-						y-MM-dd
-						E, M/d/y
-						MMM y
-						d MMM, y
-						y MMM d, E
-						MMMM y
-						QQQ y
-						QQQQ y
-						'week' w 'of' Y
-						'week' w 'of' Y
-					
-					
-						{0} {1}
-					
-					
-						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
-						
-							d–d
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-						
-							h a – h a
-							h–h a
-						
-						
-							HH–HH
-						
-						
-							h:mm a – h:mm a
-							h:mm–h:mm a
-							h:mm–h:mm a
-						
-						
-							HH:mm–HH:mm
-							HH:mm–HH:mm
-						
-						
-							h:mm a – h:mm a v
-							h:mm–h:mm a v
-							h:mm–h:mm a v
-						
-						
-							HH:mm–HH:mm v
-							HH:mm–HH:mm v
-						
-						
-							h a – h a v
-							h–h a v
-						
-						
-							HH–HH v
-						
-						
-							MM–MM
-						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
-						
-							E, dd/M – E, dd/M
-							MM-dd, E – MM-dd, E
-						
-						
-							LLL–LLL
-						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
-						
-							y–y
-						
-						
-							MM/y – MM/y
-							MM/y – MM/y
-						
-						
-							dd/MM/y – dd/MM/y
-							dd/MM/y – dd/MM/y
-							y-MM-dd – y-MM-dd
-						
-						
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-						
-						
-							y MMM–MMM
-							y MMM – y MMM
-						
-						
-							y MMM d–d
-							y MMM d – MMM d
-							y MMM d – y MMM d
-						
-						
-							y MMM d, E – MMM d, E
-							y MMM d, E – MMM d, E
-							y MMM d, E – y MMM d, E
-						
-						
-							y MMMM–MMMM
-							y MMMM – y MMMM
-						
-					
-				
-			
-		
-		
-			
-				Zamani
-			
-			
-				Shekara
-			
-			
-				Shekara
-			
-			
-				Shekara
-			
-			
-				Kwata
-			
-			
-				Kwata
-			
-			
-				Kwata
-			
-			
-				Wata
-			
-			
-				Wata
-			
-			
-				Wata
-			
-			
-				Mako
-			
-			
-				Mako
-			
-			
-				Mako
-			
-			
-				Kwana
-				Jiya
-				Yau
-				Gobe
-			
-			
-				Kwana
-				Jiya
-				Yau
-				Gobe
-			
-			
-				Kwana
-				Jiya
-				Yau
-				Gobe
-			
-			
-				Rana mako
-			
-			
-				Lokuttan rana
-			
-			
-				Awa
-			
-			
-				Awa
-			
-			
-				Awa
-			
-			
-				Minti
-			
-			
-				Minti
-			
-			
-				Minti
-			
-			
-				Daƙiƙa
-			
-			
-				Daƙiƙa
-			
-			
-				Daƙiƙa
-			
-			
-				Lokacin yanki
-			
-		
-		
-			+HH:mm;-HH:mm
-			GMT{0}
-			GMT
-			{0} Lokaci
-			{0} Lokaci rana
-			{0} Daidai ta ce lokaci
-			{1} ({0})
-			
-				
-					Hadewa duniya lokaci
-				
-			
-			
-				Birni da ba a sani ba
-			
-			
-				Antigua
-			
-			
-				Anguilla
-			
-			
-				Aruba
-			
-			
-				Barbados
-			
-			
-				St. Barthelemy
-			
-			
-				Bermuda
-			
-			
-				Kralendijk
-			
-			
-				Nassau
-			
-			
-				Belize
-			
-			
-				Dawson
-			
-			
-				Whitehorse
-			
-			
-				Inuvik
-			
-			
-				Vancouver
-			
-			
-				Fort Nelson
-			
-			
-				Dawson Creek
-			
-			
-				Creston
-			
-			
-				Yellowknife
-			
-			
-				Edmonton
-			
-			
-				Swift Current
-			
-			
-				Cambridge Bay
-			
-			
-				Regina
-			
-			
-				Winnipeg
-			
-			
-				Resolute
-			
-			
-				Rainy River
-			
-			
-				Rankin Inlet
-			
-			
-				Atikokan
-			
-			
-				Thunder Bay
-			
-			
-				Nipigon
-			
-			
-				Toronto
-			
-			
-				Iqaluit
-			
-			
-				Pangnirtung
-			
-			
-				Moncton
-			
-			
-				Halifax
-			
-			
-				Goose Bay
-			
-			
-				Glace Bay
-			
-			
-				Blanc-Sablon
-			
-			
-				St. John’s
-			
-			
-				Costa Rica
-			
-			
-				Havana
-			
-			
-				Curacao
-			
-			
-				Dominica
-			
-			
-				Santo Domingo
-			
-			
-				Grenada
-			
-			
-				Thule
-			
-			
-				Nuuk
-			
-			
-				Ittoqqortoormiit
-			
-			
-				Danmarkshavn
-			
-			
-				Guadeloupe
-			
-			
-				Guatemala
-			
-			
-				Tegucigalpa
-			
-			
-				Port-au-Prince
-			
-			
-				Jamaica
-			
-			
-				St. Kitts
-			
-			
-				Cayman
-			
-			
-				St. Lucia
-			
-			
-				Marigot
-			
-			
-				Martinique
-			
-			
-				Montserrat
-			
-			
-				Tijuana
-			
-			
-				Hermosillo
-			
-			
-				Mazatlan
-			
-			
-				Chihuahua
-			
-			
-				Bahia Banderas
-			
-			
-				Ojinaga
-			
-			
-				Monterrey
-			
-			
-				Mexico City
-			
-			
-				Matamoros
-			
-			
-				Merida
-			
-			
-				Cancun
-			
-			
-				Managua
-			
-			
-				Panama
-			
-			
-				Miquelon
-			
-			
-				Puerto Rico
-			
-			
-				El Salvador
-			
-			
-				Lower Prince’s Quarter
-			
-			
-				Grand Turk
-			
-			
-				Port of Spain
-			
-			
-				Adak
-			
-			
-				Nome
-			
-			
-				Anchorage
-			
-			
-				Yakutat
-			
-			
-				Sitka
-			
-			
-				Juneau
-			
-			
-				Metlakatla
-			
-			
-				Los Angeles
-			
-			
-				Boise
-			
-			
-				Phoenix
-			
-			
-				Denver
-			
-			
-				Beulah, North Dakota
-			
-			
-				New Salem, North Dakota
-			
-			
-				Center, North Dakota
-			
-			
-				Chicago
-			
-			
-				Menominee
-			
-			
-				Vincennes, Indiana
-			
-			
-				Petersburg, Indiana
-			
-			
-				Tell City, Indiana
-			
-			
-				Knox, Indiana
-			
-			
-				Winamac, Indiana
-			
-			
-				Marengo, Indiana
-			
-			
-				Indianapolis
-			
-			
-				Louisville
-			
-			
-				Vevay, Indiana
-			
-			
-				Monticello, Kentucky
-			
-			
-				Detroit
-			
-			
-				New York
-			
-			
-				St. Vincent
-			
-			
-				Tortola
-			
-			
-				St. Thomas
-			
-			
-				
-					Lokaci ta Alaska
-					Ida Lokaci ta Alaska
-					Lokaci rana ta Alaska
-				
-			
-			
-				
-					Lokaci dake Amurika arewa ta tsakiyar
-					Ida Lokaci dake Amurika arewa ta tsakiyar
-					Lokaci rana dake Amurika arewa ta tsakiyar
-				
-			
-			
-				
-					Lokaci gabas a arewacin da Amirka
-					Lokaci daidai ta ce a arewacin da Amirka
-					Lokaci rana a arewacin da Amirka
-				
-			
-			
-				
-					Lokaci tsauni a arewacin da Amirka
-					Lokacin daidai ta ce tsauni a arewacin da Amirka
-					Lokaci rana tsauni a arewacin da Amirka
-				
-			
-			
-				
-					Amurika da arewa a lokaci lafiya
-					Ida Amurika da arewa a lokaci lafiya
-					Ida Amurika da arewa a lokaci rana
-				
-			
-			
-				
-					Lokaci da Kanada, Puerto Rico da Virgin Islands
-					Ida Lokaci da Kanada, Puerto Rico da Virgin Islands
-					Lokaci rana da amfani da shi Kanada, Puerto rico da Virgin Islands
-				
-			
-			
-				
-					Lokaci ta Kuba
-					Ida Lokaci ta Kuba
-					Lokaci rana ta Kuba
-				
-			
-			
-				
-					Tsakiyar a lokaci turai
-					Ida Tsakiyar a Lokaci Turai
-					Tsakiyar bazara a lokaci turai
-				
-			
-			
-				
-					Lokaci a turai gabas
-					Ida lokaci a turai gabas
-					Gabas a lokaci turai da bazara
-				
-			
-			
-				
-					Lokaci ta yammacin turai
-					Ida lokaci ta yammacin turai
-					Ida lokaci ta yammacin turai da bazara
-				
-			
-			
-				
-					Lokacin Greenwhich a London
-				
-			
-			
-				
-					Lokaci a gabas ta Greeland
-					Ida Lokaci a gabas ta Greeland
-					Lokaci rana a gabas ta Greeland
-				
-			
-			
-				
-					Lokaci a yammacin ta Greeland
-					Ida Lokaci a yammacin ta Greeland
-					Lokaci rana a yammacin ta Greeland
-				
-			
-			
-				
-					Lokaci ta Hawaii-Aleutian
-					Ida Lokaci ta Hawaii-Aleutian
-					Lokaci rana ta Hawaii-Aleutian
-				
-			
-			
-				
-					Lokaci a arewa da yammacin ta Mesiko
-					Ida Lokaci a arewa da yammacin ta Mesiko
-					Lokaci rana a arewa da yammacin ta Mesiko
-				
-			
-			
-				
-					Lokaci a lafiya ta Mesiko
-					Ida Lokaci a lafiya ta Mesiko
-					Lokaci rana a lafiya ta Mesiko
-				
-			
-			
-				
-					Lokaci ta Newfoundland
-					Ida Lokaci ta Newfoundland
-					Lokaci rana ta Newfoundland
-				
-			
-			
-				
-					Lokaci ta St. Pierre da Miquelon
-					Ida Lokaci ta St. Pierre da Miquelon
-					Lokaci rana ta St. Pierre da Miquelon
-				
-			
-		
-	
-	
-		latn
-		
-			latn
-		
-		
-			.
-			,
-			%
-			+
-			-
-		
-		
-			
-				
-					#,##0.###
-				
-			
-			
-				
-					Dubu 0
-					Dubu 0
-					Dubu 00
-					Dubu 00
-					Dubu 000
-					Dubu 000
-					Miliyan 0
-					Miliyan 0
-					Miliyan 00
-					Miliyan 00
-					Miliyan 000
-					Miliyan 000
-					Biliyan 0
-					Biliyan 0
-					Biliyan 00
-					Biliyan 00
-					Biliyan 000
-					Biliyan 000
-					Triliyan 0
-					Triliyan 0
-					Triliyan 00
-					Triliyan 00
-					Triliyan 000
-					Triliyan 000
-				
-			
-			
-				
-					0D
-					0D
-					00D
-					00D
-					000D
-					000D
-					0M
-					0M
-					00M
-					00M
-					000M
-					000M
-					0B
-					0B
-					00B
-					00B
-					000B
-					000B
-					0T
-					0T
-					00T
-					00T
-					000T
-					000T
-				
-			
-		
-		
-			
-				
-					#E0
-				
-			
-		
-		
-			
-				
-					#,##0%
-				
-			
-		
-		
-			
-				
-					¤ #,##0.00
-				
-			
-			
-				
-					¤ 0D
-					¤ 0D
-					¤ 00D
-					¤ 00D
-					¤ 000K
-					¤ 000D
-					¤ 0M
-					¤ 0M
-					¤ 00M
-					¤ 00M
-					¤ 000M
-					¤ 000M
-					¤0B
-					¤0B
-					¤00B
-					¤00B
-					¤000B
-					¤000B
-					¤0T
-					¤0T
-					¤00T
-					¤00T
-					¤000T
-					¤000T
-				
-			
-			{0} {1}
-			{0} {1}
-		
-		
-			
-				Kuɗin Haɗaɗɗiyar Daular Larabawa
-			
-			
-				Kuɗin Angola
-			
-			
-				Dalar Ostareliya
-			
-			
-				Kuɗin Baharan
-			
-			
-				Kuɗin Burundi
-			
-			
-				Ril Kudin Birazil
-				Ril Kudin Birazil
-				Ril Kudin Birazil
-				R$
-				R$
-			
-			
-				Kuɗin Baswana
-			
-			
-				Dalar Kanada
-			
-			
-				Kuɗin Kongo
-			
-			
-				Kuɗin Suwizalan
-			
-			
-				Yuwan kasar Sin
-				Yuwan kasar Sin
-				Yuwan kasar Sin
-				CN¥
-				¥
-			
-			
-				Kuɗin Tsibiran Kap Barde
-			
-			
-				Kuɗin Jibuti
-			
-			
-				Kuɗin Aljeriya
-			
-			
-				Fam kin Masar
-			
-			
-				Kuɗin Eritireya
-			
-			
-				Kuɗin Habasha
-			
-			
-				Yuro
-				€
-				€
-			
-			
-				Fam na Ingila
-				Fam na Ingila
-				Faman na Ingila
-				£
-				£
-			
-			
-				Cedi
-			
-			
-				Kuɗin Gambiya
-			
-			
-				Kuɗin Gini
-			
-			
-				Kuɗin Indiya
-				₹
-				₹
-			
-			
-				Yen kasar Japan
-				Yen kasar Japan
-				Yen kasar Japan
-				¥
-				¥
-			
-			
-				Sulen Kenya
-			
-			
-				Kuɗin Kwamoras
-			
-			
-				Dalar Laberiya
-			
-			
-				Kuɗin Lesoto
-			
-			
-				Kuɗin Libiya
-			
-			
-				Kuɗin Maroko
-			
-			
-				Kuɗin Madagaskar
-			
-			
-				Kuɗin Moritaniya (1973–2017)
-			
-			
-				Kuɗin Moritaniya
-			
-			
-				Kuɗin Moritus
-			
-			
-				Kuɗin Malawi
-			
-			
-				Kuɗin Mozambik
-			
-			
-				Dalar Namibiya
-			
-			
-				Naira
-				₦
-			
-			
-				Ruble kasar Rasha
-				Ruble kasar Rasha
-				Ruble kasar Rasha
-				RUB
-				₽
-			
-			
-				Kuɗin Ruwanda
-			
-			
-				Riyal
-			
-			
-				Kuɗin Saishal
-			
-			
-				Fam kin Sudan
-			
-			
-				Fam kin San Helena
-			
-			
-				Kuɗin Salewo
-			
-			
-				Sulen Somaliya
-			
-			
-				Kuɗin Sawo Tome da Paransip (1977–2017)
-			
-			
-				Kuɗin Sawo Tome da Paransip
-			
-			
-				Kuɗin Lilangeni
-			
-			
-				Kuɗin Tunisiya
-			
-			
-				Sulen Tanzaniya
-			
-			
-				Sule Yuganda
-			
-			
-				Dalar Amirka
-				Dalar Amirka
-				Dalar Amirka
-				$
-				$
-			
-			
-				Kuɗin Sefa na Afirka Ta Tsakiya
-			
-			
-				Kuɗin Sefa na Afirka Ta Yamma
-			
-			
-				Kudin da ba a sani ba
-				Kudin sashe da ba a sani ba
-				(Kudin da ba a sani ba)
-			
-			
-				Kuɗin Afirka Ta Kudu
-			
-			
-				Kuɗin Zambiya (1968–2012)
-			
-			
-				Kuɗin Zambiya
-			
-			
-				Dalar zimbabuwe
-			
-		
-	
-	
-		
-			h:mm
-		
-		
-			h:mm:ss
-		
-		
-			m:ss
-		
-	
-	
-		
-			{0}, {1}
-			{0}, {1}
-			{0} da {1}
-			{0} da {1}
-		
-	
-	
-		
-			i
-			aʼa:a
-		
-	
 
diff --git a/make/data/cldr/common/main/ha_NG.xml b/make/data/cldr/common/main/ha_NG.xml
index 42b26f852e3..1618f68e7bf 100644
--- a/make/data/cldr/common/main/ha_NG.xml
+++ b/make/data/cldr/common/main/ha_NG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/haw.xml b/make/data/cldr/common/main/haw.xml
index dfad5d4fd4a..58a39c43b57 100644
--- a/make/data/cldr/common/main/haw.xml
+++ b/make/data/cldr/common/main/haw.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -81,7 +81,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ā e ē i ī o ō u ū h k l m n p w ʻ]
 		[b c d f g j q r s t v x y z]
 		[A E I O U B C D F G H J K L M N P Q R S T V W ʻ X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/haw_US.xml b/make/data/cldr/common/main/haw_US.xml
index 5b17496887f..2de20078adf 100644
--- a/make/data/cldr/common/main/haw_US.xml
+++ b/make/data/cldr/common/main/haw_US.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/he.xml b/make/data/cldr/common/main/he.xml
index 8e7a9e6b613..d6b1024ed42 100644
--- a/make/data/cldr/common/main/he.xml
+++ b/make/data/cldr/common/main/he.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -144,7 +144,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			יוונית
 			עילמית
 			אנגלית
-			אנגלית (ארה״ב)
 			אנגלית תיכונה
 			אספרנטו
 			ספרדית
@@ -187,7 +186,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			גותית
 			גרבו
 			יוונית עתיקה
-			גרמנית שוויצרית
+			גרמנית (בשוויץ)
 			גוג׳ארטי
 			גוסי
 			מאנית
@@ -203,7 +202,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			המונג
 			הירי מוטו
 			קרואטית
-			סורבית גבוהה
+			סורבית עילית
 			סינית שיאנג
 			קריאולית (האיטי)
 			הונגרית
@@ -482,7 +481,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			טורקמנית
 			טוקלאו
 			טאגאלוג
-			קלינגון
+			קלינגונית
 			טלינגיט
 			טמאשק
 			סוואנה
@@ -511,7 +510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			אוזבקית
 			וואי
 			וונדה
-			ויאטנמית
+			וייטנאמית
 			‏וולאפיק
 			ווטיק
 			וונג׳ו
@@ -533,14 +532,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			יידיש
 			יורובה
 			קנטונזית
+			סינית, קנטונזית
 			זואנג
 			זאפוטק
 			בליסימבולס
 			זנאגה
 			תמזיע׳ת מרוקאית תקנית
 			סינית
+			סינית, מנדרינית
 			סינית פשוטה
+			סינית מנדרינית פשוטה
 			סינית מסורתית
+			סינית מנדרינית מסורתית
 			זולו
 			זוני
 			ללא תוכן לשוני
@@ -568,7 +571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -588,14 +591,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -916,8 +919,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ונואטו
 			איי ווליס ופוטונה
 			סמואה
-			XA
-			XB
+			מבטאים חלקיים
+			דו-כיווני חלקי
 			קוסובו
 			תימן
 			מאיוט
@@ -941,20 +944,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			תבנית מטבע
 			התעלם מסמלים במיון
 			מיון לפי הטעמות בסדר הפוך
-			סידור לפי אותיות רישיות/קטנות
-			מיון תלוי רישיות
+			סידור לפי אותיות רישיות/קטנות
+			מיון תלוי רישיות
 			סדר מיון
-			מיון מנורמל
-			מיון לפי מספרים
-			עוצמת המיון
+			מיון מנורמל
+			מיון לפי מספרים
+			עוצמת המיון
 			מטבע
 			מחזור השעות (12 או 24)
 			סגנון מעבר שורה
 			מערכת מדידה
 			מספרים
-			אזור זמן
-			משתנה אזור
-			שימוש פרטי
+			אזור זמן
+			משתנה אזור
+			שימוש פרטי
 		
 		
 			לוח השנה הבודהיסטי
@@ -974,7 +977,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			לוח שנה ISO-8601
 			לוח השנה היפני
 			לוח השנה הפרסי
-			לוח השנה הטאיווני
+			לוח השנה הטייוואני
 			תבנית מטבע למטרות חשבונאות
 			תבנית מטבע רגילה
 			מיין סמלים
@@ -1087,8 +1090,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[א ב ג ד ה ו ז ח ט י כ ך ל מ ם נ ן ס ע פ ף צ ץ ק ר ש ת]
 		[\u05BD\u05C4\u200E\u200F \u05B0 \u05B1 \u05B2 \u05B3 \u05B4 \u05B5 \u05B6 \u05B7 \u05B8 \u05B9 \u05BB \u05C2 \u05C1 \u05BC \u05BF ״]
 		[א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת]
-		[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . ׳ ' " ( ) \[ \] / ״ ־]
+		[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . ׳ ' " ( ) \[ \] / ״ ־]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1102,13 +1105,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1134,6 +1132,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						הספירה הבודהיסטית
 					
+					
+						BE
+					
+					
+						BE
+					
 				
 			
 			
@@ -1154,6 +1158,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							מסרה
 							נאסי
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							טאוט
 							בבה
@@ -1186,6 +1205,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							מסרה
 							נאסי
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							טאוט
 							בבה
@@ -1208,6 +1242,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						עידן 0
 						עידן 1
 					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
 				
 			
 			
@@ -1228,6 +1270,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							נהסה
 							פגומן
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							מסקרם
 							טקמת
@@ -1260,6 +1317,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							נהסה
 							פגומן
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							מסקרם
 							טקמת
@@ -1282,6 +1354,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						עידן 0
 						עידן 1
 					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
 				
 			
 			
@@ -1374,55 +1454,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							y G – y G
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							d.M.y – d.M.y GGGGG
+							d.M.y – d.M.y GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y GGGGG – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
+							E, d.M.y – E, d.M.y GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d – d בMMM y G
+							d בMMM y G – d בMMM y G
+							d בMMM – d בMMM y G
+							d בMMM y – d בMMM y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E, d בMMM – E, d בMMM y G
+							E, d בMMM y G – E, d בMMM y G
+							E, d בMMM – E, d בMMM y G
+							E, d בMMM y – E, d בMMM y G
 						
 						
 							h a – h a
@@ -1536,6 +1599,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							נוב׳
 							דצמ׳
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ינואר
 							פברואר
@@ -2182,6 +2259,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						AM
 					
+					
+						AM
+					
 				
 				
 					
@@ -2324,6 +2404,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							מאגהה
 							פלגונה
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							צ׳ייטרה
 							וייסקהה
@@ -2354,6 +2448,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							מאגהה
 							פלגונה
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							צ׳ייטרה
 							וייסקהה
@@ -2564,6 +2672,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							בהמן
 							אספנד
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							פרורדין
 							ארדיבהשת
@@ -2594,6 +2716,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							בהמן
 							אספנד
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							פרורדין
 							ארדיבהשת
@@ -2614,6 +2750,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						הספירה הפרסית
 					
+					
+						AP
+					
+					
+						AP
+					
 				
 			
 			
@@ -2624,9 +2766,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						לפני R.O.C
+						R.O.C.
 					
 					
 						לפני R.O.C
+						R.O.C.
 					
 				
 			
@@ -3230,7 +3374,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				יום ו׳ שעבר
 				יום ו׳
-				ביום ו׳ הבא
+				יום ו׳ הבא
 				
 					בעוד יום שישי {0}
 					בעוד {0} ימי שישי
@@ -3460,7 +3604,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				אזור
+				אזור זמן
 			
 			
 				אזור
@@ -3525,7 +3669,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				טרול
 			
 			
-				סיוואה
+				סייווה
 			
 			
 				מוסון
@@ -4155,7 +4299,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אקטובה
 			
 			
-				קוסטנאי
+				קוסטנאי
 			
 			
 				קיזילורדה
@@ -4164,7 +4308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אלמאטי
 			
 			
-				האנוי
+				ויינטיאן
 			
 			
 				ביירות
@@ -4233,7 +4377,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				חובד
 			
 			
-				אולאאנבטאר
+				אולאן באטור
 			
 			
 				צ׳ויבלסן
@@ -4941,9 +5085,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					שעון אזרבייג׳אן
-					שעון אזרבייג׳אן (חורף)
-					שעון אזרבייג׳אן (קיץ)
+					שעון אזרבייג׳ן
+					שעון אזרבייג׳ן (חורף)
+					שעון אזרבייג׳ן (קיץ)
 				
 			
 			
@@ -5385,9 +5529,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					שעון אולן בטור
-					שעון אולן בטור (חורף)
-					שעון אולן בטור (קיץ)
+					שעון אולאן באטור
+					שעון אולאן באטור (חורף)
+					שעון אולאן באטור (קיץ)
 				
 			
 			
@@ -5720,11 +5864,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
+			latn
 			hebr
 		
 		1
+		
+			∞
+		
+		
+			%
+			‰
+			∞
+		
 		
+			.
+			,
+			;
 			%
 			‎+
 			‎-
@@ -5736,6 +5893,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					‏0 אלף
@@ -5931,6 +6093,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דירהם של איחוד הנסיכויות הערביות
 				דירהם של איחוד הנסיכויות הערביות
 				דירהם של איחוד הנסיכויות הערביות
+				AED
 			
 			
 				אפגני אפגני
@@ -5938,6 +6101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אפגני אפגני
 				אפגני אפגני
 				אפגני אפגני
+				AFN
 			
 			
 				לק אלבני
@@ -5945,6 +6109,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לק אלבני
 				לק אלבני
 				לק אלבני
+				ALL
 			
 			
 				דראם ארמני
@@ -5952,6 +6117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דראם ארמני
 				דראם ארמני
 				דראם ארמני
+				AMD
 			
 			
 				גילדר של האנטילים ההולנדיים
@@ -5959,6 +6125,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				גילדר של האנטילים ההולנדיים
 				גילדר של האנטילים ההולנדיים
 				גילדר של האנטילים ההולנדיים
+				ANG
 			
 			
 				קואנזה אנגולי
@@ -5966,6 +6133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קואנזה אנגולי
 				קואנזה אנגולי
 				קואנזה אנגולי
+				AOA
 				Kz
 			
 			
@@ -5983,6 +6151,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פסו ארגנטינאי
 				פסו ארגנטינאי
 				פסו ארגנטינאי
+				ARS
 				$
 			
 			
@@ -5994,6 +6163,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר אוסטרלי
 				דולר אוסטרלי
 				דולר אוסטרלי
+				A$
 				$
 			
 			
@@ -6002,6 +6172,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פלורין של ארובה
 				פלורין של ארובה
 				פלורין של ארובה
+				AWG
 			
 			
 				מנאט אזרביג׳אני (1993–2006)
@@ -6012,6 +6183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				מאנאט אזרבייג׳ני
 				מאנאט אזרבייג׳ני
 				מאנאט אזרבייג׳ני
+				AZN
 			
 			
 				דינר של בוסניה־הרצגובינה
@@ -6022,6 +6194,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				מארק סחיר של בוסניה והרצגובינה
 				מארק סחיר של בוסניה והרצגובינה
 				מארק סחיר של בוסניה והרצגובינה
+				BAM
 				KM
 			
 			
@@ -6030,6 +6203,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר ברבדיאני
 				דולר ברבדיאני
 				דולר ברבדיאני
+				BBD
 				$
 			
 			
@@ -6038,6 +6212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				טאקה בנגלדשי
 				טאקה בנגלדשי
 				טאקה בנגלדשי
+				BDT
 				৳
 			
 			
@@ -6055,6 +6230,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לב בולגרי
 				לב בולגרי
 				לב בולגרי
+				BGN
 			
 			
 				דינר בחרייני
@@ -6062,6 +6238,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר בחרייני
 				דינר בחרייני
 				דינר בחרייני
+				BHD
 			
 			
 				פרנק בורונדי
@@ -6069,6 +6246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק בורונדי
 				פרנק בורונדי
 				פרנק בורונדי
+				BIF
 			
 			
 				דולר ברמודה
@@ -6076,6 +6254,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר ברמודה
 				דולר ברמודה
 				דולר ברמודה
+				BMD
 				$
 			
 			
@@ -6084,6 +6263,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר ברוניי
 				דולר ברוניי
 				דולר ברוניי
+				BND
 				$
 			
 			
@@ -6092,6 +6272,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				בוליביאנו
 				בוליביאנו
 				בוליביאנו
+				BOB
 				Bs
 			
 			
@@ -6109,6 +6290,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריאל ברזילאי
 				ריאל ברזילאי
 				ריאל ברזילאי
+				R$
 				R$
 			
 			
@@ -6117,6 +6299,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר בהאמי
 				דולר בהאמי
 				דולר בהאמי
+				BSD
 				$
 			
 			
@@ -6125,6 +6308,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				נגולטרום בהוטני
 				נגולטרום בהוטני
 				נגולטרום בהוטני
+				BTN
 			
 			
 				פולה בוטסואני
@@ -6132,6 +6316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פולה בוטסואני
 				פולה בוטסואני
 				פולה בוטסואני
+				BWP
 				P
 			
 			
@@ -6140,7 +6325,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רובל בלרוסי
 				רובל בלרוסי
 				רובל בלרוסי
-				р.
+				BYN
+				р
 			
 			
 				רובל בלרוסי (2000–2016)
@@ -6148,6 +6334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רובל בלרוסי (2000–2016)
 				רובל בלרוסי (2000–2016)
 				רובל בלרוסי (2000–2016)
+				BYR
 			
 			
 				דולר בליזי
@@ -6155,6 +6342,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר בליזי
 				דולר בליזי
 				דולר בליזי
+				BZD
 				$
 			
 			
@@ -6163,6 +6351,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר קנדי
 				דולר קנדי
 				דולר קנדי
+				CA$
 				$
 			
 			
@@ -6171,6 +6360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק קונגולזי
 				פרנק קונגולזי
 				פרנק קונגולזי
+				CDF
 			
 			
 				פרנק שוויצרי
@@ -6178,6 +6368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק שוויצרי
 				פרנק שוויצרי
 				פרנק שוויצרי
+				CHF
 			
 			
 				פסו צ׳ילאני
@@ -6185,6 +6376,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פסו צ׳ילאני
 				פסו צ׳ילאני
 				פסו צ׳ילאני
+				CLP
 				$
 			
 			
@@ -6210,6 +6402,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פסו קולומביאני
 				פסו קולומביאני
 				פסו קולומביאני
+				COP
 				$
 			
 			
@@ -6218,6 +6411,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קולון קוסטה־ריקני
 				קולון קוסטה־ריקני
 				קולון קוסטה־ריקני
+				CRC
 				₡
 			
 			
@@ -6229,6 +6423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פזו קובני להמרה
 				פזו קובני להמרה
 				פזו קובני להמרה
+				CUC
 				$
 			
 			
@@ -6237,6 +6432,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פזו קובני
 				פזו קובני
 				פזו קובני
+				CUP
 				$
 			
 			
@@ -6245,6 +6441,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אסקודו כף ורדה
 				אסקודו כף ורדה
 				אסקודו כף ורדה
+				CVE
 			
 			
 				לירה קפריסאית
@@ -6255,6 +6452,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קורונה צ׳כית
 				קורונה צ׳כית
 				קורונה צ׳כית
+				CZK
 				Kč
 			
 			
@@ -6269,6 +6467,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק ג׳יבוטי
 				פרנק ג׳יבוטי
 				פרנק ג׳יבוטי
+				DJF
 			
 			
 				כתר דני
@@ -6276,6 +6475,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				כתר דני
 				כתר דני
 				כתר דני
+				DKK
 				kr
 			
 			
@@ -6284,6 +6484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פזו דומיניקני
 				פזו דומיניקני
 				פזו דומיניקני
+				DOP
 				$
 			
 			
@@ -6292,6 +6493,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר אלג׳ירי
 				דינר אלג׳ירי
 				דינר אלג׳ירי
+				DZD
 			
 			
 				סוקר אקואדורי
@@ -6305,6 +6507,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה מצרית
 				לירה מצרית
 				לירה מצרית
+				EGP
 				E£
 			
 			
@@ -6313,6 +6516,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				נאקפה אריתראי
 				נאקפה אריתראי
 				נאקפה אריתראי
+				ERN
 			
 			
 				פזטה [ESA]
@@ -6329,6 +6533,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ביר אתיופי
 				ביר אתיופי
 				ביר אתיופי
+				ETB
 			
 			
 				אירו
@@ -6336,6 +6541,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אירו
 				אירו
 				אירו
+				€
 				€
 			
 			
@@ -6347,6 +6553,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר פיג׳י
 				דולר פיג׳י
 				דולר פיג׳י
+				FJD
 				$
 			
 			
@@ -6355,6 +6562,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה של איי פוקלנד
 				לירה של איי פוקלנד
 				לירה של איי פוקלנד
+				FKP
 				£
 			
 			
@@ -6366,6 +6574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה שטרלינג
 				לירה שטרלינג
 				לירה שטרלינג
+				£
 				£
 			
 			
@@ -6374,6 +6583,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לארי גאורגי
 				לארי גאורגי
 				לארי גאורגי
+				GEL
 				₾
 				₾
 			
@@ -6383,6 +6593,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				סדי גאני
 				סדי גאני
 				סדי גאני
+				GHS
 			
 			
 				פאונד גיברלטר
@@ -6390,6 +6601,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פאונד גיברלטר
 				פאונד גיברלטר
 				פאונד גיברלטר
+				GIP
 				£
 			
 			
@@ -6398,6 +6610,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דלסי גמבי
 				דלסי גמבי
 				דלסי גמבי
+				GMD
 			
 			
 				פרנק גינאי
@@ -6405,6 +6618,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק גינאי
 				פרנק גינאי
 				פרנק גינאי
+				GNF
 				FG
 			
 			
@@ -6416,6 +6630,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קצאל גואטמלי
 				קצאל גואטמלי
 				קצאל גואטמלי
+				GTQ
 				Q
 			
 			
@@ -6427,6 +6642,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר גיאני
 				דולר גיאני
 				דולר גיאני
+				GYD
 				$
 			
 			
@@ -6435,6 +6651,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר הונג קונגי
 				דולר הונג קונגי
 				דולר הונג קונגי
+				HK$
 				$
 			
 			
@@ -6443,6 +6660,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				למפירה הונדורי
 				למפירה הונדורי
 				למפירה הונדורי
+				HNL
 				L
 			
 			
@@ -6451,6 +6669,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קונה קרואטי
 				קונה קרואטי
 				קונה קרואטי
+				HRK
 				kn
 			
 			
@@ -6459,6 +6678,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				גורד האיטי
 				גורד האיטי
 				גורד האיטי
+				HTG
 			
 			
 				פורינט הונגרי
@@ -6466,6 +6686,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פורינט הונגרי
 				פורינט הונגרי
 				פורינט הונגרי
+				HUF
 				Ft
 			
 			
@@ -6474,6 +6695,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופיה אינדונזית
 				רופיה אינדונזית
 				רופיה אינדונזית
+				IDR
 				Rp
 			
 			
@@ -6489,6 +6711,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				שקלים חדשים
 				שקלים חדשים
 				שקלים חדשים
+				₪
 				₪
 			
 			
@@ -6497,6 +6720,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופי הודי
 				רופי הודי
 				רופי הודי
+				₹
 				₹
 			
 			
@@ -6505,6 +6729,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר עיראקי
 				דינר עיראקי
 				דינר עיראקי
+				IQD
 			
 			
 				ריאל איראני
@@ -6512,6 +6737,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריאל איראני
 				ריאל איראני
 				ריאל איראני
+				IRR
 			
 			
 				כתר איסלנדי
@@ -6519,6 +6745,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				כתר איסלנדי
 				כתר איסלנדי
 				כתר איסלנדי
+				ISK
 				kr
 			
 			
@@ -6530,6 +6757,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר ג׳מייקני
 				דולר ג׳מייקני
 				דולר ג׳מייקני
+				JMD
 				$
 			
 			
@@ -6538,6 +6766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר ירדני
 				דינר ירדני
 				דינר ירדני
+				JOD
 			
 			
 				ין יפני
@@ -6554,6 +6783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				שילינג קנייתי
 				שילינג קנייתי
 				שילינג קנייתי
+				KES
 			
 			
 				סום קירגיזי
@@ -6561,6 +6791,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				סום קירגיזי
 				סום קירגיזי
 				סום קירגיזי
+				KGS
 			
 			
 				ריל קמבודי
@@ -6568,6 +6799,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריל קמבודי
 				ריל קמבודי
 				ריל קמבודי
+				KHR
 				៛
 			
 			
@@ -6576,6 +6808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק קומורואי
 				פרנק קומורואי
 				פרנק קומורואי
+				KMF
 				CF
 			
 			
@@ -6584,6 +6817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				וון צפון קוריאני
 				וון צפון קוריאני
 				וון צפון קוריאני
+				KPW
 				₩
 			
 			
@@ -6592,6 +6826,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				וון דרום קוריאני
 				וון דרום קוריאני
 				וון דרום קוריאני
+				₩
 				₩
 			
 			
@@ -6600,6 +6835,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר כוויתי
 				דינר כוויתי
 				דינר כוויתי
+				KWD
 			
 			
 				דולר קיימני
@@ -6607,6 +6843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר קיימני
 				דולר קיימני
 				דולר קיימני
+				KYD
 				$
 			
 			
@@ -6615,6 +6852,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				טנגה קזחסטני
 				טנגה קזחסטני
 				טנגה קזחסטני
+				KZT
 				₸
 			
 			
@@ -6623,6 +6861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קיפ לאי
 				קיפ לאי
 				קיפ לאי
+				LAK
 				₭
 			
 			
@@ -6631,6 +6870,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה לבנונית
 				לירה לבנונית
 				לירה לבנונית
+				LBP
 				L£
 			
 			
@@ -6639,6 +6879,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופי סרי לנקי
 				רופי סרי לנקי
 				רופי סרי לנקי
+				LKR
 				Rs
 			
 			
@@ -6647,6 +6888,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר ליברי
 				דולר ליברי
 				דולר ליברי
+				LRD
 				$
 			
 			
@@ -6658,12 +6900,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ליטא ליטאי
 				ליטא ליטאי
 				ליטא ליטאי
+				LTL
 			
 			
 				פרנק לוקסמבורגי
 			
 			
 				לט לטבי
+				LVL
 			
 			
 				דינר לובי
@@ -6671,6 +6915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר לובי
 				דינר לובי
 				דינר לובי
+				LYD
 			
 			
 				דירהם מרוקאי
@@ -6678,6 +6923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דירהם מרוקאי
 				דירהם מרוקאי
 				דירהם מרוקאי
+				MAD
 			
 			
 				פרנק מרוקאי
@@ -6688,6 +6934,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לאו מולדובני
 				לאו מולדובני
 				לאו מולדובני
+				MDL
 			
 			
 				אריארי מלגשי
@@ -6695,6 +6942,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אריארי מלגשי
 				אריארי מלגשי
 				אריארי מלגשי
+				MGA
 				Ar
 			
 			
@@ -6706,6 +6954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר מקדוני
 				דינר מקדוני
 				דינר מקדוני
+				MKD
 			
 			
 				קיאט מיאנמרי
@@ -6713,6 +6962,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קיאט מיאנמרי
 				קיאט מיאנמרי
 				קיאט מיאנמרי
+				MMK
 				K
 			
 			
@@ -6721,6 +6971,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				טוגרוג מונגולי
 				טוגרוג מונגולי
 				טוגרוג מונגולי
+				MNT
 				₮
 			
 			
@@ -6729,6 +6980,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פטקה של מקאו
 				פטקה של מקאו
 				פטקה של מקאו
+				MOP
 			
 			
 				אואוגויה מאוריטני (1973–2017)
@@ -6736,6 +6988,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אואוגויה מאוריטני (1973–2017)
 				אואוגויה מאוריטני (1973–2017)
 				אואוגויה מאוריטני (1973–2017)
+				MRO
 			
 			
 				אואוגויה מאוריטני
@@ -6743,6 +6996,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				אואוגויה מאוריטני
 				אואוגויה מאוריטני
 				אואוגויה מאוריטני
+				MRU
 			
 			
 				לירה מלטית
@@ -6753,6 +7007,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופי מאוריציני
 				רופי מאוריציני
 				רופי מאוריציני
+				MUR
 				Rs
 			
 			
@@ -6761,6 +7016,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופיה מלדיבית
 				רופיה מלדיבית
 				רופיה מלדיבית
+				MVR
 			
 			
 				קואצ׳ה מלאווי
@@ -6768,6 +7024,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קואצ׳ה מלאווי
 				קואצ׳ה מלאווי
 				קואצ׳ה מלאווי
+				MWK
 			
 			
 				פזו מקסיקני
@@ -6775,6 +7032,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פזו מקסיקני
 				פזו מקסיקני
 				פזו מקסיקני
+				MX$
 				$
 			
 			
@@ -6786,6 +7044,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רינגיט מלזי
 				רינגיט מלזי
 				רינגיט מלזי
+				MYR
 				RM
 			
 			
@@ -6804,6 +7063,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				מטיקל מוזמביני
 				מטיקל מוזמביני
 				מטיקל מוזמביני
+				MZN
 			
 			
 				דולר נמיבי
@@ -6811,6 +7071,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר נמיבי
 				דולר נמיבי
 				דולר נמיבי
+				NAD
 				$
 			
 			
@@ -6819,6 +7080,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				נאירה ניגרי
 				נאירה ניגרי
 				נאירה ניגרי
+				NGN
 				₦
 			
 			
@@ -6827,6 +7089,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קורדובה ניקרגואה
 				קורדובה ניקרגואה
 				קורדובה ניקרגואה
+				NIO
 				C$
 			
 			
@@ -6838,6 +7101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				כתר נורווגי
 				כתר נורווגי
 				כתר נורווגי
+				NOK
 				kr
 			
 			
@@ -6846,6 +7110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופי נפאלי
 				רופי נפאלי
 				רופי נפאלי
+				NPR
 				Rs
 			
 			
@@ -6854,6 +7119,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר ניו זילנדי
 				דולר ניו זילנדי
 				דולר ניו זילנדי
+				NZ$
 				$
 			
 			
@@ -6862,6 +7128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריאל עומאני
 				ריאל עומאני
 				ריאל עומאני
+				OMR
 			
 			
 				בלבואה פנמי
@@ -6869,6 +7136,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				בלבואה פנמי
 				בלבואה פנמי
 				בלבואה פנמי
+				PAB
 			
 			
 				סול פרואני
@@ -6876,6 +7144,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				סול פרואני
 				סול פרואני
 				סול פרואני
+				PEN
 			
 			
 				קינה של פפואה גינאה החדשה
@@ -6883,6 +7152,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קינה של פפואה גינאה החדשה
 				קינה של פפואה גינאה החדשה
 				קינה של פפואה גינאה החדשה
+				PGK
 			
 			
 				פזו פיליפיני
@@ -6890,6 +7160,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פזו פיליפיני
 				פזו פיליפיני
 				פזו פיליפיני
+				PHP
 				₱
 			
 			
@@ -6898,6 +7169,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופי פקיסטני
 				רופי פקיסטני
 				רופי פקיסטני
+				PKR
 				Rs
 			
 			
@@ -6906,6 +7178,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				זלוטי פולני
 				זלוטי פולני
 				זלוטי פולני
+				PLN
 				zł
 			
 			
@@ -6920,6 +7193,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				גוארני פרגוואי
 				גוארני פרגוואי
 				גוארני פרגוואי
+				PYG
 				₲
 			
 			
@@ -6928,6 +7202,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריאל קטארי
 				ריאל קטארי
 				ריאל קטארי
+				QAR
 			
 			
 				לאו רומני ישן
@@ -6938,6 +7213,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לאו רומני
 				לאו רומני
 				לאו רומני
+				RON
 				lei
 			
 			
@@ -6946,6 +7222,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר סרבי
 				דינר סרבי
 				דינר סרבי
+				RSD
 			
 			
 				רובל רוסי
@@ -6953,6 +7230,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רובל רוסי
 				רובל רוסי
 				רובל רוסי
+				RUB
 				₽
 				₽
 			
@@ -6965,6 +7243,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק רואנדי
 				פרנק רואנדי
 				פרנק רואנדי
+				RWF
 				RF
 			
 			
@@ -6973,6 +7252,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריאל סעודי
 				ריאל סעודי
 				ריאל סעודי
+				SAR
 			
 			
 				דולר איי שלמה
@@ -6980,6 +7260,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר איי שלמה
 				דולר איי שלמה
 				דולר איי שלמה
+				SBD
 				$
 			
 			
@@ -6988,6 +7269,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				רופי סיישלי
 				רופי סיישלי
 				רופי סיישלי
+				SCR
 			
 			
 				דינר סודני
@@ -6998,6 +7280,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה סודנית
 				לירה סודנית
 				לירה סודנית
+				SDG
 			
 			
 				לירה סודנית (1957–1998)
@@ -7017,6 +7300,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר סינגפורי
 				דולר סינגפורי
 				דולר סינגפורי
+				SGD
 				$
 			
 			
@@ -7025,6 +7309,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פאונד סנט הלני
 				פאונד סנט הלני
 				פאונד סנט הלני
+				SHP
 				£
 			
 			
@@ -7039,6 +7324,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ליאון סיירה לאוני
 				ליאון סיירה לאוני
 				ליאון סיירה לאוני
+				SLL
 			
 			
 				שילינג סומלי
@@ -7046,6 +7332,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				שילינג סומלי
 				שילינג סומלי
 				שילינג סומלי
+				SOS
 			
 			
 				דולר סורינאמי
@@ -7053,6 +7340,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר סורינאמי
 				דולר סורינאמי
 				דולר סורינאמי
+				SRD
 				$
 			
 			
@@ -7064,6 +7352,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה דרום-סודנית
 				לירה דרום-סודנית
 				לירה דרום-סודנית
+				SSP
 				£
 			
 			
@@ -7072,14 +7361,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דוברה של סן טומה ופרינסיפה (1977–2017)
 				דוברה של סן טומה ופרינסיפה (1977–2017)
 				דוברה של סן טומה ופרינסיפה (1977–2017)
+				STD
 			
 			
-				דוברה של סן טומה ופרינסיפה
-				דוברה של סן טומה ופרינסיפה
-				דוברה של סן טומה ופרינסיפה
-				דוברה של סן טומה ופרינסיפה
-				דוברה של סן טומה ופרינסיפה
+				דוברה של סאו טומה ופרינסיפה
+				דוברה של סאו טומה ופרינסיפה
+				דוברה של סאו טומה ופרינסיפה
+				דוברה של סאו טומה ופרינסיפה
+				דוברה של סאו טומה ופרינסיפה
 				STN
+				Db
 			
 			
 				רובל סובייטי
@@ -7097,6 +7388,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה סורית
 				לירה סורית
 				לירה סורית
+				SYP
 				£
 			
 			
@@ -7105,6 +7397,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לילנגני סווזילנדי
 				לילנגני סווזילנדי
 				לילנגני סווזילנדי
+				SZL
 			
 			
 				בהט תאילנדי
@@ -7121,6 +7414,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				סומוני טג׳קיסטני
 				סומוני טג׳קיסטני
 				סומוני טג׳קיסטני
+				TJS
 			
 			
 				מנאט טורקמאני
@@ -7131,6 +7425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				מאנאט טורקמני
 				מאנאט טורקמני
 				מאנאט טורקמני
+				TMT
 			
 			
 				דינר טוניסאי
@@ -7138,6 +7433,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דינר טוניסאי
 				דינר טוניסאי
 				דינר טוניסאי
+				TND
 			
 			
 				פאנגה טונגי
@@ -7145,6 +7441,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פאנגה טונגי
 				פאנגה טונגי
 				פאנגה טונגי
+				TOP
 				T$
 			
 			
@@ -7159,6 +7456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				לירה טורקית חדשה
 				לירה טורקית חדשה
 				לירה טורקית חדשה
+				TRY
 				₺
 				TL
 			
@@ -7168,6 +7466,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר טרינידדי
 				דולר טרינידדי
 				דולר טרינידדי
+				TTD
 				$
 			
 			
@@ -7176,6 +7475,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר טייוואני חדש
 				דולר טייוואני חדש
 				דולר טייוואני חדש
+				NT$
 				NT$
 			
 			
@@ -7184,6 +7484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				שילינג טנזני
 				שילינג טנזני
 				שילינג טנזני
+				TZS
 			
 			
 				הריבנה אוקראיני
@@ -7191,6 +7492,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				הריבנה אוקראיני
 				הריבנה אוקראיני
 				הריבנה אוקראיני
+				UAH
 				₴
 			
 			
@@ -7202,6 +7504,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				שילינג אוגנדי
 				שילינג אוגנדי
 				שילינג אוגנדי
+				UGX
 			
 			
 				דולר אמריקאי
@@ -7224,6 +7527,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פסו אורוגוואי
 				פסו אורוגוואי
 				פסו אורוגוואי
+				UYU
 				$
 			
 			
@@ -7232,6 +7536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				סום אוזבקי
 				סום אוזבקי
 				סום אוזבקי
+				UZS
 			
 			
 				בוליבר ונצואלי (1871–2008)
@@ -7242,6 +7547,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				בוליבר ונצואלי (2008–2018)
 				בוליבר ונצואלי (2008–2018)
 				בוליבר ונצואלי (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -7258,6 +7564,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דונג וייטנאמי
 				דונג וייטנאמי
 				דונג וייטנאמי
+				₫
 				₫
 			
 			
@@ -7266,6 +7573,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ואטו של ונואטו
 				ואטו של ונואטו
 				ואטו של ונואטו
+				VUV
 			
 			
 				טאלה סמואי
@@ -7273,6 +7581,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				טאלה סמואי
 				טאלה סמואי
 				טאלה סמואי
+				WST
 			
 			
 				פרנק CFA מרכז אפריקני
@@ -7280,6 +7589,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק CFA מרכז אפריקני
 				פרנק CFA מרכז אפריקני
 				פרנק CFA מרכז אפריקני
+				FCFA
 			
 			
 				כסף
@@ -7293,6 +7603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				דולר מזרח קריבי
 				דולר מזרח קריבי
 				דולר מזרח קריבי
+				EC$
 				$
 			
 			
@@ -7307,6 +7618,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק CFA מערב אפריקני
 				פרנק CFA מערב אפריקני
 				פרנק CFA מערב אפריקני
+				CFA
 			
 			
 				פלדיום
@@ -7317,6 +7629,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				פרנק פולינזיה הצרפתית
 				פרנק פולינזיה הצרפתית
 				פרנק פולינזיה הצרפתית
+				CFPF
 			
 			
 				פלטינה
@@ -7340,6 +7653,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ריאל תימני
 				ריאל תימני
 				ריאל תימני
+				YER
 			
 			
 				דינר יגוסלבי חדש
@@ -7356,6 +7670,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ראנד דרום אפריקאי
 				ראנד דרום אפריקאי
 				ראנד דרום אפריקאי
+				ZAR
 				R
 			
 			
@@ -7367,6 +7682,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				קוואצ׳ה זמבי
 				קוואצ׳ה זמבי
 				קוואצ׳ה זמבי
+				ZMW
 				ZK
 			
 			
@@ -7378,7 +7694,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			~{0}
-			≥{0}+
 			≤{0}
 			{0}–{1}
 		
@@ -7393,7 +7708,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			
-				{0} לכל {1}
+				{0} ל{1}
 			
 			
 				כוח ג׳י
@@ -7632,11 +7947,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ג׳יגה-בייט
 			
 			
-				גיגהביט
-				{0} גיגהביט
-				{0} גיגהביט
-				{0} גיגהביט
-				{0} גיגהביט
+				ג׳יגה-ביט
+				{0} ג'יגה-ביט
+				{0} ג'יגה-ביט
+				{0} ג'יגה-ביט
+				{0} ג'יגה-ביט
 			
 			
 				מגה-בייט
@@ -7687,6 +8002,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} מאות
 				{0} מאות
 			
+			
+				עשורים
+				עשור {0}
+				{0} עשורים
+				{0} עשורים
+				{0} עשורים
+			
 			
 				שנים
 				שנה
@@ -7848,6 +8170,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} יחידות תרמיות בריטיות
 				{0} יחידות תרמיות בריטיות
 			
+			
+				יחידה תרמית בארה״ב
+			
 			
 				ליברת-כוח
 				{0} ליברת-כוח
@@ -7890,6 +8215,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} הרץ
 				{0} הרץ
 			
+			
+				קו מפריד מסוג em
+				‎{0} em ‎
+				‎{0} em ‎
+				‎{0} em ‎
+				‎{0} ems ‎
+			
+			
+				פיקסלים
+				‎{0} px ‎
+				‎{0} px ‎
+				‎{0} px ‎
+				‎{0} px ‎
+			
+			
+				מגה-פיקסל
+				‎{0} MP ‎
+				‎{0} MP ‎
+				‎{0} MP ‎
+				‎{0} MP ‎
+			
+			
+				פיקסלים לסנטימטר
+				‎{0} ppcm‎
+				‎{0} ppcm‎
+				‎{0} ppcm‎
+				‎{0} ppcm‎
+			
+			
+				פיקסלים לאינץ׳
+				{0} פיקסל לאינץ'
+				‎{0} ppi‎
+				‎{0} ppi‎
+				{0} פיקסלים לאינץ'
+			
+			
+				נקודות לסנטימטר
+				נקודה {0} לסנטימטר
+				‎{0} dpcm‎
+				‎{0} dpcm
+				{0} נקודות לסנטימטר
+			
+			
+				נקודות לאינץ׳
+				‎{0} dpi‎
+				‎{0} dpi‎
+				‎{0} dpi‎
+				‎{0} dots per inch‎
+			
 			
 				קילומטרים
 				קילומטר {0}
@@ -8022,11 +8396,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} נקודות
 			
 			
-				רדיוס סולרי
-				{0} רדיוס סולרי
-				{0} R☉
-				{0} R☉
-				{0} R☉
+				רדיוס סולרי
+				{0} רדיוס סולרי
+				{0} רדיוס סולרי
+				{0} רדיוס סולרי
+				{0} רדיוס סולרי
 			
 			
 				לוקס
@@ -8037,10 +8411,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				אנרגיה סולארית ביחידת זמן
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
 			
 			
 				טון מטרי
@@ -8186,13 +8556,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} כוח סוס
 				{0} כוח סוס
 			
-			
-				הקטופסקל
-				הקטופסקל {0}
-				{0} הקטופסקל
-				{0} הקטופסקל
-				{0} הקטופסקל
-			
 			
 				מילימטר כספית
 				מילימטר כספית אחד
@@ -8214,6 +8577,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} אינץ׳ כספית
 				{0} אינץ׳ כספית
 			
+			
+				בר
+				{0} בר
+				{0} בר
+				{0} בר
+				{0} בר
+			
 			
 				מיליבר
 				{0} מיליבר
@@ -8228,6 +8598,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} אטמוספרה
 				{0} אטמוספרות
 			
+			
+				פסקל
+				{0} פסקל
+				{0} פסקל
+				{0} פסקל
+				{0} פסקל
+			
+			
+				הקטופסקל
+				הקטופסקל {0}
+				{0} הקטופסקל
+				{0} הקטופסקל
+				{0} הקטופסקל
+			
 			
 				קילו-פסקל
 				{0} קילו-פסקל
@@ -8511,6 +8895,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				כוח ג׳י
 				{0} G
@@ -8570,10 +8957,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				הקטאר
-				{0} ha
-				{0} ha
-				{0} ha
-				{0} ha
+				‎{0} ha
+				‎{0} ha
+				‎{0} ha
+				‎{0} ha
 			
 			
 				מ״ר
@@ -8593,40 +8980,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				מייל רבוע
-				{0} sq mi
-				{0} sq mi
-				{0} sq mi
-				{0} sq mi
-				{0}/mi²
+				‎{0} sq mi
+				‎{0} sq mi
+				‎{0} sq mi
+				‎{0} sq mi
+				‎{0}/mi²
 			
 			
 				אקר
-				{0} ac
+				‎{0} ac
 				{0} ac
-				{0} ac
-				{0} ac
+				‎{0} ac
+				‎{0} ac
 			
 			
 				yards²
-				{0} yd²
-				{0} yd²
-				{0} yd²
-				{0} yd²
+				‎{0} yd²
+				‎{0} yd²
+				‎{0} yd²
+				‎{0} yd²
 			
 			
 				ft²
-				{0} sq ft
-				{0} sq ft
-				{0} sq ft
-				{0} sq ft
+				‎{0} sq ft
+				‎{0} sq ft
+				‎{0} sq ft
+				‎{0} sq ft
 			
 			
 				in²
-				{0} in²
-				{0} in²
-				{0} in²
-				{0} in²
-				{0}/in²
+				‎{0} in²
+				‎{0} in²
+				‎{0} in²
+				‎{0} in²
+				‎{0}/in²
 			
 			
 				דונם
@@ -8677,20 +9064,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-				{0} mol
-				{0} mol
-			
 			
 				ליטרים/ק״מ
 				{0} ל׳/ק״מ
@@ -8803,6 +9176,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} מאות
 				{0} מאות
 			
+			
+				עשור
+				עשור {0}
+				{0} עשורים
+				{0} עשורים
+				{0} עשורים
+			
 			
 				שנים
 				שנה {0}
@@ -8950,33 +9330,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} קוט״ש
 				{0} קוט״ש
 			
-			
-				eV
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
-			
 			
 				BTU
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -9006,6 +9361,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				‎{0} em ‎
+				‎{0} em ‎
+				‎{0} em ‎
+				‎{0} em ‎
+			
+			
+				‎{0} px ‎
+				‎{0} px ‎
+				‎{0} px ‎
+				‎{0} px ‎
+			
+			
+				‎{0} MP ‎
+				‎{0} MP ‎
+				‎{0} MP ‎
+				‎{0} MP ‎
+			
+			
+				‎{0} ppcm‎
+				‎{0} ppcm‎
+				‎{0} ppcm‎
+				‎{0} ppcm‎
+			
+			
+				‎{0} ppi‎
+				‎{0} ppi‎
+				‎{0} ppi‎
+				‎{0} ppi‎
+			
+			
+				‎{0} dpcm
+				‎{0} dpcm
+				‎{0} dpcm
+				‎{0} dpcm
+			
+			
+				‎{0} dpi‎
+				‎{0} dpi‎
+				‎{0} dpi‎
+				‎{0} dpi‎
+			
 			
 				ק״מ
 				{0} ק״מ
@@ -9016,8 +9413,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				מטרים
-				מ׳
-				שני מ׳
+				{0} מ׳
+				{0} מ׳
 				{0} מ׳
 				{0} מ׳
 				{0}/מ׳
@@ -9031,7 +9428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ס״מ
-				ס"מ {0}
+				{0} ס״מ
 				{0} ס״מ
 				{0} ס״מ
 				{0} ס״מ
@@ -9046,28 +9443,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				µm
-				{0} µm
-				{0} µm
-				{0} µm
-				{0} µm
+				‎{0} µm‎
+				‎{0} µm‎
+				‎{0} µm‎
+				‎{0} µm‎
 			
 			
 				nm
-				{0} nm
-				{0} nm
-				{0} nm
-				{0} nm
+				‎{0} nm
+				‎{0} nm
+				‎{0} nm
+				‎{0} nm
 			
 			
 				פ״מ
 				פ“מ {0}
-				פ“מ {0}
-				פ“מ {0}
-				פ“מ {0}
+				{0} פ"מ
+				{0} פ"מ
+				{0} פ"מ
 			
 			
 				מייל
-				מייל {0}
+				{0} מייל
 				{0} מייל
 				{0} מייל
 				{0} מייל
@@ -9081,26 +9478,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				רגל
-				{0} ft
-				{0} ft
-				{0} ft
-				{0} ft
-				{0}/ft
+				‎{0} ft
+				‎{0} ft
+				‎{0} ft
+				‎{0} ft
+				‎{0}/ft
 			
 			
 				אינץ׳
-				{0} in
-				{0} in
-				{0} in
-				{0} in
-				{0}/in
+				‎{0} in
+				‎{0} in
+				‎{0} in
+				‎{0} in
+				‎{0}/in
 			
 			
 				pc
-				{0} pc
-				{0} pc
-				{0} pc
-				{0} pc
+				‎{0} pc
+				‎{0} pc
+				‎{0} pc
+				‎{0} pc
 			
 			
 				שנות אור
@@ -9111,10 +9508,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				au
-				{0} au
-				{0} au
-				{0} au
-				{0} au
+				‎{0} au
+				‎{0} au
+				‎{0} au
+				‎{0} au
 			
 			
 				מ״י
@@ -9138,11 +9535,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} נק'
 			
 			
-				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
+				‎{0} R☉‎
+				‎{0} R☉‎
+				‎{0} R☉‎
+				‎{0} R☉‎
 			
 			
 				lux
@@ -9151,13 +9547,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -9239,27 +9628,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 				{0} CD
 			
-			
-				Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -9302,13 +9670,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} כ״ס
 				{0} כ״ס
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -9330,6 +9691,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				בר
+				{0} בר
+				{0} בר
+				{0} בר
+				{0} בר
+			
 			
 				mbar
 				{0} mbar
@@ -9344,19 +9712,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				קמ״ש
@@ -9414,20 +9775,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				קמ״ק
 				קמ״ק {0}
@@ -9437,10 +9784,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				m³
-				{0} m³
-				{0} m³
-				{0} m³
-				{0} m³
+				‎{0} m³
+				‎{0} m³
+				‎{0} m³
+				‎{0} m³
 				{0}/m³
 			
 			
@@ -9453,45 +9800,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mi³
-				{0} mi³
-				{0} mi³
-				{0} mi³
-				{0} mi³
+				‎{0} mi³
+				‎{0} mi³
+				‎{0} mi³
+				‎{0} mi³
 			
 			
 				yd³
-				{0} yd³
-				{0} yd³
-				{0} yd³
-				{0} yd³
+				‎{0} yd³
+				‎{0} yd³
+				‎{0} yd³
+				‎{0} yd³
 			
 			
 				feet³
-				{0} ft³
-				{0} ft³
-				{0} ft³
-				{0} ft³
+				‎{0} ft³
+				‎{0} ft³
+				‎{0} ft³
+				‎{0} ft³
 			
 			
 				in³
-				{0} in³
-				{0} in³
-				{0} in³
-				{0} in³
+				‎{0} in³
+				‎{0} in³
+				‎{0} in³
+				‎{0} in³
 			
 			
 				ML
-				{0} ML
-				{0} ML
-				{0} ML
-				{0} ML
+				‎{0} ML
+				‎{0} ML
+				‎{0} ML
+				‎{0} ML
 			
 			
 				hL
-				{0} hL
-				{0} hL
-				{0} hL
-				{0} hL
+				‎{0} hL
+				‎{0} hL
+				‎{0} hL
+				‎{0} hL
 			
 			
 				ליטר
@@ -9510,10 +9857,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				cL
-				{0} cL
-				{0} cL
-				{0} cL
-				{0} cL
+				‎{0} cL
+				‎{0} cL
+				‎{0} cL
+				‎{0} cL
 			
 			
 				מ״ל
@@ -9524,24 +9871,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mpt
-				{0} mpt
-				{0} mpt
-				{0} mpt
-				{0} mpt
+				‎{0} mpt
+				‎{0} mpt
+				‎{0} mpt
+				‎{0} mpt
 			
 			
 				mcup
-				{0} mc
-				{0} mc
-				{0} mc
-				{0} mc
+				‎{0} mc
+				‎{0} mc
+				‎{0} mc
+				‎{0} mc
 			
 			
 				ac ft
-				{0} ac ft
-				{0} ac ft
-				{0} ac ft
-				{0} ac ft
+				‎{0} ac ft
+				‎{0} ac ft
+				‎{0} ac ft
+				‎{0} ac ft
 			
 			
 				גלון
@@ -9561,17 +9908,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				qts
-				{0} qt
-				{0} qt
-				{0} qt
-				{0} qt
+				‎{0} qt
+				‎{0} qt
+				‎{0} qt
+				‎{0} qt
 			
 			
 				פינט
-				{0} pt
-				{0} pt
-				{0} pt
-				{0} pt
+				‎{0} pt
+				‎{0} pt
+				‎{0} pt
+				‎{0} pt
 			
 			
 				כוסות
@@ -9582,17 +9929,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				fl oz
-				{0} fl oz
-				{0} fl oz
-				{0} fl oz
-				{0} fl oz
+				‎{0} fl oz
+				‎{0} fl oz
+				‎{0} fl oz
+				‎{0} fl oz
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				‎{0} fl oz Imp.‎
+				‎{0} fl oz Imp.‎
+				‎{0} fl oz Imp.‎
+				‎{0} fl oz Imp.‎
 			
 			
 				כפות
@@ -9609,11 +9955,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} כפי׳
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
+				‎{0} bbl
+				‎{0} bbl
+				‎{0} bbl
+				‎{0} bbl
 			
 			
 				כיוון
@@ -9629,6 +9974,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				כוח ג׳י
+				{0} G
+				{0} G
+				{0} G
+				{0} G
+			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
+				{0} m/s²
+				{0} m/s²
+			
+			
+				{0}°
+				{0}°
+				{0}°
+				{0}°
 			
 			
 				דקה {0}
@@ -9805,6 +10167,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				μsecs
+				{0} μs
+				{0} μs
+				{0} μs
+				{0} μs
+			
+			
+				{0} ns
+				{0} ns
+				{0} ns
+				{0} ns
 			
 			
 				ק״מ
@@ -9816,7 +10188,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				מטר
-				מ' {0}
+				{0} מ׳
 				{0} מ′
 				{0} מ׳
 				{0} מ׳
@@ -9844,6 +10216,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} מ״מ
 				{0} מ״מ
 			
+			
+				µm
+				{0} µm
+				{0} µm
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+				{0} nm
+				{0} nm
+			
 			
 				פ״מ
 				פיקומטר {0}
@@ -9881,6 +10267,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} אינץ׳
 				{0}/אינץ׳
 			
+			
+				pc
+				{0} pc
+				{0} pc
+				{0} pc
+				{0} pc
+			
 			
 				שנות אור
 				שנת אור {0}
@@ -9888,6 +10281,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} שנות אור
 				{0} שנות אור
 			
+			
+				au
+				{0} au
+				{0} au
+				{0} au
+				{0} au
+			
 			
 				מ״י
 				מ״י אחד
@@ -9895,6 +10295,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} מ״י
 				{0} מ״י
 			
+			
+				smi
+				{0} smi
+				{0} smi
+				{0} smi
+				{0} smi
+			
 			
 				נק׳
 				נק׳ {0}
@@ -9902,6 +10309,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} נק׳
 				{0} נק'
 			
+			
+				t
+				{0} t
+				{0} t
+				{0} t
+				{0} t
+			
 			
 				ק״ג
 				{0}kg
@@ -9945,15 +10359,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ליבראות
 				{0} ליבראות
 				{0} ליבראות
+				{0}/lb
 			
 			
+				oz
 				אונקיה {0}
 				{0} אונקיות
 				{0} אונקיות
 				{0} אונקיות
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
+				{0} oz t
+				{0} oz t
+				{0} oz t
 			
 			
 				קרט
+				{0} CD
+				{0} CD
+				{0} CD
+				{0} CD
+			
+			
+				{0} kW
+				{0} kW
+				{0} kW
+				{0} kW
+			
+			
+				{0} W
+				{0} W
+				{0} W
+				{0} W
 			
 			
 				כ״ס {0}
@@ -9961,11 +10401,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} כ״ס
 				{0} כ״ס
 			
-			
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+				{0} psi
+				{0} psi
+				{0} psi
 			
 			
 				in Hg
@@ -9981,6 +10429,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} מיליבר
 				{0} מיליבר
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				קמ״ש
 				{0} קמ״ש
@@ -10002,6 +10457,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mph
 				{0} mph
 			
+			
+				kn
+				{0} kn
+				{0} kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0}°C
@@ -10009,12 +10478,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°C
 				{0}°C
 			
+			
+				°F
+				{0}°F
+				{0}°F
+				{0}°F
+				{0}°F
+			
+			
+				K
+				{0} K
+				{0} K
+				{0} K
+				{0} K
+			
 			
 				{0} קמ״ק
 				{0} קמ״ק
 				{0} קמ״ק
 				{0} קמ״ק
 			
+			
+				{0} mi³
+				{0} mi³
+				{0} mi³
+				{0} mi³
+			
 			
 				ליטר
 				{0} ל׳
@@ -10053,11 +10542,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, או {1}
 			{0} או {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} ו{1}
-			{0} ו{1}
+		
+			{0} או {1}
+		
+		
+			{0} או {1}
 		
 		
 			{0}, {1}
@@ -10114,7 +10603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		ציור תיבה
 		ברייל
 		בניין
-		תבליטים/כוכבים
+		תבליטים או כוכבים
 		ג׳אמו עיצורי
 		סמלי מטבעות
 		קו מפריד/מחבר
@@ -10123,7 +10612,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		סמלי חיזוי עתידות
 		חצים כלפי מטה
 		חצים כלפי מעלה ומטה
-		כתב של מזרח אסיה
+		כתב של שפות מזרח אסיה
 		אמוג׳י
 		כתב של שפות אירופיות
 		אישה
@@ -10134,7 +10623,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		פורמט ורווחים לבנים
 		משתנה ברוחב מלא
 		צורות גאומטריות
-		משתנים מבחינת רוחב
+		משתנה בחצי רוחב
 		תווי האן
 		רדיקלים של האן
 		האנג׳ה
@@ -10173,22 +10662,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		חצים ימינה
 		סימנים סטנדרטיים
 		משתני צורות קטנות
-		חיוך
+		סמלי סמיילי
 		סמיילי או אנשים
 		מערכות כתב דרום אסייתיות
-		מערכות כתב מזרח אסייתיות
+		מערכות כתב דרום מזרח אסיה
 		ריווח
 		ספורט
 		סמלים
 		סמלים טכניים
 		סימנים טונאליים
-		טיול
+		נסיעות
 		נסיעות ומקומות
 		חצים כלפי מעלה
 		חלופות
 		ג׳אמו ווקאלי
 		מזג אוויר
-		מערכות כתב ממערב אסיה
+		מערכות כתב מערב אסיה
 		רווח לבן
 	
 	
diff --git a/make/data/cldr/common/main/he_IL.xml b/make/data/cldr/common/main/he_IL.xml
index 6d1b3035174..565009012ff 100644
--- a/make/data/cldr/common/main/he_IL.xml
+++ b/make/data/cldr/common/main/he_IL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/hi.xml b/make/data/cldr/common/main/hi.xml
index 9cf48df0640..49541035d72 100644
--- a/make/data/cldr/common/main/hi.xml
+++ b/make/data/cldr/common/main/hi.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -82,6 +82,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			कैड्डो
 			कैरिब
 			अत्सम
+			चकमा
 			चेचन
 			सिबुआनो
 			शिगा
@@ -526,14 +527,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			यहूदी
 			योरूबा
 			कैंटोनीज़
+			चीनी, कैंटोनीज़
 			ज़ुआंग
 			ज़ेपोटेक
 			ब्लिसिम्बॉल्स
 			ज़ेनान्गा
 			मानक मोरक्कन तामाज़ाइट
 			चीनी
+			चीनी, मैंडेरिन
 			सरलीकृत चीनी
+			सरलीकृत मैंडेरिन चीनी
 			पारंपरिक चीनी
+			पारंपरिक मैंडेरिन चीनी
 			ज़ुलू
 			ज़ूनी
 			कोई भाषा सामग्री नहीं
@@ -867,8 +872,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			सेंट मार्टिन
 			मेडागास्कर
 			मार्शल द्वीपसमूह
-			मकदूनिया
-			मकदूनिया (FYROM)
+			उत्तरी मकदूनिया
 			माली
 			म्यांमार (बर्मा)
 			मंगोलिया
@@ -941,7 +945,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			सिंट मार्टिन
 			सीरिया
 			स्वाज़ीलैंड
-			स्वाज़िलैंड
+			स्वाज़ीलैंड
 			ट्रिस्टन दा कुना
 			तुर्क और कैकोज़ द्वीपसमूह
 			चाड
@@ -978,6 +982,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			वनुआतू
 			वालिस और फ़्यूचूना
 			समोआ
+			सूडो-एक्सेंट
+			सूडो-बायडायरेक्शनल
 			कोसोवो
 			यमन
 			मायोते
@@ -1001,22 +1007,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			कैलेंडर
 			मुद्रा प्रारूप
-			चिह्न वर्गीकरण पर ध्यान न दें
-			विपरीत उच्‍चारण वर्गीकरण
-			अपरकेस/लोअरकेस क्रमांकन
-			केस संवेदी वर्गीकरण
+			चिह्न वर्गीकरण पर ध्यान न दें
+			विपरीत उच्‍चारण वर्गीकरण
+			अपरकेस/लोअरकेस क्रमांकन
+			केस संवेदी वर्गीकरण
 			सॉर्ट क्रम
-			सामान्यीकृत वर्गीकरण
-			संख्यात्मक वर्गीकरण
-			वर्गीकरण सशक्तता
+			सामान्यीकृत वर्गीकरण
+			संख्यात्मक वर्गीकरण
+			वर्गीकरण सशक्तता
 			मुद्रा
 			घंटों का चक्र (12 बनाम 24)
 			पंक्ति विच्छेद शैली
 			मापन प्रणाली
 			संख्याएँ
-			समय क्षेत्र
-			स्थानीय प्रकार
-			निजी-उपयोग
+			समय क्षेत्र
+			स्थानीय प्रकार
+			निजी-उपयोग
 		
 		
 			बौद्ध पंचांग
@@ -1142,19 +1148,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u093C ॐ \u0902 \u0901 ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]
 		[\u200C\u200D]
 		[अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह]
-		[\- , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
-		[\- , ; \: ! ? . ‘ ’ “ ” ( ) \[ \] \{ \} ॰]
+		[\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
+		[\- ‑ , ; \: ! ? . ‘ ’ “ ” ( ) \[ \] \{ \} ॰]
+		{0}…
+		…{0}
+		{0}…{1}
+		{0} …
+		… {0}
+		{0} … {1}
+		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
+	
+		“
+		”
+		‘
+		’
+	
 	
 		
 			
@@ -1270,55 +1298,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							B h – B h
-							B h–h
+							B h – B h
+							B h–h
 						
 						
-							B h:mm – B h:mm
-							B h:mm–h:mm
-							B h:mm–h:mm
+							B h:mm – B h:mm
+							B h:mm–h:mm
+							B h:mm–h:mm
 						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1832,44 +1822,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2380,6 +2332,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				वर्ष
+				पिछले साल
+				इस साल
+				अगले साल
 				
 					{0} वर्ष में
 					{0} वर्ष में
@@ -2533,6 +2488,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				दिन
+				बीता कल
+				आज
+				आने वाला कल
 				
 					{0} दिन में
 					{0} दिन में
@@ -2544,6 +2502,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				दिन
+				बीता कल
+				आज
+				आने वाला कल
 				
 					{0} दिन में
 					{0} दिन में
@@ -3660,7 +3621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				अक्तोब
 			
 			
-				कोस्टाने
+				कोस्टाने
 			
 			
 				केज़ेलोर्डा
@@ -5183,16 +5144,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			deva
 		
 		1
 		
+			.
+			,
 			%
+			+
+			-
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5350,6 +5320,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				संयुक्त अरब अमीरात दिरहाम
 				संयुक्त अरब अमीरात दिरहाम
 				संयुक्त अरब अमीरात दिरहाम
+				AED
 			
 			
 				अफगानी (1927–2002)
@@ -5358,166 +5329,218 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				अफ़गान अफ़गानी
 				अफ़गान अफ़गानी
 				अफ़गान अफ़गानी
+				AFN
 			
 			
 				अल्बानियाई लेक
 				अल्बानियाई लेक
 				अल्बानियाई लेक
+				ALL
 			
 			
 				आर्मेनियाई द्राम
 				आर्मेनियाई द्राम
 				आर्मेनियाई द्राम
+				AMD
 			
 			
 				नीदरलैंड एंटीलियन गिल्डर
 				नीदरलैंड एंटीलियन गिल्डर
 				नीदरलैंड एंटीलियन गिल्डर
+				ANG
 			
 			
 				अंगोला क्वांज़ा
 				अंगोला क्वांज़ा
 				अंगोला क्वांज़ा
+				AOA
+				Kz
 			
 			
 				अर्जेंटीनी पेसो
 				अर्जेंटीनी पेसो
 				अर्जेंटीनी पेसो
+				ARS
+				$
 			
 			
 				ऑस्ट्रेलियाई डॉलर
 				ऑस्ट्रेलियाई डॉलर
 				ऑस्ट्रेलियाई डॉलर
+				A$
+				$
 			
 			
 				अरूबाई फ़्लोरिन
 				अरूबाई फ़्लोरिन
 				अरूबाई फ़्लोरिन
+				AWG
 			
 			
 				अज़रबैजानी मैनेट
 				अज़रबैजानी मैनेट
 				अज़रबैजानी मैनेट
+				AZN
 			
 			
 				बोस्निया हर्ज़ेगोविना परिवर्तनीय मार्क
 				बोस्निया हर्ज़ेगोविना परिवर्तनीय मार्क
 				बोस्निया हर्ज़ेगोविना परिवर्तनीय मार्क
+				BAM
+				KM
 			
 			
 				बार्बेडियन डॉलर
 				बार्बेडियन डॉलर
 				बार्बेडियन डॉलर
+				BBD
+				$
 			
 			
 				बांग्लादेशी टका
 				बांग्लादेशी टका
 				बांग्लादेशी टका
+				BDT
+				৳
 			
 			
 				बुल्गारियाई लेव
 				बुल्गारियाई लेव
 				बुल्गारियाई लेव
+				BGN
 			
 			
 				बहरीनी दिनार
 				बहरीनी दिनार
 				बहरीनी दिनार
+				BHD
 			
 			
 				बुरूंडी फ़्रैंक
 				बुरूंडी फ़्रैंक
 				बुरूंडी फ़्रैंक
+				BIF
 			
 			
 				बरमूडा डॉलर
 				बरमूडा डॉलर
 				बरमूडा डॉलर
+				BMD
+				$
 			
 			
 				ब्रूनेई डॉलर
 				ब्रूनेई डॉलर
 				ब्रूनेई डॉलर
+				BND
+				$
 			
 			
 				बोलिवियाई बोलिवियानो
 				बोलिवियाई बोलिवियानो
 				बोलिवियाई बोलिवियानो
+				BOB
+				Bs
 			
 			
 				ब्राज़ीली रियाल
 				ब्राज़ीली रियाल
 				ब्राज़ीली रियाल
+				R$
+				R$
 			
 			
 				बहामाई डॉलर
 				बहामाई डॉलर
 				बहामाई डॉलर
+				BSD
+				$
 			
 			
 				भूटानी नंगलट्रम
 				भूटानी नंगलट्रम
 				भूटानी नंगलट्रम
+				BTN
 			
 			
 				बोत्सवानियाई पुला
 				बोत्सवानियाई पुला
 				बोत्सवानियाई पुला
+				BWP
+				P
 			
 			
 				बेलारूसी रूबल
 				बेलारूसी रूबल
 				बेलारूसी रूबल
+				BYN
+				р.
 			
 			
 				बेलारूसी रूबल (2000–2016)
 				बेलारूसी रूबल (2000–2016)
 				बेलारूसी रूबल (2000–2016)
+				BYR
 			
 			
 				बेलीज़ डॉलर
 				बेलीज़ डॉलर
 				बेलीज़ डॉलर
+				BZD
+				$
 			
 			
 				कनाडाई डॉलर
 				कनाडाई डॉलर
 				कनाडाई डॉलर
+				CA$
+				$
 			
 			
 				कोंगोली फ़्रैंक
 				कोंगोली फ़्रैंक
 				कोंगोली फ़्रैंक
+				CDF
 			
 			
 				स्विस फ़्रैंक
 				स्विस फ़्रैंक
 				स्विस फ़्रैंक
+				CHF
 			
 			
 				चिली पेसो
 				चिली पेसो
 				चिली पेसो
+				CLP
+				$
 			
 			
-				चीनी यूआन
-				चीनी यूआन
-				चीनी यूआन
+				चीनी युआन (ऑफ़शोर)
+				चीनी युआन (ऑफ़शोर)
+				चीनी युआन (ऑफ़शोर)
+				CNH
 			
 			
 				चीनी युआन
 				चीनी युआन
 				चीनी युआन
+				CN¥
+				¥
 			
 			
 				कोलंबियाई पेसो
 				कोलंबियाई पेसो
 				कोलंबियाई पेसो
+				COP
+				$
 			
 			
 				कोस्टा रिका कोलोन
 				कोस्टा रिका कोलोन
 				कोस्टा रिका कोलोन
+				CRC
+				₡
 			
 			
 				सर्बिय का ढीनार
@@ -5526,16 +5549,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				क्यूबाई परिवर्तनीय पेसो
 				क्यूबाई परिवर्तनीय पेसो
 				क्यूबाई परिवर्तनीय पेसो
+				CUC
+				$
 			
 			
 				क्यूबाई पेसो
 				क्यूबाई पेसो
 				क्यूबाई पेसो
+				CUP
+				$
 			
 			
 				केप वर्ड एस्कूडो
 				केप वर्ड एस्कूडो
 				केप वर्ड एस्कूडो
+				CVE
 			
 			
 				साईप्रस पाऊंड
@@ -5544,6 +5572,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				चेक गणराज्य कोरुना
 				चेक गणराज्य कोरुना
 				चेक गणराज्य कोरुना
+				CZK
+				Kč
 			
 			
 				डच मार्क
@@ -5552,21 +5582,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				जिबूती फ़्रैंक
 				जिबूती फ़्रैंक
 				जिबूती फ़्रैंक
+				DJF
 			
 			
 				डैनिश क्रोन
 				डैनिश क्रोन
 				डैनिश क्रोन
+				DKK
+				kr
 			
 			
 				डोमिनिकन पेसो
 				डोमिनिकन पेसो
 				डोमिनिकन पेसो
+				DOP
+				$
 			
 			
 				अल्जीरियाई दिनार
 				अल्जीरियाई दिनार
 				अल्जीरियाई दिनार
+				DZD
 			
 			
 				एस्टोनियाई क्रून्
@@ -5575,31 +5611,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				मिस्र पाउंड
 				मिस्र पाउंड
 				मिस्र पाउंड
+				EGP
+				E£
 			
 			
 				इरीट्रियन नाक्फ़ा
 				इरीट्रियन नाक्फ़ा
 				इरीट्रियन नाक्फ़ा
+				ERN
 			
 			
 				इथियोपियन बिर
 				इथियोपियन बिर
 				इथियोपियन बिर
+				ETB
 			
 			
 				यूरो
 				यूरो
 				यूरो
+				€
+				€
 			
 			
 				फ़िजी डॉलर
 				फ़िजी डॉलर
 				फ़िजी डॉलर
+				FJD
+				$
 			
 			
 				फ़ॉकलैंड द्वीपसमूह पाउंड
 				फ़ॉकलैंड द्वीपसमूह पाउंड
 				फ़ॉकलैंड द्वीपसमूह पाउंड
+				FKP
+				£
 			
 			
 				फ़्रांसीसी फ़्रैंक
@@ -5608,52 +5654,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ब्रिटिश पाउंड स्टर्लिंग
 				ब्रिटिश पाउंड स्टर्लिंग
 				ब्रिटिश पाउंड स्टर्लिंग
+				£
+				£
 			
 			
 				जॉर्जियन लारी
 				जॉर्जियन लारी
 				जॉर्जियन लारी
+				GEL
+				₾
 				ლ
 			
 			
 				घानियन सेडी
 				घानियन सेडी
 				घानियन सेडी
+				GHS
 			
 			
 				जिब्राल्टर पाउंड
 				जिब्राल्टर पाउंड
 				जिब्राल्टर पाउंड
+				GIP
+				£
 			
 			
 				गैंबियन डलासी
 				गैंबियन डलासी
 				गैंबियन डलासी
+				GMD
 			
 			
 				गिनीयन फ़्रैंक
 				गिनीयन फ़्रैंक
 				गिनीयन फ़्रैंक
+				GNF
+				FG
 			
 			
 				ग्वाटेमाला क्वेटज़ल
 				ग्वाटेमाला क्वेटज़ल
 				ग्वाटेमाला क्वेटज़ल
+				GTQ
+				Q
 			
 			
 				गयानीज़ डॉलर
 				गयानीज़ डॉलर
 				गयानीज़ डॉलर
+				GYD
+				$
 			
 			
 				हाँगकाँग डॉलर
 				हाँगकाँग डॉलर
 				हाँगकाँग डॉलर
+				HK$
+				$
 			
 			
 				होंडुरन लेम्पिरा
 				होंडुरन लेम्पिरा
 				होंडुरन लेम्पिरा
+				HNL
+				L
 			
 			
 				क्रोएशियन दिनार
@@ -5662,46 +5726,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				क्रोएशियाई कुना
 				क्रोएशियाई कुना
 				क्रोएशियाई कुना
+				HRK
+				kn
 			
 			
 				हैतियाई गर्ड
 				हैतियाई गर्ड
 				हैतियाई गर्ड
+				HTG
 			
 			
 				हंगेरियन फ़ोरिंट
 				हंगेरियन फ़ोरिंट
 				हंगेरियन फ़ोरिंट
+				HUF
+				Ft
 			
 			
 				इंडोनेशियाई रुपिया
 				इंडोनेशियाई रुपिया
 				इंडोनेशियाई रुपिये
+				IDR
+				Rp
 			
 			
 				इज़राइली न्यू शेकेल
 				इज़राइली न्यू शेकेल
 				इज़राइली न्यू शेकेल
+				₪
+				₪
 			
 			
 				भारतीय रुपया
 				भारतीय रुपया
-				भारतीय रूपए
+				भारतीय रुपए
+				₹
+				₹
 			
 			
 				इराकी दिनार
 				इराकी दिनार
 				इराकी दिनार
+				IQD
 			
 			
 				ईरानी रियाल
 				ईरानी रियाल
 				ईरानी रियाल
+				IRR
 			
 			
 				आइसलैंडिक क्रोना
 				आइसलैंडिक क्रोना
 				आइसलैंडिक क्रोना
+				ISK
+				kr
 			
 			
 				इतली का लीरा
@@ -5710,81 +5789,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				जमैकन डॉलर
 				जमैकन डॉलर
 				जमैकन डॉलर
+				JMD
+				$
 			
 			
 				जॉर्डनियन दिनार
 				जॉर्डनियन दिनार
 				जॉर्डनियन दिनार
+				JOD
 			
 			
 				जापानी येन
 				जापानी येन
 				जापानी येन
+				JP¥
+				¥
 			
 			
 				केन्याई शिलिंग
 				केन्याई शिलिंग
 				केन्याई शिलिंग
+				KES
 			
 			
 				किर्गिस्तानी सोम
 				किर्गिस्तानी सोम
 				किर्गिस्तानी सोम
+				KGS
 			
 			
 				कंबोडियाई रियाल
 				कंबोडियाई रियाल
 				कंबोडियाई रियाल
+				KHR
+				៛
 			
 			
 				कोमोरियन फ़्रैंक
 				कोमोरियन फ़्रैंक
 				कोमोरियन फ़्रैंक
+				KMF
+				CF
 			
 			
 				उत्तर कोरियाई वॉन
 				उत्तर कोरियाई वॉन
 				उत्तर कोरियाई वॉन
+				KPW
+				₩
 			
 			
 				दक्षिण कोरियाई वॉन
 				दक्षिण कोरियाई वॉन
 				दक्षिण कोरियाई वॉन
+				₩
+				₩
 			
 			
 				कुवैती दिनार
 				कुवैती दिनार
 				कुवैती दिनार
+				KWD
 			
 			
 				कैमेन द्वीपसमूह डॉलर
 				कैमेन द्वीपसमूह डॉलर
 				कैमेन द्वीपसमूह डॉलर
+				KYD
+				$
 			
 			
 				कज़ाखिस्तानी टेंज़
 				कज़ाखिस्तानी टेंज़
 				कज़ाखिस्तानी टेंज़
+				KZT
+				₸
 			
 			
 				लाओशियन किप
 				लाओशियन किप
 				लाओशियन किप
+				LAK
+				₭
 			
 			
 				लेबनानी पाउंड
 				लेबनानी पाउंड
 				लेबनानी पाउंड
+				LBP
+				L£
 			
 			
 				श्रीलंकाई रुपया
 				श्रीलंकाई रुपया
 				श्रीलंकाई रुपए
+				LKR
+				Rs
 			
 			
 				लाइबेरियाई डॉलर
 				लाइबेरियाई डॉलर
 				लाइबेरियाई डॉलर
+				LRD
+				$
 			
 			
 				लेसोथो लोटी
@@ -5805,11 +5912,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				लीबियाई दिनार
 				लीबियाई दिनार
 				लीबियाई दिनार
+				LYD
 			
 			
 				मोरक्को दिरहम
 				मोरक्को दिरहम
 				मोरक्को दिरहम
+				MAD
 			
 			
 				मोरक्को फ्रैंक
@@ -5818,146 +5927,191 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				मोल्डोवन लियू
 				मोल्डोवन लियू
 				मोल्डोवन लियू
+				MDL
 			
 			
 				मालागासी आरियरी
 				मालागासी आरियरी
 				मालागासी आरियरी
+				MGA
+				Ar
 			
 			
 				मैसीडोनियन दिनार
 				मैसीडोनियन दिनार
 				मैसीडोनियन दिनार
+				MKD
 			
 			
 				म्यांमार क्याट
 				म्यांमार क्याट
 				म्यांमार क्याट
+				MMK
+				K
 			
 			
 				मंगोलियाई टगरिक
 				मंगोलियाई टगरिक
 				मंगोलियाई टगरिक
+				MNT
+				₮
 			
 			
 				मेकानीज़ पाटाका
 				मेकानीज़ पाटाका
 				मेकानीज़ पाटाका
+				MOP
 			
 			
 				मॉरीटेनियन ओगुइया (1973–2017)
 				मॉरीटेनियन ओगुइया (1973–2017)
 				मॉरीटेनियन ओगुइया (1973–2017)
+				MRO
 			
 			
 				मॉरीटेनियन ओगुइया
 				मॉरीटेनियन ओगुइया
 				मॉरीटेनियन ओगुइया
+				MRU
 			
 			
 				मॉरिशियन रुपया
 				मॉरिशियन रुपया
 				मॉरिशियन रुपया
+				MUR
+				Rs
 			
 			
 				मालदीवी रुफ़िया
 				मालदीवी रुफ़िया
 				मालदीवी रुफ़िया
+				MVR
 			
 			
 				मालावियन क्वाचा
 				मालावियन क्वाचा
 				मालावियन क्वाचा
+				MWK
 			
 			
 				मैक्सिकन पेसो
 				मैक्सिकन पेसो
 				मैक्सिकन पेसो
+				MX$
+				$
 			
 			
 				मलेशियाई रिंगित
 				मलेशियाई रिंगित
 				मलेशियाई रिंगित
+				MYR
+				RM
 			
 			
 				मोज़ाम्बिकन मेटिकल
 				मोज़ाम्बिकन मेटिकल
 				मोज़ाम्बिकन मेटिकल
+				MZN
 			
 			
 				नामीबियाई डॉलर
 				नामीबियाई डॉलर
 				नामीबियाई डॉलर
+				NAD
+				$
 			
 			
 				नाइजीरियाई नाइरा
 				नाइजीरियाई नाइरा
 				नाइजीरियाई नाइरा
+				NGN
+				₦
 			
 			
 				निकारागुअन कोरडोबा
 				निकारागुअन कोरडोबा
 				निकारागुअन कोरडोबा
+				NIO
+				C$
 			
 			
 				नॉर्वेजियन क्रोन
 				नॉर्वेजियन क्रोन
 				नॉर्वेजियन क्रोन
+				NOK
+				kr
 			
 			
 				नेपाली रुपया
 				नेपाली रुपया
 				नेपाली रुपए
+				NPR
+				Rs
 			
 			
 				न्यूज़ीलैंड डॉलर
 				न्यूज़ीलैंड डॉलर
 				न्यूज़ीलैंड डॉलर
+				NZ$
+				$
 			
 			
 				ओमानी रियाल
 				ओमानी रियाल
 				ओमानी रियाल
+				OMR
 			
 			
 				पनामेनियन बैल्बोआ
 				पनामेनियन बैल्बोआ
 				पनामेनियन बैल्बोआ
+				PAB
 			
 			
 				पेरूवियन सोल
 				पेरूवियन सोल
 				पेरूवियन सोल
+				PEN
 			
 			
 				पापुआ न्यू गिनीयन किना
 				पापुआ न्यू गिनीयन किना
 				पापुआ न्यू गिनीयन किना
+				PGK
 			
 			
 				फ़िलिपीनी पेसो
 				फ़िलिपीनी पेसो
 				फ़िलिपीनी पेसो
+				PHP
+				₱
 			
 			
 				पाकिस्तानी रुपया
 				पाकिस्तानी रुपया
 				पाकिस्तानी रुपए
+				PKR
+				Rs
 			
 			
 				पोलिश ज़्लॉटी
 				पोलिश ज़्लॉटी
 				पोलिश ज़्लॉटी
+				PLN
+				zł
 			
 			
 				पैराग्वियन गुआरानी
 				पैराग्वियन गुआरानी
 				पैराग्वियन गुआरानी
+				PYG
+				₲
 			
 			
 				क़तरी रियाल
 				क़तरी रियाल
 				क़तरी रियाल
+				QAR
 			
 			
 				रोडेशियाई डालर
@@ -5966,37 +6120,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				रोमानियाई ल्यू
 				रोमानियाई ल्यू
 				रोमानियाई ल्यू
+				RON
 				लेई
 			
 			
 				सर्बियन दिनार
 				सर्बियन दिनार
 				सर्बियन दिनार
+				RSD
 			
 			
 				रूसी रूबल
 				रूसी रूबल
 				रूसी रूबल
+				RUB
+				₽
 			
 			
 				रवांडाई फ़्रैंक
 				रवांडाई फ़्रैंक
 				रवांडाई फ़्रैंक
+				RWF
+				RF
 			
 			
 				सउदी रियाल
 				सउदी रियाल
 				सउदी रियाल
+				SAR
 			
 			
 				सोलोमन द्वीपसमूह डॉलर
 				सोलोमन द्वीपसमूह डॉलर
 				सोलोमन द्वीपसमूह डॉलर
+				SBD
+				$
 			
 			
 				सेशेल्सियाई रुपया
 				सेशेल्सियाई रुपया
 				सेशेल्सियाई रुपया
+				SCR
 			
 			
 				पुरानी सूडानी दिनार
@@ -6005,6 +6169,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				सूडानी पाउंड
 				सूडानी पाउंड
 				सूडानी पाउंड
+				SDG
 			
 			
 				पुराना सूडानी पाउंड
@@ -6013,16 +6178,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				स्वीडीश क्रोना
 				स्वीडीश क्रोना
 				स्वीडीश क्रोना
+				SEK
+				kr
 			
 			
 				सिंगापुर डॉलर
 				सिंगापुर डॉलर
 				सिंगापुर डॉलर
+				SGD
+				$
 			
 			
 				सेंट हेलेना पाउंड
 				सेंट हेलेना पाउंड
 				सेंट हेलेना पाउंड
+				SHP
+				£
 			
 			
 				स्लोवेनियाई तोलार
@@ -6034,16 +6205,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				सिएरा लियोनियन लियोन
 				सिएरा लियोनियन लियोन
 				सिएरा लियोनियन लियोन
+				SLL
 			
 			
 				सोमाली शिलिंग
 				सोमाली शिलिंग
 				सोमाली शिलिंग
+				SOS
 			
 			
 				सूरीनामी डॉलर
 				सूरीनामी डॉलर
 				सूरीनामी डॉलर
+				SRD
+				$
 			
 			
 				सूरीनामी गिल्डर
@@ -6052,17 +6227,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				दक्षिण सूडानी पाउंड
 				दक्षिण सूडानी पाउंड
 				दक्षिण सूडानी पाउंड
+				SSP
+				£
 			
 			
 				साओ तोम और प्रिंसिपे डोबरा (1977–2017)
 				साओ तोम और प्रिंसिपे डोबरा (1977–2017)
 				साओ तोम और प्रिंसिपे डोबरा (1977–2017)
+				STD
 			
 			
 				साओ टोम और प्रिंसिपे डोबरा
 				साओ टोम और प्रिंसिपे डोबरा
 				साओ टोम और प्रिंसिपे डोबरा
 				STN
+				Db
 			
 			
 				सोवियत रूबल
@@ -6071,17 +6250,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				सीरियाई पाउंड
 				सीरियाई पाउंड
 				सीरियाई पाउंड
+				SYP
+				£
 			
 			
 				स्वाज़ी लिलांजेनी
 				स्वाज़ी लिलांजेनी
 				स्वाज़ी लिलांजेनी
+				SZL
 			
 			
 				थाई बहत
 				थाई बहत
 				थाई बहत
 				฿
+				฿
 			
 			
 				तजाखी रूबल
@@ -6090,21 +6273,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ताजिकिस्तानी सोमोनी
 				ताजिकिस्तानी सोमोनी
 				ताजिकिस्तानी सोमोनी
+				TJS
 			
 			
 				तुर्कमेनिस्तानी मैनत
 				तुर्कमेनिस्तानी मैनत
 				तुर्कमेनिस्तानी मैनत
+				TMT
 			
 			
 				ट्यूनीशियाई दिनार
 				ट्यूनीशियाई दिनार
 				ट्यूनीशियाई दिनार
+				TND
 			
 			
 				टोंगन पांगा
 				टोंगन पांगा
 				टोंगन पांगा
+				TOP
+				T$
 			
 			
 				पुरानी तुर्की लीरा
@@ -6113,38 +6301,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				तुर्की लीरा
 				तुर्की लीरा
 				तुर्की लीरा
+				TRY
+				₺
+				TL
 			
 			
 				त्रिनिदाद और टोबैगो डॉलर
 				त्रिनिदाद और टोबैगो डॉलर
 				त्रिनिदाद और टोबैगो डॉलर
+				TTD
+				$
 			
 			
 				नया ताईवानी डॉलर
 				नया ताईवानी डॉलर
 				नया ताईवानी डॉलर
+				NT$
 				NT$
 			
 			
 				तंज़ानियाई शिलिंग
 				तंज़ानियाई शिलिंग
 				तंज़ानियाई शिलिंग
+				TZS
 			
 			
 				यूक्रेनियन रिव्निया
 				यूक्रेनियन रिव्निया
 				यूक्रेनियन रिव्निया
+				UAH
+				₴
 			
 			
 				युगांडाई शिलिंग
 				युगांडाई शिलिंग
 				युगांडाई शिलिंग
+				UGX
 			
 			
 				यूएस डॉलर
 				यूएस डॉलर
 				यूएस डॉलर
 				$
+				$
 			
 			
 				अमेरीकी डालर (कल)
@@ -6156,11 +6355,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				उरुग्वियन पेसो
 				उरुग्वियन पेसो
 				उरुग्वियन पेसो
+				UYU
+				$
 			
 			
-				उज़्बेकिस्तान सोम
-				उज़्बेकिस्तान सोम
-				उज़्बेकिस्तान सोम
+				उज़्बेकिस्तानी सोम
+				उज़्बेकिस्तानी सोम
+				उज़्बेकिस्तानी सोम
+				UZS
 			
 			
 				वेनेज़ुएला बोलिवर (1871–2008)
@@ -6169,46 +6371,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				वेनेज़ुएला बोलिवर (2008–2018)
 				वेनेज़ुएला बोलिवर (2008–2018)
 				वेनेज़ुएला बोलिवर (2008–2018)
+				VEF
+				Bs
 			
 			
 				वेनेज़ुएला बोलिवर
 				वेनेज़ुएला बोलिवर
 				वेनेज़ुएला बोलिवर
+				VES
 			
 			
 				वियतनामी डोंग
 				वियतनामी डोंग
 				वियतनामी डोंग
+				₫
+				₫
 			
 			
 				वनुआतू वातू
 				वनुआतू वातू
 				वनुआतू वातू
+				VUV
 			
 			
 				समोआई ताला
 				समोआई ताला
 				समोआई ताला
+				WST
 			
 			
 				केंद्रीय अफ़्रीकी CFA फ़्रैंक
 				केंद्रीय अफ़्रीकी CFA फ़्रैंक
 				केंद्रीय अफ़्रीकी CFA फ़्रैंक
+				FCFA
 			
 			
 				पूर्वी कैरिबियाई डॉलर
 				पूर्वी कैरिबियाई डॉलर
 				पूर्वी कैरिबियाई डॉलर
+				EC$
+				$
 			
 			
 				पश्चिमी अफ़्रीकी CFA फ़्रैंक
 				पश्चिमी अफ़्रीकी CFA फ़्रैंक
 				पश्चिमी अफ़्रीकी CFA फ़्रैंक
+				CFA
 			
 			
 				[CFP] फ़्रैंक
 				[CFP] फ़्रैंक
 				[CFP] फ़्रैंक
+				CFPF
 			
 			
 				अज्ञात मुद्रा
@@ -6219,11 +6433,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				यमनी रियाल
 				यमनी रियाल
 				यमनी रियाल
+				YER
 			
 			
 				दक्षिण अफ़्रीकी रैंड
 				दक्षिण अफ़्रीकी रैंड
 				दक्षिण अफ़्रीकी रैंड
+				ZAR
+				R
 			
 			
 				ज़ाम्बियन क्वाचा (1968–2012)
@@ -6232,6 +6449,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ज़ाम्बियन क्वाचा
 				ज़ाम्बियन क्वाचा
 				ज़ाम्बियन क्वाचा
+				ZMW
+				ZK
 			
 		
 		
@@ -6243,9 +6462,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			{0} घंटा
 			{0} घंटे
-			{0}था दाहिना मोड़ लें.
+			तीसरा दाहिना मोड़ लें.
 			{0}ठा दाहिना मोड़ लें.
-			{0}ला दाहिना मोड़ लें.
+			पहला दाहिना मोड़ लें.
 			{0}वां दाहिना मोड़ लें.
 			{0}रा दाहिना मोड़ लें.
 		
@@ -6253,12 +6472,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			
-				{0} प्रति {1}
+				{0} प्रति {1}
 			
 			
 				गुरुत्व बल
-				{0} गु–बल
-				{0} गु–बल
+				{0} गुरुत्व–बल
+				{0} गुरुत्व–बल
 			
 			
 				मीटर/से²
@@ -6266,9 +6485,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मीटर प्रति सेकंड वर्ग
 			
 			
-				घूर्णन
-				{0} घूर्णन
-				{0} घूर्णन
+				घूर्णन
+				{0} घूर्णन
+				{0} घूर्णन
 			
 			
 				रेडियन
@@ -6294,7 +6513,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				वर्ग किलोमीटर
 				{0} वर्ग किलोमीटर
 				{0} वर्ग किलोमीटर
-				{0} प्रति वर्ग किलोमीटर
+				{0} प्रति वर्ग किलोमीटर
 			
 			
 				हेक्टेयर
@@ -6305,19 +6524,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				वर्ग मीटर
 				{0} वर्ग मीटर
 				{0} वर्ग मीटर
-				{0}/वर्ग मीटर
+				{0}/वर्ग मीटर
 			
 			
 				वर्ग सेंटीमीटर
 				{0} वर्ग सेंटीमीटर
 				{0} वर्ग सेंटीमीटर
-				{0}/वर्ग सेंटीमीटर
+				{0}/वर्ग सेंटीमीटर
 			
 			
 				वर्ग मील
 				{0} वर्ग मील
 				{0} वर्ग मील
-				{0}/वर्ग मील
+				{0}/वर्ग मील
 			
 			
 				एकड़
@@ -6338,12 +6557,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				वर्ग इंच
 				{0} वर्ग इंच
 				{0} वर्ग इंच
-				{0}/वर्ग इंच
+				{0}/वर्ग इंच
 			
 			
-				डोनम
-				{0} डोनम
-				{0} डोनम
+				डोनम
+				{0} डोनम
+				{0} डोनम
 			
 			
 				कैरट
@@ -6361,28 +6580,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मिलीमोल प्रति लीटर
 			
 			
-				{0} ppm
-				{0} हिस्सा प्रति दस लाख
+				ppm
+				{0} ppm
+				{0} हिस्सा प्रति दस लाख
 			
 			
-				प्रतिशत
-				{0} प्रतिशत
-				{0} प्रतिशत
+				प्रतिशत
+				{0} प्रतिशत
+				{0} प्रतिशत
 			
 			
-				प्रति हज़ार
-				{0} प्रति हज़ार
-				{0} प्रति हज़ार
+				प्रति हज़ार
+				{0} प्रति हज़ार
+				{0} प्रति हज़ार
 			
 			
-				प्रति दस हज़ार
-				{0} प्रति दस हज़ार
-				{0} प्रति दस हज़ार
+				प्रति दस हज़ार
+				{0} प्रति दस हज़ार
+				{0} प्रति दस हज़ार
 			
 			
-				मोल
-				{0} मोल
-				{0} मोल
+				मोल
+				{0} मोल
+				{0} मोल
 			
 			
 				लीटर प्रति किलोमीटर
@@ -6390,9 +6610,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} लीटर प्रति किलोमीटर
 			
 			
-				लीटर प्रति 100 किलोमीटर
-				{0} लीटर प्रति 100 किलोमीटर
-				{0} लीटर प्रति 100 किलोमीटर
+				लीटर प्रति 100 किलोमीटर
+				{0} लीटर प्रति 100 किलोमीटर
+				{0} लीटर प्रति 100 किलोमीटर
 			
 			
 				मील प्रति गैलन
@@ -6405,9 +6625,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मील प्रति इंपीरियल गैलन
 			
 			
-				पेटाबाइट
-				{0} पेटाबाइट
-				{0} पेटाबाइट
+				पेटाबाइट
+				{0} पेटाबाइट
+				{0} पेटाबाइट
 			
 			
 				टेराबाइट
@@ -6464,6 +6684,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} शताब्दी
 				{0} शताब्दियाँ
 			
+			
+				दशकों
+				{0} दशक
+				{0} दशकों
+			
 			
 				वर्ष
 				{0} वर्ष
@@ -6572,24 +6797,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} किलोवॉट घंटे
 			
 			
-				इलेक्ट्रॉनवोल्ट
-				{0} इलेक्ट्रॉनवोल्ट
-				{0} इलेक्ट्रॉनवोल्ट
+				इलेक्ट्रॉनवोल्ट
+				{0} इलेक्ट्रॉनवोल्ट
+				{0} इलेक्ट्रॉनवोल्ट
 			
 			
-				ब्रिटिश थर्मल यूनिट
-				{0} ब्रिटिश थर्मल यूनिट
-				{0} ब्रिटिश थर्मल यूनिट
+				ब्रिटिश थर्मल यूनिट
+				{0} ब्रिटिश थर्मल यूनिट
+				{0} ब्रिटिश थर्मल यूनिट
+			
+			
+				यूएस थेर्म
+				{0} यूएस थेर्म
+				{0} यूएस थेर्म
 			
 			
-				पाउंड-बल
-				{0} पाउंड-बल
-				{0} पाउंड-बल
+				पाउंड-बल
+				{0} पाउंड-बल
+				{0} पाउंड-बल
 			
 			
-				न्यूटन
-				{0} न्यूटन
-				{0} न्यूटन
+				न्यूटन
+				{0} न्यूटन
+				{0} न्यूटन
 			
 			
 				गीगाहर्ट्ज़
@@ -6611,17 +6841,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हर्ट्ज़
 				{0} हर्ट्ज़
 			
+			
+				टाइपोग्राफ़िक एम
+			
+			
+				पिक्सेल
+				{0} पिक्सेल
+				{0} पिक्सेल
+			
+			
+				मेगापिक्सेल
+				{0} मेगापिक्सेल
+				{0} मेगापिक्सेल
+			
+			
+				पिक्सेल प्रति सेंटीमीटर
+				{0} पिक्सेल प्रति सेंटीमीटर
+				{0} पिक्सेल प्रति सेंटीमीटर
+			
+			
+				पिक्सेल प्रति इंच
+				{0} पिक्सेल प्रति इंच
+				{0} पिक्सेल प्रति इंच
+			
+			
+				बिंदु प्रति सेंटीमीटर
+				{0} बिंदु प्रति सेंटीमीटर
+				{0} बिंदु प्रति सेंटीमीटर
+			
+			
+				बिंदु प्रति इंच
+				{0} बिंदु प्रति इंच
+				{0} बिंदु प्रति इंच
+			
 			
 				किलोमीटर
 				{0} किलोमीटर
 				{0} किलोमीटर
-				{0}/किलोमीटर
+				{0}/किलोमीटर
 			
 			
 				मीटर
 				{0} मीटर
 				{0} मीटर
-				{0}/मीटर
+				{0}/मीटर
 			
 			
 				डेसीमीटर
@@ -6632,7 +6895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				सेंटीमीटर
 				{0} सेंटीमीटर
 				{0} सेंटीमीटर
-				{0}/सेंटीमीटर
+				{0}/सेंटीमीटर
 			
 			
 				मिलीमीटर
@@ -6668,13 +6931,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				फ़ीट
 				{0} फ़ुट
 				{0} फ़ीट
-				{0}/फ़ीट
+				{0}/फ़ीट
 			
 			
 				इंच
 				{0} इंच
 				{0} इंच
-				{0}/इंच
+				{0}/इंच
 			
 			
 				पार्सेक
@@ -6697,9 +6960,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} नॉटिकल मील
 			
 			
-				मील-स्कैण्डिनेवियन
-				{0} मील-स्कैण्डिनेवियन
-				{0} मील-स्कैण्डिनेवियन
+				मील-स्कैण्डिनेवियन
+				{0} मील-स्कैण्डिनेवियन
+				{0} मील-स्कैण्डिनेवियन
 			
 			
 				pt
@@ -6707,9 +6970,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				सौर अर्धव्यास
-				{0} सौर अर्धव्यास
-				{0} सौर अर्धव्यास
+				सौर अर्धव्यास
+				{0} सौर अर्धव्यास
+				{0} सौर अर्धव्यास
 			
 			
 				लक्स
@@ -6717,9 +6980,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} लक्स
 			
 			
-				सौर ज्योति
-				{0} सौर ज्योति
-				{0} सौर ज्योति
+				सौर ज्योति
+				{0} सौर ज्योति
+				{0} सौर ज्योति
 			
 			
 				मीट्रिक टन
@@ -6776,19 +7039,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} कैरेट
 			
 			
-				डाल्टन
-				{0} डाल्टन
-				{0} डाल्टन
+				डाल्टन
+				{0} डाल्टन
+				{0} डाल्टन
 			
 			
-				पृथ्वी द्रव्यमान
-				{0} पृथ्वी द्रव्यमान
-				{0} पृथ्वी द्रव्यमान
+				पृथ्वी द्रव्यमान
+				{0} पृथ्वी द्रव्यमान
+				{0} पृथ्वी द्रव्यमान
 			
 			
-				सौर द्रव्यमान
-				{0} सौर द्रव्यमान
-				{0} सौर द्रव्यमान
+				सौर द्रव्यमान
+				{0} सौर द्रव्यमान
+				{0} सौर द्रव्यमान
 			
 			
 				गिगावॉट
@@ -6820,11 +7083,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} अश्वशक्ति
 				{0} अश्वशक्ति
 			
-			
-				हैक्टोपास्कल
-				{0} हैक्टोपास्कल
-				{0} हैक्टोपास्कल
-			
 			
 				मर्क्यूरी मिलीमीटर
 				{0} मर्क्यूरी मिलीमीटर
@@ -6840,25 +7098,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मर्करी इंच
 				{0} मर्करी इंच
 			
+			
+				बार
+				{0} बार
+				{0} बार
+			
 			
 				मिलीबार
 				{0} मिलीबार
 				{0} मिलीबार
 			
 			
-				वायुमण्डलीय दबाव
-				{0} वायुमंडलीय दबाव
-				{0} वायुमंडलीय दबाव
+				वायुमण्डलीय दबाव
+				{0} वायुमंडलीय दबाव
+				{0} वायुमंडलीय दबाव
+			
+			
+				पास्कल
+				{0} पास्कल
+				{0} पास्कल
+			
+			
+				हैक्टोपास्कल
+				{0} हैक्टोपास्कल
+				{0} हैक्टोपास्कल
 			
 			
-				किलोपास्कल
-				{0} किलोपास्कल
-				{0} किलोपास्कल
+				किलोपास्कल
+				{0} किलोपास्कल
+				{0} किलोपास्कल
 			
 			
-				मेगापास्कल
-				{0} मेगापास्कल
-				{0} मेगापास्कल
+				मेगापास्कल
+				{0} मेगापास्कल
+				{0} मेगापास्कल
 			
 			
 				किलोमीटर प्रति घंटा
@@ -6876,9 +7149,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मील प्रति घंटा
 			
 			
-				नॉट
-				{0} नॉट
-				{0} नॉट
+				नॉट
+				{0} नॉट
+				{0} नॉट
+			
+			
+				°
+				{0}°
+				{0}°
 			
 			
 				डिग्री सेल्सियस
@@ -6896,14 +7174,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} केल्विन
 			
 			
-				पाउंड-फ़ीट
-				{0} पाउंड-फ़ुट
-				{0} पाउंड-फ़ुट
+				पाउंड-फ़ुट
+				{0} पाउंड-फ़ुट
+				{0} पाउंड-फ़ुट
 			
 			
-				न्यूटन-मीटर
-				{0} न्यूटन-मीटर
-				{0} न्यूटन-मीटर
+				न्यूटन-मीटर
+				{0} न्यूटन-मीटर
+				{0} न्यूटन-मीटर
 			
 			
 				घन किलोमीटर
@@ -6914,13 +7192,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				घन मीटर
 				{0} घन मीटर
 				{0} घन मीटर
-				{0}/घन मीटर
+				{0}/घन मीटर
 			
 			
 				घन सेंटीमीटर
 				{0} घन सेंटीमीटर
 				{0} घन सेंटीमीटर
-				{0}/घन सेंटीमीटर
+				{0}/घन सेंटीमीटर
 			
 			
 				घन मील
@@ -6974,14 +7252,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मिलीलीटर
 			
 			
-				मीट्रिक पिंट
-				{0} मीट्रिक पिंट
-				{0} मीट्रिक पिंट
+				मीट्रिक पिंट
+				{0} मीट्रिक पिंट
+				{0} मीट्रिक पिंट
 			
 			
-				मीट्रिक कप
-				{0} मीट्रिक कप
-				{0} मीट्रिक कप
+				मीट्रिक कप
+				{0} मीट्रिक कप
+				{0} मीट्रिक कप
 			
 			
 				एकड़ फ़ीट
@@ -6992,7 +7270,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				गैलन
 				{0} गैलन
 				{0} गैलन
-				{0}/गैलन
+				{0}/गैलन
 			
 			
 				इम्पीरियल गैलन
@@ -7021,9 +7299,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} फ़्लूइड आउंस
 			
 			
-				इम्पी॰ फ़्लुइड आउंस
-				{0} इम्पी॰ फ़्लुइड आउंस
-				{0} इम्पी॰ फ़्लुइड आउंस
+				इम्पी॰ फ़्लुइड आउंस
+				{0} इम्पी॰ फ़्लुइड आउंस
+				{0} इम्पी॰ फ़्लुइड आउंस
 			
 			
 				टेबलस्पून
@@ -7036,17 +7314,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} टी स्पून
 			
 			
-				बैरल
-				{0} बैरल
-				{0} बैरल
+				बैरल
+				{0} बैरल
+				{0} बैरल
 			
 			
-				प्रधान दिशा
+				प्रधान दिशा
+				{0}E
+				{0}N
+				{0}S
+				{0}W
 			
 		
 		
+			
+				{0}/{1}
+			
 			
-				गु–बल
+				गुरुत्व बल
 				{0} G
 				{0} G
 			
@@ -7056,9 +7341,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मी॰/व॰से॰
 			
 			
-				घूर्णन
-				{0} घूर्णन
-				{0} घूर्णन
+				घूर्णन
+				{0} घूर्णन
+				{0} घूर्णन
 			
 			
 				रेडियन
@@ -7084,7 +7369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				वर्ग कि॰मी॰
 				{0} वर्ग कि॰मी॰
 				{0} वर्ग कि॰मी॰
-				{0}/वर्ग कि॰मी॰
+				{0}/वर्ग कि॰मी॰
 			
 			
 				हेक्टेयर
@@ -7095,19 +7380,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				वर्ग मीटर
 				{0} वर्ग मी॰
 				{0} वर्ग मी॰
-				{0}/वर्ग मीटर
+				{0}/वर्ग मीटर
 			
 			
 				वर्ग सें॰
 				{0} व॰ सें॰
 				{0} व॰ सें॰
-				{0}/वर्ग सें॰ मी॰
+				{0}/वर्ग सें॰ मी॰
 			
 			
 				वर्ग मील
 				{0} वर्ग मील
 				{0} वर्ग मील
-				{0}/मील²
+				{0}/मील²
 			
 			
 				एकड़
@@ -7128,15 +7413,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				व॰ इं॰
 				{0} व॰ इं॰
 				{0} व॰ इं॰
-				{0}/वर्ग इंच
+				{0}/वर्ग इंच
 			
 			
-				डोनम
-				{0} डोनम
-				{0} डोनम
+				डोनम
+				{0} डोनम
+				{0} डोनम
 			
 			
 				कैरट
+				{0} kt
+				{0} kt
 			
 			
 				मि॰ग्रा॰/डे॰ली॰
@@ -7148,21 +7435,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मिलीमोल/ली॰
 				{0} मिलीमोल/ली॰
 			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+			
 			
-				प्रतिशत
+				प्रतिशत
+				{0}%
+				{0}%
 			
 			
-				प्रति हज़ार
-			
-			
-				‱
-				{0}‱
-				{0}‱
+				प्रति हज़ार
+				{0}‰
+				{0}‰
 			
 			
-				मोल
-				{0} मोल
-				{0} मोल
+				मोल
+				{0} मोल
+				{0} मोल
 			
 			
 				लीटर/किमी
@@ -7170,7 +7461,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ली/किमी
 			
 			
-				ली॰/100 कि॰मी॰
+				ली॰/100 कि॰मी॰
 				{0} ली॰/100 कि॰मी॰
 				{0} ली॰/100 कि॰मी॰
 			
@@ -7185,7 +7476,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg इंपीरियल
 			
 			
-				पेटाबाइट
+				पेटाबाइट
+				{0} PB
+				{0} PB
+			
+			
+				TB
+				{0} TB
+				{0} TB
+			
+			
+				Tb
+				{0} Tb
+				{0} Tb
+			
+			
+				GB
+				{0} GB
+				{0} GB
+			
+			
+				Gb
+				{0} Gb
+				{0} Gb
+			
+			
+				MB
+				{0} MB
+				{0} MB
+			
+			
+				Mb
+				{0} Mb
+				{0} Mb
+			
+			
+				kB
+				{0} kB
+				{0} kB
+			
+			
+				kb
+				{0} kb
+				{0} kb
 			
 			
 				बाइट
@@ -7202,6 +7535,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} शता
 				{0} शता
 			
+			
+				दश.
+				{0} दश.
+				{0} दश.
+			
 			
 				वर्ष
 				{0} वर्ष
@@ -7271,47 +7609,91 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ओम
+				{0} Ω
+				{0} Ω
 			
 			
 				वोल्ट
+				{0} V
+				{0} V
+			
+			
+				kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+				{0} cal
+			
+			
+				Cal
+				{0} Cal
+				{0} Cal
 			
 			
 				किलो जूल
+				{0} kJ
+				{0} kJ
 			
 			
 				जूल
+				{0} J
+				{0} J
 			
-			
-				eV
-				{0} eV
-				{0} eV
+			
+				kWh
+				{0} kWh
+				{0} kWh
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
+			
+				यूएस थेर्म
+				{0} यूएस थेर्म
+				{0} यूएस थेर्म
 			
 			
-				न्यू॰
-				{0} न्यू॰
-				{0} न्यू॰
+				न्यू॰
+				{0} न्यू॰
+				{0} न्यू॰
+			
+			
+				GHz
+				{0} GHz
+				{0} GHz
+			
+			
+				MHz
+				{0} MHz
+				{0} MHz
+			
+			
+				kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+				{0} Hz
+			
+			
+				पिक्सेल
+			
+			
+				मेगापिक्सेल
 			
 			
 				कि॰मी॰
 				{0} कि॰मी॰
 				{0} कि॰मी॰
-				{0}/कि॰मी॰
+				{0}/कि॰मी॰
 			
 			
 				मीटर
 				{0} मी
 				{0} मी
-				{0}/मी
+				{0}/मी
 			
 			
 				डे॰मी॰
@@ -7322,7 +7704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				सें॰मी॰
 				{0} सें॰मी॰
 				{0} सें॰मी॰
-				{0}/सें॰मी॰
+				{0}/सें॰मी॰
 			
 			
 				मि॰मी॰
@@ -7358,13 +7740,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				फ़ीट
 				{0} फ़ीट
 				{0} फ़ीट
-				{0}/फ़ीट
+				{0}/फ़ीट
 			
 			
 				इंच
 				{0} इंच
 				{0} इंच
-				{0}/इंच
+				{0}/इंच
 			
 			
 				पार्सेक
@@ -7386,23 +7768,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} नॉ॰ मी॰
 				{0} नॉ॰ मी॰
 			
+			
+				smi
+				{0} smi
+				{0} smi
+			
 			
 				pt
 				{0} pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				लक्स
-			
-			
-				L☉
-				{0} L☉
-				{0} L☉
+				{0} lx
+				{0} lx
 			
 			
 				मीट्रिक टन
@@ -7459,32 +7838,89 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} कै॰
 			
 			
-				डाल्टन
-				{0} डाल्टन
-				{0} डाल्टन
+				डाल्टन
+				{0} डाल्टन
+				{0} डाल्टन
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+			
+				GW
+				{0} GW
+				{0} GW
 			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+			
+				MW
+				{0} MW
+				{0} MW
+			
+			
+				kW
+				{0} kW
+				{0} kW
 			
 			
 				वॉट
+				{0} W
+				{0} W
+			
+			
+				mW
+				{0} mW
+				{0} mW
+			
+			
+				hp
+				{0} hp
+				{0} hp
+			
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+				{0} psi
+			
+			
+				inHg
+				{0} inHg
+				{0} inHg
+			
+			
+				बार
+				{0} बार
+				{0} बार
+			
+			
+				mbar
+				{0} mbar
+				{0} mbar
+			
+			
+				atm
+				{0} atm
+				{0} atm
+			
+			
+				पा॰
+				{0} पा॰
+				{0} पा॰
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
-				किपा॰
-				{0} किपा॰
-				{0} किपा॰
+				किपा॰
+				{0} किपा॰
+				{0} किपा॰
 			
 			
-				मेपा॰
-				{0} मेपा॰
-				{0} मेपा॰
+				मेपा॰
+				{0} मेपा॰
+				{0} मेपा॰
 			
 			
 				कि॰मी॰/घं॰
@@ -7502,9 +7938,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मी॰प्र॰घं॰
 			
 			
-				नॉट
-				{0} नॉट
-				{0} नॉट
+				नॉट
+				{0} नॉट
+				{0} नॉट
+			
+			
+				°
+				{0}°
+				{0}°
 			
 			
 				डिग्री सेल्सियस
@@ -7516,15 +7957,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°फ़ेरन
 				{0}°फ़ेरन
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+			
+				K
+				{0} K
+				{0} K
 			
 			
-				न्यू॰मी॰
-				{0} न्यू॰मी॰
-				{0} न्यू॰मी॰
+				न्यू॰मी॰
+				{0} न्यू॰मी॰
+				{0} न्यू॰मी॰
 			
 			
 				घन कि॰मी॰
@@ -7535,13 +7976,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				घन मी॰
 				{0} घन मी॰
 				{0} घन मी॰
-				{0}/घन मी॰
+				{0}/घन मी॰
 			
 			
 				घन सें॰ मी॰
 				{0} घन सें॰ मी॰
 				{0} घन सें॰ मी॰
-				{0}/घन सें॰ मी॰
+				{0}/घन सें॰ मी॰
 			
 			
 				घन मील
@@ -7577,7 +8018,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				लीटर
 				{0} ली॰
 				{0} ली॰
-				{0}/ली॰
+				{0}/ली॰
 			
 			
 				डे॰ली॰
@@ -7595,14 +8036,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मि॰ ली॰
 			
 			
-				मीट्रिक पिंट
-				{0} मीट्रिक पिंट
-				{0} मीट्रिक पिंट
+				मीट्रिक पिंट
+				{0} मीट्रिक पिंट
+				{0} मीट्रिक पिंट
 			
 			
-				मीट्रिक कप
-				{0} मीट्रिक कप
-				{0} मीट्रिक कप
+				मीट्रिक कप
+				{0} मीट्रिक कप
+				{0} मीट्रिक कप
 			
 			
 				एकड़ फ़ीट
@@ -7613,7 +8054,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				गैलन
 				{0} गैलन
 				{0} गैलन
-				{0}/गैलन
+				{0}/गैलन
 			
 			
 				इम्पी॰ गैलन
@@ -7641,11 +8082,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} फ़्लूइड आउंस
 				{0} फ़्लूइड आउंस
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				टे॰ स्पून
 				{0} टे॰ स्पून
@@ -7657,15 +8093,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} टी स्पून
 			
 			
-				बैरल
-				{0} बैरल
-				{0} बैरल
+				बैरल
+				{0} बैरल
+				{0} बैरल
 			
 			
-				दिशा
+				दिशा
+				{0}E
+				{0}N
+				{0}S
+				{0}W
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				गु–बल
 				{0}गु॰
@@ -7707,10 +8150,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ft²
 				{0}ft²
 			
+			
+				%
+				{0}%
+				{0}%
+			
 			
-				ली॰/100 कि॰मी॰
-				{0}ली/100कि
-				{0}ली/100कि
+				ली॰/100 कि॰मी॰
+				{0}ली/100कि
+				{0}ली/100कि
 			
 			
 				वर्ष
@@ -7826,10 +8274,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}एचपी
 				{0}एचपी
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0}" Hg
 				{0}" Hg
@@ -7838,6 +8282,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mb
 				{0}mb
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				कि॰मी॰/घं॰
 				{0}किमी/घं
@@ -7874,7 +8322,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ली॰
 			
 			
-				दिशा
+				दिशा
+				{0}E
+				{0}N
+				{0}S
+				{0}W
 			
 		
 		
@@ -7889,6 +8341,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			{0}, {1}
+			{0}, {1}
 			{0}, और {1}
 			{0} और {1}
 		
@@ -7898,18 +8352,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} या {1}
 			{0} या {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-		
 		
-			{0} और {1}
-			{0} और {1}
+			{0}, {1}
+			{0}, {1}
+			{0} और {1}
+			{0} और {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0}, और {1}
 			{0} और {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+			{0} {1}
+			{0} {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+			{0}, {1}
+			{0}, {1}
+		
 	
 	
 		
@@ -7947,7 +8413,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		dingbat
 		पूर्वानुमान चिह्न
 		नीचे की ओर वाला तीर
-		नीचे की ओर ऊपर की ओर तीर
+		नीचे की ओर ऊपर की ओर तीर
 		पूर्वी एशियाई लिपि
 		इमोजी
 		यूरोपीय लिपि
diff --git a/make/data/cldr/common/main/hi_IN.xml b/make/data/cldr/common/main/hi_IN.xml
index 272df6408bc..737a695fec7 100644
--- a/make/data/cldr/common/main/hi_IN.xml
+++ b/make/data/cldr/common/main/hi_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/hr.xml b/make/data/cldr/common/main/hr.xml
index f7f34d1cecd..f5256170579 100644
--- a/make/data/cldr/common/main/hr.xml
+++ b/make/data/cldr/common/main/hr.xml
@@ -9,10 +9,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
+		
+			{0} ({1})
+			{0}, {1}
+			{0}: {1}
+		
 		
 			afarski
 			abhaski
@@ -86,7 +91,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			karipski
 			cayuga
 			atsam
-			chakma
+			chakma
 			čečenski
 			cebuano
 			chiga
@@ -143,9 +148,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			australski engleski
 			kanadski engleski
 			britanski engleski
-			engleski (UK)
 			američki engleski
-			engleski (SAD)
 			srednjoengleski
 			esperanto
 			španjolski
@@ -540,14 +543,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jidiš
 			jorupski
 			kantonski
+			kineski, kantonski
 			zhuang
 			zapotečki
 			Blissovi simboli
 			zenaga
 			standardni marokanski tamašek
 			kineski
+			kineski, mandarinski
 			kineski (pojednostavljeni)
+			mandarinski kineski (pojednostavljeni)
 			kineski (tradicionalni)
+			mandarinski kineski (tradicionalni)
 			zulu
 			zuni
 			bez jezičnog sadržaja
@@ -791,7 +798,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kanada
 			Kokosovi (Keelingovi) otoci
 			Kongo - Kinshasa
-			Kongo (DRK)
+			Kongo (DR)
 			Srednjoafrička Republika
 			Kongo - Brazzaville
 			Kongo (RK)
@@ -944,7 +951,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Filipini
 			Pakistan
 			Poljska
-			Sveti Petar i Mikelon
+			Saint-Pierre-et-Miquelon
 			Otoci Pitcairn
 			Portoriko
 			Palestinsko područje
@@ -979,7 +986,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Salvador
 			Sint Maarten
 			Sirija
-			Svazi
+			Esvatini
+			Svazi
 			Tristan da Cunha
 			Otoci Turks i Caicos
 			Čad
@@ -1016,8 +1024,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis i Futuna
 			Samoa
-			pseudo naglasci
-			pseudo bidi
+			pseudo naglasci
+			pseudo bidi
 			Kosovo
 			Jemen
 			Mayotte
@@ -1070,22 +1078,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			kalendar
 			Format valute
-			Zanemarivanje poredavanja simbola
-			Obrnuto poredavanje po naglasku
-			Poredavanje po velikim/malim slovima
-			Poredavanje u skladu s veličinom slova
+			Zanemarivanje razvrstavanja simbola
+			Obrnuto razvrstavanje po naglasku
+			Razvrstavanje po velikim/malim slovima
+			Razvrstavanje prema veličini slova
 			Redoslijed razvrstavanja
-			Normalizirano poredavanje
-			Numeričko poredavanje
-			Jačina poredavanja
+			Normalizirano razvrstavanje
+			Brojčano razvrstavanje
+			Jačina razvrstavanja
 			valuta
 			format vremena (12 ili 24)
 			stil prijeloma retka
 			sustav mjernih jedinica
 			brojevi
-			Vremenska zona
-			Varijanta zemlje/jezika
-			Privatna upotreba
+			Vremenska zona
+			Varijanta zemlje/jezika
+			Privatna upotreba
 		
 		
 			budistički kalendar
@@ -1141,8 +1149,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Poredaj po naglascima/veličini/širini/pismu kana
 			Poredaj po naglasku
 			Poredaj po naglascima/veličini/širini
-			Široki
-			Uski
+			Široki
+			Uski
 			Numerički
 			12-satni format (0-11)
 			12-satni format (1-12)
@@ -1234,24 +1242,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c č ć d {dž} đ e f g h i j k l {lj} m n {nj} o p r s š t u v z ž]
 		[q w x y]
 		[A B C Č Ć D {DŽ} Đ E F G H I J K L {LJ} M N {NJ} O P Q R S Š T U V W X Y Z Ž]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[‐ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ ” „ ( ) \[ \] @ * / ′ ″]
+		{0}…
+		…{0}
 		{0}… {1}
 		{0}…
+		… {0}
+		{0} … {1}
+		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1270,6 +1288,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								spring begins
+								rain water
+							
+						
+					
+				
 				
 					
 						
@@ -1295,7 +1341,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
 					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
 						
 							1.
 							2.
@@ -1311,6 +1404,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							12.
 							13.
 						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
 					
 				
 			
@@ -1869,6 +1977,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							HH:mm:ss (zzzz)
 						
 					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
 				
 				
 					
@@ -1927,9 +2050,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d. MMM
 						d. MMMM
 						E, d. MMMM
-						W. 'tjedan' 'u' MMMM
-						W. 'tjedan' 'u' MMMM
-						W. 'tjedan' 'u' MMMM
+						W. 'tjedan' MMMM
+						W. 'tjedan' MMMM
+						W. 'tjedan' MMMM
 						mm:ss
 						y.
 						MM. y.
@@ -2102,7 +2225,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
 					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
 						
 							1.
 							2.
@@ -2117,12 +2284,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11.
 							12.
 						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
 					
 				
+				
+					
+						Saka
+					
+				
 			
 			
 				
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
 					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
 						
 							1.
 							2.
@@ -2137,8 +2367,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11.
 							12.
 						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
 					
 				
+				
+					
+						AH
+					
+				
 				
 					
 						
@@ -2172,6 +2421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						L.
 						d. M.
 						E, d. M.
+						LLL
 						d. MMM
 						E, d. MMM
 						d. MMMM
@@ -2413,6 +2663,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Bunkyū (1861.-1864.)
 						Genji (1864.-1865.)
 						Keiō (1865.-1868.)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 				
 				
@@ -2448,6 +2702,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
 						E, d.
@@ -2458,6 +2722,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						L.
 						d. M.
 						E, d. M.
+						LLL
 						d. MMM
 						E, d. MMM
 						d. MMMM
@@ -2485,7 +2750,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
 					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
 						
 							1.
 							2.
@@ -2500,8 +2809,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11.
 							12.
 						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
 					
 				
+				
+					
+						AP
+					
+				
 			
 			
 				
@@ -2514,6 +2842,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						d.
 						L.
+						LLL
 						d. MMM
 						E, d. MMM
 					
@@ -3300,6 +3629,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kabul
 			
+			
+				Antigua
+			
 			
 				Angvila
 			
@@ -3462,6 +3794,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Saint Barthélemy
 			
+			
+				Bermuda
+			
 			
 				Brunej
 			
@@ -3934,7 +4269,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuvajt
 			
 			
-				Kajman
+				Cayman
 			
 			
 				Aktau
@@ -3949,7 +4284,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktobe
 			
 			
-				Kostanay
+				Kostanay
 			
 			
 				Kizilorda
@@ -4219,7 +4554,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kalinjingrad
 			
 			
-				Simferopol
+				Simferopolj
 			
 			
 				Moskva
@@ -4231,7 +4566,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Saratov
 			
 			
-				Astrakhan
+				Astrahan
 			
 			
 				Uljanovsk
@@ -4243,7 +4578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Samara
 			
 			
-				Ekaterinburg
+				Jekaterinburg
 			
 			
 				Omsk
@@ -4267,7 +4602,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Irkutsk
 			
 			
-				Chita
+				Čita
 			
 			
 				Jakutsk
@@ -4387,7 +4722,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dili
 			
 			
-				Ashgabat
+				Ašgabat
 			
 			
 				Tunis
@@ -4943,12 +5278,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					vrijeme Francuske Gvajane
+					vrijeme Francuske Gijane
 				
 			
 			
 				
-					južnofrancusko i antarktičko vrijeme
+					vrijeme Francuskih južnih i antarktičkih teritorija
 				
 			
 			
@@ -5137,7 +5472,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					vrijeme Otoka Line
+					vrijeme Ekvatorskih otoka
 				
 			
 			
@@ -5541,20 +5876,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					ekaterinburško vrijeme
-					ekaterinburško standardno vrijeme
-					ekaterinburško ljetno vrijeme
+					jekaterinburško vrijeme
+					jekaterinburško standardno vrijeme
+					jekaterinburško ljetno vrijeme
 				
 			
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			,
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5563,6 +5904,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tisuća
@@ -5717,108 +6063,128 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				andorska pezeta
 				andorske pezete
 				andorskih pezeta
+				ADP
 			
 			
 				UAE dirham
 				UAE dirham
 				UAE dirhama
 				UAE dirhama
+				AED
 			
 			
 				afganistanski afgani (1927.–2002.)
 				afganistanski afgan (1927.–2002.)
 				afganistanska afgana (1927.–2002.)
 				afganistanskih afgana (1927.–2002.)
+				AFA
 			
 			
 				afganistanski afgani
 				afganistanski afgan
 				afganistanska afgana
 				afganistanskih afgana
+				AFN
 			
 			
 				stari albanski lek
 				stari albanski lek
 				stara albanska leka
 				starih albanskih leka
+				ALK
 			
 			
 				albanski lek
 				albanski lek
 				albanska leka
 				albanskih leka
+				ALL
 			
 			
 				armenski dram
 				armenski dram
 				armenska drama
 				armenskih drama
+				AMD
 			
 			
 				nizozemskoantilski gulden
 				nizozemskoantilski gulden
 				nizozemskoantilska guldena
 				nizozemskoantilskih guldena
+				ANG
 			
 			
 				angolska kvanza
 				angolska kvanza
 				angolske kvanze
 				angolskih kvanzi
+				AOA
+				Kz
 			
 			
 				angolska kvanza (1977.–1990.)
 				angolska kvanza (1977.–1990.)
 				angolske kvanze (1977.–1990.)
 				angolskih kvanzi (1977.–1990.)
+				AOK
 			
 			
 				angolska nova kvanza (1990.–2000.)
 				angolska nova kvanza (1990.–2000.)
 				angolske nove kvanze (1990.–2000.)
 				angolskih novih kvanzi (1990.–2000.)
+				AON
 			
 			
 				angolska kvanza (1995.–1999.)
 				angolska kvanza (1995.–1999.)
 				angolske kvanze (1995.–1999.)
 				angolskih kvanzi (1995.–1999.)
+				AOR
 			
 			
 				argentinski austral
 				argentinski austral
 				argentinska australa
 				argentinskih australa
+				ARA
 			
 			
 				argentinski pezo lej (1970.–1983.)
 				argentinski pezo lej (1970.–1983.)
 				argentinska pezo leja (1970.–1983.)
 				argentinskih pezo leja (1970.–1983.)
+				ARL
 			
 			
 				argentinski pezo (1881.–1970.)
 				argentinski pezo (1881.–1970.)
 				argentinska peza (1881.–1970.)
 				argentinskih peza (1881.–1970.)
+				ARM
 			
 			
 				argentinski pezo (1983.–1985.)
 				argentinski pezo (1983.–1985.)
 				argentinska peza (1983.–1985.)
 				argentinskih peza (1983.–1985.)
+				ARP
 			
 			
 				argentinski pezo
 				argentinski pezos
 				argentinska pezosa
 				argentinskih pezosa
+				ARS
+				$
 			
 			
 				austrijski šiling
 				austrijski šiling
 				austrijska šilinga
 				austrijskih šilinga
+				ATS
 			
 			
 				australski dolar
@@ -5826,162 +6192,195 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				australska dolara
 				australskih dolara
 				AUD
+				$
 			
 			
 				arupski florin
 				arupski florin
 				arupska florina
 				arupskih florina
+				AWG
 			
 			
 				azerbajdžanski manat (1993.–2006.)
 				azerbajdžanski manat (1993.–2006.)
 				azerbajdžanska manata (1993.–2006.)
 				azerbajdžanskih manata (1993.–2006.)
+				AZM
 			
 			
 				azerbajdžanski manat
 				azerbajdžanski manat
 				azerbajdžanska manata
 				azerbajdžanskih manata
+				AZN
 			
 			
 				bosansko-hercegovački dinar
 				bosansko-hercegovački dinar
 				bosansko-hercegovačka dinara
 				bosansko-hercegovačkih dinara
+				BAD
 			
 			
 				konvertibilna marka
 				konvertibilna marka
 				konvertibilne marke
 				konvertibilnih maraka
+				BAM
+				KM
 			
 			
 				bosansko-hercegovački novi dinar
 				bosansko-hercegovački novi dinar
 				bosansko-hercegovačka nova dinara
 				bosansko-hercegovačkih novih dinara
+				BAN
 			
 			
 				barbadoski dolar
 				barbadoski dolar
 				barbadoska dolara
 				barbadoskih dolara
+				BBD
+				$
 			
 			
 				bangladeška taka
 				bangladeška taka
 				bangladeške take
 				bangladeških taka
+				BDT
+				৳
 			
 			
 				belgijski franak (konvertibilan)
 				belgijski franak (konvertibilan)
 				belgijska franka (konvertibilna)
 				belgijskih franaka (konvertibilnih)
+				BEC
 			
 			
 				belgijski franak
 				belgijski franak
 				belgijska franka
 				belgijskih franaka
+				BEF
 			
 			
 				belgijski franak (financijski)
 				belgijski franak (financijski)
 				belgijska franka (financijska)
 				belgijskih franaka (financijskih)
+				BEL
 			
 			
 				bugarski čvrsti lev
 				bugarski čvrsti lev
 				bugarska čvrsta leva
 				bugarskih čvrstih leva
+				BGL
 			
 			
 				bugarski socijalistički lev
 				bugarski socijalistički lev
 				bugarska socijalistička leva
 				bugarskih socijalističkih leva
+				BGM
 			
 			
 				bugarski lev
 				bugarski lev
 				bugarska leva
 				bugarskih leva
+				BGN
 			
 			
 				stari bugarski lev
 				stari bugarski lev
 				stara bugarska leva
 				starih bugarskih leva
+				BGO
 			
 			
 				bahreinski dinar
 				bahreinski dinar
 				bahreinska dinara
 				bahreinskih dinara
+				BHD
 			
 			
 				burundski franak
 				burundski franak
 				burundska franka
 				burundskih franaka
+				BIF
 			
 			
 				bermudski dolar
 				bermudski dolar
 				bermudska dolara
 				bermudskih dolara
+				BMD
+				$
 			
 			
 				brunejski dolar
 				brunejski dolar
 				brunejska dolara
 				brunejskih dolara
+				BND
+				$
 			
 			
 				bolivijski bolivijano
 				bolivijski bolivijano
 				bolivijska bolivijana
 				bolivijskih bolivijana
+				BOB
+				Bs
 			
 			
 				stari bolivijski bolivijano
 				stari bolivijski bolivijano
 				stara bolivijska bolivijana
 				starih bolivijskih bolivijana
+				BOL
 			
 			
 				bolivijski pezo
 				bolivijski pezo
 				bolivijska peza
 				bolivijskih peza
+				BOP
 			
 			
 				bolivijski mvdol
 				bolivijski mvdol
 				bolivijska mvdola
 				bolivijskih mvdola
+				BOV
 			
 			
 				brazilski novi cruzeiro (1967.–1986.)
 				brazilski novi cruzeir (1967.–1986.)
 				brazilska nova cruzeira (1967.–1986.)
 				brazilskih novih cruzeira (1967.–1986.)
+				BRB
 			
 			
 				brazilski cruzado
 				brazilski cruzad
 				brazilska cruzada
 				brazilskih cruzada
+				BRC
 			
 			
 				brazilski cruzeiro (1990.–1993.)
 				brazilski cruzeir (1990.–1993.)
 				brazilska cruzeira (1990.–1993.)
 				brazilskih cruzeira (1990.–1993.)
+				BRE
 			
 			
 				brazilski real
@@ -5989,72 +6388,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brazilska reala
 				brazilskih reala
 				BRL
+				R$
 			
 			
 				brazilski novi cruzado
 				brazilski novi cruzad
 				brazilska nova cruzada
 				brazilskih novih cruzada
+				BRN
 			
 			
 				brazilski cruzeiro
 				brazilski cruzeiro
 				brazilska cruzeira
 				brazilskih cruzeira
+				BRR
 			
 			
 				stari brazilski kruzeiro
 				stari brazilski kruzeiro
 				stara brazilska kruzeira
 				starih brazilskih kruzeira
+				BRZ
 			
 			
 				bahamski dolar
 				bahamski dolar
 				bahamska dolara
 				bahamskih dolara
+				BSD
+				$
 			
 			
 				butanski ngultrum
 				butanski ngultrum
 				butanska ngultruma
 				butanskih ngultruma
+				BTN
 			
 			
 				burmanski kyat
 				burmanski kyat
 				burmanska kyata
 				burmanskih kyata
+				BUK
 			
 			
 				bocvanska pula
 				bocvanska pula
 				bocvanske pule
 				bocvanskih pula
+				BWP
+				P
 			
 			
 				bjeloruska nova rublja (1994–1999)
 				bjeloruska nova rublja (1994–1999)
 				bjeloruske nove rublje (1994–1999)
 				bjeloruskih novih rublji (1994–1999)
+				BYB
 			
 			
-				bjeloruska rublja
-				bjeloruska rublja
-				bjeloruske rublje
-				bjeloruskih rublji
+				bjeloruski rubalj
+				bjeloruski rubalj
+				bjeloruska rublja
+				bjeloruskih rubalja
+				BYN
+				р.
 			
 			
 				bjeloruska rublja (2000–2016)
 				bjeloruska rublja (2000–2016)
 				bjeloruske rublje (2000–2016)
 				bjeloruskih rublji (2000–2016)
+				BYR
 			
 			
 				belizeanski dolar
 				belizeanski dolar
 				belizeanska dolara
 				belizeanskih dolara
+				BZD
+				$
 			
 			
 				kanadski dolar
@@ -6062,60 +6477,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kanadska dolara
 				kanadskih dolara
 				CAD
+				$
 			
 			
 				kongoanski franak
 				kongoanski franak
 				kongoanska franka
 				kongoanskih franaka
+				CDF
 			
 			
 				WIR euro
 				WIR euro
 				WIR eura
 				WIR eura
+				CHE
 			
 			
 				švicarski franak
 				švicarski franak
 				švicarska franka
 				švicarskih franaka
+				CHF
 			
 			
 				WIR franak
 				WIR franak
 				WIR franka
 				WIR franaka
+				CHW
 			
 			
 				čileanski eskudo
 				čileanski eskudo
 				čileanska eskuda
 				čileanskih eskuda
+				CLE
 			
 			
 				čileanski unidades de fomentos
 				čileanski unidades de fomentos
 				čileanska unidades de fomentos
 				čileanskih unidades de fomentos
+				CLF
 			
 			
 				čileanski pezo
 				čileanski pezo
 				čileanska peza
 				čileanskih peza
+				CLP
+				$
 			
 			
 				kineski juan (offshore)
 				kineski juan (offshore)
 				kineska juana (offshore)
 				kineskih juana (offshore)
+				CNH
 			
 			
 				kineski narodni dolar
 				kineski narodni dolar
 				kineska narodna dolara
 				kineskih narodnih dolara
+				CNX
 			
 			
 				kineski yuan
@@ -6123,156 +6549,191 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kineska yuana
 				kineskih yuana
 				CNY
+				¥
 			
 			
 				kolumbijski pezo
 				kolumbijski pezo
 				kolumbijska peza
 				kolumbijskih peza
+				COP
+				$
 			
 			
 				unidad de valor real
 				unidad de valor real
 				unidad de valor reala
 				unidad de valor reala
+				COU
 			
 			
 				kostarikanski kolon
 				kostarikanski kolon
 				kostarikanska kolona
 				kostarikanskih kolona
+				CRC
+				₡
 			
 			
 				stari srpski dinar
 				stari srpski dinar
 				stara srpska dinara
 				starih srpskih dinara
+				CSD
 			
 			
 				čehoslovačka kruna
 				čehoslovačka kruna
 				čehoslovačke krune
 				čehoslovačkih kruna
+				CSK
 			
 			
 				kubanski konvertibilni pezo
 				kubanski konvertibilni pezo
 				kubanska konvertibilna peza
 				kubanskih konvertibilnih peza
+				CUC
+				$
 			
 			
 				kubanski pezo
 				kubanski pezo
 				kubanska peza
 				kubanskih peza
+				CUP
+				$
 			
 			
 				zelenortski eskudo
 				zelenortski eskudo
 				zelenortska eskuda
 				zelenortskih eskuda
+				CVE
 			
 			
 				ciparska funta
 				ciparska funta
 				ciparske funte
 				ciparskih funti
+				CYP
 			
 			
 				češka kruna
 				češka kruna
 				češke krune
 				čeških kruna
+				CZK
+				Kč
 			
 			
 				istočnonjemačka marka
 				istočnonjemačka marka
 				istočnonjemačke marke
 				istočnonjemačkih marki
+				DDM
 			
 			
 				njemačka marka
 				njemačka marka
 				njemačke marke
 				njemačkih marki
+				DEM
 			
 			
 				džibutski franak
 				džibutski franak
 				džibutska franka
 				džibutskih franaka
+				DJF
 			
 			
 				danska kruna
 				danska kruna
 				danske krune
 				danskih kruna
+				DKK
+				kr
 			
 			
 				dominikanski pezo
 				dominikanski pezo
 				dominikanska peza
 				dominikanskih peza
+				DOP
+				$
 			
 			
 				alžirski dinar
 				alžirski dinar
 				alžirska dinara
 				alžirskih dinara
+				DZD
 			
 			
 				ekvatorska sukra
 				evatorska sucra
 				ekvatorske sucre
 				ekvatorskih sucri
+				ECS
 			
 			
 				ekvatorski unidad de valor constante (UVC)
 				ekvatorski unidad de valor constante (UVC)
 				ekvatorska unidad de valor constante (UVC)
 				ekvatorskih unidad de valor constante (UVC)
+				ECV
 			
 			
 				estonska kruna
 				estonska kruna
 				estonske krune
 				estonskih kruna
+				EEK
 			
 			
 				egipatska funta
 				egipatska funta
 				egipatske funte
 				egipatskih funti
+				EGP
+				E£
 			
 			
 				eritrejska nakfa
 				eritrejska nakfa
 				eritrejske nakfe
 				eritrejskih nakfi
+				ERN
 			
 			
 				španjolska pezeta (A račun)
 				španjolska pezeta (A račun)
 				španjolske pezete (A račun)
 				španjolskih pezeta (A račun)
+				ESA
 			
 			
 				španjolska pezeta (konvertibilni račun)
 				španjolska pezeta (konvertibilan račun)
 				španjolske pezete (konvertibilan račun)
 				španjolskih pezeta (konvertibilan račun)
+				ESB
 			
 			
 				španjolska pezeta
 				španjolska pezeta
 				španjolske pezete
 				španjolskih pezeta
+				ESP
+				₧
 			
 			
 				etiopski bir
 				etiopski bir
 				etiopska bira
 				etiopskih bira
+				ETB
 			
 			
 				euro
@@ -6280,30 +6741,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				eura
 				eura
 				EUR
+				€
 			
 			
 				finska marka
 				finska marka
 				finske marke
 				finskih marki
+				FIM
 			
 			
 				fidžijski dolar
 				fidžijski dolar
 				fidžijska dolara
 				fidžijskih dolara
+				FJD
+				$
 			
 			
 				falklandska funta
 				falklandska funta
 				falklandske funte
 				falklandskih funti
+				FKP
+				£
 			
 			
 				francuski franak
 				francuski franak
 				francuska franka
 				francuskih franaka
+				FRF
 			
 			
 				britanska funta
@@ -6311,18 +6779,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				britanske funte
 				britanskih funti
 				GBP
+				£
 			
 			
 				gruzijski kupon larit
 				gruzijski kupon larit
 				gruzijska kupon larita
 				gruzijskih kupon larita
+				GEK
 			
 			
 				gruzijski lari
 				gruzijski lar
 				gruzijska lara
 				gruzijskih lara
+				GEL
+				₾
 				₾
 			
 			
@@ -6330,133 +6802,163 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ganski cedi (1979.–2007.)
 				ganska ceda (1979.–2007.)
 				ganskih ceda (1979.–2007.)
+				GHC
 			
 			
 				ganski cedi
 				ganski cedi
 				ganska ceda
 				ganskih ceda
+				GHS
 			
 			
 				gibraltarska funta
 				gibraltarska funta
 				gibraltarske funte
 				gibraltarskih funti
+				GIP
+				£
 			
 			
 				gambijski dalas
 				gambijski dalas
 				gambijska dalasa
 				gambijskih dalasa
+				GMD
 			
 			
 				gvinejski franak
 				gvinejski franak
 				gvinejska franka
 				gvinejskih franaka
+				GNF
+				FG
 			
 			
 				gvinejski syli
 				gvinejski syli
 				gvinejska sylija
 				gvinejskih sylija
+				GNS
 			
 			
 				ekvatorski gvinejski ekwele
 				ekvatorski gvinejski ekwele
 				ekvatorski gvinejska ekwele
 				ekvatorskih gvinejskih ekwele
+				GQE
 			
 			
 				grčka drahma
 				grčka drahma
 				grčke drahme
 				grčkih drahmi
+				GRD
 			
 			
 				gvatemalski kvecal
 				gvatemalski kvecal
 				gvatemalska kvecala
 				gvatemalskih kvecala
+				GTQ
+				Q
 			
 			
 				portugalski gvinejski eskudo
 				portugalski gvinejski eskudo
 				portugalska gvinejska eskuda
 				portugalskih gvinejskih eskuda
+				GWE
 			
 			
 				gvinejskobisauski pezo
 				gvinejskobisauski pezo
 				gvinejskobisauska peza
 				gvinejskobisauskih peza
+				GWP
 			
 			
 				gvajanski dolar
 				gvajanski dolar
 				gvajanska dolara
 				gvajanskih dolara
+				GYD
+				$
 			
 			
 				hongkonški dolar
-				honkonški dolar
-				honkonška dolara
-				honkonških dolara
+				hongkonški dolar
+				hongkonška dolara
+				hongkonških dolara
 				HKD
+				$
 			
 			
 				honduraška lempira
 				honduraška lempira
 				honduraške lempire
 				honduraških lempira
+				HNL
+				L
 			
 			
 				hrvatski dinar
 				hrvatski dinar
 				hrvatska dinara
 				hrvatskih dinara
+				HRD
 			
 			
 				hrvatska kuna
 				hrvatska kuna
 				hrvatske kune
 				hrvatskih kuna
+				HRK
+				kn
 			
 			
 				haićanski gourd
 				haićanski gourd
 				haićanska gourda
 				haićanskih gourda
+				HTG
 			
 			
 				mađarska forinta
 				mađarska forinta
 				mađarske forinte
 				mađarskih forinti
+				HUF
+				Ft
 			
 			
 				indonezijska rupija
 				indonezijska rupija
 				indonezijske rupije
 				indonezijskih rupija
+				IDR
+				Rp
 			
 			
 				irska funta
 				irska funta
 				irske funte
 				irskih funti
+				IEP
 			
 			
 				izraelska funta
 				izraelska funta
 				izraelske funte
 				izraelskih funti
+				ILP
 			
 			
 				stari izraelski šekel
 				stari izraelski šekel
 				stara izraelska šekela
 				starih izraelskih šekela
+				ILR
 			
 			
 				novi izraelski šekel
@@ -6464,6 +6966,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nova izraelska šekela
 				novih izraelskih šekela
 				ILS
+				₪
 			
 			
 				indijska rupija
@@ -6471,48 +6974,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				indijske rupije
 				indijskih rupija
 				INR
+				₹
 			
 			
 				irački dinar
 				irački dinar
 				iračka dinara
 				iračkih dinara
+				IQD
 			
 			
 				iranski rijal
 				iranski rijal
 				iranska rijala
 				iranskih rijala
+				IRR
 			
 			
 				stara islandska kruna
 				stara islandska kruna
 				stare islandske krune
 				starih islandskih kruna
+				ISJ
 			
 			
 				islandska kruna
 				islandska kruna
 				islandske krune
 				islandskih kruna
+				ISK
+				kr
 			
 			
 				talijanska lira
 				talijanska lira
 				talijanske lire
 				talijanskih lira
+				ITL
 			
 			
 				jamajčanski dolar
 				jamajčanski dolar
 				jamajčanska dolara
 				jamajčanskih dolara
+				JMD
+				$
 			
 			
 				jordanski dinar
 				jordanski dinar
 				jordanska dinara
 				jordanskih dinara
+				JOD
 			
 			
 				japanski jen
@@ -6520,48 +7033,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				japanska jena
 				japanskih jena
 				JPY
+				¥
 			
 			
 				kenijski šiling
 				kenijski šiling
 				kenijska šilinga
 				kenijskih šilinga
+				KES
 			
 			
 				kirgiski som
 				kirgijski som
 				kirgijska soma
 				kirgijskih soma
+				KGS
 			
 			
-				kambođanski rijal
-				kambođanski rijal
-				kambođanska rijala
-				kambođanskih rijala
+				kambodžanski rijal
+				kambodžanski rijal
+				kambodžanska rijala
+				kambodžanskih rijala
+				KHR
+				៛
 			
 			
 				komorski franak
 				komorski franak
 				komorska franka
 				komorskih franaka
+				KMF
+				CF
 			
 			
 				sjevernokorejski won
 				sjevernokorejski won
 				sjevernokorejska wona
 				sjevernokorejskih wona
+				KPW
+				₩
 			
 			
 				južnokorejski hvan
 				južnokorejski hvan
 				južnokorejska hvana
 				južnokorejskih hvana
+				KRH
 			
 			
 				stari južnokorejski von
 				stari južnokorejski von
 				stara južnokorejska vona
 				starih južnokorejskih vona
+				KRO
 			
 			
 				južnokorejski won
@@ -6569,228 +7093,276 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				južnokorejska wona
 				južnokorejskih wona
 				KRW
+				₩
 			
 			
 				kuvajtski dinar
 				kuvajtski dinar
 				kuvajtska dinara
 				kuvajtskih dinara
+				KWD
 			
 			
 				kajmanski dolar
 				kajmanski dolar
 				kajmanska dolara
 				kajmanskih dolara
+				KYD
+				$
 			
 			
 				kazahstanski tenge
 				kazahstanski tenge
 				kazahstanska tengea
 				kazahstanskih tengea
+				KZT
+				₸
 			
 			
 				laoski kip
 				laoski kip
 				laoska kipa
 				laoskih kipa
+				LAK
+				₭
 			
 			
 				libanonska funta
 				libanonska funta
 				libanonske funte
 				libanonskih funti
+				LBP
+				L£
 			
 			
 				šrilankanska rupija
 				šrilankanska rupija
 				šrilankanske rupije
 				šrilankanskih rupija
+				LKR
+				Rs
 			
 			
 				liberijski dolar
 				liberijski dolar
 				liberijska dolara
 				liberijskih dolara
+				LRD
+				$
 			
 			
 				lesoto loti
 				lesoto loti
 				lesoto lotija
 				lesoto lotija
+				LSL
 			
 			
 				litavski litas
 				litavski litas
 				litavska litasa
 				litavskih litasa
+				LTL
 			
 			
 				litavski talonas
 				litavski talonas
 				litavska talonasa
 				litavskih talonasa
+				LTT
 			
 			
 				luksemburški konvertibilni franak
 				luksemburški konvertibilni franak
 				luksemburška konvertibilna franka
 				luksemburških konvertibilnih franaka
+				LUC
 			
 			
 				luksemburški franak
 				luksemburški franak
 				luksemburška franka
 				luksemburških franaka
+				LUF
 			
 			
 				luksemburški financijski franak
 				luksemburški financijski franak
 				luksemburška financijska franka
 				luksemburških financijskih franaka
+				LUL
 			
 			
 				letonski lats
 				letonski lats
 				letonska latsa
 				letonskih latsa
+				LVL
 			
 			
 				letonska rublja
 				letonska rublja
 				letonske rublje
 				letonskih rublji
+				LVR
 			
 			
 				libijski dinar
 				libijski dinar
 				libijska dinara
 				libijskih dinara
+				LYD
 			
 			
 				marokanski dirham
 				marokanski dirham
 				marokanska dirhama
 				marokanskih dirhama
+				MAD
 			
 			
 				marokanski franak
 				marokanski franak
 				marokanska franka
 				marokanskih franaka
+				MAF
 			
 			
 				monegaški franak
 				monegaški franak
 				monegaška franka
 				monegaških franaka
+				MCF
 			
 			
 				moldavski kupon
 				moldavski kupon
 				moldavska kupona
 				moldavskih kupona
+				MDC
 			
 			
 				moldavski lej
 				moldavski lej
 				moldavska leja
 				moldavskih leja
+				MDL
 			
 			
-				madagaskarski ariary
-				madagaskarski ariary
-				madagaskarska ariarija
-				madagaskarskih ariarija
+				malgaški arijari
+				malgaški arijari
+				malgaška arijarija
+				malgaških arijarija
+				MGA
+				Ar
 			
 			
 				madagaskarski franak
 				madagaskarski franak
 				madagaskarska franka
 				madagaskarskih franaka
+				MGF
 			
 			
 				makedonski denar
 				makedonski denar
 				makedonska denara
 				makedonskih denara
+				MKD
 			
 			
 				stari makedonski denar
 				stari makedonski denar
 				stara makedonska denara
 				starih makedonski denara
+				MKN
 			
 			
 				malijski franak
 				malijski franak
 				malijska franka
 				malijskih franaka
+				MLF
 			
 			
 				mjanmarski kjat
 				mjanmarski kjat
 				mjanmarska kjata
 				mjanmarskih kjata
+				MMK
+				K
 			
 			
 				mongolski tugrik
 				mongolski tugrik
 				mongolska tugrika
 				mongolskih tugrika
+				MNT
+				₮
 			
 			
 				makaoška pataka
 				makaoška pataka
 				makaoške patake
 				makaoških pataka
+				MOP
 			
 			
 				mauritanijska ouguja (1973. – 2017.)
 				mauritanijska ouguja (1973. – 2017.)
 				mauritanijske ouguje (1973. – 2017.)
 				mauritanijskih ouguja (1973. – 2017.)
+				MRO
 			
 			
 				mauritanijska ouguja
 				mauritanijska ouguja
 				mauritanijske ouguje
 				mauritanijskih ouguja
+				MRU
 			
 			
 				malteška lira
 				malteška lira
 				malteške lire
 				malteških lira
+				MTL
 			
 			
 				malteška funta
 				malteška funta
 				malteške funte
 				malteških funti
+				MTP
 			
 			
 				mauricijska rupija
 				mauricijska rupija
 				mauricijske rupije
 				mauricijskih rupija
+				MUR
+				Rs
 			
 			
 				maldivijska rupija
 				maldivijska rupija
 				maldivijske rupije
 				maldivijskih rupija
+				MVP
 			
 			
 				maldivijska rufija
 				maldivijska rufija
 				maldivijske rufije
 				maldivijskih rufija
+				MVR
 			
 			
 				malavijska kvača
 				malavijska kvača
 				malavijske kvače
 				malavijskih kvača
+				MWK
 			
 			
 				meksički pezo
@@ -6798,84 +7370,104 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				meksička peza
 				meksičkih peza
 				MXN
+				$
 			
 			
 				meksički srebrni pezo (1861–1992)
 				meksički srebrni pezo (1861–1992)
 				meksička srebrna peza (1861–1992)
 				meksičkih srebrnih peza (1861–1992)
+				MXP
 			
 			
 				meksički unidad de inversion (UDI)
 				meksički unidads de inversion (UDI)
 				meksička unidads de inversion (UDI)
 				meksičkih unidads de inversion (UDI)
+				MXV
 			
 			
 				malezijski ringit
 				malezijski ringit
 				malezijska ringita
 				malezijskih ringita
+				MYR
+				RM
 			
 			
 				mozambijski eskudo
 				mozambijski eskudo
 				mozambijska eskuda
 				mozambijskih eskuda
+				MZE
 			
 			
 				stari mozambijski metikal
 				stari mozambijski metikal
 				stara mozambijska metikala
 				starih mozambijskih metikala
+				MZM
 			
 			
 				mozambički metikal
 				mozambijski metikal
 				mozambijska metikala
 				mozambijskih metikala
+				MZN
 			
 			
 				namibijski dolar
 				namibijski dolar
 				namibijska dolara
 				namibijskih dolara
+				NAD
+				$
 			
 			
 				nigerijska naira
 				nigerijski nair
 				nigerijska naira
 				nigerijskih naira
+				NGN
+				₦
 			
 			
 				nikaragvanska kordoba
 				nikaragvanska kordoba
 				nikaragvanske kordobe
 				nikaragvanskih kordoba
+				NIC
 			
 			
 				nikaragvanska zlatna kordoba
 				nikaragvanska zlatna kordoba
 				nikaragvanske zlatne kordobe
 				nikaragvanskih zlatnih kordoba
+				NIO
+				C$
 			
 			
 				nizozemski gulden
 				nizozemski gulden
 				nizozemska guldena
 				nizozemskih guldena
+				NLG
 			
 			
 				norveška kruna
 				norveška kruna
 				norveške krune
 				norveških kruna
+				NOK
+				kr
 			
 			
 				nepalska rupija
 				nepalska rupija
 				nepalske rupije
 				nepalskih rupija
+				NPR
+				Rs
 			
 			
 				novozelandski dolar
@@ -6883,324 +7475,399 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				novozelandska dolara
 				novozelandskih dolara
 				NZD
+				$
 			
 			
 				omanski rijal
 				omanski rijal
 				omanska rijala
 				omanskih rijala
+				OMR
 			
 			
 				panamska balboa
 				panamska balboa
 				panamske balboe
 				panamskih balboa
+				PAB
 			
 			
 				peruanski inti
 				peruanski inti
 				peruanske inti
 				peruanskih inti
+				PEI
 			
 			
 				peruanski sol
 				peruanski sol
 				peruanska sola
 				peruanskih sola
+				PEN
 			
 			
 				peruanski sol (1863–1965)
 				peruanski sol (1863–1965)
 				peruanska sola (1863–1965)
 				peruanskih sola (1863–1965)
+				PES
 			
 			
 				kina Papue Nove Gvineje
 				kina Papue Nove Gvineje
 				kine Papue Nove Gvineje
 				kina Papue Nove Gvineje
+				PGK
 			
 			
 				filipinski pezo
 				filipinski pezo
 				filipinska peza
 				filipinskih peza
+				PHP
+				₱
 			
 			
 				pakistanska rupija
 				pakistanska rupija
 				pakistanske rupije
 				pakistanskih rupija
+				PKR
+				Rs
 			
 			
 				poljska zlota
 				poljska zlota
 				poljske zlote
 				poljskih zlota
+				PLN
+				zł
 			
 			
 				poljska zlota (1950.–1995.)
 				poljska zlota (1950.–1995.)
 				poljske zlote (1950.–1995.)
 				poljskih zlota (1950.–1995.)
+				PLZ
 			
 			
 				portugalski eskudo
 				portugalski eskudo
 				portugalska eskuda
 				portugalskih eskuda
+				PTE
 			
 			
 				paragvajski gvarani
 				paragvajski gvarani
 				paragvajska gvaranija
 				paragvajskih gvaranija
+				PYG
+				₲
 			
 			
 				katarski rial
 				katarski rijal
 				katarska rijala
 				katarskih rijala
+				QAR
 			
 			
 				rodezijski dolar
 				rodezijski dolar
 				rodezijska dolara
 				rodezijskih dolara
+				RHD
 			
 			
 				starorumunjski lek
 				stari rumunjski lej
 				stara rumunjska leja
 				starih rumunjskih leja
+				ROL
 			
 			
 				rumunjski lej
 				rumunjski lej
 				rumunjska leja
 				rumunjskih leja
+				RON
+				lei
 			
 			
 				srpski dinar
 				srpski dinar
 				srpska dinara
 				srpskih dinara
+				RSD
 			
 			
-				ruska rublja
-				ruska rublja
-				ruske rublje
-				ruskih rublji
+				ruski rubalj
+				ruski rubalj
+				ruska rublja
+				ruskih rubalja
+				RUB
+				₽
 			
 			
 				ruska rublja (1991.–1998.)
 				ruska rublja (1991.–1998.)
 				ruske rublje (1991.–1998.)
 				ruskih rublji (1991.–1998.)
+				RUR
+				р.
 			
 			
 				ruandski franak
 				ruandski franak
 				ruandska franka
 				ruandskih franaka
+				RWF
+				RF
 			
 			
-				saudijski rial
+				saudijski rijal
 				saudijski rijal
 				saudijska rijala
 				saudijskih rijala
+				SAR
 			
 			
 				solmonskootočni dolar
 				solomonskootočni dolar
 				solomonskootočna dolara
 				solomonskootočnih dolara
+				SBD
+				$
 			
 			
 				sejšelska rupija
 				sejšelska rupija
 				sejšelske rupije
 				sejšelskih rupija
+				SCR
 			
 			
 				sudanski dinar
 				sudanski dinar
 				sudanska dinara
 				sudanskih dinara
+				SDD
 			
 			
 				sudanska funta
 				sudanska funta
 				sudanske funte
 				sudanskih funti
+				SDG
 			
 			
 				stara sudanska funta
 				stara sudanska funta
 				stare sudanske funte
 				starih sudanskih funti
+				SDP
 			
 			
 				švedska kruna
 				švedska kruna
 				švedske krune
 				švedskih kruna
+				SEK
+				kr
 			
 			
 				singapurski dolar
 				singapurski dolar
 				singapurska dolara
 				singapurskih dolara
+				SGD
+				$
 			
 			
 				svetohelenska funta
 				svetohelenska funta
 				svetohelenske funte
 				svetohelenskih funti
+				SHP
+				£
 			
 			
 				slovenski tolar
 				slovenski tolar
 				slovenska tolara
 				slovenskih tolara
+				SIT
 			
 			
 				slovačka kruna
 				slovačka kruna
 				slovačke krune
 				slovačkih kruna
+				SKK
 			
 			
 				sijeraleonski leone
 				sijeraleonski leon
 				sijeraleonske leone
 				sijeraleonskih leona
+				SLL
 			
 			
 				somalijski šiling
 				somalijski šiling
 				somalijska šilinga
 				somalijskih šilinga
+				SOS
 			
 			
 				surinamski dolar
 				surinamski dolar
 				surinamska dolara
 				surinamskih dolara
+				SRD
+				$
 			
 			
 				surinamski gulden
 				surinamski gulden
 				surinamska guldena
 				surinamskih guldena
+				SRG
 			
 			
 				južnosudanska funta
 				južnosudanska funta
 				južnosudanske funte
 				južnosudanskih funti
+				SSP
+				£
 			
 			
 				dobra Svetog Tome i Principa (1977–2017)
 				dobra Svetog Tome i Principa (1977–2017)
 				dobre Svetog Tome i Principa (1977–2017)
 				dobri Svetog Tome i Principa (1977–2017)
+				STD
 			
 			
 				dobra Svetog Tome i Principa
 				dobra Svetog Tome i Principa
 				dobre Svetog Tome i Principa
 				dobri Svetog Tome i Principa
+				STN
+				Db
 			
 			
 				sovjetska rublja
 				sovjetska rublja
 				sovjetske rublje
 				sovjetskih rublji
+				SUR
 			
 			
 				salvadorski kolon
 				salvadorski kolon
 				salvadorska kolona
 				salvadorskih kolona
+				SVC
 			
 			
 				sirijska funta
 				sirijska funta
 				sirijske funte
 				sirijskih funti
+				SYP
+				£
 			
 			
 				svazi lilangeni
 				svazi lilangeni
 				svazi lilangena
 				svazi lilangena
+				SZL
 			
 			
 				tajlandski baht
 				tajlandski baht
 				tajlandska bahta
 				tajlandskih bahta
+				THB
+				฿
 			
 			
 				tajikistanska rublja
 				tadžikistanska rublja
 				tadžikistanske rublje
 				tadžikistanskih rublji
+				TJR
 			
 			
 				tadžikistanski somoni
 				tadžikistanski somoni
 				tadžikistanska somona
 				tadžikistanskih somona
+				TJS
 			
 			
 				turkmenistanski manat (1993.–2009.)
 				turkmenistanski manat (1993.–2009.)
 				turkmenistanska manata (1993.–2009.)
 				turkmenistanskih manata (1993.–2009.)
+				TMM
 			
 			
 				turkmenistanski manat
 				turkmenistanski manat
 				turkmenistanska manata
 				turkmenistanskih manata
+				TMT
 			
 			
 				tuniski dinar
 				tuniski dinar
 				tuniska dinara
 				tuniskih dinara
+				TND
 			
 			
 				tongaška pa’anga
 				tongaška pa’anga
 				tongaške pa’ange
 				tongaških pa’angi
+				TOP
+				T$
 			
 			
 				timorski eskudo
 				timorski eskudo
 				timorska eskuda
 				timorskih eskuda
+				TPE
 			
 			
 				turska lira (1922.–2005.)
 				turska lira (1922.–2005.)
 				turske lire (1922.–2005.)
 				turskih lira (1922.–2005.)
+				TRL
 			
 			
 				turska lira
 				turska lira
 				turske lire
 				turskih lira
+				TRY
+				₺
+				TL
 			
 			
 				trininadtobaški dolar
 				trinidadtobaški dolar
 				trinidadtobaška dolara
 				trinidadtobaških dolara
+				TTD
+				$
 			
 			
 				novotajvanski dolar
@@ -7215,30 +7882,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tanzanijski šiling
 				tanzanijska šilinga
 				tanzanijskih šilinga
+				TZS
 			
 			
 				ukrajinska hrivnja
 				ukrajinska hrivnja
 				ukrajinske hrivnje
 				ukrajinskih hrivnji
+				UAH
+				₴
 			
 			
 				ukrajinski karbovanet
 				ukrajinski karbovantsiv
 				ukrajinska karbovantsiva
 				ukrajinskih karbovantsiva
+				UAK
 			
 			
 				ugandski šiling (1966.–1987.)
 				ugandski šiling (1966.–1987.)
 				ugandska šilinga (1966.–1987.)
 				ugandskih šilinga (1966.–1987.)
+				UGS
 			
 			
 				ugandski šiling
 				ugandski šiling
 				ugandska šilinga
 				ugandskih šilinga
+				UGX
 			
 			
 				američki dolar
@@ -7246,60 +7919,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				američka dolara
 				američkih dolara
 				USD
+				$
 			
 			
 				američki dolar (sljedeći dan)
 				američki dolar (sljedeći dan)
 				američka dolara (sljedeći dan)
 				američkih dolara (sljedeći dan)
+				USN
 			
 			
 				američki dolar (isti dan)
 				američki dolar (isti dan)
 				američka dolara (isti dan)
 				američkih dolara (isti dan)
+				USS
 			
 			
 				urugvajski pezo en unidades indexadas
 				urugvajski pesos en unidades indexadas
 				urugvajska pesosa en unidades indexadas
 				urugvajskih pesosa en unidades indexadas
+				UYI
 			
 			
 				urugvajski pezo (1975.–1993.)
 				urugvajski pezo (1975.–1993.)
 				urugvajska peza (1975.–1993.)
 				urugvajskih peza (1975.–1993.)
+				UYP
 			
 			
 				urugvajski pezo
 				urugvajski pezo
 				urugvajska pezosa
 				urugvajskih pezosa
+				UYU
+				$
 			
 			
 				uzbekistanski som
 				uzbekistanski som
 				uzbekistanska soma
 				uzbekistanskih soma
+				UZS
 			
 			
 				venezuelanski bolivar (1871.–2008.)
 				venezuelanski bolivar (1871.–2008.)
 				venezuelanska bolivara (1871.–2008.)
 				venezuelanskih bolivara (1871.–2008.)
+				VEB
 			
 			
 				venezuelanski bolivar (2008. – 2018.)
 				venezuelanski bolivar (2008. – 2018.)
 				venezuelanska bolivara (2008. – 2018.)
 				venezuelanskih bolivara (2008. – 2018.)
+				VEF
+				Bs
 			
 			
 				venezuelanski bolivar
 				venezuelanski bolivar
 				venezuelanska bolivara
 				venezuelanskih bolivara
+				VES
 			
 			
 				vijetnamski dong
@@ -7307,66 +7992,77 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vijetnamska donga
 				vijetnamskih donga
 				VND
+				₫
 			
 			
 				vijetnamski dong (1978.–1985.)
 				vijetnamski dong (1978.–1985.)
 				vijetnamska donga (1978.–1985.)
 				vijetnamskih donga (1978.–1985.)
+				VNN
 			
 			
 				vanuatski vatu
 				vanuatski vatu
 				vanuatska vatua
 				vanuatskih vatua
+				VUV
 			
 			
 				samoanska tala
 				samoanska tala
 				samoanske tale
 				samoanskih tala
+				WST
 			
 			
 				CFA franak BEAC
 				CFA franak BEAC
 				CFA franka BEAC
 				CFA franaka BEAC
+				FCFA
 			
 			
 				srebro
 				srebro
 				srebra
 				srebra
+				XAG
 			
 			
 				zlato
 				zlato
 				zlata
 				zlata
+				XAU
 			
 			
 				Europska složena jedinica
 				europska složena jedinica
 				europske složene jedinice
 				europskih složenih jedinica
+				XBA
 			
 			
 				Europska monetarna jedinica
 				europska monetarna jedinica
 				europske monetarne jedinice
 				europskih monetarnih jedinica
+				XBB
 			
 			
 				europska obračunska jedinica (XBC)
 				europska obračunska jedinica (XBC)
 				europske obračunske jedinice (XBC)
 				europskih obračunskih jedinica (XBC)
+				XBC
 			
 			
 				europska obračunska jedinica (XBD)
 				europska obračunska jedinica (XBD)
 				europske obračunske jedinice (XBD)
 				europskih obračunskih jedinica (XBD)
+				XBD
 			
 			
 				istočnokaripski dolar
@@ -7374,42 +8070,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				istočnokaripska dolara
 				istočnokaripskih dolara
 				XCD
+				$
 			
 			
 				posebna crtaća prava
 				posebno crtaće pravo
 				poseebna crtaća prava
 				posebnih crtaćih prava
+				XDR
 			
 			
 				europska monetarna jedinica (ECU)
 				europska monetarna jedinica (ECU)
 				europske monetarne jedinice (ECU)
 				europskih monetarnih jedinica (ECU)
+				XEU
 			
 			
 				francuski zlatni franak
 				francuski zlatni franak
 				francuska zlatna franka
 				francuskih zlatnih franaka
+				XFO
 			
 			
 				francuski UIC-franak
 				francuski UIC-franak
 				francuska UIC-franka
 				francuskih UIC-franaka
+				XFU
 			
 			
 				CFA franak BCEAO
 				CFA franak BCEAO
 				CFA franka BCEAO
 				CFA franaka BCEAO
+				CFA
 			
 			
 				paladij
 				paladij
 				paladija
 				paladija
+				XPD
 			
 			
 				CFP franak
@@ -7423,30 +8126,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				platina
 				platine
 				platina
+				XPT
 			
 			
 				RINET fondovi
 				RINET fond
 				RINET fonda
 				RINET fondova
+				XRE
 			
 			
 				sukre
 				sukra
 				sukre
 				sukri
+				XSU
 			
 			
 				ispitni kod valute
 				ispitni kod vlaute
 				ispitna koda valute
 				ispitnih kodova valute
+				XTS
 			
 			
 				obračunska jedinica ADB
 				obračunska jedinica ADB
 				obračunske jedinice ADB
 				obračunskih jedinica ADB
+				XUA
 			
 			
 				nepoznata valuta
@@ -7460,90 +8168,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenski dinar
 				jemenska dinara
 				jemenskih dinara
+				YDD
 			
 			
-				jemenski rial
+				jemenski rijal
 				jemenski rijal
 				jemenska rijala
 				jemenskih rijala
+				YER
 			
 			
 				jugoslavenski čvrsti dinar
 				jugoslavenski čvrsti dinar
 				jugoslavenska čvrsta dinara
 				jugoslavenskih čvrstih dinara
+				YUD
 			
 			
 				jugoslavenski novi dinar
 				jugoslavenski novi dinar
 				jugoslavenska nova dinara
 				jugoslavenskih novih dinara
+				YUM
 			
 			
 				jugoslavenski konvertibilni dinar
 				jugoslavenski konvertibilni dinar
 				jugoslavenska konvertibilna dinara
 				jugoslavenskih konvertibilnih dinara
+				YUN
 			
 			
 				jugoslavenski reformirani dinar
 				jugoslavenski reformirani dinar
 				jugoslavenska reformirana dinara
 				jugoslavenskih reformiranih dinara
+				YUR
 			
 			
 				južnoafrički rand (financijski)
 				južnoafrički rand (financijski)
 				južnoafrička randa (financijska)
 				južnoafričkih randa (financijskih)
+				ZAL
 			
 			
 				južnoafrički rand
 				južnoafrički rand
 				južnoafrička randa
 				južnoafričkih randa
+				ZAR
+				R
 			
 			
 				zambijska kvača (1968–2012)
 				zambijska kvača (1968–2012)
 				zambijske kvače (1968–2012)
 				zambijskih kvača (1968–2012)
+				ZMK
 			
 			
 				zambijska kvača
 				zambijska kvača
 				zambijske kvače
 				zambijskih kvača
+				ZMW
+				ZK
 			
 			
 				zairski novi zair
 				zairski novi zair
 				zairska nova zaira
 				zairskih novih zaira
+				ZRN
 			
 			
 				zairski zair
 				zairski zair
 				zairska zaira
 				zairskih zaira
+				ZRZ
 			
 			
 				zimbabveanski dolar (1980.–2008.)
 				zimbabveanski dolar (1980.–2008.)
 				zimbabveanska dolara (1980.–2008.)
 				zimbabveanskih dolara (1980.–2008.)
+				ZWD
 			
 			
 				zimbabveanski dolar (2009)
 				zimbabveanski dolar (2009)
 				zimbabveanska dolara (2009)
 				zimbabveanskih dolara (2009)
+				ZWL
 			
 			
 				zimbabveanski dolar (2008)
 				zimbabveanski dolar (2008)
 				zimbabveanska dolara (2008)
 				zimbabveanskih dolara (2008)
+				ZWR
 			
 		
 		
@@ -7561,8 +8286,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				{0}/{1}
+			
 			
 				G
+				{0} G
+				{0} G
+				{0} G
 			
 			
 				metri u sekundi na kvadrat
@@ -7605,7 +8336,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kvadratni kilometar
 				{0} kvadratna kilometra
 				{0} kvadratnih kilometara
-				{0} po kvadratnom kilometru
+				{0} po kvadratnom kilometru
 			
 			
 				hektari
@@ -7618,19 +8349,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kvadratni metar
 				{0} kvadratna metra
 				{0} kvadratnih metara
+				{0}/m²
 			
 			
 				kvadratni centimetri
 				{0} kvadratni centimetar
 				{0} kvadratna centimetra
 				{0} kvadratnih centimetara
+				{0}/cm²
 			
 			
 				kvadratne milje
 				{0} kvadratna milja
 				{0} kvadratne milje
 				{0} kvadratnih milja
-				{0} po kvadratnoj milji
+				{0} po kvadratnoj milji
 			
 			
 				katastarska jutra
@@ -7655,12 +8388,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kvadratni inč
 				{0} kvadratna inča
 				{0} kvadratnih inča
+				{0}/in²
 			
 			
-				dunami
-				{0} dunama
-				{0} dunama
-				{0} dunama
+				dunami
+				{0} dunama
+				{0} dunama
+				{0} dunama
 			
 			
 				karati
@@ -7706,9 +8440,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				moli
-				{0} mola
-				{0} mola
-				{0} mola
+				{0} mola
+				{0} mola
+				{0} mola
 			
 			
 				litre po kilometru
@@ -7806,6 +8540,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} stoljeća
 				{0} stoljeća
 			
+			
+				desetljeća
+				{0} desetljeće
+				{0} desetljeća
+				{0} desetljeća
+			
 			
 				godine
 				{0} godina
@@ -7839,18 +8579,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sat
 				{0} sata
 				{0} sati
+				{0}/h
 			
 			
 				minute
 				{0} minuta
 				{0} minute
 				{0} minuta
+				{0}/min
 			
 			
 				sekunde
 				{0} sekunda
 				{0} sekunde
 				{0} sekundi
+				{0}/s
 			
 			
 				milisekunde
@@ -7931,16 +8674,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilovatsati
 			
 			
-				elektronvolti
-				{0} elektronvolt
-				{0} elektronvolta
-				{0} elektronvolta
+				elektronvolti
+				{0} elektronvolt
+				{0} elektronvolta
+				{0} elektronvolta
 			
 			
-				britanske termalne jedinice
-				{0} britanska termalna jedinica
-				{0} britanske termalne jedinice
-				{0} britanskih termalnih jedinica
+				britanske termalne jedinice
+				{0} britanska termalna jedinica
+				{0} britanske termalne jedinice
+				{0} britanskih termalnih jedinica
+			
+			
+				SAD therm
+				{0} SAD therm
+				{0} SAD therma
+				{0} SAD therma
 			
 			
 				funte sile
@@ -7978,17 +8727,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} herca
 				{0} herca
 			
+			
+				tipografski em
+				{0} tipografski em
+				{0} tipografska ema
+				{0} tipografskih ema
+			
+			
+				pikseli
+				{0} piksel
+				{0} piksela
+				{0} piksela
+			
+			
+				megapikseli
+				{0} megapiksel
+				{0} megapiksela
+				{0} megapiksela
+			
+			
+				pikseli po centimetru
+				{0} piksel po centimetru
+				{0} piksela po centimetru
+				{0} piksela po centimetru
+			
+			
+				pikseli po inču
+				{0} piksel po inču
+				{0} piksela po inču
+				{0} piksela po inču
+			
+			
+				točke po centimetru
+				{0} točka po centimetru
+				{0} točke po centimetru
+				{0} točaka po centimetru
+			
+			
+				točke po inču
+				{0} točka po inču
+				{0} točke po inču
+				{0} točaka po inču
+			
 			
 				kilometri
 				{0} kilometar
 				{0} kilometra
 				{0} kilometara
+				{0}/km
 			
 			
 				metri
 				{0} metar
 				{0} metra
 				{0} metara
+				{0}/m
 			
 			
 				decimetri
@@ -8001,6 +8794,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} centimetar
 				{0} centimetra
 				{0} centimetara
+				{0}/cm
 			
 			
 				milimetri
@@ -8043,12 +8837,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} stopa
 				{0} stope
 				{0} stopa
+				{0}/ft
 			
 			
 				inči
 				{0} inč
 				{0} inča
 				{0} inča
+				{0}/in
 			
 			
 				parseci
@@ -8099,10 +8895,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} točaka
 			
 			
-				Sunčevi polumjeri
-				{0} Sunčev polumjer
-				{0} Sunčeva polumjera
-				{0} Sunčevih polumjera
+				Sunčevi polumjeri
+				{0} Sunčev polumjer
+				{0} Sunčeva polumjera
+				{0} Sunčevih polumjera
 			
 			
 				luksi
@@ -8127,12 +8923,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilogram
 				{0} kilograma
 				{0} kilograma
+				{0}/kg
 			
 			
 				grami
 				{0} gram
 				{0} grama
 				{0} grama
+				{0}/g
 			
 			
 				miligrami
@@ -8163,12 +8961,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} funta
 				{0} funte
 				{0} funti
+				{0}/lb
 			
 			
 				unce
 				{0} unca
 				{0} unce
 				{0} unci
+				{0}/oz
 			
 			
 				troy unce
@@ -8183,22 +8983,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karata
 			
 			
-				daltoni
-				{0} dalton
-				{0} daltona
-				{0} daltona
+				daltoni
+				{0} dalton
+				{0} daltona
+				{0} daltona
 			
 			
-				Zemljine mase
-				{0} Zemljina masa
-				{0} Zemljine mase
-				{0} Zemljinih masa
+				Zemljine mase
+				{0} Zemljina masa
+				{0} Zemljine mase
+				{0} Zemljinih masa
 			
 			
-				Sunčeve mase
-				{0} Sunčeva masa
-				{0} Sunčeve mase
-				{0} Sunčevih masa
+				Sunčeve mase
+				{0} Sunčeva masa
+				{0} Sunčeve mase
+				{0} Sunčevih masa
 			
 			
 				gigavati
@@ -8236,12 +9036,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} konjske snage
 				{0} konjskih snaga
 			
-			
-				hektopaskali
-				{0} hektopaskal
-				{0} hektopaskala
-				{0} hektopaskala
-			
 			
 				milimetri živina stupca
 				{0} milimetar živina stupca
@@ -8260,6 +9054,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inča žive
 				{0} inča žive
 			
+			
+				bari
+				{0} bar
+				{0} bara
+				{0} bara
+			
 			
 				milibari
 				{0} milibar
@@ -8272,6 +9072,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfere
 				{0} atmosfera
 			
+			
+				paskali
+				{0} paskal
+				{0} paskala
+				{0} paskala
+			
+			
+				hektopaskali
+				{0} hektopaskal
+				{0} hektopaskala
+				{0} hektopaskala
+			
 			
 				kilopaskali
 				{0} kilopaskal
@@ -8303,10 +9115,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} milja na sat
 			
 			
-				čvor
-				{0} čvor
-				{0} čvora
-				{0} čvorova
+				čvor
+				{0} čvor
+				{0} čvora
+				{0} čvorova
+			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
 			
 			
 				Celzijevi stupnjevi
@@ -8349,12 +9167,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kubni metar
 				{0} kubna metra
 				{0} kubnih metara
+				{0}/m³
 			
 			
 				kubni centimetri
 				{0} kubni centimetar
 				{0} kubna centimetra
 				{0} kubnih centimetara
+				{0}/cm³
 			
 			
 				kubne milje
@@ -8397,6 +9217,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} litra
 				{0} litre
 				{0} litara
+				{0}/l
 			
 			
 				decilitri
@@ -8417,16 +9238,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mililitara
 			
 			
-				metričke pinte
-				{0} metrička pinta
-				{0} metričke pinte
-				{0} metričkih pinti
+				metričke pinte
+				{0} metrička pinta
+				{0} metričke pinte
+				{0} metričkih pinti
 			
 			
-				metričke šalice
-				{0} metrička šalica
-				{0} metričke šalice
-				{0} metričkih šalica
+				metričke šalice
+				{0} metrička šalica
+				{0} metričke šalice
+				{0} metričkih šalica
 			
 			
 				aker-stope
@@ -8445,14 +9266,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} galon
 				{0} galona
 				{0} galona
-				{0}/gal
+				{0}/gal
 			
 			
-				imp. galoni
-				{0} imp. galon
-				{0} imp. galona
-				{0} imp. galona
-				{0} po imp. galonu
+				imp. galoni
+				{0} imp. galon
+				{0} imp. galona
+				{0} imp. galona
+				{0} po imp. galonu
 			
 			
 				četvrtine
@@ -8479,10 +9300,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tekućih unci
 			
 			
-				imp. tekuće unce
-				{0} imp. tekuća unca
-				{0} imp. tekuće unce
-				{0} imp. tekućih unci
+				imp. tekuće unce
+				{0} imp. tekuća unca
+				{0} imp. tekuće unce
+				{0} imp. tekućih unci
 			
 			
 				žlice
@@ -8497,22 +9318,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} žličica
 			
 			
-				bareli
-				{0} barel
-				{0} barela
-				{0} barela
+				bareli
+				{0} barel
+				{0} barela
+				{0} barela
 			
 			
 				kardinalni smjer
-				{0}I
-				{0}S
-				{0}J
-				{0}Z
+				{0}I
+				{0}S
+				{0}J
+				{0}Z
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				G
+				{0} G
+				{0} G
+				{0} G
+			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
+				{0} m/s²
 			
 			
 				okr.
@@ -8520,8 +9353,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} okr.
 				{0} okr.
 			
+			
+				rad
+				{0} rad
+				{0} rad
+				{0} rad
+			
 			
 				°
+				{0}°
+				{0}°
+				{0}°
 			
 			
 				min
@@ -8535,8 +9377,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} s
 				{0} s
 			
+			
+				km²
+				{0} km²
+				{0} km²
+				{0} km²
+				{0}/km²
+			
 			
 				ha
+				{0} ha
+				{0} ha
+				{0} ha
+			
+			
+				m²
+				{0} m²
+				{0} m²
+				{0} m²
+				{0}/m²
+			
+			
+				cm²
+				{0} cm²
+				{0} cm²
+				{0} cm²
+				{0}/cm²
+			
+			
+				mi²
+				{0} mi²
+				{0} mi²
+				{0} mi²
+				{0}/mi²
 			
 			
 				kj
@@ -8544,11 +9417,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kj
 				{0} kj
 			
+			
+				yd²
+				{0} yd²
+				{0} yd²
+				{0} yd²
+			
+			
+				ft²
+				{0} ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				in²
+				{0} in²
+				{0} in²
+				{0} in²
+				{0}/in²
+			
 			
-				dunami
-				{0} dunama
-				{0} dunama
-				{0} dunama
+				dunami
+				{0} dunama
+				{0} dunama
+				{0} dunama
+			
+			
+				kt
+				{0} kt
+				{0} kt
+				{0} kt
 			
 			
 				mg/dl
@@ -8562,27 +9460,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 				{0} mmol/l
 			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+				{0} ppm
+			
 			
+				%
 				{0} %
 				{0} %
 				{0} %
 			
 			
+				‰
 				{0} ‰
 				{0} ‰
 				{0} ‰
 			
 			
-				‱
 				{0} ‱
 				{0} ‱
 				{0} ‱
 			
 			
-				mol
-				{0} mola
-				{0} mola
-				{0} mola
+				{0} mola
+				{0} mola
+				{0} mola
 			
 			
 				l/km
@@ -8608,6 +9512,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg imp.
 				{0} mpg imp.
 			
+			
+				PB
+				{0} PB
+				{0} PB
+				{0} PB
+			
+			
+				TB
+				{0} TB
+				{0} TB
+				{0} TB
+			
+			
+				Tb
+				{0} Tb
+				{0} Tb
+				{0} Tb
+			
+			
+				GB
+				{0} GB
+				{0} GB
+				{0} GB
+			
+			
+				Gb
+				{0} Gb
+				{0} Gb
+				{0} Gb
+			
+			
+				MB
+				{0} MB
+				{0} MB
+				{0} MB
+			
+			
+				Mb
+				{0} Mb
+				{0} Mb
+				{0} Mb
+			
+			
+				kB
+				{0} kB
+				{0} kB
+				{0} kB
+			
+			
+				kb
+				{0} kb
+				{0} kb
+				{0} kb
+			
 			
 				bajt
 				{0} bajt
@@ -8615,6 +9573,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bajtova
 			
 			
+				bit
 				{0} bit
 				{0} bita
 				{0} bitova
@@ -8625,6 +9584,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} st.
 				{0} st.
 			
+			
+				des.
+				{0} des.
+				{0} des.
+				{0} des.
+			
 			
 				g.
 				{0} g.
@@ -8655,18 +9620,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				h
+				{0} h
+				{0} h
+				{0} h
+				{0}/h
+			
+			
+				min
+				{0} min
+				{0} min
+				{0} min
+				{0}/min
 			
 			
 				s
+				{0} s
+				{0} s
+				{0} s
+				{0}/s
+			
+			
+				ms
+				{0} ms
+				{0} ms
+				{0} ms
+			
+			
+				μs
+				{0} μs
+				{0} μs
+				{0} μs
+			
+			
+				ns
+				{0} ns
+				{0} ns
+				{0} ns
 			
 			
 				A
+				{0} A
+				{0} A
+				{0} A
+			
+			
+				mA
+				{0} mA
+				{0} mA
+				{0} mA
 			
 			
 				Ω
+				{0} Ω
+				{0} Ω
+				{0} Ω
 			
 			
 				V
+				{0} V
+				{0} V
+				{0} V
+			
+			
+				kcal
+				{0} kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+				{0} cal
+				{0} cal
 			
 			
 				kcal
@@ -8674,50 +9699,202 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kcal
 				{0} kcal
 			
+			
+				kJ
+				{0} kJ
+				{0} kJ
+				{0} kJ
+			
 			
 				J
+				{0} J
+				{0} J
+				{0} J
 			
-			
-				eV
-				{0} eV
-				{0} eV
-				{0} eV
+			
+				kWh
+				{0} kWh
+				{0} kWh
+				{0} kWh
 			
 			
-				BTU
-				{0} BTU
-				{0} BTU
-				{0} BTU
+				BTU
+				{0} BTU
+				{0} BTU
+				{0} BTU
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
+			
+				SAD therm
+				{0} SAD therm
+				{0} SAD therma
+				{0} SAD therma
 			
-			
-				N
-				{0} N
-				{0} N
-				{0} N
+			
+				GHz
+				{0} GHz
+				{0} GHz
+				{0} GHz
+			
+			
+				MHz
+				{0} MHz
+				{0} MHz
+				{0} MHz
+			
+			
+				kHz
+				{0} kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+				{0} Hz
+				{0} Hz
+			
+			
+				em
+				{0} em
+				{0} ema
+				{0} emova
+			
+			
+				px
+				{0} px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+			
+			
+				km
+				{0} km
+				{0} km
+				{0} km
+				{0}/km
 			
 			
 				m
+				{0} m
+				{0} m
+				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
+				{0} dm
+			
+			
+				cm
+				{0} cm
+				{0} cm
+				{0} cm
+				{0}/cm
+			
+			
+				mm
+				{0} mm
+				{0} mm
+				{0} mm
+			
+			
+				µm
+				{0} µm
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+				{0} nm
+			
+			
+				pm
+				{0} pm
+				{0} pm
+				{0} pm
+			
+			
+				mi
+				{0} mi
+				{0} mi
+				{0} mi
 			
 			
 				jardi
+				{0} yd
+				{0} yd
+				{0} yd
 			
 			
 				stope
+				{0} ft
+				{0} ft
+				{0} ft
+				{0}/ft
 			
 			
 				inči
+				{0} in
+				{0} in
+				{0} in
+				{0}/in
+			
+			
+				pc
+				{0} pc
+				{0} pc
+				{0} pc
 			
 			
 				svjetlosne g.
+				{0} ly
+				{0} ly
+				{0} ly
+			
+			
+				au
+				{0} au
+				{0} au
+				{0} au
 			
 			
 				furlonzi
+				{0} fur
+				{0} fur
+				{0} fur
 			
 			
 				hv
@@ -8725,23 +9902,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hv
 				{0} hv
 			
+			
+				nmi
+				{0} nmi
+				{0} nmi
+				{0} nmi
+			
+			
+				smi
+				{0} smi
+				{0} smi
+				{0} smi
+			
 			
 				točke
+				{0} pt
+				{0} pt
+				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
+			
+				lx
+				{0} lx
+				{0} lx
+				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
+			
+				t
+				{0} t
+				{0} t
+				{0} t
+			
+			
+				kg
+				{0} kg
+				{0} kg
+				{0} kg
+				{0}/kg
 			
 			
 				g
+				{0} g
+				{0} g
+				{0} g
+				{0}/g
+			
+			
+				mg
+				{0} mg
+				{0} mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
+				{0} µg
+				{0} µg
+			
+			
+				tn
+				{0} tn
+				{0} tn
+				{0} tn
+			
+			
+				st
+				{0} st
+				{0} st
+				{0} st
+			
+			
+				lb
+				{0} lb
+				{0} lb
+				{0} lb
+				{0}/lb
+			
+			
+				oz
+				{0} oz
+				{0} oz
+				{0} oz
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
+				{0} oz t
+				{0} oz t
 			
 			
 				ct
@@ -8750,25 +9997,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ct
 			
 			
-				daltoni
-				{0} Da
-				{0} Da
-				{0} Da
+				daltoni
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
+			
+				GW
+				{0} GW
+				{0} GW
+				{0} GW
 			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
+			
+				MW
+				{0} MW
+				{0} MW
+				{0} MW
+			
+			
+				kW
+				{0} kW
+				{0} kW
+				{0} kW
 			
 			
 				W
+				{0} W
+				{0} W
+				{0} W
+			
+			
+				mW
+				{0} mW
+				{0} mW
+				{0} mW
 			
 			
 				KS
@@ -8776,29 +10035,101 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} KS
 				{0} KS
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+				{0} mm Hg
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
+			
+				psi
+				{0} psi
+				{0} psi
+				{0} psi
+			
+			
+				inHg
+				{0} inHg
+				{0} inHg
+				{0} inHg
+			
+			
+				bar
+				{0} bar
+				{0} bara
+				{0} bara
+			
+			
+				mbar
+				{0} mbar
+				{0} mbar
+				{0} mbar
+			
+			
+				atm
+				{0} atm
+				{0} atm
+				{0} atm
+			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
+			
+				km/h
+				{0} km/h
+				{0} km/h
+				{0} km/h
+			
+			
+				m/s
+				{0} m/s
+				{0} m/s
+				{0} m/s
+			
+			
+				mi/h
+				{0} mi/h
+				{0} mi/h
+				{0} mi/h
 			
 			
-				čv
-				{0} čv
-				{0} čv
-				{0} čv
+				čv
+				{0} čv
+				{0} čv
+				{0} čv
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+			
+			
+				°C
+				{0} °C
+				{0} °C
+				{0} °C
+			
+			
+				°F
+				{0} °F
+				{0} °F
+				{0} °F
+			
+			
+				K
+				{0} K
+				{0} K
+				{0} K
 			
 			
 				Nm
@@ -8806,6 +10137,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Nm
 				{0} Nm
 			
+			
+				km³
+				{0} km³
+				{0} km³
+				{0} km³
+			
+			
+				m³
+				{0} m³
+				{0} m³
+				{0} m³
+				{0}/m³
+			
+			
+				cm³
+				{0} cm³
+				{0} cm³
+				{0} cm³
+				{0}/cm³
+			
+			
+				mi³
+				{0} mi³
+				{0} mi³
+				{0} mi³
+			
+			
+				yd³
+				{0} yd³
+				{0} yd³
+				{0} yd³
+			
+			
+				ft³
+				{0} ft³
+				{0} ft³
+				{0} ft³
+			
+			
+				in³
+				{0} in³
+				{0} in³
+				{0} in³
+			
 			
 				Ml
 				{0} Ml
@@ -8820,6 +10195,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				l
+				{0} l
+				{0} l
+				{0} l
+				{0}/l
 			
 			
 				dl
@@ -8839,25 +10218,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				mpt
+				{0} mpt
+				{0} mpt
+				{0} mpt
+			
 			
-				m. šalica
+				m. šalica
+				{0} mc
+				{0} mc
+				{0} mc
+			
+			
+				ac ft
+				{0} ac ft
+				{0} ac ft
+				{0} ac ft
+			
+			
+				bu
+				{0} bu
+				{0} bu
+				{0} bu
 			
 			
 				gal
 				{0} gal
 				{0} gal
 				{0} gal
-				{0}/gal
+				{0}/gal
 			
 			
-				imp. gal.
-				{0} imp. gal.
-				{0} imp. gal.
-				{0} imp. gal.
-				{0}/imp. gal.
+				imp. gal.
+				{0} imp. gal.
+				{0} imp. gal.
+				{0} imp. gal.
+				{0}/imp. gal.
+			
+			
+				qt
+				{0} qt
+				{0} qt
+				{0} qt
+			
+			
+				pt
+				{0} pt
+				{0} pt
+				{0} pt
 			
 			
 				šalice
+				{0} c
+				{0} c
+				{0} c
 			
 			
 				fl oz
@@ -8866,31 +10281,100 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				imp. fl oz
-				{0} imp. fl oz
-				{0} imp. fl oz
-				{0} imp. fl oz
+				imp. fl oz
+				{0} imp. fl oz
+				{0} imp. fl oz
+				{0} imp. fl oz
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
+			
+				tbsp
+				{0} tbsp
+				{0} tbsp
+				{0} tbsp
+			
+			
+				tsp
+				{0} tsp
+				{0} tsp
+				{0} tsp
 			
 			
 				smjer
-				{0}I
-				{0}S
-				{0}J
-				{0}Z
+				{0}I
+				{0}S
+				{0}J
+				{0}Z
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0} G
+				{0} G
+				{0} G
+			
+			
+				{0} m/s²
+				{0} m/s²
+				{0} m/s²
+			
+			
+				{0} rad
+				{0} rad
+				{0} rad
+			
+			
+				{0}°
+				{0}°
+				{0}°
+			
+			
+				{0} km²
+				{0} km²
+				{0} km²
+			
+			
+				{0} ha
+				{0} ha
+				{0} ha
+			
+			
+				{0} m²
+				{0} m²
+				{0} m²
+			
+			
+				{0} cm²
+				{0} cm²
+				{0} cm²
+			
+			
+				{0} mi²
+				{0} mi²
+				{0} mi²
+			
 			
 				{0} kj
 				{0} kj
 				{0} kj
 			
+			
+				{0} yd²
+				{0} yd²
+				{0} yd²
+			
+			
+				{0} ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				{0} in²
+				{0} in²
+				{0} in²
+			
 			
 				{0} kt
 				{0} kt
@@ -8903,6 +10387,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 			
 			
+				%
 				{0} %
 				{0} %
 				{0} %
@@ -8923,6 +10408,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg
 				{0} mpg
 			
+			
+				{0} TB
+				{0} TB
+				{0} TB
+			
+			
+				{0} Tb
+				{0} Tb
+				{0} Tb
+			
+			
+				{0} GB
+				{0} GB
+				{0} GB
+			
+			
+				{0} Gb
+				{0} Gb
+				{0} Gb
+			
+			
+				{0} MB
+				{0} MB
+				{0} MB
+			
+			
+				{0} Mb
+				{0} Mb
+				{0} Mb
+			
+			
+				{0} kB
+				{0} kB
+				{0} kB
+			
+			
+				{0} kb
+				{0} kb
+				{0} kb
+			
 			
 				{0} bajt
 				{0} bajta
@@ -8959,14 +10484,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				h
+				{0} h
+				{0} h
+				{0} h
 			
 			
+				min
 				{0} m
 				{0} m
 				{0} m
 			
 			
 				s
+				{0} s
+				{0} s
+				{0} s
+			
+			
+				ms
+				{0} ms
+				{0} ms
+				{0} ms
+			
+			
+				{0} μs
+				{0} μs
+				{0} μs
+			
+			
+				{0} ns
+				{0} ns
+				{0} ns
+			
+			
+				{0} A
+				{0} A
+				{0} A
+			
+			
+				{0} mA
+				{0} mA
+				{0} mA
+			
+			
+				{0} Ω
+				{0} Ω
+				{0} Ω
+			
+			
+				{0} V
+				{0} V
+				{0} V
+			
+			
+				{0} kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				{0} cal
+				{0} cal
+				{0} cal
 			
 			
 				kcal
@@ -8974,8 +10552,94 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kcal
 				{0} kcal
 			
+			
+				{0} kJ
+				{0} kJ
+				{0} kJ
+			
+			
+				{0} J
+				{0} J
+				{0} J
+			
+			
+				{0} kWh
+				{0} kWh
+				{0} kWh
+			
+			
+				{0} GHz
+				{0} GHz
+				{0} GHz
+			
+			
+				{0} MHz
+				{0} MHz
+				{0} MHz
+			
+			
+				{0} kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				{0} Hz
+				{0} Hz
+				{0} Hz
+			
+			
+				km
+				{0} km
+				{0} km
+				{0} km
+			
 			
 				m
+				{0} m
+				{0} m
+				{0} m
+			
+			
+				{0} dm
+				{0} dm
+				{0} dm
+			
+			
+				cm
+				{0} cm
+				{0} cm
+				{0} cm
+			
+			
+				mm
+				{0} mm
+				{0} mm
+				{0} mm
+			
+			
+				{0} µm
+				{0} µm
+				{0} µm
+			
+			
+				{0} nm
+				{0} nm
+				{0} nm
+			
+			
+				{0} pm
+				{0} pm
+				{0} pm
+			
+			
+				{0} mi
+				{0} mi
+				{0} mi
+			
+			
+				{0} yd
+				{0} yd
+				{0} yd
 			
 			
 				{0}′
@@ -8987,30 +10651,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}″
 			
+			
+				{0} pc
+				{0} pc
+				{0} pc
+			
+			
+				{0} ly
+				{0} ly
+				{0} ly
+			
+			
+				{0} au
+				{0} au
+				{0} au
+			
+			
+				{0} fur
+				{0} fur
+				{0} fur
+			
 			
 				hv
 				{0} hv
 				{0} hv
 				{0} hv
 			
+			
+				{0} nmi
+				{0} nmi
+				{0} nmi
+			
+			
+				{0} lx
+				{0} lx
+				{0} lx
+			
+			
+				{0} t
+				{0} t
+				{0} t
+			
+			
+				kg
+				{0} kg
+				{0} kg
+				{0} kg
+			
 			
 				g
+				{0} g
+				{0} g
+				{0} g
+			
+			
+				{0} mg
+				{0} mg
+				{0} mg
+			
+			
+				{0} µg
+				{0} µg
+				{0} µg
+			
+			
+				{0} tn
+				{0} tn
+				{0} tn
+			
+			
+				st
+				{0} st
+				{0} st
+				{0} st
+			
+			
+				{0} lb
+				{0} lb
+				{0} lb
+			
+			
+				{0} oz
+				{0} oz
+				{0} oz
+			
+			
+				{0} oz t
+				{0} oz t
+				{0} oz t
 			
 			
 				{0} ct
 				{0} ct
 				{0} ct
 			
+			
+				{0} GW
+				{0} GW
+				{0} GW
+			
+			
+				{0} MW
+				{0} MW
+				{0} MW
+			
+			
+				{0} kW
+				{0} kW
+				{0} kW
+			
+			
+				{0} W
+				{0} W
+				{0} W
+			
+			
+				{0} mW
+				{0} mW
+				{0} mW
+			
 			
 				{0} KS
 				{0} KS
 				{0} KS
 			
+			
+				{0} mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				{0} psi
+				{0} psi
+				{0} psi
+			
+			
+				{0} inHg
+				{0} inHg
+				{0} inHg
+			
 			
 				{0} mb
 				{0} mb
 				{0} mb
 			
+			
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
+			
+				km/h
+				{0} km/h
+				{0} km/h
+				{0} km/h
+			
+			
+				{0} m/s
+				{0} m/s
+				{0} m/s
+			
+			
+				{0} mi/h
+				{0} mi/h
+				{0} mi/h
+			
+			
+				°C
+				{0} °C
+				{0} °C
+				{0} °C
+			
+			
+				{0}°F
+				{0}°F
+				{0}°F
+			
+			
+				{0} K
+				{0} K
+				{0} K
+			
+			
+				{0} km³
+				{0} km³
+				{0} km³
+			
+			
+				{0} m³
+				{0} m³
+				{0} m³
+			
+			
+				{0} cm³
+				{0} cm³
+				{0} cm³
+			
+			
+				{0} mi³
+				{0} mi³
+				{0} mi³
+			
+			
+				{0} yd³
+				{0} yd³
+				{0} yd³
+			
+			
+				{0} ft³
+				{0} ft³
+				{0} ft³
+			
+			
+				{0} in³
+				{0} in³
+				{0} in³
+			
 			
 				{0} Ml
 				{0} Ml
@@ -9023,6 +10879,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				l
+				{0} l
+				{0} l
+				{0} l
 			
 			
 				{0} dl
@@ -9039,22 +10898,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				{0} ac ft
+				{0} ac ft
+				{0} ac ft
+			
+			
+				bu
+				{0} bu
+				{0} bu
+				{0} bu
+			
 			
 				{0} gal
 				{0} gal
 				{0} gal
 			
+			
+				{0} qt
+				{0} qt
+				{0} qt
+			
+			
+				{0} pt
+				{0} pt
+				{0} pt
+			
+			
+				{0} c
+				{0} c
+				{0} c
+			
 			
 				{0} fl oz
 				{0} fl oz
 				{0} fl oz
 			
+			
+				{0} tbsp
+				{0} tbsp
+				{0} tbsp
+			
+			
+				{0} tsp
+				{0} tsp
+				{0} tsp
+			
 			
 				smjer
-				{0}I
-				{0}S
-				{0}J
-				{0}Z
+				{0}I
+				{0}S
+				{0}J
+				{0}Z
 			
 		
 		
@@ -9069,18 +10964,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			{0}, {1}
+			{0}, {1}
 			{0} i {1}
 			{0} i {1}
 		
 		
-			{0} ili {1}
-			{0} ili {1}
-		
-		
 			{0}, {1}
 			{0}, {1}
-			{0} i {1}
-			{0} i {1}
+			{0} ili {1}
+			{0} ili {1}
 		
 		
 			{0}, {1}
@@ -9089,6 +10982,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} i {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0} i {1}
 			{0} i {1}
 		
@@ -9098,6 +10993,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} {1}
 			{0} {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 	
 	
 		
diff --git a/make/data/cldr/common/main/hr_BA.xml b/make/data/cldr/common/main/hr_BA.xml
index 278f25480df..cfd0ee54661 100644
--- a/make/data/cldr/common/main/hr_BA.xml
+++ b/make/data/cldr/common/main/hr_BA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/hr_HR.xml b/make/data/cldr/common/main/hr_HR.xml
index c16361ddb18..36ca01a6f32 100644
--- a/make/data/cldr/common/main/hr_HR.xml
+++ b/make/data/cldr/common/main/hr_HR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/hsb.xml b/make/data/cldr/common/main/hsb.xml
index 7c5841969f1..5f05c32f9e9 100644
--- a/make/data/cldr/common/main/hsb.xml
+++ b/make/data/cldr/common/main/hsb.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -75,9 +75,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			awstralska jendźelšćina
 			kanadiska jendźelšćina
 			britiska jendźelšćina
-			jendźelšćina (UK)
 			ameriska jendźelšćina
-			jendźelšćina (USA)
 			esperanto
 			španišćina
 			łaćonskoameriska španišćina
@@ -513,8 +511,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			St. Martin
 			Madagaskar
 			Marshallowe kupy
-			Makedonska
-			Makedonska (FYROM)
 			Mali
 			Myanmar
 			Mongolska
@@ -701,8 +697,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c č ć d {dź} e ě f g h {ch} i j k ł l m n ń o ó p q r ř s š t u v w x y z ž]
 		[á à ă â å ä ã ą ā æ ç ď đ é è ĕ ê ë ė ę ē ğ í ì ĭ î ï İ ī ı ĺ ľ ň ñ ò ŏ ô ö ő ø ō œ ŕ ś ş ß ť ú ù ŭ û ů ü ű ū ý ÿ ż ź]
 		[A B C Č Ć D {DŹ} E F G H {CH} I J K Ł L M N O P Q R S Š T U V W X Y Z Ž]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 	
 	
 		„
@@ -5186,13 +5182,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} konjace mocy
 				{0} konjacych mocow
 			
-			
-				hektopascale
-				{0} hektopascal
-				{0} hektopascalej
-				{0} hektopascale
-				{0} hektopascalow
-			
 			
 				milimetry žiwoslěbroweho stołpika
 				{0} milimeter žiwoslěbroweho stołpika
@@ -5221,6 +5210,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} milibary
 				{0} milibarow
 			
+			
+				hektopascale
+				{0} hektopascal
+				{0} hektopascalej
+				{0} hektopascale
+				{0} hektopascalow
+			
 			
 				kilometry na hodźinu
 				{0} kilometer na hodźinu
@@ -6009,13 +6005,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} PS
 				{0} PS
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6044,6 +6033,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -6459,12 +6455,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} PS
 				{0} PS
 			
-			
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -6477,6 +6467,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
diff --git a/make/data/cldr/common/main/hsb_DE.xml b/make/data/cldr/common/main/hsb_DE.xml
index 1003d953a49..0f5d53e0ba9 100644
--- a/make/data/cldr/common/main/hsb_DE.xml
+++ b/make/data/cldr/common/main/hsb_DE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/hu.xml b/make/data/cldr/common/main/hu.xml
index 6e2df1f0a0c..9bbcb08187a 100644
--- a/make/data/cldr/common/main/hu.xml
+++ b/make/data/cldr/common/main/hu.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -57,20 +57,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			balucsi
 			balinéz
 			basza
-			bamun
-			gomala
+			bamun
+			gomala
 			belarusz
 			bedzsa
 			bemba
 			bena
-			bafut
+			bafut
 			bolgár
 			nyugati beludzs
 			bodzspuri
 			bislama
 			bikol
 			bini
-			kom
+			kom
 			siksika
 			bambara
 			bangla
@@ -79,16 +79,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			braj
 			bodo
 			bosnyák
-			koszi
+			koszi
 			burját
 			buginéz
-			bulu
+			bulu
 			blin
-			medumba
+			medumba
 			katalán
 			caddo
 			karib
-			kajuga
+			kajuga
 			atszam
 			csakma
 			csecsen
@@ -147,9 +147,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ausztrál angol
 			kanadai angol
 			brit angol
-			angol (UK)
 			amerikai angol
-			angol (USA)
 			közép angol
 			eszperantó
 			spanyol
@@ -181,7 +179,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ír
 			ga
 			gagauz
-			gan kínai
+			gan kínai
 			gajo
 			gbaja
 			skóciai kelta
@@ -203,7 +201,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			gvicsin
 			hausza
 			haida
-			hakka kínai
+			hakka kínai
 			hawaii
 			héber
 			hindi
@@ -248,7 +246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			kamba
 			kawi
 			kabardi
-			kanembu
+			kanembu
 			tyap
 			makonde
 			kabuverdianu
@@ -311,13 +309,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			lujia
 			lett
 			madurai
-			mafa
+			mafa
 			magahi
 			maithili
 			makaszar
 			mandingó
 			masai
-			maba
+			maba
 			moksán
 			mandar
 			mende
@@ -347,11 +345,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			mirandéz
 			márvári
 			burmai
-			myene
+			myene
 			erzjány
 			mázanderáni
 			naurui
-			min nan kínai
+			min nan kínai
 			nápolyi
 			nama
 			norvég (bokmål)
@@ -438,7 +436,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			szindhi
 			dél-kurd
 			északi számi
-			szeneka
+			szeneka
 			szena
 			szölkup
 			kojra-szenni
@@ -447,7 +445,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			szerbhorvát
 			tachelhit
 			san
-			csádi arab
+			csádi arab
 			szingaléz
 			szidamó
 			szlovák
@@ -521,7 +519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			üzbég
 			vai
 			venda
-			vietnami
+			vietnámi
 			volapük
 			votják
 			vunjo
@@ -532,7 +530,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			vasó
 			warlpiri
 			volof
-			wu kínai
+			wu kínai
 			kalmük
 			xhosza
 			szoga
@@ -543,14 +541,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jiddis
 			joruba
 			kantoni
+			kantoni kínai
 			zsuang
 			zapoték
 			Bliss jelképrendszer
 			zenaga
 			marokkói tamazight
 			kínai
+			mandarin
 			egyszerűsített kínai
+			kínai (egyszerűsített)
 			hagyományos kínai
+			kínai (hagyományos)
 			zulu
 			zuni
 			nincs nyelvészeti tartalom
@@ -660,7 +662,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
+			
+			
 			
 			
 			
@@ -772,7 +777,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kongó (Köztársaság)
 			Svájc
 			Elefántcsontpart
-			CI
 			Cook-szigetek
 			Chile
 			Kamerun
@@ -884,7 +888,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Marshall-szigetek
 			Észak-Macedónia
 			Mali
-			Mianmar (Burma)
+			Mianmar
 			Mongólia
 			Makaó KKT
 			Makaó
@@ -955,6 +959,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Szíria
 			Szváziföld
+			Eswatini
 			Tristan da Cunha
 			Turks- és Caicos-szigetek
 			Csád
@@ -991,8 +996,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis és Futuna
 			Szamoa
-			Pszeudo-nyelvjárások
-			Pszeudo-kétirányú
+			Pszeudo-nyelvjárások
+			Pszeudo-kétirányú
 			Koszovó
 			Jemen
 			Mayotte
@@ -1062,21 +1067,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Naptár
 			Pénznemformátum
-			Szimbólumokat figyelmen kívül hagyó rendezés
-			Ékezetek fordított rendezése
-			Rendezés nagy- vagy kisbetűk szerint
-			Kisbetű-nagybetű érzékeny rendezés
+			Szimbólumokat figyelmen kívül hagyó rendezés
+			Ékezetek fordított rendezése
+			Rendezés nagy- vagy kisbetűk szerint
+			Kisbetű-nagybetű érzékeny rendezés
 			Rendezési sorrend
-			Normalizált rendezés
-			Numerikus rendezés
-			Rendezés erőssége
+			Normalizált rendezés
+			Numerikus rendezés
+			Rendezés erőssége
 			Pénznem
 			Óraformátum (12 – 24)
 			Sortörés stílusa
 			Mértékegységrendszer
 			Számok
-			Időzóna
-			Földrajzi helyvariáns
+			Időzóna
+			Földrajzi helyvariáns
 			Privát használatra
 		
 		
@@ -1111,7 +1116,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Előző rendezési sorrend a kompatibilitás érdekében
 			Szótári rendezési sorrend
 			Alapértelmezett Unicode rendezési sorrend
-			Európai rendezési szabályok
+			Emodzsi rendezési sorrend
+			Európai rendezési szabályok
 			Egyszerűsített kínai sorrend - GB2312
 			Telefonkönyv sorrend
 			Fonetikus rendezési sorrend
@@ -1209,8 +1215,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á b c {cs} {ccs} d {dz} {ddz} {dzs} {ddzs} e é f g {gy} {ggy} h i í j k l {ly} {lly} m n {ny} {nny} o ó ö ő p r s {sz} {ssz} t {ty} {tty} u ú ü ű v z {zs} {zzs}]
 		[à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ô ø ō œ q ù ŭ û ū w x y ÿ]
 		[A Á B C {CS} D {DZ} {DZS} E É F G {GY} H I Í J K L {LY} M N {NY} O Ó Ö Ő P Q R S {SZ} T {TY} U Ú Ü Ű V W X Y Z {ZS}]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- – , ; \: ! ? . … ' ’ " ” „ « » ( ) \[ \] \{ \} ⟨ ⟩ § @ * / \& # ~ ⁒]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ – , ; \: ! ? . … ' ’ " ” „ « » ( ) \[ \] \{ \} ⟨ ⟩ § @ * / \& # ~ ⁒]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1224,13 +1230,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1410,6 +1411,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1478,6 +1493,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1568,56 +1597,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
 						
-							h:mm B – h:mm B
-							h:mm–h:mm B
 							h:mm – h:mm B
 						
 						
 							d–d.
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							a h – a h
 							a h–h
@@ -2138,56 +2123,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d.
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							a h – a h
 							a h–h
@@ -2608,12 +2546,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						R.O.C. előtt
+						R.O.C.
 					
 					
 						R.O.C. előtt
+						R.O.C.
 					
 					
 						R.O.C. előtt
+						R.O.C.
 					
 				
 			
@@ -3189,7 +3130,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				óra
+				ó
 				
 					{0} óra múlva
 					{0} óra múlva
@@ -3223,7 +3164,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				perc
+				p
 				
 					{0} perc múlva
 					{0} perc múlva
@@ -3257,7 +3198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				másodperc
+				mp
 				
 					{0} másodperc múlva
 					{0} másodperc múlva
@@ -3293,7 +3234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					egyezményes koordinált világidő
+					Koordinált világidő
 				
 			
 			
@@ -3957,13 +3898,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oral
 			
 			
-				Atyrau
+				Atirau
 			
 			
 				Aktöbe
 			
 			
-				Kosztanaj
+				Kosztanaj
 			
 			
 				Kizilorda
@@ -5562,19 +5503,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			latn
 		
-		4
+		1
 		
 			,
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ezer
@@ -5696,6 +5645,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				EAE-dirham
 				EAE-dirham
 				EAE-dirham
+				AED
 			
 			
 				afgán afghani (1927–2002)
@@ -5706,26 +5656,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afgán afghani
 				afgán afghani
 				afgán afghani
+				AFN
 			
 			
 				albán lek
 				albán lek
 				albán lek
+				ALL
 			
 			
 				örmény dram
 				örmény dram
 				örmény dram
+				AMD
 			
 			
 				holland antilláki forint
 				holland antilláki forint
 				holland antilláki forint
+				ANG
 			
 			
 				angolai kwanza
 				angolai kwanza
 				angolai kwanza
+				AOA
+				Kz
 			
 			
 				Angolai kwanza (1977–1990)
@@ -5756,6 +5712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentin peso
 				argentin peso
 				argentin peso
+				ARS
 				$
 			
 			
@@ -5768,11 +5725,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ausztrál dollár
 				ausztrál dollár
 				AUD
+				$
 			
 			
 				arubai florin
 				arubai florin
 				arubai florin
+				AWG
 			
 			
 				azerbajdzsáni manat (1993–2006)
@@ -5783,6 +5742,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				azerbajdzsáni manat
 				azerbajdzsáni manat
 				azerbajdzsáni manat
+				AZN
 			
 			
 				Bosznia-hercegovinai dínár (1992–1994)
@@ -5793,16 +5753,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bosznia-hercegovinai konvertibilis márka
 				bosznia-hercegovinai konvertibilis márka
 				bosznia-hercegovinai konvertibilis márka
+				BAM
+				KM
 			
 			
 				barbadosi dollár
 				barbadosi dollár
 				barbadosi dollár
+				BBD
+				$
 			
 			
 				bangladesi taka
 				bangladesi taka
 				bangladesi taka
+				BDT
+				৳
 			
 			
 				Belga frank (konvertibilis)
@@ -5828,31 +5794,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolgár új leva
 				bolgár új leva
 				bolgár új leva
+				BGN
 			
 			
 				bahreini dinár
 				bahreini dinár
 				bahreini dinár
+				BHD
 			
 			
 				burundi frank
 				burundi frank
 				burundi frank
+				BIF
 			
 			
 				bermudai dollár
 				bermudai dollár
 				bermudai dollár
+				BMD
+				$
 			
 			
 				brunei dollár
 				brunei dollár
 				brunei dollár
+				BND
+				$
 			
 			
 				bolíviai boliviano
 				bolíviai boliviano
 				bolíviai boliviano
+				BOB
+				Bs
 			
 			
 				Bolíviai peso
@@ -5900,48 +5875,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahamai dollár
 				bahamai dollár
 				bahamai dollár
+				BSD
+				$
 			
 			
 				bhutáni ngultrum
 				bhutáni ngultrum
 				bhutáni ngultrum
+				BTN
 			
 			
 				Burmai kyat
+				burmai kjap
+				burmai kjap
 			
 			
 				botswanai pula
 				botswanai pula
 				botswanai pula
+				BWP
+				P
 			
 			
 				Fehérorosz új rubel (1994–1999)
 			
 			
-				fehérorosz rubel
-				fehérorosz rubel
-				fehérorosz rubel
+				belarusz rubel
+				belarusz rubel
+				belarusz rubel
+				BYN
+				р.
 			
 			
 				fehérorosz rubel (2000–2016)
 				fehérorosz rubel (2000–2016)
 				fehérorosz rubel (2000–2016)
+				BYR
 			
 			
 				belize-i dollár
 				belize-i dollár
 				belize-i dollár
+				BZD
+				$
 			
 			
 				kanadai dollár
 				kanadai dollár
 				kanadai dollár
 				CAD
+				$
 			
 			
 				kongói frank
 				kongói frank
 				kongói frank
+				CDF
 			
 			
 				WIR euro
@@ -5950,6 +5939,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svájci frank
 				svájci frank
 				svájci frank
+				CHF
 			
 			
 				WIR frank
@@ -5961,6 +5951,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chilei peso
 				chilei peso
 				chilei peso
+				CLP
+				$
 			
 			
 				kínai jüan (offshore)
@@ -5979,6 +5971,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kolumbiai peso
 				kolumbiai peso
 				kolumbiai peso
+				COP
 				$
 			
 			
@@ -5988,6 +5981,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Costa Rica-i colon
 				Costa Rica-i colon
 				Costa Rica-i colon
+				CRC
+				₡
 			
 			
 				szerb dinár
@@ -5999,16 +5994,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kubai konvertibilis peso
 				kubai konvertibilis peso
 				kubai konvertibilis peso
+				CUC
+				$
 			
 			
 				kubai peso
 				kubai peso
 				kubai peso
+				CUP
+				$
 			
 			
 				Cape Verde-i escudo
 				Cape Verde-i escudo
 				Cape Verde-i escudo
+				CVE
 			
 			
 				Ciprusi font
@@ -6017,6 +6017,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cseh korona
 				cseh korona
 				cseh korona
+				CZK
+				Kč
 			
 			
 				Kelet-Német márka
@@ -6028,22 +6030,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dzsibuti frank
 				dzsibuti frank
 				dzsibuti frank
+				DJF
 			
 			
 				dán korona
 				dán korona
 				dán korona
+				DKK
 				kr
 			
 			
 				dominikai peso
 				dominikai peso
 				dominikai peso
+				DOP
+				$
 			
 			
 				algériai dínár
 				algériai dínár
 				algériai dínár
+				DZD
 			
 			
 				Ecuadori sucre
@@ -6058,11 +6065,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				egyiptomi font
 				egyiptomi font
 				egyiptomi font
+				EGP
+				E£
 			
 			
 				eritreai nakfa
 				eritreai nakfa
 				eritreai nakfa
+				ERN
 			
 			
 				spanyol peseta (A–kontó)
@@ -6077,6 +6087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				etiópiai birr
 				etiópiai birr
 				etiópiai birr
+				ETB
 			
 			
 				euró
@@ -6092,11 +6103,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fidzsi dollár
 				fidzsi dollár
 				fidzsi dollár
+				FJD
+				$
 			
 			
 				falkland-szigeteki font
 				falkland-szigeteki font
 				falkland-szigeteki font
+				FKP
+				£
 			
 			
 				Francia frank
@@ -6115,6 +6130,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				grúz lari
 				grúz lari
 				grúz lari
+				GEL
+				₾
 				₾
 			
 			
@@ -6124,21 +6141,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghánai cedi
 				ghánai cedi
 				ghánai cedi
+				GHS
 			
 			
 				gibraltári font
 				gibraltári font
 				gibraltári font
+				GIP
+				£
 			
 			
 				gambiai dalasi
 				gambiai dalasi
 				gambiai dalasi
+				GMD
 			
 			
 				guineai frank
 				guineai frank
 				guineai frank
+				GNF
+				FG
 			
 			
 				Guineai syli
@@ -6155,6 +6178,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guatemalai quetzal
 				guatemalai quetzal
 				guatemalai quetzal
+				GTQ
+				Q
 			
 			
 				Portugál guinea escudo
@@ -6166,6 +6191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guyanai dollár
 				guyanai dollár
 				guyanai dollár
+				GYD
 				$
 			
 			
@@ -6179,6 +6205,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hodurasi lempira
 				hodurasi lempira
 				hodurasi lempira
+				HNL
+				L
 			
 			
 				Horvát dínár
@@ -6187,23 +6215,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				horvát kuna
 				horvát kuna
 				horvát kuna
+				HRK
 				kn
 			
 			
 				haiti gourde
 				haiti gourde
 				haiti gourde
+				HTG
 			
 			
 				magyar forint
 				magyar forint
 				magyar forint
 				Ft
+				Ft
 			
 			
 				indonéz rúpia
 				indonéz rúpia
 				indonéz rúpia
+				IDR
+				Rp
 			
 			
 				Ír font
@@ -6216,27 +6249,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				izraeli új sékel
 				izraeli új sékel
 				ILS
+				₪
 			
 			
 				indiai rúpia
 				indiai rúpia
 				indiai rúpia
 				INR
+				₹
 			
 			
 				iraki dínár
 				iraki dínár
 				iraki dínár
+				IQD
 			
 			
 				iráni rial
 				iráni rial
 				iráni rial
+				IRR
 			
 			
 				izlandi korona
 				izlandi korona
 				izlandi korona
+				ISK
 				kr
 			
 			
@@ -6246,11 +6284,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jamaicai dollár
 				jamaicai dollár
 				jamaicai dollár
+				JMD
+				$
 			
 			
 				jordániai dínár
 				jordániai dínár
 				jordániai dínár
+				JOD
 			
 			
 				japán jen
@@ -6263,26 +6304,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kenyai shilling
 				kenyai shilling
 				kenyai shilling
+				KES
 			
 			
 				kirgizisztáni szom
 				kirgizisztáni szom
 				kirgizisztáni szom
+				KGS
 			
 			
 				kambodzsai riel
 				kambodzsai riel
 				kambodzsai riel
+				KHR
+				៛
 			
 			
 				comorei frank
 				comorei frank
 				comorei frank
+				KMF
+				CF
 			
 			
 				észak-koreai won
 				észak-koreai won
 				észak-koreai won
+				KPW
 				₩
 			
 			
@@ -6296,36 +6344,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuvaiti dínár
 				kuvaiti dínár
 				kuvaiti dínár
+				KWD
 			
 			
 				kajmán-szigeteki dollár
 				kajmán-szigeteki dollár
 				kajmán-szigeteki dollár
+				KYD
+				$
 			
 			
 				kazahsztáni tenge
 				kazahsztáni tenge
 				kazahsztáni tenge
+				KZT
+				₸
 			
 			
 				laoszi kip
 				laoszi kip
 				laoszi kip
+				LAK
+				₭
 			
 			
 				libanoni font
 				libanoni font
 				libanoni font
+				LBP
+				L£
 			
 			
 				Srí Lanka-i rúpia
 				Srí Lanka-i rúpia
 				Srí Lanka-i rúpia
+				LKR
+				Rs
 			
 			
 				libériai dollár
 				libériai dollár
 				libériai dollár
+				LRD
+				$
 			
 			
 				Lesothoi loti
@@ -6334,6 +6395,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litvániai litas
 				litvániai litas
 				litvániai litas
+				LTL
 			
 			
 				Litvániai talonas
@@ -6351,6 +6413,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lett lats
 				lett lats
 				lett lats
+				LVL
 			
 			
 				Lett rubel
@@ -6359,11 +6422,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				líbiai dínár
 				líbiai dínár
 				líbiai dínár
+				LYD
 			
 			
 				marokkói dirham
 				marokkói dirham
 				marokkói dirham
+				MAD
 			
 			
 				Marokkói frank
@@ -6372,11 +6437,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				moldován lei
 				moldován lei
 				moldován lei
+				MDL
 			
 			
 				madagaszkári ariary
 				madagaszkári ariary
 				madagaszkári ariary
+				MGA
+				Ar
 			
 			
 				Madagaszkári frank
@@ -6385,6 +6453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				macedon dínár
 				macedon dínár
 				macedon dínár
+				MKD
 			
 			
 				Mali frank
@@ -6393,28 +6462,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mianmari kyat
 				mianmari kyat
 				mianmari kyat
+				MMK
+				K
 			
 			
 				mongóliai tugrik
 				mongóliai tugrik
 				mongóliai tugrik
+				MNT
 				₮
 			
 			
 				makaói pataca
 				makaói pataca
 				makaói pataca
+				MOP
 			
 			
 				mauritániai ouguiya (1973–2017)
 				mauritániai ouguiya (1973–2017)
 				mauritániai ouguiya (1973–2017)
+				MRO
 			
 			
 				mauritániai ouguiya
 				mauritániai ouguiya
 				mauritániai ouguiya
-				MRU
 			
 			
 				Máltai líra
@@ -6426,22 +6499,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mauritiusi rúpia
 				mauritiusi rúpia
 				mauritiusi rúpia
+				MUR
+				Rs
 			
 			
 				maldív-szigeteki rufiyaa
 				maldív-szigeteki rufiyaa
 				maldív-szigeteki rufiyaa
+				MVR
 			
 			
 				malawi kwacha
 				malawi kwacha
 				malawi kwacha
+				MWK
 			
 			
 				mexikói peso
 				mexikói peso
 				mexikói peso
 				MXN
+				$
 			
 			
 				Mexikói ezüst peso (1861–1992)
@@ -6453,6 +6531,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malajziai ringgit
 				malajziai ringgit
 				malajziai ringgit
+				MYR
+				RM
 			
 			
 				Mozambik escudo
@@ -6464,16 +6544,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mozambiki metikális
 				mozambiki metikális
 				mozambiki metikális
+				MZN
 			
 			
 				namíbiai dollár
 				namíbiai dollár
 				namíbiai dollár
+				NAD
+				$
 			
 			
 				nigériai naira
 				nigériai naira
 				nigériai naira
+				NGN
+				₦
 			
 			
 				Nikaraguai cordoba
@@ -6482,6 +6567,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nicaraguai córdoba
 				nicaraguai córdoba
 				nicaraguai córdoba
+				NIO
+				C$
 			
 			
 				Holland forint
@@ -6490,28 +6577,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				norvég korona
 				norvég korona
 				norvég korona
+				NOK
 				kr
 			
 			
 				nepáli rúpia
 				nepáli rúpia
 				nepáli rúpia
+				NPR
+				Rs
 			
 			
 				új-zélandi dollár
 				új-zélandi dollár
 				új-zélandi dollár
 				NZD
+				$
 			
 			
 				ománi rial
 				ománi rial
 				ománi rial
+				OMR
 			
 			
 				panamai balboa
 				panamai balboa
 				panamai balboa
+				PAB
 			
 			
 				perui inti
@@ -6520,6 +6613,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				perui sol
 				perui sol
 				perui sol
+				PEN
 			
 			
 				perui sol (1863–1965)
@@ -6528,21 +6622,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pápua új-guineai kina
 				pápua új-guineai kina
 				pápua új-guineai kina
+				PGK
 			
 			
 				fülöp-szigeteki peso
 				fülöp-szigeteki peso
 				fülöp-szigeteki peso
+				PHP
+				₱
 			
 			
 				pakisztáni rúpia
 				pakisztáni rúpia
 				pakisztáni rúpia
+				PKR
+				Rs
 			
 			
 				lengyel zloty
 				lengyel zloty
 				lengyel zloty
+				PLN
 				zł
 			
 			
@@ -6555,12 +6655,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paraguayi guarani
 				paraguayi guarani
 				paraguayi guarani
+				PYG
 				₲
 			
 			
 				katari rial
 				katari rial
 				katari rial
+				QAR
 			
 			
 				rhodéziai dollár
@@ -6576,16 +6678,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				román lej
 				román lej
 				román lej
+				RON
+				lei
 			
 			
 				szerb dínár
 				szerb dínár
 				szerb dínár
+				RSD
 			
 			
 				orosz rubel
 				orosz rubel
 				orosz rubel
+				RUB
+				₽
 			
 			
 				orosz rubel (1991–1998)
@@ -6596,21 +6703,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruandai frank
 				ruandai frank
 				ruandai frank
+				RWF
+				RF
 			
 			
 				szaúdi riyal
 				szaúdi riyal
 				szaúdi riyal
+				SAR
 			
 			
 				salamon-szigeteki dollár
 				salamon-szigeteki dollár
 				salamon-szigeteki dollár
+				SBD
+				$
 			
 			
 				seychelle-szigeteki rúpia
 				seychelle-szigeteki rúpia
 				seychelle-szigeteki rúpia
+				SCR
 			
 			
 				Szudáni dínár (1992–2007)
@@ -6621,6 +6734,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				szudáni font
 				szudáni font
 				szudáni font
+				SDG
 			
 			
 				Szudáni font (1957–1998)
@@ -6631,17 +6745,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svéd korona
 				svéd korona
 				svéd korona
+				SEK
 				kr
 			
 			
 				szingapúri dollár
 				szingapúri dollár
 				szingapúri dollár
+				SGD
+				$
 			
 			
 				Szent Ilona-i font
 				Szent Ilona-i font
 				Szent Ilona-i font
+				SHP
+				£
 			
 			
 				Szlovén tolar
@@ -6653,16 +6772,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sierra Leone-i leone
 				Sierra Leone-i leone
 				Sierra Leone-i leone
+				SLL
 			
 			
 				szomáli shilling
 				szomáli shilling
 				szomáli shilling
+				SOS
 			
 			
 				suriname-i dollár
 				suriname-i dollár
 				suriname-i dollár
+				SRD
 				$
 			
 			
@@ -6672,16 +6794,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dél-szudáni font
 				dél-szudáni font
 				dél-szudáni font
+				SSP
+				£
 			
 			
 				São Tomé és Príncipe-i dobra (1977–2017)
 				São Tomé és Príncipe-i dobra (1977–2017)
 				São Tomé és Príncipe-i dobra (1977–2017)
+				STD
 			
 			
 				São Tomé és Príncipe-i dobra
 				São Tomé és Príncipe-i dobra
 				São Tomé és Príncipe-i dobra
+				STN
+				Db
 			
 			
 				Szovjet rubel
@@ -6693,16 +6820,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				szíriai font
 				szíriai font
 				szíriai font
+				SYP
+				£
 			
 			
-				szváziföldi lilangeni
-				szváziföldi lilangeni
-				szváziföldi lilangeni
+				szvázi lilangeni
+				szvázi lilangeni
+				szvázi lilangeni
+				SZL
 			
 			
 				thai baht
 				thai baht
 				thai baht
+				THB
+				฿
 			
 			
 				Tádzsikisztáni rubel
@@ -6711,6 +6843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tádzsikisztáni somoni
 				tádzsikisztáni somoni
 				tádzsikisztáni somoni
+				TJS
 			
 			
 				türkmenisztáni manat (1993–2009)
@@ -6721,19 +6854,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				türkmenisztáni manat
 				türkmenisztáni manat
 				türkmenisztáni manat
+				TMT
 			
 			
 				tunéziai dínár
 				tunéziai dínár
 				tunéziai dínár
+				TND
 			
 			
 				tongai paanga
 				tongai paanga
 				tongai paanga
+				TOP
+				T$
 			
 			
 				Timori escudo
+				timori escudo
+				timori escudo
 			
 			
 				török líra (1922–2005)
@@ -6744,11 +6883,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				török líra
 				török líra
 				török líra
+				TRY
+				₺
+				TL
 			
 			
 				Trinidad és Tobago-i dollár
 				Trinidad és Tobago-i dollár
 				Trinidad és Tobago-i dollár
+				TTD
+				$
 			
 			
 				tajvani új dollár
@@ -6761,11 +6905,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tanzániai shilling
 				tanzániai shilling
 				tanzániai shilling
+				TZS
 			
 			
 				ukrán hrivnya
 				ukrán hrivnya
 				ukrán hrivnya
+				UAH
+				₴
 			
 			
 				Ukrán karbovanec
@@ -6779,12 +6926,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ugandai shilling
 				ugandai shilling
 				ugandai shilling
+				UGX
 			
 			
 				USA-dollár
 				USA-dollár
 				USA-dollár
 				USD
+				$
 			
 			
 				USA dollár (következő napi)
@@ -6806,12 +6955,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguay-i peso
 				uruguayi peso
 				uruguayi peso
+				UYU
 				$
 			
 			
 				üzbegisztáni szum
 				üzbegisztáni szum
 				üzbegisztáni szum
+				UZS
 			
 			
 				Venezuelai bolivar (1871–2008)
@@ -6822,32 +6973,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelai bolivar (2008–2018)
 				venezuelai bolivar (2008–2018)
 				venezuelai bolivar (2008–2018)
+				VEF
+				Bs
 			
 			
 				venezuelai bolivar
 				venezuelai bolivar
 				venezuelai bolivar
+				VES
 			
 			
-				vietnami dong
-				vietnami dong
-				vietnami dong
+				vietnámi dong
+				vietnámi dong
+				vietnámi dong
 				VND
+				₫
+			
+			
+				vietnámi dong (1978–1985)
+				vietnámi dong (1978–1985)
+				vietnámi dong (1978–1985)
 			
 			
 				vanuatui vatu
 				vanuatui vatu
 				vanuatui vatu
+				VUV
 			
 			
 				nyugat-szamoai tala
 				nyugat-szamoai tala
 				nyugat-szamoai tala
+				WST
 			
 			
 				CFA frank BEAC
 				CFA frank BEAC
 				CFA frank BEAC
+				FCFA
 			
 			
 				Ezüst
@@ -6880,6 +7043,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kelet-karibi dollár
 				kelet-karibi dollár
 				XCD
+				$
 			
 			
 				Special Drawing Rights
@@ -6899,6 +7063,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA frank BCEAO
 				CFA frank BCEAO
 				CFA frank BCEAO
+				CFA
 			
 			
 				palládium
@@ -6909,6 +7074,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				csendes-óceáni valutaközösségi frank
 				csendes-óceáni valutaközösségi frank
 				csendes-óceáni valutaközösségi frank
+				CFPF
 			
 			
 				platina
@@ -6933,6 +7099,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemeni rial
 				jemeni rial
 				jemeni rial
+				YER
 			
 			
 				Jugoszláv kemény dínár
@@ -6950,14 +7117,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dél-afrikai rand
 				dél-afrikai rand
 				dél-afrikai rand
+				ZAR
+				R
 			
 			
 				Zambiai kwacha (1968–2012)
+				ZMK
 			
 			
 				zambiai kwacha
 				zambiai kwacha
 				zambiai kwacha
+				ZMW
+				ZK
 			
 			
 				Zairei új zaire
@@ -7036,6 +7208,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				négyzetkilométer
 				{0} négyzetkilométer
 				{0} négyzetkilométer
+				{0}/km²
 			
 			
 				hektár
@@ -7081,11 +7254,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} négyzethüvelyk
 				{0}/négyzethüvelyk
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karát
 				{0} karát
@@ -7206,6 +7374,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} évszázad
 				{0} évszázad
 			
+			
+				évtized
+				{0} évtized
+				{0} évtized
+			
 			
 				év
 				{0} év
@@ -7323,6 +7496,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} brit hőegység
 				{0} brit hőegység
 			
+			
+				amerikai therm
+				{0} amerikai therm
+				{0} amerikai therm
+			
 			
 				fonterő
 				{0} fonterő
@@ -7353,6 +7531,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				nyomdai em
+				{0} kvirt
+				{0} kvirt
+			
+			
+				képpont
+				{0} képpont
+				{0} képpont
+			
+			
+				millió képpont
+				{0} millió képpont
+				{0} millió képpont
+			
+			
+				képpont per centiméter
+				{0} képpont per centiméter
+				{0} képpont per centiméter
+			
+			
+				képpont per hüvelyk
+				{0} képpont per hüvelyk
+				{0} képpont per hüvelyk
+			
+			
+				pont per centiméter
+				{0} pont per centiméter
+				{0} pont per centiméter
+			
+			
+				pont per hüvelyk
+				{0} pont per hüvelyk
+				{0} pont per hüvelyk
+			
 			
 				kilométer
 				{0} kilométer
@@ -7495,6 +7708,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tonna
 				{0} tonna
 			
+			
+				stone
+				{0} stone
+				{0} stone
+			
 			
 				font
 				{0} font
@@ -7562,13 +7780,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lóerő
 				{0} lóerő
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
-				mm Hg
+				higanymilliméter
 				{0} higanymilliméter
 				{0} higanymilliméter
 			
@@ -7592,6 +7805,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmoszféra
 				{0} atmoszféra
 			
+			
+				pascal
+				{0} pascal
+				{0} pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
+			
 			
 				kilopascal
 				{0} kilopascal
@@ -7838,6 +8061,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				km²
 				{0} km²
 				{0} km²
+				{0}/km²
 			
 			
 				ha
@@ -7883,10 +8107,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in²
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
+			
+				kt
+				{0} kt
+				{0} kt
 			
 			
 				mg/dl
@@ -7913,16 +8137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				l/km
 				{0} l/km
@@ -8003,6 +8217,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sz.
 				{0} sz.
 			
+			
+				dek
+				{0} dek
+				{0} dek
+			
 			
 				év
 				{0} év
@@ -8110,25 +8329,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+			
+				USA therm
+				{0} USA therm
+				{0} USA therm
 			
 			
 				GHz
@@ -8150,6 +8354,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				képpont
+			
+			
+				megapixel
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
 			
 				km
 				{0} km
@@ -8247,19 +8467,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Nap-sugár
-				{0} R☉
-				{0} R☉
 			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -8314,21 +8527,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Kt
 				{0} Kt
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -8359,13 +8557,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} LE
 				{0} LE
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
-				mm Hg
+				Hgmm
 				{0} mm Hg
 				{0} mm Hg
 			
@@ -8389,15 +8582,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				Pa
+				{0} Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -8439,15 +8632,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				Nm
-				{0} Nm
-				{0} Nm
+				{0} Nm
+				{0} Nm
 			
 			
 				km³
@@ -8596,6 +8784,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0} G
+				{0} G
+			
 			
 				{0}°
 				{0}°
@@ -8637,15 +8829,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}%
 				{0}%
 			
+			
+				‰
+			
 			
 				l/100 km
 				{0} l/100 km
 				{0} l/100 km
 			
+			
+				{0} B
+				{0} B
+			
 			
-				sz.
-				{0} sz.
-				{0} sz.
+				sz.
+				{0} sz.
+				{0} sz.
 			
 			
 				év
@@ -8666,22 +8865,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nap
 				{0} nap
 				{0} nap
-				{0}/nap
+				{0}/nap
 			
 			
 				h
 				{0} h
 				{0} h
+				{0}/h
 			
 			
 				min
 				{0} min
 				{0} min
+				{0}/min
 			
 			
 				s
 				{0} s
 				{0} s
+				{0}/s
 			
 			
 				ms
@@ -8692,16 +8894,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				km
 				{0} km
 				{0} km
+				{0}/km
 			
 			
 				m
 				{0} m
 				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
 			
 			
 				cm
 				{0} cm
 				{0} cm
+				{0}/cm
 			
 			
 				mm
@@ -8718,6 +8928,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mf
 			
 			
+				yd
 				{0} yd
 				{0} yd
 			
@@ -8731,6 +8942,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hüvelyk
 				{0} hüvelyk
 				{0} hüvelyk
+				{0}/in
 			
 			
 				{0} fényév
@@ -8745,19 +8957,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kg
 				{0} kg
 				{0} kg
+				{0}/kg
 			
 			
 				g
 				{0} g
 				{0} g
+				{0}/g
+			
+			
+				st
+				{0} st
+				{0} st
 			
 			
-				{0} font
+				lb
+				{0} lb
 				{0} font
+				{0}/lb
 			
 			
-				{0} uncia
+				oz
+				{0} oz
 				{0} uncia
+				{0}/oz
 			
 			
 				{0} kW
@@ -8771,16 +8994,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} LE
 				{0} LE
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
-				Hgmm
-				{0} Hgmm
-				{0} Hgmm
+				Hgmm
+				{0} Hgmm
+				{0} Hgmm
+			
+			
+				psi
+				{0} psi
+				{0} psi
 			
 			
+				Hgin
 				{0} inHg
 				{0} inHg
 			
@@ -8788,12 +9013,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
 				{0} km/h
 			
 			
+				m/s
 				{0} m/s
 				{0} m/s
 			
@@ -8802,19 +9033,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mph
 				{0} mph
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0} °C
 				{0} °C
 			
 			
+				°F
 				{0} °F
 				{0} °F
 			
+			
+				K
+				{0} K
+				{0} K
+			
 			
 				{0} km³
 				{0} km³
 			
+			
+				{0} mi³
+				{0} mi³
+			
 			
 				l
 				{0} l
@@ -8851,15 +9097,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} vagy {1}
 			{0} vagy {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} és {1}
-			{0} és {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
 			{0} és {1}
 			{0} és {1}
 		
diff --git a/make/data/cldr/common/main/hu_HU.xml b/make/data/cldr/common/main/hu_HU.xml
index d769c63e770..216fe85f007 100644
--- a/make/data/cldr/common/main/hu_HU.xml
+++ b/make/data/cldr/common/main/hu_HU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/hy.xml b/make/data/cldr/common/main/hy.xml
index 96a85025766..795a9628446 100644
--- a/make/data/cldr/common/main/hy.xml
+++ b/make/data/cldr/common/main/hy.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -75,6 +75,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			բուգիերեն
 			բիլին
 			կատալաներեն
+			չակմա
 			չեչեներեն
 			սեբուերեն
 			չիգա
@@ -90,7 +91,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ղրիմյան թուրքերեն
 			սեյշելյան խառնակերտ ֆրանսերեն
 			չեխերեն
-			եկեղեցական սլավոներեն
+			սլավոներեն, եկեղեցական
 			չուվաշերեն
 			ուելսերեն
 			դանիերեն
@@ -120,7 +121,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			բրիտանական անգլերեն
 			անգլերեն (Բրիտանիա)
 			ամերիկյան անգլերեն
-			անգլերեն (ԱՄՆ)
 			էսպերանտո
 			իսպաներեն
 			լատինամերիկյան իսպաներեն
@@ -291,6 +291,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			նամա
 			գրքային նորվեգերեն
 			հյուսիսային նդեբելե
+			ստորին գերմաներեն
 			ստորին սաքսոներեն
 			նեպալերեն
 			նեվարերեն
@@ -481,6 +482,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			իդիշ
 			յորուբա
 			կանտոներեն
+			չինարեն, կանտոներեն
 			ժուանգ
 			սապոտեկերեն
 			զեյլանդերեն
@@ -488,7 +490,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ընդհանուր մարոկյան թամազիղտ
 			չինարեն
 			պարզեցված չինարեն
-			ավանդական չինարեն
+			չինարեն, ավանդական
+			չինարեն (ավանդական չինարեն)
 			զուլուերեն
 			զունիերեն
 			առանց լեզվային բովանդակության
@@ -620,7 +623,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Կոնգո - Բրազավիլ
 			Կոնգո (Կոնգոյի Հանրապետություն)
 			Շվեյցարիա
-			Կոտ դ’Իվուար
+			Կոտ դ՚Իվուար
 			Փղոսկրի Ափ
 			Կուկի կղզիներ
 			Չիլի
@@ -841,6 +844,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Վանուատու
 			Ուոլիս և Ֆուտունա
 			Սամոա
+			կեղծ տարբերիչներ
+			կեղծ երկուղղված
 			Կոսովո
 			Եմեն
 			Մայոտ
@@ -892,25 +897,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ամերիկյան համակարգ
 			արաբա-հնդկական թվանշաններ
 			արաբա-հնդկական թվերի ընդլայնված համակարգ
-			հայկական թվանշաններ
-			հայկական թվեր (փոքրատառ)
+			հայկական թվանիշեր
+			հայկական փոքրատառ թվանիշեր
 			բենգալական թվանշաններ
 			դեվանագարի թվանշաններ
-			եթովպական թվանշաններ
+			եթովպական թվանիշեր
 			ամբողջ լայնքով թվանշաններ
-			վրացական թվեր
-			հունական թվեր
-			հունական թվեր (փոքրատառ)
+			վրացական թվանիշեր
+			հունական թվանիշեր
+			հունական փոքրատառ թվանիշեր
 			գուջարաթի թվանշաններ
 			գուրմուխի թվանշաններ
 			չինական տասնորդական թվեր
-			չինական պարզեցված թվեր
-			չինական պարզեցված ֆինանսական թվեր
-			չինական ավանդական թվեր
-			չինական ավանդական ֆինանսական թվեր
-			եբրայերեն թվեր
-			ճապոնական թվեր
-			ճապոնական ֆինանսական թվեր
+			չինական պարզեցված թվանիշեր
+			չինական պարզեցված ֆինանսական թվանիշեր
+			չինական ավանդական թվանիշեր
+			չինական ավանդական ֆինանսական թվանիշեր
+			եբրայական թվանիշեր
+			ճապոնական թվանիշեր
+			ճապոնական ֆինանսական թվանիշեր
 			քմերական թվանշաններ
 			կաննադա թվանշաններ
 			լաոսական թվանշաններ
@@ -918,9 +923,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			մալայալամ թվանշաններ
 			բիրմական թվանշաններ
 			օրիյա թվանշաններ
-			հռոմեական թվեր
-			հռոմեական թվեր (փոքրատառ)
-			թամիլական ավանդական թվեր
+			հռոմեական թվանիշեր
+			հռոմեական փոքրատառ թվանիշեր
+			թամիլական ավանդական թվանիշեր
 			թամիլական թվանշաններ
 			թելուգու թվանշաններ
 			թայական թվանշաններ
@@ -938,9 +943,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
-		[ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք և օ ֆ]
-		[Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[ա բ գ դ ե զ է ը թ ժ ի լ խ ծ կ հ ձ ղ ճ մ յ ն շ ո չ պ ջ ռ ս վ տ ր ց ւ փ ք օ ֆ]
+		[և]
+		[Ա Բ Գ Դ Ե Զ Է Ը Թ Ժ Ի Լ Խ Ծ Կ Հ Ձ Ղ Ճ Մ Յ Ն Շ Ո Չ Պ Ջ Ռ Ս Վ Տ Ր Ց Ւ Փ Ք Օ Ֆ]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[֊ , ՝ \: ՜ ՞ . « » ՚ ՛ ՟]
 		{0}…
 		…{0}
@@ -948,7 +954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} …
 		… {0}
 		{0} … {1}
-		?
+		(՞)
 	
 	
 		«
@@ -1059,44 +1065,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1428,9 +1396,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							կեսօրին
 							PM
 							առավոտյան
-							ցերեկը
+							ցերեկվա
 							երեկոյան
-							գիշերը
+							գիշերվա
 						
 					
 					
@@ -1579,8 +1547,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d MMM
 						d MMM, E
 						MMMM d
-						MMMM W շաբ
-						MMMM W շաբ
+						MMMM W-ին շաբաթ
+						MMMM W-րդ շաբաթ
 						mm:ss
 						y
 						MM.y
@@ -1592,8 +1560,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						y թ․ LLLL
 						y թ. QQQ
 						y թ. QQQQ
-						Y w շաբ
-						Y w շաբ
+						Y թ․ w-ին շաբաթ
+						Y թ․ w-րդ շաբաթ
 					
 					
 						{0} {1}
@@ -1613,7 +1581,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d–d
 						
 						
-							G y – G y
 							G y–y թթ․
 						
 						
@@ -1628,10 +1595,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							GGGGG dd.MM.y – dd.MM.y
 						
 						
-							GGGGG ccc, dd.MM.y – ccc, dd.MM.y
-							GGGGG ccc, dd.MM.y – GGGGG ccc, dd.MM.y
-							GGGGG ccc, dd.MM.y – ccc, dd.MM.y
-							GGGGG ccc, dd.MM.y – ccc, dd.MM.y
+							GGGGG dd.MM.y, ccc – dd.MM.y, ccc
+							GGGGG dd.MM.y ccc – GGGGG dd.MM.y ccc
+							GGGGG dd.MM.y ccc – dd.MM.y ccc
+							GGGGG dd.MM.y ccc – dd.MM.y ccc
 						
 						
 							G y MMM – G y MMM
@@ -1639,16 +1606,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							G y MMM – y MMM
 						
 						
-							G dd–dd MMM, y թ.
-							G dd MMM, y թ․ – G dd MMM, y թ.
-							G dd MMM – dd MMM, y թ.
-							G dd MMM, y թ․ – G dd MMM, y թ.
+							G y թ. MMM dd–dd
+							G y թ․ MMM dd – G y թ. MMM dd
+							G y թ. MMM dd – MMM dd
+							G y թ․ MMM dd – G y թ. MMM dd
 						
 						
-							G E, d MMM – E, d MMM, y թ.
-							G E, d MMM – G E, d MMM, y թ.
-							G E, d MMM y թ. – E, d MMM
-							G E, d MMM y թ. – E, d MMM y թ.
+							G y թ. MMM d E – MMM d E
+							G y թ. MMM d E – G MMM d E
+							G y թ. MMM d E – MMM d E
+							G y թ. MMM d E – y թ. MMM d E
 						
 						
 							h a – h a
@@ -1841,7 +1808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ամս
-				անցյալ ամիս
+				նախորդ ամիս
 				այս ամիս
 				հաջորդ ամիս
 				
@@ -1855,7 +1822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ամս
-				անցյալ ամիս
+				նախորդ ամիս
 				այս ամիս
 				հաջորդ ամիս
 				
@@ -1917,7 +1884,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				օր
-				երեկ չէ առաջի օրը
+				նախանցյալ օրը
 				երեկ
 				այսօր
 				վաղը
@@ -3069,6 +3036,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ակտոբե
 			
+			
+				Կոստանայ
+			
 			
 				Կիզիլորդա
 			
@@ -4566,7 +4536,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
+			latn
 			armn
 		
 		1
@@ -4575,6 +4547,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4583,6 +4557,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 հազար
@@ -4699,16 +4678,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Արաբական Միացյալ Էմիրությունների դիրհամ
 				ԱՄԷ դիրհամ
 				ԱՄԷ դիրհամ
+				AED
 			
 			
 				աֆղանական աֆղանի
 				աֆղանական աֆղանի
 				աֆղանական աֆղանի
+				AFN
 			
 			
 				ալբանական լեկ
 				ալբանական լեկ
 				ալբանական լեկ
+				ALL
 			
 			
 				հայկական դրամ
@@ -4721,730 +4703,941 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				նիդեռլանդական անտիլյան գուլդեն
 				նիդեռլանդական անտիլյան գուլդեն
 				նիդեռլանդական անտիլյան գուլդեն
+				ANG
 			
 			
 				անգոլական կվանզա
 				անգոլական կվանզա
 				անգոլական կվանզա
+				AOA
+				Kz
 			
 			
 				արգենտինական պեսո
 				արգենտինական պեսո
 				արգենտինական պեսո
+				ARS
+				$
 			
 			
 				ավստրալիական դոլար
 				ավստրալիական դոլար
 				ավստրալիական դոլար
+				A$
+				$
 			
 			
 				արուբական ֆլորին
 				արուբական ֆլորին
 				արուբական ֆլորին
+				AWG
 			
 			
 				ադրբեջանական մանաթ
 				ադրբեջանական մանաթ
 				ադրբեջանական մանաթ
+				AZN
 			
 			
 				Բոսնիա և Հերցեգովինայի փոխարկվող մարկ
 				Բոսնիա և Հերցեգովինայի փոխարկվող մարկ
 				Բոսնիա և Հերցեգովինայի փոխարկվող մարկ
+				BAM
+				KM
 			
 			
 				բարբադոսյան դոլար
 				բարբադոսյան դոլար
 				բարբադոսյան դոլար
+				BBD
 				$
 			
 			
 				Բանգլադեշի տակա
 				Բանգլադեշի տակա
 				Բանգլադեշի տակա
+				BDT
+				৳
 			
 			
 				բուլղարական լև
 				բուլղարական լև
 				բուլղարական լև
+				BGN
 			
 			
 				Բահրեյնի դինար
 				Բահրեյնի դինար
 				Բահրեյնի դինար
+				BHD
 			
 			
 				բուրունդիական ֆրանկ
 				բուրունդիական ֆրանկ
 				բուրունդիական ֆրանկ
+				BIF
 			
 			
 				բերմուդյան դոլար
 				բերմուդյան դոլար
 				բերմուդյան դոլար
+				BMD
 				$
 			
 			
 				Բրունեյի դոլար
 				Բրունեյի դոլար
 				Բրունեյի դոլար
+				BND
+				$
 			
 			
 				բոլիվիական բոլիվիանո
 				բոլիվիական բոլիվիանո
 				բոլիվիական բոլիվիանո
+				BOB
+				Bs
 			
 			
 				բրազիլական ռեալ
 				բրազիլական ռեալ
 				բրազիլական ռեալ
+				R$
+				R$
 			
 			
 				բահամյան դոլար
 				բահամյան դոլար
 				բահամյան դոլար
+				BSD
 				$
 			
 			
 				բութանական նգուլտրում
 				բութանական նգուլտրում
 				բութանական նգուլտրում
+				BTN
 			
 			
 				բոթսվանական պուլա
 				բոթսվանական պուլա
 				բոթսվանական պուլա
+				BWP
+				P
 			
 			
 				բելառուսական ռուբլի
 				բելառուսական ռուբլի
 				բելառուսական ռուբլի
+				BYN
+				р.
 			
 			
 				Բելառուսական ռուբլի (2000–2016)
 				բելառուսական ռուբլի (2000–2016)
 				բելառուսական ռուբլի (2000–2016)
+				BYR
 			
 			
 				Բելիզի դոլար
 				Բելիզի դոլար
 				Բելիզի դոլար
+				BZD
 				$
 			
 			
 				կանադական դոլար
 				կանադական դոլար
 				կանադական դոլար
+				CA$
 				$
 			
 			
 				Կոնգոյի ֆրանկ
 				Կոնգոյի ֆրանկ
 				Կոնգոյի ֆրանկ
+				CDF
 			
 			
 				շվեյցարական ֆրանկ
 				շվեյցարական ֆրանկ
 				շվեյցարական ֆրանկ
+				CHF
 			
 			
 				չիլիական պեսո
 				չիլիական պեսո
 				չիլիական պեսո
+				CLP
+				$
 			
 			
 				CNH
 				CNH
 				CNH
+				CNH
 			
 			
 				չինական յուան
 				չինական յուան
 				չինական յուան
+				CN¥
+				¥
 			
 			
 				կոլումբիական պեսո
 				կոլումբիական պեսո
 				կոլումբիական պեսո
+				COP
+				$
 			
 			
 				Կոստա Ռիկայի կոլոն
 				Կոստա Ռիկայի կոլոն
 				Կոստա Ռիկայի կոլոն
+				CRC
 				₡
 			
 			
 				կուբայական փոխարկվող պեսո
 				կուբայական փոխարկվող պեսո
 				կուբայական փոխարկվող պեսո
+				CUC
 				$
 			
 			
 				կուբայական պեսո
 				կուբայական պեսո
 				կուբայական պեսո
+				CUP
 				$
 			
 			
 				Կաբո Վերդեի էսկուդո
 				Կաբո Վերդեի էսկուդո
 				Կաբո Վերդեի էսկուդո
+				CVE
 			
 			
 				չեխական կրոն
 				չեխական կրոն
 				չեխական կրոն
+				CZK
+				Kč
 			
 			
 				Ջիբութիի ֆրանկ
 				Ջիբութիի ֆրանկ
 				Ջիբութիի ֆրանկ
+				DJF
 			
 			
 				դանիական կրոն
 				դանիական կրոն
 				դանիական կրոն
+				DKK
+				kr
 			
 			
 				դոմինիկյան պեսո
 				դոմինիկյան պեսո
 				դոմինիկյան պեսո
+				DOP
 				$
 			
 			
 				ալժիրական դինար
 				ալժիրական դինար
 				ալժիրական դինար
+				DZD
 			
 			
 				եգիպտական ֆունտ
 				եգիպտական ֆունտ
 				եգիպտական ֆունտ
+				EGP
+				E£
 			
 			
 				էրիթրեական նակվա
 				էրիթրեական նակֆա
 				էրիթրեական նակֆա
+				ERN
 			
 			
 				եթովպիական բիր
 				եթովպիական բիր
 				եթովպիական բիր
+				ETB
 			
 			
 				եվրո
 				եվրո
 				եվրո
+				€
+				€
 			
 			
 				ֆիջիական դոլար
 				ֆիջիական դոլար
 				ֆիջիական դոլար
+				FJD
+				$
 			
 			
 				Ֆոլքլենդյան կղզիների ֆունտ
 				Ֆոլքլենդյան կղզիների ֆունտ
 				Ֆոլքլենդյան կղզիների ֆունտ
+				FKP
+				£
 			
 			
 				բրիտանական ֆունտ ստերլինգ
 				բրիտանական ֆունտ ստերլինգ
 				բրիտանական ֆունտ ստերլինգ
+				£
+				£
 			
 			
 				վրացական լարի
 				վրացական լարի
 				վրացական լարի
+				GEL
+				₾
 			
 			
 				գայանական սեդի
 				գանայական սեդի
 				գանայական սեդի
+				GHS
 			
 			
 				Ջիբրալթարի ֆունտ
 				Ջիբրալթարի ֆունտ
 				Ջիբրալթարի ֆունտ
+				GIP
+				£
 			
 			
 				գամբիական դալասի
 				գամբիական դալասի
 				գամբիական դալասի
+				GMD
 			
 			
 				գվինեական ֆրանկ
 				գվինեական ֆրանկ
 				գվինեական ֆրանկ
+				GNF
+				FG
 			
 			
 				գվատեմալական կետսալ
 				գվատեմալական կետսալ
 				գվատեմալական կետսալ
+				GTQ
 				Q
 			
 			
 				գայանական դոլար
 				գայանական դոլար
 				գայանական դոլար
+				GYD
+				$
 			
 			
 				Հոնկոնգի դոլար
 				Հոնկոնգի դոլար
 				Հոնկոնգի դոլար
+				HK$
+				$
 			
 			
 				հոնդուրասական լեմպիրա
 				հոնդուրասական լեմպիրա
 				հոնդուրասական լեմպիրա
+				HNL
 				L
 			
 			
 				խորվաթական կունա
 				խորվաթական կունա
 				խորվաթական կունա
+				HRK
+				kn
 			
 			
 				հայիթյան գուրդ
 				հայիթյան գուրդ
 				հայիթյան գուրդ
+				HTG
 			
 			
 				հունգարական ֆորինտ
 				հունգարական ֆորինտ
 				հունգարական ֆորինտ
+				HUF
+				Ft
 			
 			
 				ինդոնեզիական ռուփի
 				ինդոնեզիական ռուփի
 				ինդոնեզիական ռուփի
+				IDR
+				Rp
 			
 			
 				Իսրայելի նոր շեկել
 				Իսրայելի նոր շեկել
 				Իսրայելի նոր շեկել
+				₪
+				₪
 			
 			
 				հնդկական ռուփի
 				հնդկական ռուփի
 				հնդկական ռուփի
+				₹
+				₹
 			
 			
 				իրաքյան դինար
 				իրաքյան դինար
 				իրաքյան դինար
+				IQD
 			
 			
 				իրանական ռիալ
 				իրանական ռիալ
 				իրանական ռիալ
+				IRR
 			
 			
 				իսլանդական կրոն
 				իսլանդական կրոն
 				իսլանդական կրոն
+				ISK
+				kr
 			
 			
 				Ճամայկայի դոլար
 				Ճամայկայի դոլար
 				Ճամայկայի դոլար
+				JMD
 				$
 			
 			
 				հորդանանյան դինար
 				հորդանանյան դինար
 				հորդանանյան դինար
+				JOD
 			
 			
 				ճապոնական իեն
 				ճապոնական իեն
 				ճապոնական իեն
+				JP¥
+				¥
 			
 			
 				քենիական շիլինգ
 				քենիական շիլինգ
 				քենիական շիլինգ
+				KES
 			
 			
 				ղրղզական սոմ
 				ղրղզական սոմ
 				ղրղզական սոմ
+				KGS
 			
 			
 				կամբոջական ռիել
 				կամբոջական ռիել
 				կամբոջական ռիել
+				KHR
+				៛
 			
 			
 				կոմորյան ֆրանկ
 				կոմորյան ֆրանկ
 				կոմորյան ֆրանկ
+				KMF
+				CF
 			
 			
 				հյուսիսկորեական վոն
 				հյուսիսկորեական վոն
 				հյուսիսկորեական վոն
+				KPW
+				₩
 			
 			
 				հարավկորեական վոն
 				հարավկորեական վոն
 				հարավկորեական վոն
+				₩
+				₩
 			
 			
 				Քուվեյթի դինար
 				Քուվեյթի դինար
 				Քուվեյթի դինար
+				KWD
 			
 			
 				Կայմանյան կղզիների դոլար
 				Կայմանյան կղզիների դոլար
 				Կայմանյան կղզիների դոլար
+				KYD
 				$
 			
 			
 				ղազախական տենգե
 				ղազախական տենգե
 				ղազախական տենգե
+				KZT
+				₸
 			
 			
 				լաոսական կիպ
 				լաոսական կիպ
 				լաոսական կիպ
+				LAK
+				₭
 			
 			
 				լիբանանյան ֆունտ
 				լիբանանյան ֆունտ
 				լիբանանյան ֆունտ
+				LBP
+				L£
 			
 			
 				Շրի Լանկայի ռուփի
 				Շրի Լանկայի ռուփի
 				Շրի Լանկայի ռուփի
+				LKR
+				Rs
 			
 			
 				լիբերիական դոլար
 				լիբերիական դոլար
 				լիբերիական դոլար
+				LRD
+				$
 			
 			
 				Լիտվական լիտ
 				Լիտվական լիտ
 				Լիտվական լիտ
+				LTL
 			
 			
 				Լատվիական լատ
 				Լատվիական լատ
 				Լատվիական լատ
+				LVL
 			
 			
 				լիբիական դինար
 				լիբիական դինար
 				լիբիական դինար
+				LYD
 			
 			
 				Մարոկկոյի դիրհամ
 				Մարոկկոյի դիրհամ
 				Մարոկկոյի դիրհամ
+				MAD
 			
 			
 				մոլդովական լեյ
 				մոլդովական լեյ
 				մոլդովական լեյ
+				MDL
 			
 			
 				Մադագասկարի արիարի
 				Մադագասկարի արիարի
 				Մադագասկարի արիարի
+				MGA
+				Ar
 			
 			
 				մակեդոնական դենար
 				մակեդոնական դենար
 				մակեդոնական դենար
+				MKD
 			
 			
 				Մյանմայի կյատ
 				Մյանմայի կյատ
 				Մյանմայի կյատ
+				MMK
+				K
 			
 			
 				մոնղոլական տուգրիկ
 				մոնղոլական տուգրիկ
 				մոնղոլական տուգրիկ
+				MNT
+				₮
 			
 			
 				Մակաոյի պատակա
 				Մակաոյի պատակա
 				Մակաոյի պատակա
+				MOP
 			
 			
 				մավրիտանական ուգիյա (1973–2017)
 				մավրիտանական ուգիյա (1973–2017)
 				մավրիտանական ուգիյա (1973–2017)
+				MRO
 			
 			
 				մավրիտանական ուգիյա
 				մավրիտանական ուգիյա
 				մավրիտանական ուգիյա
+				MRU
 			
 			
 				մավրիկյան ռուփի
 				մավրիկյան ռուփի
 				մավրիկյան ռուփի
+				MUR
+				Rs
 			
 			
 				մալդիվյան ռուֆիյա
 				մալդիվյան ռուֆիյա
 				մալդիվյան ռուֆիյա
+				MVR
 			
 			
 				մալավիական կվաչա
 				մալավիական կվաչա
 				մալավիական կվաչա
+				MWK
 			
 			
 				մեքսիկական պեսո
 				մեքսիկական պեսո
 				մեքսիկական պեսո
+				MX$
 				$
 			
 			
 				մալայզիական ռինգիտ
 				մալայզիական ռինգիտ
 				մալայզիական ռինգիտ
+				MYR
+				RM
 			
 			
 				մոզամբիկյան մետիկալ
 				մոզամբիկյան մետիկալ
 				մոզամբիկյան մետիկալ
+				MZN
 			
 			
 				նամիբիական դոլար
 				նամիբիական դոլար
 				նամիբիական դոլար
+				NAD
+				$
 			
 			
 				նիգերիական նայրա
 				նիգերիական նայրա
 				նիգերիական նայրա
+				NGN
+				₦
 			
 			
 				նիկարագուական կորդոբա
 				նիկարագուական կորդոբա
 				նիկարագուական կորդոբա
+				NIO
 				C$
 			
 			
 				նորվեգական կրոն
 				նորվեգական կրոն
 				նորվեգական կրոն
+				NOK
+				kr
 			
 			
 				Նեպալի ռուփի
 				Նեպալի ռուփի
 				Նեպալի ռուփի
+				NPR
+				Rs
 			
 			
 				նորզելանդական դոլար
 				նորզելանդական դոլար
 				նորզելանդական դոլար
+				NZ$
+				$
 			
 			
 				Օմանի ռիալ
 				Օմանի ռիալ
 				Օմանի ռիալ
+				OMR
 			
 			
 				պանամական բալբոա
 				պանամական բալբոա
 				պանամական բալբոա
+				PAB
 			
 			
 				Պերուի սոլ
 				Պերուի սոլ
 				Պերուի սոլ
+				PEN
 			
 			
 				Պապուա Նոր Գվինեայի կինա
 				Պապուա Նոր Գվինեայի կինա
 				Պապուա Նոր Գվինեայի կինա
+				PGK
 			
 			
 				ֆիլիպինյան պեսո
 				ֆիլիպինյան պեսո
 				ֆիլիպինյան պեսո
+				PHP
+				₱
 			
 			
 				պակիստանյան ռուփի
 				պակիստանյան ռուփի
 				պակիստանյան ռուփի
+				PKR
+				Rs
 			
 			
 				լեհական զլոտի
 				լեհական զլոտի
 				լեհական զլոտի
+				PLN
+				zł
 			
 			
 				պարագվայական գուարանի
 				պարագվայական գուարանի
 				պարագվայական գուարանի
+				PYG
+				₲
 			
 			
 				Կատարի ռիալ
 				Կատարի ռիալ
 				Կատարի ռիալ
+				QAR
 			
 			
 				ռումինական լեյ
 				ռումինական լեյ
 				ռումինական լեյ
+				RON
+				lei
 			
 			
 				սերբական դինար
 				սերբական դինար
 				սերբական դինար
+				RSD
 			
 			
 				ռուսական ռուբլի
 				ռուսական ռուբլի
 				ռուսական ռուբլի
+				RUB
+				₽
 			
 			
 				ռուանդական ֆրանկ
 				ռուանդական ֆրանկ
 				ռուանդական ֆրանկ
+				RWF
+				RF
 			
 			
 				Սաուդյան Արաբիայի ռիալ
 				Սաուդյան Արաբիայի ռիալ
 				Սաուդյան Արաբիայի ռիալ
+				SAR
 			
 			
 				Սողոմոնյան կղզիների դոլար
 				Սողոմոնյան կղզիների դոլար
 				Սողոմոնյան կղզիների դոլար
+				SBD
+				$
 			
 			
 				սեյշելյան ռուփի
 				սեյշելյան ռուփի
 				սեյշելյան ռուփի
+				SCR
 			
 			
 				սուդանական ֆունտ
 				սուդանական ֆունտ
 				սուդանական ֆունտ
+				SDG
 			
 			
 				շվեդական կրոն
 				շվեդական կրոն
 				շվեդական կրոն
+				SEK
+				kr
 			
 			
 				Սինգապուրի դոլար
 				Սինգապուրի դոլար
 				Սինգապուրի դոլար
+				SGD
+				$
 			
 			
 				Սուրբ Հեղինեի ֆունտ
 				Սուրբ Հեղինեի ֆունտ
 				Սուրբ Հեղինեի ֆունտ
+				SHP
+				£
 			
 			
 				Սիեռա Լեոնեի լեոնե
 				Սիեռա Լեոնեի լեոնե
 				Սիեռա Լեոնեի լեոնե
+				SLL
 			
 			
 				սոմալիական շիլինգ
 				սոմալիական շիլինգ
 				սոմալիական շիլինգ
+				SOS
 			
 			
 				սուրինամական դոլար
 				սուրինամական դոլար
 				սուրինամական դոլար
+				SRD
+				$
 			
 			
 				հարավսուդանական ֆունտ
 				հարավսուդանական ֆունտ
 				հարավսուդանական ֆունտ
+				SSP
+				£
 			
 			
 				Սան Տոմե և Փրինսիպիի դոբրա (1977–2017)
 				Սան Տոմե և Փրինսիպիի դոբրա (1977–2017)
 				Սան Տոմե և Փրինսիպիի դոբրա (1977–2017)
+				STD
 			
 			
 				Սան Տոմե և Փրինսիպիի դոբրա
 				Սան Տոմե և Փրինսիպիի դոբրա
 				Սան Տոմե և Փրինսիպիի դոբրա
+				STN
 				Db
 			
 			
 				սիրիական ֆունտ
 				սիրիական ֆունտ
 				սիրիական ֆունտ
+				SYP
+				£
 			
 			
 				սվազիլենդական լիլանգենի
 				սվազիլենդական լիլանգենի
 				սվազիլենդական լիլանգենի
+				SZL
 			
 			
 				թայլանդական բատ
 				թայլանդական բատ
 				թայլանդական բատ
 				฿
+				฿
 			
 			
 				տաջիկական սոմոնի
 				տաջիկական սոմոնի
 				տաջիկական սոմոնի
+				TJS
 			
 			
 				թուրքմենական մանաթ
 				թուրքմենական մանաթ
 				թուրքմենական մանաթ
+				TMT
 			
 			
 				թունիսյան դինար
 				թունիսյան դինար
 				թունիսյան դինար
+				TND
 			
 			
 				Տոնգայի պաանգա
 				Տոնգայի պաանգա
 				Տոնգայի պաանգա
+				TOP
+				T$
 			
 			
 				թուրքական լիրա
 				թուրքական լիրա
 				թուրքական լիրա
+				TRY
+				₺
+				TL
 			
 			
 				Տրինիդադ և Տոբագոյի դոլար
 				Տրինիդադ և Տոբագոյի դոլար
 				Տրինիդադ և Տոբագոյի դոլար
+				TTD
 				$
 			
 			
 				թայվանական նոր դոլար
 				թայվանական նոր դոլար
 				թայվանական նոր դոլար
+				NT$
 				NT$
 			
 			
 				տանզանիական շիլինգ
 				տանզանիական շիլինգ
 				տանզանիական շիլինգ
+				TZS
 			
 			
 				ուկրաինական գրիվնա
 				ուկրաինական գրիվնա
 				ուկրաինական գրիվնա
+				UAH
+				₴
 			
 			
 				ուգանդական շիլինգ
 				ուգանդական շիլինգ
 				ուգանդական շիլինգ
+				UGX
 			
 			
 				ԱՄՆ դոլար
@@ -5457,57 +5650,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ուրուգվայական պեսո
 				ուրուգվայական պեսո
 				ուրուգվայական պեսո
+				UYU
+				$
 			
 			
 				ուզբեկական սոմ
 				ուզբեկական սոմ
 				ուզբեկական սոմ
+				UZS
 			
 			
 				վենեսուելական բոլիվար (2008–2018)
 				վենեսուելական բոլիվար (2008–2018)
 				վենեսուելական բոլիվար (2008–2018)
+				VEF
+				Bs
 			
 			
 				վենեսուելական բոլիվար
 				վենեսուելական բոլիվար
 				վենեսուելական բոլիվար
+				VES
 			
 			
 				վիետնամական դոնգ
 				վիետնամական դոնգ
 				վիետնամական դոնգ
+				₫
+				₫
 			
 			
 				Վանուատուի վատու
 				Վանուատուի վատու
 				Վանուատուի վատու
+				VUV
 			
 			
 				սամոական տալա
 				սամոական տալա
 				սամոական տալա
+				WST
 			
 			
 				Կենտրոնական Աֆրիկայի ԿՖԱ ֆրանկ
 				Կենտրոնական Աֆրիկայի ԿՖԱ ֆրանկ
 				Կենտրոնական Աֆրիկայի ԿՖԱ ֆրանկ
+				FCFA
 			
 			
 				արևելակարիբյան դոլար
 				արևելակարիբյան դոլար
 				արևելակարիբյան դոլար
+				EC$
 				$
 			
 			
 				Արևմտյան Աֆրիկայի ԿՖԱ ֆրանկ
 				Արևմտյան Աֆրիկայի ԿՖԱ ֆրանկ
 				Արևմտյան Աֆրիկայի ԿՖԱ ֆրանկ
+				CFA
 			
 			
 				ԿՊՖ ֆրանկ
 				ԿՊՖ ֆրանկ
 				ԿՊՖ ֆրանկ
+				CFPF
 			
 			
 				անհայտ արժույթ
@@ -5518,21 +5725,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				եմենական ռիալ
 				եմենական ռիալ
 				եմենական ռիալ
+				YER
 			
 			
 				հարավաֆրիկյան ռանդ
 				հարավաֆրիկյան ռանդ
 				հարավաֆրիկյան ռանդ
+				ZAR
+				R
 			
 			
 				Զամբիական կվաչա (1968–2012)
 				Զամբիական կվաչա (1968–2012)
 				Զամբիական կվաչա (1968–2012)
+				ZMK
 			
 			
 				զամբիական կվաչա
 				զամբիական կվաչա
 				զամբիական կվաչա
+				ZMW
+				ZK
 			
 		
 		
@@ -5633,10 +5846,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} քառակուսի ֆուտ
 			
 			
-				քառակուսի դյույմեր
-				{0} քառակուսի դյույմ
-				{0} քառակուսի դյույմ
-				{0} քառակուսի դյույմի վրա
+				քառակուսի մատնաչափեր
+				{0} քառակուսի մատնաչափ
+				{0} քառակուսի մատնաչափ
+				{0} քառակուսի մատնաչափի վրա
 			
 			
 				դունամներ
@@ -5704,7 +5917,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մղոն անգլիական գալոնի վրա
 			
 			
-				պետաբայթ
+				պետաբայթեր
 				{0} պետաբայթ
 				{0} պետաբայթ
 			
@@ -5763,6 +5976,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} դար
 				{0} դար
 			
+			
+				տասնամյակներ
+				{0} տասնամյակ
+				{0} տասնամյակ
+			
 			
 				տարիներ
 				{0} տարի
@@ -5880,6 +6098,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} բրիտանական ջերմային միավոր
 				{0} բրիտանական ջերմային միավոր
 			
+			
+				ԱՄՆ ջերմեր
+				{0} ԱՄՆ ջերմ
+				{0} ԱՄՆ ջերմ
+			
 			
 				ֆունտ-ուժեր
 				{0} ֆունտ-ուժ
@@ -5910,6 +6133,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} հերց
 				{0} հերց
 			
+			
+				տպագրական em
+			
+			
+				փիքսելներ
+				{0} փիքսել
+				{0} փիքսել
+			
+			
+				մեգափիքսելներ
+				{0} մեգափիքսել
+				{0} մեգափիքսել
+			
+			
+				փիքսելներ սանտիմետրի վրա
+				{0} փիքսել սանտիմետրի վրա
+				{0} փիքսել սանտիմետրի վրա
+			
+			
+				փիքսելներ մատնաչափի վրա
+				{0} փիքսել մատնաչափի վրա
+				{0} փիքսել մատնաչափի վրա
+			
+			
+				կետեր սանտիմետրի վրա
+				{0} կետ սանտիմետրի վրա
+				{0} կետ սանտիմետրի վրա
+			
+			
+				կետեր մատնաչափի վրա
+				{0} կետ մատնաչափի վրա
+				{0} կետ մատնաչափի վրա
+			
 			
 				կիլոմետրեր
 				{0} կիլոմետր
@@ -5970,10 +6226,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ֆուտի վրա
 			
 			
-				դյույմեր
-				{0} դյույմ
-				{0} դյույմ
-				{0} դյույմի վրա
+				մատնաչափեր
+				{0} մատնաչափ
+				{0} մատնաչափ
+				{0} մատնաչափի վրա
 			
 			
 				պարսեկներ
@@ -6059,15 +6315,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ֆունտի վրա
 			
 			
-				ունցիաներ
-				{0} ունցիա
-				{0} ունցիա
-				{0} ունցիայի վրա
+				ունկիներ
+				{0} ունկի
+				{0} ունկի
+				{0} ունկիի վրա
 			
 			
-				տրոյական ունցիաներ
-				{0} տրոյական ունցիա
-				{0} տրոյական ունցիա
+				տրոյական ունկիներ
+				{0} տրոյական ունկի
+				{0} տրոյական ունկի
 			
 			
 				կարատներ
@@ -6091,8 +6347,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				գիգավատտեր
-				{0} գիգավատտեր
-				{0} գիգավատտեր
+				{0} գիգավատտ
+				{0} գիգավատտ
 			
 			
 				մեգավատտեր
@@ -6119,11 +6375,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ձիաուժ
 				{0} ձիաուժ
 			
-			
-				հեկտոպասկալ
-				{0} հեկտոպասկալ
-				{0} հեկտոպասկալ
-			
 			
 				սնդիկի սյան միլիմետրեր
 				{0} միլիմետր սնդիկի սյուն
@@ -6139,6 +6390,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} դյույմ սնդիկի սյուն
 				{0} դյույմ սնդիկի սյուն
 			
+			
+				բարեր
+				{0} բար
+				{0} բար
+			
 			
 				միլիբարեր
 				{0} միլիբար
@@ -6149,6 +6405,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մթնոլորտ
 				{0} մթնոլորտ
 			
+			
+				պասկալներ
+				{0} պասկալ
+				{0} պասկալ
+			
+			
+				հեկտոպասկալ
+				{0} հեկտոպասկալ
+				{0} հեկտոպասկալ
+			
 			
 				կիլոպասկալներ
 				{0} կիլոպասկալ
@@ -6156,7 +6422,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				մեգապասկալներ
-				{0} ՄՊա
+				{0} մեգապասկալ
 				{0} մեգապասկալ
 			
 			
@@ -6232,7 +6498,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} խորանարդ մղոն
 			
 			
-				խորանարդ յարդ
+				խորանարդ յարդեր
 				{0} խորանարդ յարդ
 				{0} խորանարդ յարդ
 			
@@ -6242,9 +6508,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} խորանարդ ֆուտ
 			
 			
-				խորանարդ դյույմ
-				{0} խորանարդ դյույմ
-				{0} խորանարդ դյույմ
+				խորանարդ մատնաչափեր
+				{0} խորանարդ մատնաչափ
+				{0} խորանարդ մատնաչափ
 			
 			
 				մեգալիտրեր
@@ -6278,9 +6544,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} միլիլիտր
 			
 			
-				մետրիկ պինտեր
-				{0} մետրիկ պինտ
-				{0} մետրիկ պինտ
+				մետրիկ փինթեր
+				{0} մետրիկ փինթ
+				{0} մետրիկ փինթ
 			
 			
 				մետրիկ բաժակներ
@@ -6310,9 +6576,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} քվարտ
 			
 			
-				պինտեր
-				{0} պինտ
-				{0} պինտ
+				փինթեր
+				{0} փինթ
+				{0} փինթ
 			
 			
 				բաժակներ
@@ -6320,14 +6586,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} բաժակ
 			
 			
-				հեղուկ ունցիաներ
-				{0} հեղուկ ունցիա
-				{0} հեղուկ ունցիա
+				հեղուկ ունկիներ
+				{0} հեղուկ ունկի
+				{0} հեղուկ ունկի
 			
 			
-				անգլիական հեղուկ ունցիաներ
-				{0} անգլիական հեղուկ ունցիա
-				{0} անգլիական հեղուկ ունցիա
+				անգլիական հեղուկ ունկիներ
+				{0} անգլիական հեղուկ ունկի
+				{0} անգլիական հեղուկ ունկի
 			
 			
 				ճաշի գդալ
@@ -6340,15 +6606,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} թեյի գդալ
 			
 			
-				բարելներ
-				{0} բարել
-				{0} բարել
+				տակառներ
+				{0} տակառ
+				{0} տակառ
 			
 			
 				ուղղություն
 				արևելյան երկարության {0}
-				հյուսիսային լայնության {0}
-				հարավային լայնության {0}
+				{0} հյուսիսային լայնության
+				{0} հարավային լայնության
 				արևմտյան երկարության {0}
 			
 		
@@ -6377,7 +6643,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ռադ
 			
 			
-				աստիճաններ
+				աստիճան
 				{0}°
 				{0}°
 			
@@ -6436,10 +6702,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ֆտ²
 			
 			
-				դյմ²
-				{0} դյմ²
-				{0} դյմ²
-				{0}/դյմ²
+				մատ²
+				{0} մատ²
+				{0} մատ²
+				{0}/մատ²
 			
 			
 				դունամ
@@ -6507,12 +6773,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մղ/անգլ․ գալ
 			
 			
-				պետաբայթ
+				ՊԲայթ
 				{0} ՊԲ
 				{0} ՊԲ
 			
 			
-				ՏԲ
+				ՏԲայթ
 				{0} ՏԲ
 				{0} ՏԲ
 			
@@ -6522,7 +6788,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Տբիթ
 			
 			
-				ԳԲ
+				ԳԲայթ
 				{0} ԳԲ
 				{0} ԳԲ
 			
@@ -6532,7 +6798,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Գբիթ
 			
 			
-				ՄԲ
+				ՄԲայթ
 				{0} ՄԲ
 				{0} ՄԲ
 			
@@ -6542,7 +6808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Մբիթ
 			
 			
-				կԲ
+				կԲայթ
 				{0} կԲ
 				{0} կԲ
 			
@@ -6553,7 +6819,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Բ
-				{0} Բ
+				{0} Բայթ
 				{0} Բ
 			
 			
@@ -6566,6 +6832,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} դ․
 				{0} դ․
 			
+			
+				10-ամյակ
+				{0} 10-ամյակ
+				{0} 10-ամյակ
+			
 			
 				տ
 				{0} տ
@@ -6634,9 +6905,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մԱ
 			
 			
-				օմ
-				{0} օմ
-				{0} օմ
+				օհմեր
+				{0} Օհմ
+				{0} Օհմ
 			
 			
 				Վ
@@ -6678,10 +6949,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} էՎ
 				{0} էՎ
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				ԱՄՆ ջերմ
+				{0} ԱՄՆ ջերմ
+				{0} ԱՄՆ ջերմ
 			
 			
 				ֆնտ․ ու․
@@ -6713,6 +6984,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Հց
 				{0} Հց
 			
+			
+				փիքսելներ
+				{0} փքս
+				{0} փքս
+			
+			
+				մեգափիքսելներ
+				{0} ՄՓ
+				{0} ՄՓ
+			
+			
+				փսմ
+				{0} փսմ
+				{0} փսմ
+			
+			
+				փմչ
+				{0} փմչ
+				{0} փմչ
+			
+			
+				կսմ
+				{0} կսմ
+				{0} կսմ
+			
+			
+				կմչ
+				{0} կմչ
+				{0} կմչ
+			
 			
 				կմ
 				{0} կմ
@@ -6773,10 +7074,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/ֆտ
 			
 			
-				դյմ
-				{0} դյմ
-				{0} դյմ
-				{0}/դյմ
+				մատ
+				{0} մատ
+				{0} մատ
+				{0}/մատ
 			
 			
 				պկ
@@ -6818,11 +7119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} լք
 				{0} լք
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				տ
 				{0} տ
@@ -6856,21 +7152,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ամեր․ տ
 			
 			
-				ֆունտեր
+				ֆունտ
 				{0} ֆունտ
 				{0} ֆունտ
 				{0}/ֆունտ
 			
 			
-				ունց
-				{0} ունց
-				{0} ունց
-				{0}/ունց
+				ունկ.
+				{0} ունկ.
+				{0} ունկ.
+				{0}/ունկ.
 			
 			
-				տրոյ․ ունց
-				{0} տրոյ․ ունց
-				{0} տրոյ․ ունց
+				տրոյ․ ունկ.
+				{0} տրոյ․ ունկ.
+				{0} տրոյ․ ունկ.
 			
 			
 				կար
@@ -6882,16 +7178,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} դա
 				{0} դա
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				ԳՎտ
 				{0} ԳՎտ
@@ -6922,11 +7208,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ձ․ու․
 				{0} ձ․ու․
 			
-			
-				հՊա
-				{0} հՊա
-				{0} հՊա
-			
 			
 				մմ ս.ս.
 				{0} մմ ս.ս.
@@ -6942,6 +7223,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} դյմ. ս.ս.
 				{0} դյմ. ս.ս.
 			
+			
+				բար
+				{0} բար
+				{0} բար
+			
 			
 				մբար
 				{0} մբար
@@ -6952,6 +7238,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մթն
 				{0} մթն
 			
+			
+				Պա
+				{0} Պա
+				{0} Պա
+			
+			
+				հՊա
+				{0} հՊա
+				{0} հՊա
+			
 			
 				կՊա
 				{0} կՊա
@@ -6978,9 +7274,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մղ/ժ
 			
 			
-				հանգույցներ
-				{0} հանգույց
-				{0} հանգույց
+				հնգ
+				{0} հնգ
+				{0} հնգ
 			
 			
 				°
@@ -7045,9 +7341,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ֆտ³
 			
 			
-				դյմ³
-				{0} դյմ³
-				{0} դյմ³
+				մատ³
+				{0} մատ³
+				{0} մատ³
 			
 			
 				Մլ
@@ -7082,8 +7378,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				մետր․ պինտեր
-				{0} մետր․ պինտ
-				{0} մետր․ պինտ
+				{0} մետր․ փինթ
+				{0} մետր․ փինթ
 			
 			
 				մ․ բաժ․
@@ -7113,9 +7409,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} քվարտ
 			
 			
-				պինտեր
-				{0} պինտ
-				{0} պինտ
+				փինթեր
+				{0} փինթ
+				{0} փինթ
 			
 			
 				բաժակներ
@@ -7123,9 +7419,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} բաժ․
 			
 			
-				հղ․ ունց․
-				{0} հղ. ունց․
-				{0} հղ. ունց․
+				հղ․ ունկ․
+				{0} հղ. ունկ․
+				{0} հղ. ունկ․
 			
 			
 				ա․ հ․ ու․
@@ -7143,9 +7439,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} թգ.
 			
 			
-				բարել
-				{0} բարել
-				{0} բարել
+				տակառ
+				{0} տկռ
+				{0} տկռ
 			
 			
 				ուղղություն
@@ -7323,10 +7619,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ձ/ու
 				{0}ձ/ու
 			
-			
-				{0} հՊա
-				{0} հՊա
-			
 			
 				{0}" ս. ս.
 				{0}" ս. ս
@@ -7335,6 +7627,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} մբ
 				{0} մբ
 			
+			
+				{0} հՊա
+				{0} հՊա
+			
 			
 				կմ/ժ
 				{0} կմ/ժ
@@ -7402,10 +7698,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} կամ {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0} և {1}
-			{0} և {1}
+			{0}, {1}
+			{0}, {1}
 		
 		
 			{0}, {1}
@@ -7440,7 +7734,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		{0} — բոլորը
-		{0}՝ {1}
+		{0}․ {1}
 		{0} — համատեղելի
 		{0} — ներդրված
 		{0} — ընդլայնված
@@ -7450,84 +7744,84 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Գրեր — {0}
 		{0} — Գծեր
 		{0} — Գծեր
-		Զբաղմունքներ
-		Աֆրիկյան գրեր
-		Ամերիկյան գրեր
+		զբաղմունք
+		աֆրիկյան գիր
+		ամերիկյան գիր
 		կենդանի
-		Կենդանիներ և բնություն
-		Սլաքներ
+		կենդանիներ կամ բնություն
+		սլաք
 		մարմին
 		Կեղծ գրաֆիկա
-		Բրեյլի գիր
+		բրայլ
 		շենք
-		Պարբերակներ/աստղանիշեր
+		պարբերակ կամ աստղանիշ
 		Ջամո բաղաձայններ
-		Արժույթների նշաններ
-		Միության/անջատման գծիկ
-		Թվանշաններ
-		Նշագիր
-		Գուշակության նշաններ
-		Վար ուղղված սլաքներ
-		Վար և վեր ուղղված սլաքներ
+		արժույթի նշան
+		անջատման կամ միության գծիկ
+		թվանշան
+		նշագիր
+		գուշակության նշան
+		վար ուղղված սլաք
+		վար և վեր ուղղված սլաք
 		Արևելաասիական գրեր
 		Էմոձի
 		Եվրոպական գրեր
 		կին
 		դրոշ
-		Դրոշակներ
-		Ուտելիք և ըմպելիք
-		Ձևաչափում
-		Ձևաչափում և բացատներ
+		դրոշներ
+		ուտելիք և ըմպելիք
+		ձևաչափ
+		ձևաչափ և բացատ
 		Ձևի ամբողջ լայնքով տարբերակներ
-		Երկրաչափական պատկերներ
-		Ձևի կես լայնքով տարբերակներ
-		Չինական նշաններ
+		երկրաչափական պատկեր
+		կիսալայն տարբերակ
+		խան գրանշան
 		Հիերոգլիֆային բանալիներ
 		Հանջա
 		Չինարենի պարզեցված հիերոգլիֆներ
 		Չինարենի ավանդական հիերոգլիֆներ
 		սիրտ
-		Պատմական գրեր
+		պատմական գիր
 		Հիերոգլիֆների նկարագրման նշաններ
-		Կանա
+		ճապոնական կանա
 		Կամբուն
 		Կանձի
 		ստեղն
 		Ձախ ուղղված սլաքներ
 		Ձախ և աջ ուղղված սլաքներ
-		Տառային նշաններ
+		տառակերպ նշան
 		Սահմանափակ գործածում
 		տղամարդ
 		Մաթեմատիկական նշաններ
 		Միջինարևելյան գրեր
-		Խառը
-		ժամանակակից գրեր
-		Փոխակերպիչ
-		Երաժշտական գրեր
+		խառը
+		ժամանակակից գիր
+		փոփոխիչ
+		երաժշտական նշան
 		բնություն
 		Առանց բացատի
-		Թվեր
-		Առարկաներ
-		Այլ
+		թվեր
+		առարկա
+		այլ
 		Զույգ նշաններ
 		անձ
-		Հնչյունային այբուբեն
-		Պատկերագրեր
+		հնչյունային այբուբեն
+		պատկերագիր
 		վայր
 		բույս
-		Կետադրական նշաններ
+		կետադրություն
 		Աջ ուղղված սլաքներ
-		Ստանդարտ նշաններ
-		Ձևի փոքր տարբերակներ
+		նիշ կամ նշան
+		փոքր տարբերակներ
 		զմայլիկ
-		Զմայլիկներ և մարդիկ
-		Հարավասիական գրեր
+		զմայլիկ կամ անձ
+		հարավասիական գիր
 		Հարավարևելյան Ասիայի գրեր
 		Բացատներ
 		սպորտ
 		Նշաններ
-		Տեխնիկական նշաններ
-		Տոնի նշաններ
+		տեխնիկական նշան
+		ձայներանգի նշան
 		ճամփորդություն
 		Ճամփորդություն և վայրեր
 		Վեր ուղղված սլաքներ
@@ -7535,76 +7829,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Ջամո ձայնավորներ
 		եղանակ
 		Արևմտաասիական գրեր
-		Բացատներ
+		բացատ
 	
 	
-		շեղագիր
+		շեղ
 		օպտիկական չափ
 		թեքություն
 		լայնություն
 		հագեցվածություն
-		ձեռագիր
+		արագագիր
 		ենթագիր
 		տեքստ
 		տիտղոսային
 		մոնիտոր
 		պաստառ
-		թեք շեղագիր
+		հետթեքված
 		ուղիղ
 		թեք
 		գերթեք
-		ուլտրասեղմված
-		ուլտրանեղացված
-		ուլտրանեղ
-		գերսեղմված
-		գերնեղացված
-		ուլտրանեղ
-		սեղմված
-		նեղացված
-		նեղացված
-		կիսասեղմված
-		կիսանեղացված
+		անդրախտացված
+		անդրասեղմված
+		անդրանեղ
+		գերխտացված
+		գերսեղմված
+		գերնեղ
+		խտացված
+		սեղմված
+		սեղմված
+		կիսախտացված
+		կիսասեղմված
 		կիսանեղ
 		նորմալ
-		կիսալայնացված
+		կիսաընդլայնված
 		կիսաձգված
 		կիսալայն
-		լայնացված
+		ընդլայնված
 		ձգված
 		լայն
-		գերլայնացված
+		գերընդլայնված
 		գերձգված
 		գերլայն
-		ուլտրալայնացված
-		ուլտրաձգված
-		ուլտրալայն
+		անդրընդլայնված
+		անդրաձգված
+		անդրալայն
 		բարակ
 		գերթեթև
-		ուլտրաթեթև
+		անդրաթեթև
 		թեթև
 		կիսաթեթև
 		գրքային
-		սովորական
+		կանոնավոր
 		միջին
 		կիսաթավ
-		միջին թավության
+		միջնաթավ
 		թավ
 		գերթավ
 		սև
 		ծանր
 		գերսև
 		ուլտրասև
-		ուլտրածանր
+		անդրածանր
 		ուղղաձիգ կոտորակներ
 		գլխատառերի միջև բացատներ
 		ոչ պարտադիր կցագրեր
 		շեղ կոտորակներ
-		թվանշանների հավասարեցում
+		նոր ոճի թվանշաններ
 		հնաոճ տարրեր
 		դասական թվականներ
-		համաչափ թվանշաններ
+		համամասնական թվանշաններ
 		փոքր գլխատառեր
 		աղյուսակային թվանշաններ
-		զրո
+		շեղագծված զրո
 	
 
diff --git a/make/data/cldr/common/main/hy_AM.xml b/make/data/cldr/common/main/hy_AM.xml
index c84ed9f7d8f..d61bd5f30bc 100644
--- a/make/data/cldr/common/main/hy_AM.xml
+++ b/make/data/cldr/common/main/hy_AM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ia.xml b/make/data/cldr/common/main/ia.xml
index 4f37fb840f6..d1775d4b8ca 100644
--- a/make/data/cldr/common/main/ia.xml
+++ b/make/data/cldr/common/main/ia.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -103,9 +103,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			anglese australian
 			anglese canadian
 			anglese britannic
-			anglese (GB)
 			anglese american
-			anglese (SUA)
 			esperanto
 			espaniol
 			espaniol latinoamerican
@@ -615,7 +613,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Madagascar
 			Insulas Marshall
 			Macedonia
-			Macedonia (ARYM)
 			Mali
 			Birmania/Myanmar
 			Mongolia
@@ -2888,10 +2885,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		latn
-		
-			latn
-		
 		2
 		
 			,
@@ -3459,7 +3452,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				rublos russe
 				rublos russe
 				₽
-				₽
 			
 			
 				franco ruandese
@@ -4133,11 +4125,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} cv
 				{0} cavallos-vapor
 			
-			
-				hectopascales
-				{0} hPa
-				{0} hectopascales
-			
 			
 				milimetros de mercurio
 				{0} mm Hg
@@ -4163,6 +4150,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atm
 				{0} atmospheras
 			
+			
+				hectopascales
+				{0} hPa
+				{0} hectopascales
+			
 			
 				kilometros per hora
 				{0} km/h
@@ -4846,11 +4838,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} cv
 				{0} cv
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -4876,6 +4863,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
diff --git a/make/data/cldr/common/main/ia_001.xml b/make/data/cldr/common/main/ia_001.xml
index ff63792ea54..9b39f505fc6 100644
--- a/make/data/cldr/common/main/ia_001.xml
+++ b/make/data/cldr/common/main/ia_001.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/id.xml b/make/data/cldr/common/main/id.xml
index 2166e4fd95e..23e016c43cc 100644
--- a/make/data/cldr/common/main/id.xml
+++ b/make/data/cldr/common/main/id.xml
@@ -9,10 +9,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
+		
+			{0} ({1})
+			{0}, {1}
+			{0}: {1}
+		
 		
 			Afar
 			Abkhaz
@@ -150,7 +155,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Inggris
 			Inggris (Inggris)
 			Inggris (U.K.)
-			Inggris (A.S.)
 			Inggris Abad Pertengahan
 			Esperanto
 			Spanyol
@@ -554,12 +558,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yiddish
 			Yoruba
 			Kanton
+			Tionghoa, Kanton
 			Zhuang
 			Zapotek
 			Blissymbol
 			Zenaga
 			Tamazight Maroko Standar
 			Tionghoa
+			Tionghoa, Mandarin
 			Tionghoa (Aksara Sederhana)
 			Tionghoa (Aksara Tradisional)
 			Zulu
@@ -570,6 +576,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			
 			
+			
 			
 			
 			
@@ -624,6 +631,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -712,6 +720,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -771,7 +780,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Albania
 			Armenia
 			Angola
-			Antartika
+			Antarktika
 			Argentina
 			Samoa Amerika
 			Austria
@@ -808,8 +817,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kongo - Brazzaville
 			Kongo (Republik)
 			Swiss
-			Pantai Gading
-			Pantai Gading (Ivory Coast)
+			Côte d’Ivoire
+			Côte d’Ivoire
 			Kepulauan Cook
 			Cile
 			Kamerun
@@ -820,7 +829,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kuba
 			Tanjung Verde
 			Curaçao
-			Pulau Christmas
+			Pulau Natal
 			Siprus
 			Ceko
 			Republik Ceko
@@ -843,8 +852,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Zona Euro
 			Finlandia
 			Fiji
-			Kepulauan Malvinas
-			Kepulauan Malvinas (Falkland)
+			Kepulauan Falkland
+			Kepulauan Falkland (Malvinas)
 			Mikronesia
 			Kepulauan Faroe
 			Prancis
@@ -868,14 +877,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Guam
 			Guinea-Bissau
 			Guyana
-			Hong Kong SAR Tiongkok
+			Hong Kong DAK Tiongkok
 			Hong Kong
 			Pulau Heard dan Kepulauan McDonald
 			Honduras
 			Kroasia
 			Haiti
 			Hungaria
-			Kepulauan Canary
+			Kepulauan Canaria
 			Indonesia
 			Irlandia
 			Israel
@@ -923,7 +932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mali
 			Myanmar (Burma)
 			Mongolia
-			Makau SAR Tiongkok
+			Makau DAK Tiongkok
 			Makau
 			Kepulauan Mariana Utara
 			Martinik
@@ -996,13 +1005,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tristan da Cunha
 			Kepulauan Turks dan Caicos
 			Cad
-			Wilayah Kutub Selatan Prancis
+			Wilayah Selatan Perancis
 			Togo
 			Thailand
 			Tajikistan
 			Tokelau
 			Timor Leste
-			TL
+			Timor Timur
 			Turkimenistan
 			Tunisia
 			Tonga
@@ -1021,10 +1030,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Uruguay
 			Uzbekistan
 			Vatikan
-			Saint Vincent dan Grenadines
+			Saint Vincent dan Grenadine
 			Venezuela
-			Kepulauan Virgin Inggris
-			Kepulauan Virgin A.S.
+			Kepulauan Virgin Britania Raya
+			Kepulauan Virgin Amerika Serikat
 			Vietnam
 			Vanuatu
 			Kepulauan Wallis dan Futuna
@@ -1118,7 +1127,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kalender ISO-8601
 			Kalender Jepang
 			Kalender Persia
-			Kalendar Minguo
+			Kalender Min-guo
 			Format Mata Uang Akuntansi
 			Format Mata Uang Standar
 			Sortir Simbol
@@ -1146,6 +1155,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Urutan Sortir Guratan
 			Urutan Sortir Tradisional
 			Urutan Sortir Guratan Radikal
+			Aturan Pengurutan Zhuyin
 			Sortir Tanpa Normalisasi
 			Sortir Unicode Dinormalisasi
 			Sortir Digit Satu Per Satu
@@ -1165,8 +1175,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Gaya Pemisah Baris Renggang
 			Gaya Pemisah Baris Normal
 			Gaya Pemisah Baris Rapat
-			BGN
-			UNGEGN
+			Transliterasi BGN AS
+			Transliterasi GEGN PBB
 			Sistem Metrik
 			Sistem Pengukuran Imperial
 			Sistem Pengukuran A.S.
@@ -1251,8 +1261,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
 		[å]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ “ ” ( ) \[ \] /]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ “ ” ( ) \[ \] /]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1261,19 +1271,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1682,7 +1697,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
 						
@@ -2224,7 +2238,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
 						
@@ -2384,60 +2397,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							Muh.
 							Saf.
-							Rab. I
-							Rab. II
-							Jum. I
-							Jum. II
+							Rab. Awal
+							Rab. Akhir
+							Jum. Awal
+							Jum. Akhir
 							Raj.
-							Sha.
+							Sya.
 							Ram.
 							Syaw.
-							Dhuʻl-Q.
-							Dhuʻl-H.
+							Zulka.
+							Zulhi.
 						
 						
-							Muharram
+							Muharam
 							Safar
-							Rabiʻ I
-							Rabiʻ II
-							Jumada I
-							Jumada II
+							Rabiulawal
+							Rabiulakhir
+							Jumadilawal
+							Jumadilakhir
 							Rajab
-							Sya’ban
-							Ramadhan
+							Syakban
+							Ramadan
 							Syawal
-							Dhuʻl-Qiʻdah
-							Dhuʻl-Hijjah
+							Zulkaidah
+							Zulhijah
 						
 					
 					
 						
 							Muh.
 							Saf.
-							Rab. I
-							Rab. II
-							Jum. I
-							Jum. II
+							Rab. Awal
+							Rab. Akhir
+							Jum. Awal
+							Jum. Akhir
 							Raj.
-							Sha.
+							Sya.
 							Ram.
 							Syaw.
-							Dhuʻl-Q.
-							Dhuʻl-H.
+							Zulka.
+							Zulhi.
 						
 						
-							Muharram
+							Muharam
 							Safar
-							Rabiʻ I
-							Rabiʻ II
-							Jumada I
-							Jumada II
+							Rabiulawal
+							Rabiulakhir
+							Jumadilawal
+							Jumadilakhir
 							Rajab
-							Sya’ban
-							Ramadhan
+							Syakban
+							Ramadan
 							Syawal
-							Dhuʻl-Qiʻdah
-							Dhuʻl-Hijjah
+							Zulkaidah
+							Zulhijah
 						
 					
 				
@@ -2486,11 +2499,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
-						E, d
-						y G
-						MMM y G
-						d MMM y G
-						E, d MMM y G
+						E, d
+						y G
+						MMM y G
+						d MMM y G
+						E, d MMM y G
 						d/M
 						E, d/M
 						d MMM
@@ -2498,16 +2511,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d MMMM
 						E, d MMMM
 						y G
-						y G
-						M/y G
-						d/M/y G
-						E, d/M/y G
-						MMM y G
-						d MMM y G
-						E, d MMM y G
-						MMMM y G
-						QQQ y G
-						QQQQ y G
+						y G
+						M/y G
+						d/M/y G
+						E, d/M/y G
+						MMM y G
+						d MMM y G
+						E, d MMM y G
+						MMMM y G
+						QQQ y G
+						QQQQ y G
 					
 					
 						
@@ -2758,6 +2771,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				thn.
+				thn lalu
+				thn ini
+				thn depan
 				
 					dlm {0} thn
 				
@@ -2767,6 +2783,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				thn.
+				thn lalu
+				thn ini
+				thn depan
 				
 					dlm {0} thn
 				
@@ -2818,6 +2837,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				bln.
+				bln lalu
+				bln ini
+				bln berikutnya
 				
 					dlm {0} bln
 				
@@ -2827,6 +2849,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				bln.
+				bln lalu
+				bln ini
+				bln berikutnya
 				
 					dlm {0} bln
 				
@@ -2849,6 +2874,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mgg.
+				mgg lalu
+				mgg ini
+				mgg depan
 				
 					dlm {0} mgg
 				
@@ -2859,6 +2887,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mgg.
+				mgg lalu
+				mgg ini
+				mgg depan
 				
 					dlm {0} mgg
 				
@@ -2911,13 +2942,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				Hari dalam Setahun
+				hari dalam setahun
 			
 			
-				Hari dalam Setahun
+				hari dlm setahun
 			
 			
-				Hari dalam Setahun
+				hari dlm 1 thn
 			
 			
 				hari dalam seminggu
@@ -3291,7 +3322,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				Tidak Dikenal
+				Kota Tidak Dikenal
 			
 			
 				Andorra
@@ -3956,6 +3987,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktobe
 			
+			
+				Kostanay
+			
 			
 				Qyzylorda
 			
@@ -4232,6 +4266,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Volgograd
 			
+			
+				Saratov
+			
 			
 				Astrakhan
 			
@@ -5550,7 +5587,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			,
 			.
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5559,6 +5599,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ribu
@@ -5640,6 +5685,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dirham Uni Emirat Arab
 				Dirham Uni Emirat Arab
+				AED
 			
 			
 				Afgani Afganistan (1927–2002)
@@ -5648,22 +5694,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Afgani Afganistan
 				Afgani Afganistan
+				AFN
 			
 			
 				Lek Albania
 				Lek Albania
+				ALL
 			
 			
 				Dram Armenia
 				Dram Armenia
+				AMD
 			
 			
 				Guilder Antilla Belanda
 				Guilder Antilla Belanda
+				ANG
 			
 			
 				Kwanza Angola
 				Kwanza Angola
+				AOA
+				Kz
 			
 			
 				Kwanza Angola (1977–1991)
@@ -5695,6 +5747,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Argentina
 				Peso Argentina
+				ARS
+				$
 			
 			
 				Schilling Austria
@@ -5703,10 +5757,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dolar Australia
 				Dolar Australia
 				AU$
+				$
 			
 			
 				Florin Aruba
 				Florin Aruba
+				AWG
 			
 			
 				Manat Azerbaijan (1993–2006)
@@ -5715,6 +5771,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Manat Azerbaijan
 				Manat Azerbaijan
+				AZN
 			
 			
 				Dinar Bosnia-Herzegovina (1992–1994)
@@ -5723,6 +5780,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Mark Konvertibel Bosnia-Herzegovina
 				Mark Konvertibel Bosnia-Herzegovina
+				BAM
+				KM
 			
 			
 				Dinar Baru Bosnia-Herzegovina (1994–1997)
@@ -5731,10 +5790,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dolar Barbados
 				Dolar Barbados
+				BBD
+				$
 			
 			
 				Taka Bangladesh
 				Taka Bangladesh
+				BDT
+				৳
 			
 			
 				Franc Belgia (konvertibel)
@@ -5754,6 +5817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lev Bulgaria
 				Lev Bulgaria
+				BGN
 			
 			
 				Lev Bulgaria (1879–1952)
@@ -5762,22 +5826,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dinar Bahrain
 				Dinar Bahrain
+				BHD
 			
 			
 				Franc Burundi
 				Franc Burundi
+				BIF
 			
 			
 				Dolar Bermuda
 				Dolar Bermuda
+				BMD
+				$
 			
 			
 				Dolar Brunei
 				Dolar Brunei
+				BND
+				$
 			
 			
 				Boliviano
 				Boliviano
+				BOB
+				Bs
 			
 			
 				Boliviano Bolivia (1863–1963)
@@ -5804,6 +5876,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Real Brasil
 				Real Brasil
+				R$
+				R$
 			
 			
 				Cruzado Baru Brasil (1989–1990)
@@ -5820,10 +5894,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dolar Bahama
 				Dolar Bahama
+				BSD
+				$
 			
 			
 				Ngultrum Bhutan
 				Ngultrum Bhutan
+				BTN
 			
 			
 				Kyat Burma
@@ -5831,6 +5908,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pula Botswana
 				Pula Botswana
+				BWP
+				P
 			
 			
 				Rubel Baru Belarus (1994–1999)
@@ -5839,22 +5918,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rubel Belarusia
 				Rubel Belarusia
+				BYN
+				р.
 			
 			
 				Rubel Belarusia (2000–2016)
 				Rubel Belarusia (2000–2016)
+				BYR
 			
 			
 				Dolar Belize
 				Dolar Belize
+				BZD
+				$
 			
 			
 				Dolar Kanada
 				Dolar Kanada
+				CA$
+				$
 			
 			
 				Franc Kongo
 				Franc Kongo
+				CDF
 			
 			
 				Euro WIR
@@ -5862,6 +5949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc Swiss
 				Franc Swiss
+				CHF
 			
 			
 				Franc WIR
@@ -5875,18 +5963,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Cile
 				Peso Cile
+				CLP
+				$
 			
 			
 				Yuan Tiongkok (luar negeri)
 				Yuan Tiongkok (luar negeri)
+				CNH
 			
 			
 				Yuan Tiongkok
 				Yuan Tiongkok
+				CN¥
+				¥
 			
 			
 				Peso Kolombia
 				Peso Kolombia
+				COP
+				$
 			
 			
 				Unit Nilai Nyata Kolombia
@@ -5894,6 +5989,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Colon Kosta Rika
 				Colon Kosta Rika
+				CRC
+				₡
 			
 			
 				Dinar Serbia (2002–2006)
@@ -5905,14 +6002,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Konvertibel Kuba
 				Peso Konvertibel Kuba
+				CUC
+				$
 			
 			
 				Peso Kuba
 				Peso Kuba
+				CUP
+				$
 			
 			
 				Escudo Tanjung Verde
 				Escudo Tanjung Verde
+				CVE
 			
 			
 				Pound Siprus
@@ -5920,6 +6022,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Koruna Cheska
 				Koruna Cheska
+				CZK
+				Kč
 			
 			
 				Mark Jerman Timur
@@ -5930,18 +6034,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc Jibuti
 				Franc Jibuti
+				DJF
 			
 			
 				Krone Denmark
 				Krone Denmark
+				DKK
+				kr
 			
 			
 				Peso Dominika
 				Peso Dominika
+				DOP
+				$
 			
 			
 				Dinar Algeria
 				Dinar Algeria
+				DZD
 			
 			
 				Sucre Ekuador
@@ -5955,10 +6065,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pound Mesir
 				Pound Mesir
+				EGP
+				E£
 			
 			
 				Nakfa Eritrea
 				Nakfa Eritrea
+				ERN
 			
 			
 				Peseta Spanyol (akun)
@@ -5972,10 +6085,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Birr Etiopia
 				Birr Etiopia
+				ETB
 			
 			
 				Euro
 				Euro
+				€
+				€
 			
 			
 				Markka Finlandia
@@ -5983,10 +6099,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dolar Fiji
 				Dolar Fiji
+				FJD
+				$
 			
 			
 				Pound Kepulauan Falkland
 				Pound Kepulauan Falkland
+				FKP
+				£
 			
 			
 				Franc Prancis
@@ -5994,6 +6114,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pound Inggris
 				Pound Inggris
+				£
+				£
 			
 			
 				Kupon Larit Georgia
@@ -6001,6 +6123,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lari Georgia
 				Lari Georgia
+				GEL
+				₾
 			
 			
 				Cedi Ghana (1979–2007)
@@ -6009,18 +6133,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Cedi Ghana
 				Cedi Ghana
+				GHS
 			
 			
 				Pound Gibraltar
 				Pound Gibraltar
+				GIP
+				£
 			
 			
 				Dalasi Gambia
 				Dalasi Gambia
+				GMD
 			
 			
 				Franc Guinea
 				Franc Guinea
+				GNF
+				FG
 			
 			
 				Syli Guinea
@@ -6034,6 +6164,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Quetzal Guatemala
 				Quetzal Guatemala
+				GTQ
+				Q
 			
 			
 				Escudo Guinea Portugal
@@ -6044,14 +6176,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dolar Guyana
 				Dolar Guyana
+				GYD
+				$
 			
 			
 				Dolar Hong Kong
 				Dolar Hong Kong
+				HK$
+				$
 			
 			
 				Lempira Honduras
 				Lempira Honduras
+				HNL
+				L
 			
 			
 				Dinar Kroasia
@@ -6059,14 +6197,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kuna Kroasia
 				Kuna Kroasia
+				HRK
+				kn
 			
 			
 				Gourde Haiti
 				Gourde Haiti
+				HTG
 			
 			
 				Forint Hungaria
 				Forint Hungaria
+				HUF
+				Ft
 			
 			
 				Rupiah Indonesia
@@ -6087,19 +6230,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Shekel Baru Israel
 				Shekel Baru Israel
+				₪
+				₪
 			
 			
 				Rupee India
 				Rupee India
 				Rs
+				₹
 			
 			
 				Dinar Irak
 				Dinar Irak
+				IQD
 			
 			
 				Rial Iran
 				Rial Iran
+				IRR
 			
 			
 				Krona Islandia (1918–1981)
@@ -6108,6 +6256,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Krona Islandia
 				Krona Islandia
+				ISK
+				kr
 			
 			
 				Lira Italia
@@ -6115,34 +6265,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dolar Jamaika
 				Dolar Jamaika
+				JMD
+				$
 			
 			
 				Dinar Yordania
 				Dinar Yordania
+				JOD
 			
 			
 				Yen Jepang
 				Yen Jepang
+				JP¥
+				¥
 			
 			
 				Shilling Kenya
 				Shilling Kenya
+				KES
 			
 			
 				Som Kirgistan
 				Som Kirgistan
+				KGS
 			
 			
 				Riel Kamboja
 				Riel Kamboja
+				KHR
+				៛
 			
 			
 				Franc Komoro
 				Franc Komoro
+				KMF
+				CF
 			
 			
 				Won Korea Utara
 				Won Korea Utara
+				KPW
+				₩
 			
 			
 				Hwan Korea Selatan (1953–1962)
@@ -6155,34 +6318,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Won Korea Selatan
 				Won Korea Selatan
+				₩
+				₩
 			
 			
 				Dinar Kuwait
 				Dinar Kuwait
+				KWD
 			
 			
 				Dolar Kepulauan Cayman
 				Dolar Kepulauan Cayman
+				KYD
+				$
 			
 			
 				Tenge Kazakstan
 				Tenge Kazakstan
+				KZT
+				₸
 			
 			
 				Kip Laos
 				Kip Laos
+				LAK
+				₭
 			
 			
 				Pound Lebanon
 				Pound Lebanon
+				LBP
+				L£
 			
 			
 				Rupee Sri Lanka
 				Rupee Sri Lanka
+				LKR
+				Rs
 			
 			
 				Dolar Liberia
 				Dolar Liberia
+				LRD
+				$
 			
 			
 				Loti Lesotho
@@ -6190,6 +6368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Litas Lituania
 				Litas Lituania
+				LTL
 			
 			
 				Talonas Lituania
@@ -6206,6 +6385,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lats Latvia
 				Lats Latvia
+				LVL
 			
 			
 				Rubel Latvia
@@ -6213,10 +6393,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dinar Libya
 				Dinar Libya
+				LYD
 			
 			
 				Dirham Maroko
 				Dirham Maroko
+				MAD
 			
 			
 				Franc Maroko
@@ -6230,10 +6412,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Leu Moldova
 				Leu Moldova
+				MDL
 			
 			
 				Ariary Madagaskar
 				Ariary Madagaskar
+				MGA
+				Ar
 			
 			
 				Franc Malagasi
@@ -6241,6 +6426,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Denar Makedonia
 				Denar Makedonia
+				MKD
 			
 			
 				Denar Makedonia (1992–1993)
@@ -6252,22 +6438,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kyat Myanmar
 				Kyat Myanmar
+				MMK
+				K
 			
 			
 				Tugrik Mongolia
 				Tugrik Mongolia
+				MNT
+				₮
 			
 			
 				Pataca Makau
 				Pataca Makau
+				MOP
 			
 			
 				Ouguiya Mauritania (1973–2017)
 				Ouguiya Mauritania (1973–2017)
+				MRO
 			
 			
 				Ouguiya Mauritania
 				Ouguiya Mauritania
+				MRU
 			
 			
 				Lira Malta
@@ -6278,6 +6471,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rupee Mauritius
 				Rupee Mauritius
+				MUR
+				Rs
 			
 			
 				Rufiyaa Maladewa (1947–1981)
@@ -6286,14 +6481,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rufiyaa Maladewa
 				Rufiyaa Maladewa
+				MVR
 			
 			
 				Kwacha Malawi
 				Kwacha Malawi
+				MWK
 			
 			
 				Peso Meksiko
 				Peso Meksiko
+				MX$
+				$
 			
 			
 				Peso Silver Meksiko (1861–1992)
@@ -6305,6 +6504,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ringgit Malaysia
 				Ringgit Malaysia
+				MYR
+				RM
 			
 			
 				Escudo Mozambik
@@ -6316,14 +6517,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Metical Mozambik
 				Metical Mozambik
+				MZN
 			
 			
 				Dolar Namibia
 				Dolar Namibia
+				NAD
+				$
 			
 			
 				Naira Nigeria
 				Naira Nigeria
+				NGN
+				₦
 			
 			
 				Cordoba Nikaragua (1988–1991)
@@ -6332,6 +6538,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Cordoba Nikaragua
 				Cordoba Nikaragua
+				NIO
+				C$
 			
 			
 				Guilder Belanda
@@ -6339,22 +6547,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Krone Norwegia
 				Krone Norwegia
+				NOK
+				kr
 			
 			
 				Rupee Nepal
 				Rupee Nepal
+				NPR
+				Rs
 			
 			
 				Dolar Selandia Baru
 				Dolar Selandia Baru
+				NZ$
+				$
 			
 			
 				Rial Oman
 				Rial Oman
+				OMR
 			
 			
 				Balboa Panama
 				Balboa Panama
+				PAB
 			
 			
 				Inti Peru
@@ -6362,6 +6578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Sol Peru
 				Sol Peru
+				PEN
 			
 			
 				Sol Peru (1863–1965)
@@ -6370,18 +6587,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kina Papua Nugini
 				Kina Papua Nugini
+				PGK
 			
 			
 				Peso Filipina
 				Peso Filipina
+				PHP
+				₱
 			
 			
 				Rupee Pakistan
 				Rupee Pakistan
+				PKR
+				Rs
 			
 			
 				Polandia Zloty
 				Polandia Zloty
+				PLN
+				zł
 			
 			
 				Zloty Polandia (1950–1995)
@@ -6393,10 +6617,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Guarani Paraguay
 				Guarani Paraguay
+				PYG
+				₲
 			
 			
 				Rial Qatar
 				Rial Qatar
+				QAR
 			
 			
 				Dolar Rhodesia
@@ -6408,14 +6635,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Leu Rumania
 				Leu Rumania
+				RON
+				lei
 			
 			
 				Dinar Serbia
 				Dinar Serbia
+				RSD
 			
 			
 				Rubel Rusia
 				Rubel Rusia
+				RUB
+				₽
 			
 			
 				Rubel Rusia (1991–1998)
@@ -6424,18 +6656,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc Rwanda
 				Franc Rwanda
+				RWF
+				RF
 			
 			
 				Riyal Arab Saudi
 				Riyal Arab Saudi
+				SAR
 			
 			
 				Dolar Kepulauan Solomon
 				Dolar Kepulauan Solomon
+				SBD
+				$
 			
 			
 				Rupee Seychelles
 				Rupee Seychelles
+				SCR
 			
 			
 				Dinar Sudan (1992–2007)
@@ -6444,6 +6682,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pound Sudan
 				Pound Sudan
+				SDG
 			
 			
 				Pound Sudan (1957–1998)
@@ -6452,14 +6691,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Krona Swedia
 				Krona Swedia
+				SEK
+				kr
 			
 			
 				Dolar Singapura
 				Dolar Singapura
+				SGD
+				$
 			
 			
 				Pound Saint Helena
 				Pound Saint Helena
+				SHP
+				£
 			
 			
 				Tolar Slovenia
@@ -6470,14 +6715,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Leone Sierra Leone
 				Leone Sierra Leone
+				SLL
 			
 			
 				Shilling Somalia
 				Shilling Somalia
+				SOS
 			
 			
 				Dolar Suriname
 				Dolar Suriname
+				SRD
+				$
 			
 			
 				Guilder Suriname
@@ -6485,14 +6734,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pound Sudan Selatan
 				Pound Sudan Selatan
+				SSP
+				£
 			
 			
 				Dobra Sao Tome dan Principe (1977–2017)
 				Dobra Sao Tome dan Principe (1977–2017)
+				STD
 			
 			
 				Dobra Sao Tome dan Principe
 				Dobra Sao Tome dan Principe
+				STN
 			
 			
 				Rubel Soviet
@@ -6503,15 +6756,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pound Suriah
 				Pound Suriah
+				SYP
+				£
 			
 			
 				Lilangeni Swaziland
 				Lilangeni Swaziland
+				SZL
 			
 			
 				Baht Thailand
 				Baht Thailand
 				฿
+				฿
 			
 			
 				Rubel Tajikistan
@@ -6519,6 +6776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Somoni Tajikistan
 				Somoni Tajikistan
+				TJS
 			
 			
 				Manat Turkmenistan (1993–2009)
@@ -6527,14 +6785,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Manat Turkimenistan
 				Manat Turkimenistan
+				TMT
 			
 			
 				Dinar Tunisia
 				Dinar Tunisia
+				TND
 			
 			
 				Paʻanga Tonga
 				Paʻanga Tonga
+				TOP
+				T$
 			
 			
 				Escudo Timor
@@ -6546,23 +6808,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lira Turki
 				Lira Turki
+				TRY
+				₺
+				TL
 			
 			
 				Dolar Trinidad dan Tobago
 				Dolar Trinidad dan Tobago
+				TTD
+				$
 			
 			
 				Dolar Baru Taiwan
 				Dolar Baru Taiwan
+				NT$
 				NT$
 			
 			
 				Shilling Tanzania
 				Shilling Tanzania
+				TZS
 			
 			
 				Hryvnia Ukraina
 				Hryvnia Ukraina
+				UAH
+				₴
 			
 			
 				Karbovanet Ukraina
@@ -6574,10 +6845,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Shilling Uganda
 				Shilling Uganda
+				UGX
 			
 			
 				Dolar Amerika Serikat
 				Dolar Amerika Serikat
+				US$
+				$
 			
 			
 				Dolar AS (Hari berikutnya)
@@ -6595,10 +6869,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Uruguay
 				Peso Uruguay
+				UYU
+				$
 			
 			
 				Som Uzbekistan
 				Som Uzbekistan
+				UZS
 			
 			
 				Bolivar Venezuela (1871–2008)
@@ -6607,14 +6884,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bolivar Venezuela (2008–2018)
 				Bolivar Venezuela (2008–2018)
+				VEF
+				Bs
 			
 			
 				Bolivar Venezuela
 				Bolivar Venezuela
+				VES
 			
 			
 				Dong Vietnam
 				Dong Vietnam
+				₫
+				₫
 			
 			
 				Dong Vietnam (1978–1985)
@@ -6623,14 +6905,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Vatu Vanuatu
 				Vatu Vanuatu
+				VUV
 			
 			
 				Tala Samoa
 				Tala Samoa
+				WST
 			
 			
 				Franc CFA BEAC
 				Franc CFA BEAC
+				FCFA
 			
 			
 				Silver
@@ -6653,6 +6938,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dolar Karibia Timur
 				Dolar Karibia Timur
+				EC$
+				$
 			
 			
 				Hak Khusus Menggambar
@@ -6669,6 +6956,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc CFA BCEAO
 				Franc CFA BCEAO
+				CFA
 			
 			
 				Palladium
@@ -6676,6 +6964,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc CFP
 				Franc CFP
+				CFPF
 			
 			
 				Platinum
@@ -6697,6 +6986,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rial Yaman
 				Rial Yaman
+				YER
 			
 			
 				Hard Dinar Yugoslavia (1966–1990)
@@ -6720,6 +7010,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rand Afrika Selatan
 				Rand Afrika Selatan
+				ZAR
+				R
 			
 			
 				Kwacha Zambia (1968–2012)
@@ -6728,6 +7020,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kwacha Zambia
 				Kwacha Zambia
+				ZMW
+				ZK
 			
 			
 				Zaire Baru Zaire (1993–1998)
@@ -6798,8 +7092,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per kilometer persegi
 			
 			
-				hektar
-				{0} hektar
+				hektare
+				{0} hektare
 			
 			
 				meter persegi
@@ -6817,8 +7111,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per mil persegi
 			
 			
-				acre
-				{0} acre
+				ekar
+				{0} ekar
 			
 			
 				yard persegi
@@ -6833,10 +7127,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inci persegi
 				{0} per inci persegi
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -6846,8 +7136,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} milligram per desiliter
 			
 			
-				millimole per liter
-				{0} millimole per liter
+				millimol per liter
+				{0} millimol per liter
 			
 			
 				bagian per juta
@@ -6865,10 +7155,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				permyriad
 				{0} permyriad
 			
-			
-				mol
-				{0} mol
-			
 			
 				liter per kilometer
 				{0} liter per kilometer
@@ -6933,6 +7219,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				abad
 				{0} abad
 			
+			
+				dekade
+				{0} dekade
+			
 			
 				tahun
 				{0} tahun
@@ -7028,6 +7318,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				satuan panas Britania
 				{0} satuan panas Britania
 			
+			
+				therm AS
+				{0} therm AS
+			
 			
 				pound gaya
 				{0} pound gaya
@@ -7052,6 +7346,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hertz
 				{0} hertz
 			
+			
+				em tipografis
+			
+			
+				piksel
+				{0} piksel
+			
+			
+				megapiksel
+				{0} megapiksel
+			
+			
+				piksel per sentimeter
+				{0} piksel per sentimeter
+			
+			
+				piksel per inci
+				{0} piksel per inci
+			
+			
+				dot per sentimeter
+				{0} dot per sentimeter
+			
+			
+				dot per inci
+				{0} dot per inci
+			
 			
 				kilometer
 				{0} kilometer
@@ -7181,9 +7502,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per pon
 			
 			
-				ons
+				ounce
 				{0} ons
-				{0} per ons
+				{0} per ounce
 			
 			
 				troy ons
@@ -7229,10 +7550,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				daya kuda
 				{0} daya kuda
 			
-			
-				hektopaskal
-				{0} hektopaskal
-			
 			
 				milimeter merkuri
 				{0} milimeter merkuri
@@ -7253,6 +7570,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atmosfer
 				{0} atmosfer
 			
+			
+				pascal
+				{0} pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+			
 			
 				kilopascal
 				{0} kilopascal
@@ -7387,6 +7712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pint
 			
 			
+				cup
 				{0} cup
 			
 			
@@ -7452,14 +7778,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				km²
 				{0} km²
+				{0}/km²
 			
 			
-				hektar
+				hektare
 				{0} ha
 			
 			
 				meter²
 				{0} m²
+				{0}/m²
 			
 			
 				cm²
@@ -7469,9 +7797,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				mil persegi
 				{0} mi²
+				{0}/mi²
 			
 			
-				acre
+				ekar
+				{0} ac
 			
 			
 				yard²
@@ -7486,32 +7816,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in²
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
+				{0} kt
+			
+			
+				mg/dL
+				{0} mg/dL
 			
 			
 				millimol/liter
+				{0} mmol/L
 			
 			
 				bagian/juta
+				{0} ppm
 			
 			
 				persen
+				{0}%
 			
 			
 				permil
+				{0}‰
 			
 			
 				permyriad
-				{0}‱
-			
-			
-				mol
-				{0} mol
 			
 			
 				liter/km
@@ -7527,9 +7857,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mil/gal Imp.
+				{0} mpg Imp.
 			
 			
 				PByte
+				{0} PB
 			
 			
 				TByte
@@ -7568,12 +7900,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} byte
 			
 			
+				bit
 				{0} bit
 			
 			
 				abad
 				{0} abad
 			
+			
+				dek
+				{0} dek
+			
 			
 				tahun
 				{0} thn
@@ -7663,19 +8000,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektronvolt
-				{0} eV
 			
 			
 				BTU
-				{0} Btu
+			
+			
+				therm AS
+				{0} therm AS
 			
 			
 				pound gaya
-				{0} lbf
 			
 			
 				newton
-				{0} N
 			
 			
 				GHz
@@ -7693,6 +8030,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hz
 				{0} Hz
 			
+			
+				piksel
+			
+			
+				megapiksel
+			
 			
 				km
 				{0} km
@@ -7730,6 +8073,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mil
+				{0} mi
 			
 			
 				yard
@@ -7737,9 +8081,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				kaki
+				{0} ft
+				{0}/ft
 			
 			
 				inci
+				{0} in
+				{0}/in
 			
 			
 				parsec
@@ -7747,6 +8095,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				thn cahaya
+				{0} tc
 			
 			
 				sa
@@ -7773,14 +8122,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				radius Matahari
-				{0} R☉
 			
 			
 				lux
+				{0} lx
 			
 			
 				luminositas matahari
-				{0} L☉
 			
 			
 				t
@@ -7806,33 +8154,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ton
+				{0} tn
 			
 			
 				stone
 			
 			
 				pon
+				{0} lb
+				{0}/lb
 			
 			
-				ons
+				oz
+				{0} oz
+				{0}/oz
 			
 			
 				oz troy
+				{0} oz t
 			
 			
 				karat
+				{0} CD
 			
 			
 				dalton
-				{0} Da
 			
 			
 				massa Bumi
-				{0} M⊕
 			
 			
 				massa Matahari
-				{0} M☉
 			
 			
 				GW
@@ -7854,29 +8206,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mW
 				{0} mW
 			
-			
-				hPa
-				{0} hPa
+			
+				hp
+				{0} hp
 			
 			
 				mm Hg
 				{0} mm Hg
 			
+			
+				psi
+				{0} psi
+			
 			
 				in Hg
 				{0} inHg
 			
-			
-				kPa
-				{0} kPa
+			
+				mbar
+				{0} mbar
 			
-			
-				MPa
-				{0} MPa
+			
+				atm
+				{0} atm
+			
+			
+				hPa
+				{0} hPa
 			
 			
 				km/jam
-				{0} kph
+				{0} km/j
 			
 			
 				meter/dtk
@@ -7906,14 +8266,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -7962,12 +8314,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} dL
 			
 			
+				cL
 				{0} cL
 			
 			
 				mL
 				{0} mL
 			
+			
+				mpt
+				{0} mpt
+			
+			
+				mcup
+				{0} mc
+			
+			
+				ac ft
+				{0} ac ft
+			
 			
 				gal
 				{0} gal
@@ -7975,18 +8340,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				gal Imp.
+				{0} gal Imp.
+				{0}/gal Imp.
+			
+			
+				qt
+				{0} qt
 			
 			
 				pint
+				{0} pt
+			
+			
+				cup
+				{0} c
 			
 			
 				fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				sdm
 				{0} sdm
@@ -7997,7 +8369,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				barrel
-				{0} bbl
 			
 			
 				arah
@@ -8024,6 +8395,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}″
 			
+			
+				%
+				{0}%
+			
 			
 				L/100km
 				{0}L/100km
@@ -8177,7 +8552,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				km/jam
-				{0}kph
+				{0}km/j
 			
 			
 				m/d
@@ -8220,12 +8595,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} dan {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0}, atau {1}
 			{0} atau {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/id_ID.xml b/make/data/cldr/common/main/id_ID.xml
index 700617f2515..6af48bc23a8 100644
--- a/make/data/cldr/common/main/id_ID.xml
+++ b/make/data/cldr/common/main/id_ID.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ig.xml b/make/data/cldr/common/main/ig.xml
index 964426023cc..049f9565ffa 100644
--- a/make/data/cldr/common/main/ig.xml
+++ b/make/data/cldr/common/main/ig.xml
@@ -7,19 +7,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
-		
-			{0} ({1})
-			{0}, {1}
-			{0}: {1}
-		
 		
 			Akan
 			Amariikị
 			Arabiikị
+			Ụdị Arabiikị nke oge a
 			Belaruusu
 			Bọlụgarịa
 			Bengali
@@ -31,7 +27,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Asụsụ Bekee
 			Bekee ndị Australia
 			Bekee ndị Canada
-			Bekee ndị Britain
 			Bekee ndị UK
 			Bekee ndị America
 			Bekee ndị US
@@ -87,39 +82,280 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
+			
 			
 			
 			
 		
 		
+			Uwa
+			Afrika
+			Mpaghara Ugwu Amerịka
+			Mpaghara Mgbada Ugwu America
+			Oceania
+			Mpaghara Ọdịda Anyanwụ Afrịka
+			Etiti America
+			Mpaghara Ọwụwa Anyanwụ Afrịka
+			Mpaghara Ugwu Afrịka
+			Etiti Afrịka
+			Mpaghara Mgbada Ugwu Afrịka
+			Amerịka
+			Mpaghara Ugwu America
+			Onye Carrabean
+			Mpaghara Ọwụwa Anyanwụ Asia
+			Mpaghara Mgbada Ugwu Asia
+			Mpaghara Mgbada Ugwu Asia dị na Ọwụwa Anyanwụ
+			Mpaghara Mgbada Ugwu Europe
+			Australasia
+			Melanesia
+			Mpaghara Micronesian
+			Polynesia
+			Asia
+			Etiti Asia
+			Mpaghara Ọdịda Anyanwụ Asia
+			Europe
+			Mpaghara Ọwụwa Anyanwụ Europe
+			Mpaghara Ugwu Europe
+			Mpaghara Ọdịda Anyanwụ Europe
+			Sub-Saharan Afrịka
+			Latin America
+			Ascension Island
+			Andorra
+			Antigua & Barbuda
+			Anguilla
+			Albania
+			Angola
+			Antarctica
+			Argentina
+			American Samoa
+			Austria
+			Australia
+			Aruba
+			Agwaetiti Aland
+			Bosnia & Herzegovina
+			Barbados
+			Belgium
+			Burkina Faso
+			Bulgaria
+			Burundi
 			Binin
+			St. Barthélemy
 			Bemuda
+			Bolivia
+			Caribbean Netherlands
 			Mba Brazil
+			Bahamas
+			Agwaetiti Bouvet
+			Botswana
+			Belarus
+			Belize
+			Kanada
+			Agwaetiti Cocos (Keeling)
+			Congo - Kinshasa
+			Congo (DRC)
+			Central African Republik
+			Congo
+			Congo (Republik)
+			Switzerland
+			Côte d’Ivoire
+			Ivory Coast
+			Agwaetiti Cook
+			Chile
+			Cameroon
 			Mba China
+			Colombia
+			Agwaetiti Clipperton
+			Kosta Rika
+			Cuba
+			Cape Verde
+			Kurakao
+			Agwaetiti Christmas
+			Czechia
+			Czech Republik
 			Mba Germany
+			Diego Garcia
+			Djibouti
+			Denmark
+			Dominika
+			Dominican Republik
+			Algeria
+			Ceuta & Melilla
+			Ecuador
+			Estonia
+			Egypt
+			Ọdịda Anyanwụ Sahara
+			Eritrea
+			Spain
+			Ethiopia
+			Finland
+			Fiji
+			Agwaetiti Falkland
+			Agwaetiti Falkland
+			Micronesia
+			Agwaetiti Faroe
 			Mba France
+			Gabon
 			Mba United Kingdom
+			UK
+			Grenada
+			Frenchi Guiana
+			Guernsey
+			Ghana
+			Gibraltar
+			Greenland
+			Gambia
+			Guinea
+			Guadeloupe
+			Equatorial Guinea
+			Greece
+			South Georgia na Agwaetiti South Sandwich
+			Guatemala
+			Guam
+			Guinea-Bissau
+			Guyana
+			Agwaetiti Heard na Agwaetiti McDonald
+			Honduras
+			Croatia
 			Hati
+			Hungary
+			Agwaetiti Kanarị
+			Ireland
+			Isle of Man
 			Mba India
+			British Indian Ocean Territory
+			Iceland
 			Mba Italy
+			Jersey
+			Jamaika
 			Mba Japan
+			Kenya
+			Kiribati
 			Comorosu
+			St. Kitts & Nevis
+			Agwaetiti Cayman
+			St. Lucia
+			Liechtenstein
+			Liberia
+			Lesotho
+			Lithuania
+			Luxembourg
+			Latvia
 			Libyia
+			Morocco
+			Monaco
+			Moldova
+			Montenegro
+			St. Martin
+			Madagaskar
+			Agwaetiti Marshall
+			North Macedonia
+			Mali
+			Agwaetiti Northern Mariana
+			Martinique
+			Mauritania
+			Montserrat
+			Malta
+			Mauritius
 			Maldivesa
+			Malawi
+			Mexico
+			Mozambik
+			Namibia
+			New Caledonia
+			Niger
+			Agwaetiti Norfolk
 			Naịjịrịa
+			Nicaragua
+			Netherlands
+			Norway
+			Nauru
+			Niue
+			New Zealand
+			Panama
+			Peru
+			Frenchi Polynesia
+			Papua New Guinea
+			Philippines
+			Poland
+			St. Pierre & Miquelon
+			Agwaetiti Pitcairn
+			Puerto Rico
+			Portugal
+			Palau
+			Paraguay
+			Outlying Oceania
+			Réunion
+			Romania
+			Serbia
 			Mba Russia
+			Rwanda
+			Agwaetiti Solomon
+			Seychelles
+			Sudan
+			Sweden
+			Singapore
+			St. Helena
+			Slovenia
+			Svalbard & Jan Mayen
+			Slovakia
+			Sierra Leone
+			San Marino
+			Senegal
+			Somalia
+			Suriname
+			South Sudan
+			São Tomé & Príncipe
+			El Salvador
+			Sint Maarten
+			Eswatini
+			Swaziland
+			Tristan da Cunha
+			Agwaetiti Turks na Caicos
+			Chad
+			Ụmụ ngalaba Frenchi Southern
+			Togo
+			Thailand
+			Tokelau
+			Timor-Leste
+			East Timor
+			Tunisia
+			Tonga
+			Trinidad & Tobago
+			Tuvalu
+			Tanzania
+			Ukraine
+			Uganda
+			Obere Agwaetiti Dị Na Mpụga U.S
+			Mba Ụwa Jikọrọ Ọnụ
 			Mba United States
+			Uruguay
+			Vatican City
+			St. Vincent & Grenadines
+			Venezuela
+			Agwaetiti British Virgin
+			Agwaetiti Virgin nke US
+			Vietnam
+			Vanuatu
+			Wallis & Futuna
+			Samoa
+			Pseudo-Accents
+			Pseudo-Bidi
+			Kosovo
+			Mayotte
+			South Africa
+			Zambia
+			Zimbabwe
 			Mpaghara Amaghị
 		
 		
 			Kalenda Gregory
+			Kalenda ISO-8601
 			Usoro Nhazi
 			Ọnụ Ọgụgụ Mpaghara Ọdịda Anyanwụ
 		
 		
 			Metriik
-			UK
-			US
 		
 		
 			Asụsụ: {0}
@@ -129,17 +365,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		[a b {ch} d e ẹ f g {gb} {gh} {gw} h i ị j k {kp} {kw} l m n ṅ {nw} {ny} o ọ p r s {sh} t u ụ v w y z]
-		[áàā c éèē íìī{ị́}{ị̀} ḿ{m̀} ńǹ óòō{ọ́}{ọ̀} q úùū{ụ́}{ụ̀} x]
+		[á à ā c é è ē í ì ī {ị\u0301} {ị\u0300} ḿ {m\u0300} ń ǹ ó ò ō {ọ\u0301} {ọ\u0300} q ú ù ū {ụ\u0301} {ụ\u0300} x]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ‘ ’ “ ” ( ) \[ \] \{ \}]
+		[\- ‑ , ; \: ! ? . ‘ ’ “ ” ( ) \[ \] \{ \}]
 	
-	
-		“
-		”
-		‘
-		’
-	
 	
 		
 			
@@ -209,9 +438,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						QQQ y
 						QQQQ y
 					
-					
-						{0} – {1}
-					
 				
 			
 			
@@ -314,19 +540,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Wen
 							Tọọ
 							Fraị
-							Satọdee
-						
-						
-							S
-							M
-							T
-							W
-							T
-							F
-							S
+							Sat
 						
 						
-							Ụka
+							Sọn
 							Mọn
 							Tiu
 							Wen
@@ -335,7 +552,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Sat
 						
 						
-							Ụbọchị Ụka
+							Sọndee
 							Mọnde
 							Tiuzdee
 							Wenezdee
@@ -352,19 +569,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Wen
 							Tọọ
 							Fraị
-							Satọdee
-						
-						
-							S
-							M
-							T
-							W
-							T
-							F
-							S
+							Sat
 						
 						
-							Ụka
+							Sọn
 							Mọn
 							Tiu
 							Wen
@@ -373,7 +581,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Sat
 						
 						
-							Ụbọchị Ụka
+							Sọndee
 							Mọnde
 							Tiuzdee
 							Wenezdee
@@ -457,10 +665,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
-						Tupu Kristi
-						BCE
-						Afọ Kristi
-						CE
+						Tupu Kraist
+						Tupu Oge Afọ
+						Afọ Kraịst
+						Oge Afọ
 					
 					
 						T.K.
@@ -541,42 +749,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						d, E
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
-						G y
 						MMM G y
 						d MMM, G y
 						E, d MMM, G y
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
-						h:mm:ss a v
-						HH:mm:ss v
-						h:mm a v
-						HH:mm v
-						L
 						d/M
 						E, d/M
-						LLL
 						d MMM
 						E, d MMM
 						d MMMM
 						E, d MMMM
-						mm:ss
-						y
+						'Izu' W 'n'‘'ime' MMMM
 						M/y
 						d/M/y
 						E, d/M/y
@@ -586,12 +768,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMMM y
 						QQQ y
 						QQQQ y
+						'Izu' w 'n' 'ime' Y
 					
 					
 						{0} {1}
 					
 					
-						{0} – {1}
 						
 							d–d
 						
@@ -694,39 +876,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Afọ
+				Afọ gara aga
+				Afọ a
+				Afọ ọzọ
 			
 			
-				Afọ
+				Afọ gara aga
+				Afọ a
+				Afọ ọzọ
 			
 			
-				Afọ
+				Afọ gara aga
+				Afọ a
+				Afọ ọzọ
 			
 			
-				Nkeji Afọ
+				Ọnwa atọ n’afọ
 			
 			
-				Nkeji Afọ
+				Ọnwa atọ n’afọ
 			
 			
-				Nkeji Afọ
+				Ọnwa atọ n’afọ
 			
 			
 				Ọnwa
+				Ọnwa gara aga
+				Ọnwa a
+				Ọnwa ọzọ
 			
 			
-				Ọnwa
+				Ọnwa gara aga
+				Ọnwa a
+				Ọnwa ọzọ
 			
 			
-				Ọnwa
+				Ọnwa gara aga
+				Ọnwa a
+				Ọnwa ọzọ
 			
 			
 				Izu
+				Izu gara aga
+				Izu a
+				Izu na-esote
+				Izu nke{0}
 			
 			
-				Izu
+				Izu gara aga
+				Izu a
+				Izu na-esote
+				Izu nke{0}
 			
 			
-				Izu
+				Izu gara aga
+				Izu a
+				Izu na-esote
+				Izu nke{0}
 			
 			
 				Ụbọchị
@@ -735,14 +941,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Echi
 			
 			
-				Ụbọchị
-				Nnyaafụ
+				Ụnyaahụ
 				Taata
 				Echi
 			
 			
-				Ụbọchị
-				Nnyaafụ
+				Ụnyaahụ
 				Taata
 				Echi
 			
@@ -755,29 +959,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Elekere
 			
-			
-				Elekere
-			
-			
-				Elekere
-			
 			
 				Nkeji
 			
-			
-				Nkeji
-			
-			
-				Nkeji
-			
 			
-				Sekọnd
+				Tịm kọm
 			
 			
-				Sekọnd
+				Tịm kọm
 			
 			
-				Sekọnd
+				Tịm kọm
 			
 			
 				Mpaghara oge
@@ -799,6 +991,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Obodo Amaghị
 			
+			
+				Araguaina
+			
+			
+				
+					Oge Okpomọkụ Britain
+				
+			
+			
+				
+					Oge Okpomọkụ Ireland
+				
+			
+			
+				
+					Oge Afghanistan
+				
+			
+			
+				
+					Oge Etiti Afrịka
+				
+			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Afrịka
+				
+			
+			
+				
+					Oge Izugbe Mpaghara Mgbada Ugwu Afrịka
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Afrịka
+					Oge Izugbe Mpaghara Ọdịda Anyanwụ Afrịka
+					Oge Okpomọkụ Mpaghara Ọdịda Anyanwụ Afrịka
+				
+			
+			
+				
+					Oge Alaska
+					Oge Izugbe Alaska
+					Oge Ihe Alaska
+				
+			
+			
+				
+					Oge Amazon
+					Oge Izugbe Amazon
+					Oge Okpomọkụ Amazon
+				
+			
 			
 				
 					Oge Mpaghara Etiti
@@ -827,6 +1073,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Oge Ihe Mpaghara Pacific
 				
 			
+			
+				
+					Oge Apia
+					Oge Izugbe Apia
+					Oge Ihe Apia
+				
+			
+			
+				
+					Oge Arab
+					Oge Izugbe Arab
+					Oge Ihe Arab
+				
+			
+			
+				
+					Oge Argentina
+					Oge Izugbe Argentina
+					Oge Okpomọkụ Argentina
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Argentina
+					Oge Izugbe Mpaghara Ọdịda Anyanwụ Argentina
+					Oge Okpomọkụ Mpaghara Ọdịda Anyanwụ Argentina
+				
+			
+			
+				
+					Oge Armenia
+					Oge Izugbe Armenia
+					Oge Okpomọkụ Armenia
+				
+			
 			
 				
 					Oge Mpaghara Atlantic
@@ -834,6 +1115,175 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Oge Ihe Mpaghara Atlantic
 				
 			
+			
+				
+					Oge Etiti Australia
+					Oge Izugbe Etiti Australia
+					Oge Ihe Etiti Australia
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Etiti Australia
+					Oge Izugbe Mpaghara Ọdịda Anyanwụ Etiti Australia
+					Oge Ihe Mpaghara Ọdịda Anyanwụ Etiti Australia
+				
+			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Australia
+					Oge Izugbe Mpaghara Ọwụwa Anyanwụ Australia
+					Oge Ihe Mpaghara Ọwụwa Anyanwụ Australia
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Australia
+					Oge Izugbe Mpaghara Ọdịda Anyanwụ Australia
+					Oge Ihe Mpaghara Ọdịda Anyanwụ Australia
+				
+			
+			
+				
+					Oge Azerbaijan
+					Oge Izugbe Azerbaijan
+					Oge Okpomọkụ Azerbaijan
+				
+			
+			
+				
+					Oge Azores
+					Oge Izugbe Azores
+					Oge Okpomọkụ Azores
+				
+			
+			
+				
+					Oge Bangladesh
+					Oge Izugbe Bangladesh
+					Oge Okpomọkụ Bangladesh
+				
+			
+			
+				
+					Oge Bhutan
+				
+			
+			
+				
+					Oge Bolivia
+				
+			
+			
+				
+					Oge Brasilia
+					Oge Izugbe Brasilia
+					Oge Okpomọkụ Brasilia
+				
+			
+			
+				
+					Oge Brunei Darussalam
+				
+			
+			
+				
+					Oge Cape Verde
+					Oge Izugbe Cape Verde
+					Oge Okpomọkụ Cape Verde
+				
+			
+			
+				
+					Oge Izugbe Chamorro
+				
+			
+			
+				
+					Oge Chatham
+					Oge Izugbe Chatham
+					Oge Ihe Chatham
+				
+			
+			
+				
+					Oge Chile
+					Oge Izugbe Chile
+					Oge Okpomọkụ Chile
+				
+			
+			
+				
+					Oge China
+					Oge Izugbe China
+					Oge Ihe China
+				
+			
+			
+				
+					Oge Choibals
+					Oge Izugbe Choibals
+					Oge Okpomọkụ Choibals
+				
+			
+			
+				
+					Oge Ekeresimesi Island
+				
+			
+			
+				
+					Oge Cocos Islands
+				
+			
+			
+				
+					Oge Columbia
+					Oge Izugbe Columbia
+					Oge Okpomọkụ Columbia
+				
+			
+			
+				
+					Oge Cook Islands
+					Oge Izugbe Cook Islands
+					Oge Ọkara Okpomọkụ Cook Islands
+				
+			
+			
+				
+					Oge Cuba
+					Oge Izugbe Cuba
+					Oge Ihe Mpaghara Cuba
+				
+			
+			
+				
+					Oge Davis
+				
+			
+			
+				
+					Oge Dumont-d’Urville
+				
+			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Timor
+				
+			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Island
+					Oge Izugbe Mpaghara Ọwụwa Anyanwụ Island
+					Oge Okpomọkụ Mpaghara Ọwụwa Anyanwụ Island
+				
+			
+			
+				
+					Oge Ecuador
+				
+			
 			
 				
 					Oge Mpaghara Etiti Europe
@@ -855,18 +1305,582 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Oge Okpomọkụ Mpaghara Ọdịda Anyanwụ Europe
 				
 			
+			
+				
+					Oge Falkland Islands
+					Oge Izugbe Falkland Islands
+					Oge Okpomọkụ Falkland Islands
+				
+			
+			
+				
+					Oge Fiji
+					Oge Izugbe Fiji
+					Oge Okpomọkụ Fiji
+				
+			
+			
+				
+					Oge French Guiana
+				
+			
+			
+				
+					Oge French Southern & Antarctic
+				
+			
+			
+				
+					Oge Galapagos
+				
+			
+			
+				
+					Oge Gambier
+				
+			
+			
+				
+					Oge Georgia
+					Oge Izugbe Georgia
+					Oge Okpomọkụ Georgia
+				
+			
+			
+				
+					Oge Gilbert Islands
+				
+			
 			
 				
 					Oge Mpaghara Greemwich Mean
 				
 			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Greenland
+					Oge Izugbe Mpaghara Ọwụwa Anyanwụ Greenland
+					Oge Okpomọkụ Mpaghara Ọwụwa Anyanwụ Greenland
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Greenland
+					Oge Izugbe Mpaghara Ọdịda Anyanwụ Greenland
+					Oge Okpomọkụ Mpaghara Ọdịda Anyanwụ Greenland
+				
+			
+			
+				
+					Oge Izugbe Gulf
+				
+			
+			
+				
+					Oge Guyana
+				
+			
+			
+				
+					Oge Hawaii-Aleutian
+					Oge Izugbe Hawaii-Aleutian
+					Oge Ihe Hawaii-Aleutian
+				
+			
+			
+				
+					Oge Hong Kong
+					Oge Izugbe Hong Kong
+					Oge Okpomọkụ Hong Kong
+				
+			
+			
+				
+					Oge Hovd
+					Oge Izugbe Hovd
+					Oge Okpomọkụ Hovd
+				
+			
+			
+				
+					Oge Izugbe India
+				
+			
+			
+				
+					Oge Osimiri India
+				
+			
+			
+				
+					Oge Indochina
+				
+			
+			
+				
+					Oge Etiti Indonesia
+				
+			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Indonesia
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Indonesia
+				
+			
+			
+				
+					Oge Iran
+					Oge Izugbe Iran
+					Oge Ihe Iran
+				
+			
+			
+				
+					Oge Irkutsk
+					Oge Izugbe Irkutsk
+					Oge Okpomọkụ Irkutsk
+				
+			
+			
+				
+					Oge Israel
+					Oge Izugbe Israel
+					Oge Ihe Israel
+				
+			
+			
+				
+					Oge Japan
+					Oge Izugbe Japan
+					Oge Ihe Japan
+				
+			
+			
+				
+					Oge Mpaghara Ọwụwa Anyanwụ Kazakhstan
+				
+			
+			
+				
+					Oge Mpaghara Ọdịda Anyanwụ Kazakhstan
+				
+			
+			
+				
+					Oge Korea
+					Oge Izugbe Korea
+					Oge Ihe Korea
+				
+			
+			
+				
+					Oge Kosrae
+				
+			
+			
+				
+					Oge Krasnoyarsk
+					Oge Izugbe Krasnoyarsk
+					Oge Okpomọkụ Krasnoyarsk
+				
+			
+			
+				
+					Oge Kyrgyzstan
+				
+			
+			
+				
+					Oge Line Islands
+				
+			
+			
+				
+					Oge Lord Howe
+					Oge Izugbe Lord Howe
+					Oge Ihe Lord Howe
+				
+			
+			
+				
+					Oge Macquarie Island
+				
+			
+			
+				
+					Oge Magadan
+					Oge Izugbe Magadan
+					Oge Okpomọkụ Magadan
+				
+			
+			
+				
+					Oge Malaysia
+				
+			
+			
+				
+					Oge Maldives
+				
+			
+			
+				
+					Oge Marquesas
+				
+			
+			
+				
+					Oge Marshall Islands
+				
+			
+			
+				
+					Oge Mauritius
+					Oge Izugbe Mauritius
+					Oge Okpomọkụ Mauritius
+				
+			
+			
+				
+					Oge Mawson
+				
+			
+			
+				
+					Oge Northwest Mexico
+					Oge Izugbe Northwest Mexico
+					Oge Ihe Northwest Mexico
+				
+			
+			
+				
+					Oge Mexican Pacific
+					Oge Izugbe Mexican Pacific
+					Oge Ihe Mexican Pacific
+				
+			
+			
+				
+					Oge Ulaanbaatar
+					Oge Izugbe Ulaanbaatar
+					Oge Okpomọkụ Ulaanbaatar
+				
+			
+			
+				
+					Oge Moscow
+					Oge Izugbe Moscow
+					Oge Okpomọkụ Moscow
+				
+			
+			
+				
+					Oge Myanmar
+				
+			
+			
+				
+					Oge Nauru
+				
+			
+			
+				
+					Oge Nepal
+				
+			
+			
+				
+					Oge New Caledonia
+					Oge Izugbe New Caledonia
+					Oge Okpomọkụ New Caledonia
+				
+			
+			
+				
+					Oge New Zealand
+					Oge Izugbe New Zealand
+					Oge Ihe New Zealand
+				
+			
+			
+				
+					Oge Newfoundland
+					Oge Izugbe Newfoundland
+					Oge Ihe Newfoundland
+				
+			
+			
+				
+					Oge Niue
+				
+			
+			
+				
+					Oge Norfolk Island
+				
+			
+			
+				
+					Oge Fernando de Noronha
+					Oge Izugbe Fernando de Noronha
+					Oge Okpomọkụ Fernando de Noronha
+				
+			
+			
+				
+					Oge Novosibirsk
+					Oge Izugbe Novosibirsk
+					Oge Okpomọkụ Novosibirsk
+				
+			
+			
+				
+					Oge Omsk
+					Oge Izugbe Omsk
+					Oge Okpomọkụ Omsk
+				
+			
+			
+				
+					Oge Pakistan
+					Oge Izugbe Pakistan
+					Oge Okpomọkụ Pakistan
+				
+			
+			
+				
+					Oge Palau
+				
+			
+			
+				
+					Oge Papua New Guinea
+				
+			
+			
+				
+					Oge Paraguay
+					Oge Izugbe Paraguay
+					Oge Okpomọkụ Paraguay
+				
+			
+			
+				
+					Oge Peru
+					Oge Izugbe Peru
+					Oge Okpomọkụ Peru
+				
+			
+			
+				
+					Oge Philippine
+					Oge Izugbe Philippine
+					Oge Okpomọkụ Philippine
+				
+			
+			
+				
+					Oge Phoenix Islands
+				
+			
+			
+				
+					Oge St. Pierre & Miquelon
+					Oge Izugbe St. Pierre & Miquelon
+					Oge Ihe St. Pierre & Miquelon
+				
+			
+			
+				
+					Oge Pitcairn
+				
+			
+			
+				
+					Oge Ponape
+				
+			
+			
+				
+					Oge Pyongyang
+				
+			
+			
+				
+					Oge Réunion
+				
+			
+			
+				
+					Oge Rothera
+				
+			
+			
+				
+					Oge Sakhalin
+					Oge Izugbe Sakhalin
+					Oge Okpomọkụ Sakhalin
+				
+			
+			
+				
+					Oge Samoa
+					Oge Izugbe Samoa
+					Oge Ihe Samoa
+				
+			
+			
+				
+					Oge Seychelles
+				
+			
+			
+				
+					Oge Izugbe Singapore
+				
+			
+			
+				
+					Oge Solomon Islands
+				
+			
+			
+				
+					Oge South Georgia
+				
+			
+			
+				
+					Oge Suriname
+				
+			
+			
+				
+					Oge Syowa
+				
+			
+			
+				
+					Oge Tahiti
+				
+			
+			
+				
+					Oge Taipei
+					Oge Izugbe Taipei
+					Oge Ihe Taipei
+				
+			
+			
+				
+					Oge Tajikistan
+				
+			
+			
+				
+					Oge Tokelau
+				
+			
+			
+				
+					Oge Tonga
+					Oge Izugbe Tonga
+					Oge Okpomọkụ Tonga
+				
+			
+			
+				
+					Oge Chuuk
+				
+			
+			
+				
+					Oge Turkmenist
+					Oge Izugbe Turkmenist
+					Oge Okpomọkụ Turkmenist
+				
+			
+			
+				
+					Oge Tuvalu
+				
+			
+			
+				
+					Oge Uruguay
+					Oge Izugbe Uruguay
+					Oge Okpomọkụ Uruguay
+				
+			
+			
+				
+					Oge Uzbekist
+					Oge Izugbe Uzbekist
+					Oge Okpomọkụ Uzbekist
+				
+			
+			
+				
+					Oge Vanuatu
+					Oge Izugbe Vanuatu
+					Oge Okpomọkụ Vanuatu
+				
+			
+			
+				
+					Oge Venezuela
+				
+			
+			
+				
+					Oge Vladivostok
+					Oge Izugbe Vladivostok
+					Oge Okpomọkụ Vladivostok
+				
+			
+			
+				
+					Oge Volgograd
+					Oge Izugbe Volgograd
+					Oge Okpomọkụ Volgograd
+				
+			
+			
+				
+					Oge Vostok
+				
+			
+			
+				
+					Oge Wake Island
+				
+			
+			
+				
+					Oge Wallis & Futuna
+				
+			
+			
+				
+					Oge Yakutsk
+					Oge Izugbe Yakutsk
+					Oge Okpomọkụ Yakutsk
+				
+			
+			
+				
+					Oge Yekaterinburg
+					Oge Izugbe Yekaterinburg
+					Oge Okpomọkụ Yekaterinburg
+				
+			
 		
 	
 	
-		latn
-		
-			latn
-		
 		1
 		
 			٫
@@ -920,20 +1934,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			NaN
 			:
 		
-		
-			
-				
-					#,##0.###
-				
-			
-		
-		
-			
-				
-					#E0
-				
-			
-		
 		
 			
 				
@@ -941,13 +1941,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				
-					#,##0%
-				
-			
-		
 		
 			
 				
@@ -989,20 +1982,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					¤000T
 				
 			
-			{0} {1}
 		
 		
+			
+				Dollar Bermuda
+				Dollars Bermuda
+			
 			
 				Real Brazil
 				Real Brazil
-				R$
-				R$
+			
+			
+				Dollar Belize
+				Dollars Belize
+			
+			
+				Dollar Canada
+				Dollars Canada
 			
 			
 				Yuan China
 				Yuan China
-				CN¥
-				¥
 			
 			
 				Escudo Caboverdiano
@@ -1010,26 +2010,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Euro
 				euro
-				€
-				€
 			
 			
 				Pound British
 				Pound British
-				£
-				£
 			
 			
 				Rupee India
 				Rupee India
-				₹
-				₹
 			
 			
 				Yen Japan
 				Yen Japan
 				¥
-				¥
 			
 			
 				Naịra
@@ -1038,14 +2031,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ruble Russia
 				Ruble Russia
-				RUB
-				₽
+			
+			
+				Dollar Surinamese
+				Dollar Surinamese
+			
+			
+				Dollar Trinidad & Tobago
+				Dollars Trinidad & Tobago
 			
 			
 				Dollar US
-				dollar US
+				Dollars US
 				$
-				$
 			
 			
 				Ego Amaghị
@@ -1053,27 +2051,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
+			{0}+
+			≤{0}
 			{0}–{1}
 		
+		
+			ubochi {0}
+			Si uzo aka nri {0}
+		
 	
 	
-		
-			h:mm
-		
-		
-			h:mm:ss
-		
-		
-			m:ss
-		
+		
+			
+				Ọtụtụ nari afọ
+			
+			
+				Ọtụtụ afọ iri
+			
+			
+				Ọtụtụ Afọ
+			
+			
+				Ọtụtụ Ọnwa
+			
+			
+				Ọtụtụ Izu
+			
+			
+				Ọtụtụ Ubochi
+			
+		
 	
 	
 		
-			{0}, {1}
 			{0}, {1}
 			{0}, na {1}
 			{0} na {1}
 		
+		
+			{0}, {1}
+		
 	
 	
 		
diff --git a/make/data/cldr/common/main/ig_NG.xml b/make/data/cldr/common/main/ig_NG.xml
index 2cbeffba95e..6f312946433 100644
--- a/make/data/cldr/common/main/ig_NG.xml
+++ b/make/data/cldr/common/main/ig_NG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ii.xml b/make/data/cldr/common/main/ii.xml
index 1bc0ba2c7be..26380ea4ba1 100644
--- a/make/data/cldr/common/main/ii.xml
+++ b/make/data/cldr/common/main/ii.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -67,7 +67,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[ꀀ-ꒌ]
 		[ꀀ ꀋ ꀗ ꀣ ꀯ ꀺ ꁆ ꁒ ꁞ ꁩ ꁵ ꂁ ꂍ ꂘ ꂤ ꂰ ꂼ ꃇ ꃓ ꃟ ꃫ ꃶ ꄂ ꄎ ꄚ ꄥ ꄱ ꄽ ꅉ ꅔ ꅠ ꅬ ꅸ ꆃ ꆏ ꆛ ꆧ ꆳ ꆾ ꇊ ꇖ ꇢ ꇭ ꇹ ꈅ ꈑ ꈜ ꈨ ꈴ ꉀ ꉋ ꉗ ꉣ ꉯ ꉺ ꊆ ꊒ ꊞ ꊩ ꊵ ꋁ ꋍ ꋘ ꋤ ꋰ ꋼ ꌇ ꌓ ꌟ ꌫ ꌷ ꍂ ꍎ ꍚ ꍦ ꍱ ꍽ ꎉ ꎕ ꎠ ꎬ ꎸ ꏄ ꏏ ꏛ ꏧ ꏳ ꏾ ꐊ ꐖ ꐢ ꐭ ꐹ ꑅ ꑑ ꑜ ꑨ ꑴ ꒀ ꒋ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/ii_CN.xml b/make/data/cldr/common/main/ii_CN.xml
index b21136a12fd..9373cd2c1b4 100644
--- a/make/data/cldr/common/main/ii_CN.xml
+++ b/make/data/cldr/common/main/ii_CN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/is.xml b/make/data/cldr/common/main/is.xml
index c8d71647316..f6a93dd5146 100644
--- a/make/data/cldr/common/main/is.xml
+++ b/make/data/cldr/common/main/is.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -84,6 +84,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			karíbamál
 			kajúga
 			atsam
+			tsjakma
 			tsjetsjenska
 			kebúanó
 			kíga
@@ -142,7 +143,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			bresk enska
 			enska (bresk)
 			bandarísk enska
-			enska (BNA)
 			miðenska
 			esperantó
 			spænska
@@ -366,7 +366,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			núer
 			navahó
 			klassísk nevaríska
-			njanja; sísjeva; sjeva
+			nýanja
 			njamvesí
 			nyankole
 			njóró
@@ -530,14 +530,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jiddíska
 			jórúba
 			kantónska
+			kínverska, kantónska
 			súang
 			sapótek
 			blisstákn
 			senaga
 			staðlað marokkóskt tamazight
 			kínverska
+			kínverska, mandarín
 			kínverska (einfölduð)
+			mandarín (einfölduð)
 			kínverska (hefðbundin)
+			mandarín (hefðbundin)
 			súlú
 			súní
 			ekkert tungumálaefni
@@ -729,6 +733,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kongó (Lýðveldið)
 			Sviss
 			Fílabeinsströndin
+			Fílabeinsströndin
 			Cooks-eyjar
 			Síle
 			Kamerún
@@ -742,6 +747,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Jólaey
 			Kýpur
 			Tékkland
+			Tékkland
 			Þýskaland
 			Diego Garcia
 			Djíbútí
@@ -834,7 +840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mónakó
 			Moldóva
 			Svartfjallaland
-			St. Martin
+			Saint-Martin
 			Madagaskar
 			Marshalleyjar
 			Norður-Makedónía
@@ -910,6 +916,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sankti Martin
 			Sýrland
 			Svasíland
+			Svasíland
 			Tristan da Cunha
 			Turks- og Caicoseyjar
 			Tsjad
@@ -946,6 +953,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanúatú
 			Wallis- og Fútúnaeyjar
 			Samóa
+			gervihreimur
+			gervistaður
 			Kósóvó
 			Jemen
 			Mayotte
@@ -1105,8 +1114,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á b d ð e é f g h i í j k l m n o ó p r s t u ú v x y ý þ æ ö]
 		[c q w z]
 		[A Á B C D Ð E É F G H I Í J K L M N O Ó P Q R S T U Ú V W X Y Ý Z Þ Æ Ö]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1118,13 +1127,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
@@ -1989,15 +1993,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d.–d.
 						
@@ -2552,55 +2547,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d.–d.
 						
 						
-							G y – G y
-							G y–y
+							y G – y G
+							y–y G
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							MM.y GGGGG – MM.y GGGGG
+							MM.y – MM.y GGGGG
+							MM.y – MM.y GGGGG
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							dd.MM.y – dd.MM.y GGGGG
+							dd.MM.y GGGGG – dd.MM.y GGGGG
+							dd.MM.y – dd.MM.y GGGGG
+							dd.MM.y – dd.MM.y GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y GGGGG – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
+							E, dd.MM.y – E, dd.MM.y GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G – MMM y G
+							MMM–MMM y G
+							MMM y – MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d.–d. MMM y G
+							d. MMM y G – d. MMM y G
+							d. MMM – d. MMM y G
+							d. MMM y – d. MMM y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y G – E, d. MMM y G
+							E, d. MMM – E, d. MMM y G
+							E, d. MMM y – E, d. MMM y G
 						
 						
 							h a – h a
@@ -7031,12 +7017,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
+		
+			؜+
+			؜-
+		
 		
 			,
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -7045,6 +7041,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 þúsund
@@ -7164,31 +7165,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arabískt dírham
 				arabískt dírham
 				arabísk dírhöm
+				AED
 			
 			
 				afgani
 				afgani
 				afganar
+				AFN
 			
 			
 				albanskt lek
 				albanskt lek
 				albönsk lek
+				ALL
 			
 			
 				armenskt dramm
 				armenskt dramm
 				armensk drömm
+				AMD
 			
 			
 				hollenskt Antillugyllini
 				hollenskt Antillugyllini
 				hollensk Antillugyllini
+				ANG
 			
 			
 				angólsk kvansa
 				angólsk kvansa
 				angólskar kvönsur
+				AOA
 			
 			
 				Argentine Austral
@@ -7200,6 +7207,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentínskur pesi
 				argentínskur pesi
 				argentínskir pesar
+				ARS
 				$
 			
 			
@@ -7216,27 +7224,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arúbönsk flórína
 				arúbönsk flórína
 				arúbanskar flórínur
+				AWG
 			
 			
 				aserskt manat
 				aserskt manat
 				asersk manöt
+				AZN
 			
 			
 				skiptanlegt Bosníu og Hersegóvínu-mark
 				skiptanlegt Bosníu og Hersegóvínu-mark
 				skiptanleg Bosníu og Hersegóvínu-mörk
+				BAM
 			
 			
 				barbadoskur dalur
 				barbadoskur dalur
 				barbadoskir dalir
+				BBD
 				$
 			
 			
 				bangladessk taka
 				bangladessk taka
 				bangladesskar tökur
+				BDT
 				৳
 			
 			
@@ -7249,33 +7262,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				búlgarskt lef
 				búlgarskt lef
 				búlgörsk lef
+				BGN
 			
 			
 				bareinskur denari
 				bareinskur denari
 				bareinskir denarar
+				BHD
 			
 			
 				búrúndískur franki
 				búrúndískur franki
 				búrúndískir frankar
+				BIF
 			
 			
 				Bermúdadalur
 				Bermúdadalur
 				Bermúdadalir
+				BMD
 				$
 			
 			
 				brúneiskur dalur
 				brúneiskur dalur
 				brúneiskir dalir
+				BND
 				$
 			
 			
 				bólivíani
 				bólivíani
 				bólivíanar
+				BOB
 			
 			
 				Bólivískur pesi
@@ -7294,12 +7313,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahamadalur
 				Bahamadalur
 				Bahamadalir
+				BSD
 				$
 			
 			
 				bútanskt núltrum
 				bútanskt núltrum
 				bútönsk núltrum
+				BTN
 			
 			
 				Búrmverskt kjat
@@ -7308,21 +7329,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				botsvönsk púla
 				botsvönsk púla
 				botsvanskar púlur
+				BWP
 			
 			
 				hvítrússnesk rúbla
 				hvítrússnesk rúbla
 				hvítrússneskar rúblur
+				BYN
 			
 			
 				hvítrússnesk rúbla (2000–2016)
 				hvítrússnesk rúbla (2000–2016)
 				hvítrússneskar rúblur (2000–2016)
+				BYR
 			
 			
 				belískur dalur
 				belískur dalur
 				belískir dalir
+				BZD
 				$
 			
 			
@@ -7336,11 +7361,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kongóskur franki
 				kongóskur franki
 				kongóskir frankar
+				CDF
 			
 			
 				svissneskur franki
 				svissneskur franki
 				svissneskir frankar
+				CHF
 			
 			
 				Chilean Unidades de Fomento
@@ -7349,29 +7376,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				síleskur pesi
 				síleskur pesi
 				síleskir pesar
+				CLP
 				$
 			
 			
 				kínverskt júan (utan heimalands)
 				kínverskt júan (utan heimalands)
 				kínverskt júan (utan heimalands)
+				CNH
 			
 			
 				kínverskt júan
 				kínverskt júan
 				kínversk júön
+				CN¥
 				¥
 			
 			
 				kólumbískur pesi
 				kólumbískur pesi
 				kólumbískir pesar
+				COP
 				$
 			
 			
 				kostarískt kólon
 				kostarískt kólon
 				kostarísk kólon
+				CRC
 				₡
 			
 			
@@ -7379,19 +7411,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				kúbverskur skiptanlegur pesi
-				kúbverskur skiptanlegur pesói
-				kúbverskir skiptanlegir pesóar
+				kúbverskur skiptanlegur pesi
+				kúbverskir skiptanlegir pesar
+				CUC
 			
 			
 				kúbverskur pesi
 				kúbverskur pesi
 				kúbverskir pesar
+				CUP
 				$
 			
 			
 				grænhöfðeyskur skúti
 				grænhöfðeyskur skúti
 				grænhöfðeyskir skútar
+				CVE
 			
 			
 				Kýpverskt pund
@@ -7400,6 +7435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tékknesk króna
 				tékknesk króna
 				tékkneskar krónur
+				CZK
 			
 			
 				Austurþýskt mark
@@ -7411,22 +7447,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				djíbútískur franki
 				djíbútískur franki
 				djíbútískir frankar
+				DJF
 			
 			
 				dönsk króna
 				dönsk króna
 				danskar krónur
+				DKK
 			
 			
 				dóminískur pesi
 				dóminískur pesi
 				dóminískir pesar
+				DOP
 				$
 			
 			
 				alsírskur denari
 				alsírskur denari
 				alsírskir denarar
+				DZD
 			
 			
 				Ecuador Sucre
@@ -7440,11 +7480,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				egypskt pund
 				egypskt pund
 				egypsk pund
+				EGP
 			
 			
 				erítresk nakfa
 				erítresk nakfa
 				erítreskar nökfur
+				ERN
 			
 			
 				Spænskur peseti
@@ -7453,6 +7495,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				eþíópískt birr
 				eþíópískt birr
 				eþíópísk birr
+				ETB
 			
 			
 				evra
@@ -7468,12 +7511,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fidjeyskur dalur
 				fidjeyskur dalur
 				fidjeyskir dalir
+				FJD
 				$
 			
 			
 				falklenskt pund
 				falklenskt pund
 				falklensk pund
+				FKP
 			
 			
 				Franskur franki
@@ -7489,28 +7534,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				georgískur lari
 				georgískur lari
 				georgískir larar
+				GEL
 				₾
 			
 			
 				ganverskur sedi
 				ganverskur sedi
 				ganverskir sedar
+				GHS
 			
 			
 				Gíbraltarspund
 				Gíbraltarspund
 				Gíbraltarspund
+				GIP
 				£
 			
 			
 				gambískur dalasi
 				gambískur dalasi
 				gambískir dalasar
+				GMD
 			
 			
 				Gíneufranki
 				Gíneufranki
 				Gíneufrankar
+				GNF
 			
 			
 				Drakma
@@ -7519,6 +7569,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gvatemalskt kvesal
 				gvatemalskt kvesal
 				gvatemölsk kvesöl
+				GTQ
 			
 			
 				Portúgalskur, gíneskur skúti
@@ -7527,38 +7578,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				gvæjanskur dalur
 				gvæjanskur dalur
 				gvæjanskir dalir
+				GYD
 				$
 			
 			
 				Hong Kong-dalur
 				Hong Kong-dalur
 				Hong Kong-dalir
+				HK$
 				$
 			
 			
 				hondúrsk lempíra
 				hondúrsk lempíra
 				hondúrskar lempírur
+				HNL
 			
 			
 				króatísk kúna
 				króatísk kúna
 				króatískar kúnur
+				HRK
 			
 			
 				haítískur gúrdi
 				haítískur gúrdi
 				haítískir gúrdar
+				HTG
 			
 			
 				ungversk fórinta
 				ungversk fórinta
 				ungverskar fórintur
+				HUF
 			
 			
 				indónesísk rúpía
 				indónesísk rúpía
 				indónesískar rúpíur
+				IDR
 				Rp
 			
 			
@@ -7571,6 +7629,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nýr ísraelskur sikill
 				nýr ísraelskur sikill
 				nýir ísraelskir siklar
+				₪
 				₪
 			
 			
@@ -7584,16 +7643,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				írakskur denari
 				írakskur denari
 				írakskir denarar
+				IQD
 			
 			
 				íranskt ríal
 				íranskt ríal
 				írönsk ríöl
+				IRR
 			
 			
 				íslensk króna
 				íslensk króna
 				íslenskar krónur
+				ISK
 				kr
 			
 			
@@ -7603,44 +7665,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jamaískur dalur
 				jamaískur dalur
 				jamaískir dalir
+				JMD
 				$
 			
 			
 				jórdanskur denari
 				jórdanskur denari
 				jórdanskir denarar
+				JOD
 			
 			
 				japanskt jen
 				japanskt jen
 				japönsk jen
+				JP¥
 				¥
 			
 			
 				kenískur skildingur
 				kenískur skildingur
 				kenískir skildingar
+				KES
 			
 			
 				kirgiskt som
 				kirgiskt som
 				kirgisk som
+				KGS
 			
 			
 				kambódískt ríal
 				kambódískt ríal
 				kambódísk ríöl
+				KHR
 				៛
 			
 			
 				kómoreyskur franki
 				kómoreyskur franki
 				kómoreyskir frankar
+				KMF
 			
 			
 				norðurkóreskt vonn
 				norðurkóreskt vonn
 				norðurkóresk vonn
+				KPW
 			
 			
 				suðurkóreskt vonn
@@ -7653,39 +7723,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kúveiskur denari
 				kúveiskur denari
 				kúveiskir denarar
+				KWD
 			
 			
 				caymaneyskur dalur
 				caymaneyskur dalur
 				caymaneyskir dalir
+				KYD
 				$
 			
 			
 				kasakst tengi
 				kasakst tengi
 				kasöksk tengi
+				KZT
 				₸
 			
 			
 				laoskt kip
 				laoskt kip
 				laosk kip
+				LAK
 				₭
 			
 			
 				líbanskt pund
 				líbanskt pund
 				líbönsk pund
+				LBP
 			
 			
 				srílönsk rúpía
 				srílönsk rúpía
 				srílanskar rúpíur
+				LKR
 			
 			
 				líberískur dalur
 				líberískur dalur
 				líberískir dalir
+				LRD
 				$
 			
 			
@@ -7695,6 +7772,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Litháískt lít
 				litháískt lít
 				litháísk lít
+				LTL
 			
 			
 				Lithuanian Talonas
@@ -7706,6 +7784,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lettneskt lat
 				lettneskt lat
 				lettnesk löt
+				LVL
 			
 			
 				Lettnesk rúbla
@@ -7714,11 +7793,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				líbískur denari
 				líbískur denari
 				líbískir denarar
+				LYD
 			
 			
 				marokkóskt dírham
 				marokkóskt dírham
 				marokkósk dírhöm
+				MAD
 			
 			
 				Marokkóskur franki
@@ -7727,11 +7808,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				moldavískt lei
 				moldavískt lei
 				moldavísk lei
+				MDL
 			
 			
 				Madagaskararjari
 				Madagaskararjari
 				Madagaskararjarar
+				MGA
 			
 			
 				Madagaskur franki
@@ -7740,6 +7823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedónskur denari
 				makedónskur denari
 				makedónskir denarar
+				MKD
 			
 			
 				Malískur franki
@@ -7748,27 +7832,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mjanmarskt kjat
 				mjanmarskt kjat
 				mjanmörsk kjöt
+				MMK
 			
 			
 				mongólskur túríkur
 				mongólskur túríkur
 				mongólskir túríkar
+				MNT
 				₮
 			
 			
 				makaósk pataka
 				makaósk pataka
 				makaóskar patökur
+				MOP
 			
 			
 				márítönsk úgía (1973–2017)
 				máritönsk úgía (1973–2017)
 				máritanskar úgíur (1973–2017)
+				MRO
 			
 			
 				márítönsk úgía
 				máritönsk úgía
 				máritanskar úgíur
+				MRU
 			
 			
 				Meltnesk líra
@@ -7780,16 +7869,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				máritísk rúpía
 				máritísk rúpía
 				máritískar rúpíur
+				MUR
 			
 			
 				maldíveysk rúpía
 				maldíveysk rúpía
 				maldíveyskar rúpíur
+				MVR
 			
 			
 				malavísk kvaka
 				malavísk kvaka
 				malavískar kvökur
+				MWK
 			
 			
 				mexíkóskur pesi
@@ -7808,6 +7900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malasískt ringit
 				malasískt ringit
 				malasísk ringit
+				MYR
 			
 			
 				Mósambískur skúti
@@ -7816,28 +7909,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mósambískt metikal
 				mósambískt metikal
 				mósambísk metiköl
+				MZN
 			
 			
 				namibískur dalur
 				namibískur dalur
 				namibískir dalir
+				NAD
 				$
 			
 			
 				nígerísk næra
 				nígerísk næra
 				nígerískar nærur
+				NGN
 				₦
 			
 			
-				Níkarögsk kordóva (1988–1991)
-				Níkarögsk kordóva (1988–1991)
-				Níkaragskar kordóvur (1988–1991)
+				Níkarögsk kordóva (1988–1991)
+				Níkarögsk kordóva (1988–1991)
+				Níkaragskar kordóvur (1988–1991)
 			
 			
 				níkaraögsk kordóva
 				níkarögsk kordóva
 				níkaragskar kordóvur
+				NIO
 			
 			
 				Hollenskt gyllini
@@ -7846,11 +7943,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				norsk króna
 				norsk króna
 				norskar krónur
+				NOK
 			
 			
 				nepölsk rúpía
 				nepölsk rúpía
 				nepalskar rúpíur
+				NPR
 			
 			
 				nýsjálenskur dalur
@@ -7863,37 +7962,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ómanskt ríal
 				ómanskt ríal
 				ómönsk ríöl
+				OMR
 			
 			
 				balbói
 				balbói
 				balbóar
+				PAB
 			
 			
 				perúskt sól
 				perúskt sól
 				perúsk sól
+				PEN
 			
 			
 				papúsk kína
 				papúsk kína
 				papúskar kínur
+				PGK
 			
 			
 				filippseyskur pesi
 				filippseyskur pesi
 				filippseyskir pesar
+				PHP
 				₱
 			
 			
 				pakistönsk rúpía
 				pakistönsk rúpía
 				pakistanskar rúpíur
+				PKR
 			
 			
 				pólskt slot
 				pólskt slot
 				pólsk slot
+				PLN
 			
 			
 				Slot
@@ -7905,12 +8011,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paragvæskt gvaraní
 				paragvæskt gvaraní
 				paragvæsk gvaraní
+				PYG
 				₲
 			
 			
 				katarskt ríal
 				katarskt ríal
 				katörsk ríöl
+				QAR
 			
 			
 				Rúmenskt lei (1952–2006)
@@ -7921,16 +8029,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúmenskt lei
 				rúmenskt lei
 				rúmensk lei
+				RON
 			
 			
 				serbneskur denari
 				serbneskur denari
 				serbneskir denarar
+				RSD
 			
 			
 				rússnesk rúbla
 				rússnesk rúbla
 				rússneskar rúblur
+				RUB
 			
 			
 				Rússnesk rúbla (1991–1998)
@@ -7939,22 +8050,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rúandskur franki
 				rúandskur franki
 				rúandskir frankar
+				RWF
 			
 			
 				sádíarabískt ríal
 				sádiarabískt ríal
 				sádiarabísk ríöl
+				SAR
 			
 			
 				salómonseyskur dalur
 				salómonseyskur dalur
 				salómonseyskir dalir
+				SBD
 				$
 			
 			
 				Seychellesrúpía
 				Seychellesrúpía
 				Seychellesrúpíur
+				SCR
 			
 			
 				Súdanskur denari
@@ -7963,6 +8078,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				súdanskt pund
 				súdanskt pund
 				súdönsk pund
+				SDG
 			
 			
 				Súdanskt pund (1957–1998)
@@ -7971,17 +8087,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sænsk króna
 				sænsk króna
 				sænskar krónur
+				SEK
 			
 			
 				singapúrskur dalur
 				singapúrskur dalur
 				singapúrskir dalir
+				SGD
 				$
 			
 			
 				helenskt pund
 				helenskt pund
 				helensk pund
+				SHP
 			
 			
 				Slóvenskur dalur
@@ -7993,16 +8112,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				síerraleónsk ljóna
 				síerraleónsk ljóna
 				síerraleónskar ljónur
+				SLL
 			
 			
 				sómalískur skildingur
 				sómalískur skildingur
 				sómalískir skildingar
+				SOS
 			
 			
 				Súrínamdalur
 				Súrínamdalur
 				Súrínamdalir
+				SRD
 				$
 			
 			
@@ -8012,17 +8134,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				suðursúdanskt pund
 				suðursúdanskt pund
 				suðursúdönsk pund
+				SSP
 				£
 			
 			
 				Saó Tóme og Prinsípe-dóbra (1977–2017)
 				Saó Tóme og Prinsípe-dóbra (1977–2017)
 				Saó Tóme og Prinsípe-dóbrur (1977–2017)
+				STD
 			
 			
 				Saó Tóme og Prinsípe-dóbra
 				Saó Tóme og Prinsípe-dóbra
 				Saó Tóme og Prinsípe-dóbrur
+				STN
 			
 			
 				Soviet Rouble
@@ -8036,16 +8161,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sýrlenskt pund
 				sýrlenskt pund
 				sýrlensk pund
+				SYP
 			
 			
 				svasílenskur lílangeni
 				svasílenskur lílangeni
 				svasílenskir lílangenar
+				SZL
 			
 			
 				taílenskt bat
 				taílenskt bat
 				taílensk böt
+				THB
 				฿
 			
 			
@@ -8055,6 +8183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tadsjikskur sómóni
 				tadsjikskur sómóni
 				tadsjikskir sómónar
+				TJS
 			
 			
 				Túrkmenskt manat (1993–2009)
@@ -8065,16 +8194,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				túrkmenskt manat
 				túrkmenskt manat
 				túrkmensk manöt
+				TMT
 			
 			
 				túnískur denari
 				túniskur denari
 				túniskir denarar
+				TND
 			
 			
 				Tongapanga
 				Tongapanga
 				Tongapöngur
+				TOP
 				T$
 			
 			
@@ -8087,12 +8219,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tyrknesk líra
 				tyrknesk líra
 				tyrkneskar lírur
+				TRY
 				₺
 			
 			
 				Trínidad og Tóbagó-dalur
 				Trínidad og Tóbagó-dalur
 				Trínidad og Tóbagó-dalir
+				TTD
 				$
 			
 			
@@ -8106,11 +8240,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tansanískur skildingur
 				tansanískur skildingur
 				tansanískir skildingar
+				TZS
 			
 			
 				úkraínsk hrinja
 				úkraínsk hrinja
 				úkraínskar hrinjur
+				UAH
 				₴
 			
 			
@@ -8120,6 +8256,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				úgandskur skildingur
 				úgandskur skildingur
 				úgandskir skildingar
+				UGX
 			
 			
 				Bandaríkjadalur
@@ -8138,12 +8275,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				úrúgvæskur pesi
 				úrúgvæskur pesi
 				úrúgvæskir pesar
+				UYU
 				$
 			
 			
 				úsbekskt súm
 				úsbekskt súm
 				úsbeksk súm
+				UZS
 			
 			
 				Bolívar í Venesúela (1871–2008)
@@ -8152,11 +8291,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venesúelskur bólívari (2008–2018)
 				venesúelskur bólívari (2008–2018)
 				venesúelskir bólívarar (2008–2018)
+				VEF
 			
 			
 				venesúelskur bólívari
 				venesúelskur bólívari
 				venesúelskir bólívarar
+				VES
 			
 			
 				víetnamskt dong
@@ -8169,16 +8310,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vanúatúskt vatú
 				vanúatúskt vatú
 				vanúatúsk vatú
+				VUV
 			
 			
 				Samóatala
 				Samóatala
 				Samóatölur
+				WST
 			
 			
 				miðafrískur franki
 				miðafrískur franki
 				miðafrískir frankar
+				FCFA
 			
 			
 				unse silfur
@@ -8194,6 +8338,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				austurkarabískur dalur
 				austurkarabískur dalur
 				austurkarabískir dalir
+				EC$
 			
 			
 				Sérstök dráttarréttindi
@@ -8208,6 +8353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vesturafrískur franki
 				vesturafrískur franki
 				vesturafrískir frankar
+				CFA
 			
 			
 				unse palladín
@@ -8218,6 +8364,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pólinesískur franki
 				pólinesískur franki
 				pólinesískir frankar
+				CFPF
 			
 			
 				unse platína
@@ -8236,6 +8383,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenskt ríal
 				jemenskt ríal
 				jemensk ríöl
+				YER
 			
 			
 				Júgóslavneskur denari
@@ -8247,6 +8395,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				suðurafrískt rand
 				suðurafrískt rand
 				suðurafrísk rönd
+				ZAR
 			
 			
 				Zambian Kwacha (1968–2012)
@@ -8255,6 +8404,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sambísk kvaka
 				sambísk kvaka
 				sambískar kvökur
+				ZMW
 			
 			
 				Simbabveskur dalur
@@ -8487,6 +8637,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} öld
 				{0} aldir
 			
+			
+				áratugir
+				{0} áratugur
+				{0} áratugir
+			
 			
 				ár
 				{0} ár
@@ -8604,6 +8759,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Bresk varmaeining
 				{0} Breskar varmaeiningar
 			
+			
+				bandarískar varmaeiningar
+				{0} bandarísk varmaeining
+				{0} bandarískar varmaeiningar
+			
 			
 				kraftar punds
 				{0} kraftur punds
@@ -8634,6 +8794,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				pixlar
+				{0} pixill
+				{0} pixlar
+			
+			
+				megapixlar
+				{0} megapixill
+				{0} megapixlar
+			
+			
+				pixlar á sentimetra
+				{0} pixill á sentimetra
+				{0} pixlar á sentimetra
+			
+			
+				pixlar á tommu
+				{0} pixill á tommu
+				{0} pixlar á tommu
+			
+			
+				punktar á sentimetra
+				{0} punktur á sentimetra
+				{0} punktar á sentimetra
+			
+			
+				punktar á tommu
+				{0} punktur á tommu
+				{0} punktar á tommu
+			
 			
 				kílómetrar
 				{0} kílómetri
@@ -8750,7 +8940,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lúx
 			
 			
-				ljósafl sólar
 				{0} ljósafl sólar
 				{0} ljósafl sólar
 			
@@ -8782,7 +8971,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} míkrógrömm
 			
 			
-				bandarískt tonn
+				bandarísk tonn
 				{0} bandarískt tonn
 				{0} bandarísk tonn
 			
@@ -8858,11 +9047,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hestafl
 				{0} hestöfl
 			
-			
-				hektópasköl
-				{0} hektópaskal
-				{0} hektópasköl
-			
 			
 				millimetrar af kvikasilfri
 				{0} millimetrar af kvikasilfri
@@ -8874,9 +9058,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pund á fertommu
 			
 			
-				tommur af kvikvasilfri
+				tommur af kvikasilfri
 				{0} tomma af kvikasilfri
-				{0} tommur af kvikvasilfri
+				{0} tommur af kvikasilfri
+			
+			
+				bör
+				{0} bar
+				{0} bör
 			
 			
 				millibör
@@ -8888,6 +9077,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} loftþyngd
 				{0} loftþyngdir
 			
+			
+				pasköl
+				{0} paskal
+				{0} pasköl
+			
+			
+				hektópasköl
+				{0} hektópaskal
+				{0} hektópasköl
+			
 			
 				kílópasköl
 				{0} kílópaskal
@@ -9217,8 +9416,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				permyriad
-				{0}‱
-				{0}‱
 			
 			
 				m´ól
@@ -9305,6 +9502,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} árh
 				{0} árh
 			
+			
+				árat.
+				{0} árat.
+				{0} árat.
+			
 			
 				ár
 				{0} ár
@@ -9414,23 +9616,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				rafeindarvolt
-				{0} eV
-				{0} eV
 			
 			
 				BTU
-				{0} Btu
-				{0} Btu
+			
+			
+				bandarísk varmaeining
+				{0} bna varmaeining
+				{0} bna varmaeiningar
 			
 			
 				kraftur punds
-				{0} lbf
-				{0} lbf
 			
 			
 				njúton
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -9452,6 +9651,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				pixlar
+				{0} px
+				{0} px
+			
+			
+				megapixlar
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -9633,13 +9862,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dalton
-				{0} Da
-				{0} Da
 			
 			
 				jarðmassar
-				{0} M⊕
-				{0} M⊕
 			
 			
 				sólmassar
@@ -9676,11 +9901,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hö
 				{0} hö
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -9696,6 +9916,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				{0} bar
+				{0} bör
+			
 			
 				mbar
 				{0} mbar
@@ -9706,15 +9930,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				Pa
+				{0} Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				kílómetrar á klukkustund
@@ -9756,16 +9980,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -9924,59 +10138,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m/s²
 			
 			
-				{0}°
-				{0}°
+				{0}°
+				{0}°
 			
 			
-				{0}′
-				{0}′
+				{0}′
+				{0}′
 			
 			
-				{0}″
-				{0}″
+				{0}″
+				{0}″
 			
 			
-				{0} km²
-				{0} km²
+				{0} km²
+				{0} km²
 			
 			
-				{0} ha
-				{0} ha
+				hektari
+				{0} ha
+				{0} ha
 			
 			
-				{0} m²
-				{0} m²
-				{0}/m²
+				{0} m²
+				{0} m²
+				{0}/m²
 			
 			
-				{0}/cm²
+				{0}/cm²
 			
 			
 				{0}mí²
 				{0}mí²
 			
 			
+				ekra
 				{0} ek.
 				{0} ek.
 			
 			
-				{0} ferfet
-				{0} ferfet
+				ft²
+				{0}ft²
+				{0}ft²
 			
 			
-				mg/dL
-				{0}mg/dL
-				{0}mg/dL
+				mg/dL
+				{0}mg/dL
+				{0}mg/dL
 			
 			
-				mmol/L
-				{0}mmol/L
-				{0}mmol/L
+				mmol/L
+				{0}mmol/L
+				{0}mmol/L
 			
 			
-				ppm
-				{0}ppm
-				{0}ppm
+				ppm
+				{0}ppm
+				{0}ppm
 			
 			
 				%
@@ -10215,21 +10432,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kt.
 			
 			
-				{0} kW
-				{0} kW
+				{0} kW
+				{0} kW
 			
 			
-				{0} W
-				{0} W
-			
-			
-				{0} ek
-				{0} ek
-			
-			
-				hPa
-				{0} hPa
-				{0} hPa
+				{0} W
+				{0} W
 			
 			
 				mm Hg
@@ -10246,11 +10454,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}" Hg
 				{0}" Hg
 			
+			
+				{0} bar
+				{0} bör
+			
 			
 				mbar
 				{0} mbar
 				{0} mbör
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/klst.
 				{0} km/klst.
@@ -10292,14 +10509,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				{0} km³
-				{0} km³
+				{0} km³
+				{0} km³
 			
 			
-				{0}/m³
+				{0}/m³
 			
 			
-				{0}/cm³
+				{0}/cm³
 			
 			
 				{0}mi³
@@ -10343,7 +10560,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/is_IS.xml b/make/data/cldr/common/main/is_IS.xml
index fef0259ea10..bbfbc6bdb6c 100644
--- a/make/data/cldr/common/main/is_IS.xml
+++ b/make/data/cldr/common/main/is_IS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/it.xml b/make/data/cldr/common/main/it.xml
index dfd660bbb35..e65b125f6c1 100644
--- a/make/data/cldr/common/main/it.xml
+++ b/make/data/cldr/common/main/it.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -107,7 +107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			caribico
 			cayuga
 			atsam
-			chakma
+			chakma
 			ceceno
 			cebuano
 			chiga
@@ -169,7 +169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			inglese britannico
 			inglese (GB)
 			inglese americano
-			inglese (USA)
 			inglese medio
 			esperanto
 			spagnolo
@@ -627,8 +626,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			zenaga
 			tamazight del Marocco standard
 			cinese
+			cinese (mandarino)
 			cinese semplificato
+			cinese mandarino semplificato
 			cinese tradizionale
+			cinese mandarino tradizionale
 			zulu
 			zuni
 			nessun contenuto linguistico
@@ -1073,6 +1075,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tagikistan
 			Tokelau
 			Timor Est
+			Timor Est
 			Turkmenistan
 			Tunisia
 			Tonga
@@ -1099,8 +1102,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis e Futuna
 			Samoa
-			pseudo-accenti
-			pseudo-bidi
+			Pseudo-accenti
+			Pseudo-bidi
 			Kosovo
 			Yemen
 			Mayotte
@@ -1345,8 +1348,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a à b c d e é è f g h i ì j k l m n o ó ò p q r s t u ù v w x y z]
 		[ª á â å ä ã æ ç ê ë í î ï ñ º ô ö õ ø œ ß ú û ü ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- — , ; \: ! ? . … ' ’ " “ ” « » ( ) \[ \] \{ \} @ /]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ — , ; \: ! ? . … ' ’ " “ ” « » ( ) \[ \] \{ \} @ /]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1360,13 +1363,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1520,42 +1518,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d–d
 						
 						
-							G y – G y
-							G y–y
+							G y – G y
+							G y–y
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
+							GGGGG y-MM – GGGGG y-MM
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							d/M/y – d/M/y GGGGG
-							d/M/y GGGGG – d/M/y GGGGG
-							d/M/y – d/M/y GGGGG
-							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
 						
 						
-							E, d/M/y – E, d/M/y GGGGG
-							E, d/M/y – E, d/M/y GGGGG
-							E, d/M/y – E, d/M/y GGGGG
-							E d/M/y – E d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
 						
 						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
 						
 						
 							h a – h a
@@ -1868,7 +1866,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mezzogiorno
 							PM
 							di mattina
-							del pomeriggio
+							di pomeriggio
 							di sera
 							di notte
 						
@@ -1878,7 +1876,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mezzogiorno
 							p.
 							di mattina
-							del pomeriggio
+							di pomeriggio
 							di sera
 							di notte
 						
@@ -1966,6 +1964,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2081,7 +2101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							MMM y – MMM y G
 						
 						
-							d – d MMM y G
+							d – d MMM y G
 							d MMM y G – d MMM y G
 							d MMM – d MMM y G
 							d MMM y – d MMM y G
@@ -2384,9 +2404,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sett.
-				settimana scorsa
-				questa settimana
-				settimana prossima
+				settimana scorsa
+				questa settimana
+				settimana prossima
 				
 					tra {0} sett.
 					tra {0} sett.
@@ -2399,9 +2419,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sett.
-				settimana scorsa
-				questa settimana
-				settimana prossima
+				settimana scorsa
+				questa settimana
+				settimana prossima
 				
 					tra {0} sett.
 					tra {0} sett.
@@ -3575,9 +3595,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aqtöbe
 			
-			
-				Qostanay
-			
 			
 				Qyzylorda
 			
@@ -5120,6 +5137,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			,
 			.
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5128,6 +5147,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 mille
@@ -5604,7 +5628,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				euro
 				euro
 				euro
-				€
+				€
+				€
 			
 			
 				markka finlandese
@@ -6091,6 +6116,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				złoty polacco
 				złoty polacco
 				złoty polacchi
+				PLN
 				zł
 			
 			
@@ -6335,7 +6361,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dollaro statunitense
 				dollari statunitensi
 				USD
-				$
+				$
 			
 			
 				dollaro statunitense (next day)
@@ -6612,9 +6638,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per pollice quadrato
 			
 			
-				dunum
-				{0} dunum
-				{0} dunum
+				dunum
+				{0} dunum
+				{0} dunum
 			
 			
 				carati
@@ -6736,6 +6762,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} secolo
 				{0} secoli
 			
+			
+				decadi
+				{0} decade
+				{0} decadi
+			
 			
 				anni
 				{0} anno
@@ -6849,14 +6880,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} elettronvolt
 			
 			
-				BTU
-				{0} BTU
-				{0} BTU
+				BTU
+				{0} BTU
+				{0} BTU
+			
+			
+				therm US
+				{0} therm US
+				{0} therm US
 			
 			
-				libbre-forza
-				{0} libbra-forza
-				{0} libbre-forza
+				libbre-forza
+				{0} libbra-forza
+				{0} libbre-forza
 			
 			
 				newton
@@ -6883,6 +6919,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				pixel
+				{0} pixel
+				{0} pixel
+			
+			
+				pixel per centimetro
+				{0} pixel per centimetro
+				{0} pixel per centimetro
+			
 			
 				chilometri
 				{0} chilometro
@@ -6989,9 +7035,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				luminosità solari
-				{0} luminosità solare
-				{0} luminosità solari
+				luminosità solari
+				{0} luminosità solare
+				{0} luminosità solari
 			
 			
 				tonnellate metriche
@@ -7092,11 +7138,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cavallo vapore
 				{0} cavalli vapore
 			
-			
-				ettopascal
-				{0} ettopascal
-				{0} ettopascal
-			
 			
 				millimetri di mercurio
 				{0} millimetro di mercurio
@@ -7122,6 +7163,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfera
 				{0} atmosfere
 			
+			
+				ettopascal
+				{0} ettopascal
+				{0} ettopascal
+			
 			
 				chilopascal
 				{0} chilopascal
@@ -7173,14 +7219,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Kelvin
 			
 			
-				libbre-piede
-				{0} libbra-piede
-				{0} libbre-piedi
+				libbre-piede
+				{0} libbra-piede
+				{0} libbre-piedi
 			
 			
-				newton metri
-				{0} newton metro
-				{0} newton metri
+				newton metri
+				{0} newton metro
+				{0} newton metri
 			
 			
 				chilometri cubi
@@ -7303,9 +7349,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} once fluide
 			
 			
-				once liquide imperiali
-				{0} oncia liquida imperiale
-				{0} once liquide imperiali
+				once liquide imperiali
+				{0} oncia liquida imperiale
+				{0} once liquide imperiali
 			
 			
 				cucchiai da tavola
@@ -7318,9 +7364,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cucchiai da tè
 			
 			
-				barrel
-				{0} barrel
-				{0} barrel
+				barile
+				{0} barile
+				{0} barili
 			
 			
 				punti cardinali
@@ -7420,9 +7466,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in²
 			
 			
-				dunum
-				{0} dunum
-				{0} dunum
+				dunum
+				{0} dunum
+				{0} dunum
 			
 			
 				kt
@@ -7454,16 +7500,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				L/km
 				{0} L/km
@@ -7544,6 +7580,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sec.
 				{0} secc.
 			
+			
+				dec.
+				{0} dec.
+				{0} dec.
+			
 			
 				anni
 				{0} anno
@@ -7651,25 +7692,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-				{0} eV
-			
 			
-				BTU
-				{0} BTU
-				{0} BTU
+				BTU
+				{0} BTU
+				{0} BTU
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+			
+				therm US
+				{0} therm US
+				{0} therm US
 			
 			
 				GHz
@@ -7786,21 +7817,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -7860,16 +7881,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Da
 				{0} Da
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -7900,11 +7911,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7930,15 +7936,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -7981,14 +7982,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				lb-ft
-				{0} lb-ft
-				{0} lb-ft
+				lb-ft
+				{0} lb-ft
+				{0} lb-ft
 			
 			
-				Nm
-				{0} Nm
-				{0} Nm
+				Nm
+				{0} Nm
+				{0} Nm
 			
 			
 				km³
@@ -8109,9 +8110,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				fl oz imp.
-				{0} fl oz imp.
-				{0} fl oz imp.
+				fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
 			
 			
 				tbsp
@@ -8124,9 +8125,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 			
 			
-				barrel
-				{0} barrel
-				{0} barrel
+				barile
+				{0} bbl
+				{0} bbl
 			
 			
 				punto
@@ -8232,7 +8233,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}km
 			
 			
-				metro
 				{0}m
 				{0}m
 			
@@ -8301,10 +8301,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0}hp
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0}inHg
 				{0}inHg
@@ -8313,6 +8309,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				km/h
 				{0}km/h
@@ -8375,12 +8375,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} o {1}
 			{0} o {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} e {1}
-			{0} e {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/it_CH.xml b/make/data/cldr/common/main/it_CH.xml
index 9da845dff47..a2b5d48223b 100644
--- a/make/data/cldr/common/main/it_CH.xml
+++ b/make/data/cldr/common/main/it_CH.xml
@@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		[\- . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ . ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		‹
diff --git a/make/data/cldr/common/main/it_IT.xml b/make/data/cldr/common/main/it_IT.xml
index 7b9c5dfcb2d..3a3158f7edd 100644
--- a/make/data/cldr/common/main/it_IT.xml
+++ b/make/data/cldr/common/main/it_IT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/it_SM.xml b/make/data/cldr/common/main/it_SM.xml
index 1d72a664a04..1c943f8aeb1 100644
--- a/make/data/cldr/common/main/it_SM.xml
+++ b/make/data/cldr/common/main/it_SM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/it_VA.xml b/make/data/cldr/common/main/it_VA.xml
index 8ef26c89b40..8a03a94f961 100644
--- a/make/data/cldr/common/main/it_VA.xml
+++ b/make/data/cldr/common/main/it_VA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ja.xml b/make/data/cldr/common/main/ja.xml
index eb1fab894bc..f3e70ce5e92 100644
--- a/make/data/cldr/common/main/ja.xml
+++ b/make/data/cldr/common/main/ja.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -107,7 +107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			カリブ語
 			カユーガ語
 			チャワイ語
-			チャクマ語
+			チャクマ語
 			チェチェン語
 			セブアノ語
 			チガ語
@@ -621,6 +621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ヨルバ語
 			ニェエンガトゥ語
 			広東語
+			中国語 (広東語)
 			チワン語
 			サポテカ語
 			ブリスシンボル
@@ -628,8 +629,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ゼナガ語
 			標準モロッコ タマジクト語
 			中国語
+			中国語 (標準語)
 			簡体中国語
+			標準中国語 (簡体字)
 			繁体中国語
+			標準中国語 (繁体字)
 			ズールー語
 			ズニ語
 			言語的内容なし
@@ -744,7 +748,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -780,7 +784,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -805,7 +809,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 		
 		
 			世界
@@ -1106,6 +1110,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			バヌアツ
 			ウォリス・フツナ
 			サモア
+			疑似アクセント
+			疑似 BIDI
 			コソボ
 			イエメン
 			マヨット
@@ -1145,6 +1151,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			標準コーンウォール語正書法
 			ラウキカ
 			レージア方言 リポヴァツ方言
+			LUNA1918
 			メテルチッツァ
 			モノトニック
 			ンジュカ方言
@@ -1153,6 +1160,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			現代ヴォラピュク語
 			オゼアッコ/オソヤネ方言
 			パマカ方言
+			PETR1708
 			ピン音(ローマ字表記法)
 			ポリトニック
 			コンピュータ
@@ -1160,6 +1168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			改訂版
 			古典ヴォラピュク語
 			レシア方言
+			RUMGR
 			サホ語
 			スコットランド標準英語
 			リバプール方言
@@ -1179,21 +1188,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			暦法
 			通貨フォーマット
-			記号を無視した並べ替え
-			アクセント（逆方向）による並べ替え
-			大文字順/小文字順による並べ替え
-			大文字小文字を区別した並べ替え
+			記号を無視した並べ替え
+			アクセント（逆方向）による並べ替え
+			大文字順/小文字順による並べ替え
+			大文字小文字を区別した並べ替え
 			並べ替え順序
 			正規化による並べ替え
-			数値による並べ替え
-			強度による並べ替え
+			数値による並べ替え
+			強度による並べ替え
 			通貨
 			時間制(12 / 24)
 			禁則処理
 			単位系
 			数値書式
-			タイムゾーン
-			ロケールのバリアント
+			タイムゾーン
+			ロケールのバリアント
 			私用
 		
 		
@@ -1238,7 +1247,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			リフォーム
 			汎用検索
 			ハングル語頭子音による並べ替え
-			標準ソート順序
+			標準並べ替え順序
 			画数順
 			トラディッショナル
 			部首順
@@ -1276,7 +1285,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ブラーフミー数字
 			チャクマ数字
 			チャム数字
-			デーヴァナーガリー数字
+			デーバナーガリー数字
 			エチオピア数字
 			財務用漢数字
 			全角数字
@@ -1311,7 +1320,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			独自の記数法
 			ンコ数字
 			オルチキ数字
-			オリヤー数字
+			オディア数字
 			オスマニア数字
 			ローマ数字
 			ローマ数字(小文字)
@@ -1321,7 +1330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			スンダ数字
 			タークリー数字
 			新タイ・ルー数字
-			タミール数字
+			伝統的タミル数字
 			タミル数字
 			テルグ数字
 			タイ数字
@@ -1344,8 +1353,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[々 ゝヽ ゞヾ ー ぁァ あア ぃィ いイ ぅゥ うウ ヴ ぇェ えエ ぉォ おオ ヵ かカ がガ きキ ぎギ くク ぐグ ヶ けケ げゲ こコ ごゴ さサ ざザ しシ じジ すス ずズ せセ ぜゼ そソ ぞゾ たタ だダ ちチ ぢヂ っッ つツ づヅ てテ でデ とト どド なナ にニ ぬヌ ねネ のノ はハ ばバ ぱパ ひヒ びビ ぴピ ふフ ぶブ ぷプ へヘ べベ ぺペ ほホ ぼボ ぽポ まマ みミ むム めメ もモ ゃャ やヤ ゅュ ゆユ ょョ よヨ らラ りリ るル れレ ろロ ゎヮ わワ ゐヰ ゑヱ をヲ んン 一 丁 七 万-下 不 与 且 世 丘 丙 両 並 中 丸 丹 主 久 乏 乗 乙 九 乱 乳 乾 亀 了 予 争 事 二 互 五 井 亜 亡 交 享-亭 人 仁 今 介 仏 仕 他 付 仙 代-以 仮 仰 仲 件 任 企 伏-休 会 伝 伯 伴 伸 伺 似 但 位-佐 体 何 余 作 佳 併 使 例 侍 供 依 価 侮 侯 侵 便 係 促 俊 俗 保 信 修 俳 俵 俸 俺 倉 個 倍 倒 候 借 倣 値 倫 倹 偉 偏 停 健 側-偶 偽 傍 傑 傘 備 催 債 傷 傾 働 像 僕 僚 僧 儀 億 儒 償 優 元-兆 先 光 克 免 児 党 入 全 八-六 共 兵 具 典 兼 内 円 冊 再 冒 冗 写 冠 冬 冷 准 凍 凝 凡 処 凶 凸-出 刀 刃 分-刈 刊 刑 列 初 判 別 利 到 制-券 刺 刻 則 削 前 剖 剛 剣-剥 副 剰 割 創 劇 力 功 加 劣 助 努 励 労 効 劾 勅 勇 勉 動 勘 務 勝 募 勢 勤 勧 勲 包 化 北 匠 匹-医 匿 十 千 升 午 半 卑-協 南 単 博 占 印 危 即-卵 卸 厄 厘 厚 原 厳 去 参 又 及-収 叔 取 受 叙 口-句 叫 召 可-右 号 司 各 合 吉 同-向 君 吟 否 含 吸 吹 呈-告 周 味 呼 命 和 咲 哀 品 員 哲 唆 唇 唐 唯 唱 商 問 啓 善 喚 喜 喝 喪 喫 営 嗣 嘆 嘱 器 噴 嚇 囚 四 回 因 団 困 囲 図 固 国 圏 園 土 圧 在 地 坂 均 坊 坑 坪 垂 型 垣 埋 城 域 執 培 基 埼 堀 堂 堅 堕 堤 堪 報 場 塀 塁 塊 塑 塔 塗 塚 塩 填 塾 境 墓 増 墜 墨 墳 墾 壁 壇 壊 壌 士 壮 声-売 変 夏 夕 外 多 夜 夢 大 天-夫 央 失 奇-奉 奏 契 奔 奥 奨 奪 奮 女 奴 好 如-妄 妊 妙 妥 妨 妹 妻 姉 始 姓 委 姫 姻 姿 威 娘 娠 娯 婆 婚 婦 婿 媒 嫁 嫌 嫡 嬢 子 孔 字 存 孝 季 孤 学 孫 宅 宇-安 完 宗-定 宜 宝 実 客-室 宮 宰 害-家 容 宿 寂 寄 密 富 寒 寛 寝 察 寡 寧 審 寮 寸 寺 対 寿 封 専 射 将 尉-尋 導 小 少 尚 就 尺 尼-局 居 屈 届 屋 展 属 層 履 屯 山 岐 岡 岩 岬 岳 岸 峠 峡 峰 島 崇 崎 崩 川 州 巡 巣 工-巨 差 己 巻 市 布 帆 希 帝 帥 師 席 帯 帰 帳 常 帽 幅 幕 幣 干-年 幸 幹 幻-幾 庁 広 床 序 底 店 府 度 座 庫 庭 庶-庸 廃 廉 廊 延 廷 建 弁 弊 式 弐 弓-引 弟 弦 弧 弱 張 強 弾 当 形 彩 彫 彰 影 役 彼 往 征 径 待 律 後 徐 徒 従 得 御 復 循 微 徳 徴 徹 心 必 忌 忍 志-忙 応 忠 快 念 怒 怖 思 怠 急 性 怪 恋 恐 恒 恥 恨 恩 恭 息 恵 悔 悟 悠 患 悦 悩 悪 悲 悼 情 惑 惜 惨 惰 想 愁 愉 意 愚 愛 感 慈 態 慌 慎 慕 慢 慣 慨 慮 慰 慶 憂 憎 憤 憩 憲 憶 憾 懇 懐 懲 懸 成-戒 戦 戯 戸 戻 房 所 扇 扉 手 才 打 払 扱 扶 批 承 技 抄 把 抑 投 抗 折 抜 択 披 抱 抵 抹 押 抽 担 拍 拐 拒 拓 拘 拙 招 拝 拠 拡 括 拷 拾 持 指 挑 挙 挟 振 挿 捕 捜 捨 据 掃 授 掌 排 掘 掛 採 探 接 控 推 措 掲 描 提 揚 換 握 揮 援 揺 損 搬 搭 携 搾 摂 摘 摩 撃 撤 撮 撲 擁 操 擦 擬 支 改 攻 放 政 故 敏 救 敗 教 敢 散 敬 数 整 敵 敷 文 斉 斎 斗 料 斜 斤 斥 断 新 方 施 旅 旋 族 旗 既 日 旧-早 旬 昆 昇 明 易 昔 星 映 春 昨 昭 是 昼 時 晩 普 景 晴 晶 暁 暇 暑 暖 暗 暦 暫 暮 暴 曇 曜 曲 更 書 曹 替 最 月 有 服 朕 朗 望 朝 期 木 未-札 朱 朴 机 朽 杉 材 村 束 条 来 杯 東 松 板 析 林 枚 果 枝 枠 枢 枯 架 柄 某 染 柔 柱 柳 査 栄 栓 校 株 核 根 格 栽 桃 案 桑 桜 桟 梅 械 棄 棋 棒 棚 棟 森 棺 植 検 業 極 楼 楽 概 構 様 槽 標 模 権 横 樹 橋 機 欄 欠 次 欧 欲 欺 款 歌 歓 止 正 武 歩 歯 歳 歴 死 殉-残 殖 殴 段 殺 殻 殿 母 毎 毒 比 毛 氏 民 気 水 氷 永 汁 求 汎 汗 汚 江 池 決 汽 沈 沖 没 沢 河 沸 油 治 沼 沿 況 泉 泊 泌 法 泡-泣 泥 注 泰 泳 洋 洗 洞 津 洪 活 派 流 浄 浅 浜 浦 浪 浮 浴 海 浸 消 涙 涯 液 涼 淑 淡 深 混 添 清 渇-渉 渋 渓 減 渡 渦 温 測 港 湖 湯 湾-満 源 準 溝 溶 滅 滋 滑 滝 滞 滴 漁 漂 漆 漏 演 漠 漢 漫 漬 漸 潔 潜 潟 潤 潮 澄 激 濁 濃 濫 濯 瀬 火 灯 灰 災 炉 炊 炎 炭 点 為 烈 無 焦 然 焼 煙 照 煩 煮 熟 熱 燃 燥 爆 爵 父 片 版 牙 牛 牧 物 牲 特 犠 犬 犯 状 狂 狩 独 狭 猛 猟 猫 献 猶 猿 獄 獣 獲 玄 率 玉 王 珍 珠 班 現 球 理 琴 環 璽 瓶 甘 甚 生 産 用 田-申 男 町 画 界 畑 畔 留 畜 畝 略 番 異 畳 疎 疑 疫 疲 疾 病 症 痘 痛 痢 痴 療 癒 癖 発 登 白 百 的 皆 皇 皮 皿 盆 益 盗 盛 盟 監 盤 目 盲 直 相 盾 省 看 県 真 眠 眺 眼 着 睡 督 瞬 矛 矢 知 短 矯 石 砂 研 砕 砲 破 硝 硫 硬 碁 碑 確 磁 磨 礁 礎 示 礼 社 祈 祉 祖 祝 神 祥 票 祭 禁 禅 禍 福 秀 私 秋 科 秒 秘 租 秩 称 移 程 税 稚 種 稲 稼 稿 穀 穂 積 穏 穫 穴 究 空 突 窃 窒 窓 窮 窯 立 竜 章 童 端 競 竹 笑 笛 符 第 筆 等 筋 筒 答 策 箇 算 管 箱 節 範 築 篤 簡 簿 籍 米 粉 粋 粒 粗 粘 粛 粧 精 糖 糧 糸 系 糾 紀 約 紅 紋 納 純 紙-紛 素-索 紫 累 細 紳 紹 紺 終 組 経 結 絞 絡 給 統 絵 絶 絹 継 続 維 綱 網 綿 緊 総 緑 緒 線 締 編 緩 緯 練 縁 縄 縛 縦 縫 縮 績 繁 繊 織 繕 繭 繰 缶 罪 置 罰 署 罷 羅 羊 美 群 義 羽 翁 翌 習 翻 翼 老 考 者 耐 耕 耗 耳 聖 聞 聴 職 肉 肌 肖 肝 肢 肥 肩 肪 肯 育 肺 胃 胆 背 胎 胞 胴 胸 能 脂 脅 脈 脚 脱 脳 腐 腕 腰 腸 腹 膚 膜 膨 臓 臣 臨 自 臭 至 致 興 舌 舎 舗 舞 舟 航 般 舶 船 艇 艦 良 色 芋 芝 花 芳 芸 芽 苗 若 苦 英 茂 茎 茶 草 荒 荘 荷 菊 菌 菓 菜 華 落 葉 著 葬 蒸 蓄 蔵 薄 薦 薪-薬 藤 藩 藻 虎 虐 虚 虜 虞 虫 蚊 蚕 蛇 蛍 蛮 融 血 衆 行 術 街 衛 衝 衡 衣 表 衰 衷 袋 被 裁 裂 装 裏 裕 補 裸 製 複 褐 褒 襟 襲 西 要 覆 覇 見 規 視 覚 覧 親 観 角 解 触 言 訂 計 討 訓 託 記 訟 訪 設 許 訳 訴 診 証 詐 詔 評 詞 詠 試 詩 詰-詳 誇 誉 誌 認 誓 誕 誘 語 誠 誤 説 読 誰 課 調 談 請 論 諭 諮 諸 諾 謀 謁 謄 謙 講 謝 謡 謹 識 譜 警 議 譲 護 谷 豆 豊 豚 象 豪 貝 貞 負-貢 貧-販 貫 責 貯 貴 買 貸 費 貿 賀 賃 賄 資 賊 賓 賛 賜 賞 賠 賢 賦 質 購 贈 赤 赦 走 赴 起 超 越 趣 足 距 跡 路 跳 践 踊 踏 躍 身 車 軌 軍 軒 軟 転 軸 軽 較 載 輝 輩 輪 輸 轄 辛 辞 辱 農 辺 込 迅 迎 近 返 迫 迭 述 迷 追 退 送 逃 逆 透 逐 逓 途 通 逝 速 造 連 逮 週 進 逸 遂 遅 遇 遊 運 遍 過 道-違 遠 遣 適 遭 遮 遵 遷 選 遺 避 還 邦 邪 邸 郊 郎 郡 部 郭 郵 郷 都 酌 配 酒 酔 酢 酪 酬 酵 酷 酸 醜 醸 釈 里-量 金 針 釣 鈍 鈴 鉄 鉛 鉢 鉱 銀 銃 銅 銘 銭 鋭 鋳 鋼 錠 錬 錯 録 鍛 鎖 鎮 鏡 鐘 鑑 長 門 閉 開 閑 間 関 閣 閥 閲 闘 阪 防 阻 附 降 限 陛 院-陥 陪 陰 陳 陵 陶 陸 険 陽 隅 隆 隊 階 随 隔 際 障 隠 隣 隷 隻 雄-雇 雌 雑 離 難 雨 雪 雰 雲 零 雷 電 需 震 霊 霜 霧 露 青 静 非 面 革 靴 韓 音 韻 響 頂 頃 項 順 預-頒 領 頬 頭 頻 頼 題 額 顔 顕 願 類 顧 風 飛 食 飢 飯 飲 飼-飾 養 餓 館 首 香 馬 駄-駆 駐 騎 騒 験 騰 驚 骨 髄 高 髪 鬼 魂 魅 魔 魚 鮮 鯨 鳥 鳴 鶏 鹿 麗 麦 麻 黄 黒 黙 鼓 鼻 齢]
 		[丑 亥 亨 兌 兎 卯 嘉 壬 寅 巳 庚 弘 戊 戌 拼 昌 楔 猪 癸 祚 禄 禎 辰 酉 錄 閏 雉 鳳 鼠]
 		[あ か さ た な は ま や ら わ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[‾ _＿ \-－ ‐ — ― 〜 ・ ･ ,， 、､ ;； \:： !！ ?？ .． ‥ … 。｡ ＇ ‘ ’ "＂ “ ” (（ )） \[［ \]］ \{｛ \}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\＼ \&＆ #＃ %％ ‰ † ‡ ′ ″ 〃 ※]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[‾ _＿ \-－ ‐ ‑ — ― 〜 ・ ･ ,， 、､ ;； \:： !！ ?？ .． ‥ … 。｡ ＇ ‘ ’ "＂ “ ” (（ )） \[［ \]］ \{｛ \}｝ 〈 〉 《 》 「｢ 」｣ 『 』 【 】 〔 〕 ‖ § ¶ @＠ *＊ /／ \\＼ \&＆ #＃ %％ ‰ † ‡ ′ ″ 〃 ※]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1359,8 +1368,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
+			['ʼ՚᾽᾿’＇]
+			[%٪﹪％]
+			[؉‰]
 			[\$﹩＄$]
 			[£₤]
+			[¥￥]
+			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1386,6 +1400,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						仏暦
 					
+					
+						BE
+					
+					
+						BE
+					
 				
 				
 					
@@ -1884,6 +1904,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							メスラ
 							ナシエ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							トウト
 							ババ
@@ -1916,6 +1951,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							メスラ
 							ナシエ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							トウト
 							ババ
@@ -1933,6 +1983,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -2170,6 +2234,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ネハッセ
 							パグメン
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							メスケレム
 							テケムト
@@ -2202,6 +2281,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ネハッセ
 							パグメン
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							メスケレム
 							テケムト
@@ -2219,6 +2313,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -2327,10 +2435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d日～d日
 						
-						
-							Gy年～Gy年
-							Gy年～y年
-						
 						
 							GGGGGy/MM～GGGGGy/MM
 							GGGGGy/MM～y/MM
@@ -2348,6 +2452,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							GGGGGy/MM/dd(E)～y/MM/dd(E)
 							GGGGGy/MM/dd(E)～y/MM/dd(E)
 						
+						
+							Gy年～Gy年
+							Gy年～y年
+						
 						
 							GGGGGy/MM～GGGGGy/MM
 							GGGGGy/MM～y/MM
@@ -2494,6 +2602,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11月
 							12月
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1月
 							2月
@@ -2524,6 +2646,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11月
 							12月
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1月
 							2月
@@ -3039,6 +3175,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							アヴ
 							エルル
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ティスレ
 							へシボン
@@ -3073,6 +3225,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							アヴ
 							エルル
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ティスレ
 							へシボン
@@ -3091,6 +3259,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 				
 					
 						
@@ -3131,6 +3310,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							マーガ
 							パルグナ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							カイトラ
 							ヴァイサカ
@@ -3161,6 +3354,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							マーガ
 							パルグナ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							カイトラ
 							ヴァイサカ
@@ -3206,6 +3413,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ズル・カイダ
 							ズル・ヒッジャ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ムハッラム
 							サフアル
@@ -3236,6 +3457,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ズル・カイダ
 							ズル・ヒッジャ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ムハッラム
 							サフアル
@@ -3252,6 +3487,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 				
 					
 						
@@ -3872,6 +4118,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							バフマン
 							エスファンド
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ファルヴァルディーン
 							オルディーベヘシュト
@@ -3902,6 +4162,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							バフマン
 							エスファンド
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ファルヴァルディーン
 							オルディーベヘシュト
@@ -3918,6 +4192,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3984,7 +4269,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				年
 				昨年
 				今年
-				翌年
+				来年
 				
 					{0} 年後
 				
@@ -3996,7 +4281,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				年
 				昨年
 				今年
-				翌年
+				来年
 				
 					{0} 年後
 				
@@ -4008,7 +4293,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				年
 				昨年
 				今年
-				翌年
+				来年
 				
 					{0}年後
 				
@@ -4056,7 +4341,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				月
 				先月
 				今月
-				翌月
+				来月
 				
 					{0} か月後
 				
@@ -4068,7 +4353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				月
 				先月
 				今月
-				翌月
+				来月
 				
 					{0} か月後
 				
@@ -4080,7 +4365,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				月
 				先月
 				今月
-				翌月
+				来月
 				
 					{0}か月後
 				
@@ -4092,7 +4377,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				週
 				先週
 				今週
-				翌週
+				来週
 				
 					{0} 週間後
 				
@@ -4105,7 +4390,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				週
 				先週
 				今週
-				翌週
+				来週
 				
 					{0} 週間後
 				
@@ -4118,7 +4403,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				週
 				先週
 				今週
-				翌週
+				来週
 				
 					{0}週間後
 				
@@ -5224,6 +5509,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				アクトベ
 			
+			
+				コスタナイ
+			
 			
 				クズロルダ
 			
@@ -6809,13 +7097,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
+			latn
 			jpan
 			jpanfin
 		
 		1
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -6824,6 +7119,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0
@@ -6902,6 +7202,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				アンドラ ペセタ
 				アンドラ ペセタ
+				ADP
 			
 			
 				アラブ首長国連邦ディルハム
@@ -6911,6 +7212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				アフガニスタン アフガニー (1927–2002)
 				アフガニスタン アフガニー (1927–2002)
+				AFA
 			
 			
 				アフガニスタン アフガニー
@@ -6920,10 +7222,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				アルバニア レク (1946–1965)
 				アルバニア レク (1946–1965)
+				ALK
 			
 			
 				アルバニア レク
 				アルバニア レク
+				ALL
 			
 			
 				アルメニア ドラム
@@ -6933,61 +7237,75 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				オランダ領アンティル ギルダー
 				オランダ領アンティル ギルダー
+				ANG
 			
 			
 				アンゴラ クワンザ
 				アンゴラ クワンザ
+				AOA
 				Kz
 			
 			
 				アンゴラ クワンザ (1977–1991)
 				アンゴラ クワンザ (1977–1991)
+				AOK
 			
 			
 				アンゴラ 新クワンザ (1990–2000)
 				アンゴラ 新クワンザ (1990–2000)
+				AON
 			
 			
 				アンゴラ 旧クワンザ (1995–1999)
 				アンゴラ 旧クワンザ (1995–1999)
+				AOR
 			
 			
 				アルゼンチン アゥストラール
 				アルゼンチン アゥストラール
+				ARA
 			
 			
 				アルゼンチン・ペソ・レイ（1970–1983）
 				アルゼンチン・ペソ・レイ（1970–1983）
+				ARL
 			
 			
 				アルゼンチン・ペソ（1881–1970）
 				アルゼンチン・ペソ（1881–1970）
+				ARM
 			
 			
 				アルゼンチン ペソ (1983–1985)
 				アルゼンチン ペソ (1983–1985)
+				ARP
 			
 			
 				アルゼンチン ペソ
 				アルゼンチン ペソ
+				ARS
 				$
 			
 			
 				オーストリア シリング
 				オーストリア シリング
+				ATS
 			
 			
 				オーストラリア ドル
 				オーストラリア ドル
+				A$
 				$
 			
 			
 				アルバ ギルダー
 				アルバ ギルダー
+				AWG
 			
 			
 				アゼルバイジャン マナト (1993–2006)
 				アゼルバイジャン マナト (1993–2006)
+				AZM
 			
 			
 				アゼルバイジャン マナト
@@ -6997,19 +7315,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ボスニア・ヘルツェゴビナ ディナール (1992–1994)
 				ボスニア・ヘルツェゴビナ ディナール (1992–1994)
+				BAD
 			
 			
 				ボスニア・ヘルツェゴビナ 兌換マルク (BAM)
 				ボスニア・ヘルツェゴビナ 兌換マルク (BAM)
+				BAM
 				KM
 			
 			
 				ボスニア・ヘルツェゴビナ 新ディナール（1994–1997）
 				ボスニア・ヘルツェゴビナ 新ディナール（1994–1997）
+				BAN
 			
 			
 				バルバドス ドル
 				バルバドス ドル
+				BBD
 				$
 			
 			
@@ -7021,30 +7343,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ベルギー フラン (BEC)
 				ベルギー フラン (BEC)
+				BEC
 			
 			
 				ベルギー フラン
 				ベルギー フラン
+				BEF
 			
 			
 				ベルギー フラン (BEL)
 				ベルギー フラン (BEL)
+				BEL
 			
 			
 				ブルガリア レフ
 				ブルガリア レフ
+				BGL
 			
 			
 				ブルガリア社会主義 レフ
 				ブルガリア社会主義 レフ
+				BGM
 			
 			
 				ブルガリア 新レフ
 				ブルガリア 新レフ
+				BGN
 			
 			
 				ブルガリア レフ（1879–1952）
 				ブルガリア レフ（1879–1952）
+				BGO
 			
 			
 				バーレーン ディナール
@@ -7054,10 +7383,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ブルンジ フラン
 				ブルンジ フラン
+				BIF
 			
 			
 				バミューダ ドル
 				バミューダ ドル
+				BMD
 				$
 			
 			
@@ -7069,52 +7400,64 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ボリビア ボリビアーノ
 				ボリビア ボリビアーノ
+				BOB
 				Bs
 			
 			
 				ボリビア ボリビアーノ (1863–1963)
 				ボリビア ボリビアーノ (1863–1963)
+				BOL
 			
 			
 				ボリビア ペソ
 				ボリビア ペソ
+				BOP
 			
 			
 				ボリビア (Mvdol)
 				ボリビア (Mvdol)
+				BOV
 			
 			
 				ブラジル 新クルゼイロ (1967–1986)
 				ブラジル 新クルゼイロ (1967–1986)
+				BRB
 			
 			
 				ブラジル クルザード (1986–1989)
 				ブラジル クルザード (1986–1989)
+				BRC
 			
 			
 				ブラジル クルゼイロ (1990–1993)
 				ブラジル クルゼイロ (1990–1993)
+				BRE
 			
 			
 				ブラジル レアル
 				ブラジル レアル
+				R$
 				R$
 			
 			
 				ブラジル 新クルザード (1989–1990)
 				ブラジル 新クルザード (1989–1990)
+				BRN
 			
 			
 				ブラジル クルゼイロ (1993–1994)
 				ブラジル クルゼイロ (1993–1994)
+				BRR
 			
 			
 				ブラジル クルゼイロ（1942–1967）
 				ブラジル クルゼイロ（1942–1967）
+				BRZ
 			
 			
 				バハマ ドル
 				バハマ ドル
+				BSD
 				$
 			
 			
@@ -7125,62 +7468,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ビルマ チャット
 				ビルマ チャット
+				BUK
 			
 			
 				ボツワナ プラ
 				ボツワナ プラ
+				BWP
 				P
 			
 			
 				ベラルーシ 新ルーブル (1994–1999)
 				ベラルーシ 新ルーブル (1994–1999)
+				BYB
 			
 			
 				ベラルーシ ルーブル
 				ベラルーシ ルーブル
+				BYN
 				р.
 			
 			
 				ベラルーシ ルーブル (2000–2016)
 				ベラルーシ ルーブル (2000–2016)
+				BYR
 			
 			
 				ベリーズ ドル
 				ベリーズ ドル
+				BZD
 				$
 			
 			
 				カナダ ドル
 				カナダ ドル
+				CA$
 				$
 			
 			
 				コンゴ フラン
 				コンゴ フラン
+				CDF
 			
 			
 				ユーロ (WIR)
 				ユーロ (WIR)
+				CHE
 			
 			
 				スイス フラン
 				スイス フラン
+				CHF
 			
 			
 				フラン (WIR)
 				フラン (WIR)
+				CHW
 			
 			
 				チリ エスクード
 				チリ エスクード
+				CLE
 			
 			
 				チリ ウニダ・デ・フォメント (UF)
 				チリ ウニダ・デ・フォメント (UF)
+				CLF
 			
 			
 				チリ ペソ
 				チリ ペソ
+				CLP
 				$
 			
 			
@@ -7191,6 +7548,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				中国人民銀行ドル
 				中国人民銀行ドル
+				CNX
 			
 			
 				中国人民元
@@ -7201,142 +7559,175 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				コロンビア ペソ
 				コロンビア ペソ
+				COP
 				$
 			
 			
 				コロンビア レアル （UVR)
 				コロンビア レアル （UVR)
+				COU
 			
 			
 				コスタリカ コロン
 				コスタリカ コロン
+				CRC
 				₡
 			
 			
 				セルビア ディナール (2002–2006)
 				セルビア ディナール (2002–2006)
+				CSD
 			
 			
 				チェコスロバキア コルナ
 				チェコスロバキア コルナ
+				CSK
 			
 			
 				キューバ 兌換ペソ
 				キューバ 兌換ペソ
+				CUC
 				$
 			
 			
 				キューバ ペソ
 				キューバ ペソ
+				CUP
 				$
 			
 			
 				カーボベルデ エスクード
 				カーボベルデ エスクード
+				CVE
 			
 			
 				キプロス ポンド
 				キプロス ポンド
+				CYP
 			
 			
 				チェコ コルナ
 				チェコ コルナ
+				CZK
 				Kč
 			
 			
 				東ドイツ マルク
 				東ドイツ マルク
+				DDM
 			
 			
 				ドイツ マルク
 				ドイツ マルク
+				DEM
 			
 			
 				ジブチ フラン
 				ジブチ フラン
+				DJF
 			
 			
 				デンマーク クローネ
 				デンマーク クローネ
+				DKK
 				kr
 			
 			
 				ドミニカ ペソ
 				ドミニカ ペソ
+				DOP
 				$
 			
 			
 				アルジェリア ディナール
 				アルジェリア ディナール
+				DZD
 			
 			
 				エクアドル スクレ
 				エクアドル スクレ
+				ECS
 			
 			
 				エクアドル (UVC)
 				エクアドル (UVC)
+				ECV
 			
 			
 				エストニア クルーン
 				エストニア クルーン
+				EEK
 			
 			
 				エジプト ポンド
 				エジプト ポンド
+				EGP
 				E£
 			
 			
 				エリトリア ナクファ
 				エリトリア ナクファ
+				ERN
 			
 			
 				スペインペセタ（勘定A）
 				スペインペセタ（勘定A）
+				ESA
 			
 			
 				スペイン 兌換ペセタ
 				スペイン 兌換ペセタ
+				ESB
 			
 			
 				スペイン ペセタ
 				スペイン ペセタ
+				ESP
+				₧
 			
 			
 				エチオピア ブル
 				エチオピア ブル
+				ETB
 			
 			
 				ユーロ
 				ユーロ
+				€
 				€
 			
 			
 				フィンランド マルカ
 				フィンランド マルカ
+				FIM
 			
 			
 				フィジー ドル
 				フィジー ドル
+				FJD
 				$
 			
 			
 				フォークランド（マルビナス）諸島 ポンド
 				フォークランド（マルビナス）諸島 ポンド
+				FKP
 				£
 			
 			
 				フランス フラン
 				フランス フラン
+				FRF
 			
 			
 				英国ポンド
 				英国ポンド
+				£
 				£
 			
 			
 				ジョージア クーポン ラリ
 				ジョージア クーポン ラリ
+				GEK
 			
 			
 				ジョージア ラリ
@@ -7348,81 +7739,99 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ガーナ セディ (1979–2007)
 				ガーナ セディ (1979–2007)
+				GHC
 			
 			
 				ガーナ セディ
 				ガーナ セディ
+				GHS
 			
 			
 				ジブラルタル ポンド
 				ジブラルタル ポンド
+				GIP
 				£
 			
 			
 				ガンビア ダラシ
 				ガンビア ダラシ
+				GMD
 			
 			
 				ギニア フラン
 				ギニア フラン
+				GNF
 				FG
 			
 			
 				ギニア シリー
 				ギニア シリー
+				GNS
 			
 			
 				赤道ギニア エクウェレ
 				赤道ギニア エクウェレ
+				GQE
 			
 			
 				ギリシャ ドラクマ
 				ギリシャ ドラクマ
+				GRD
 			
 			
 				グアテマラ ケツァル
 				グアテマラ ケツァル
+				GTQ
 				Q
 			
 			
 				ポルトガル領ギニア エスクード
 				ポルトガル領ギニア エスクード
+				GWE
 			
 			
 				ギニアビサウ ペソ
 				ギニアビサウ ペソ
+				GWP
 			
 			
 				ガイアナ ドル
 				ガイアナ ドル
+				GYD
 				$
 			
 			
 				香港ドル
 				香港ドル
+				HK$
 				$
 			
 			
 				ホンジュラス レンピラ
 				ホンジュラス レンピラ
+				HNL
 				L
 			
 			
 				クロアチア ディナール
 				クロアチア ディナール
+				HRD
 			
 			
 				クロアチア クーナ
 				クロアチア クーナ
+				HRK
 				kn
 			
 			
 				ハイチ グールド
 				ハイチ グールド
+				HTG
 			
 			
 				ハンガリー フォリント
 				ハンガリー フォリント
+				HUF
 				Ft
 			
 			
@@ -7434,23 +7843,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				アイリッシュ ポンド
 				アイリッシュ ポンド
+				IEP
 			
 			
 				イスラエル ポンド
 				イスラエル ポンド
+				ILP
 			
 			
 				イスラエル シェケル (1980–1985)
 				イスラエル シェケル (1980–1985)
+				ILR
 			
 			
 				イスラエル新シェケル
 				イスラエル新シェケル
+				₪
 				₪
 			
 			
 				インド ルピー
 				インド ルピー
+				₹
 				₹
 			
 			
@@ -7466,19 +7880,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				アイスランド クローナ (1918–1981)
 				アイスランド クローナ (1918–1981)
+				ISJ
 			
 			
 				アイスランド クローナ
 				アイスランド クローナ
+				ISK
 				kr
 			
 			
 				イタリア リラ
 				イタリア リラ
+				ITL
 			
 			
 				ジャマイカ ドル
 				ジャマイカ ドル
+				JMD
 				$
 			
 			
@@ -7495,6 +7913,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ケニア シリング
 				ケニア シリング
+				KES
 			
 			
 				キルギス ソム
@@ -7510,6 +7929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				コモロ フラン
 				コモロ フラン
+				KMF
 				CF
 			
 			
@@ -7521,14 +7941,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				韓国 ファン（1953–1962）
 				韓国 ファン（1953–1962）
+				KRH
 			
 			
 				韓国 ウォン（1945–1953）
 				韓国 ウォン（1945–1953）
+				KRO
 			
 			
 				韓国ウォン
 				韓国ウォン
+				₩
+				₩
 			
 			
 				クウェート ディナール
@@ -7538,6 +7962,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ケイマン諸島 ドル
 				ケイマン諸島 ドル
+				KYD
 				$
 			
 			
@@ -7567,84 +7992,104 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				リベリア ドル
 				リベリア ドル
+				LRD
 				$
 			
 			
 				レソト ロティ
 				レソト ロティ
+				LSL
 			
 			
 				リトアニア リタス
 				リトアニア リタス
+				LTL
 			
 			
 				リトアニア タロナ
 				リトアニア タロナ
+				LTT
 			
 			
 				ルクセンブルク 兌換フラン
 				ルクセンブルク 兌換フラン
+				LUC
 			
 			
 				ルクセンブルグ フラン
 				ルクセンブルグ フラン
+				LUF
 			
 			
 				ルクセンブルク 金融フラン
 				ルクセンブルク 金融フラン
+				LUL
 			
 			
 				ラトビア ラッツ
 				ラトビア ラッツ
+				LVL
 			
 			
 				ラトビア ルーブル
 				ラトビア ルーブル
+				LVR
 			
 			
 				リビア ディナール
 				リビア ディナール
+				LYD
 			
 			
 				モロッコ ディルハム
 				モロッコ ディルハム
+				MAD
 			
 			
 				モロッコ フラン
 				モロッコ フラン
+				MAF
 			
 			
 				モネガスク フラン
 				モネガスク フラン
+				MCF
 			
 			
 				モルドバ クーポン
 				モルドバ クーポン
+				MDC
 			
 			
 				モルドバ レイ
 				モルドバ レイ
+				MDL
 			
 			
 				マダガスカル アリアリ
 				マダガスカル アリアリ
+				MGA
 				Ar
 			
 			
 				マラガシ フラン
 				マラガシ フラン
+				MGF
 			
 			
 				マケドニア デナル
 				マケドニア デナル
+				MKD
 			
 			
 				マケドニア ディナール（1992–1993）
 				マケドニア ディナール（1992–1993）
+				MKN
 			
 			
 				マリ フラン
 				マリ フラン
+				MLF
 			
 			
 				ミャンマー チャット
@@ -7666,6 +8111,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				モーリタニア ウギア (1973–2017)
 				モーリタニア ウギア (1973–2017)
+				MRO
 			
 			
 				モーリタニア ウギア
@@ -7675,19 +8121,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				マルタ リラ
 				マルタ リラ
+				MTL
 			
 			
 				マルタ ポンド
 				マルタ ポンド
+				MTP
 			
 			
 				モーリシャス ルピー
 				モーリシャス ルピー
+				MUR
 				Rs
 			
 			
 				モルディブ諸島 ルピー
 				モルディブ諸島 ルピー
+				MVP
 			
 			
 				モルディブ ルフィア
@@ -7697,19 +8147,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				マラウィ クワチャ
 				マラウィ クワチャ
+				MWK
 			
 			
 				メキシコ ペソ
 				メキシコ ペソ
+				MX$
 				$
 			
 			
 				メキシコ ペソ (1861–1992)
 				メキシコ ペソ (1861–1992)
+				MXP
 			
 			
 				メキシコ (UDI)
 				メキシコ (UDI)
+				MXV
 			
 			
 				マレーシア リンギット
@@ -7720,41 +8174,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				モザンピーク エスクード
 				モザンピーク エスクード
+				MZE
 			
 			
 				モザンビーク メティカル (1980–2006)
 				モザンビーク メティカル (1980–2006)
+				MZM
 			
 			
 				モザンビーク メティカル
 				モザンビーク メティカル
+				MZN
 			
 			
 				ナミビア ドル
 				ナミビア ドル
+				NAD
 				$
 			
 			
 				ナイジェリア ナイラ
 				ナイジェリア ナイラ
+				NGN
 				₦
 			
 			
 				ニカラグア コルドバ (1988–1991)
 				ニカラグア コルドバ (1988–1991)
+				NIC
 			
 			
 				ニカラグア コルドバ オロ
 				ニカラグア コルドバ オロ
+				NIO
 				C$
 			
 			
 				オランダ ギルダー
 				オランダ ギルダー
+				NLG
 			
 			
 				ノルウェー クローネ
 				ノルウェー クローネ
+				NOK
 				kr
 			
 			
@@ -7766,6 +8229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ニュージーランド ドル
 				ニュージーランド ドル
+				NZ$
 				$
 			
 			
@@ -7776,22 +8240,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				パナマ バルボア
 				パナマ バルボア
+				PAB
 			
 			
 				ペルー インティ
 				ペルー インティ
+				PEI
 			
 			
 				ペルー ソル
 				ペルー ソル
+				PEN
 			
 			
 				ペルー ソル (1863–1965)
 				ペルー ソル (1863–1965)
+				PES
 			
 			
 				パプアニューギニア キナ
 				パプアニューギニア キナ
+				PGK
 			
 			
 				フィリピン ペソ
@@ -7808,19 +8277,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ポーランド ズウォティ
 				ポーランド ズウォティ
+				PLN
 				zł
 			
 			
 				ポーランド ズウォティ (1950–1995)
 				ポーランド ズウォティ (1950–1995)
+				PLZ
 			
 			
 				ポルトガル エスクード
 				ポルトガル エスクード
+				PTE
 			
 			
 				パラグアイ グアラニ
 				パラグアイ グアラニ
+				PYG
 				₲
 			
 			
@@ -7831,32 +8304,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ローデシア ドル
 				ローデシア ドル
+				RHD
 			
 			
 				ルーマニア レイ (1952–2006)
 				ルーマニア レイ (1952–2006)
+				ROL
 			
 			
 				ルーマニア レイ
 				ルーマニア レイ
+				RON
 				レイ
 			
 			
 				ディナール (セルビア)
 				ディナール (セルビア)
+				RSD
 			
 			
 				ロシア ルーブル
 				ロシア ルーブル
+				RUB
 				₽
 			
 			
 				ロシア ルーブル (1991–1998)
 				ロシア ルーブル (1991–1998)
+				RUR
 			
 			
 				ルワンダ フラン
 				ルワンダ フラン
+				RWF
 				RF
 			
 			
@@ -7867,27 +8347,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ソロモン諸島 ドル
 				ソロモン諸島 ドル
+				SBD
 				$
 			
 			
 				セーシェル ルピー
 				セーシェル ルピー
+				SCR
 			
 			
 				スーダン ディナール (1992–2007)
 				スーダン ディナール (1992–2007)
+				SDD
 			
 			
 				スーダン ポンド
 				スーダン ポンド
+				SDG
 			
 			
 				スーダン ポンド (1957–1998)
 				スーダン ポンド (1957–1998)
+				SDP
 			
 			
 				スウェーデン クローナ
 				スウェーデン クローナ
+				SEK
 				kr
 			
 			
@@ -7899,41 +8385,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				セントヘレナ ポンド
 				セントヘレナ ポンド
+				SHP
 				£
 			
 			
 				スロベニア トラール
 				スロベニア トラール
+				SIT
 			
 			
 				スロバキア コルナ
 				スロバキア コルナ
+				SKK
 			
 			
 				シエラレオネ レオン
 				シエラレオネ レオン
+				SLL
 			
 			
 				ソマリア シリング
 				ソマリア シリング
+				SOS
 			
 			
 				スリナム ドル
 				スリナム ドル
+				SRD
 				$
 			
 			
 				スリナム ギルダー
 				スリナム ギルダー
+				SRG
 			
 			
 				南スーダン ポンド
 				南スーダン ポンド
+				SSP
 				£
 			
 			
 				サントメ・プリンシペ ドブラ (1977–2017)
 				サントメ・プリンシペ ドブラ (1977–2017)
+				STD
 			
 			
 				サントメ・プリンシペ ドブラ
@@ -7944,10 +8439,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ソ連 ルーブル
 				ソ連 ルーブル
+				SUR
 			
 			
 				エルサルバドル コロン
 				エルサルバドル コロン
+				SVC
 			
 			
 				シリア ポンド
@@ -7958,15 +8455,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				スワジランド リランゲニ
 				スワジランド リランゲニ
+				SZL
 			
 			
 				タイ バーツ
 				タイ バーツ
+				THB
 				฿
 			
 			
 				タジキスタン ルーブル
 				タジキスタン ルーブル
+				TJR
 			
 			
 				タジキスタン ソモニ
@@ -7976,6 +8476,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				トルクメニスタン マナト (1993–2009)
 				トルクメニスタン マナト (1993–2009)
+				TMM
 			
 			
 				トルクメニスタン マナト
@@ -7985,19 +8486,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				チュニジア ディナール
 				チュニジア ディナール
+				TND
 			
 			
 				トンガ パ・アンガ
 				トンガ パ・アンガ
+				TOP
 				T$
 			
 			
 				ティモール エスクード
 				ティモール エスクード
+				TPE
 			
 			
 				トルコ リラ (1922–2005)
 				トルコ リラ (1922–2005)
+				TRL
 			
 			
 				新トルコリラ
@@ -8009,32 +8514,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				トリニダード・トバゴ ドル
 				トリニダード・トバゴ ドル
+				TTD
 				$
 			
 			
 				新台湾ドル
 				新台湾ドル
+				NT$
+				$
 			
 			
 				タンザニア シリング
 				タンザニア シリング
+				TZS
 			
 			
 				ウクライナ グリブナ
 				ウクライナ グリブナ
+				UAH
 				₴
 			
 			
 				ウクライナ カルボバネツ
 				ウクライナ カルボバネツ
+				UAK
 			
 			
 				ウガンダ シリング (1966–1987)
 				ウガンダ シリング (1966–1987)
+				UGS
 			
 			
 				ウガンダ シリング
 				ウガンダ シリング
+				UGX
 			
 			
 				米ドル
@@ -8045,22 +8558,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				米ドル (翌日)
 				米ドル (翌日)
+				USN
 			
 			
 				米ドル (当日)
 				米ドル (当日)
+				USS
 			
 			
 				ウルグアイ ペソエン
 				ウルグアイ ペソエン
+				UYI
 			
 			
 				ウルグアイ ペソ (1975–1993)
 				ウルグアイ ペソ (1975–1993)
+				UYP
 			
 			
 				ウルグアイ ペソ
 				ウルグアイ ペソ
+				UYU
 				$
 			
 			
@@ -8071,10 +8589,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ベネズエラ ボリバル (1871–2008)
 				ベネズエラ ボリバル (1871–2008)
+				VEB
 			
 			
 				ベネズエラ ボリバル (2008–2018)
 				ベネズエラ ボリバル (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -8085,100 +8605,124 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ベトナム ドン
 				ベトナム ドン
+				₫
 				₫
 			
 			
 				ベトナム ドン（1978–1985）
 				ベトナム ドン（1978–1985）
+				VNN
 			
 			
 				バヌアツ バツ
 				バヌアツ バツ
+				VUV
 			
 			
 				サモア タラ
 				サモア タラ
+				WST
 			
 			
 				中央アフリカ CFA フラン
 				中央アフリカ CFA フラン
+				FCFA
 			
 			
 				銀
 				銀
+				XAG
 			
 			
 				金
 				金
+				XAU
 			
 			
 				ヨーロッパ混合単位 (EURCO)
 				ヨーロッパ混合単位 (EURCO)
+				XBA
 			
 			
 				ヨーロッパ通貨単位 (EMU–6)
 				ヨーロッパ通貨単位 (EMU–6)
+				XBB
 			
 			
 				ヨーロッパ勘定単位 (EUA–9)
 				ヨーロッパ勘定単位 (EUA–9)
+				XBC
 			
 			
 				ヨーロッパ勘定単位 (EUA–17)
 				ヨーロッパ勘定単位 (EUA–17)
+				XBD
 			
 			
 				東カリブ ドル
 				東カリブ ドル
+				EC$
 				$
 			
 			
 				特別引き出し権
 				特別引き出し権
+				XDR
 			
 			
 				ヨーロッパ通貨単位
 				ヨーロッパ通貨単位
+				XEU
 			
 			
 				フランス金フラン
 				フランス金フラン
+				XFO
 			
 			
 				フランス フラン (UIC)
 				フランス フラン (UIC)
+				XFU
 			
 			
 				西アフリカ CFA フラン
 				西アフリカ CFA フラン
+				CFA
 			
 			
 				パラジウム
 				パラジウム
+				XPD
 			
 			
 				CFP フラン
 				CFP フラン
+				CFPF
 			
 			
 				プラチナ
 				プラチナ
+				XPT
 			
 			
 				RINET基金
 				RINET基金
+				XRE
 			
 			
 				スクレ
 				スクレ
+				XSU
 			
 			
 				テスト用通貨コード
 				テスト用通貨コード
+				XTS
 			
 			
 				UA (アフリカ開発銀行)
 				UA (アフリカ開発銀行)
+				XUA
 			
 			
 				不明または無効な通貨
@@ -8188,6 +8732,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				イエメン ディナール
 				イエメン ディナール
+				YDD
 			
 			
 				イエメン リアル
@@ -8197,56 +8742,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ユーゴスラビア ハード・ディナール (1966–1990)
 				ユーゴスラビア ハード・ディナール (1966–1990)
+				YUD
 			
 			
 				ユーゴスラビア ノビ・ディナール (1994–2002)
 				ユーゴスラビア ノビ・ディナール (1994–2002)
+				YUM
 			
 			
 				ユーゴスラビア 兌換ディナール (1990–1992)
 				ユーゴスラビア 兌換ディナール (1990–1992)
+				YUN
 			
 			
 				ユーゴスラビア 改革ディナール（1992–1993）
 				ユーゴスラビア 改革ディナール（1992–1993）
+				YUR
 			
 			
 				南アフリカ ランド (ZAL)
 				南アフリカ ランド (ZAL)
+				ZAL
 			
 			
 				南アフリカ ランド
 				南アフリカ ランド
+				ZAR
 				R
 			
 			
 				ザンビア クワチャ (1968–2012)
 				ザンビア クワチャ (1968–2012)
+				ZMK
 			
 			
 				ザンビア クワチャ
 				ザンビア クワチャ
+				ZMW
 				ZK
 			
 			
 				ザイール 新ザイール (1993–1998)
 				ザイール 新ザイール (1993–1998)
+				ZRN
 			
 			
 				ザイール ザイール (1971–1993)
 				ザイール ザイール (1971–1993)
+				ZRZ
 			
 			
 				ジンバブエ ドル (1980–2008)
 				ジンバブエ ドル (1980–2008)
+				ZWD
 			
 			
 				ジンバブエ ドル (2009)
 				ジンバブエ ドル (2009)
+				ZWL
 			
 			
 				シンバブエ ドル（2008）
 				シンバブエ ドル（2008）
+				ZWR
 			
 		
 		
@@ -8265,6 +8823,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}毎{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				重力加速度
 				{0} G
@@ -8335,8 +8896,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/平方インチ
 			
 			
-				ドゥナム
-				{0} ドゥナム
+				ドゥナム
+				{0} ドゥナム
 			
 			
 				金
@@ -8363,12 +8924,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} パーミル
 			
 			
-				パーミリアド
-				{0} パーミリアド
+				パーミリアド
+				{0} パーミリアド
 			
 			
-				モル
-				{0} モル
+				モル
+				{0} モル
 			
 			
 				リットル毎キロメートル
@@ -8434,6 +8995,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				世紀
 				{0} 世紀
 			
+			
+				十年
+				{0} 十年
+			
 			
 				年
 				{0} 年
@@ -8522,20 +9087,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} キロワット時
 			
 			
-				電子ボルト
-				{0} 電子ボルト
+				電子ボルト
+				{0} 電子ボルト
 			
 			
-				英熱量
-				{0} 英熱量
+				英熱量
+				{0} 英熱量
+			
+			
+				米サーム
+				{0} 米サーム
 			
 			
-				重量ポンド
-				{0} 重量ポンド
+				重量ポンド
+				{0} 重量ポンド
 			
 			
-				ニュートン
-				{0} ニュートン
+				ニュートン
+				{0} ニュートン
 			
 			
 				ギガヘルツ
@@ -8553,6 +9122,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ヘルツ
 				{0} ヘルツ
 			
+			
+				フォントサイズ em
+			
+			
+				ピクセル
+				{0} ピクセル
+			
+			
+				メガピクセル
+				{0} メガピクセル
+			
+			
+				ピクセル/cm
+				{0} ピクセル/cm
+			
+			
+				ピクセル/インチ
+				{0} ピクセル/インチ
+			
+			
+				ドット/cm
+				{0} ドット/cm
+			
+			
+				ドット/インチ
+				{0} ドット/インチ
+			
 			
 				キロメートル
 				{0} キロメートル
@@ -8639,16 +9235,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ポイント
 			
 			
-				太陽半径
-				{0} 太陽半径
+				太陽半径
+				{0} 太陽半径
 			
 			
 				ルクス
 				{0} ルクス
 			
 			
-				太陽光度
-				{0} 太陽光度
+				太陽光度
+				{0} 太陽光度
 			
 			
 				トン
@@ -8699,16 +9295,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} カラット
 			
 			
-				ダルトン
-				{0} ダルトン
+				ダルトン
+				{0} ダルトン
 			
 			
-				地球質量
-				{0} 地球質量
+				地球質量
+				{0} 地球質量
 			
 			
-				太陽質量
-				{0} 太陽質量
+				太陽質量
+				{0} 太陽質量
 			
 			
 				ギガワット
@@ -8734,10 +9330,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				馬力
 				{0} 馬力
 			
-			
-				ヘクトパスカル
-				{0} ヘクトパスカル
-			
 			
 				水銀柱ミリメートル
 				{0} 水銀柱ミリメートル
@@ -8750,6 +9342,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				水銀柱インチ
 				{0} 水銀柱インチ
 			
+			
+				バール
+				{0} バール
+			
 			
 				ミリバール
 				{0} ミリバール
@@ -8758,13 +9354,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				気圧
 				{0} 気圧
 			
+			
+				パスカル
+				{0} パスカル
+			
+			
+				ヘクトパスカル
+				{0} ヘクトパスカル
+			
 			
-				キロパスカル
-				{0} キロパスカル
+				キロパスカル
+				{0} キロパスカル
 			
 			
-				メガパスカル
-				{0} メガパスカル
+				メガパスカル
+				{0} メガパスカル
 			
 			
 				キロメートル毎時
@@ -8799,12 +9403,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ケルビン
 			
 			
-				ポンドフィート
-				{0} ポンドフィート
+				ポンドフィート
+				{0} ポンドフィート
 			
 			
-				ニュートンメートル
-				{0} ニュートンメートル
+				ニュートンメートル
+				{0} ニュートンメートル
 			
 			
 				立方キロメートル
@@ -8904,8 +9508,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} 液量オンス
 			
 			
-				英液量オンス
-				{0} 英液量オンス
+				英液量オンス
+				{0} 英液量オンス
 			
 			
 				大さじ
@@ -8916,8 +9520,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				小さじ {0}
 			
 			
-				バレル
-				{0} バレル
+				バレル
+				{0} バレル
 			
 			
 				方位
@@ -8931,6 +9535,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				重力加速度
 				{0} G
@@ -9001,8 +9608,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in²
 			
 			
-				ドゥナム
-				{0}ドゥナム
+				ドゥナム
+				{0}ドゥナム
 			
 			
 				金
@@ -9029,12 +9636,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				パーミリアド
-				{0}‱
+				パーミリアド
+				{0}‱
 			
 			
-				モル
-				{0} mol
+				モル
+				{0} mol
 			
 			
 				L/km
@@ -9081,8 +9688,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Mb
 			
 			
-				kB
-				{0} kB
+				KB
+				{0} KB
 			
 			
 				キロビット
@@ -9100,6 +9707,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				世紀
 				{0} 世紀
 			
+			
+				十年
+				{0} 十年
+			
 			
 				年
 				{0} 年
@@ -9188,20 +9799,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				電子ボルト
-				{0} eV
+				電子ボルト
+				{0} eV
 			
 			
-				英熱量
-				{0} BTU
+				英熱量
+				{0} BTU
+			
+			
+				米サーム
+				{0} 米サーム
 			
 			
-				重量ポンド
-				{0} lbf
+				重量ポンド
+				{0} lbf
 			
 			
-				ニュートン
-				{0} N
+				ニュートン
+				{0} N
 			
 			
 				GHz
@@ -9219,6 +9834,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+			
+			
+				ピクセル
+				{0} px
+			
+			
+				メガピクセル
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -9286,6 +9929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ハロン
+				{0} fur
 			
 			
 				ファゾム
@@ -9304,16 +9948,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				太陽半径
-				{0} R☉
+				太陽半径
+				{0} R☉
 			
 			
 				ルクス
 				{0} lx
 			
 			
-				太陽光度
-				{0} L☉
+				太陽光度
+				{0} L☉
 			
 			
 				トン
@@ -9343,6 +9987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ストーン
+				{0} st
 			
 			
 				ポンド
@@ -9363,16 +10008,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ct
 			
 			
-				ダルトン
-				{0} Da
+				ダルトン
+				{0} Da
 			
 			
-				地球質量
-				{0} M⊕
+				地球質量
+				{0} M⊕
 			
 			
-				太陽質量
-				{0} M☉
+				太陽質量
+				{0} M☉
 			
 			
 				ギガワット
@@ -9398,10 +10043,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				馬力
 				{0} 馬力
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				水銀柱ミリメートル
 				{0} mm Hg
@@ -9414,6 +10055,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				水銀柱インチ
 				{0} inHg
 			
+			
+				バール
+				{0} bar
+			
 			
 				ミリバール
 				{0} mb
@@ -9422,13 +10067,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				気圧
 				{0} atm
 			
+			
+				パスカル
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+			
 			
-				kPa
-				{0} kPa
+				kPa
+				{0} kPa
 			
 			
-				MPa
-				{0} MPa
+				MPa
+				{0} MPa
 			
 			
 				km/h
@@ -9463,12 +10116,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				ポンドフィート
-				{0} lbf⋅ft
+				ポンドフィート
+				{0} lbf⋅ft
 			
 			
-				ニュートンメートル
-				{0} N⋅m
+				ニュートンメートル
+				{0} N⋅m
 			
 			
 				km³
@@ -9511,7 +10164,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				リットル
 				{0} L
-				{0}/l
+				{0}/L
 			
 			
 				デシリットル
@@ -9539,6 +10192,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ブッシェル
+				{0} bu
 			
 			
 				ガロン
@@ -9567,8 +10221,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				英液量オンス
-				{0} fl oz Imp
+				英液量オンス
+				{0} fl oz Imp
 			
 			
 				大さじ
@@ -9579,8 +10233,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				小さじ {0}
 			
 			
-				バレル
-				{0} bbl
+				バレル
+				{0} bbl
 			
 			
 				方位
@@ -9594,11 +10248,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				重力加速度
 				{0}G
 			
 			
+				m/s²
 				{0}m/s²
 			
 			
@@ -9773,10 +10431,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				km
 				{0}km
+				{0}/km
 			
 			
 				m
 				{0}m
+				{0}/m
 			
 			
 				デシメートル
@@ -9785,6 +10445,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				cm
 				{0}cm
+				{0}/cm
 			
 			
 				mm
@@ -9813,10 +10474,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				フィート
 				{0}′
+				{0}/ft
 			
 			
 				インチ
 				{0}″
+				{0}/in
 			
 			
 				パーセク
@@ -9842,6 +10505,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				スカンジナビアマイル
+				{0} smi
+			
+			
+				{0} pt
 			
 			
 				{0}lx
@@ -9852,10 +10519,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				kg
 				{0}kg
+				{0}/kg
 			
 			
 				g
 				{0}g
+				{0}/g
 			
 			
 				{0}mg
@@ -9872,10 +10541,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ポンド
 				{0}lb
+				{0}/lb
 			
 			
 				オンス
 				{0}oz
+				{0}/oz
 			
 			
 				{0}oz t
@@ -9901,9 +10572,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}hp
 			
-			
-				{0}hPa
-			
 			
 				水銀柱ミリメートル
 				{0}mm Hg
@@ -9920,11 +10588,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ミリバール
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+			
 			
 				km/h
 				{0}km/h
 			
 			
+				m/s
 				{0}m/s
 			
 			
@@ -9933,12 +10606,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ノット
+				{0} kn
+			
+			
+				°
+				{0}°
 			
 			
 				°C
 				{0}°C
 			
+			
+				°F
+				{0}°F
+			
 			
+				K
 				{0}K
 			
 			
@@ -10039,12 +10722,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}、または{1}
 			{0}または{1}
 		
-		
-			{0}、{1}
-			{0}、{1}
-			{0}、{1}
-			{0}、{1}
-		
 		
 			{0}、{1}
 			{0}、{1}
diff --git a/make/data/cldr/common/main/ja_JP.xml b/make/data/cldr/common/main/ja_JP.xml
index 13460b7616a..687dc493d12 100644
--- a/make/data/cldr/common/main/ja_JP.xml
+++ b/make/data/cldr/common/main/ja_JP.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/jgo.xml b/make/data/cldr/common/main/jgo.xml
index be4658263df..c09e66de460 100644
--- a/make/data/cldr/common/main/jgo.xml
+++ b/make/data/cldr/common/main/jgo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -123,8 +123,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á â ǎ b c d ɛ {ɛ\u0301} {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} {ɛ\u0304} f g h i í î ǐ j k l m ḿ {m\u0300} {m\u0304} n ń ǹ {n\u0304} ŋ {ŋ\u0301} {ŋ\u0300} {ŋ\u0304} ɔ {ɔ\u0301} {ɔ\u0302} {ɔ\u030C} p {pf} s {sh} t {ts} u ú û ǔ ʉ {ʉ\u0301} {ʉ\u0302} {ʉ\u030C} {ʉ\u0308} v w ẅ y z ꞌ]
 		[e o q r x]
 		[A B C D Ɛ F G H I J K L M N Ŋ Ɔ P {Pf} S {Sh} T {Ts} U Ʉ {Ʉ\u0308} V W Ẅ Y Z Ꞌ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ‹ › « »]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ; \: ! ? . ‹ › « »]
 		?
 	
 	
diff --git a/make/data/cldr/common/main/jgo_CM.xml b/make/data/cldr/common/main/jgo_CM.xml
index 0ab628d7a57..79130bd5a15 100644
--- a/make/data/cldr/common/main/jgo_CM.xml
+++ b/make/data/cldr/common/main/jgo_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/jmc.xml b/make/data/cldr/common/main/jmc.xml
index 1fae83b1b95..cadb5eaa5f3 100644
--- a/make/data/cldr/common/main/jmc.xml
+++ b/make/data/cldr/common/main/jmc.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/jmc_TZ.xml b/make/data/cldr/common/main/jmc_TZ.xml
index 240a162d56a..92d365385ec 100644
--- a/make/data/cldr/common/main/jmc_TZ.xml
+++ b/make/data/cldr/common/main/jmc_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/jv.xml b/make/data/cldr/common/main/jv.xml
index 281db5c1b5b..ba548fc4c30 100644
--- a/make/data/cldr/common/main/jv.xml
+++ b/make/data/cldr/common/main/jv.xml
@@ -10,7 +10,7 @@ terms of use, see http://www.unicode.org/copyright.html
 -->
 
 	
-		
+		
 		
 	
 	
@@ -44,6 +44,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Bodo
 			bs
 			Katala
+			Chakma
 			Chechen
 			Cebuano
 			Chiga
@@ -66,7 +67,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			Yunani
 			Inggris
 			Inggris (Britania)
-			Inggris (AS)
 			Esperanto
 			Spanyol
 			Spanyol (Amerika Latin)
@@ -243,10 +243,14 @@ terms of use, see http://www.unicode.org/copyright.html
 			Yiddish
 			Yoruba
 			Kanton
+			Tyonghwa, Kanton
 			Tamazight Moroko Standar
 			Tyonghwa
+			Tyonghwa, Mandarin
 			Tyonghwa (Gampang)
+			Tyonghwa Mandarin (Ringkes)
 			Tyonghwa (Tradisional)
+			Tyonghwa Mandarin (Tradisional)
 			Zulu
 			Konten tanpa linguistik
 		
@@ -287,6 +291,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 			
+			
 			
 			
 			
@@ -353,7 +358,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Bahrain
 			Burundi
 			Bénin
-			Saint Barthélémi
+			Saint Barthélémi
 			Bermuda
 			Brunéi
 			Bolivia
@@ -409,7 +414,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Fiji
 			Kapuloan Falkland
 			Kapuloan Falkland (Islas Malvinas)
-			Féderasi Mikronésia
+			Féderasi Mikronésia
 			Kapuloan Faro
 			Prancis
 			Gabon
@@ -425,8 +430,8 @@ terms of use, see http://www.unicode.org/copyright.html
 			Gambia
 			Guinea
 			Guadélup
-			Guinéa Katulistiwa
-			Grikenlan
+			Guinéa Katulistiwa
+			Grikenlan
 			Georgia Kidul lan Kapuloan Sandwich Kidul
 			Guatémala
 			Guam
@@ -459,7 +464,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Kamboja
 			Kiribati
 			Komoro
-			Saint Kits lan Nèvis
+			Saint Kits lan Nèvis
 			Koréa Lèr
 			Koréa Kidul
 			Kuwait
@@ -484,12 +489,11 @@ terms of use, see http://www.unicode.org/copyright.html
 			Madagaskar
 			Kapuloan Marshall
 			Makédonia
-			Républik Makédonia Lor
 			Mali
 			Myanmar (Burma)
 			Mongolia
 			Laladan Administratif Astamiwa Makau
-			Macau
+			Macau
 			Kapuloan Mariana Lor
 			Martinik
 			Mauritania
@@ -521,7 +525,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Pilipina
 			Pakistan
 			Polen
-			Saint Pièr lan Mikuélon
+			Saint Pièr lan Mikuélon
 			Kapuloan Pitcairn
 			Puèrto Riko
 			Tlatah Palèstina
@@ -533,7 +537,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Oseania Paling Njaba
 			Réunion
 			Ruméni
-			Sèrbi
+			Sèrbi
 			Rusia
 			Rwanda
 			Arab Saudi
@@ -542,7 +546,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Sudan
 			Swèdhen
 			Singapura
-			Saint Héléna
+			Saint Héléna
 			Slovénia
 			Svalbard lan Jan Mayen
 			Slowak
@@ -557,6 +561,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Sint Martén
 			Suriah
 			Swasiland
+			(Swasiland)
 			Tristan da Cunha
 			Turks lan Kapuloan Kaikos
 			Chad
@@ -584,7 +589,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Uruguay
 			Usbèkistan
 			Kutha Vatikan
-			Saint Vinsen lan Grénadin
+			Saint Vinsen lan Grénadin
 			Vénésuéla
 			Kapuloan Virgin Britania
 			Kapuloan Virgin Amérika
@@ -592,6 +597,8 @@ terms of use, see http://www.unicode.org/copyright.html
 			Vanuatu
 			Wallis lan Futuna
 			Samoa
+			Logat Semu
+			Rong Arah Semu
 			Kosovo
 			Yaman
 			Mayotte
@@ -651,8 +658,8 @@ terms of use, see http://www.unicode.org/copyright.html
 			Digit Gujarat
 			Digit Gurmukhi
 			Angka Desimal Mandarin
-			Angka Mandarin Prasaja
-			Angka Finansial Mandarin Prasaja
+			Angka Mandarin Ringkes
+			Angka Finansial Mandarin Ringkes
 			Angka Mandarin Tradisional
 			Angka Finansial Mandarin Tradisional
 			Angka Ibrani
@@ -694,8 +701,6 @@ terms of use, see http://www.unicode.org/copyright.html
 		[a â å b c d e é è ê g h i ì j k l m n o ò p r s t u ù w y]
 		[f q v x z]
 		[A Â Å B C D E É È Ê G H I Ì J K L M N O Ò P R S T U Ù W Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -704,28 +709,14 @@ terms of use, see http://www.unicode.org/copyright.html
 		{0} … {1}
 		?
 		
-			[\--/]
 			[\:∶]
 		
 		
-			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
-			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
-		
-		
-			[,٫︐﹐，]
-			[.․﹒．｡]
 		
 	
 	
@@ -781,13 +772,8 @@ terms of use, see http://www.unicode.org/copyright.html
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
 						d
 						ccc
-						E h:mm B
-						E h:mm:ss B
 						E, d
 						E h:mm a
 						E HH:mm
@@ -825,18 +811,47 @@ terms of use, see http://www.unicode.org/copyright.html
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM, y G
+							d MMM, y G – d MMM, y G
+							d MMM – d MMM, y G
+							d MMM, y – d MMM, y G
+						
+						
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y G – E, d MMM, y G
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y – E, d MMM, y G
+						
 						
 							MM – MM
 						
@@ -991,7 +1006,7 @@ terms of use, see http://www.unicode.org/copyright.html
 				
 					
 						
-							Ahd
+							Ahad
 							Sen
 							Sel
 							Rab
@@ -1009,7 +1024,7 @@ terms of use, see http://www.unicode.org/copyright.html
 							S
 						
 						
-							Ahd
+							Ahad
 							Sen
 							Sel
 							Rab
@@ -1029,7 +1044,7 @@ terms of use, see http://www.unicode.org/copyright.html
 					
 					
 						
-							Ahd
+							Ahad
 							Sen
 							Sel
 							Rab
@@ -1047,7 +1062,7 @@ terms of use, see http://www.unicode.org/copyright.html
 							S
 						
 						
-							Ahd
+							Ahad
 							Sen
 							Sel
 							Rab
@@ -1218,13 +1233,8 @@ terms of use, see http://www.unicode.org/copyright.html
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
 						d
 						ccc
-						E h:mm B
-						E h:mm:ss B
 						E, d
 						E h:mm a
 						E HH:mm
@@ -1251,7 +1261,7 @@ terms of use, see http://www.unicode.org/copyright.html
 						d MMM
 						E, d MMM
 						d MMMM
-						'pekan' W 'saka' MMMM
+						'pekan' W 'ing' MMMM
 						mm:ss
 						y
 						MM-y
@@ -1263,25 +1273,54 @@ terms of use, see http://www.unicode.org/copyright.html
 						MMMM y
 						QQQ y
 						QQQQ y
-						'pekan' w 'saka' Y
+						'pekan' w 'ing' Y
 					
 					
 						{0} {1}
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
+						
+							y G– y G
+							y–y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM, y G
+							d MMM, y G – d MMM, y G
+							d MMM – d MMM, y G
+							d MMM, y – d MMM, y G
+						
+						
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y G – E, d MMM, y G
+							E, d MMM – E, d MMM, y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h a – h a
 							h – h a
@@ -1379,12 +1418,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				era
 			
-			
-				era
-			
-			
-				era
-			
 			
 				taun
 				taun wingi
@@ -1399,53 +1432,44 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				taun
-				
-					ing {0} tn
-				
-				
-					{0} tn kepungkur
-				
 			
 			
 				taun
-				taun wingi
-				taun iki
-				taun ngarep
 				
-					+{0} y
+					ing {0} taun
 				
 				
-					-{0} y
+					{0} taun kepungkur
 				
 			
 			
 				triwulan
-				kwartal wingi
-				kwartal iki
-				kwartal ngarep
+				triwulan wingi
+				triwulan iki
+				triwulan ngarep
 				
-					ing {0} kwartal
+					ing {0} triwulan
 				
 				
-					{0} kwartal kepungkur
+					{0} triwulan kepungkur
 				
 			
 			
 				triwulan
 				
-					ing {0} kwrt.
+					ing {0} triwulan
 				
 				
-					{0} kwrt. kepungkur
+					{0} triwulan kepungkur
 				
 			
 			
 				triwulan
 				
-					+{0} Q
+					ing {0} triwulan
 				
 				
-					-{0} Q
+					{0} triwulan kepungkur
 				
 			
 			
@@ -1462,20 +1486,14 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				sasi
-				
-					ing {0} s.
-				
-				
-					{0} s. kepungkur
-				
 			
 			
 				sasi
 				
-					+{0} m
+					ing {0} sasi
 				
 				
-					-{0} m
+					{0} sasi kepungkur
 				
 			
 			
@@ -1484,49 +1502,46 @@ terms of use, see http://www.unicode.org/copyright.html
 				pekan iki
 				pekan ngarep
 				
-					ing {0} minggu
+					ing {0} pekan
 				
 				
-					{0} minggu kepungkur
+					{0} pekan kepungkur
 				
 				pekan kaping {0}
 			
 			
 				pekan
 				
-					ing {0} mgg.
+					ing {0} pekan
 				
 				
-					{0} mgg. kepungkur
+					{0} pekan kepungkur
 				
 				pekan kaping {0}
 			
 			
 				pekan
-				pekan wingi
-				pekan iki
-				pekan ngarep
 				
-					+{0} w
+					ing {0} pekan
 				
 				
-					-{0} w
+					{0} pekan kepungkur
 				
 				pekan kaping {0}
 			
 			
-				minggu jroning sesasi
+				pekan jroning sesasi
 			
 			
-				mgu ing sasi
+				pekan jroning sasi
 			
 			
-				mgu ing sasi
+				pekan jroning sasi
 			
 			
 				dino
 				wingi
-				saiki
+				dino iki
 				sesuk
 				
 					ing {0} dina
@@ -1538,32 +1553,26 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				dino
 				wingi
-				saiki
+				dino iki
 				sesuk
-				
-					-{0} d
-				
 			
 			
 				dino
 				wingi
-				saiki
+				dino iki
 				sesuk
-				
-					+{0} d
-				
 				
-					-{0} d
+					{0} dino kepungkur
 				
 			
 			
-				dina jroning setaun
+				dina jroning taun
 			
 			
-				dina ing taun
+				dina jroning taun
 			
 			
-				dn ing taun
+				dina jroning taun
 			
 			
 				dino sepekan
@@ -1571,11 +1580,8 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				dina jroning sasi
 			
-			
-				dn jroning sasi
-			
 			
-				Weekday Of Month
+				dino jroning sasi
 			
 			
 				Ahad wingi
@@ -1599,17 +1605,6 @@ terms of use, see http://www.unicode.org/copyright.html
 					{0} Ahad kepungkur
 				
 			
-			
-				Ah wingi
-				Ah iki
-				Ah ngarep
-				
-					ing {0} Ah
-				
-				
-					{0} Ah kepungkur
-				
-			
 			
 				Senèn wingi
 				Senèn iki
@@ -1623,7 +1618,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				Sen. wingi
-				Sen iki
+				Sen. iki
 				Sen. ngarep
 				
 					ing {0} Sen.
@@ -1665,17 +1660,6 @@ terms of use, see http://www.unicode.org/copyright.html
 					{0} Sel. kepungkur
 				
 			
-			
-				Sl wingi
-				Sl iki
-				Sl ngarep
-				
-					ing {0} Sl
-				
-				
-					{0} Sl kepungkur
-				
-			
 			
 				Rebo wingi
 				Rebo iki
@@ -1698,17 +1682,6 @@ terms of use, see http://www.unicode.org/copyright.html
 					{0} Reb. kepungkur
 				
 			
-			
-				R wingi
-				R iki
-				R ngarep
-				
-					ing {0} R
-				
-				
-					{0} R kepungkur
-				
-			
 			
 				Kemis wingi
 				Kemis iki
@@ -1731,17 +1704,6 @@ terms of use, see http://www.unicode.org/copyright.html
 					{0} Kms. kepungkur
 				
 			
-			
-				K wingi
-				K iki
-				K ngarep
-				
-					ing {0} K
-				
-				
-					{0} K kepungkur
-				
-			
 			
 				Jemuwah wingi
 				Jemuwah iki
@@ -1764,17 +1726,6 @@ terms of use, see http://www.unicode.org/copyright.html
 					{0} Jem. kepungkur
 				
 			
-			
-				J wingi
-				J iki
-				J ngarep
-				
-					ing {0} J
-				
-				
-					{0} J kepungkur
-				
-			
 			
 				Setu wingi
 				Setu iki
@@ -1820,52 +1771,47 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				jam
-				
-					+{0} h
-				
-				
-					-{0} h
-				
 			
 			
 				jam
 				
-					+{0} h
+					ing {0} jam
 				
 				
-					-{0} h
+					{0} jam kepungkur
 				
 			
 			
 				menit
 				menit iki
 				
-					ing {0} mnt
+					ing {0} menit
 				
 				
-					{0} men. kepungkur
+					{0} menit kepungkur
 				
 			
 			
 				menit
 				
-					+{0} min
+					ing {0} menit
 				
 				
-					-{0} min
+					{0} menit kepungkur
 				
 			
 			
 				menit
 				
-					+{0} min
+					ing {0} menit
 				
 				
-					-{0} min
+					{0} menit kepungkur
 				
 			
 			
 				detik
+				saiki
 				
 					ing {0} detik
 				
@@ -1875,20 +1821,14 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				detik
-				
-					ing {0} dtk
-				
-				
-					{0} det. kepungkur
-				
 			
 			
 				detik
 				
-					+{0} s
+					ing {0} detik
 				
 				
-					-{0} s
+					{0} detik kepungkur
 				
 			
 			
@@ -1905,7 +1845,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			{1} ({0})
 			
 				
-					Wektu Kordinat Universal
+					Wektu Universal Kakoordhinasi
 				
 			
 			
@@ -2574,6 +2514,9 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				Aqtobe
 			
+			
+				Kostanai
+			
 			
 				Qyzylorda
 			
@@ -2941,7 +2884,7 @@ terms of use, see http://www.unicode.org/copyright.html
 				Singapura
 			
 			
-				Saint Helena
+				Santa Helena
 			
 			
 				Ljubljana
@@ -3380,7 +3323,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				
-					Wektu Standar Chamorro
+					Wektu Chamorro
 				
 			
 			
@@ -3930,7 +3873,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				
-					Wektu Standar Singapura
+					Wektu Singapura
 				
 			
 			
@@ -4075,13 +4018,10 @@ terms of use, see http://www.unicode.org/copyright.html
 		
 			java
 		
-		1
 		
 			,
 			.
 			%
-			+
-			-
 			E
 			×
 			‰
@@ -4089,11 +4029,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			NaN
 		
 		
-			
-				
-					#,##0.###
-				
-			
 			
 				
 					0 èwu
@@ -4149,15 +4084,15 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				
-					¤0K
-					¤00K
-					¤000K
-					¤0M
-					¤00M
-					¤000M
-					¤0B
-					¤00B
-					¤000B
+					¤0È
+					¤00È
+					¤000È
+					¤0Y
+					¤00Y
+					¤000Y
+					¤0M
+					¤00M
+					¤000M
 					¤0T
 					¤00T
 					¤000T
@@ -4169,509 +4104,363 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				Dirham Uni Emirat Arab
 				Dirham Uni Emirat Arab
-				AED
 			
 			
 				Afghani Afganistan
 				Afghani Afganistan
-				AFN
 			
 			
 				Lek Albania
 				Lek Albania
-				ALL
 			
 			
 				Dram Armenia
 				Dram Armenia
-				AMD
 			
 			
 				Guilder Antilla Walanda
 				Guilder Antilla Walanda
-				ANG
 			
 			
 				Kwanza Angola
 				Kwanza Angola
-				AOA
-				Kz
 			
 			
 				Peso Argentina
 				Peso Argentina
-				ARS
-				$
 			
 			
 				Dolar Australia
 				Dolar Australia
-				A$
-				$
 			
 			
 				Florin Aruban
 				Florin Aruban
-				AWG
 			
 			
 				Manat Azerbaijan
 				Manat Azerbaijan
-				AZN
 			
 			
 				Mark Konvertibel Bosnia-Herzegovina
 				Mark Konvertibel Bosnia-Herzegovina
-				BAM
-				KM
 			
 			
 				Dolar Barbadian
 				Dolar Barbadian
-				BBD
-				$
 			
 			
 				Taka Bangladesh
 				Taka Bangladesh
-				BDT
-				৳
 			
 			
 				Lev Bulgaria
 				Lev Bulgaria
-				BGN
 			
 			
 				Bahrain Dinar
 				Bahrain Dinar
-				BHD
 			
 			
 				Franc Burundi
 				Franc Burundi
-				BIF
 			
 			
 				Dolar Bermuda
 				Dolar Bermuda
-				BMD
-				$
 			
 			
 				Dolar Brunai
 				Dolar Brunai
-				BND
-				$
 			
 			
 				Boliviano Bolivia
 				Boliviano Bolivia
-				BOB
-				Bs
 			
 			
 				Real Brasil
 				Real Brasil
-				R$
-				R$
 			
 			
 				Dolar Bahamian
 				Dolar Bahamian
-				BSD
-				$
 			
 			
 				Ngultrum Bhutan
 				Ngultrum Bhutan
-				BTN
 			
 			
 				Pula Botswana
 				Pula Botswana
-				BWP
-				P
 			
 			
 				Ruble Belarusia
 				Ruble Belarusia
-				BYN
-				р.
 			
 			
 				Dolar Belise
 				Dolar Belise
-				BZD
-				$
 			
 			
 				Dolar Kanada
 				Dolar Kanada
-				CA$
-				$
 			
 			
 				Franc Kongo
 				Franc Kongo
-				CDF
 			
 			
 				Franc Swiss
 				Franc Swiss
-				CHF
 			
 			
 				Peso Chili
 				Peso Chili
-				CLP
-				$
 			
 			
-				Yuan Cina (Jaban Rangkah)
-				Yuan Cina (Jaban Rangkah)
-				CNH
+				Yuan Tyongkok (Jaban Rangkah)
+				Yuan Tyongkok (Jaban Rangkah)
 			
 			
-				Yuan Cina
-				Yuan Cina
-				CN¥
-				¥
+				Yuan Tyongkok
+				Yuan Tyongkok
 			
 			
 				Peso Kolumbia
 				Peso Kolumbia
-				COP
-				$
 			
 			
 				Colon Kosta Rika
 				Colon Kosta Rika
-				CRC
-				₡
 			
 			
 				Peso Konvertibel Kuba
 				Peso Konvertibel Kuba
-				CUC
-				$
 			
 			
 				Peso Kuba
 				Peso Kuba
-				CUP
-				$
 			
 			
 				Escudo Tanjung Verde
 				Escudo Tanjung Verde
-				CVE
 			
 			
 				Koruna Czech
 				Koruna Czech
-				CZK
-				Kč
 			
 			
 				Franc Djibouti
 				Franc Djibouti
-				DJF
 			
 			
 				Krone Denmark
 				Krone Denmark
-				DKK
-				kr
 			
 			
 				Peso Dominika
 				Peso Dominika
-				DOP
-				$
 			
 			
 				Dinar Algeria
 				Dinar Algeria
-				DZD
 			
 			
 				Pound Mesir
 				Pound Mesir
-				EGP
-				E£
 			
 			
 				Nakfa Eritrea
 				Nakfa Eritrea
-				ERN
 			
 			
 				Birr Ethiopia
 				Birr Ethiopia
-				ETB
 			
 			
 				Euro
 				Euro
-				€
-				€
 			
 			
 				Dolar Fiji
 				Dolar Fiji
-				FJD
-				$
 			
 			
 				Pound Kepuloan Falkland
 				Pound Kepuloan Falkland
-				FKP
-				£
 			
 			
 				Pound Inggris
 				Pound Inggris
-				£
-				£
 			
 			
 				Lari Georgia
 				Lari Georgia
-				GEL
-				₾
 			
 			
 				Cedi Ghana
 				Cedi Ghana
-				GHS
 			
 			
 				Pound Gibraltar
 				Pound Gibraltar
-				GIP
-				£
 			
 			
 				Dalasi Gambia
 				Dalasi Gambia
-				GMD
 			
 			
 				Franc Guinea
 				Franc Guinea
-				GNF
-				FG
 			
 			
 				Quetzal Guatemala
 				Quetzal Guatemala
-				GTQ
-				Q
 			
 			
 				Dolar Guyana
 				Dolar Guyana
-				GYD
-				$
 			
 			
 				Dolar Hong Kong
 				Dolar Hong Kong
-				HK$
-				$
 			
 			
 				Lempira Honduras
 				Lempira Honduras
-				HNL
-				L
 			
 			
 				Kuna Kroasia
 				Kuna Kroasia
-				HRK
-				kn
 			
 			
 				Gourde Haiti
 				Gourde Haiti
-				HTG
 			
 			
 				Forint Hungaria
 				Forint Hungaria
-				HUF
-				Ft
 			
 			
 				Rupiah Indonesia
 				Rupiah Indonesia
 				Rp
-				Rp
 			
 			
 				Shekel Anyar Israel
 				Shekel Anyar Israel
-				₪
-				₪
 			
 			
 				Rupee India
 				Rupee India
-				₹
-				₹
 			
 			
 				Dinar Irak
 				Dinar Irak
-				IQD
 			
 			
 				Rial Iran
 				Rial Iran
-				IRR
 			
 			
 				Krona Islandia
 				Krona Islandia
-				ISK
-				kr
 			
 			
 				Dolar Jamaika
 				Dolar Jamaika
-				JMD
-				$
 			
 			
 				Dinar Yordania
 				Dinar Yordania
-				JOD
 			
 			
 				Yen Jepang
 				Yen Jepang
-				JP¥
-				¥
 			
 			
 				Shilling Kenya
 				Shilling Kenya
-				KES
 			
 			
 				Som Kirgistan
 				Som Kirgistan
-				KGS
 			
 			
 				Riel Kamboja
 				Riel Kamboja
-				KHR
-				៛
 			
 			
 				Franc Komoro
 				Franc Komoro
-				KMF
-				CF
 			
 			
 				Won Korea Lor
 				Won Korea Lor
-				KPW
-				₩
 			
 			
 				Won Korea Kidul
 				Won Korea Kidul
-				₩
-				₩
 			
 			
 				Dinar Kuwait
 				Dinar Kuwait
-				KWD
 			
 			
 				Dolar Kepuloan Caiman
 				Dolar Kepuloan Caiman
-				KYD
-				$
 			
 			
 				Tenge Kasakhstan
 				Tenge Kasakhstan
-				KZT
-				₸
 			
 			
 				Kip Laos
 				Kip Laos
-				LAK
-				₭
 			
 			
 				Pound Libanon
 				Pound Libanon
-				LBP
-				L£
 			
 			
 				Rupee Sri Lanka
 				Rupee Sri Lanka
-				LKR
-				Rs
 			
 			
 				Dolar Liberia
 				Dolar Liberia
-				LRD
-				$
 			
 			
 				Dinar Libya
 				Dinar Libya
-				LYD
 			
 			
 				Dirham Maroko
 				Dirham Moroko
-				MAD
 			
 			
 				Leu Moldova
 				Leu Moldova
-				MDL
 			
 			
 				Ariary Malagasi
 				Ariary Malagasi
-				MGA
-				Ar
 			
 			
 				Denar Masedonia
 				Denar Masedonia
-				MKD
 			
 			
 				Kyat Myanmar
 				Kyat Myanmar
-				MMK
-				K
 			
 			
 				Tugrik Mongol
 				Tugrik Mongol
-				MNT
-				₮
 			
 			
 				Pataca Macau
 				MOP
-				MOP
 			
 			
 				Ouguiya Mauritania (1973 - 2017)
@@ -4681,305 +4470,218 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				Ouguiya Mauritania
 				Ouguiya Mauritania
-				MRU
 			
 			
 				Rupee Mauritius
 				Rupee Mauritius
-				MUR
-				Rs
 			
 			
 				Rufiyaa Maladewa
 				Rufiyaa Maladewa
-				MVR
 			
 			
 				Kwacha Malawi
 				Kwacha Malawi
-				MWK
 			
 			
 				Peso Meksiko
 				Peso Meksiko
-				MX$
-				$
 			
 			
 				Ringgit Malaysia
 				Ringgit Malaysia
-				MYR
-				RM
 			
 			
 				Metical Mosambik
 				Metical Mosambik
-				MZN
 			
 			
 				Dolar Namibia
 				Dolar Namibia
-				NAD
-				$
 			
 			
 				Naira Nigeria
 				Naira Nigeria
-				NGN
-				₦
 			
 			
 				Cordoba Nikaragua
 				Cordoba Nikaragua
-				NIO
-				C$
 			
 			
 				Krone Norwegia
 				Krone Norwegia
-				NOK
-				kr
 			
 			
 				Rupee Nepal
 				Rupee Nepal
-				NPR
-				Rs
 			
 			
 				Dolar Selandia Anyar
 				Dolar Selandia Anyar
-				NZ$
-				$
 			
 			
 				Rial Oman
 				Rial Oman
-				OMR
 			
 			
 				Balboa Panama
 				Balboa Panama
-				PAB
 			
 			
 				Sol Peru
 				Sol Peru
-				PEN
 			
 			
 				Kina Papua Nugini
 				Kina Papua Nugini
-				PGK
 			
 			
 				Piso Filipina
 				Piso Filipina
-				PHP
-				₱
 			
 			
 				Rupee Pakistan
 				Rupee Pakistan
-				PKR
-				Rs
 			
 			
 				Zloty Polandia
 				Zloty Polandia
-				PLN
-				zł
 			
 			
 				Guarani Paraguay
 				Guarani Paraguay
-				PYG
-				₲
 			
 			
 				Rial Qatar
 				Rial Qatar
-				QAR
 			
 			
 				Leu Rumania
 				Leu Rumania
-				RON
-				lei
 			
 			
 				Dinar Serbia
 				Dinar Serbia
-				RSD
 			
 			
 				Rubel Rusia
 				Rubel Rusia
-				RUB
-				₽
 			
 			
 				Franc Rwanda
 				Franc Rwanda
-				RWF
-				RF
 			
 			
 				Riyal Saudi
 				Riyal Saudi
-				SAR
 			
 			
 				Dolar Kepuloan Solomon
 				Dolar Kepuloan Solomon
-				SBD
-				$
 			
 			
 				Rupee Seichelles
 				Rupee Seichelles
-				SCR
 			
 			
 				Pound Sudan
 				Pound Sudan
-				SDG
 			
 			
 				Krona Swedia
 				Krona Swedia
-				SEK
-				kr
 			
 			
 				Dolar Singapura
 				Dolar Singapura
-				SGD
-				$
 			
 			
 				Pound Santa Helena
 				Pound Santa Helena
-				SHP
-				£
 			
 			
 				Leone Sierra Leone
 				Leone Sierra Leone
-				SLL
 			
 			
 				Shilling Somalia
 				Shilling Somalia
-				SOS
 			
 			
 				Dolar Suriname
 				Dolar Suriname
-				SRD
-				$
 			
 			
 				Pound Sudan Kidul
 				Pound Sudan Kidul
-				SSP
-				£
 			
 			
 				Dobra Sao Tome lan Principe
 				Dobra Sao Tome lan Principe
-				STN
-				Db
 			
 			
 				Pound Siria
 				Pound Siria
-				SYP
-				£
 			
 			
 				Lilangeni Swasi
 				Lilangeni Swasi
-				SZL
 			
 			
 				Baht Thai
 				Baht Thai
-				THB
-				฿
 			
 			
 				Somoni Tajikistan
 				Somoni Tajikistan
-				TJS
 			
 			
 				Manat Turmenistan
 				Manat Turmenistan
-				TMT
 			
 			
 				Dinar Tunisia
 				Dinar Tunisia
-				TND
 			
 			
 				Paʻanga Tonga
 				Paʻanga Tonga
-				TOP
-				T$
 			
 			
 				Lira Turki
 				Lira Turki
-				TRY
-				₺
-				TL
 			
 			
 				Dolar Trinidad lan Tobago
 				Dolar Trinidad lan Tobago
-				TTD
-				$
 			
 			
 				Dolar Anyar Taiwan
 				Dolar Anyar Taiwan
-				NT$
-				$
 			
 			
 				Shilling Tansania
 				Shilling Tansania
-				TZS
 			
 			
 				Hryvnia Ukrania
 				Hryvnia Ukrania
-				UAH
-				₴
 			
 			
 				Shilling Uganda
 				Shilling Uganda
-				UGX
 			
 			
 				Dolar Amerika Serikat
 				Dolar Amerika Serikat
-				US$
-				$
 			
 			
 				Peso Uruguay
 				Peso Uruguay
-				UYU
-				$
 			
 			
 				Som Usbekistan
 				Som Usbekistan
-				UZS
 			
 			
 				Bolivar Venezuela (2008 - 2018)
@@ -4990,44 +4692,34 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				Bolivar Venezuela
 				Bolivar Venezuela
-				VES
 			
 			
 				Dong Vietnam
 				Dong Vietnam
-				₫
-				₫
 			
 			
 				Vatu Vanuatu
 				Vatu Vanuatu
-				VUV
 			
 			
 				Tala Samoa
 				Tala Samoa
-				WST
 			
 			
 				CFA Franc Afrika Tengah
 				CFA Franc Afrika Tengah
-				FCFA
 			
 			
 				Dolar Karibia Wetan
 				Dolar Karibia Wetan
-				EC$
-				$
 			
 			
 				CFA Franc Afrika Kulon
 				CFA Franc Afrika Kulon
-				CFA
 			
 			
 				Franc CFP
 				Franc CFP
-				CFPF
 			
 			
 				Dhuwit Ora Dikenali
@@ -5036,25 +4728,18 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 				Rial Yaman
 				Rial Yaman
-				YER
 			
 			
 				Rand Afrika Kidul
 				Rand Afrika Kidul
-				ZAR
-				R
 			
 			
 				Kwacha Sambia
 				Kwacha Sambia
-				ZMW
-				ZK
 			
 		
 		
-			~{0}
 			⩾{0}
-			≤{0}
 			{0} – {1}
 		
 		
@@ -5136,10 +4821,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} inci persegi
 				{0} saben inci persegi
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -5166,10 +4847,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				permiriad
-			
-			
-				mol
-				{0} mol
+				{0} permiriad
 			
 			
 				liter saben kilometer
@@ -5235,6 +4913,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				abad
 				{0} abad
 			
+			
+				dasawarsa
+				{0} dasawarsa
+			
 			
 				taun
 				{0} taun
@@ -5246,14 +4928,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} saben sasi
 			
 			
-				pekan
-				{0} pekan
-				{0} saben pekan
+				peken
+				{0} peken
+				{0} saben peken
 			
 			
-				dino
-				{0} dino
-				{0} saben dino
+				dina
+				{0} dina
+				{0} saben dina
 			
 			
 				jam
@@ -5324,15 +5006,23 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				elektronvolt
+				{0} elektronvolt
 			
 			
 				takeran panas Britania
+				{0} takeran panas Britania
+			
+			
+				takeran panas AS
+				{0} takeran panas AS
 			
 			
 				pon gaya
+				{0} pon gaya
 			
 			
 				newton
+				{0} newton
 			
 			
 				gigahet
@@ -5350,6 +5040,25 @@ terms of use, see http://www.unicode.org/copyright.html
 				het
 				{0} het
 			
+			
+				tipografi em
+			
+			
+				piksel
+				{0} piksel
+			
+			
+				megapiksel
+				{0} megapiksel
+			
+			
+				titek saben sentimeter
+				{0} titek saben sentimeter
+			
+			
+				titek saben inci
+				{0} titek saben inci
+			
 			
 				kilometer
 				{0} kilometer
@@ -5428,14 +5137,16 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} poin
 			
 			
-				solar radii
+				radii srengenge
+				{0} radii srengenge
 			
 			
 				luk
 				{0} luk
 			
 			
-				luminositas srengéngé
+				luminositas srengenge
+				{0} luminositas srengenge
 			
 			
 				metrik ton
@@ -5483,12 +5194,15 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				dalton
+				{0} dalton
 			
 			
 				massa Bumi
+				{0} massa Bumi
 			
 			
-				massa matahari
+				massa srengenge
+				{0} massa srengenge
 			
 			
 				gigawatt
@@ -5514,10 +5228,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				tenogo jaran
 				{0} tenogo jaran
 			
-			
-				hektopaskal
-				{0} hektopaskal
-			
 			
 				milimeter saka raksa
 				{0} milimeter saka raksa
@@ -5538,6 +5248,22 @@ terms of use, see http://www.unicode.org/copyright.html
 				atmosfer
 				{0} atmosfer
 			
+			
+				paskal
+				{0} paskal
+			
+			
+				hektopaskal
+				{0} hektopaskal
+			
+			
+				kilopaskal
+				{0} kilopaskal
+			
+			
+				megapaskal
+				{0} megapaskal
+			
 			
 				kilometer saben jam
 				{0} kilometer saben jam
@@ -5570,6 +5296,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				kelvin
 				{0} kelvin
 			
+			
+				pon-kaki
+				{0} pon-kaki
+			
+			
+				newton-meter
+				{0} newton-meter
+			
 			
 				kilometer kubik
 				{0} kilometer kubik
@@ -5663,6 +5397,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				ons banyu
 				{0} ons banyu
 			
+			
+				Imp. ons banyu
+				{0} Imp. ons banyu
+			
 			
 				sendok mangan
 				{0} sendok mangan
@@ -5673,6 +5411,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				barel
+				{0} barel
 			
 			
 				arah kardinal
@@ -5755,10 +5494,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} inci²
 				{0}/inci²
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
 				{0} kt
@@ -5785,11 +5520,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				permiriad
-				{0}‱
-			
-			
-				mol
-				{0} mol
 			
 			
 				liter/km
@@ -5855,6 +5585,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				abad
 				{0} abad
 			
+			
+				dsw
+				{0} dsw
+			
 			
 				taun
 				{0} taun
@@ -5866,14 +5600,13 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0}/sasi
 			
 			
-				pekan
-				{0} pekan
-				{0}/pekan
+				peken
+				{0} peken
+				{0}/peken
 			
 			
-				dino
-				{0} dino
-				{0}/dino
+				dina
+				{0} dina
 			
 			
 				jam
@@ -5944,19 +5677,19 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				elektronvolt
-				{0} eV
 			
 			
 				BTU
-				{0} Btu
+			
+			
+				takeran panas AS
+				{0} takeran panas AS
 			
 			
 				pon gaya
-				{0} lbf
 			
 			
 				newton
-				{0} N
 			
 			
 				GHz
@@ -5974,6 +5707,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				Hz
 				{0} Hz
 			
+			
+				tscm
+				{0} tscm
+			
+			
+				tsi
+				{0} tsi
+			
 			
 				km
 				{0} km
@@ -6052,16 +5793,14 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} p
 			
 			
-				solar radii
-				{0} R☉
+				radii srengenge
 			
 			
 				luk
 				{0} luk
 			
 			
-				luminositas srengéngé
-				{0} L☉
+				luminositas srengenge
 			
 			
 				metrik ton
@@ -6109,15 +5848,12 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				dalton
-				{0} Da
 			
 			
 				massa Bumi
-				{0} M⊕
 			
 			
-				massa matahari
-				{0} M☉
+				massa srengenge
 			
 			
 				GW
@@ -6143,10 +5879,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				tenogo jaran
 				{0} tenogo jaran
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6167,13 +5899,9 @@ terms of use, see http://www.unicode.org/copyright.html
 				atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
 			
 			
 				km/jam
@@ -6208,12 +5936,8 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} K
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
+				pon-kaki
+				{0} pon-kaki
 			
 			
 				km³
@@ -6309,8 +6033,8 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} ons banyu
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
+				Imp. ons banyu
+				{0} Imp. ons banyu
 			
 			
 				sdk mgn
@@ -6322,7 +6046,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			
 			
 				barel
-				{0} bbl
 			
 			
 				arah
@@ -6353,12 +6076,12 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} sasi
 			
 			
-				pekan
-				{0} pekan
+				peken
+				{0} peken
 			
 			
-				dino
-				{0} dino
+				dina
+				{0}d
 			
 			
 				jam
@@ -6443,17 +6166,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			{0}, utowo {1}
 			{0} utowo {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, utowo {1}
-			{0} utowo {1}
-		
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, utowo {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
@@ -6487,7 +6199,6 @@ terms of use, see http://www.unicode.org/copyright.html
 	
 	
 		{0} — kabeh
-		{0}: {1}
 		{0} — kompatibilitas
 		{0} — ketutup
 		{0} — didawakake
@@ -6525,7 +6236,7 @@ terms of use, see http://www.unicode.org/copyright.html
 		varian amba setengah kebak
 		karakter Han
 		radikal Han
-		Hanzi (prasaja)
+		Hanzi (ringkes)
 		Hanzi (tradisional)
 		ati
 		skrip tradisional
@@ -6602,6 +6313,7 @@ terms of use, see http://www.unicode.org/copyright.html
 		rada dirapetake
 		rada dipadhetake
 		rada ciyut
+		lumrah
 		rada dijembarake
 		rada didawakake
 		rada amba
diff --git a/make/data/cldr/common/main/jv_ID.xml b/make/data/cldr/common/main/jv_ID.xml
index 8a36e6f3d78..8a538e5ad64 100644
--- a/make/data/cldr/common/main/jv_ID.xml
+++ b/make/data/cldr/common/main/jv_ID.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ka.xml b/make/data/cldr/common/main/ka.xml
index eac50bc926e..2d1b8cd1bd2 100644
--- a/make/data/cldr/common/main/ka.xml
+++ b/make/data/cldr/common/main/ka.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -78,6 +78,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ბილინი
 			კატალანური
 			კაიუგა
+			ჩაკმა
 			ჩეჩნური
 			სებუანო
 			ჩიგა
@@ -489,12 +490,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			იდიში
 			იორუბა
 			კანტონური
+			ჩინური, კანტონური
 			ბლისსიმბოლოები
 			ზენაგა
 			სტანდარტული მაროკოული ტამაზიგხტი
 			ჩინური
+			ჩინური, მანდარინი
 			გამარტივებული ჩინური
+			გამარტივებული ჩინური მანდარინი
 			ტრადიციული ჩინური
+			ტრადიციული ჩინური მანდარინი
 			ზულუ
 			ზუნი
 			ლინგვისტური შიგთავსი არ არის
@@ -854,8 +859,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			სენ-მარტენი
 			მადაგასკარი
 			მარშალის კუნძულები
-			მაკედონია
-			მაკედონია (ყოფილი იუგოსლავიის რესპუბლიკა მაკედონია)
+			ჩრდილოეთ მაკედონია
 			მალი
 			მიანმარი (ბირმა)
 			მონღოლეთი
@@ -965,6 +969,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ვანუატუ
 			უოლისი და ფუტუნა
 			სამოა
+			ფსევდო-აქცენტები
+			ფსევდო-ორმიმართულებიანი
 			კოსოვო
 			იემენი
 			მაიოტა
@@ -1156,8 +1162,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ]
 		[ⴀ ⴁ ⴂ ⴃ ⴄ ⴅ ⴆ ჱ ⴡ ⴇ ⴈ ⴉ ⴊ ⴋ ⴌ ჲ ⴢ ⴍ ⴎ ⴏ ⴐ ⴑ ⴒ ჳ ⴣ ⴓ ⴔ ⴕ ⴖ ⴗ ⴘ ⴙ ⴚ ⴛ ⴜ ⴝ ⴞ ჴ ⴤ ⴟ ⴠ ჵ ⴥ ჶ ჷ ჸ ჹ ჺ]
 		[ა ბ გ დ ე ვ ზ თ ი კ ლ მ ნ ო პ ჟ რ ს ტ უ ფ ქ ღ ყ შ ჩ ც ძ წ ჭ ხ ჯ ჰ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ჻ ' ‘ ‚ “ „ « » ( ) \[ \] \{ \} § @ * / \& # † ‡ ′ ″ №]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ჻ ' ‘ ‚ “ „ « » ( ) \[ \] \{ \} § @ * / \& # † ‡ ′ ″ №]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1284,35 +1290,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							GGGGG y-MM – y-MM
 							GGGGG y-MM – y-MM
 						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1674,7 +1651,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							შუაღამე
 							AM
 							შუადღე
-							შუადღ. შემდეგ
+							PM
 							დილა
 							ნაშუადღევი
 							საღამო
@@ -1795,8 +1772,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d MMM
 						E, d MMM
 						d MMMM
-						MMMM-ის კვირა W
-						MMMM-ის კვირა W
+						MMMMს კვირა W
+						MMMMს კვირა W
 						mm:ss
 						y
 						M.y
@@ -1832,40 +1809,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							G y – G y
 							G y–y
 						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2918,7 +2861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ანტიგუა
 			
 			
-				ანგილა
+				ანგილია
 			
 			
 				ტირანა
@@ -5068,7 +5011,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
+			latn
 			geor
 		
 		2
@@ -5077,6 +5022,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5085,6 +5032,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ათასი
@@ -5204,6 +5156,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				არაბთა გაერთიანებული საამიროების დირჰამი
 				არაბთა გაერთიანებული საამიროების დირჰამი
 				არაბთა გაერთიანებული საამიროების დირჰამი
+				AED
 			
 			
 				ავღანი (1927–2002)
@@ -5212,26 +5165,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ავღანური ავღანი
 				ავღანური ავღანი
 				ავღანური ავღანი
+				AFN
 			
 			
 				ალბანური ლეკი
 				ალბანური ლეკი
 				ალბანური ლეკი
+				ALL
 			
 			
 				სომხური დრამი
 				სომხური დრამი
 				სომხური დრამი
+				AMD
 			
 			
 				ნიდერლანდების ანტილების გულდენი
 				ნიდრელანდების ანტილიის გულდენი
 				ნიდრელანდების ანტილიის გულდენი
+				ANG
 			
 			
 				ანგოლური კვანზა
 				ანგოლური კვანზა
 				ანგოლური კვანზა
+				AOA
+				Kz
 			
 			
 				ანგოლური კვანზა (1977–1990)
@@ -5252,6 +5211,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				არგენტინული პესო
 				არგენტინული პესო
 				არგენტინული პესო
+				ARS
 				$
 			
 			
@@ -5268,6 +5228,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				არუბანული გულდენი
 				არუბანული გულდენი
 				არუბანული გულდენი
+				AWG
 			
 			
 				აზერბაიჯანული მანათი (1993–2006)
@@ -5276,6 +5237,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				აზერბაიჯანული მანათი
 				აზერბაიჯანული მანათი
 				აზერბაიჯანული მანათი
+				AZN
 			
 			
 				ბოსნია-ჰერცოგოვინას დინარი
@@ -5284,17 +5246,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ბოსნია და ჰერცოგოვინას კონვერტირებადი მარკა
 				ბოსნია და ჰერცოგოვინას კონვერტირებადი მარკა
 				ბოსნია და ჰერცოგოვინას კონვერტირებადი მარკა
+				BAM
+				KM
 			
 			
 				ბარბადოსული დოლარი
 				ბარბადოსული დოლარი
 				ბარბადოსული დოლარი
+				BBD
 				$
 			
 			
 				ბანგლადეშური ტაკა
 				ბანგლადეშური ტაკა
 				ბანგლადეშური ტაკა
+				BDT
 				৳
 			
 			
@@ -5313,33 +5279,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ბულგარული ლევი
 				ბულგარული ლევი
 				ბულგარული ლევი
+				BGN
 			
 			
 				ბაჰრეინული დინარი
 				ბაჰრეინული დინარი
 				ბაჰრეინული დინარი
+				BHD
 			
 			
 				ბურუნდიული ფრანკი
 				ბურუნდიული ფრანკი
 				ბურუნდიული ფრანკი
+				BIF
 			
 			
 				ბერმუდული დოლარი
 				ბერმუდული დოლარი
 				ბერმუდული დოლარი
+				BMD
 				$
 			
 			
 				ბრუნეული დოლარი
 				ბრუნეული დოლარი
 				ბრუნეული დოლარი
+				BND
 				$
 			
 			
 				ბოლივიური ბოლივიანო
 				ბოლივიური ბოლივიანო
 				ბოლივიური ბოლივიანო
+				BOB
+				Bs
 			
 			
 				ბოლივიური პესო
@@ -5357,6 +5330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ბრაზილიური რეალი
 				ბრაზილიური რეალი
 				ბრაზილიური რეალი
+				R$
 				R$
 			
 			
@@ -5369,17 +5343,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ბაჰამური დოლარი
 				ბაჰამური დოლარი
 				ბაჰამური დოლარი
+				BSD
 				$
 			
 			
 				ბუტანური ნგულტრუმი
 				ბუტანური ნგულტრუმი
 				ბუტანური ნგულტრუმი
+				BTN
 			
 			
 				ბოცვანური პულა
 				ბოცვანური პულა
 				ბოცვანური პულა
+				BWP
+				P
 			
 			
 				ახალი ბელარუსიული რუბლი (1994–1999)
@@ -5388,44 +5366,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ბელორუსული რუბლი
 				ბელორუსული რუბლი
 				ბელორუსული რუბლი
+				BYN
+				р.
 			
 			
 				ბელორუსული რუბლი (2000–2016)
 				ბელორუსული რუბლი (2000–2016)
 				ბელორუსული რუბლი (2000–2016)
+				BYR
 			
 			
 				ბელიზის დოლარი
 				ბელიზის დოლარი
 				ბელიზის დოლარი
+				BZD
 				$
 			
 			
 				კანადური დოლარი
 				კანადური დოლარი
 				კანადური დოლარი
+				CA$
 				$
 			
 			
 				კონგოს ფრანკი
 				კონგოს ფრანკი
 				კონგოს ფრანკი
+				CDF
 			
 			
 				შვეიცარიული ფრანკი
 				შვეიცარიული ფრანკი
 				შვეიცარიული ფრანკი
+				CHF
 			
 			
 				ჩილეს პესო
 				ჩილეს პესო
 				ჩილეს პესო
+				CLP
 				$
 			
 			
 				ჩინური იუანი (ოფშორი)
 				ჩინური იუანი (ოფშორი)
 				ჩინური იუანი (ოფშორი)
+				CNH
 			
 			
 				ჩინური იუანი
@@ -5438,12 +5425,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				კოლუმბიური პესო
 				კოლუმბიური პესო
 				კოლუმბიური პესო
+				COP
 				$
 			
 			
 				კოსტა-რიკული კოლონი
 				კოსტა-რიკული კოლონი
 				კოსტა რიკული კოლონი
+				CRC
 				₡
 			
 			
@@ -5456,17 +5445,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				კუბური კონვერტირებადი პესო
 				კუბური კონვერტირებადი პესო
 				კუბური კონვერტირებადი პესო
+				CUC
+				$
 			
 			
 				კუბური პესო
 				კუბური პესო
 				კუბური პესო
+				CUP
 				$
 			
 			
 				კაბო-ვერდეს ესკუდო
 				კაბო-ვერდეს ესკუდო
 				კაბო-ვერდეს ესკუდო
+				CVE
 			
 			
 				კვიპროსის გირვანქა
@@ -5475,6 +5468,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ჩეხური კრონა
 				ჩეხური კრონა
 				ჩეხური კრონა
+				CZK
+				Kč
 			
 			
 				აღმოსავლეთ გერმანული მარკა
@@ -5486,22 +5481,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ჯიბუტის ფრანკი
 				ჯიბუტის ფრანკი
 				ჯიბუტის ფრანკი
+				DJF
 			
 			
 				დანიური კრონა
 				დანიური კრონა
 				დანიური კრონა
+				DKK
+				kr
 			
 			
 				დომინიკური პესო
 				დომინიკური პესო
 				დომინიკური პესო
+				DOP
 				$
 			
 			
 				ალჟირული დინარი
 				ალჟირული დინარი
 				ალჟირული დინარი
+				DZD
 			
 			
 				ესტონური კრუნა
@@ -5510,11 +5510,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ეგვიპტური გირვანქა
 				ეგვიპტური გირვანქა
 				ეგვიპტური გირვანქა
+				EGP
+				E£
 			
 			
 				ერიტრეის ნაკფა
 				ერიტრეის ნაკფა
 				ერიტრეის ნაკფა
+				ERN
 			
 			
 				ესპანური პესეტა
@@ -5523,11 +5526,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ეთიოპიური ბირი
 				ეთიოპიური ბირი
 				ეთიოპიური ბირი
+				ETB
 			
 			
 				ევრო
 				ევრო
 				ევრო
+				€
 				€
 			
 			
@@ -5537,12 +5542,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ფიჯის დოლარი
 				ფიჯის დოლარი
 				ფიჯის დოლარი
+				FJD
 				$
 			
 			
 				ფოლკლენდის კუნძულების ფუნტი
 				ფოლკლენდის კუნძულების ფუნტი
 				ფოლკლენდის კუნძულების ფუნტი
+				FKP
+				£
 			
 			
 				ფრანგული ფრანკი
@@ -5551,6 +5559,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ბრიტანული გირვანქა სტერლინგი
 				ბრიტანული გირვანქა სტერლინგი
 				ბრიტანული გირვანქა სტერლინგი
+				£
 				£
 			
 			
@@ -5567,22 +5576,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				განური სედი
 				განური სედი
 				განური სედი
+				GHS
 			
 			
 				გიბრალტარული ფუნტი
 				გიბრალტარული ფუნტი
 				გიბრალტარული ფუნტი
+				GIP
 				£
 			
 			
 				გამბიური დალასი
 				გამბიური დალასი
 				გამბიური დალასი
+				GMD
 			
 			
 				გვინეური ფრანკი
 				გვინეური ფრანკი
 				გვინეური ფრანკი
+				GNF
+				FG
 			
 			
 				ბერძნული დრაჰმა
@@ -5591,6 +5605,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				გვატემალური კეტსალი
 				გვატემალური კეტსალი
 				გვატემალური კეტსალი
+				GTQ
+				Q
 			
 			
 				პორტუგალიური გინეა ესკუდო
@@ -5599,6 +5615,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				გაიანური დოლარი
 				გაიანური დოლარი
 				გაიანური დოლარი
+				GYD
 				$
 			
 			
@@ -5612,6 +5629,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ჰონდურასული ლემპირა
 				ჰონდურასული ლემპირა
 				ჰონდურასული ლემპირა
+				HNL
+				L
 			
 			
 				ხორვატიული დინარი
@@ -5620,21 +5639,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ხორვატული კუნა
 				ხორვატული კუნა
 				ხორვატული კუნა
+				HRK
+				kn
 			
 			
 				ჰაიტური გურდი
 				ჰაიტური გურდი
 				ჰაიტური გურდი
+				HTG
 			
 			
 				უნგრული ფორინტი
 				უნგრული ფორინტი
 				უნგრული ფორინტი
+				HUF
+				Ft
 			
 			
 				ინდონეზიური რუპია
 				ინდონეზიური რუპია
 				ინდონეზიური რუპია
+				IDR
+				Rp
 			
 			
 				ირლანდიური გირვანქა
@@ -5657,16 +5683,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ერაყული დინარი
 				ერაყული დინარი
 				ერაყული დინარი
+				IQD
 			
 			
 				ირანული რიალი
 				ირანული რიალი
 				ირანული რიალი
+				IRR
 			
 			
 				ისლანდიური კრონა
 				ისლანდიური კრონა
 				ისლანდიური კრონა
+				ISK
+				kr
 			
 			
 				იტალიური ლირა
@@ -5675,12 +5705,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				იამაიკური დოლარი
 				იამაიკური დოლარი
 				იამაიკური დოლარი
+				JMD
 				$
 			
 			
 				იორდანიული დოლარი
 				იორდანიული დოლარი
 				იორდანიული დოლარი
+				JOD
 			
 			
 				იაპონური იენი
@@ -5693,27 +5725,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				კენიური შილინგი
 				კენიური შილინგი
 				კენიური შილინგი
+				KES
 			
 			
 				ყირგიზული სომი
 				ყირგიზული სომი
 				ყირგიზული სომი
+				KGS
 			
 			
 				კამბოჯური რიელი
 				კამბოჯური რიელი
 				კამბოჯური რიელი
+				KHR
 				៛
 			
 			
 				კომორული ფრანკი
 				კომორული ფრანკი
 				კომორული ფრანკი
+				KMF
+				CF
 			
 			
 				ჩრდილოეთ კორეული ვონი
 				ჩრდილოეთ კორეული ვონი
 				ჩრდილოეთ კორეული ვონი
+				KPW
+				₩
 			
 			
 				სამხრეთ კორეული ვონი
@@ -5726,45 +5765,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ქუვეითური დინარი
 				ქუვეითური დინარი
 				ქუვეითური დინარი
+				KWD
 			
 			
 				კაიმანის კუნძულების დოლარი
 				კაიმანის კუნძულების დოლარი
 				კაიმანის კუნძულების დოლარი
+				KYD
 				$
 			
 			
 				ყაზახური ტენგე
 				ყაზახური ტენგე
 				ყაზახური ტენგე
+				KZT
 				₸
 			
 			
 				ლაოსური კიპი
 				ლაოსური კიპი
 				ლაოსური კიპი
+				LAK
 				₭
 			
 			
 				ლიბანური ფუნტი
 				ლიბანური ფუნტი
 				ლიბანური ფუნტი
+				LBP
+				L£
 			
 			
 				შრი-ლანკური რუპია
 				შრი-ლანკური რუპია
 				შრი-ლანკური რუპია
+				LKR
+				Rs
 			
 			
 				ლიბერიული დოლარი
 				ლიბერიული დოლარი
 				ლიბერიული დოლარი
+				LRD
 				$
 			
 			
 				ლიტვური ლიტა
 				ლიტვური ლიტა
 				ლიტვური ლიტა
+				LTL
 			
 			
 				ლიტვური ტალონი
@@ -5782,6 +5831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ლატვიური ლატი
 				ლატვიური ლატი
 				ლატვიური ლატი
+				LVL
 			
 			
 				ლატვიური რუბლი
@@ -5790,11 +5840,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ლიბიური დინარი
 				ლიბიური დინარი
 				ლიბიური დინარი
+				LYD
 			
 			
 				მაროკოს დირჰამი
 				მაროკოს დირჰამი
 				მაროკოს დირჰამი
+				MAD
 			
 			
 				მაროკოს ფრანკი
@@ -5803,11 +5855,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				მოლდოვური ლეუ
 				მოლდოვური ლეუ
 				მოლდოვური ლეუ
+				MDL
 			
 			
 				მადაგასკარის არიარი
 				მადაგასკარის არიარი
 				მადაგასკარის არიარი
+				MGA
+				Ar
 			
 			
 				მადაგასკარის ფრანკი
@@ -5816,6 +5871,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				მაკედონიური დინარი
 				მაკედონიური დინარი
 				მაკედონიური დინარი
+				MKD
 			
 			
 				მალის ფრანკი
@@ -5824,27 +5880,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				მიანმარის კიატი
 				მიანმარის კიატი
 				მიანმარის კიატი
+				MMK
+				K
 			
 			
 				მონღოლური ტუგრიკი
 				მონღოლური ტუგრიკი
 				მონღოლური ტუგრიკი
+				MNT
 				₮
 			
 			
 				მაკაუს პატაკა
 				მაკაუს პატაკა
 				მაკაუს პატაკა
+				MOP
 			
 			
 				მავრიტანული უგია (1973–2017)
 				მავრიტანული უგია (1973–2017)
 				მავრიტანული უგია (1973–2017)
+				MRO
 			
 			
 				მავრიტანული უგია
 				მავრიტანული უგია
 				მავრიტანული უგია
+				MRU
 			
 			
 				მალტის ლირა
@@ -5856,21 +5918,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				მავრიტანული რუპია
 				მავრიტანული რუპია
 				მავრიტანული რუპია
+				MUR
+				Rs
 			
 			
 				მალდივური რუფია
 				მალდივური რუფია
 				მალდივური რუფია
+				MVR
 			
 			
 				მალავიური კვაჩა
 				მალავიური კვაჩა
 				მალავიური კვაჩა
+				MWK
 			
 			
 				მექსიკური პესო
 				მექსიკური პესო
 				მექსიკური პესო
+				MX$
 				$
 			
 			
@@ -5880,6 +5947,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				მალაიზიური რინგიტი
 				მალაიზიური რინგიტი
 				მალაიზიური რინგიტი
+				MYR
+				RM
 			
 			
 				მოზამბიკური ესკუდო
@@ -5893,17 +5962,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				მოზამბიკური მეტიკალი
 				მოზამბიკური მეტიკალი
 				მოზამბიკური მეტიკალი
+				MZN
 			
 			
 				ნამიბიური დოლარი
 				ნამიბიური დოლარი
 				ნამიბიური დოლარი
+				NAD
 				$
 			
 			
 				ნიგერიული ნაირა
 				ნიგერიული ნაირა
 				ნიგერიული ნაირა
+				NGN
 				₦
 			
 			
@@ -5913,6 +5985,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ნიკარაგუული კორდობა
 				ნიკარაგუას ოქროს კორდობა
 				ნიკარაგუას ოქროს კორდობა
+				NIO
+				C$
 			
 			
 				ჰოლანდიური გულდენი
@@ -5921,11 +5995,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ნორვეგიული კრონა
 				ნორვეგიული კრონა
 				ნორვეგიული კრონა
+				NOK
+				kr
 			
 			
 				ნეპალური რუპია
 				ნეპალური რუპია
 				ნეპალური რუპია
+				NPR
+				Rs
 			
 			
 				ახალი ზელანდიის დოლარი
@@ -5938,11 +6016,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ომანის რიალი
 				ომანის რიალი
 				ომანის რიალი
+				OMR
 			
 			
 				პანამური ბალბოა
 				პანამური ბალბოა
 				პანამური ბალბოა
+				PAB
 			
 			
 				პერუს ინტი
@@ -5951,6 +6031,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				პერუს სოლი
 				პერუს სოლი
 				პერუს სოლი
+				PEN
 			
 			
 				პერუს სოლი (1863–1965)
@@ -5959,22 +6040,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				პაპუა-ახალი გვინეის კინა
 				პაპუა-ახალი გვინეის კინა
 				პაპუა-ახალი გვინეის კინა
+				PGK
 			
 			
 				ფილიპინური პესო
 				ფილიპინური პესო
 				ფილიპინური პესო
+				PHP
 				₱
 			
 			
 				პაკისტანური რუპია
 				პაკისტანური რუპია
 				პაკისტანური რუპია
+				PKR
+				Rs
 			
 			
 				პოლონური ზლოტი
 				პოლონური ზლოტი
 				პოლონური ზლოტი
+				PLN
+				zł
 			
 			
 				პოლონური ზლოტი (1950–1995)
@@ -5986,12 +6073,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				პარაგვაული გუარანი
 				პარაგვაული გუარანი
 				პარაგვაული გუარანი
+				PYG
 				₲
 			
 			
 				კატარის რიალი
 				კატარის რიალი
 				კატარის რიალი
+				QAR
 			
 			
 				როდეზიული დოლარი
@@ -6003,16 +6092,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				რუმინული ლეუ
 				რუმინული ლეუ
 				რუმინული ლეუ
+				RON
+				lei
 			
 			
 				სერბული დინარი
 				სერბული დინარი
 				სერბული დინარი
+				RSD
 			
 			
 				რუსული რუბლი
 				რუსული რუბლი
 				რუსული რუბლი
+				RUB
+				₽
 			
 			
 				რუსული რუბლი (1991–1998)
@@ -6021,22 +6115,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				რუანდული ფრანკი
 				რუანდული ფრანკი
 				რუანდული ფრანკი
+				RWF
+				RF
 			
 			
 				საუდის არაბეთის რიალი
 				საუდის არაბეთის რიალი
 				საუდის არაბეთის რიალი
+				SAR
 			
 			
 				სოლომონის კუნძულების დოლარი
 				სოლომონის კუნძულების დოლარი
 				სოლომონის კუნძულების დოლარი
+				SBD
 				$
 			
 			
 				სეიშელური რუპია
 				სეიშელური რუპია
 				სეიშელური რუპია
+				SCR
 			
 			
 				სუდანის დინარი
@@ -6045,6 +6144,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				სუდანური ფუნტი
 				სუდანური ფუნტი
 				სუდანური ფუნტი
+				SDG
 			
 			
 				სუდანის გირვანქა
@@ -6053,32 +6153,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				შვედური კრონა
 				შვედური კრონა
 				შვედური კრონა
+				SEK
+				kr
 			
 			
 				სინგაპურის დოლარი
 				სინგაპურის დოლარი
 				სინგაპურის დოლარი
+				SGD
 				$
 			
 			
 				წმ. ელენეს კუნძულის ფუნტი
 				წმ. ელენეს კუნძულის ფუნტი
 				წმ. ელენეს კუნძულის ფუნტი
+				SHP
+				£
 			
 			
 				სიერა-ლეონეს ლეონე
 				სიერა-ლეონეს ლეონე
 				სიერა-ლეონეს ლეონე
+				SLL
 			
 			
 				სომალური შილინგი
 				სომალური შილინგი
 				სომალური შილინგი
+				SOS
 			
 			
 				სურინამული დოლარი
 				სურინამული დოლარი
 				სურინამული დოლარი
+				SRD
 				$
 			
 			
@@ -6088,17 +6196,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				სამხრეთ სუდანური ფუნტი
 				სამხრეთ სუდანური ფუნტი
 				სამხრეთ სუდანური ფუნტი
+				SSP
 				£
 			
 			
 				სან-ტომე და პრინსიპის დობრა (1977–2017)
 				სან-ტომე და პრინსიპის დობრა (1977–2017)
 				სან-ტომე და პრინსიპის დობრა (1977–2017)
+				STD
 			
 			
 				სან-ტომე და პრინსიპის დობრა
 				სან-ტომე და პრინსიპის დობრა
 				სან-ტომე და პრინსიპის დობრა
+				STN
+				Db
 			
 			
 				საბჭოთა რუბლი
@@ -6107,16 +6219,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				სირიული ფუნტი
 				სირიული გირვანქა
 				სირიული გირვანქა
+				SYP
+				£
 			
 			
 				სვაზილენდის ლილანგენი
 				სვაზილენდის ლილანგენი
 				სვაზილენდის ლილანგენი
+				SZL
 			
 			
 				ტაილანდური ბატი
 				ტაილანდური ბატი
 				ტაილანდური ბატი
+				THB
 				฿
 			
 			
@@ -6126,6 +6242,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ტაჯიკური სომონი
 				ტაჯიკური სომონი
 				ტაჯიკური სომონი
+				TJS
 			
 			
 				თურქმენული მანათი
@@ -6134,16 +6251,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				თურქმენეთის მანათი
 				თურქმენეთის მანათი
 				თურქმენეთის მანათი
+				TMT
 			
 			
 				ტუნისური დინარი
 				ტუნისის დინარი
 				ტუნისის დინარი
+				TND
 			
 			
 				ტონგანური პაანგა
 				ტონგანური პაანგა
 				ტონგანური პაანგა
+				TOP
+				T$
 			
 			
 				თურქული ლირა
@@ -6152,29 +6273,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ახალი თურქული ლირა
 				ახალი თურქული ლირა
 				ახალი თურქული ლირა
+				TRY
 				₺
+				TL
 			
 			
 				ტრინიდად და ტობაგოს დოლარი
 				ტრინიდად და ტობაგოს დოლარი
 				ტრინიდად და ტობაგოს დოლარი
+				TTD
 				$
 			
 			
 				ტაივანური ახალი დოლარი
 				ტაივანური ახალი დოლარი
 				ტაივანური ახალი დოლარი
+				NT$
 				NT$
 			
 			
 				ტანზანიური შილინგი
 				ტანზანიური შილინგი
 				ტანზანიური შილინგი
+				TZS
 			
 			
 				უკრაინული გრივნა
 				უკრაინული გრივნა
 				უკრაინული გრივნა
+				UAH
 				₴
 			
 			
@@ -6187,11 +6314,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				უგანდური შილინგი
 				უგანდური შილინგი
 				უგანდური შილინგი
+				UGX
 			
 			
 				აშშ დოლარი
 				აშშ დოლარი
 				აშშ დოლარი
+				US$
 				$
 			
 			
@@ -6207,12 +6336,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ურუგვაის პესო
 				ურუგვაის პესო
 				ურუგვაის პესო
+				UYU
 				$
 			
 			
 				უზბეკური სუმი
 				უზბეკური სუმი
 				უზბეკური სუმი
+				UZS
 			
 			
 				ვენესუელის ბოლივარი (1871–2008)
@@ -6221,6 +6352,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ვენესუელის ბოლივარი (2008–2018)
 				ვენესუელის ბოლივარი (2008–2018)
 				ვენესუელის ბოლივარი (2008–2018)
+				VEF
+				Bs
 			
 			
 				ვენესუელის ბოლივარი
@@ -6239,16 +6372,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ვანუატუს ვატუ
 				ვანატუს ვატუ
 				ვანატუს ვატუ
+				VUV
 			
 			
 				სამოური ტალა
 				დასავლეთ სამოას ტალა
 				სამოური ტალა
+				WST
 			
 			
 				ცენტრალურ აფრიკული CFA ფრანკი
 				ცენტრალურ აფრიკული CFA ფრანკი
 				ცენტრალურ აფრიკული CFA ფრანკი
+				FCFA
 			
 			
 				ვერცხლი
@@ -6263,6 +6399,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				აღმოსავლეთ კარიბიული დოლარი
 				აღმოსავლეთ კარიბიული დოლარი
 				აღმოსავლეთ კარიბიული დოლარი
+				EC$
+				$
 			
 			
 				ევროპული სავალუტო ერთეული
@@ -6274,11 +6412,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				დასავლეთ აფრიკული CFA ფრანკი
 				დასავლეთ აფრიკული CFA ფრანკი
 				დასავლეთ აფრიკული CFA ფრანკი
+				CFA
 			
 			
 				CFP ფრანკი
 				CFP ფრანკი
 				CFP ფრანკი
+				CFPF
 			
 			
 				უცნობი ვალუტა
@@ -6292,6 +6432,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				იემენის რეალი
 				იემენის რეალი
 				იემენის რეალი
+				YER
 			
 			
 				იუგოსლავიური მყარი დინარი
@@ -6306,16 +6447,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				სამხრეთ აფრიკული რანდი
 				სამხრეთ აფრიკული რანდი
 				სამხრეთ აფრიკული რანდი
+				ZAR
+				R
 			
 			
 				ზამბიური კვაჭა (1968–2012)
 				ზამბიური კვაჭა (1968–2012)
 				ზამბიური კვაჭა (1968–2012)
+				ZMK
 			
 			
 				ზამბიური კვაჭა
 				ზამბიური კვაჭა
 				ზამბიური კვაჭა
+				ZMW
+				ZK
 			
 			
 				ზაირის ახალი ზაირი
@@ -6466,16 +6612,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} პრომილე
 				{0} პრომილე
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				ლიტრი კილომეტრზე
 				{0} ლიტრი კილომეტრზე
@@ -6556,6 +6692,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} საუკუნე
 				{0} საუკუნე
 			
+			
+				დეკადა
+				{0} დეკადა
+				{0} დეკადა
+			
 			
 				წელი
 				{0} წელი
@@ -6673,15 +6814,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ბრიტანული სითბური ერთეული
 				{0} ბრიტანული სითბური ერთეული
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+			
+				აშშ თერმი
+				{0} აშშ თერმი
+				{0} აშშ თერმი
 			
 			
 				გიგაჰერცი
@@ -6703,6 +6839,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ჰერცი
 				{0} ჰერცი
 			
+			
+				ტიპოგრაფიული ემი
+				{0} ემი
+				{0} ემი
+			
+			
+				პიქსელი
+				{0} პიქსელი
+				{0} პიქსელი
+			
+			
+				მეგაპიქსელი
+				{0} მეგაპიქსელი
+				{0} მეგაპიქსელი
+			
+			
+				პიქსელი სანტიმეტრზე
+				{0} პიქსელი სანტიმეტრზე
+				{0} პიქსელი სანტიმეტრზე
+			
+			
+				პიქსელი დუიმზე
+				{0} პიქსელი დუიმზე
+				{0} პიქსელი დუიმზე
+			
+			
+				წერტილი სანტიმეტრზე
+				{0} წერტილი სანტიმეტრზე
+				{0} წერტილი სანტიმეტრზე
+			
+			
+				წერტილი დუიმზე
+				{0} წერტილი დუიმზე
+				{0} წერტილი დუიმზე
+			
 			
 				კილომეტრი
 				{0} კილომეტრი
@@ -6798,21 +6969,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} პუნქტი
 				{0} პუნქტი
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				ლუქსი
 				{0} ლუქსი
 				{0} ლუქსი
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				მეტრული ტონა
 				{0} მეტრული ტონა
@@ -6912,11 +7073,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ცხენის ძალა
 				{0} ცხენის ძალა
 			
-			
-				ჰექტოპასკალი
-				{0} ჰექტოპასკალი
-				{0} ჰექტოპასკალი
-			
 			
 				მილიმეტრი ვერცხლისწყლის სვეტისა
 				{0} მილიმეტრი ვერცხლისწყლის სვეტისა
@@ -6932,6 +7088,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ვერცხლისწყლის დუიმი
 				{0} ვერცხლისწყლის დუიმი
 			
+			
+				ბარი
+				{0} ბარი
+				{0} ბარი
+			
 			
 				მილიბარი
 				{0} მილიბარი
@@ -6942,6 +7103,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ატმოსფერო
 				{0} ატმოსფერო
 			
+			
+				პასკალი
+				{0} პასკალი
+				{0} პასკალი
+			
+			
+				ჰექტოპასკალი
+				{0} ჰექტოპასკალი
+				{0} ჰექტოპასკალი
+			
 			
 				კილოპასკალი
 				{0} კილოპასკალი
@@ -6992,16 +7163,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} კელვინი
 				{0} კელვინის გრადუსი
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				კუბური კილომეტრი
 				{0} კუბური კილომეტრი
@@ -7269,16 +7430,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				ლიტრი/კმ
 				{0} ლ/კმ
@@ -7359,6 +7510,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ს.
 				{0} ს.
 			
+			
+				დეკადა
+				{0} დეკადა
+				{0} დეკადა
+			
 			
 				წ
 				{0} წ
@@ -7476,15 +7632,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ბსე
 				{0} ბსე
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+			
+				აშშ თერმი
+				{0} აშშ თერმი
+				{0} აშშ თერმი
 			
 			
 				გჰც.
@@ -7506,6 +7657,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ჰც.
 				{0} ჰც.
 			
+			
+				ემი
+				{0} ემი
+				{0} ემი
+			
+			
+				პქს
+				{0} პქს
+				{0} პქს
+			
+			
+				მპქს
+				{0} მპქს
+				{0} მპქს
+			
+			
+				პქს/სმ-ზე
+				{0} პქს/სმ-ზე
+				{0} პქს/სმ-ზე
+			
+			
+				პიქს/დუიმზე
+				{0} პიქს/დუიმზე
+				{0} პიქს/დუიმზე
+			
+			
+				წერტ/სმ-ზე
+				{0} წერტ/სმ-ზე
+				{0} წერტ/სმ-ზე
+			
+			
+				წერტ/დუიმზე
+				{0} წერტ/დუიმზე
+				{0} წერტ/დუიმზე
+			
 			
 				კმ
 				{0} კმ
@@ -7601,21 +7787,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} პნქტ.
 				{0} პქნტ.
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				ლუქსი
 				{0} ლუქსი
 				{0} ლუქსი
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				მტ
 				{0} მტ
@@ -7675,16 +7851,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} დალტ.
 				{0} დალტ.
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				გვტ
 				{0} გვტ
@@ -7715,11 +7881,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ცხ. ძ.
 				{0} ცხ. ძ.
 			
-			
-				ჰპა
-				{0} ჰპა
-				{0} ჰპა
-			
 			
 				მმ ვწყ. სვ.
 				{0} მმ ვწყ. სვ.
@@ -7735,6 +7896,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ვრც. დმ.
 				{0} ვრც. დმ.
 			
+			
+				ბარი
+				{0} ბარი
+				{0} ბარი
+			
 			
 				მბარი
 				{0} მბარი
@@ -7745,6 +7911,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ატმ.
 				{0} ატმ.
 			
+			
+				პა
+				{0} პა
+				{0} პა
+			
+			
+				ჰპა
+				{0} ჰპა
+				{0} ჰპა
+			
 			
 				კპა
 				{0} კპა
@@ -7795,16 +7971,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				კუბური კილომეტრი
 				{0} კმ³
@@ -8116,10 +8282,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ცხ.ძ.
 				{0}ცხ.ძ.
 			
-			
-				{0} ჰპა
-				{0} ჰპა
-			
 			
 				{0} ვრც. დმ.
 				{0} ვრც. დმ.
@@ -8128,6 +8290,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} მბრ
 				{0} მბრ
 			
+			
+				{0} ჰპა
+				{0} ჰპა
+			
 			
 				კმ/სთ
 				{0} კმ/სთ
@@ -8194,12 +8360,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} ან {1}
 			{0} ან {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} და {1}
-			{0} და {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/ka_GE.xml b/make/data/cldr/common/main/ka_GE.xml
index 4c0f6b116e9..37f3110cfca 100644
--- a/make/data/cldr/common/main/ka_GE.xml
+++ b/make/data/cldr/common/main/ka_GE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kab.xml b/make/data/cldr/common/main/kab.xml
index 471dea60d82..4cb80525e86 100644
--- a/make/data/cldr/common/main/kab.xml
+++ b/make/data/cldr/common/main/kab.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -32,6 +32,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Taṛagunit
 			Tangikat
 			Taɛrabt
+			Taɛrabt tamezdayt tatrart
 			Tamapuct
 			Taṛapahut
 			Tasamizt
@@ -40,7 +41,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Tavarikt
 			Tawadhit
 			Taymarit
-			Tazerbiǧanit
+			Tazerbayǧant
 			Tazrit
 			Tabackirt
 			Tabalinit
@@ -62,7 +63,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Tabujinit
 			Tablint
 			Takaṭalant
-			Tačičant
+			Tacakmat
+			Tačičinit
 			Tacibwanit
 			Tacigat
 			Tacamuṛut
@@ -400,10 +402,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Tayiddict
 			Tayurubit
 			Takantunit
+			Tacinwat, Takantunit
 			Tamaziɣt Tizeɣt Tamerrukit
 			Tacinwat, Tamundarint
+			Tacinwat, Tamundarint
 			Tacinwat taḥerfit
+			Tacinwat tamundarint taḥerfit
 			Tacinwat tamensayt
+			Tacinwat tamundarint tamensayt
 			Tazulut
 			Tazunit
 			Ulac agbur utlayan
@@ -645,8 +651,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			San Maṛtan
 			Madaɣecqer
 			Tigzirin n Marcal
-			Masidwan
-			Masidunya (Tagduda Taqbuṛt Tayuguslavit n Masidunya)
 			Mali
 			Myanmar
 			Mungulya
@@ -843,15 +847,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			Tutlayt: {0}
 			Tira: {0}
-			Tamnaṭ: {0}
+			Tamnaḍt: {0}
 		
 	
 	
 		[a b c č d ḍ e ɛ f g ǧ ɣ h ḥ i j k l m n p q r ṛ s ṣ t ṭ u w x y z ẓ]
 		[o v]
 		[A B C Č D Ḍ E Ɛ F G Ǧ Ɣ H Ḥ I J K L M N P Q R Ṛ S Ṣ T Ṭ U W X Y Z Ẓ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ( ) \[ \] \{ \}]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -865,7 +869,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			[.․。︒﹒．｡]
-			[\$﹩＄$]
+			['ʼ՚᾽᾿’＇]
+			[%٪﹪％]
+			[؉‰]
 			[£₤]
 			[₨₹{Rp}{Rs}]
 		
@@ -2163,9 +2169,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			+HH:mm;-HH:mm
 			KLG {0}
 			KLG
-			akud: {0}
-			{0} (akud n unebdu)
-			{0} (akud amagnu)
+			Akud: {0}
+			{0} (Akud n unebdu)
+			{0} (Akud amagnu)
 			{1} ({0})
 			
 				Honolulu
@@ -7296,6 +7302,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}, neɣ {1}
 			{0} neɣ {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
@@ -7426,4 +7436,72 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		Askript n Asya n Unẓul
 		asekkil amellal
 	
+	
+		uknan
+		tafekka tasniẓrant
+		kennu
+		tehri
+		tuzert
+		idewweṛ
+		taneffust
+		aḍris
+		asezwel
+		askan
+		anazal
+		yekna s azelmaḍ
+		ubdid
+		yekna
+		yekna nezzeh
+		yezmeḍ aṭas
+		yessed aṭas
+		yeḥreṣ aṭas
+		yezmeḍ nezzeh
+		yessed nezzeh
+		yeḥreṣ nezzeh
+		yezmeḍ
+		yessed
+		yessed
+		azgen yezmeḍ
+		azgen yessed
+		azgen yeḥreṣ
+		amagnu
+		azgen yejbed
+		azgen yennejbad
+		azgen hraw
+		yejbed
+		yennejbad
+		hraw
+		yejbed nezzeh
+		yennejbad nezzeh
+		hraw nezzeh
+		yejbed aṭas
+		yennejbad aṭas
+		hraw aṭas
+		rqiq
+		rqiq nezzeh
+		rqiq aṭas
+		afessas
+		azgen afessas
+		adlis
+		alugan
+		alemmas
+		zur azgen
+		zur nnefṣ
+		zur
+		zur nezzeh
+		aberkan
+		ẓẓay
+		aberkan nezzeh
+		aberkan aṭas
+		ẓẓay aṭas
+		tirẓiyin tubdidin
+		aṣiẓi n yisekkilen meqqṛen
+		imḍanen n ureyyec
+		imḍanen s tṛuẓi n wadda
+		imḍanen udusen
+		imḍanen iẓunanen
+		isekkilen imeqṛanen mecṭuḥen
+		izwilen imdewṛen
+		tagrumma tilemt
+	
 
diff --git a/make/data/cldr/common/main/kab_DZ.xml b/make/data/cldr/common/main/kab_DZ.xml
index 0f0ab5c1600..b46e0d570ba 100644
--- a/make/data/cldr/common/main/kab_DZ.xml
+++ b/make/data/cldr/common/main/kab_DZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kam.xml b/make/data/cldr/common/main/kam.xml
index f3259348dc5..8b114ea9f14 100644
--- a/make/data/cldr/common/main/kam.xml
+++ b/make/data/cldr/common/main/kam.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/kam_KE.xml b/make/data/cldr/common/main/kam_KE.xml
index cfa10a60471..093d71c0a94 100644
--- a/make/data/cldr/common/main/kam_KE.xml
+++ b/make/data/cldr/common/main/kam_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kde.xml b/make/data/cldr/common/main/kde.xml
index 8fe11793565..a66637bb43b 100644
--- a/make/data/cldr/common/main/kde.xml
+++ b/make/data/cldr/common/main/kde.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Chisiwa cha Malushal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/kde_TZ.xml b/make/data/cldr/common/main/kde_TZ.xml
index 6ffe8c26939..dc8b82fd4dd 100644
--- a/make/data/cldr/common/main/kde_TZ.xml
+++ b/make/data/cldr/common/main/kde_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kea.xml b/make/data/cldr/common/main/kea.xml
index c0b1db07b79..4e2c217108e 100644
--- a/make/data/cldr/common/main/kea.xml
+++ b/make/data/cldr/common/main/kea.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -28,11 +28,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			araukanu
 			asames
 			asu
+			asturianu
 			aimara
 			azerbaijanu
 			azeri
 			baxkir
-			balinese
+			balines
+			basa
 			bielorusu
 			bemba
 			bena
@@ -44,19 +46,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			bodo
 			bosniu
 			katalãu
+			xakma
 			txetxenu
+			sebuanu
 			xiga
 			xeroki
 			kurdu sentral
 			kórsiku
 			txeku
+			slavu klériku
 			txuvaxi
 			gales
 			dinamarkes
 			taita
-			alimãu
-			alimãu austriaku
-			altu alimãu suisu
+			alemon
+			alemon austríaku
+			alemon altu suisu
 			zarma
 			sórbiu baxu
 			duala
@@ -68,10 +73,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ingles
 			ingles australianu
 			ingles kanadianu
-			ingles britaniku
-			ingles (R.U.)
+			ingles britániku
 			ingles merkanu
-			ingles (S.U.)
 			sperantu
 			spanhol
 			spanhol latinu-merkanu
@@ -79,7 +82,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			spanhol mexikanu
 			stonianu
 			basku
+			ewondo
 			persa
+			fula
 			finlandes
 			filipinu
 			fijianu
@@ -87,12 +92,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			franses
 			franses kanadianu
 			franses suisu
+			friulanu
 			fríziu osidental
 			irlandes
 			gagauz
 			galegu
 			guarani
-			alimãu suísu
+			alemon suísu
 			gujarati
 			gusii
 			manks
@@ -100,11 +106,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			avaianu
 			ebraiku
 			indi
+			hmong
 			kroata
 			sórbiu altu
 			aitianu
 			úngaru
 			arméniu
+			interlingua
 			indonéziu
 			ibo
 			nuosu
@@ -118,10 +126,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			jorjianu
 			kabila
 			kamba
+			makonde
 			kabuverdianu
 			koira txiini
 			kikuiu
 			kazak
+			kako
 			groenlandes
 			kalenjin
 			kmer
@@ -131,16 +141,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			konkani
 			kaxmira
 			bafia
+			kolonhanu
 			kurdu
 			kórniku
 			kirgiz
 			latin
+			langi
 			luxemburges
 			luganda
+			lakota
+			lingala
 			lausianu
-			lituanes
+			lituanu
+			luba-katanga
+			luo
+			luyia
 			letãu
 			malgaxi
+			makua
 			maori
 			masedóniu
 			malaialam
@@ -149,6 +167,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			maltes
 			birmanes
 			norueges bokmål
+			alemon baxu
 			nepales
 			olandes
 			flamengu
@@ -156,8 +175,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			norueges nynorsk
 			oromo
 			odía
+			osétiku
 			pandjabi
 			pulaku
+			prusianu
 			paxto
 			purtuges
 			purtuges brazileru
@@ -165,10 +186,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			kexua
 			kitxe
 			romanxi
+			rundi
 			rumenu
 			rumenu moldáviku
+			rombu
 			rusu
 			kiniaruanda
+			rwa
 			sánskritu
 			sindi
 			koiraboro seni
@@ -202,10 +226,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			uolof
 			koza
 			ioruba
-			kantonese
+			kantunes
+			kantunes (tradisional)
+			tamazait marokinu padron
 			xines
+			xines, mandarin
 			xines simplifikadu
+			xines mandarin (simplificadu)
 			xines tradisional
+			xines mandarin (tradisional)
 			zulu
 			sen kontiudu linguístiku
 		
@@ -230,6 +259,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -247,6 +277,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
+			
 			
 			
 			
@@ -273,7 +305,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Europa di Sul
 			Australázia
 			Melanézia
-			Rejiãu di Mikronézia
+			Rejion di Mikronézia
 			Polinézia
 			Ázia
 			Ázia Sentral
@@ -282,8 +314,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Europa Oriental
 			Europa di Norti
 			Europa Osidental
+			Áfrika Subisariana
 			Merka Latinu
-			Ilha di Asensãu
+			Ilha di Asenson
 			Andora
 			Emiradus Árabi Unidu
 			Afeganistãu
@@ -299,7 +332,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Austrália
 			Aruba
 			Ilhas Åland
-			Azerbaijãu
+			Azerbaidjan
 			Bósnia i Erzegovina
 			Barbadus
 			Bangladexi
@@ -309,15 +342,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Barain
 			Burundi
 			Benin
-			Sãu Bartolomeu
+			San Bartolomeu
 			Bermudas
 			Brunei
 			Bolívia
 			Karaibas Olandezas
 			Brazil
 			Baamas
-			Butãu
-			Ilha Buve
+			Butan
+			Ilha Buvê
 			Botsuana
 			Belarus
 			Belizi
@@ -333,7 +366,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Kosta di Marfin (Côte d’Ivoire)
 			Ilhas Kuk
 			Xili
-			Kamarõis
+			Kamarons
 			Xina
 			Kolômbia
 			Ilha Kliperton
@@ -360,7 +393,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Iritreia
 			Spanha
 			Etiópia
-			Uniãu Europeia
+			Union Europeia
+			Eurozona
 			Finlándia
 			Fidji
 			Ilhas Malvinas
@@ -368,7 +402,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mikronézia
 			Ilhas Faroe
 			Fransa
-			Gabãu
+			Gabon
 			Reinu Unidu
 			R.U.
 			Granada
@@ -388,7 +422,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Guam
 			Gine-Bisau
 			Giana
-			Rejiãu Administrativu Spesial di Hong Kong
+			Hong Kong, Rejion Administrativu Spesial di Xina
 			Hong Kong
 			Ilhas Heard i McDonald
 			Onduras
@@ -409,18 +443,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Jersi
 			Jamaika
 			Jordánia
-			Japãu
+			Japon
 			Kénia
-			Kirgistãu
+			Kirgistan
 			Kambodja
 			Kiribati
 			Kamoris
-			Sãu Kristovãu i Nevis
+			San Kristovan i Nevis
 			Koreia di Norti
 			Koreia di Sul
 			Kueiti
-			Ilhas Kaimãu
-			Kazakistãu
+			Ilhas Kaimon
+			Kazakistan
 			Laus
 			Líbanu
 			Santa Lúsia
@@ -436,15 +470,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mónaku
 			Moldávia
 			Montenegru
-			Sãu Martinhu di Fransa
+			San Martinhu (Fransa)
 			Madagaskar
 			Ilhas Marxal
-			Masidónia
-			Masidónia (FYROM)
+			Masidónia di Norti
 			Mali
 			Mianmar (Birmánia)
 			Mongólia
-			Rejiãu Administrativu Spesial di Makau
+			Makau, Rejion Administrativu Spesial di Xina
 			Makau
 			Ilhas Marianas di Norti
 			Martinika
@@ -475,18 +508,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Polinézia Franseza
 			Papua-Nova Gine
 			Filipinas
-			Pakistãu
+			Pakistan
 			Pulónia
 			San Piere i Mikelon
-			Pirkairn
+			Ilhas Pitkairn
 			Portu Riku
-			Palistina
+			Tiritóriu palistinianu
+			Palistina
 			Purtugal
 			Palau
 			Paraguai
 			Katar
 			Ilhas di Oseania
-			Runiãu
+			Runion
 			Ruménia
 			Sérvia
 			Rúsia
@@ -494,7 +528,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Arábia Saudita
 			Ilhas Salumãu
 			Seixelis
-			Sudãu
+			Sudon
 			Suésia
 			Singapura
 			Santa Ilena
@@ -506,22 +540,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Senegal
 			Sumália
 			Surinami
-			Sudãu di Sul
-			Sãu Tume i Prínsipi
+			Sudon di Sul
+			San Tume i Prínsipi
 			El Salvador
-			Sãu Martinhu di Olanda
+			San Martinhu (Olanda)
 			Síria
-			Suazilándia
+			Eswatini
+			Suazilándia
 			Tristan da Kunha
 			Ilhas Turkas i Kaikus
 			Txadi
 			Terras Franses di Sul
 			Togu
 			Tailándia
-			Tadjikistãu
+			Tadjikistan
 			Tokelau
 			Timor Lesti
-			Turkumenistãu
+			Timor-Leste
+			Turkumenistan
 			Tunízia
 			Tonga
 			Turkia
@@ -532,12 +568,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Ukránia
 			Uganda
 			Ilhas Minoris Distantis de Stadus Unidus
+			Nasons Unidas
 			Stadus Unidos di Merka
 			S.U.
 			Uruguai
-			Uzbekistãu
+			Uzbekistan
 			Vatikanu
-			Sãu Bisenti i Granadinas
+			San Bisenti i Granadinas
 			Vinizuela
 			Ilhas Virjens Británikas
 			Ilhas Virjens Merkanas
@@ -545,38 +582,72 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Vanuatu
 			Ualis i Futuna
 			Samoa
+			Pseudo-sotakis
+			Pseudo-bidiresional
 			Kozovu
 			Iémen
 			Maiote
 			Áfrika di Sul
 			Zámbia
 			Zimbábui
-			Rejiãu Diskonxedu
+			Rejion Diskonxedu
 		
 		
 			Kalendáriu
+			Formatu di mueda
+			Ordenason
+			Mueda
+			Siklu oráriu (12 o 24)
+			Stilu di kebra di linha
+			Sistema di midida
+			Nunbru
 		
 		
+			Kalendáriu budista
+			Kalendáriu xines
+			Kalendáriu dangi
+			Kalendáriu etiópiku
 			Kalendáriu Gregorianu
-			Númerus Arábikus
+			Kalendáriu ebraiku
+			Kalendáriu islámiku
+			Kalendáriu ISO-8601
+			Kalendáriu japones
+			Kalendáriu persa
+			Kalendáriu di Repúblika di Xina
+			Formatu di mueda kontabilístiku
+			Formatu di mueda padron
+			Órdi padron di Unicode
+			Piskiza di uzu jeral
+			Órdi padron
+			Sistema di 12 ora (0–11)
+			Sistema di 12 ora (1–12)
+			Sistema di 24 ora (0–23)
+			Sistema di 24 ora (1–24)
+			Stilu fleksível di kebra di linha
+			Stilu padron di kebra di linha
+			Stilu ríjidu di kebra di linha
+			Sistema métriku
+			Sistema di midida britániku
+			Sistema di midida merkanu
+			Nunbru osidental
 		
 		
 			Métriku
-			Ingles
+			Britániku
 			Merkanu
 		
 		
 			Lingua: {0}
 			Skrita: {0}
-			Rejiãu: {0}
+			Rejion: {0}
 		
 	
 	
 		[a b d {dj} e f g h i j k l {lh} m n ñ {nh} o p r s t {tx} u v x y z]
 		[ª á à ă â å ä ã ā æ c ç é è ĕ ê ë ẽ ē í ì ĭ î ï ĩ ī {n\u0308} º ó ò ŏ ô ö õ ø ō œ q {rr} ú ù ŭ û ü ũ ū w ÿ]
 		[A B D E F G H I J K L M N O P R S T U V X Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \& # † ‡]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \& # † ‡]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -612,7 +683,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							d/M/y GGGGG
+							dd/MM/y GGGGG
 						
 					
 				
@@ -641,8 +712,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						d
 						ccc
 						E, d
+						E, h:mm a
+						E, HH:mm
+						E, h:mm:ss a
+						E, HH:mm:ss
 						y G
-						MMM y G
+						LLL y G
 						d MMM y G
 						E, d MMM y G
 						h a
@@ -663,24 +738,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						mm:ss
 						mm:ss
 						y
-						MM/y
+						LL/y
 						dd/MM/y
 						E, dd/MM/y
 						MM/y
-						MMM y
+						LLL y
 						d MMM y
 						E, d MMM y
-						MMMM 'di' y
+						LLLL 'di' y
 						QQQ y
 						QQQQ 'di' y
 						y G
-						MM/y GGGGG
+						LL/y GGGGG
 						dd/MM/y GGGGG
 						E, dd/MM/y GGGGG
-						MMM y G
+						LLL y G
 						d MMM y G
 						E, d MMM y G
-						MMMM y G
+						LLLL y G
 						QQQ y G
 						QQQQ 'di' y G
 					
@@ -689,6 +764,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							LL/y GGGGG – LL/y GGGGG
+							LL/y – LL/y GGGGG
+							LL/y – LL/y GGGGG
+						
+						
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y GGGGG – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+						
+						
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y GGGGG – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+						
+						
+							LLL y G – LLL y G
+							LLL – LLL y G
+							LLL y – LLL y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -722,7 +835,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							HH–HH v
 						
 						
-							M – M
+							L – L
 						
 						
 							dd/MM – dd/MM
@@ -733,7 +846,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, dd/MM – E, dd/MM
 						
 						
-							MMM – MMM
+							LLL – LLL
 						
 						
 							d – d MMM
@@ -748,7 +861,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							MM/y – MM/y
-							MM/y – MM/y
+							LL/y – LL/y
 						
 						
 							dd/MM/y – dd/MM/y
@@ -761,8 +874,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, dd/MM/y – E, dd/MM/y
 						
 						
-							MMM – MMM y
-							MMM y – MMM y
+							LLL – LLL y
+							LLL y – LLL y
 						
 						
 							d – d MMM y
@@ -775,8 +888,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, d MMM y – E, d MMM y
 						
 						
-							MMMM – MMMM 'di' y G
-							MMMM 'di' y – MMMM 'di' y G
+							LLLL – LLLL 'di' y G
+							LLLL 'di' y – LLLL 'di' y G
 						
 					
 				
@@ -998,10 +1111,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							am
 							pm
 						
-						
-							a
-							p
-						
 						
 							am
 							pm
@@ -1010,9 +1119,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
-						Antis di Kristu
-						Antis di Era Kumun
-						Dispos di Kristu
+						antis di Kristu
+						antis di Era Kumun
+						dispos di Kristu
 						Era Kumun
 					
 					
@@ -1040,7 +1149,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							d/M/y
+							dd/MM/y
 						
 					
 				
@@ -1069,34 +1178,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						
-							{1} {0}
+							{1}, {0}
 						
 					
 					
 						d
 						ccc
+						E, h:mm B
+						E, h:mm:ss B
 						E, d
 						E, h:mm a
 						E, HH:mm
 						E, h:mm:ss a
 						E, HH:mm:ss
 						y G
-						MMM y G
+						LLL y G
 						d MMM y G
 						E, d MMM y G
 						h a
@@ -1113,33 +1224,79 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						dd/MM
 						E, dd/MM
 						dd/MM
-						LLL
 						d MMM
 						E, d MMM
 						d 'di' MMMM
 						E, d 'di' MMMM
+						W'º' 'simana' 'di' MMMM
 						mm:ss
 						mm:ss
 						y
-						MM/y
+						LL/y
 						dd/MM/y
 						E, dd/MM/y
-						MM/y
-						MMM y
+						LL/y
+						LLL y
 						d MMM y
 						E, d MMM y
-						MMMM 'di' y
+						LLLL 'di' y
 						QQQ y
 						QQQQ 'di' y
+						w'º' 'simana' 'di' Y
 					
 					
 						{0} {1}
 					
 					
 						{0} – {1}
+						
+							h – h B
+						
+						
+							h:mm – h:mm B
+							h:mm – h:mm B
+						
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							LL/y GGGGG – LL/y GGGGG
+							LL/y – LL/y GGGGG
+							LL/y – LL/y GGGGG
+						
+						
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y GGGGG – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+							dd/MM/y – dd/MM/y GGGGG
+						
+						
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y GGGGG – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+							E, dd/MM/y – E, dd/MM/y GGGGG
+						
+						
+							LLL y G – LLL y G
+							LLL – LLL y G
+							LLL y – LLL y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h a – h a
 							h – h a
@@ -1173,7 +1330,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							HH – HH v
 						
 						
-							M – M
+							L – L
 						
 						
 							dd/MM – dd/MM
@@ -1198,8 +1355,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							y – y
 						
 						
-							MM/y – MM/y
-							MM/y – MM/y
+							LL/y – LL/y
+							LL/y – LL/y
 						
 						
 							dd/MM/y – dd/MM/y
@@ -1212,8 +1369,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, dd/MM/y – E, dd/MM/y
 						
 						
-							MMM – MMM y
-							MMM y – MMM y
+							LLL – LLL y
+							LLL y – LLL y
 						
 						
 							d – d MMM y
@@ -1226,8 +1383,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, d MMM y – E, d MMM y
 						
 						
-							MMMM – MMMM 'di' y
-							MMMM y – MMMM y
+							LLLL – LLLL 'di' y
+							LLLL y – LLLL y
 						
 					
 				
@@ -1235,10 +1392,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			
-				Era
+				era
 			
 			
-				Anu
+				anu
 				anu pasadu
 				es anu li
 				prósimu anu
@@ -1268,7 +1425,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Trimestri
+				trimestri
+				trimestri pasadu
+				es trimestri li
+				prósimu trimestri
 				
 					di li {0} trimestri
 				
@@ -1295,7 +1455,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Mes
+				mes
 				mes pasadu
 				es mes li
 				prósimu mes
@@ -1325,7 +1485,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Simana
+				simana
 				simana pasadu
 				es simana li
 				prósimu simana
@@ -1335,6 +1495,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					a ten {0} simana
 				
+				simana di {0}
 			
 			
 				sim.
@@ -1344,6 +1505,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					a ten {0} sim.
 				
+				sim. di {0}
 			
 			
 				sim.
@@ -1353,12 +1515,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					a ten {0} sim.
 				
+				sim. di {0}
+			
+			
+				simana di mes
+			
+			
+				sim. di mes
+			
+			
+				sim. di mes
 			
 			
-				Dia
+				dia
 				onti
 				oji
-				manha
+				manhan
 				
 					di li {0} dia
 				
@@ -1368,6 +1540,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				dia
+				onti
+				oji
+				manhan
 				
 					di li {0} dia
 				
@@ -1377,6 +1552,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				dia
+				onti
+				oji
+				manhan
 				
 					di li {0} dia
 				
@@ -1384,119 +1562,267 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					a ten {0} dia
 				
 			
+			
+				dia di anu
+			
+			
+				dia di anu
+			
+			
+				dia di anu
+			
 			
-				Dia di simana
+				dia di simana
+			
+			
+				dia di sim.
+			
+			
+				dia di simana di mes
+			
+			
+				dia di sim. di mes
+			
+			
+				dia di sim. di mes
 			
 			
 				dumingu pasadu
 				es dumingu li
 				prósimu dumingu
+				
+					di li {0} dumingu
+				
+				
+					a ten {0} dumingu
+				
 			
 			
 				dum. pasadu
 				es dum. li
 				prósimu dum.
+				
+					di li {0} dum.
+				
+				
+					a ten {0} dum.
+				
 			
 			
 				dum. pasadu
 				es dum. li
 				prósimu dum.
+				
+					di li {0} dum.
+				
+				
+					a ten {0} dum.
+				
 			
 			
 				sigunda-fera pasadu
 				es sigunda-fera li
 				prósimu sigunda-fera
+				
+					di li {0} sigunda-fera
+				
+				
+					a ten {0} sigunda-fera
+				
 			
 			
 				sig. pasadu
 				es sig. li
 				prósimu sig.
+				
+					di li {0} sig.
+				
+				
+					a ten {0} sig.
+				
 			
 			
 				sig. pasadu
 				es sig. li
 				prósimu sig.
+				
+					di li {0} sig.
+				
+				
+					a ten {0} sig.
+				
 			
 			
 				tersa-fera pasadu
 				es tersa-fera li
 				prósimu tersa-fera
+				
+					di li {0} tersa-fera
+				
+				
+					a ten {0} tersa-fera
+				
 			
 			
 				ter. pasadu
 				es ter. li
 				prósimu ter.
+				
+					di li {0} ter.
+				
+				
+					a ten {0} ter.
+				
 			
 			
 				ter. pasadu
 				es ter. li
 				prósimu ter.
+				
+					di li {0} ter.
+				
+				
+					a ten {0} ter.
+				
 			
 			
 				kuarta-fera pasadu
 				es kuarta-fera li
 				prósimu kuarta-fera
+				
+					di li {0} kuarta-fera
+				
+				
+					a ten {0} kuarta-fera
+				
 			
 			
 				kua. pasadu
 				es kua. li
 				prósimu kua.
+				
+					di li {0} kua.
+				
+				
+					a ten {0} kua.
+				
 			
 			
 				kua. pasadu
 				es kua. li
 				prósimu kua.
+				
+					di li {0} kua.
+				
+				
+					a ten {0} kua.
+				
 			
 			
 				kinta-fera pasadu
 				es kinta-fera li
 				prósimu kinta-fera
+				
+					di li {0} kinta-fera
+				
+				
+					a ten {0} kinta-fera
+				
 			
 			
 				kin. pasadu
 				es kin. li
 				prósimu kin.
+				
+					di li {0} kin.
+				
+				
+					a ten {0} kin.
+				
 			
 			
 				kin. pasadu
 				es kin. li
 				prósimu kin.
+				
+					di li {0} kin.
+				
+				
+					a ten {0} kin.
+				
 			
 			
 				sesta-fera pasadu
 				es sesta-fera li
 				prósimu sesta-fera
+				
+					di li {0} sesta-fera
+				
+				
+					a ten {0} sesta-fera
+				
 			
 			
 				ses. pasadu
 				es ses. li
 				prósimu ses.
+				
+					di li {0} ses.
+				
+				
+					a ten {0} ses.
+				
 			
 			
 				ses. pasadu
 				es ses. li
 				prósimu ses.
+				
+					di li {0} ses.
+				
+				
+					a ten {0} ses.
+				
 			
 			
 				sabadu pasadu
 				es sabadu li
 				prósimu sabadu
+				
+					di li {0} sabadu
+				
+				
+					a ten {0} sabadu
+				
 			
 			
 				sab. pasadu
 				es sab. li
 				prósimu sab.
+				
+					di li {0} sab.
+				
+				
+					a ten {0} sab.
+				
 			
 			
 				sab. pasadu
 				es sab. li
 				prósimu sab.
+				
+					di li {0} sab.
+				
+				
+					a ten {0} sab.
+				
 			
 			
 				am/pm
 			
 			
-				Ora
+				ora
+				es ora li
 				
 					di li {0} ora
 				
@@ -1523,7 +1849,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Minutu
+				minutu
+				es minutu li
 				
 					di li {0} minutu
 				
@@ -1550,7 +1877,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Sigundu
+				sigundu
+				agora
 				
 					di li {0} sigundu
 				
@@ -1577,7 +1905,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Ora lokal
+				ora lokal
 			
 		
 		
@@ -1585,11 +1913,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			GMT{0}
 			GMT
 			Ora di {0}
-			Ora di {0} (verãu)
-			Ora di {0} (normal)
+			Ora di Veron di {0}
+			Ora Padron di {0}
 			{1} ({0})
+			
+				
+					Ora Universal Kordenadu
+				
+			
 			
-				Sidadi Diskonxedu
+				Sidadi diskonxedu
 			
 			
 				Bermuda
@@ -1597,113 +1930,161 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Blank-Sablon
 			
+			
+				Kosta Rika
+			
+			
+				
+					Ora di Veron Britániku
+				
+			
+			
+				
+					Ora Padron di Irlanda
+				
+			
+			
+				Xiuáua
+			
+			
+				Kankun
+			
+			
+				Xikagu
+			
 			
 				Indianapolis
 			
 			
 				
-					Ora di Afrika Sentral
+					Ora di Áfrika Sentral
 				
 			
 			
 				
-					Ora di Afrika Oriental
+					Ora di Áfrika Oriental
 				
 			
 			
 				
-					Ora di Sul di Afrika
+					Ora di Sul di Áfrika
 				
 			
 			
 				
-					Ora di Afrika Osidental
-					Ora Padrãu di Afrika Osidental
-					Ora di Verão di Afrika Osidental
+					Ora di Áfrika Osidental
+					Ora Padron di Áfrika Osidental
+					Ora di Veron di Áfrika Osidental
+				
+			
+			
+				
+					Ora di Alaska
+					Ora Padron di Alaska
+					Ora di Veron di Alaska
 				
 			
 			
 				
 					Ora Sentral
-					Ora Sentral Padrãu
-					Ora Sentral di Verãu
+					Ora Padron Sentral
+					Ora di Veron Sentral
 				
 			
 			
 				
 					Ora Oriental
-					Ora Oriental Padrãu
-					Ora Oriental di Verãu
+					Ora Padron Oriental
+					Ora di Veron Oriental
 				
 			
 			
 				
 					Ora di Montanha
-					Ora di Montanha Padrãu
-					Ora di Verãu di Montanha
+					Ora Padron di Montanha
+					Ora di Veron di Montanha
 				
 			
 			
 				
-					Ora di Pasifiku
-					Ora di Pasifiku Padrãu
-					Ora di Pasifiku di Verãu
+					Ora di Pasífiku
+					Ora Padron di Pasífiku
+					Ora di Veron di Pasífiku
 				
 			
 			
 				
-					Ora di Atlantiku
-					Ora Padrãu di Atlantiku
-					Ora di Verãu di Atlantiku
+					Ora di Atlántiku
+					Ora Padron di Atlántiku
+					Ora di Veron di Atlántiku
 				
 			
 			
 				
-					Ora di Australia Sentral
-					Ora Padrãu di Australia Sentral
-					Ora di Verãu di Australia Sentral
+					Ora di Austrália Sentral
+					Ora Padron di Austrália Sentral
+					Ora di Veron di Austrália Sentral
 				
 			
 			
 				
-					Ora di Autralia Sentru-Osidental
-					Ora Padrãu di Australia Sentru-Osidental
-					Ora di Verãu di Australia Sentru-Osidental
+					Ora di Austrália Sentru-Osidental
+					Ora Padron di Austrália Sentru-Osidental
+					Ora di Veron di Austrália Sentru-Osidental
 				
 			
 			
 				
-					Ora di Australia Oriental
-					Ora Padrãu di Australia Oriental
-					Ora di Verãu di Australia Oriental
+					Ora di Austrália Oriental
+					Ora Padron di Austrália Oriental
+					Ora di Veron di Austrália Oriental
 				
 			
 			
 				
-					Ora di Australia Osidental
-					Ora Padrãu di Australia Osidental
-					Ora di Verãu di Australia Osidental
+					Ora di Austrália Osidental
+					Ora Padron di Austrália Osidental
+					Ora di Veron di Austrália Osidental
+				
+			
+			
+				
+					Ora di Kabu Verdi
+					Ora Padron di Kabu Verdi
+					Ora di Veron de Kabu Verdi
+				
+			
+			
+				
+					Ora di Kuba
+					Ora Padron di Kuba
+					Ora di Veron di Kuba
 				
 			
 			
 				
 					Ora di Europa Sentral
-					Ora Padrãu di Europa Sentral
-					Ora di Verãu di Europa Sentral
+					Ora Padron di Europa Sentral
+					Ora di Veron di Europa Sentral
 				
 			
 			
 				
 					Ora di Europa Oriental
-					Ora Padrãu di Europa Oriental
-					Ora di Verãu di Europa Oriental
+					Ora Padron di Europa Oriental
+					Ora di Veron di Europa Oriental
 				
 			
 			
 				
 					Ora di Europa Osidental
-					Ora Padrãu di Europa Osidental
-					Ora di Verãu di Europa Osidental
+					Ora Padron di Europa Osidental
+					Ora di Veron di Europa Osidental
+				
+			
+			
+				
+					Ora Médiu di Greenwich
 				
 			
 		
@@ -1906,7 +2287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Skudu Kabuverdianu
 				Skudu Kabuverdianu
-				​ 
+				​
 				$
 			
 			
@@ -1928,8 +2309,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				DZD
 			
 			
-				Libra ejipsiu
-				Libra ejipsiu
+				Libra ejípsiu
+				Libra ejípsiu
 				EGP
 			
 			
@@ -1938,8 +2319,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ERN
 			
 			
-				Bir etiopi
-				Bir etiopi
+				Bir etiópiku
+				Bir etiópiku
 				ETB
 			
 			
@@ -1955,8 +2336,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				FKP
 			
 			
-				Libra britaniku
-				Libra britaniku
+				Libra britániku
+				Libra britániku
 				£
 				£
 			
@@ -2082,8 +2463,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				LTL
 			
 			
-				Dinar libiu
-				Dinar libiu
+				Dinar líbiu
+				Dinar líbiu
 				LYD
 			
 			
@@ -2258,8 +2639,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				STD
 			
 			
-				Dobra di Sãu Tume i Prínsipi
-				Dobra di Sãu Tume i Prinsipi
+				Dobra di San Tume i Prínsipi
+				Dobra di San Tume i Prinsipi
 			
 			
 				SYP
@@ -2371,18 +2752,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			+{0}
-			{0}–{1}
+			{0} – {1}
 		
+		
+			{0} dia
+			{0}º lugar
+		
 	
 	
 		
+			
+				{0} pur {1}
+			
+			
+				{0}-{1}
+			
 			
 				forsa G
 				{0} forsa G
 			
 			
-				métru pur sigundu kuadradu
-				{0} métru pur sigundu kuadradu
+				metru pur sigundu kuadradu
+				{0} metru pur sigundu kuadradu
 			
 			
 				volta
@@ -2461,6 +2852,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				parti pur milhãu
 				{0} parti pur milhãu
 			
+			
+				pursentu
+				{0} pursentu
+			
+			
+				pur mil
+				{0} pur mil
+			
+			
+				pontu bazi
+				{0} pontu bazi
+			
 			
 				litru pur kilómetru
 				{0} litru pur kilómetru
@@ -2477,6 +2880,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				milha pur galãu imperial
 				{0} milha pur galãu imperial
 			
+			
+				petabyte
+				{0} petabyte
+			
 			
 				terabyte
 				{0} terabyte
@@ -2521,6 +2928,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sékulu
 				{0} sékulu
 			
+			
+				dékada
+				{0} dékada
+			
 			
 				anu
 				{0} anu
@@ -2568,6 +2979,107 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				nanosigundu
 				{0} nanosigundu
 			
+			
+				amper
+				{0} amper
+			
+			
+				miliamper
+				{0} miliamper
+			
+			
+				{0} ohm
+			
+			
+				{0} volt
+			
+			
+				kilokaloria
+				{0} kilokaloria
+			
+			
+				kaloria
+				{0} kaloria
+			
+			
+				Kaloria
+				{0} Kaloria
+			
+			
+				kilojoule
+				{0} kilojoule
+			
+			
+				{0} joule
+			
+			
+				kilowatt-ora
+				{0} kilowatt-ora
+			
+			
+				eleton-volt
+				{0} eletron-volt
+			
+			
+				unidadi térmiku britániku
+				{0} unidadi térmiku britániku
+			
+			
+				unidadi térmiku merkanu
+				{0} unidadi térmiku merkanu
+			
+			
+				libra di forsa
+				{0} libra di forsa
+			
+			
+				newton
+				{0} newton
+			
+			
+				jigaertz
+				{0} jigaertz
+			
+			
+				megaertz
+				{0} megaertz
+			
+			
+				kiloertz
+				{0} kiloertz
+			
+			
+				ertz
+				{0} ertz
+			
+			
+				emi tipográfiku
+				{0} emi tipográfiku
+			
+			
+				piksel
+				{0} piksel
+			
+			
+				megapiksel
+				{0} megapiksel
+			
+			
+				piksel pur sentímetru
+				{0} piksel pur sentímetru
+			
+			
+				piksel pur pulegada
+				{0} piksel pur pulegada
+			
+			
+				pontu pur sentímeru
+				{0} pontu pur sentímetru
+			
+			
+				pontu pur pulegada
+				{0} pontu pur pulegada
+			
 			
 				kilómetru
 				{0} kilómetru
@@ -2641,36 +3153,191 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				milha skandinavu
 				{0} milha skandinavu
 			
+			
+				pontu
+				{0} pontu
+			
+			
+				raiu solar
+				{0} raiu solar
+			
 			
 				lux
 				{0} lux
 			
+			
+				luminozidadi solar
+				{0} luminozidadi solar
+			
+			
+				tonelada métriku
+				{0} tonelada métriku
+			
+			
+				kilograma
+				{0} kilograma
+				{0} pur kilograma
+			
+			
+				grama
+				{0} grama
+				{0} pur grama
+			
+			
+				miligrama
+				{0} miligrama
+			
+			
+				mikrograma
+				{0} mikrograma
+			
+			
+				tonelada
+				{0} tonelada
+			
+			
+				libra
+				{0} libra
+				{0} pur libra
+			
+			
+				ónsa
+				{0} ónsa
+				{0} pur ónsa
+			
+			
+				ónsa troy
+				{0} ónsa troy
+			
+			
+				kilati
+				{0} kilati
+			
+			
+				dalton
+				{0} dalton
+			
+			
+				masa di Tera
+				{0} masa di Tera
+			
+			
+				masa di Sol
+				{0} masa di Sol
+			
+			
+				jigawatt
+				{0} jigawatt
+			
+			
+				megawatt
+				{0} megawatt
+			
+			
+				kilowatt
+				{0} kilowatt
+			
 			
 				watt
+				{0} watt
+			
+			
+				miliwatt
+				{0} miliwatt
+			
+			
+				kabalu-vapor
+				{0} kabalu-vapor
+			
+			
+				milímetru di merkúriu
+				{0} milímetru di merkúriu
+			
+			
+				libra pur pulegada kuadradu
+				{0} libra pur pulegada kuadradu
+			
+			
+				pulegada di merkúriu
+				{0} pulegada di merkúriu
+			
+			
+				bar
+				{0} bar
+			
+			
+				milibar
+				{0} milibar
+			
+			
+				atmosfera
+				{0} atmosfera
+			
+			
+				paskal
+				{0} paskal
+			
+			
+				ektopaskal
+				{0} ektopaskal
+			
+			
+				kilopaskal
+				{0} kilopaskal
+			
+			
+				megapaskal
+				{0} megapaskal
 			
 			
 				kilómetru pur ora
 				{0} kilómetru pur ora
 			
 			
-				métru pur sigundu
-				{0} métru pur sigundu
+				metru pur sigundu
+				{0} metru pur sigundu
 			
 			
 				milha pur ora
 				{0} milha pur ora
 			
+			
+				nó
+				{0} nó
+			
+			
+				grau Celsius
+				{0} grau Celsius
+			
+			
+				grau Fahrenheit
+				{0} grau Fahrenheit
+			
+			
+				kelvin
+				{0} kelvin
+			
+			
+				pe-libra
+				{0} pe-libra
+			
+			
+				newton-metru
+				{0} newton-metru
+			
 			
 				kilómetru kúbiku
 				{0} kilómetru kúbiku
 			
 			
-				métru kúbiku
-				{0} métru kúbiku
+				metru kúbiku
+				{0} metru kúbiku
+				{0} pur metru kúbiku
 			
 			
 				sentímetru kúbiku
 				{0} sentímetru kúbiku
+				{0} pur sentímetru kúbiku
 			
 			
 				milha kúbiku
@@ -2699,6 +3366,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				litru
 				{0} litru
+				{0} pur litru
 			
 			
 				desilitru
@@ -2712,6 +3380,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mililitru
 				{0} mililitru
 			
+			
+				pint métriku
+				{0} pint métriku
+			
+			
+				xávina métriku
+				{0} xávina métriku
+			
 			
 				ákri-pé
 				{0} ákri-pé
@@ -2719,6 +3395,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				galãu
 				{0} galãu
+				{0} pur galãu
+			
+			
+				galãu imperial
+				{0} galãu imperial
+				{0} pur galãu imperial
 			
 			
 				kuart
@@ -2736,6 +3418,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ónsa fluídu
 				{0} ónsa fluídu
 			
+			
+				ónsa fluídu imperial
+				{0} ónsa fluídu imperial
+			
 			
 				kudjer di sopa
 				{0} kudjer di sopa
@@ -2744,15 +3430,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kudjer di xá
 				{0} kudjer di xá
 			
+			
+				baril
+				{0} baril
+			
+			
+				direson kardial
+				{0} esti
+				{0} norti
+				{0} sul
+				{0} oesti
+			
 		
 		
 			
 				G
-				{0} G
-			
-			
-				m/s²
-				{0} m/s²
 			
 			
 				vol
@@ -2891,6 +3583,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sék.
 				{0} sék.
 			
+			
+				dék.
+				{0} dék.
+			
 			
 				anu
 				{0} anu
@@ -2970,10 +3666,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kJ
 				{0} kJ
 			
+			
+				J
+			
 			
 				kWh
 				{0} kWh
 			
+			
+				thm SU
+				{0} thm SU
+			
 			
 				GHz
 				{0} GHz
@@ -3063,43 +3766,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				smi
 				{0} smi
 			
+			
+				pontu
+				{0} pt
+			
+			
+				raiu solar
+			
 			
 				lux
 				{0} lx
 			
-			
-				t
-				{0} t
-			
 			
-				{0} g
-			
-			
-				mg
-				{0} mg
-			
-			
-				µg
-				{0} µg
+				g
 			
 			
-				tn
-				{0} tn
-			
-			
-				lb
-				{0} lb
-			
-			
-				oz
-				{0} oz
-			
-			
-				oz t
-				{0} oz t
+				ton
+				{0} ton
 			
 			
-				{0} CD
+				kt
+				{0} kt
 			
 			
 				GW
@@ -3121,69 +3808,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mW
 				{0} mW
 			
-			
-				hPa
-				{0} hPa
+			
+				cv
+				{0} cv
 			
-			
-				mm Hg
-				{0} mm Hg
+			
+				{0} °C
 			
-			
-				psi
-				{0} psi
-			
-			
-				inHg
-				{0} inHg
-			
-			
-				mbar
-				{0} mbar
-			
-			
-				km/h
-				{0} km/h
-			
-			
-				m/s
-				{0} m/s
-			
-			
-				mi/h
-				{0} mi/h
-			
-			
-				K
-				{0} K
-			
-			
-				km³
-				{0} km³
-			
-			
-				m³
-				{0} m³
-			
-			
-				cm³
-				{0} cm³
-			
-			
-				mi³
-				{0} mi³
-			
-			
-				yd³
-				{0} yd³
-			
-			
-				ft³
-				{0} ft³
-			
-			
-				in³
-				{0} in³
+			
+				{0} °F
 			
 			
 				Ml
@@ -3195,7 +3828,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				l
-				{0} l
 			
 			
 				dl
@@ -3209,6 +3841,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ml
 				{0} ml
 			
+			
+				ptm
+				{0} ptm
+			
+			
+				xávm
+				{0} xávm
+			
 			
 				ac ft
 				{0} ac ft
@@ -3216,6 +3856,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				gal
 				{0} gal
+				{0}/gal
+			
+			
+				gal imp.
+				{0} gal imp.
+				{0}/gal imp.
 			
 			
 				qt
@@ -3226,21 +3872,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} pt
 			
 			
-				xáv.
-				{0} xáv.
+				xáv
+				{0} xáv
 			
 			
 				fl oz
 				{0} fl oz
 			
+			
+				fl oz imp.
+				{0} fl oz imp.
+			
 			
-				k.sp.
-				{0} k.sp.
+				ks
+				{0} ks
 			
 			
-				k.xá
-				{0} k.xá
+				kx
+				{0} kx
 			
+			
+				direson
+				{0} E
+				{0} N
+				{0} S
+				{0} W
+			
 		
 		
 			
@@ -3296,11 +3953,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mm
 			
 			
-				kg
-				{0} kg
+				{0}kg
 			
 			
-				{0} g
+				g
 			
 			
 				km/h
@@ -3310,6 +3966,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				l
 				{0} l
 			
+			
+				direson
+			
 		
 		
 			h:mm
@@ -3328,6 +3987,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} i {1}
 			{0} i {1}
 		
+		
+			{0} o {1}
+			{0} o {1}
+		
+		
+			{0} o {1}
+			{0} o {1}
+		
+		
+			{0} o {1}
+			{0} o {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/kea_CV.xml b/make/data/cldr/common/main/kea_CV.xml
index bc70bcf3fe9..6993cbdcd02 100644
--- a/make/data/cldr/common/main/kea_CV.xml
+++ b/make/data/cldr/common/main/kea_CV.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/khq.xml b/make/data/cldr/common/main/khq.xml
index baeffedd234..fd81ed09457 100644
--- a/make/data/cldr/common/main/khq.xml
+++ b/make/data/cldr/common/main/khq.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldovi
 			Madagascar
 			Maršal gungey
-			Maacedooni
 			Maali
 			Maynamar
 			Mongooli
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]
 		[v]
 		[A Ã B C D E Ẽ F G H I J K L M N Ɲ Ŋ O Õ P Q R S Š T U W X Y Z Ž]
-		[  \- . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/khq_ML.xml b/make/data/cldr/common/main/khq_ML.xml
index 8c0268cb8e7..997afb4f4b2 100644
--- a/make/data/cldr/common/main/khq_ML.xml
+++ b/make/data/cldr/common/main/khq_ML.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ki.xml b/make/data/cldr/common/main/ki.xml
index 59665a3ae78..aacf794a7db 100644
--- a/make/data/cldr/common/main/ki.xml
+++ b/make/data/cldr/common/main/ki.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/ki_KE.xml b/make/data/cldr/common/main/ki_KE.xml
index 0d791310620..cfc516a71a4 100644
--- a/make/data/cldr/common/main/ki_KE.xml
+++ b/make/data/cldr/common/main/ki_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kk.xml b/make/data/cldr/common/main/kk.xml
index 1a7b9bbaae4..7fbc96b675d 100644
--- a/make/data/cldr/common/main/kk.xml
+++ b/make/data/cldr/common/main/kk.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -323,7 +323,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			руа тілі
 			санскрит тілі
 			сандаве тілі
-			якут тілі
+			саха тілі
 			самбуру тілі
 			сантали тілі
 			нгамбай тілі
@@ -415,10 +415,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			идиш тілі
 			йоруба тілі
 			кантон тілі
+			қытай тілі (кантон)
 			марокколық стандартты тамазигхт тілі
 			қытай тілі
+			қытай тілі (мандарин)
 			жеңілдетілген қытай тілі
+			жеңілдетілген қытай тілі (мандарин)
 			дәстүрлі қытай тілі
+			дәстүрлі қытай тілі (мандарин)
 			зулу тілі
 			зуни тілі
 			тілдік мазмұны жоқ
@@ -551,6 +555,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Конго Республикасы
 			Швейцария
 			Кот-д’Ивуар
+			Кот-д’Ивуар
 			Кук аралдары
 			Чили
 			Камерун
@@ -733,6 +738,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Синт-Мартен
 			Сирия
 			Свазиленд
+			Свазиленд
 			Тристан-да-Кунья
 			Теркс және Кайкос аралдары
 			Чад
@@ -875,8 +881,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а ә б в г ғ д е ё ж з и й к қ л м н ң о ө п р с т у ұ ү ф х һ ц ч ш щ ъ ы і ь э ю я]
 		[]
 		[А Ә Б В Г Ғ Д Е Ё Ж З И Й К Қ Л М Н Ң О Ө П Р С Т У Ұ Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы І Ь Э Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] \{ \} § @ * / \& #]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -884,30 +890,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		… {0}
 		{0} … {1}
 		?
-		
-			[\--/]
-			[\:∶︓﹕：]
-		
-		
-			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
-			[\$﹩＄]
-			[£₤￡]
-			[¥￥]
-			[₩￦]
-			[₨₹{Rp}{Rs}]
-		
-		
-			[\-‐‒–⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
-		
-		
-			[,٫︐﹐，]
-			[.․﹒．｡]
-		
 	
 	
 		«
@@ -1039,32 +1021,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
 						
 							G y 'ж'. d–d MMM
 							G y 'ж'. d MMM – G y 'ж'. d MMM
@@ -1451,9 +1407,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						б.з.д.
-						BCE
+						BCE
 						б.з.
-						CE
+						CE
 					
 				
 				
@@ -1588,32 +1544,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
 						
 							G y 'ж'. d–d MMM
 							G y 'ж'. d MMM – G y 'ж'. d MMM
@@ -2836,7 +2766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Аддис-Абеба
 			
 			
-				Хелсинки
+				Хельсинки
 			
 			
 				Фиджи
@@ -2893,7 +2823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Нуук
 			
 			
-				Скорсбиссун
+				Иттоккортоормиит
 			
 			
 				Денмарксхавн
@@ -3045,6 +2975,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ақтөбе
 			
+			
+				Қостанай
+			
 			
 				Қызылорда
 			
@@ -3121,7 +3054,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ховд
 			
 			
-				Улан-Батор
+				Ұланбатыр
 			
 			
 				Чойбалсан
@@ -3547,7 +3480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Метлакатла
 			
 			
-				Лос-Анжелес
+				Лос-Анджелес
 			
 			
 				Бойсе
@@ -4551,17 +4484,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			latn
 		
+		1
 		
 			,
 			 
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			сан емес
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 мың
@@ -4783,6 +4725,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Бермуд доллары
 				Бермуд доллары
 				Бермуд доллары
+				BMD
 				$
 			
 			
@@ -4850,6 +4793,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Канада доллары
 				Канада доллары
 				Канада доллары
+				CA$
 				$
 			
 			
@@ -4875,12 +4819,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Қытай юані (офшор)
 				Қытай юані (офшор)
 				Қытай юані (офшор)
+				CNH
 			
 			
 				Қытай юані
 				Қытай юані
 				Қытай юані
 				CN¥
+				¥
 			
 			
 				Колумбия песосы
@@ -5001,7 +4947,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Грузия лариі
 				Грузия лариі
 				GEL
-				₾
 				₾
 			
 			
@@ -5196,6 +5141,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Қазақстан теңгесі
 				Қазақстан теңгесі
 				₸
+				₸
 			
 			
 				Лаос кипі
@@ -5296,7 +5242,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мавритания угиясы
 				Мавритания угиясы
 				Мавритания угиясы
-				MRU
 			
 			
 				Маврикий рупиясы
@@ -5442,7 +5387,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Румыния лейі
 				Румыния лейі
 				RON
-				lei
 			
 			
 				Сербия динары
@@ -5546,7 +5490,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сант-Томе мен Принсипи добрасы
 				Сант-Томе мен Принсипи добрасы
 				Сант-Томе мен Принсипи добрасы
-				STN
 				Db
 			
 			
@@ -5666,7 +5609,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Венесуэла боливары
 				Венесуэла боливары
 				Венесуэла боливары
-				VES
 			
 			
 				Вьетнам донгі
@@ -5795,7 +5737,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шаршы километр
 				{0} шаршы километр
 				{0} шаршы километр
-				{0}/км²
+				{0}/шаршы километр
 			
 			
 				гектар
@@ -5806,19 +5748,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шаршы метр
 				{0} шаршы метр
 				{0} шаршы метр
-				{0}/метр²
+				{0}/шаршы метр
 			
 			
 				шаршы сантиметр
 				{0} шаршы сантиметр
 				{0} шаршы сантиметр
-				{0}/см²
+				{0}/шаршы сантиметр
 			
 			
 				шаршы миля
 				{0} шаршы миля
 				{0} шаршы миля
-				{0}/миля²
+				{0}/шаршы миля
 			
 			
 				акр
@@ -5839,7 +5781,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шаршы дюйм
 				{0} шаршы дюйм
 				{0} шаршы дюйм
-				{0}/дюйм²
+				{0}/шаршы дюйм
 			
 			
 				дунам
@@ -5966,6 +5908,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ғасыр
 				{0} ғасыр
 			
+			
+				декада
+				{0} декада
+				{0} декада
+			
 			
 				жыл
 				{0} жыл
@@ -6083,6 +6030,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} британдық жылу бірлігі
 				{0} британдық жылу бірлігі
 			
+			
+				америка термі
+				{0} америка термі
+				{0} америка термі
+			
 			
 				фунт-күш
 				{0} фунт-күш
@@ -6113,6 +6065,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} герц
 				{0} герц
 			
+			
+				типографиялық эм
+				{0} эм
+				{0} эм
+			
+			
+				пиксель
+				{0} пиксель
+				{0} пиксель
+			
+			
+				мегапиксель
+				{0} мегапиксель
+				{0} мегапиксель
+			
+			
+				пиксель/сантиметр
+				{0} пиксель/сантиметр
+				{0} пиксель/сантиметр
+			
+			
+				пиксель/дюйм
+				{0} пиксель/дюйм
+				{0} пиксель/дюйм
+			
+			
+				нүкте/сантиметр
+				{0} нүкте/сантиметр
+				{0} нүкте/сантиметр
+			
+			
+				нүкте/дюйм
+				{0} нүкте/дюйм
+				{0} нүкте/дюйм
+			
 			
 				километр
 				{0} километр
@@ -6204,9 +6191,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} скандинавиялық миля
 			
 			
-				ұпай
-				{0} ұпай
-				{0} ұпай
+				пункт
+				{0} пункт
+				{0} пункт
 			
 			
 				Күн радиусы
@@ -6322,15 +6309,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ат күші
 				{0} ат күші
 			
-			
-				гектопаскаль
-				{0} гектопаскаль
-				{0} гектопаскаль
-			
 			
-				сынап бағанасының миллиметрі
-				сынап бағанасының {0} миллиметрі
-				сынап бағанасының {0} миллиметрі
+				миллиметр сынап бағанасы
+				{0} миллиметр сынап бағанасы
+				{0} миллиметр сынап бағанасы
 			
 			
 				фунт/шаршы дюйм
@@ -6338,9 +6320,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} фунт/шаршы дюйм
 			
 			
-				сынап бағанасының дюймы
-				сынап бағанасының {0} дюймы
-				сынап бағанасының {0} дюймы
+				дюйм сынап бағанасы
+				{0} дюйм сынап бағанасы
+				{0} дюйм сынап бағанасы
+			
+			
+				бар
+				{0} бар
+				{0} бар
 			
 			
 				миллибар
@@ -6352,6 +6339,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфера
 				{0} атмосфера
 			
+			
+				паскаль
+				{0} паскаль
+				{0} паскаль
+			
+			
+				гектопаскаль
+				{0} гектопаскаль
+				{0} гектопаскаль
+			
 			
 				килопаскаль
 				{0} килопаскаль
@@ -6421,13 +6418,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				текше метр
 				{0} текше метр
 				{0} текше метр
-				{0}/метр³
+				{0}/текше метр
 			
 			
 				текше сантиметр
 				{0} текше сантиметр
 				{0} текше сантиметр
-				{0}/сантиметр³
+				{0}/текше сантиметр
 			
 			
 				текше миля
@@ -6651,8 +6648,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				карат
-				{0} КТ
-				{0} КТ
+				{0} кар.
+				{0} кар.
 			
 			
 				мг/дл
@@ -6701,13 +6698,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				миля/галлон
-				{0} mpg
-				{0} mpg
+				{0} миля/гал.
+				{0} миля/гал.
 			
 			
-				mpg Imp.
-				{0} mpg Imp.
-				{0} mpg Imp.
+				миля/имп. гал.
+				{0} миля/имп. гал.
+				{0} миля/имп. гал.
 			
 			
 				Пбайт
@@ -6769,6 +6766,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ғ.
 				{0} ғ.
 			
+			
+				декада
+				{0} декада
+				{0} декада
+			
 			
 				жыл
 				{0} ж.
@@ -6886,6 +6888,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				америка термі
+				{0} амер. термі
+				{0} амер. термі
+			
 			
 				lbf
 				{0} lbf
@@ -6916,6 +6923,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Гц
 				{0} Гц
 			
+			
+				эм
+				{0} эм
+				{0} эм
+			
+			
+				Мп
+				{0} Мп
+				{0} Мп
+			
+			
+				пиксель/см
+				{0} пиксель/см
+				{0} пиксель/см
+			
+			
+				нүкте/см
+				{0} нүкте/см
+				{0} нүкте/см
+			
+			
+				нүкте/дюйм
+				{0} нүкте/дюйм
+				{0} нүкте/дюйм
+			
 			
 				км
 				{0} км
@@ -6955,7 +6987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} нм
 			
 			
-				пикометр
+				пм
 				{0} пм
 				{0} пм
 			
@@ -7007,7 +7039,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} smi
 			
 			
-				ұпай
+				пункт
 				{0} ұпай
 				{0} ұпай
 			
@@ -7077,8 +7109,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				карат
-				{0} КТ
-				{0} КТ
+				{0} кар.
+				{0} кар.
 			
 			
 				Да
@@ -7125,15 +7157,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} а. к.
 				{0} а. к.
 			
-			
-				гектопаскаль
-				{0} гПа
-				{0} гПа
-			
 			
-				с.б.мм.
-				{0} с.б.мм.
-				{0} с.б.мм.
+				мм с.б.
+				{0} мм с.б.
+				{0} мм с.б.
 			
 			
 				psi
@@ -7141,20 +7168,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} psi
 			
 			
-				сынап бағаны дюймі
-				{0} inHg
-				{0} inHg
+				дюйм сынап бағанасы
+				{0} дюйм с.б.
+				{0} дюйм с.б.
+			
+			
+				бар
+				{0} бар
+				{0} бар
 			
 			
 				мбар
-				{0} мб
-				{0} мб
+				{0} мбар
+				{0} мбар
 			
 			
 				атм
 				{0} атм
 				{0} атм
 			
+			
+				Па
+				{0} Па
+				{0} Па
+			
+			
+				гектопаскаль
+				{0} гПа
+				{0} гПа
+			
 			
 				кПа
 				{0} кПа
@@ -7244,8 +7286,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				фут³
-				{0} фт³
-				{0} фт³
+				{0} фут³
+				{0} фут³
 			
 			
 				дюйм³
@@ -7289,7 +7331,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpt
 			
 			
-				м. кесе
 				{0} mc
 				{0} mc
 			
@@ -7299,15 +7340,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} aкро-фут
 			
 			
-				gal
-				{0} gal
-				{0} gal
-				{0}/gal
+				гал.
+				{0} гал.
+				{0} гал.
+				{0}/гал.
 			
 			
 				имп. галлон
-				{0} gal Imp.
-				{0} gal Imp.
+				{0} имп. гал.
+				{0} имп. гал.
 				{0}/имп. галлон
 			
 			
@@ -7326,9 +7367,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к.
 			
 			
-				fl oz
-				{0} fl oz
-				{0} fl oz
+				сұй. унц.
+				{0} сұй. унц.
+				{0} сұй. унц.
 			
 			
 				имп. fl oz
@@ -7526,10 +7567,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ат күші
 				{0} ат күші
 			
-			
-				{0} гПа
-				{0} гПа
-			
 			
 				{0} inHg
 				{0} inHg
@@ -7538,6 +7575,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мб
 				{0} мб
 			
+			
+				{0} гПа
+				{0} гПа
+			
 			
 				км/сағ
 				{0} км/сағ
@@ -7604,16 +7645,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, не болмаса {1}
 			{0} не {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0} және {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
 			{0} және {1}
 		
 		
diff --git a/make/data/cldr/common/main/kk_KZ.xml b/make/data/cldr/common/main/kk_KZ.xml
index 068a7afafd5..b5daa29231e 100644
--- a/make/data/cldr/common/main/kk_KZ.xml
+++ b/make/data/cldr/common/main/kk_KZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kkj.xml b/make/data/cldr/common/main/kkj.xml
index 73319e95953..76baccdb320 100644
--- a/make/data/cldr/common/main/kkj.xml
+++ b/make/data/cldr/common/main/kkj.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -24,7 +24,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à â {a\u0327} b ɓ c d ɗ {ɗy} e é è ê ɛ {ɛ\u0301} {ɛ\u0300} {ɛ\u0302} {ɛ\u0327} f g {gb} {gw} h i í ì î {i\u0327} j k {kp} {kw} l m {mb} n {nd} nj {ny} ŋ {ŋg} {ŋgb} {ŋgw} o ó ò ô ɔ {ɔ\u0301} {ɔ\u0300} {ɔ\u0302} {ɔ\u0327} p r s t u ú ù û {u\u0327} v w y]
 		[q x z]
 		[A B Ɓ C D Ɗ {Ɗy} E Ɛ F G {Gb} {Gw} H I {I\u0327} J K {Kp} {Kw} L M {Mb} N {Nd} Nj {Ny} Ŋ {Ŋg} {Ŋgb} {Ŋgw} O Ɔ {Ɔ\u0327} P R S T U {U\u0327} V W Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[, \: ! ? . … ‘ ‹ › “ ” « » ( ) *]
 	
 	
diff --git a/make/data/cldr/common/main/kkj_CM.xml b/make/data/cldr/common/main/kkj_CM.xml
index d721efe89d0..9df61780cb9 100644
--- a/make/data/cldr/common/main/kkj_CM.xml
+++ b/make/data/cldr/common/main/kkj_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kl.xml b/make/data/cldr/common/main/kl.xml
index 97fa4ca5352..8acb00c1888 100644
--- a/make/data/cldr/common/main/kl.xml
+++ b/make/data/cldr/common/main/kl.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -233,7 +233,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Montenegro
 			Frankrigi Saint Martin
 			Madagaskar
-			Makedonia
 			Mali
 			Burma
 			Macao
@@ -352,9 +351,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		[a á â ã b c d e é ê f g h i í î ĩ j k l m n o ô p q r s t u ú û ũ v w x y z æ ø å]
-		[ĸ]
-		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]
+		[a b c d e f g h i j k l m n o p q r s t u v w x y z æ ø å]
+		[á â ã é ê ẽ í î ĩ ô õ ĸ ú û ũ]
+		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]
 		[, . % ‰ + − 0 1 2 3 4 5 6 7 8 9]
 		{0}…
 		…{0}
@@ -383,7 +382,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							MMM dd, y G
+							dd MMM y G
 						
 					
 					
@@ -428,8 +427,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						y-MM
 						y-MM-dd
 						E, y-MM-dd
-						MMM y
-						MMM d, y
+						LLL y
+						dd MMM y
 						E, MMM d, y
 						y QQQQ
 						y QQQQ
@@ -536,14 +535,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 						
 							jan
-							feb
+							febr
 							mar
 							apr
 							maj
 							jun
 							jul
 							aug
-							sep
+							sept
 							okt
 							nov
 							dec
@@ -563,31 +562,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							D
 						
 						
-							januari
-							februari
-							martsi
-							aprili
-							maji
-							juni
-							juli
-							augustusi
-							septemberi
-							oktoberi
-							novemberi
-							decemberi
+							januaarip
+							februaarip
+							marsip
+							apriilip
+							maajip
+							juunip
+							juulip
+							aggustip
+							septembarip
+							oktobarip
+							novembarip
+							decembarip
 						
 					
 					
 						
 							jan
-							feb
+							febr
 							mar
 							apr
 							maj
 							jun
 							jul
 							aug
-							sep
+							sept
 							okt
 							nov
 							dec
@@ -607,18 +606,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							D
 						
 						
-							januari
-							februari
-							martsi
-							aprili
-							maji
-							juni
-							juli
-							augustusi
-							septemberi
-							oktoberi
-							novemberi
-							decemberi
+							januaari
+							februaari
+							marsi
+							apriili
+							maaji
+							juuni
+							juuli
+							aggusti
+							septembari
+							oktobari
+							novembari
+							decembari
 						
 					
 				
@@ -769,7 +768,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							MMM dd, y
+							dd MMM y
 						
 					
 					
@@ -836,9 +835,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						y-MM
 						y-MM-dd
 						E, y-MM-dd
-						MMM y
-						MMM d, y
-						E, MMM d, y
+						LLL y
+						dd MMM y
+						E, dd MMM y
 						y QQQQ
 						y QQQQ
 					
@@ -1561,11 +1560,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hestekraft
 				{0} hestekrafter
 			
-			
-				hektopascali
-				{0} hektopascali
-				{0} hektopascali
-			
 			
 				tommer kviksølv
 				{0} tomme kviksølv
@@ -1576,6 +1570,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} millibari
 				{0} millibari
 			
+			
+				hektopascali
+				{0} hektopascali
+				{0} hektopascali
+			
 			
 				kilometeri per nalunaaquttap-akunnera
 				{0} kilometeri per nalunaaquttap-akunnera
@@ -1954,11 +1953,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hk
 				{0} hk
 			
-			
-				hektopascali
-				{0} hPa
-				{0} hPa
-			
 			
 				tommer kviksølv
 				{0} inHg
@@ -1969,6 +1963,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hektopascali
+				{0} hPa
+				{0} hPa
+			
 			
 				kilometeri per nalunaaquttap-akunnera
 				{0} km/h
@@ -2309,10 +2308,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}hk
 				{0}hk
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -2321,6 +2316,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				{0}km/h
 				{0}km/h
diff --git a/make/data/cldr/common/main/kl_GL.xml b/make/data/cldr/common/main/kl_GL.xml
index a701b0726e0..b425faf4cea 100644
--- a/make/data/cldr/common/main/kl_GL.xml
+++ b/make/data/cldr/common/main/kl_GL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kln.xml b/make/data/cldr/common/main/kln.xml
index a909fa5860e..1ce6588b62d 100644
--- a/make/data/cldr/common/main/kln.xml
+++ b/make/data/cldr/common/main/kln.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Emetab Moldova
 			Emetab Madagascar
 			Ikwembeiyotab Marshall
-			Emetab Macedonia
 			Emetab Mali
 			Emetab Myanmar
 			Emetab Mongolia
diff --git a/make/data/cldr/common/main/kln_KE.xml b/make/data/cldr/common/main/kln_KE.xml
index a22b2b8ad4b..42bbe58ead4 100644
--- a/make/data/cldr/common/main/kln_KE.xml
+++ b/make/data/cldr/common/main/kln_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/km.xml b/make/data/cldr/common/main/km.xml
index 7e0c241dcd7..3a380ac9c0a 100644
--- a/make/data/cldr/common/main/km.xml
+++ b/make/data/cldr/common/main/km.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -67,6 +67,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ប៊ុកហ្គី
 			ប្ល៊ីន
 			កាតាឡាន
+			ចាក់ម៉ា
 			ឈីឆេន
 			ស៊ីប៊ូអាណូ
 			ឈីហ្គា
@@ -88,6 +89,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ដាចវ៉ា
 			តៃតា
 			អាល្លឺម៉ង់
+			អាល្លឺម៉ង់ (ស្វ៊ីស)
 			ដូគ្រីប
 			ហ្សាម៉ា
 			សូប៊ីក្រោម
@@ -102,8 +104,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			អ៊ីកាជុក
 			ក្រិក
 			អង់គ្លេស
-			អង់គ្លេស (ច.អ.)
-			អង់គ្លេស (ស.រ.អ)
 			អេស្ពេរ៉ាន់តូ
 			អេស្ប៉ាញ
 			អេស្ប៉ាញ (អ៊ឺរ៉ុប)
@@ -118,6 +118,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ហ្វារូស
 			ហ្វ៊ុន
 			បារាំង
+			បារាំង (ស្វ៊ីស)
 			ហ៊្វ្រូលាន
 			ហ្វ្រីស៊ានខាងលិច
 			អៀរឡង់
@@ -403,11 +404,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			យ៉ីឌីស
 			យរូបា
 			កន្តាំង
+			ចិនកាតាំង
 			ហ្សួង
 			តាម៉ាហ្សៃម៉ារ៉ុកស្តង់ដា
 			ចិន
+			ចិនកុកងឺ
 			ចិន​អក្សរ​កាត់
+			ចិនកុកងឺ (អក្សរ​កាត់)
 			ចិន​អក្សរ​ពេញ
+			ចិនកុកងឺ (អក្សរ​ពុម្ព)
 			ហ្សូលូ
 			ហ្សូនី
 			គ្មាន​ទិន្នន័យ​ភាសា
@@ -575,7 +580,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ហ្វាំងឡង់
 			ហ្វីជី
 			កោះ​ហ្វក់ឡែន
-			កោះ​ហ្វក់ឡែន (Islas Malvinas)
+			កោះ​ហ្វក់ឡែន (ម៉ាវីណាស)
 			មីក្រូណេស៊ី
 			កោះ​ហ្វារ៉ូ
 			បារាំង
@@ -723,6 +728,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			សីង​ម៉ាធីន
 			ស៊ីរី
 			ស្វាស៊ីឡង់
+			ស្វាស៊ីឡង់
 			ទ្រីស្តង់​ដា​ចូនហា
 			កោះ​ទួគ និង កៃកូស
 			ឆាដ
@@ -731,7 +737,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ថៃ
 			តាហ្ស៊ីគីស្ថាន
 			តូខេឡៅ
-			ទីម័រលីស
+			ទីម័រលេស្តេ
 			ទីម័រ​ខាង​កើត
 			តួកម៉េនីស្ថាន
 			ទុយនីស៊ី
@@ -745,7 +751,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			អ៊ូហ្គង់ដា
 			កោះ​អៅឡាយីង​អាមេរិក
 			អង្គការសហប្រជាជាតិ
-			អង្គការ
+			UN
 			សហរដ្ឋអាមេរិក
 			ស.រ.អ
 			អ៊ុយរូហ្គាយ
@@ -759,6 +765,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			វ៉ានូទូ
 			វ៉ាលីស និង​ហ្វូទូណា
 			សាម័រ
+			Pseudo-Accents
+			Pseudo-Bidi
 			កូសូវ៉ូ
 			យេម៉ែន
 			ម៉ាយុត
@@ -855,8 +863,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u17D0 ៈ \u17CB \u17C9 \u17CA \u17CD ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ {អា} ឥ ឦ ឧ {ឧក} ឩ ឪ ឯ ឰ ឱ ឲ ឳ ា \u17B7 \u17B8 \u17B9 \u17BA \u17BB \u17BC \u17BD ើ ឿ ៀ េ ែ ៃ ោ ៅ \u17C6 ះ \u17D2]
 		[\u17B4\u17B5\u200B \u17CC \u17CE \u17CF \u17D1 ឝ ឞ]
 		[ក ខ គ ឃ ង ច ឆ ជ ឈ ញ ដ ឋ ឌ ឍ ណ ត ថ ទ ធ ន ប ផ ព ភ ម យ រ ឫ ឬ ល ឭ ឮ វ ស ហ ឡ អ ឥ ឦ ឧ ឩ ឪ ឯ ឰ ឱ ឳ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ៖ ! ? . ។ ៕ ‘ ’ " “ ” ( ) \[ \] \{ \} ៙ ៚]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ៖ ! ? . ។ ៕ ‘ ’ " “ ” ( ) \[ \] \{ \} ៙ ៚]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -970,17 +978,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} - {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y GGGGG – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -1058,7 +1102,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							d–d MMM y G
-							MMM d – MMM d, y G
+							d MMM – d MMM y G
 							d MMM, y – d MMM, y G
 						
 						
@@ -1483,17 +1527,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} - {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y GGGGG – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
 						
 							h a – h a
 							h – h a
@@ -2841,6 +2921,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				អាកទូប៊ី
 			
+			
+				កូស្ដេណេ
+			
 			
 				គីហ្ស៊ីឡូដា
 			
@@ -4342,11 +4425,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			khmr
 		
+		1
 		
 			,
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4355,6 +4441,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ពាន់
@@ -5417,7 +5508,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ក្នុងមួយអ៊ីញការ៉េ
 			
 			
-				dunams
 				{0} dunams
 			
 			
@@ -5444,14 +5534,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-			
 			
 				លីត្រ​ក្នុង​មួយ​គីឡូម៉ែត្រ
 				{0} លីត្រ​ក្នុង​មួយ​គីឡូម៉ែត្រ
@@ -5516,6 +5598,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				សតវត្ស
 				{0} សតវត្ស
 			
+			
+				ទសវត្សរ៍
+				{0} ទសវត្សរ៍
+			
 			
 				ឆ្នាំ
 				{0} ឆ្នាំ
@@ -5603,22 +5689,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				គីឡូវ៉ាត់​ម៉ោង
 				{0} គីឡូវ៉ាត់​ម៉ោង
 			
-			
-				eV
-				{0} eV
-			
-			
-				BTU
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-			
 			
 				ជីកាហឺត
 				{0} ជីកាហឺត
@@ -5712,21 +5782,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-			
 			
 				lux
 				{0} lux
 			
-			
-				L☉
-				{0} L☉
-			
 			
-				រង្វាស់​តោន
-				{0} រង្វាស់​តោន
+				តោនម៉ែត្រ
+				{0} តោនម៉ែត្រ
 			
 			
 				គីឡូក្រាម
@@ -5768,18 +5830,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ការ៉ាត់
 				{0} ការ៉ាត់
 			
-			
-				Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-			
 			
 				ជីកាវ៉ាត់
 				{0} ជីកាវ៉ាត់
@@ -5804,10 +5854,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				សេះ
 				{0} សេះ
 			
-			
-				ហិចតូប៉ាស្កាល់
-				{0} ហិចតូប៉ាស្កាល់
-			
 			
 				មិល្លីម៉ែត្រនៃ​បារត
 				{0} មិល្លីម៉ែត្រនៃ​បារត
@@ -5828,13 +5874,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				បរិយាកាស
 				បរិយាកាស {0}
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				ហិចតូប៉ាស្កាល់
+				{0} ហិចតូប៉ាស្កាល់
 			
 			
 				គីឡូម៉ែត្រ​ក្នុង​មួយ​ម៉ោង
@@ -5868,14 +5910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				អង្សា​ខែលវិន
 				{0} អង្សា​ខែលវិន
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-			
 			
 				គីឡូម៉ែត្រ​គូប
 				{0} គីឡូម៉ែត្រ​គូប
@@ -5969,10 +6003,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				អោន​វត្ថុ​រាវ
 				{0} អោន​វត្ថុ​រាវ
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				ស្លាបព្រា​បាយ
 				{0} ស្លាបព្រា​បាយ
@@ -5981,10 +6011,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ស្លាបព្រា​កាហ្វេ
 				{0} ស្លាបព្រា​កាហ្វេ
 			
-			
-				bbl
-				{0} bbl
-			
 			
 				ទិសទាំងបួន
 				{0}កើត
@@ -6068,7 +6094,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dunams
-				{0} dunam
 			
 			
 				ការ៉ាត់
@@ -6094,14 +6119,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-			
 			
 				លីត្រ/km
 				{0} L/km
@@ -6166,6 +6183,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ស.វ
 				{0} ស.វ
 			
+			
+				ទសវត្សរ៍
+				{0} ទសវត្សរ៍
+			
 			
 				ឆ្នាំ
 				{0} ឆ្នាំ
@@ -6253,21 +6274,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-			
 			
 				BTU
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
 			
 			
 				GHz
@@ -6362,18 +6370,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-			
 			
 				lux
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -6418,18 +6418,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ការ៉ាត់
 				{0} CD
 			
-			
-				Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -6454,10 +6442,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6478,13 +6462,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
 			
 			
 				km/h
@@ -6518,14 +6498,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -6619,10 +6591,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -6631,10 +6599,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tsp
 				{0} tsp
 			
-			
-				bbl
-				{0} bbl
-			
 			
 				ទិស
 				{0}កើត
@@ -6774,15 +6738,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} សេះ
 			
-			
-				{0} hPa
-			
 			
 				{0}" Hg
 			
 			
 				{0} ម.ប.
 			
+			
+				{0} hPa
+			
 			
 				km/h
 				{0} kph
diff --git a/make/data/cldr/common/main/km_KH.xml b/make/data/cldr/common/main/km_KH.xml
index 64132c1adda..8d70b257824 100644
--- a/make/data/cldr/common/main/km_KH.xml
+++ b/make/data/cldr/common/main/km_KH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kn.xml b/make/data/cldr/common/main/kn.xml
index e176ec842e0..c6708e223dc 100644
--- a/make/data/cldr/common/main/kn.xml
+++ b/make/data/cldr/common/main/kn.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -81,6 +81,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಕ್ಯಾಡ್ಡೋ
 			ಕಾರಿಬ್
 			ಅಟ್ಸಮ್
+			ಚಕ್ಮಾ
 			ಚೆಚನ್
 			ಸೆಬುವಾನೊ
 			ಚಿಗಾ
@@ -118,7 +119,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಡಿಂಕಾ
 			ಜರ್ಮಾ
 			ಡೋಗ್ರಿ
-			ಲೋವರ್ ಸೋರ್ಬಿಯನ್
+			ಲೋವರ್ ಸರ್ಬಿಯನ್
 			ಡುವಾಲಾ
 			ಮಧ್ಯ ಡಚ್
 			ದಿವೆಹಿ
@@ -529,14 +530,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಯಿಡ್ಡಿಶ್
 			ಯೊರುಬಾ
 			ಕ್ಯಾಂಟನೀಸ್
+			ಚೈನೀಸ್, ಕ್ಯಾಂಟೊನೀಸ್
 			ಝೂವಾಂಗ್
 			ಝೋಪೊಟೆಕ್
 			ಬ್ಲಿಸ್ಸಿಂಬಲ್ಸ್
 			ಝೆನಾಗಾ
 			ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಮೊರೊಕ್ಕನ್ ಟಮಜೈಟ್
 			ಚೈನೀಸ್
+			ಚೈನೀಸ್, ಮಂಡಾರಿನ್
 			ಸರಳೀಕೃತ ಚೈನೀಸ್
 			ಸಾಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್
+			ಸಾಂಪ್ರದಾಯಿಕ ಮ್ಯಾಂಡರಿನ್ ಚೈನೀಸ್
 			ಜುಲು
 			ಝೂನಿ
 			ಯಾವುದೇ ಭಾಷಾಸಂಬಂಧಿ ವಿಷಯವಿಲ್ಲ
@@ -580,7 +584,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -629,7 +633,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -710,7 +714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಪೂರ್ವ ಯೂರೋಪ್
 			ಉತ್ತರ ಯೂರೋಪ್
 			ಪಶ್ಚಿಮ ಯೂರೋಪ್
-			ಉಪ-ಸಹಾರನ್ ಆಫ್ರಿಕಾ
+			ಉಪ-ಸಹಾರನ್ ಆಫ್ರಿಕಾ
 			ಲ್ಯಾಟಿನ್ ಅಮೇರಿಕಾ
 			ಅಸೆನ್ಶನ್ ದ್ವೀಪ
 			ಅಂಡೋರಾ
@@ -799,7 +803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಫರೋ ದ್ವೀಪಗಳು
 			ಫ್ರಾನ್ಸ್
 			ಗೆಬೊನ್
-			ಬ್ರಿಟನ್/ಇಂಗ್ಲೆಂಡ್
+			ಯುನೈಟೆಡ್ ಕಿಂಗ್‌ಡಮ್
 			ಯು.ಕೆ.
 			ಗ್ರೆನೆಡಾ
 			ಜಾರ್ಜಿಯಾ
@@ -869,8 +873,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಸೇಂಟ್ ಮಾರ್ಟಿನ್
 			ಮಡಗಾಸ್ಕರ್
 			ಮಾರ್ಷಲ್ ದ್ವೀಪಗಳು
-			ಮ್ಯಾಸಿಡೋನಿಯಾ
-			ಮ್ಯಾಸಿಡೋನಿಯಾ (FYROM)
+			ಉತ್ತರ ಮ್ಯಾಸಿಡೋನಿಯಾ
 			ಮಾಲಿ
 			ಮಯನ್ಮಾರ್ (ಬರ್ಮಾ)
 			ಮಂಗೋಲಿಯಾ
@@ -942,7 +945,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಎಲ್ ಸಾಲ್ವೇಡಾರ್
 			ಸಿಂಟ್ ಮಾರ್ಟೆನ್
 			ಸಿರಿಯಾ
-			ಸ್ವಾಜಿಲ್ಯಾಂಡ್
+			ಸ್ವಾತಿನಿ
 			ಸ್ವಾಜಿಲ್ಯಾಂಡ್‌
 			ಟ್ರಿಸ್ತನ್ ಡಾ ಕುನ್ಹಾ
 			ಟರ್ಕ್ಸ್ ಮತ್ತು ಕೈಕೋಸ್ ದ್ವೀಪಗಳು
@@ -980,6 +983,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ವನೌಟು
 			ವಾಲಿಸ್ ಮತ್ತು ಫುಟುನಾ
 			ಸಮೋವಾ
+			ಸ್ಯುಡೊ ಉಚ್ಛಾರಣೆಗಳು
+			ಸ್ಯುಡೊ-ಬಿಡಿ
 			ಕೊಸೊವೊ
 			ಯೆಮನ್
 			ಮಯೊಟ್ಟೆ
@@ -1004,7 +1009,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಸಂಖ್ಯೆ ವಿಂಗಡಣೆ
 			ವಿಂಗಡಣೆ ಸಾಮರ್ಥ್ಯ
 			ಕರೆನ್ಸಿ
-			ಗಂಟೆ ಚಕ್ರ (12 ವಿರುದ್ಧ 24)
+			ಕಾಲ ಚಕ್ರ (12 ವಿರುದ್ಧ 24)
 			ಲೈನ್ ಬ್ರೇಕ್ ಶೈಲಿ
 			ಮಾಪನ ವ್ಯವಸ್ಥೆ
 			ಸಂಖ್ಯೆಗಳು
@@ -1030,7 +1035,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ಜಪಾನೀಸ್ ಕ್ಯಾಲೆಂಡರ್
 			ಪರ್ಷಿಯನ್ ಕ್ಯಾಲೆಂಡರ್
 			ಮಿಂಗೋ ಕ್ಯಾಲೆಂಡರ್
-			ಲೆಕ್ಕಪರಿಶೋಧಕ ಕರೆನ್ಚಿ ಸ್ವರೂಪ
+			ಅಕೌಂಟಿಂಗ್ ಕರೆನ್ಸಿ ಸ್ವರೂಪ
 			ಪ್ರಮಾಣಿತ ಕರೆನ್ಸಿ ಸ್ವರೂಪ
 			ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ
 			ನಿರ್ಲಕ್ಷಿಸಿದ ಚಿಹ್ನೆಗಳನ್ನು ವಿಂಗಡಿಸಿ
@@ -1137,8 +1142,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u0CBC ೦ ೧ ೨ ೩ ೪ ೫ ೬ ೭ ೮ ೯ ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಌ ೡ ಎ ಏ ಐ ಒ ಓ ಔ ಂ ಃ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ವ ಶ ಷ ಸ ಹ ಳ ಽ ಾ \u0CBF ೀ ು ೂ ೃ ೄ \u0CC6 ೇ ೈ ೊ ೋ \u0CCC \u0CCD ೕ ೖ]
 		[\u200C\u200D ೞ]
 		[ಅ ಆ ಇ ಈ ಉ ಊ ಋ ೠ ಌ ೡ ಎ ಏ ಐ ಒ ಓ ಔ ಕ ಖ ಗ ಘ ಙ ಚ ಛ ಜ ಝ ಞ ಟ ಠ ಡ ಢ ಣ ತ ಥ ದ ಧ ನ ಪ ಫ ಬ ಭ ಮ ಯ ರ ಱ ಲ ವ ಶ ಷ ಸ ಹ ಳ ೞ]
-		[\- , . % ‰ + 0೦ 1೧ 2೨ 3೩ 4೪ 5೫ 6೬ 7೭ 8೮ 9೯]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]
+		[\- ‑ , . % ‰ + 0೦ 1೧ 2೨ 3೩ 4೪ 5೫ 6೬ 7೭ 8೮ 9೯]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1174,6 +1179,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1192,6 +1210,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಮೆಸ್ರಾ
 							ನಾಸಿ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ಟೌಟ್
 							ಬಾಬಾ
@@ -1224,6 +1257,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಮೆಸ್ರಾ
 							ನಾಸಿ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ಟೌಟ್
 							ಬಾಬಾ
@@ -1241,6 +1289,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1260,6 +1322,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ನಿಹಾಸ್ಸೆ
 							ಪೆಗ್ಯುಮೆನ್
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ಮೆಸ್ಕರೆಮ್
 							ಟೆಕೆಮ್ಟ್
@@ -1292,6 +1369,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ನಿಹಾಸ್ಸೆ
 							ಪೆಗ್ಯುಮೆನ್
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ಮೆಸ್ಕರೆಮ್
 							ಟೆಕೆಮ್ಟ್
@@ -1309,6 +1401,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1401,55 +1507,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
+						
+							h a – h a
+							h–h a
 						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+						
+							HH–HH
 						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M–M
@@ -1896,6 +1987,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMM d
 						E, d MMM
 						d MMMM
+						'week' W 'of' MMMM
+						'week' W 'of' MMMM
 						mm:ss
 						y
 						M/y
@@ -1908,6 +2001,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMMM y
 						QQQ y
 						QQQQ y
+						'week' w 'of' Y
+						'week' w 'of' Y
 					
 					
 						{0} {1}
@@ -1915,55 +2010,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
-							h–h B
+							h B – h B
+							h–h B
 						
 						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+							h:mm B – h:mm B
+							h:mm–h:mm B
+							h:mm–h:mm B
 						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2075,6 +2132,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಎವಿ
 							ಎಲುಲ್
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ಟಿಶ್ರಿ
 							ಹೆಶ್‌ವಾನ್
@@ -2109,6 +2182,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಎವಿ
 							ಎಲುಲ್
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ಟಿಶ್ರಿ
 							ಹೆಶ್‌ವಾನ್
@@ -2127,6 +2216,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2145,6 +2245,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಮಾಘ
 							ಫಾಲ್ಗುಣ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ಚೈತ್ರ
 							ವೈಶಾಖ
@@ -2175,6 +2289,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಮಾಘ
 							ಫಾಲ್ಗುಣ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ಚೈತ್ರ
 							ವೈಶಾಖ
@@ -2220,6 +2348,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಧು‘ಲ್-ಕಿ.
 							ಧು‘ಲ್-ಹ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ಮುಹರಮ್
 							ಸಫಾರ್
@@ -2250,6 +2392,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಧು‘ಲ್-ಕಿ.
 							ಧು‘ಲ್-ಹ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ಮುಹರಮ್
 							ಸಫಾರ್
@@ -2266,6 +2422,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2284,6 +2451,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಬಹ್ಮನ್
 							ಎಸ್ಫಾಂಡ್
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ಫರ್ವರ್ದಿನ್
 							ಓರ್ದಿಬೆಹೆಶ್ಟ್
@@ -2314,6 +2495,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ಬಹ್ಮನ್
 							ಎಸ್ಫಾಂಡ್
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ಫರ್ವರ್ದಿನ್
 							ಓರ್ದಿಬೆಹೆಶ್ಟ್
@@ -2330,6 +2525,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3693,7 +3899,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಅಕ್ಟೋಬೆ
 			
 			
-				ಕೊಸ್ಟನಯ್
+				ಕೊಸ್ಟನಯ್
 			
 			
 				ಕಿಜೈಲೋರ್ದ
@@ -4059,7 +4265,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಸ್ಟಾಕ್‍ಹೋಮ್
 			
 			
-				ಸಿಂಗಾಪೂರ್
+				ಸಿಂಗಪುರ್
 			
 			
 				ಸೇಂಟ್ ಹೆಲೆನಾ
@@ -5132,7 +5338,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					ಸಿಂಗಾಪುರ್ ಪ್ರಮಾಣಿತ ಸಮಯ
+					ಸಿಂಗಪುರ್ ಪ್ರಮಾಣಿತ ಸಮಯ
 				
 			
 			
@@ -5273,6 +5479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			knda
 		
@@ -5291,7 +5498,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5307,6 +5519,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ಸಾವಿರ
@@ -5442,282 +5659,332 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			
 				ಸಂಯುಕ್ತ ಅರಬ್‌ ಎಮಿರೇಟ್‌‌ಗಳ ದಿರಾಮ್‌‌
-				ಸಂಯುಕ್ತ ಅರಬ್‌ ಎಮಿರೇಟ್‌‌ಗಳ ದಿರಾಮ್‌‌
-				ಸಂಯುಕ್ತ ಅರಬ್‌ ಎಮಿರೇಟ್‌‌ಗಳ ದಿರಾಮ್‌‌‍ಗಳು
+				ಯುಎಇ ದಿರಾಮ್
+				ಯುಎಇ ದಿರಾಮ್‌ಗಳು
+				AED
 			
 			
 				ಅಫ್‌ಘನ್ ಅಫಘಾನಿ
 				ಅಫ್‌ಘನ್ ಅಫಘಾನಿ
 				ಅಫ್‌ಘನ್ ಅಫಘಾನಿಗಳು
+				AFN
 			
 			
 				ಅಲ್‌ಬೇನಿಯನ್ ಲೆಕ್
 				ಅಲ್‌ಬೇನಿಯನ್ ಲೆಕ್
 				ಅಲ್‌ಬೇನಿಯನ್ ಲೆಕ್
+				ALL
 			
 			
 				ಅರ್ಮೆನಿಯನ್ ಡ್ರಾಮ್
 				ಅರ್ಮೆನಿಯನ್ ಡ್ರಾಮ್
 				ಅರ್‌ಮೇನಿಯನ್ ಡ್ರಾಮ್‌ಗಳು
+				AMD
 			
 			
 				ನೆದರ್ಲೆಂಡ್ಸ್ ಆಂಟಿಲಿಯನ್ ಗಿಲ್ಡರ್
 				ನೆದರ್ಲೆಂಡ್ಸ್ ಆಂಟಿಲಿಯನ್ ಗಿಲ್ಡರ್
 				ನೆದರ್ಲೆಂಡ್ಸ್ ಆಂಟಿಲಿಯನ್ ಗಿಲ್ಡರ್‌ಗಳು
+				ANG
 			
 			
 				ಅಂಗೋಲಾದ ಕ್ವಾನ್ಝಾ
 				ಅಂಗೋಲಾದ ಕ್ವಾನ್ಝಾ
 				ಅಂಗೋಲಾದ ಕ್ವಾನ್ಝಾಗಳು
+				AOA
 				Kz
 			
 			
 				ಅರ್ಜೆಂಟಿನಾ ಪೆಸೊ
 				ಅರ್ಜೆಂಟಿನಾ ಪೆಸೊ
 				ಅರ್ಜೆಂಟಿನಾ ಪೆಸೊಗಳು
+				ARS
 				$
 			
 			
 				ಆಸ್ಟ್ರೇಲಿಯನ್ ಡಾಲರ್‌
 				ಆಸ್ಟ್ರೇಲಿಯನ್ ಡಾಲರ್‌
 				ಆಸ್ಟ್ರೇಲಿಯನ್ ಡಾಲರ್‌‌ಗಳು
+				A$
 				$
 			
 			
 				ಅರುಬನ್ ಫ್ಲೊರೀನ್‌‌
 				ಅರುಬನ್ ಫ್ಲೊರೀನ್‌‌
 				ಅರುಬನ್ ಫ್ಲೊರೀನ್‌‌
+				AWG
 			
 			
 				ಅಝರ್‌ಬೈಜಾನಿ ಮನಾತ್
 				ಅಝರ್‌ಬೈಜಾನಿ ಮನಾತ್
 				ಅಝರ್‌ಬೈಜಾನಿ ಮನಾತ್‌ಗಳು
+				AZN
 			
 			
 				ಬೋಸ್ನಿಯಾ-ಹರ್ಜ್‌ಗೋವಿನ ಪರಿವರ್ತನೀಯ ಗುರುತು
 				ಬೋಸ್ನಿಯಾ-ಹರ್ಜ್‌ಗೋವಿನ ಪರಿವರ್ತನೀಯ ಗುರುತು
 				ಬೋಸ್ನಿಯಾ-ಹರ್ಜ್‌ಗೋವಿನ ಪರಿವರ್ತನೀಯ ಗುರುತುಗಳು
+				BAM
 				KM
 			
 			
 				ಬರ್ಬಾಡಿಯನ್ ಡಾಲರ್
 				ಬರ್ಬಾಡಿಯನ್ ಡಾಲರ್
 				ಬರ್ಬಾಡಿಯನ್ ಡಾಲರ್‌ಗಳು
+				BBD
 				$
 			
 			
 				ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾ
 				ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾ
 				ಬಾಂಗ್ಲಾದೇಶದ ಟಾಕಾಗಳು
+				BDT
 				৳
 			
 			
 				ಬಲ್ಗೇರಿಯನ್ ಲೆವ್
 				ಬಲ್ಗೇರಿಯನ್ ಲೆವ್
 				ಬಲ್ಗೇರಿಯನ್ ಲೀವಾ
+				BGN
 			
 			
 				ಬಹ್‌‌ರೈನಿ ದಿನಾರ್
 				ಬಹ್‌‌ರೈನಿ ದಿನಾರ್
 				ಬಹ್‌‌ರೈನಿ ದಿನಾರ್‌ಗಳು
+				BHD
 			
 			
 				ಬುರುಂದಿಯನ್ ಫ್ರಾಂಕ್
 				ಬುರುಂದಿಯನ್ ಫ್ರಾಂಕ್
 				ಬುರುಂದಿಯನ್ ಫ್ರಾಂಕ್‍ಗಳು
+				BIF
 			
 			
 				ಬರ್ಮುಡನ್ ಡಾಲರ್
 				ಬರ್ಮುಡನ್ ಡಾಲರ್
 				ಬರ್ಮುಡನ್ ಡಾಲರ್‌ಗಳು
+				BMD
 				$
 			
 			
 				ಬ್ರೂನಿ ಡಾಲರ್
 				ಬ್ರೂನಿ ಡಾಲರ್
 				ಬ್ರೂನಿ ಡಾಲರ್‌ಗಳು
+				BND
 				$
 			
 			
 				ಬೊಲಿವಿಯಾದ ಬೊಲಿವಿಯಾನೊ
 				ಬೊಲಿವಿಯಾದ ಬೊಲಿವಿಯಾನೊ
 				ಬೊಲಿವಿಯಾದ ಬೊಲಿವಿಯಾನೊಗಳು
+				BOB
 				Bs
 			
 			
 				ಬ್ರೆಜಿಲಿಯನ್‌ ರಿಯಲ್
 				ಬ್ರೆಜಿಲಿಯನ್‌ ರಿಯಲ್
 				ಬ್ರೆಜಿಲಿಯನ್ ರಿಯಲ್‍ಗಳು
+				R$
 				R$
 			
 			
 				ಬಹಾಮಿಯನ್ ಡಾಲರ್
 				ಬಹಾಮಿಯನ್ ಡಾಲರ್
 				ಬಹಾಮಿಯನ್ ಡಾಲರ್‌ಗಳು
+				BSD
 				$
 			
 			
 				ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್
 				ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್
 				ಭೂತಾನೀಸ್ ನುಲ್ತರಮ್‌ಗಳು
+				BTN
 			
 			
 				ಬೋಟ್ಸ್‌ವಾನನ್ ಪುಲಾ
 				ಬೋಟ್ಸ್‌ವಾನನ್ ಪುಲಾ
 				ಬೋಟ್ಸ್‌ವಾನನ್ ಪುಲಾಗಳು
+				BWP
 				P
 			
 			
 				ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್
 				ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್
 				ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್‍ಗಳು
+				BYN
 				р.
 			
 			
 				ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್ (2000–2016)
 				ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್ (2000–2016)
 				ಬೆಲಾರುಸಿಯನ್ ರೂಬಲ್‍ಗಳು (2000–2016)
+				BYR
 			
 			
 				ಬೆಲೀಜ್ ಡಾಲರ್
 				ಬೆಲೀಜ್ ಡಾಲರ್
 				ಬೆಲೀಜ್ ಡಾಲರ್‌‍ಗಳು
+				BZD
 				$
 			
 			
 				ಕೆನಡಾದ ಡಾಲರ್
 				ಕೆನಡಾದ ಡಾಲರ್
 				ಕೆನಡಾದ ಡಾಲರ್‌ಗಳು
+				CA$
 				$
 			
 			
 				ಕಾಂಗೋಲೀಸ್ ಫ್ರಾಂಕ್
 				ಕಾಂಗೋಲೀಸ್ ಫ್ರಾಂಕ್
 				ಕಾಂಗೋಲೀಸ್ ಫ್ರಾಂಕ್‍‌ಗಳು
+				CDF
 			
 			
 				ಸ್ವಿಸ್ ಫ್ರಾಂಕ್
 				ಸ್ವಿಸ್ ಫ್ರಾಂಕ್
 				ಸ್ವಿಸ್ ಫ್ರಾಂಕ್‍ಗಳು
+				CHF
 			
 			
 				ಚಿಲಿಯ ಪೆಸೊ
 				ಚಿಲಿಯ ಪೆಸೊ
 				ಚಿಲಿಯ ಪೆಸೊಗಳು
+				CLP
 				$
 			
 			
-				CNH
-				CNH
-				CNH
+				ಚೈನೀಸ್ ಯುವಾನ್ (ಆಫ್‌ಶೋರ್)
+				ಚೈನೀಸ್ ಯುವಾನ್ (ಆಫ್‌ಶೋರ್)
+				ಚೈನೀಸ್ ಯುವಾನ್ (ಆಫ್‌ಶೋರ್)
+				CNH
 			
 			
 				ಚೈನೀಸ್ ಯುವಾನ್
 				ಚೈನೀಸ್ ಯುವಾನ್
 				ಚೈನೀಸ್ ಯುವಾನ್
+				CN¥
 				¥
 			
 			
 				ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊ
 				ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊ
 				ಕೊಲೊಂಬಿಯೋದ ಪೆಸೊಗಳು
+				COP
 				$
 			
 			
 				ಕೋಸ್ಟ ರಿಕನ್ ಕೊಲನ್
 				ಕೋಸ್ಟಾ ರಿಕಾದ ಕೊಲೊನ್‌
 				ಕೋಸ್ಟಾ ರಿಕಾದ ಕೊಲೊನ್‌ಗಳು
+				CRC
 				₡
 			
 			
 				ಕ್ಯುಬಾದ ಪರಿವರ್ತನೀಯ ಪೆಸೊ
 				ಕ್ಯೂಬಾದ ಪರಿವರ್ತನೀಯ ಪೆಸೊ
 				ಕ್ಯೂಬಾದ ಪರಿವರ್ತನೀಯ ಪೆಸೊಗಳು
+				CUC
 				$
 			
 			
 				ಕ್ಯೂಬಾದ ಪೆಸೊ
 				ಕ್ಯೂಬಾದ ಪೆಸೊ
 				ಕ್ಯೂಬಾದ ಪೆಸೊಗಳು
+				CUP
 				$
 			
 			
 				ಕೇಪ್ ವರ್ಡಿನ್ ಎಸ್‌ಕೂಡೊ
 				ಕೇಪ್ ವರ್ಡಿನ್ ಎಸ್‌ಕೂಡೊ
 				ಕೇಪ್ ವರ್ಡಿನ್ ಎಸ್‌ಕೂಡೊಗಳು
+				CVE
 			
 			
 				ಝೆಕ್ ಗಣರಾಜ್ಯ ಕೊರೂನ
 				ಝೆಕ್ ಗಣರಾಜ್ಯ ಕೊರೂನ
 				ಝೆಕ್ ಗಣರಾಜ್ಯ ಕೊರೂನಗಳು
+				CZK
 				Kč
 			
 			
 				ಜಿಬೊಟಿಯನ್ ಫ್ರಾಂಕ್
 				ಜಿಬೊಟಿಯನ್ ಫ್ರಾಂಕ್
 				ಜಿಬೊಟಿಯನ್ ಫ್ರಾಂಕ್‍ಗಳು
+				DJF
 			
 			
 				ಡ್ಯಾನಿಶ್ ಕ್ರೋನ್
 				ಡ್ಯಾನಿಶ್ ಕ್ರೋನ್
 				ಡ್ಯಾನಿಶ್ ಕ್ರೋನರ್
+				DKK
 				kr
 			
 			
 				ಡೊಮಿನಿಕನ್ ಪೆಸೊ
 				ಡೊಮಿನಿಕನ್ ಪೆಸೊ
 				ಡೊಮಿನಿಕನ್ ಪೆಸೊಗಳು
+				DOP
 				$
 			
 			
-				ಅಲ್ಗೇರಿಯನ್ ದಿನಾರ್
-				ಅಲ್ಗೇರಿಯನ್ ದಿನಾರ್
-				ಅಲ್ಗೇರಿಯನ್ ದಿನಾರ್‌‍ಗಳು
+				ಅಲ್ಜೀರಿಯನ್ ದಿನಾರ್
+				ಅಲ್ಜೀರಿಯನ್ ದಿನಾರ್
+				ಅಲ್ಜೀರಿಯನ್ ದಿನಾರ್‌ಗಳು
+				DZD
 			
 			
 				ಈಜಿಪ್ಷಿಯನ್ ಪೌಂಡ್‍
 				ಈಜಿಪ್ಷಿಯನ್ ಪೌಂಡ್‍
 				ಈಜಿಪ್ಷಿಯನ್ ಪೌಂಡ್‍ಗಳು
+				EGP
 				E£
 			
 			
 				ಎರಿತ್ರಿಯನ್ ನಕ್ಫಾ
 				ಎರಿತ್ರಿಯನ್ ನಕ್ಫಾ
 				ಎರಿತ್ರಿಯನ್ ನಕ್ಫಾಗಳು
+				ERN
 			
 			
 				ಇಥಿಯೋಪಿಯನ್ ಬಿರ್
 				ಇಥಿಯೋಪಿಯನ್ ಬಿರ್
 				ಇಥಿಯೋಪಿಯನ್ ಬಿರ್‌ಗಳು
+				ETB
 			
 			
 				ಯೂರೊ
 				ಯೂರೊ
-				ಯೂರೊ
+				ಯೂರೊಗಳು
+				€
 				€
 			
 			
 				ಫಿಜಿಯನ್ ಡಾಲರ್
 				ಫಿಜಿಯನ್ ಡಾಲರ್
 				ಫಿಜಿಯನ್ ಡಾಲರ್‌ಗಳು
+				FJD
 				$
 			
 			
 				ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪೌಂಡ್
 				ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪೌಂಡ್
 				ಫಾಲ್ಕ್‌ಲ್ಯಾಂಡ್ ದ್ವೀಪಗಳ ಪೌಂಡ್‍ಗಳು
+				FKP
 				£
 			
 			
 				ಬ್ರಿಟೀಷ್ ಪೌಂಡ್
 				ಬ್ರಿಟಿಷ್ ಪೌಂಡ್
 				ಬ್ರಿಟೀಷ್ ಪೌಂಡ್‍ಗಳು
+				£
 				£
 			
 			
 				ಜಾರ್ಜಿಯಾದ ಲಾರಿ
 				ಜಾರ್ಜಿಯಾದ ಲಾರಿ
-				ಜಾರ್ಜಿಯಾದ ಲಾರಿ
+				ಜಾರ್ಜಿಯಾದ ಲಾರಿಗಳು
+				GEL
 				₾
 				₾
 			
@@ -5725,189 +5992,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಘಾನಾದ ಸೆದಿ
 				ಘಾನಾದ ಸೆದಿ
 				ಘಾನಾದ ಸೆದಿಗಳು
+				GHS
 			
 			
 				ಗಿಬ್ರಾಲ್ಟರ್ ಪೌಂಡ್
 				ಗಿಬ್ರಾಲ್ಟರ್ ಪೌಂಡ್
 				ಗಿಬ್ರಾಲ್ಟರ್ ಪೌಂಡ್‍ಗಳು
+				GIP
 				£
 			
 			
 				ಗ್ಯಾಂಬಿಯಾದ ದಲಾಸಿ
 				ಗ್ಯಾಂಬಿಯಾದ ದಲಾಸಿ
 				ಗ್ಯಾಂಬಿಯಾದ ದಲಾಸಿಗಳು
+				GMD
 			
 			
 				ಗಿನಿಯನ್ ಫ್ರಾಂಕ್
 				ಗಿನಿಯನ್ ಫ್ರಾಂಕ್
 				ಗಿನಿಯನ್ ಫ್ರಾಂಕ್‌ಗಳು
+				GNF
 				FG
 			
 			
 				ಗ್ವಾಟೆಮಾಲಾದ ಕುಯಿಟ್ಸಲ್‌‌
 				ಗ್ವಾಟೆಮಾಲಾದ ಕುಯಿಟ್ಸಲ್‌‌
 				ಗ್ವಾಟೆಮಾಲಾದ ಕುಯಿಟ್ಸಲ್‌‌‍ಗಳು
+				GTQ
 				Q
 			
 			
 				ಗುಯಾನೀಸ್‌ ಡಾಲರ್‌
 				ಗುಯಾನೀಸ್‌ ಡಾಲರ್‌
 				ಗುಯಾನೀಸ್‌ ಡಾಲರ್‌‌ಗಳು
+				GYD
 				$
 			
 			
 				ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್
 				ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್
 				ಹಾಂಗ್ ಕಾಂಗ್ ಡಾಲರ್‌ಗಳು
+				HK$
 				$
 			
 			
 				ಹೊಂಡುರಾನ್‌ ಲೆಂಪಿರಾ
 				ಹೊಂಡುರಾನ್‌ ಲೆಂಪಿರಾ
 				ಹೊಂಡುರಾನ್‌ ಲೆಂಪಿರಾಗಳು
+				HNL
 				L
 			
 			
 				ಕ್ರೊಯೆಷ್ಯಾದ ಕೂನಾ
 				ಕ್ರೊಯೆಷ್ಯಾದ ಕೂನಾ
 				ಕ್ರೊಯೆಷ್ಯಾದ ಕೂನಾಗಳು
+				HRK
 				kn
 			
 			
 				ಹೈಟಿಯ ಗೋರ್ದೆ
 				ಹೈಟಿಯ ಗೋರ್ದೆ
 				ಹೈಟಿಯ ಗೋರ್ದೆಗಳು
+				HTG
 			
 			
 				ಹಂಗೇರಿಯನ್ ಫೋರಿಂಟ್
 				ಹಂಗೇರಿಯನ್ ಫೋರಿಂಟ್
 				ಹಂಗೇರಿಯನ್ ಫೋರಿಂಟ್‍ಗಳು
+				HUF
 				Ft
 			
 			
 				ಇಂಡೊನೇಷ್ಯಾ ರುಪೈ
 				ಇಂಡೊನೇಷ್ಯಾ ರುಪೈ
 				ಇಂಡೊನೇಷ್ಯಾ ರುಪೈ
+				IDR
 				Rp
 			
 			
 				ಇಸ್ರೇಲಿ ನ್ಯೂ ಶೇಖಲ್
 				ಇಸ್ರೇಲಿ ನ್ಯೂ ಶೇಖಲ್
 				ಇಸ್ರೇಲಿ ನ್ಯೂ ಶೇಖಲ್‍ಗಳು
+				₪
 				₪
 			
 			
 				ಭಾರತೀಯ ರೂಪಾಯಿ
 				ಭಾರತೀಯ ರೂಪಾಯಿ
 				ಭಾರತೀಯ ರೂಪಾಯಿಗಳು
+				₹
 				₹
 			
 			
-				ಇರಾಕಿಯನ್ ದಿನಾರ್‌
-				ಇರಾಖಿಯನ್ ದಿನಾರ್
-				ಇರಾಕಿಯನ್ ದಿನಾರ್‌ಗಳು
+				ಇರಾಕಿ ದಿನಾರ್
+				ಇರಾಕಿ ದಿನಾರ್
+				ಇರಾಕಿ ದಿನಾರ್‌ಗಳು
+				IQD
 			
 			
 				ಇರಾನಿಯನ್ ರಿಯಲ್
 				ಇರಾನಿಯನ್ ರಿಯಲ್
 				ಇರಾನಿಯನ್ ರಿಯಲ್‌ಗಳು
+				IRR
 			
 			
 				ಐಸ್‌ಲ್ಯಾಂಡಿಕ್ ಕ್ರೋನಾ
 				ಐಸ್‌ಲ್ಯಾಂಡಿಕ್ ಕ್ರೋನಾ
 				ಐಸ್‌ಲ್ಯಾಂಡಿಕ್ ಕ್ರೋನಾ
+				ISK
 				kr
 			
 			
 				ಜಮೈಕನ್ ಡಾಲರ್
 				ಜಮೈಕನ್ ಡಾಲರ್
 				ಜಮೈಕನ್ ಡಾಲರ್‌ಗಳು
+				JMD
 				$
 			
 			
 				ಜೋರ್ಡಾನಿಯನ್ ದಿನಾರ್
 				ಜೋರ್ಡಾನಿಯನ್ ದಿನಾರ್
 				ಜೋರ್ಡಾನಿಯನ್ ದಿನಾರ್‌ಗಳು
+				JOD
 			
 			
 				ಜಪಾನೀಸ್ ಯೆನ್
 				ಜಪಾನೀಸ್ ಯೆನ್
 				ಜಪಾನೀಸ್ ಯೆನ್
+				JP¥
 				¥
 			
 			
 				ಕೀನ್ಯಾದ ಶಿಲ್ಲಿಂಗ್‌
 				ಕೀನ್ಯಾದ ಶಿಲ್ಲಿಂಗ್‌
 				ಕೀನ್ಯಾದ ಶಿಲ್ಲಿಂಗ್‌ಗಳು
+				KES
 			
 			
 				ಕಿರ್ಗಿಸ್ತಾನಿ ಸೋಮ್
 				ಕಿರ್ಗಿಸ್ತಾನಿ ಸೋಮ್
 				ಕಿರ್ಗಿಸ್ತಾನಿ ಸೋಮ್
+				KGS
 			
 			
 				ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್
 				ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್
 				ಕಾಂಬೋಡಿಯನ್ ರಿಯಲ್‍ಗಳು
+				KHR
 				៛
 			
 			
 				ಕೊಮೊರಿಯನ್ ಫ್ರಾಂಕ್
 				ಕೊಮೊರಿಯನ್ ಫ್ರಾಂಕ್
 				ಕೊಮೊರಿಯನ್ ಫ್ರಾಂಕ್‍ಗಳು
+				KMF
 				CF
 			
 			
 				ಉತ್ತರ ಕೊರಿಯನ್ ವೋನ್
 				ಉತ್ತರ ಕೊರಿಯನ್ ವೋನ್
 				ಉತ್ತರ ಕೊರಿಯನ್ ವೋನ್
+				KPW
 				₩
 			
 			
 				ದಕ್ಷಿಣ ಕೊರಿಯನ್ ವೊನ್
 				ದಕ್ಷಿಣ ಕೊರಿಯನ್ ವೊನ್
 				ದಕ್ಷಿಣ ಕೊರಿಯನ್ ವೊನ್
+				₩
 				₩
 			
 			
 				ಕುವೈತೀ ದಿನಾರ್
 				ಕುವೈತೀ ದಿನಾರ್
 				ಕುವೈತೀ ದಿನಾರ್‌ಗಳು
+				KWD
 			
 			
 				ಕೆಮ್ಯಾನ್‌ ಐಲ್ಯಾಂಡ್‌ನ ಡಾಲರ್‌
 				ಕೆಮ್ಯಾನ್‌ ಐಲ್ಯಾಂಡ್‌ನ ಡಾಲರ್‌
 				ಕೆಮ್ಯಾನ್‌ ಐಲ್ಯಾಂಡ್‌ನ ಡಾಲರ್‌‌ಗಳು
+				KYD
 				$
 			
 			
 				ಕಜಾಕಿಸ್ತಾನಿ ತೆಂಗೆ
-				ಕಜಕಿಸ್ತಾನ್ ತೆಂಗೇ
+				ಕಜಾಕಿಸ್ತಾನಿ ತೆಂಗೆ
 				ಕಜಾಕಿಸ್ತಾನಿ ತೆಂಗೆಗಳು
+				KZT
 				₸
 			
 			
 				ಲೋಟಿಯನ್ ಕಿಪ್
 				ಲೋಟಿಯನ್ ಕಿಪ್
 				ಲೋಟಿಯನ್ ಕಿಪ್‍ಗಳು
+				LAK
 				₭
 			
 			
 				ಲೆಬೆನೀಸ್ ಪೌಂಡ್
 				ಲೆಬೆನೀಸ್ ಪೌಂಡ್
 				ಲೆಬೆನೀಸ್ ಪೌಂಡ್‍ಗಳು
+				LBP
 				L£
 			
 			
 				ಶ್ರೀಲಂಕಾದ ರುಪೀ
 				ಶ್ರೀಲಂಕಾದ ರುಪೀ
 				ಶ್ರೀಲಂಕಾದ ರುಪೀಗಳು
+				LKR
 				Rs
 			
 			
 				ಲಿಬೇರಿಯನ್ ಡಾಲರ್
 				ಲಿಬೇರಿಯನ್ ಡಾಲರ್
 				ಲಿಬೇರಿಯನ್ ಡಾಲರ್‌ಗಳು
+				LRD
 				$
 			
 			
@@ -5917,287 +6217,340 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಲಿಥುನಿಯನ್‌ ಲಿತಾಸ್‌
 				ಲಿಥುನಿಯನ್‌ ಲಿತಾಸ್‌
 				ಲಿಥುನಿಯನ್‌ ಲಿತಾಯ್
+				LTL
 			
 			
 				ಲ್ಯಾಟ್ವಿಯನ್ ಲ್ಯಾಟ್ಸ್
 				ಲ್ಯಾಟ್ವಿಯನ್ ಲ್ಯಾಟ್ಸ್
 				ಲ್ಯಾಟ್ವಿಯನ್ ಲ್ಯಾಟಿ
+				LVL
 			
 			
 				ಲಿಬಿಯಾದ ದಿನಾರ್‌
 				ಲಿಬಿಯಾದ ದಿನಾರ್‌
 				ಲಿಬಿಯಾದ ದಿನಾರ್‌‍ಗಳು
+				LYD
 			
 			
 				ಮೊರೊಕನ್ ದಿರ್‌ಹಮ್
 				ಮೊರೊಕನ್ ದಿರ್‌ಹಮ್
 				ಮೊರೊಕನ್ ದಿರ್‌ಹಮ್‌ಗಳು
+				MAD
 			
 			
 				ಮಲ್ದೋವಾದ ಲೆವೂ
 				ಮಲ್ದೋವಾದ ಲೆವೂ
 				ಮಲ್ದೋವಾದ ಲೆಯ್
+				MDL
 			
 			
 				ಮಲಗಾಸಿ ಅರಿಯಾರಿ
 				ಮಲಗಾಸಿ ಅರಿಯಾರಿ
 				ಮಲಗಾಸಿ ಅರಿಯಾರಿಗಳು
+				MGA
 				Ar
 			
 			
 				ಮೆಸಡೋನಿಯನ್ ದಿನಾರ್
 				ಮೆಸಡೋನಿಯನ್ ದಿನಾರ್
 				ಮೆಸಡೋನಿಯನ್ ದಿನಾರಿ
+				MKD
 			
 			
 				ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್
 				ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್
 				ಮ್ಯಾನ್ಮಾರ್ ಕ್ಯಾಟ್‍ಗಳು
+				MMK
 				K
 			
 			
 				ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌
 				ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌
 				ಮಂಗೋಲಿಯಾದ ತುಗ್ರಿಕ್‌‌‌ಗಳು
+				MNT
 				₮
 			
 			
-				ಮಕ್ಯೂದ ಪಟಕಾ
-				ಮಕ್ಯೂದ ಪಟಕಾ
-				ಮಕ್ಯೂದ ಪಟಕಾಗಳು
+				ಮಕಾನಿಸ್ ಪಟಾಕಾ
+				ಮಕಾನಿಸ್ ಪಟಾಕಾ
+				ಮಕಾನಿಸ್ ಪಟಾಕಾಗಳು
+				MOP
 			
 			
 				ಮೌರೀಶಿಯನಿಯನ್ ಒಗಿಯ (1973–2017)
 				ಮೌರೀಶಿಯನಿಯನ್ ಒಗಿಯ (1973–2017)
 				ಮೌರೀಶಿಯನಿಯನ್ ಒಗಿಯಗಳು (1973–2017)
+				MRO
 			
 			
 				ಮೌರೀಶಿಯನಿಯನ್ ಒಗಿಯ
 				ಮೌರೀಶಿಯನಿಯನ್ ಒಗಿಯ
 				ಮೌರೀಶಿಯನಿಯನ್ ಒಗಿಯಗಳು
+				MRU
 			
 			
 				ಮಾರಿಷಿಯನ್ ರುಪಿ
 				ಮಾರಿಷಿಯನ್ ರುಪಿ
 				ಮಾರಿಷಿಯನ್ ರುಪಿಗಳು
+				MUR
 				Rs
 			
 			
 				ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾ
 				ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾ
 				ಮಾಲ್ಡೀವಿಯನ್ ರುಫಿಯಾಗಳು
+				MVR
 			
 			
 				ಮಲಾವಿಯ ಕ್ವಾಚ
 				ಮಲಾವಿಯ ಕ್ವಾಚ
 				ಮಲಾವಿಯ ಕ್ವಾಚಗಳು
+				MWK
 			
 			
 				ಮೆಕ್ಸಿಕೊದ ಪೆಸೊ
 				ಮೆಕ್ಸಿಕೊದ ಪೆಸೊ
 				ಮೆಕ್ಸಿಕೊದ ಪೆಸೊಗಳು
+				MX$
 				$
 			
 			
-				ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್
-				ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್
-				ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್ಟ್‌ಗಳು
+				ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್
+				ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್
+				ಮಲೇಶಿಯನ್ ರಿಂಗಿಟ್‌ಗಳು
+				MYR
 				RM
 			
 			
 				ಮೊಝಾಂಬಿಕನ್ ಮೆಟಿಕಲ್
 				ಮೊಝಾಂಬಿಕನ್ ಮೆಟಿಕಲ್
 				ಮೊಝಾಂಬಿಕನ್ ಮೆಟಿಕಲ್‍ಗಳು
+				MZN
 			
 			
 				ನಮೀಬಿಯನ್ ಡಾಲರ್
 				ನಮೀಬಿಯನ್ ಡಾಲರ್
 				ನಮೀಬಿಯನ್ ಡಾಲರ್‌‍ಗಳು
+				NAD
 				$
 			
 			
 				ನೈಜೀರಿಯಾದ ನೇರಾ
 				ನೈಜೀರಿಯಾದ ನೇರಾ
 				ನೈಜೀರಿಯಾದ ನೇರಾಗಳು
+				NGN
 				₦
 			
 			
 				ನಿಕಾರಗ್ವಾದ ಕರ್ದೊಬಾ
 				ನಿಕಾರಗ್ವಾದ ಕರ್ದೊಬಾ
 				ನಿಕಾರಗ್ವಾದ ಕರ್ದೊಬಾಗಳು
+				NIO
 				C$
 			
 			
 				ನಾರ್ವೇಯ ಕ್ರೋನ್
 				ನಾರ್ವೇಯ ಕ್ರೋನ್
 				ನಾರ್ವೇಯ ಕ್ರೋನರ್
+				NOK
 				kr
 			
 			
 				ನೇಪಾಳದ ರುಪೀ
 				ನೇಪಾಳದ ರುಪೀ
 				ನೇಪಾಳದ ರುಪೀಗಳು
+				NPR
 				Rs
 			
 			
 				ನ್ಯೂಜಿಲ್ಯಾಂಡ್ ಡಾಲರ್
 				ನ್ಯೂಜಿಲ್ಯಾಂಡ್ ಡಾಲರ್
 				ನ್ಯೂಜಿಲ್ಯಾಂಡ್ ಡಾಲರ್‌ಗಳು
+				NZ$
 				$
 			
 			
 				ಒಮಾನಿ ರಿಯಲ್
 				ಒಮಾನಿ ರಿಯಲ್
 				ಒಮಾನಿ ರಿಯಲ್‍ಗಳು
+				OMR
 			
 			
 				ಪನಾಮಾನಿಯನ್ ಬಲ್ಬೋವಾ
 				ಪನಾಮಾನಿಯನ್ ಬಲ್ಬೋವಾ
 				ಪನಾಮಾನಿಯನ್ ಬಲ್ಬೋವಾಗಳು
+				PAB
 			
 			
 				ಪೆರುವಿಯನ್ ಸೊಲ್
 				ಪೆರುವಿಯನ್ ಸೊಲ್
 				ಪೆರುವಿಯನ್ ಸೊಲ್‍ಗಳು
+				PEN
 			
 			
 				ಪಪುವಾ ನ್ಯೂ ಗಿನಿಯನ್ ಕಿನಾ
 				ಪಪುವಾ ನ್ಯೂ ಗಿನಿಯನ್ ಕಿನಾ
 				ಪಪುವಾ ನ್ಯೂ ಗಿನಿಯನ್ ಕಿನಾ
+				PGK
 			
 			
-				ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊ
-				ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊ
-				ಫಿಲಿಪ್ಪೈನ್ ಪೆಸೊಗಳು
+				ಫಿಲಿಪ್ಪೈನ್ ಪಿಸೊ
+				ಫಿಲಿಪ್ಪೈನ್ ಪಿಸೊ
+				ಫಿಲಿಪ್ಪೈನ್ ಪಿಸೊಗಳು
+				PHP
 				₱
 			
 			
 				ಪಾಕಿಸ್ತಾನದ ರುಪೀ
 				ಪಾಕಿಸ್ತಾನದ ರುಪೀ
 				ಪಾಕಿಸ್ತಾನದ ರುಪೀಗಳು
+				PKR
 				Rs
 			
 			
 				ಪೊಲಿಶ್ ಝ್ಲೋಟಿ
 				ಪೊಲಿಶ್ ಝ್ಲೋಟಿ
 				ಪೊಲಿಶ್ ಝ್ಲೋಟಿಗಳು
+				PLN
 				zł
 			
 			
 				ಪೆರುಗ್ವೇಯ ಗ್ವಾರನೀ
 				ಪೆರುಗ್ವೇಯ ಗ್ವಾರನೀ
 				ಪೆರುಗ್ವೇಯ ಗ್ವಾರನೀಗಳು
+				PYG
 				₲
 			
 			
 				ಖತಾರಿ ರಿಯಲ್
 				ಖತಾರಿ ರಿಯಲ್
 				ಖತಾರಿ ರಿಯಲ್‍ಗಳು
+				QAR
 			
 			
 				ರೊಮೇನಿಯನ್ ಲೆವು
 				ರೊಮೇನಿಯನ್ ಲೆವು
 				ರೊಮೇನಿಯನ್ ಲೆಯ್
+				RON
 				ಲೀ
 			
 			
 				ಸೆರ್ಬಿಯನ್ ದಿನಾರ್
 				ಸೆರ್ಬಿಯನ್ ದಿನಾರ್
 				ಸೆರ್ಬಿಯನ್ ದಿನಾರ್‌ಗಳು
+				RSD
 			
 			
 				ರಶಿಯನ್ ರೂಬಲ್
 				ರಶಿಯನ್ ರೂಬಲ್
 				ರಶಿಯನ್ ರೂಬಲ್‍ಗಳು
+				RUB
 				₽
 			
 			
 				ರುವಾಂಡನ್ ಫ್ರಾಂಕ್
 				ರುವಾಂಡನ್ ಫ್ರಾಂಕ್
 				ರುವಾಂಡನ್ ಫ್ರಾಂಕ್‍ಗಳು
+				RWF
 				RF
 			
 			
 				ಸೌದಿ ರಿಯಾಲ್
 				ಸೌದಿ ರಿಯಾಲ್
 				ಸೌದಿ ರಿಯಾಲ್‍ಗಳು
+				SAR
 			
 			
 				ಸೊಲೊಮನ್ ದ್ವೀಪಗಳ ಡಾಲರ್
 				ಸೊಲೊಮನ್ ದ್ವೀಪಗಳ ಡಾಲರ್
 				ಸೊಲೊಮನ್ ದ್ವೀಪಗಳ ಡಾಲರ್‌ಗಳು
+				SBD
 				$
 			
 			
 				ಸೆಚೊಲಿಯೊಸ್ ರುಪಿ
 				ಸೆಚೊಲಿಯೊಸ್ ರುಪಿ
 				ಸೆಚೊಲಿಯೊಸ್ ರುಪಿಗಳು
+				SCR
 			
 			
 				ಸುಡಾನೀಸ್ ಪೌಂಡ್
 				ಸುಡಾನೀಸ್ ಪೌಂಡ್
 				ಸುಡಾನೀಸ್ ಪೌಂಡ್
+				SDG
 			
 			
 				ಸ್ವೀಡಿಷ್ ಕ್ರೋನಾ
 				ಸ್ವೀಡಿಷ್ ಕ್ರೋನಾ
 				ಸ್ವೀಡಿಶ್ ಕ್ರೋನರ್
+				SEK
 				kr
 			
 			
 				ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌
 				ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌
 				ಸಿಂಗಾಪುರ್ ಡಾಲರ್‌‌ಗಳು
+				SGD
 				$
 			
 			
 				ಸೇಂಟ್ ಹೆಲೇನಾ ಪೌಂಡ್
 				ಸೇಂಟ್ ಹೆಲೇನಾ ಪೌಂಡ್
-				ಸೇಂಟ್ ಹೆಲೇನಾ ಪೌಂಡ್
+				ಸೇಂಟ್ ಹೆಲೇನಾ ಪೌಂಡ್‌ಗಳು
+				SHP
 				£
 			
 			
 				ಸಿಯೆರಾ ಲಿಯೋನಿಯನ್ ಲಿಯೋನ್
 				ಸಿಯೆರಾ ಲಿಯೋನಿಯನ್ ಲಿಯೋನ್
 				ಸಿಯೆರಾ ಲಿಯೋನಿಯನ್ ಲಿಯೋನ್‌ಗಳು
+				SLL
 			
 			
 				ಸೊಮಾಲಿ ಶಿಲ್ಲಿಂಗ್
 				ಸೊಮಾಲಿ ಶಿಲ್ಲಿಂಗ್
 				ಸೊಮಾಲಿ ಶಿಲ್ಲಿಂಗ್‍ಗಳು
+				SOS
 			
 			
 				ಸುರಿನಾಮೀಸ್ ಡಾಲರ್
 				ಸುರಿನಾಮೀಸ್ ಡಾಲರ್
 				ಸುರಿನಾಮೀಸ್ ಡಾಲರ್‌ಗಳು
+				SRD
 				$
 			
 			
 				ದಕ್ಷಿಣ ಸೂಡಾನೀಸ್ ಪೌಂಡ್‍
 				ದಕ್ಷಿಣ ಸೂಡಾನೀಸ್ ಪೌಂಡ್‍
 				ದಕ್ಷಿಣ ಸೂಡಾನೀಸ್ ಪೌಂಡ್‍‍ಗಳು
+				SSP
 				£
 			
 			
 				ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾ (1977–2017)
 				ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾ (1977–2017)
 				ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾಗಳು (1977–2017)
+				STD
 			
 			
 				ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾ
 				ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾ
 				ಸಾವೊ ಟೋಮ್ ಮತ್ತು ಪ್ರಿನ್ಸಿಪ್ ದೊಬ್ರಾಗಳು
+				STN
+				Db
 			
 			
 				ಸಿರಿಯನ್ ಪೌಂಡ್
 				ಸಿರಿಯನ್ ಪೌಂಡ್
 				ಸಿರಿಯನ್ ಪೌಂಡ್‌ಗಳು
+				SYP
 				£
 			
 			
 				ಸ್ವಾಜಿ ಲಿಲಂಗೆನಿ
 				ಸ್ವಾಜಿ ಲಿಲಂಗೆನಿ
 				ಸ್ವಾಜಿ ಎಮಲಂಗೆನಿ
+				SZL
 			
 			
 				ಥಾಯ್ ಬಹ್ತ್
@@ -6210,27 +6563,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ತಜಕಿಸ್ತಾನಿ ಸೊಮೋನಿ
 				ತಜಕಿಸ್ತಾನಿ ಸೊಮೋನಿ
 				ತಜಕಿಸ್ತಾನಿ ಸೊಮೋನಿಗಳು
+				TJS
 			
 			
 				ಟರ್ಕ್‍ಮೆನಿಸ್ತಾನ್ ಮನಾತ್
 				ಟರ್ಕ್‍ಮೆನಿಸ್ತಾನ್ ಮನಾತ್
 				ಟರ್ಕ್‍ಮೆನಿಸ್ತಾನ್ ಮನಾತ್
+				TMT
 			
 			
 				ಟ್ಯುನೀಷಿಯನ್‌ ದಿನಾರ್
 				ತುನೀಸಿಯನ್ ದಿನಾರ್
 				ಟ್ಯುನೀಷಿಯನ್‌ ದಿನಾರ್‌ಗಳು
+				TND
 			
 			
 				ಟೊಂಗಾ ಪಾಂಗ
 				ಟೊಂಗಾ ಪಾಂಗ
 				ಟೊಂಗಾ ಪಾಂಗ
+				TOP
 				T$
 			
 			
 				ಟರ್ಕಿಶ್ ಲಿರಾ
 				ಟರ್ಕಿಶ್ ಲಿರಾ
 				ಟರ್ಕಿಶ್ ಲಿರಾ
+				TRY
 				₺
 				TL
 			
@@ -6238,29 +6596,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಟ್ರಿನಿಡಾಡ್ ಮತ್ತು ಟೊಬಾಗೊ ಡಾಲರ್
 				ಟ್ರಿನಿಡಾಡ್ ಮತ್ತು ಟೊಬಾಗೊ ಡಾಲರ್
 				ಟ್ರಿನಿಡಾಡ್ ಮತ್ತು ಟೊಬಾಗೊ ಡಾಲರ್‌ಗಳು
+				TTD
 				$
 			
 			
 				ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್
 				ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್
 				ನ್ಯೂ ತೈವಾನ್ ಡಾಲರ್‌ಗಳು
+				NT$
 				NT$
 			
 			
 				ತಾನ್‌ಜೇನಿಯನ್ ಶಿಲ್ಲಿಂಗ್
 				ತಾನ್‌ಜೇನಿಯನ್ ಶಿಲ್ಲಿಂಗ್
 				ತಾನ್‌ಜೇನಿಯನ್ ಶಿಲ್ಲಿಂಗ್‍ಗಳು
+				TZS
 			
 			
 				ಉಕ್ರೇನಿಯನ್ ಹ್ರಿವ್ನೀಯ
 				ಉಕ್ರೇನಿಯನ್ ಹ್ರಿವ್ನೀಯ
 				ಉಕ್ರೇನಿಯನ್ ಹ್ರಿವ್ನೀಯಗಳು
+				UAH
 				₴
 			
 			
 				ಉಗಾಂಡನ್ ಶಿಲ್ಲಿಂಗ್
 				ಉಗಾಂಡನ್ ಶಿಲ್ಲಿಂಗ್
 				ಉಗಾಂಡನ್ ಶಿಲ್ಲಿಂಗ್‍ಗಳು
+				UGX
 			
 			
 				ಅಮೆರಿಕದ ಡಾಲರ್‌
@@ -6273,60 +6636,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಉರುಗ್ವೆಯ ಪೆಸೊ
 				ಉರುಗ್ವೆಯ ಪೆಸೊ
 				ಉರುಗ್ವೆಯ ಪೆಸೊಗಳು
+				UYU
 				$
 			
 			
 				ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್
 				ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್
 				ಉಜ್ಬೇಕಿಸ್ತಾನ್ ಸೊಮ್
+				UZS
 			
 			
 				ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್ (2008–2018)
 				ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್ (2008–2018)
 				ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್‌ಗಳು (2008–2018)
+				VEF
 				Bs
 			
 			
 				ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್
 				ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್
 				ವೆನಿಜುಲಿಯನ್ ಬೊಲಿವರ್‌ಗಳು
+				VES
 			
 			
 				ವಿಯೆಟ್ನಾಮೀಸ್ ಡಾಂಗ್
 				ವಿಯೆಟ್ನಾಮೀಸ್ ಡಾಂಗ್
 				ವಿಯೆಟ್ನಾಮೀಸ್ ಡಾಂಗ್
+				₫
 				₫
 			
 			
 				ವನೂತು ವತು
 				ವನೂತು ವತು
 				ವನೂತು ವತುಗಳು
+				VUV
 			
 			
 				ಸಮೋನ್ ತಲಾ
 				ಸಮೋನ್ ತಲಾ
 				ಸಮೋನ್ ತಲಾ
+				WST
 			
 			
 				ಮಧ್ಯ ಆಫ್ರಿಕನ್ CFA ಫ್ರಾಂಕ್
 				ಮಧ್ಯ ಆಫ್ರಿಕನ್ CFA ಫ್ರಾಂಕ್
 				ಮಧ್ಯ ಆಫ್ರಿಕನ್ CFA ಫ್ರಾಂಕ್‌ಗಳು
+				FCFA
 			
 			
 				ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್
 				ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್
 				ಪೂರ್ವ ಕೆರೀಬಿಯನ್ ಡಾಲರ್‌ಗಳು
+				EC$
 				$
 			
 			
-				ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ [CFA] ಫ್ರಾಂಕ್
-				ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ [CFA] ಫ್ರಾಂಕ್‌
-				ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ [CFA] ಫ್ರಾಂಕ್‌ಗಳು
+				ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ CFA ಫ್ರಾಂಕ್
+				ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ CFA ಫ್ರಾಂಕ್
+				ಪಶ್ಚಿಮ ಆಫ್ರಿಕಾದ CFA ಫ್ರಾಂಕ್‌ಗಳು
+				CFA
 			
 			
 				[CFP] ಫ್ರಾಂಕ್
 				[CFP] ಫ್ರಾಂಕ್
 				[CFP] ಫ್ರಾಂಕ್‌ಗಳು
+				CFPF
 			
 			
 				ಅಪರಿಚಿತ ಕರೆನ್ಸಿ
@@ -6337,11 +6711,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಯೆಮೆನಿ ರಿಯಲ್
 				ಯೆಮೆನಿ ರಿಯಲ್
 				ಯೆಮೆನಿ ರಿಯಲ್‍ಗಳು
+				YER
 			
 			
 				ದಕ್ಷಿಣ ಆಫ್ರಿಕನ್ ರಾಂಡ್
 				ದಕ್ಷಿಣ ಆಫ್ರಿಕನ್ ರಾಂಡ್
 				ದಕ್ಷಿಣ ಆಫ್ರಿಕನ್ ರಾಂಡ್
+				ZAR
 				R
 			
 			
@@ -6351,11 +6727,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಜಾಂಬಿಯಾ ಕ್ವಾಚ
 				ಜಾಂಬಿಯಾ ಕ್ವಾಚ
 				ಜಾಂಬಿಯಾ ಕ್ವಾಚಗಳು
+				ZMW
 				ZK
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
@@ -6367,7 +6746,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			
-				{0} ಪ್ರತಿ {1} ಗೆ
+				ಪ್ರತಿ {1} ಗೆ {0}
 			
 			
 				ಜಿ-ಫೋರ್ಸ್
@@ -6380,9 +6759,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಸೆಕೆಂಡ್‌ ಸ್ಕ್ವೇರ್‌ಗಳಿಗೆ
 			
 			
-				ಕ್ರಾಂತಿ
-				{0} ಕ್ರಾಂತಿ
-				{0} ಕ್ರಾಂತಿಗಳು
+				ತಿರುಗುವಿಕೆ
+				{0} ತಿರುಗುವಿಕೆ
+				{0} ತಿರುಗುವಿಕೆಗಳು
 			
 			
 				ರೇಡಿಯಾನ್‌ಗಳು
@@ -6391,24 +6770,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ಡಿಗ್ರಿಗಳು
-				{0}ಡಿಗ್ರಿ
+				{0} ಡಿಗ್ರಿ
 				{0}ಡಿಗ್ರಿಗಳು
 			
 			
-				ನಿಮಿಷಗಳು
-				{0} ನಿಮಿಷ
-				{0} ನಿಮಿಷಗಳು
+				ಆರ್ಕ್‌ಮಿನಿಟ್‌ಗಳು
+				{0} ಆರ್ಕ್‌ಮಿನಿಟ್
+				{0} ಆರ್ಕ್‌ಮಿನಿಟ್‌ಗಳು
 			
 			
-				ಸೆಕೆಂಡುಗಳು
-				{0} ಸೆಕೆಂಡ್
-				{0} ಸೆಕೆಂಡುಗಳು
+				ಆರ್ಕ್‌ಸೆಕೆಂಡುಗಳು
+				{0} ಆರ್ಕ್‌ಸೆಕೆಂಡ್
+				{0} ಆರ್ಕ್‌ಸೆಕೆಂಡುಗಳು
 			
 			
 				ಚದರ ಕಿಲೋಮೀಟರ್‌ಗಳು
 				{0} ಚದರ ಕಿಲೋಮೀಟರ್
 				{0} ಚದರ ಕಿಲೋಮೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಚದರ ಕಿಲೋಮೀಟರ್‌ಗೆ
+				ಪ್ರತಿ ಚದರ ಕಿಲೋಮೀಟರ್‌ಗೆ {0}
 			
 			
 				ಹೆಕ್ಟೇರುಗಳು
@@ -6419,19 +6798,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಚದರ ಮೀಟರ್‌ಗಳು
 				{0} ಚದರ ಮೀಟರ್
 				{0} ಚದರ ಮೀಟರ್‌ಗಳು
-				{0} ಚದರ ಮೀಟರ್‌ಗೆ
+				ಚದರ ಮೀಟರ್‌ಗೆ {0}
 			
 			
 				ಚದರ ಸೆಂಟಿಮೀಟರ್‌ಗಳು
 				{0} ಚದರ ಸೆಂಟಿಮೀಟರ್
 				{0} ಚದರ ಸೆಂಟಿಮೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಚದರ ಸೆಂಟಿಮೀಟರ್‌‌ಗೆ
+				ಪ್ರತಿ ಚದರ ಸೆಂಟಿಮೀಟರ್‌‌ಗೆ {0}
 			
 			
 				ಚದರ ಮೈಲುಗಳು
 				{0} ಚದರ ಮೈಲು
 				{0} ಚದರ ಮೈಲುಗಳು
-				{0} ಪ್ರತಿ ಚದರ ಮೈಲಿಗೆ
+				ಪ್ರತಿ ಚದರ ಮೈಲಿಗೆ {0}
 			
 			
 				ಎಕರೆಗಳು
@@ -6452,12 +6831,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಚದರ ಅಂಗುಲಗಳು
 				{0} ಚದರ ಅಂಗುಲ
 				{0} ಚದರ ಅಂಗುಲಗಳು
-				{0} ಚದರ ಅಂಗುಲಕ್ಕೆ
+				{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ
 			
 			
-				ಡುನಮ್ಸ್‌
-				{0} ಡುನಮ್‌
-				{0} ಡುನಮ್‌ಗಳು
+				ಡುನಮ್ಸ್‌
+				{0} ಡುನಮ್‌
+				{0} ಡುನಮ್‌ಗಳು
 			
 			
 				ಕಾರಟ್‌ಗಳು
@@ -6465,9 +6844,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕಾರಟ್‌ಗಳು
 			
 			
-				ಡೆಸಿಲೀಟರ್ ಮಿಲಿಗ್ರಾಂ
+				ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂಗಳು
 				{0} ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂ
-				{0} ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂ
+				{0} ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂಗಳು
 			
 			
 				ಪ್ರತಿ ಲೀಟರ್ ಮಿಲ್ಲಿಮೋಲ್ಸ್
@@ -6480,34 +6859,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಪ್ರತಿ ಮಿಲಿಯನ್ ಭಾಗಗಳು
 			
 			
-				ಶೇಕಡಾ
-				{0} ಶೇಕಡಾ
-				{0} ಶೇಕಡಾ
+				ಶೇಕಡಾ
+				{0} ಶೇಕಡಾ
+				{0} ಶೇಕಡಾ
 			
 			
-				ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
-				{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
-				{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
+				ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
+				{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
+				{0} ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
 			
 			
-				‱
-				{0}‱
-				{0}‱
+				ಪರ್ಮಿರೈಡ್
+				{0} ಪರ್ಮಿರೈಡ್
+				{0} ಪರ್ಮಿರೈಡ್
 			
 			
-				mol
-				{0} mol
-				{0} mol
+				ಮೋಲ್‌ಗಳು
+				{0} ಮೋಲ್‌ಗಳು
+				{0} ಮೋಲ್‌ಗಳು
 			
 			
-				ಲೀಟರ್ ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌ಗೆ
+				ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌ಗೆ ಲೀಟರ್‌ಗಳು
 				{0} ಲೀಟರ್ ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌ಗೆ
 				{0} ಪ್ರತಿ ಕಿಲೋಮೀಟರ್‌‌ಗೆ ಲೀಟರ್‌ಗಳು
 			
 			
-				ಲೀ/100ಕಿಮೀ
-				{0} ಲೀಟರ್‌ಗಳು ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ
-				{0} ಲೀಟರ್‌ಗಳು ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ
+				ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ ಲೀಟರ್‌ಗಳು
+				{0} ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ ಲೀಟರ್‌ಗಳು
+				{0} ಪ್ರತಿ 100 ಕಿಲೋಮೀಟರ್‌ಗಳಿಗೆ ಲೀಟರ್‌ಗಳು
 			
 			
 				ಪ್ರತಿ ಗ್ಯಾಲನ್‌‌ಗೆ ಮೈಲಿಗಳು
@@ -6520,9 +6899,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಪ್ರತಿ Imp ಗ್ಯಾಲನ್‌ಗೆ ಮೈಲಿಗಳು
 			
 			
-				ಪೆಟಾಬೈಟ್‌ಗಳು
-				{0} ಪೆಟಾಬೈಟ್‌
-				{0} ಪೆಟಾಬೈಟ್‌ಗಳು
+				ಪೆಟಾಬೈಟ್‌ಗಳು
+				{0} ಪೆಟಾಬೈಟ್‌
+				{0} ಪೆಟಾಬೈಟ್‌ಗಳು
 			
 			
 				ಟೆರಾಬೈಟ್‌ಗಳು
@@ -6579,17 +6958,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಶತಮಾನ
 				{0}ಶತಮಾನಗಳು
 			
+			
+				ದಶಕಗಳು
+				{0} ದಶಕ
+				{0} ದಶಕಗಳು
+			
 			
 				ವರ್ಷಗಳು
 				{0} ವರ್ಷ
 				{0} ವರ್ಷಗಳು
-				{0} ಪ್ರತಿ ವರ್ಷಕ್ಕೆ
+				ಪ್ರತಿ ವರ್ಷಕ್ಕೆ {0}
 			
 			
 				ತಿಂಗಳು
 				{0} ತಿಂಗಳು
 				{0} ತಿಂಗಳು
-				{0} ಪ್ರತಿ ತಿಂಗಳಿಗೆ
+				ಪ್ರತಿ ತಿಂಗಳಿಗೆ {0}
 			
 			
 				ವಾರಗಳು
@@ -6607,19 +6991,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಗಂಟೆಗಳು
 				{0} ಗಂಟೆ
 				{0} ಗಂಟೆಗಳು
-				{0} ಪ್ರತಿ ಗಂಟೆ
+				ಪ್ರತಿ ಗಂಟೆಗೆ {0}
 			
 			
 				ನಿಮಿಷಗಳು
 				{0} ನಿಮಿಷ
 				{0} ನಿಮಿಷಗಳು
-				{0} ಪ್ರತಿ ನಿಮಿಷಕ್ಕೆ
+				ಪ್ರತಿ ನಿಮಿಷಕ್ಕೆ {0}
 			
 			
 				ಸೆಕೆಂಡುಗಳು
 				{0} ಸೆಕೆಂಡ್
 				{0} ಸೆಕೆಂಡುಗಳು
-				{0} ಪ್ರತಿ ಸೆಕೆಂಡ್
+				ಪ್ರತಿ ಸೆಕೆಂಡ್‌ಗೆ {0}
 			
 			
 				ಮಿಲಿಸೆಕೆಂಡುಗಳು
@@ -6687,24 +7071,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕಿಲೋವ್ಯಾಟ್‌-ಗಂಟೆಗಳು
 			
 			
-				eV
-				{0} eV
-				{0} eV
+				ಎಲೆಕ್ಟ್ರಾನ್‌ವೋಲ್ಟ್‌ಗಳು
+				{0} ಎಲೆಕ್ಟ್ರಾನ್‌ವೋಲ್ಟ್‌
+				{0} ಎಲೆಕ್ಟ್ರಾನ್‌ವೋಲ್ಟ್‌ಗಳು
 			
 			
-				Btu
-				{0} Btu
-				{0} Btu
+				ಬ್ರಿಟಿಷ್ ಉಷ್ಣ ಘಟಕಗಳು
+				{0} ಬ್ರಿಟಿಷ್ ಉಷ್ಣ ಘಟಕ
+				{0} ಬ್ರಿಟಿಷ್ ಉಷ್ಣ ಘಟಕಗಳು
+			
+			
+				ಯುಎಸ್ ಥರ್ಮ್ಸ್
+				{0} ಯುಎಸ್ ಥರ್ಮ್ಸ್
+				{0} ಯುಎಸ್ ಥರ್ಮ್ಸ್
 			
 			
-				lbf
-				{0} lbf
-				{0} lbf
+				ಪೌಂಡ್ಸ್ ಆಫ್ ಫೋರ್ಸ್
+				{0} ಪೌಂಡ್ ಆಫ್ ಫೋರ್ಸ್
+				{0} ಪೌಂಡ್ಸ್ ಆಫ್ ಫೋರ್ಸ್
 			
 			
-				N
-				{0} N
-				{0} N
+				ನ್ಯೂಟೋನ್‌ಗಳು
+				{0} ನ್ಯೂಟೋನ್‌
+				{0} ನ್ಯೂಟೋನ್‌ಗಳು
 			
 			
 				ಗಿಗಾಹರ್ಟ್ಸ್‌
@@ -6726,17 +7115,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಹರ್ಟ್ಸ್‌
 				{0} ಹರ್ಟ್ಸ್‌
 			
+			
+				ಟೈಪೊಗ್ರಾಫಿಕ್ em
+				{0} em
+				{0} ems
+			
+			
+				ಪಿಕ್ಸೆಲ್‌ಗಳು
+				{0} ಪಿಕ್ಸೆಲ್
+				{0} ಪಿಕ್ಸೆಲ್‌ಗಳು
+			
+			
+				ಮೆಗಾಪಿಕ್ಸೆಲ್‌ಗಳು
+				{0} ಮೆಗಾಪಿಕ್ಸೆಲ್
+				{0} ಮೆಗಾಪಿಕ್ಸೆಲ್‌ಗಳು
+			
+			
+				ಪಿಕ್ಸೆಲ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್
+				{0} ಪಿಕ್ಸೆಲ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್
+				{0} ಪಿಕ್ಸೆಲ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್
+			
+			
+				ಪಿಕ್ಸೆಲ್ಸ್ ಪರ್ ಇಂಚ್
+				{0} ಪಿಕ್ಸೆಲ್ ಪರ್ ಇಂಚ್
+				{0} ಪಿಕ್ಸೆಲ್ಸ್ ಪರ್ ಇಂಚ್
+			
+			
+				ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್
+				{0} ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್
+				{0} ಡಾಟ್ಸ್ ಪರ್ ಸೆಂಟಿಮೀಟರ್
+			
+			
+				ಡಾಟ್ಸ್ ಪರ್ ಇಂಚ್
+				{0} ಡಾಟ್ ಪರ್ ಇಂಚ್
+				{0} ಡಾಟ್ಸ್ ಪರ್ ಇಂಚ್
+			
 			
 				ಕಿಲೋಮೀಟರ್‌ಗಳು
 				{0} ಕಿಲೋಮೀಟರ್
 				{0} ಕಿಲೋಮೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಕಿಲೋಮೀಟ‍ರ್‌ಗೆ
+				ಪ್ರತಿ ಕಿಲೋಮೀಟ‍ರ್‌ಗೆ {0}
 			
 			
 				ಮೀಟರ್‌ಗಳು
 				{0} ಮೀಟರ್
 				{0} ಮೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಮೀಟರ್‌ಗೆ
+				ಪ್ರತಿ ಮೀಟರ್‌ಗೆ {0}
 			
 			
 				ಡೆಸಿಮೀಟರ್‌ಗಳು
@@ -6747,7 +7171,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಸೆಂಟಿಮೀಟರ್‌ಗಳು
 				{0} ಸೆಂಟಿಮೀಟರ್
 				{0} ಸೆಂಟಿಮೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಸೆಂಟಿಮೀಟರ್‌ಗೆ
+				ಪ್ರತಿ ಸೆಂಟಿಮೀಟರ್‌ಗೆ {0}
 			
 			
 				ಮಿಲಿಮೀಟರ್‌ಗಳು
@@ -6783,13 +7207,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಅಡಿ
 				{0} ಅಡಿ
 				{0} ಅಡಿ
-				{0} ಪ್ರತಿ ಅಡಿಗೆ
+				ಪ್ರತಿ ಅಡಿಗೆ {0}
 			
 			
 				ಅಂಗುಲಗಳು
 				{0} ಅಂಗುಲ
 				{0} ಅಂಗುಲಗಳು
-				{0} ಪ್ರತಿ ಅಂಗುಲಕ್ಕೆ
+				ಪ್ರತಿ ಅಂಗುಲಕ್ಕೆ {0}
 			
 			
 				ಪಾರ್‌‍ಸೆಕೆಂ
@@ -6822,9 +7246,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಪಾಯಿಂಟ್‌ಗಳು
 			
 			
-				ಸೋಲಾರ್‌ ರೇಡಿ
-				{0} ಸೋಲಾರ್‌ ರೇಡಿಯಸ್‌
-				{0} ಸೋಲಾರ್‌ ರೇಡಿ
+				ಸೋಲಾರ್‌ ರೇಡಿ
+				{0} ಸೋಲಾರ್‌ ರೇಡಿಯಸ್‌
+				{0} ಸೋಲಾರ್‌ ರೇಡಿ
 			
 			
 				ಲಕ್ಸ್‌‌
@@ -6832,9 +7256,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಲಕ್ಸ್‌‌
 			
 			
-				L☉
-				{0} L☉
-				{0} L☉
+				ಸೌರ ಪ್ರಕಾಶಗಳು
+				{0} ಸೌರ ಪ್ರಕಾಶಗಳು
+				{0} ಸೌರ ಪ್ರಕಾಶಗಳು
 			
 			
 				ಮೆಟ್ರಿಕ್‌‌ ಟನ್‌ಗಳು
@@ -6896,19 +7320,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕ್ಯಾರೆಟ್‌ಗಳು
 			
 			
-				ಡಿಎ
-				{0} ಡಿಎ
-				{0} ಡಿಎ
+				ಡಿಎ
+				{0} ಡಿಎ
+				{0} ಡಿಎ
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				ಭೂಮಿಯ ದೃವ್ಯರಾಶಿ
+				{0} ಭೂಮಿಯ ದೃವ್ಯರಾಶಿ
+				{0} ಭೂಮಿಯ ದೃವ್ಯರಾಶಿ
 			
 			
-				ಸೋಲಾರ್‌ ಮಾಸ್‌
-				{0} ಸೋಲಾರ್‌ ಮಾಸ್‌
-				{0} ಸೋಲಾರ್‌ ಮಾಸಸ್‌
+				ಸೋಲಾರ್‌ ಮಾಸ್‌
+				{0} ಸೋಲಾರ್‌ ಮಾಸ್‌
+				{0} ಸೋಲಾರ್‌ ಮಾಸಸ್‌
 			
 			
 				ಗಿಗಾವ್ಯಾಟ್‌ಗಳು
@@ -6940,11 +7364,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಹಾರ್ಸ್‌ಪವರ್
 				{0} ಹಾರ್ಸ್‌ಪವರ್
 			
-			
-				ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು
-				{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್
-				{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು
-			
 			
 				ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌ಗಳು
 				{0} ಮರ್ಕ್ಯುರಿ ಮಿಲಿಮೀಟರ್‌
@@ -6960,25 +7379,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲ
 				{0} ಮರ್ಕ್ಯುರಿ ಅಂಗುಲಗಳು
 			
+			
+				ಬಾರ್‌ಗಳು
+				{0} ಬಾರ್‌
+				{0} ಬಾರ್‌ಗಳು
+			
 			
 				ಮಿಲಿಬಾರ್‌ಗಳು
 				{0} ಮಿಲಿಬಾರ್
 				{0} ಮಿಲಿಬಾರ್‌ಗಳು
 			
 			
-				ವಾತಾವರಣಗಳು
-				{0} ವಾತಾವರಣ
-				{0} ವಾತಾವರಣಗಳು
+				ವಾತಾವರಣಗಳು
+				{0} ವಾತಾವರಣ
+				{0} ವಾತಾವರಣಗಳು
+			
+			
+				ಪಾಸ್ಕಲ್ಸ್
+				{0} ಪ್ಯಾಸ್ಕಲ್
+				{0} ಪ್ಯಾಸ್ಕಲ್ಸ್
+			
+			
+				ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು
+				{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್
+				{0} ಹೆಕ್ಟೋಪ್ಯಾಸ್ಕಲ್‌ಗಳು
 			
 			
-				ಕಿಲೋಪಾಸ್ಕಲ್‌ಗಳು
-				{0} ಕಿಲೋಪಾಸ್ಕಲ್‌
-				{0} ಕಿಲೋಪಾಸ್ಕಲ್‌ಗಳು
+				ಕಿಲೋಪಾಸ್ಕಲ್‌ಗಳು
+				{0} ಕಿಲೋಪಾಸ್ಕಲ್‌
+				{0} ಕಿಲೋಪಾಸ್ಕಲ್‌ಗಳು
 			
 			
-				ಮೆಗಾಪಾಸ್ಕಲ್‌ಗಳು
-				{0} ಮೆಗಾಪಾಸ್ಕಲ್‌
-				{0} ಮೆಗಾಪಾಸ್ಕಲ್‌ಗಳು
+				ಮೆಗಾಪಾಸ್ಕಲ್‌ಗಳು
+				{0} ಮೆಗಾಪಾಸ್ಕಲ್‌
+				{0} ಮೆಗಾಪಾಸ್ಕಲ್‌ಗಳು
 			
 			
 				ಕಿಲೋಮೀಟರ್‌ಗಳು ಪ್ರತಿ ಗಂಟೆಗೆ
@@ -7021,14 +7455,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕೆಲ್ವಿನ್‍ಗಳು
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				ಪೌಂಡ್-ಅಡಿ
+				{0} ಪೌಂಡ್-ಅಡಿ
+				{0} ಪೌಂಡ್-ಅಡಿ
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				ನ್ಯೂಟನ್-ಮೀಟರ್
+				{0} ನ್ಯೂಟನ್-ಮೀಟರ್
+				{0} ನ್ಯೂಟನ್-ಮೀಟರ್
 			
 			
 				ಘನ ಕಿಲೋಮೀಟರ್‌ಗಳು
@@ -7045,7 +7479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳು
 				{0} ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್
 				{0} ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳಿಗೆ
+				ಪ್ರತಿ ಕ್ಯೂಬಿಕ್ ಸೆಂಟಿಮೀಟರ್‌ಗಳಿಗೆ {0}
 			
 			
 				ಘನ ಮೈಲುಗಳು
@@ -7081,7 +7515,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಲೀಟರ್‌‌ಗಳು
 				{0} ಲೀಟರ್
 				{0} ಲೀಟರ್‌ಗಳು
-				{0} ಪ್ರತಿ ಲೀಟರ್‌ಗೆ
+				ಪ್ರತಿ ಲೀಟರ್‌ಗೆ {0}
 			
 			
 				ಡೆಸಿಲೀಟರ್‌ಗಳು
@@ -7146,9 +7580,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				ಇಂಪಿರಿಯಲ್ ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು
+				{0} ಇಂಪಿರಿಯಲ್ ಫ್ಲೂಡ್ ಔನ್ಸ್‌
+				{0} ಇಂಪಿರಿಯಲ್ ಫ್ಲೂಡ್ ಔನ್ಸ್‌ಗಳು
 			
 			
 				ಟೇಬಲ್ ಸ್ಪೂನ್‍ಗಳು
@@ -7161,9 +7595,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಟೀ ಸ್ಪೂನ್‍ಗಳು
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
+				ಬ್ಯಾರೆಲ್‌ಗಳು
+				{0} ಬ್ಯಾರೆಲ್
+				{0} ಬ್ಯಾರೆಲ್‌ಗಳು
 			
 			
 				ಕಾರ್ಡಿನಲ್ ನಿರ್ದೇಶನ
@@ -7177,23 +7611,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ಜಿ-ಫೋರ್ಸ್
-				{0} ಜಿ-ಫೋ.
-				{0} ಜಿ-ಫೋ.
+				{0} ಜಿ
+				{0} ಜಿ
 			
 			
-				ಮೀ/ಸೆ²
+				ಮೀಟರ್‌ಗಳು/ಸೆ²
 				{0} ಮೀ/ಸೆ²
 				{0} ಮೀ/ಸೆ²
 			
 			
-				ಕ್ರಾಂ
-				{0} ಕ್ರಾಂ
-				{0} ಕ್ರಾಂ
+				ತಿರುಗು
+				{0} ತಿರುಗು
+				{0} ತಿರುಗು
 			
 			
-				ರೇಡಿ.
+				ರೇಡಿಯಾನ್‌ಗಳು
 				{0} ರೇಡಿ.
 				{0} ರೇಡಿ
 			
@@ -7203,14 +7640,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಡಿ.
 			
 			
-				ನಿ.
-				{0} ನಿ.
-				{0} ನಿ.ಗಳು
+				ಆರ್ಕ್‌ಮಿನಿ
+				{0} ಆರ್ಕ್‌ಮಿನಿ
+				{0} ಆರ್ಕ್‌ಮಿನಿ
 			
 			
-				ಸೆಕೆಂ.ಗಳು
-				{0} ಸೆಕೆಂ
-				{0} ಸೆಕೆಂ.ಗಳು
+				ಆರ್ಕ್‌ಸೆಕೆಂ
+				{0} ಆರ್ಕ್ಸ್‌ ಸೆಂ
+				{0} ಆರ್ಕ್‌ಸೆಕೆಂ
 			
 			
 				ಕಿಮೀ²
@@ -7224,10 +7661,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಹೆ.
 			
 			
-				ಚದರ ಮೀಟರ್‌ಗಳು
+				ಮೀಟರ್‌ಗಳು²
 				{0} ಮೀ²
 				{0} ಮೀ²
-				{0}/ಮೀ²ಗೆ
+				{0}/ಮೀ²
 			
 			
 				ಸೆಂ.ಮೀ²
@@ -7260,12 +7697,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ಅಂಗುಲಗಳು²
 				{0} ಅಂ²
 				{0} ಅಂ²
-				{0}/ಅಂ²ಕ್ಕೆ
+				{0}/ಅಂ²
 			
 			
-				ಡುನಮ್‌
-				{0} ಡುನಮ್
-				{0} ಡುನಮ್
+				ಡುನಮ್‌
+				{0} ಡುನಮ್
+				{0} ಡುನಮ್
 			
 			
 				ಕಾರಟ್‌ಗಳು
@@ -7288,23 +7725,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಭಾಪ್ರಮಿ
 			
 			
-				ಶೇಕಡಾ
+				ಶೇಕಡಾ
+				{0}%
+				{0}%
 			
 			
-				ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
+				ಪ್ರತಿ ಸಾವಿರಕ್ಕೆ
+				{0}‰
+				{0}‰
 			
 			
-				‱
-				{0}‱
-				{0}‱
+				ಪರ್ಮಿರೈಡ್
+				{0}‱
+				{0}‱
 			
 			
-				mol
-				{0} mol
-				{0} mol
+				ಮೋಲ್‌
+				{0} ಮೋಲ್
+				{0} ಮೋಲ್
 			
 			
-				ಲೀ/ಕಿ.ಮೀ
+				ಲೀಟರ್‌ಗಳು/ಕಿಮೀ
 				{0} ಲೀ/ಕಿ.ಮೀ
 				{0} ಲೀ/ಕಿ.ಮೀ
 			
@@ -7314,7 +7755,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಲೀ/100ಕಿ.ಮೀ
 			
 			
-				ಮೈ/ಗ್ಯಾ
+				ಮೈಲಿಗಳು/ಗ್ಯಾ
 				{0} ಪ್ರಗ್ಯಾಮೈ
 				{0} ಪ್ರ.ಗ್ಯಾ.ಮೈ.
 			
@@ -7324,9 +7765,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಮೈಪ್ರಗ್ರಾಂ Imp
 			
 			
-				ಪೆಬೈ
-				{0} ಪೆಬೈ
-				{0} ಪೆಬೈ
+				ಪೆಬೈ
+				{0} ಪೆಬೈ
+				{0} ಪೆಬೈ
 			
 			
 				ಟೆ.ಬೈ.
@@ -7369,13 +7810,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕಿ.ಬಿ.
 			
 			
-				ಬೈ.
-				{0} ಬೈ.
+				ಬೈಟ್
+				{0} ಬೈಟ್
 				{0} ಬೈ.
 			
 			
 				ಬಿಟ್‌
-				{0} ಬಿ.
+				{0} ಬಿಟ್
 				{0} ಬಿ.
 			
 			
@@ -7383,6 +7824,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಶ
 				{0} ಶ
 			
+			
+				ದಶ
+				{0} ದಶ
+				{0} ದಶ
+			
 			
 				ವರ್ಷಗಳು
 				{0} ವರ್ಷ
@@ -7491,24 +7937,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕಿವ್ಯಾಗಂ
 			
 			
-				eV
-				{0} eV
-				{0} eV
+				ಎಲೆಕ್ಟ್ರಾನ್‌ವೋಲ್ಟ್‌
+				{0} ಎವೋ
+				{0} ಎವೋ
 			
 			
-				Btu
-				{0} Btu
-				{0} Btu
+				ಬ್ರಿಉಘ
+				{0} ಬ್ರಿಉಘ
+				{0} ಬ್ರಿಉಘ
+			
+			
+				ಯುಎಸ್ ಥರ್ಮ್ಸ್
+				{0} ಯುಎಸ್ ಥರ್ಮ್ಸ್
+				{0} ಯುಎಸ್ ಥರ್ಮ್ಸ್
 			
 			
-				lbf
-				{0} lbf
-				{0} lbf
+				ಪೌಂಡ್ - ಫೋರ್ಸ್
+				{0} ಎಲ್‌ಬಿಎಫ್
+				{0} ಎಲ್‌ಬಿಎಫ್
 			
 			
-				N
-				{0} N
-				{0} N
+				ನ್ಯೂಟೋನ್‌
+				{0} ನ್ಯೂ
+				{0} ನ್ಯೂ
 			
 			
 				ಗಿ.ಹ
@@ -7530,6 +7981,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಹರ್ಟ್ಸ್‌
 				{0} ಹರ್ಟ್ಸ್‌
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				ಪಿಕ್ಸೆಲ್‌ಗಳು
+				{0} px
+				{0} px
+			
+			
+				ಮೆಗಾಪಿಕ್ಸೆಲ್‌ಗಳು
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				ಕಿಲೋಮೀಟರ್‌ಗಳು
 				{0} ಕಿಮೀ
@@ -7537,7 +8023,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/ಕಿ.ಮೀ
 			
 			
-				ಮೀಟರ್‌ಗಳು
+				ಮೀ
 				{0} ಮೀ
 				{0} ಮೀ
 				{0}/ಮೀ
@@ -7623,22 +8109,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ಪಾಯಿಂಟ್‌ಗಳು
 				{0} ಪಾಯಿಂಟ್
-				{0} ಪಾಯಿಂಟ್‌ಗಳು
+				{0} ಪಾಯಿಂಟ್‌
 			
 			
-				ಸೋಲಾರ್‌ ರೇಡಿ
-				{0} R☉
-				{0} R☉
+				ಸೋಲಾರ್‌ ರೇಡಿ
+				{0} R☉
+				{0} R☉
 			
 			
-				ಲ.
-				{0} ಲ.
-				{0} ಲ.
+				ಲಕ್ಸ್
+				{0} ಎಲ್‌ಎಕ್ಸ್
+				{0} ಎಲ್‌ಎಕ್ಸ್
 			
 			
-				L☉
-				{0} L☉
-				{0} L☉
+				ಸೌರ ಪ್ರಕಾಶಗಳು
 			
 			
 				ಟ
@@ -7700,19 +8184,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕ್ಯಾರೆ
 			
 			
-				ಡಿಎ
-				{0} ಡಿಎ
-				{0} Da
+				ಡಿಎ
+				{0} ಡಿಎ
+				{0} Da
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				ಭೂಮಿಯ ದೃವ್ಯರಾಶಿ
+				{0} ದೃ⊕
+				{0} ದೃ⊕
 			
 			
-				ಸೋಲಾರ್‌ ಮಾಸ್‌ಗಳು
-				{0} M☉
-				{0} M☉
+				ಸೋಲಾರ್‌ ಮಾಸ್‌ಗಳು
+				{0} ದೃ☉
+				{0} ದೃ☉
 			
 			
 				ಗಿ.ವ್ಯಾ
@@ -7744,11 +8228,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಹೆಚ್‌ಪಿ
 				{0} ಹೆಚ್‌ಪಿ
 			
-			
-				ಹೆ.ಪ್ಯಾ.
-				{0} ಹೆ.ಪ್ಯಾ
-				{0} ಹೆ.ಪ್ಯಾ
-			
 			
 				ಮರ್ಕ್ಯು.ಮಿ.ಮೀ.
 				{0} ಮರ್ಕ್ಯು ಮಿಮೀ
@@ -7764,28 +8243,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಮರ್ಕ್ಯುಅಂ
 				{0} ಮರ್ಕ್ಯುಅಂ
 			
+			
+				ಬಾರ್‌
+				{0} ಬಾರ್‌
+				{0} ಬಾರ್‌ಗಳು
+			
 			
 				ಮಿ.ಬಾರ್‌
 				{0} ಮಿ.ಬಾರ್
 				{0} ಮಿ.ಬಾರ್
 			
 			
-				ವಾತಾವರಣಗಳು
-				{0} ವಾತಾವರಣ
-				{0} ವಾತಾವರಣ
+				ವಾತಾವರಣಗಳು
+				{0} ವಾತಾವರಣ
+				{0} ವಾತಾವರಣ
+			
+			
+				ಪಾ
+				{0} ಪಾ
+				{0} ಪ್ಯಾ
+			
+			
+				ಹೆ.ಪ್ಯಾ.
+				{0} ಹೆ.ಪ್ಯಾ
+				{0} ಹೆ.ಪ್ಯಾ
 			
 			
-				ಕೆಪಿಎ
-				{0} ಕೆಪಿಎ
-				{0} ಕೆಪಿಎ
+				ಕೆಪಿಎ
+				{0} ಕೆಪಿಎ
+				{0} ಕೆಪಿಎ
 			
 			
-				ಎಂಪಿಎ
-				{0} ಎಂಪಿಎ
-				{0} ಎಂಪಿಎ
+				ಎಂಪಿಎ
+				{0} ಎಂಪಿಎ
+				{0} ಎಂಪಿಎ
 			
 			
-				ಕಿ.ಮೀ/ಗಂ
+				ಕಿ.ಮೀ/ಗಂಟೆ
 				{0} ಕಿ.ಮೀ./ಗಂ
 				{0} ಕಿ.ಮೀ./ಗಂ
 			
@@ -7795,7 +8289,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಮೀ/ಸೆ.
 			
 			
-				ಮೈ/ಗಂ
+				ಮೈಲುಗಳು/ಗಂಟೆ
 				{0} ಮೈ/ಗಂ
 				{0} ಮೈ/ಗಂ
 			
@@ -7825,14 +8319,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಕೆ
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				ಎಲ್‌ಬಿಎಫ್-ಎಫ್‌ಟಿ
+				{0} ಎಲ್‌ಬಿಎಫ್-ಎಫ್‌ಟಿ
+				{0} ಎಲ್‌ಬಿಎಫ್-ಎಫ್‌ಟಿ
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				ನ್ಯೂ.ಮೀ
+				{0} ನ್ಯೂ.ಮೀ
+				{0} ನ್ಯೂ.ಮೀ
 			
 			
 				ಕಿಮೀ³
@@ -7950,9 +8444,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಫ್ಲೂ.ಔ
 			
 			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				ಇಂಪಿ. ಫ್ಲೂ. ಔ.
+				{0} fl oz Imp.
+				{0} fl oz Imp.
 			
 			
 				ಟೇ.ಸ್ಪೂ
@@ -7965,12 +8459,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ಟೀ ಸ್ಪೂ
 			
 			
-				bbl
-				{0} bbl
-				{0} bbl
+				ಬ್ಯಾರೆಲ್
+				{0} bbl
+				{0} bbl
 			
 			
-				ದಿಕ್ಕು
+				ದಿಕ್ಕು
 				{0}ಪೂ
 				{0}ಉ
 				{0}ದ
@@ -8017,13 +8511,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ಚ.ಅ
 				{0}ಚ.ಅ
 			
+			
+				%
+				{0}%
+				{0}%
+			
 			
 				ಲೀ/100ಕಿ.ಮೀ
 				{0} ಲೀ/100ಕಿಮೀ
 				{0} ಲೀ/100ಕಿಮೀ
 			
 			
-				ವರ್ಷಗಳು
+				ವ
 				{0}ವ
 				{0}ವ
 			
@@ -8035,13 +8534,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ವಾರ
-				{0}ವಾರ
-				{0}ವಾರ
+				{0}ವಾ
+				{0}ವಾ
 			
 			
 				ದಿನ
-				{0}ದಿನ
-				{0}ದಿನ
+				{0}ದಿ
+				{0}ದಿ
 				{0}/ದಿ
 			
 			
@@ -8074,7 +8573,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/ಕಿ.ಮೀ
 			
 			
-				ಮೀಟರ್‌ಗಳು
+				ಮೀ
 				{0}ಮೀ
 				{0}ಮೀ
 				{0}/ಮೀ
@@ -8171,11 +8670,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ಹೆಚ್‌ಪಿ
 				{0}ಹೆಚ್‌ಪಿ
 			
-			
-				ಹೆ.ಪ್ಯಾ.
-				{0}ಹೆ.ಪ್ಯಾ
-				{0}ಹೆ.ಪ್ಯಾ
-			
 			
 				ಮರ್ಕ್ಯು.ಮಿ.ಮೀ.
 				{0}mmHg
@@ -8196,6 +8690,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ಮಿ.ಬಾ.
 				{0}ಮಿ.ಬಾ.
 			
+			
+				ಹೆ.ಪ್ಯಾ.
+				{0}ಹೆ.ಪ್ಯಾ
+				{0}ಹೆ.ಪ್ಯಾ
+			
 			
 				ಕಿ.ಮೀ/ಗಂ
 				{0}ಕಿ.ಮೀ.ಗಂ
@@ -8211,6 +8710,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ಮೈ/ಗಂ
 				{0}ಮೈ/ಗಂ
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°ಸೆ
 				{0}°ಸೆ
@@ -8240,7 +8744,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ಲೀ
 			
 			
-				ದಿಕ್ಕು
+				ದಿಕ್ಕು
 				{0}ಪೂ
 				{0}ಉ
 				{0}ದ
@@ -8270,6 +8774,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, ಅಥವಾ {1}
 			{0} ಅಥವಾ {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/kn_IN.xml b/make/data/cldr/common/main/kn_IN.xml
index fdf05f0f8a2..4513cf63771 100644
--- a/make/data/cldr/common/main/kn_IN.xml
+++ b/make/data/cldr/common/main/kn_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ko.xml b/make/data/cldr/common/main/ko.xml
index 37c3e46e47f..c6ee79adeba 100644
--- a/make/data/cldr/common/main/ko.xml
+++ b/make/data/cldr/common/main/ko.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -95,7 +95,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			카리브어
 			카유가어
 			앗삼어
-			차크마어
+			차크마어
 			체첸어
 			세부아노어
 			치가어
@@ -152,7 +152,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			중세 영어
 			에스페란토어
 			스페인어
-			스페인어(유럽)
+			스페인어(유럽)
 			에스토니아어
 			바스크어
 			이원도어
@@ -408,7 +408,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			고대 프로방스어
 			파슈토어
 			포르투갈어
-			포르투갈어(유럽)
+			포르투갈어(유럽)
 			케추아어
 			키체어
 			라자스탄어
@@ -548,12 +548,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			이디시어
 			요루바어
 			광둥어
+			중국어(광둥어)
 			주앙어
 			사포테크어
 			블리스 심볼
 			제나가어
 			표준 모로코 타마지트어
 			중국어
+			중국어(만다린)
+			중국어(만다린, 간체)
+			중국어(만다린, 번체)
 			줄루어
 			주니어
 			언어 관련 내용 없음
@@ -1028,8 +1032,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			바누아투
 			왈리스-푸투나 제도
 			사모아
-			유사 억양
-			유사 양방향
+			유사 억양
+			유사 양방향
 			코소보
 			예멘
 			마요트
@@ -1093,22 +1097,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			달력
 			통화 형식
-			기호 정렬 무시
-			악센트 역순 정렬
-			대문자/소문자 순서
-			대/소문자 구분 정렬
+			기호 정렬 무시
+			악센트 역순 정렬
+			대문자/소문자 순서
+			대/소문자 구분 정렬
 			정렬 순서
-			표준 정렬
-			숫자 정렬
-			정렬 강도
+			표준 정렬
+			숫자 정렬
+			정렬 강도
 			통화
 			시간표시법(12시, 24시)
 			줄바꿈 스타일
 			계량법
 			숫자
-			시간대
-			방언
-			공개 여부
+			시간대
+			방언
+			공개 여부
 		
 		
 			불교력
@@ -1252,24 +1256,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[가-힣]
 		[ᄀ-ᄒ ᅡ-ᅵ ᆨ-ᇂ 丘 串 乃 久 乖 九 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 企 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個 倞 倦 倨 假 偈 健 傀 傑 傾 僅 僑 價 儆 儉 儺 光 克 兢 內 公 共 其 具 兼 冀 冠 凱 刊 刮 券 刻 剋 剛 劇 劍 劒 功 加 劤 劫 勁 勍 勘 勤 勸 勻 勾 匡 匣 區 南 卦 却 卵 卷 卿 厥 去 及 口 句 叩 叫 可 各 吉 君 告 呱 呵 咎 咬 哥 哭 啓 喀 喇 喝 喫 喬 嗜 嘉 嘔 器 囊 困 固 圈 國 圭 圻 均 坎 坑 坤 坰 坵 垢 基 埼 堀 堅 堈 堪 堺 塊 塏 境 墾 壙 壞 夔 奇 奈 奎 契 奸 妓 妗 姑 姜 姦 娘 娜 嫁 嬌 孔 季 孤 宏 官 客 宮 家 寄 寇 寡 寬 尻 局 居 屆 屈 岐 岡 岬 崎 崑 崗 嵌 嵐 嶇 嶠 工 巧 巨 己 巾 干 幹 幾 庚 庫 康 廊 廐 廓 廣 建 弓 强 彊 徑 忌 急 怪 怯 恐 恝 恪 恭 悸 愆 感 愧 愷 愾 慊 慣 慤 慨 慶 慷 憩 憬 憾 懃 懇 懦 懶 懼 戈 戒 戟 戡 扱 技 抉 拉 拏 拐 拒 拘 括 拮 拱 拳 拷 拿 捏 据 捲 捺 掘 掛 控 揀 揆 揭 擊 擎 擒 據 擧 攪 攷 改 攻 故 敎 救 敢 敬 敲 斛 斤 旗 旣 昆 昑 景 晷 暇 暖 暠 暻 曠 曲 更 曷 朗 朞 期 机 杆 杞 杰 枏 果 枯 架 枸 柑 柩 柬 柯 校 根 格 桀 桂 桔 桿 梏 梗 械 梱 棄 棋 棍 棘 棨 棺 楗 楠 極 槁 構 槐 槨 槪 槻 槿 樂 橄 橋 橘 機 檄 檎 檢 櫃 欄 權 欺 款 歌 歐 歸 殼 毆 毬 氣 求 江 汨 汲 決 汽 沂 沽 洛 洸 浪 涇 淃 淇 減 渠 渴 湳 溝 溪 滑 滾 漑 潔 潰 澗 激 濫 灌 灸 炅 炚 炬 烙 烱 煖 爛 牽 犬 狂 狗 狡 狼 獗 玖 玘 珂 珏 珖 珙 珞 珪 球 琦 琨 琪 琯 琴 瑾 璂 璟 璣 璥 瓊 瓘 瓜 甄 甘 甲 男 畇 界 畸 畺 畿 疆 疥 疳 痂 痙 痼 癎 癩 癸 皆 皎 皐 盖 監 看 眷 睾 瞰 瞼 瞿 矜 矩 矯 硅 硬 碁 碣 磎 磬 磯 磵 祁 祇 祈 祛 祺 禁 禽 科 稈 稼 稽 稿 穀 究 穹 空 窘 窟 窮 窺 竅 竟 竭 競 竿 筋 筐 筠 箇 箕 箝 管 簡 粳 糠 系 糾 紀 納 紘 級 紺 絅 結 絞 給 絳 絹 絿 經 綱 綺 緊 繫 繭 繼 缺 罐 罫 羅 羈 羌 羔 群 羹 翹 考 耆 耉 耕 耭 耿 肌 肝 股 肩 肯 肱 胛 胱 脚 脛 腔 腱 膈 膏 膠 臘 臼 舅 舊 舡 艮 艱 芎 芥 芩 芹 苛 苟 苦 苽 茄 莖 菅 菊 菌 菓 菫 菰 落 葛 葵 蓋 蕎 蕨 薑 藁 藍 藿 蘭 蘿 虔 蚣 蛟 蝎 螺 蠟 蠱 街 衢 衲 衾 衿 袈 袞 袴 裙 裸 褐 襁 襟 襤 見 規 覡 覲 覺 觀 角 計 記 訣 訶 詭 誇 誡 誥 課 諫 諾 謙 講 謳 謹 譏 警 譴 谷 谿 豈 貢 貫 貴 賈 購 赳 起 跏 距 跨 踞 蹇 蹶 躬 軀 車 軌 軍 軻 較 輕 轎 轟 辜 近 迦 迲 适 逑 逕 逵 過 遣 遽 邏 那 邯 邱 郊 郎 郡 郭 酪 醵 金 鈐 鈞 鉀 鉅 鉗 鉤 銶 鋸 鋼 錡 錤 錦 錮 鍋 鍵 鎌 鎧 鏡 鑑 鑒 鑛 開 間 閘 閣 閨 闕 關 降 階 隔 隙 雇 難 鞏 鞠 鞨 鞫 頃 頸 顆 顧 飢 餃 館 饉 饋 饑 駒 駕 駱 騎 騏 騫 驅 驕 驚 驥 骨 高 鬼 魁 鮫 鯤 鯨 鱇 鳩 鵑 鵠 鷄 鷗 鸞 麒 麴 黔 鼓 龕 龜]
 		[ㄱ ㄴ ㄷ ㄹ ㅁ ㅂ ㅅ ㅇ ㅈ ㅊ ㅋ ㅌ ㅍ ㅎ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[‾ _ ＿ \- － ‐ — ― 〜 ・ , ， 、 ; ； \: ： ! ！ ¡ ? ？ ¿ . ． ‥ … 。 · ＇ ‘ ’ " ＂ “ ” ( （ ) ） \[ ［ \] ］ \{ ｛ \} ｝ 〈 〉 《 》 「 」 『 』 【 】 〔 〕 § ¶ @ ＠ * ＊ / ／ \\ ＼ \& ＆ # ＃ % ％ ‰ † ‡ ′ ″ 〃 ※]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[‾ _ ＿ \- － ‐ ‑ — ― 〜 ・ , ， 、 ; ； \: ： ! ！ ¡ ? ？ ¿ . ． ‥ … 。 · ＇ ‘ ’ " ＂ “ ” ( （ ) ） \[ ［ \] ］ \{ ｛ \} ｝ 〈 〉 《 》 「 」 『 』 【 】 〔 〕 § ¶ @ ＠ * ＊ / ／ \\ ＼ \& ＆ # ＃ % ％ ‰ † ‡ ′ ″ 〃 ※]
+		{0}…
+		…{0}
+		{0}…{1}
+		{0} …
+		… {0}
+		{0} … {1}
+		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
+	
+		“
+		”
+		‘
+		’
+	
 	
 		
 			
@@ -2866,6 +2887,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						유대력
 					
+					
+						AM
+					
+					
+						AM
+					
 				
 			
 			
@@ -2907,6 +2934,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						히즈라력
 					
+					
+						AH
+					
+					
+						AH
+					
 				
 				
 					
@@ -4486,7 +4519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				악토브
 			
 			
-				코스타나이
+				코스타나이
 			
 			
 				키질로르다
@@ -6068,14 +6101,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			‏+
 			‏-
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -6084,6 +6125,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0천
@@ -6165,6 +6211,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				아랍에미리트 디르함
 				아랍에미리트 디르함
+				AED
 			
 			
 				아프가니 (1927–2002)
@@ -6172,22 +6219,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				아프가니스탄 아프가니
 				아프가니스탄 아프가니
+				AFN
 			
 			
 				알바니아 레크
 				알바니아 레크
+				ALL
 			
 			
 				아르메니아 드람
 				아르메니아 드람
+				AMD
 			
 			
 				네덜란드령 안틸레스 길더
 				네덜란드령 안틸레스 길더
+				ANG
 			
 			
 				앙골라 콴자
 				앙골라 콴자
+				AOA
+				Kz
 			
 			
 				앙골라 콴자 (1977–1990)
@@ -6213,6 +6266,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				아르헨티나 페소
 				아르헨티나 페소
+				ARS
+				$
 			
 			
 				호주 실링
@@ -6221,10 +6276,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				호주 달러
 				호주 달러
 				AU$
+				$
 			
 			
 				아루바 플로린
 				아루바 플로린
+				AWG
 			
 			
 				아제르바이젠 마나트(1993–2006)
@@ -6232,6 +6289,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				아제르바이잔 마나트
 				아제르바이잔 마나트
+				AZN
 			
 			
 				보스니아-헤르체고비나 디나르
@@ -6239,6 +6297,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				보스니아-헤르체고비나 태환 마르크
 				보스니아-헤르체고비나 태환 마르크
+				BAM
+				KM
 			
 			
 				보스니아-헤르체고비나 신디나르 (1994–1997)
@@ -6246,10 +6306,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				바베이도스 달러
 				바베이도스 달러
+				BBD
+				$
 			
 			
 				방글라데시 타카
 				방글라데시 타카
+				BDT
+				৳
 			
 			
 				벨기에 프랑 (태환)
@@ -6269,6 +6333,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				불가리아 레프
 				불가리아 레프
+				BGN
 			
 			
 				불가리아 렛 (1879–1952)
@@ -6276,22 +6341,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				바레인 디나르
 				바레인 디나르
+				BHD
 			
 			
 				부룬디 프랑
 				부룬디 프랑
+				BIF
 			
 			
 				버뮤다 달러
 				버뮤다 달러
+				BMD
+				$
 			
 			
 				부루나이 달러
 				부루나이 달러
+				BND
+				$
 			
 			
 				볼리비아노
 				볼리비아노
+				BOB
+				Bs
 			
 			
 				볼리비아 볼리비아노 (1863–1963)
@@ -6314,6 +6387,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				브라질 레알
 				브라질 헤알
+				R$
+				R$
 			
 			
 				브라질 크루자두 노보
@@ -6327,10 +6402,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				바하마 달러
 				바하마 달러
+				BSD
+				$
 			
 			
 				부탄 눌투눔
 				부탄 눌투눔
+				BTN
 			
 			
 				버마 차트
@@ -6338,6 +6416,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				보츠와나 폴라
 				보츠와나 폴라
+				BWP
+				P
 			
 			
 				벨라루스 신권 루블 (1994–1999)
@@ -6345,22 +6425,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				벨라루스 루블
 				벨라루스 루블
+				BYN
+				р.
 			
 			
 				벨라루스 루블 (2000–2016)
 				벨라루스 루블 (2000–2016)
+				BYR
 			
 			
 				벨리즈 달러
 				벨리즈 달러
+				BZD
+				$
 			
 			
 				캐나다 달러
 				캐나다 달러
+				CA$
+				$
 			
 			
 				콩고 프랑 콩골라스
 				콩고 프랑 콩골라스
+				CDF
 			
 			
 				유로 (WIR)
@@ -6368,6 +6456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				스위스 프랑
 				스위스 프랑
+				CHF
 			
 			
 				프랑 (WIR)
@@ -6381,18 +6470,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				칠레 페소
 				칠레 페소
+				CLP
+				$
 			
 			
 				중국 위안화(역외)
 				중국 위안화(역외)
+				CNH
 			
 			
 				중국 위안화
 				중국 위안화
+				CN¥
+				¥
 			
 			
 				콜롬비아 페소
 				콜롬비아 페소
+				COP
+				$
 			
 			
 				콜롬비아 실가 단위
@@ -6400,6 +6496,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				코스타리카 콜론
 				코스타리카 콜론
+				CRC
+				₡
 			
 			
 				고 세르비아 디나르
@@ -6410,14 +6508,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				쿠바 태환 페소
 				쿠바 태환 페소
+				CUC
+				$
 			
 			
 				쿠바 페소
 				쿠바 페소
+				CUP
+				$
 			
 			
 				카보베르데 에스쿠도
 				카보베르데 에스쿠도
+				CVE
 			
 			
 				싸이프러스 파운드
@@ -6425,6 +6528,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				체코 공화국 코루나
 				체코 공화국 코루나
+				CZK
+				Kč
 			
 			
 				동독 오스트마르크
@@ -6435,18 +6540,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				지부티 프랑
 				지부티 프랑
+				DJF
 			
 			
 				덴마크 크로네
 				덴마크 크로네
+				DKK
+				kr
 			
 			
 				도미니카 페소
 				도미니카 페소
+				DOP
+				$
 			
 			
 				알제리 디나르
 				알제리 디나르
+				DZD
 			
 			
 				에쿠아도르 수크레
@@ -6460,10 +6571,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				이집트 파운드
 				이집트 파운드
+				EGP
+				E£
 			
 			
 				에리트리아 나크파
 				에리트리아 나크파
+				ERN
 			
 			
 				스페인 페세타(예금)
@@ -6477,10 +6591,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				에티오피아 비르
 				에티오피아 비르
+				ETB
 			
 			
 				유로
 				유로
+				€
+				€
 			
 			
 				핀란드 마르카
@@ -6488,10 +6605,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				피지 달러
 				피지 달러
+				FJD
+				$
 			
 			
 				포클랜드제도 파운드
 				포클랜드제도 파운드
+				FKP
+				£
 			
 			
 				프랑스 프랑
@@ -6499,6 +6620,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				파운드
 				영국령 파운드 스털링
+				£
+				£
 			
 			
 				그루지야 지폐 라리트
@@ -6506,6 +6629,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				조지아 라리
 				조지아 라리
+				GEL
+				₾
 				₾
 			
 			
@@ -6514,18 +6639,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				가나 시디
 				가나 시디
+				GHS
 			
 			
 				지브롤터 파운드
 				지브롤터 파운드
+				GIP
+				£
 			
 			
 				감비아 달라시
 				감비아 달라시
+				GMD
 			
 			
 				기니 프랑
 				기니 프랑
+				GNF
+				FG
 			
 			
 				기니 시리
@@ -6539,6 +6670,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				과테말라 케트살
 				과테말라 케트살
+				GTQ
+				Q
 			
 			
 				포르투갈령 기니 에스쿠도
@@ -6549,14 +6682,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				가이아나 달러
 				가이아나 달러
+				GYD
+				$
 			
 			
 				홍콩 달러
 				홍콩 달러
+				HK$
+				$
 			
 			
 				온두라스 렘피라
 				온두라스 렘피라
+				HNL
+				L
 			
 			
 				크로아티아 디나르
@@ -6564,18 +6703,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				크로아티아 쿠나
 				크로아티아 쿠나
+				HRK
+				kn
 			
 			
 				하이티 구르드
 				하이티 구르드
+				HTG
 			
 			
 				헝가리 포린트
 				헝가리 포린트
+				HUF
+				Ft
 			
 			
 				인도네시아 루피아
 				인도네시아 루피아
+				IDR
+				Rp
 			
 			
 				아일랜드 파운드
@@ -6586,22 +6732,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				이스라엘 신권 세켈
 				이스라엘 신권 세켈
+				₪
+				₪
 			
 			
 				인도 루피
 				인도 루피
+				₹
+				₹
 			
 			
 				이라크 디나르
 				이라크 디나르
+				IQD
 			
 			
 				이란 리얄
 				이란 리얄
+				IRR
 			
 			
 				아이슬란드 크로나
 				아이슬란드 크로나
+				ISK
+				kr
 			
 			
 				이탈리아 리라
@@ -6609,34 +6763,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				자메이카 달러
 				자메이카 달러
+				JMD
+				$
 			
 			
 				요르단 디나르
 				요르단 디나르
+				JOD
 			
 			
 				일본 엔화
 				일본 엔화
+				JP¥
+				¥
 			
 			
 				케냐 실링
 				케냐 실링
+				KES
 			
 			
 				키르기스스탄 솜
 				키르기스스탄 솜
+				KGS
 			
 			
 				캄보디아 리얄
 				캄보디아 리얄
+				KHR
+				៛
 			
 			
 				코모르 프랑
 				코모르 프랑
+				KMF
+				CF
 			
 			
 				조선 민주주의 인민 공화국 원
 				조선 민주주의 인민 공화국 원
+				KPW
+				₩
 			
 			
 				대한민국 환 (1953–1962)
@@ -6644,34 +6811,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				대한민국 원
 				대한민국 원
+				₩
+				₩
 			
 			
 				쿠웨이트 디나르
 				쿠웨이트 디나르
+				KWD
 			
 			
 				케이맨 제도 달러
 				케이맨 제도 달러
+				KYD
+				$
 			
 			
 				카자흐스탄 텐게
 				카자흐스탄 텐게
+				KZT
+				₸
 			
 			
 				라오스 키프
 				라오스 키프
+				LAK
+				₭
 			
 			
 				레바논 파운드
 				레바논 파운드
+				LBP
+				L£
 			
 			
 				스리랑카 루피
 				스리랑카 루피
+				LKR
+				Rs
 			
 			
 				라이베리아 달러
 				라이베리아 달러
+				LRD
+				$
 			
 			
 				레소토 로티
@@ -6679,6 +6861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				리투아니아 리타
 				리투아니아 리타
+				LTL
 			
 			
 				룩셈부르크 타로나
@@ -6695,6 +6878,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				라트비아 라트
 				라트비아 라트
+				LVL
 			
 			
 				라트비아 루블
@@ -6702,10 +6886,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				리비아 디나르
 				리비아 디나르
+				LYD
 			
 			
 				모로코 디렘
 				모로코 디렘
+				MAD
 			
 			
 				모로코 프랑
@@ -6719,10 +6905,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				몰도바 레이
 				몰도바 레이
+				MDL
 			
 			
 				마다가스카르 아리아리
 				마다가스카르 아리아리
+				MGA
+				Ar
 			
 			
 				마다가스카르 프랑
@@ -6730,6 +6919,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				마케도니아 디나르
 				마케도니아 디나르
+				MKD
 			
 			
 				말리 프랑
@@ -6737,22 +6927,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				미얀마 키얏
 				미얀마 키얏
+				MMK
+				K
 			
 			
 				몽골 투그릭
 				몽골 투그릭
+				MNT
+				₮
 			
 			
 				마카오 파타카
 				마카오 파타카
+				MOP
 			
 			
 				모리타니 우기야 (1973–2017)
 				모리타니 우기야 (1973–2017)
+				MRO
 			
 			
 				모리타니 우기야
 				모리타니 우기야
+				MRU
 			
 			
 				몰타 리라
@@ -6763,18 +6960,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				모리셔스 루피
 				모리셔스 루피
+				MUR
+				Rs
 			
 			
 				몰디브 제도 루피아
 				몰디브 제도 루피아
+				MVR
 			
 			
 				말라위 콰쳐
 				말라위 콰쳐
+				MWK
 			
 			
 				멕시코 페소
 				멕시코 페소
+				MX$
+				$
 			
 			
 				멕시코 실버 페소 (1861–1992)
@@ -6785,6 +6988,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				말레이시아 링깃
 				말레이시아 링깃
+				MYR
+				RM
 			
 			
 				모잠비크 에스쿠도
@@ -6795,14 +7000,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				모잠비크 메티칼
 				모잠비크 메티칼
+				MZN
 			
 			
 				나미비아 달러
 				나미비아 달러
+				NAD
+				$
 			
 			
 				니제르 나이라
 				니제르 나이라
+				NGN
+				₦
 			
 			
 				니카라과 코르도바
@@ -6810,6 +7020,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				니카라과 코르도바 오로
 				니카라과 코르도바 오로
+				NIO
+				C$
 			
 			
 				네델란드 길더
@@ -6817,22 +7029,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				노르웨이 크로네
 				노르웨이 크로네
+				NOK
+				kr
 			
 			
 				네팔 루피
 				네팔 루피
+				NPR
+				Rs
 			
 			
 				뉴질랜드 달러
 				뉴질랜드 달러
+				NZ$
+				$
 			
 			
 				오만 리얄
 				오만 리얄
+				OMR
 			
 			
 				파나마 발보아
 				파나마 발보아
+				PAB
 			
 			
 				페루 인티
@@ -6840,6 +7060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				페루 솔
 				페루 솔
+				PEN
 			
 			
 				페루 솔 (1863–1965)
@@ -6847,18 +7068,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				파푸아뉴기니 키나
 				파푸아뉴기니 키나
+				PGK
 			
 			
 				필리핀 페소
 				필리핀 페소
+				PHP
+				₱
 			
 			
 				파키스탄 루피
 				파키스탄 루피
+				PKR
+				Rs
 			
 			
 				폴란드 즐로티
 				폴란드 즐로티
+				PLN
+				zł
 			
 			
 				폴란드 즐로티 (1950–1995)
@@ -6869,10 +7097,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				파라과이 과라니
 				파라과이 과라니
+				PYG
+				₲
 			
 			
 				카타르 리얄
 				카타르 리얄
+				QAR
 			
 			
 				로디지아 달러
@@ -6883,15 +7114,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				루마니아 레우
 				루마니아 레우
+				RON
 				L
 			
 			
 				세르비아 디나르
 				세르비아 디나르
+				RSD
 			
 			
 				러시아 루블
 				러시아 루블
+				RUB
+				₽
 			
 			
 				러시아 루블 (1991–1998)
@@ -6899,18 +7134,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				르완다 프랑
 				르완다 프랑
+				RWF
+				RF
 			
 			
 				사우디아라비아 리얄
 				사우디아라비아 리얄
+				SAR
 			
 			
 				솔로몬 제도 달러
 				솔로몬 제도 달러
+				SBD
+				$
 			
 			
 				세이셸 루피
 				세이셸 루피
+				SCR
 			
 			
 				수단 디나르
@@ -6918,6 +7159,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				수단 파운드
 				수단 파운드
+				SDG
 			
 			
 				고 수단 파운드
@@ -6925,14 +7167,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				스웨덴 크로나
 				스웨덴 크로나
+				SEK
+				kr
 			
 			
 				싱가폴 달러
 				싱가폴 달러
+				SGD
+				$
 			
 			
 				세인트헬레나 파운드
 				세인트헬레나 파운드
+				SHP
+				£
 			
 			
 				슬로베니아 톨라르
@@ -6943,14 +7191,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				시에라리온 리온
 				시에라리온 리온
+				SLL
 			
 			
 				소말리아 실링
 				소말리아 실링
+				SOS
 			
 			
 				수리남 달러
 				수리남 달러
+				SRD
+				$
 			
 			
 				수리남 길더
@@ -6958,14 +7210,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				남수단 파운드
 				남수단 파운드
+				SSP
+				£
 			
 			
 				상투메 프린시페 도브라 (1977–2017)
 				상투메 프린시페 도브라 (1977–2017)
+				STD
 			
 			
 				상투메 프린시페 도브라
 				상투메 프린시페 도브라
+				STN
+				Db
 			
 			
 				소련 루블
@@ -6976,14 +7233,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				시리아 파운드
 				시리아 파운드
+				SYP
+				£
 			
 			
 				스와질란드 릴랑게니
 				스와질란드 릴랑게니
+				SZL
 			
 			
 				태국 바트
 				태국 바트
+				THB
+				฿
 			
 			
 				타지키스탄 루블
@@ -6991,6 +7253,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				타지키스탄 소모니
 				타지키스탄 소모니
+				TJS
 			
 			
 				투르크메니스탄 마나트 (1993–2009)
@@ -6998,14 +7261,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				투르크메니스탄 마나트
 				투르크메니스탄 마나트
+				TMT
 			
 			
 				튀니지 디나르
 				튀니지 디나르
+				TND
 			
 			
 				통가 파앙가
 				통가 파앙가
+				TOP
+				T$
 			
 			
 				티모르 에스쿠도
@@ -7016,23 +7283,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				신 터키 리라
 				신 터키 리라
+				TRY
+				₺
+				TL
 			
 			
 				트리니다드 토바고 달러
 				트리니다드 토바고 달러
+				TTD
+				$
 			
 			
 				신 타이완 달러
 				신 타이완 달러
+				NT$
 				NT$
 			
 			
 				탄자니아 실링
 				탄자니아 실링
+				TZS
 			
 			
 				우크라이나 그리브나
 				우크라이나 그리브나
+				UAH
+				₴
 			
 			
 				우크라이나 카보바네츠
@@ -7043,10 +7319,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				우간다 실링
 				우간다 실링
+				UGX
 			
 			
 				미국 달러
 				미국 달러
+				US$
+				$
 			
 			
 				미국 달러(다음날)
@@ -7063,10 +7342,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				우루과이 페소 우루과요
 				우루과이 페소 우루과요
+				UYU
+				$
 			
 			
 				우즈베키스탄 숨
 				우즈베키스탄 숨
+				UZS
 			
 			
 				베네주엘라 볼리바르 (1871–2008)
@@ -7074,14 +7356,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				베네수엘라 볼리바르 (2008–2018)
 				베네수엘라 볼리바르 (2008–2018)
+				VEF
+				Bs
 			
 			
 				베네수엘라 볼리바르
 				베네수엘라 볼리바르
+				VES
 			
 			
 				베트남 동
 				베트남 동
+				₫
+				₫
 			
 			
 				베트남 동 (1978–1985)
@@ -7089,14 +7376,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				바누아투 바투
 				바누아투 바투
+				VUV
 			
 			
 				서 사모아 탈라
 				서 사모아 탈라
+				WST
 			
 			
 				중앙아프리카 CFA 프랑
 				중앙아프리카 CFA 프랑
+				FCFA
 			
 			
 				은화
@@ -7119,6 +7409,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				동카리브 달러
 				동카리브 달러
+				EC$
+				$
 			
 			
 				특별인출권
@@ -7135,6 +7427,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				서아프리카 CFA 프랑
 				서아프리카 CFA 프랑
+				CFA
 			
 			
 				팔라듐
@@ -7142,6 +7435,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				CFP 프랑
 				CFP 프랑
+				CFPF
 			
 			
 				백금
@@ -7162,6 +7456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				예멘 리알
 				예멘 리알
+				YER
 			
 			
 				유고슬라비아 동전 디나르
@@ -7178,6 +7473,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				남아프리카 랜드
 				남아프리카 랜드
+				ZAR
+				R
 			
 			
 				쟘비아 콰쳐 (1968–2012)
@@ -7185,6 +7482,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				잠비아 콰쳐
 				잠비아 콰쳐
+				ZMW
+				ZK
 			
 			
 				자이르 신권 자이르
@@ -7288,8 +7587,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				제곱인치당 {0}
 			
 			
-				두남
-				{0}두남
+				두남
+				{0}두남
 			
 			
 				캐럿
@@ -7304,15 +7603,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				리터당 {0}밀리몰
 			
 			
+				ppm
 				{0}ppm
 			
-			
-				‱
-				{0}‱
+			
+				%
+				{0}%
+			
+			
+				‰
+				{0}‰
 			
 			
-				몰
-				{0}몰
+				몰
+				{0}몰
 			
 			
 				킬로미터당 리터
@@ -7466,20 +7770,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}킬로와트시
 			
 			
-				전자볼트
-				{0}전자볼트
+				전자볼트
+				{0}전자볼트
 			
 			
-				영국 열량 단위
-				{0}영국 열량 단위
+				영국 열량 단위
+				{0}영국 열량 단위
 			
 			
-				파운드포스
-				{0}파운드포스
+				파운드포스
+				{0}파운드포스
 			
 			
-				뉴턴
-				{0}뉴턴
+				뉴턴
+				{0}뉴턴
 			
 			
 				기가헤르츠
@@ -7583,16 +7887,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}포인트
 			
 			
-				태양 반경
-				{0} 태양 반경
+				태양 반경
+				{0} 태양 반경
 			
 			
 				룩스
 				{0}룩스
 			
 			
-				태양 광도
-				{0}태양 광도
+				태양 광도
+				{0}태양 광도
 			
 			
 				메트릭 톤
@@ -7643,16 +7947,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}캐럿
 			
 			
-				돌턴
-				{0}돌턴
+				돌턴
+				{0}돌턴
 			
 			
-				지구 질량
-				{0}지구 질량
+				지구 질량
+				{0}지구 질량
 			
 			
-				태양 질량
-				{0}태양 질량
+				태양 질량
+				{0}태양 질량
 			
 			
 				기가와트
@@ -7678,10 +7982,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				마력
 				{0}마력
 			
-			
-				헥토파스칼
-				{0}헥토파스칼
-			
 			
 				수은주밀리미터
 				{0}수은주밀리미터
@@ -7699,24 +7999,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}밀리바
 			
 			
+				atm
 				{0}atm
 			
+			
+				헥토파스칼
+				{0}헥토파스칼
+			
 			
-				킬로파스칼
-				{0}킬로파스칼
+				킬로파스칼
+				{0}킬로파스칼
 			
 			
-				메가파스칼
-				{0}메가파스칼
+				메가파스칼
+				{0}메가파스칼
 			
 			
 				시간당 킬로미터
 				시속 {0}킬로미터
 			
 			
+				m/s
 				초속 {0}미터
 			
 			
+				mi/h
 				시속 {0}마일
 			
 			
@@ -7740,12 +8047,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}켈빈
 			
 			
-				lbf⋅ft
 				{0}lbf⋅ft
 			
 			
-				뉴턴미터
-				{0}뉴턴미터
+				뉴턴미터
+				{0}뉴턴미터
 			
 			
 				세제곱킬로미터
@@ -7841,8 +8147,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}액량 온스
 			
 			
-				영국 액량 온스
-				{0}영국 액량 온스
+				영국 액량 온스
+				{0}영국 액량 온스
 			
 			
 				테이블스푼
@@ -7853,8 +8159,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}티스푼
 			
 			
-				배럴
-				{0}배럴
+				배럴
+				{0}배럴
 			
 			
 				방향
@@ -7865,84 +8171,118 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}⋅{1}
+			
 			
+				g-force
 				{0}G
 			
 			
+				m/s²
 				{0}m/s²
 			
 			
+				rev
 				{0}rev
 			
 			
+				rad
 				{0}rad
 			
 			
 				°
+				{0}°
 			
 			
 				′
+				{0}′
 			
 			
 				″
+				{0}″
 			
 			
+				km²
 				{0}km²
+				{0}/km²
 			
 			
 				ha
 				{0}ha
 			
 			
+				m²
 				{0}m²
+				{0}/m²
 			
 			
+				cm²
 				{0}cm²
+				{0}/cm²
 			
 			
+				mi²
 				{0}mi²
+				{0}/mi²
 			
 			
 				ac
 				{0}ac
 			
 			
+				yd²
 				{0}yd²
 			
 			
+				ft²
 				{0}ft²
 			
 			
+				in²
 				{0}in²
+				{0}/in²
 			
 			
-				두남
-				{0}두남
+				두남
+				{0}두남
 			
 			
+				kt
 				{0}kt
 			
 			
+				mg/dL
 				{0}mg/dL
 			
 			
+				mmol/L
 				{0}mmol/L
 			
 			
+				ppm
 				{0}ppm
 			
-			
-				‱
-				{0}‱
+			
+				%
+				{0}%
+			
+			
+				‰
+				{0}‰
 			
 			
-				mol
-				{0}mol
+				{0}mol
 			
 			
+				L/km
 				{0}L/km
 			
 			
+				L/100km
 				{0}L/100km
 			
 			
@@ -7950,45 +8290,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mpg
 			
 			
+				mpg Imp.
 				{0}mpg Imp.
 			
 			
+				PB
 				{0}PB
 			
 			
+				TB
 				{0}TB
 			
 			
+				Tb
 				{0}Tb
 			
 			
+				GB
 				{0}GB
 			
 			
+				Gb
 				{0}Gb
 			
 			
+				MB
 				{0}MB
 			
 			
+				Mb
 				{0}Mb
 			
 			
+				kB
 				{0}kB
 			
 			
+				kb
 				{0}kb
 			
 			
+				byte
 				{0}byte
 			
 			
+				bit
 				{0}bit
 			
 			
 				C
 				{0}C
 			
+			
+				dec
+				{0} dec
+			
 			
 				년
 				{0}년
@@ -8012,6 +8368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				시간
 				{0}시간
+				{0}/h
 			
 			
 				분
@@ -8021,6 +8378,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				초
 				{0}초
+				{0}/s
 			
 			
 				밀리초
@@ -8035,12 +8393,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ns
 			
 			
+				amp
 				{0}A
 			
 			
+				mA
 				{0}mA
 			
 			
+				ohm
 				{0}Ω
 			
 			
@@ -8048,15 +8409,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}V
 			
 			
+				kcal
 				{0}kcal
 			
 			
+				cal
 				{0}cal
 			
 			
+				Cal
 				{0}Cal
 			
 			
+				kJ
 				{0}kJ
 			
 			
@@ -8064,162 +8429,237 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}줄
 			
 			
+				kWh
 				{0}kWh
 			
 			
-				eV
-				{0}eV
+				eV
+				{0}eV
 			
 			
-				Btu
-				{0}Btu
+				Btu
+				{0}Btu
+			
+			
+				US therm
+				{0} US therm
 			
 			
-				lbf
-				{0}lbf
+				{0}lbf
 			
 			
-				N
-				{0}N
+				{0}N
 			
 			
+				GHz
 				{0}GHz
 			
 			
+				MHz
 				{0}MHz
 			
 			
+				kHz
 				{0}kHz
 			
 			
+				Hz
 				{0}Hz
 			
+			
+				em
+				{0} em
+			
+			
+				px
+				{0} px
+			
+			
+				MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+			
 			
+				km
 				{0}km
+				{0}/km
 			
 			
 				m
 				{0}m
+				{0}/m
 			
 			
+				dm
 				{0}dm
 			
 			
+				cm
 				{0}cm
+				{0}/cm
 			
 			
+				mm
 				{0}mm
 			
 			
+				µm
 				{0}µm
 			
 			
+				nm
 				{0}nm
 			
 			
+				pm
 				{0}pm
 			
 			
+				mi
 				{0}mi
 			
 			
+				yd
 				{0}야드
 			
 			
+				ft
 				{0}ft
+				{0}/ft
 			
 			
+				in
 				{0}in
+				{0}/in
 			
 			
 				pc
 				{0}pc
 			
 			
+				ly
 				{0}ly
 			
 			
+				au
 				{0}au
 			
 			
+				fur
 				{0}fur
 			
 			
+				fm
 				{0}fth
 			
 			
+				nmi
 				{0}nmi
 			
 			
+				smi
 				{0}smi
 			
 			
+				pt
 				{0}pt
 			
 			
-				R☉
-				{0}R☉
+				R☉
+				{0}R☉
 			
 			
+				lx
 				{0}lx
 			
 			
-				L☉
-				{0}L☉
+				{0}L☉
 			
 			
+				t
 				{0}t
 			
 			
+				kg
 				{0}kg
+				{0}/kg
 			
 			
 				그램
 				{0}g
+				{0}/g
 			
 			
+				mg
 				{0}mg
 			
 			
+				µg
 				{0}µg
 			
 			
+				tn
 				{0}tn
 			
 			
+				st
 				{0}st
 			
 			
+				lb
 				{0}lb
+				{0}/lb
 			
 			
+				oz
 				{0}oz
+				{0}/oz
 			
 			
+				oz t
 				{0}oz t
 			
 			
+				CD
 				{0}CD
 			
 			
-				Da
-				{0}Da
+				Da
+				{0}Da
 			
 			
-				M⊕
-				{0}M⊕
+				M⊕
+				{0}M⊕
 			
 			
-				M☉
-				{0}M☉
+				M☉
+				{0}M☉
 			
 			
+				GW
 				{0}GW
 			
 			
+				MW
 				{0}MW
 			
 			
+				kW
 				{0}kW
 			
 			
@@ -8227,86 +8667,127 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}W
 			
 			
+				mW
 				{0}mW
 			
 			
+				hp
 				{0}hp
 			
-			
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
 			
 			
+				psi
 				{0}psi
 			
 			
+				inHg
 				{0}inHg
 			
+			
+				bar
+				{0} bar
+			
 			
+				mbar
 				{0}mb
 			
 			
+				atm
 				{0}atm
 			
+			
+				Pa
+				{0} Pa
+			
+			
+				hPa
+				{0}hPa
+			
 			
-				kPa
-				{0}kPa
+				kPa
+				{0}kPa
 			
 			
-				MPa
-				{0}MPa
+				MPa
+				{0}MPa
 			
 			
+				km/h
 				{0}km/h
 			
 			
+				m/s
 				{0}m/s
 			
 			
+				mi/h
 				{0}mi/h
 			
 			
+				kn
 				{0}kn
 			
+			
+				°
+				{0}°
+			
+			
+				°C
+				{0}°C
+			
+			
+				°F
+				{0}°F
+			
 			
+				K
 				{0}K
 			
 			
-				lbf⋅ft
 				{0}lbf⋅ft
 			
 			
-				N⋅m
-				{0}N⋅m
+				{0}N⋅m
 			
 			
+				km³
 				{0}km³
 			
 			
+				m³
 				{0}m³
+				{0}/m³
 			
 			
+				cm³
 				{0}cm³
+				{0}/cm³
 			
 			
+				mi³
 				{0}mi³
 			
 			
+				yd³
 				{0}yd³
 			
 			
+				ft³
 				{0}ft³
 			
 			
+				in³
 				{0}in³
 			
 			
+				ML
 				{0}ML
 			
 			
+				hL
 				{0}hL
 			
 			
@@ -8315,21 +8796,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/L
 			
 			
+				dL
 				{0}dL
 			
 			
+				cL
 				{0}cL
 			
 			
+				mL
 				{0}mL
 			
 			
+				mpt
 				{0}mpt
 			
 			
+				mcup
 				{0}mc
 			
 			
+				ac ft
 				{0}ac ft
 			
 			
@@ -8338,12 +8825,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/gal
 			
 			
+				Imp. gal
 				{0}gal Imp.
+				{0}/gal Imp.
 			
 			
+				qt
 				{0}qt
 			
 			
+				pt
 				{0}pt
 			
 			
@@ -8355,28 +8846,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}fl oz
 			
 			
-				Imp. fl oz
-				{0}fl oz Imp.
+				Imp. fl oz
+				{0}fl oz Imp.
 			
 			
+				tbsp
 				{0}tbsp
 			
 			
+				tsp
 				{0}tsp
 			
 			
-				bbl
-				{0}bbl
+				bbl
+				{0}bbl
 			
 			
 				쪽
+				{0}E
+				{0}N
+				{0}S
+				{0}W
 			
 		
 		
+			
+				{0}/{1}
+			
 			
+				g-force
 				{0}G
 			
 			
+				m/s²
 				{0}m/s²
 			
 			
@@ -8406,7 +8908,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}ft²
 			
+			
+				%
+				{0}%
+			
 			
+				L/100km
 				{0}L/100km
 			
 			
@@ -8453,104 +8960,144 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ms
 			
 			
+				μs
 				{0}μs
 			
 			
+				ns
 				{0}ns
 			
 			
+				km
 				{0}km
+				{0}/km
 			
 			
 				m
 				{0}m
+				{0}/m
 			
 			
+				dm
 				{0}dm
 			
 			
+				cm
 				{0}cm
+				{0}/cm
 			
 			
+				mm
 				{0}mm
 			
 			
+				µm
 				{0}µm
 			
 			
+				nm
 				{0}nm
 			
 			
+				pm
 				{0}pm
 			
 			
+				mi
 				{0}mi
 			
 			
+				yd
 				{0}yd
 			
 			
+				ft
 				{0}′
+				{0}/ft
 			
 			
+				in
 				{0}″
+				{0}/in
 			
 			
+				pc
 				{0}pc
 			
 			
+				ly
 				{0}ly
 			
 			
+				au
 				{0}au
 			
 			
+				fur
 				{0}fur
 			
 			
+				fm
 				{0}fth
 			
 			
+				nmi
 				{0}nmi
 			
 			
+				smi
 				{0}smi
 			
 			
+				pt
 				{0}pt
 			
 			
+				t
 				{0}t
 			
 			
+				kg
 				{0}kg
+				{0}/kg
 			
 			
 				g
 				{0}g
+				{0}/g
 			
 			
+				mg
 				{0}mg
 			
 			
+				µg
 				{0}µg
 			
 			
+				tn
 				{0}tn
 			
 			
+				st
 				{0}st
 			
 			
+				lb
 				{0}lb
+				{0}/lb
 			
 			
+				oz
 				{0}oz
+				{0}/oz
 			
 			
+				oz t
 				{0}oz t
 			
 			
+				CD
 				{0}CD
 			
 			
@@ -8562,35 +9109,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}HP
 			
-			
-				{0}hPa
-			
 			
 				mmHg
 				{0}mmHg
 			
 			
+				psi
 				{0}psi
 			
 			
+				inHg
 				{0}"Hg
 			
 			
+				mbar
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+			
 			
+				km/h
 				{0}km/h
 			
 			
+				m/s
 				{0}m/s
 			
 			
+				mi/h
 				{0}mph
 			
 			
+				kn
 				{0}kn
 			
+			
+				°
+				{0}°
+			
+			
+				°C
+				{0}°C
+			
+			
+				°F
+				{0}°F
+			
 			
+				K
 				{0}K
 			
 			
@@ -8605,6 +9173,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				쪽
+				{0}E
+				{0}N
+				{0}S
+				{0}W
 			
 		
 		
@@ -8625,14 +9197,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} 및 {1}
 		
 		
-			{0} 또는 {1}
-			{0} 또는 {1}
-		
-		
 			{0}, {1}
 			{0}, {1}
-			{0} 및 {1}
-			{0} 및 {1}
+			{0} 또는 {1}
+			{0} 또는 {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/ko_KP.xml b/make/data/cldr/common/main/ko_KP.xml
index a037dfbd573..e19dbd2c2dd 100644
--- a/make/data/cldr/common/main/ko_KP.xml
+++ b/make/data/cldr/common/main/ko_KP.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ko_KR.xml b/make/data/cldr/common/main/ko_KR.xml
index 649030f7e37..d22ae4d814a 100644
--- a/make/data/cldr/common/main/ko_KR.xml
+++ b/make/data/cldr/common/main/ko_KR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kok.xml b/make/data/cldr/common/main/kok.xml
index bb6da323b55..00b0b89b21e 100644
--- a/make/data/cldr/common/main/kok.xml
+++ b/make/data/cldr/common/main/kok.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -56,13 +56,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			सिकसिका
 			बंबारा
 			बांग्ला
-			तिबेतियन
+			तिबेटी
 			ब्रेटन
 			बोडो
 			बोस्नियन
 			बगिनिस
 			ब्लीन
 			कटलान
+			चक्मा
 			चिचेन
 			सिबौना
 			चिगा
@@ -70,7 +71,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			छुनिस
 			मारी
 			चोताव
-			चिरोकी
+			चॅरोकी
 			चेयनी
 			मध्य खुर्दीश
 			कोर्शियन
@@ -114,7 +115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			इस्टोनियन्
 			बास्क
 			एवोंडो
-			पर्षियन्
+			पर्सियन
 			फुला
 			फिन्निष्
 			फिलिपिनो
@@ -246,7 +247,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			मिनाग्काबौ
 			मसीडोनियन्
 			मळियाळम
-			मंगोलियन्
+			मंगोलियन
 			मणिपुरी
 			मोहाक
 			मोस्सी
@@ -265,6 +266,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			नामा
 			नोर्वेजियन बोकमाल
 			उत्तर न्डेबेले
+			निम्न जर्मन
 			नेपाळी
 			नेवरी
 			डोंगा
@@ -361,13 +363,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			तिम्ने
 			तेसो
 			तेतम
-			तजिक
+			ताजिक
 			थाई
 			तिग्रिन्या
 			टिग्रे
-			तुर्कमन
+			तुर्कमेन
 			तगालोग
-			लिंगॉन
+			क्लिंगन
 			सेत्स्वाना
 			तोंगा
 			तोक पिसीन
@@ -388,7 +390,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			यमबुंडु
 			अज्ञात भाशा
 			उर्दू
-			उज़बेक
+			उझबेक
 			वाई
 			वेंदा
 			वियत्नामीज़
@@ -443,7 +445,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
 			
 			
@@ -538,9 +540,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			कॅनडा
 			कोकोस (कीलिंग) आयलँड
 			कोंगो - किंशासा
-			कोंगो (डीआरसी)
+			काँगो (डीआरसी)
 			मध्य अफ्रीकी लोकसत्तकराज्य
-			कोंगो - ब्राझाविला
+			काँगो - ब्राझाविला
 			कोंगो (प्रजासत्ताक)
 			स्विट्ज़रलैंड
 			कोत द’ईवोआर
@@ -722,11 +724,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			सोमालिया
 			सुरीनाम
 			दक्षिण सुडान
-			सावो टोमे आनी प्रिंसिपल
+			साओ टोम आनी प्रिन्सिप
 			एल साल्वाडोर
 			सिंट मार्टेन
 			सिरिया
-			स्वाजीलँड
+			इस्वातिनी
+			स्वाझिलँड
 			त्रिस्तान दा कुन्हा
 			तुर्क्स आनी कॅकोज आयलँड्स
 			चाड
@@ -762,6 +765,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			वनातू
 			वालिस आनी फ्यूचूना
 			सामोआ
+			स्युडो-ऍक्सेंट
+			स्युडो-बिडी
 			कोसोवो
 			येमेन
 			मेयोट
@@ -778,7 +783,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			वराचें चक्र (12 वि 24)
 			रेग खंड करपाची शैली
 			मापन प्रणाली
-			क्रमांक
+			संख्या
 		
 		
 			बुध्दीश्ट दिनदर्शिका
@@ -789,23 +794,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			हिब्रू दिनदर्शिका
 			ईस्लामीक दिनदर्शिका
 			आयएसओ-8601 दिनदर्शिका
-			जपानी
+			जपानी दिनदर्शिका
 			पर्शियन दिनदर्शिका
 			मिंगुआ दिनदर्शिका (अणकाराची कुरू: जाका चिनी दिनदर्शिकेचें प्रजासत्ताक", "रिपब्लिकन दिनदर्शिका")
 			लेखा चलन स्वरूप
-			प्रमाणित
+			प्रमाणित चलन स्वरुप
 			डिफॉल्ट युनिकोड वर्गवारी क्रम
-			सोद घेवचो
+			सामान्य-उद्देशान केल्लो सोद
 			प्रमाणित वर्गवारी क्रम
 			12 वरांची यंत्रणा (0–11)
 			12 वरांची यंत्रणा (1–12)
 			24 वरांची यंत्रणा (0–23)
 			24 वरांची यंत्रणा (1–24)
-			लूज रेग खंड शैली
+			सुटी रेग खंड शैली
 			सामान्य रेग खंड शैली
 			सक्तीची रेग खंड शैली
 			मॅट्रीक प्रणाली
-			व्हडली मापन प्रणाली
+			भव्य मापन प्रणाली
 			युएस मापन प्रणाली
 			अरेबिक-भारतीय अंक
 			विस्तारीत अरेबीक-भारतीय अंक
@@ -831,22 +836,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			कंबोडियन अंक
 			कन्नड अंक
 			लाओ अंक
-			अस्तंत अंक
+			अस्तंतीय अंक
 			मल्याळम अंक
 			म्यानमार अंक
-			ओडिया
+			ओडिया अंक
 			रोमन संख्या
 			रोमन लोवरकेस संख्या
 			पारंपारीक तमिळ संख्या
 			तमिळ अंक
 			तेलुगू अंक
 			थाय अंक
-			तिबेतियन
+			तिबेतियन अंक
 		
 		
-			Metric
-			UK
-			US
+			मॅट्रिक
+			युके
+			युएस
 		
 		
 			भाशा: {0}
@@ -858,8 +863,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u093C ० १ २ ३ ४ ५ ६ ७ ८ ९ ॐ \u0902 \u0901 ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क {क\u093C} ख {ख\u093C} ग {ग\u093C} घ ङ च छ ज {ज\u093C} झ ञ ट ठ ड {ड\u093C} ढ {ढ\u093C} ण त थ द ध न प फ {फ\u093C} ब भ म य {य\u093C} र ल व श ष स ह ळ ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]
 		[\u200C\u200D]
 		[अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ]
-		[\- , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 	
 	
 		“
@@ -958,9 +963,56 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
+						
+							h B – h B
+							h–h B
+						
+						
+							h:mm B – h:mm B
+							h:mm–h:mm B
+							h:mm–h:mm B
+						
 						
 							d–d
 						
+						
+							YG – YG
+							y–y G
+						
+						
+							MM-yGGGG – MM-y GGGG
+							MM-y GGGGG – MM y
+							MM-y GGGGG – MM-y
+						
+						
+							dd-MM-y GGGGG – dd-MM-y
+							dd-MM-y GGGGG – dd-MM-Y GGGGG
+							dd-MM-y GGGGG – dd-MM-y
+							d-M-y – d-M-y GGGGG
+						
+						
+							E, dd-MM-Y GGGGG – E-dd-MM-y
+							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
+							E,dd-MM-y GGGGG – E, dd-MM-y
+							E,dd-MM-y GGGGG – E,dd-MM-y
+						
+						
+							MMM y G – MMM y G
+							MMM y G–MMM
+							MMM y G – MMM y
+						
+						
+							d-MMM y G–d
+							d MMM y G – d MMM y G
+							d MMM y G –d MMM
+							d MMM y G – d MMM y
+						
+						
+							e, d MMM y G – e, d MMM
+							E, d MMM y G – E, d MMM y G
+							E, d MMM y G – E, d MMM
+							E, d MMM y G – E, d MMM y
+						
 						
 							MM–MM
 						
@@ -1205,10 +1257,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							4
 						
 						
-							Q1
-							Q2
-							Q3
-							Q4
+							1लें त्रैमासीक
+							2रें त्रैमासीक
+							3रें त्रैमासीक
+							4थें त्रैमासीक
 						
 					
 					
@@ -1225,40 +1277,40 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							4
 						
 						
-							Q1
-							Q2
-							Q3
-							Q4
+							1लें त्रैमासीक
+							2रें त्रैमासीक
+							3रें त्रैमासीक
+							4थें त्रैमासीक
 						
 					
 				
 				
 					
 						
-							म.पू.
-							म.नं.
+							AM
+							PM
 						
 						
-							म.पू.
-							म.नं.
+							a
+							p
 						
 						
-							म.पू.
-							म.नं.
+							AM
+							PM
 						
 					
 					
 						
-							म.पू.
-							म.नं.
+							AM
+							PM
 						
 						
-							म.पू.
-							म.नं.
+							AM
+							PM
 						
 						
-							म.पू.
-							म.नं.
+							AM
+							PM
 						
 					
 				
@@ -1375,6 +1427,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMM d
 						MMM d, E
 						MMMM d
+						'week' W 'of' MMMM
 						mm:ss
 						y
 						y-MM
@@ -1386,15 +1439,63 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						y MMMM
 						y QQQ
 						y QQQQ
+						'week' w 'of' Y
 					
 					
 						{0} {1}
 					
 					
 						{0} – {1}
+						
+							h B – h B
+							h–h B
+						
+						
+							h:mm B – h:mm B
+							h:mm–h:mm B
+							h:mm–h:mm B
+						
 						
 							d–d
 						
+						
+							G y – G y
+							G y–y
+						
+						
+							GGGGG y-MM – GGGGG y-MM
+							GGGGG y-MM – y-MM
+							GGGGG y-MM – y-MM
+						
+						
+							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – GGGGG y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
+						
+						
+							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
+						
+						
+							G y MMM – G y MMM
+							G y MMM–MMM
+							G y MMM – y MMM
+						
+						
+							G y MMM d–d
+							G y MMM d – G y MMM d
+							G y MMM d – MMM d
+							G y MMM d – y MMM d
+						
+						
+							G y MMM d, E – MMM d, E
+							G y MMM d, E – G y MMM d, E
+							G y MMM d, E – MMM d, E
+							G y MMM d, E – y MMM d, E
+						
 						
 							h a – h a
 							h–h a
@@ -1603,9 +1704,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				सप्तक
-				
-					{0} सप्त.
-				
 				
 					{0} सप्तकां आदीं
 				
@@ -1919,13 +2017,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				दिसाचोकालावधी
+				AM/PM
 			
 			
-				दिसाचोकालावधी
+				AM/PM
 			
 			
-				दिसाचोकालावधी
+				AM/PM
 			
 			
 				वर
@@ -2012,7 +2110,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				झोन
+				वेळ झोन
 			
 			
 				झोन
@@ -2037,12 +2135,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				अज्ञात शार
 			
+			
+				अंडोरा
+			
+			
+				दुबय
+			
+			
+				काबुल
+			
 			
 				एँटिगुआ
 			
 			
 				अंगुला
 			
+			
+				तिराना
+			
+			
+				येरेवान
+			
+			
+				लुआंडा
+			
+			
+				रोथेरा
+			
+			
+				पाल्मेर
+			
+			
+				ट्रोल
+			
+			
+				स्योवा
+			
+			
+				मॉसन
+			
+			
+				डेव्हीस
+			
+			
+				वोस्तोक
+			
+			
+				केसी
+			
+			
+				द्युमाँ दूरवीय
+			
+			
+				मॅकमुर्दो
+			
 			
 				रियो गलेगॉस
 			
@@ -2079,18 +2225,96 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ब्यूनस आयर्स
 			
+			
+				पागो पागो
+			
+			
+				वियेना
+			
+			
+				पर्थ
+			
+			
+				उक्ला
+			
+			
+				डार्विन
+			
+			
+				एडिलेड
+			
+			
+				ब्रोकन हिल
+			
+			
+				क्युरी
+			
+			
+				मेलबर्न
+			
+			
+				होबार्ट
+			
+			
+				लिडेमॅन
+			
+			
+				सिडनी
+			
+			
+				ब्रिस्बेन
+			
+			
+				मॅक्वेरी
+			
+			
+				लॉर्ड होवे
+			
 			
 				अरुबा
 			
+			
+				मॅरीहाम्न
+			
+			
+				बाकू
+			
+			
+				साराजिवो
+			
 			
 				बारबाडोस
 			
+			
+				ढाका
+			
+			
+				ब्रुसेल्स
+			
+			
+				ओगादौगो
+			
+			
+				सोफिया
+			
+			
+				बेहरेन
+			
+			
+				बुजुमबुरा
+			
+			
+				पोर्टो-नोवो
+			
 			
 				सेंट बार्थेलेमी
 			
 			
 				बर्मुडा
 			
+			
+				ब्रूनेई
+			
 			
 				ला पाझ
 			
@@ -2148,6 +2372,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				नसाऊ
 			
+			
+				थिम्फू
+			
+			
+				गाबोरोन
+			
+			
+				मिंस्क
+			
 			
 				बेलिझ
 			
@@ -2194,7 +2427,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				रिसोल्युट
 			
 			
-				पावसाळी न्हय
+				पावसाळी न्हंय
 			
 			
 				रँकिन इनलॅट
@@ -2235,6 +2468,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				सेंट जॉन्स
 			
+			
+				कोकोस
+			
+			
+				किनशासा
+			
+			
+				लुबुमबाशी
+			
+			
+				बांगी
+			
+			
+				ब्राझाविले
+			
+			
+				झुरिच
+			
+			
+				अबिदजान
+			
+			
+				रारोटोंगा
+			
 			
 				ईस्टर
 			
@@ -2244,6 +2501,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				सँटियागो
 			
+			
+				डौआला
+			
+			
+				उरुम्की
+			
+			
+				शांघाय
+			
 			
 				बोगोटा
 			
@@ -2253,32 +2519,126 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				हवाना
 			
+			
+				केप वर्दे
+			
 			
 				कुराकाओ
 			
+			
+				क्रिसमस
+			
+			
+				निकोसिया
+			
+			
+				फमागुस्ता
+			
+			
+				प्राग
+			
+			
+				बुसिंजेन
+			
+			
+				बर्लिन
+			
+			
+				जिबूती
+			
+			
+				कोपनहेगन
+			
 			
 				डोमिनीका
 			
 			
 				सांतो डोमिंगो
 			
+			
+				आल्जियार्स
+			
 			
 				गालापागोस
 			
 			
 				ग्वायेकिल
 			
+			
+				टॅलिन
+			
+			
+				कायरो
+			
+			
+				अल आयुन
+			
+			
+				अस्मारा
+			
+			
+				कॅनरी
+			
+			
+				सेउटा
+			
+			
+				माद्रीद
+			
+			
+				आदीस अबाबा
+			
+			
+				हेलसिंकी
+			
+			
+				फिजी
+			
+			
+				स्टेन्ले
+			
+			
+				चुक
+			
+			
+				पोह्नपेई
+			
+			
+				कोसरे
+			
+			
+				फैरो
+			
+			
+				पॅरिस
+			
+			
+				लिब्रेविले
+			
 			
 				
 					ब्रिटिश ग्रीष्म वेळ
 				
+				लंडन
 			
 			
 				ग्रेनॅडा
 			
+			
+				तुबलीसी
+			
 			
 				केइन
 			
+			
+				गर्नसी
+			
+			
+				आकरा
+			
+			
+				जिब्राल्टर
+			
 			
 				थुले
 			
@@ -2291,47 +2651,264 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				डेन्मार्कशॉन
 			
+			
+				बानजुल
+			
+			
+				कोनाक्रा
+			
 			
 				ग्वाडेलोप
 			
+			
+				मलाबो
+			
+			
+				अथेन्स
+			
+			
+				दक्षिण जॉर्जिया
+			
 			
 				ग्वाटेमाला
 			
+			
+				गुआम
+			
+			
+				बिसाउ
+			
 			
 				गुयाना
 			
+			
+				हाँग काँग
+			
 			
 				तेगुसिगल्पा
 			
+			
+				झाग्रेब
+			
 			
 				पोर्ट-औ-प्रिन्स
 			
+			
+				बुडापेस्ट
+			
+			
+				जकार्ता
+			
+			
+				पोण्टीअनाक
+			
+			
+				मकास्सार
+			
+			
+				जायापुरा
+			
 			
 				
 					आयरिश प्रमाणित वेळ
 				
+				डब्लिन
+			
+			
+				जेरुसालेम
+			
+			
+				इसले ऑफ मॅन
+			
+			
+				कोलकाता
+			
+			
+				चागोस
+			
+			
+				बगदाद
+			
+			
+				तेहरान
+			
+			
+				रिक्जेविक
+			
+			
+				रोम
+			
+			
+				जर्सी
 			
 			
 				जमैका
 			
+			
+				अम्मान
+			
+			
+				तोक्यो
+			
+			
+				नायरोबी
+			
+			
+				बिश्केक
+			
+			
+				फ्नोम पेन्ह
+			
+			
+				इंडरबरी
+			
+			
+				किरितिमाती
+			
+			
+				तारवा
+			
+			
+				कोमोरो
+			
 			
 				सेंट किट्स
 			
+			
+				प्योंगयांग
+			
+			
+				सोल
+			
+			
+				कुवेत
+			
 			
 				कैमेन
 			
+			
+				ऍक्टो
+			
+			
+				ओरल
+			
+			
+				अत्यारो
+			
+			
+				अक्टोबे
+			
+			
+				कोस्टानाय
+			
+			
+				क्य्ज्यलॉरडा
+			
+			
+				अल्माटी
+			
+			
+				व्हिएन्टियन
+			
+			
+				बेरूत
+			
 			
 				सेंट लुसीया
 			
+			
+				वडुज
+			
+			
+				कोलंबो
+			
+			
+				मोनरोविया
+			
+			
+				मासेरु
+			
+			
+				विल्नियस
+			
+			
+				लक्सेमबर्ग
+			
+			
+				रीगा
+			
+			
+				त्रिपोली
+			
+			
+				कासाब्लांका
+			
+			
+				मोनॅको
+			
+			
+				चिसीनाऊ
+			
+			
+				पॉडगोरिका
+			
 			
 				मेरीगॉट
 			
+			
+				अंटानानारिवो
+			
+			
+				क्वाजलेन
+			
+			
+				माजुरो
+			
+			
+				स्कोप्जे
+			
+			
+				बामाको
+			
+			
+				यानगॉन
+			
+			
+				होव्हड
+			
+			
+				उलानबतार
+			
+			
+				चोईबाल्सन
+			
+			
+				मकाव
+			
+			
+				सायपान
+			
 			
 				मार्टिनिक
 			
+			
+				नवाकसुत
+			
 			
 				मॉन्टसेराट
 			
+			
+				माल्टा
+			
+			
+				मॉरिशस
+			
+			
+				मालदीव
+			
+			
+				ब्लानटायर
+			
 			
 				तिजुआना
 			
@@ -2365,45 +2942,351 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				कानकुन
 			
+			
+				कुआलालम्पूर
+			
+			
+				कुचींग
+			
+			
+				मापुटो
+			
+			
+				विंडहोक
+			
+			
+				नूमेआ
+			
+			
+				नियामी
+			
+			
+				नॉरफोक
+			
+			
+				लागोस
+			
 			
 				मॅनाग्वा
 			
+			
+				ऍम्स्टरडॅम
+			
+			
+				ओस्लो
+			
+			
+				काठमांडू
+			
+			
+				नावरू
+			
+			
+				नीयू
+			
+			
+				चॅथम
+			
+			
+				ऑकलँड
+			
+			
+				मस्कट
+			
 			
 				पनामा
 			
 			
 				लिमा
 			
+			
+				ताहिती
+			
+			
+				मार्किसस
+			
+			
+				गाम्बियर
+			
+			
+				पोर्ट मॉरेस्बी
+			
+			
+				बोगेनविले
+			
+			
+				मनिला
+			
+			
+				कराची
+			
+			
+				वारसॉ
+			
 			
 				मिक्वेलोन
 			
+			
+				पिटकॅरन
+			
 			
 				पिर्टो रिको
 			
+			
+				गाझा
+			
+			
+				हेब्रॉन
+			
+			
+				अझोरेस
+			
+			
+				मदिरा
+			
+			
+				लिस्बन
+			
+			
+				पलाऊ
+			
 			
 				असंसियन
 			
+			
+				कतार
+			
+			
+				रियुनियन
+			
+			
+				बुखारेस्ट
+			
+			
+				बेलग्रेड
+			
+			
+				कालिनिनग्राड
+			
+			
+				सिमफरोपोल
+			
+			
+				मॉस्को
+			
+			
+				व्होल्गोग्राड
+			
+			
+				साराटोव
+			
+			
+				आस्ट्रखन
+			
+			
+				उल्यानोव्स्क
+			
+			
+				किरोव
+			
+			
+				समारा
+			
+			
+				येकातेरिनबर्ग
+			
+			
+				ओम्स्क
+			
+			
+				नोवोसिबिर्स्क
+			
+			
+				बरनौल
+			
+			
+				टॉमस्क
+			
+			
+				नोवोकुझनेत्स्क
+			
+			
+				क्रास्नोयार्स्क
+			
+			
+				इर्कुटस्क
+			
+			
+				चिटा
+			
+			
+				यकुत्स्क
+			
+			
+				व्लादिवोस्तोक
+			
+			
+				खा़ंडिगा
+			
+			
+				सखलिन
+			
+			
+				उस्त नेरा
+			
+			
+				मगादान
+			
+			
+				स्रेदनेकॉलय्मस्क
+			
+			
+				कामचाट्का
+			
+			
+				अनादिर
+			
+			
+				किगाली
+			
+			
+				रियाध
+			
+			
+				ग्वादालकॅनाल
+			
+			
+				माहे
+			
+			
+				खार्टोम
+			
+			
+				स्टॉकहोम
+			
+			
+				सिंगापूर
+			
+			
+				सें. हेलेना
+			
+			
+				जुब्लजाना
+			
+			
+				लोंगयेअरब्येन
+			
+			
+				ब्राटिस्लाव्हा
+			
+			
+				फ्रिटावन
+			
+			
+				सॅन मारीनो
+			
+			
+				डकार
+			
+			
+				मोगादिशू
+			
 			
 				परामारिबो
 			
+			
+				जुबा
+			
+			
+				साओ टोम
+			
 			
 				एल साल्वाडोर
 			
 			
 				लोवर प्रिंसेस क्वार्टर
 			
+			
+				दमस्कस
+			
+			
+				एमबाबेन
+			
 			
 				ग्रँड तुर्क
 			
+			
+				एनजामेना
+			
+			
+				केरगुलेन
+			
+			
+				लोम
+			
+			
+				बँकॉक
+			
+			
+				दुशान्बे
+			
+			
+				फाकाओफो
+			
+			
+				दिली
+			
+			
+				अशगाबाट
+			
+			
+				टुनिस
+			
+			
+				टोंगाटापू
+			
+			
+				इस्तंबूल
+			
 			
 				पोर्ट ऑफ स्पेन
 			
+			
+				फुनाफुटी
+			
+			
+				तैपेई
+			
+			
+				दार इ सलाम
+			
+			
+				उझगोरोड
+			
+			
+				कीव
+			
+			
+				झापोरोझे
+			
+			
+				काम्पाला
+			
+			
+				मिडवे
+			
+			
+				वैक
+			
 			
 				अडाक
 			
 			
 				नोमे
 			
+			
+				जॉन्स्टन
+			
 			
 				ऐंकरज
 			
@@ -2485,6 +3368,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				मोंटेव्हिडियो
 			
+			
+				समरकंद
+			
+			
+				ताश्कंद
+			
+			
+				वॅटिकन
+			
 			
 				सेंट विन्सेंट
 			
@@ -2497,6 +3389,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				सेंट थॉमस
 			
+			
+				हो ची मिन्ह
+			
+			
+				इफेट
+			
+			
+				वालिस
+			
+			
+				अपिया
+			
+			
+				Aden
+			
+			
+				मेयोट
+			
+			
+				जोहान्सबर्ग
+			
+			
+				लुसाका
+			
+			
+				हरारे
+			
+			
+				
+					अफगानिस्तान वेळ
+				
+			
 			
 				
 					मध्य आफ्रिका वेळ
@@ -2544,7 +3468,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					उदेंत वेळ
 					उदेंत प्रमाणित वेळ
-					उदेंतेचो डेलायट वेळ
+					उदेंत डेलायट वेळ
 				
 			
 			
@@ -2561,6 +3485,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					प्रशांत डेलायट वेळ
 				
 			
+			
+				
+					अपिया वेळ
+					अपिया प्रमाणित वेळ
+					अपिया डेलायट वेळ
+				
+			
+			
+				
+					अरबी वेळ
+					अरबी प्रमाणित वेळ
+					अरबी डेलायट वेळ
+				
+			
 			
 				
 					अर्जेंटिना वेळ
@@ -2575,6 +3513,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					अस्तंत अर्जेंटिना ग्रीष्म वेळ
 				
 			
+			
+				
+					आर्मेनिया वेळ
+					आर्मेनिया प्रमाणित वेळ
+					आर्मेनिया ग्रीष्म वेळ
+				
+			
 			
 				
 					अटलांटीक वेळ
@@ -2582,6 +3527,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					अटलांटीक डेलायट वेळ
 				
 			
+			
+				
+					मध्य ऑस्ट्रेलीया वेळ
+					ऑस्ट्रेलीयन मध्य प्रमाणित वेळ
+					ऑस्ट्रेलीयन मध्य डेलायट वेळ
+				
+			
+			
+				
+					ऑस्ट्रेलीयन मध्य अस्तंत वेळ
+					ऑस्ट्रेलीयन मध्य अस्तंत प्रमाणित वेळ
+					ऑस्ट्रेलीयन मध्य अस्तंत डेलायट वेळ
+				
+			
+			
+				
+					उदेंत ऑस्ट्रेलीया वेळ
+					ऑस्ट्रेलीयन उदेंत प्रमाणित वेळ
+					ऑस्ट्रेलीयन उदेंत डेलायट वेळ
+				
+			
+			
+				
+					अस्तंत ऑस्ट्रेलीया वेळ
+					ऑस्ट्रेलीयन अस्तंत प्रमाणित वेळ
+					ऑस्ट्रेलीयन अस्तंत डेलायट वेळ
+				
+			
+			
+				
+					अजरबैजान वेळ
+					अजरबैजान प्रमाणित वेळ
+					अजरबैजान ग्रीष्म वेळ
+				
+			
+			
+				
+					अझोरेस
+					अझोरेस प्रमाणित वेळ
+					अझोरेस ग्रीष्म वेळ
+				
+			
+			
+				
+					बांगलादेश वेळ
+					बांगलादेश प्रमाणित वेळ
+					बांगलादेश ग्रीष्म वेळ
+				
+			
+			
+				
+					भूतान
+				
+			
 			
 				
 					बोलिव्हिया वेळ
@@ -2594,6 +3593,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					ब्राझिलिया ग्रीष्म वेळ
 				
 			
+			
+				
+					ब्रुनेइ दारूस्सलाम वेळ
+				
+			
+			
+				
+					केप वर्दे वेळ
+					केप वर्दे प्रमाणित वेळ
+					केप वर्दे ग्रीष्म वेळ
+				
+			
+			
+				
+					कॅमोरा प्रमाणित वेळ
+				
+			
+			
+				
+					चॅथम वेळ
+					चॅथम प्रमाणित वेळ
+					चॅथम डेलायट वेळ
+				
+			
 			
 				
 					चिली वेळ
@@ -2601,13 +3624,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					चिली ग्रीष्म वेळ
 				
 			
+			
+				
+					चीन वेळ
+					चीन प्रमाणित वेळ
+					चीन डेलायट वेळ
+				
+			
+			
+				
+					चोईबाल्सन वेळ
+					चोईबाल्सन प्रमाणित वेळ
+					चोईबाल्सन ग्रीष्म वेळ
+				
+			
+			
+				
+					क्रिसमस आयलँड वेळ
+				
+			
+			
+				
+					कोकोस आयलँड वेळ
+				
+			
 			
 				
-					कोलंबिया
+					कोलंबिया वेळ
 					कोलंबिया प्रमाणित वेळ
 					कोलंबिया ग्रीष्म वेळ
 				
 			
+			
+				
+					कूक आयलँड वेळ
+					कूक आयलँड प्रमाणित वेळ
+					कूक आयलँड अर्द ग्रीष्म वेळ
+				
+			
 			
 				
 					क्युबा वेळ
@@ -2615,6 +3669,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					क्युबा डेलायट वेळ
 				
 			
+			
+				
+					डेव्हीस वेळ
+				
+			
+			
+				
+					द्युमाँ दूरवीय वेळ
+				
+			
+			
+				
+					उदेंत तिमोर वेळ
+				
+			
 			
 				
 					ईस्टर आयलँड वेळ
@@ -2627,6 +3696,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					इक्वेडोर वेळ
 				
 			
+			
+				
+					मध्य युरोपियन वेळ
+					मध्य युरोपियन प्रमाणित वेळ
+					मध्य युवरोपियन ग्रीष्म वेळ
+				
+			
+			
+				
+					उदेंत युरोपियन वेळ
+					उदेंत युरोपियन प्रमाणित वेळ
+					उदेंत युरोपियन ग्रीष्म वेळ
+				
+			
+			
+				
+					आनीक-उदेंत युरोपियन वेळ
+				
+			
+			
+				
+					अस्तंत युरोपियन वेळ
+					अस्तंत युरोपियन प्रमाणित वेळ
+					अस्तंत युरोपियन ग्रीष्म वेळ
+				
+			
 			
 				
 					फॉकलँड आयलँड्स वेळ
@@ -2634,16 +3729,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					फॉकलँड आयलँड्स ग्रीष्म वेळ
 				
 			
+			
+				
+					फिजी वेळ
+					फिजी प्रमाणित वेळ
+					फिजी ग्रीष्म वेळ
+				
+			
 			
 				
 					फ्रेंच गयाना वेळ
 				
 			
+			
+				
+					फ्रेन्च दक्षिण आनी अंटार्क्टिक वेळ
+				
+			
 			
 				
 					गालापागोस वेळ
 				
 			
+			
+				
+					गाम्बियर वेळ
+				
+			
+			
+				
+					जॉर्जिया वेळ
+					जॉर्जिया प्रमाणित वेळ
+					जॉर्जिया ग्रीष्म वेळ
+				
+			
+			
+				
+					गिल्बर्ट आयलँड वेळ
+				
+			
+			
+				
+					ग्रीनविच मध्यc वेळ
+				
+			
 			
 				
 					उदेंत ग्रीनलँड वेळ
@@ -2658,6 +3787,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					अस्तंत ग्रीनलँड ग्रीष्म वेळ
 				
 			
+			
+				
+					गल्फ प्रमाणित वेळ
+				
+			
 			
 				
 					गुयाना वेळ
@@ -2670,14 +3804,171 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					हवाई-अलेयुशिन डेलायट वेळ
 				
 			
+			
+				
+					हाँग काँग वेळ
+					हाँग काँग प्रमाणित वेळ
+					हाँग काँग ग्रीष्म वेळ
+				
+			
+			
+				
+					होव्हड
+					होव्हड प्रमाणित वेळ
+					होव्हड ग्रीष्म वेळ
+				
+			
 			
 				
-					भारतीय समय
+					भारतीय प्रमाणित वेळ
 				
 				
 					IST
 				
 			
+			
+				
+					हिंद म्हासागर वेळ
+				
+			
+			
+				
+					इंडोचीन वेळ
+				
+			
+			
+				
+					मध्य इंडोनेशिया वेळ
+				
+			
+			
+				
+					उदेंत इंडोनेशिया वेळ
+				
+			
+			
+				
+					अस्तंत इंडोनेशिया वेळ
+				
+			
+			
+				
+					इरान
+					इरान प्रमाणित वेळ
+					इरान डेलायट वेळ
+				
+			
+			
+				
+					इर्कुटस्क वेळ
+					ईर्कुटस्क प्रमाणित वेळ
+					ईर्कुटस्क ग्रीष्म वेळ
+				
+			
+			
+				
+					इज़राइल वेळ
+					इज़राइल प्रमाणित वेळ
+					इज़राइल डेलायट वेळ
+				
+			
+			
+				
+					जपान वेळ
+					जपान प्रमाणित वेळ
+					जपान डेलायट वेळ
+				
+			
+			
+				
+					उदेंत कझाकस्तान वेळ
+				
+			
+			
+				
+					अस्तंत कझाकस्तान वेळ
+				
+			
+			
+				
+					कोरियन वेळ
+					कोरियन प्रमाणित वेळ
+					कोरियन डेलायट वेळ
+				
+			
+			
+				
+					कोसरे वेळ
+				
+			
+			
+				
+					क्रास्नोयार्स्क वेळ
+					क्रास्नोयार्स्क प्रमाणित वेळ
+					क्रास्नोयार्स्क ग्रीष्म वेळ
+				
+			
+			
+				
+					किर्गिज़स्तान वेळ
+				
+			
+			
+				
+					लायन आयलँड वेळ
+				
+			
+			
+				
+					लॉर्ड होवे वेळ
+					लॉर्ड होवे प्रमाणित वेळ
+					लॉर्ड होवे डेलायट वेळ
+				
+			
+			
+				
+					मॅक्वेरी आयलँड वेळ
+				
+			
+			
+				
+					मगादान वेळ
+					मगादान प्रमाणित वेळ
+					मगादान ग्रीष्म वेळ
+				
+			
+			
+				
+					मलेशिया वेळ
+				
+			
+			
+				
+					मालदीव वेळ
+				
+			
+			
+				
+					मार्किसस वेळ
+				
+			
+			
+				
+					मार्शल आयलँड वेळ
+				
+			
+			
+				
+					मॉरिशस वेळ
+					मॉरिशस प्रमाणित वेळ
+					मॉरिशस ग्रीष्म वेळ
+				
+			
+			
+				
+					मॉसन वेळ
+				
+			
 			
 				
 					वायव्य मेक्सिको वेळ
@@ -2692,6 +3983,49 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					मेक्सिकन प्रशांत डेलायट वेळ
 				
 			
+			
+				
+					उलानबतार वेळ
+					उलानबतार प्रमाणित वेळ
+					उलानबतार ग्रीष्म वेळ
+				
+			
+			
+				
+					मॉस्को वेळ
+					मॉस्को प्रमाणित वेळ
+					मॉस्को ग्रीष्म वेळ
+				
+			
+			
+				
+					म्यानमार वेळ
+				
+			
+			
+				
+					नरू वेळ
+				
+			
+			
+				
+					नेपाळ वेळ
+				
+			
+			
+				
+					न्यु कॅलेडोनिया वेळ
+					न्यु कॅलेडोनिया प्रमाणित वेळ
+					न्यु कॅलेडोनिया ग्रीष्म वेळ
+				
+			
+			
+				
+					न्युझीलॅन्ड वेळ
+					न्युझीलॅन्ड प्रमाणित वेळ
+					न्युझीलॅन्ड डेलायट वेळ
+				
+			
 			
 				
 					न्युफावंडलँड वेळ
@@ -2699,11 +4033,52 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					न्युफावंडलँड डेलायट वेळ
 				
 			
+			
+				
+					न्युए वेळ
+				
+			
+			
+				
+					नॉरफॉक आयलँड वेळ
+				
+			
 			
 				
 					फर्नांडो दी नोरोन्हा वेळ
 					फर्नांडो दी नोरोन्हा प्रमाणित वेळ
-					Vote फर्नांडो दी नोरोन्हा ग्रीष्म वेळ
+					फर्नांडो दी नोरोन्हा ग्रीष्म वेळ
+				
+			
+			
+				
+					नोवोसिबिर्स्क
+					नोवोसिबिर्स्क प्रमाणित वेळ
+					नोवोसिबिर्स्क ग्रीष्म वेळ
+				
+			
+			
+				
+					ओम्स्क वेळ
+					ओम्स्क प्रमाणित वेळ
+					ओम्स्क ग्रीष्म वेळ
+				
+			
+			
+				
+					पाकिस्तान
+					पाकिस्तान प्रमाणित वेळ
+					पाकिस्तान ग्रीष्म वेळ
+				
+			
+			
+				
+					पलाऊ वेळ
+				
+			
+			
+				
+					पापुआ न्यु गिनी वेळ
 				
 			
 			
@@ -2720,6 +4095,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					पेरू ग्रीष्म वेळ
 				
 			
+			
+				
+					फिलिपायन वेळ
+					फिलिपायन प्रमाणित वेळ
+					फिलिपायन ग्रीष्म वेळ
+				
+			
+			
+				
+					फिनिक्स आयलँड वेळ
+				
+			
 			
 				
 					सेंट पियर आनी मिकलान वेळ
@@ -2727,6 +4114,60 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					सेंट पियर आनी मिकलान डेलायट वेळ
 				
 			
+			
+				
+					पिटकॅरन वेळ
+				
+			
+			
+				
+					पोनेप वेळ
+				
+			
+			
+				
+					प्योंगयांग वेळ
+				
+			
+			
+				
+					रियुनियन वेळ
+				
+			
+			
+				
+					रोथेरा वेळ
+				
+			
+			
+				
+					सखलिन वेळ
+					सखलिन प्रमाणित वेळ
+					सखलिन ग्रीष्म वेळ
+				
+			
+			
+				
+					सामोआ वेळ
+					सामोआ प्रमाणित वेळ
+					सामोआ डेलायट वेळ
+				
+			
+			
+				
+					सेशेल्स वेळ
+				
+			
+			
+				
+					सिंगापूर प्रमाणित वेळ
+				
+			
+			
+				
+					सोलोमन आइलँड्स वेळ
+				
+			
 			
 				
 					दक्षिण जॉर्जिया वेळ
@@ -2737,6 +4178,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					सुरिनाम वेळ
 				
 			
+			
+				
+					स्योवा वेळ
+				
+			
+			
+				
+					ताहिती वेळ
+				
+			
+			
+				
+					तैपेई वेळ
+					तैपेई प्रमाणित वेळ
+					तैपेई डेलायट वेळ
+				
+			
+			
+				
+					तजीकिस्तान वेळ
+				
+			
+			
+				
+					टोकलाऊ वेळ
+				
+			
+			
+				
+					टोंगा वेळ
+					टोंगा प्रमाणित वेळ
+					टोंगा ग्रीष्म वेळ
+				
+			
+			
+				
+					चुक वेळ
+				
+			
+			
+				
+					तुर्कमेनिस्तान
+					तुर्कमेनिस्तान प्रमाणित वेळ
+					तुर्कमेनिस्तान ग्रीष्म वेळ
+				
+			
+			
+				
+					टुवालू वेळ
+				
+			
 			
 				
 					उरुग्वे वेळ
@@ -2744,11 +4236,68 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					उरुग्वे ग्रीष्म वेळ
 				
 			
+			
+				
+					उज़्बेकिस्तान वेळ
+					उज़्बेकिस्तान प्रमाणित वेळ
+					उज़्बेकिस्तान ग्रीष्म वेळ
+				
+			
+			
+				
+					वनातू वेळ
+					वनातू प्रमाणित वेळ
+					वनातू ग्रीष्म वेळ
+				
+			
 			
 				
 					वेनेझुएला वेळ
 				
 			
+			
+				
+					व्लादिवोस्तोक वेळ
+					व्लादिवोस्तोक प्रमाणित वेळ
+					व्लादिवोस्तोक ग्रीष्म वेळ
+				
+			
+			
+				
+					व्होल्गोग्राड वेळ
+					व्होल्गोग्राड प्रमाणित वेळ
+					व्होल्गोग्राड ग्रीष्म वेळ
+				
+			
+			
+				
+					वोस्तोक वेळ
+				
+			
+			
+				
+					वैक आयलँड वेळ
+				
+			
+			
+				
+					वालिस आनी फ्यूचूना वेळ
+				
+			
+			
+				
+					यकुत्स्क वेळ
+					यकुत्स्क प्रमाणित वेळ
+					यकुत्स्क ग्रीष्म वेळ
+				
+			
+			
+				
+					येकातेरिनबर्ग वेळ
+					येकातेरिनबर्ग प्रमाणित वेळ
+					येकातेरिनबर्ग ग्रीष्म वेळ
+				
+			
 		
 	
 	
@@ -2779,30 +4328,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
-					#,##,##0.###
+					#,##0.###
 				
 			
 		
 		
 			
 				
-					#,##,##0.###
+					#,##0.###
 				
 			
 			
 				
-					0K
-					00K
-					000K
-					0M
-					00M
-					000M
-					0G
-					00G
-					000G
-					0T
-					00T
-					000T
+					0 हजार
+					00 हजार
+					000 हजार
+					0 दशलक्ष
+					00 दशलक्ष
+					000 दशलक्ष
+					0 अब्ज
+					00 अब्ज
+					000 अब्ज
+					0 ट्रिलियन
+					00 ट्रिलियन
+					000 ट्रिलियन
 				
 			
 			
@@ -2813,9 +4362,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					0M
 					00M
 					000M
-					0G
-					00G
-					000G
+					0B
+					00B
+					000B
 					0T
 					00T
 					000T
@@ -2839,107 +4388,929 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
-					#,##,##0%
+					#,##0%
 				
 			
 		
 		
 			
 				
-					#,##,##0%
+					#,##0%
 				
 			
 		
 		
 			
 				
-					¤ #,##,##0.00
+					¤#,##0.00
 				
 			
 		
 		
 			
 				
-					¤ #,##,##0.00
+					¤ #,##0.00
 				
 				
-					¤ #,##,##0.00
+					¤#,##0.00;(¤#,##0.00)
 				
 			
 			
 				
-					¤ 0K
-					¤ 00K
-					¤ 000K
-					¤ 0M
-					¤ 00M
-					¤ 000M
-					¤ 0G
-					¤ 00G
-					¤ 000G
-					¤ 0T
-					¤ 00T
-					¤ 000T
+					¤0K
+					¤00K
+					¤000K
+					¤0M
+					¤00M
+					¤000M
+					¤0B
+					¤00B
+					¤000B
+					¤0T
+					¤00T
+					¤000T
 				
 			
 			{0} {1}
 		
 		
+			
+				युनाइटेड अरब इमीरॅट्स दिरहम
+				युएई दिरहम्स
+				AED
+			
+			
+				अफगाण अफगाणी
+				अफगाण अफगाणीस
+				AFN
+			
+			
+				अल्बेनियन लेक
+				अल्बेनियन लेके
+				ALL
+			
+			
+				अर्मेनियन ड्राम
+				अर्मेनियन ड्राम्स
+				AMD
+			
+			
+				नॅदरलँड अँटिलियन गिल्डर
+				नॅदरलँड अँटिलियन गिल्डर्स
+				ANG
+			
+			
+				अंगोलन क्वॉन्ज
+				अंगोलन क्वॉन्ज्स
+				AOA
+				Kz
+			
+			
+				अर्जेंटिना पेसो
+				अर्जेंटिना पेसोस
+				ARS
+				$
+			
+			
+				ऑस्ट्रेलियाई डॉलर
+				ऑस्ट्रेलियाई डॉलर्स
+				A$
+				$
+			
+			
+				अरुबान फ्लोरिन
+				अरुबान फ्लोरिन
+				AWG
+			
+			
+				अज़रबैजानी मनात
+				अज़रबैजानी मनात्स
+				AZN
+			
+			
+				बोस्निया-हेर्जेगोविना रुपांतरीत मार्क
+				बोस्निया-हेर्जेगोविना रुपांतरीत मार्क्स
+				BAM
+				KM
+			
+			
+				बार्बाडियान डॉलर
+				बार्बाडियान डॉलर्स
+				BBD
+				$
+			
+			
+				बांगलादेशी टाका
+				बांगलादेशी टाकास
+				BDT
+				৳
+			
+			
+				बल्गेरियन लेव
+				बल्गेरियन लेवा
+				BGN
+			
+			
+				बहरिनी डिनार
+				बहरिनी डिनार्स
+				BHD
+			
+			
+				बुरुंडी फ्रँक
+				बुरुंडी फ्रँक
+				BIF
+			
+			
+				बरमुदान डॉलर
+				बरमुदान डॉलर्स
+				BMD
+				$
+			
+			
+				ब्रूनेई डॉलर
+				ब्रूनेई डॉलर्स
+				BND
+				$
+			
+			
+				बोलिव्हियन बोलिवियानो
+				बोलिव्हियन बोलिवियानोस
+				BOB
+				Bs
+			
 			
-				BRL
-				BRL
+				ब्राझिलियन रियाल
+				ब्राझिलियन रियाल्स
 				R$
 				R$
 			
+			
+				बहामियन डॉलर
+				बहामियन डॉलर्स
+				BSD
+				$
+			
+			
+				भुतानीज नागल्ट्रम
+				भुतानीज नागल्ट्रम्स
+				BTN
+			
+			
+				बोत्सवाना पुला
+				Vote बोत्सवाना पुलास
+				BWP
+				P
+			
+			
+				बैलोरुसियन् रूबल
+				बैलोरुसियन् रूबल्स
+				BYN
+				р.
+			
+			
+				बेलिझ डॉलर
+				बेलिझ डॉलर्स
+				BZD
+				$
+			
+			
+				कॅनाडियन डॉलर
+				कॅनाडियन डॉलर्स
+				CA$
+				$
+			
+			
+				काँगोलिसी फ्रँक
+				काँगोलिसी फ्रँक्स
+				CDF
+			
+			
+				स्विस फ्रँक
+				स्विस फ्रँक्स
+				CHF
+			
+			
+				चिली पेसो
+				चिली पेसोस
+				CLP
+				$
+			
+			
+				चिनी युआन (ऑफशोर)
+				चिनी युआन (ऑफशोर)
+				CNH
+			
 			
-				CNY
-				CNY
+				चिनी युआन
+				चिनी युआन
 				CN¥
 				¥
 			
+			
+				कोलंबियन पेसो
+				कोलंबियन पेसोस
+				COP
+				$
+			
+			
+				कोस्ता रिका कॉलॉन
+				कोस्ता रिका कॉलॉन्स
+				CRC
+				₡
+			
+			
+				क्युबान रुपांतरीत पेसो
+				क्युबान रुपांतरीत पेसोस
+				CUC
+				$
+			
+			
+				क्युबान पेसो
+				क्युबान पेसोस
+				CUP
+				$
+			
+			
+				केप वर्दे एस्कुडो
+				केप वर्दे एस्कुडो्स
+				CVE
+			
+			
+				चेक कोरुना
+				चेक कोरुनास
+				CZK
+				Kč
+			
+			
+				जिबूती फ्रँक
+				जिबूती फ्रँक्स
+				DJF
+			
+			
+				डॅनिश क्रोन
+				डॅनिश क्रोनर
+				DKK
+				kr
+			
+			
+				डोमिनिकन पेसो
+				डोमिनिकन पेसोस
+				DOP
+				$
+			
+			
+				अल्जेरियाई डिनार
+				अल्जेरियाई डिनार्स
+				DZD
+			
+			
+				ईजिप्ती पावंड
+				ईजिप्ती पावंड्स
+				EGP
+				E£
+			
+			
+				इरिट्रियन नाक्फा
+				इरिट्रियन नाक्फास
+				ERN
+			
+			
+				इथियोपियाई बिरर
+				इथियोपियाई बिरर्स
+				ETB
+			
 			
-				EUR
-				EUR
+				युरो
+				युरोस
 				€
 				€
 			
+			
+				फिजी डॉलर
+				फिजी डॉलर्स
+				FJD
+				$
+			
+			
+				फ़ॉकलैंड आइलैंड्स पावंड
+				फ़ॉकलैंड आइलैंड्स पावंड्स
+				FKP
+				£
+			
 			
-				GBP
-				GBP
+				ब्रिटिश पावंड
+				ब्रिटिश पावंड्स
 				£
 				£
 			
+			
+				जॉर्जियन लारी
+				जॉर्जियन लारीस
+				GEL
+				₾
+			
+			
+				घानाई सेडी
+				घानाई सेडीस
+				GHS
+			
+			
+				जिब्राल्टर पावंड
+				जिब्राल्टर पावंड्स
+				GIP
+				£
+			
+			
+				गॅम्बियन दलासी
+				गॅम्बियन दलासीस
+				GMD
+			
+			
+				गिनीन फ्रँक
+				गिनीन फ्रँक्स
+				GNF
+				FG
+			
+			
+				ग्वाटेमाला कुएट्झल
+				ग्वाटेमाला कुएट्झल्स
+				GTQ
+				Q
+			
+			
+				गयाना डॉलर
+				गयाना डॉलर्स
+				GYD
+				$
+			
+			
+				हाँग काँग डॉलर
+				हाँग काँग डॉलर्स
+				HK$
+				$
+			
+			
+				होंडुरान लेम्पिरा
+				होंडुरान लेम्पिरास
+				HNL
+				L
+			
+			
+				क्रोयेषियन् कुना
+				क्रोयेषियन् कुनास
+				HRK
+				kn
+			
+			
+				हैतीयन गौर्डे
+				हैतीयन गौर्डेस
+				HTG
+			
+			
+				हंगेरियन फोरिंट
+				हंगेरियन फोरिंट्स
+				HUF
+				Ft
+			
+			
+				इंडोनेशियन रुपिया
+				इंडोनेशियन रुपिया
+				IDR
+				Rp
+			
+			
+				इस्त्रायली न्यु शेकेल
+				इस्त्रायली न्यु शेकेल्स
+				₪
+				₪
+			
 			
-				INR
-				INR
+				भारतीय रुपया
+				भारतीय रुपया
 				₹
 				₹
 			
+			
+				इराकी डिनार
+				इराकी डिनार्स
+				IQD
+			
+			
+				ईरानी रियाल
+				ईरानी रियाल्स
+				IRR
+			
+			
+				आईस्लान्डिक क्रोना
+				आईस्लान्डिक क्रोनुर
+				ISK
+				kr
+			
+			
+				जमैकन डॉलर
+				जमैकन डॉलर्स
+				JMD
+				$
+			
+			
+				जॉर्डनियन डिनार
+				जॉर्डनियन डिनार्स
+				JOD
+			
 			
-				JPY
-				JPY
+				जपानी येन
+				जपानी येन
 				JP¥
 				¥
 			
+			
+				केनयाई शिलिंग
+				केनयाई शिलिंग्स
+				KES
+			
+			
+				किरगिझस्तान सोम
+				किरगिझस्तान सोम्स
+				KGS
+			
+			
+				कंबोडियन रियाल
+				कंबोडियन रियाल्स
+				KHR
+				៛
+			
+			
+				कोमोरियन फ्रँक
+				कोमोरियन फ्रँक्स
+				KMF
+				CF
+			
+			
+				उत्तर कोरियन वॉन
+				उत्तर कोरियन वॉन
+				KPW
+				₩
+			
+			
+				दक्षिण कोरियन वॉन
+				दक्षिण कोरियन वॉन
+				₩
+				₩
+			
+			
+				कुवेती डिनार
+				कुवेती डिनार्स
+				KWD
+			
+			
+				कैमेन आइलैंड्स डॉलर
+				कैमेन आइलैंड्स डॉलर्स
+				KYD
+				$
+			
+			
+				कझाकस्तानी टेंग
+				कझाकस्तानी टेंग्स
+				KZT
+				₸
+			
+			
+				लाओ किप
+				लाओ किप्स
+				LAK
+				₭
+			
+			
+				लिबानेस पावंड
+				लिबानेस पावंड्स
+				LBP
+				L£
+			
+			
+				श्री लंका रुपया
+				श्री लंका रुपया
+				LKR
+				Rs
+			
+			
+				लायबेरियन डॉलर
+				लायबेरियन डॉलर्स
+				LRD
+				$
+			
+			
+				लीबियान डिनार
+				लीबियान डिनार्स
+				LYD
+			
+			
+				मोरक्कन दिरहम
+				मोरक्कन दिरहम्स
+				MAD
+			
+			
+				मोल्दोवान लियू
+				मोल्दोवान लेई
+				MDL
+			
+			
+				मलागासी एरियारी
+				मलागासी एरियारीस
+				MGA
+				Ar
+			
+			
+				मसीडोनियन् डिनर
+				मसीडोनियन् डिनारी
+				MKD
+			
+			
+				म्यानमार क्यात
+				म्यानमार क्यात्स
+				MMK
+				K
+			
+			
+				मंगोलियन तुगरिक
+				मंगोलियन तुगरिक्स
+				MNT
+				₮
+			
+			
+				मकानेसे पटका
+				मकानेसे पटकास
+				MOP
+			
+			
+				मॉरिटानिया उगिया
+				मॉरिटानिया उगियास
+				MRU
+			
+			
+				मॉरिशस रुपी
+				मॉरिशस रुपया
+				MUR
+				Rs
+			
+			
+				मालदिवी रुफिया
+				मालदिवी रुफियास
+				MVR
+			
+			
+				मलावियन क्वाचा
+				मलावियन क्वाचास
+				MWK
+			
+			
+				मेक्सिकन पेसो
+				मेक्सिकन पेसोस
+				MX$
+				$
+			
+			
+				मलेशियाई रिंग्गित
+				मलेशियाई रिंग्गित्स
+				MYR
+				RM
+			
+			
+				मोझांबिकन मेटिकल
+				मोझांबिकन मेटिकल्स
+				MZN
+			
+			
+				नामीबिया डॉलर
+				नामीबिया डॉलर्स
+				NAD
+				$
+			
+			
+				नायजेरियन नायरा
+				नायजेरियन नायरास
+				NGN
+				₦
+			
+			
+				निकारागुआन कॉर्डोबा
+				निकारागुआन कॉर्डोबास
+				NIO
+				C$
+			
+			
+				नॉर्वेगन क्रोन
+				नॉर्वेगन क्रोनर
+				NOK
+				kr
+			
+			
+				नेपाळी रुपया
+				नेपाळी रुपया
+				NPR
+				Rs
+			
+			
+				न्युझीलॅन्ड डॉलर
+				न्युझीलॅन्ड डॉलर्स
+				NZ$
+				$
+			
+			
+				ओमानी रियाल
+				ओमानी रियाल्स
+				OMR
+			
+			
+				पानामानियन बाल्बोआ
+				पानामानियन बाल्बोआस
+				PAB
+			
+			
+				पेरिवियन सोल
+				पेरुवियन सोल्स
+				PEN
+			
+			
+				पापुआ न्यु गिनी किना
+				पापुआ न्यु गिनी किना
+				PGK
+			
+			
+				फिलिपिनी पेसो
+				फिलिपिनी पेसोस
+				PHP
+				₱
+			
+			
+				पाकिस्तानी रुपया
+				पाकिस्तानी रुपया
+				PKR
+				Rs
+			
+			
+				पोलिष झ्लोटी
+				पोलिष झ्लोटी्स
+				PLN
+				zł
+			
+			
+				पराग्वेन गौरानी
+				पराग्वेन गौरानीस
+				PYG
+				₲
+			
+			
+				कतारी रियाल
+				कतारी रियाल्स
+				QAR
+			
+			
+				रोमानियन् लियू
+				रोमानियन् लेई
+				रॉन
+				लेई
+			
+			
+				सर्बियन डिनार
+				सर्बियन डिनार्स
+				RSD
+			
 			
-				RUB
-				RUB
+				रुसी रुबल
+				रुसी रुबल्स
 				RUB
 				₽
 			
+			
+				रवांडा फ्रँक
+				रवांडा फ्रँक्स
+				RWF
+				RF
+			
+			
+				सौदी रियाल
+				सौदी रियाल्स
+				SAR
+			
+			
+				सोलोमन आयलँड्स डॉलर
+				सोलोमन आयलँड डॉलर्स
+				SBD
+				$
+			
+			
+				सेशेल्लोइस रुपी
+				सेशेल्लोइस रुपया
+				SCR
+			
+			
+				सुदानी पावंड
+				सुदानी पावंड्स
+				SDG
+			
+			
+				स्वीदीष क्रोन
+				स्वीदीष क्रोनोर
+				SEK
+				kr
+			
+			
+				सिंगापूरी डॉलर
+				सिंगापूरी डॉलर्स
+				SGD
+				$
+			
+			
+				सेंट हेलिना पावंड
+				सेंट हेलिना पावंड्स
+				SHP
+				£
+			
+			
+				सिएरा लियॉनी लियॉन
+				सिएरा लियॉनी लियॉन्स
+				SLL
+			
+			
+				सोमाली शिलिंग
+				सोमाली शिलिंग्स
+				SOS
+			
+			
+				सुरीनामी डॉलर
+				सुरीनामी डॉलर्स
+				SRD
+				$
+			
+			
+				दक्षिण सुडानी पावंड
+				दक्षिण सुडानी पावंड्स
+				SSP
+				£
+			
+			
+				साओ टोम आनी प्रिन्सिप डोब्रा
+				साओ टोम आनी प्रिन्सिप डोब्रास
+				STN
+				Db
+			
+			
+				सिरियन पावंड
+				सिरियन पावंड्स
+				SYP
+				£
+			
+			
+				स्वाजी लिलांगेनी
+				स्वाजी एमालांगेनी
+				SZL
+			
+			
+				थाई बाट
+				थाई बाट
+				THB
+				฿
+			
+			
+				ताजिकिस्तानी सोमोनी
+				ताजिकिस्तानी सोमोनीस
+				TJS
+			
+			
+				तुर्कमेनिस्तानी मनत
+				तुर्कमेनिस्तानी मनत
+				TMT
+			
+			
+				ट्यूनीशियन डिनार
+				ट्यूनीशियन डिनार्स
+				TND
+			
+			
+				टोंगन पांगा
+				टोंगन पांगा
+				TOP
+				T$
+			
+			
+				तुर्किश लायरा
+				तुर्किश लायरा
+				TRY
+				₺
+				TL
+			
+			
+				ट्रिनीडाड आनी टोबॅगो डॉलर
+				ट्रिनीडाड आनी टोबॅगो डॉलर्स
+				TTD
+				$
+			
+			
+				न्यू तायवान डॉलर
+				न्यू तायवान डॉलर्स
+				NT$
+				$
+			
+			
+				तंजानिया शिलिंग
+				तंजानिया शिलिंग्स
+				TZS
+			
+			
+				युक्रेनियन् रिव्निया
+				युक्रेनियन् रिव्नियास
+				UAH
+				₴
+			
+			
+				युगांडा शिलिंग
+				युगांडा शिलिंग्स
+				UGX
+			
 			
-				USD
-				USD
+				युएस डॉलर
+				युएस डॉलर्स
 				US$
 				$
 			
+			
+				उरुग्वेन पेसो
+				उरुग्वेन पेसोस
+				UYU
+				$
+			
+			
+				उज़्बेकिस्तानी सोम
+				उज़्बेकिस्तानी सोम
+				UZS
+			
+			
+				विनेझुएला बोलिव्हर
+				विनेझुएला बोलिव्हर्स
+				VES
+			
+			
+				वियतनामी डोंग
+				वियतनामी डोंग
+				₫
+				₫
+			
+			
+				वानूआतू वातू
+				वानूआतू वातूस
+				VUV
+			
+			
+				समोआई टाला
+				समोआई टाला
+				WST
+			
+			
+				मध्य अफ्रीकी सीएफए फ्रँक
+				मध्य अफ्रीकी सीएफए फ्रँक्स
+				FCFA
+			
+			
+				उदेंत कॅरिबियन डॉलर
+				उदेंत कॅरिबियन डॉलर्स
+				EC$
+				$
+			
+			
+				अस्तंत आफ्रिकी सीएफए फ्रँक
+				अस्तंत आफ्रिकी सीएफए फ्रँक्स
+				CFA
+			
+			
+				सीएफपी फ्रँक
+				सीएफपी फ्रँक्स
+				CFPF
+			
 			
-				XXX
-				XXX
+				अज्ञात चलन
+				(अज्ञात चलन)
+			
+			
+				येमेनी रियाल
+				येमेनी रियाल्स
+				YER
+			
+			
+				दक्षिण आफ्रिकन रँड
+				दक्षिण आफ्रिकन रँड
+				ZAR
+				R
+			
+			
+				झांबियन क्वाचा
+				झांबियन क्वाचास
+				ZMW
+				ZK
 			
 		
 		
-			≥{0}
+			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
@@ -2948,6 +5319,1323 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		
+			
+				मी/से²
+				{0} मी/से²
+			
+			
+				परिभ्रमण
+				{0} परिभ्रमणां
+			
+			
+				रेडियन
+				{0} रेडियन
+			
+			
+				अंश
+				{0} अंश
+			
+			
+				आर्कमिनीट
+				{0} आर्कमिनीट
+			
+			
+				आर्कसेकंद
+				{0} आर्कसेकंद
+			
+			
+				चौरस किलोमीटर
+				{0} चौरस किलोमीटर
+				दर चौरस किलोमीटर {0}
+			
+			
+				हॅक्टर
+				{0} हॅक्टर
+			
+			
+				चौरस मीटर
+				{0} चौरस मीटर
+				दर चौरस मिटर {0}
+			
+			
+				चौरस सेंटिमीटर
+				{0} चौरस सेंटिमीटर
+				दर चौरस सेंटिमीटर {0}
+			
+			
+				चौरस मायल
+				{0} चौरस मायल
+				दर चौरस मायल {0}
+			
+			
+				एकर
+				{0} एकर
+			
+			
+				चौरस यार्ड
+				{0} चौरस यार्ड
+			
+			
+				चौरस फूट
+				{0} चौरस फूट
+			
+			
+				चौरस इंच
+				{0} चौरस इंच
+				दर चौरस इंच {0}
+			
+			
+				डुनाम्स
+				{0} डुनाम्स
+			
+			
+				कॅरट्स
+				{0} कॅरट्स
+			
+			
+				मिलिग्राम/डेसिलिटर
+				{0} मिलिग्राम/डेसिलिटर
+			
+			
+				मिलिमोल्स/लि
+				{0} मिलिमोल्स/लि
+			
+			
+				टक्को
+				{0} टक्को
+			
+			
+				दरमायल
+				{0} दरमायल
+			
+			
+				मोल्स
+				{0} मोल
+			
+			
+				लिटर/किलोमीटर
+				{0} लिटर/किलोमीटर
+			
+			
+				लिटर/100किलोमीटर
+				{0} लिटर/100किलोमीटर
+			
+			
+				पेटाबायट
+				{0} पेटाबायट
+			
+			
+				टेराबायट
+				{0} टेराबायट
+			
+			
+				टेराबिट्स
+				{0} टेराबिट्स
+			
+			
+				गिगाबायट
+				{0} गिगाबायट
+			
+			
+				गिगाबिट
+				{0} गिगाबिट
+			
+			
+				मॅगाबायट
+				{0} मॅगाबायट
+			
+			
+				मॅगाबिट
+				{0} मॅगाबिट
+			
+			
+				किलोबायट
+				{0} किलोबायट
+			
+			
+				किलोबिट
+				{0} किलोबिट
+			
+			
+				बायट
+				{0} बायट
+			
+			
+				बिट
+				{0} बिट
+			
+			
+				शतकां
+				{0} शतकां
+			
+			
+				दशकां
+				{0} दशकां
+			
+			
+				वर्सां
+				{0} वर्सां
+				दर वर्सा {0}
+			
+			
+				म्हयने
+				{0} म्हयने
+				दर म्हयनो {0}
+			
+			
+				सप्तक
+				{0} सप्तक
+				दर सप्तकाक {0}
+			
+			
+				दीस
+				{0} दीस
+				दर दिसा {0}
+			
+			
+				वरां
+				{0} वरां
+				दर वरा {0}
+			
+			
+				मिण्टां
+				{0} मिण्टां
+				दर मिनीट {0}
+			
+			
+				सेकंद
+				{0} सेकंदांनी
+				दर सेकंद {0}
+			
+			
+				मिलिसेकंदांनी
+				{0} मिलिसेकंदांनी
+			
+			
+				मायक्रोसेकंदांनी
+				{0} मायक्रोसेकंदांनी
+			
+			
+				नॅनोसेकंदांनी
+				{0} नॅनोसेकंदांनी
+			
+			
+				एम्पियर
+				{0} एम्पियर
+			
+			
+				ओम
+			
+			
+				वोल्ट
+				{0} वो
+			
+			
+				किलोकॅलरीज
+				{0} किलोकॅल
+			
+			
+				कॅलरीज
+				{0} कॅलरीज
+			
+			
+				कॅलरीज
+				{0} कॅलरीज
+			
+			
+				किलोज्युल
+				{0} किलोज्युल
+			
+			
+				ज्युल
+				{0} ज्युल
+			
+			
+				किलोवॅट-वरां
+				{0} किलोवॅट-वरां
+			
+			
+				न्युटन
+				{0} न्युटन
+			
+			
+				गिगाहर्ट्झ
+				{0} गिगाहर्ट्झ
+			
+			
+				मॅगाहर्ट्झ
+				{0} मॅगाहर्ट्झ
+			
+			
+				किलोहर्ट्झ
+				{0} किलोहर्ट्झ
+			
+			
+				हर्ट्झ
+				{0} हर्ट्झ
+			
+			
+				टायपोग्रॅफिक एम
+				{0} ems
+			
+			
+				पिक्सेल्स
+				{0} पिक्सेल्स
+			
+			
+				मॅगोपिक्सेल्स
+				{0} मॅगोपिक्सेल्स
+			
+			
+				दर सेंटिमीटराक पिक्सेल
+				दर सेंटिमीटराक पिक्सेल {0}
+			
+			
+				दर इंचाक पिक्सेल्स
+				दर इंचाक पिक्सेल {0}
+			
+			
+				दर सेंटिमीटर ठिपके
+				दर सेंटिमीटर ठिपके {0}
+			
+			
+				दर इंचाक ठिपके
+				दर इंचाक ठिपके {0}
+			
+			
+				किलोमीटर
+				{0} किलोमीटर
+				दर किलोमीटर {0}
+			
+			
+				मीटर
+				{0} मीटर
+				दर मिटर {0}
+			
+			
+				डेसीमीटर
+				{0} डेसीमीटर
+			
+			
+				सेंटिमीटर
+				{0} सेंटिमीटर
+				दर सेंटिमीटर {0}
+			
+			
+				मिलिमीटर
+				{0} मिलिमिटर
+			
+			
+				मायक्रोमीटर
+				{0} मायक्रोमीटर
+			
+			
+				नॅनोमीटर
+				{0} नॅनोमीटर
+			
+			
+				पिकोमीटर
+				{0} पिकोमिटर
+			
+			
+				मायल्स
+				{0} मायल्स
+			
+			
+				यार्ड
+				{0} यार्ड
+			
+			
+				फूट
+				{0} फूट
+				दर फूट {0}
+			
+			
+				इंच
+				{0} इंच
+				दर इंच {0}
+			
+			
+				पॅरासे
+				{0} पॅरासे
+			
+			
+				प्रकाश वर्सां
+				{0} प्रकाश वर्सां
+			
+			
+				खगोलशास्त्रीय प्रमाण
+				{0} खगोलशास्त्रीय प्रमाण
+			
+			
+				नॉटिकल मायल्स
+				{0} नॉटिकल्स मायल्स
+			
+			
+				मायल-स्कँडिनेव्हियन
+				{0} मायल्स-स्कँडिनेव्हियन
+			
+			
+				पॉयंट
+				{0} पॉयंट्स
+			
+			
+				सौर त्रिज्या
+				{0} सौर त्रिज्या
+			
+			
+				मॅट्रिक टन
+				{0} मॅट्रिक टन
+			
+			
+				किलोग्राम
+				{0} किलोग्राम
+				{0}/किलोग्राम
+			
+			
+				ग्राम
+				{0} ग्राम
+				{0}/ग्रा
+			
+			
+				मिलिग्राम
+				{0} मिलिग्राम
+			
+			
+				टन
+				{0} टन
+			
+			
+				पौंड
+				{0} पौंड
+			
+			
+				कॅरट
+				{0} कॅरट
+			
+			
+				मेगावॅट
+				{0} मेगावॅट
+			
+			
+				किलोवॅट
+				{0} किलोवॅट
+			
+			
+				वॅट
+				{0} वॅट
+			
+			
+				मिलिवॅट
+				{0} मिलिवॅट
+			
+			
+				हॉर्सपावर
+				{0} हॉर्सपावर
+			
+			
+				पट्टी
+				{0} पट्ट्यो
+			
+			
+				अटमोसपियर
+				{0} अटमोसपियर
+			
+			
+				पास्कल
+				{0} पास्कल
+			
+			
+				किमी/व
+				{0} किमी/व
+			
+			
+				मी/से
+				{0} मी/से
+			
+			
+				मा/व
+				{0} मा/व
+			
+			
+				अंश सेल्सियस
+				{0} अंश सेल्सियस
+			
+			
+				अंश फारेनहायट
+				{0} अंश फारेनहायट
+			
+			
+				केल्वीन
+				{0} केल्वीन
+			
+			
+				न्युटन-मीटर
+				{0} न्युटन-मीटर
+			
+			
+				क्युबीक किलोमीटर
+				{0} क्युबीक किलोमीटर
+			
+			
+				क्युबीक मीटर
+				{0} क्युबीक मीटर
+				{0}/मी³
+			
+			
+				सेमी³
+				{0} सेमी³
+				{0}/सेमी³
+			
+			
+				मा³
+				{0} मा³
+			
+			
+				या³
+				{0} या³
+			
+			
+				फू³
+				{0} फू³
+			
+			
+				इं³
+				{0} इं³
+			
+			
+				मॅगालिटर
+				{0} मॅगालिटर
+			
+			
+				लिटर
+				{0} लिटर
+				{0}/लिटर
+			
+			
+				मिलिलिटर
+				{0} मिलिलिटर
+			
+			
+				मॅट्रिक कप
+				{0} मॅट्रिक कप
+			
+			
+				एकर-फूट
+				{0} एकर-फूट
+			
+			
+				गॅलोन
+				{0} गॅलोन
+				दर गॅलोन {0}
+			
+			
+				क्वार्त
+				{0} क्वार्त
+			
+			
+				कप
+				{0} क
+			
+			
+				फ्लुइड औंस
+				{0} फ्लुइड औंस
+			
+			
+				व्हडलें कुलेर
+				{0} व्हडलें कुलेर
+			
+			
+				कुलेर
+				{0} कुलेर
+			
+			
+				बॅरल
+				{0} बॅरल
+			
+			
+				मुख्य दिका
+				{0} उदेंत
+				{0} उत्तर
+				{0} दक्षिण
+				{0} अस्तंत
+			
+		
+		
+			
+				{0}/{1}
+			
+			
+				{0}⋅{1}
+			
+			
+				g-force
+				{0} G
+			
+			
+				मी/से²
+				{0} मी/से²
+			
+			
+				rev
+				{0} rev
+			
+			
+				रेडियन
+				{0} रे
+			
+			
+				अंश
+				{0}°
+			
+			
+				आमि
+				{0}′
+			
+			
+				आसे
+				{0}″
+			
+			
+				किमी²
+				{0} किमी²
+				{0}/किमी²
+			
+			
+				हॅक्टर
+				{0} ha
+			
+			
+				मीटर²
+				{0} मी²
+				{0}/मी²
+			
+			
+				सेमी²
+				{0} सेमी²
+				{0}/सेमी²
+			
+			
+				चौ मायल
+				{0} चौ मा
+				{0}/mi²
+			
+			
+				एकर
+				{0} ac
+			
+			
+				यार्ड²
+				{0} yd²
+			
+			
+				चौ फूट
+				{0} चौ फू
+			
+			
+				in²
+				{0} in²
+				{0}/in²
+			
+			
+				डुनाम्स
+				{0} डुनाम
+			
+			
+				कॅरट्स
+				{0} kt
+			
+			
+				मिग्रा/डेलि
+				{0} मिग्रा/डेलि
+			
+			
+				मिमो/लि
+				{0} मिमो/लि
+			
+			
+				ppm
+				{0} ppm
+			
+			
+				%
+				{0}%
+			
+			
+				‰
+				{0}‰
+			
+			
+				‱
+				{0}‱
+			
+			
+				मोल
+				{0} मोल
+			
+			
+				लि/किमी
+				{0} लि/किमी
+			
+			
+				लि/100किमी
+				{0} लि/100किमी
+			
+			
+				mpg US
+				{0} mpg US
+			
+			
+				mpg Imp.
+				{0} mpg Imp.
+			
+			
+				PB
+				{0} PB
+			
+			
+				TB
+				{0} TB
+			
+			
+				Tb
+				{0} Tb
+			
+			
+				GB
+				{0} GB
+			
+			
+				Gb
+				{0} Gb
+			
+			
+				MB
+				{0} MB
+			
+			
+				Mb
+				{0} Mb
+			
+			
+				kB
+				{0} kB
+			
+			
+				kb
+				{0} kb
+			
+			
+				बायट
+				{0} बायट
+			
+			
+				बिट
+				{0} बिट
+			
+			
+				श
+				{0} श
+			
+			
+				दशक
+				{0} दशक
+			
+			
+				वर्सां
+				{0} वर्सां
+				{0}/वर्सां
+			
+			
+				म्हयने
+				{0} म्हयने
+				{0}/म्ह
+			
+			
+				सप्तक
+				{0} सप्तक
+				{0}/स
+			
+			
+				दीस
+				{0} दीस
+				{0}/दी
+			
+			
+				वरां
+				{0} वर
+				{0}/वर
+			
+			
+				मिण्टां
+				{0} मिनीट
+				{0}/मिनीट
+			
+			
+				सेकंदांनी
+				{0} सेकंद
+				{0}/से
+			
+			
+				मिलिसेकंदांनी
+				{0} मिलिसेकंद
+			
+			
+				μsecs
+				{0} μs
+			
+			
+				नॅनोसेकंदांनी
+				{0} नॅसे
+			
+			
+				एम्प्स
+				{0} ए
+			
+			
+				mA
+				{0} mA
+			
+			
+				ओम्स
+				{0} Ω
+			
+			
+				वोल्ट
+				{0} वो
+			
+			
+				kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+			
+			
+				Cal
+				{0} Cal
+			
+			
+				किलोज्युल
+				{0} किलोज्युल
+			
+			
+				ज्युल
+				{0} ज्यु
+			
+			
+				किवॅटवर
+				{0}किवॅटवर
+			
+			
+				eV
+				{0} eV
+			
+			
+				Btu
+				{0} Btu
+			
+			
+				US therm
+				{0} US therm
+			
+			
+				lbf
+				{0} lbf
+			
+			
+				न्युटन
+				{0} न्यु
+			
+			
+				GHz
+				{0} GHz
+			
+			
+				MHz
+				{0} MHz
+			
+			
+				kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+			
+			
+				em
+				{0} em
+			
+			
+				पिक्सेल्स
+				{0} px
+			
+			
+				मॅगोपिक्सेल्स
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+			
+			
+				किमी
+				{0} किमी
+				{0}/किमी
+			
+			
+				मी
+				{0} मी
+				{0}/मी
+			
+			
+				डेमी
+				{0} डेमी
+			
+			
+				सेमी
+				{0} सेमी
+				{0}/सेमी
+			
+			
+				मिमी
+				{0} मिमी
+			
+			
+				µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+			
+			
+				pm
+				{0} pm
+			
+			
+				मायल्स
+				{0} mi
+			
+			
+				यार्ड
+				{0} yd
+			
+			
+				फूट
+				{0} फूट
+				{0}/ft
+			
+			
+				इंच
+				{0} in
+				{0}/in
+			
+			
+				pc
+				{0} pc
+			
+			
+				प्रकाश वर्सां
+				{0} ly
+			
+			
+				au
+				{0} au
+			
+			
+				nmi
+				{0} nmi
+			
+			
+				smi
+				{0} smi
+			
+			
+				पॉयंट
+				{0} pt
+			
+			
+				सौर त्रिज्या
+				{0} R☉
+			
+			
+				lx
+				{0} lx
+			
+			
+				L☉
+				{0} L☉
+			
+			
+				t
+				{0} t
+			
+			
+				किलोग्राम
+				{0} किलोग्राम
+				{0}/किलोग्राम
+			
+			
+				ग्राम
+				{0} ग्राम
+				{0}/ग्रा
+			
+			
+				मिग्रा
+				{0} मिग्रा
+			
+			
+				µg
+				{0} µg
+			
+			
+				टन
+				{0} टन
+			
+			
+				lb
+				{0} lb
+				{0}/lb
+			
+			
+				oz
+				{0} oz
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
+			
+			
+				कॅरट
+				{0} कॅ
+			
+			
+				Da
+				{0} Da
+			
+			
+				M⊕
+				{0} M⊕
+			
+			
+				M☉
+				{0} M☉
+			
+			
+				GW
+				{0} GW
+			
+			
+				मेवॅ
+				{0} मेवॅ
+			
+			
+				किवॅ
+				{0} किवॅ
+			
+			
+				वॅट
+				{0} वॅ
+			
+			
+				mW
+				{0} mW
+			
+			
+				हॉर्सपावर
+				{0} हॉर्सपावर
+			
+			
+				mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+			
+			
+				inHg
+				{0} inHg
+			
+			
+				पट्टी
+				{0} पट्टी
+			
+			
+				mbar
+				{0} mbar
+			
+			
+				atm
+				{0} atm
+			
+			
+				Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+			
+			
+				kPa
+				{0} kPa
+			
+			
+				MPa
+				{0} MPa
+			
+			
+				किमी/व
+				{0} किमी/व
+			
+			
+				मी/से
+				{0} मी/से
+			
+			
+				मा/व
+				{0} मा/व
+			
+			
+				kn
+				{0} kn
+			
+			
+				°
+				{0}°
+			
+			
+				अं. से
+				{0} अंसे
+			
+			
+				अंश फारेनहायट
+				{0}°फा
+			
+			
+				के
+				{0} के
+			
+			
+				lbf⋅ft
+				{0} lbf⋅ft
+			
+			
+				N⋅m
+				{0} N⋅m
+			
+			
+				किमी³
+				{0} किमी³
+			
+			
+				मी³
+				{0} मी³
+				{0}/मी³
+			
+			
+				सेमी³
+				{0} सेमी³
+				{0}/सेमी³
+			
+			
+				mi³
+				{0} mi³
+			
+			
+				या³
+				{0} या³
+			
+			
+				फू³
+				{0} फू³
+			
+			
+				इंच³
+				{0} इ³
+			
+			
+				ML
+				{0} ML
+			
+			
+				hL
+				{0} hL
+			
+			
+				लिटर
+				{0} लि
+				{0}/लि
+			
+			
+				dL
+				{0} dL
+			
+			
+				cL
+				{0} cL
+			
+			
+				मिलि
+				{0} मिलि
+			
+			
+				mpt
+				{0} mpt
+			
+			
+				mcup
+				{0} mc
+			
+			
+				एकर फू
+				{0} ए फू
+			
+			
+				गॅ
+				{0} गॅ
+				{0}/गॅलो युएस
+			
+			
+				Imp. gal
+				{0} gal Imp.
+				{0}/gal Imp.
+			
+			
+				क्वा
+				{0} क्वा
+			
+			
+				pt
+				{0} pt
+			
+			
+				कप
+				{0} क
+			
+			
+				US fl oz
+				{0} fl oz US
+			
+			
+				Imp. fl oz
+				{0} fl oz Imp.
+			
+			
+				tbsp
+				{0} tbsp
+			
+			
+				कु
+				{0} कु
+			
+			
+				बॅरल
+				{0} बॅरल
+			
+			
+				दिका
+				{0} उदें
+				{0} उत्त
+				{0} द
+				{0} अ
+			
+		
+		
+			
+				वर्सा
+				{0}व
+			
+			
+				म्हयनो
+				{0}म्ह
+			
+			
+				स
+				{0}स
+			
+			
+				दीस
+				{0}दी
+			
+			
+				वर
+				{0} व
+			
+			
+				मिनीट
+				{0} मि
+			
+			
+				सेकंद
+				{0}से
+			
+			
+				मिलिसे
+				{0}मिसे
+			
+			
+				किमी
+				{0} किमी
+			
+			
+				मी
+				{0}मी
+			
+			
+				सेमी
+				{0} सेमी
+			
+			
+				मिमी
+				{0} मिमी
+			
+			
+				किलोग्राम
+				{0} किलो
+			
+			
+				ग्राम
+				{0} ग्रा
+			
+			
+				किमी/व
+				{0} किमी/व
+			
+			
+				°से
+				{0}°से
+			
+			
+				लिटर
+				{0} लि
+			
+			
+				दिका
+				{0}उदें
+				{0}उत्त
+				{0}द
+				{0}अ
+			
+		
 		
 			h:mm
 		
@@ -2965,6 +6653,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}, {1}
 			{0}, {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+			{0}, वा {1}
+			{0} वा {1}
+		
+		
+			{0}, वा {1}
+			{0} वा {1}
+		
+		
+			{0}, वा {1}
+			{0} वा {1}
+		
+		
+			{0} & {1}
+		
+		
+			{0} {1}
+			{0} {1}
+			{0} {1}
+		
 	
 	
 		
@@ -2972,4 +6682,170 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ना:n
 		
 	
+	
+		{0} — सगळें
+		{0} — अनुरुपताय
+		{0} — जोडलां
+		{0} — विस्तारायलां
+		{0} — इतिहासीक
+		{0} — तरेकवार
+		{0} — हेर
+		लिपयो — {0}
+		{0} आघात
+		कृती
+		आफ्रिकेची लिपी
+		अमेरिकेची लिपी
+		जनावर
+		जनावर वा सैम
+		बाण
+		कूड
+		बॉक्स रेखाटण
+		ब्रेल
+		इमारत
+		बुलेट वा नखेत्र
+		व्यंजन जामो
+		चलन चिन्न
+		डॅश वा कनॅक्टर
+		अंक
+		डिंगबॅट
+		डिविनेशन चिन्न
+		सकयल दर्शोवपी बाण
+		सकयल वयर दर्शोवपी बाण
+		उदेंत आशियाई लिपी
+		युरोपियन लिपी
+		बायल
+		बावटो
+		बावटे
+		अन्न आनी पेय
+		स्वरूप
+		स्वरूप आनी धवीसुवात
+		पूर्ण-रुंदी वेरीयंट
+		भुमिती आकार
+		अर्द-रुंदी वेरीयंट
+		हॅन वर्ण
+		हॅन रेडिकल
+		हांजा
+		हांजी (सोंपी केल्लीझ
+		हांजी (पारंपारीक)
+		काळीज
+		इतिहासीक लिपी
+		आयडियोग्रॅफिक डिस्क. वर्ण
+		जपानी काना
+		कानबुन
+		कांजी
+		कीकॅप
+		दाव्यान दाखोवपी बाण
+		दाव्यान उजव्यान दाखोवपी बाण
+		पत्रासारकें चिन्न
+		मर्यादीत-वापर
+		दादलो
+		गणीत चिन्न
+		मध्य उदेंत लिपी
+		तरेकवार
+		आधुनिक लिपी
+		मॉडिफायर
+		संगिताचें चिन्न
+		सैम
+		सुवातना
+		आंकडे
+		ऑब्जॅक्ट
+		हेर
+		जोडी लायिल्लें
+		व्यक्ती
+		फोनेटिक अक्षर
+		पिक्टोग्राफ
+		सुवात
+		वनस्पत
+		विरामचिन्न
+		उजव्यान दाखोवपी बाण
+		चिन्न वा कुरू
+		ल्हान वेरीयंट
+		स्मायली
+		स्मायली वा व्यक्ती
+		दक्षिण आशियाई लिपी
+		आग्नेय आशियाई लिपी
+		सुवात घेवप
+		क्रिडा
+		कुरू
+		तांत्रिक कुरू
+		स्वर खूण
+		भोंवडी
+		भोंवडी वा सुवात
+		वयर दर्शोवपी बाण
+		वेरीयंट
+		स्वरयुक्त जामो
+		हवामान
+		अस्तंत आशियाई लिपी
+		धवीसुवात
+	
+	
+		तिरपें
+		ऑप्टिकल आकार
+		स्लांट
+		रुंदी
+		वजन
+		छेदक
+		माथाळो
+		लिखीत
+		वाकडें
+		प्रदर्शन
+		पोस्टर
+		फाटल्यानबाग
+		अपरायट
+		बागिल्लें
+		अतिरिक्त-बागिल्लें
+		चडथंड
+		चडआकुंचीत
+		चडसंकुचीत
+		अतिरिक्त थंड
+		अतिरिक्त-आकुंचीत
+		अतिरिक्त संकुचीत
+		थंड
+		आकुंचीत
+		आकुंचीत
+		अर्दथंड
+		अर्दआकुंचीत
+		अर्दआकुंचीत
+		सादारण
+		अर्दविस्तारीत
+		अर्दविस्तारीत
+		अर्दरुंदी
+		विस्तारीत
+		विस्तारीत
+		रुंद
+		अतिरिक्त-विस्तारीत
+		अतिरिक्त-विस्तारीत
+		अतिरिक्त रुंद
+		चडविस्तारीत
+		चडविस्तारीत
+		चडरुंद
+		बारीक
+		अतिरिक्त-विरळ
+		चडविरळ
+		विरळ
+		अर्दविरळ
+		पुस्तक
+		नियमीत
+		माध्यम
+		अर्दठळक
+		अर्दठळक
+		ठळक
+		अतिरिक्त-ठळक
+		काळें
+		जड
+		अतिरिक्त-काळें
+		चडकाळें
+		चडजड
+		उबे अपूर्णांक
+		कॅपिटल सुवात
+		पर्यायी लिगाचर्स
+		कर्णरेशा अपूर्णांक
+		स्तर आंकडे
+		पोरणी-शैलीच्यो आकृत्यो
+		ऑर्डिनाल
+		प्रमाणबध्द आंकडे
+		ल्हान कॅपिटल
+		टॅबुलार आंकडे
+		स्लॅश शून्य
+	
 
diff --git a/make/data/cldr/common/main/kok_IN.xml b/make/data/cldr/common/main/kok_IN.xml
index 754f00d198f..709b41a5fd8 100644
--- a/make/data/cldr/common/main/kok_IN.xml
+++ b/make/data/cldr/common/main/kok_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ks.xml b/make/data/cldr/common/main/ks.xml
index 6716ec03df5..12e20b7238b 100644
--- a/make/data/cldr/common/main/ks.xml
+++ b/make/data/cldr/common/main/ks.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -745,7 +745,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سینٹ مارٹِن
 			میڑاگاسکار
 			مارشَل جٔزیٖرٕ
-			مؠسوڑونِیا
 			مالی
 			مَیَنما بٔرما
 			مَنگولِیا
@@ -914,7 +913,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[ء آ أ ٲ ؤ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں ھ ہ و ۄ ۆ ی ۍ ؠ ے]
 		[\u200E\u200F \u064E \u064F \u0650 \u0654 \u0655 \u065F \u0656 \u0657]
-		[\u200E \- , . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
+		[\u200E \- ‑ , . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
 	
 	
 		
@@ -3294,8 +3293,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			,
 			;
 			%
-			‎+ 
-			‎- 
+			‎+
+			‎-
 			E
 			‰
 			∞
diff --git a/make/data/cldr/common/main/ks_IN.xml b/make/data/cldr/common/main/ks_IN.xml
index 44ff337144d..e3540e23921 100644
--- a/make/data/cldr/common/main/ks_IN.xml
+++ b/make/data/cldr/common/main/ks_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ksb.xml b/make/data/cldr/common/main/ksb.xml
index 11935a0d655..db731ab0795 100644
--- a/make/data/cldr/common/main/ksb.xml
+++ b/make/data/cldr/common/main/ksb.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Mashal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/ksb_TZ.xml b/make/data/cldr/common/main/ksb_TZ.xml
index bfdccbddae0..fddd888b2e3 100644
--- a/make/data/cldr/common/main/ksb_TZ.xml
+++ b/make/data/cldr/common/main/ksb_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ksf.xml b/make/data/cldr/common/main/ksf.xml
index 5db24d626ca..aa1ce943905 100644
--- a/make/data/cldr/common/main/ksf.xml
+++ b/make/data/cldr/common/main/ksf.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			mɔldaví
 			madagaska
 			zǝ i marcál
-			másǝdwán
 			mali
 			myanmár
 			mɔŋolí
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á b c d e é ǝ {ǝ\u0301} ɛ {ɛ\u0301} f g h i í j k l m n ŋ o ó ɔ {ɔ\u0301} p r s t u ú v w y z]
 		[q x]
 		[A B C D E Ǝ Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/ksf_CM.xml b/make/data/cldr/common/main/ksf_CM.xml
index 3c7a8604dac..874b0486a89 100644
--- a/make/data/cldr/common/main/ksf_CM.xml
+++ b/make/data/cldr/common/main/ksf_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ksh.xml b/make/data/cldr/common/main/ksh.xml
index 8cc858874bf..315829149cf 100644
--- a/make/data/cldr/common/main/ksh.xml
+++ b/make/data/cldr/common/main/ksh.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -596,8 +596,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			de Zint-Määtes-Ensel
 			Maddajaska
 			de Machschall-Enselle
-			Mazedoonije
-			de vörmaals ens jugoßlaawesch jewääse Republik Mazedoonije
 			Maali
 			Birma
 			Mongjolei
@@ -2811,12 +2809,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Pferdestärke
 				{0} Pferdestärken
 			
-			
-				Hektopascal
-				{0} Hektopascal
-				{0} Hektopascal
-				{0} Hektopascal
-			
 			
 				Dumm Quecksilbersäule
 				{0} Dumm Quecksilbersäule
@@ -2829,6 +2821,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Millibar
 				{0} Millibar
 			
+			
+				Hektopascal
+				{0} Hektopascal
+				{0} Hektopascal
+				{0} Hektopascal
+			
 			
 				Kilometer pro Schtunde
 				{0} Kilometer pro Schtunde
@@ -3089,12 +3087,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} PS
 				{0} PS
 			
-			
-				Hektopascal
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				Dumm Quecksilbersäule
 				{0} inHg
@@ -3107,6 +3099,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				Hektopascal
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				Kilometer pro Schtunde
 				{0} km/h
@@ -3320,11 +3318,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}PS
 				{0}PS
 			
-			
-				{0}hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -3335,6 +3328,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				{0}km/h
 				{0}km/h
diff --git a/make/data/cldr/common/main/ksh_DE.xml b/make/data/cldr/common/main/ksh_DE.xml
index 261a3b200cf..70204389af9 100644
--- a/make/data/cldr/common/main/ksh_DE.xml
+++ b/make/data/cldr/common/main/ksh_DE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ku.xml b/make/data/cldr/common/main/ku.xml
index 1c1d79bf74c..7f57a9a872e 100644
--- a/make/data/cldr/common/main/ku.xml
+++ b/make/data/cldr/common/main/ku.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -236,6 +236,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			udmurtî
 			oygurî
 			ukraynî
+			zimanê nenas
 			urdûyî
 			ozbekî
 			viyetnamî
@@ -247,6 +248,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			yidîşî
 			yorubayî
 			kantonî
+			çînî
+			çînî, mandarînî
+			çîniya sadekirî
+			çîniya mandarînî ya sadekirî
+			çîniya kevneşopî
+			çîniya mandarînî ya kevneşopî
 			zuluyî
 			zazakî
 		
@@ -258,7 +265,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
+			
+			
+			
+			
 			
+			
 			
 			
 			
@@ -273,8 +286,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Amerîkaya Bakur
 			Amerîkaya Başûr
 			Okyanûsya
+			Afrîkaya Rojava
 			Amerîkaya Navîn
+			Afrîkaya Rojhilat
 			Afrîkaya Bakur
+			Afrîkaya Navîn
 			Amerîka
 			Karîb
 			Awistralasya
@@ -425,7 +441,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Madagaskar
 			Giravên Marşal
 			Makedonya
-			MK
 			Malî
 			Myanmar (Birmanya)
 			Mongolya
@@ -554,7 +569,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c ç d e ê f g h i î j k l m n o p q r s ş t u û v w x y z]
 		[á à ă â å ä ã ā æ è ĕ ë ē é ì ĭ ï ī í ñ ó ò ŏ ô ø ō œ ß ù ŭ ū ú ÿ]
 		[A B C Ç D E Ê F G H I Î J K L M N O P Q R S Ş T U Û V W X Y Z]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -563,23 +578,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} … {1}
 		?
 		
-			[\--/]
 			[\:∶]
 		
 		
-			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
-		
-		
-			[,٫︐﹐，]
-			[.․﹒．｡]
 		
 	
 	
@@ -792,10 +798,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							4
 						
 						
-							Ç1
-							Ç2
-							Ç3
-							Ç4
+							Çarêka 1em
+							Çarêka 2em
+							Çarêka 3em
+							Çarêka 4em
 						
 					
 					
@@ -811,28 +817,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							3
 							4
 						
+						
+							Çarêka 1em
+							Çarêka 2em
+							Çarêka 3em
+							Çarêka 4em
+						
 					
 				
 				
 					
 						
-							BN
-							PN
+							BN
+							PN
 						
 						
-							BN
-							PN
+							BN
+							PN
 						
 					
 				
 				
 					
 						berî zayînê
+						berî zayînê
 						piştî zayînê
+						piştî zayînê
 					
 					
 						BZ
+						BZ
 						PZ
+						PZ
 					
 				
 				
@@ -885,12 +901,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				par
 				îsal
 				sala piştî
+				
+					di salekê de
+					di {0} salan de
+				
+				
+					berî {0} salê
+					berî {0} salan
+				
 			
 			
 				sal
+				par
+				îsal
+				sala bê
+				
+					piştî salekê
+					piştî {0} salan
+				
+				
+					berî salekê
+					berî {0} salan
+				
 			
 			
 				sl
+				par
+				îsal
+				sala bê
+				
+					piştî salekê
+					piştî {0} salan
+				
+				
+					berî salekê
+					berî {0} salan
+				
 			
 			
 				çarêk
@@ -903,21 +949,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				meh
+				meha borî
+				vê mehê
+				meha were
 			
 			
 				m.
+				meha br.
+				vê mehê
+				meha bê
 			
 			
 				m.
+				meha br.
+				vê mehê
+				meha bê
 			
 			
 				hefte
+				hefteya borî
+				vê hefteyê
+				hefteya were
+				hefteya {0}
 			
 			
 				hf.
+				hft. borî
+				vê hft.
+				hft. bê
+				hft. {0}
 			
 			
 				hf.
+				hft. borî
+				vê hft.
+				hft. bê
+				hft. {0}
+			
+			
+				hefteya mehê
 			
 			
 				roj
@@ -931,6 +1001,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				r.
 			
+			
+				roja salê
+			
+			
+				roja salê
+			
+			
+				roja salê
+			
+			
+				roja hefteyê
+			
+			
+				roja hefteyê
+			
+			
+				roja hefteyê
+			
+			
+				roja mehê
+			
+			
+				roja mehê
+			
+			
+				roja mehê
+			
+			
+				BN/PN
+			
+			
+				BN/PN
+			
+			
+				BN/PN
+			
 			
 				saet
 			
@@ -958,14 +1064,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				s.
 			
+			
+				qada demê
+			
+			
+				qad
+			
+			
+				qad
+			
 		
 	
 	
-		latn
-		
-			latn
-		
-		1
 		
 			,
 			.
@@ -1016,8 +1126,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ewro
 				ewro
 				ewro
-				€
-				€
 			
 			
 				₺
@@ -1034,6 +1142,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		
+			
+				dewr
+				{0} dewr
+				{0} dewr
+			
+			
+				radyan
+				{0} radyan
+				{0} radyan
+			
+			
+				derece
+				{0} derece
+				{0} derece
+			
+			
+				xuleka kevanî
+				{0} xuleka kevanî
+				{0} xulekên kevanî
+			
+			
+				çirkeya kevanî
+				{0} çirkeya kevanî
+				{0} çirkeyên kevanî
+			
+			
+				qerat
+				{0} qerat
+				{0} qerat
+			
+			
+				ji sedî
+				ji sedî {0}
+				ji sedî {0}
+			
 			
 				sal
 				{0} sal
@@ -1083,6 +1226,42 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
+			
+				dwr
+				{0} dwr
+				{0} dwr
+			
+			
+				radyan
+				{0} rad
+				{0} rad
+			
+			
+				derece
+			
+			
+				xlk. kevanî
+			
+			
+				çrk. kevanî
+			
+			
+				qerat
+			
+			
+				%{0}
+				%{0}
+			
+			
+				l/km
+				{0} l/km
+				{0} l/km
+			
+			
+				l/100 km
+				{0} l/100 km
+				{0} l/100 km
+			
 			
 				sal
 				{0} sal
@@ -1133,6 +1312,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
+			
+				%{0}
+				%{0}
+			
+			
+				l/100km
+				{0}l/100km
+				{0}l/100km
+			
 			
 				sl
 				{0}sl
diff --git a/make/data/cldr/common/main/ku_TR.xml b/make/data/cldr/common/main/ku_TR.xml
index b5fd2a69559..2c2cec8b082 100644
--- a/make/data/cldr/common/main/ku_TR.xml
+++ b/make/data/cldr/common/main/ku_TR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/kw.xml b/make/data/cldr/common/main/kw.xml
index 3e52d825b70..e0a86c6e80a 100644
--- a/make/data/cldr/common/main/kw.xml
+++ b/make/data/cldr/common/main/kw.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
diff --git a/make/data/cldr/common/main/kw_GB.xml b/make/data/cldr/common/main/kw_GB.xml
index b02b34c77db..a247ac89772 100644
--- a/make/data/cldr/common/main/kw_GB.xml
+++ b/make/data/cldr/common/main/kw_GB.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ky.xml b/make/data/cldr/common/main/ky.xml
index 8456fdfceef..f191826b26e 100644
--- a/make/data/cldr/common/main/ky.xml
+++ b/make/data/cldr/common/main/ky.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -66,6 +66,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			бугийче
 			блинче
 			каталонча
+			Чакма
 			чеченче
 			себуанча
 			чигача
@@ -102,9 +103,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			экажукча
 			грекче
 			англисче
-			англисче (УБ)
 			англисче (Америка Кошмо Штаттары)
-			англисче (АКШ)
 			эсперанто
 			испанча
 			испанча (Европа)
@@ -299,6 +298,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			пруссча
 			пуштуча
 			португалча
+			Бразилиялык Португал тили
 			португалча (Европа)
 			кечуача
 			кичече
@@ -409,8 +409,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			идишче
 			йорубача
 			кантончо
+			Кытайча, Кантондук
 			марокко тамазигт адабий тилинде
 			кытайча
+			Кытайча,Мандарин
 			кытайча (жөнөкөйлөштүрүлгөн)
 			кытайча (салттуу)
 			зулуча
@@ -728,7 +730,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Синт-Мартен
 			Сирия
 			Свазиленд
-			SZ
 			Тристан-да-Кунья
 			Түркс жана Кайкос аралдары
 			Чад
@@ -764,6 +765,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Уоллис жана Футуна
 			Самоа
+			Жасалма- Акцент
+			Жасалма - эки тараптуу
 			Косово
 			Йемен
 			Майотта
@@ -863,8 +866,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б г д е ё ж з и й к л м н ң о ө п р с т у ү х ч ш ъ ы э ю я]
 		[в ф ц щ ь]
 		[А Б В Г Д Е Ё Ж З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -878,13 +881,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1376,10 +1374,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						биздин заманга чейин
 						б.з.ч.
 						биздин заман
+						б.з.
 					
 					
 						б.з.ч.
+						б.з.ч.
 						б.з.
+						б.з.
 					
 					
 						б.з.ч.
@@ -2955,6 +2956,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Актобе
 			
+			
+				Костанай
+			
 			
 				Кызылорда
 			
@@ -5879,6 +5883,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кылым
 				{0} кылым
 			
+			
+				декадалар
+				{0} он жылдык
+				{0} он жылдык
+			
 			
 				жыл
 				{0} жыл
@@ -5996,6 +6005,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Британдык жылуулук бирдиги
 				{0} Британдык жылуулук бирдиги
 			
+			
+				терм АКШ
+				{0} терм АКШ
+				{0} терм АКШ
+			
 			
 				күч фунттары
 				{0}күч фунту
@@ -6235,11 +6249,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} аттын күчү
 				{0} аттын күчү
 			
-			
-				гектопаскаль
-				{0} гектопаскаль
-				{0} гектопаскаль
-			
 			
 				миллиметр сымап мамычасы
 				{0} миллиметр сымап мамычасы
@@ -6265,6 +6274,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфера
 				{0} атм
 			
+			
+				гектопаскаль
+				{0} гектопаскаль
+				{0} гектопаскаль
+			
 			
 				kPa
 				{0} kPa
@@ -6682,6 +6696,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к.
 				{0} к.
 			
+			
+				он жылдык
+				{0} он жылдык
+				{0} он жылдык
+			
 			
 				жыл
 				{0} ж.
@@ -6799,6 +6818,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				Терм АКШ
+				{0} терм АКШ
+				{0} терм АКШ
+			
 			
 				күч-фунттары
 				{0} lbf
@@ -7038,11 +7062,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} а.к.
 				{0} а.к.
 			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-			
 			
 				мм.с.м.
 				{0} мм.с. м.
@@ -7068,6 +7087,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атм
 				{0} атмс
 			
+			
+				гПа
+				{0} гПа
+				{0} гПа
+			
 			
 				kPa
 				{0} kPa
@@ -7439,10 +7463,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ат
 				{0} ат
 			
-			
-				{0} гПа
-				{0} гПа
-			
 			
 				{0} inHg
 				{0} inHg
@@ -7451,6 +7471,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мб
 				{0} мб
 			
+			
+				{0} гПа
+				{0} гПа
+			
 			
 				км/саат
 				{0} км/с
@@ -7517,12 +7541,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, же {1}
 			{0} же {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} жана {1}
-			{0} жана {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/ky_KG.xml b/make/data/cldr/common/main/ky_KG.xml
index 35f44371f08..ebd67bdfb8a 100644
--- a/make/data/cldr/common/main/ky_KG.xml
+++ b/make/data/cldr/common/main/ky_KG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lag.xml b/make/data/cldr/common/main/lag.xml
index 852640d16cd..3169e209921 100644
--- a/make/data/cldr/common/main/lag.xml
+++ b/make/data/cldr/common/main/lag.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molidóova
 			Bukíini
 			Visíiwa vya Marisháali
-			Masedónia
 			Máali
 			Miáama
 			Mongólia
diff --git a/make/data/cldr/common/main/lag_TZ.xml b/make/data/cldr/common/main/lag_TZ.xml
index 336ffe63ec1..12da312d37c 100644
--- a/make/data/cldr/common/main/lag_TZ.xml
+++ b/make/data/cldr/common/main/lag_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lb.xml b/make/data/cldr/common/main/lb.xml
index 3a1b1cfbcc4..6c672a0a5ee 100644
--- a/make/data/cldr/common/main/lb.xml
+++ b/make/data/cldr/common/main/lb.xml
@@ -10,7 +10,7 @@ terms of use, see http://www.unicode.org/copyright.html
 -->
 
 	
-		
+		
 		
 	
 	
@@ -165,7 +165,6 @@ terms of use, see http://www.unicode.org/copyright.html
 			Britescht Englesch
 			Englesch (UK)
 			Amerikanescht Englesch
-			Englesch (US)
 			Mëttelenglesch
 			Esperanto
 			Spuenesch
@@ -399,6 +398,7 @@ terms of use, see http://www.unicode.org/copyright.html
 			Norwegesch Bokmål
 			Nord-Ndebele-Sprooch
 			Nidderdäitsch
+			nds_NL
 			Nepalesesch
 			Newari
 			Ndonga
@@ -1203,8 +1203,8 @@ terms of use, see http://www.unicode.org/copyright.html
 		[a ä b c d e é ë f g h i j k l m n o p q r s t u v w x y z]
 		[á à ă â å ã ā æ ç è ĕ ê ē ğ í ì ĭ î ï İ ī ı ñ ó ò ŏ ô ö ø ō œ ş ß ú ù ŭ û ü ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0} …
 		… {0}
 		{0} … {1}
@@ -1351,6 +1351,7 @@ terms of use, see http://www.unicode.org/copyright.html
 						LLL
 						d. MMM
 						E, d. MMM
+						d. MMMM
 						y G
 						y G
 						M.y GGGGG
@@ -1359,6 +1360,7 @@ terms of use, see http://www.unicode.org/copyright.html
 						MMM y G
 						d. MMM y G
 						E, d. MMM y G
+						MMMM y G
 						QQQ y G
 						QQQQ y G
 					
@@ -1755,6 +1757,7 @@ terms of use, see http://www.unicode.org/copyright.html
 						LLL
 						d. MMM
 						E, d. MMM
+						d. MMMM
 						mm:ss
 						y
 						M.y
@@ -1763,6 +1766,7 @@ terms of use, see http://www.unicode.org/copyright.html
 						MMM y
 						d. MMM y
 						E, d. MMM y
+						MMMM y
 						QQQ y
 						QQQQ y
 					
@@ -5586,11 +5590,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} Päerdsstäerkt
 				{0} Päerdsstäerkten
 			
-			
-				hPa
-				{0} Hektopascal
-				{0} Hektopascal
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -5611,6 +5610,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} Millibar
 				{0} Millibar
 			
+			
+				hPa
+				{0} Hektopascal
+				{0} Hektopascal
+			
 			
 				Kilometer pro Stonn
 				{0} Kilometer pro Stonn
@@ -6195,11 +6199,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} PS
 				{0} PS
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6220,6 +6219,11 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -6591,10 +6595,6 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} PS
 				{0} PS
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} mm Hg
 				{0} mm Hg
@@ -6611,6 +6611,10 @@ terms of use, see http://www.unicode.org/copyright.html
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
diff --git a/make/data/cldr/common/main/lb_LU.xml b/make/data/cldr/common/main/lb_LU.xml
index 768e150f821..a7466bee18e 100644
--- a/make/data/cldr/common/main/lb_LU.xml
+++ b/make/data/cldr/common/main/lb_LU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lg.xml b/make/data/cldr/common/main/lg.xml
index d69155c3405..deacd535b29 100644
--- a/make/data/cldr/common/main/lg.xml
+++ b/make/data/cldr/common/main/lg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molodova
 			Madagasika
 			Bizinga bya Mariso
-			Masedoniya
 			Mali
 			Myanima
 			Mongoliya
diff --git a/make/data/cldr/common/main/lg_UG.xml b/make/data/cldr/common/main/lg_UG.xml
index 419873b6984..dce9434e883 100644
--- a/make/data/cldr/common/main/lg_UG.xml
+++ b/make/data/cldr/common/main/lg_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lkt.xml b/make/data/cldr/common/main/lkt.xml
index 61129f22972..b54bcc6da20 100644
--- a/make/data/cldr/common/main/lkt.xml
+++ b/make/data/cldr/common/main/lkt.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,8 +184,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á {aŋ} b č {čh} {čʼ} e é g ǧ h ȟ i í {iŋ} k {kh} {kȟ} {kʼ} l m n ŋ o ó p {ph} {pȟ} {pʼ} s š t {th} {tȟ} {tʼ} u ú {uŋ} w y z ž ʼ]
 		[c d f {ȟʼ} j q r {sʼ} {šʼ} v x]
 		[A B Č E G Ǧ H Ȟ I K L M N Ŋ O P S Š T U W Y Z Ž]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . " “ ” ( ) \[ \] @ * / \& #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . " “ ” ( ) \[ \] @ * / \& #]
 	
 	
 		
diff --git a/make/data/cldr/common/main/lkt_US.xml b/make/data/cldr/common/main/lkt_US.xml
index d187cbd72be..12ee0993fc6 100644
--- a/make/data/cldr/common/main/lkt_US.xml
+++ b/make/data/cldr/common/main/lkt_US.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ln.xml b/make/data/cldr/common/main/ln.xml
index 3649a5588fd..b3e93bb142a 100644
--- a/make/data/cldr/common/main/ln.xml
+++ b/make/data/cldr/common/main/ln.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -252,8 +252,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Sántu Martin
 			Madagasikari
 			Bisanga bya Marishalɛ
-			Masedwanɛ
-			Masedoni (RYYYK)
 			Malí
 			Birmanie
 			Mongolí
@@ -378,7 +376,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á â ǎ b c d e é ê ě ɛ {ɛ\u0301} {ɛ\u0302} {ɛ\u030C} f g {gb} h i í î ǐ k l m {mb} {mp} n {nd} {ng} {nk} {ns} {nt} {ny} {nz} o ó ô ǒ ɔ {ɔ\u0301} {ɔ\u0302} {ɔ\u030C} p r s t u ú v w y z]
 		[j q x]
 		[A B C D E Ɛ F G {Gb} H I K L M {Mb} {Mp} N {Nd} {Ng} {Nk} {Ns} {Nt} {Ny} {Nz} O Ɔ P R S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		?
 	
 	
diff --git a/make/data/cldr/common/main/ln_AO.xml b/make/data/cldr/common/main/ln_AO.xml
index a894b4f2193..89d44f8c7e8 100644
--- a/make/data/cldr/common/main/ln_AO.xml
+++ b/make/data/cldr/common/main/ln_AO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ln_CD.xml b/make/data/cldr/common/main/ln_CD.xml
index 2339986d7e8..f37ff1ea1cd 100644
--- a/make/data/cldr/common/main/ln_CD.xml
+++ b/make/data/cldr/common/main/ln_CD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ln_CF.xml b/make/data/cldr/common/main/ln_CF.xml
index bae93958ec7..c12fcad67eb 100644
--- a/make/data/cldr/common/main/ln_CF.xml
+++ b/make/data/cldr/common/main/ln_CF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ln_CG.xml b/make/data/cldr/common/main/ln_CG.xml
index ed435fa8aa1..102b3ca1f97 100644
--- a/make/data/cldr/common/main/ln_CG.xml
+++ b/make/data/cldr/common/main/ln_CG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lo.xml b/make/data/cldr/common/main/lo.xml
index da4e1abc657..97a47707583 100644
--- a/make/data/cldr/common/main/lo.xml
+++ b/make/data/cldr/common/main/lo.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -89,6 +89,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ຄາຣິບ
 			ຄາຢູກາ
 			ອາດແຊມ
+			Chakma
 			ຊີເຄນ
 			ຊີບູໂນ
 			ຊີກາ
@@ -534,14 +535,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ຢິວ
 			ໂຢຣູບາ
 			ກວາງຕຸ້ງ
+			ພາສາຈີນ, ຈີກວາງຕຸ້ງ
 			ຊວາງ
 			ຊາໂປແຕບ
 			ສັນຍາລັກບລີຊິມ
 			ເຊນາກາ
 			ໂມຣັອກແຄນ ທາມາຊີກ ມາດຕະຖານ
 			ຈີນ
+			ພາສາຈີນ, ພາສາຈີນກາງ
 			ຈີນແບບຮຽບງ່າຍ
+			ພາສາຈີນກາງ
 			ຈີນແບບດັ້ງເດີມ
+			ພາສາຈີນແມນດາຣິນດັ້ງເດີມ
 			ຊູລູ
 			ຊູນີ
 			ບໍ່ມີເນື້ອຫາພາສາ
@@ -812,7 +817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ໂດມີນິຄາ
 			ສາທາລະນະລັດ ໂດມິນິກັນ
 			ອັລຈິເຣຍ
-			ເຊວຕາ ແລະເມລິນລາ
+			ເຊວຕາ & ເມລິນລາ
 			ເອກວາດໍ
 			ເອສໂຕເນຍ
 			ອີຢິບ
@@ -900,8 +905,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ເຊນ ມາທິນ
 			ມາດາກາສະກາ
 			ຫມູ່ເກາະມາແຊວ
-			ແມຊິໂດເນຍ
-			ແມຊິໂດເນຍ (FYROM)
+			ແມຊິໂດເນຍເໜືອ
 			ມາລີ
 			ມຽນມາ (ເບີມາ)
 			ມອງໂກເລຍ
@@ -1011,6 +1015,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ວານົວຕູ
 			ວາລລິສ ແລະ ຟູຕູນາ
 			ຊາມົວ
+			Pseudo-Accents
+			Pseudo-Bidi
 			ໂຄໂຊໂວ
 			ເຢເມນ
 			ມາຢັອດ
@@ -1183,8 +1189,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			ເມທຣິກ
-			ອັງກິດ
-			ອາເມຣິກາ
+			ສະຫະລາດຊະອານາຈັກອັງກິດ
+			ສະຫະລັດອາເມລິກາ
 		
 		
 			{0}
@@ -1196,8 +1202,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u0EC8 \u0EC9 \u0ECA \u0ECB \u0ECC \u0ECD ໆ ກ ຂ ຄ ງ ຈ ສ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ຫ ໜ ໝ ອ ຮ ຯ ະ \u0EB1 າ ຳ \u0EB4 \u0EB5 \u0EB6 \u0EB7 \u0EB8 \u0EB9 \u0EBB \u0EBC ຽ ເ ແ ໂ ໃ ໄ]
 		[\u200B ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙]
 		[ກ ຂ ຄ ງ ຈ ສ ຊ ຍ ດ ຕ ຖ ທ ນ ບ ປ ຜ ຝ ພ ຟ ມ ຢ ຣ ລ ວ ຫ {ຫງ} {ຫຍ} {ຫນ} {ຫມ} {ຫລ} {ຫວ} ອ ຮ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1724,22 +1730,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG M/y – GGGGG M/y
 							GGGGG M/y – M/y
@@ -1751,6 +1744,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							GGGGG d/M/y – d/M/y
 							GGGGG d/M/y – d/M/y
 						
+						
+							E, d/M GGGGG y – E, d/M GGGGG y
+							E, d/M GGGGG y – E, d/M GGGGG y
+							E, d/M GGGGG y – E, d/M GGGGG y
+						
+						
+							d MMM G y– d MMM G y
+							d MMM – d MMM G y
+							d MMM G y– d MMM G y
+						
+						
+							E, d MMM – E, d MMM G y
+							E, d MMM G y – E, d MMM G y
+							E, d MMM – E, d MMM G y
+							E, d MMM G y – E, d MMM G y
+						
 						
 							h a – h a
 							h–h a
@@ -2067,10 +2076,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ກາງຄືນ
 						
 						
-							ທຄ
-							ກທ
-							ທ
-							ຫຼທ
+							ທ່ຽງຄືນ
+							ຕອນທ່ຽງ
 							ຕອນເຊົ້າ
 							ຕອນທ່ຽງ
 							ຕອນແລງ
@@ -2099,14 +2106,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							​ກາງ​ຄືນ
 						
 						
-							ທຄ
-							ກທ
 							ຕອນທ່ຽງ
-							ຫຼທ
-							ຊ
+							​ເຊົ້າ
 							ສ
-							ລ
-							ກຄ
+							ແລງ
+							​ກາງ​ຄືນ
 						
 						
 							ທ່ຽງຄືນ
@@ -2252,15 +2256,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
@@ -3125,9 +3120,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					ໃນ {0} ຕມ.
 				
-				
-					{0} ຕມ. ກ່ອນ
-				
 			
 			
 				ເດືອນ
@@ -3293,9 +3285,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ອາ. ແລ້ວ
-				ອາ. ນີ້
-				ອາ. ໜ້າ
 				
 					ໃນ {0} ວັນອາທິດ
 				
@@ -3326,9 +3315,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ຈ. ແລ້ວ
-				ຈ. ນີ້
-				ຈ. ໜ້າ
 				
 					ໃນ {0} ວັນຈັນ
 				
@@ -3392,9 +3378,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ພຸ. ແລ້ວ
-				ພຸ. ນີ້
-				ພຸ. ໜ້າ
 				
 					ໃນ {0} ວັນພຸດ
 				
@@ -3425,9 +3408,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ພຫ. ແລ້ວ
-				ພຫ. ນີ້
-				ພຫ. ໜ້າ
 				
 					ໃນ {0} ວັນພະຫັດ
 				
@@ -3458,9 +3438,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ສຸ. ແລ້ວ
-				ສຸ. ນີ້
-				ສຸ. ໜ້າ
 				
 					ໃນອີກ {0} ວັນສຸກ
 				
@@ -3491,9 +3468,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ສ. ແລ້ວ
-				ສ. ນີ້
-				ສ. ໜ້າ
 				
 					ໃນ {0} ວັນເສົາ
 				
@@ -3542,7 +3516,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ນາທີ
 				ນາທີນີ້
 				
-					{0} ໃນອີກ 0 ນາທີ
+					ໃນອີກ {0} ນາທີ
 				
 				
 					{0} ນາທີກ່ອນ
@@ -3903,7 +3877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ເອດມອນຕອນ
 			
 			
-				ສະວິວ ເຄີເຣນ
+				ສະວິຟ ເຄີເຣນ
 			
 			
 				ແຄມບຣິດ ເບ
@@ -4212,7 +4186,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ເກາະແມນ
 			
 			
-				ໂຄກາຕາ
+				ໂກລກາຕາ
 			
 			
 				ຊາໂກສ
@@ -4289,6 +4263,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ອັດໂທບີ
 			
+			
+				ຄອສຕາເນ
+			
 			
 				ໄຄຊີລໍດາ
 			
@@ -4392,7 +4369,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ເມົາຣິທຽສ
 			
 			
-				ມັລດີບ
+				ມັລດີຟ
 			
 			
 				ແບລນໄທຣ໌
@@ -4791,7 +4768,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ເມັດລາກັດລາ
 			
 			
-				ລອສ ແອນເຈລີສ
+				ລອສແອນເຈລີສ
 			
 			
 				ບອຍຊ໌
@@ -4940,9 +4917,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					ເວລາອະແລສກາ
-					ເວລາມາດຕະຖານອະແລສກາ
-					ເວລາກາງເວັນອະແລສກາ
+					ເວລາອະລັສກາ
+					ເວລາມາດຕະຖານອະລັສກາ
+					ເວລາກາງເວັນອະລັສກາ
 				
 			
 			
@@ -5479,7 +5456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					ເວລາມັນດີຟ
+					ເວລາມັລດີຟ
 				
 			
 			
@@ -6202,14 +6179,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				BYR
 			
 			
-				ໂດ​ລ່າ​ເບ​ລິ​ຊ
-				ໂດ​ລ່າ​ເບ​ລິ​ຊ
+				ໂດ​ລ່າ​ເບ​ລີຊ
+				ໂດ​ລ່າ​ເບ​ລີຊ
 				BZD
 				$
 			
 			
-				ໂດລ່າຄານາດາ
-				ໂດລ່າຄານາດາ
+				ໂດລ່າແຄນາດາ
+				ໂດລ່າແຄນາດາ
 				CA$
 				$
 			
@@ -6244,6 +6221,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ຢວນຈີນ (ນອກປະເທດ)
 				ຢວນຈີນ (ນອກປະເທດ)
+				CNH
 			
 			
 				ຈີນ ຢວນ
@@ -6254,6 +6232,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ໂຄ​ລົມ​ບຽນ ເປ​ໂຊ
 				ໂຄ​ລົມ​ບຽນ ເປ​ໂຊ
+				COP
 				$
 			
 			
@@ -6292,8 +6271,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ປອນ ໄຊປຣັດ
 			
 			
-				ໂຄ​ຣູ​ນາ ເຊກ
-				ໂຄ​ຣູ​ນາ ເຊກ
+				ເຊກ ໂຄ​ຣູ​ນາ
+				ເຊກ ໂຄ​ຣູ​ນາ
 				CZK
 				Kč
 			
@@ -6384,8 +6363,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ຟຣັງ ຝຣັ່ງ
 			
 			
-				ປອນ ສະ​ເຕີ​ຣິງ (ອັງ​ກິດ)
-				ປອນ ສະເຕີຣິງ (ອັງກິດ)
+				ອັງກິດ ປອນ
+				ອັງກິດ ປອນ
 				£
 				£
 			
@@ -6403,8 +6382,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ເຊດີ ການາ (1979–2007)
 			
 			
-				ເຊ​ດິ ກາ​ນາ​ອຽນ
-				ເຊ​ດິ ກາ​ນາ​ອຽນ
+				ກາ​ນາ​ອຽນ ເຊ​ດິ
+				ກາ​ນາ​ອຽນ ເຊ​ດິ
 				GHS
 			
 			
@@ -6797,8 +6776,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ກິລເດີ ເນເທີແລນ
 			
 			
-				ນໍ​ເວ​ກຽນ ​ໂຄຣນ
-				ນໍ​ເວ​ກຽນ ​ໂຄຣນ
+				ນໍ​ເວ​ຈຽນ ​ໂຄຣນ
+				ນໍ​ເວ​ຈຽນ ​ໂຄຣນ
 				NOK
 				kr
 			
@@ -6990,6 +6969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ເຊົາ ໂທ​ເມ ແອນ ພ​ຣິນ​ຊິ​ປີ ໂດບຣາ
 				ເຊົາ ໂທ​ເມ ແອນ ພ​ຣິນ​ຊິ​ປີ ໂດບຣາ
+				STN
 				Db
 			
 			
@@ -7056,8 +7036,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				TL
 			
 			
-				ທ​ຣິ​ນິ​ແດດ ແອນ ໂທ​ບາ​ໂກ ໂດ​ລ່າ
-				ທ​ຣິ​ນິ​ແດດ ແອນ ໂທ​ບາ​ໂກ ໂດ​ລ່າ
+				ທ​ຣິ​ນິ​ແດດ & ໂທ​ບາ​ໂກ ໂດ​ລ່າ
+				ທ​ຣິ​ນິ​ແດດ & ໂທ​ບາ​ໂກ ໂດ​ລ່າ
 				TTD
 				$
 			
@@ -7130,6 +7110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ເວ​ເນ​ຊູ​ເອ​ລັນ ໂບ​ລິ​ວາ
 				ເວ​ເນ​ຊູ​ເອ​ລັນ ໂບ​ລິ​ວາ
+				VES
 			
 			
 				ຫວຽດ​ນາມ ດົງ
@@ -7457,6 +7438,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ສັດຕະວັດ
 				{0} ສັດຕະວັດ
 			
+			
+				ທົດສະວັດ
+				{0} ທົດສະວັດ
+			
 			
 				ປີ
 				{0} ປີ
@@ -7517,20 +7502,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Ω
 			
 			
-				volt
-				{0} V
+				ໂວລ
+				{0} ໂວລ
 			
 			
-				kcal
-				{0} kcal
+				ກິໂລແຄລໍລີ່
+				{0} ກິໂລແຄລໍລີ່
 			
 			
-				cal
-				{0} cal
+				ແຄລໍລີ່
+				{0} ແຄລໍລີ່
 			
 			
-				Cal
-				{0} Cal
+				ແຄລໍລີ່
+				{0} ແຄລໍລີ່
 			
 			
 				kJ
@@ -7688,18 +7673,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} µg
 			
 			
-				tn
-				{0} tn
+				ໂຕນ
+				{0} ໂຕນ
 			
 			
 				ປອນ
 				{0} ປອນ
-				{0}/lb
+				{0}/ປອນ
 			
 			
-				ອອນ
-				{0} ອອນ
-				{0} ຕໍ່ ອອນ
+				ອອນສ
+				{0} ອອນສ
+				{0} ຕໍ່ ອອນສ
 			
 			
 				oz t
@@ -7745,10 +7730,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ແຮງມ້າ
 				{0} ແຮງມ້າ
 			
-			
-				hectopascals
-				{0} hectopascals
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7769,6 +7750,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atmospheres
 				{0} atmospheres
 			
+			
+				hectopascals
+				{0} hectopascals
+			
 			
 				ກິ​ໂລ​ປາ​ສ​ການ
 				{0} ກິ​ໂລ​ປາ​ສ​ການ
@@ -7790,8 +7775,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ໄມລ໌ຕໍ່ຊົ່ວໂມງ
 			
 			
-				knot
-				{0} knots
+				ນ໋ອດ
+				{0} ນ໋ອດ
 			
 			
 				°
@@ -7885,9 +7870,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ac ft
 			
 			
-				gal
-				{0} gal
-				{0} per gallon
+				ແກລລອນ
+				{0} ແກລລອນ
+				{0} ຕໍ່ແກລລອນ
 			
 			
 				ແກລລອນອັງກິດ
@@ -7910,10 +7895,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -8035,14 +8016,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ຕໍ່ພັນ
 				{0}‰
 			
-			
-				‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-			
 			
 				ລ/ກມ
 				{0} ລ/ກມ
@@ -8107,6 +8080,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				c
 				{0} c
 			
+			
+				ທົດສະວັດ
+				{0} ທົດສະວັດ
+			
 			
 				ປີ
 				{0} ປີ
@@ -8167,20 +8144,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Ω
 			
 			
-				volt
-				{0} V
+				ໂວລ
+				{0} ໂວລ
 			
 			
-				kcal
-				{0} kcal
+				ກິໂລແຄລໍລີ່
+				{0} ກິໂລແຄລໍລີ່
 			
 			
-				cal
-				{0} cal
+				ຄລ
+				{0} ຄລ
 			
 			
-				Cal
-				{0} Cal
+				ຄລ
+				{0} ຄລ
 			
 			
 				kJ
@@ -8194,22 +8171,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-			
 			
 				GHz
 				{0} GHz
@@ -8303,18 +8264,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ຈຸດ
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-			
 			
 				lux
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -8330,26 +8283,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/g
 			
 			
-				mg
-				{0} mg
+				ມກ
+				{0} ມກ
 			
 			
 				µg
 				{0} µg
 			
 			
-				tn
-				{0} tn
+				ຕ
+				{0} ຕ
 			
 			
 				ປອນ
 				{0} ປ
-				{0}/lb
+				{0}/ປ
 			
 			
-				ອອນ
+				ອອນສ
 				{0} ອ
-				{0}/oz
+				{0}/ອ
 			
 			
 				oz t
@@ -8359,18 +8312,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CD
 				{0} CD
 			
-			
-				Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -8395,10 +8336,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ແຮງມ້າ
 				{0} hp
 			
-			
-				hPA
-				{0} hPA
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8419,13 +8356,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				hPA
+				{0} hPA
 			
 			
 				ກມ/ຊມ
@@ -8459,17 +8392,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ອົງສາ ເຄ.
 				{0}°K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-			
 			
-				km³
-				{0} km³
+				ກມ³
+				{0} ກມ³
 			
 			
 				ມ³
@@ -8535,9 +8460,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ac ft
 			
 			
-				gal
-				{0} gal
-				{0}/gal
+				ແກລລອນ
+				{0} ແກລລອນ
+				{0}/ແກລລອນ
 			
 			
 				Imp. gal
@@ -8560,10 +8485,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -8572,10 +8493,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tsp
 				{0} tsp
 			
-			
-				bbl
-				{0} bbl
-			
 			
 				ທິດທາງ
 				{0}E
@@ -8720,10 +8637,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} hp
 			
-			
-				hPA
-				{0} hPA
-			
 			
 				in Hg
 				{0} in Hg
@@ -8732,9 +8645,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mbar
 				{0} mbar
 			
+			
+				hPA
+				{0} hPA
+			
 			
 				ກມ/ຊມ
-				{0} km/h
 			
 			
 				{0} m/s
@@ -8781,7 +8697,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0} ແລະ {1}
 		
@@ -8832,12 +8747,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} — ເບັດຕະເລັດ
 		{0} — ອື່ນໆ
 		ແບບຂຽນ — {0}
-		{0} ສະໂຕຣກ
+		{0} ຈັງຫວະ
 		ການເຄື່ອນໄຫວ
 		ແບບຂຽນອາຟຣິກັນ
 		ແບບຂຽນອາເມຣິກັນ
 		ສັດ
-		ສັດ ແລະ ທຳມະຊາດ
+		ສັດ ຫຼື ທຳມະຊາດ
 		ລູກສອນ
 		ຮ່າງກາຍ
 		ການແຕ້ມກ່ອງ
@@ -8890,7 +8805,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		ທຳມະຊາດ
 		ບໍ່ມີຍະຫວ່າງ
 		ຕົວເລກ
-		ອອບເຈັກ
+		ວັດຖຸ
 		ອື່ນໆ
 		ຈັບຄູ່ແລ້ວ
 		ຄົນ
@@ -8909,7 +8824,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		ຊ່ອງຫວ່າງ
 		ກິລາ
 		ສັນຍາລັກ
-		ສັນຍາລັກທາງເທັກນິກ
+		ສັນຍາລັກທາງເຕັກນິກ
 		ັວັນນະຍຸດ
 		ທ່ອງທ່ຽວ
 		ທ່ອງທ່ຽວ ແລະ ສະຖານທີ່ຕ່າງໆ
diff --git a/make/data/cldr/common/main/lo_LA.xml b/make/data/cldr/common/main/lo_LA.xml
index 3da7b0c47a9..b0fabb7320f 100644
--- a/make/data/cldr/common/main/lo_LA.xml
+++ b/make/data/cldr/common/main/lo_LA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lrc.xml b/make/data/cldr/common/main/lrc.xml
index 736e30b9778..853bb210d54 100644
--- a/make/data/cldr/common/main/lrc.xml
+++ b/make/data/cldr/common/main/lrc.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -347,8 +347,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u0659 \u065B آ أ ؤ ئ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ڤ ق ک گ ل م ن ھ ە و ۉ ۊ ی ؽ]
 		[\u200B\u200C\u200D\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0654 إ ة ك ه ى ي]
 		[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ھ و ی]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]
 	
 	
 		“
@@ -615,7 +615,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						BCE
+						BCE
 						CE
+						CE
 					
 				
 				
diff --git a/make/data/cldr/common/main/lrc_IQ.xml b/make/data/cldr/common/main/lrc_IQ.xml
index 5d30fe1c61a..b1665e4afa5 100644
--- a/make/data/cldr/common/main/lrc_IQ.xml
+++ b/make/data/cldr/common/main/lrc_IQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lrc_IR.xml b/make/data/cldr/common/main/lrc_IR.xml
index 3f00abc6b7f..3968677da8d 100644
--- a/make/data/cldr/common/main/lrc_IR.xml
+++ b/make/data/cldr/common/main/lrc_IR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lt.xml b/make/data/cldr/common/main/lt.xml
index aba9fbecf50..e2ed68fdc08 100644
--- a/make/data/cldr/common/main/lt.xml
+++ b/make/data/cldr/common/main/lt.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -166,9 +166,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Australijos anglų
 			Kanados anglų
 			Didžiosios Britanijos anglų
-			anglų (JK)
 			Jungtinių Valstijų anglų
-			anglų (JAV)
 			Vidurio Anglijos
 			esperanto
 			ispanų
@@ -625,6 +623,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jorubų
 			njengatu
 			kinų kalbos Kantono tarmė
+			kinų kalbos Kantono tarmė
 			chuang
 			zapotekų
 			BLISS simbolių
@@ -632,8 +631,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			zenaga
 			standartinė Maroko tamazigtų
 			kinų
+			kinų, mandarinų
 			supaprastintoji kinų
+			supaprastintoji mandarinų kinų
 			tradicinė kinų
+			tradicinė mandarinų kinų
 			zulų
 			Zuni
 			nėra kalbinio turinio
@@ -734,6 +736,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -1072,6 +1075,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Martenas
 			Sirija
 			Svazilandas
+			Svazilandas
 			Tristanas da Kunja
 			Terkso ir Kaikoso Salos
 			Čadas
@@ -1081,7 +1085,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tadžikija
 			Tokelau
 			Rytų Timoras
-			TL
 			Turkmėnistanas
 			Tunisas
 			Tonga
@@ -1108,8 +1111,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Volisas ir Futūna
 			Samoa
-			XA
-			XB
 			Kosovas
 			Jemenas
 			Majotas
@@ -1322,7 +1323,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[á à ã {ą\u0301} {ą\u0303} {ch} {dz} {dž} é è ẽ {ę\u0301} {ę\u0303} {ė\u0301} {ė\u0303} {i\u0307\u0301}í {i\u0307\u0300}ì {i\u0307\u0303}ĩ {į\u0301}{į\u0307\u0301} {į\u0303}{į\u0307\u0303} {j\u0303}{j\u0307\u0303} {l\u0303} {m\u0303} ñ ó ò õ q {r\u0303} ú ù ũ {ų\u0301} {ų\u0303} {ū\u0301} {ū\u0303} w x]
 		[A Ą B C Č D E Ę Ė F G H I Į Y J K L M N O P R S Š T U Ų Ū V Z Ž]
 		[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … “ „ ( ) \[ \] \{ \}]
+		[\- ‐ ‑ – — , ; \: ! ? . … “ „ ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1336,13 +1337,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1467,7 +1463,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}b
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
 					
 						
 							
@@ -1498,6 +1529,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							
 						
 					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1540,11 +1637,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						d, E
 						U
 						U MMM
 						U MMM d
 						U MMM d, E
+						L
+						MM-dd
+						MM-dd, E
+						LLL
+						MMM d
+						MMM d, E
 						U
 						y-MM-dd
 						U
@@ -1558,6 +1683,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						U QQQQ
 					
 					
+						
+							d–d
+						
+						
+							MM–MM
+						
 						
 							MM-dd–MM-dd
 							MM-dd–MM-dd
@@ -1566,13 +1697,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							MM-dd, E–MM-dd, E
 							MM-dd, E–MM-dd, E
 						
+						
+							LLL–LLL
+						
 						
+							MMM d–d
 							MMM d–MMM d
 						
 						
 							MMM d, E–MMM d, E
 							MMM d, E–MMM d, E
 						
+						
+							U–U
+						
 						
 							y-MM–y-MM
 							y-MM–y-MM
@@ -1588,9 +1726,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							y-MM-dd, E–y-MM-dd, E
 						
 						
+							U MMM–MMM
 							U MMM–U MMM
 						
 						
+							U MMM d–d
 							U MMM d–MMM d
 							U MMM d–U MMM d
 						
@@ -1600,6 +1740,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							U MMM d, E–U MMM d, E
 						
 						
+							U MMMM–MMMM
 							U MMMM–U MMMM
 						
 					
@@ -1734,6 +1875,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1
 							2
@@ -1764,6 +1919,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1
 							2
@@ -1780,7 +1949,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}b
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
 					
 						
 							
@@ -1811,6 +2015,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							
 						
 					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1853,11 +2123,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						d, E
 						U
 						U MMM
 						U MMM d
 						U MMM d, E
+						L
+						MM-dd
+						MM-dd, E
+						LLL
+						MMM d
+						MMM d, E
 						U
 						y-MM-dd
 						U
@@ -1871,6 +2169,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						U QQQQ
 					
 					
+						
+							d–d
+						
+						
+							MM–MM
+						
 						
 							MM-dd–MM-dd
 							MM-dd–MM-dd
@@ -1879,13 +2183,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							MM-dd, E–MM-dd, E
 							MM-dd, E–MM-dd, E
 						
+						
+							LLL–LLL
+						
 						
+							MMM d–d
 							MMM d–MMM d
 						
 						
 							MMM d, E–MMM d, E
 							MMM d, E–MMM d, E
 						
+						
+							U–U
+						
 						
 							y-MM–y-MM
 							y-MM–y-MM
@@ -1901,9 +2212,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							y-MM-dd, E–y-MM-dd, E
 						
 						
+							U MMM–MMM
 							U MMM–U MMM
 						
 						
+							U MMM d–d
 							U MMM d–MMM d
 							U MMM d–U MMM d
 						
@@ -1913,6 +2226,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							U MMM d, E–U MMM d, E
 						
 						
+							U MMMM–MMMM
 							U MMMM–U MMMM
 						
 					
@@ -2030,6 +2344,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						ERA0
+					
+					
+						ERA0
+					
+				
+			
 			
 				
 					
@@ -2120,67 +2444,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							hh:mm a–hh:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
 						
 							hh:mm a–hh:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M–M
@@ -3180,12 +3477,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						Taika (645–650)
 						Hakuči (650–671)
 						Hakuho (672–686)
 						Šučo (686–701)
 						Taiho (701–704)
+						Keiun (704–708)
 						Vado (708–715)
+						Reiki (715–717)
 						Joro (717–724)
+						Jinki (724–729)
 						Tempio (729–749)
 						Tempio-kampo (749–749)
 						Tempio-šoho (749–757)
@@ -3200,6 +3501,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Tenčo (824–834)
 						Šova (834–848)
 						Kajo (848–851)
+						Ninju (851–854)
 						Saiko (854–857)
 						Tenan (857–859)
 						Jogan (859–877)
@@ -3207,17 +3509,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Ninja (885–889)
 						Kampjo (889–898)
 						Šotai (898–901)
+						Engi (901–923)
 						Enčo (923–931)
 						Šohei (931–938)
 						Tengjo (938–947)
 						Tenriaku (947–957)
+						Tentoku (957–961)
 						Ova (961–964)
 						Koho (964–968)
 						Ana (968–970)
+						Tenroku (970–973)
 						Ten-en (973–976)
 						Jogen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
 						Kana (985–987)
 						Ei-en (987–989)
+						Eiso (989–990)
 						Šorjaku (990–995)
 						Čotoku (995–999)
 						Čoho (999–1004)
@@ -3229,7 +3537,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Čogen (1028–1037)
 						Čorjaku (1037–1040)
 						Čokju (1040–1044)
+						Kantoku (1044–1046)
 						Eišo (1046–1053)
+						Tengi (1053–1058)
 						Kohei (1058–1065)
 						Džirjaku (1065–1069)
 						Enkju (1069–1074)
@@ -3245,6 +3555,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Čodži (1104–1106)
 						Kašo (1106–1108)
 						Tenin (1108–1110)
+						Ten-ei (1110–1113)
 						Eikju (1113–1118)
 						Gen-ei (1118–1120)
 						Hoan (1120–1124)
@@ -3257,15 +3568,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Kodži (1142–1144)
 						Tenjo (1144–1145)
 						Kjuan (1145–1151)
+						Ninpei (1151–1154)
 						Kjuju (1154–1156)
 						Hogen (1156–1159)
 						Heidži (1159–1160)
 						Eirjaku (1160–1161)
 						Oho (1161–1163)
 						Čokan (1163–1165)
+						Eiman (1165–1166)
 						Nin-an (1166–1169)
 						Kao (1169–1171)
 						Šoan (1171–1175)
+						Angen (1175–1177)
 						Džišo (1177–1181)
 						Jova (1181–1182)
 						Džuei (1182–1184)
@@ -3282,12 +3596,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Šokju (1219–1222)
 						Džu (1222–1224)
 						Genin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
 						Džoei (1232–1233)
 						Tempuku (1233–1234)
 						Bunrjaku (1234–1235)
+						Katei (1235–1238)
 						Rjakunin (1238–1239)
 						En-o (1239–1240)
 						Nindži (1240–1243)
+						Kangen (1243–1247)
 						Hodži (1247–1249)
 						Kenčo (1249–1256)
 						Kogen (1256–1257)
@@ -3299,7 +3618,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Kendži (1275–1278)
 						Koan (1278–1288)
 						Šu (1288–1293)
+						Einin (1293–1299)
 						Šoan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
 						Tokudži (1306–1308)
 						Enkei (1308–1311)
 						Očo (1311–1312)
@@ -3309,19 +3631,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Dženkjo (1321–1324)
 						Šoču (1324–1326)
 						Kareki (1326–1329)
+						Gentoku (1329–1331)
 						Genko (1331–1334)
 						Kemu (1334–1336)
+						Engen (1336–1340)
 						Kokoku (1340–1346)
 						Šohei (1346–1370)
+						Kentoku (1370–1372)
 						Bunču (1372–1375)
 						Tendžu (1375–1379)
 						Korjaku (1379–1381)
 						Kova (1381–1384)
 						Genču (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
 						Ku (1389–1390)
+						Meitoku (1390–1394)
 						Oei (1394–1428)
 						Šočo (1428–1429)
 						Eikjo (1429–1441)
+						Kakitsu (1441–1444)
 						Bun-an (1444–1449)
 						Hotoku (1449–1452)
 						Kjotoku (1452–1455)
@@ -3330,35 +3659,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Kanšo (1460–1466)
 						Bunšo (1466–1467)
 						Onin (1467–1469)
+						Bunmei (1469–1487)
 						Čokjo (1487–1489)
+						Entoku (1489–1492)
 						Meio (1492–1501)
+						Bunki (1501–1504)
 						Eišo (1504–1521)
+						Taiei (1521–1528)
 						Kjoroku (1528–1532)
 						Tenmon (1532–1555)
 						Kodži (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
 						Tenšo (1573–1592)
+						Bunroku (1592–1596)
 						Keičo (1596–1615)
 						Genva (1615–1624)
 						Kan-ei (1624–1644)
 						Šoho (1644–1648)
+						Keian (1648–1652)
 						Šu (1652–1655)
 						Meirjaku (1655–1658)
 						Mandži (1658–1661)
+						Kanbun (1661–1673)
 						Enpo (1673–1681)
 						Tenva (1681–1684)
 						Džokjo (1684–1688)
+						Genroku (1688–1704)
 						Hoei (1704–1711)
 						Šotoku (1711–1716)
 						Kjoho (1716–1736)
+						Genbun (1736–1741)
 						Kanpo (1741–1744)
 						Enkjo (1744–1748)
 						Kan-en (1748–1751)
 						Horjaku (1751–1764)
 						Meiva (1764–1772)
 						An-ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
 						Kjova (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
 						Tenpo (1830–1844)
 						Koka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
 						Man-en (1860–1861)
 						Bunkju (1861–1864)
 						Gendži (1864–1865)
@@ -3366,6 +3712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Meidži
 						Taišo
 						Šova
+						Heisei
 					
 				
 			
@@ -3519,9 +3866,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				m.
-				praėjusiais metais
-				šiais metais
-				kitais metais
+				praėjusiais metais
+				šiais metais
+				kitais metais
 				
 					po {0} m.
 					po {0} m.
@@ -3537,9 +3884,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				m.
-				praėjusiais metais
-				šiais metais
-				kitais metais
+				praėjusiais metais
+				šiais metais
+				kitais metais
 				
 					po {0} m.
 					po {0} m.
@@ -3621,9 +3968,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mėn.
-				praėjusį mėnesį
-				šį mėnesį
-				kitą mėnesį
+				praėjusį mėnesį
+				šį mėnesį
+				kitą mėnesį
 				
 					po {0} mėn.
 					po {0} mėn.
@@ -3639,9 +3986,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mėn.
-				praėjusį mėnesį
-				šį mėnesį
-				kitą mėnesį
+				praėjusį mėnesį
+				šį mėnesį
+				kitą mėnesį
 				
 					po {0} mėn.
 					po {0} mėn.
@@ -3676,9 +4023,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sav.
-				praėjusią savaitę
-				šią savaitę
-				kitą savaitę
+				praėjusią savaitę
+				šią savaitę
+				kitą savaitę
 				
 					po {0} sav.
 					po {0} sav.
@@ -3695,9 +4042,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sav.
-				praėjusią savaitę
-				šią savaitę
-				kitą savaitę
+				praėjusią savaitę
+				šią savaitę
+				kitą savaitę
 				
 					po {0} sav.
 					po {0} sav.
@@ -3744,9 +4091,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				d.
 				užvakar
-				vakar
-				šiandien
-				rytoj
+				vakar
+				šiandien
+				rytoj
 				poryt
 				
 					po {0} d.
@@ -3764,9 +4111,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				d.
 				užvakar
-				vakar
-				šiandien
-				rytoj
+				vakar
+				šiandien
+				rytoj
 				poryt
 				
 					po {0} d.
@@ -6590,6 +6937,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			latn
 		
@@ -6597,7 +6945,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			,
 			 
+			;
 			%
+			+
 			−
 			×10^
 			×
@@ -6607,6 +6957,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tūkstantis
@@ -6806,6 +7161,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				JAE dirhamai
 				JAE dirhamo
 				JAE dirhamų
+				AED
 			
 			
 				Afganistano afganis (1927–2002)
@@ -6820,6 +7176,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afganistano afganiai
 				Afganistano afganio
 				Afganistano afganių
+				AFN
 			
 			
 				Albanijos lekas (1946–1965)
@@ -6834,6 +7191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Albanijos lekai
 				Albanijos leko
 				Albanijos lekų
+				ALL
 			
 			
 				Armėnijos dramas
@@ -6841,6 +7199,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Armėnijos dramai
 				Armėnijos dramo
 				Armėnijos dramų
+				AMD
 			
 			
 				Olandijos Antilų guldenas
@@ -6848,6 +7207,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Olandijos Antilų guldenai
 				Olandijos Antilų guldeno
 				Olandijos Antilų guldenų
+				ANG
 			
 			
 				Angolos kvanza
@@ -6855,6 +7215,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Angolos kvanzos
 				Angolos kvanzos
 				Angolos kvanzų
+				AOA
 				Kz
 			
 			
@@ -6912,6 +7273,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Argentinos pesai
 				Argentinos peso
 				Argentinos pesų
+				ARS
 				$
 			
 			
@@ -6936,6 +7298,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Arubos guldenai
 				Arubos guldeno
 				Arubos guldenų
+				AWG
 			
 			
 				Azerbaidžano manatas (1993–2006)
@@ -6950,6 +7313,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Azerbaidžano manatai
 				Azerbaidžano manato
 				Azerbaidžano manatų
+				AZN
 			
 			
 				Bosnijos ir Hercegovinos dinaras (1992–1994)
@@ -6964,6 +7328,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bosnijos ir Hercegovinos konvertuojamosios markės
 				Bosnijos ir Hercegovinos konvertuojamosios markės
 				Bosnijos ir Hercegovinos konvertuojamųjų markių
+				BAM
 				KM
 			
 			
@@ -6979,6 +7344,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Barbadoso doleriai
 				Barbadoso dolerio
 				Barbadoso dolerių
+				BBD
 				$
 			
 			
@@ -6987,6 +7353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bangladešo takos
 				Bangladešo takos
 				Bangladešo takų
+				BDT
 				BDT
 			
 			
@@ -7030,6 +7397,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bulgarijos levai
 				Bulgarijos levo
 				Bulgarijos levų
+				BGN
 			
 			
 				Bulgarijos levas (1879–1952)
@@ -7044,6 +7412,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahreino dinarai
 				Bahreino dinaro
 				Bahreino dinarų
+				BHD
 			
 			
 				Burundžio frankas
@@ -7051,6 +7420,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Burundžio frankai
 				Burundžio franko
 				Burundžio frankų
+				BIF
 			
 			
 				Bermudos doleris
@@ -7058,6 +7428,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bermudos doleriai
 				Bermudos dolerio
 				Bermudos dolerių
+				BMD
 				$
 			
 			
@@ -7066,6 +7437,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Brunėjaus doleriai
 				Brunėjaus dolerio
 				Brunėjaus dolerių
+				BND
 				$
 			
 			
@@ -7074,6 +7446,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolivijos bolivijanai
 				Bolivijos bolivijano
 				Bolivijos bolivijanų
+				BOB
 				Bs
 			
 			
@@ -7154,6 +7527,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahamų doleriai
 				Bahamų dolerio
 				Bahamų dolerių
+				BSD
 				$
 			
 			
@@ -7162,6 +7536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Butano ngultrumai
 				Butano ngultrumo
 				Butano ngultrumų
+				BTN
 			
 			
 				Birmos kijatas
@@ -7176,6 +7551,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Botsvanos pulos
 				Botsvanos pulos
 				Botsvanos pulų
+				BWP
 				P
 			
 			
@@ -7191,6 +7567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Baltarusijos rubliai
 				Baltarusijos rublio
 				Baltarusijos rublių
+				BYN
 				Br
 			
 			
@@ -7199,6 +7576,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Baltarusijos rubliai (2000–2016)
 				Baltarusijos rublio (2000–2016)
 				Baltarusijos rublių (2000–2016)
+				BYR
 			
 			
 				Belizo doleris
@@ -7206,6 +7584,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Belizo doleriai
 				Belizo dolerio
 				Belizo dolerių
+				BZD
 				$
 			
 			
@@ -7223,6 +7602,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kongo frankai
 				Kongo franko
 				Kongo frankų
+				CDF
 			
 			
 				WIR eurai
@@ -7237,6 +7617,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Šveicarijos frankai
 				Šveicarijos franko
 				Šveicarijos frankų
+				CHF
 			
 			
 				WIR frankas
@@ -7265,6 +7646,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Čilės pesai
 				Čilės peso
 				Čilės pesų
+				CLP
 				$
 			
 			
@@ -7297,6 +7679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kolumbijos pesai
 				Kolumbijos peso
 				Kolumbijos pesų
+				COP
 				$
 			
 			
@@ -7312,6 +7695,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kosta Rikos kolonai
 				Kosta Rikos kolono
 				Kosta Rikos kolonų
+				CRC
 				₡
 			
 			
@@ -7334,6 +7718,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kubos konvertuojamieji pesai
 				Kubos konvertuojamojo peso
 				Kubos konvertuojamųjų pesų
+				CUC
 				$
 			
 			
@@ -7342,6 +7727,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kubos pesai
 				Kubos peso
 				Kubos pesų
+				CUP
 				$
 			
 			
@@ -7350,6 +7736,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Žaliojo Kyšulio eskudai
 				Žaliojo Kyšulio eskudo
 				Žaliojo Kyšulio eskudų
+				CVE
 			
 			
 				Kipro svaras
@@ -7364,6 +7751,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Čekijos kronos
 				Čekijos kronos
 				Čekijos kronų
+				CZK
 				Kč
 			
 			
@@ -7386,6 +7774,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Džibučio frankai
 				Džibučio franko
 				Džibučio frankų
+				DJF
 			
 			
 				Danijos krona
@@ -7393,6 +7782,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Danijos kronos
 				Danijos kronos
 				Danijos kronų
+				DKK
 				kr
 			
 			
@@ -7401,6 +7791,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dominikos pesai
 				Dominikos peso
 				Dominikos pesų
+				DOP
 				$
 			
 			
@@ -7409,6 +7800,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Alžyro dinarai
 				Alžyro dinaro
 				Alžyro dinarų
+				DZD
 			
 			
 				Ekvadoro sukrė
@@ -7437,6 +7829,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Egipto svarai
 				Egipto svaro
 				Egipto svarų
+				EGP
 				E£
 			
 			
@@ -7445,6 +7838,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Eritrėjos nakfos
 				Eritrėjos nakfos
 				Eritrėjos nakfų
+				ERN
 			
 			
 				Ispanų pesetai (A sąskaita)
@@ -7473,6 +7867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Etiopijos birai
 				Etiopijos biro
 				Etiopijos birų
+				ETB
 			
 			
 				Euras
@@ -7496,6 +7891,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fidžio doleriai
 				Fidžio dolerio
 				Fidžio dolerių
+				FJD
 				$
 			
 			
@@ -7504,6 +7900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Falklando salų svarai
 				Falklando salų svaro
 				Falklando salų svarų
+				FKP
 				£
 			
 			
@@ -7535,6 +7932,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gruzijos lariai
 				Gruzijos lario
 				Gruzijos larių
+				GEL
 				₾
 				₾
 			
@@ -7551,6 +7949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ganos sedžiai
 				Ganos sedžio
 				Ganos sedžių
+				GHS
 			
 			
 				Gibraltaro svaras
@@ -7558,6 +7957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gibraltaro svarai
 				Gibraltaro svaro
 				Gibraltaro svarų
+				GIP
 				£
 			
 			
@@ -7566,6 +7966,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gambijos dalasiai
 				Gambijos dalasio
 				Gambijos dalasių
+				GMD
 			
 			
 				Gvinėjos frankas
@@ -7573,6 +7974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gvinėjos frankai
 				Gvinėjos franko
 				Gvinėjos frankų
+				GNF
 				FG
 			
 			
@@ -7602,6 +8004,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gvatemalos ketcaliai
 				Gvatemalos ketcalio
 				Gvatemalos ketcalių
+				GTQ
 				Q
 			
 			
@@ -7624,6 +8027,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gajanos doleriai
 				Gajanos dolerio
 				Gajanos dolerių
+				GYD
 				$
 			
 			
@@ -7641,6 +8045,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hondūro lempiros
 				Hondūro lempiros
 				Hondūro lempirų
+				HNL
 				L
 			
 			
@@ -7656,6 +8061,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kroatijos kunos
 				Kroatijos kunos
 				Kroatijos kunų
+				HRK
 				kn
 			
 			
@@ -7664,6 +8070,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Haičio gurdai
 				Haičio gurdo
 				Haičio gurdų
+				HTG
 			
 			
 				Vengrijos forintas
@@ -7671,6 +8078,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vengrijos forintai
 				Vengrijos forinto
 				Vengrijos forintų
+				HUF
 				Ft
 			
 			
@@ -7679,6 +8087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Indonezijos rupijos
 				Indonezijos rupijos
 				Indonezijos rupijų
+				IDR
 				Rp
 			
 			
@@ -7726,6 +8135,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Irako dinarai
 				Irako dinaro
 				Irako dinarų
+				IQD
 			
 			
 				Irano rialas
@@ -7733,6 +8143,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Irano rialai
 				Irano rialo
 				Irano rialų
+				IRR
 			
 			
 				Islandijos krona (1918–1981)
@@ -7747,6 +8158,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Islandijos kronos
 				Islandijos kronos
 				Islandijos kronų
+				ISK
 				kr
 			
 			
@@ -7762,6 +8174,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jamaikos doleriai
 				Jamaikos dolerio
 				Jamaikos dolerių
+				JMD
 				$
 			
 			
@@ -7770,6 +8183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jordanijos dinarai
 				Jordanijos dinaro
 				Jordanijos dinarų
+				JOD
 			
 			
 				Japonijos jena
@@ -7786,6 +8200,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kenijos šilingai
 				Kenijos šilingo
 				Kenijos šilingų
+				KES
 			
 			
 				Kirgizijos somas
@@ -7793,6 +8208,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kirgizijos somai
 				Kirgizijos somo
 				Kirgizijos somų
+				KGS
 			
 			
 				Kambodžos rielis
@@ -7800,6 +8216,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kambodžos rieliai
 				Kambodžos rielio
 				Kambodžos rielių
+				KHR
 				KHR
 			
 			
@@ -7808,6 +8225,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Komoro frankai
 				Komoro franko
 				Komoro frankų
+				KMF
 				CF
 			
 			
@@ -7816,6 +8234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Šiaurės Korėjos vonai
 				Šiaurės Korėjos vono
 				Šiaurės Korėjos vonų
+				KPW
 				₩
 			
 			
@@ -7847,6 +8266,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuveito dinarai
 				Kuveito dinaro
 				Kuveito dinarų
+				KWD
 			
 			
 				Kaimanų salų doleris
@@ -7854,6 +8274,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kaimanų salų doleriai
 				Kaimanų salų dolerio
 				Kaimanų salų dolerių
+				KYD
 				$
 			
 			
@@ -7862,6 +8283,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kazachstano tengės
 				Kazachstano tengės
 				Kazachstano tengių
+				KZT
 				₸
 			
 			
@@ -7870,6 +8292,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Laoso kipai
 				Laoso kipo
 				Laoso kipų
+				LAK
 				LAK
 			
 			
@@ -7878,6 +8301,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libano svarai
 				Libano svaro
 				Libano svarų
+				LBP
 				L£
 			
 			
@@ -7886,6 +8310,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Šri Lankos rupijos
 				Šri Lankos rupijos
 				Šri Lankos rupijų
+				LKR
 				Rs
 			
 			
@@ -7894,6 +8319,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Liberijos doleriai
 				Liberijos dolerio
 				Liberijos dolerių
+				LRD
 				$
 			
 			
@@ -7909,6 +8335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lietuvos litai
 				Lietuvos lito
 				Lietuvos litų
+				LTL
 			
 			
 				Lietuvos talonas
@@ -7944,6 +8371,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Latvijos latai
 				Latvijos lato
 				Latvijos latų
+				LVL
 			
 			
 				Latvijos rublis
@@ -7958,6 +8386,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libijos dinarai
 				Libijos dinaro
 				Libijos dinarų
+				LYD
 			
 			
 				Maroko dirhamas
@@ -7965,6 +8394,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maroko dirhamai
 				Maroko dirhamo
 				Maroko dirhamų
+				MAD
 			
 			
 				Maroko frankas
@@ -7993,6 +8423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Moldovos lėjos
 				Moldovos lėjos
 				Moldovos lėjų
+				MDL
 			
 			
 				Madagaskaro ariaris
@@ -8000,6 +8431,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Madagaskaro ariariai
 				Madagaskaro ariario
 				Madagaskaro ariarių
+				MGA
 				Ar
 			
 			
@@ -8015,6 +8447,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makedonijos denarai
 				Makedonijos denaro
 				Makedonijos denarų
+				MKD
 			
 			
 				Makedonijos denaras (1992–1993)
@@ -8036,6 +8469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mianmaro kijatai
 				Mianmaro kijato
 				Mianmaro kijatų
+				MMK
 				K
 			
 			
@@ -8044,6 +8478,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mongolijos tugrikai
 				Mongolijos tugriko
 				Mongolijos tugrikų
+				MNT
 				MNT
 			
 			
@@ -8052,6 +8487,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makao patakos
 				Makao patakos
 				Makao patakų
+				MOP
 			
 			
 				Mauritanijos ugija (1973–2017)
@@ -8059,6 +8495,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mauritanijos ugijos (1973–2017)
 				Mauritanijos ugijos (1973–2017)
 				Mauritanijos ugijų (1973–2017)
+				MRO
 			
 			
 				Mauritanijos ugija
@@ -8088,6 +8525,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mauricijaus rupijos
 				Mauricijaus rupijos
 				Mauricijaus rupijų
+				MUR
 				Rs
 			
 			
@@ -8103,6 +8541,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maldyvų rufijos
 				Maldyvų rufijos
 				Maldyvų rufijų
+				MVR
 			
 			
 				Malavio kvača
@@ -8110,6 +8549,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malavio kvačos
 				Malavio kvačos
 				Malavio kvačų
+				MWK
 			
 			
 				Meksikos pesas
@@ -8140,6 +8580,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malaizijos ringitai
 				Malaizijos ringito
 				Malaizijos ringitų
+				MYR
 				RM
 			
 			
@@ -8162,6 +8603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mozambiko metikaliai
 				Mozambiko metikalio
 				Mozambiko metikalių
+				MZN
 			
 			
 				Namibijos doleris
@@ -8169,6 +8611,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Namibijos doleriai
 				Namibijos dolerio
 				Namibijos dolerių
+				NAD
 				$
 			
 			
@@ -8177,6 +8620,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nigerijos nairos
 				Nigerijos nairos
 				Nigerijos nairų
+				NGN
 				₦
 			
 			
@@ -8192,6 +8636,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nikaragvos kordobos
 				Nikaragvos kordobos
 				Nikaragvos kordobų
+				NIO
 				C$
 			
 			
@@ -8207,6 +8652,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Norvegijos kronos
 				Norvegijos kronos
 				Norvegijos kronų
+				NOK
 				kr
 			
 			
@@ -8215,6 +8661,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nepalo rupijos
 				Nepalo rupijos
 				Nepalo rupijų
+				NPR
 				Rs
 			
 			
@@ -8232,6 +8679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Omano rialai
 				Omano rialo
 				Omano rialų
+				OMR
 			
 			
 				Panamos balboja
@@ -8239,6 +8687,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Panamos balbojos
 				Panamos balbojos
 				Panamos balbojų
+				PAB
 			
 			
 				Peru intis
@@ -8253,6 +8702,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peru soliai
 				Peru solio
 				Peru solių
+				PEN
 			
 			
 				Peru solis (1863–1965)
@@ -8267,6 +8717,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Papua Naujosios Gvinėjos kinos
 				Papua Naujosios Gvinėjos kinos
 				Papua Naujosios Gvinėjos kinų
+				PGK
 			
 			
 				Filipinų pesas
@@ -8274,6 +8725,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Filipinų pesai
 				Filipinų peso
 				Filipinų pesų
+				PHP
 				₱
 			
 			
@@ -8282,6 +8734,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pakistano rupijos
 				Pakistano rupijos
 				Pakistano rupijų
+				PKR
 				Rs
 			
 			
@@ -8290,6 +8743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lenkijos zlotai
 				Lenkijos zloto
 				Lenkijos zlotų
+				PLN
 				zl
 			
 			
@@ -8312,6 +8766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Paragvajaus guaraniai
 				Paragvajaus guaranio
 				Paragvajaus guaranių
+				PYG
 				Gs
 			
 			
@@ -8320,6 +8775,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kataro rialai
 				Kataro rialo
 				Kataro rialų
+				QAR
 			
 			
 				Rodezijos doleris
@@ -8341,6 +8797,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rumunijos lėjos
 				Rumunijos lėjos
 				Rumunijos lėjų
+				RON
 				lei
 			
 			
@@ -8349,6 +8806,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Serbijos dinarai
 				Serbijos dinaro
 				Serbijos dinarų
+				RSD
 			
 			
 				Rusijos rublis
@@ -8356,6 +8814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rusijos rubliai
 				Rusijos rublio
 				Rusijos rublių
+				RUB
 				rb
 				₽
 			
@@ -8372,6 +8831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ruandos frankai
 				Ruandos franko
 				Ruandos frankų
+				RWF
 				RF
 			
 			
@@ -8380,6 +8840,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Saudo Arabijos rijalai
 				Saudo Arabijos rijalo
 				Saudo Arabijos rijalų
+				SAR
 			
 			
 				Saliamono salų doleris
@@ -8387,6 +8848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Saliamono salų doleriai
 				Saliamono salų dolerio
 				Saliamono salų dolerių
+				SBD
 				$
 			
 			
@@ -8395,6 +8857,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Seišelių rupijos
 				Seišelių rupijos
 				Seišelių rupijų
+				SCR
 			
 			
 				Sudano dinaras (1992–2007)
@@ -8409,6 +8872,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sudano svarai
 				Sudano svaro
 				Sudano svarų
+				SDG
 			
 			
 				Sudano svaras (1957–1998)
@@ -8423,6 +8887,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Švedijos kronos
 				Švedijos kronos
 				Švedijos kronų
+				SEK
 				kr
 			
 			
@@ -8431,6 +8896,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Singapūro doleriai
 				Singapūro dolerio
 				Singapūro dolerių
+				SGD
 				$
 			
 			
@@ -8439,6 +8905,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Šv. Elenos salų svarai
 				Šv. Elenos salų svaro
 				Šv. Elenos salų svarų
+				SHP
 				£
 			
 			
@@ -8461,6 +8928,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Siera Leonės leonės
 				Siera Leonės leonės
 				Siera Leonės leonių
+				SLL
 			
 			
 				Somalio šilingas
@@ -8468,6 +8936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Somalio šilingai
 				Somalio šilingo
 				Somalio šilingų
+				SOS
 			
 			
 				Surimano doleris
@@ -8475,6 +8944,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Surimano doleriai
 				Surimano dolerio
 				Surimano dolerių
+				SRD
 				$
 			
 			
@@ -8490,6 +8960,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pietų Sudano svarai
 				Pietų Sudano svaro
 				Pietų Sudano svarų
+				SSP
 				£
 			
 			
@@ -8498,6 +8969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				San Tomės ir Principės dobros (1977–2017)
 				San Tomės ir Principės dobros (1977–2017)
 				Sao Tomės ir Principės dobrų (1977–2017)
+				STD
 			
 			
 				San Tomės ir Principės dobra
@@ -8528,6 +9000,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sirijos svarai
 				Sirijos svaro
 				Sirijos svarų
+				SYP
 				£
 			
 			
@@ -8536,6 +9009,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Svazilando lilangeniai
 				Svazilendo lilangenio
 				Svazilendo lilangenių
+				SZL
 			
 			
 				Tailando batas
@@ -8543,6 +9017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tailando batai
 				Tailando bato
 				Tailando batų
+				THB
 				฿
 			
 			
@@ -8558,6 +9033,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tadžikistano somoniai
 				Tadžikistano somonio
 				Tadžikistano somonių
+				TJS
 			
 			
 				Turkmėnistano manatas (1993–2009)
@@ -8572,6 +9048,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turkmėnistano manatai
 				Turkmėnistano manato
 				Turkmėnistano manatų
+				TMT
 			
 			
 				Tuniso dinaras
@@ -8579,6 +9056,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tuniso dinarai
 				Tuniso dinaro
 				Tuniso dinarų
+				TND
 			
 			
 				Tongo paanga
@@ -8586,6 +9064,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tongo paangos
 				Tongo paangos
 				Tongo paangų
+				TOP
 				T$
 			
 			
@@ -8608,7 +9087,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turkijos liros
 				Turkijos liros
 				Turkijos lirų
+				TRY
 				₺
+				TL
 			
 			
 				Trinidado ir Tobago doleris
@@ -8616,6 +9097,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Trinidado ir Tobago doleriai
 				Trinidado ir Tobago dolerio
 				Trinidado ir Tobago dolerių
+				TTD
 				$
 			
 			
@@ -8633,6 +9115,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tanzanijos šilingai
 				Tanzanijos šilingo
 				Tanzanijos šilingų
+				TZS
 			
 			
 				Ukrainos grivina
@@ -8640,6 +9123,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ukrainos grivinos
 				Ukrainos grivinos
 				Ukrainos grivinų
+				UAH
 				₴
 			
 			
@@ -8662,6 +9146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ugandos šilingai
 				Ugandos šilingo
 				Ugandos šilingų
+				UGX
 			
 			
 				JAV doleris
@@ -8706,6 +9191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Urugvajaus pesai
 				Urugvajaus peso
 				Urugvajaus pesų
+				UYU
 				$
 			
 			
@@ -8714,6 +9200,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uzbekistano sumai
 				Uzbekistano sumo
 				Uzbekistano sumų
+				UZS
 			
 			
 				Venesuelos bolivaras (1871–2008)
@@ -8728,6 +9215,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venesuelos bolivarai (2008–2018)
 				Venesuelos bolivaro (2008–2018)
 				Venesuelos bolivarų (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -8760,6 +9248,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vanuatu vatai
 				Vanuatu vato
 				Vanuatu vatų
+				VUV
 			
 			
 				Samoa tala
@@ -8767,6 +9256,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Samoa talos
 				Samoa talos
 				Samoa talų
+				WST
 			
 			
 				CFA BEAC frankas
@@ -8929,6 +9419,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jemeno rialai
 				Jemeno rialo
 				Jemeno rialų
+				YER
 			
 			
 				Jugoslavijos kietasis dinaras (1966–1990)
@@ -8971,6 +9462,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pietų Afrikos Respublikos randai
 				Pietų Afrikos Respublikos rando
 				Pietų Afrikos Respublikos randų
+				ZAR
 				R
 			
 			
@@ -8986,6 +9478,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zambijos kvačos
 				Zambijos kvačos
 				Zambijos kvačų
+				ZMW
 				ZK
 			
 			
@@ -9209,13 +9702,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 				{0} promilė
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-			
 			
 				moliai
 				{0} molis
@@ -9335,6 +9821,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} amžiaus
 				{0} amžių
 			
+			
+				dekados
+				{0} dekada
+				{0} dekados
+				{0} dekados
+				{0} dekadų
+			
 			
 				metai
 				{0} metai
@@ -9491,10 +9984,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				britiškieji šilumos vienetai
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
+			
+			
+				JAV termos
+				{0} JAV terma
+				{0} JAV termos
+				{0} JAV termos
+				{0} JAV termų
 			
 			
 				jėgos svarai
@@ -9538,6 +10034,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} herco
 				{0} hercų
 			
+			
+				tipografinis emas
+			
+			
+				pikseliai
+				{0} pikselis
+				{0} pikseliai
+				{0} pikselio
+				{0} pikselių
+			
+			
+				megapikseliai
+				{0} megapikselis
+				{0} megapikseliai
+				{0} megapikselio
+				{0} megapikselių
+			
+			
+				pikseliai centimetre
+				{0} pikselis centimetre
+				{0} pikseliai centimetre
+				{0} pikselio centimetre
+				{0} pikselių centimetre
+			
+			
+				pikseliai colyje
+				{0} pikselis colyje
+				{0} pikseliai colyje
+				{0} pikselio colyje
+				{0} pikselių colyje
+			
+			
+				taškai centimetre
+				{0} taškas centimetre
+				{0} taškai centimetre
+				{0} taško centimetre
+				{0} taškų centimetre
+			
+			
+				taškai colyje
+				{0} taškas colyje
+				{0} taškai colyje
+				{0} taško colyje
+				{0} taškų colyje
+			
 			
 				kilometrai
 				{0} kilometras
@@ -9685,10 +10226,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				saulės spinduliuotė
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
 			
 			
 				liuksai
@@ -9699,10 +10236,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				saulės šviesis
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
 			
 			
 				metrinės tonos
@@ -9794,17 +10327,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				žemės masė
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
 			
 			
 				saulės masė
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
 			
 			
 				gigavatai
@@ -9848,13 +10373,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} arklio galios
 				{0} arklio galių
 			
-			
-				hektopaskaliai
-				{0} hektopaskalis
-				{0} hektopaskaliai
-				{0} hektopaskalio
-				{0} hektopaskalių
-			
 			
 				gysidabrio stulpelio milimetrai
 				{0} gysidabrio stulpelio milimetras
@@ -9876,6 +10394,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gyvsidabrio stulpelio colio
 				{0} gyvsidabrio stulpelio colių
 			
+			
+				baras
+				{0} baras
+				{0} barai
+				{0} baro
+				{0} barų
+			
 			
 				milibarai
 				{0} milibaras
@@ -9890,6 +10415,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosferos
 				{0} atmosferų
 			
+			
+				paskaliai
+				{0} paskalis
+				{0} paskaliai
+				{0} paskalio
+				{0} paskalių
+			
+			
+				hektopaskaliai
+				{0} hektopaskalis
+				{0} hektopaskaliai
+				{0} hektopaskalio
+				{0} hektopaskalių
+			
 			
 				kilopaskaliai
 				{0} kilopaskalis
@@ -9962,10 +10501,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				svarų pėdos
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
 			
 			
 				niutonmetrai
@@ -10346,20 +10881,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 				{0} ‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-				{0} mol
-				{0} mol
-			
 			
 				l/km
 				{0} l/km
@@ -10472,6 +10993,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} a.
 				{0} a.
 			
+			
+				dekados
+				{0} dek.
+				{0} dek.
+				{0} dek.
+				{0} dek.
+			
 			
 				metai
 				{0} m.
@@ -10619,33 +11147,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-				{0} eV
-				{0} eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
-				{0} N
-				{0} N
+			
+				JAV terma
+				{0} JAV terma
+				{0} JAV termos
+				{0} JAV termos
+				{0} JAV termų
 			
 			
 				GHz
@@ -10675,6 +11182,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				tipografinis emas
+			
+			
+				pikseliai
+				{0} p
+				{0} p
+				{0} p
+				{0} p
+			
+			
+				megapikseliai
+			
+			
+				pikseliai centimetre
+				{0} p/cm
+				{0} p/cm
+				{0} p/cm
+				{0} p/cm
+			
+			
+				pikseliai colyje
+			
+			
+				taškai centimetre
+				{0} tšk./cm
+				{0} tšk./cm
+				{0} tšk./cm
+				{0} tšk./cm
+			
+			
+				taškai colyje
+				{0} tšk./in
+				{0} tšk./in
+				{0} tšk./in
+				{0} tšk./in
+			
 			
 				km
 				{0} km
@@ -10785,6 +11329,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} AV
 				{0} AV
 			
+			
+				fur
+				{0} fur
+				{0} fur
+				{0} fur
+				{0} fur
+			
 			
 				fth
 				{0} fth
@@ -10813,13 +11364,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lx
 				{0} lx
@@ -10827,13 +11371,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				mt
 				{0} mt
@@ -10915,27 +11452,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ct
 				{0} ct
 			
-			
-				Da
-				{0} Da
-				{0} Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -10978,13 +11494,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} AG
 				{0} AG
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -11006,6 +11515,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				baras
+				{0} ba
+				{0} ba
+				{0} ba
+				{0} ba
+			
 			
 				mbar
 				{0} mbar
@@ -11020,19 +11536,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
+			
+				paskaliai
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/val.
@@ -11090,13 +11602,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				N-m
 				{0} N-m
@@ -11219,6 +11724,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ft akre
 				{0} ft akre
 			
+			
+				bu
+				{0} bu
+				{0} bu
+				{0} bu
+				{0} bu
+			
 			
 				gal
 				{0} gal
@@ -11284,13 +11796,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} a. š.
 				{0} a. š.
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-			
 			
 				kryptis
 				{0} R
@@ -11452,6 +11957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} s
 				{0} s
 				{0} s
+				{0}/s
 			
 			
 				milisek.
@@ -11460,8 +11966,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ms
 				{0} ms
 			
+			
+				μs
+				{0} μs
+				{0} μs
+				{0} μs
+				{0} μs
+			
 			
 				nanosek.
+				{0} ns
+				{0} ns
+				{0} ns
+				{0} ns
 			
 			
 				km
@@ -11543,6 +12060,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} šm.
 				{0} šm.
 			
+			
+				fur
+				{0} fur
+				{0} fur
+				{0} fur
+				{0} fur
+			
 			
 				fth
 				{0} fth
@@ -11614,13 +12138,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} AG
 				{0} AG
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -11649,6 +12166,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -11731,6 +12255,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ft akre
 				{0} ft akre
 			
+			
+				bu
+				{0} bu
+				{0} bu
+				{0} bu
+				{0} bu
+			
 			
 				{0} kvorta
 				{0} kvortos
@@ -11774,12 +12305,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} ar {1}
 			{0} ar {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} ir {1}
-			{0} ir {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/lt_LT.xml b/make/data/cldr/common/main/lt_LT.xml
index 1eb9c9af80a..633e84300d6 100644
--- a/make/data/cldr/common/main/lt_LT.xml
+++ b/make/data/cldr/common/main/lt_LT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lu.xml b/make/data/cldr/common/main/lu.xml
index 5dfa35f4eb7..931292c5052 100644
--- a/make/data/cldr/common/main/lu.xml
+++ b/make/data/cldr/common/main/lu.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -182,7 +182,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molidavi
 			Madagasikari
 			Lutanda lua Marishale
-			Masedwane
 			Mali
 			Myamare
 			Mongoli
@@ -287,7 +286,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à b c d e é è ɛ {ɛ\u0301} {ɛ\u0300} f h i í ì j k l m n {ng} {ny} o ó ò ɔ {ɔ\u0301} {ɔ\u0300} p {ph} q s {shi} t u ú ù v w y z]
 		[g r x]
 		[A B C D E F H I J K L M N O P Q S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/lu_CD.xml b/make/data/cldr/common/main/lu_CD.xml
index 7e99882cc69..7e6297a4ae1 100644
--- a/make/data/cldr/common/main/lu_CD.xml
+++ b/make/data/cldr/common/main/lu_CD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/luo.xml b/make/data/cldr/common/main/luo.xml
index ffea234611a..4262f47df71 100644
--- a/make/data/cldr/common/main/luo.xml
+++ b/make/data/cldr/common/main/luo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Madagascar
 			Chuia mar Marshall
-			Macedonia
 			Mali
 			Myanmar
 			Mongolia
diff --git a/make/data/cldr/common/main/luo_KE.xml b/make/data/cldr/common/main/luo_KE.xml
index a8f97f979d4..a32830565cd 100644
--- a/make/data/cldr/common/main/luo_KE.xml
+++ b/make/data/cldr/common/main/luo_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/luy.xml b/make/data/cldr/common/main/luy.xml
index 5720eacd0b3..2f947b13f8f 100644
--- a/make/data/cldr/common/main/luy.xml
+++ b/make/data/cldr/common/main/luy.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/luy_KE.xml b/make/data/cldr/common/main/luy_KE.xml
index 0b13bbf10f1..5b96f8f0d69 100644
--- a/make/data/cldr/common/main/luy_KE.xml
+++ b/make/data/cldr/common/main/luy_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/lv.xml b/make/data/cldr/common/main/lv.xml
index 5b0f3e87609..e8a21afe9ff 100644
--- a/make/data/cldr/common/main/lv.xml
+++ b/make/data/cldr/common/main/lv.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -90,7 +90,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			karību
 			kajuga
 			atsamu
-			čakmu
+			čakmu
 			čečenu
 			sebuāņu
 			kiga
@@ -145,7 +145,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			angļu
 			angļu (Lielbritānija)
 			angļu (Lielbritānija)
-			angļu (ASV)
 			vidusangļu
 			esperanto
 			spāņu
@@ -314,7 +313,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			malagasu
 			vidusīru
 			makua
-			mgo
+			metu
 			māršaliešu
 			maoru
 			mikmaku
@@ -527,14 +526,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jidišs
 			jorubu
 			kantoniešu
+			ķīniešu (kantoniešu)
 			džuanu
 			sapoteku
 			blissimbolika
 			zenagu
 			standarta tamazigtu (Maroka)
 			ķīniešu
+			ķīniešu (mandarīnu)
 			ķīniešu vienkāršotā
+			ķīniešu vienkāršotā (mandarīnu)
 			ķīniešu tradicionālā
+			ķīniešu tradicionālā (mandarīnu)
 			zulu
 			zunju
 			bez lingvistiska satura
@@ -554,7 +557,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -815,7 +818,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mali
 			Mjanma (Birma)
 			Mongolija
-			Ķīnas īpašās pārvaldes apgabals Makao
+			ĶTR īpašais administratīvais reģions Makao
 			Makao
 			Ziemeļu Marianas salas
 			Martinika
@@ -883,7 +886,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Salvadora
 			Sintmārtena
 			Sīrija
-			Svazilenda
+			Svatini
+			Svazilenda
 			Tristana da Kuņas salas
 			Tērksas un Kaikosas salas
 			Čada
@@ -893,6 +897,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tadžikistāna
 			Tokelau
 			Austrumtimora
+			Austrumtimora
 			Turkmenistāna
 			Tunisija
 			Tonga
@@ -919,8 +924,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Volisa un Futunas salas
 			Samoa
-			pseidoakcenti
-			pseido-Bidi
+			pseidoakcenti
+			pseidodivvirzienu
 			Kosova
 			Jemena
 			Majota
@@ -953,22 +958,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Kalendārs
 			valūtas formāts
-			Kārtošana, ignorējot simbolus
-			Diakritisko zīmju kārtošana apgrieztā secībā
-			Lielo/mazo burtu kārtošana
-			Reģistrjutīgo rakstzīmju kārtošana
+			kārtošana, ignorējot simbolus
+			akcentēto burtu kārtošana apgrieztā secībā
+			kārtošana pēc lielajiem/mazajiem burtiem
+			reģistrjutīga kārtošana
 			kārtošanas secība
-			Normalizētā kārtošana
-			Kārtošana skaitliskā secībā
-			Kārtošanas pakāpe
-			Valūta
+			normalizēta kārtošana
+			kārtošana skaitliskā secībā
+			kārtošanas pakāpe
+			valūta
 			Stundu formāts (12 vai 24)
 			Rindiņas pārtraukuma stils
 			mērvienību sistēma
 			Cipari
-			Laika josla
-			Lokalizācijas variants
-			Personīgai lietošanai
+			laika josla
+			lokalizācijas variants
+			personīgai lietošanai
 		
 		
 			budistu kalendārs
@@ -1094,8 +1099,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a ā b c č d e ē f g ģ h i ī j k ķ l ļ m n ņ o p r s š t u ū v z ž]
 		[y ō q ŗ w x]
 		[A Ā B C Č D E Ē F G Ģ H I Ī Y J K Ķ L Ļ M N Ņ O P Q R S Š T U Ū V W X Z Ž]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ ” „ ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ ‚ " “ ” „ ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1104,19 +1109,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0}…{1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1394,55 +1403,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0}–{1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d.–d.
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							G y. 'gada' MMM – G y 'gada' MMM
+							G y. 'gada' MMM–MMM
+							G y. 'gada' MMM – y. 'gada' MMM
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							G y. 'gada' d.–d. MMM
+							G y. 'gada' d. MMM – G y. 'gada' d. MMM
+							G y. 'gada' d. MMM – d. MMM
+							G y. 'gada' d. MMM – y. 'gada' d. MMM
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							G y. 'gada' d. MMM, E – d. MMM, E
+							G y. 'gada' d. MMM, E – G y. 'gada' d. MMM, E
+							G y. 'gada' d. MMM, E – d. MMM, E
+							G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E
 						
 						
 							MM–MM
@@ -1784,11 +1763,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						pirms mūsu ēras
+						pirms mūsu ēras
 						mūsu ērā
+						mūsu ērā
 					
 					
 						p.m.ē.
+						p.m.ē.
 						m.ē.
+						m.ē.
 					
 					
 						p.m.ē.
@@ -1897,9 +1880,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d. MMM
 						d. MMMM
 						E, d. MMMM
-						MMMM W. 'nedēļa'
-						MMMM W. 'nedēļa'
-						MMMM W. 'nedēļa'
+						MMMM, W. 'nedēļa'
+						MMMM, W. 'nedēļa'
+						MMMM, W. 'nedēļa'
 						mm:ss
 						mm:ss
 						y. 'g'.
@@ -1921,55 +1904,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d.–d.
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							G y. 'gada' MMM – G y. 'gada' MMM
+							G y. 'gada' MMM–MMM
+							G y. 'gada' MMM – y. 'gada' MMM
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							G y. 'gada' d.–d. MMM
+							G y. 'gada' d. MMM – G y. 'gada' d. MMM
+							G y. 'gada' d. MMM – d. MMM
+							G y. 'gada' d. MMM – y. 'gada' d. MMM
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							G y. 'gada' d. MMM, E – d. MMM, E
+							G y. 'gada' d. MMM, E – G y. 'gada' d. MMM, E
+							G y. 'gada' d. MMM, E – d. MMM, E
+							G y. 'gada' d. MMM, E – y. 'gada' d. MMM, E
 						
 						
 							h a – h a
@@ -2365,6 +2318,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				g.
+				pag. gadā
+				šajā g.
+				nāk. gadā
 				
 					pēc {0} g.
 					pēc {0} g.
@@ -2378,6 +2334,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				g.
+				pag. gadā
+				šajā g.
+				nāk. gadā
 				
 					pēc {0} g.
 					pēc {0} g.
@@ -2449,6 +2408,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mēn.
+				pag. mēn.
+				šajā mēn.
+				nāk. mēn.
 				
 					pēc {0} mēn.
 					pēc {0} mēn.
@@ -2462,6 +2424,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mēn.
+				pag. mēn.
+				šajā mēn.
+				nāk. mēn.
 				
 					pēc {0} mēn.
 					pēc {0} mēn.
@@ -2492,6 +2457,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ned.
+				pag. ned.
+				šajā ned.
+				nāk. ned.
 				
 					pēc {0} ned.
 					pēc {0} ned.
@@ -2506,6 +2474,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ned.
+				pag. ned.
+				šajā ned.
+				nāk. ned.
 				
 					pēc {0} ned.
 					pēc {0} ned.
@@ -3737,6 +3708,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktebe
 			
+			
+				Kostanaja
+			
 			
 				Kizilorda
 			
@@ -5279,6 +5253,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			,
 			 
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5287,6 +5263,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tūkstošu
@@ -5441,36 +5422,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				AAE dirhēmi
 				AAE dirhēms
 				AAE dirhēmi
+				AED
 			
 			
 				Afganistānas afgāns
 				Afganistānas afgāni
 				Afganistānas afgāns
 				Afganistānas afgāni
+				AFN
 			
 			
 				Albānijas leks
 				Albānijas leki
 				Albānijas leks
 				Albānijas leki
+				ALL
 			
 			
 				Armēnijas drams
 				Armēnijas drami
 				Armēnijas drams
 				Armēnijas drami
+				AMD
 			
 			
 				Nīderlandes Antiļu guldenis
 				Nīderlandes Antiļu guldeņi
 				Nīderlandes Antiļu guldenis
 				Nīderlandes Antiļu guldeņi
+				ANG
 			
 			
 				Angolas kvanza
 				Angolas kvanzas
 				Angolas kvanza
 				Angolas kvanzas
+				AOA
 				Kz
 			
 			
@@ -5478,6 +5465,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Argentīnas peso
 				Argentīnas peso
 				Argentīnas peso
+				ARS
 				$
 			
 			
@@ -5496,6 +5484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Arubas guldeņi
 				Arubas guldenis
 				Arubas guldeņi
+				AWG
 			
 			
 				Azerbaidžānas manats (1993–2006)
@@ -5508,12 +5497,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Azerbaidžānas manati
 				Azerbaidžānas manats
 				Azerbaidžānas manati
+				AZN
 			
 			
 				Bosnijas un Hercogovinas konvertējamā marka
 				Bosnijas un Hercogovinas konvertējamās markas
 				Bosnijas un Hercogovinas konvertējamā marka
 				Bosnijas un Hercogovinas konvertējamās markas
+				BAM
 				KM
 			
 			
@@ -5521,6 +5512,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Barbadosas dolāri
 				Barbadosas dolārs
 				Barbadosas dolāri
+				BBD
 				$
 			
 			
@@ -5528,6 +5520,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bangladešas takas
 				Bangladešas taka
 				Bangladešas takas
+				BDT
 				৳
 			
 			
@@ -5541,24 +5534,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bulgārijas levas
 				Bulgārijas leva
 				Bulgārijas levas
+				BGN
 			
 			
 				Bahreinas dinārs
 				Bahreinas dināri
 				Bahreinas dinārs
 				Bahreinas dināri
+				BHD
 			
 			
 				Burundi franks
 				Burundi franki
 				Burundi franks
 				Burundi franki
+				BIF
 			
 			
 				Bermudu dolārs
 				Bermudu dolāri
 				Bermudu dolārs
 				Bermudu dolāri
+				BMD
 				$
 			
 			
@@ -5566,6 +5563,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Brunejas dolāri
 				Brunejas dolārs
 				Brunejas dolāri
+				BND
 				$
 			
 			
@@ -5573,6 +5571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolīvijas boliviano
 				Bolīvijas boliviano
 				Bolīvijas boliviano
+				BOB
 				Bs
 			
 			
@@ -5580,6 +5579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Brazīlijas reāli
 				Brazīlijas reāls
 				Brazīlijas reāli
+				R$
 				R$
 			
 			
@@ -5587,6 +5587,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bahamu dolāri
 				Bahamu dolārs
 				Bahamu dolāri
+				BSD
 				$
 			
 			
@@ -5594,12 +5595,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Butānas ngultrumi
 				Butānas ngultrums
 				Butānas ngultrumi
+				BTN
 			
 			
 				Botsvanas pula
 				Botsvanas pulas
 				Botsvanas pula
 				Botsvanas pulas
+				BWP
 				P
 			
 			
@@ -5607,6 +5610,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Baltkrievijas rubeļi
 				Baltkrievijas rubelis
 				Baltkrievijas rubeļi
+				BYN
 				р.
 			
 			
@@ -5614,12 +5618,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Baltkrievijas rubeļi (2000–2016)
 				Baltkrievijas rubelis (2000–2016)
 				Baltkrievijas rubeļi (2000–2016)
+				BYR
 			
 			
 				Belizas dolārs
 				Belizas dolāri
 				Belizas dolārs
 				Belizas dolāri
+				BZD
 				$
 			
 			
@@ -5627,6 +5633,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kanādas dolāri
 				Kanādas dolārs
 				Kanādas dolāri
+				CA$
 				$
 			
 			
@@ -5634,31 +5641,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				KDR franki
 				KDR franks
 				KDR franki
+				CDF
 			
 			
 				Šveices franks
 				Šveices franki
 				Šveices franks
 				Šveices franki
+				CHF
 			
 			
 				Čīles peso
 				Čīles peso
 				Čīles peso
 				Čīles peso
+				CLP
 				$
 			
 			
-				Ķīnas juaņa (ofšors)
-				Ķīnas juaņa (ofšors)
-				Ķīnas juaņa (ofšors)
-				Ķīnas juaņas (ofšors)
+				Ķīnas juaņa (ofšors)
+				Ķīnas juaņa (ofšors)
+				Ķīnas juaņa (ofšors)
+				Ķīnas juaņas (ofšors)
+				CNH
 			
 			
 				Ķīnas juaņs
 				Ķīnas juaņi
 				Ķīnas juaņs
 				Ķīnas juaņi
+				CN¥
 				¥
 			
 			
@@ -5666,6 +5678,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kolumbijas peso
 				Kolumbijas peso
 				Kolumbijas peso
+				COP
 				$
 			
 			
@@ -5676,6 +5689,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kostarikas koloni
 				Kostarikas kolons
 				Kostarikas koloni
+				CRC
 				₡
 			
 			
@@ -5683,6 +5697,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kubas konvertējamie peso
 				Kubas konvertējamais peso
 				Kubas konvertējamie peso
+				CUC
 				$
 			
 			
@@ -5690,6 +5705,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kubas peso
 				Kubas peso
 				Kubas peso
+				CUP
 				$
 			
 			
@@ -5697,6 +5713,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kaboverdes eskudo
 				Kaboverdes eskudo
 				Kaboverdes eskudo
+				CVE
 			
 			
 				Kipras mārciņa
@@ -5706,6 +5723,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Čehijas kronas
 				Čehijas krona
 				Čehijas kronas
+				CZK
 				Kč
 			
 			
@@ -5716,12 +5734,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Džibutijas franki
 				Džibutijas franks
 				Džibutijas franki
+				DJF
 			
 			
 				Dānijas krona
 				Dānijas kronas
 				Dānijas krona
 				Dānijas kronas
+				DKK
 				kr
 			
 			
@@ -5729,6 +5749,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dominikānas peso
 				Dominikānas peso
 				Dominikānas peso
+				DOP
 				$
 			
 			
@@ -5736,6 +5757,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Alžīrijas dināri
 				Alžīrijas dinārs
 				Alžīrijas dināri
+				DZD
 			
 			
 				Igaunijas krona
@@ -5745,6 +5767,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ēģiptes mārciņas
 				Ēģiptes mārciņa
 				Ēģiptes mārciņas
+				EGP
 				E£
 			
 			
@@ -5752,6 +5775,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Eritrejas nakfas
 				Eritrejas nakfa
 				Eritrejas nakfas
+				ERN
 			
 			
 				Spānijas peseta
@@ -5761,12 +5785,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Etiopijas biri
 				Etiopijas birs
 				Etiopijas biri
+				ETB
 			
 			
 				eiro
 				eiro
 				eiro
 				eiro
+				€
 				€
 			
 			
@@ -5777,6 +5803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fidži dolāri
 				Fidži dolārs
 				Fidži dolāri
+				FJD
 				$
 			
 			
@@ -5784,6 +5811,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Folklenda Salu mārciņas
 				Folklenda Salu mārciņa
 				Folklenda Salu mārciņas
+				FKP
 				£
 			
 			
@@ -5794,6 +5822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lielbritānijas mārciņas
 				Lielbritānijas mārciņa
 				Lielbritānijas mārciņas
+				£
 				£
 			
 			
@@ -5801,6 +5830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gruzijas lari
 				Gruzijas lari
 				Gruzijas lari
+				GEL
 				₾
 				₾
 			
@@ -5809,12 +5839,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ganas sedi
 				Ganas sedi
 				Ganas sedi
+				GHS
 			
 			
 				Gibraltāra mārciņa
 				Gibraltāra mārciņas
 				Gibraltāra mārciņa
 				Gibraltāra mārciņas
+				GIP
 				£
 			
 			
@@ -5822,12 +5854,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gambijas dalasi
 				Gambijas dalasi
 				Gambijas dalasi
+				GMD
 			
 			
 				Gvinejas franks
 				Gvinejas franki
 				Gvinejas franks
 				Gvinejas franki
+				GNF
 				FG
 			
 			
@@ -5838,6 +5872,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gvatemalas ketsali
 				Gvatemalas ketsals
 				Gvatemalas ketsali
+				GTQ
 				Q
 			
 			
@@ -5845,6 +5880,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gajānas dolāri
 				Gajānas dolārs
 				Gajānas dolāri
+				GYD
 				$
 			
 			
@@ -5852,6 +5888,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Honkongas dolāri
 				Honkongas dolārs
 				Honkongas dolāri
+				HK$
 				$
 			
 			
@@ -5859,6 +5896,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hondurasas lempīras
 				Hondurasas lempīra
 				Hondurasas lempīras
+				HNL
 				L
 			
 			
@@ -5866,6 +5904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Horvātijas kunas
 				Horvātijas kuna
 				Horvātijas kunas
+				HRK
 				kn
 			
 			
@@ -5873,12 +5912,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Haiti gurdi
 				Haiti gurds
 				Haiti gurdi
+				HTG
 			
 			
 				Ungārijas forints
 				Ungārijas forinti
 				Ungārijas forints
 				Ungārijas forinti
+				HUF
 				Ft
 			
 			
@@ -5886,6 +5927,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Indonēzijas rūpijas
 				Indonēzijas rūpija
 				Indonēzijas rūpijas
+				IDR
 				Rp
 			
 			
@@ -5896,6 +5938,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Izraēlas šekeļi
 				Izraēlas šekelis
 				Izraēlas šekeļi
+				₪
 				₪
 			
 			
@@ -5903,6 +5946,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Indijas rūpijas
 				Indijas rūpija
 				Indijas rūpijas
+				₹
 				₹
 			
 			
@@ -5910,18 +5954,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Irākas dināri
 				Irākas dinārs
 				Irākas dināri
+				IQD
 			
 			
 				Irānas riāls
 				Irānas riāli
 				Irānas riāls
 				Irānas riāli
+				IRR
 			
 			
 				Islandes krona
 				Islandes kronas
 				Islandes krona
 				Islandes kronas
+				ISK
 				kr
 			
 			
@@ -5932,6 +5979,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jamaikas dolāri
 				Jamaikas dolārs
 				Jamaikas dolāri
+				JMD
 				$
 			
 			
@@ -5939,6 +5987,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jordānas dināri
 				Jordānas dinārs
 				Jordānas dināri
+				JOD
 			
 			
 				Japānas jena
@@ -5953,18 +6002,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kenijas šiliņi
 				Kenijas šiliņš
 				Kenijas šiliņi
+				KES
 			
 			
 				Kirgizstānas soms
 				Kirgizstānas somi
 				Kirgizstānas soms
 				Kirgizstānas somi
+				KGS
 			
 			
 				Kambodžas riels
 				Kambodžas rieli
 				Kambodžas riels
 				Kambodžas rieli
+				KHR
 				៛
 			
 			
@@ -5972,6 +6024,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Komoru franki
 				Komoru franks
 				Komoru franki
+				KMF
 				CF
 			
 			
@@ -5979,6 +6032,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ziemeļkorejas vonas
 				Ziemeļkorejas vona
 				Ziemeļkorejas vonas
+				KPW
 				₩
 			
 			
@@ -5986,6 +6040,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dienvidkorejas vonas
 				Dienvidkorejas vona
 				Dienvidkorejas vonas
+				₩
 				₩
 			
 			
@@ -5993,12 +6048,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuveitas dināri
 				Kuveitas dinārs
 				Kuveitas dināri
+				KWD
 			
 			
 				Kaimanu salu dolārs
 				Kaimanu salu dolāri
 				Kaimanu salu dolārs
 				Kaimanu salu dolāri
+				KYD
 				$
 			
 			
@@ -6006,6 +6063,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kazahstānas tenges
 				Kazahstānas tenge
 				Kazahstānas tenges
+				KZT
 				₸
 			
 			
@@ -6013,6 +6071,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Laosas kipi
 				Laosas kips
 				Laosas kipi
+				LAK
 				₭
 			
 			
@@ -6020,6 +6079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libānas mārciņas
 				Libānas mārciņa
 				Libānas mārciņas
+				LBP
 				L£
 			
 			
@@ -6027,6 +6087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Šrilankas rūpijas
 				Šrilankas rūpija
 				Šrilankas rūpijas
+				LKR
 				Rs
 			
 			
@@ -6034,6 +6095,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libērijas dolāri
 				Libērijas dolārs
 				Libērijas dolāri
+				LRD
 				$
 			
 			
@@ -6063,24 +6125,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lībijas dināri
 				Lībijas dinārs
 				Lībijas dināri
+				LYD
 			
 			
 				Marokas dirhēms
 				Marokas dirhēmi
 				Marokas dirhēms
 				Marokas dirhēmi
+				MAD
 			
 			
 				Moldovas leja
 				Moldovas lejas
 				Moldovas leja
 				Moldovas lejas
+				MDL
 			
 			
 				Madagaskaras ariari
 				Madagaskaras ariari
 				Madagaskaras ariari
 				Madagaskaras ariari
+				MGA
 				Ar
 			
 			
@@ -6088,6 +6154,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maķedonijas denāri
 				Maķedonijas denārs
 				Maķedonijas denāri
+				MKD
 			
 			
 				CFA (Āfrikas) franks
@@ -6097,6 +6164,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mjanmas kjati
 				Mjanmas kjats
 				Mjanmas kjati
+				MMK
 				K
 			
 			
@@ -6104,6 +6172,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mongolijas tugriki
 				Mongolijas tugriks
 				Mongolijas tugriki
+				MNT
 				₮
 			
 			
@@ -6111,19 +6180,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makao patakas
 				Makao pataka
 				Makao patakas
+				MOP
 			
 			
 				Mauritānijas ugija (1973–2017)
 				Mauritānijas ugijas (1973–2017)
 				Mauritānijas ugija (1973–2017)
 				Mauritānijas ugijas (1973–2017)
+				MRO
 			
 			
 				Mauritānijas ugija
 				Mauritānijas ugijas
 				Mauritānijas ugija
 				Mauritānijas ugijas
-				MRU
 			
 			
 				Maltas lira
@@ -6136,6 +6206,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maurīcijas rūpijas
 				Maurīcijas rūpija
 				Maurīcijas rūpijas
+				MUR
 				Rs
 			
 			
@@ -6143,18 +6214,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maldīvijas rūfijas
 				Maldīvijas rūfija
 				Maldīvijas rūfijas
+				MVR
 			
 			
 				Malāvijas kvača
 				Malāvijas kvačas
 				Malāvijas kvača
 				Malāvijas kvačas
+				MWK
 			
 			
 				Meksikas peso
 				Meksikas peso
 				Meksikas peso
 				Meksikas peso
+				MX$
 				$
 			
 			
@@ -6162,6 +6236,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malaizijas ringiti
 				Malaizijas ringits
 				Malaizijas ringiti
+				MYR
 				RM
 			
 			
@@ -6178,12 +6253,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mozambikas metikali
 				Mozambikas metikals
 				Mozambikas metikali
+				MZN
 			
 			
 				Namībijas dolārs
 				Namībijas dolāri
 				Namībijas dolārs
 				Namībijas dolāri
+				NAD
 				$
 			
 			
@@ -6191,6 +6268,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nigērijas nairas
 				Nigērijas naira
 				Nigērijas nairas
+				NGN
 				₦
 			
 			
@@ -6198,6 +6276,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nikaragvas kordobas
 				Nikaragvas kordoba
 				Nikaragvas kordobas
+				NIO
 				C$
 			
 			
@@ -6208,6 +6287,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Norvēģijas kronas
 				Norvēģijas krona
 				Norvēģijas kronas
+				NOK
 				kr
 			
 			
@@ -6215,6 +6295,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nepālas rūpijas
 				Nepālas rūpija
 				Nepālas rūpijas
+				NPR
 				Rs
 			
 			
@@ -6222,6 +6303,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jaunzēlandes dolāri
 				Jaunzēlandes dolārs
 				Jaunzēlandes dolāri
+				NZ$
 				$
 			
 			
@@ -6229,30 +6311,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Omānas riāli
 				Omānas riāls
 				Omānas riāli
+				OMR
 			
 			
 				Panamas balboa
 				Panamas balboa
 				Panamas balboa
 				Panamas balboa
+				PAB
 			
 			
 				Peru sols
 				Peru soli
 				Peru sols
 				Peru soli
+				PEN
 			
 			
 				Papua-Jaungvinejas kina
 				Papua-Jaungvinejas kinas
 				Papua-Jaungvinejas kina
 				Papua-Jaungvinejas kinas
+				PGK
 			
 			
 				Filipīnu peso
 				Filipīnu peso
 				Filipīnu peso
 				Filipīnu peso
+				PHP
 				₱
 			
 			
@@ -6260,6 +6347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pakistānas rūpijas
 				Pakistānas rūpija
 				Pakistānas rūpijas
+				PKR
 				Rs
 			
 			
@@ -6267,6 +6355,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Polijas zloti
 				Polijas zlots
 				Polijas zloti
+				PLN
 				zł
 			
 			
@@ -6277,6 +6366,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Paragvajas guarani
 				Paragvajas guarani
 				Paragvajas guarani
+				PYG
 				₲
 			
 			
@@ -6284,6 +6374,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kataras riāli
 				Kataras riāls
 				Kataras riāli
+				QAR
 			
 			
 				Rumānijas vecā leja
@@ -6296,6 +6387,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rumānijas lejas
 				Rumānijas leja
 				Rumānijas lejas
+				RON
 				lei
 			
 			
@@ -6303,12 +6395,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Serbijas dināri
 				Serbijas dinārs
 				Serbijas dināri
+				RSD
 			
 			
 				Krievijas rublis
 				Krievijas rubļi
 				Krievijas rublis
 				Krievijas rubļi
+				RUB
 				₽
 			
 			
@@ -6316,6 +6410,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ruandas franki
 				Ruandas franks
 				Ruandas franki
+				RWF
 				RF
 			
 			
@@ -6323,12 +6418,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Saūda riāli
 				Saūda riāls
 				Saūda riāli
+				SAR
 			
 			
 				Zālamana Salu dolārs
 				Zālamana Salu dolāri
 				Zālamana Salu dolārs
 				Zālamana Salu dolāri
+				SBD
 				$
 			
 			
@@ -6336,18 +6433,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Seišelu salu rūpijas
 				Seišelu salu rūpija
 				Seišelu salu rūpijas
+				SCR
 			
 			
 				Sudānas mārciņa
 				Sudānas mārciņas
 				Sudānas mārciņa
 				Sudānas mārciņas
+				SDG
 			
 			
 				Zviedrijas krona
 				Zviedrijas kronas
 				Zviedrijas krona
 				Zviedrijas kronas
+				SEK
 				kr
 			
 			
@@ -6355,6 +6455,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Singapūras dolāri
 				Singapūras dolārs
 				Singapūras dolāri
+				SGD
 				$
 			
 			
@@ -6362,6 +6463,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sv.Helēnas salas mārciņas
 				Sv.Helēnas salas mārciņa
 				Sv.Helēnas salas mārciņas
+				SHP
 				£
 			
 			
@@ -6375,18 +6477,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sjerraleones leones
 				Sjerraleones leone
 				Sjerraleones leones
+				SLL
 			
 			
 				Somālijas šiliņš
 				Somālijas šiliņi
 				Somālijas šiliņš
 				Somālijas šiliņi
+				SOS
 			
 			
 				Surinamas dolārs
 				Surinamas dolāri
 				Surinamas dolārs
 				Surinamas dolāri
+				SRD
 				$
 			
 			
@@ -6397,6 +6502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dienvidsudānas mārciņas
 				Dienvidsudānas mārciņa
 				Dienvidsudānas mārciņas
+				SSP
 				£
 			
 			
@@ -6404,12 +6510,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Santome un Prinsipi dobras (1977–2017)
 				Santome un Prinsipi dobra (1977–2017)
 				Santome un Prinsipi dobras (1977–2017)
+				STD
 			
 			
 				Santome un Prinsipi dobra
 				Santome un Prinsipi dobras
 				Santome un Prinsipi dobra
 				Santome un Prinsipi dobras
+				STN
 				Db
 			
 			
@@ -6420,6 +6528,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sīrijas mārciņas
 				Sīrijas mārciņa
 				Sīrijas mārciņas
+				SYP
 				£
 			
 			
@@ -6427,6 +6536,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Svazilendas lilangeni
 				Svazilendas lilangeni
 				Svazilendas lilangeni
+				SZL
 			
 			
 				Taizemes bāts
@@ -6441,6 +6551,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tadžikistānas somoni
 				Tadžikistānas somons
 				Tadžikistānas somoni
+				TJS
 			
 			
 				Turkmenistānas manats (1993–2009)
@@ -6453,18 +6564,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turkmenistānas manati
 				Turkmenistānas manats
 				Turkmenistānas manati
+				TMT
 			
 			
 				Tunisijas dinārs
 				Tunisijas dināri
 				Tunisijas dinārs
 				Tunisijas dināri
+				TND
 			
 			
 				Tongas paanga
 				Tongas paangas
 				Tongas paanga
 				Tongas paangas
+				TOP
 				T$
 			
 			
@@ -6478,6 +6592,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turcijas liras
 				Turcijas lira
 				Turcijas liras
+				TRY
 				₺
 				TL
 			
@@ -6486,6 +6601,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Trinidādas un Tobāgo dolāri
 				Trinidādas un Tobāgo dolārs
 				Trinidādas un Tobāgo dolāri
+				TTD
 				$
 			
 			
@@ -6493,6 +6609,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Taivānas jaunie dolāri
 				Taivānas jaunais dolārs
 				Taivānas jaunie dolāri
+				NT$
 				NT$
 			
 			
@@ -6500,12 +6617,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tanzānijas šiliņi
 				Tanzānijas šiliņš
 				Tanzānijas šiliņi
+				TZS
 			
 			
 				Ukrainas grivna
 				Ukrainas grivnas
 				Ukrainas grivna
 				Ukrainas grivnas
+				UAH
 				₴
 			
 			
@@ -6513,6 +6632,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ugandas šiliņi
 				Ugandas šiliņš
 				Ugandas šiliņi
+				UGX
 			
 			
 				ASV dolārs
@@ -6527,6 +6647,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Urugvajas peso
 				Urugvajas peso
 				Urugvajas peso
+				UYU
 				$
 			
 			
@@ -6534,6 +6655,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uzbekistānas sumi
 				Uzbekistānas sums
 				Uzbekistānas sumi
+				UZS
 			
 			
 				Venecuēlas bolivārs (1871–2008)
@@ -6546,6 +6668,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venecuēlas bolivāri (2008–2018)
 				Venecuēlas bolivārs (2008–2018)
 				Venecuēlas bolivāri (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6553,12 +6676,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venecuēlas bolivāri
 				Venecuēlas bolivārs
 				Venecuēlas bolivāri
+				VES
 			
 			
 				Vjetnamas dongi
 				Vjetnamas dongi
 				Vjetnamas dongi
 				Vjetnamas dongi
+				₫
 				₫
 			
 			
@@ -6566,18 +6691,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vanuatu vatu
 				Vanuatu vatu
 				Vanuatu vatu
+				VUV
 			
 			
 				Samoa tala
 				Samoa talas
 				Samoa tala
 				Samoa talas
+				WST
 			
 			
 				Centrālāfrikas CFA franks
 				Centrālāfrikas CFA franki
 				Centrālāfrikas CFA franks
 				Centrālāfrikas CFA franki
+				FCFA
 			
 			
 				sudrabs
@@ -6617,6 +6745,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Austrumkarību dolāri
 				Austrumkarību dolārs
 				Austrumkarību dolāri
+				EC$
 				$
 			
 			
@@ -6636,6 +6765,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rietumāfrikas CFA franki
 				Rietumāfrikas CFA franks
 				Rietumāfrikas CFA franki
+				CFA
 			
 			
 				pallādijs
@@ -6648,6 +6778,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP franki
 				CFP franks
 				CFP franki
+				CFPF
 			
 			
 				platīns
@@ -6672,12 +6803,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jemenas riāli
 				Jemenas riāls
 				Jemenas riāli
+				YER
 			
 			
 				Dienvidāfrikas rends
 				Dienvidāfrikas rendi
 				Dienvidāfrikas rends
 				Dienvidāfrikas rendi
+				ZAR
 				R
 			
 			
@@ -6691,6 +6824,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zambijas kvačas
 				Zambijas kvača
 				Zambijas kvačas
+				ZMW
 				ZK
 			
 			
@@ -6722,16 +6856,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/{1}
 			
 			
-				Brīvās krišanas paātrinājums:
-				Brīvās krišanas paātrinājums: {0}
-				Brīvās krišanas paātrinājums: {0}
-				Brīvās krišanas paātrinājums: {0}
+				smagumspēks
+				{0} smagumspēku
+				{0} smagumspēks
+				{0} smagumspēks
 			
 			
-				metri sekundē kvadrātā
-				{0} metru sekundē kvadrāta
-				{0} metrs sekundē kvadrātā
-				{0} metri sekundē kvadrātā
+				metri kvadrātsekundē
+				{0} metru kvadrātsekundē
+				{0} metrs kvadrātsekundē
+				{0} metri kvadrātsekundē
 			
 			
 				apgrieziens
@@ -6823,8 +6957,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} uz kvadrātcollu
 			
 			
-				dunams
-				{0} dunams
+				{0} dunamu
 				{0} dunams
 				{0} dunami
 			
@@ -6835,10 +6968,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karāti
 			
 			
-				miligrami uz dekalitru
-				{0} miligramu uz dekalitru
-				{0} miligrams uz dekalitru
-				{0} miligrami uz dekalitru
+				miligrami uz decilitru
+				{0} miligramu uz decilitru
+				{0} miligrams uz decilitru
+				{0} miligrami uz decilitru
 			
 			
 				milimoli uz litru
@@ -6853,26 +6986,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} miljonās daļas
 			
 			
-				procents
-				{0} procents
-				{0} procents
-				{0} procents
+				procents
+				{0} procentu
+				{0} procents
+				{0} procenti
 			
 			
-				promile
-				{0} promile
-				{0} promile
-				{0} promile
+				promile
+				{0} promiļu
+				{0} promile
+				{0} promiles
 			
 			
 				promiriāde
 				{0}‱
-				{0}‱
-				{0}‱
+				{0} promiriāde
+				{0} promiriādes
 			
 			
 				moli
-				{0} mol
+				{0} molu
 				{0} mols
 				{0} moli
 			
@@ -6889,22 +7022,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} litri uz 100 kilometriem
 			
 			
-				jūdzes ar galonu
-				{0} jūdžu ar galonu
-				{0} jūdze ar galonu
-				{0} jūdzes ar galonu
+				jūdzes uz galonu
+				{0} jūdžu uz galonu
+				{0} jūdze uz galonu
+				{0} jūdzes uz galonu
 			
 			
-				jūdzes ar imp. galonu
-				{0} jūdžu ar imp. galonu
-				{0} jūdze ar imp. galonu
-				{0} jūdzes ar imp. galonu
+				jūdzes uz britu galonu
+				{0} jūdžu uz britu galonu
+				{0} jūdze uz britu galonu
+				{0} jūdzes uz britu galonu
 			
 			
-				petabaiti
-				{0} PB
-				{0} petabaitu
-				{0} petabaiti
+				petabaiti
+				{0} petabaitu
+				{0} petabaits
+				{0} petabaiti
 			
 			
 				terabaiti
@@ -6972,6 +7105,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gadsimts
 				{0} gadsimti
 			
+			
+				dekādes
+				{0} dekāžu
+				{0} dekāde
+				{0} dekādes
+			
 			
 				gadi
 				{0} gadu
@@ -7101,19 +7240,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektronvolti
-				{0} eV
+				{0} elektronvoltu
 				{0} elektronvolts
 				{0} elektronvolti
 			
 			
-				britu termālās vienības
-				{0} Btu
-				{0} britu termālā vienība
-				{0} britu termālās vienības
+				britu termiskās mērvienības
+				{0} britu termisko mērvienību
+				{0} britu termiskā mērvienība
+				{0} britu termiskās mērvienības
+			
+			
+				ASV termiskās vienības
+				{0} ASV termisko vienību
+				{0} ASV termiskā vienība
+				{0} ASV termiskās vienības
 			
 			
 				jaudas māciņas
-				{0} lbf
+				{0} jaudas mārciņu
 				{0} jaudas mārciņa
 				{0} jaudas mārciņas
 			
@@ -7147,6 +7292,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hercs
 				{0} herci
 			
+			
+				pikseļi
+				{0} px
+				{0} pikselis
+				{0} pikseļi
+			
+			
+				megapikseļi
+				{0} MP
+				{0} megapikselis
+				{0} megapikseļi
+			
+			
+				pikseļi centimetrā
+				{0} ppcm
+				{0} pikselis centimetrā
+				{0} pikseļi centimetrā
+			
+			
+				pikseļi collā
+				{0} ppi
+				{0} pikselis collā
+				{0} pikseļi collā
+			
+			
+				punkti centimetrā
+				{0} dpc
+				{0} punkts centimetrā
+				{0} punkti centimetrā
+			
+			
+				punkti collā
+				{0} dpi
+				{0} punkts collā
+				{0} punkti collā
+			
 			
 				kilometri
 				{0} kilometru
@@ -7288,7 +7469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Saules starjauda
 				{0} L☉
 				{0} Saules starjauda
-				{0} Saules starjauda
+				{0} Saules starjaudas
 			
 			
 				metriskās tonnas
@@ -7301,14 +7482,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilogramu
 				{0} kilograms
 				{0} kilogrami
-				{0}/kg
+				{0} uz kilogramu
 			
 			
 				grami
 				{0} gramu
 				{0} grams
 				{0} grami
-				{0}/g
+				{0} uz gramu
 			
 			
 				miligrami
@@ -7339,14 +7520,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mārciņu
 				{0} mārciņa
 				{0} mārciņas
-				{0}/mārc.
+				{0} uz mārciņu
 			
 			
 				unces
 				{0} unču
 				{0} unce
 				{0} unces
-				{0}/unce
+				{0} uz unci
 			
 			
 				Trojas unces
@@ -7414,17 +7595,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} zirgspēks
 				{0} zirgspēki
 			
-			
-				hektopaskāli
-				{0} hektopaskālu
-				{0} hektopaskāls
-				{0} hektopaskāli
-			
 			
-				dzīvsudraba staba milimetri
-				{0} dzīvsudraba staba milimetru
-				{0} dzīvsudraba staba milimetrs
-				{0} dzīvsudraba staba milimetri
+				dzīvsudraba stabiņa milimetri
+				{0} dzīvsudraba stabiņa milimetru
+				{0} dzīvsudraba stabiņa milimetrs
+				{0} dzīvsudraba stabiņa milimetri
 			
 			
 				mārciņas uz kvadrātcollu
@@ -7433,10 +7608,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mārciņas uz kvadrātcollu
 			
 			
-				dzīvsudraba staba collas
-				{0} dzīvsudraba staba collu
-				{0} dzīvsudraba staba colla
-				{0} dzīvsudraba staba collas
+				dzīvsudraba stabiņa collas
+				{0} dzīvsudraba stabiņa collu
+				{0} dzīvsudraba stabiņa colla
+				{0} dzīvsudraba stabiņa collas
+			
+			
+				bāri
+				{0} bāru
+				{0} bārs
+				{0} bāri
 			
 			
 				milibāri
@@ -7445,10 +7626,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} milibāri
 			
 			
-				atmosfēras
-				{0} atm
-				{0} atmosfēra
-				{0} atmosfēras
+				atmosfēras
+				{0} atmosfēras
+				{0} atmosfēra
+				{0} atmosfēras
+			
+			
+				paskāli
+				{0} paskālu
+				{0} paskāls
+				{0} paskāli
+			
+			
+				hektopaskāli
+				{0} hektopaskālu
+				{0} hektopaskāls
+				{0} hektopaskāli
 			
 			
 				kilopaskāli
@@ -7511,14 +7704,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvini
 			
 			
-				mārciņu pēdas
-				{0} mārciņu pēdas
-				{0} mārciņu pēda
-				{0} mārciņu pēdas
+				mārciņpēda
+				{0} mārciņpēdu
+				{0} mārciņpēda
+				{0} mārciņpēdas
 			
 			
 				ņūtonmetri
-				{0} N⋅m
+				{0} ņūtonmetru
 				{0} ņūtonmetrs
 				{0} ņūtonmetri
 			
@@ -7599,7 +7792,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mililitri
-				{0} milimitru
+				{0} mililitru
 				{0} mililitrs
 				{0} mililitri
 			
@@ -7626,14 +7819,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} galonu
 				{0} galons
 				{0} galoni
-				{0}/gal.
+				{0} uz galonu
 			
 			
-				imperiālie galoni
-				{0} imperiālo galonu
-				{0} imperiālais galons
-				{0} imperiālie galoni
-				{0} uz imperiālo galonu
+				britu galoni
+				{0} britu galonu
+				{0} britu galons
+				{0} britu galoni
+				{0} uz britu galonu
 			
 			
 				kvartas
@@ -7660,8 +7853,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} šķidruma unces
 			
 			
-				britu šķidruma unces
-				{0} britu šķidruma unces
+				britu šķidruma unces
+				{0} britu šķidruma unču
 				{0} britu šķidruma unce
 				{0} britu šķidruma unces
 			
@@ -7684,7 +7877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bareli
 			
 			
-				debespuse
+				debespuse
 				{0}A
 				{0}Z
 				{0}D
@@ -7696,13 +7889,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/{1}
 			
 			
-				Brīvās krišanas paātrinājums:
+				smagumspēks
 				{0} G
 				{0} G
 				{0} G
 			
 			
-				m/s²
+				metri kvadrātsekundē
 				{0} m/s²
 				{0} m/s²
 				{0} m/s²
@@ -7714,7 +7907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} apgr.
 			
 			
-				rad
+				radiāni
 				{0} rad
 				{0} rad
 				{0} rad
@@ -7726,13 +7919,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°
 			
 			
-				′
+				leņķa minūtes
 				{0}′
 				{0}′
 				{0}′
 			
 			
-				″
+				leņķa sekundes
 				{0}″
 				{0}″
 				{0}″
@@ -7772,7 +7965,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/mi²
 			
 			
-				ac
+				akri
 				{0} ac
 				{0} ac
 				{0} ac
@@ -7794,11 +7987,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in²
 				{0} in²
 				{0} in²
-				{0} uz collu²
 			
 			
 				dunami
-				{0} dunami
+				{0} dunamu
 				{0} dunams
 				{0} dunami
 			
@@ -7809,10 +8001,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kt
 			
 			
-				mg/dL
-				{0} mg/dL
-				{0} mg/dL
-				{0} mg/dL
+				mg/dl
+				{0} mg/dl
+				{0} mg/dl
+				{0} mg/dl
 			
 			
 				mmol/L
@@ -7821,16 +8013,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/L
 			
 			
-				ppm
+				miljonās daļas
 				{0} ppm
 				{0} ppm
 				{0} ppm
 			
 			
-				procents
+				procents
+				{0}%
+				{0}%
+				{0}%
 			
 			
-				promile
+				promile
+				{0}‰
+				{0}‰
+				{0}‰
 			
 			
 				promiriāde
@@ -7857,7 +8055,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l/100 km
 			
 			
-				mpg
+				jūdzes uz galonu
 				{0} mpg
 				{0} mpg
 				{0} mpg
@@ -7868,6 +8066,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg Imp.
 				{0} mpg Imp.
 			
+			
+				PB
+				{0} PB
+				{0} PB
+				{0} PB
+			
 			
 				TB
 				{0} TB
@@ -7934,6 +8138,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gs.
 				{0} gs.
 			
+			
+				dek
+				{0} dek
+				{0} dek
+				{0} dek
+			
 			
 				g.
 				{0} g.
@@ -7967,13 +8177,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} st.
 				{0} st.
 				{0} st.
-				{0}/st.
 			
 			
 				min.
 				{0} min.
 				{0} min.
-				{0} min.
+				{0} min
 				{0}/min.
 			
 			
@@ -8014,13 +8223,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mA
 			
 			
-				Ω
+				omi
 				{0} Ω
 				{0} Ω
 				{0} Ω
 			
 			
-				V
+				volti
 				{0} V
 				{0} V
 				{0} V
@@ -8050,7 +8259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kJ
 			
 			
-				J
+				džouli
 				{0} J
 				{0} J
 				{0} J
@@ -8068,7 +8277,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eV
 			
 			
-				BTU
 				{0} Btu
 				{0} Btu
 				{0} Btu
@@ -8109,8 +8317,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				pikseļi
+			
+			
+				megapikseļi
+			
+			
+				dpc
+				{0} dpc
+				{0} dpc
+				{0} dpc
+			
 			
-				kilometri
 				{0} km
 				{0} km
 				{0} km
@@ -8174,23 +8393,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				pēdas
-				{0} pēdas
-				{0} pēda
-				{0} pēdas
-				{0}/pēda
+				{0} ft
+				{0} ft
+				{0} ft
 			
 			
-				colla
-				{0} collas
-				{0} colla
-				{0} collas
-				{0}/colla
+				collas
 			
 			
 				parseki
-				{0} parseki
-				{0} parseks
-				{0} parseki
+				{0} pc
+				{0} pc
+				{0} pc
 			
 			
 				g.g.
@@ -8217,10 +8431,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fatomi
 			
 			
-				jūras jūdzes
-				{0} jūras jūdzes
-				{0} jūras jūdze
-				{0} jūras jūdzes
+				{0} nmi
+				{0} nmi
+				{0} nmi
 			
 			
 				skandināvu jūdze
@@ -8229,19 +8442,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} skandināvu jūdzes
 			
 			
-				pk.
+				punkti
 				{0} pk.
 				{0} pk.
 				{0} pk.
 			
 			
-				Saules rādiuss
+				Saules rādiusi
 				{0} R☉
 				{0} R☉
 				{0} R☉
 			
 			
-				lx
+				lukss
 				{0} lx
 				{0} lx
 				{0} lx
@@ -8266,7 +8479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/kg
 			
 			
-				g
+				grami
 				{0} g
 				{0} g
 				{0} g
@@ -8297,11 +8510,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} stouni
 			
 			
-				mārc.
-				{0} mārc.
-				{0} mārc.
-				{0} mārc.
-				{0}/mārc.
+				mārciņas
+				{0} lb
+				{0} lb
+				{0} lb
 			
 			
 				unces
@@ -8359,7 +8571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kW
 			
 			
-				W
+				vati
 				{0} W
 				{0} W
 				{0} W
@@ -8376,12 +8588,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ZS
 				{0} ZS
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -8406,6 +8612,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				atm
+				{0} atm
+				{0} atm
+				{0} atm
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8438,9 +8656,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mezgls
-				{0} mezgli
-				{0} mezgls
-				{0} mezgli
 			
 			
 				°
@@ -8467,7 +8682,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				mārc. pēda
+				mārciņpēda
 				{0} mārc. pēdas
 				{0} mārc. pēda
 				{0} mārc. pēdas
@@ -8585,11 +8800,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/gal.
 			
 			
-				imp. gal.
-				{0} imp. gal.
-				{0} imp. gal.
-				{0} imp. gal.
-				{0}/imp. gal.
+				britu galons
+				{0} britu galonu
+				{0} britu galons
+				{0} britu galoni
+				{0}/britu galonu
 			
 			
 				qt
@@ -8598,13 +8813,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} qt
 			
 			
-				pt
+				pintes
 				{0} pt
 				{0} pt
 				{0} pt
 			
 			
-				gl.
+				glāzes
 				{0} gl.
 				{0} gl.
 				{0} gl.
@@ -8617,7 +8832,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				britu šķidr. unces
-				{0} britu šķidr. unces
+				{0} britu šķidr. unču
 				{0} britu šķidr. unce
 				{0} britu šķidr. unces
 			
@@ -8640,7 +8855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bbl
 			
 			
-				debespuse
+				debespuse
 				{0}A
 				{0}Z
 				{0}D
@@ -8703,7 +8918,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ft²
 			
 			
-				procents
+				procents
+				{0}%
+				{0}%
+				{0}%
 			
 			
 				l/100 km
@@ -8740,59 +8958,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				d.
-				{0}d
-				{0}d
-				{0}d
 				{0}/d.
 			
 			
 				h
-				{0}h
-				{0}h
-				{0}h
+				{0} h
+				{0} h
+				{0} h
 			
 			
 				min
-				{0}min
-				{0}min
-				{0}min
+				{0} min
+				{0} min
+				{0} min
 				{0}/min.
 			
 			
 				s
-				{0}s
-				{0}s
-				{0}s
+				{0} s
+				{0} s
+				{0} s
 			
 			
 				ms
-				{0}ms
-				{0}ms
-				{0}ms
 			
 			
 				km
-				{0}km
-				{0}km
-				{0}km
 			
 			
 				m
-				{0}m
-				{0}m
-				{0}m
 			
 			
 				cm
-				{0}cm
+				{0} cm
 				{0}cm
-				{0}cm
+				{0} cm
 			
 			
 				mm
-				{0}mm
+				{0} mm
 				{0}mm
-				{0}mm
+				{0} mm
 			
 			
 				{0}pm
@@ -8875,15 +9081,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				kg
-				{0}kg
-				{0}kg
-				{0}kg
 			
 			
-				g
-				{0}g
-				{0}g
-				{0}g
+				grams
 			
 			
 				tonnas
@@ -8932,11 +9132,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ZS
 				{0} ZS
 			
-			
-				{0}hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -8953,11 +9148,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/h
 				{0}km/h
-				{0}km/h
-				{0}km/h
+				{0} km/h
+				{0} km/h
 			
 			
 				{0}m/s
@@ -9000,11 +9200,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				l
 				{0}l
-				{0}l
-				{0}l
+				{0} l
+				{0} l
 			
 			
-				debespuse
+				debespuse
 				{0}A
 				{0}Z
 				{0}D
@@ -9034,12 +9234,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} vai {1}
 			{0} vai {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} un {1}
-			{0} un {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
@@ -9102,7 +9296,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		drukas ornamenti
 		okultie simboli
 		lejupvērstās bultiņas
-		augšupvērstās bultiņas
+		lejupvērstās un augšupvērstās bultiņas
 		Austrumāzijas rakstības
 		emocijzīmes
 		Eiropas rakstības
@@ -9123,8 +9317,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		sirds
 		vēsturiskās rakstības
 		hieroglifus aprakstošie simboli
-		japāņu hana
-		kambuns
+		japāņu kana
 		kandži
 		taustiņš
 		pa kreisi vērstās bultiņas
@@ -9166,7 +9359,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		ceļojumi un vietas
 		augšupvērstās bultiņas
 		variantu formas
-		skanīgie džamo
+		vokāliskie džamo
 		laikapstākļi
 		Rietumāzijas rakstības
 		nedrukājama rakstzīme
@@ -9178,22 +9371,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		platums
 		svars
 		kursīvs
-		paraksts
+		paraksts
 		teksts
 		titulburtu litera
 		attēlojums
-		plakāts
+		plakāts
 		pretējs slīpraksts
 		taisns
 		slīps
 		īpaši slīps
-		ultrakondensēts
+		galēji sablīvēts
 		ultrasaspiests
 		īpaši šaurs
-		īpaši kondensēts
+		īpaši sablīvēts
 		īpaši saspiests
 		īpaši šaurs
-		kondensēts
+		sablīvēts
 		saspiests
 		saspiests
 		daļēji saspiests
@@ -9203,42 +9396,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		pusizvērsts
 		puspaplašināts
 		pusplats
-		izvērsts
+		izvērsts
 		paplašināts
 		plats
-		īpaši izvērsts
+		īpaši izvērsts
 		īpaši paplašināts
 		īpaši plats
 		ultraizvērsts
 		ultrapaplašināts
 		ultraplats
 		plāns
-		īpaši šaurs
+		īpaši šaurs
 		ultraviegls
-		viegls
-		pusviegls
-		grāmata
-		regulārs
+		šaurs
+		pusšaurs
+		grāmata
+		parasts
 		vidējs
 		pustrekns
 		pustrekns
 		treknraksts
 		īpaši trekns
 		melns
-		smags
-		īpaši melns
+		biezs
+		īpaši melns
 		pilnīgi melns
-		īpaši smags
+		īpaši biezs
 		vertikāli daļskaitļi
-		lielo burtu atstarpes
+		lielo burtu atstarpes
 		izvēles ligatūras
 		diagonāli daļskaitļi
 		vienādaugstuma cipari
 		senlaicīgi cipari
 		kārtas skaitļi
-		proporcionāli cipari
+		proporcionāli cipari
 		kapiteļi
 		tabulas cipari
-		pārsvītrota nulle
+		pārsvītrota nulle
 	
 
diff --git a/make/data/cldr/common/main/lv_LV.xml b/make/data/cldr/common/main/lv_LV.xml
index d17f95578d2..a85090a5025 100644
--- a/make/data/cldr/common/main/lv_LV.xml
+++ b/make/data/cldr/common/main/lv_LV.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mas.xml b/make/data/cldr/common/main/mas.xml
index b94bf2c7628..87a4d62fe2a 100644
--- a/make/data/cldr/common/main/mas.xml
+++ b/make/data/cldr/common/main/mas.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/mas_KE.xml b/make/data/cldr/common/main/mas_KE.xml
index b3d74d7b17e..b029698582b 100644
--- a/make/data/cldr/common/main/mas_KE.xml
+++ b/make/data/cldr/common/main/mas_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mas_TZ.xml b/make/data/cldr/common/main/mas_TZ.xml
index ff3ef55980c..6acb1307c84 100644
--- a/make/data/cldr/common/main/mas_TZ.xml
+++ b/make/data/cldr/common/main/mas_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mer.xml b/make/data/cldr/common/main/mer.xml
index f053dff4b6d..feb2b7d62e1 100644
--- a/make/data/cldr/common/main/mer.xml
+++ b/make/data/cldr/common/main/mer.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Madagasika
 			Aĩrandi cia Marshal
-			Macedonia
 			Mali
 			Myanima
 			Mongolia
diff --git a/make/data/cldr/common/main/mer_KE.xml b/make/data/cldr/common/main/mer_KE.xml
index 46ddbddd079..eefc4983454 100644
--- a/make/data/cldr/common/main/mer_KE.xml
+++ b/make/data/cldr/common/main/mer_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mfe.xml b/make/data/cldr/common/main/mfe.xml
index 08118804b75..3e6f9ead3fa 100644
--- a/make/data/cldr/common/main/mfe.xml
+++ b/make/data/cldr/common/main/mfe.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldavi
 			Madagaskar
 			Zil Marshall
-			Masedwann
 			Mali
 			Myanmar
 			Mongoli
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a b c d e f g h i j k l m n o p r s t u v w x y z]
 		[A B C D E F G H I J K L M N O P R S T U V W X Y Z]
-		[  \- . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/mfe_MU.xml b/make/data/cldr/common/main/mfe_MU.xml
index aa7721e2d7f..1669a931b31 100644
--- a/make/data/cldr/common/main/mfe_MU.xml
+++ b/make/data/cldr/common/main/mfe_MU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mg.xml b/make/data/cldr/common/main/mg.xml
index 909f766d622..ecf03403eef 100644
--- a/make/data/cldr/common/main/mg.xml
+++ b/make/data/cldr/common/main/mg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Môldavia
 			Madagasikara
 			Nosy Marshall
-			Makedonia
 			Mali
 			Myanmar
 			Môngôlia
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a à â b d e é è ê ë f g h i ì î ï j k l m n ñ o ô p r s t v y z]
 		[c q u w x]
 		[A B D E F G H I J K L M N O P R S T V Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/mg_MG.xml b/make/data/cldr/common/main/mg_MG.xml
index bb3773d5c1f..b40e695071c 100644
--- a/make/data/cldr/common/main/mg_MG.xml
+++ b/make/data/cldr/common/main/mg_MG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mgh.xml b/make/data/cldr/common/main/mgh.xml
index 8dc8872c4e1..314d428d8b5 100644
--- a/make/data/cldr/common/main/mgh.xml
+++ b/make/data/cldr/common/main/mgh.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -132,7 +132,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Ulibya
 			Umantegro
 			Ubukini
-			Umasedonia
 			Umalawi
 			Umozambiki
 			Unijeri
@@ -201,7 +200,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c d e f g h i j k l m n o p r s t u v w y z]
 		[q x]
 		[A B C D E F G H I J K L M N O P R S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/mgh_MZ.xml b/make/data/cldr/common/main/mgh_MZ.xml
index 0ac629db017..eac5de9e81c 100644
--- a/make/data/cldr/common/main/mgh_MZ.xml
+++ b/make/data/cldr/common/main/mgh_MZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mgo.xml b/make/data/cldr/common/main/mgo.xml
index b790649b671..5066212d972 100644
--- a/make/data/cldr/common/main/mgo.xml
+++ b/make/data/cldr/common/main/mgo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -38,7 +38,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a à b {ch} d e è ə {ə\u0300} f g {gh} i ì j k m n ŋ o ò ɔ {ɔ\u0300} p r s t u ù w y z ʼ]
 		[c h l q v x]
 		[A B {CH} D E Ə F G {GH} I J K M N Ŋ O Ɔ P R S T U W Y Z ʼ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[, ; \: ! ? . ' ‘ ’ " “ ”]
 		{0}…
 		…{0}
diff --git a/make/data/cldr/common/main/mgo_CM.xml b/make/data/cldr/common/main/mgo_CM.xml
index ab0ca5380f2..5e16e254ee9 100644
--- a/make/data/cldr/common/main/mgo_CM.xml
+++ b/make/data/cldr/common/main/mgo_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mi.xml b/make/data/cldr/common/main/mi.xml
index 1e3654c74a6..fc7a8a17589 100644
--- a/make/data/cldr/common/main/mi.xml
+++ b/make/data/cldr/common/main/mi.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -43,6 +43,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Ruhiana
 			Reo Tē Mōhiotia
 			Hainamana
+			Hainamana Manarini
 			Hainamana Māmā
 			Hainamana Tukuiho
 		
@@ -83,9 +84,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			US
 		
 		
-			{0}
-			{0}
-			{0}
+			Reo: {0}
+			Momotuhi: {0}
+			Rohe: {0}
 		
 	
 	
@@ -118,22 +119,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
-							G y MMMM d, EEEE
+							EEEE, d MMMM y G
 						
 					
 					
 						
-							G y MMMM d
+							d MMMM y G
 						
 					
 					
 						
-							G y MMM d
+							d MMM y G
 						
 					
 					
 						
-							GGGGG y-MM-dd
+							dd-MM-y GGGGG
 						
 					
 				
@@ -467,32 +468,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						BCE
+						BCE
 						CE
+						CE
 					
 					
 						BCE
+						BCE
 						CE
+						CE
 					
 				
 				
 					
 						
-							y MMMM d, EEEE
+							EEEE, d MMMM y
 						
 					
 					
 						
-							y MMMM d
+							d MMMM y
 						
 					
 					
 						
-							y MMM d
+							d MMM y
 						
 					
 					
 						
-							y-MM-dd
+							dd-MM-y
 						
 					
 				
@@ -509,12 +514,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							h:mm:ss
+							h:mm:ss a
 						
 					
 					
 						
-							h:mm
+							h:mm a
 						
 					
 				
@@ -539,6 +544,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							{1} {0}
 						
 					
+					
+						h B
+						h:mm B
+						h:mm:ss B
+						d
+						ccc
+						E h:mm B
+						E h:mm:ss B
+						E, d
+						E h:mm a
+						E h:mm:ss a
+						y G
+						MMM y G
+						d MMM y G
+						E, d MMM y G
+						h a
+						h:mm a
+						h:mm:ss a
+						h:mm:ss a v
+						h:mm a v
+						L
+						dd-MM
+						E, dd-MM
+						LLL
+						d MMM
+						E, d MMM
+						d MMMM
+						'wiki' W 'o' MMMM
+						y
+						MM-y
+						dd-MM-y
+						E, dd-MM-y
+						MMM y
+						d MMM y
+						E, d MMM y
+						MMMM y
+						QQQ y
+						QQQQ y
+						'wiki' w 'o' Y
+					
 					
 						{0} ki te {1}
 					
@@ -846,11 +891,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		latn
-		
-			latn
-		
-		1
 		
 			.
 			,
@@ -947,183 +987,128 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ANG
 				ANG
-				ANG
 			
 			
 				ARS
 				ARS
-				ARS
-				$
 			
 			
 				AWG
 				AWG
-				AWG
 			
 			
 				BBD
 				BBD
-				BBD
-				$
 			
 			
 				BMD
 				BMD
-				BMD
-				$
 			
 			
 				Real Parahi
-				Ngā real Parahi
-				R$
-				R$
+				real Parahi
 			
 			
 				BSD
 				BSD
-				BSD
-				$
 			
 			
 				BZD
 				BZD
-				BZD
-				$
 			
 			
 				CAD
 				CAD
-				CA$
-				$
 			
 			
 				Yuan Haina
-				Yuan Haina
-				CN¥
-				¥
+				yuan Haina
 			
 			
 				CRC
 				CRC
-				CRC
-				₡
 			
 			
 				CUC
 				CUC
-				CUC
-				$
 			
 			
 				CUP
 				CUP
-				CUP
-				$
 			
 			
 				DOP
 				DOP
-				DOP
-				$
 			
 			
 				Euro
-				euros
-				€
-				€
+				euro
 			
 			
 				Pāuna Piritene
-				Ngā pāuna Piritene
-				£
-				£
+				pāuna Piritene
 			
 			
 				GTQ
 				GTQ
-				GTQ
-				Q
 			
 			
 				HNL
 				HNL
-				HNL
-				L
 			
 			
 				HTG
 				HTG
-				HTG
 			
 			
-				Rupee Iniana
-				Ngā rupee Iniana
-				₹
-				₹
+				Rupī Iniana
+				rupī Iniana
 			
 			
 				JMD
 				JMD
-				JMD
-				$
 			
 			
 				Yen Hapanihi
-				Yen Hapanihi
+				yen Hapanihi
 				¥
-				¥
 			
 			
 				KYD
 				KYD
-				KYD
-				$
 			
 			
 				MXN
 				MXN
-				MX$
-				$
 			
 			
 				NIO
 				NIO
-				NIO
-				C$
 			
 			
 				Tāra o Aotearoa
-				Ngā tāra o Aotearoa
+				tāra o Aotearoa
 				$
 			
 			
 				PAB
 				PAB
-				PAB
 			
 			
 				Rūpera Ruhiana
-				Ngā rūpera Ruhiana
-				RUB
-				₽
+				rūpera Ruhiana
 			
 			
 				TTD
 				TTD
-				TTD
-				$
 			
 			
 				Tāra US
-				Ngā tāra US
-				US$
-				$
+				tāra US
 			
 			
 				XCD
 				XCD
-				EC$
-				$
 			
 			
 				Moni Tē Mōhiotia
diff --git a/make/data/cldr/common/main/mi_NZ.xml b/make/data/cldr/common/main/mi_NZ.xml
index 64b83d05026..fe2c8144a39 100644
--- a/make/data/cldr/common/main/mi_NZ.xml
+++ b/make/data/cldr/common/main/mi_NZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mk.xml b/make/data/cldr/common/main/mk.xml
index 9a93015d2e7..070b82f3f15 100644
--- a/make/data/cldr/common/main/mk.xml
+++ b/make/data/cldr/common/main/mk.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -106,7 +106,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			карипски
 			кајуга
 			ацам
-			чакмански
+			чакмански
 			чеченски
 			себуански
 			чига
@@ -168,7 +168,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			британски англиски
 			англиски (во ОК)
 			американски англиски
-			англиски (САД)
 			средноанглиски
 			есперанто
 			шпански
@@ -624,6 +623,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			јорупски
 			њенгату
 			кантонски
+			кинески, кантонски
 			џуаншки
 			запотечки
 			блиссимболи
@@ -631,8 +631,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			зенага
 			стандарден марокански тамазитски
 			кинески
+			кинески, мандарински
 			поедноставен кинески
+			поедноставен мандарински
 			традиционален кинески
+			традиционален мандарински
 			зулу
 			зуни
 			без лингвистичка содржина
@@ -1071,6 +1074,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Свети Мартин
 			Сирија
 			Свазиленд
+			Свазиленд
 			Тристан да Куња
 			Острови Туркс и Каикос
 			Чад
@@ -1107,8 +1111,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Валис и Футуна
 			Самоа
-			псевдо-акценти
-			псевдо-биди
+			псевдо-акценти
+			псевдо-биди
 			Косово
 			Јемен
 			Мајот
@@ -1202,7 +1206,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Јапонски броеви
 			Јапонски финансиски броеви
 			Кмерски цифри
-			Канада цифри
+			Каннада цифри
 			Лаошки цифри
 			Арапски броеви
 			Малајаламски цифри
@@ -1231,8 +1235,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б в г д ѓ е ж з ѕ и ј к л љ м н њ о п р с т ќ у ф х ц ч џ ш]
 		[ѐ ѝ]
 		[А Б В Г Д Ѓ Е Ж З Ѕ И Ј К Л Љ М Н Њ О П Р С Т Ќ У Ф Х Ц Ч Џ Ш]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] \{ \}]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1246,8 +1250,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
+			['ʼ՚᾽᾿’＇]
+			[%٪﹪％]
+			[؉‰]
 			[\$﹩＄$]
 			[£₤]
+			[¥￥]
+			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1660,53 +1669,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						{0} - {1}
 						
 							h B – h B
-							h – h B
+							h – h B
 						
 						
 							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
+							h:mm – h:mm B
+							h:mm – h:mm B
 						
 						
 							d–d
 						
 						
-							G y – G y
-							G y – y
+							G y – G y
+							G y – y
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							GGGGG y-MM – GGGGG y-MM
+							GGGGG y-MM – y-MM
+							GGGGG y-MM – y-MM
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – GGGGG y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
 						
 						
-							G y MMM – G y MMM
-							G y MMM – MMM
-							G y MMM – y MMM
+							G y MMM – G y MMM
+							G y MMM – MMM
+							G y MMM – y MMM
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							G y MMM d–d
+							G y MMM d – G y MMM d
+							G y MMM d – MMM d
+							G y MMM d – y MMM d
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							G y MMM d, E – MMM d, E
+							G y MMM d, E – G y MMM d, E
+							G y MMM d, E – MMM d, E
+							G y MMM d, E – y MMM d, E
 						
 						
 							h a – h a
@@ -2097,7 +2106,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						пр.н.е.
 						п.н.е.
 						н.е.
-						CE
+						н.е.
 					
 					
 						пр.н.е.
@@ -2107,22 +2116,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							EEEE, dd MMMM y
+							EEEE, d MMMM y
 						
 					
 					
 						
-							dd MMMM y
+							d MMMM y
 						
 					
 					
 						
-							dd.M.y
+							d.M.y
 						
 					
 					
 						
-							dd.M.yy
+							d.M.yy
 						
 					
 				
@@ -2184,8 +2193,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E HH:mm:ss
 						y G
 						MMM y G
-						dd MMM y G
-						E, dd MMM y G
+						d MMM y G
+						E, d MMM y G
 						h a
 						HH
 						h:mm a
@@ -2198,15 +2207,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						HH:mm v
 						L
 						d.M
-						dd.M
+						d.M
 						E, d.M
 						LLL
 						d MMM
 						E, d MMM
 						d MMMM
 						E, d MMMM
-						W 'седмица' 'од' MMMM
-						W 'седмица' 'од' MMMM
+						W. 'седмица' 'од' MMMM
+						W. 'седмица' 'од' MMMM
 						mm:ss
 						y
 						M.y
@@ -2227,54 +2236,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} - {1}
 						
-							h B – h B
 							h – h B
 						
 						
 							h:mm B – h:mm B
 							h:mm – h:mm B
-							h:mm – h:mm B
+							h:mm – h:mm B
 						
 						
 							d – d
 						
 						
-							G y – G y
-							G y – y
+							G y – G y
+							G y – y
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							GGGGG y-MM – GGGGG y-MM
+							GGGGG y-MM – y-MM
+							GGGGG y-MM – y-MM
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – GGGGG y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
+							GGGGG y-MM-dd – y-MM-dd
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
+							GGGGG y-MM-dd, E – y-MM-dd, E
 						
 						
-							G y MMM – G y MMM
-							G y MMM – MMM
-							G y MMM – y MMM
+							G y MMM – G y MMM
+							G y MMM – MMM
+							G y MMM – y MMM
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							G y MMM d–d
+							G y MMM d – G y MMM d
+							G y MMM d – MMM d
+							G y MMM d – y MMM d
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							G y MMM d, E – MMM d, E
+							G y MMM d, E – G y MMM d, E
+							G y MMM d, E – MMM d, E
+							G y MMM d, E – y MMM d, E
 						
 						
 							h a – h a
@@ -2924,9 +2932,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				год.
-				минатата година
-				оваа година
-				следната година
+				минатата год.
+				оваа год.
+				следната год.
 				
 					за {0} год.
 					за {0} год.
@@ -2938,9 +2946,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				год.
-				минатата година
-				оваа година
-				следната година
+				минатата год.
+				оваа год.
+				следната год.
 				
 					за {0} год.
 					за {0} год.
@@ -4243,7 +4251,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Актобе
 			
 			
-				Костанај
+				Костанај
 			
 			
 				Кизилорда
@@ -5787,6 +5795,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			,
 			.
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5795,6 +5805,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 илјада
@@ -5862,7 +5877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			
 				
-					#,##0%
+					#,##0 %
 				
 			
 		
@@ -5914,6 +5929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Дирхам на Обединети Арапски Емирати
 				Дирхам на Обединети Арапски Емирати
 				Дирхами на Обединети Арапски Емирати
+				AED
 			
 			
 				Авгани (1927–2002)
@@ -5922,26 +5938,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Авганистански авгани
 				Авгани
 				Авгани
+				AFN
 			
 			
 				Албански лек
 				Албански лек
 				Албански леки
+				ALL
 			
 			
 				Ерменски драм
 				Ерменски драм
 				Ерменски драми
+				AMD
 			
 			
 				Холандски антилски гилдер
 				Холандски антилски гилдер
 				Холандски антилски гилдери
+				ANG
 			
 			
-				Анголска Кванза
-				Анголска Кванза
+				Анголска кванза
+				Анголска кванза
 				Анголски кванзи
+				AOA
 				Kz
 			
 			
@@ -5957,6 +5978,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Аргентински пезос
 				Аргентински пезос
 				Аргентински пезоси
+				ARS
 				$
 			
 			
@@ -5972,32 +5994,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Арубиски флорин
 				Арубиски флорин
-				Арубиски флорин
+				Арубиски флорини
+				AWG
 			
 			
 				Азербејџански манат
 				Азербејџански манат
 				Азербејџански манати
+				AZN
 			
 			
 				Босанско-Херцеговски Динар
 			
 			
-				Босанско-Херцеговска конвертибилна марка
-				Босанско-Херцеговска конвертибилна марка
-				Босанско-Херцеговски конвертибилни марки
+				Босанско-херцеговска конвертибилна марка
+				Босанско-херцеговска конвертибилна марка
+				Босанско-херцеговски конвертибилни марки
+				BAM
 				KM
 			
 			
 				Барбадоски долар
 				Барбадоски долар
 				Барбадоски долари
+				BBD
 				$
 			
 			
 				Бангладешка така
 				Бангладешка така
 				Бангладешки таки
+				BDT
 				৳
 			
 			
@@ -6016,56 +6043,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Бугарски лев
 				Бугарски лев
 				Бугарски левови
+				BGN
 			
 			
 				Бахреински динар
 				Бахреински динар
 				Бахреински динари
+				BHD
 			
 			
 				Бурундиски франк
 				Бурундиски франк
 				Бурундиски франци
+				BIF
 			
 			
 				Бермудски долар
-				Бермудски долари
+				Бермудски долар
 				Бермудски долари
+				BMD
 				$
 			
 			
 				Брунејски долар
 				Брунејски долар
-				Брунејски долар
+				Брунејски долари
+				BND
 				$
 			
 			
 				Боливиски боливиано
 				Боливиски боливиано
 				Боливиски боливиани
+				BOB
 				Bs
 			
 			
 				Бразилски реал
 				Бразилски реал
 				Бразилски реали
+				R$
 				R$
 			
 			
 				Бахамски долар
-				Бахамски долари
+				Бахамски долар
 				Бахамски долари
+				BSD
 				$
 			
 			
 				Бутански нгултрум
 				Бутански нгултрум
 				Бутански нгултруми
+				BTN
 			
 			
 				Боцванска пула
 				Боцванска пула
 				Боцвански пули
+				BWP
 				P
 			
 			
@@ -6075,39 +6112,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Белоруска рубља
 				Белоруска рубља
 				Белоруски рубљи
+				BYN
 				р.
 			
 			
 				Белоруска рубља (2000–2016)
 				Белоруска рубља (2000–2016)
 				Белоруски рубљи (2000–2016)
+				BYR
 			
 			
-				Белизиски Долар
-				Белизиски Долар
-				Белизиски Долар
+				Белизиски долар
+				Белизиски долар
+				Белизиски долари
+				BZD
 				$
 			
 			
 				Канадски долар
-				Канадски долари
+				Канадски долар
 				Канадски долари
+				CA$
 				$
 			
 			
 				Конголски франк
 				Конголски франк
 				Конголски франци
+				CDF
 			
 			
 				Швајцарски франк
 				Швајцарски франк
 				Швајцарски франци
+				CHF
 			
 			
 				Чилеански пезос
 				Чилеански пезос
 				Чилеански пезоси
+				CLP
 				$
 			
 			
@@ -6127,12 +6171,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Колумбиски пезос
 				Колумбиски пезос
 				Колумбиски пезоси
+				COP
 				$
 			
 			
 				Костарикански колон
-				Костарикански колони
+				Костарикански колон
 				Костарикански колони
+				CRC
 				₡
 			
 			
@@ -6142,26 +6188,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кубански пезос (конвертибилен)
 				Кубански пезос (конвертибилен)
 				Кубански пезоси (конвертибилни)
+				CUC
 				$
 			
 			
 				Кубански пезос
 				Кубански пезос
-				Кубански пезос
+				Кубански пезоси
+				CUP
 				$
 			
 			
 				Зелено’ртски ескудо
 				Зелено’ртски ескудо
 				Зелено’ртски ескуди
+				CVE
 			
 			
 				Кипарска фунта
 			
 			
-				Чешка корона
-				Чешка корона
-				Чешки корони
+				Чешка круна
+				Чешка круна
+				Чешки круни
+				CZK
 				Kč
 			
 			
@@ -6171,34 +6221,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Џибутски франк
 				Џибутски франк
 				Џибутски франци
+				DJF
 			
 			
 				Данска круна
 				Данска круна
 				Дански круни
+				DKK
 				kr
 			
 			
-				Доминикански Пезос
-				Доминикански Пезос
-				Доминикански Пезос
+				Доминикански пезос
+				Доминикански пезос
+				Доминикански пезоси
+				DOP
 				$
 			
 			
 				Алжирски динар
 				Алжирски динар
 				Алжирски динари
+				DZD
 			
 			
 				Египетска фунта
 				Египетска фунта
 				Египетски фунти
+				EGP
 				E£
 			
 			
 				Еритрејска накфа
 				Еритрејска накфа
 				Еритрејски накфи
+				ERN
 			
 			
 				Шпанска Пезета
@@ -6207,11 +6263,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Етиописки бир
 				Етиописки бир
 				Етиописки бири
+				ETB
 			
 			
 				Евро
 				евро
 				евра
+				€
 				€
 			
 			
@@ -6221,12 +6279,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Фиџиски долар
 				Фиџиски долар
 				Фиџиски долари
+				FJD
 				$
 			
 			
 				Фолкландска фунта
 				Фолкландска фунта
 				Фолкландски фунти
+				FKP
 				£
 			
 			
@@ -6243,6 +6303,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Грузиски лари
 				Грузиски лари
 				Грузиски лари
+				GEL
 				₾
 				₾
 			
@@ -6253,22 +6314,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Гански седи
 				Гански седи
 				Гански седи
+				GHS
 			
 			
 				Гибралтарска фунта
 				Гибралтарска фунта
 				Гибралтарски фунти
+				GIP
 				£
 			
 			
 				Гамбиски даласи
 				Гамбиски Даласи
 				Гамбиски Даласи
+				GMD
 			
 			
 				Гвинејски франк
 				Гвинејски франк
 				Гвинејски франци
+				GNF
 				FG
 			
 			
@@ -6277,7 +6342,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Гватемалски кветцал
 				Гватемалски кветцал
-				Гватемалски кветцал
+				Гватемалски кветцали
+				GTQ
 				Q
 			
 			
@@ -6287,6 +6353,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Гвајански долар
 				Гвајански долар
 				Гвајански долари
+				GYD
 				$
 			
 			
@@ -6298,8 +6365,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Хондурска лемпира
-				Хондурски лемпири
+				Хондурска лемпира
 				Хондурски лемпири
+				HNL
 				L
 			
 			
@@ -6309,23 +6377,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Хрватска куна
 				Хрватска куна
 				Хрватски куни
+				HRK
 				kn
 			
 			
 				Хаитски гурд
 				Хаитски гурд
-				Хаитски гурд
+				Хаитски гурди
+				HTG
 			
 			
 				Унгарска форинта
 				Унгарска форинта
 				Унгарски форинти
+				HUF
 				Ft
 			
 			
 				Индонезиска рупија
 				Индонезиска рупија
-				Индонезиска рупија
+				Индонезиски рупии
+				IDR
 				Rp
 			
 			
@@ -6342,9 +6414,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				₪
 			
 			
-				Индијска рупија
-				Индијска рупија
-				Индијска рупија
+				Индиска рупија
+				Индиска рупија
+				Индиски рупии
 				INR
 				₹
 			
@@ -6352,16 +6424,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ирачки динар
 				Ирачки динар
 				Ирачки динари
+				IQD
 			
 			
 				Ирански риал
 				Ирански риал
-				Ирански риал
+				Ирански риали
+				IRR
 			
 			
 				Исландска крона
 				Исландска крона
 				Исландски крони
+				ISK
 				kr
 			
 			
@@ -6369,14 +6444,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Јамајкански долар
-				Јамајкански долари
+				Јамајкански долар
 				Јамајкански долари
+				JMD
 				$
 			
 			
 				Јордански динар
 				Јордански динар
 				Јордански динари
+				JOD
 			
 			
 				Јапонски јен
@@ -6389,28 +6466,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кениски шилинг
 				Кениски шилинг
 				Кениски шилинзи
+				KES
 			
 			
 				Киргистански сом
 				Киргистански сом
 				Киргистански соми
+				KGS
 			
 			
 				Камбоџиски рел
 				Камбоџиски рел
-				Камбоџиски рел
+				Камбоџиски рели
+				KHR
 				៛
 			
 			
 				Коморски франк
 				Коморски франк
 				Коморски франци
+				KMF
 				CF
 			
 			
 				Северно корејски вон
 				Северно корејски вон
 				Северно корејски вони
+				KPW
 				₩
 			
 			
@@ -6424,41 +6506,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кувајтски динар
 				Кувајтски динар
 				Кувајтски динари
+				KWD
 			
 			
 				Долар на кајмански острови
 				Долар на кајмански острови
 				Долари на кајмански острови
+				KYD
 				$
 			
 			
 				Казахстанска тенга
 				Казахстанска тенга
 				Казахстански тенги
+				KZT
 				₸
 			
 			
 				Лаоски кип
 				Лаоски кип
-				Лаоски кип
+				Лаоски кипови
+				LAK
 				₭
 			
 			
 				Либанска фунта
 				Либанска фунта
 				Либански фунти
+				LBP
 				L£
 			
 			
 				Шриланканска рупија
 				Шриланканска рупија
-				Шриланканска рупија
+				Шриланкански рупии
+				LKR
 				Rs
 			
 			
 				Либериски долар
 				Либериски долар
 				Либериски долари
+				LRD
 				$
 			
 			
@@ -6468,6 +6557,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Литваниска лита
 				Литваниска лита
 				Литваниска лита
+				LTL
 			
 			
 				Литваниски литаз
@@ -6479,6 +6569,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Латвијски лат
 				Латвијски лат
 				Латвијски лат
+				LVL
 			
 			
 				Латвијска рубља
@@ -6487,11 +6578,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Либијски динар
 				Либијски динар
 				Либијски динари
+				LYD
 			
 			
 				Марокански дирхам
 				Марокански дирхам
 				Марокански дирхами
+				MAD
 			
 			
 				Марокански франк
@@ -6500,18 +6593,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Молдавски леу
 				Молдавски леу
 				Молдавски леу
+				MDL
 			
 			
 				Малагасиски ариари
 				Малагасиски ариари
 				Малагасиски ариари
+				MGA
 				Ar
 			
 			
 				Македонски денар
 				Македонски денар
 				Македонски денари
-				ден
+				ден.
 			
 			
 				Малски франк
@@ -6520,23 +6615,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мјанмарски киат
 				Мјанмарски киат
 				Мјанмарски киати
+				MMK
 				K
 			
 			
 				Монголиски тугрик
 				Монголиски тугрик
 				Монголиски тугрици
+				MNT
 				₮
 			
 			
 				Макао патака
 				Макао патака
 				Макао патаки
+				MOP
 			
 			
 				Мавританска угија (1973–2017)
 				Мавританска угија (1973–2017)
 				Мавритански угии (1973–2017)
+				MRO
 			
 			
 				Мавританска угија
@@ -6554,22 +6653,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мавританска рупија
 				Мавританска рупија
 				Мавритански рупии
+				MUR
 				Rs
 			
 			
 				Малдивиска руфија
 				Малдивска руфија
 				Малдивски руфии
+				MVR
 			
 			
 				Малависка квача
 				Малависка квача
 				Малависки квачи
+				MWK
 			
 			
 				Мексикански пезос
-				Мексикански пезоси
+				Мексикански пезос
 				Мексикански пезоси
+				MX$
 				$
 			
 			
@@ -6579,6 +6682,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Малезиски рингит
 				Малезиски рингит
 				Малезиски рингити
+				MYR
 				RM
 			
 			
@@ -6591,17 +6695,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мозамбиски метикал
 				Мозамбиски метикал
 				Мозамбиски метикали
+				MZN
 			
 			
 				Намибиски долар
 				Намибиски долар
 				Намибиски долари
+				NAD
 				$
 			
 			
 				Нигериска наира
 				Нигериска наира
 				Нигериски наири
+				NGN
 				₦
 			
 			
@@ -6613,6 +6720,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Никарагванска кордоба
 				Никарагванска кордоба
 				Никарагвански кордоби
+				NIO
 				C$
 			
 			
@@ -6622,12 +6730,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Норвешка круна
 				Норвешка круна
 				Норвешки круни
+				NOK
 				kr
 			
 			
 				Непалска рупија
 				Непалска рупија
-				Непалска рупија
+				Непалски рупии
+				NPR
 				Rs
 			
 			
@@ -6641,16 +6751,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Омански риал
 				Омански риал
 				Омански риали
+				OMR
 			
 			
 				Панамска балбоа
 				Панамска балбоа
-				Панамска балбоа
+				Панамски балбои
+				PAB
 			
 			
 				Перуански сол
 				Перуански сол
 				Перуански соли
+				PEN
 			
 			
 				Перуански сол (1863–1965)
@@ -6659,23 +6772,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Папуа новогвинејска кина
 				Папуа новогвинејска кина
 				Папуа новогвинејска кина
+				PGK
 			
 			
 				Филипински пезос
 				Филипински пезос
 				Филипински пезоси
+				PHP
 				₱
 			
 			
 				Пакистанска рупија
 				Пакистанска рупија
-				Пакистанска рупија
+				Пакистански рупии
+				PKR
 				Rs
 			
 			
 				Полска злота
 				Полска злота
 				Полски злоти
+				PLN
 				zł
 			
 			
@@ -6688,12 +6805,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Парагвајска гуарана
 				Парагвајска гуарана
 				Парагвајски гуарани
+				PYG
 				₲
 			
 			
 				Катарски риал
 				Катарски риал
 				Катарски риали
+				QAR
 			
 			
 				Романска леи (1952–2006)
@@ -6701,20 +6820,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Романска леи (1952–2006)
 			
 			
-				Романска леи
-				Романски леи
+				Романски леу
+				Романски леу
 				Романски леи
+				RON
 				lei
 			
 			
 				Српски динар
 				Српски динар
 				Српски динари
+				RSD
 			
 			
 				Руска рубља
 				Руска рубља
 				Руски рубљи
+				RUB
 				₽
 			
 			
@@ -6724,23 +6846,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Руандски франк
 				Руандски франк
 				Руандски франци
+				RWF
 				RF
 			
 			
 				Саудиски ријал
 				Саудиски ријал
 				Саудиски ријали
+				SAR
 			
 			
 				Соломонски долар
 				Соломонски долар
 				Соломонски долари
+				SBD
 				$
 			
 			
 				Сејшелска рупија
 				Сејшелска рупија
 				Сејшелски рупии
+				SCR
 			
 			
 				Стар судански динар
@@ -6749,6 +6875,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Суданска фунта
 				Суданска фунта
 				Судански фунти
+				SDG
 			
 			
 				Стара суданска фунта
@@ -6757,18 +6884,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Шведска круна
 				Шведска круна
 				Шведски круни
+				SEK
 				kr
 			
 			
 				Сингапурски долар
 				Сингапурски долар
 				Сингапурски долари
+				SGD
 				$
 			
 			
 				Фунта на Света Елена
 				Фунта на Света Елена
 				Фунти на Света Елена
+				SHP
 				£
 			
 			
@@ -6781,16 +6911,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сиералеонско леоне
 				Сиералеонско леоне
 				Сиералеонски леони
+				SLL
 			
 			
 				Сомалијски шилинг
 				Сомалијски шилинг
 				Сомалијски шилинзи
+				SOS
 			
 			
 				Суринамски долар
 				Суринамски долар
 				Суринамски долари
+				SRD
 				$
 			
 			
@@ -6800,17 +6933,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Јужносуданска фунта
 				Јужносуданска фунта
 				Јужносудански фунти
+				SSP
 				£
 			
 			
 				Добра на Саун Томе и Принсип (1977–2017)
 				Добра на Саун Томе и Принсип (1977–2017)
 				Добри на Саун Томе и Принсип (1977–2017)
+				STD
 			
 			
-				Добра на Саун Томе и Принсип
-				Добра на Саун Томе и Принсип
-				Добри на Саун Томе и Принсип
+				Добра на Сао Томе и Принсипе
+				Добра на Сао Томе и Принсипе
+				Добри на Сао Томе и Принсипе
 				STN
 				Db
 			
@@ -6824,17 +6959,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сиријска фунта
 				Сиријска фунта
 				Сиријски фунти
+				SYP
 				£
 			
 			
 				Свазилендски лиланген
 				Свазилендски лиланген
 				Свазилендски лилангени
+				SZL
 			
 			
 				Таи бат
 				Таи бат
 				Таи бат
+				THB
 				฿
 			
 			
@@ -6844,6 +6982,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Таџикистански сомони
 				Таџикистански сомони
 				Таџикистански сомони
+				TJS
 			
 			
 				Туркменистански манат
@@ -6852,16 +6991,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Туркменист. манат
 				Туркменистански манати
 				Туркменистански манати
+				TMT
 			
 			
 				Тунизиски динар
 				Тунизиски динар
 				Тунизиски динари
+				TND
 			
 			
 				Тонганска панга
 				Тонганска панга
 				Тонганска панга
+				TOP
 				T$
 			
 			
@@ -6876,13 +7018,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Турска лира
 				Турска лира
 				Турски лири
+				TRY
 				₺
 				TL
 			
 			
 				Долар на Тринидад и Тобаго
-				Долари на Тринидад и Тобаго
+				Долар на Тринидад и Тобаго
 				Долари на Тринидад и Тобаго
+				TTD
 				$
 			
 			
@@ -6896,11 +7040,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Танзаниски шилинг
 				Танзаниски шилинг
 				Танзаниски шилинзи
+				TZS
 			
 			
 				Украинска хривнија
 				Украинска хривнија
 				Украински хривнии
+				UAH
 				₴
 			
 			
@@ -6910,11 +7056,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Угандиски шилинг
 				Угандиски шилинг
 				Угандиски шилинзи
+				UGX
 			
 			
 				Американски долар
-				Американски долари
+				Американски долар
 				Американски долари
+				US$
 				$
 			
 			
@@ -6930,12 +7078,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Уругвајски пезос
 				Уругвајски пезос
 				Уругвајски пезоси
+				UYU
 				$
 			
 			
 				Узбекистански сом
 				Узбекистански сом
 				Узбекистански соми
+				UZS
 			
 			
 				Венецуелски боливар (1871–2008)
@@ -6946,6 +7096,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Венецуелски боливар (2008–2018)
 				Венецуелски боливар (2008–2018)
 				Венецуелски боливари (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6965,32 +7116,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ванатски вату
 				Ванатски вату
 				Ванатски ватуи
+				VUV
 			
 			
 				Самоанска тала
 				Самоанска тала
 				Самоанска тала
+				WST
 			
 			
 				Централноафрикански франк
 				Централноафрикански франк
 				Централноафрикански франци
+				FCFA
 			
 			
-				Источно карибиски долар
-				Источно карибиски долар
-				Источно карибиски долар
+				Источно карипски долар
+				Источно карипски долар
+				Источно карипски долари
+				EC$
 				$
 			
 			
 				Западноафрикански франк
 				Западноафрикански франк
 				Западноафрикански франци
+				CFA
 			
 			
 				ЦФП франк
 				ЦФП франк
 				ЦФП франци
+				CFPF
 			
 			
 				Непозната валута
@@ -7004,6 +7161,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Јеменски риал
 				Јеменски риал
 				Јеменски риали
+				YER
 			
 			
 				Југословенски динар
@@ -7018,6 +7176,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Јужноафрикански ранд
 				Јужноафрикански ранд
 				Јужноафрикански ранди
+				ZAR
 				R
 			
 			
@@ -7027,6 +7186,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Замбијска квача
 				Замбијска квача
 				Замбијски квачи
+				ZMW
 				ZK
 			
 			
@@ -7059,6 +7219,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} на {1}
 			
+			
+				{0}⋅{1}
+			
 			
 				гравитациска сила
 				{0} гравитациска сила
@@ -7085,14 +7248,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} степени
 			
 			
-				минути
-				{0} минута
-				{0} минути
+				аголни минути
+				{0} аголна минута
+				{0} аголни минути
 			
 			
-				секунди
-				{0} секунда
-				{0} секунди
+				аголни секунди
+				{0} аголна секунда
+				{0} аголни секунди
 			
 			
 				квадратни километри
@@ -7269,6 +7432,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} век
 				{0} векови
 			
+			
+				децении
+				{0} деценија
+				{0} децении
+			
 			
 				години
 				{0} година
@@ -7386,10 +7554,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} британска термална единица
 				{0} британски термални единици
 			
+			
+				US терми
+				{0} US терм
+				{0} US терми
+			
 			
-				фунти-сила
-				{0} фунта-сила
-				{0} фунти-сила
+				фунти сила
+				{0} фунта сила
+				{0} фунти сила
 			
 			
 				њутни
@@ -7545,7 +7718,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				килограми
 				{0} килограм
 				{0} килограми
-				{0} од килограм
+				{0} на килограм
 			
 			
 				грама
@@ -7577,13 +7750,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фунти
 				{0} фунта
 				{0} фунти
-				{0} од фунта
+				{0} на фунта
 			
 			
 				унци
 				{0} унца
 				{0} унци
-				{0} од унца
+				{0} на унца
 			
 			
 				тројски унци
@@ -7640,11 +7813,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} коњска сила
 				{0} коњски сили
 			
-			
-				хектопаскали
-				{0} хектопаскал
-				{0} хектопаскали
-			
 			
 				милиметри жива
 				{0} милиметар жива
@@ -7660,6 +7828,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} инч жива
 				{0} инчи жива
 			
+			
+				бари
+				{0} бар
+				{0} бари
+			
 			
 				милибари
 				{0} милибар
@@ -7670,6 +7843,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфера
 				{0} атмосфери
 			
+			
+				хектопаскали
+				{0} хектопаскал
+				{0} хектопаскали
+			
 			
 				килопаскали
 				{0} килопаскал
@@ -7721,9 +7899,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} келвини
 			
 			
-				стапки-фунти
-				{0} стапка-фунти
-				{0} стапки-фунти
+				стапки фунти
+				{0} стапка фунта
+				{0} стапки фунти
 			
 			
 				њутнметри
@@ -7804,9 +7982,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} метрички пинти
 			
 			
-				метрички шолји
-				{0} метричка шолја
-				{0} метрички шолји
+				метрички чаши
+				{0} метричка чаша
+				{0} метрички чаши
 			
 			
 				ар-стапка
@@ -7825,10 +8003,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} по галон
 			
 			
-				Imp. gal
-				{0} gal Imp.
-				{0} gal Imp.
-				{0}/gal Imp.
+				имп. галони
+				{0} имп. галон
+				{0} имп. галони
+				{0}/имп. галон
 			
 			
 				кварти
@@ -7841,9 +8019,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} пинти
 			
 			
-				шолји
-				{0} шолја
-				{0} шолји
+				чаши
+				{0} чаша
+				{0} чаши
 			
 			
 				унци течност
@@ -7882,6 +8060,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				гравитациска сила
 				{0} G
@@ -7908,14 +8089,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} степ.
 			
 			
-				минути
-				{0} мин.
-				{0} мин
+				аголни минути
+				{0} аголна мин.
+				{0} аголни мин.
 			
 			
-				секунди
-				{0} сек
-				{0} сек
+				аголни секунди
+				{0} аголна сек.
+				{0} аголни сек.
 			
 			
 				км²
@@ -8092,6 +8273,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} в.
 				{0} в.
 			
+			
+				дец.
+				{0} дец.
+				{0} дец.
+			
 			
 				години
 				{0} год.
@@ -8209,6 +8395,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				US терм
+				{0} US терм
+				{0} US терми
+			
 			
 				lbf
 				{0} lbf
@@ -8239,6 +8430,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				км
 				{0} км
@@ -8463,15 +8689,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кс
 				{0} кс
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
-				мм жива
-				{0} мм жива
-				{0} мм жива
+				mmHg
+				{0} mmHg
+				{0} mmHg
 			
 			
 				psi
@@ -8483,6 +8704,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				бар
+				{0} бар
+				{0} бари
+			
 			
 				мбар
 				{0} мбар
@@ -8493,6 +8719,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атм
 				{0} атм
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8530,13 +8766,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				целзиусови степени
-				{0}°C
-				{0}°C
+				{0} °C
+				{0} °C
 			
 			
 				°F
-				{0}°F
-				{0}°F
+				{0} °F
+				{0} °F
 			
 			
 				K
@@ -8648,10 +8884,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/gal
 			
 			
-				Imp. gal
-				{0} gal Imp.
-				{0} gal Imp.
-				{0}/gal Imp.
+				имп. галон
+				{0} имп. галон
+				{0} имп. галони
+				{0}/имп. галон
 			
 			
 				qt
@@ -8664,9 +8900,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				шолји
-				{0} ш.
-				{0} ш.
+				чаши
+				{0} ч.
+				{0} ч.
 			
 			
 				fl oz
@@ -8705,6 +8941,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				G
 			
@@ -9058,10 +9297,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кс
 				{0} кс
 			
-			
-				{0} хПа
-				{0} хПа
-			
 			
 				мм жива
 				{0}mm Hg
@@ -9076,6 +9311,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мб
 				{0} мб
 			
+			
+				{0} хПа
+				{0} хПа
+			
 			
 				км/ч
 				{0} к/ч
@@ -9227,10 +9466,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} или {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0} и {1}
-			{0} и {1}
+			{0} и {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/mk_MK.xml b/make/data/cldr/common/main/mk_MK.xml
index c4b53965fb3..4229bd8725f 100644
--- a/make/data/cldr/common/main/mk_MK.xml
+++ b/make/data/cldr/common/main/mk_MK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ml.xml b/make/data/cldr/common/main/ml.xml
index 6361b3eb1de..7cdd192709a 100644
--- a/make/data/cldr/common/main/ml.xml
+++ b/make/data/cldr/common/main/ml.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -89,6 +89,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			കാരിബ്
 			കയൂഗ
 			അറ്റ്സാം
+			ചക്‌മ
 			ചെചൻ
 			സെബുവാനോ
 			ചിഗ
@@ -132,7 +133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ദിവെഹി
 			യോല-ഫോന്യി
 			ദ്വൈല
-			സോങ്ക
+			ദ്‌സോങ്ക
 			ഡാസാഗ
 			എംബു
 			യൂവ്
@@ -543,12 +544,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			യിദ്ദിഷ്
 			യൊറൂബാ
 			കാന്റണീസ്
+			ചൈനീസ്, കാന്റണീസ്
 			സ്വാംഗ്
 			സാപ്പോടെക്
 			ബ്ലിസ്സിംബൽസ്
 			സെനഗ
 			സ്റ്റാൻഡേർഡ് മൊറോക്കൻ റ്റാമസിയറ്റ്
 			ചൈനീസ്
+			ചൈനീസ്, മാൻഡറിൻ
 			ലളിതമാക്കിയ ചൈനീസ്
 			പരമ്പരാഗത ചൈനീസ്
 			സുലു
@@ -920,7 +923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ഫിലിപ്പീൻസ്
 			പാക്കിസ്ഥാൻ
 			പോളണ്ട്
-			സെന്റ് പിയറിയും മിക്കലണും
+			സെന്റ് പിയറി ആൻഡ് മിക്വലൻ
 			പിറ്റ്‌കെയ്‌ൻ ദ്വീപുകൾ
 			പോർട്ടോ റിക്കോ
 			പാലസ്‌തീൻ പ്രദേശങ്ങൾ
@@ -956,8 +959,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			സിന്റ് മാർട്ടെൻ
 			സിറിയ
 			സ്വാസിലാന്റ്
-			സ്വിറ്റ്സർലൻഡ്
-			ട്രസ്റ്റൻ ഡ കൂന
+			സ്വിറ്റ്സർലൻഡ്
+			ട്രിസ്റ്റൻ ഡ കൂന
 			ടർക്ക്‌സും കെയ്‌ക്കോ ദ്വീപുകളും
 			ഛാഡ്
 			ഫ്രഞ്ച് ദക്ഷിണ ഭൂപ്രദേശം
@@ -993,6 +996,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			വന്വാതു
 			വാലിസ് ആന്റ് ഫ്യൂച്യുന
 			സമോവ
+			കൃത്രിമ ഉച്ചാരണം
 			കൊസോവൊ
 			യെമൻ
 			മയോട്ടി
@@ -1200,8 +1204,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u200C\u200D ഃ അ ആ ഇ ഈ ഉ ഊ ഋ ൠ ഌ ൡ എ ഏ ഐ ഒ ഓ ഔ ക ൿ ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ൺ ത ഥ ദ ധ ന ൻ പ ഫ ബ ഭ മ ം യ ര ർ ല ൽ വ ശ ഷ സ ഹ ള ൾ ഴ റ ാ ി ീ \u0D41 \u0D42 \u0D43 െ േ ൈ ൊ ോ ൌ ൗ \u0D4D]
 		[]
 		[അ ആ ഇ ഈ ഉ ഊ ഋ എ ഏ ഐ ഒ ഓ ഔ ക ഖ ഗ ഘ ങ ച ഛ ജ ഝ ഞ ട ഠ ഡ ഢ ണ ത ഥ ദ ധ ന പ ഫ ബ ഭ മ യ ര ല വ ശ ഷ സ ഹ ള ഴ റ]
-		[\- , . % ‰ + 0൦ 1൧ 2൨ 3൩ 4൪ 5൫ 6൬ 7൭ 8൮ 9൯]
-		[\- , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
+		[\- ‑ , . % ‰ + 0൦ 1൧ 2൨ 3൩ 4൪ 5൫ 6൬ 7൭ 8൮ 9൯]
+		[\- ‑ , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1237,6 +1241,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1553,70 +1570,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
+							h a – h a
 							h–h a
 						
+						
+							HH–HH
+						
 						
+							h:mm a – h:mm a
 							h:mm–h:mm a
 							h:mm–h:mm a
 						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
 						
+							h:mm a – h:mm a v
 							h:mm–h:mm a v
 							h:mm–h:mm a v
 						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
 						
+							h a – h a v
 							h–h a v
 						
+						
+							HH–HH v
+						
 						
 							M – M
 						
@@ -2118,56 +2106,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h – h a
@@ -2366,6 +2307,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2664,6 +2616,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3670,7 +3633,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				നിപ്പിഗോൺ
 			
 			
-				ടൊറണ്ടോ
+				ടൊറന്റോ
 			
 			
 				ഇഖാലിത്
@@ -4027,7 +3990,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				അഖ്‌തോബ്
 			
 			
-				കോസ്റ്റനേ
+				കോസ്റ്റനേ
 			
 			
 				ഖിസിലോർഡ
@@ -5607,12 +5570,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			mlym
 		
 		1
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5621,8 +5590,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5785,6 +5758,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				യുണൈറ്റഡ് അറബ് എമിറേറ്റ്സ് ദിർഹം
 				യു.എ.ഇ. ദിർഹം
 				യു.എ.ഇ. ദിർഹം
+				AED
 			
 			
 				അഫ്ഘാനി (1927–2002)
@@ -5795,26 +5769,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				അഫ്‌ഗാൻ അഫ്‌‌ഗാനി
 				അഫ്‌ഗാൻ അഫ്‌‌ഗാനി
 				അഫ്‌ഗാൻ അഫ്‌‌ഗാനി
+				AFN
 			
 			
 				അൽബേനിയൻ ലെക്
 				അൽബേനിയൻ ലെക്
 				അൽബേനിയൻ ലെക്
+				ALL
 			
 			
 				അർമേനിയൻ ഡ്രാം
 				അർമേനിയൻ ഡ്രാം
 				അർമേനിയൻ ഡ്രാം
+				AMD
 			
 			
 				നെതർലാൻഡ്‌സ് ആന്റിലൻ ഗിൽഡർ
 				നെതർലാൻഡ്‌സ് ആന്റിലൻ ഗിൽഡർ
 				നെതർലാൻഡ്‌സ് ആന്റിലൻ ഗിൽഡർ
+				ANG
 			
 			
 				അംഗോളൻ ‍ക്വാൻസ
 				അംഗോളൻ ക്വാൻസ
 				അംഗോളൻ ക്വാൻസ
+				AOA
 				Kz
 			
 			
@@ -5846,6 +5825,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				അർജൻറീൻ പെസോ
 				അർജൻറീൻ പെസോ
 				അർജൻറീൻ പെസോ
+				ARS
 				$
 			
 			
@@ -5857,12 +5837,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഓസ്ട്രേലിയൻ ഡോളർ
 				ഓസ്ട്രേലിയൻ ഡോളർ
 				ഓസ്ട്രേലിയൻ ഡോളർ
+				A$
 				$
 			
 			
 				അറൂബൻ ഫ്ലോറിൻ
 				അറൂബൻ ഫ്ലോറിൻ
 				അറൂബൻ ഫ്ലോറിൻ
+				AWG
 			
 			
 				അസർബയ്ജാനിയൻ മനത് (1993–2006)
@@ -5873,6 +5855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				അസർബൈജാനി മനത്
 				അസർബൈജാനി മനത്
 				അസർബൈജാനി മനത്
+				AZN
 			
 			
 				ബോസ്നിയ-ഹെർസഗോവിന ദിനാർ
@@ -5883,18 +5866,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബോസ്‌നിയ-ഹെർസഗോവിന കൺവേർട്ടബിൾ മാർക്ക്
 				ബോസ്‌നിയ-ഹെർസഗോവിന കൺവേർട്ടബിൾ മാർക്ക്
 				ബോസ്‌നിയ-ഹെർസഗോവിന കൺവേർട്ടബിൾ മാർക്ക്
+				BAM
 				KM
 			
 			
 				ബാർബേഡിയൻ ഡോളർ
 				ബാർബേഡിയൻ ഡോളർ
 				ബാർബേഡിയൻ ഡോളർ
+				BBD
 				$
 			
 			
 				ബംഗ്ലാദേശി ടാക്ക
 				ബംഗ്ലാദേശി ടാക്ക
 				ബംഗ്ലാദേശി ടാക്ക
+				BDT
 				৳
 			
 			
@@ -5921,33 +5907,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബൾഗേറിയൻ ലെവ്
 				ബൾഗേറിയൻ ലെവ്
 				ബൾഗേറിയൻ ലെവ്
+				BGN
 			
 			
 				ബഹ്റൈനി ദിനാർ
 				ബഹ്റൈനി ദിനാർ
 				ബഹ്റൈനി ദിനാർ
+				BHD
 			
 			
 				ബറുണ്ടിയൻ ഫ്രാങ്ക്
 				ബുറുണ്ടിയൻ ഫ്രാങ്ക്
 				ബറുണ്ടിയൻ ഫ്രാങ്ക്
+				BIF
 			
 			
 				ബെർമുഡൻ ഡോളർ
 				ബെർമുഡൻ ഡോളർ
 				ബെർമുഡൻ ഡോളർ
+				BMD
 				$
 			
 			
 				ബ്രൂണൈ ഡോളർ
 				ബ്രൂണൈ ഡോളർ
 				ബ്രൂണൈ ഡോളർ
+				BND
 				$
 			
 			
 				ബൊളീവിയൻ ബൊളിവിയാനോ
 				ബൊളീവിയൻ ബൊളിവിയാനോ
 				ബൊളീവിയൻ ബൊളിവിയാനോ
+				BOB
 				Bs
 			
 			
@@ -5979,6 +5971,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബ്രസീലിയൻ റിയാൽ
 				ബ്രസീലിയൻ റിയാൽ
 				ബ്രസീലിയൻ റിയാൽ
+				R$
 				R$
 			
 			
@@ -5995,12 +5988,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബഹാമിയൻ ഡോളർ
 				ബഹാമിയൻ ഡോളർ
 				ബഹാമിയൻ ഡോളർ
+				BSD
 				$
 			
 			
 				ഭൂട്ടാനീസ് ഗൾട്രം
 				ഭൂട്ടാനീസ് ഗൾട്രം
 				ഭൂട്ടാനീസ് ഗൾട്രം
+				BTN
 			
 			
 				ബർമീസ് ചാറ്റ്
@@ -6011,6 +6006,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബോട്‌സ്വാനൻ പ്യുല
 				ബോട്‌സ്വാനൻ പ്യുല
 				ബോട്‌സ്വാനൻ പ്യുല
+				BWP
 				P
 			
 			
@@ -6022,29 +6018,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബെലാറുഷ്യൻ റൂബിൾ
 				ബെലാറുഷ്യൻ റൂബിൾ
 				ബെലാറുഷ്യൻ റൂബിൾ
+				BYN
 				р.
 			
 			
 				ബെലാറുഷ്യൻ റൂബിൾ (2000–2016)
 				ബെലാറുഷ്യൻ റൂബിൾ (2000–2016)
 				ബെലാറുഷ്യൻ റൂബിൾ (2000–2016)
+				BYR
 			
 			
 				ബെലീസ് ഡോളർ
 				ബെലീസ് ഡോളർ
 				ബെലീസ് ഡോളർ
+				BZD
 				$
 			
 			
 				കനേഡിയൻ ഡോളർ
 				കനേഡിയൻ ഡോളർ
 				കനേഡിയൻ ഡോളർ
+				CA$
 				$
 			
 			
 				കോങ്കളീസ് ഫ്രാങ്ക്
 				കോങ്കളീസ് ഫ്രാങ്ക്
 				കോങ്കളീസ് ഫ്രാങ്ക്
+				CDF
 			
 			
 				WIR യൂറോ
@@ -6055,6 +6056,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				സ്വിസ് ഫ്രാങ്ക്
 				സ്വിസ് ഫ്രാങ്ക്
 				സ്വിസ് ഫ്രാങ്ക്
+				CHF
 			
 			
 				WIR ഫ്രാങ്ക്
@@ -6070,6 +6072,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ചിലിയൻ പെസോ
 				ചിലിയൻ പെസോ
 				ചിലിയൻ പെസോ
+				CLP
 				$
 			
 			
@@ -6082,12 +6085,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ചൈനീസ് യുവാൻ
 				ചൈനീസ് യുവാൻ
 				ചൈനീസ് യുവാൻ
+				CN¥
 				¥
 			
 			
 				കൊളംബിയൻ പെസോ
 				കൊളംബിയൻ പെസോ
 				കൊളംബിയൻ പെസോ
+				COP
 				$
 			
 			
@@ -6099,6 +6104,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				കോസ്റ്റാ റിക്കൻ കോളൻ
 				കോസ്റ്റാ റിക്കൻ കോളൻ
 				കോസ്റ്റാ റിക്കൻ കോളൻ
+				CRC
 				₡
 			
 			
@@ -6115,18 +6121,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ക്യൂബൻ കൺവേർട്ടബിൾ പെസോ
 				ക്യൂബൻ കൺവേർട്ടബിൾ പെസോ
 				ക്യൂബൻ കൺവേർട്ടബിൾ പെസോ
+				CUC
 				$
 			
 			
 				ക്യൂബൻ പെസോ
 				ക്യൂബൻ പെസോ
 				ക്യൂബൻ പെസോ
+				CUP
 				$
 			
 			
 				കേപ് വെർദിയൻ എസ്‌ക്യുഡോ
 				കേപ് വെർദിയൻ എസ്‌ക്യുഡോ
 				കേപ് വെർദിയൻ എസ്‌ക്യുഡോസ്
+				CVE
 			
 			
 				സൈപ്രസ് പൌണ്ട്
@@ -6137,6 +6146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ചെക്ക് റിപ്പബ്ലിക് കൊരുണ
 				ചെക്ക് റിപ്പബ്ലിക് കൊരുണ
 				ചെക്ക് റിപ്പബ്ലിക് കൊരുണ
+				CZK
 				Kč
 			
 			
@@ -6153,23 +6163,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ദിജിബൗട്ടിയൻ ഫ്രാങ്ക്
 				ദിജിബൗട്ടിയൻ ഫ്രാങ്ക്
 				ദിജിബൗട്ടിയൻ ഫ്രാങ്ക്
+				DJF
 			
 			
 				ഡാനിഷ് ക്രോണെ
 				ഡാനിഷ് ക്രോണെ
 				ഡാനിഷ് ക്രോണെ
+				DKK
 				kr
 			
 			
 				ഡൊമിനിക്കൻ പെസോ
 				ഡൊമിനിക്കൻ പെസോ
 				ഡൊമിനിക്കൻ പെസോ
+				DOP
 				$
 			
 			
 				അൾജീരിയൻ ദിനാർ
 				അൾജീരിയൻ ദിനാർ
 				അൾജീരിയൻ ദിനാർ
+				DZD
 			
 			
 				ഇക്വഡോർ സൂക്രേ
@@ -6190,12 +6204,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഈജിപ്‌ഷ്യൻ പൗണ്ട്
 				ഈജിപ്‌ഷ്യൻ പൗണ്ട്
 				ഈജിപ്‌ഷ്യൻ പൗണ്ട്
+				EGP
 				E£
 			
 			
 				എറിത്രിയൻ നക്ഫ
 				എറിത്രിയൻ നക്ഫ
 				എറിത്രിയൻ നക്‌ഫ
+				ERN
 			
 			
 				സ്പാനിഷ് പസെയ്റ്റ (A അക്കൌണ്ട്)
@@ -6216,11 +6232,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				എത്യോപ്യൻ ബിർ
 				എത്യോപ്യൻ ബിർ
 				എത്യോപ്യൻ ബിർ
+				ETB
 			
 			
 				യൂറോ
 				യൂറോ
 				യൂറോ
+				€
 				€
 			
 			
@@ -6232,12 +6250,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഫിജിയൻ ഡോളർ
 				ഫിജിയൻ ഡോളർ
 				ഫിജിയൻ ഡോളർ
+				FJD
 				$
 			
 			
 				ഫാക്ക്‌ലാന്റ് ദ്വീപുകളുടെ പൗണ്ട്
 				ഫാക്ക്‌ലാന്റ് ദ്വീപുകളുടെ പൗണ്ട്
 				ഫാക്ക്‌ലാന്റ് ദ്വീപുകളുടെ പൗണ്ട്
+				FKP
 				£
 			
 			
@@ -6249,6 +6269,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ബ്രിട്ടീഷ് പൗണ്ട്
 				ബ്രിട്ടീഷ് പൗണ്ട്
 				ബ്രിട്ടീഷ് പൗണ്ട്
+				£
 				£
 			
 			
@@ -6260,6 +6281,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ജോർജ്ജിയൻ ലാറി
 				ജോർജ്ജിയൻ ലാറി
 				ജോർജ്ജിയൻ ലാറിസ്
+				GEL
 				₾
 				₾
 			
@@ -6272,22 +6294,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഘാനയൻ കെഡി
 				ഘാനയൻ കെഡി
 				ഘാനയൻ കെഡി
+				GHS
 			
 			
 				ജിബ്രാൾട്ടർ പൗണ്ട്
 				ജിബ്രാൾട്ടർ പൗണ്ട്
 				ജിബ്രാൾട്ടർ പൗണ്ട്
+				GIP
 				£
 			
 			
 				ഗാംബിയൻ ദലാസി
 				ഗാംബിയൻ ദലാസി
 				ഗാംബിയൻ ദലാസിസ്
+				GMD
 			
 			
 				ഗിനിയൻ ഫ്രാങ്ക്
 				ഗിനിയൻ ഫ്രാങ്ക്
 				ഗിനിയൻ ഫ്രാങ്ക്സ്
+				GNF
 				FG
 			
 			
@@ -6309,6 +6335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഗ്വാട്ടിമാലൻ ക്വെറ്റ്‌സൽ
 				ഗ്വാട്ടിമാലൻ ക്വെറ്റ്‌സൽ
 				ഗ്വാട്ടിമാലൻ ക്വെറ്റ്‌സൽ
+				GTQ
 				Q
 			
 			
@@ -6325,18 +6352,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഗയാനീസ് ഡോളർ
 				ഗയാനീസ് ഡോളർ
 				ഗയാനീസ് ഡോളർ
+				GYD
 				$
 			
 			
 				ഹോങ്കോങ്ങ് ഡോളർ
 				ഹോങ്കോങ്ങ് ഡോളർ
 				ഹോങ്കോങ്ങ് ഡോളർ
+				HK$
 				$
 			
 			
 				ഹോണ്ടുറൻ ലെംപിറ
 				ഹോണ്ടുറൻ ലെംപിറ
 				ഹോണ്ടുറൻ ലെംപിറ
+				HNL
 				L
 			
 			
@@ -6348,23 +6378,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ക്രൊയേഷൻ ക്യുന
 				ക്രൊയേഷൻ ക്യുന
 				ക്രൊയേഷൻ ക്യുന
+				HRK
 				kn
 			
 			
 				ഹെയ്‌തിയൻ ഗൂർഡ്
 				ഹെയ്‌തിയൻ ഗൂർഡ്
 				ഹെയ്‌തിയൻ ഗൂർഡ്
+				HTG
 			
 			
 				ഹംഗേറിയൻ ഫോറിന്റ്
 				ഹംഗേറിയൻ ഫോറിന്റ്
 				ഹംഗേറിയൻ ഫോറിന്റ്
+				HUF
 				Ft
 			
 			
 				ഇന്തോനേഷ്യൻ റുപിയ
 				ഇന്തോനേഷ്യൻ റുപിയ
 				ഇന്തോനേഷ്യൻ റുപിയ
+				IDR
 				Rp
 			
 			
@@ -6381,28 +6415,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഇസ്രായേലി ന്യൂ ഷെക്കെൽ
 				ഇസ്രായേലി ന്യൂ ഷെക്കെൽ
 				ഇസ്രായേലി ന്യൂ ഷെക്കെൽ
+				₪
 				₪
 			
 			
 				ഇന്ത്യൻ രൂപ
 				ഇന്ത്യൻ രൂപ
 				ഇന്ത്യൻ രൂപ
+				₹
 				₹
 			
 			
 				ഇറാഖി ദിനാർ
 				ഇറാഖി ദിനാർ
 				ഇറാഖി ദിനാർ
+				IQD
 			
 			
 				ഇറാനിയൻ റിയാൽ
 				ഇറാനിയൻ റിയാൽ
 				ഇറാനിയൻ റിയാൽ
+				IRR
 			
 			
 				ഐസ്‌ലാൻഡിക് ക്രോണ
 				ഐസ്‌ലാൻഡിക് ക്രോണ
 				ഐസ്‌ലാൻഡിക് ക്രോണ
+				ISK
 				kr
 			
 			
@@ -6414,12 +6453,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ജമൈക്കൻ ഡോളർ
 				ജമൈക്കൻ ഡോളർ
 				ജമൈക്കൻ ഡോളർ
+				JMD
 				$
 			
 			
 				ജോർദ്ദാനിയൻ ദിനാർ
 				ജോർദ്ദാനിയൻ ദിനാർ
 				ജോർദ്ദാനിയൻ ദിനാർ
+				JOD
 			
 			
 				ജാപ്പനീസ് യെൻ
@@ -6432,75 +6473,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				കെനിയൻ ഷില്ലിംഗ്
 				കെനിയൻ ഷില്ലിംഗ്
 				കെനിയൻ ഷില്ലിംഗ്
+				KES
 			
 			
 				കിർഗിസ്ഥാനി സോം
 				കിർഗിസ്ഥാനി സോം
 				കിർഗിസ്ഥാനി സോം
+				KGS
 			
 			
 				കംബോഡിയൻ റീൽ
 				കംബോഡിയൻ റീൽ
 				കംബോഡിയൻ റീൽ
+				KHR
 				៛
 			
 			
 				കൊമോറിയൻ ഫ്രാങ്ക്
 				കൊമോറിയൻ ഫ്രാങ്ക്
 				കൊമോറിയൻ ഫ്രാങ്ക്
+				KMF
 				CF
 			
 			
 				ഉത്തര കൊറിയൻ വോൺ
 				ഉത്തര കൊറിയൻ വോൺ
 				ഉത്തര കൊറിയൻ വോൺ
+				KPW
 				₩
 			
 			
 				ദക്ഷിണ കൊറിയൻ വോൺ
 				ദക്ഷിണ കൊറിയൻ വോൺ
 				ദക്ഷിണ കൊറിയൻ വോൺ
+				₩
 				₩
 			
 			
 				കുവൈറ്റി ദിനാർ
 				കുവൈറ്റി ദിനാർ
 				കുവൈറ്റി ദിനാർ
+				KWD
 			
 			
 				കേമാൻ ഐലൻഡ്‌സ് ഡോളർ
 				കേമാൻ ഐലൻഡ്‌സ് ഡോളർ
 				കേമാൻ ഐലൻഡ്‌സ് ഡോളർ
+				KYD
 				$
 			
 			
 				കസാക്കിസ്ഥാനി ടെംഗെ
 				കസാക്കിസ്ഥാനി ടെംഗെ
 				കസാക്കിസ്ഥാനി ടെംഗെ
+				KZT
 				₸
 			
 			
 				ലാവോഷിയൻ കിപ്
 				ലാവോഷ്യൻ കിപ്‌
 				ലാവോഷിയൻ കിപ്
+				LAK
 				₭
 			
 			
 				ലെബനീസ് പൗണ്ട്
 				ലെബനീസ് പൗണ്ട്
 				ലെബനീസ് പൗണ്ട്
+				LBP
 				L£
 			
 			
 				ശ്രീലങ്കൻ റുപ്പീ
 				ശ്രീലങ്കൻ റുപ്പീ
 				ശ്രീലങ്കൻ റുപ്പീ
+				LKR
 				Rs
 			
 			
 				ലൈബീരിയൻ ഡോളർ
 				ലൈബീരിയൻ ഡോളർ
 				ലൈബീരിയൻ ഡോളർ
+				LRD
 				$
 			
 			
@@ -6512,6 +6566,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ലിത്വാനിയൻ ലിറ്റാസ്
 				ലിത്വാനിയൻ ലിറ്റാസ്
 				ലിത്വാനിയൻ ലിറ്റാസ്
+				LTL
 			
 			
 				ലിത്വാനിയൻ തലോനാസ്
@@ -6537,6 +6592,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ലാറ്റ്വിയൻ ലാറ്റ്സ്
 				ലാറ്റ്വിയൻ ലാറ്റ്സ്
 				ലാറ്റ്വിയൻ ലാറ്റ്സ്
+				LVL
 			
 			
 				ലാറ്റ്വിയൻ റൂബിൾ
@@ -6547,11 +6603,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ലിബിയൻ ദിനാർ
 				ലിബിയൻ ദിനാർ
 				ലിബിയൻ ദിനാർ
+				LYD
 			
 			
 				മൊറോക്കൻ ദിർഹം
 				മൊറോക്കൻ ദിർഹം
 				മൊറോക്കൻ ദിർഹം
+				MAD
 			
 			
 				മൊറോക്കൻ ഫ്രാങ്ക്
@@ -6560,11 +6618,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				മൊൾഡോവൻ ലിയു
 				മൊൾഡോവൻ ലിയു
 				മൊൾഡോവൻ ലിയു
+				MDL
 			
 			
 				മഡഗാസി ഏരിയറി
 				മഡഗാസി ഏരിയറി
 				മഡഗാസി ഏരിയറി
+				MGA
 				Ar
 			
 			
@@ -6574,6 +6634,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				മാസിഡോണിയൻ ദിനാർ
 				മാസിഡോണിയൻ ദിനാർ
 				മാസിഡോണിയൻ ദിനാർ
+				MKD
 			
 			
 				മാലി ഫ്രാങ്ക്
@@ -6582,28 +6643,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				മ്യാൻമാർ ക്യാട്
 				മ്യാൻമാർ ക്യാട്
 				മ്യാൻമാർ ക്യാട്
+				MMK
 				K
 			
 			
 				മംഗോളിയൻ തുഗ്രിക്
 				മംഗോളിയൻ തുഗ്രിക്
 				മംഗോളിയൻ തുഗ്രിക്
+				MNT
 				₮
 			
 			
 				മകാനീസ് പതാക്ക
 				മകാനീസ് പതാക്ക
 				മകാനീസ് പതാക്ക
+				MOP
 			
 			
 				മൗറിറ്റേനിയൻ ഔഗിയ (1973–2017)
 				മൗറിറ്റേനിയൻ ഔഗിയ (1973–2017)
 				മൗറിറ്റേനിയൻ ഔഗിയസ് (1973–2017)
+				MRO
 			
 			
 				മൗറിറ്റേനിയൻ ഔഗിയ
 				മൗറിറ്റേനിയൻ ഔഗിയ
 				മൗറിറ്റേനിയൻ ഔഗിയസ്
+				MRU
 			
 			
 				മൽത്തീസ് ലിറ
@@ -6615,22 +6681,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				മൗറീഷ്യൻ റുപ്പീ
 				മൗറീഷ്യൻ റുപ്പീ
 				മൗറീഷ്യൻ റുപ്പീ
+				MUR
 				Rs
 			
 			
 				മാൽദീവിയൻ റുഫിയ
 				മാൽദീവിയൻ റുഫിയ
 				മാൽദീവിയൻ റുഫിയ
+				MVR
 			
 			
 				മലാവിയൻ ക്വച്ചാ
 				മലാവിയൻ ക്വച്ചാ
 				മലാവിയൻ ക്വച്ചാ
+				MWK
 			
 			
 				മെക്സിക്കൻ പെസോ
 				മെക്സിക്കൻ പെസോ
 				മെക്സിക്കൻ പെസോ
+				MX$
 				$
 			
 			
@@ -6647,6 +6717,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				മലേഷ്യൻ റിംഗിറ്റ്
 				മലേഷ്യൻ റിംഗിറ്റ്
 				മലേഷ്യൻ റിംഗിറ്റ്
+				MYR
 				RM
 			
 			
@@ -6659,17 +6730,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				മൊസാംബിക്കൻ മെറ്റിക്കൽ
 				മൊസാംബിക്കൻ മെറ്റിക്കൽ
 				മൊസാംബിക്കൻ മെറ്റിക്കൽ
+				MZN
 			
 			
 				നമീബിയൻ ഡോളർ
 				നമീബിയൻ ഡോളർ
 				നമീബിയൻ ഡോളർ
+				NAD
 				$
 			
 			
 				നൈജീരിയൻ നൈറ
 				നൈജീരിയൻ നൈറ
 				നൈജീരിയൻ നൈറ
+				NGN
 				₦
 			
 			
@@ -6679,6 +6753,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				നിക്കരാഗ്വൻ കോർഡോബ
 				നിക്കരാഗ്വൻ കോർഡോബ
 				നിക്കരാഗ്വൻ കോർഡോബ
+				NIO
 				C$
 			
 			
@@ -6690,29 +6765,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				നോർവീജിയൻ ക്രോണെ
 				നോർവീജിയൻ ക്രോണെ
 				നോർവീജിയൻ ക്രോണെ
+				NOK
 				kr
 			
 			
 				നേപ്പാളീസ് റുപ്പീ
 				നേപ്പാളീസ് റുപ്പീ
 				നേപ്പാളീസ് റുപ്പീ
+				NPR
 				Rs
 			
 			
 				ന്യൂസിലാന്റ് ഡോളർ
 				ന്യൂസിലാന്റ് ഡോളർ
 				ന്യൂസിലാന്റ് ഡോളർ
+				NZ$
 				$
 			
 			
 				ഒമാനി റിയാൽ
 				ഒമാനി റിയാൽ
 				ഒമാനി റിയാൽ
+				OMR
 			
 			
 				പനാമനിയൻ ബാൽബോവ
 				പനാമനിയൻ ബാൽബോവ
 				പനാമനിയൻ ബാൽബോവ
+				PAB
 			
 			
 				പെറൂവിയൻ ഇൻറി
@@ -6723,6 +6803,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				പെറുവിയൻ സോൾ
 				പെറുവിയൻ സോൾ
 				പെറുവിയൻ സോൾ
+				PEN
 			
 			
 				പെറൂവിയൻ സോൾ (1863–1965)
@@ -6733,23 +6814,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				പാപ്പുവ ന്യൂ ഗിനിയൻ കിന
 				പാപ്പുവ ന്യൂ ഗിനിയൻ കിന
 				പാപ്പുവ ന്യൂ ഗിനിയൻ കിന
+				PGK
 			
 			
 				ഫിലിപ്പീനി പെസോ
 				ഫിലിപ്പീനി പെസോ
 				ഫിലിപ്പീനി പെസോ
+				PHP
 				₱
 			
 			
 				പാക്കിസ്ഥാനി റുപ്പീ
 				പാക്കിസ്ഥാനി റുപ്പീ
 				പാക്കിസ്ഥാനി റുപ്പീ
+				PKR
 				Rs
 			
 			
 				പോളിഷ് സ്ലോട്ടി
 				പോളിഷ് സ്ലോട്ടി
 				പോളിഷ് സ്ലോട്ടി
+				PLN
 				zł
 			
 			
@@ -6762,12 +6847,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				പരാഗ്വേയൻ ഗ്വരനീ
 				പരാഗ്വേയൻ ഗ്വരനീ
 				പരാഗ്വേയൻ ഗ്വരനീ
+				PYG
 				₲
 			
 			
 				ഖത്തർ റിയാൽ
 				ഖത്തർ റിയാൽ
 				ഖത്തർ റിയാൽ
+				QAR
 			
 			
 				റൊഡേഷ്യൻ ഡോളർ
@@ -6779,17 +6866,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				റൊമാനിയൻ ലെയു
 				റൊമാനിയൻ ലെയു
 				റൊമാനിയൻ ലെയു
+				RON
 				lei
 			
 			
 				സെർബിയൻ ദിനാർ
 				സെർബിയൻ ദിനാർ
 				സെർബിയൻ ദിനാർ
+				RSD
 			
 			
 				റഷ്യൻ റൂബിൾ
 				റഷ്യൻ റൂബിൾ
 				റഷ്യൻ റൂബിൾ
+				RUB
 				₽
 			
 			
@@ -6799,23 +6889,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				റുവാണ്ടൻ ഫ്രാങ്ക്
 				റുവാണ്ടൻ ഫ്രാങ്ക്
 				റുവാണ്ടൻ ഫ്രാങ്ക്
+				RWF
 				RF
 			
 			
 				സൗദി റിയാൽ
 				സൗദി റിയാൽ
 				സൗദി റിയാൽ
+				SAR
 			
 			
 				സോളമൻ ദ്വീപുകളുടെ ഡോളർ
 				സോളമൻ ദ്വീപുകളുടെ ഡോളർ
 				സോളമൻ ദ്വീപുകളുടെ ഡോളർ
+				SBD
 				$
 			
 			
 				സീഷെലോയിസ് റുപ്പീ
 				സീഷെലോയിസ് റുപ്പീ
 				സീഷെലോയിസ് റുപ്പീ
+				SCR
 			
 			
 				പ്രാചീന സുഡാനീസ് ദിനാർ
@@ -6824,6 +6918,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				സുഡാനീസ് പൗണ്ട്
 				സുഡാനീസ് പൗണ്ട്
 				സുഡാനീസ് പൗണ്ട്
+				SDG
 			
 			
 				പ്രാചീന സുഡാനീസ് പൌണ്ട്
@@ -6832,18 +6927,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				സ്വീഡിഷ് ക്രോണ
 				സ്വീഡിഷ് ക്രോണ
 				സ്വീഡിഷ് ക്രോണ
+				SEK
 				kr
 			
 			
 				സിംഗപ്പൂർ ഡോളർ
 				സിംഗപ്പൂർ ഡോളർ
 				സിംഗപ്പൂർ ഡോളർ
+				SGD
 				$
 			
 			
 				സെന്റ് ഹെലീന പൗണ്ട്
 				സെന്റ് ഹെലീന പൗണ്ട്
 				സെന്റ് ഹെലീന പൗണ്ട്
+				SHP
 				£
 			
 			
@@ -6856,16 +6954,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				സിയെറ ലിയോണിയൻ ലിയോൺ
 				സിയെറ ലിയോണിയൻ ലിയോൺ
 				സിയെറ ലിയോണിയൻ ലിയോണസ്
+				SLL
 			
 			
 				സോമാലി ഷില്ലിംഗ്
 				സോമാലി ഷില്ലിംഗ്
 				സോമാലി ഷില്ലിംഗ്
+				SOS
 			
 			
 				സുരിനെയിമിസ് ഡോളർ
 				സുരിനെയിമിസ് ഡോളർ
 				സുരിനെയിമിസ് ഡോളർ
+				SRD
 				$
 			
 			
@@ -6875,17 +6976,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ദക്ഷിണ സുഡാനീസ് പൗണ്ട്
 				ദക്ഷിണ സുഡാനീസ് പൗണ്ട്
 				ദക്ഷിണ സുഡാനീസ് പൗണ്ട്
+				SSP
 				£
 			
 			
 				സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര (1977–2017)
 				സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര (1977–2017)
 				സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര (1977–2017)
+				STD
 			
 			
 				സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര
 				സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര
 				സാവോ ടോമി ആൻഡ് പ്രിൻസിപെ ഡോബ്ര
+				STN
+				Db
 			
 			
 				സോവിയറ്റ് റൂബിൾ
@@ -6897,12 +7002,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				സിറിയൻ പൗണ്ട്
 				സിറിയൻ പൗണ്ട്
 				സിറിയൻ പൗണ്ട്
+				SYP
 				£
 			
 			
 				സ്വാസി ലിലാംഗനി
 				സ്വാസി ലിലാംഗനി
 				സ്വാസി ലിലാംഗനി
+				SZL
 			
 			
 				തായ് ബട്ട്
@@ -6920,6 +7027,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				താജിക്കിസ്ഥാനി സോംനി
 				താജിക്കിസ്ഥാനി സോംനി
 				താജിക്കിസ്ഥാനി സൊമോനി
+				TJS
 			
 			
 				തുർക്മെനിസ്ഥാൻ മനത്
@@ -6930,16 +7038,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				തുർക്ക്‌മെനിസ്ഥാനി മനത്
 				തുർക്ക്‌മെനിസ്ഥാനി മനത്
 				തുർക്ക്‌മെനിസ്ഥാനി മനത്
+				TMT
 			
 			
 				ടുണീഷ്യൻ ദിനാർ
 				ടുണീഷ്യൻ ദിനാർ
 				ടുണീഷ്യൻ ദിനാർ
+				TND
 			
 			
 				ടോംഗൻ പാംഗ
 				ടോംഗൻ പാംഗ
 				ടോംഗൻ പാംഗ
+				TOP
 				T$
 			
 			
@@ -6956,6 +7067,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ടർക്കിഷ് ലിറ
 				ടർക്കിഷ് ലിറ
 				ടർക്കിഷ് ലിറ
+				TRY
 				₺
 				TL
 			
@@ -6963,23 +7075,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ട്രിനിഡാഡ് അന്റ് ടുബാഗോ ഡോളർ
 				ട്രിനിഡാഡ് അന്റ് ടുബാഗോ ഡോളർ
 				ട്രിനിഡാഡ് അന്റ് ടുബാഗോ ഡോളർ
+				TTD
 				$
 			
 			
 				ന്യൂ തായ്‌വാൻ ഡോളർ
 				ന്യൂ തായ്‌വാൻ ഡോളർ
 				ന്യൂ തായ്‌വാൻ ഡോളർ
+				NT$
 				NT$
 			
 			
 				ടാൻസാനിയൻ ഷില്ലിംഗ്
 				ടാൻസാനിയൻ ഷില്ലിംഗ്
 				ടാൻസാനിയൻ ഷില്ലിംഗ്
+				TZS
 			
 			
 				ഉക്രേനിയൻ ഹ്രിവ്‌നിയ
 				ഉക്രേനിയൻ ഹ്രിവ്നിയ
 				ഉക്രേനിയൻ ഹ്രിവ്‌നിയ
+				UAH
 				₴
 			
 			
@@ -6994,6 +7110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഉഗാണ്ടൻ ഷില്ലിംഗ്
 				ഉഗാണ്ടൻ ഷില്ലിംഗ്
 				ഉഗാണ്ടൻ ഷില്ലിംഗ്
+				UGX
 			
 			
 				യു.എസ്. ഡോളർ
@@ -7024,12 +7141,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ഉറുഗ്വേയൻ പെസോ
 				ഉറുഗ്വേയൻ പെസോ
 				ഉറുഗ്വേയൻ പെസോ
+				UYU
 				$
 			
 			
 				ഉസ്‌ബെക്കിസ്ഥാനി സോം
 				ഉസ്‌ബെക്കിസ്ഥാനി സോം
 				ഉസ്‌ബെക്കിസ്ഥാനി സോം
+				UZS
 			
 			
 				വെനസ്വേലൻ ബോലിവർ (1871–2008)
@@ -7040,33 +7159,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				വെനിസ്വേലൻ ബൊളീവർ (2008–2018)
 				വെനിസ്വേലൻ ബൊളീവർ (2008–2018)
 				വെനിസ്വേലൻ ബൊളീവർ (2008–2018)
+				VEF
 				Bs
 			
 			
 				വെനിസ്വേലൻ ബൊളീവർ
 				വെനിസ്വേലൻ ബൊളീവർ
 				വെനിസ്വേലൻ ബൊളീവർ
+				VES
 			
 			
 				വിയറ്റ്നാമീസ് ഡോങ്
 				വിയറ്റ്നാമീസ് ഡോങ്
 				വിയറ്റ്നാമീസ് ഡോങ്
+				₫
 				₫
 			
 			
 				വന്വാതു വാതു
 				വന്വാതു വാതു
 				വന്വാതു വാതു
+				VUV
 			
 			
 				സമോവൻ താല
 				സമോവൻ താല
 				സമോവൻ താല
+				WST
 			
 			
 				മദ്ധ്യ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്
 				മദ്ധ്യ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്
 				മദ്ധ്യ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്
+				FCFA
 			
 			
 				വെള്ളി
@@ -7102,6 +7227,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				കിഴക്കൻ കരീബിയൻ ഡോളർ
 				കിഴക്കൻ കരീബിയൻ ഡോളർ
 				കിഴക്കൻ കരീബിയൻ ഡോളർ
+				EC$
 				$
 			
 			
@@ -7128,6 +7254,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				പശ്ചിമ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്
 				പശ്ചിമ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്
 				പശ്ചിമ ആഫ്രിക്കൻ [CFA] ഫ്രാങ്ക്
+				CFA
 			
 			
 				പലാഡിയം
@@ -7138,6 +7265,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP ഫ്രാങ്ക്
 				CFP ഫ്രാങ്ക്
 				CFP ഫ്രാങ്ക്
+				CFPF
 			
 			
 				പ്ലാറ്റിനം
@@ -7168,6 +7296,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				യെമനി റിയാൽ
 				യെമനി റിയാൽ
 				യെമനി റിയാൽ
+				YER
 			
 			
 				യൂഗോസ്ലേവിയൻ ഹാർഡ് ദിനാർ
@@ -7193,6 +7322,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ദക്ഷിണാഫ്രിക്കൻ റാൻഡ്
 				ദക്ഷിണാഫ്രിക്കൻ റാൻഡ്
 				ദക്ഷിണാഫ്രിക്കൻ റാൻഡ്
+				ZAR
 				R
 			
 			
@@ -7204,6 +7334,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				സാംബിയൻ ക്വാച്ച
 				സാംബിയൻ ക്വാച്ച
 				സാംബിയൻ ക്വാച്ച
+				ZMW
 				ZK
 			
 			
@@ -7223,7 +7354,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
@@ -7323,9 +7456,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} / ചതുരശ്ര ഇഞ്ച്
 			
 			
-				ദുനം
-				{0} ദുനം
-				{0} ദുനങ്ങൾ
+				ദുനം
+				{0} ദുനം
+				{0} ദുനങ്ങൾ
 			
 			
 				ക്യാരറ്റ്
@@ -7353,19 +7486,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}%
 			
 			
-				പ്രതിമില്ലി
-				{0} പ്രതിമില്ലി
-				{0} പ്രതിമില്ലി
+				പ്രതിമില്ലി
+				{0} പ്രതിമില്ലി
+				{0} പ്രതിമില്ലി
 			
 			
-				‱
-				{0}‱
-				{0}‱
+				{0} പിരമിഡ്
+				{0} പിരമിഡ്
 			
 			
-				mol
-				{0} mol
-				{0} mol
+				മോളുകൾ
+				{0} മോൾ
+				{0} മോളുകൾ
 			
 			
 				ലിറ്റർ/കിലോമീറ്റർ
@@ -7388,9 +7520,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} മൈൽ / ഇംപീ. ഗാലൻ
 			
 			
-				PB
-				{0} പെറ്റാബൈറ്റ്
-				{0} പെറ്റാബൈറ്റ്
+				പെറ്റാബൈറ്റുകൾ
+				{0} പെറ്റാബൈറ്റ്
+				{0} പെറ്റാബൈറ്റ്
 			
 			
 				ടെറാബൈറ്റ്
@@ -7447,6 +7579,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} നൂറ്റാണ്ട്
 				{0} നൂറ്റാണ്ടുകൾ
 			
+			
+				ദശാബ്‌ദം
+				ദശാബ്‌ദം
+				{0} ദശാബ്‌ദം
+			
 			
 				വർഷം
 				{0} വർഷം
@@ -7555,24 +7692,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} കിലോവാട്ട്/മണിക്കൂർ
 			
 			
-				eV
-				{0} eV
-				{0} eV
+				{0} ഇലക്ട്രോൺവോൾട്ട്
+				{0} ഇലക്ട്രോൺവോൾട്ട്
 			
 			
-				BTU
-				{0} ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റ്
-				{0} ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റുകൾ
+				ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റ്
+				{0} ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റ്
+				{0} ബ്രിട്ടീഷ് തെർമൽ യൂണിറ്റുകൾ
 			
 			
-				lbf
-				{0} lbf
-				{0} lbf
+				പൗണ്ട്സ് ഓഫ് ഫോഴ്സ്
+				{0} പൗണ്ട് ഓഫ് ഫോഴ്സ്
+				{0} പൗണ്ട്സ് ഓഫ് ഫോഴ്സ്
 			
 			
-				N
-				{0} N
-				{0} N
+				ന്യൂട്ടൻസ്
+				{0} ന്യൂട്ടൻ
+				{0} ന്യൂട്ടൻസ്
 			
 			
 				ജിഗാഹെർട്സ്
@@ -7699,20 +7835,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} പോയിന്റ്
 				{0} പോയിന്റ്
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				ലക്സ്
 				{0} ലക്സ്
 				{0} ലക്സ്
 			
 			
-				L☉
-				{0} L☉
-				{0} L☉
+				സോളാർ ലുമിനോസൈട്സ്
+				{0} സോളാർ ലുമിനോസിറ്റി
+				{0} സോളാർ ലുമിനോസൈട്സ്
 			
 			
 				മെട്രിക് ടൺ
@@ -7774,19 +7905,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ക്യാരറ്റ്
 			
 			
-				Da
-				{0} Da
-				{0} Da
+				ഡാൽട്ടണുകൾ
+				ഡാൽട്ടൻ
+				{0} ഡാൽട്ടണുകൾ
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				{0} ഭൂപിണ്ഡം
+				{0} ഭൂപിണ്ഡം
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
+				സൂര്യപിണ്ഡം
+				{0} സൂര്യപിണ്ഡം
+				{0} സൂര്യപിണ്ഡം
 			
 			
 				ജിഗാവാട്ട്
@@ -7818,11 +7948,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} കുതിരശക്തി
 				{0} കുതിരശക്തി
 			
-			
-				ഹെക്‌ടോപാസ്‌ക്കൽ
-				{0} ഹെക്‌ടോപാസ്‌ക്കൽ
-				{0} ഹെക്‌ടോപാസ്‌ക്കൽ
-			
 			
 				മില്ലീമീറ്റർ മെർക്കുറി
 				{0} മില്ലീമീറ്റർ മെർക്കുറി
@@ -7838,25 +7963,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ഇഞ്ച് ഓഫ് മെർക്കുറി
 				{0} ഇഞ്ച് ഓഫ് മെർക്കുറി
 			
+			
+				ബാറുകൾ
+				{0} ബാർ
+				{0} ബാറുകൾ
+			
 			
 				മില്ലിബാർ
 				{0} മില്ലിബാർ
 				{0} മില്ലിബാർ
 			
 			
-				അറ്റ്‌മോസ്‌ഫിയർ
-				{0} അറ്റ്‌മോസ്‌ഫിയർ
-				{0} അറ്റ്‌മോസ്‌ഫിയർ
+				അറ്റ്‌മോസ്‌ഫിയർ
+				{0} അറ്റ്‌മോസ്‌ഫിയർ
+				{0} അറ്റ്‌മോസ്‌ഫിയർ
+			
+			
+				പാസ്കൽസ്
+				{0} പാസ്കൽ
+				{0} പാസ്കൽസ്
+			
+			
+				ഹെക്‌ടോപാസ്‌ക്കൽ
+				{0} ഹെക്‌ടോപാസ്‌ക്കൽ
+				{0} ഹെക്‌ടോപാസ്‌ക്കൽ
 			
 			
-				കിലോപാസ്കൽ
-				{0} കിലോപാസ്കൽ
-				{0} കിലോപാസ്കൽ
+				കിലോപാസ്കൽ
+				{0} കിലോപാസ്കൽ
+				{0} കിലോപാസ്കൽ
 			
 			
-				മെഗാപാസ്കൽ
-				{0} മെഗാപാസ്കൽ
-				{0} മെഗാപാസ്കലുകൾ
+				മെഗാപാസ്കൽ
+				{0} മെഗാപാസ്കൽ
+				{0} മെഗാപാസ്കലുകൾ
 			
 			
 				കിലോമീറ്റർ/മണിക്കൂർ
@@ -7899,14 +8039,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} കെൽവിൻ
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				പൗണ്ട് ഫീറ്റ്
+				{0} പൗണ്ട് ഫൂട്ട്
+				{0} പൗണ്ട് ഫീറ്റ്
 			
 			
-				ന്യൂട്ടൺ മീറ്റർ
-				{0} ന്യൂട്ടൺ മീറ്റർ
-				{0} ന്യൂട്ടൺ മീറ്ററുകൾ
+				ന്യൂട്ടൺ മീറ്റർ
+				{0} ന്യൂട്ടൺ മീറ്റർ
+				{0} ന്യൂട്ടൺ മീറ്ററുകൾ
 			
 			
 				ക്യൂബിക് കിലോമീറ്റർ
@@ -8023,11 +8163,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ഫ്ലൂയിഡ് ഔൺസ്
 				{0} ഫ്ലൂയിഡ് ഔൺസ്
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				ടേബിൾസ്‌പൂൺ
 				{0} ടേബിൾസ്‌പൂൺ
@@ -8039,12 +8174,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ടീസ്‌പൂൺ
 			
 			
-				ബാരൽ
-				{0} ബാരൽ
-				{0} ബാരൽ
+				ബാരൽ
+				{0} ബാരൽ
+				{0} ബാരൽ
 			
 			
-				കാർഡിനൽ ദിശ
+				കാർഡിനൽ ദിശ
 				{0} കിഴക്ക്
 				{0} വടക്ക്
 				{0} തെക്ക്
@@ -8055,6 +8190,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ജി-ഫോഴ്‌സ്
 				{0} ജി
@@ -8141,9 +8279,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/ഇഞ്ച്²
 			
 			
-				ദുനങ്ങൾ
-				{0} ദുനം
-				{0} ദുനം
+				ദുനങ്ങൾ
+				{0} ദുനം
+				{0} ദുനം
 			
 			
 				ക്യാരറ്റ്
@@ -8176,14 +8314,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				‱
-				{0}‱
-				{0}‱
+				പിരമിഡ്
 			
 			
-				mol
-				{0} mol
-				{0} mol
+				മോൾ
+				{0} മോൾ
+				{0} മോൾ
 			
 			
 				ലിറ്റർ/കി.മീ.
@@ -8206,7 +8342,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} മൈ.പെ.ഗാ./ഇം‌പീ.
 			
 			
-				PB
+				പെ.ബൈ.
 				{0} പിബി
 				{0} പിബി
 			
@@ -8227,6 +8363,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ജി.ബിറ്റ്
+				{0} Gb
+				{0} Gb
 			
 			
 				മെ.ബൈറ്റ്
@@ -8263,6 +8401,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} നൂ.
 				{0} നൂ.
 			
+			
+				ദശാബ്‌ദം
+				{0} ദശാബ്‌ദം
+				{0} ദശാബ്‌ദം
+			
 			
 				വർഷം
 				{0} വ
@@ -8371,24 +8514,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} കി.വാ/മ.
 			
 			
-				eV
-				{0} eV
-				{0} eV
+				ഇലക്ട്രോൺവോൾട്ട്
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+			
+			
+				US therm
+				{0} US therm
+				{0} US therm
 			
 			
-				lbf
-				{0} lbf
-				{0} lbf
+				പൗണ്ട് ഫോഴ്സ്
 			
 			
-				N
-				{0} N
-				{0} N
+				ന്യൂട്ടൻ
 			
 			
 				ജി.ഹെ.
@@ -8410,6 +8550,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ഹെ.
 				{0} ഹെ.
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				കി.മീ.
 				{0} കി.മീ.
@@ -8515,20 +8690,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} പോ.
 				{0} പോ.
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				ലക്സ്
 				{0} ലക്സ്
 				{0} ലക്സ്
 			
 			
-				L☉
-				{0} L☉
-				{0} L☉
+				സോളാർ ലുമിനോസൈട്സ്
 			
 			
 				ട.
@@ -8590,19 +8758,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 			
 			
-				Da
-				{0} Da
-				{0} Da
+				ഡാൽട്ടണുകൾ
+				{0} ഡാ
+				{0} ഡാ
 			
 			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+				ഭൂപിണ്ഡം
 			
 			
-				M☉
-				{0} M☉
-				{0} M☉
+				സൂര്യപിണ്ഡം
 			
 			
 				ജി.വാ.
@@ -8634,11 +8798,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} എച്ച്.പി.
 				{0} എച്ച്.പി.
 			
-			
-				ഹെ.പാ.
-				{0} ഹെ.പാ.
-				{0} ഹെ.പാ.
-			
 			
 				മിമീ.മെ.
 				{0} മിമീ.മെ.
@@ -8654,6 +8813,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ഇഞ്ച് മെ.
 				{0} ഇഞ്ച് മെ.
 			
+			
+				ബാർ
+				{0} ബാർ
+				{0} ബാറുകൾ
+			
 			
 				മി.ബാ
 				{0} മി.ബാ
@@ -8664,15 +8828,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				പാ
+				{0} പാ
+				{0} പാ
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				ഹെ.പാ.
+				{0} ഹെ.പാ.
+				{0} ഹെ.പാ.
 			
 			
 				കി.മീ/മ.
@@ -8714,16 +8878,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K​
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				കി.മീ³
 				{0} കി.മീ³
@@ -8839,11 +8993,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ഫ്ലൂ. ഔ.
 				{0} ഫ്ലൂ. ഔ.
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				ടേ.സ്‌പൂ.
 				{0} ടേ.സ്‌പൂ.
@@ -8855,9 +9004,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ടീ.സ്‌പൂ.
 			
 			
-				ബാരൽ
-				{0} bbl
-				{0} bbl
+				ബാരൽ
 			
 			
 				ദിശ
@@ -9155,11 +9302,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} വാ
 				{0} വാ
 			
-			
-				ഹെ.പാ.
-				{0} hPa
-				{0} hPa
-			
 			
 				മിമീ.മെ.
 				{0}മിമീ.മെ.
@@ -9178,6 +9320,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} മിബാ
 				{0} മിബാ
 			
+			
+				ഹെ.പാ.
+				{0} hPa
+				{0} hPa
+			
 			
 				കി.മീ/മ.
 				{0}കി.മീ/മ.
@@ -9198,6 +9345,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}നോട്ട്
 				{0}നോട്ട്
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°സെ
 				{0}°സെ
@@ -9209,6 +9361,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°ഫാ
 			
 			
+				K
 				{0}K
 				{0}K
 			
@@ -9272,7 +9425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} {1}
 			{0} {1}
 			{0} {1}
-			{0} കൂടാതെ {1}
+			{0}, {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/ml_IN.xml b/make/data/cldr/common/main/ml_IN.xml
index 76bb2a8cfb3..708da954377 100644
--- a/make/data/cldr/common/main/ml_IN.xml
+++ b/make/data/cldr/common/main/ml_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mn.xml b/make/data/cldr/common/main/mn.xml
index 8bcb74b06eb..cc6a55a98ed 100644
--- a/make/data/cldr/common/main/mn.xml
+++ b/make/data/cldr/common/main/mn.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -65,6 +65,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			буги
 			блин
 			каталан
+			чакма
 			чечень
 			себуано
 			чига
@@ -268,6 +269,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			нама
 			норвегийн букмол
 			хойд ндебеле
+			доод герман
 			бага саксон
 			балба
 			невари
@@ -384,7 +386,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			тасавак
 			таити
 			тува
-			Төв Атласын тамазайт
+			Төв Атласын тамазигхт
 			удмурт
 			уйгур
 			украин
@@ -410,10 +412,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			иддиш
 			ёруба
 			кантон
-			Мороккогийн стандарт тамазайт
+			хятад, кантон
+			стандарт тамазайт (Морокко)
 			хятад
+			хятад, мандарин
 			хялбаршуулсан хятад
+			хялбаршуулсан мандарин хятад
 			уламжлалт хятад
+			уламжлалт мандарин хятад
 			зулу
 			зуни
 			хэл зүйн агуулгагүй
@@ -651,13 +657,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Ливи
 			Морокко
 			Монако
-			Молдав
+			Молдова
 			Монтенегро
 			Сент-Мартин
 			Мадагаскар
 			Маршаллын арлууд
-			Македон
-			Македон (Хуучин ЮБНМУ)
+			Хойд Македон
 			Мали
 			Мьянмар
 			Монгол
@@ -729,7 +734,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Эль Сальвадор
 			Синт Мартен
 			Сири
-			Свазиланд
+			Эсватини
+			Свазиланд
 			Тристан да Кунъя
 			Турк ба Кайкосын Арлууд
 			Чад
@@ -766,6 +772,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Уоллис ба Футуна
 			Самоа
+			хуурмаг аялга
+			хуурмаг хоёр чиглэлт
 			Косово
 			Йемен
 			Майотта
@@ -818,7 +826,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			бенгал тоо
 			деванагари тоо
 			этиоп тоо
-			бүрэн хэмжээтэй тоо
+			бүтэн-өргөнтэй тоо
 			гүрж тоо
 			грек тоо
 			жижиг грек тоо
@@ -849,7 +857,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			төвд тоо
 		
 		
-			метрийн
+			метрийн систем
 			ИБ
 			АНУ
 		
@@ -862,9 +870,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[а б в г д е ё ж з и й к л м н о ө п р с т у ү ф х ц ч ш щ ъ ы ь э ю я]
 		[ә җ ӊ һ]
-		[А Б В Г Д Е Ж З И Й К Л М Н О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[А Б В Г Д Е Ж З И Й К Л М Н О Ө П Р С Т У Ү Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -970,56 +978,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1410,12 +1371,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							y.MM.dd, EEEE
+							y 'оны' MMMM'ын' d, EEEE 'гараг'
 						
 					
 					
 						
-							y.MM.dd
+							y 'оны' MMMM'ын' d
 						
 					
 					
@@ -1527,55 +1488,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
 						
-							G y MMM – G y MMM
 							G y MMM – MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
 						
 						
 							h a – h a
@@ -1805,6 +1722,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				7 хоног
+				өнгөрсөн 7 хоног
+				энэ 7 хоног
+				ирэх 7 хоног
 				
 					{0} 7 хоногийн дараа
 					{0} 7 хоногийн дараа
@@ -1817,6 +1737,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				7 хоног
+				өнгөрсөн 7 хоног
+				энэ 7 хоног
+				ирэх 7 хоног
 				
 					{0} 7 хоногийн дараа
 					{0} 7 хоногийн дараа
@@ -2405,7 +2328,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кордова
 			
 			
-				Буэнос Айрес
+				Буэнос-Айрес
 			
 			
 				Паго Паго
@@ -2645,7 +2568,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Глейс булан
 			
 			
-				Бланк-Саблон
+				Блан-Саблон
 			
 			
 				Сент-Жонс
@@ -2702,7 +2625,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Хавана
 			
 			
-				Кабо Верде
+				Кабо-Верде
 			
 			
 				Кюрасао
@@ -2768,7 +2691,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мадрид
 			
 			
-				Аддис-абеба
+				Аддис-Aбеба
 			
 			
 				Хельсинк
@@ -2789,7 +2712,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Косрэ
 			
 			
-				Фароэ
+				Фарер
 			
 			
 				Парис
@@ -2980,6 +2903,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Актөбе
 			
+			
+				Костанай
+			
 			
 				Кызылорд
 			
@@ -3182,7 +3108,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Таити
 			
 			
-				Маркизас
+				Маркез
 			
 			
 				Гамбьер
@@ -3224,7 +3150,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Мадейра
 			
 			
-				Лисбон
+				Лиссабон
 			
 			
 				Палау
@@ -3362,7 +3288,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Фритаун
 			
 			
-				Сан Марино
+				Сан-Марино
 			
 			
 				Дакар
@@ -3452,10 +3378,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Кампала
 			
 			
-				Мидвей
+				Мидуэй
 			
 			
-				Уэйк
+				Уэк
 			
 			
 				Адак
@@ -3779,9 +3705,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Кабо Вердийн цаг
-					Кабо Вердийн стандарт цаг
-					Кабо Вердийн зуны цаг
+					Кабо-Вердийн цаг
+					Кабо-Вердийн стандарт цаг
+					Кабо-Вердийн зуны цаг
 				
 			
 			
@@ -3836,9 +3762,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Күүк арлын цаг
-					Күүк арлын стандарт цаг
-					Күүк арлын хагас зуны цаг
+					Күүкийн арлуудын цаг
+					Күүкийн арлуудын стандарт цаг
+					Күүкийн арлуудын хагас зуны цаг
 				
 			
 			
@@ -3944,7 +3870,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Жильбер арлын цаг
+					Гильбертийн арлуудын цаг
 				
 			
 			
@@ -3954,21 +3880,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Зүүн Гринландын цаг
-					Зүүн Гринландын стандарт цаг
-					Зүүн Гринландын зуны цаг
+					Зүүн Гренландын цаг
+					Зүүн Гренландын стандарт цаг
+					Зүүн Гренландын зуны цаг
 				
 			
 			
 				
-					Баруун Гринландын цаг
-					Баруун Гринландын стандарт цаг
-					Баруун Гринландын зуны цаг
+					Баруун Гренландын цаг
+					Баруун Гренландын стандарт цаг
+					Баруун Гренландын зуны цаг
 				
 			
 			
 				
-					Галфийн стандарт цаг
+					Персийн булангийн цаг
 				
 			
 			
@@ -4091,7 +4017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Лайн арлын цаг
+					Лайн арлуудын цаг
 				
 			
 			
@@ -4125,12 +4051,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Маркесасын цаг
+					Маркезын арлуудын цаг
 				
 			
 			
 				
-					Маршаллын арлын цаг
+					Маршаллын арлуудын цаг
 				
 			
 			
@@ -4285,9 +4211,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Сен-Пьер ба Микелоны цаг
+					Сент-Пьер ба Микелоны цаг
 					Сент-Пьер ба Микелоны стандарт цаг
-					Сен-Пьер ба Микелоны зуны цаг
+					Сент-Пьер ба Микелоны зуны цаг
 				
 			
 			
@@ -4346,7 +4272,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Өмнөд Жоржийн цаг
+					Өмнөд Жоржиагийн цаг
 				
 			
 			
@@ -4452,7 +4378,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Вейк арлын цаг
+					Уэкийн арлуудын цаг
 				
 			
 			
@@ -4481,9 +4407,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			latn
 		
+		1
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4492,6 +4423,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 мянга
@@ -4611,66 +4547,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				AED
 			
 			
-				афганистан афгани
-				афганистан афгани
-				афганистан афгани
+				Афганистаны афгани
+				Афганистаны афгани
+				Афганистаны афгани
 				AFN
 			
 			
-				албанийн лек
-				албанийн лек
-				албанийн лек
+				Албанийн лек
+				Албанийн лек
+				Албанийн лек
 				ALL
 			
 			
-				арменийн драм
-				арменийн драм
-				арменийн драм
+				Арменийн драм
+				Арменийн драм
+				Арменийн драм
 				AMD
 			
 			
-				нидерландын антиллъя гулдер
-				нидерландын антиллъя гулдер
-				нидерландын антиллъя гулдер
+				Нидерландын Антиллийн гулдер
+				Нидерландын Антиллийн гулдер
+				Нидерландын Антиллийн гулдер
 				ANG
 			
 			
-				ангол кванза
-				ангол кванза
-				ангол кванза
+				Анголын кванза
+				Анголын кванза
+				Анголын кванза
 				AOA
 				Kz
 			
 			
-				аргентин песо
-				аргентин песо
-				аргентин песо
+				Аргентины песо
+				Аргентины песо
+				Аргентины песо
 				ARS
 				$
 			
 			
-				австрали доллар
-				австрали доллар
-				австрали доллар
+				Австралийн доллар
+				Австралийн доллар
+				Австралийн доллар
 				A$
 				$
 			
 			
-				арубын флорин
-				арубын флорин
-				арубын флорин
+				Арубын флорин
+				Арубын флорин
+				Арубын флорин
 				AWG
 			
 			
-				азербайжаны манат
-				азербайжаны манат
-				азербайжаны манат
+				Азербайжаны манат
+				Азербайжаны манат
+				Азербайжаны манат
 				AZN
 			
 			
-				босни-герцеговин хөрвөгч марк
-				босни-герцеговин хөрвөгч марк
-				босни-герцеговин хөрвөгч марк
+				Босни-Герцеговины хөрвөгч марк
+				Босни-Герцеговины хөрвөгч марк
+				Босни-Герцеговины хөрвөгч марк
 				BAM
 				KM
 			
@@ -4682,82 +4618,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				$
 			
 			
-				бангладеш така
-				бангладеш така
-				бангладеш така
+				Бангладешийн така
+				Бангладешийн така
+				Бангладешийн така
 				BDT
 				৳
 			
 			
-				болгарын лев
-				болгарын лев
-				болгарын лев
+				Болгарын лев
+				Болгарын лев
+				Болгарын лев
 				BGN
 			
 			
-				бахрейн динар
-				бахрейн динар
-				бахрейн динар
+				Бахрейн динар
+				Бахрейн динар
+				Бахрейн динар
 				BHD
 			
 			
-				бурунд франк
-				бурунд франк
-				бурунд франк
+				Бурундийн франк
+				Бурундийн франк
+				Бурундийн франк
 				BIF
 			
 			
-				бермуд доллар
-				бермуд доллар
-				бермуд доллар
+				Бермудын доллар
+				Бермудын доллар
+				Бермудын доллар
 				BMD
 				$
 			
 			
-				бруней доллар
-				бруней доллар
-				бруней доллар
+				Брунейн доллар
+				Брунейн доллар
+				Брунейн доллар
 				BND
 				$
 			
 			
-				боливи боливиано
-				боливи боливиано
-				боливи боливиано
+				Боливийн боливиано
+				Боливийн боливиано
+				Боливийн боливиано
 				BOB
 				Bs
 			
 			
-				бразилийн рил
-				бразилийн рил
-				бразилийн рил
+				Бразилийн реал
+				Бразилийн реал
+				Бразилийн реал
 				R$
 				R$
 			
 			
-				багам доллар
-				багам доллар
-				багам доллар
+				Багамын доллар
+				Багамын доллар
+				Багамын доллар
 				BSD
 				$
 			
 			
-				бутаны нгултрум
-				бутаны нгултрум
-				бутаны нгултрум
+				Бутаны нгултрум
+				Бутаны нгултрум
+				Бутаны нгултрум
 				BTN
 			
 			
-				ботсвани пула
-				ботсвани пула
-				ботсвани пула
+				Ботсванийн пула
+				Ботсванийн пула
+				Ботсванийн пула
 				BWP
 				P
 			
 			
-				беларусь рубль
-				беларусь рубль
-				беларусь рубль
+				Беларусийн рубль
+				Беларусийн рубль
+				Беларусийн рубль
 				BYN
 				р.
 			
@@ -4768,9 +4704,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				BYR
 			
 			
-				белиз доллар
-				белиз доллар
-				белиз доллар
+				Белизийн доллар
+				Белизийн доллар
+				Белизийн доллар
 				BZD
 				$
 			
@@ -4782,121 +4718,121 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				$
 			
 			
-				конго франк
-				конго франк
-				конго франк
+				Конгогийн франк
+				Конгогийн франк
+				Конгогийн франк
 				CDF
 			
 			
-				швейцарь франк
-				швейцарь франк
-				швейцарь франк
+				Швейцарийн франк
+				Швейцарийн франк
+				Швейцарийн франк
 				CHF
 			
 			
-				чилийн песо
-				чилийн песо
-				чилийн песо
+				Чилийн песо
+				Чилийн песо
+				Чилийн песо
 				CLP
 				$
 			
 			
-				Хятадын юань
-				Хятадын юань
-				Хятадын юань
+				Хятадын юань (офшор)
+				Хятадын юань (офшор)
+				Хятадын юань (офшор)
 				CNH
 			
 			
-				хятад юань
-				хятад юань
-				хятад юань
+				Хятадын юань
+				Хятадын юань
+				Хятадын юань
 				CN¥
 				¥
 			
 			
-				колумбын песо
-				колумбын песо
-				колумбын песо
+				Колумбын песо
+				Колумбын песо
+				Колумбын песо
 				COP
 				$
 			
 			
-				коста рикагийн колон
-				коста рикагийн колон
-				коста рикагийн колон
+				Коста-Рикагийн колон
+				Коста-Рикагийн колон
+				Коста-Рикагийн колон
 				CRC
 				₡
 			
 			
-				кубын хөрвөгч песо
-				кубын хөрвөгч песо
-				кубын хөрвөгч песо
+				Кубын хөрвөгч песо
+				Кубын хөрвөгч песо
+				Кубын хөрвөгч песо
 				CUC
 				$
 			
 			
-				кубын песо
-				кубын песо
-				кубын песо
+				Кубын песо
+				Кубын песо
+				Кубын песо
 				CUP
 				$
 			
 			
-				кабо-верде эскудо
-				кабо-верде эскудо
-				кабо-верде эскудо
+				Кабо-Вердийн эскудо
+				Кабо-Вердийн эскудо
+				Кабо-Вердийн эскудо
 				CVE
 			
 			
-				Чех крон
-				Чех крон
-				Чех крон
+				Чехийн крон
+				Чехийн крон
+				Чехийн крон
 				CZK
 				Kč
 			
 			
-				жибоути франк
-				жибоути франк
-				жибоути франк
+				Жибутийн франк
+				Жибутийн франк
+				Жибутийн франк
 				DJF
 			
 			
-				данийн крон
-				данийн крон
-				данийн крон
+				Данийн крон
+				Данийн крон
+				Данийн крон
 				DKK
 				kr
 			
 			
-				доминиканы песо
-				доминиканы песо
-				доминиканы песо
+				Доминиканы песо
+				Доминиканы песо
+				Доминиканы песо
 				DOP
 				$
 			
 			
-				алжир доллар
-				алжир доллар
-				алжир доллар
+				Алжирийн доллар
+				Алжирийн доллар
+				Алжирийн доллар
 				DZD
 			
 			
-				египет паунд
-				египет паунд
-				египет паунд
+				Египетийн фунт
+				Египетийн фунт
+				Египетийн фунт
 				EGP
 				E£
 			
 			
-				эритрей накфа
-				эритрей накфа
-				эритрей накфа
+				Эритрейн накфа
+				Эритрейн накфа
+				Эритрейн накфа
 				ERN
 			
 			
-				этиоп бирр
-				этиоп бирр
-				этиоп бирр
+				Этиопын бирр
+				Этиопын бирр
+				Этиопын бирр
 				ETB
 			
 			
@@ -4907,252 +4843,252 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				€
 			
 			
-				фижи доллар
-				фижи доллар
-				фижи доллар
+				Фижигийн доллар
+				Фижигийн доллар
+				Фижигийн доллар
 				FJD
 				$
 			
 			
-				фолклэнд арлын паунд
-				фолклэнд арлын паунд
-				фолклэнд арлын паунд
+				Фолклендийн арлуудын паунд
+				Фолклендийн арлуудын паунд
+				Фолклендийн арлуудын паунд
 				FKP
 				£
 			
 			
-				британийн фунт
-				британийн фунт
-				британийн фунт
+				Британийн фунт
+				Британийн фунт
+				Британийн фунт
 				£
 				£
 			
 			
-				гүржийн лари
-				гүржийн лари
-				гүржийн лари
+				Гүржийн лари
+				Гүржийн лари
+				Гүржийн лари
 				GEL
 				₾
 			
 			
-				гана седи
-				гана седи
-				гана седи
+				Ганагийн седи
+				Ганагийн седи
+				Ганагийн седи
 				GHS
 			
 			
-				гибралтар паунд
-				гибралтар паунд
-				гибралтар паунд
+				Гибралтарын фунт
+				Гибралтарын фунт
+				Гибралтарын фунт
 				GIP
 				£
 			
 			
-				гамби даласи
-				гамби даласи
-				гамби даласи
+				Гамбийн даласи
+				Гамбийн даласи
+				Гамбийн даласи
 				GMD
 			
 			
-				гвиней франк
-				гвиней франк
-				гвиней франк
+				Гвинейн франк
+				Гвинейн франк
+				Гвинейн франк
 				GNF
 				FG
 			
 			
-				гватемалын кецал
-				гватемалын кецал
-				гватемалын кецал
+				Гватемалын кецал
+				Гватемалын кецал
+				Гватемалын кецал
 				GTQ
 				Q
 			
 			
-				гайана доллар
-				гайана доллар
-				гайана доллар
+				Гайанын доллар
+				Гайанын доллар
+				Гайанын доллар
 				GYD
 				$
 			
 			
-				хонгконг доллар
-				хонгконг доллар
-				хонгконг доллар
+				Хонг Конгийн доллар
+				Хонг Конгийн доллар
+				Хонг Конгийн доллар
 				HK$
 				$
 			
 			
-				гондурасын лемпира
-				гондурасын лемпира
-				гондурасын лемпира
+				Гондурасын лемпира
+				Гондурасын лемпира
+				Гондурасын лемпира
 				HNL
 				L
 			
 			
-				хорватын куна
-				хорватын куна
-				хорватын куна
+				Хорватын куна
+				Хорватын куна
+				Хорватын куна
 				HRK
 				kn
 			
 			
-				гаитийн гоурд
-				гаитийн гоурд
-				гаитийн гоурд
+				Гаитийн гурд
+				Гаитийн гурд
+				Гаитийн гурд
 				HTG
 			
 			
-				унгарын форинт
-				унгарын форинт
-				унгарын форинт
+				Унгарын форинт
+				Унгарын форинт
+				Унгарын форинт
 				HUF
 				Ft
 			
 			
-				индонези рупи
-				индонези рупи
-				индонези рупи
+				Индонезийн рупи
+				Индонезийн рупи
+				Индонезийн рупи
 				IDR
 				Rp
 			
 			
-				израилийн шинэ шекел
-				израилийн шинэ шекел
-				израилийн шинэ шекел
+				Израилийн шинэ шекел
+				Израилийн шинэ шекел
+				Израилийн шинэ шекел
 				₪
 				₪
 			
 			
-				энэтхэг рупи
-				энэтхэг рупи
-				энэтхэг рупи
+				Энэтхэгийн рупи
+				Энэтхэгийн рупи
+				Энэтхэгийн рупи
 				₹
 				₹
 			
 			
-				ирак динар
-				ирак динар
-				ирак динар
+				Иракийн динар
+				Иракийн динар
+				Иракийн динар
 				IQD
 			
 			
-				иран риал
-				иран риал
-				иран риал
+				Ираны риял
+				Ираны риял
+				Ираны риял
 				IRR
 			
 			
-				исландын крон
-				исландын крон
-				исландын крон
+				Исландын крон
+				Исландын крон
+				Исландын крон
 				ISK
 				kr
 			
 			
-				ямайк доллар
-				ямайк доллар
-				ямайк доллар
+				Ямайкийн доллар
+				Ямайкийн доллар
+				Ямайкийн доллар
 				JMD
 				$
 			
 			
-				йордан динар
-				йордан динар
-				йордан динар
+				Йорданы динар
+				Йорданы динар
+				Йорданы динар
 				JOD
 			
 			
-				япон иен
-				япон иен
-				япон иен
+				Японы иен
+				Японы иен
+				Японы иен
 				JP¥
 				¥
 			
 			
-				кени шиллинг
-				кени шиллинг
-				кени шиллинг
+				Кенийн шиллинг
+				Кенийн шиллинг
+				Кенийн шиллинг
 				KES
 			
 			
-				кыргыз сом
-				кыргыз сом
-				кыргыз сом
+				Кыргызын сом
+				Кыргызын сом
+				Кыргызын сом
 				KGS
 			
 			
-				камбож риел
-				камбож риел
-				камбож риел
+				Камбожийн риел
+				Камбожийн риел
+				Камбожийн риел
 				KHR
 				៛
 			
 			
-				комор франк
-				комор франк
-				комор франк
+				Коморын франк
+				Коморын франк
+				Коморын франк
 				KMF
 				CF
 			
 			
-				хойд солонгос вон
-				хойд солонгос вон
-				хойд солонгос вон
+				Хойд Солонгосын вон
+				Хойд Солонгосын вон
+				Хойд Солонгосын вон
 				KPW
 				₩
 			
 			
-				өмнөд солонгос вон
-				өмнөд солонгос вон
-				өмнөд солонгос вон
+				Өмнөд Солонгосын вон
+				Өмнөд Солонгосын вон
+				Өмнөд Солонгосын вон
 				₩
 				₩
 			
 			
-				кувейт динар
-				кувейт динар
-				кувейт динар
+				Кувейтийн динар
+				Кувейтийн динар
+				Кувейтийн динар
 				KWD
 			
 			
-				кайман арлын доллар
-				кайман арлын доллар
-				кайман арлын доллар
+				Кайманы арлуудын доллар
+				Кайманы арлуудын доллар
+				Кайманы арлуудын доллар
 				KYD
 				$
 			
 			
-				казахын тэнгэ
-				казахын тэнгэ
-				казахын тэнгэ
+				Казахстаны тэнгэ
+				Казахстаны тэнгэ
+				Казахстаны тэнгэ
 				KZT
 				₸
 			
 			
-				лаосын кип
-				лаосын кип
-				лаосын кип
+				Лаосын кип
+				Лаосын кип
+				Лаосын кип
 				LAK
 				₭
 			
 			
-				ливан паунд
-				ливан паунд
-				ливан паунд
+				Ливаны фунт
+				Ливаны фунт
+				Ливаны фунт
 				LBP
 				L£
 			
 			
-				шри-ланк рупи
-				шри-ланк рупи
-				шри-ланк рупи
+				Шри-Ланкийн рупи
+				Шри-Ланкийн рупи
+				Шри-Ланкийн рупи
 				LKR
 				Rs
 			
 			
-				либери доллар
-				либери доллар
-				либери доллар
+				Либерийн доллар
+				Либерийн доллар
+				Либерийн доллар
 				LRD
 				$
 			
@@ -5169,54 +5105,54 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				LVL
 			
 			
-				ливи доллар
-				ливи доллар
-				ливи доллар
+				Ливийн доллар
+				Ливийн доллар
+				Ливийн доллар
 				LYD
 			
 			
-				мароккогийн дирхам
-				мароккогийн дирхам
-				мароккогийн дирхам
+				Мороккогийн дирхэм
+				Мороккогийн дирхэм
+				Мороккогийн дирхэм
 				MAD
 			
 			
-				молдавын леу
-				молдавын леу
-				молдавын леу
+				Молдовын лей
+				Молдовын лей
+				Молдовын лей
 				MDL
 			
 			
-				малайн ариари
-				малайн ариари
-				малайн ариари
+				Малагасийн ариари
+				Малагасийн ариари
+				Малагасийн ариари
 				MGA
 				Ar
 			
 			
-				македони динар
-				македони динар
-				македони динар
+				Македонийн динар
+				Македонийн динар
+				Македонийн динар
 				MKD
 			
 			
-				мьянмарын киат
-				мьянмарын киат
-				мьянмарын киат
+				Мьянмарын киат
+				Мьянмарын киат
+				Мьянмарын киат
 				MMK
 				K
 			
 			
-				төгрөг
-				төгрөг
-				төгрөг
+				Монгол төгрөг
+				Монгол төгрөг
+				Монгол төгрөг
 				₮
 				₮
 			
 			
-				макаогийн патака
-				макаогийн патака
-				макаогийн патака
+				Макаогийн патака
+				Макаогийн патака
+				Макаогийн патака
 				MOP
 			
 			
@@ -5226,246 +5162,247 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				MRO
 			
 			
-				мавритан угия
-				мавритан угия
-				мавритан угия
+				Мавританийн угия
+				Мавританийн угия
+				Мавританийн угия
+				MRU
 			
 			
-				мавритын рупи
-				мавритын рупи
-				мавритын рупи
+				Маврикийн рупи
+				Маврикийн рупи
+				Маврикийн рупи
 				MUR
 				Rs
 			
 			
-				мальдив руфия
-				мальдив руфия
-				мальдив руфия
+				Мальдивийн руфия
+				Мальдивийн руфия
+				Мальдивийн руфия
 				MVR
 			
 			
-				малави квача
-				Малавигийн квача
-				малави квача
+				Малавийн квача
+				Малавийн квача
+				Малавийн квача
 				MWK
 			
 			
-				мексикийн песо
-				мексикийн песо
-				мексикийн песо
+				Мексикийн песо
+				Мексикийн песо
+				Мексикийн песо
 				MX$
 				$
 			
 			
-				малайзын рингит
-				малайзын рингит
-				малайзын рингит
+				Малайзын рингит
+				Малайзын рингит
+				Малайзын рингит
 				MYR
 				RM
 			
 			
-				мозамбик метикал
-				мозамбик метикал
-				мозамбик метикал
+				Мозамбикийн метикал
+				Мозамбикийн метикал
+				Мозамбикийн метикал
 				MZN
 			
 			
-				намиби доллар
-				намиби доллар
-				намиби доллар
+				Намибийн доллар
+				Намибийн доллар
+				Намибийн доллар
 				NAD
 				$
 			
 			
-				нигери найра
-				нигери найра
-				нигери найра
+				Нигерийн найра
+				Нигерийн найра
+				Нигерийн найра
 				NGN
 				₦
 			
 			
-				никарагуагийн кордоба
-				никарагуагийн кордоба
-				никарагуагийн кордоба
+				Никарагуагийн кордоба
+				Никарагуагийн кордоба
+				Никарагуагийн кордоба
 				NIO
 				C$
 			
 			
-				норвегийн крон
-				норвегийн крон
-				норвегийн крон
+				Норвегийн крон
+				Норвегийн крон
+				Норвегийн крон
 				NOK
 				kr
 			
 			
-				балба рупи
-				балба рупи
-				балба рупи
+				Балбын рупи
+				Балбын рупи
+				Балбын рупи
 				NPR
 				Rs
 			
 			
-				шинэ зеланд доллар
-				шинэ зеланд доллар
-				шинэ зеланд доллар
+				Шинэ Зеландын доллар
+				Шинэ Зеландын доллар
+				Шинэ Зеландын доллар
 				NZ$
 				$
 			
 			
-				омани риал
-				омани риал
-				омани риал
+				Оманийн риал
+				Оманийн риал
+				Оманийн риал
 				OMR
 			
 			
-				панамын бальбоа
-				панамын бальбоа
-				панамын бальбоа
+				Панамын бальбоа
+				Панамын бальбоа
+				Панамын бальбоа
 				PAB
 			
 			
-				перугийн соль
-				перугийн соль
-				перугийн соль
+				Перугийн соль
+				Перугийн соль
+				Перугийн соль
 				PEN
 			
 			
-				папуа-шинэ гвинейн кина
-				папуа-шинэ гвинейн кина
-				папуа-шинэ гвинейн кина
+				Папуа-Шинэ Гвинейн кина
+				Папуа-Шинэ Гвинейн кина
+				Папуа-Шинэ Гвинейн кина
 				PGK
 			
 			
-				филиппин песо
-				филиппин песо
-				филиппин песо
+				Филиппиний песо
+				Филиппиний песо
+				Филиппиний песо
 				PHP
 				₱
 			
 			
-				пакистан рупи
-				пакистан рупи
-				пакистан рупи
+				Пакистаны рупи
+				Пакистаны рупи
+				Пакистаны рупи
 				PKR
 				Rs
 			
 			
-				польшийн злот
-				польшийн злот
-				польшийн злот
+				Польшийн злот
+				Польшийн злот
+				Польшийн злот
 				PLN
 				zł
 			
 			
-				парагвайн гуарани
-				парагвайн гуарани
-				парагвайн гуарани
+				Парагвайн гуарани
+				Парагвайн гуарани
+				Парагвайн гуарани
 				PYG
 				₲
 			
 			
-				катар риал
-				катар риал
-				катар риал
+				Катарын риал
+				Катарын риал
+				Катарын риал
 				QAR
 			
 			
-				румыны леу
-				румыны леу
-				румыны леу
+				Румыны лей
+				Румыны лей
+				Румыны лей
 				RON
 				lei
 			
 			
-				серб динар
-				серб динар
-				серб динар
+				Сербийн динар
+				Сербийн динар
+				Сербийн динар
 				RSD
 			
 			
-				орос рубль
-				орос рубль
-				орос рубль
+				Оросын рубль
+				Оросын рубль
+				Оросын рубль
 				RUB
 				₽
 				₽
 			
 			
-				руанд франк
-				руанд франк
-				руанд франк
+				Руандагийн франк
+				Руандагийн франк
+				Руандагийн франк
 				RWF
 				RF
 			
 			
-				сауди риал
-				сауди риал
-				сауди риал
+				Саудын риял
+				Саудын риял
+				Саудын риял
 				SAR
 			
 			
-				соломон арлын доллар
-				соломон арлын доллар
-				соломон арлын доллар
+				Соломоны арлуудын доллар
+				Соломоны арлуудын доллар
+				Соломоны арлуудын доллар
 				SBD
 				$
 			
 			
-				сейшел рупи
-				сейшел рупи
-				сейшел рупи
+				Сейшелийн рупи
+				Сейшелийн рупи
+				Сейшелийн рупи
 				SCR
 			
 			
-				судан паунд
-				судан паунд
-				судан паунд
+				Суданы фунт
+				Суданы фунт
+				Суданы фунт
 				SDG
 			
 			
-				шведийн крон
-				шведийн крон
-				шведийн крон
+				Шведийн крон
+				Шведийн крон
+				Шведийн крон
 				SEK
 				кр
 			
 			
-				сингапур доллар
-				сингапур доллар
-				сингапур доллар
+				Сингапурын доллар
+				Сингапурын доллар
+				Сингапурын доллар
 				SGD
 				$
 			
 			
-				сент хелена фунт
-				сент хелена паунд
-				сент хелена фунт
+				Сент Хеленагийн фунт
+				Сент Хеленагийн фунт
+				Сент Хеленагийн фунт
 				SHP
 				£
 			
 			
-				сьерра леоны леон
-				сьерра леоне леоне
-				сьерра леоне леоне
+				Сьерра-Леоны леон
+				Сьерра-Леоны леон
+				Сьерра-Леоны леон
 				SLL
 			
 			
-				сомали шиллинг
-				сомали шиллинг
-				сомали шиллинг
+				Сомалийн шиллинг
+				Сомалийн шиллинг
+				Сомалийн шиллинг
 				SOS
 			
 			
-				суринам доллар
-				суринам доллар
-				суринам доллар
+				Суринамын доллар
+				Суринамын доллар
+				Суринамын доллар
 				SRD
 				$
 			
 			
-				өмнөд судан паунд
-				өмнөд судан паунд
-				өмнөд судан паунд
+				Өмнөд Суданы фунт
+				Өмнөд Суданы фунт
+				Өмнөд Суданы фунт
 				SSP
 				£
 			
@@ -5476,95 +5413,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				STD
 			
 			
-				сан-томе ба принсипи добра
-				Сан-Томе Принсипигийн мөнгөн тэмдэгт добра
-				Сан-Томе Принсипигийн мөнгөн тэмдэгт добра
+				Сан-Томе ба Принсипигийн добра
+				Сан-Томе ба Принсипигийн добра
+				Сан-Томе ба Принсипигийн добра
+				STN
 				Db
 			
 			
-				сири паунд
-				сири паунд
-				сири паунд
+				Сирийн фунт
+				Сирийн фунт
+				Сирийн фунт
 				SYP
 				£
 			
 			
-				свазиланд лилангени
-				свазиланд лилангени
-				свазиланд лилангени
+				Свазиландын лилангени
+				Свазиландын лилангени
+				Свазиландын лилангени
 				SZL
 			
 			
-				тайландын бат
-				тайландын бат
-				тайландын бат
+				Тайландын бат
+				Тайландын бат
+				Тайландын бат
 				฿
 				฿
 			
 			
-				тажикийн сомон
-				тажикийн сомон
-				тажикийн сомон
+				Тажикийн сомон
+				Тажикийн сомон
+				Тажикийн сомон
 				TJS
 			
 			
-				туркмен манат
-				туркмен манат
-				туркмен манат
+				Туркмены манат
+				Туркмены манат
+				Туркмены манат
 				TMT
 			
 			
-				тунис доллар
-				тунис доллар
-				тунис доллар
+				Тунисын доллар
+				Тунисын доллар
+				Тунисын доллар
 				TND
 			
 			
-				тонгагийн панга
-				тонгагийн панга
-				тонгагийн панга
+				Тонгагийн панга
+				Тонгагийн панга
+				Тонгагийн панга
 				TOP
 				T$
 			
 			
-				туркийн лира
-				туркийн лира
-				туркийн лира
+				Туркийн лира
+				Туркийн лира
+				Туркийн лира
 				TRY
 				₺
 				TL
 			
 			
-				тринидад ба тобаго доллар
-				тринидад ба тобаго доллар
-				тринидад ба тобаго доллар
+				Тринидад ба Тобагогийн доллар
+				Тринидад ба Тобагогийн доллар
+				Тринидад ба Тобагогийн доллар
 				TTD
 				$
 			
 			
-				шинэ тайвань доллар
-				шинэ тайвань доллар
-				шинэ тайвань доллар
+				Шинэ Тайванийн доллар
+				Шинэ Тайванийн доллар
+				Шинэ Тайванийн доллар
 				NT$
 				NT$
 			
 			
-				танзани шиллинг
-				танзани шиллинг
-				танзани шиллинг
+				Танзанийн шиллинг
+				Танзанийн шиллинг
+				Танзанийн шиллинг
 				TZS
 			
 			
-				украины гривня
-				украины гривня
-				украины гривня
+				Украины гривна
+				Украины гривна
+				Украины гривна
 				UAH
 				₴
 			
 			
-				уганд шиллинг
-				уганд шиллинг
-				уганд шиллинг
+				Угандагийн шиллинг
+				Угандагийн шиллинг
+				Угандагийн шиллинг
 				UGX
 			
 			
@@ -5575,16 +5513,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				$
 			
 			
-				уругвайн песо
-				уругвайн песо
-				уругвайн песо
+				Уругвайн песо
+				Уругвайн песо
+				Уругвайн песо
 				UYU
 				$
 			
 			
-				узбекийн сом
-				узбекийн сом
-				узбекийн сом
+				Узбекийн сом
+				Узбекийн сом
+				Узбекийн сом
 				UZS
 			
 			
@@ -5595,52 +5533,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bs
 			
 			
-				венесуэлийн боливар
-				венесуэлийн боливар
-				венесуэлийн боливар
+				Венесуэлийн боливар
+				Венесуэлийн боливар
+				Венесуэлийн боливар
+				VES
 			
 			
-				вьетнамын донг
-				вьетнамын донг
-				вьетнамын донг
+				Вьетнамын донг
+				Вьетнамын донг
+				Вьетнамын донг
 				₫
 				₫
 			
 			
-				вануатугийн вату
-				вануатугийн вату
-				вануатугийн вату
+				Вануатугийн вату
+				Вануатугийн вату
+				Вануатугийн вату
 				VUV
 			
 			
-				самоагийн тала
-				самоагийн тала
-				самоагийн тала
+				Самоагийн тала
+				Самоагийн тала
+				Самоагийн тала
 				WST
 			
 			
-				төв африкийн франк
-				төв африкийн франк
-				төв африкийн франк
+				Төв Африкийн франк
+				Төв Африкийн франк
+				Төв Африкийн франк
 				FCFA
 			
 			
-				зүүн карибийн доллар
-				зүүн карибийн доллар
-				зүүн карибийн доллар
+				Зүүн Карибийн доллар
+				Зүүн Карибийн доллар
+				Зүүн Карибийн доллар
 				EC$
 				$
 			
 			
-				баруун африкийн франк
-				баруун африкийн франк
-				баруун африкийн франк
+				Баруун Африкийн франк
+				Баруун Африкийн франк
+				Баруун Африкийн франк
 				CFA
 			
 			
-				францын колоний франк
-				францын колоний франк
-				францын колоний франк
+				Францын колонийн франк
+				Францын колонийн франк
+				Францын колонийн франк
 				CFPF
 			
 			
@@ -5649,15 +5588,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				(тодорхойгүй мөнгөн тэмдэгт)
 			
 			
-				йемен риал
-				йемен риал
-				йемен риал
+				Йемений риял
+				Йемений риял
+				Йемений риял
 				YER
 			
 			
-				өмнөд африкийн ранд
-				өмнөд африкийн ранд
-				өмнөд африкийн ранд
+				Өмнөд Африкийн ранд
+				Өмнөд Африкийн ранд
+				Өмнөд Африкийн ранд
 				ZAR
 				R
 			
@@ -5667,9 +5606,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Замби квача (1968–2012)
 			
 			
-				замби квача
-				замби квача
-				замби квача
+				Замбийн квача
+				Замбийн квача
+				Замбийн квача
 				ZMW
 				ZK
 			
@@ -5689,7 +5628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			
-				{0}/{1}
+				{1} тутамд {0}
 			
 			
 				жи-хүч
@@ -5697,9 +5636,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} жи-хүч
 			
 			
-				метр сек кв
-				{0} метр сек кв
-				{0} метр сек кв
+				квадрат секундэд ногдох метр
+				квадрат секундэд {0} метр
+				квадрат секундэд {0} метр
 			
 			
 				эргэлт
@@ -5728,9 +5667,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				квадрат километр
-				{0} км²
-				{0} км²
-				{0}/км²
+				{0} квадрат километр
+				{0} квадрат километр
+				квадрат километр тутамд {0}
 			
 			
 				гектар
@@ -5739,21 +5678,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				квадрат метр
-				{0} м²
-				{0} м²
-				{0}/м²
+				{0} квадрат метр
+				{0} квадрат метр
+				квадрат метр тутамд {0}
 			
 			
-				сантиметр квадрат
-				{0} сантиметр квадрат
-				{0} см²
-				{0}/см²
+				квадрат сантиметр
+				{0} квадрат сантиметр
+				{0} квадрат сантиметр
+				квадрат сантиметр тутамд {0}
 			
 			
-				кв.миль
-				{0} миль²
-				{0} миль²
-				{0}/миль²
+				квадрат миль
+				{0} квадрат миль
+				{0} квадрат миль
+				квадрат миль тутамд {0}
 			
 			
 				акр
@@ -5761,25 +5700,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} акр
 			
 			
-				ярд²
-				{0} ярд²
-				{0} ярд²
+				квадрат ярд
+				{0} квадрат ярд
+				{0} квадрат ярд
 			
 			
-				кв.фут
-				{0} кв.фут
-				{0} кв.фут
+				квадрат фут
+				{0} квадрат фут
+				{0} квадрат фут
 			
 			
-				кв.инч
-				{0} кв.инч
-				{0} кв.инч
-				{0}/инч²
+				квадрат инч
+				{0} квадрат инч
+				{0} квадрат инч
+				квадрат инч тутамд {0}
 			
 			
-				dunams
-				{0} dunam
-				{0} dunams
+				дунам
+				{0} дунам
+				{0} дунам
 			
 			
 				карат
@@ -5787,19 +5726,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} карат
 			
 			
-				мг/дЛ
-				{0} мг/дЛ
-				{0} мг/дЛ
+				мг/дл
+				{0} мг/дл
+				{0} мг/дл
 			
 			
-				ммол/л
-				{0} ммол/л
-				{0} ммол/л
+				литр тутамд ногдох миллимоль
+				литр тутамд {0} миллимоль
+				литр тутамд {0} миллимоль
 			
 			
-				хэсэг/саяд
-				{0} хэсэг/саяд
-				{0} хэсэг/саяд
+				саяны хувь
+				саяны {0} хувь
+				саяны {0} хувь
 			
 			
 				хувь
@@ -5807,12 +5746,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} хувь
 			
 			
-				‰
+				мянганы хувь
+				мянганы {0} хувь
+				мянганы {0} хувь
 			
 			
-				permyriad
-				{0} permyriad
-				{0} permyriad
+				арван мянганы хувь
+				арван мянганы {0} хувь
+				арван мянганы {0} хувь
 			
 			
 				моль
@@ -5820,24 +5761,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} моль
 			
 			
-				литр/километр
-				{0} литр/километр
-				{0} литр/километр
+				километр тутамд ногдох литр
+				километр тутамд {0} литр
+				километр тутамд {0} литр
 			
 			
-				л/100км
-				{0} л/100км
-				{0} л/100км
+				100 километр тутамд ногдох литр
+				100 километр тутамд {0} литр
+				100 километр тутамд {0} литр
 			
 			
-				миль/галлон
-				{0} миль/галлон
-				{0} миль/галлон
+				галлон тутамд ногдох миль
+				галлон тутамд {0} миль
+				Vote галлон тутамд {0} миль
 			
 			
-				миль/ИБгаллон
-				{0} миль/ИБгаллон
-				{0} миль/ИБгаллон
+				анг. галлон тутамд ногдох миль
+				анг. галлон тутамд {0} миль
+				анг. галлон тутамд {0} миль
 			
 			
 				петабайт
@@ -5896,32 +5837,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				зуун
-				{0}зуун
-				{0}зуун
+				{0} зуун
+				{0} зуун
+			
+			
+				декад
+				{0} декад
+				{0} декад
 			
 			
 				жил
 				{0} жил
 				{0} жил
-				{0}/жилд
+				{0}/жил
 			
 			
 				сар
 				{0} сар
 				{0} сар
-				{0}/сард
+				{0}/сар
 			
 			
 				долоо хоног
 				{0} долоо хоног
 				{0} долоо хоног
-				{0}/7хоногт
+				{0}/долоо хоног
 			
 			
-				өдөр
-				{0} өдөр
-				{0} өдөр
-				{0}/өдөрт
+				хоног
+				{0} хоног
+				{0} хоног
+				{0}/хоног
 			
 			
 				цаг
@@ -5942,9 +5888,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/сек
 			
 			
-				милисекунд
-				{0} милисекунд
-				{0} милисекунд
+				миллисекунд
+				{0} миллисекунд
+				{0} миллисекунд
 			
 			
 				микросекунд
@@ -5957,24 +5903,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} наносекунд
 			
 			
-				ампер
-				{0} ампер
-				{0} ампер
+				Ампер
+				{0} Ампер
+				{0} Ампер
 			
 			
-				милиампер
-				{0} милиампер
-				{0} милиампер
+				миллиАмпер
+				{0} миллиАмпер
+				{0} миллиАмпер
 			
 			
-				ом
-				{0} ом
-				{0} ом
+				Ом
+				{0} Ом
+				{0} Ом
 			
 			
-				вольт
-				{0} вольт
-				{0} вольт
+				Вольт
+				{0} Вольт
+				{0} Вольт
 			
 			
 				килокалори
@@ -5987,24 +5933,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} калори
 			
 			
-				Калори
-				{0} Калори
-				{0} Калори
+				калори
+				{0} калори
+				{0} калори
 			
 			
-				киложоуль
-				{0} киложоуль
-				{0} киложоуль
+				килоЖоуль
+				{0} килоЖоуль
+				{0} килоЖоуль
 			
 			
-				жоуль
-				{0} жоуль
-				{0} жоуль
+				Жоуль
+				{0} Жоуль
+				{0} Жоуль
 			
 			
-				киловатт цаг
-				{0} киловатт цаг
-				{0} киловатт цаг
+				килоВатт-цаг
+				{0} килоВатт-цаг
+				{0} килоВатт-цаг
 			
 			
 				электрон-Вольт
@@ -6016,6 +5962,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} британийн дулааны нэгж
 				{0} британийн дулааны нэгж
 			
+			
+				америк дулаан
+				{0} америк дулаан
+				{0} америк дулаан
+			
 			
 				фунт хүч
 				{0} фунт хүч
@@ -6027,57 +5978,72 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ньютон
 			
 			
-				гигагерц
-				{0} гигагерц
-				{0} гигагерц
+				гигаГерц
+				{0} гигаГерц
+				{0} гигаГерц
 			
 			
-				мегагерц
-				{0} мегагерц
-				{0} мегагерц
+				мегаГерц
+				{0} мегаГерц
+				{0} мегаГерц
 			
 			
-				килогерц
-				{0} килогерц
-				{0} килогерц
+				килоГерц
+				{0} килоГерц
+				{0} килоГерц
 			
 			
-				герц
-				{0} герц
-				{0} герц
+				Герц
+				{0} Герц
+				{0} Герц
+			
+			
+				пиксель/см
+				{0} пиксель/см
+				{0} пиксель/см
+			
+			
+				пиксель/инч
+				{0} пиксель/инч
+				{0} пиксель/инч
+			
+			
+				цэг/см
+				{0} цэг/см
+				{0} цэг/см
 			
 			
 				километр
 				{0} километр
-				{0} км
-				{0}/км
+				{0} километр
+				километр тутамд {0}
 			
 			
 				метр
 				{0} метр
 				{0} метр
-				{0}/м
+				метр тутамд {0}
 			
 			
 				дециметр
 				{0} дециметр
-				{0} дм
+				{0} дециметр
 			
 			
 				сантиметр
 				{0} сантиметр
 				{0} см
-				{0}/см
+				сантиметр тутамд {0}
 			
 			
-				милиметр
-				{0} милиметр
-				{0} мм
+				миллиметр
+				{0} миллиметр
+				{0} миллиметр
 			
 			
 				микрометр
-				{0} µм
-				{0} µм
+				{0} микрометр
+				{0} микрометр
 			
 			
 				нанометр
@@ -6157,48 +6123,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} нарны гэрлийн урсгал
 			
 			
-				метрийн тонн
-				{0} метрийн тонн
-				{0} метрийн тонн
+				тонн
+				{0} тонн
+				{0} тонн
 			
 			
-				килограм
-				{0} килограм
-				{0} килограм
-				{0}/кг
+				килограмм
+				{0} килограмм
+				{0} килограмм
+				килограмм тутамд {0}
 			
 			
 				грамм
 				{0} грамм
 				{0} грамм
-				{0}/гр
+				грамм тутамд {0}
 			
 			
-				милиграм
-				{0} милиграм
-				{0} милиграм
+				миллиграмм
+				{0} миллиграмм
+				{0} миллиграмм
 			
 			
-				микрограм
-				{0} микрограм
-				{0} микрограм
+				микрограмм
+				{0} микрограмм
+				{0} микрограмм
 			
 			
-				тонн
-				{0} тонн
-				{0} тонн
+				америк тонн
+				{0} америк тонн
+				{0} америк тонн
 			
 			
 				фунт
 				{0} фунт
 				{0} фунт
-				{0}/фунт
+				фунт тутамд {0}
 			
 			
 				унц
 				{0} унц
 				{0} унц
-				{0}/унц
+				унц тутамд {0}
 			
 			
 				трой унц
@@ -6226,94 +6192,102 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} нарны масс
 			
 			
-				гигаватт
-				{0} гигаватт
-				{0} гигаватт
+				гигаВатт
+				{0} гигаВатт
+				{0} гигаВатт
 			
 			
-				мегаватт
-				{0} мегаватт
-				{0} мегаватт
+				мегаВатт
+				{0} мегаВатт
+				{0} мегаВатт
 			
 			
-				киловатт
-				{0} киловатт
-				{0} киловатт
+				килоВатт
+				{0} килоВатт
+				{0} килоВатт
 			
 			
-				ватт
-				{0} ватт
-				{0} ватт
+				Ватт
+				{0} Ватт
+				{0} Ватт
 			
 			
-				миливатт
-				{0} миливатт
-				{0} миливатт
+				миллиВатт
+				{0} миллиВатт
+				{0} миллиВатт
 			
 			
 				морины хүч
 				{0} морины хүч
 				{0} морины хүч
 			
-			
-				гектопаскал
-				{0} гектопаскал
-				{0} гектопаскал
-			
 			
-				мөнгөн усны милиметр
-				{0} мөнгөн усны милиметр
-				{0} мөнгөн усны милиметр
+				мөнгөн усны баганын миллиметр
+				{0} мөнгөн усны баганын миллиметр
+				{0} мөнгөн усны баганын миллиметр
 			
 			
-				фунт/квадрат инч
-				{0} фунт/кв.инч
-				{0} фунт/кв.инч
+				квадрат инч тутамд ногдох фунт
+				квадрат инч тутамд {0} фунт
+				квадрат инч тутамд {0} фунт
 			
 			
-				мөнгөн усны инч
-				{0} мөнгөн усны инч
-				{0} мөнгөн усны инч
+				мөнгөн усны баганын инч
+				{0} мөнгөн усны баганын инч
+				{0} мөнгөн усны баганын инч
+			
+			
+				бар
+				{0} бар
+				{0} бар
 			
 			
-				милибар
-				{0} милибар
-				{0} милибар
+				миллибар
+				{0} миллибар
+				{0} миллибар
 			
 			
 				уур амьсгал
 				{0} уур амьсгал
 				{0} уур амьсгал
 			
+			
+				Паскаль
+				{0} Паскаль
+				{0} Паскаль
+			
+			
+				гектоПаскал
+				{0} гектоПаскал
+				{0} гектоПаскал
+			
 			
 				килопаскаль
 				{0} килопаскаль
 				{0} килопаскаль
 			
 			
-				мегапаскаль
-				{0} мегапаскаль
-				{0} мегапаскаль
+				мегаПаскаль
+				{0} мегаПаскаль
+				{0} мегаПаскаль
 			
 			
-				километр/цаг
-				{0} километр/цаг
-				{0} километр/цаг
+				цагт ногдох километр
+				цагт {0} километр
+				цагт {0} километр
 			
 			
-				метр/секунд
-				{0} метр/секунд
-				{0} метр/секунд
+				секундэд ногдох метр
+				секундэд {0} метр
+				секундэд {0} метр
 			
 			
-				миль/цаг
-				{0} миль/цаг
-				{0} миль/цаг
+				цагт ногдох миль
+				цагт {0} миль
+				цагт {0} миль
 			
 			
 				зангилаа
-				{0}/зангилаа
-				{0}/зангилаа
 			
 			
 				°
@@ -6331,9 +6305,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Фаренгейтын хэм
 			
 			
-				келвиний хэм
-				{0} келвиний хэм
-				{0} келвиний хэм
+				Кельвиний хэм
+				{0} Кельвиний хэм
+				{0} Кельвиний хэм
 			
 			
 				фунт фүүт
@@ -6347,30 +6321,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				куб километр
-				{0} км³
-				{0} км³
+				{0} куб километр
+				{0} куб километр
 			
 			
 				куб метр
-				{0} м³
-				{0} м³
-				{0}/м³
+				{0} куб метр
+				{0} куб метр
+				куб метр тутамд {0}
 			
 			
 				куб сантиметр
-				{0} cм³
-				{0} cм³
-				{0}/см³
+				{0} куб сантиметр
+				{0} куб сантиметр
+				куб сантиметр тутамд {0}
 			
 			
 				куб миль
-				{0} ми³
-				{0} ми³
+				{0} куб миль
+				{0} куб миль
 			
 			
-				ярд³
-				{0} ярд³
-				{0} ярд³
+				куб ярд
+				{0} куб ярд
+				{0} куб ярд
 			
 			
 				куб фут
@@ -6396,7 +6370,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				литр
 				{0} литр
 				{0} литр
-				{0}/л
+				литр тутамд {0}
 			
 			
 				децилитр
@@ -6409,19 +6383,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} центилитр
 			
 			
-				милилитр
-				{0} милилитр
-				{0} милилитр
+				миллилитр
+				{0} миллилитр
+				{0} миллилитр
 			
 			
-				хэмжүүрийн пинт
-				{0} хэмж. пинт
-				{0} хэмж. пинт
+				метрийн пинт
+				{0} метрийн пинт
+				{0} метрийн пинт
 			
 			
-				хэмжүүрийн аяга
-				{0} хэмжүүрийн аяга
-				{0} хэмжүүрийн аяга
+				метрийн аяга
+				{0} метрийн аяга
+				{0} метрийн аяга
 			
 			
 				акр-фут
@@ -6432,13 +6406,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				галлон
 				{0} галлон
 				{0} галлон
-				{0}/галл.
+				галлон тутамд {0}
 			
 			
-				ИБ галлон
-				{0} ИБ галлон
-				{0} ИБ галлон
-				{0}/ИБ галлон
+				анг. галлон
+				{0} анг. галлон
+				{0} анг. галлон
+				анг. галлон тутамд {0}
 			
 			
 				кварц
@@ -6446,9 +6420,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кварц
 			
 			
-				пайнт
-				{0} пайнт
-				{0} пайнт
+				пинт
+				{0} пинт
+				{0} пинт
 			
 			
 				аяга
@@ -6457,14 +6431,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				шингэн унц
-				{0} ш унц
-				{0} ш унц
-			
-			
-				английн шингэн унц
 				{0} шингэн унц
 				{0} шингэн унц
 			
+			
+				анг. шингэн унц
+				{0} анг. шингэн унц
+				{0} анг. шингэн унц
+			
 			
 				хоолны халбага
 				{0} хоолны халбага
@@ -6481,10 +6455,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} баррель
 			
 			
-				{0}Зүүн
-				{0}Умард
-				{0}Өмнөд
-				{0}Өрнөд
+				зүг чиг
+				зүүн уртрагийн {0}
+				хойд өргөргийн {0}
+				өмнөд өргөргийн {0}
+				баруун уртрагийн {0}
 			
 		
 		
@@ -6577,29 +6552,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/инч²
 			
 			
-				dunams
-				{0} dunam
-				{0} dunam
+				дунам
+				{0} дунам
+				{0} дунам
 			
 			
 				карат
-				{0} кт
-				{0} кт
+				{0} кар
+				{0} кар
 			
 			
-				мг/дЛ
-				{0} мг/дЛ
-				{0} мг/дЛ
+				мг/дл
+				{0} мг/дл
+				{0} мг/дл
 			
 			
-				ммол/л
-				{0} ммол/л
-				{0} ммол/л
+				миллимоль/литр
+				{0} ммоль/л
+				{0} ммоль/л
 			
 			
-				хэсэг/саяд
-				{0} ppm
-				{0} ppm
+				хувь/сая
+				{0}x10⁻⁶
+				{0}x10⁻⁶
 			
 			
 				хувь
@@ -6607,14 +6582,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}%
 			
 			
-				‰
+				мянганы хувь
 				{0}‰
 				{0}‰
 			
 			
-				permyriad
-				{0}‱
-				{0}‱
+				арван мянганы хувь
 			
 			
 				моль
@@ -6632,14 +6605,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} л/100км
 			
 			
-				миль/галл.
-				миль/галл.
+				миль/гал
+				миль/гал
 				{0} ми/гал
 			
 			
-				миль/ИБгаллон
-				{0} mpg Imp.
-				{0} mpg Imp.
+				миль/анг. гал
+				{0} ми/анг. гал
+				{0} ми/анг. гал
 			
 			
 				ПБайт
@@ -6698,32 +6671,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				зуун
-				{0}зуун
-				{0}зуун
+				{0} зуун
+				{0} зуун
+			
+			
+				декад
+				{0} декад
+				{0} декад
 			
 			
 				жил
 				{0} жил
 				{0} жил
-				{0}/жилд
+				{0}/ж
 			
 			
 				сар
 				{0} сар
 				{0} сар
-				{0}/сард
+				{0}/сар
 			
 			
-				дол/хон
-				{0} дол/хон
-				{0} дол/хон
-				{0}/7хоногт
+				долоо хоног
+				{0} д.х
+				{0} д.х
+				{0}/д.х
 			
 			
-				өдөр
-				{0} өдөр
-				{0} өдөр
-				{0}/өдөрт
+				хоног
+				{0} хоног
+				{0} хоног
+				{0}/хоног
 			
 			
 				цаг
@@ -6744,7 +6722,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/сек
 			
 			
-				милисек
+				миллисекунд
 				{0} мс
 				{0} мс
 			
@@ -6759,22 +6737,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} нс
 			
 			
-				амп
+				А
 				{0} А
 				{0} A
 			
 			
-				милиамп
+				мА
 				{0} мА
 				{0} мА
 			
 			
-				ом
+				Ω
 				{0} Ω
 				{0} Ω
 			
 			
-				вольт
+				В
 				{0} В
 				{0} В
 			
@@ -6789,24 +6767,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кал
 			
 			
-				Кал
-				{0} Кал
-				{0} Кал
+				кал
+				{0} кал
+				{0} кал
 			
 			
-				киложоуль
-				{0} кж
-				{0} кж
+				килоЖоуль
+				{0} кЖ
+				{0} кЖ
 			
 			
-				жоуль
-				{0} жо
-				{0} жо
+				Жоуль
+				{0} Ж
+				{0} Ж
 			
 			
-				кВ-цаг
-				{0} кВц
-				{0} кВц
+				кВт-цаг
+				{0} кВтц
+				{0} кВтц
 			
 			
 				электрон-Вольт
@@ -6815,13 +6793,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				BTU
-				{0} Btu
-				{0} Btu
+			
+			
+				ам.дулаан
+				{0} ам.дулаан
+				{0} ам.дулаан
 			
 			
 				фунт хүч
-				{0} lbf
-				{0} lbf
 			
 			
 				ньютон
@@ -6848,6 +6827,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Гц
 				{0} Гц
 			
+			
+				цэг/см
+				{0} цэг/см
+				{0} цэг/см
+			
 			
 				км
 				{0} км
@@ -6855,7 +6839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/км
 			
 			
-				метр
+				м
 				{0} м
 				{0} м
 				{0}/м
@@ -6929,9 +6913,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} сн
 			
 			
-				дмиль
-				{0} дмиль
-				{0} дмиль
+				дми
+				{0} дми
+				{0} дми
 			
 			
 				скандинавын миль
@@ -6945,8 +6929,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				нарны радиус
-				{0} R☉
-				{0} R☉
 			
 			
 				люкс
@@ -6955,8 +6937,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				нарны гэрлийн урсгал
-				{0} L☉
-				{0} L☉
 			
 			
 				т
@@ -6986,9 +6966,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} µг
 			
 			
-				тонн
-				{0} тн
-				{0} тн
+				америк тонн
+				{0} ам. тн
+				{0} ам. тн
 			
 			
 				фунт
@@ -7004,13 +6984,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				трой унц
-				{0} т унц
-				{0} т унц
+				{0} тр.унц
+				{0} тр.унц
 			
 			
 				карат
-				{0} крт
-				{0} крт
+				{0} кар
+				{0} кар
 			
 			
 				дальтон
@@ -7019,18 +6999,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Дэлхийн масс
-				{0} M⊕
-				{0} M⊕
 			
 			
 				нарны масс
-				{0} M☉
-				{0} M☉
 			
 			
-				ГВ
-				{0} ГВ
-				{0} ГВ
+				ГВт
+				{0} ГВт
+				{0} ГВт
 			
 			
 				МВт
@@ -7043,7 +7019,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кВт
 			
 			
-				ватт
+				Ватт
 				{0} Вт
 				{0} Вт
 			
@@ -7057,25 +7033,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мх
 				{0} мх
 			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-			
 			
-				МөУс мм
-				{0} МөУс мм
-				{0} МөУс мм
+				мм.муб
+				{0} мм.муб
+				{0} мм.муб
 			
 			
-				фунт/кв.инч
-				{0} ф/инч²
-				{0} ф/инч²
+				фунт/инч²
+				{0} фунт/инч²
+				{0} фунт/инч²
 			
 			
-				МөУс инч
-				{0} МөУсИн
-				{0} МөУсИн
+				инч.муб
+				{0} инч.муб
+				{0} инч.муб
+			
+			
+				бар
+				{0} бар
+				{0} бар
 			
 			
 				мбар
@@ -7083,9 +7059,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мбар
 			
 			
-				atm
-				{0} atm
-				{0} atm
+				атм
+				{0} атм
+				{0} атм
+			
+			
+				Па
+				{0} Па
+				{0} Па
+			
+			
+				гПа
+				{0} гПа
+				{0} гПа
 			
 			
 				кПа
@@ -7113,9 +7099,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ми/ц
 			
 			
-				зангилаа
-				{0} зангилаа
-				{0} зангилаа
+				занг.
+				{0} занг.
+				{0} занг.
 			
 			
 				°
@@ -7137,15 +7123,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°К
 				{0}°К
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				Н*м
-				{0} N⋅m
-				{0} N⋅m
 			
 			
 				км³
@@ -7185,14 +7164,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} инч³
 			
 			
-				МЛ
-				{0} МЛ
-				{0} МЛ
+				Мл
+				{0} Мл
+				{0} Мл
 			
 			
-				хЛ
-				{0} хЛ
-				{0} хЛ
+				хл
+				{0} хл
+				{0} хл
 			
 			
 				литр
@@ -7201,29 +7180,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/л
 			
 			
-				дЛ
-				{0} дЛ
-				{0} дЛ
+				дл
+				{0} дл
+				{0} дл
 			
 			
-				цЛ
-				{0} цЛ
-				{0} цЛ
+				цл
+				{0} цл
+				{0} цл
 			
 			
-				мЛ
-				{0} мЛ
-				{0} мЛ
+				мл
+				{0} мл
+				{0} мл
 			
 			
-				хэмж. пинт
-				{0} mpt
-				{0} mpt
+				мпт
+				{0} мпт
+				{0} мпт
 			
 			
-				хэмжүүрийн аяга
-				{0} mc
-				{0} mc
+				м.аяга
+				{0} м.аяга
+				{0} м.аяга
 			
 			
 				акр фут
@@ -7231,16 +7210,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} акр фут
 			
 			
-				галл.
-				{0} галл.
-				{0} галл.
-				{0}/АНУ галлон
+				гал
+				{0} гал
+				{0} гал
+				{0}/ам. гал
 			
 			
-				ИБ галлон
-				{0} ИБ галлон
-				{0} ИБ галлон
-				{0}/ИБ галлон
+				анг. гал
+				{0} анг. гал
+				{0} анг. гал
+				{0}/анг. гал
 			
 			
 				крц
@@ -7248,9 +7227,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} крц
 			
 			
-				пайнт
-				{0} пнт
-				{0} пнт
+				пинт
+				{0} пт
+				{0} пт
 			
 			
 				аяга
@@ -7258,24 +7237,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} а
 			
 			
-				ш унц
-				{0} ш унц
-				{0} ш унц
+				ш.унц
+				{0} ш.унц
+				{0} ш.унц
 			
 			
-				Imp. fl oz
-				{0} шингэн унц
-				{0} шингэн унц
+				анг. ш.унц
+				{0} анг. ш.унц
+				{0} анг. ш.унц
 			
 			
-				х/халбага
-				{0} х/халбага
-				{0} х/халбага
+				х.х
+				{0} х.х
+				{0} х.х
 			
 			
-				ц/халбага
-				{0} ц/халбага
-				{0} ц/халбага
+				ц.х
+				{0} ц.х
+				{0} ц.х
 			
 			
 				баррель
@@ -7283,11 +7262,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} баррель
 			
 			
-				чиглэл
-				{0}Зүүн
-				{0}Умард
-				{0}Өмнөд
-				{0}Өрнөд
+				зүг
+				{0} з.у
+				{0} х.ө
+				{0} ө.ө
+				{0} б.у
 			
 		
 		
@@ -7346,23 +7325,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				жил
-				{0} жил
-				{0} жил
+				{0}ж
+				{0}ж
 			
 			
 				сар
-				{0} сар
-				{0} сар
+				{0}с
+				{0}с
 			
 			
-				дол/хон
-				{0} д/х
-				{0} д/х
+				д.х
+				{0} д.х
+				{0} д.х
 			
 			
-				өдөр
-				{0} өдөр
-				{0} өдөр
+				хоног
+				{0} хоног
+				{0} хоног
 			
 			
 				цаг
@@ -7458,10 +7437,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} м.х.
 				{0} м.х.
 			
-			
-				{0} гПа
-				{0} гПа
-			
 			
 				{0} муб
 				{0} муб
@@ -7470,6 +7445,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} милбар
 				{0} милбар
 			
+			
+				{0} гПа
+				{0} гПа
+			
 			
 				км/ц
 				{0} км/ц
@@ -7506,11 +7485,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} л
 			
 			
-				чиглэл
-				{0}Зүүн
-				{0}Умард
-				{0}Өмнөд
-				{0}Өрнөд
+				зүг
+				{0} з.у
+				{0} х.ө
+				{0} ө.ө
+				{0} б.у
 			
 		
 		
@@ -7533,38 +7512,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			{0}, {1}
 			{0}, {1}
-			{0}, эсвэл {1}
+			{0}, {1} зэргийн аль нэг
 			{0} эсвэл {1}
 		
+		
+			{0}, {1} зэргийн аль нэг
+		
+		
+			{0}, {1} зэргийн аль нэг
+		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, & {1}
-			{0} & {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
 		
 	
 	
diff --git a/make/data/cldr/common/main/mn_MN.xml b/make/data/cldr/common/main/mn_MN.xml
index 1c103a4c1d7..bc50ffcef95 100644
--- a/make/data/cldr/common/main/mn_MN.xml
+++ b/make/data/cldr/common/main/mn_MN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mr.xml b/make/data/cldr/common/main/mr.xml
index abde33436e3..b9b490a7f1c 100644
--- a/make/data/cldr/common/main/mr.xml
+++ b/make/data/cldr/common/main/mr.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -81,6 +81,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			कॅड्डो
 			कॅरिब
 			अत्सम
+			चाकमा
 			चेचेन
 			सिबुआनो
 			किगा
@@ -528,14 +529,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			यिद्दिश
 			योरुबा
 			कँटोनीज
+			चीनी, कँटोनीज
 			झुआंग
 			झेपोटेक
 			ब्लिसिम्बॉल्स
 			झेनान्गा
 			प्रमाण मोरोक्कन तॅमॅझायट
 			चीनी
+			चीनी, मँडेरिन
 			सरलीकृत चीनी
+			सरलीकृत मँडेरिन चीनी
 			पारंपारिक चीनी
+			पारंपारिक मँडेरिन चीनी
 			झुलू
 			झुनी
 			भाषावैज्ञानिक सामग्री नाही
@@ -702,7 +707,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			मेलानेशिया
 			मायक्रोनेशियन प्रदेश
 			पॉलिनेशिया
-			अशिया
+			आशिया
 			मध्य आशिया
 			पश्चिम आशिया
 			युरोप
@@ -939,7 +944,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			अल साल्वाडोर
 			सिंट मार्टेन
 			सीरिया
-			स्वाझिलँड
+			इस्वातिनी
+			स्वाझिलँड
 			ट्रिस्टन दा कुन्हा
 			टर्क्स आणि कैकोस बेटे
 			चाड
@@ -976,6 +982,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			वानुआतु
 			वालिस आणि फ्यूचूना
 			सामोआ
+			नकली-उच्चारणे
+			नकली-बीडी
 			कोसोव्हो
 			येमेन
 			मायोट्टे
@@ -1132,8 +1140,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u093C ॐ \u0902 \u0901 ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ऱ ल व श ष स ह ळ ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]
 		[\u200C\u200D]
 		[\u200D ॐ \u0902 ः अ आ इ ई उ ऊ ऋ ऌ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह ळ ऽ \u0945 \u094D]
-		[\- , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]
+		[\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] @ * / \& # ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1147,13 +1155,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1502,56 +1505,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2069,56 +2025,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h – h a
@@ -2318,6 +2227,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						ऍन्नो मुंडी
 					
+					
+						AM
+					
+					
+						AM
+					
 				
 			
 			
@@ -2617,6 +2532,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -3968,7 +3894,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				अ‍ॅक्टोबे
 			
 			
-				कोस्टाने
+				कोस्टाने
 			
 			
 				किझीलोर्डा
@@ -5554,21 +5480,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
 			
@@ -5720,166 +5656,196 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				संयुक्त अरब अमीरात दिरहॅम
 				संयुक्त अरब अमीरात दिरहॅम
 				संयुक्त अरब अमीरात दिरहॅम
+				AED
 			
 			
 				अफगाण अफगाणी
 				अफगाण अफगाणी
 				अफगाण अफगाणी
+				AFN
 			
 			
 				अल्बानियन लेक
 				अल्बानियन लेक
 				अल्बानियन लेके
+				ALL
 			
 			
 				आर्मेनियन द्रॅम
 				आर्मेनियन द्रॅम
 				आर्मेनियन द्रॅम
+				AMD
 			
 			
 				नेदरलँडचा अँटिलीन गिल्डर
 				नेदरलँडचा अँटिलीन गिल्डर
 				नेदरलँडचे अँटिलीन गिल्डर्स
+				ANG
 			
 			
 				अँगोलन क्वॅन्झा
 				अँगोलन क्वॅन्झा
 				अँगोलन क्वॅन्झास
+				AOA
 				Kz
 			
 			
 				अर्जेंटाइन पेसो
 				अर्जेंटाइन पेसो
 				अर्जेंटाइन पेसोज
+				ARS
 				$
 			
 			
 				ऑस्ट्रेलियन डॉलर
 				ऑस्ट्रेलियन डॉलर
 				ऑस्ट्रेलियन डॉलर्स
+				A$
 				$
 			
 			
 				अरुबा फ्लोरिन
 				अरुबा फ्लोरिन
 				अरुबा फ्लोरिन
+				AWG
 			
 			
 				अझरबैझानी मानाट
 				अझरबैझानी मानाट
 				अझरबैझानी मानाट
+				AZN
 			
 			
 				बोस्निया-हर्जेगोविना विनिमय मार्क
 				बोस्निया-हर्जेगोविना विनिमय मार्क
 				बोस्निया-हर्जेगोविना विनिमय मार्क्स
+				BAM
 				KM
 			
 			
 				बार्बाडियन डॉलर
 				बार्बाडियन डॉलर
 				बार्बाडियन डॉलर्स
+				BBD
 				$
 			
 			
 				बांगलादेशी टका
 				बांगलादेशी टका
 				बांगलादेशी टका
+				BDT
 				৳
 			
 			
 				बल्गेरियन लेव
 				बल्गेरियन लेव
 				बल्गेरियन लेवा
+				BGN
 			
 			
 				बाहरिनी दिनार
 				बाहरिनी दिनार
 				बाहरिनी दिनार
+				BHD
 			
 			
 				बुरुंडियन फ्रँक
 				बुरुंडियन फ्रँक
 				बुरुंडियन फ्रँक्स
+				BIF
 			
 			
 				बर्मुडा डॉलर
 				बर्मुडा डॉलर
 				बर्मुडा डॉलर्स
+				BMD
 				$
 			
 			
 				ब्रुनेई डॉलर
 				ब्रुनेई डॉलर
 				ब्रुनेई डॉलर्स
+				BND
 				$
 			
 			
 				बोलिव्हियन बोलिव्हियानो
 				बोलिव्हियन बोलिव्हियानो
 				बोलिव्हियन बोलिव्हियानोज
+				BOB
 				Bs
 			
 			
 				ब्राझिलियन रियाल
 				ब्राझिलियन रियाल
 				ब्राझिलियन रियाल्स
+				R$
 				R$
 			
 			
 				बहामी डॉलर
 				बहामी डॉलर
 				बहामी डॉलर्स
+				BSD
 				$
 			
 			
 				भूतानी एंगल्ट्रम
 				भूतानी एंगल्ट्रम
 				भूतानी एंगल्ट्रम
+				BTN
 			
 			
 				बोट्सवानन पुला
 				बोट्सवानन पुला
 				बोट्सवाना पुलाज
+				BWP
 				P
 			
 			
 				बेलारुशियन रुबल
 				बेलारुशियन रुबल
 				बेलारुशियन रुबल्स
+				BYN
 				р.
 			
 			
 				बेलारुशियन रुबल (2000–2016)
 				बेलारुशियन रुबल (2000–2016)
 				बेलारुशियन रुबल्स (2000–2016)
+				BYR
 			
 			
 				बेलीझ डॉलर
 				बेलीझ डॉलर
 				बेलीझ डॉलर्स
+				BZD
 				$
 			
 			
 				कॅनडियन डॉलर
 				कॅनडियन डॉलर
 				कॅनडियन डॉलर्स
+				CA$
 				$
 			
 			
 				काँगोलीज फ्रँक
 				काँगोलीज फ्रँक
 				काँगोलीज फ्रँक्स
+				CDF
 			
 			
 				स्विस फ्रँक
 				स्विस फ्रँक
 				स्विस फ्रँक्स
+				CHF
 			
 			
 				चिली पेसो
 				चिली पेसो
 				चिली पेसोज
+				CLP
 				$
 			
 			
@@ -5892,109 +5858,128 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				चीनी युआन
 				चीनी युआन
 				चीनी युआन
+				CN¥
 				¥
 			
 			
 				कोलंबियन पेसो
 				कोलंबियन पेसो
 				कोलंबियन पेसोज
+				COP
 				$
 			
 			
 				कोस्टा रिका कोलोन
 				कोस्टा रिका कोलोन
 				कोस्टा रिका कोलोन्स
+				CRC
 				₡
 			
 			
 				क्यूबन विनिमय पेसो
 				क्यूबन विनिमय पेसो
 				क्यूबन विनिमय पेसोज
+				CUC
 				$
 			
 			
 				क्यूबन पेसो
 				क्यूबन पेसो
 				क्यूबन पेसोज
+				CUP
 				$
 			
 			
 				केप व्हर्डेयन एस्कुडो
 				केप व्हर्डेयन एस्कुडो
 				केप व्हर्डेयन एस्कुडोज
+				CVE
 			
 			
 				झेक प्रजासत्ताक कोरुना
 				झेक प्रजासत्ताक कोरुना
 				झेक प्रजासत्ताक कोरुनाज
+				CZK
 				Kč
 			
 			
 				जिबौटियन फ्रँक
 				जिबौटियन फ्रँक
 				जिबौटियन फ्रँक्स
+				DJF
 			
 			
 				डॅनिश क्रोन
 				डॅनिश क्रोन
 				डॅनिश क्रोन
+				DKK
 				kr
 			
 			
 				डोमिनिकन पेसो
 				डोमिनिकन पेसो
 				डोमिनिकन पेसोज
+				DOP
 				$
 			
 			
 				अल्जेरियन दिनार
 				अल्जेरियन दिनार
 				अल्जेरियन दिनार
+				DZD
 			
 			
 				इजिप्शियन पाउंड
 				इजिप्शियन पाउंड
 				इजिप्शियन पाउंड्स
+				EGP
 				E£
 			
 			
 				इरिट्रियन नाक्फा
 				इरिट्रियन नाक्फा
 				इरिट्रियन नाक्फाज
+				ERN
 			
 			
 				इथिओपियन बिर
 				इथिओपियन बिर
 				इथिओपियन बिर्स
+				ETB
 			
 			
 				युरो
 				युरो
 				युरो
+				€
 				€
 			
 			
 				फिजियन डॉलर
 				फिजियन डॉलर्स
 				फिजियन डॉलर्स
+				FJD
 				$
 			
 			
 				फॉकलंड आयलंड पाउंड
 				फॉकलंड आयलंड पाउंड
 				फॉकलंड आयलंड पाउंड्स
+				FKP
 				£
 			
 			
 				ब्रिटिश पाऊंड
 				ब्रिटिश पाऊंड
 				ब्रिटिश पाऊंड्स
+				£
 				£
 			
 			
 				जॉर्जियन लारी
 				जॉर्जियन लारी
 				जॉर्जियन लारी
+				GEL
 				₾
 				[₾]
 			
@@ -6002,189 +5987,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				घानीयन सेडी
 				घानीयन सेडी
 				घानीयन सेडीस
+				GHS
 			
 			
 				जिब्राल्टर पाउंड
 				जिब्राल्टर पाउंड
 				जिब्राल्टर पाउंड्स
+				GIP
 				£
 			
 			
 				गाम्बियन डालासी
 				गाम्बियन डालासी
 				गाम्बियन डालासीस
+				GMD
 			
 			
 				गिनी फ्रँक
 				गिनी फ्रँक
 				गिनी फ्रँक्स
+				GNF
 				FG
 			
 			
 				ग्वाटेमालाचे क्वेत्झाल
 				ग्वाटेमालाचे क्वेत्झाल
 				ग्वाटेमालाचे क्वेत्झाल्स
+				GTQ
 				Q
 			
 			
 				गयाना डॉलर
 				गयाना डॉलर
 				गयाना डॉलर्स
+				GYD
 				$
 			
 			
 				हाँगकाँग डॉलर
 				हाँगकाँग डॉलर
 				हाँगकाँग डॉलर्स
+				HK$
 				$
 			
 			
 				होन्डुरन लेंपिरा
 				होन्डुरन लेंपिरा
 				होन्डुरन लेंपिराज
+				HNL
 				L
 			
 			
 				क्रोएशियन कूना
 				क्रोएशियन कूना
 				क्रोएशियन कूनाज
+				HRK
 				kn
 			
 			
 				हैती गोअर्ड
 				हैती गोअर्ड
 				हैती गोअर्ड्स
+				HTG
 			
 			
 				हंगेरियन फॉरिन्ट
 				हंगेरियन फॉरिन्ट
 				हंगेरियन फॉरिन्ट्स
+				HUF
 				Ft
 			
 			
 				इंडोनेशियन रुपिया
 				इंडोनेशियन रुपिया
 				इंडोनेशियन रुपिया
+				IDR
 				Rp
 			
 			
 				ईस्त्रायली न्यू शेकेल
 				ईस्त्रायली न्यू शेकेल
 				ईस्त्रायली न्यू शेकेल
+				₪
 				₪
 			
 			
 				भारतीय रुपया
 				भारतीय रुपया
 				भारतीय रुपये
+				₹
 				₹
 			
 			
 				इराकी दिनार
 				इराकी दिनार
 				इराकी दिनार
+				IQD
 			
 			
 				इराणी रियाल
 				इराणी रियाल
 				इराणी रियाल
+				IRR
 			
 			
 				आइसलँडिक क्रोना
 				आइसलँडिक क्रोना
 				आइसलँडिक क्रोन्युर
+				ISK
 				kr
 			
 			
 				जमैकन डॉलर
 				जमैकन डॉलर
 				जमैकन डॉलर्स
+				JMD
 				$
 			
 			
 				जॉर्डनियन दिनार
 				जॉर्डनियन दिनार
 				जॉर्डनियन दिनार
+				JOD
 			
 			
 				जपानी येन
 				जपानी येन
 				जपानी येन
+				JP¥
 				¥
 			
 			
 				केनियन शिलिंग
 				केनियन शिलिंग
 				केनियन शिलिंग्स
+				KES
 			
 			
 				किरगिस्तानी सॉम
 				किरगिस्तानी सॉम
 				किरगिस्तानी सॉम
+				KGS
 			
 			
 				कंबोडियन रियेल
 				कंबोडियन रियेल
 				कंबोडियन रियेल
+				KHR
 				៛
 			
 			
 				कोमोरियन फ्रँक
 				कोमोरियन फ्रँक
 				कोमोरियन फ्रँक्स
+				KMF
 				CF
 			
 			
 				उत्तर कोरियन वॉन
 				उत्तर कोरियन वॉन
 				उत्तर कोरियन वॉन
+				KPW
 				₩
 			
 			
 				दक्षिण कोरियन वॉन
 				दक्षिण कोरियन वॉन
 				दक्षिण कोरियन वॉन
+				₩
 				₩
 			
 			
 				कुवैती दिनार
 				कुवैती दिनार
 				कुवैती दिनार
+				KWD
 			
 			
 				केमेन आयलॅंड डॉलर
 				केमेन आयलॅंड डॉलर
 				केमेन आयलॅंड डॉलर्स
+				KYD
 				$
 			
 			
 				कझाकिस्तानी तेंगे
 				कझाकिस्तानी तेंगे
 				कझाकिस्तानी तेंगे
+				KZT
 				₸
 			
 			
 				लाओशियन किप
 				लाओशियन किप
 				लाओशियन किप
+				LAK
 				₭
 			
 			
 				लेबनीज पाउंड
 				लेबनीज पाउंड
 				लेबनीज पाउंड्स
+				LBP
 				L£
 			
 			
 				श्रीलंकन रुपया
 				श्रीलंकन रुपया
 				श्रीलंकन रुपये
+				LKR
 				Rs
 			
 			
 				लाइबेरियन डॉलर
 				लाइबेरियन डॉलर
 				लाइबेरियन डॉलर्स
+				LRD
 				$
 			
 			
@@ -6194,59 +6212,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				लिथुआनियन लिटास
 				लिथुआनियन लिटास
 				लिथुआनियन लिटाई
+				LTL
 			
 			
 				लाट्व्हियन लाट्झ
 				लाट्व्हियन लाट्झ
 				लाट्व्हियन लाटी
+				LVL
 			
 			
 				लिबियाचा दिनार
 				लिबियाचा दिनार
 				लिबियन दिनार
+				LYD
 			
 			
 				मोरोक्को दिरहॅम
 				मोरोक्को दिरहॅम
 				मोरोक्कन दिरहाम
+				MAD
 			
 			
 				मोल्डोवन लेउ
 				मोल्डोवन लेउ
 				मोल्डोवन लेई
+				MDL
 			
 			
 				मालागासी एरियारी
 				मालागासी एरियारी
 				मालागासी एरियारीज
+				MGA
 				Ar
 			
 			
 				मॅसेडोनियन देनार
 				मॅसेडोनियन देनार
 				मॅसेडोनियन देनारी
+				MKD
 			
 			
 				म्यानमार क्याट
 				म्यानमार क्याट
 				म्यानमार क्याट
+				MMK
 				K
 			
 			
 				मंगोलियन टुग्रिक
 				मंगोलियन टुग्रिक
 				मंगोलियन टुग्रिक्स
+				MNT
 				₮
 			
 			
 				मॅकॅनीज् पटाका
 				मॅकॅनीज् पटाका
 				मॅकॅनीज् पटाकाज
+				MOP
 			
 			
 				मॉरिटानियन ओगिया (1973–2017)
 				मॉरिटानियन ओगिया (1973–2017)
 				मॉरिटानियन ओगियाज (1973–2017)
+				MRO
 			
 			
 				मॉरिटानियन ओगिया
@@ -6258,208 +6287,245 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				मॉरिशियन रुपी
 				मॉरिशियन रुपी
 				मॉरिशियन रुपीज
+				MUR
 				Rs
 			
 			
 				मालदीवियन रुफिया
 				मालदीवियन रुफिया
 				मालदीवियन रुफिया
+				MVR
 			
 			
 				मालावियन क्वाचा
 				मालावियन क्वाचा
 				मालावियन क्वाचास
+				MWK
 			
 			
 				मेक्सिको पेसो
 				मेक्सिको पेसो
 				मेक्सिको पेसोज
+				MX$
 				$
 			
 			
 				मलेशियन रिंगिट
 				मलेशियन रिंगिट
 				मलेशियन रिंगिट
+				MYR
 				RM
 			
 			
 				मोझांबिकन मेटिकल
 				मोझांबिकन मेटिकल
 				मोझांबिकन मेटिकल्स
+				MZN
 			
 			
 				नमिबियन डॉलर
 				नमिबियन डॉलर
 				नमिबियन डॉलर्स
+				NAD
 				$
 			
 			
 				नायजेरियन नायरा
 				नायजेरियन नायरा
 				नायजेरियन नायराज
+				NGN
 				₦
 			
 			
 				निकाराग्वेचा कोर्डोबा
 				निकाराग्वेचा कोर्डोबा
 				निकाराग्वन कोर्डोबाज
+				NIO
 				C$
 			
 			
 				नॉर्वेजियन क्रोन
 				नॉर्वेजियन क्रोन
 				नॉर्वेजियन क्रोनर
+				NOK
 				kr
 			
 			
 				नेपाळी रुपया
 				नेपाळी रुपया
 				नेपाळी रुपये
+				NPR
 				Rs
 			
 			
 				न्यूझीलँड डॉलर
 				न्यूझीलँड डॉलर
 				न्यूझीलँड डॉलर्स
+				NZ$
 				$
 			
 			
 				ओमानी रियाल
 				ओमानी रियाल
 				ओमानी रियाल
+				OMR
 			
 			
 				पनामा बाल्बोआ
 				पनामा बाल्बोआ
 				पनामा बाल्बोआज
+				PAB
 			
 			
 				पेरुवियन सोल
 				पेरुवियन सोल
 				पेरुवियन सोल्स
+				PEN
 			
 			
 				पापुआ न्यू गिनीयन किना
 				पापुआ न्यू गिनीयन किना
 				पापुआ न्यू गिनीयन किना
+				PGK
 			
 			
 				फिलिपिनी पेसो
 				फिलिपिनी पेसो
 				फिलिपिनी पेसोज
+				PHP
 				₱
 			
 			
 				पाकिस्तानी रुपया
 				पाकिस्तानी रुपया
 				पाकिस्तानी रुपये
+				PKR
 				Rs
 			
 			
 				पोलिश झ्लॉटी
 				पोलिश झ्लॉटी
 				पोलिश झ्लॉटीज
+				PLN
 				zł
 			
 			
 				पराग्वे ग्वारानी
 				पराग्वे ग्वारानी
 				पराग्वे ग्वारानीज
+				PYG
 				₲
 			
 			
 				कतारी रियाल
 				कतारी रियाल
 				कतारी रियाल
+				QAR
 			
 			
 				रोमानियन लेऊ
 				रोमानियन लेऊ
 				रोमानियन लेई
+				RON
 				lei
 			
 			
 				सर्बियन दिनार
 				सर्बियन दिनार
 				सर्बियन दिनार
+				RSD
 			
 			
 				रशियन रुबल
 				रशियन रुबल
 				रशियन रुबल्स
+				RUB
 				₽
 			
 			
 				रवांडा फ्रँक
 				रवांडा फ्रँक
 				रवांडा फ्रँक्स
+				RWF
 				RF
 			
 			
 				सौदी रियाल
 				सौदी रियाल
 				सौदी रियाल
+				SAR
 			
 			
 				सोलोमन आयलँड्स डॉलर
 				सोलोमन आयलँड्स डॉलर
 				सोलोमन आयलँड्स डॉलर्स
+				SBD
 				$
 			
 			
 				सेशेलोईस रुपी
 				सेशेलोईस रुपी
 				सेशेलोईस रुपीज
+				SCR
 			
 			
 				सुदानी पाउंड
 				सुदानी पाउंड
 				सुदानी पाउंड्स
+				SDG
 			
 			
 				स्वीडिश क्रोना
 				स्वीडिश क्रोना
 				स्वीडिश क्रोनोर
+				SEK
 				kr
 			
 			
 				सिंगापूर डॉलर
 				सिंगापूर डॉलर
 				सिंगापूर डॉलर्स
+				SGD
 				$
 			
 			
 				सेंट हेलेना पाउंड
 				सेंट हेलेना पाउंड
 				सेंट हेलेना पाउंड्स
+				SHP
 				£
 			
 			
 				सिएरा लिऑनचा लिऑन
 				सिएरा लिऑनचा लिऑन
 				सिएरा लिऑनचे लिऑन्स
+				SLL
 			
 			
 				सोमाली शिलिंग
 				सोमाली शिलिंग्स
 				सोमाली शिलिंग
+				SOS
 			
 			
 				सुरिनामी डॉलर
 				सुरिनामी डॉलर
 				सुरिनामी डॉलर्स
+				SRD
 				$
 			
 			
 				दक्षिण सुदानी पाउंड
 				दक्षिण सुदानी पाउंड
 				दक्षिण सुदानी पाउंड्स
+				SSP
 				£
 			
 			
 				साओ टोम आणि प्रिन्सिपे डोबरा (1977–2017)
 				साओ टोम आणि प्रिन्सिपे डोबरा (1977–2017)
 				साओ टोम आणि प्रिन्सिपे डोबराज (1977–2017)
+				STD
 			
 			
 				साओ टोम आणि प्रिन्सिपे डोबरा
@@ -6472,12 +6538,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				सीरियन पाउंड
 				सीरियन पाउंड
 				सीरियन पाउंड्स
+				SYP
 				£
 			
 			
 				स्वाझी लीलांगेनी
 				स्वाझी लीलांगेनी
 				स्वाझी एमालांगेनी
+				SZL
 			
 			
 				थाई बाहत
@@ -6490,27 +6558,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ताजकीस्तानी सोमोनी
 				ताजकीस्तानी सोमोनी
 				ताजकीस्तानी सोमोनीज
+				TJS
 			
 			
 				तुर्कमेनिस्तानी मानाट
 				तुर्कमेनिस्तानी मानाट
 				तुर्कमेनिस्तानी मानाट
+				TMT
 			
 			
 				ट्यूनिशियन दिनार
 				ट्यूनिशियन दिनार
 				ट्यूनिशियन दिनार
+				TND
 			
 			
 				टोंगन पाआंगा
 				टोंगन पाआंगा
 				टोंगन पाआंगा
+				TOP
 				T$
 			
 			
 				तुर्की लिरा
 				तुर्की लिरा
 				तुर्की लिरा
+				TRY
 				₺
 				TL
 			
@@ -6518,29 +6591,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				त्रिनिदाद आणि टोबॅगो डॉलर
 				त्रिनिदाद आणि टोबॅगो डॉलर
 				त्रिनिदाद आणि टोबॅगो डॉलर्स
+				TTD
 				$
 			
 			
 				न्यू तैवान डॉलर
 				न्यू तैवान डॉलर
 				न्यू तैवान डॉलर्स
+				NT$
 				NT$
 			
 			
 				टांझानियन शिलिंग
 				टांझानियन शिलिंग
 				टांझानियन शिलिंग्स
+				TZS
 			
 			
 				युक्रेनियन रिवनिया
 				युक्रेनियन रिवनिया
 				युक्रेनियन रिवनियाज
+				UAH
 				₴
 			
 			
 				युगांडा शिलिंग
 				युगांडा शिलिंग
 				युगांडा शिलिंग्स
+				UGX
 			
 			
 				यूएस डॉलर
@@ -6553,17 +6631,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				उरुग्वेचा पेसो
 				उरुग्वेचा पेसो
 				उरुग्वेचे पेसोज
+				UYU
 				$
 			
 			
 				उझबेकिस्तानी सोम
 				उझबेकिस्तानी सोम
 				उझबेकिस्तानी सोम
+				UZS
 			
 			
 				व्हेनेझुएला बोलिव्हार (2008–2018)
 				व्हेनेझुएला बोलिव्हार (2008–2018)
 				व्हेनेझुएला बोलिव्हार्स (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6576,38 +6657,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				व्हिएतनामी डोंग
 				व्हिएतनामी डोंग
 				व्हिएतनामी डोंग
+				₫
 				₫
 			
 			
 				वानुआतु वाटु
 				वानुआतु वाटु
 				वानुआतु वाटु
+				VUV
 			
 			
 				सामोअन टाला
 				सामोअन टाला
 				सामोअन टाला
+				WST
 			
 			
 				मध्य आफ्रिकन [CFA] फ्रँक
 				मध्य आफ्रिकन [CFA] फ्रँक
 				मध्य आफ्रिकन [CFA] फ्रँक
+				FCFA
 			
 			
 				पूर्व कॅरीबियन डॉलर
 				पूर्व कॅरीबियन डॉलर
 				पूर्व कॅरीबियन डॉलर्स
+				EC$
 				$
 			
 			
 				पश्चिम आफ्रिकन [CFA] फ्रँक
 				पश्चिम आफ्रिकन [CFA] फ्रँक
 				पश्चिम आफ्रिकन [CFA] फ्रँक्स
+				CFA
 			
 			
 				[CFP] फ्रँक
 				[CFP] फ्रँक
 				[CFP] फ्रँक्स
+				CFPF
 			
 			
 				अज्ञात चलन
@@ -6618,11 +6706,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				येमेनी रियाल
 				येमेनी रियाल
 				येमेनी रियाल
+				YER
 			
 			
 				दक्षिण आफ्रिकी रँड
 				दक्षिण आफ्रिकी रँड
 				दक्षिण आफ्रिकी रँड
+				ZAR
 				R
 			
 			
@@ -6632,11 +6722,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				झांबियन क्वाचा
 				झांबियन क्वाचा
 				झांबियन क्वाचास
+				ZMW
 				ZK
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
@@ -6739,9 +6832,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} दर चौरस इंच
 			
 			
-				दुनाम
-				{0} दुनाम
-				{0} दुनाम
+				दुनाम
+				{0} दुनाम
+				{0} दुनाम
 			
 			
 				कॅरेट्स
@@ -6774,14 +6867,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} प्रतिमैल
 			
 			
-				पर्मिरेड
-				{0} पर्मिरेड
-				{0} पर्मिरेड
+				पर्मिरेड
+				{0} पर्मिरेड
+				{0} पर्मिरेड
 			
 			
-				मोल
-				{0} मोल
-				{0} मोल
+				मोल
+				{0} मोल
+				{0} मोल
 			
 			
 				लीटर प्रति किलोमीटर
@@ -6863,6 +6956,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} शतक
 				{0} शतके
 			
+			
+				दशके
+				{0} दशक
+				{0} दशके
+			
 			
 				वर्षे
 				{0} वर्ष
@@ -6971,24 +7069,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} किलोवॉट-तास
 			
 			
-				इलेक्ट्रॉनव्होल्ट्स
-				{0} इलेक्ट्रॉनव्होल्ट
-				{0} इलेक्ट्रॉनव्होल्ट्स
+				इलेक्ट्रॉनव्होल्ट्स
+				{0} इलेक्ट्रॉनव्होल्ट
+				{0} इलेक्ट्रॉनव्होल्ट्स
 			
 			
-				ब्रिटिश थर्मल युनिट
-				{0} ब्रिटिश थर्मल युनिट
-				{0} ब्रिटिश थर्मल युनिट
+				ब्रिटिश थर्मल युनिट
+				{0} ब्रिटिश थर्मल युनिट
+				{0} ब्रिटिश थर्मल युनिट
 			
 			
-				पाउंड्स ऑफ फोर्स
-				{0} पाउंड ऑफ फोर्स
-				{0} पाउंड्स ऑफ फोर्स
+				पाउंड्स ऑफ फोर्स
+				{0} पाउंड ऑफ फोर्स
+				{0} पाउंड्स ऑफ फोर्स
 			
 			
-				न्यूटन्स
-				{0} न्यूटन
-				{0} न्यूटन्स
+				न्यूटन्स
+				{0} न्यूटन
+				{0} न्यूटन्स
 			
 			
 				गिगाहर्ट्झ
@@ -7010,6 +7108,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हर्ट्झ
 				{0} हर्ट्झ
 			
+			
+				टायपोग्राफिक em
+				{0} em
+				{0} ems
+			
+			
+				पिक्सेल्स
+				{0} पिक्सेल
+				{0} पिक्सेल्स
+			
+			
+				मेगापिक्सेल्स
+				{0} मेगापिक्सेल
+				{0} मेगापिक्सेल्स
+			
+			
+				पिक्सेल्स प्रति सेंटीमीटर
+				{0} पिक्सेल प्रति सेंटीमीटर
+				{0} पिक्सेल्स प्रति सेंटीमीटर
+			
+			
+				पिक्सेल्स प्रति इंच
+				{0} पिक्सेल प्रति इंच
+				{0} पिक्सेल्स प्रति इंच
+			
+			
+				प्रति सेंटीमीटर बिंदू
+				{0} प्रति सेंटीमीटर बिंदू
+				{0} प्रति सेंटीमीटर बिंदू
+			
+			
+				प्रति इंच बिंदू
+				{0} प्रति इंच बिंदू
+				{0} प्रति इंच बिंदू
+			
 			
 				किलोमीटर
 				{0} किलोमीटर
@@ -7106,9 +7239,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} बिंदु
 			
 			
-				सौर त्रिज्या
-				{0} सौर त्रिज्या
-				{0} सौर त्रिज्या
+				सौर त्रिज्या
+				{0} सौर त्रिज्या
+				{0} सौर त्रिज्या
 			
 			
 				लक्स
@@ -7116,9 +7249,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} लक्स
 			
 			
-				सौर प्रकाश
-				{0} सौर प्रकाश
-				{0} सौर प्रकाश
+				सौर प्रकाश
+				{0} सौर प्रकाश
+				{0} सौर प्रकाश
 			
 			
 				मेट्रिक टन
@@ -7180,19 +7313,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} कॅरेट्स
 			
 			
-				डाल्टन
-				{0} डाल्टन
-				{0} डाल्टन
+				डाल्टन
+				{0} डाल्टन
+				{0} डाल्टन
 			
 			
-				पृथ्वी द्रव्यमान
-				{0} पृथ्वी द्रव्यमान
-				{0} पृथ्वी द्रव्यमान
+				पृथ्वी द्रव्यमान
+				{0} पृथ्वी द्रव्यमान
+				{0} पृथ्वी द्रव्यमान
 			
 			
-				सौर द्रव्यमान
-				{0} सौर द्रव्यमान
-				{0} सौर द्रव्यमान
+				सौर द्रव्यमान
+				{0} सौर द्रव्यमान
+				{0} सौर द्रव्यमान
 			
 			
 				गिगावॉट
@@ -7224,11 +7357,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हॉर्सपॉवर
 				{0} हॉर्सपॉवर
 			
-			
-				हेक्टोपास्कल
-				{0} हेक्टोपास्कल
-				{0} हेक्टोपास्कल
-			
 			
 				मर्क्यूरी मिलिमीटर
 				{0} मर्क्यूरी मिलिमीटर
@@ -7254,15 +7382,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} वातावरण
 				{0} वातावरण
 			
+			
+				हेक्टोपास्कल
+				{0} हेक्टोपास्कल
+				{0} हेक्टोपास्कल
+			
 			
-				किलोपास्कल
-				{0} किलोपास्कल
-				{0} किलोपास्कल
+				किलोपास्कल
+				{0} किलोपास्कल
+				{0} किलोपास्कल
 			
 			
-				मेगापास्कल
-				{0} मेगापास्कल
-				{0} मेगापास्कल्स
+				मेगापास्कल
+				{0} मेगापास्कल
+				{0} मेगापास्कल्स
 			
 			
 				किलोमीटर प्रति तास
@@ -7305,14 +7438,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} केल्व्हिन
 			
 			
-				पाउंड-फूट
-				{0} पाउंड-फुट
-				{0} पाउंड-फूट
+				पाउंड-फूट
+				{0} पाउंड-फुट
+				{0} पाउंड-फूट
 			
 			
-				न्यूटन-मीटर
-				{0} न्यूटन-मीटर
-				{0} न्यूटन-मीटर
+				न्यूटन-मीटर
+				{0} न्यूटन-मीटर
+				{0} न्यूटन-मीटर
 			
 			
 				घन किलोमीटर
@@ -7430,9 +7563,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} फ्लूइड औंस
 			
 			
-				इम्पे. फ्लुईड औंस
-				{0} इम्पे. फ्लुईड औंस
-				{0} इम्पे. फ्लुईड औंस
+				इम्पे. फ्लुईड औंस
+				{0} इम्पे. फ्लुईड औंस
+				{0} इम्पे. फ्लुईड औंस
 			
 			
 				टेबलस्पून
@@ -7445,9 +7578,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} टीस्पून
 			
 			
-				बॅरल
-				{0} बॅरल
-				{0} बॅरल
+				बॅरल
+				{0} बॅरल
+				{0} बॅरल
 			
 			
 				मुख्य दिशा
@@ -7547,9 +7680,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/इंच²
 			
 			
-				दुनाम
-				{0} दुनाम
-				{0} दुनाम
+				दुनाम
+				{0} दुनाम
+				{0} दुनाम
 			
 			
 				कॅरेट्स
@@ -7582,14 +7715,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				पर्मिरेड
-				{0}‱
-				{0}‱
+				पर्मिरेड
 			
 			
-				मोल
-				{0} मोल
-				{0} मोल
+				मोल
+				{0} मोल
+				{0} मोल
 			
 			
 				लीटर/किमी
@@ -7671,6 +7802,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} श
 				{0} श
 			
+			
+				द
+				{0} द
+				{0} द
+			
 			
 				वर्षे
 				{0} वर्ष
@@ -7779,24 +7915,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				इलेक्ट्रॉनव्होल्ट
-				{0} eV
-				{0} eV
+				इलेक्ट्रॉनव्होल्ट
 			
 			
-				BTU
-				{0} बिटीयू
-				{0} बिटीयू
+				BTU
+				{0} बिटीयू
+				{0} बिटीयू
 			
 			
-				पाउंड-फोर्स
-				{0} lbf
-				{0} lbf
+				पाउंड-फोर्स
 			
 			
-				न्यूटन
-				{0} N
-				{0} N
+				न्यूटन
 			
 			
 				GHz
@@ -7818,6 +7948,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				पिक्सेल्स
+				{0} पि
+				{0} पि
+			
+			
+				मे पि
+				{0} मे पि
+				{0} मे पि
+			
+			
+				पि प्र सेंमी
+				{0} पि प्र सेंमी
+				{0} पि प्र सेंमी
+			
+			
+				पि प्र इं
+				{0} पि प्र इं
+				{0} पि प्र इं
+			
+			
+				प्र सें बिं
+				{0} प्र सें बिं
+				{0} प्र सें बिं
+			
+			
+				प्र इं बिं
+				{0} प्र इं बिं
+				{0} प्र इं बिं
+			
 			
 				किमी
 				{0} किमी
@@ -7914,9 +8074,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} बिंदु
 			
 			
-				सौर त्रिज्या
-				{0} R☉
-				{0} R☉
+				सौर त्रिज्या
 			
 			
 				लक्स
@@ -7924,9 +8082,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				सौर प्रकाश
-				{0} L☉
-				{0} L☉
+				सौर प्रकाश
 			
 			
 				t
@@ -7988,19 +8144,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 			
 			
-				डाल्टन
-				{0} डाल्टन
-				{0} डाल्टन
+				डाल्टन
+				{0} डाल्टन
+				{0} डाल्टन
 			
 			
-				पृथ्वी द्रव्यमान
-				{0} M⊕
-				{0} M⊕
+				पृथ्वी द्रव्यमान
 			
 			
-				सौर द्रव्यमान
-				{0} M☉
-				{0} M☉
+				सौर द्रव्यमान
 			
 			
 				GW
@@ -8032,11 +8184,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8062,15 +8209,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
-				MPa
-				{0} MPa
-				{0} MPa
+				MPa
 			
 			
 				किमी/तास
@@ -8112,16 +8257,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				किमी³
 				{0} किमी³
@@ -8238,9 +8373,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				इम्पे. फ्लु औं
-				{0} fl oz Imp.
-				{0} fl oz Imp.
+				इम्पे. फ्लु औं
 			
 			
 				tbsp
@@ -8253,9 +8386,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 			
 			
-				बॅरल
-				{0} bbl
-				{0} bbl
+				बॅरल
 			
 			
 				दिशा
@@ -8376,6 +8507,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मिलिसे
 				{0} मिलिसे
 			
+			
+				μs
+				{0} μs
+				{0} μs
+			
 			
 				नॅनोसेक
 				{0} नॅसे
@@ -8395,6 +8531,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				डेमी
+				{0} dm
+				{0} dm
 			
 			
 				सेंमी
@@ -8409,6 +8547,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				मायक्रोमीटर
+				{0} µm
+				{0} µm
 			
 			
 				नॅमी
@@ -8444,12 +8584,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				पार्सेक
+				{0} pc
+				{0} pc
 			
 			
 				प्रकाश वर्षे
 				{0}प्रव
 				{0}प्रव
 			
+			
+				smi
+				{0} smi
+				{0} smi
+			
 			
 				किग्रॅ
 				{0}किग्रॅ
@@ -8481,11 +8628,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				पाउंड
 				{0}#
 				{0}#
+				{0}/lb
 			
 			
 				औंस
 				{0}औंस
 				{0}औंस
+				{0}/oz
 			
 			
 				{0}किवॉ
@@ -8499,15 +8648,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हॉपॉ
 				{0}हॉपॉ
 			
-			
-				{0}हेक्टोपा
-				{0}हेक्टोपा
-			
 			
+				mm Hg
 				{0}mmHg
 				{0}mmHg
 			
 			
+				psi
 				{0}psi
 				{0}psi
 			
@@ -8521,6 +8668,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}मिबा
 				{0}मिबा
 			
+			
+				hPa
+				{0}हेक्टोपा
+				{0}हेक्टोपा
+			
 			
 				किमी/तास
 				{0}किप्रता
@@ -8536,6 +8688,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}मैप्रता
 				{0}मैप्रता
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°से
 				{0}°से
@@ -8548,6 +8705,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				केल्व्हिन
+				{0} K
+				{0} K
 			
 			
 				{0}किमी³
@@ -8593,12 +8752,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, किंवा {1}
 			{0} किंवा {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} आणि {1}
-			{0} आणि {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/mr_IN.xml b/make/data/cldr/common/main/mr_IN.xml
index c6b9724fcde..8fcbe7e11ea 100644
--- a/make/data/cldr/common/main/mr_IN.xml
+++ b/make/data/cldr/common/main/mr_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ms.xml b/make/data/cldr/common/main/ms.xml
index 096d835f377..0af3d15051f 100644
--- a/make/data/cldr/common/main/ms.xml
+++ b/make/data/cldr/common/main/ms.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -461,57 +461,181 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yiddish
 			Yoruba
 			Kantonis
+			Cina, Kantonis
 			Tamazight Maghribi Standard
 			Cina
+			Cina, Mandarin
 			Cina Ringkas
+			Cina Mandarin Ringkas
 			Cina Tradisional
+			Cina Mandarin Tradisional
 			Zulu
 			Zuni
 			Tiada kandungan linguistik
 			Zaza
 		
 		
+			
+			
 			
 			
+			
 			
+			
+			
+			
+			
+			
 			
+			
 			
+			
 			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
 			
+			
+			
+			
+			
+			
+			
 			
 			
+			
+			
+			
+			
+			
 			
 			
 			
 			
 			
 			
+			
 			
 			
 			
 			
+			
 			
 			
+			
+			
+			
 			
+			
+			
 			
+			
 			
+			
 			
+			
 			
+			
 			
 			
+			
+			
 			
 			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
+			
 			
+			
+			
+			
 			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
+			
+			
 			
+			
+			
 			
 			
 			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			
 			
 			
@@ -781,6 +905,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Syria
 			Swaziland
+			Swaziland
 			Tristan da Cunha
 			Kepulauan Turks dan Caicos
 			Chad
@@ -817,8 +942,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis dan Futuna
 			Samoa
-			XA
-			XB
 			Kosovo
 			Yaman
 			Mayotte
@@ -863,9 +986,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kalendar Kebangsaan India
 			Kalendar Islam
 			Kalendar Sivil Islam
-			Kalendar Islam (Arab Saudi, cerapan)
-			Kalendar Islam (jadual, zaman astronomi)
-			Kalendar Islam (Umm Al-Quran)
+			Kalendar Islam (Arab Saudi, cerapan)
+			Kalendar Islam (jadual, zaman astronomi)
+			Kalendar Islam (Umm Al-Quran)
 			Kalendar ISO-8601
 			Kalendar Jepun
 			Kalendar Parsi
@@ -882,11 +1005,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Isih Tidak Sensitif Atur
 			Isih Sensitif Atur
 			Aturan Isih Cina Tradisional - Big5
-			Tertib Isihan Sebelumnya
+			Tertib Isihan Sebelumnya
 			Aturan Isih Kamus
 			Tertib Isih Unikod Lalai
-			Aturan Isih Emoji
-			Peraturan Isihan Eropah
+			Aturan Isih Emoji
+			Peraturan Isihan Eropah
 			Aturan Isih Bahasa Cina Ringkas - GB2312
 			Aturan Isih Buku Telefon
 			Urutan Isih Fonetik
@@ -898,7 +1021,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Aturan Isih Coretan
 			Aturan Isih Tradisional
 			Aturan Isih Coretan Radikal
-			Aturan Isih Zhuyin
+			Aturan Isih Zhuyin
 			Isih Tanpa Penormalan
 			Isih Unikod Ternormal
 			Isih Digit Secara Berasingan
@@ -923,23 +1046,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sistem Metrik
 			Sistem Ukuran Imperial
 			Sistem Ukuran AS
-			Digit Ahom
+			Digit Ahom
 			Digit Indi-Arab
 			Digit Indi Arab Lanjutan
 			Angka Armenia
 			Angka Kecil Armenia
-			Digit Bali
+			Digit Bali
 			Digit Benggali
-			Digit Brahmi
-			Digit Chakma
-			Digit Cham
-			Digit Cyril
+			Digit Brahmi
+			Digit Chakma
+			Digit Cham
+			Digit Cyril
 			Digit Devanagari
 			Angka Ethiopia
 			Angka Kewangan
 			Digit Lebar Penuh
 			Angka Georgia
-			Digit Masaram Gondi
+			Digit Gunjala Gondi
+			Digit Masaram Gondi
 			Angka Greek
 			Angka Huruf Kecil Greek
 			Digit Gujarat
@@ -950,56 +1074,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Angka Cina Tradisional
 			Angka Kewangan Cina Tradisional
 			Angka Ibrani
-			Digit Pahawh Hmong
-			Digit Jawa
+			Digit Pahawh Hmong
+			Digit Nyiakeng Puachue Hmong
+			Digit Jawa
 			Angka Jepun
 			Angka Kewangan Jepun
-			Digit Kayah Li
+			Digit Kayah Li
 			Digit Khmer
 			Digit Kannada
-			Digit Tai Tham Hora
-			Digit Tai Tham Tham
+			Digit Tai Tham Hora
+			Digit Tai Tham Tham
 			Digit Lao
 			Digit Barat
-			Digit Lepcha
-			Digit Limbu
-			Digit Matematik Tebal
-			Digit Matematik Dwilejang
-			Digit Matematik Monospace
-			Digit Matematik San Serif Tebal
-			Digit Matematik San Serif
+			Digit Lepcha
+			Digit Limbu
+			Digit Matematik Tebal
+			Digit Matematik Dwilejang
+			Digit Matematik Monospace
+			Digit Matematik San Serif Tebal
+			Digit Matematik San Serif
 			Digit Malayalam
-			Digit Modi
+			Digit Modi
 			Digit Mongolia
-			Digit Mro
-			Digit Meetei Mayek
+			Digit Mro
+			Digit Meetei Mayek
 			Digit Myammar
-			Digit Myanmar Shan
-			Digit Myanmar Tai Laing
+			Digit Myanmar Shan
+			Digit Myanmar Tai Laing
 			Digit Asal
-			Digit N’Ko
-			Digit Ol Chiki
+			Digit N’Ko
+			Digit Ol Chiki
 			Digit Oriya
-			Digit Osmanya
+			Digit Osmanya
+			Digit Hanifi Rohingya
 			Angka Roman
 			Angka Huruf Kecil Roman
-			Digit Saurashtra
-			Digit Sharada
-			Digit Khudawadi
-			Digit Sinhala Lith
-			Digit Sora Sompeng
-			Digit Sunda
-			Digit Takri
-			Digit Tai Lue Baru
+			Digit Saurashtra
+			Digit Sharada
+			Digit Khudawadi
+			Digit Sinhala Lith
+			Digit Sora Sompeng
+			Digit Sunda
+			Digit Takri
+			Digit Tai Lue Baru
 			Angka Tamil Tradisional
 			Digit Tamil
 			Digit Telugu
 			Digit Thai
 			Digit Tibet
-			Digit Tirhuta
+			Digit Tirhuta
 			Angka Tradisional
 			Digit Vai
-			Digit Warang Citi
+			Digit Warang Citi
+			Digit Wancho
 		
 		
 			Metrik
@@ -1014,9 +1141,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		[a {ai} {au} b c d {dz} e f g h i j k {kh} l m n {ng} {ngg} {ny} o p q r s {sy} t {ts} u {ua} v w x y z]
+		[]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1030,13 +1158,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1057,6 +1180,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1171,6 +1307,243 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+					
+					
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tout
+							Baba
+							Hator
+							Kiahk
+							Toba
+							Amshir
+							Baramhat
+							Baramouda
+							Bashans
+							Paona
+							Epep
+							Mesra
+							Nasie
+						
+					
+				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
+			
+			
+				
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
+					
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Meskerem
+							Tekemt
+							Hedar
+							Tahsas
+							Ter
+							Yekatit
+							Megabit
+							Miazia
+							Genbot
+							Sene
+							Hamle
+							Nehasse
+							Pagumen
+						
+					
+				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
+			
+			
+				
+					
+						ERA0
+					
+					
+						ERA0
+					
+					
+						ERA0
+					
+				
+			
 			
 				
 					
@@ -1260,55 +1633,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							G y – G y
-							G y–y
+							y G – y G
+							y–y G
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d–d MMM, y G
+							d MMM, y G – d MMM, y G
+							d MMM – d MMM, y G
+							d MMM, y – d MMM, y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y G – E, d MMM, y G
+							E, d MMM – E, d MMM, y G
+							E, d MMM, y – E, d MMM, y G
 						
 						
 							h a – h a
@@ -1676,19 +2040,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						S.M.
-						BCE
 						TM
-						CE
 					
 					
 						S.M.
-						BCE
 						TM
-						CE
 					
 					
-						S.M.
-						TM
+						S.M.
+						TM
 					
 				
 				
@@ -1802,21 +2162,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMMM y
 						QQQ y
 						QQQQ y
+						'week' w 'of' Y
 					
 					
 						{0} {1}
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
@@ -1951,6 +2303,119 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+					
+					
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
+						
+							Tishri
+							Heshvan
+							Kislev
+							Tevet
+							Shevat
+							Adar I
+							Adar
+							Adar II
+							Nisan
+							Iyar
+							Sivan
+							Tamuz
+							Av
+							Elul
+						
+					
+				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 				
 					
 						
@@ -1974,6 +2439,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						
 							{1}, {0}
@@ -1985,13 +2460,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						E, d
 						y G
 						MMM y G
 						d MMM y G
 						E, d MMM y G
+						L
 						d/M
 						E, d/M
+						LLL
 						d MMM
 						E, d MMM
 						d MMMM
@@ -2008,6 +2487,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2068,6 +2583,198 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
+			
+			
+				
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+					
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
+			
 			
 				
 					
@@ -2092,16 +2799,122 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
+			
 			
 				
 					
 						Sebelum R.O.C
+						R.O.C.
 					
 					
 						Before R.O.C.
+						R.O.C.
 					
 					
 						Sblm R.O.C
+						R.O.C.
 					
 				
 			
@@ -2239,9 +3052,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mgu
-				mng lepas
-				mng ini
-				mng depan
+				mgu lepas
+				mgu ini
+				mgu depan
 				
 					dlm {0} mgu
 				
@@ -2252,9 +3065,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mgu
-				mng lepas
-				mng ini
-				mng depan
+				mgu lepas
+				mgu ini
+				mgu depan
 				
 					dlm {0} mgu
 				
@@ -2289,7 +3102,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				hari
 				kelmarin
-				semlm
+				semalam
 				hari ini
 				esok
 				lusa
@@ -2593,7 +3406,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				jam
-				jam ini
+				jam ini
 				
 					dlm {0} jam
 				
@@ -2603,7 +3416,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				jam
-				jam ini
+				jam ini
 				
 					dlm {0} jam
 				
@@ -2651,7 +3464,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				saat
-				sekarang
+				sekarang
 				
 					dlm {0} saat
 				
@@ -2661,7 +3474,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				saat
-				sekarang
+				sekarang
 				
 					dlm {0} saat
 				
@@ -3364,6 +4177,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aqtobe
 			
+			
+				Kostanay
+			
 			
 				Qyzylorda
 			
@@ -4038,7 +4854,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					Waktu Pergunungan
 					Waktu Piawai Pergunungan
-					Waktu Hari Siang Pergunungan
+					Waktu Siang Pergunungan
 				
 			
 			
@@ -4062,6 +4878,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					Waktu Siang Apia
 				
 			
+			
+				
+					Waktu Aqtau
+					Waktu Standard Aqtau
+					Waktu Musim Panas Aqtau
+				
+			
 			
 				
 					Waktu Arab
@@ -4342,6 +5165,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					Waktu Min Greenwich
 				
+				
+					GMT
+				
 			
 			
 				
@@ -4894,14 +5720,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ribu
@@ -4980,119 +5817,145 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dirham Emiriah Arab Bersatu
 				Dirham UAE
+				AED
 			
 			
 				Afghani Afghanistan
 				Afghani Afghanistan
+				AFN
 			
 			
 				Lek Albania
 				Lek Albania
+				ALL
 			
 			
 				Dram Armenia
 				Dram Armenia
+				AMD
 			
 			
 				Guilder Antillen Belanda
 				Guilder Antillen Belanda
+				ANG
 			
 			
 				Kwanza Angola
 				Kwanza Angola
+				AOA
 				Kz
 			
 			
 				Peso Argentina
 				Peso Argentina
+				ARS
 				$
 			
 			
 				Dolar Australia
 				Dolar Australia
+				A$
 				$
 			
 			
 				Florin Aruba
 				Florin Aruba
+				AWG
 			
 			
 				Manat Azerbaijan
 				Manat Azerbaijan
+				AZN
 			
 			
 				Mark Boleh Tukar Bosnia-Herzegovina
 				Mark Boleh Tukar Bosnia-Herzegovina
+				BAM
 				KM
 			
 			
 				Dolar Barbados
 				Dolar Barbados
+				BBD
 				$
 			
 			
 				Taka Bangladesh
 				Taka Bangladesh
+				BDT
 				৳
 			
 			
 				Lev Bulgaria
 				Lev Bulgaria
+				BGN
 			
 			
 				Dinar Bahrain
 				Dinar Bahrain
+				BHD
 			
 			
 				Franc Burundi
 				Franc Burundi
+				BIF
 			
 			
 				Dolar Bermuda
 				Dolar Bermuda
+				BMD
 				$
 			
 			
 				Dolar Brunei
 				Dolar Brunei
+				BND
 				$
 			
 			
 				Boliviano Bolivia
 				Boliviano Bolivia
+				BOB
 				Bs
 			
 			
 				Real Brazil
 				Real Brazil
+				R$
 				R$
 			
 			
 				Dolar Bahamas
 				Dolar Bahamas
+				BSD
 				$
 			
 			
 				Ngultrum Bhutan
 				Ngultrum Bhutan
+				BTN
 			
 			
 				Pula Botswana
 				Pula Botswana
+				BWP
 				P
 			
 			
 				Rubel Belarus baharu
 				rubel lama Belarus
+				BYN
 				р.
 			
 			
 				Rubel Belarus (2000–2016)
 				Rubel Belarus
+				BYR
 			
 			
 				Dolar Belize
 				Dolar Belize
+				BZD
 				$
 			
 			
@@ -5104,264 +5967,320 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc Congo
 				Franc Congo
+				CDF
 			
 			
 				Franc Switzerland
 				Franc Switzerland
+				CHF
 			
 			
 				Peso Chile
 				Peso Chile
+				CLP
 				$
 			
 			
 				Yuan China (luar pesisir)
 				Yuan China (luar pesisir)
+				CNH
 			
 			
 				Yuan Cina
 				Yuan Cina
+				CN¥
 				¥
 			
 			
 				Peso Colombia
 				Peso Colombia
+				COP
 				$
 			
 			
 				Colon Costa Rica
 				Colon Costa Rica
+				CRC
 				₡
 			
 			
 				Peso Boleh Tukar Cuba
 				Peso Boleh Tukar Cuba
+				CUC
 				$
 			
 			
 				Peso Cuba
 				Peso Cuba
+				CUP
 				$
 			
 			
 				Escudo Tanjung Verde
 				Escudo Tanjung Verde
+				CVE
 			
 			
 				Koruna Republik Czech
 				Koruna Republik Czech
+				CZK
 				Kč
 			
 			
 				Franc Djibouti
 				Franc Djibouti
+				DJF
 			
 			
 				Krone Denmark
 				Krone Denmark
+				DKK
 				kr
 			
 			
 				Peso Dominican
 				Peso Dominican
+				DOP
 				$
 			
 			
 				Dinar Algeria
 				Dinar Algeria
+				DZD
 			
 			
 				Paun Mesir
 				Paun Mesir
+				EGP
 				E£
 			
 			
 				ERN
 				Nakfa Eritrea
+				ERN
 			
 			
 				Birr Ethiopia
 				Birr Ethiopia
+				ETB
 			
 			
 				Euro
 				Euro
+				€
 				€
 			
 			
 				Dolar Fiji
 				Dolar Fiji
+				FJD
 				$
 			
 			
 				Paun Kepulauan Falkland
 				Paun Kepulauan Falkland
+				FKP
 				£
 			
 			
 				Paun British
 				Paun British
+				£
 				£
 			
 			
 				Lari Georgia
 				Lari Georgia
+				GEL
 				₾
 			
 			
 				Cedi Ghana
 				Cedi Ghana
+				GHS
 			
 			
 				Paun Gibraltar
 				Paun Gibraltar
+				GIP
 				£
 			
 			
 				Dalasi Gambia
 				Dalasi Gambia
+				GMD
 			
 			
 				Franc Guinea
 				Franc Guinea
+				GNF
 				FG
 			
 			
 				Quetzal Guatemala
 				Quetzal Guatemala
+				GTQ
 				Q
 			
 			
 				Dolar Guyana
 				Dolar Guyana
+				GYD
 				$
 			
 			
 				Dolar Hong Kong
 				Dolar Hong Kong
+				HK$
 				$
 			
 			
 				Lempira Honduras
 				Lempira Honduras
+				HNL
 				L
 			
 			
 				Kuna Croatia
 				Kuna Croatia
+				HRK
 				kn
 			
 			
 				Gourde Haiti
 				Gourde Haiti
+				HTG
 			
 			
 				Forint Hungary
 				Forint Hungary
+				HUF
 				Ft
 			
 			
 				Rupiah Indonesia
 				Rupiah Indonesia
+				IDR
 				Rp
 			
 			
 				Syekel Baharu Israel
 				Syekel baharu Israel
+				₪
 				₪
 			
 			
 				Rupee India
 				Rupee India
+				₹
 				₹
 			
 			
 				Dinar Iraq
 				Dinar Iraq
+				IQD
 			
 			
 				Rial Iran
 				Rial Iran
+				IRR
 			
 			
 				Krona Iceland
 				Krona Iceland
+				ISK
 				kr
 			
 			
 				Dolar Jamaica
 				Dolar Jamaica
+				JMD
 				$
 			
 			
 				Dinar Jordan
 				Dinar Jordan
+				JOD
 			
 			
 				Yen Jepun
 				Yen Jepun
+				JP¥
 				¥
 			
 			
 				Syiling Kenya
 				Syiling Kenya
+				KES
 			
 			
 				Som Kyrgystani
 				Som Kyrgystani
+				KGS
 			
 			
 				Riel Kemboja
 				Riel Kemboja
+				KHR
 				៛
 			
 			
 				Franc Comoria
 				Franc Comoria
+				KMF
 				CF
 			
 			
 				Won Korea Utara
 				Won Korea Utara
+				KPW
 				₩
 			
 			
 				Won Korea Selatan
 				Won Korea Selatan
+				₩
 				₩
 			
 			
 				Dinar Kuwait
 				Dinar Kuwait
+				KWD
 			
 			
 				Dolar Kepulauan Cayman
 				Dolar Kepulauan Cayman
+				KYD
 				$
 			
 			
 				Tenge Kazakhstan
 				Tenge Kazakhstan
+				KZT
 				₸
 			
 			
 				Kip Laos
 				Kip Laos
+				LAK
 				₭
 			
 			
 				Paun Lubnan
 				Paun Lubnan
+				LBP
 				L£
 			
 			
 				Rupee Sri Lanka
 				Rupee Sri Lanka
+				LKR
 				Rs
 			
 			
 				Dolar Liberia
 				Dolar Liberia
+				LRD
 				$
 			
 			
@@ -5370,66 +6289,81 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Litas Lithuania
 				Litas Lithuania
+				LTL
 			
 			
 				Lats Latvia
 				Lats Latvia
+				LVL
 			
 			
 				Dinar Libya
 				Dinar Libya
+				LYD
 			
 			
 				Dirham Maghribi
 				Dirham Maghribi
+				MAD
 			
 			
 				Leu Moldova
 				Leu Moldova
+				MDL
 			
 			
 				Ariary Malagasy
 				Ariary Malagasy
+				MGA
 				Ar
 			
 			
 				Denar Macedonia
 				Denar Macedonia
+				MKD
 			
 			
 				Kyat Myanma
 				Kyat Myanma
+				MMK
 				K
 			
 			
 				Tugrik Mongolia
 				Tugrik Mongolia
+				MNT
 				₮
 			
 			
 				Pataca Macau
 				Pataca Macau
+				MOP
 			
 			
 				Ouguiya Mauritania (1973–2017)
 				Ouguiya Mauritania (1973–2017)
+				MRO
 			
 			
 				Ouguiya Mauritania
 				Ouguiya Mauritania
+				MRU
 			
 			
 				Rupee Mauritius
 				Rupee Mauritius
+				MUR
 				Rs
 			
 			
 				Rufiyaa Maldives
 				Rufiyaa Maldives
+				MVR
 			
 			
 				Kwacha Malawi
 				Kwacha Malawi
+				MWK
 			
 			
 				Peso Mexico
@@ -5446,213 +6380,259 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Metikal Mozambique
 				Metikal Mozambique
+				MZN
 			
 			
 				Dolar Namibia
 				Dolar Namibia
+				NAD
 				$
 			
 			
 				Naira Nigeria
 				Naira Nigeria
+				NGN
 				₦
 			
 			
 				Cordoba Nicaragua
 				Cordoba Nicaragua
+				NIO
 				C$
 			
 			
 				Krone Norway
 				Krone Norway
+				NOK
 				kr
 			
 			
 				Rupee Nepal
 				Rupee Nepal
+				NPR
 				Rs
 			
 			
 				Dolar New Zealand
 				Dolar New Zealand
+				NZ$
 				$
 			
 			
 				Rial Oman
 				Rial Oman
+				OMR
 			
 			
 				Balboa Panama
 				Balboa Panama
+				PAB
 			
 			
 				Sol Peru
 				Sol Peru
+				PEN
 			
 			
 				Kina Papua New Guinea
 				Kina Papua New Guinea
+				PGK
 			
 			
 				Peso Filipina
 				Peso Filipina
+				PHP
 				₱
 			
 			
 				Rupee Pakistan
 				Rupee Pakistan
+				PKR
 				Rs
 			
 			
 				Zloty Poland
 				Zloty Poland
+				PLN
 				zł
 			
 			
 				Guarani Paraguay
 				Guarani Paraguay
+				PYG
 				₲
 			
 			
 				Rial Qatar
 				Rial Qatar
+				QAR
 			
 			
 				Leu Romania
 				Leu Romania
+				RON
 				lei
 			
 			
 				Dinar Serbia
 				Dinar Serbia
+				RSD
 			
 			
 				Rubel Rusia
 				Rubel Rusia
+				RUB
 				₽
 			
 			
 				Franc Rwanda
 				Franc Rwanda
+				RWF
 				RF
 			
 			
 				Riyal Saudi
 				Riyal Saudi
+				SAR
 			
 			
 				Dolar Kepulauan Solomon
 				Dolar Kepulauan Solomon
+				SBD
 				$
 			
 			
 				Rupee Seychelles
 				Rupee Seychelles
+				SCR
 			
 			
 				Paun Sudan
 				Paun Sudan
+				SDG
 			
 			
 				Krona Sweden
 				Krona Sweden
+				SEK
 				kr
 			
 			
 				Dolar Singapura
 				Dolar Singapura
+				SGD
 				$
 			
 			
 				Paun Saint Helena
 				Paun Saint Helena
+				SHP
 				£
 			
 			
 				Leone Sierra Leone
 				Leone Sierra Leone
+				SLL
 			
 			
 				Syiling Somali
 				Syiling Somali
+				SOS
 			
 			
 				Dolar Surinam
 				Dolar Surinam
+				SRD
 				$
 			
 			
 				Paun Sudan selatan
 				Paun Sudan selatan
+				SSP
 				£
 			
 			
 				Dobra Sao Tome dan Principe (1977–2017)
 				Dobra Sao Tome dan Principe (1977–2017)
+				STD
 			
 			
 				Dobra Sao Tome dan Principe
 				Dobra Sao Tome dan Principe
+				STN
 			
 			
 				Paun Syria
 				Paun Syria
+				SYP
 				£
 			
 			
 				Lilangeni Swazi
 				Lilangeni Swazi
+				SZL
 			
 			
 				Baht Thai
 				Baht Thai
+				THB
 				฿
 			
 			
 				Somoni Tajikistan
 				Somoni Tajikistan
+				TJS
 			
 			
 				Manat Turkmenistan
 				Manat Turkmenistan
+				TMT
 			
 			
 				Dinar Tunisia
 				Dinar Tunisia
+				TND
 			
 			
 				Pa’anga Tonga
 				Pa’anga Tonga
+				TOP
 				T$
 			
 			
 				Lira Turki
 				Lira Turki
+				TRY
 				₺
 				TL
 			
 			
 				Dolar Trinidad dan Tobago
 				Dolar Trinidad dan Tobago
+				TTD
 				$
 			
 			
 				Dolar Taiwan Baru
 				Dolar Taiwan Baru
+				NT$
 				NT$
 			
 			
 				Syiling Tanzania
 				Syiling Tanzania
+				TZS
 			
 			
 				Hryvnia Ukraine
 				Hryvnia Ukraine
+				UAH
 				₴
 			
 			
 				Syiling Uganda
 				Syiling Uganda
+				UGX
 			
 			
 				Dolar AS
@@ -5663,50 +6643,61 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Uruguay
 				Peso Uruguay
+				UYU
 				$
 			
 			
 				Som Uzbekistan
 				Som Uzbekistan
+				UZS
 			
 			
 				Bolivar Venezuela (2008–2018)
 				Bolivar Venezuela (2008–2018)
+				VEF
 				Bs
 			
 			
 				Bolivar Venezuela
 				Bolivar Venezuela
+				VES
 			
 			
 				Dong Vietnam
 				Dong Vietnam
+				₫
 				₫
 			
 			
 				Vatu Vanuatu
 				Vatu Vanuatu
+				VUV
 			
 			
 				Tala Samoa
 				Tala Samoa
+				WST
 			
 			
 				Franc CFA BEAC
 				Franc CFA BEAC
+				FCFA
 			
 			
 				Dolar Caribbean Timur
 				Dolar Caribbean Timur
+				EC$
 				$
 			
 			
 				Franc CFA BCEAO
 				Franc CFA BCEAO
+				CFA
 			
 			
 				Franc CFP
 				Franc CFP
+				CFPF
 			
 			
 				Mata Wang Tidak Diketahui
@@ -5715,18 +6706,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rial Yaman
 				Rial Yaman
+				YER
 			
 			
 				Rand Afrika Selatan
 				Rand Afrika Selatan
+				ZAR
 				R
 			
 			
 				Kwacha Zambia (1968–2012)
+				ZMK
 			
 			
 				Kwacha Zambia
 				Kwacha Zambia
+				ZMW
 				ZK
 			
 		
@@ -5816,10 +6811,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inci persegi
 				{0} setiap inci persegi
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -5848,10 +6839,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				permyriad
 				{0} permyriad
 			
-			
-				mol
-				{0} mol
-			
 			
 				liter sekilometer
 				{0} liter sekilometer
@@ -5916,6 +6903,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				abad
 				{0} abad
 			
+			
+				dekad
+				{0} dekad
+			
 			
 				tahun
 				{0} tahun
@@ -6011,6 +7002,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				unit terma British
 				{0} unit terma British
 			
+			
+				terma US
+				{0} terma US
+			
 			
 				paun daya
 				{0} paun daya
@@ -6035,6 +7030,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hertz
 				{0} hertz
 			
+			
+				em tipografi
+				{0} ems
+			
+			
+				piksel
+				{0} piksel
+			
+			
+				megapiksel
+				{0} megapiksel
+			
+			
+				piksel sesentimeter
+				{0} piksel sesentimeter
+			
+			
+				piksel seinci
+				{0} piksel seinci
+			
+			
+				bintik sesentimeter
+				{0} bintik sesentimeter
+			
+			
+				bintik seinci
+				{0} bintik seinci
+			
 			
 				kilometer
 				{0} kilometer
@@ -6101,12 +7124,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} unit astronomi
 			
 			
-				furlong
-				{0} furlong
+				furlong
+				{0} furlong
 			
 			
-				fathom
-				{0} fathom
+				fathom
+				{0} fathom
 			
 			
 				batu nautika
@@ -6159,7 +7182,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tan
 			
 			
-				stone
+				stone
+				{0} st
 			
 			
 				paun
@@ -6215,10 +7239,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuasa kuda
 				{0} kuasa kuda
 			
-			
-				hektopascal
-				{0} hektopascal
-			
 			
 				milimeter raksa
 				{0} milimeter raksa
@@ -6239,6 +7259,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atmosfera
 				{0} atmosfera
 			
+			
+				Pascal
+				{0} Pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+			
 			
 				kilopaskal
 				{0} kilopaskal
@@ -6380,10 +7408,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				auns cecair
 				{0} auns cecair
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				sudu besar
 				{0} sudu besar
@@ -6408,6 +7432,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				daya g
 				{0} G
@@ -6477,10 +7504,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in²
 				{0}/in²
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
 				{0} kt
@@ -6505,14 +7528,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				per seribu
 				{0}‰
 			
-			
-				‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-			
 			
 				liter/km
 				{0} L/km
@@ -6577,6 +7592,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				abad
 				{0} abad
 			
+			
+				dkd
+				{0} dkd
+			
 			
 				tahun
 				{0} thn
@@ -6664,21 +7683,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-			
 			
 				utB
 				{0} utB
 			
-			
-				lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
+			
+				terma US
+				{0} terma US
 			
 			
 				GHz
@@ -6696,6 +7707,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+			
+			
+				px
+				{0} px
+			
+			
+				MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+			
 			
 				kilometer
 				{0} km
@@ -6762,10 +7801,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} au
 			
 			
-				furlong
+				furlong
+				{0} fur
 			
 			
-				fathom
+				fathom
 				{0} fth
 			
 			
@@ -6780,17 +7820,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mata
 				{0} mt
 			
-			
-				R☉
-				{0} R☉
-			
 			
 				lux
 				{0} lx
 			
 			
 				lumonisiti suria
-				{0} L☉
 			
 			
 				t
@@ -6819,7 +7854,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tn
 			
 			
-				stone
+				stone
+				{0} st
 			
 			
 				paun
@@ -6839,18 +7875,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				karat
 				{0} CD
 			
-			
-				Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -6875,10 +7899,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6891,6 +7911,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -6899,13 +7923,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
+			
+				Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
 			
 			
 				km/jam
@@ -6939,10 +7963,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				Nm
 				{0} Nm
@@ -7040,10 +8060,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				sudu besar
 				{0} sudu besar
@@ -7052,10 +8068,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sudu teh
 				{0} sudu teh
 			
-			
-				bbl
-				{0} bbl
-			
 			
 				arah
 				{0}E
@@ -7069,11 +8081,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/{1}
 			
 			
-				daya g
+				daya g
 				{0} g
 			
 			
-				{0}m/s²
+				{0}m/s²
 			
 			
 				{0}′
@@ -7081,6 +8093,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}″
 			
+			
+				{0} km²
+			
+			
+				{0} ha
+			
+			
+				{0} m²
+			
 			
 				{0} bt²
 			
@@ -7090,9 +8111,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} ka²
 			
-			
-				{0} dunam
-			
 			
 				%
 				{0}%
@@ -7102,70 +8120,91 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} L/100km
 			
 			
-				abad
-				{0} abad
+				abad
+				{0} abad
 			
 			
 				thn
 				{0} thn
-				{0}/thn
+				{0}/thn
 			
 			
 				bulan
 				{0} bln
-				{0}/bln
+				{0}/bln
 			
 			
 				minggu
 				{0} mgu
-				{0}/mgu
+				{0}/mgu
 			
 			
 				hari
 				{0} h
-				{0}/h
+				{0}/h
 			
 			
 				jam
 				{0} j
-				{0}/j
+				{0}/j
 			
 			
 				minit
 				{0} min
+				{0}/min
 			
 			
 				saat
 				{0} s
+				{0}/s
 			
 			
 				milisaat
 				{0} ms
 			
 			
-				μsaat
+				μsaat
+				{0} μs
+			
+			
+				{0} ns
 			
 			
 				kilometer
 				{0} km
+				{0}/km
 			
 			
 				meter
 				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
 			
 			
 				sentimeter
 				{0} cm
+				{0}/cm
 			
 			
 				mm
 				{0} mm
 			
+			
+				{0} µm
+			
+			
+				nm
+				{0} nm
+			
 			
+				pm
 				{0} pm
 			
 			
-				bt
+				bt
 				{0} bt
 			
 			
@@ -7173,68 +8212,123 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ela
 			
 			
-				ka
+				ka
 				{0}'
 				{0}/ka
 			
 			
 				{0}"
+				{0}/in
 			
 			
 				parsek
+				{0} pc
 			
 			
 				thn cahaya
 				{0} t. chya
 			
+			
+				au
+				{0} au
+			
 			
-				furlong
+				furlong
+				{0} fur
 			
 			
-				fathom
+				fathom
 				{0} fth
 			
 			
-				btn
-				{0} btn
+				btn
+				{0} btn
+			
+			
+				smi
+				{0} smi
 			
 			
-				mt
-				{0} mt
+				mt
+				{0} mt
+			
+			
+				t
+				{0} t
 			
 			
 				kg
 				{0} kg
+				{0}/kg
 			
 			
 				gram
 				{0} g
+				{0}/g
+			
+			
+				mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
 			
 			
-				tan
+				tan
+				{0} tn
 			
 			
-				stone
+				stone
+				{0} st
 			
 			
+				lb
 				{0} paun
+				{0}/lb
 			
 			
-				auns
+				auns
 				{0} auns
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
 			
 			
-				karat
+				karat
+				{0} CD
 			
-			
-				{0} hPa
+			
+				{0} kW
+			
+			
+				{0} W
+			
+			
+				{0} hp
+			
+			
+				mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
 			
 			
+				inHg
 				{0} inHg
 			
 			
+				mbar
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+			
 			
 				km/j
 				{0} kmj
@@ -7243,9 +8337,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m/s
 			
 			
-				batu/jam
+				batu/jam
 				{0} bsj
 			
+			
+				kn
+				{0} kn
+			
+			
+				°
+				{0}°
+			
 			
 				°C
 				{0}°C
@@ -7253,6 +8355,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}°F
 			
+			
+				K
+				{0} K
+			
+			
+				{0} km³
+			
 			
 				{0} bt³
 			
@@ -7292,8 +8401,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} atau {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -7423,7 +8530,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		Bentuk Varian
 		Jamo Vokal
 		cuaca
-		Tiulisan Asia Barat
+		Skrip Asia Barat
 		Ruang putih
 	
 	
@@ -7454,7 +8561,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		semi dipadatkan
 		semimampat
 		semisempit
-		normal
 		semi dikembangkan
 		semi diperluaskan
 		semilebar
diff --git a/make/data/cldr/common/main/ms_BN.xml b/make/data/cldr/common/main/ms_BN.xml
index 2b2dfa99df0..a68cd22edc2 100644
--- a/make/data/cldr/common/main/ms_BN.xml
+++ b/make/data/cldr/common/main/ms_BN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ms_MY.xml b/make/data/cldr/common/main/ms_MY.xml
index 9c7e6271721..0d129b3d961 100644
--- a/make/data/cldr/common/main/ms_MY.xml
+++ b/make/data/cldr/common/main/ms_MY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ms_SG.xml b/make/data/cldr/common/main/ms_SG.xml
index c826de4ff1c..390074c631c 100644
--- a/make/data/cldr/common/main/ms_SG.xml
+++ b/make/data/cldr/common/main/ms_SG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mt.xml b/make/data/cldr/common/main/mt.xml
index 85efee603c3..6ff2076321d 100644
--- a/make/data/cldr/common/main/mt.xml
+++ b/make/data/cldr/common/main/mt.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -134,9 +134,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Ingliż Awstraljan
 			Ingliż Kanadiż
 			Ingliż Brittaniku
-			Ingliż (UK)
 			Ingliż Amerikan
-			Ingliż (US)
 			Ingliż Medjevali
 			Esperanto
 			Spanjol
@@ -882,8 +880,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a à b ċ d e è f ġ g {għ} h ħ i ì j k l m n o ò p q r s t u ù v w x ż z]
 		[c y]
 		[A B Ċ C D E F Ġ G {GĦ} H Ħ I {IE*} J K L M N O P Q R S T U V W X Y Ż Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
diff --git a/make/data/cldr/common/main/mt_MT.xml b/make/data/cldr/common/main/mt_MT.xml
index e869fd47dd7..11c1868795d 100644
--- a/make/data/cldr/common/main/mt_MT.xml
+++ b/make/data/cldr/common/main/mt_MT.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mua.xml b/make/data/cldr/common/main/mua.xml
index 22887496e91..b8f6131d99a 100644
--- a/make/data/cldr/common/main/mua.xml
+++ b/make/data/cldr/common/main/mua.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldoviya
 			Madagaskar
 			Sǝr Marshall ma laŋne
-			Macedoniya
 			Sǝr Mali
 			Sǝr Myanmar
 			Mongoliya
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ã b ɓ c d ɗ e ë ǝ f g h i ĩ j k l m n ŋ o õ p r s t u v ṽ w y z]
 		[q x]
 		[A B Ɓ C D Ɗ E Ǝ F G H I J K L M N Ŋ O P R S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/mua_CM.xml b/make/data/cldr/common/main/mua_CM.xml
index ccda6ebcea7..51842b31f58 100644
--- a/make/data/cldr/common/main/mua_CM.xml
+++ b/make/data/cldr/common/main/mua_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/my.xml b/make/data/cldr/common/main/my.xml
index f5fa4c83ebd..42974b20148 100644
--- a/make/data/cldr/common/main/my.xml
+++ b/make/data/cldr/common/main/my.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -35,6 +35,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			အင်ဂလို ဆက္ကစွန်
 			အန်ဂီကာ
 			အာရဗီ
+			ခေတ်သစ် ရှေ့ဆောင် အာရဗီ
 			မာပုချီ
 			အာရာပါဟို
 			အာသံ
@@ -66,6 +67,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ဘူဂစ်စ်
 			ဘလင်
 			ကတ်တလန်
+			ချတ်ခ်မာ
 			ချက်ချန်း
 			စီဗူအာနို
 			ချီဂါ
@@ -117,6 +119,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			အက်စ်ပရန်တို
 			စပိန်
 			စပိန် (ဥရောပ)
+			စပိန် (မက္ကဆီကို)
 			အက်စ်တိုးနီးယား
 			ဘာစ်ခ်
 			အီဝန်ဒို
@@ -427,8 +430,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ဂျူး
 			ယိုရူဘာ
 			ကွမ်တုံ
+			တရုတ်၊ ကွမ်းတုံ
 			မိုရိုကို တမဇိုက်
 			တရုတ်
+			ပြည်ကြီးတရုတ်
+			ပြည်ကြီးတရုတ် (ရိုးရှင်း)
+			ပြည်ကြီးတရုတ် (ရိုးရာ)
 			ဇူးလူး
 			ဇူနီ
 			ဘာသာစကားနှင့် ပတ်သက်သောအရာ မရှိပါ
@@ -752,6 +759,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			စင့်မာတင်
 			ဆီးရီးယား
 			ဆွာဇီလန်
+			ဆွာဇီလန်
 			ထရစ္စတန် ဒါ ကွန်ဟာ
 			တခ်စ်နှင့်ကာအီကိုစ်ကျွန်းစု
 			ချဒ်
@@ -761,6 +769,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			တာဂျီကစ္စတန်
 			တိုကလောင်
 			အရှေ့တီမော
+			အရှေ့တီမော
 			တာ့ခ်မင်နစ္စတန်
 			တူနီးရှား
 			တွန်ဂါ
@@ -899,7 +908,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ ဣ ၏ ဤ ဥ ဦ ဧ ဩ ဪ ာ ါ \u102D \u102E \u102F \u1030 ေ \u1032 \u1036 ဿ ျ ြ \u103D \u103E \u1039 \u103A \u1037 း]
 		[၀႐ ၁႑ ၂႒ ၃႓ ၄႔ ၅႕ ၆႖ ၇႗ ၈႘ ၉႙ ၵ ၚ ၽ ၾ ၐ ၑ ၥ ဨ ဢ ၒ ၓ ၔ ၕ \u1033 ၖ ၗ \u1058 \u1059 \u1034 ၢ \u1086 ၤ ႈ ႊ ႏ]
 		[က ခ ဂ ဃ င စ ဆ ဇ ဈ ဉ ည ဋ ဌ ဍ ဎ ဏ တ ထ ဒ ဓ န ပ ဖ ဗ ဘ မ ယ ရ လ ဝ သ ဟ ဠ အ]
-		[\- , . % ‰ + 0၀ 1၁ 2၂ 3၃ 4၄ 5၅ 6၆ 7၇ 8၈ 9၉]
+		[\- ‑ , . % ‰ + 0၀ 1၁ 2၂ 3၃ 4၄ 5၅ 6၆ 7၇ 8၈ 9၉]
 		[၊ ။ ‘ ’ “ ”]
 		{0}…
 		…{0}
@@ -909,14 +918,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -2310,7 +2328,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ဆန် လူဝီစ်
 			
 			
-				ကာတာမာရကွာ
+				ကာတာမာရကာ
 			
 			
 				ဆာလ်တာ
@@ -2900,6 +2918,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				အာချတူးဘီ
 			
+			
+				ကော့စ်တနေ
+			
 			
 				ကီဇလော်ဒါ
 			
@@ -4415,8 +4436,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4438,6 +4463,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ဂဏန်းမဟုတ်သော
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0ထောင်
@@ -4584,6 +4614,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဩစတြေးလျ ဒေါ်လာ
 				ဩစတြေးလျ ဒေါ်လာ
+				A$
 				$
 			
 			
@@ -4656,6 +4687,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဘရာဇီး ရီးယဲ
 				ဘရာဇီး ရီးယဲ
+				R$
 				R$
 			
 			
@@ -4690,15 +4722,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဘီလာရုဇ် ရူဘယ် (၂၀၀၀–၂၀၁၆)
 				ဘီလာရုဇ် ရူဘယ် (၂၀၀၀–၂၀၁၆)
+				BYR
 			
 			
 				ဘလိဇ် ဒေါ်လာ
 				ဘလိဇ် ဒေါ်လာ
 				BZD
+				$
 			
 			
 				ကနေဒါ ဒေါ်လာ
 				ကနေဒါ ဒေါ်လာ
+				CA$
 				$
 			
 			
@@ -4720,10 +4755,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				တရုတ် ယွမ် (ဟောင်ကောင်)
 				တရုတ် ယွမ် (ဟောင်ကောင်)
+				CNH
 			
 			
 				တရုတ် ယွမ်
 				တရုတ် ယွမ်
+				CN¥
 				¥
 			
 			
@@ -4735,6 +4772,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ကို့စတာရီကာ ကိုလွန်
 				ကို့စတာရီကာ ကိုလွန်
+				CRC
 				₡
 			
 			
@@ -4810,6 +4848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ယူရို
 				ယူရို
+				€
 				€
 			
 			
@@ -4830,6 +4869,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဗြိတိသျှ ပေါင်
 				ဗြိတိသျှ ပေါင်
+				£
 				£
 			
 			
@@ -4875,6 +4915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဟောင်ကောင် ဒေါ်လာ
 				ဟောင်ကောင် ဒေါ်လာ
+				HK$
 				$
 			
 			
@@ -4912,11 +4953,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				အစ္စရေး ရှဲကလ်အသစ်
 				အစ္စရေး ရှဲကလ်အသစ်
+				₪
 				₪
 			
 			
 				အိန္ဒိယ ရူပီး
 				အိန္ဒိယ ရူပီး
+				₹
 				₹
 			
 			
@@ -4949,6 +4992,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဂျပန် ယန်း
 				ဂျပန် ယန်း
+				JP¥
 				¥
 			
 			
@@ -4982,6 +5026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				တောင်ကိုရီးယား ဝမ်
 				တောင်ကိုရီးယား ဝမ်
+				₩
 				₩
 			
 			
@@ -5104,6 +5149,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				မက်ကဆီကို ပီဆို
 				မက်ကဆီကို ပီဆို
+				MX$
 				$
 			
 			
@@ -5150,6 +5196,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				နယူးဇီလန် ဒေါ်လာ
 				နယူးဇီလန် ဒေါ်လာ
+				NZ$
 				$
 			
 			
@@ -5299,6 +5346,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဆောင်တူမေးနှင့် ပရင်စီပီ ဒိုဘရာ (၂၀၁၈)
 				ဆောင်တူမေးနှင့် ပရင်စီပီ ဒိုဘရာစ် (၂၀၁၈)
+				STN
 				Db
 			
 			
@@ -5361,6 +5409,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ထိုင်ဝမ် ဒေါ်လာအသစ်
 				ထိုင်ဝမ် ဒေါ်လာအသစ်
+				NT$
 				$
 			
 			
@@ -5382,6 +5431,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				အမေရိကန် ဒေါ်လာ
 				အမေရိကန် ဒေါ်လာ
+				US$
 				$
 			
 			
@@ -5414,6 +5464,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ဗီယက်နမ် ဒေါင်
 				ဗီယက်နမ် ဒေါင်
+				₫
 				₫
 			
 			
@@ -5429,6 +5480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ကင်မရွန်း ဖရန့်
 				ကင်မရွန်း ဖရန့်
+				FCFA
 			
 			
 				ငွေ
@@ -5442,6 +5494,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				အရှေ့ကာရစ်ဘီယံ ဒေါ်လာ
 				အရှေ့ကာရစ်ဘီယံ ဒေါ်လာ
+				EC$
 				$
 			
 			
@@ -5450,10 +5503,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				အနောက် အာဖရိက CFA ဖရန့်
 				အနောက် အာဖရိက CFA ဖရန့်
+				CFA
 			
 			
 				CFP ဖရန့်
 				CFP ဖရန့်
+				CFPF
 			
 			
 				ပလက်တီနမ်
@@ -5671,6 +5726,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ရာစုနှစ်
 				{0} ရာစုနှစ်
 			
+			
+				ဆယ်စုနှစ်
+				{0} ဆယ်စုနှစ်
+			
 			
 				နှစ်
 				{0} နှစ်
@@ -5766,6 +5825,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ဗြိတိသျှ သာမယ်လ်ယူနစ်
 				{0} ဗြိတိသျှ သာမယ်လ်ယူနစ်
 			
+			
+				ယူအက်စ် သာမယ်လ်
+				{0} ယူအက်စ် သာမယ်လ်
+			
 			
 				lbf
 				{0} lbf
@@ -5959,10 +6022,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				မြင်းကောင်ရေအား
 				{0} မြင်းကောင်ရေအား
 			
-			
-				ဟက်တိုပါစကယ်
-				{0} ဟက်တိုပါစကယ်
-			
 			
 				ပြဒါးမီလီမီတာ
 				{0} ပြဒါးမီလီမီတာ
@@ -5975,6 +6034,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ပြဒါးလက်မ
 				{0} ပြဒါးလက်မ
 			
+			
+				bars
+				{0} bars
+			
 			
 				မီလီဘား
 				{0} မီလီဘား
@@ -5983,6 +6046,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ကမ္ဘာ့လေထု
 				{0} ကမ္ဘာ့လေထု
 			
+			
+				ဟက်တိုပါစကယ်
+				{0} ဟက်တိုပါစကယ်
+			
 			
 				ကီလိုပါစကယ်
 				{0} ကီလိုပါစကယ်
@@ -6321,6 +6388,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ရာစု
 				{0} ရာစု
 			
+			
+				ဆယ်စု
+				{0} ဆယ်စု
+			
 			
 				နှစ်
 				{0} နှစ်
@@ -6416,13 +6487,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				BTU
 				{0} Btu
 			
+			
+				ယူအက်စ် သာမယ်လ်
+				{0} ယူအက်စပ် သာမယ်လ်
+			
 			
 				lbf
 				{0} lbf
 			
 			
 				နယူတန်
-				{0} N
 			
 			
 				ဂီဂါဟတ်ဇ်
@@ -6527,7 +6601,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ဆိုလာ လူမီနိုစီးတီးစ်
-				{0} L☉
 			
 			
 				မက်ထရစ်တန်
@@ -6609,10 +6682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6625,6 +6694,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				inHg
 				{0} inHg
 			
+			
+				{0} bars
+			
 			
 				မီလီဘား
 				{0} mbar
@@ -6633,6 +6705,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -6929,15 +7005,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} hp
 			
-			
-				{0} hPa
-			
 			
 				{0} inHg
 			
 			
 				{0} mbar
 			
+			
+				{0} hPa
+			
 			
 				ကီလိုမီတာ/နာရီ
 				{0} km/h
@@ -6996,11 +7072,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} သို့မဟုတ် {1}
 			{0} သို့မဟုတ် {1}
 		
-		
-			{0} {1}
-			{0} {1}
-			{0}နှင့် {1}
-			{0}နှင့် {1}
+		
+			{0} ၊ {1}
 		
 		
 			{0} {1}
diff --git a/make/data/cldr/common/main/my_MM.xml b/make/data/cldr/common/main/my_MM.xml
index 5eaab3658fa..6cfec0ca04e 100644
--- a/make/data/cldr/common/main/my_MM.xml
+++ b/make/data/cldr/common/main/my_MM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/mzn.xml b/make/data/cldr/common/main/mzn.xml
index 1e85dcf6c72..8754e2dcbd2 100644
--- a/make/data/cldr/common/main/mzn.xml
+++ b/make/data/cldr/common/main/mzn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -462,8 +462,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سنت مارتین
 			ماداگاسکار
 			مارشال جزایر
-			مقدونیه
-			مقدونیه جمهوری
 			مالی
 			میانمار
 			مغولستون
@@ -599,7 +597,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u064B \u064C \u064D \u0651 \u0654 ء آ أ ؤ ئ ا ب پ ة ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]
 		[\u200C\u200D\u200E\u200F \u064E \u064F \u0650 \u0652 \u0656 \u0670 إ ك ى ي]
 		[آ ا ب پ ت ث ج چ ح خ د ذ ر ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ه و ی]
-		[\- ‐ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]
+		[\- ‐ ‑ ، ٫ ٬ ؛ \: ! ؟ . … ‹ › « » ( ) \[ \] * / \\]
 		{0}…
 		…{0}
 		{0}…{1}
diff --git a/make/data/cldr/common/main/mzn_IR.xml b/make/data/cldr/common/main/mzn_IR.xml
index 5ea3d8fc6cf..f18d80fa0e4 100644
--- a/make/data/cldr/common/main/mzn_IR.xml
+++ b/make/data/cldr/common/main/mzn_IR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/naq.xml b/make/data/cldr/common/main/naq.xml
index 487e9288cdc..c0275e05f4b 100644
--- a/make/data/cldr/common/main/naq.xml
+++ b/make/data/cldr/common/main/naq.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Madagascari
 			Marshall Islands
-			Macedoniab
 			Malib
 			Myanmar
 			Mongolia
diff --git a/make/data/cldr/common/main/naq_NA.xml b/make/data/cldr/common/main/naq_NA.xml
index 18c4230b9f5..867ee24a785 100644
--- a/make/data/cldr/common/main/naq_NA.xml
+++ b/make/data/cldr/common/main/naq_NA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nb.xml b/make/data/cldr/common/main/nb.xml
index 71af244d422..f7f9dd5f3d8 100644
--- a/make/data/cldr/common/main/nb.xml
+++ b/make/data/cldr/common/main/nb.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -107,6 +107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			karibisk
 			cayuga
 			atsam
+			chakma
 			tsjetsjensk
 			cebuansk
 			kiga
@@ -618,8 +619,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			zenaga
 			standard marrokansk tamazight
 			kinesisk
+			kinesisk, mandarin
 			forenklet kinesisk
+			forenklet mandarinkinesisk
 			tradisjonell kinesisk
+			tradisjonell mandarinkinesisk
 			zulu
 			zuni
 			uten språklig innhold
@@ -879,6 +883,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Republikken Kongo
 			Sveits
 			Elfenbenskysten
+			Elfenbenskysten
 			Cookøyene
 			Chile
 			Kamerun
@@ -892,7 +897,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Christmasøya
 			Kypros
 			Tsjekkia
-			Den tsjekkiske republikk
+			Den tsjekkiske republikk
 			Tyskland
 			Diego Garcia
 			Djibouti
@@ -1071,6 +1076,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tadsjikistan
 			Tokelau
 			Øst-Timor
+			Timor-Leste
 			Turkmenistan
 			Tunisia
 			Tonga
@@ -1097,6 +1103,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis og Futuna
 			Samoa
+			pseudospråk – aksenter
+			pseudospråk – RTL
 			Kosovo
 			Jemen
 			Mayotte
@@ -1141,6 +1149,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			standard ortografi
 			laukika
 			resia med Lipovaz-dialekt
+			LUNA1918
 			Metelko-alfabet
 			monotonisk rettskriving
 			ndyuka-dialekt
@@ -1149,12 +1158,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			moderne volapük
 			oseacco- og osojanedialekt
 			Pamaka-dialekt
+			PETR1708
 			pinyin
 			polytonisk rettskriving
 			dataspråk
+			PUTER
 			revidert ortografi
 			klassisk volapük
 			resisk dialekt
+			RUMGR
 			saho
 			skotsk standard engelsk
 			scouse dialekt
@@ -1176,21 +1188,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			kalender
 			valutaformat
-			Ignorer sortering etter symboler
-			omvendt sortering etter aksent
-			Organisering av store og små bokstaver
-			Sortering av store og små bokstaver
+			Ignorer sortering etter symboler
+			omvendt sortering etter aksent
+			Organisering av store og små bokstaver
+			Sortering av store og små bokstaver
 			sorteringsrekkefølge
-			Normalisert sortering
-			Numerisk sortering
-			Sorteringsstyrke
+			Normalisert sortering
+			Numerisk sortering
+			Sorteringsstyrke
 			valuta
 			timesyklus (12 eller 24)
 			linjeskiftstil
 			målesystem
 			tall
-			tidssone
-			Språkvariant
+			tidssone
+			språkvariant
 			privat bruk
 		
 		
@@ -1352,7 +1364,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[á ǎ ã č ç đ è ê í ń ñ ŋ š ŧ ú ü ž ä ö]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]
 		[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- – , ; \: ! ? . ' " « » ( ) \[ \] \{ \} § @ * / \\]
+		[\- ‑ – , ; \: ! ? . ' " « » ( ) \[ \] \{ \} § @ * / \\]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1404,8 +1416,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -1415,6 +1448,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -1438,9 +1472,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -1503,7 +1545,552 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+					
+					
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+					
+				
+				
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1586,6 +2173,242 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							
 						
 					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
 				
 				
 					
@@ -1610,16 +2433,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						r(U)
 						MMM r(U)
 						d. MMM r
 						E d. MMM r(U)
+						h a
+						HH
 						L.
 						dd.MM
 						E dd.MM.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -1627,7 +2474,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.MM. U
 						MMM U
 						d. MMM U
+						r(U)
 						dd.MM.r
+						r(U)
 						MM.r
 						dd.MM.r
 						E dd.MM.r
@@ -1645,6 +2494,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h:mm a–h:mm a
@@ -1666,6 +2519,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							MM.–MM.
@@ -1678,6 +2535,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							dd.MM.E–dd.MM.E
 							dd.MM.E–dd.MM.E
 						
+						
+							LLL–LLL
+						
 						
 							d.–d. MMM
 							d. MMM–d. MMM
@@ -1686,6 +2546,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E d. MMM–E d. MMM
 							E d. MMM–E d. MMM
 						
+						
+							U–U
+						
 						
 							MM.y–MM.y
 							MM.y–MM.y
@@ -1855,8 +2718,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -1866,6 +2750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -1889,9 +2774,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -1954,7 +2847,552 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+					
+					
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							M01
+							M02
+							M03
+							M04
+							M05
+							M06
+							M07
+							M08
+							M09
+							M10
+							M11
+							M12
+						
+					
+				
+				
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -2037,6 +3475,242 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							
 						
 					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
 				
 				
 					
@@ -2061,8 +3735,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						r(U)
 						MMM r(U)
@@ -2071,6 +3766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						L.
 						dd.MM
 						E dd.MM.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -2078,7 +3774,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.MM. U
 						MMM U
 						d. MMM U
+						r(U)
 						dd.MM.r
+						r(U)
 						MM.r
 						dd.MM.r
 						E dd.MM.r
@@ -2096,9 +3794,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							MM.–MM.
@@ -2111,6 +3817,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							dd.MM.E–dd.MM.E
 							dd.MM.E–dd.MM.E
 						
+						
+							LLL–LLL
+						
 						
 							d.–d. MMM
 							d. MMM–d. MMM
@@ -2119,6 +3828,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E d. MMM–E d. MMM
 							E d. MMM–E d. MMM
 						
+						
+							U–U
+						
 						
 							MM.y–MM.y
 							MM.y–MM.y
@@ -2283,8 +3995,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -2294,6 +4027,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -2317,9 +4051,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -2486,57 +4228,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0}–{1}
 						
-							h B–h B
-							h–h B
+							h B–h B
 						
 						
-							h:mm B–h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+							h:mm B–h:mm B
 						
 						
 							d.–d.
 						
 						
-							y G–y G
-							y–y G
+							y G–y G
+							y–y G
 						
 						
-							MM.y GGGGG–MM.y GGGGG
-							MM.y–MM.y GGGGG
-							MM.y–MM.y GGGGG
+							MM.y GGGGG–MM.y GGGGG
+							MM.y–MM.y GGGGG
+							MM.y–MM.y GGGGG
 						
 						
-							dd.MM.y–dd.MM.y GGGGG
-							dd.MM.y GGGGG–dd.MM.y GGGGG
-							dd.MM.y–dd.MM.y GGGGG
-							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y GGGGG–dd.MM.y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
+							dd.MM.y–dd.MM.y GGGGG
 						
 						
-							E dd.MM.y–E dd.MM.y GGGGG
-							E dd.MM.y GGGGG–E dd.MM.y GGGGG
-							E dd.MM.y–E dd.MM.y GGGGG
-							E dd.MM.y–E dd.MM.y GGGGG
+							E dd.MM.y–E dd.MM.y GGGGG
+							E dd.MM.y GGGGG–E dd.MM.y GGGGG
+							E dd.MM.y–E dd.MM.y GGGGG
+							E dd.MM.y–E dd.MM.y GGGGG
 						
 						
-							MMM y G–MMM y G
-							MMM–MMM y G
-							MMM y–MMM y G
+							MMM y G–MMM y G
+							MMM–MMM y G
+							MMM y–MMM y G
 						
 						
-							d.–d. MMM y G
-							d. MMM y G–d. MMM y G
-							d. MMM–d. MMM y G
-							d. MMM y–d. MMM y G
+							d.–d. MMM y G
+							d. MMM y G–d. MMM y G
+							d. MMM–d. MMM y G
+							d. MMM y–d. MMM y G
 						
 						
-							E d. MMM–E d. MMM y G
-							E d. MMM y G–E d. MMM y G
-							E d. MMM–E d. MMM y G
-							E d. MMM y–E d. MMM y G
+							E d. MMM–E d. MMM y G
+							E d. MMM y G–E d. MMM y G
+							E d. MMM–E d. MMM y G
+							E d. MMM y–E d. MMM y G
 						
 						
 							h a – h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h:mm a – h:mm a
@@ -2558,6 +4301,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -2941,21 +4688,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
+							HH:mm:ss zzzz
 							HH.mm.ss zzzz
 						
 					
 					
 						
+							HH:mm:ss z
 							HH.mm.ss z
 						
 					
 					
 						
+							HH:mm:ss
 							HH.mm.ss
 						
 					
 					
 						
+							HH:mm
 							HH.mm
 						
 					
@@ -3040,12 +4791,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						{0}–{1}
 						
 							h B–h B
-							h–h B
 						
 						
 							h:mm B–h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
 						
 						
 							d.–d.
@@ -3317,8 +5065,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -3328,6 +5097,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -3351,9 +5121,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -3540,8 +5318,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -3551,6 +5350,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -3574,9 +5374,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -3763,8 +5571,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -3774,6 +5603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -3797,9 +5627,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -3864,14 +5702,242 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
 						Tenpyō-hōji (757-765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
+						Kahō (1094–1096)
+						Eichō (1096–1097)
+						Jōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
 						Ten-ei (1110-1113)
+						Eikyū (1113–1118)
+						Gen’ei (1118–1120)
+						Hōan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
+						Hōen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
+						Hōgen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
+						Ken’ei (1206–1207)
+						Jōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
+						Jōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
+						Tenpuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
+						En’ō (1239–1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
+						Bun’ō (1260–1261)
+						Kōchō (1261–1264)
+						Bun’ei (1264–1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
+						Enkyō (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
+						Genkō (1321–1324)
+						Shōchū (1324–1326)
+						Karyaku (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
+						Kenmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
+						Bun’an (1444–1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
+						Tenbun (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
+						Genna (1615–1624)
+						Kan’ei (1624–1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
+						Jōō (1652–1655)
+						Meireki (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
+						Tenna (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
+						Kan’en (1748–1751)
+						Hōreki (1751–1764)
+						Meiwa (1764–1772)
+						An’ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
+						Man’en (1860–1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 					
 						Taika (645–650)
@@ -4111,6 +6177,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Shōwa
 						Heisei
 					
+					
+						M
+						T
+						S
+						H
+					
 				
 				
 					
@@ -4135,8 +6207,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -4146,6 +6239,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -4169,9 +6263,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -4358,8 +6460,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -4369,6 +6492,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -4392,9 +6516,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -4493,8 +6625,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						d.
+						ccc
 						E d.
 						y G
 						MMM y G
@@ -4504,6 +6657,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d.M.
 						E d.M
 						d.M.
+						LLL
 						d. MMM
 						E d. MMM
 						d. MMMM
@@ -4527,9 +6681,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							h a–h a
+							h–h a
+						
+						
+							HH–HH
 						
 						
 							h a–h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M.–M.
@@ -4618,9 +6780,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				år
-				i fjor
-				i år
-				neste år
+				i fjor
+				i år
+				neste år
 				
 					om {0} år
 					om {0} år
@@ -4632,9 +6794,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				år
-				i fjor
-				i år
-				neste år
+				i fjor
+				i år
+				neste år
 				
 					+{0} år
 					+{0} år
@@ -4817,9 +6979,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				d.
 				-2 d.
-				i går
-				i dag
-				i morgen
+				i går
+				i dag
+				i morgen
 				+2 d.
 				
 					+{0} d.
@@ -5939,7 +8101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aqtöbe
 			
 			
-				Kostanay
+				Kostanaj
 			
 			
 				Kyzylorda
@@ -7580,108 +9742,260 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			٫
 			 
+			؛
 			٪؜
 			؜+
 			؜−
+			اس
+			×
+			؉
+			∞
+			NaN
 			.
 		
 		
 			,
 			 
+			؛
+			٪
 			‎+‎
 			‎−‎
+			×۱۰^
+			×
+			؉
+			∞
+			NaN
 			.
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
 			%
+			+
 			−
 			E
 			×
@@ -7694,114 +10008,428 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
 		
 			,
 			 
+			;
+			%
+			+
 			−
+			E
+			×
+			‰
+			∞
+			NaN
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tusen
@@ -7859,6 +10487,293 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
 		
 			
 				
@@ -7866,6 +10781,160 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
 		
 			
 				
@@ -8170,6 +11239,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
 		
 			
 				
@@ -8210,98 +11495,380 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} {1}
 			{0} {1}
 		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
+		
+			
+				
+					¤ #,##0.00
+				
+				
+					¤ #,##0.00
+				
+			
+			{0} {1}
+			{0} {1}
+		
 		
 			
 				andorranske pesetas
 				andorransk pesetas
 				andorranske pesetas
+				ADP
 			
 			
 				emiratarabiske dirham
 				emiratarabisk dirham
 				emiratarabiske dirham
+				AED
 			
 			
 				afgansk afghani (1927–2002)
 				afghansk afghani (1927–2002)
 				afghanske afghani (1927–2002)
+				AFA
 			
 			
 				afghanske afghani
 				afghansk afghani
 				afghanske afghani
+				AFN
 			
 			
 				albanske lek (1946–1965)
 				albansk lek (1946–1965)
 				albanske lek (1946–1965)
+				ALK
 			
 			
 				albanske lek
 				albansk lek
 				albanske lek
+				ALL
 			
 			
 				armenske dram
 				armensk dram
 				armenske dram
+				AMD
 			
 			
 				nederlandske antillegylden
 				nederlandsk antillegylden
 				nederlandske antillegylden
+				ANG
 			
 			
 				angolanske kwanza
 				angolansk kwanza
 				angolanske kwanza
+				AOA
 				Kz
 			
 			
 				angolanske kwanza (1977–1990)
 				angolansk kwanza (1977–1990)
 				angolanske kwanza (1977–1990)
+				AOK
 			
 			
 				angolanske nye kwanza (1990–2000)
 				angolansk ny kwanza
 				angolanske nye kwanza (1990–2000)
+				AON
 			
 			
 				angolanske omjusterte kwanza (1995–1999)
 				angolansk kwanza reajustado (1995–1999)
 				angolanske omjusterte kwanza (1995–1999)
+				AOR
 			
 			
 				argentinske australer
 				argentinsk austral
 				argentinske australer
+				ARA
 			
 			
 				argentinske peso ley
 				argentinsk peso ley
 				argentinske peso ley
+				ARL
 			
 			
 				argentinsk pesos (1881–1970)
 				argentinsk pesos (1881–1970)
 				argentinske pesos (1881–1970)
+				ARM
 			
 			
 				argentinske pesos (1983–1985)
 				argentinsk pesos (1983–1985)
 				argentinske pesos (1983–1985)
+				ARP
 			
 			
 				argentinske pesos
 				argentinsk peso
 				argentinske pesos
+				ARS
 				$
 			
 			
 				østerrikske shilling
 				østerriksk schilling
 				østerrikske schilling
+				ATS
 			
 			
 				australske dollar
@@ -8314,137 +11881,163 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arubiske floriner
 				arubisk florin
 				arubiske floriner
+				AWG
 			
 			
 				aserbajdsjanske manat (1993–2006)
 				aserbajdsjansk manat (1993–2006)
 				aserbajdsjanske manat (1993–2006)
+				AZM
 			
 			
 				aserbajdsjanske manat
 				aserbajdsjansk manat
 				aserbajdsjanske manat
+				AZN
 			
 			
 				bosnisk-hercegovinske dinarer (1992–1994)
 				bosnisk-hercegovinsk dinar (1992–1994)
 				bosnisk-hercegovinske dinarer (1992–1994)
+				BAD
 			
 			
 				bosnisk-hercegovinske konvertible mark
 				bosnisk-hercegovinsk konvertibel mark
 				bosnisk-hercegovinske konvertible mark
+				BAM
 				KM
 			
 			
 				nye bosnisk-hercegovinske dinarer (1994–1997)
 				ny bosnisk-hercegovinsk dinar (1994–1997)
 				nye bosnisk-hercegovinske dinarer (1994–1997)
+				BAN
 			
 			
 				barbadiske dollar
 				barbadisk dollar
 				barbadiske dollar
+				BBD
 				$
 			
 			
 				bangladeshiske taka
 				bangladeshisk taka
 				bangladeshiske taka
+				BDT
 				৳
 			
 			
 				belgiske franc (konvertible)
 				belgisk franc (konvertibel)
 				belgiske franc (konvertible)
+				BEC
 			
 			
 				belgiske franc
 				belgisk franc
 				belgiske franc
+				BEF
 			
 			
 				belgiske franc (finansielle)
 				belgisk franc (finansiell)
 				belgiske franc (finansielle)
+				BEL
 			
 			
 				bulgarske lev (hard)
 				bulgarsk lev (hard)
 				bulgarske lev (hard)
+				BGL
 			
 			
 				bulgarske lev (sosialist)
 				bulgarsk lev (sosialist)
 				bulgarske lev (sosialist)
+				BGM
 			
 			
 				bulgarske lev
 				bulgarsk lev
 				bulgarske lev
+				BGN
 			
 			
 				bulgarske lev (1879–1952)
 				bulgarsk lev (1879–1952)
 				bulgarske lev (1879–1952)
+				BGO
 			
 			
 				bahrainske dinarer
 				bahrainsk dinar
 				bahrainske dinarer
+				BHD
 			
 			
 				burundiske franc
 				burundisk franc
 				burundiske franc
+				BIF
 			
 			
 				bermudiske dollar
 				bermudisk dollar
 				bermudiske dollar
+				BMD
 				$
 			
 			
 				bruneiske dollar
 				bruneisk dollar
 				bruneiske dollar
+				BND
 				$
 			
 			
 				bolivianske boliviano
 				boliviansk boliviano
 				bolivianske boliviano
+				BOB
 				Bs
 			
 			
 				bolivianske boliviano (1863–1963)
 				boliviansk boliviano (1863–1963)
 				bolivianske boliviano (1863–1963)
+				BOL
 			
 			
 				bolivianske pesos
 				boliviansk pesos
 				bolivianske pesos
+				BOP
 			
 			
 				bolivianske mvdol
 				bolivianske mvdol
 				bolivianske mvdol
+				BOV
 			
 			
 				brasilianske cruzeiro novo (1967–1986)
 				brasiliansk cruzeiro novo (1967–1986)
 				brasilianske cruzeiro novo (1967–1986)
+				BRB
 			
 			
 				brasilianske cruzados (1986–1989)
 				brasiliansk cruzado (1986–1989)
 				brasilianske cruzado (1986–1989)
+				BRC
 			
 			
 				brasilianske cruzeiro (1990–1993)
 				brasiliansk cruzeiro (1990–1993)
 				brasilianske cruzeiro (1990–1993)
+				BRE
 			
 			
 				brasilianske real
@@ -8457,59 +12050,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brasilianske cruzado novo (1989–1990)
 				brasiliansk cruzado novo (1989–1990)
 				brasilianske cruzado novo (1989–1990)
+				BRN
 			
 			
 				brasilianske cruzeiro (1993–1994)
 				brasiliansk cruzeiro (1993–1994)
 				brasilianske cruzeiro (1993–1994)
+				BRR
 			
 			
 				brasilianske cruzeiro (1942–1967)
 				brasiliansk cruzeiro (1942–1967)
 				brasilianske cruzeiro (1942–1967)
+				BRZ
 			
 			
 				bahamanske dollar
 				bahamansk dollar
 				bahamanske dollar
+				BSD
 				$
 			
 			
 				bhutanske ngultrum
 				bhutansk ngultrum
 				bhutanske ngultrum
+				BTN
 			
 			
 				burmesiske kyat
 				burmesisk kyat
 				burmesiske kyat
+				BUK
 			
 			
 				botswanske pula
 				botswansk pula
 				botswanske pula
+				BWP
 				P
 			
 			
 				hviterussiske nye rubler (1994–1999)
 				hviterussisk ny rubel (1994–1999)
 				hviterussiske nye rubler (1994–1999)
+				BYB
 			
 			
 				nye hviterussiske rubler
 				ny hviterussisk rubel
 				nye hviterussiske rubler
+				BYN
 				р.
 			
 			
 				hviterussiske rubler (2000–2016)
 				hviterussisk rubel (2000–2016)
 				hviterussiske rubler (2000–2016)
+				BYR
 			
 			
 				beliziske dollar
 				belizisk dollar
 				beliziske dollar
+				BZD
 				$
 			
 			
@@ -8523,32 +12127,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kongolesiske franc
 				kongolesisk franc
 				kongolesiske franc
+				CDF
 			
 			
 				WIR euro
+				CHE
 			
 			
 				sveitsiske franc
 				sveitsisk franc
 				sveitsiske franc
+				CHF
 			
 			
 				WIR franc
+				CHW
 			
 			
 				chilenske escudo
 				chilensk escudo
 				chilenske escudo
+				CLE
 			
 			
 				chilenske unidades de fomento
 				chilensk unidades de fomento
 				chilenske unidades de fomento
+				CLF
 			
 			
 				chilenske pesos
 				chilensk peso
 				chilenske pesos
+				CLP
 				$
 			
 			
@@ -8561,6 +12172,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kinas folkebank dollar
 				Kinas folkebank dollar
 				Kinas folkebank dollar
+				CNX
 			
 			
 				kinesiske yuan
@@ -8573,6 +12185,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				colombianske pesos
 				colombiansk peso
 				colombianske pesos
+				COP
 				$
 			
 			
@@ -8585,167 +12198,198 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				costaricanske colón
 				costaricansk colón
 				costaricanske colón
+				CRC
 				₡
 			
 			
 				serbiske dinarer (2002–2006)
 				serbisk dinar (2002–2006)
 				serbiske dinarer (2002–2006)
+				CSD
 			
 			
 				tsjekkoslovakiske koruna (hard)
 				tsjekkoslovakisk koruna (hard)
 				tsjekkoslovakiske koruna (hard)
+				CSK
 			
 			
 				kubanske konvertible pesos
 				kubansk konvertibel peso
 				kubanske konvertible pesos
+				CUC
 				$
 			
 			
 				kubanske pesos
 				kubansk peso
 				kubanske pesos
+				CUP
 				$
 			
 			
 				kappverdiske escudos
 				kappverdisk escudo
 				kappverdiske escudos
+				CVE
 			
 			
 				kypriotiske pund
 				kypriotisk pund
 				kypriotiske pund
+				CYP
 			
 			
 				tsjekkiske koruna
 				tsjekkisk koruna
 				tsjekkiske koruna
+				CZK
 				Kč
 			
 			
 				østtyske mark
 				østtysk mark
 				østtyske mark
+				DDM
 			
 			
 				tyske mark
 				tysk mark
 				tyske mark
+				DEM
 			
 			
 				djiboutiske franc
 				djiboutisk franc
 				djiboutiske franc
+				DJF
 			
 			
 				danske kroner
 				dansk krone
 				danske kroner
+				DKK
 				kr
 			
 			
 				dominikanske pesos
 				dominikansk peso
 				dominikanske pesos
+				DOP
 				$
 			
 			
 				algeriske dinarer
 				algerisk dinar
 				algeriske dinarer
+				DZD
 			
 			
 				ecuadorianske sucre
 				ecuadoriansk sucre
 				ecuadorianske sucre
+				ECS
 			
 			
 				ecuadorianske unidad de valor constante (UVC)
 				ecuadoriansk unidad de valor constante (UVC)
 				ecuadorianske unidad de valor constante (UVC)
+				ECV
 			
 			
 				estiske kroon
 				estisk kroon
 				estiske kroner
+				EEK
 			
 			
 				egyptiske pund
 				egyptisk pund
 				egyptiske pund
+				EGP
 				E£
 			
 			
 				eritreiske nakfa
 				eritreisk nakfa
 				eritreiske nakfa
+				ERN
 			
 			
 				spanske peseta (A–konto)
 				spansk peseta (A–konto)
 				spanske peseta (A–konto)
+				ESA
 			
 			
 				spanske peseta (konvertibel konto)
 				spansk peseta (konvertibel konto)
 				spanske peseta (konvertibel konto)
+				ESB
 			
 			
 				spanske peseta
 				spansk peseta
 				spanske peseta
+				ESP
 			
 			
 				etiopiske birr
 				etiopisk birr
 				etiopiske birr
+				ETB
 			
 			
 				euro
 				euro
 				euro
+				€
 				€
 			
 			
 				finske mark
 				finsk mark
 				finske mark
+				FIM
 			
 			
 				fijianske dollar
 				fijiansk dollar
 				fijianske dollar
+				FJD
 				$
 			
 			
 				falklandspund
 				falklandspund
 				falklandspund
+				FKP
 				£
 			
 			
 				franske franc
 				fransk franc
 				franske franc
+				FRF
 			
 			
 				britiske pund
 				britisk pund
 				britiske pund
+				£
 				£
 			
 			
 				georgiske kupon larit
 				georgisk kupon larit
 				georgiske kupon larit
+				GEK
 			
 			
 				georgiske lari
 				georgisk lari
 				georgiske lari
+				GEL
 				₾
 				₾
 			
@@ -8753,64 +12397,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghanesisk cedi (1979–2007)
 				ghanesisk cedi (1979–2007)
 				ghanesiske cedi (1979–2007)
+				GHC
 			
 			
 				ghanesiske cedi
 				ghanesisk cedi
 				ghanesiske cedi
+				GHS
 			
 			
 				gibraltarske pund
 				gibraltarsk pund
 				gibraltarske pund
+				GIP
 				£
 			
 			
 				gambiske dalasi
 				gambisk dalasi
 				gambiske dalasi
+				GMD
 			
 			
 				guineanske franc
 				guineansk franc
 				guineanske franc
+				GNF
 				FG
 			
 			
 				guineanske syli
 				guineansk syli
 				guineanske syli
+				GNS
 			
 			
 				ekvatorialguineanske ekwele guineana
 				ekvatorialguineansk ekwele guineana
 				ekvatorialguineanske ekwele guineana
+				GQE
 			
 			
 				greske drakmer
 				gresk drakme
 				greske drakmer
+				GRD
 			
 			
 				guatemalanske quetzal
 				guatemalansk quetzal
 				guatemalanske quetzal
+				GTQ
 				Q
 			
 			
 				portugisiske guinea escudo
 				portugisisk guinea escudo
 				portugisiske guinea escudo
+				GWE
 			
 			
 				Guinea-Bissau-pesos
 				Guinea-Bissau-pesos
 				Guinea-Bissau-pesos
+				GWP
 			
 			
 				guyanske dollar
 				guyansk dollar
 				guyanske dollar
+				GYD
 				$
 			
 			
@@ -8824,50 +12480,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				honduranske lempira
 				honduransk lempira
 				honduranske lempira
+				HNL
 				L
 			
 			
 				kroatiske dinarer
 				kroatisk dinar
 				kroatiske dinarer
+				HRD
 			
 			
 				kroatiske kuna
 				kroatisk kuna
 				kroatiske kuna
+				HRK
 				kn
 			
 			
 				haitiske gourde
 				haitisk gourde
 				haitiske gourde
+				HTG
 			
 			
 				ungarske forinter
 				ungarsk forint
 				ungarske forinter
+				HUF
 				Ft
 			
 			
 				indonesiske rupier
 				indonesisk rupi
 				indonesiske rupier
+				IDR
 				Rp
 			
 			
 				irske pund
 				irsk pund
 				irske pund
+				IEP
 			
 			
 				israelske pund
 				israelsk pund
 				israelske pund
+				ILP
 			
 			
 				israelske shekler (1980–1985)
 				israelsk shekel (1980–1985)
 				israelske shekler (1980–1985)
+				ILR
 			
 			
 				nye israelske shekler
@@ -8887,11 +12552,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				irakske dinarer
 				iraksk dinar
 				irakske dinarer
+				IQD
 			
 			
 				iranske rialer
 				iransk rial
 				iranske rialer
+				IRR
 			
 			
 				islandske kroner (1918–1981)
@@ -8902,23 +12569,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				islandske kroner
 				islandsk krone
 				islandske kroner
+				ISK
 				kr
 			
 			
 				italienske lire
 				italiensk lire
 				italienske lire
+				ITL
 			
 			
 				jamaikanske dollar
 				jamaikansk dollar
 				jamaikanske dollar
+				JMD
 				$
 			
 			
 				jordanske dinarer
 				jordansk dinar
 				jordanske dinarer
+				JOD
 			
 			
 				japanske yen
@@ -8931,39 +12602,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kenyanske shilling
 				kenyansk shilling
 				kenyanske shilling
+				KES
 			
 			
 				kirgisiske som
 				kirgisisk som
 				kirgisiske som
+				KGS
 			
 			
 				kambodsjanske riel
 				kambodsjansk riel
 				kambodsjanske riel
+				KHR
 				៛
 			
 			
 				komoriske franc
 				komorisk franc
 				komoriske franc
+				KMF
 				CF
 			
 			
 				nordkoreanske won
 				nordkoreansk won
 				nordkoreanske won
+				KPW
 				₩
 			
 			
 				sørkoreanske hwan (1953–1962)
 				sørkoreansk hwan (1953–1962)
 				sørkoreanske hwan (1953–1962)
+				KRH
 			
 			
 				sørkoreanske won (1945–1953)
 				sørkoreansk won (1945–1953)
 				sørkoreanske won (1945–1953)
+				KRO
 			
 			
 				sørkoreanske won
@@ -8976,112 +12654,141 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuwaitiske dinarer
 				kuwaitisk dinar
 				kuwaitiske dinarer
+				KWD
 			
 			
 				caymanske dollar
 				caymansk dollar
 				caymanske dollar
+				KYD
 				$
 			
 			
 				kasakhstanske tenge
 				kasakhstansk tenge
 				kasakhstanske tenge
+				KZT
 				₸
 			
 			
 				laotiske kip
 				laotisk kip
 				laotiske kip
+				LAK
 				₭
 			
 			
 				libanesiske pund
 				libanesisk pund
 				libanesiske pund
+				LBP
 				L£
 			
 			
 				srilankiske rupier
 				srilankisk rupi
 				srilankiske rupier
+				LKR
 				Rs
 			
 			
 				liberiske dollar
 				liberisk dollar
 				liberiske dollar
+				LRD
 				$
 			
 			
 				lesothiske loti
 				lesothisk loti
 				lesothiske loti
+				LSL
 			
 			
 				litauiske litas
 				litauisk lita
 				litauiske lita
+				LTL
+				Lt
 			
 			
 				litauiske talonas
 				litauisk talonas
 				litauiske talonas
+				LTT
 			
 			
 				luxemburgske konvertible franc
 				luxemburgsk konvertibel franc
 				luxemburgske konvertible franc
+				LUC
 			
 			
 				luxemburgske franc
 				luxemburgsk franc
 				luxemburgske franc
+				LUF
 			
 			
 				luxemburgske finansielle franc
 				luxemburgsk finansiell franc
 				luxemburgske finansielle franc
+				LUL
 			
 			
 				latviske lats
 				latvisk lats
 				latviske lats
+				LVL
+				Ls
 			
 			
 				latviske rubler
 				latvisk rubel
 				latviske rubler
+				LVR
 			
 			
 				libyske dinarer
 				libysk dinar
 				libyske dinarer
+				LYD
 			
 			
 				marokkanske dirham
 				marokkansk dirham
 				marokkanske dirham
+				MAD
 			
 			
 				marokkanske franc
 				marokkansk franc
 				marokkanske franc
+				MAF
+			
+			
+				MCF
+				MCF
+				MCF
+				MCF
 			
 			
 				moldovske cupon
 				moldovsk cupon
 				moldovske cupon
+				MDC
 			
 			
 				moldovske leu
 				moldovsk leu
 				moldovske lei
+				MDL
 			
 			
 				madagassiske ariary
 				madagassisk ariary
 				madagassiske ariary
+				MGA
 				Ar
 			
 			
@@ -9093,38 +12800,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedonske denarer
 				makedonsk denar
 				makedonske denarer
+				MKD
 			
 			
 				makedonske denarer (1992–1993)
 				makedonsk denar (1992–1993)
 				makedonske denarer (1992–1993)
+				MKN
 			
 			
 				maliske franc
 				malisk franc
 				maliske franc
+				MLF
 			
 			
 				myanmarske kyat
 				myanmarsk kyat
 				myanmarske kyat
+				MMK
 				K
 			
 			
 				mongolske tugrik
 				mongolsk tugrik
 				mongolske tugrik
+				MNT
 				₮
 			
 			
 				makaoiske pataca
 				makaoisk pataca
 				makaoiske pataca
+				MOP
 			
 			
 				mauritanske ouguiya (1973–2017)
 				mauritansk ouguiya (1973–2017)
 				mauritanske ouguiya (1973–2017)
+				MRO
 			
 			
 				mauritanske ouguiya
@@ -9135,32 +12849,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maltesiske lira
 				maltesisk lira
 				maltesiske lira
+				MTL
 			
 			
 				maltesiske pund
 				maltesisk pund
 				maltesiske pund
+				MTP
 			
 			
 				mauritiske rupier
 				mauritisk rupi
 				mauritiske rupier
+				MUR
 				Rs
 			
 			
 				maldiviske rupier
 				maldivisk rupi
 				maldiviske rupier
+				MVP
 			
 			
 				maldiviske rufiyaa
 				maldivisk rufiyaa
 				maldiviske rufiyaa
+				MVR
 			
 			
 				malawiske kwacha
 				malawisk kwacha
 				malawiske kwacha
+				MWK
 			
 			
 				meksikanske pesos
@@ -9173,60 +12893,71 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				meksikanske sølvpesos (1861–1992)
 				meksikansk sølvpesos (1860–1992)
 				meksikanske sølvpesos (1860–1992)
+				MXP
 			
 			
 				meksikanske unidad de inversion (UDI)
 				meksikansk unidad de inversion (UDI)
 				meksikanske unidad de inversion (UDI)
+				MXV
 			
 			
 				malaysiske ringgit
 				malaysisk ringgit
 				malaysiske ringgit
+				MYR
 				RM
 			
 			
 				mosambikiske escudo
 				mosambikisk escudo
 				mosambikiske escudo
+				MZE
 			
 			
 				gamle mosambikiske metical
 				gammel mosambikisk metical
 				gamle mosambikiske metical
+				MZM
 			
 			
 				mosambikiske metical
 				mosambikisk metical
 				mosambikiske metical
+				MZN
 			
 			
 				namibiske dollar
 				namibisk dollar
 				namibiske dollar
+				NAD
 				$
 			
 			
 				nigerianske naira
 				nigeriansk naira
 				nigerianske naira
+				NGN
 				₦
 			
 			
 				nicaraguanske cordoba (1988–1991)
 				nicaraguansk cordoba (1988–1991)
 				nicaraguanske cordoba (1988–1991)
+				NIC
 			
 			
 				nicaraguanske córdoba
 				nicaraguansk córdoba
 				nicaraguanske córdoba
+				NIO
 				C$
 			
 			
 				nederlandske gylden
 				nederlandsk gylden
 				nederlandske gylden
+				NLG
 			
 			
 				norske kroner
@@ -9239,6 +12970,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nepalske rupier
 				nepalsk rupi
 				nepalske rupier
+				NPR
 				Rs
 			
 			
@@ -9252,134 +12984,159 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				omanske rialer
 				omansk rial
 				omanske rialer
+				OMR
 			
 			
 				panamanske balboa
 				panamansk balboa
 				panamanske balboa
+				PAB
 			
 			
 				peruanske inti
 				peruansk inti
 				peruanske inti
+				PEI
 			
 			
 				peruanske sol
 				peruansk sol
 				peruanske sol
+				PEN
 			
 			
 				peruanske sol (1863–1965)
 				peruansk sol (1863–1965)
 				peruanske sol (1863–1965)
+				PES
 			
 			
 				papuanske kina
 				papuansk kina
 				papuanske kina
+				PGK
 			
 			
 				filippinske pesos
 				filippinsk peso
 				filippinske pesos
+				PHP
 				₱
 			
 			
 				pakistanske rupier
 				pakistansk rupi
 				pakistanske rupier
+				PKR
 				Rs
 			
 			
 				polske zloty
 				polsk zloty
 				polske zloty
+				PLN
 				zł
 			
 			
 				polske zloty (1950–1995)
 				polsk zloty (1950–1995)
 				polske zloty (1950–1995)
+				PLZ
 			
 			
 				portugisiske escudo
 				portugisisk escudo
 				portugisiske escudo
+				PTE
 			
 			
 				paraguayanske guarani
 				paraguayansk guarani
 				paraguayanske guarani
+				PYG
 				₲
 			
 			
 				qatarske rialer
 				qatarsk rial
 				qatarske rialer
+				QAR
 			
 			
 				rhodesiske dollar
 				rhodesisk dollar
 				rhodesiske dollar
+				RHD
 			
 			
 				rumenske leu (1952–2006)
 				rumensk leu (1952–2006)
 				rumenske leu (1952–2006)
+				ROL
 			
 			
 				rumenske leu
 				rumensk leu
 				rumenske lei
+				RON
 				L
 			
 			
 				serbiske dinarer
 				serbisk dinar
 				serbiske dinarer
+				RSD
 			
 			
 				russiske rubler
 				russisk rubel
 				russiske rubler
+				RUB
 				₽
 			
 			
 				russiske rubler (1991–1998)
 				russisk rubel (1991–1998)
 				russiske rubler (1991–1998)
+				RUR
 			
 			
 				rwandiske franc
 				rwandisk franc
 				rwandiske franc
+				RWF
 				RF
 			
 			
 				saudiarabiske riyaler
 				saudiarabisk riyal
 				saudiarabiske riyaler
+				SAR
 			
 			
 				salomonske dollar
 				salomonsk dollar
 				salomonske dollar
+				SBD
 				$
 			
 			
 				seychelliske rupier
 				seychellisk rupi
 				seychelliske rupier
+				SCR
 			
 			
 				sudanesiske dinarer (1992–2007)
 				sudanesisk dinar (1992–2007)
 				sudanesiske dinarer (1992–2007)
+				SDD
 			
 			
 				sudanske pund
 				sudansk pund
 				sudanske pund
+				SDG
 			
 			
 				sudanesiske pund
@@ -9391,44 +13148,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				svenske kroner
 				svensk krone
 				svenske kroner
+				SEK
 				kr
 			
 			
 				singaporske dollar
 				singaporsk dollar
 				singaporske dollar
+				SGD
 				$
 			
 			
 				sankthelenske pund
 				sankthelensk pund
 				sankthelenske pund
+				SHP
 				£
 			
 			
 				slovenske tolar
 				slovensk tolar
 				slovenske tolar
+				SIT
 			
 			
 				slovakiske koruna
 				slovakisk koruna
 				slovakiske koruna
+				SKK
 			
 			
 				sierraleonske leone
 				sierraleonsk leone
 				sierraleonske leone
+				SLL
 			
 			
 				somaliske shilling
 				somalisk shilling
 				somaliske shilling
+				SOS
 			
 			
 				surinamske dollar
 				surinamsk dollar
 				surinamske dollar
+				SRD
 				$
 			
 			
@@ -9441,12 +13206,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sørsudanske pund
 				sørsudansk pund
 				sørsudanske pund
+				SSP
 				£
 			
 			
 				saotomesiske dobra (1977–2017)
 				saotomesisk dobra (1977–2017)
 				saotomesiske dobra (1977–2017)
+				STD
 			
 			
 				saotomesiske dobra
@@ -9458,38 +13225,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sovjetiske rubler
 				sovjetisk rubel
 				sovjetiske rubler
+				SUR
 			
 			
 				salvadoranske colon
 				salvadoransk colon
 				salvadoranske colon
+				SVC
 			
 			
 				syriske pund
 				syrisk pund
 				syriske pund
+				SYP
 				£
 			
 			
 				swazilandske lilangeni
 				swazilandsk lilangeni
 				swazilandske lilangeni
+				SZL
 			
 			
 				thailandske baht
 				thailandsk baht
 				thailandske baht
+				THB
 				฿
 			
 			
 				tadsjikiske rubler
 				tadsjikisk rubel
 				tadsjikiske rubler
+				TJR
 			
 			
 				tadsjikiske somoni
 				tadsjikisk somoni
 				tadsjikiske somoni
+				TJS
 			
 			
 				turkmenske manat (1993–2009)
@@ -9501,22 +13275,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turkmenske manat
 				turkmensk manat
 				turkmenske manat
+				TMT
 			
 			
 				tunisiske dinarer
 				tunisisk dinar
 				tunisiske dinarer
+				TND
 			
 			
 				tonganske paʻanga
 				tongansk paʻanga
 				tonganske paʻanga
+				TOP
 				T$
 			
 			
 				timoresiske escudo
 				timoresisk escudo
 				timoresiske escudo
+				TPE
 			
 			
 				tyrkiske lire (1922–2005)
@@ -9528,6 +13306,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tyrkiske lire
 				tyrkisk lire
 				tyrkiske lire
+				TRY
 				₺
 				TL
 			
@@ -9535,6 +13314,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				trinidadiske dollar
 				trinidadisk dollar
 				trinidadiske dollar
+				TTD
 				$
 			
 			
@@ -9548,27 +13328,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tanzanianske shilling
 				tanzaniansk shilling
 				tanzanianske shilling
+				TZS
 			
 			
 				ukrainske hryvnia
 				ukrainsk hryvnia
 				ukrainske hryvnia
+				UAH
 				₴
 			
 			
 				ukrainske karbovanetz
 				ukrainsk karbovanetz
 				ukrainske karbovanetz
+				UAK
 			
 			
 				ugandiske shilling (1966–1987)
 				ugandisk shilling (1966–1987)
 				ugandiske shilling (1966–1987)
+				UGS
 			
 			
 				ugandiske shilling
 				ugandisk shilling
 				ugandiske shilling
+				UGX
 			
 			
 				amerikanske dollar
@@ -9581,16 +13366,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				amerikanske dollar (neste dag)
 				amerikansk dollar (neste dag)
 				amerikanske dollar (neste dag)
+				USN
 			
 			
 				amerikanske dollar (samme dag)
 				amerikansk dollar (samme dag)
 				amerikanske dollar (samme dag)
+				USS
 			
 			
 				uruguyanske pesos (indekserte enheter)
 				uruguyanske pesos (indekserte enheter)
 				uruguyanske pesos (indekserte enheter)
+				UYI
 			
 			
 				uruguayanske pesos (1975–1993)
@@ -9602,12 +13390,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguayanske pesos
 				uruguyansk peso
 				uruguayanske pesos
+				UYU
 				$
 			
 			
 				usbekiske som
 				usbekisk som
 				usbekiske som
+				UZS
 			
 			
 				venezuelanske bolivar (1871–2008)
@@ -9619,6 +13409,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelanske bolivar (2008–2018)
 				venezuelansk bolivar (2008–2018)
 				venezuelanske bolivar (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -9638,16 +13429,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vietnamesiske dong (1978–1985)
 				vietnamesisk dong (1978–1985)
 				vietnamesiske dong (1978–1985)
+				VNN
 			
 			
 				vanuatiske vatu
 				vanuatisk vatu
 				vanuatiske vatu
+				VUV
 			
 			
 				samoanske tala
 				samoansk tala
 				samoanske tala
+				WST
 			
 			
 				sentralafrikanske CFA-franc
@@ -9659,31 +13453,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sølv
 				unse sølv
 				unser sølv
+				XAG
 			
 			
 				gull
 				unse gull
 				unser gull
+				XAU
 			
 			
 				europeisk sammensatt enhet
 				europeisk sammensatt enhet
 				europeiske sammensatte enheter
+				XBA
 			
 			
 				europeisk monetær enhet
 				europeisk monetær enhet
 				europeiske monetære enheter
+				XBB
 			
 			
 				europeisk kontoenhet (XBC)
 				europeisk kontoenhet (XBC)
 				europeiske kontoenheter
+				XBC
 			
 			
 				europeisk kontoenhet (XBD)
 				europeisk kontoenhet (XBD)
 				europeiske kontoenheter (XBD)
+				XBD
 			
 			
 				østkaribiske dollar
@@ -9696,31 +13496,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				spesielle trekkrettigheter
 				spesiell trekkrettighet
 				spesielle trekkrettigheter
+				XDR
 			
 			
 				europeisk valutaenhet
 				europeisk valutaenhet
 				europeiske valutaenheter
+				XEU
 			
 			
 				franske gullfranc
 				fransk gullfranc
 				franske gullfranc
+				XFO
 			
 			
 				franske UIC-franc
 				fransk UIC-franc
 				franske UIC-franc
+				XFU
 			
 			
 				vestafrikanske CFA-franc
 				vestafrikansk CFA-franc
 				vestafrikanske CFA-franc
+				CFA
 			
 			
 				palladium
 				unse palladium
 				unser palladium
+				XPD
 			
 			
 				CFP-franc
@@ -9732,24 +13538,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				platina
 				unse platina
 				unser platina
+				XPT
 			
 			
 				RINET-fond
+				XRE
 			
 			
 				sucre
 				sucre
 				sucre
+				XSU
 			
 			
 				testvalutakode
 				testvaluta
 				testvaluta
+				XTS
 			
 			
 				ADB-kontoenhet
 				ADB-kontoenhet
 				ADB-kontoenheter
+				XUA
 			
 			
 				ukjent valuta
@@ -9761,73 +13572,87 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenittiske dinarer
 				jemenittisk dinar
 				jemenittiske dinarer
+				YDD
 			
 			
 				jemenittiske rialer
 				jemenittisk rial
 				jemenittiske rialer
+				YER
 			
 			
 				jugoslaviske dinarer (hard)
 				jugoslavisk dinar (hard)
 				jugoslaviske dinarer (hard)
+				YUD
 			
 			
 				jugoslaviske noviy-dinarer
 				jugoslavisk noviy-dinar
 				jugoslaviske noviy-dinarer
+				YUM
 			
 			
 				jugoslaviske konvertible dinarer
 				jugoslavisk konvertibel dinar
 				jugoslaviske konvertible dinarer
+				YUN
 			
 			
 				jugoslaviske reformerte dinarer (1992–1993)
 				jugoslavisk reformert dinar (1992–1993)
 				jugoslaviske reformerte dinarer (1992–1993)
+				YUR
 			
 			
 				sørafrikanske rand (finansielle)
 				sørafrikansk rand (finansiell)
 				sørafrikanske rand (finansielle)
+				ZAL
 			
 			
 				sørafrikanske rand
 				sørafrikansk rand
 				sørafrikanske rand
+				ZAR
 				R
 			
 			
 				zambiske kwacha (1968–2012)
 				zambisk kwacha (1968–2012)
 				zambiske kwacha (1968–2012)
+				ZMK
 			
 			
 				zambiske kwacha
 				zambisk kwacha
 				zambiske kwacha
+				ZMW
 				ZK
 			
 			
 				zairiske nye zaire
 				zairisk ny zaire
 				zairiske nye zaire
+				ZRN
 			
 			
 				zairiske zaire
 				zairisk zaire
 				zairiske zaire
+				ZRZ
 			
 			
 				zimbabwiske dollar (1980–2008)
 				zimbabwisk dollar (1980–2008)
 				zimbabwiske dollar (1980–2008)
+				ZWD
 			
 			
 				zimbabwisk dollar (2009)
 				zimbabwisk dollar (2009)
 				zimbabwiske dollar (2009)
+				ZWL
 			
 			
 				zimbabwisk dollar (2008)
@@ -9837,132 +13662,173 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
-			~{0}
-			≥{0}
-			≤{0}
+			ca. {0}
+			≥ {0}
+			≤ {0}
 			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			≥{0}
+			{0}–{1}
 		
 		
 			{0} dag
@@ -10060,11 +13926,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kvadrattommer
 				{0} per kvadrattomme
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -10096,14 +13957,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} promille
 			
 			
-				promyriade
-				{0} promyriade
-				{0} promyriade
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				promyriade
+				{0} promyriade
+				{0} promyriade
 			
 			
 				liter per kilometer
@@ -10185,6 +14041,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} århundre
 				{0} århundrer
 			
+			
+				tiår
+				{0} tiår
+				{0} tiår
+			
 			
 				år
 				{0} år
@@ -10293,24 +14154,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowattimer
 			
 			
-				elektronvolt
-				{0} elektronvolt
-				{0} elektronvolt
+				elektronvolt
+				{0} elektronvolt
+				{0} elektronvolt
 			
 			
-				British thermal unit
-				{0} Btu
-				{0} Btu
+				British thermal unit
+			
+			
+				therm
+				{0} therm
+				{0} therm
 			
 			
-				poundforce
-				{0} poundforce
-				{0} poundforce
+				poundforce
+				{0} poundforce
+				{0} poundforce
 			
 			
-				newton
-				{0} newton
-				{0} newton
+				newton
+				{0} newton
+				{0} newton
 			
 			
 				gigahertz
@@ -10332,6 +14196,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				gefirt
+				{0} gefirt
+				{0} gefirt
+			
+			
+				piksler
+				{0} piksel
+				{0} piksler
+			
+			
+				megapiksler
+				{0} megapiksel
+				{0} megapiksler
+			
+			
+				piksler per centimeter
+				{0} piksel per centimeter
+				{0} piksler per centimeter
+			
+			
+				piksler per tomme
+				{0} piksel per tomme
+				{0} piksler per tomme
+			
+			
+				punkter per centimeter
+				{0} punkt per centimeter
+				{0} punkter per centimeter
+			
+			
+				punkter per tomme
+				{0} punkt per tomme
+				{0} punkter per tomme
+			
 			
 				kilometer
 				{0} kilometer
@@ -10428,9 +14327,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} punkter
 			
 			
-				solradius
-				{0} R☉
-				{0} R☉
+				solradius
 			
 			
 				lux
@@ -10438,9 +14335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				solluminositet
-				{0} L☉
-				{0} L☉
+				solluminositet
 			
 			
 				tonn
@@ -10502,19 +14397,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karat
 			
 			
-				dalton
-				{0} dalton
-				{0} dalton
+				dalton
+				{0} dalton
+				{0} dalton
 			
 			
-				jordmasser
-				{0} jordmasse
-				{0} jordmasser
+				jordmasser
+				{0} jordmasse
+				{0} jordmasser
 			
 			
-				solmasser
-				{0} solmasse
-				{0} solmasser
+				solmasser
+				{0} solmasse
+				{0} solmasser
 			
 			
 				gigawatt
@@ -10546,11 +14441,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hestekraft
 				{0} hestekrefter
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				millimeter kvikksølv
 				{0} millimeter kvikksølv
@@ -10576,15 +14466,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfære
 				{0} atmosfærer
 			
+			
+				pascal
+				{0} pascal
+				{0} pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
+			
 			
-				kilopascal
-				{0} kilopascal
-				{0} kilopascal
+				kilopascal
+				{0} kilopascal
+				{0} kilopascal
 			
 			
-				megapascal
-				{0} megapascal
-				{0} megapascal
+				megapascal
+				{0} megapascal
+				{0} megapascal
 			
 			
 				kilometer per time
@@ -10627,14 +14527,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvin
 			
 			
-				pound-foot
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				pound-foot
 			
 			
-				newtonmeter
-				{0} Nm
-				{0} Nm
+				newtonmeter
+				{0} Nm
+				{0} Nm
 			
 			
 				kubikkilometer
@@ -10752,9 +14650,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} væskeunser
 			
 			
-				imp. fluid ounce
-				{0} imp. fluid ounce
-				{0} imp. fluid ounce
+				imp. fluid ounce
+				{0} imp. fluid ounce
+				{0} imp. fluid ounce
 			
 			
 				spiseskjeer
@@ -10767,9 +14665,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} teskjeer
 			
 			
-				fat
-				{0} fat
-				{0} fat
+				fat
+				{0} fat
+				{0} fat
 			
 			
 				himmelretning
@@ -10868,11 +14766,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tommer²
 				{0}/tommer²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} kt
@@ -10904,14 +14797,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				promyriade
-				{0} ‱
-				{0} ‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				promyriade
+				{0} ‱
+				{0} ‱
 			
 			
 				liter/km
@@ -10993,6 +14881,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} årh.
 				{0} årh.
 			
+			
+				tiår
+				{0} tiår
+				{0} tiår
+			
 			
 				år
 				{0} år
@@ -11101,24 +14994,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				elektronvolt
-				{0} eV
-				{0} eV
+				elektronvolt
+				{0} eV
+				{0} eV
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				therm
+				{0} therm
+				{0} therm
 			
 			
-				poundforce
-				{0} lbf
-				{0} lbf
+				poundforce
+				{0} lbf
+				{0} lbf
 			
 			
-				newton
-				{0} N
-				{0} N
+				newton
 			
 			
 				GHz
@@ -11140,6 +15031,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				gefirt
+				{0} gefirt
+				{0} gefirt
+			
+			
+				piksler
+				{0} px
+				{0} px
+			
+			
+				megapiksler
+				{0} MP
+				{0} MP
+			
+			
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+			
 			
 				km
 				{0} km
@@ -11236,9 +15154,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 			
 			
-				solradius
-				{0} R☉
-				{0} R☉
+				solradius
 			
 			
 				lux
@@ -11246,9 +15162,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				solluminositet
-				{0} L☉
-				{0} L☉
+				solluminositet
 			
 			
 				tonn
@@ -11310,19 +15224,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} c
 			
 			
-				dalton
-				{0} Da
-				{0} Da
+				dalton
+				{0} Da
+				{0} Da
 			
 			
-				jordmasser
-				{0} M⊕
-				{0} M⊕
+				jordmasser
+				{0} M⊕
+				{0} M⊕
 			
 			
-				solmasser
-				{0} M☉
-				{0} M☉
+				solmasser
+				{0} M☉
+				{0} M☉
 			
 			
 				GW
@@ -11354,11 +15268,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hk
 				{0} hk
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -11374,6 +15283,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -11384,15 +15297,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				{0} Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/time
@@ -11434,15 +15346,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
-				Nm
-				{0} Nm
-				{0} Nm
+				Nm
+				{0} Nm
+				{0} Nm
 			
 			
 				km³
@@ -11560,9 +15467,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				imp. fl oz
-				{0} imp. fl oz
-				{0} imp. fl oz
+				imp. fl oz
+				{0} imp. fl oz
+				{0} imp. fl oz
 			
 			
 				ss
@@ -11575,9 +15482,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ts
 			
 			
-				fat
-				{0} fat
-				{0} fat
+				fat
+				{0} fat
+				{0} fat
 			
 			
 				retning
@@ -11898,10 +15805,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hk
 				{0}hk
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0}mmHg
 				{0}mmHg
@@ -11918,6 +15821,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				km/t
 				{0}km/t
@@ -12043,15 +15950,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} eller {1}
 			{0} eller {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} og {1}
-			{0} og {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
 			{0} og {1}
 			{0} og {1}
 		
diff --git a/make/data/cldr/common/main/nb_NO.xml b/make/data/cldr/common/main/nb_NO.xml
index cb05e03cb0c..6f40ce4eb4b 100644
--- a/make/data/cldr/common/main/nb_NO.xml
+++ b/make/data/cldr/common/main/nb_NO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nb_SJ.xml b/make/data/cldr/common/main/nb_SJ.xml
index 1439f03f715..3555b7bb41d 100644
--- a/make/data/cldr/common/main/nb_SJ.xml
+++ b/make/data/cldr/common/main/nb_SJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nd.xml b/make/data/cldr/common/main/nd.xml
index 760e77d8c6b..53801a162c1 100644
--- a/make/data/cldr/common/main/nd.xml
+++ b/make/data/cldr/common/main/nd.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Madagaska
 			Marshall Islands
-			Macedonia
 			Mali
 			Myanmar
 			Mongolia
diff --git a/make/data/cldr/common/main/nd_ZW.xml b/make/data/cldr/common/main/nd_ZW.xml
index 91429ca7b4d..a97a242be5c 100644
--- a/make/data/cldr/common/main/nd_ZW.xml
+++ b/make/data/cldr/common/main/nd_ZW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nds.xml b/make/data/cldr/common/main/nds.xml
index 32e374859e0..fc9ea275ff7 100644
--- a/make/data/cldr/common/main/nds.xml
+++ b/make/data/cldr/common/main/nds.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -124,9 +124,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Austraalsch Engelsch
 			Kanaadsch Engelsch
 			Brietsch Engelsch
-			Engelsch (GB)
 			Amerikaansch Engelsch
-			Engelsch (US)
 			Middelengelsch
 			Esperanto
 			Spaansch
@@ -948,8 +946,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a å ä b c d e f g h i j k l m n o ö p q r s t u ü v w x y z]
 		[á à ă â ā æ ç é è ĕ ê ë ę ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ ú ù ŭ û ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S ẞ T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 	
 	
 		„
diff --git a/make/data/cldr/common/main/nds_DE.xml b/make/data/cldr/common/main/nds_DE.xml
index b7294fff54b..33ee0b9e46f 100644
--- a/make/data/cldr/common/main/nds_DE.xml
+++ b/make/data/cldr/common/main/nds_DE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nds_NL.xml b/make/data/cldr/common/main/nds_NL.xml
index 75c5a581ff9..029dbf9ba9d 100644
--- a/make/data/cldr/common/main/nds_NL.xml
+++ b/make/data/cldr/common/main/nds_NL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -15,6 +15,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
 		[á à â ä é è ê ë í ì î ï ó ò ô ö ú ù û ü]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 	
 
diff --git a/make/data/cldr/common/main/ne.xml b/make/data/cldr/common/main/ne.xml
index 9c8f1067923..87813d90cb6 100644
--- a/make/data/cldr/common/main/ne.xml
+++ b/make/data/cldr/common/main/ne.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -105,6 +105,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			क्यारिब
 			कायुगा
 			अट्साम
+			चाक्मा
 			चेचेन
 			सेबुआनो
 			चिगा
@@ -571,11 +572,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			योरूवा
 			न्हिनगातु
 			क्यान्टोनिज
+			चिनियाँ, क्यान्टोनिज
 			ब्लिससिम्बोल्स
 			मानक मोरोक्कोन तामाजिघट
 			चिनियाँ
+			चिनियाँ, म्यान्डरिन
 			सरलिकृत चिनियाँ
+			सरलिकृत म्यान्डरिन चिनियाँ
 			परम्परागत चिनियाँ
+			परम्परागत म्यान्डरिन चिनियाँ
 			जुलु
 			जुनी
 			भाषिक सामग्री छैन
@@ -818,7 +823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			इस्टोनिया
 			इजिप्ट
 			पश्चिमी साहारा
-			एरित्रिया
+			एरिट्रीया
 			स्पेन
 			इथियोपिया
 			युरोपियन युनियन
@@ -832,10 +837,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			फ्रान्स
 			गावोन
 			संयुक्त अधिराज्य
+			युके
 			ग्रेनाडा
 			जर्जिया
 			फ्रान्सेली गायना
-			गुएर्नसे
+			ग्यूर्न्सी
 			घाना
 			जिब्राल्टार
 			ग्रिनल्याण्ड
@@ -866,7 +872,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			इराक
 			इरान
 			आइस्ल्याण्ड
-			इटाली
+			इटली
 			जर्सी
 			जमैका
 			जोर्डन
@@ -953,7 +959,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			रूस
 			रवाण्डा
 			साउदी अरब
-			सोलोमोन टापुहरु
+			सोलोमन टापुहरू
 			सेचेलेस
 			सुडान
 			स्विडेन
@@ -973,11 +979,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			सिन्ट मार्टेन
 			सिरिया
 			स्वाजिल्याण्ड
-			SZ
+			स्वाजिल्याण्ड
 			ट्रिस्टान डा कुन्हा
 			तुर्क र काइकोस टापु
 			चाड
-			फ्रान्सेली दक्षिणी क्षेत्रहरु
+			फ्रेन्च दक्षिणी राज्यहरू
 			टोगो
 			थाइल्याण्ड
 			ताजिकिस्तान
@@ -1010,6 +1016,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			भानुआतु
 			वालिस र फुटुना
 			सामोआ
+			सिउडो-एक्सेन्ट्स
+			सिउडो-बिडी
 			कोसोभो
 			येमेन
 			मायोट्ट
@@ -1117,9 +1125,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[\u093C \u0901 \u0902 ः ॐ अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]
 		[\u200C\u200D]
-		[अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह]
-		[\- , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
-		[\- — , ; ! ? । ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
+		[अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह]
+		[\- ‑ , . % ‰ + 0० 1१ 2२ 3३ 4४ 5५ 6६ 7७ 8८ 9९]
+		[\- ‑ — , ; ! ? । ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1225,56 +1233,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							MM–MM
 						
@@ -1752,56 +1713,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2013,6 +1927,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				महिना
+				गत महिना
+				यो महिना
+				आगामी महिना
 				
 					{0} महिनामा
 					{0} महिनामा
@@ -2024,6 +1941,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				महिना
+				गत महिना
+				यो महिना
+				आगामी महिना
 				
 					{0} महिनामा
 					{0} महिनामा
@@ -2050,6 +1970,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				हप्ता
+				गत हप्ता
+				यो हप्ता
+				आगामी हप्ता
 				
 					{0} हप्तामा
 					{0} हप्तामा
@@ -2062,6 +1985,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				हप्ता
+				गत हप्ता
+				यो हप्ता
+				आगामी हप्ता
 				
 					{0} हप्तामा
 					{0} हप्तामा
@@ -3225,6 +3151,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				आक्टोब
 			
+			
+				कस्टाने
+			
 			
 				किजिलोर्डा
 			
@@ -4726,24 +4655,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			deva
 		
+		1
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 हजार
@@ -4881,6 +4833,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				संयुक्त अरब एमिराट्स डिर्हाम
 				संयुक्त अरब एमिराट्स डिर्हाम
 				संयुक्त अरब एमिराट्स डिर्हाम
+				AED
 			
 			
 				अफ्गानी(१९२७–२००२)
@@ -4889,522 +4842,690 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				अफ्गान अफ्गानी
 				अफ्गान अफ्गानी
 				अफ्गान अफ्गानी
+				AFN
 			
 			
 				अल्बानियन लेक
 				अल्बानियन लेक
 				अल्बानियन लेक
+				ALL
 			
 			
 				आर्मेनियाली ड्राम
 				आर्मेनियाली ड्राम
 				आर्मेनियाली ड्राम
+				AMD
 			
 			
 				नेदरल्याण्ड्स एन्टिलियन गिल्डर
 				नेदरल्याण्ड्स एन्टिलियन गिल्डर
 				नेदरल्याण्ड्स एन्टिलियन गिल्डर
+				ANG
 			
 			
 				एङ्गोलान क्वान्जा
 				एङ्गोलान क्वान्जा
 				एङ्गोलान क्वान्जा
+				AOA
+				Kz
 			
 			
 				अर्जेन्टिनी पेसो
 				अर्जेन्टिनी पेसो
 				अर्जेन्टिनी पेसो
+				ARS
+				$
 			
 			
 				अष्ट्रेलियन डलर
 				अष्ट्रेलियन डलर
 				अष्ट्रेलियन डलर
+				A$
+				$
 			
 			
 				आरूबन फ्लोरिन
 				आरूबन फ्लोरिन
 				आरूबन फ्लोरिन
+				AWG
 			
 			
 				अजरबैजानी मानात
 				अजरबैजानी मानात
 				अजरबैजानी मानात
+				AZN
 			
 			
 				बोस्निया-हर्जगोभिनिया रूपान्तरयोग्य मार्क
 				बोस्निया-हर्जगोभिनिया रूपान्तरयोग्य मार्क
 				बोस्निया-हर्जगोभिनिया रूपान्तरयोग्य मार्क
+				BAM
+				KM
 			
 			
 				बर्बाडियन डलर
 				बार्बाडियन डलर
 				बर्बाडियन डलर
+				BBD
+				$
 			
 			
 				बङ्गलादेशी टाका
 				बङ्गलादेशी टाका
 				बङ्गलादेशी टाका
+				BDT
+				৳
 			
 			
 				बुल्गारियाली लेभ
 				बुल्गारियाली लेभ
 				बुल्गारियाली लेभा
+				BGN
 			
 			
 				बाहारैनी डिनार
 				बाहारैनी डिनार
 				बाहारैनी डिनार
+				BHD
 			
 			
 				बुरूण्डियाली फ्रान्क
 				बुरूण्डियाली फ्रान्क
 				बुरूण्डियाली फ्रान्क
+				BIF
 			
 			
 				बर्मुडन डलर
 				बर्मुडन डलर
 				बर्मुडन डलर
+				BMD
+				$
 			
 			
 				ब्रुनाई डलर
 				ब्रुनाई डलर
 				ब्रुनाई डलर
+				BND
+				$
 			
 			
 				बोलिभियन बोलिभियानो
 				बोलिभियन बोलिभियानो
 				बोलिभियन बोलिभियानो
+				BOB
+				Bs
 			
 			
 				ब्राजिलियन रियल
 				ब्राजिलियन रियल
 				ब्राजिलियन रियल
+				R$
+				R$
 			
 			
 				बहामियाली डलर
 				बहामियाली डलर
 				बहामियाली डलर
+				BSD
+				$
 			
 			
 				भुटानी एन्‌गुल्ट्रुम
 				भुटानी एन्‌गुल्ट्रुम
 				भुटानी एन्‌गुल्ट्रुम
+				BTN
 			
 			
 				बोट्सवानान पुला
 				बोट्सवानान पुला
 				बोट्सवानान पुला
+				BWP
+				P
 			
 			
 				बेलारूसी रूबल
 				बेलारूसी रूबल
 				बेलारूसी रूबल
+				BYN
+				р.
 			
 			
 				बेलारूसी रूबल (2000–2016)
 				बेलारूसी रूबल (2000–2016)
 				बेलारूसी रूबल (2000–2016)
+				BYR
 			
 			
 				वेलिज डलर
 				वेलिज डलर
 				वेलिज डलर
+				BZD
+				$
 			
 			
 				क्यानाडियाली डलर
 				क्यानाडियाली डलर
 				क्यानाडियाली डलर
+				CA$
+				$
 			
 			
 				कङ्गोली फ्रान्क
 				कङ्गोली फ्रान्क
 				कङ्गोली फ्रान्क
+				CDF
 			
 			
 				स्विस् फ्रैङ्क
 				स्विस् फ्रैङ्क
 				स्विस् फ्रैङ्क
+				CHF
 			
 			
 				चिलियन पेसो
 				चिलियन पेसो
 				चिलियन पेसो
+				CLP
+				$
 			
 			
 				चिनियाँ युआन(तटवर्ती)
 				चिनियाँ युआन(तटवर्ती)
 				चिनियाँ युआन(तटवर्ती)
+				CNH
 			
 			
 				चिनिँया युआन
 				चिनिँया युआन
 				चिनिँया युआन
+				CN¥
+				¥
 			
 			
 				कोलम्वियन पेसो
 				कोलम्वियन पेसो
 				कोलम्वियन पेसो
+				COP
+				$
 			
 			
 				कोष्टारिकन कोलोन
 				कोष्टारिकन कोलोन
 				कोष्टारिकन कोलोनहरू
+				CRC
+				₡
 			
 			
 				क्यूवाली रूपान्तरणयोग्य पेसो
 				क्यूवाली रूपान्तरणयोग्य पेसो
 				क्यूवाली रूपान्तरणयोग्य पेसो
+				CUC
+				$
 			
 			
 				क्यूवाली पेसो
 				क्यूवाली पेसो
 				क्यूवाली पेसो
+				CUP
+				$
 			
 			
 				केप भर्डियन एस्कुडो
 				केप भर्डियन एस्कुडो
 				केप भर्डियन एस्कुडो
+				CVE
 			
 			
 				चेख गणतञ्त्र कोरूना
 				चेख गणतञ्त्र कोरूना
 				चेख गणतञ्त्र कोरूना
+				CZK
+				Kč
 			
 			
 				जिबौंटियाली फ्रान्क
 				जिबौटियाली फ्रान्क
 				जिबौंटियाली फ्रान्क
+				DJF
 			
 			
 				ड्यानिश क्रोन
 				ड्यानिश क्रोन
 				ड्यानिश क्रोनर
+				DKK
+				kr
 			
 			
 				डोमिनिकन पेसो
 				डोमिनिकन पेसो
 				डोमिनिकन पेसो
+				DOP
+				$
 			
 			
 				अल्जेरियाली डिनार
 				अल्जेरियाली डिनार
 				अल्जेरियाली डिनार
+				DZD
 			
 			
 				इजिप्सियन पाउन्ड
 				इजिप्सियन पाउन्ड
 				इजिप्सियन पाउन्ड
+				EGP
+				E£
 			
 			
 				एरिट्रियन नाक्फा
 				एरिट्रियन नाक्फा
 				एरिट्रियन नाक्फा
+				ERN
 			
 			
 				इथियोपियाली बिर
 				इथियोपियाली बिर
 				इथियोपियाली बिर
+				ETB
 			
 			
 				युरो
 				युरो
 				युरो
+				€
+				€
 			
 			
 				फिजीयाली डलर
 				फिजीयाली डलर
 				फिजीयाली डलरहरू
+				FJD
+				$
 			
 			
 				फक्‌ल्याण्ड टापुहरूका पाउन्ड
 				फक्‌ल्याण्ड टापुहरूका पाउन्ड
 				फक्‌ल्याण्ड टापुहरूका पाउन्ड
+				FKP
+				£
 			
 			
 				बेलायती पाउण्ड स्टर्लिङ
 				बेलायती पाउण्ड स्टर्लिङ
 				बेलायती पाउण्ड स्टर्लिङ
+				£
+				£
 			
 			
 				जर्जियाली लारी
 				जर्जियाली लारी
 				जर्जियन लारी
+				GEL
+				₾
 				₾
 			
 			
 				घानाली सेडी
 				घानाली सेडी
 				घानाली सेडी
+				GHS
 			
 			
 				जिब्राल्टर पाउण्ड
 				जिब्राल्टर पाउण्ड
 				जिब्राल्टर पाउण्ड
+				GIP
+				£
 			
 			
 				गाम्वियाली डालासी
 				गाम्वियाली डालासी
 				गाम्वियाली डालासी
+				GMD
 			
 			
 				गिनियाली फ्रान्क
 				गिनियाली फ्रान्क
 				गिनियाली फ्रान्क
+				GNF
+				FG
 			
 			
 				ग्वाटेमाला क्वेट्जाल
 				ग्वाटेमाला क्वेट्जाल
 				ग्वाटेमाला क्वेट्जाल
+				GTQ
+				Q
 			
 			
 				गाइनिज डलर
 				गाइनिज डलर
 				गाइनिज डलर
+				GYD
+				$
 			
 			
 				हङकङ डलर
 				हङकङ डलर
 				हङकङ डलर
+				HK$
+				$
 			
 			
 				होन्डुरान लेम्पिरा
 				होन्डुरान लेम्पिरा
 				होन्डुरान लेम्पिरा
+				HNL
+				L
 			
 			
 				क्रोएशियाली कुना
 				क्रोएशियाली कुना
 				क्रोएशियाली कुना
+				HRK
+				kn
 			
 			
 				हैटियाली गुर्ड
 				हैटियाली
 				हैटियाली गुर्ड
+				HTG
 			
 			
 				हङ्गेरियन फोरिन्ट
 				हङ्गेरियन फोरिन्ट
 				हङ्गेरियन फोरिन्ट
+				HUF
+				Ft
 			
 			
 				इण्डोनेशियाली रूपियाँ
 				इण्डोनेशियाली रूपियाँ
 				इण्डोनेशियाली रूपियाँ
+				IDR
+				Rp
 			
 			
 				इजरायली नयाँ शेकेल
 				इजरायली नयाँ शेकेल
 				इजरायली नयाँ शेकेल
+				₪
+				₪
 			
 			
 				भारतीय रूपिँया
 				भारतीय रूपिँया
 				भारतीय रूपिँया
+				₹
+				₹
 			
 			
 				इराकी डिनार
 				इराकी डिनार
 				इराकी डिनार
+				IQD
 			
 			
 				इरानियाली रियाल
 				इरानियाली रियाल
 				इरानियाली रियाल
+				IRR
 			
 			
 				आइसल्याण्डिक क्रोना
 				आइसल्याण्डिक क्रोना
 				आइसल्याण्डिक क्रोनर
+				ISK
+				kr
 			
 			
 				जमाइकाली डलर
 				जमाइकाली डलर
 				जमाइकाली डलर
+				JMD
+				$
 			
 			
 				जोर्डानियाली डलर
 				जोर्डानियाली डलर
 				जोर्डानियाली डलर
+				JOD
 			
 			
 				जापानी येन
 				जापानी येन
 				जापानी येन
+				JP¥
+				¥
 			
 			
 				केन्याली शिलिङ
 				केन्याली शिलिङ
 				केन्याली शिलिङ
+				KES
 			
 			
 				किर्गिस्तानी सोम
 				किर्गिस्तानी सोम
 				किर्गिस्तानी सोम
+				KGS
 			
 			
 				कम्बोडिनेयाली रियल
 				कम्बोडिनेयाली रियल
 				कम्बोडिनेयाली रियल
+				KHR
+				៛
 			
 			
 				कोमोरियन फ्रान्क
 				कोमोरियन फ्रान्क
 				कोमोरियन फ्रान्क
+				KMF
+				CF
 			
 			
 				उत्तर कोरियाली वन
 				उत्तर कोरियाली वन
 				उत्तर कोरियाली वन
+				KPW
+				₩
 			
 			
 				दक्षिण कोरियाली वन
 				दक्षिण कोरियाली वन
 				दक्षिण कोरियाली वन
+				₩
+				₩
 			
 			
 				कुवेती डिनार
 				कुवेती डिनार
 				कुवेती डिनार
+				KWD
 			
 			
 				केम्यान टापुहरूका डलर
 				केम्यान टापुहरूका डलर
 				केम्यान टापुहरूका डलर
+				KYD
+				$
 			
 			
 				काजाखस्तानी टेन्ज
 				काजाखस्तानी टेन्ज
 				काजाखस्तानी टेन्ज
+				KZT
+				₸
 			
 			
 				लाओशियन किप
 				लाओशियन किप
 				लाओशियन किप
+				LAK
+				₭
 			
 			
 				लेबनाली पाउन्ड
 				लेबनाली पाउन्ड
 				लेबनाली पाउन्ड
+				LBP
+				L£
 			
 			
 				श्रीलङ्काली रूपिया
 				श्रीलङ्काली रूपिया
 				श्रीलङ्काली रूपिया
+				LKR
+				Rs
 			
 			
 				लिबेरियाली डलर
 				लिबेरियाली डलर
 				लिबेरियाली डलर
+				LRD
+				$
 			
 			
 				लिथुनियाली लिटास
 				लिथुनियाली लिटास
 				लिथुनियाली लिटाई
+				LTL
 			
 			
 				लाट्भियाली लाट्स
 				लाट्भियाली लाट्स
 				लाट्भियाली लाटी
+				LVL
 			
 			
 				लिवियाली डिनार
 				लिवियाली डिनार
 				लिवियाली डिनार
+				LYD
 			
 			
 				मोरोक्काली डिर्‌हाम
 				मोरोक्काली डिर्‌हाम
 				मोरोक्काली डिर्‌हाम
+				MAD
 			
 			
 				माल्डोभन लेउ
 				माल्डोभन लेउ
 				माल्डोभन लेई
+				MDL
 			
 			
 				मालागासी एरिआरी
 				मालागासी एरिआरी
 				मालागासी एरिआरी
+				MGA
+				Ar
 			
 			
 				म्यासेडोनियाली डेनार
 				म्यासेडोनियाली डेनार
 				म्यासेडोनियाली डेनारी
+				MKD
 			
 			
 				म्यान्मार क्याट
 				म्यान्मार क्याट
 				म्यान्मार क्याट
+				MMK
+				K
 			
 			
 				मङ्गोलियाली टुग्रिक
 				मङ्गोलियाली टुग्रिक
 				मङ्गोलियाली टुग्रिक
+				MNT
+				₮
 			
 			
 				माकानिज पटाका
 				माकानिज पटाका
 				माकानिज पटाका
+				MOP
 			
 			
 				माउरिटानियानली औगुइया (१९७३–२०१७)
 				माउरिटानियाली औगुइया (१९७३–२०१७)
 				माउरिटानियानली औगुइया (१९७३–२०१७)
+				MRO
 			
 			
 				माउरिटानियानली औगुइया
 				माउरिटानियाली औगुइया
 				माउरिटानियानली औगुइया
+				MRU
 			
 			
 				माउरिटियन रूपी
 				माउरिटियन रूपी
 				माउरिटियन रूपी
+				MUR
+				Rs
 			
 			
 				मालडिभियाली रूफियाँ
 				मालडिभियाली रूफियाँ
 				मालडिभियाली रूफियाँ
+				MVR
 			
 			
 				मलाविअन क्वाचा
 				मलाविअन क्वाचा
 				मलाविअन क्वाचा
+				MWK
 			
 			
 				मेक्सिकन पेसो
 				मेक्सिकन पेसो
 				मेक्सिकन पेसो
+				MX$
+				$
 			
 			
 				मलेशियाली रिङ्गेट
 				मलेशियाली रिङ्गेट
 				मलेशियाली रिङ्गेट
+				MYR
+				RM
 			
 			
 				मोजाम्विकन मेटिकल
 				मोजाम्विकन मेटिकल
 				मोजाम्विकन मेटिकल
+				MZN
 			
 			
 				नामिबियन डलर
 				नामिबियन डलर
 				नामिबियन डलर
+				NAD
+				$
 			
 			
 				नाइजेरियन नाइरा
 				नाइजेरियन नाइरा
 				नाइजेरियन नाइरा
+				NGN
+				₦
 			
 			
 				निकारागुवान कोर्डोवा
 				निकारागुवान कोर्डोवा
 				निकारागुवान कोर्डोवा
+				NIO
+				C$
 			
 			
 				नर्वेजियाली क्रोन
 				नर्वेजियाली क्रोन
 				नर्वेजियाली क्रोनर
+				NOK
+				kr
 			
 			
 				नेपाली रूपैयाँ
@@ -5418,263 +5539,341 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				न्यूजिल्याण्ड डलर
 				न्यूजिल्याण्ड डलर
 				न्यूजिल्याण्ड डलरहरू
+				NZ$
+				$
 			
 			
 				ओमनी रियल
 				ओमनी रियाल
 				ओमनी रियल
+				OMR
 			
 			
 				पानामानियाली बाल्बोआ
 				पानामानियाली बाल्बोआ
 				पानामानियाली बाल्बोआ
+				PAB
 			
 			
 				पेरूभियाली सोल
 				पेरूभियाली सोल
 				पेरूभियाली सोल
+				PEN
 			
 			
 				पपुआ न्यू गिनियाली किना
 				पपुआ न्यू गिनियाली किना
 				पपुआ न्यू गिनियाली किना
+				PGK
 			
 			
 				फिलिपिनी पेसो
 				फिलिपिनी पेसो
 				फिलिपिनी पेसो
+				PHP
+				₱
 			
 			
 				पाकिस्तानी रूपियाँ
 				पाकिस्तानी रूपियाँ
 				पाकिस्तानी रूपियाँ
+				PKR
+				Rs
 			
 			
 				पोलिश ज्लोटाई
 				पोलिश ज्लोटाई
 				पोलिश ज्लोटाई
+				PLN
+				zł
 			
 			
 				पारागुयाली गुरानी
 				पारागुयाली गुरानी
 				पारागुयाली गुरानी
+				PYG
+				₲
 			
 			
 				कतारी रियल
 				कतारी रियाल
 				कतारी रियल
+				QAR
 			
 			
 				रोमानियाली लेऊ
 				रोमानियाली लेऊ
 				रोमानियाली लेई
+				RON
+				lei
 			
 			
 				सर्बियाली डिनार
 				सर्बियाली डिनार
 				सर्बियाली डिनार
+				RSD
 			
 			
 				रूसी रूबल
 				रूसी रूबल
 				रूसी रूबल
+				RUB
+				₽
 			
 			
 				र्‌वाण्डाली फ्रान्क
 				र्‌वाण्डाली फ्रान्क
 				र्‌वाण्डाली फ्रान्क
+				RWF
+				RF
 			
 			
 				साउदी रियालहरू
 				साउदी रियाल
 				साउदी रियाल
+				SAR
 			
 			
 				सोलोमन टापुहरूका डलर
 				सोलोमन टापुहरूका डलर
 				सोलोमन टापुहरूका डलर
+				SBD
+				$
 			
 			
 				सेचेलोइस रूपी
 				सेचेलोइस रूपी
 				सेचेलोइस रूपी
+				SCR
 			
 			
 				सुडानी पाउन्ड
 				सुडानी पाउन्ड
 				सुडानी पाउन्ड
+				SDG
 			
 			
 				स्विडिश क्रोना
 				स्विडिश क्रोना
 				स्विडिश क्रोनर
+				SEK
+				kr
 			
 			
 				सिङ्गापुर डलर
 				सिङ्गापुर डलर
 				सिङ्गापुर डलर
+				SGD
+				$
 			
 			
 				सेन्ट हेलेना पाउन्ड
 				सेन्ट हेलेना पाउन्ड
 				सेन्ट हेलेना पाउन्ड
+				SHP
+				£
 			
 			
 				सियरा लियोनेन लियोन
 				सियरा लियोनेन लियोन
 				सियरा लियोनेन लियोन
+				SLL
 			
 			
 				सोमाली शिलिङ
 				सोमाली शिलिङ
 				सोमाली शिलिङ
+				SOS
 			
 			
 				सुरिनामिज डलर
 				सुरिनामिज डलर
 				सुरिनामिज डलर
+				SRD
+				$
 			
 			
 				दक्षिण सुडानी पाउन्ड
 				दक्षिण सुडानी पाउन्ड
 				दक्षिण सुडानी पाउन्ड
+				SSP
+				£
 			
 			
 				साओ टोम र प्रिन्सिप डोब्रा (१९७७–२०१७)
 				साओ टोम र प्रिन्सिप डोब्रा (१९७७–२०१७)
 				साओ टोम र प्रिन्सिप डोब्रा (१९७७–२०१७)
+				STD
 			
 			
 				साओ टोम र प्रिन्सिप डोब्रा
 				साओ टोम र प्रिन्सिप डोब्रा
 				साओ टोम र प्रिन्सिप डोब्रा
+				STN
 				Db
 			
 			
 				सिरियाली पाउन्ड
 				सिरियाली पाउन्ड
 				सिरियाली पाउन्ड
+				SYP
+				£
 			
 			
 				स्वाजी लिलान्गेनी
 				स्वाजी लिलान्गेनी
 				स्वाजी इमालेन्गेनी
+				SZL
 			
 			
 				थाई भाट
 				थाई भाट
 				थाई भाट
 				฿
+				฿
 			
 			
 				ताजिक्स्तानी सोमोनी
 				ताजिक्स्तानी सोमोनी
 				ताजिक्स्तानी सोमोनी
+				TJS
 			
 			
 				टुर्क्मेनिस्तानी मानात
 				टुर्क्मेनिस्तानी मानात
 				टुर्क्मेनिस्तानी मानात
+				TMT
 			
 			
 				टुनिसियाली डिनार
 				टुनिसियाली डिनार
 				टुनिसियाली डिनार
+				TND
 			
 			
 				टङ्गन पाङ्गा
 				टङ्गन पाङ्गा
 				टङ्गन पाङ्गा
+				TOP
+				T$
 			
 			
 				टर्किश लिरा
 				टर्किश लिरा
 				टर्किश लिरा
+				TRY
+				₺
+				TL
 			
 			
 				त्रिनिडाड र टोबागो डलर
 				त्रिनिडाड र टोबागो डलर
 				त्रिनिडाड र टोबागो डलर
+				TTD
+				$
 			
 			
 				नयाँ ताइवान डलर
 				नयाँ ताइवान डलर
 				नयाँ ताइवान डलर
+				NT$
+				$
 			
 			
 				ताञ्जानियाली शिलिङ
 				ताञ्जानियाली शिलिङ
 				ताञ्जानियाली शिलिङ
+				TZS
 			
 			
 				युक्रेनी हिर्भिनिया
 				युक्रेनी हिर्भिनिया
 				युक्रेनी हिर्भिनिया
+				UAH
+				₴
 			
 			
 				युगाण्डाली शिलिङ
 				युगाण्डाली शिलिङ
 				युगाण्डाली शिलिङ
+				UGX
 			
 			
 				अमेरिकी डलर
 				अमेरिकी डलर
 				संयुक्त राज्य डलर
+				US$
+				$
 			
 			
 				उरूगुवायाली पेसो
 				उरूगुवायाली पेसो
 				उरूगुवायाली पेसो
+				UYU
+				$
 			
 			
 				उज्बेकिस्तान सोम
 				उज्बेकिस्तान सोम
 				उज्बेकिस्तान सोम
+				UZS
 			
 			
 				भेनेजुएलन बोलिभर (२००८–२०१८)
 				भेनेजुएलन बोलिभर
 				भेनेजुएलन बोलिभर
+				VEF
+				Bs
 			
 			
 				भेनेजुएलन बोलिभर-2
 				भेनेजुएलन बोलिभर मुद्रा
 				भेनेजुएलन बोलिभर-3
+				VES
 			
 			
 				भियतनामी डङ्
 				भियतनामी डङ्
 				भियतनामी डङ्
+				₫
+				₫
 			
 			
 				भानुआतू भातु
 				भानुआतू भातु
 				भानुआतू भातुहरू
+				VUV
 			
 			
 				सामोआन ताला
 				सामोआन ताला
 				सामोआन ताला
+				WST
 			
 			
 				सीएफ्‌ए फ्रान्क बीइएसी
 				सीएफ्‌ए फ्रान्क बीइएसी
 				सीएफ्‌ए फ्रान्क बीइएसी
+				FCFA
 			
 			
 				पूर्वी क्यारिबियन डलर
 				पूर्वी क्यारिबियन डलर
 				पूर्वी क्यारिबियन डलर
+				EC$
+				$
 			
 			
 				सीएफ्‌ए फ्रान्क बीसीइएओ
 				सीएफ्‌ए फ्रान्क बीसीइएओ
 				सीऐफ्‌ए फ्रान्क्स बीसीइएओ
+				CFA
 			
 			
 				सीएफ्‌पी फ्रान्क
 				सीएफ्‌पी फ्रान्क
 				सीएफ्‌पी फ्रान्कहरू
+				CFPF
 			
 			
 				अज्ञात मुद्रा
@@ -5685,11 +5884,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				येमेनी रियाल
 				येमेनी रियाल
 				येमेनी रियाल
+				YER
 			
 			
 				दक्षिण अफ्रिकी र्‍यान्ड
 				दक्षिण अफ्रिकी र्‍यान्ड
 				दक्षिण अफ्रिकी र्‍यान्ड
+				ZAR
+				R
 			
 			
 				जाम्बियाली क्वाचा (१९६८–२०१२)
@@ -5700,6 +5902,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				जाम्बियाली क्वाचा
 				जाम्बियाली क्वाचा
 				जाम्बियाली क्वाचा
+				ZMW
+				ZK
 			
 		
 		
@@ -5930,6 +6134,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} शताब्दी
 				{0} शताब्दी
 			
+			
+				दशाब्दी
+				{0} दशाब्दी
+				{0} दशाब्दी
+			
 			
 				वर्ष
 				{0} वर्ष
@@ -6047,6 +6256,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} बेलायती ताप एकाइ
 				{0} बेलायती तापीय एकाइ
 			
+			
+				युएस थर्म
+				{0} युएस थर्म
+				{0} युएस थर्म
+			
 			
 				पाउन्ड बल
 				{0} पाउन्ड बल
@@ -6077,6 +6291,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हर्ज
 				{0} हर्ज
 			
+			
+				टाइपोग्रापिक एम
+			
+			
+				पिक्सेल
+				{0} पिक्सेल
+				{0} पिक्सेल
+			
+			
+				मेगापिक्सेल
+				{0} मेगापिक्सेल
+				{0} मेगापिक्सेल
+			
+			
+				पिक्सेल प्रति सेन्टिमिटर
+				{0} पिक्सेल प्रति सेन्टिमिटर
+				{0} पिक्सेल प्रति सेन्टिमिटर
+			
+			
+				पिक्सेल प्रति इन्च
+				{0} पिक्सेल प्रति इन्च
+				{0} पिक्सेल प्रति इन्च
+			
+			
+				डट प्रति सेन्टिमिटर
+				{0} डट प्रति सेन्टिमिटर
+				{0} डट प्रति सेन्टिमिटर
+			
+			
+				डट प्रति इन्च
+				{0} डट प्रति इन्च
+				{0} डट प्रति इन्च
+			
 			
 				किलोमिटर
 				{0} किलोमिटर
@@ -6286,11 +6533,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हर्सपावर
 				{0} हर्सपावर
 			
-			
-				हेक्टो पास्कल
-				{0} हेक्टो पास्कल
-				{0} हेक्टो पास्कल
-			
 			
 				मिलिमिटर पारो
 				{0} मिलिमिटर पारो
@@ -6306,6 +6548,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} इन्च पारो
 				{0} इन्च पारो
 			
+			
+				धर्का
+				{0} धर्का
+				{0} धर्का
+			
 			
 				मिलिबार
 				{0} मिलिबार
@@ -6316,6 +6563,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} वायुमण्डल
 				{0} वायुमण्डलहरू
 			
+			
+				पास्कल
+				{0} पास्कल
+				{0} पास्कल
+			
+			
+				हेक्टो पास्कल
+				{0} हेक्टो पास्कल
+				{0} हेक्टो पास्कल
+			
 			
 				किलोपास्कल
 				{0} किलोपास्कल
@@ -6523,6 +6780,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}प्रति {1}
 			
+			
+				{0}⋅{1}
+			
 			
 				गुरूत्वाकर्षण शक्ति
 				{0} G
@@ -6645,8 +6905,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				पर्माइराइड
-				{0}‱
-				{0}‱
 			
 			
 				मोल
@@ -6733,6 +6991,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} शताब्दी
 				{0} शताब्दी
 			
+			
+				दशाब्दी
+				{0} दशाब्दी
+				{0} दशाब्दी
+			
 			
 				वर्ष
 				{0} वर्ष
@@ -6850,6 +7113,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} बेलाइती तापीय एकाइ
 				{0} बेलाइती तापीय एकाइ
 			
+			
+				युएस थर्म
+				{0} युएस थर्म
+				{0} युएस थर्म
+			
 			
 				पाउन्ड बल
 				{0} पाउन्ड बल
@@ -6880,6 +7148,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				पिक्सेल
+				{0} px
+				{0} px
+			
+			
+				मेगापिक्सेल
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				कि.मि.
 				{0}कि.मि.
@@ -6977,8 +7280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				सौर्य रेडिआई
-				{0} R☉
-				{0} R☉
 			
 			
 				लक्स
@@ -6987,8 +7288,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				सौर्य प्रकाश
-				{0} L☉
-				{0} L☉
 			
 			
 				t
@@ -7051,13 +7350,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				पृथ्वी घन
-				{0} M⊕
-				{0} M⊕
+				{0} M⊕
+				{0} M⊕
 			
 			
 				सौर्य घन
-				{0} M☉
-				{0} M☉
 			
 			
 				GW
@@ -7089,11 +7386,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हर्सपावर
 				{0} हर्सपावर
 			
-			
-				हेक्टो पास्कल
-				{0}hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7109,6 +7401,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} इन्च पारो
 				{0} इन्च पारो
 			
+			
+				धर्का
+				{0} धर्का
+				{0} धर्का
+			
 			
 				मिलिबार
 				{0} मिलिबार
@@ -7119,6 +7416,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} वायु
 				{0} वायु
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				हेक्टो पास्कल
+				{0}hPa
+				{0} hPa
+			
 			
 				किलोपास्कल
 				{0} किलोपास्कल
@@ -7169,11 +7476,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
 			
 				न्युटन मिटर
 				{0} न्युटन मिटर
@@ -7294,11 +7596,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -7492,10 +7789,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} हर्सपावर
 				{0} हर्सपावर
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} ईञ्‍च पारो
 				{0} ईञ्‍च पारो
@@ -7504,6 +7797,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} मिलीबार
 				{0} मिलीबार
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				किलोमिटर प्रति घण्टा
 				{0} km/h
@@ -7570,6 +7867,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, वा {1}
 			{0} वा {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+			{0}, {1}
+		
 		
 			{0},{1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/ne_IN.xml b/make/data/cldr/common/main/ne_IN.xml
index d0d9a4f5349..b0959b1f384 100644
--- a/make/data/cldr/common/main/ne_IN.xml
+++ b/make/data/cldr/common/main/ne_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ne_NP.xml b/make/data/cldr/common/main/ne_NP.xml
index dbe8c6907b3..4d74477bdfa 100644
--- a/make/data/cldr/common/main/ne_NP.xml
+++ b/make/data/cldr/common/main/ne_NP.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl.xml b/make/data/cldr/common/main/nl.xml
index 33882332dd5..810dabc0729 100644
--- a/make/data/cldr/common/main/nl.xml
+++ b/make/data/cldr/common/main/nl.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -161,8 +161,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Grieks
 			Elamitisch
 			Engels
-			Engels (VK)
-			Engels (VS)
 			Middelengels
 			Esperanto
 			Spaans
@@ -610,6 +608,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yoruba
 			Nheengatu
 			Kantonees
+			Kantonees
 			Zhuang
 			Zapotec
 			Blissymbolen
@@ -617,6 +616,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Zenaga
 			Standaard Marokkaanse Tamazight
 			Chinees
+			Mandarijn
+			Mandarijn (vereenvoudigd)
+			Mandarijn (traditioneel)
 			Zoeloe
 			Zuni
 			geen linguïstische inhoud
@@ -626,6 +628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -646,6 +649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -727,6 +731,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -756,6 +761,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -1441,19 +1447,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á ä b c d e é ë f g h i í ï {ij} {íj\u0301} j k l m n o ó ö p q r s t u ú ü v w x y z]
 		[à â å ã æ ç è ê î ñ ô ø œ ù û ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
@@ -1468,6 +1469,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		
 			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
 				
 					
 						
@@ -1501,14 +1513,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -1526,52 +1552,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -1653,6 +1667,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mnd 11
 							mnd 12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							maand 1
 							maand 2
@@ -1683,6 +1711,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mnd 11
 							mnd 12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							maand 1
 							maand 2
@@ -1699,7 +1741,462 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1782,6 +2279,196 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							
 						
 					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -1852,17 +2539,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						h B
+						h:mm B
+						h:mm:ss B
+						d
+						ccc
+						E h:mm B
+						E h:mm:ss B
 						E d
 						U
 						MMM U
 						d MMM U
 						E d MMM U
+						h a
+						HH
+						h:mm a
+						HH:mm
+						h:mm:ss a
+						HH:mm:ss
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
+						mm:ss
+						U MM
+						U MM-d
+						U MMM
+						U MMM d
 						U
 						y-MM-dd
 						U
@@ -1877,14 +2604,98 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ U
 					
 					
-						
-							h B – h B
-							h–h B
+						{0} – {1}
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
+						
+							MM–MM
+						
+						
+							MM-dd – MM-dd
+							MM-dd – MM-dd
+						
+						
+							MM-dd, E – MM-dd, E
+							MM-dd, E – MM-dd, E
+						
+						
+							LLL–LLL
+						
+						
+							MMM d–d
+							MMM d – MMM d
+						
+						
+							MMM d, E – MMM d, E
+							MMM d, E – MMM d, E
+						
+						
+							U–U
+						
+						
+							y-MM – y-MM
+							y-MM – y-MM
+						
+						
+							y-MM-dd – y-MM-dd
+							y-MM-dd – y-MM-dd
+							y-MM-dd – y-MM-dd
+						
+						
+							y-MM-dd, E – y-MM-dd, E
+							y-MM-dd, E – y-MM-dd, E
+							y-MM-dd, E – y-MM-dd, E
+						
+						
+							U MMM–MMM
+							U MMM – U MMM
+						
+						
+							U MMM d–d
+							U MMM d – MMM d
+							U MMM d – U MMM d
+						
+						
+							U MMM d, E – MMM d, E
+							U MMM d, E – MMM d, E
+							U MMM d, E – U MMM d, E
+						
+						
+							U MMMM–MMMM
+							U MMMM – U MMMM
 						
 					
 				
@@ -1907,6 +2718,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Misra
 							Nasi
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tut
 							Babah
@@ -1939,6 +2765,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Misra
 							Nasi
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tut
 							Babah
@@ -1956,6 +2797,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 				
 					
 						
@@ -1989,14 +2844,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -2014,52 +2883,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -2141,6 +2998,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mnd 11
 							mnd 12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							maand 1
 							maand 2
@@ -2171,6 +3042,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							mnd 11
 							mnd 12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							maand 1
 							maand 2
@@ -2187,7 +3072,462 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+					
+					
+						
+							{0}bis
+						
+						
+							{0}b
+						
+						
+							{0}bis
+						
+					
+				
 				
+					
+						
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+							
+								zi
+								chou
+								yin
+								mao
+								chen
+								si
+								wu
+								wei
+								shen
+								you
+								xu
+								hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -2270,6 +3610,196 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							
 						
 					
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
 					
 						
 							
@@ -2350,14 +3880,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						r (U)
 						MMM r (U)
 						d MMM r
 						E d MMM r (U)
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -2379,14 +3923,98 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ r (U)
 					
 					
-						
-							h B – h B
-							h–h B
+						{0} – {1}
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
+						
+							MM–MM
+						
+						
+							MM-dd – MM-dd
+							MM-dd – MM-dd
+						
+						
+							MM-dd, E – MM-dd, E
+							MM-dd, E – MM-dd, E
+						
+						
+							LLL–LLL
+						
+						
+							MMM d–d
+							MMM d – MMM d
+						
+						
+							MMM d, E – MMM d, E
+							MMM d, E – MMM d, E
+						
+						
+							U–U
+						
+						
+							y-MM – y-MM
+							y-MM – y-MM
+						
+						
+							y-MM-dd – y-MM-dd
+							y-MM-dd – y-MM-dd
+							y-MM-dd – y-MM-dd
+						
+						
+							y-MM-dd, E – y-MM-dd, E
+							y-MM-dd, E – y-MM-dd, E
+							y-MM-dd, E – y-MM-dd, E
+						
+						
+							U MMM–MMM
+							U MMM – U MMM
+						
+						
+							U MMM d–d
+							U MMM d – MMM d
+							U MMM d – U MMM d
+						
+						
+							U MMM d, E – MMM d, E
+							U MMM d, E – MMM d, E
+							U MMM d, E – U MMM d, E
+						
+						
+							U MMMM–MMMM
+							U MMMM – U MMMM
 						
 					
 				
@@ -2409,6 +4037,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Nähase
 							Pagumän
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Mäskäräm
 							Teqemt
@@ -2441,6 +4084,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Nähase
 							Pagumän
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Mäskäräm
 							Teqemt
@@ -2495,14 +4153,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} 'om' {0}
+						
+					
+					
+						
+							{1} 'om' {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -2520,52 +4202,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -2732,55 +4402,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+							M-y GGGGG – M-y GGGGG
+							M-y – M-y GGGGG
+							M-y – M-y GGGGG
 						
 						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
+							d-M-y GGGGG – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
 						
 						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
+							E d-M-y GGGGG – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+							d–d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
 						
 						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M–M
@@ -3158,6 +4851,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -3234,55 +4949,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							y G – y G
+							y G – y G
 							y – y G
 						
 						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+							M-y GGGGG – M-y GGGGG
+							M-y – M-y GGGGG
+							M-y – M-y GGGGG
 						
 						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
+							d-M-y GGGGG – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
+							d-M-y – d-M-y GGGGG
 						
 						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
+							E d-M-y GGGGG – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
+							E d-M-y – E d-M-y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+							d–d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
 						
 						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
 						
 						
 							h a – h a
@@ -3398,6 +5104,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Av
 							Elloel
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tisjrie
 							Chesjwan
@@ -3432,6 +5154,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Av
 							Elloel
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tisjrie
 							Chesjwan
@@ -3450,6 +5188,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 				
 					
 						
@@ -3483,14 +5232,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d MMM
 						E d MMM
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -3508,52 +5271,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -3635,6 +5386,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Maagha
 							Phaalguna
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Chaitra
 							Vaishakha
@@ -3665,6 +5430,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Maagha
 							Phaalguna
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Chaitra
 							Vaishakha
@@ -3681,6 +5460,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 				
 					
 						
@@ -3714,14 +5504,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -3739,52 +5543,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -3866,6 +5658,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Doe al k.
 							Doe al h.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Moeharram
 							Safar
@@ -3896,6 +5702,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Doe al k.
 							Doe al h.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Moeharram
 							Safar
@@ -3916,6 +5736,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						Saʻna Hizjria
 					
+					
+						AH
+					
+					
+						AH
+					
 				
 				
 					
@@ -3950,14 +5776,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -3975,52 +5815,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -4088,91 +5916,718 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
 						Tenpyō-hōji (757-765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
 						Kaho (1094–1096)
+						Eichō (1096–1097)
 						Shōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
 						Ten-ei (1110-1113)
+						Eikyū (1113–1118)
 						Gen-ei (1118-1120)
 						Hoan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
 						Hoen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
 						Hogen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
 						Ken-ei (1206-1207)
 						Shōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
 						Shōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
 						Tempuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
 						En-ō (1239-1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
 						Bun-ō (1260-1261)
+						Kōchō (1261–1264)
 						Bun-ei (1264-1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
 						Enkei (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
 						Genkyō (1321–1324)
+						Shōchū (1324–1326)
 						Kareki (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
 						Kemmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
 						Bun-an (1444-1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
 						Tenmon (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
 						Genwa (1615–1624)
 						Kan-ei (1624-1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
 						Shōō (1652–1655)
 						Meiryaku (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
 						Tenwa (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
 						Kan-en (1748-1751)
 						Hōryaku (1751–1764)
+						Meiwa (1764–1772)
 						An-ei (1772-1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
 						Man-en (1860-1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
 						Tenpyō-hōji (757-765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
 						Kaho (1094–1096)
+						Eichō (1096–1097)
 						Shōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
 						Ten-ei (1110-1113)
+						Eikyū (1113–1118)
 						Gen-ei (1118-1120)
 						Hoan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
 						Hoen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
 						Hogen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
 						Ken-ei (1206-1207)
 						Shōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
 						Shōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
 						Tempuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
 						En-ō (1239-1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
 						Bun-ō (1260-1261)
+						Kōchō (1261–1264)
 						Bun-ei (1264-1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
 						Enkei (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
 						Genkyō (1321–1324)
+						Shōchū (1324–1326)
 						Kareki (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
 						Kemmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
 						Bun-an (1444-1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
 						Tenmon (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
 						Genwa (1615–1624)
 						Kan-ei (1624-1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
 						Shōō (1652–1655)
 						Meiryaku (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
 						Tenwa (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
 						Kan-en (1748-1751)
 						Hōryaku (1751–1764)
+						Meiwa (1764–1772)
 						An-ei (1772-1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
 						Man-en (1860-1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
+						Tenpyō (729–749)
 						Tenpyō-kampō (749-749)
 						Tenpyō-shōhō (749-757)
+						Tenpyō-hōji (757–765)
 						Tenpyō-jingo (765-767)
 						Jingo-keiun (767-770)
+						Hōki (770–780)
 						Ten-ō (781-782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
+						Saikō (854–857)
 						Ten-an (857-859)
+						Jōgan (859–877)
+						Gangyō (877–885)
+						Ninna (885–889)
+						Kanpyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
+						Jōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
+						Ten’en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
+						Eien (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
+						Eihō (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
+						Kahō (1094–1096)
+						Eichō (1096–1097)
+						Jōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
+						Ten-ei (1110–1113)
+						Eikyū (1113–1118)
+						Gen’ei (1118–1120)
+						Hōan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
+						Hōen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
+						Ten’yō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
+						Hōgen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
+						Nin’an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
+						Genryaku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
+						Ken’ei (1206–1207)
+						Jōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
+						Jōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
+						Tenpuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
+						En’ō (1239–1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
+						Bun’ō (1260–1261)
+						Kōchō (1261–1264)
+						Bun’ei (1264–1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
 						Enkei (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
+						Genkō (1321–1324)
+						Shōchū (1324–1326)
 						Kareki (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
+						Kenmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
+						Bun’an (1444–1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
+						Tenbun (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
+						Genna (1615–1624)
+						Kan’ei (1624–1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
+						Jōō (1652–1655)
+						Meireki (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
+						Tenna (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
 						Enkei (1744–1748)
+						Kan’en (1748–1751)
+						Hōreki (1751–1764)
+						Meiwa (1764–1772)
+						An’ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
+						Man’en (1860–1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						M
+						T
+						S
+						H
 					
 				
 				
@@ -4198,14 +6653,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} 'om' {0}
+						
+					
+					
+						
+							{1} 'om' {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -4223,52 +6702,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -4334,6 +6801,107 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
+				
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+					
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Farvardin
+							Ordibehesht
+							Khordad
+							Tir
+							Mordad
+							Shahrivar
+							Mehr
+							Aban
+							Azar
+							Dey
+							Bahman
+							Esfand
+						
+					
+				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 				
 					
 						
@@ -4367,14 +6935,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -4392,52 +6974,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -4550,14 +7120,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'om' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E d MMM y G
+						L
 						d-M
 						E d-M
+						LLL
 						d MMM
 						E d MMM
 						d MMMM
@@ -4575,52 +7159,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
+						
+							d–d
 						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+						
+							h a – h a
+							h–h a
 						
-						
-							y G – y G
-							y – y G
+						
+							HH–HH
 						
-						
-							M-y GGGGG – M-y GGGGG
-							M-y – M-y GGGGG
-							M-y – M-y GGGGG
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							d-M-y – d-M-y GGGGG
-							d-M-y GGGGG – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
-							d-M-y – d-M-y GGGGG
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y GGGGG – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
-							E d-M-y – E d-M-y GGGGG
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							d–d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
+						
+							h a – h a v
+							h–h a v
 						
-						
-							E d MMM – E d MMM y G
-							E d MMM y G – E d MMM y G
-							E d MMM – E d MMM y G
-							E d MMM y – E d MMM y G
+						
+							HH–HH v
 						
 						
 							M–M
@@ -5258,7 +7830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				uur
+				u
 				binnen een uur
 				
 					over {0} uur
@@ -5374,6 +7946,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					Gecoördineerde wereldtijd
 				
+				
+					UTC
+				
 			
 			
 				onbekende stad
@@ -5708,6 +8283,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Blanc-Sablon
 			
+			
+				Saint John’s
+			
 			
 				Cocoseilanden
 			
@@ -6011,6 +8589,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Comoro
 			
+			
+				Saint Kitts
+			
 			
 				Pyongyang
 			
@@ -6035,6 +8616,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aqtöbe
 			
+			
+				Qostanay
+			
 			
 				Qyzylorda
 			
@@ -6047,6 +8631,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Beiroet
 			
+			
+				Saint Lucia
+			
 			
 				Vaduz
 			
@@ -6608,12 +9195,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Vaticaanstad
 			
+			
+				Saint Vincent
+			
 			
 				Caracas
 			
 			
 				Tortola
 			
+			
+				Saint Thomas
+			
 			
 				Ho Chi Minhstad
 			
@@ -7058,7 +9651,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Galapagoseilandse standaardtijd
+					Galapagoseilandse tijd
 				
 			
 			
@@ -7659,87 +10252,312 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
+		
+			٫
+			٬
+			؛
+			٪؜
+			؜+
+			؜-
+			اس
+			×
+			؉
+			∞
+			NaN
+			:
+		
+		
+			٫
+			٬
+			؛
+			٪
+			‎+‎
+			‎-‎
+			×۱۰^
+			×
+			؉
+			∞
+			NaN
+			٫
+		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -7750,96 +10568,478 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
 		
 			,
 			.
+			;
+			%
+			+
+			-
+			E
+			×
+			‰
+			∞
+			NaN
+			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 duizend
@@ -7897,6 +11097,314 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#,##0.###
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
 		
 			
 				
@@ -7904,6 +11412,167 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
+		
+			
+				
+					#E0
+				
+			
+		
 		
 			
 				
@@ -7911,6 +11580,146 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
 		
 			
 				
@@ -7918,6 +11727,177 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0%
+				
+			
+		
+		
+			
+				
+					#,##0.00 ¤
+				
+				
+					#,##0.00 ¤
+				
+			
+		
 		
 			
 				
@@ -7927,6 +11907,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7937,6 +11919,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7947,6 +11931,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7957,6 +11943,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7967,6 +11955,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7977,6 +11967,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7987,6 +11979,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -7997,6 +11991,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8007,6 +12003,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8017,6 +12015,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8027,6 +12027,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8037,6 +12039,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8047,6 +12051,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8057,6 +12063,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8067,6 +12075,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8077,6 +12087,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8087,6 +12099,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8097,6 +12111,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8107,6 +12123,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8117,6 +12135,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8167,6 +12187,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8177,6 +12199,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8187,6 +12211,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8197,6 +12223,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8207,6 +12235,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8217,6 +12247,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8227,6 +12259,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8237,6 +12271,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8247,6 +12283,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8257,6 +12295,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8267,6 +12307,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8277,6 +12319,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8287,6 +12331,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8297,6 +12343,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8307,6 +12355,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8317,6 +12367,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8327,6 +12379,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8337,6 +12391,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8347,6 +12403,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8357,6 +12415,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8367,6 +12427,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8377,6 +12439,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
@@ -8387,12 +12451,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤ #,##0.00;(¤ #,##0.00)
 				
 			
+			{0} {1}
+			{0} {1}
 		
 		
 			
 				Andorrese peseta
 				Andorrese peseta
 				Andorrese peseta
+				ADP
 			
 			
 				Verenigde Arabische Emiraten-dirham
@@ -8404,6 +12471,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afghani (1927–2002)
 				Afghani (AFA)
 				Afghani (AFA)
+				AFA
 			
 			
 				Afghaanse afghani
@@ -8415,6 +12483,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Albanese lek (1946–1965)
 				Albanese lek (1946–1965)
 				Albanese lek (1946–1965)
+				ALK
 			
 			
 				Albanese lek
@@ -8445,36 +12514,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Angolese kwanza (1977–1990)
 				Angolese kwanza (1977–1990)
 				Angolese kwanza (1977–1990)
+				AOK
 			
 			
 				Angolese nieuwe kwanza (1990–2000)
 				Angolese nieuwe kwanza (1990–2000)
 				Angolese nieuwe kwanza (1990–2000)
+				AON
 			
 			
 				Angolese kwanza reajustado (1995–1999)
 				Angolese kwanza reajustado (1995–1999)
 				Angolese kwanza reajustado (1995–1999)
+				AOR
 			
 			
 				Argentijnse austral
 				Argentijnse austral
 				Argentijnse austral
+				ARA
 			
 			
 				Argentijnse peso ley (1970–1983)
 				Argentijnse peso ley (1970–1983)
 				Argentijnse peso ley (1970–1983)
+				ARL
 			
 			
 				Argentijnse peso (1881–1970)
 				Argentijnse peso (1881–1970)
 				Argentijnse peso (1881–1970)
+				ARM
 			
 			
 				Argentijnse peso (1983–1985)
 				Argentijnse peso (1983–1985)
 				Argentijnse peso (1983–1985)
+				ARP
 			
 			
 				Argentijnse peso
@@ -8487,6 +12563,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oostenrijkse schilling
 				Oostenrijkse schilling
 				Oostenrijkse schilling
+				ATS
 			
 			
 				Australische dollar
@@ -8499,11 +12576,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Arubaanse gulden
 				Arubaanse gulden
 				Arubaanse gulden
+				AWG
 			
 			
 				Azerbeidzjaanse manat (1993–2006)
 				Azerbeidzjaanse manat (1993–2006)
 				Azerbeidzjaanse manat (1993–2006)
+				AZM
 			
 			
 				Azerbeidzjaanse manat
@@ -8515,6 +12594,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bosnische dinar
 				Bosnische dinar
 				Bosnische dinar
+				BAD
 			
 			
 				Bosnische convertibele mark
@@ -8527,6 +12607,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nieuwe Bosnische dinar (1994–1997)
 				Nieuwe Bosnische dinar (1994–1997)
 				Nieuwe Bosnische dinar (1994–1997)
+				BAN
 			
 			
 				Barbadaanse dollar
@@ -8546,26 +12627,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Belgische frank (convertibel)
 				Belgische frank (convertibel)
 				Belgische frank (convertibel)
+				BEC
 			
 			
 				Belgische frank
 				Belgische frank
 				Belgische frank
+				BEF
 			
 			
 				Belgische frank (financieel)
 				Belgische frank (financieel)
 				Belgische frank (financieel)
+				BEL
 			
 			
 				Bulgaarse harde lev
 				Bulgaarse harde lev
 				Bulgaarse harde lev
+				BGL
 			
 			
 				Bulgaarse socialistische lev
 				Bulgaarse socialistische lev
 				Bulgaarse socialistische lev
+				BGM
 			
 			
 				Bulgaarse lev
@@ -8577,6 +12663,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bulgaarse lev (1879–1952)
 				Bulgaarse lev (1879–1952)
 				Bulgaarse lev (1879–1952)
+				BGO
 			
 			
 				Bahreinse dinar
@@ -8615,52 +12702,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Boliviaanse boliviano (1863–1963)
 				Boliviaanse boliviano (1863–1963)
 				Boliviaanse boliviano (1863–1963)
+				BOL
 			
 			
 				Boliviaanse peso
 				Boliviaanse peso
 				Boliviaanse peso
+				BOP
 			
 			
 				Boliviaanse mvdol
 				Boliviaanse mvdol
 				Boliviaanse mvdol
+				BOV
 			
 			
 				Braziliaanse cruzeiro novo (1967–1986)
 				Braziliaanse cruzeiro novo (1967–1986)
 				Braziliaanse cruzeiro novo (1967–1986)
+				BRB
 			
 			
 				Braziliaanse cruzado
 				Braziliaanse cruzado
 				Braziliaanse cruzado
+				BRC
 			
 			
 				Braziliaanse cruzeiro (1990–1993)
 				Braziliaanse cruzeiro (1990–1993)
 				Braziliaanse cruzeiro (1990–1993)
+				BRE
 			
 			
 				Braziliaanse real
 				Braziliaanse real
 				Braziliaanse real
+				R$
 				R$
 			
 			
 				Braziliaanse nieuwe cruzado (1989–1990)
 				Braziliaanse cruzado novo
 				Braziliaanse cruzado novo
+				BRN
 			
 			
 				Braziliaanse cruzeiro
 				Braziliaanse cruzeiro
 				Braziliaanse cruzeiro
+				BRR
 			
 			
 				Braziliaanse cruzeiro (1942–1967)
 				Braziliaanse cruzeiro (1942–1967)
 				Braziliaanse cruzeiro (1942–1967)
+				BRZ
 			
 			
 				Bahamaanse dollar
@@ -8679,6 +12776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Birmese kyat
 				Birmese kyat
 				Birmese kyat
+				BUK
 			
 			
 				Botswaanse pula
@@ -8691,6 +12789,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Wit-Russische nieuwe roebel (1994–1999)
 				Wit-Russische nieuwe roebel (1994–1999)
 				Wit-Russische nieuwe roebel (1994–1999)
+				BYB
 			
 			
 				Wit-Russische roebel
@@ -8703,6 +12802,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Wit-Russische roebel (2000–2016)
 				Wit-Russische roebel (2000–2016)
 				Wit-Russische roebel (2000–2016)
+				BYR
 			
 			
 				Belizaanse dollar
@@ -8728,6 +12828,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				WIR euro
 				WIR euro
 				WIR euro
+				CHE
 			
 			
 				Zwitserse frank
@@ -8739,16 +12840,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				WIR franc
 				WIR franc
 				WIR franc
+				CHW
 			
 			
 				Chileense escudo
 				Chileense escudo
 				Chileense escudo
+				CLE
 			
 			
 				Chileense unidades de fomento
 				Chileense unidades de fomento
 				Chileense unidades de fomento
+				CLF
 			
 			
 				Chileense peso
@@ -8758,19 +12862,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				$
 			
 			
-				Chinese renminbi (offshore)
+				Chinese yuan (offshore)
 				Chinese yuan (offshore)
 				Chinese yuan (offshore)
+				CNH
 			
 			
 				dollar van de Chinese Volksbank
 				dollar van de Chinese Volksbank
 				dollar van de Chinese Volksbank
+				CNX
 			
 			
 				Chinese yuan
 				Chinese yuan
 				Chinese yuan
+				CN¥
 				¥
 			
 			
@@ -8784,6 +12891,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidad de Valor Real
 				Unidad de Valor Real
 				Unidad de Valor Real
+				COU
 			
 			
 				Costa Ricaanse colon
@@ -8796,11 +12904,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oude Servische dinar
 				Oude Servische dinar
 				Oude Servische dinar
+				CSD
 			
 			
 				Tsjechoslowaakse harde koruna
 				Tsjechoslowaakse harde koruna
 				Tsjechoslowaakse harde koruna
+				CSK
 			
 			
 				Cubaanse convertibele peso
@@ -8826,6 +12936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cyprisch pond
 				Cyprisch pond
 				Cyprisch pond
+				CYP
 			
 			
 				Tsjechische kroon
@@ -8838,11 +12949,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oost-Duitse ostmark
 				Oost-Duitse ostmark
 				Oost-Duitse ostmark
+				DDM
 			
 			
 				Duitse mark
 				Duitse mark
 				Duitse mark
+				DEM
 			
 			
 				Djiboutiaanse frank
@@ -8874,16 +12987,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ecuadoraanse sucre
 				Ecuadoraanse sucre
 				Ecuadoraanse sucre
+				ECS
 			
 			
 				Ecuadoraanse unidad de valor constante (UVC)
 				Ecuadoraanse unidad de valor constante (UVC)
 				Ecuadoraanse unidad de valor constante (UVC)
+				ECV
 			
 			
 				Estlandse kroon
 				Estlandse kroon
 				Estlandse kroon
+				EEK
 			
 			
 				Egyptisch pond
@@ -8902,16 +13018,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Spaanse peseta (account A)
 				Spaanse peseta (account A)
 				Spaanse peseta (account A)
+				ESA
 			
 			
 				Spaanse peseta (convertibele account)
 				Spaanse peseta (convertibele account)
 				Spaanse peseta (convertibele account)
+				ESB
 			
 			
 				Spaanse peseta
 				Spaanse peseta
 				Spaanse peseta
+				ESP
+				₧
 			
 			
 				Ethiopische birr
@@ -8923,12 +13043,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Euro
 				euro
 				euro
+				€
 				€
 			
 			
 				Finse markka
 				Finse markka
 				Finse markka
+				FIM
 			
 			
 				Fiji-dollar
@@ -8948,17 +13070,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franse franc
 				Franse franc
 				Franse franc
+				FRF
 			
 			
 				Brits pond
 				Brits pond
 				Brits pond
+				£
 				£
 			
 			
 				Georgische kupon larit
 				Georgische kupon larit
 				Georgische kupon larit
+				GEK
 			
 			
 				Georgische lari
@@ -8972,6 +13097,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ghanese cedi (1979–2007)
 				Ghanese cedi (1979–2007)
 				Ghanese cedi (1979–2007)
+				GHC
 			
 			
 				Ghanese cedi
@@ -9003,16 +13129,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guinese syli
 				Guinese syli
 				Guinese syli
+				GNS
 			
 			
 				Equatoriaal-Guinese ekwele guineana
 				Equatoriaal-Guinese ekwele guineana
 				Equatoriaal-Guinese ekwele guineana
+				GQE
 			
 			
 				Griekse drachme
 				Griekse drachme
 				Griekse drachme
+				GRD
 			
 			
 				Guatemalteekse quetzal
@@ -9025,11 +13154,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Portugees-Guinese escudo
 				Portugees-Guinese escudo
 				Portugees-Guinese escudo
+				GWE
 			
 			
 				Guinee-Bissause peso
 				Guinee-Bissause peso
 				Guinee-Bissause peso
+				GWP
 			
 			
 				Guyaanse dollar
@@ -9042,6 +13173,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hongkongse dollar
 				Hongkongse dollar
 				Hongkongse dollar
+				HK$
 				$
 			
 			
@@ -9055,6 +13187,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kroatische dinar
 				Kroatische dinar
 				Kroatische dinar
+				HRD
 			
 			
 				Kroatische kuna
@@ -9087,27 +13220,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Iers pond
 				Iers pond
 				Iers pond
+				IEP
 			
 			
 				Israëlisch pond
 				Israëlisch pond
 				Israëlisch pond
+				ILP
 			
 			
 				Israëlische sjekel (1980–1985)
 				Israëlische sjekel (1980–1985)
 				Israëlische sjekel (1980–1985)
+				ILR
 			
 			
 				Israëlische nieuwe shekel
 				Israëlische nieuwe shekel
 				Israëlische nieuwe shekel
+				₪
 				₪
 			
 			
 				Indiase roepie
 				Indiase roepie
 				Indiase roepie
+				₹
 				₹
 			
 			
@@ -9126,6 +13264,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				IJslandse kroon (1918–1981)
 				IJslandse kroon (1918–1981)
 				IJslandse kronen (1918–1981)
+				ISJ
 			
 			
 				IJslandse kroon
@@ -9138,6 +13277,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Italiaanse lire
 				Italiaanse lire
 				Italiaanse lire
+				ITL
 			
 			
 				Jamaicaanse dollar
@@ -9156,6 +13296,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Japanse yen
 				Japanse yen
 				Japanse yen
+				JP¥
 				¥
 			
 			
@@ -9195,16 +13336,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zuid-Koreaanse hwan (1953–1962)
 				Zuid-Koreaanse hwan (1953–1962)
 				Zuid-Koreaanse hwan (1953–1962)
+				KRH
 			
 			
 				Oude Zuid-Koreaanse won (1945–1953)
 				oude Zuid-Koreaanse won (1945–1953)
 				oude Zuid-Koreaanse won (1945–1953)
+				KRO
 			
 			
 				Zuid-Koreaanse won
 				Zuid-Koreaanse won
 				Zuid-Koreaanse won
+				₩
 				₩
 			
 			
@@ -9259,41 +13403,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lesothaanse loti
 				Lesothaanse loti
 				Lesothaanse loti
+				LSL
 			
 			
 				Litouwse litas
 				Litouwse litas
 				Litouwse litas
+				LTL
+				Lt
 			
 			
 				Litouwse talonas
 				Litouwse talonas
 				Litouwse talonas
+				LTT
 			
 			
 				Luxemburgse convertibele franc
 				Luxemburgse convertibele franc
 				Luxemburgse convertibele franc
+				LUC
 			
 			
 				Luxemburgse frank
 				Luxemburgse frank
 				Luxemburgse frank
+				LUF
 			
 			
 				Luxemburgse financiële franc
 				Luxemburgse financiële franc
 				Luxemburgse financiële franc
+				LUL
 			
 			
 				Letse lats
 				Letse lats
 				Letse lats
+				LVL
+				Ls
 			
 			
 				Letse roebel
 				Letse roebel
 				Letse roebel
+				LVR
 			
 			
 				Libische dinar
@@ -9311,16 +13465,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Marokkaanse franc
 				Marokkaanse franc
 				Marokkaanse franc
+				MAF
 			
 			
 				Monegaskische frank
 				Monegaskische frank
 				Monegaskische frank
+				MCF
 			
 			
 				Moldavische cupon
 				Moldavische cupon
 				Moldavische cupon
+				MDC
 			
 			
 				Moldavische leu
@@ -9339,6 +13496,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Malagassische franc
 				Malagassische franc
 				Malagassische franc
+				MGF
 			
 			
 				Macedonische denar
@@ -9350,11 +13508,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Macedonische denar (1992–1993)
 				Macedonische denar (1992–1993)
 				Macedonische denar (1992–1993)
+				MKN
 			
 			
 				Malinese franc
 				Malinese franc
 				Malinese franc
+				MLF
 			
 			
 				Myanmarese kyat
@@ -9392,11 +13552,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maltese lire
 				Maltese lire
 				Maltese lire
+				MTL
 			
 			
 				Maltees pond
 				Maltees pond
 				Maltees pond
+				MTP
 			
 			
 				Mauritiaanse roepie
@@ -9409,6 +13571,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maldivische roepie
 				Maldivische roepie
 				Maldivische roepie
+				MVP
 			
 			
 				Maldivische rufiyaa
@@ -9426,17 +13589,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mexicaanse peso
 				Mexicaanse peso
 				Mexicaanse peso
+				MX$
 				$
 			
 			
 				Mexicaanse zilveren peso (1861–1992)
 				Mexicaanse zilveren peso (1861–1992)
 				Mexicaanse zilveren peso (1861–1992)
+				MXP
 			
 			
 				Mexicaanse unidad de inversion (UDI)
 				Mexicaanse unidad de inversion (UDI)
 				Mexicaanse unidad de inversion (UDI)
+				MXV
 			
 			
 				Maleisische ringgit
@@ -9449,11 +13615,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mozambikaanse escudo
 				Mozambikaanse escudo
 				Mozambikaanse escudo
+				MZE
 			
 			
 				Oude Mozambikaanse metical
 				Oude Mozambikaanse metical
 				Oude Mozambikaanse metical
+				MZM
 			
 			
 				Mozambikaanse metical
@@ -9479,6 +13647,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nicaraguaanse córdoba (1988–1991)
 				Nicaraguaanse córdoba (1988–1991)
 				Nicaraguaanse córdoba (1988–1991)
+				NIC
 			
 			
 				Nicaraguaanse córdoba
@@ -9491,6 +13660,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nederlandse gulden
 				Nederlandse gulden
 				Nederlandse gulden
+				NLG
 			
 			
 				Noorse kroon
@@ -9510,6 +13680,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nieuw-Zeelandse dollar
 				Nieuw-Zeelandse dollar
 				Nieuw-Zeelandse dollar
+				NZ$
 				$
 			
 			
@@ -9528,6 +13699,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peruaanse inti
 				Peruaanse inti
 				Peruaanse inti
+				PEI
 			
 			
 				Peruaanse sol
@@ -9539,6 +13711,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peruaanse sol (1863–1965)
 				Peruaanse sol (1863–1965)
 				Peruaanse sol (1863–1965)
+				PES
 			
 			
 				Papoea-Nieuw-Guinese kina
@@ -9571,11 +13744,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Poolse zloty (1950–1995)
 				Poolse zloty (1950–1995)
 				Poolse zloty (1950–1995)
+				PLZ
 			
 			
 				Portugese escudo
 				Portugese escudo
 				Portugese escudo
+				PTE
 			
 			
 				Paraguayaanse guarani
@@ -9594,11 +13769,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rhodesische dollar
 				Rhodesische dollar
 				Rhodesische dollar
+				RHD
 			
 			
 				Oude Roemeense leu
 				Oude Roemeense leu
 				Oude Roemeense leu
+				ROL
 			
 			
 				Roemeense leu
@@ -9624,6 +13801,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Russische roebel (1991–1998)
 				Russische roebel (1991–1998)
 				Russische roebel (1991–1998)
+				RUR
+				р.
 			
 			
 				Rwandese frank
@@ -9655,6 +13834,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Soedanese dinar
 				Soedanese dinar
 				Soedanese dinar
+				SDD
 			
 			
 				Soedanees pond
@@ -9666,6 +13846,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Soedanees pond (1957–1998)
 				Soedanees pond (1957–1998)
 				Soedanees pond (1957–1998)
+				SDP
 			
 			
 				Zweedse kroon
@@ -9692,11 +13873,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sloveense tolar
 				Sloveense tolar
 				Sloveense tolar
+				SIT
 			
 			
 				Slowaakse koruna
 				Slowaakse koruna
 				Slowaakse koruna
+				SKK
 			
 			
 				Sierraleoonse leone
@@ -9721,6 +13904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Surinaamse gulden
 				Surinaamse gulden
 				Surinaamse gulden
+				SRG
 			
 			
 				Zuid-Soedanees pond
@@ -9746,11 +13930,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sovjet-roebel
 				Sovjet-roebel
 				Sovjet-roebel
+				SUR
 			
 			
 				Salvadoraanse colón
 				Salvadoraanse colón
 				Salvadoraanse colón
+				SVC
 			
 			
 				Syrisch pond
@@ -9776,6 +13962,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tadzjikistaanse roebel
 				Tadzjikistaanse roebel
 				Tadzjikistaanse roebel
+				TJR
 			
 			
 				Tadzjiekse somoni
@@ -9787,6 +13974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Turkmeense manat (1993–2009)
 				Turkmeense manat (1993–2009)
 				Turkmeense manat (1993–2009)
+				TMM
 			
 			
 				Turkmeense manat
@@ -9811,11 +13999,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Timorese escudo
 				Timorese escudo
 				Timorese escudo
+				TPE
 			
 			
 				Turkse lire
 				oude Turkse lira
 				oude Turkse lira
+				TRL
 			
 			
 				Turkse lira
@@ -9836,6 +14026,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nieuwe Taiwanese dollar
 				Nieuwe Taiwanese dollar
 				Nieuwe Taiwanese dollar
+				NT$
 				NT$
 			
 			
@@ -9855,11 +14046,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oekraïense karbovanetz
 				Oekraïense karbovanetz
 				Oekraïense karbovanetz
+				UAK
 			
 			
 				Oegandese shilling (1966–1987)
 				Oegandese shilling (1966–1987)
 				Oegandese shilling (1966–1987)
+				UGS
 			
 			
 				Oegandese shilling
@@ -9871,27 +14064,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Amerikaanse dollar
 				Amerikaanse dollar
 				Amerikaanse dollar
+				US$
 				$
 			
 			
 				Amerikaanse dollar (volgende dag)
 				Amerikaanse dollar (volgende dag)
 				Amerikaanse dollar (volgende dag)
+				USN
 			
 			
 				Amerikaanse dollar (zelfde dag)
 				Amerikaanse dollar (zelfde dag)
 				Amerikaanse dollar (zelfde dag)
+				USS
 			
 			
 				Uruguayaanse peso en geïndexeerde eenheden
 				Uruguayaanse peso en geïndexeerde eenheden
 				Uruguayaanse peso en geïndexeerde eenheden
+				UYI
 			
 			
 				Uruguayaanse peso (1975–1993)
 				Uruguayaanse peso (1975–1993)
 				Uruguayaanse peso (1975–1993)
+				UYP
 			
 			
 				Uruguayaanse peso
@@ -9904,7 +14102,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uruguayaanse nominale salarisindexeenheid
 				Uruguayaanse nominale salarisindexeenheid
 				Uruguayaanse nominale salarisindexeenheid
-				UYW
 			
 			
 				Oezbeekse sum
@@ -9916,6 +14113,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venezolaanse bolivar (1871–2008)
 				Venezolaanse bolivar (1871–2008)
 				Venezolaanse bolivar (1871–2008)
+				VEB
 			
 			
 				Venezolaanse bolivar (2008–2018)
@@ -9934,12 +14132,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vietnamese dong
 				Vietnamese dong
 				Vietnamese dong
+				₫
 				₫
 			
 			
 				Vietnamese dong (1978–1985)
 				Vietnamese dong (1978–1985)
 				Vietnamese dong (1978–1985)
+				VNN
 			
 			
 				Vanuatuaanse vatu
@@ -9957,72 +14157,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFA-frank
 				CFA-frank
 				CFA-frank
+				FCFA
 			
 			
 				Zilver
 				Troy ounce zilver
 				Troy ounces zilver
+				XAG
 			
 			
 				Goud
 				Troy ounce goud
 				Troy ounces goud
+				XAU
 			
 			
 				Europese samengestelde eenheid
 				Europese samengestelde eenheid
 				Europese samengestelde eenheid
+				XBA
 			
 			
 				Europese monetaire eenheid
 				Europese monetaire eenheid
 				Europese monetaire eenheid
+				XBB
 			
 			
 				Europese rekeneenheid (XBC)
 				Europese rekeneenheid (XBC)
 				Europese rekeneenheid (XBC)
+				XBC
 			
 			
 				Europese rekeneenheid (XBD)
 				Europese rekeneenheid (XBD)
 				Europese rekeneenheid (XBD)
+				XBD
 			
 			
 				Oost-Caribische dollar
 				Oost-Caribische dollar
 				Oost-Caribische dollar
+				EC$
 				$
 			
 			
 				Special Drawing Rights
 				Special Drawing Rights
 				Special Drawing Rights
+				XDR
 			
 			
 				European Currency Unit
 				European Currency Unit
 				European Currency Unit
+				XEU
 			
 			
 				Franse gouden franc
 				Franse gouden franc
 				Franse gouden franc
+				XFO
 			
 			
 				Franse UIC-franc
 				Franse UIC-franc
 				Franse UIC-franc
+				XFU
 			
 			
 				CFA-franc BCEAO
 				CFA-franc BCEAO
 				CFA-franc BCEAO
+				CFA
 			
 			
 				Palladium
 				Troy ounce palladium
 				Troy ounces palladium
+				XPD
 			
 			
 				CFP-frank
@@ -10034,26 +14248,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Platina
 				Troy ounce platina
 				Troy ounces platina
+				XPT
 			
 			
 				RINET-fondsen
 				RINET-fondsen
 				RINET-fondsen
+				XRE
 			
 			
 				Sucre
 				Sucre
 				Sucre
+				XSU
 			
 			
 				Valutacode voor testdoeleinden
 				Valutacode voor testdoeleinden
 				Valutacode voor testdoeleinden
+				XTS
 			
 			
 				ADB-rekeneenheid
 				ADB-rekeneenheid
 				ADB-rekeneenheid
+				XUA
 			
 			
 				onbekende munteenheid
@@ -10065,6 +14284,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Jemenitische dinar
 				Jemenitische dinar
 				Jemenitische dinar
+				YDD
 			
 			
 				Jemenitische rial
@@ -10076,26 +14296,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Joegoslavische harde dinar
 				Joegoslavische harde dinar
 				Joegoslavische harde dinar
+				YUD
 			
 			
 				Joegoslavische noviy-dinar
 				Joegoslavische noviy-dinar
 				Joegoslavische noviy-dinar
+				YUM
 			
 			
 				Joegoslavische convertibele dinar
 				Joegoslavische convertibele dinar
 				Joegoslavische convertibele dinar
+				YUN
 			
 			
 				Joegoslavische hervormde dinar (1992–1993)
 				Joegoslavische hervormde dinar (1992–1993)
 				Joegoslavische hervormde dinar (1992–1993)
+				YUR
 			
 			
 				Zuid-Afrikaanse rand (financieel)
 				Zuid-Afrikaanse rand (financieel)
 				Zuid-Afrikaanse rand (financieel)
+				ZAL
 			
 			
 				Zuid-Afrikaanse rand
@@ -10108,6 +14333,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zambiaanse kwacha (1968–2012)
 				Zambiaanse kwacha (1968–2012)
 				Zambiaanse kwacha (1968–2012)
+				ZMK
 			
 			
 				Zambiaanse kwacha
@@ -10120,110 +14346,157 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zaïrese nieuwe zaïre
 				Zaïrese nieuwe zaïre
 				Zaïrese nieuwe zaïre
+				ZRN
 			
 			
 				Zaïrese zaïre
 				Zaïrese zaïre
 				Zaïrese zaïre
+				ZRZ
 			
 			
 				Zimbabwaanse dollar
 				Zimbabwaanse dollar
 				Zimbabwaanse dollar
+				ZWD
 			
 			
 				Zimbabwaanse dollar (2009)
 				Zimbabwaanse dollar (2009)
 				Zimbabwaanse dollar (2009)
+				ZWL
 			
 			
 				Zimbabwaanse dollar (2008)
 				Zimbabwaanse dollar (2008)
 				Zimbabwaanse dollar (2008)
+				ZWR
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
@@ -10233,95 +14506,141 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
@@ -10335,6 +14654,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} per {1}
 			
+			
+				{0}{1}
+			
 			
 				G-krachten
 				{0} G-kracht
@@ -10377,6 +14699,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per vierkante kilometer
 			
 			
+				hectare
 				{0} hectare
 				{0} hectare
 			
@@ -10399,6 +14722,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per vierkante mijl
 			
 			
+				acre
 				{0} acre
 				{0} acres
 			
@@ -10418,11 +14742,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} vierkante inch
 				{0} per vierkante inch
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karaat
 				{0} karaat
@@ -10438,6 +14757,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} millimol per liter
 				{0} millimol per liter
 			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+			
 			
 				procent
 				{0} procent
@@ -10449,14 +14773,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} promille
 			
 			
-				basispunt
-				{0} basispunt
-				{0} basispunten
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				basispunt
+				{0} basispunt
+				{0} basispunten
 			
 			
 				liter per kilometer
@@ -10523,7 +14842,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilobit
 				{0} kilobits
 			
+			
+				byte
+				{0} byte
+				{0} byte
+			
 			
+				bit
 				{0} bit
 				{0} bits
 			
@@ -10532,6 +14857,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eeuw
 				{0} eeuwen
 			
+			
+				decennia
+				{0} decennium
+				{0} decennia
+			
 			
 				jaar
 				{0} jaar
@@ -10600,10 +14930,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} milliampère
 			
 			
+				ohm
 				{0} ohm
 				{0} ohm
 			
 			
+				volt
 				{0} volt
 				{0} volt
 			
@@ -10628,6 +14960,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilojoules
 			
 			
+				joules
 				{0} joule
 				{0} joules
 			
@@ -10637,24 +14970,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowattuur
 			
 			
-				elektronvolt
-				{0} elektronvolt
-				{0} elektronvolt
+				elektronvolt
+				{0} elektronvolt
+				{0} elektronvolt
 			
 			
-				British thermal unit
-				{0} British thermal unit
-				{0} British thermal unit
+				British thermal unit
+				{0} British thermal unit
+				{0} British thermal unit
+			
+			
+				US therms
+				{0} US therm
+				{0} US therms
 			
 			
-				pound of force
-				{0} pound of force
-				{0} pound of force
+				pound of force
+				{0} pound of force
+				{0} pound of force
 			
 			
-				newton
-				{0} newton
-				{0} newton
+				newton
+				{0} newton
+				{0} newton
 			
 			
 				gigahertz
@@ -10676,6 +15014,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				typografische em
+				{0} em
+				{0} ems
+			
+			
+				pixels
+				{0} pixel
+				{0} pixels
+			
+			
+				megapixels
+				{0} megapixel
+				{0} megapixels
+			
+			
+				pixels per centimeter
+				{0} pixel per centimeter
+				{0} pixels per centimeter
+			
+			
+				pixels per inch
+				{0} pixel per inch
+				{0} pixels per inch
+			
+			
+				dots per centimeter
+				{0} dot per centimeter
+				{0} dots per centimeter
+			
+			
+				dots per inch
+				{0} dot per inch
+				{0} dots per inch
+			
 			
 				kilometer
 				{0} kilometer
@@ -10683,6 +15056,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per kilometer
 			
 			
+				meter
 				{0} meter
 				{0} meter
 				{0} per meter
@@ -10781,9 +15155,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} punten
 			
 			
-				solar radii
-				{0} solar radius
-				{0} solar radii
+				solar radii
+				{0} solar radius
+				{0} solar radii
 			
 			
 				lux
@@ -10791,9 +15165,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				solar luminosity
-				{0} solar luminosity
-				{0} solar luminosity
+				solar luminosity
+				{0} solar luminosity
+				{0} solar luminosity
 			
 			
 				tonne
@@ -10807,6 +15181,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per kilogram
 			
 			
+				gram
 				{0} gram
 				{0} gram
 				{0} per gram
@@ -10854,19 +15229,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karaat
 			
 			
-				dalton
-				{0} dalton
-				{0} dalton
+				dalton
+				{0} dalton
+				{0} dalton
 			
 			
-				aardmassa
-				{0} aardmassa
-				{0} aardmassa
+				aardmassa
+				{0} aardmassa
+				{0} aardmassa
 			
 			
-				zonnemassa
-				{0} zonnemassa
-				{0} zonnemassa
+				zonnemassa
+				{0} zonnemassa
+				{0} zonnemassa
 			
 			
 				gigawatt
@@ -10884,6 +15259,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowatt
 			
 			
+				watt
 				{0} watt
 				{0} watt
 			
@@ -10897,21 +15273,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} paardenkracht
 				{0} paardenkrachten
 			
-			
-				hectopascal
-				{0} hectopascal
-				{0} hectopascal
-			
 			
 				millimeter-kwikdruk
 				{0} millimeter-kwikdruk
 				{0} millimeter-kwikdruk
 			
+			
+				psi
+				{0} psi
+				{0} psi
+			
 			
 				inch-kwikdruk
 				{0} inch-kwikdruk
 				{0} inch-kwikdruk
 			
+			
+				bar
+				{0} bar
+				{0} bar
+			
 			
 				millibar
 				{0} millibar
@@ -10922,15 +15303,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfeer
 				{0} atmosfeer
 			
+			
+				pascal
+				{0} pascal
+				{0} pascal
+			
+			
+				hectopascal
+				{0} hectopascal
+				{0} hectopascal
+			
 			
-				kilopascal
-				{0} kilopascal
-				{0} kilopascal
+				kilopascal
+				{0} kilopascal
+				{0} kilopascal
 			
 			
-				megapascal
-				{0} megapascal
-				{0} megapascal
+				megapascal
+				{0} megapascal
+				{0} megapascal
 			
 			
 				kilometer per uur
@@ -10952,6 +15343,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} knoop
 				{0} knopen
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				graden Celsius
 				{0} graad Celsius
@@ -10968,14 +15364,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvin
 			
 			
-				pound-feet
-				{0} pound-foot
-				{0} pound-feet
+				pound-feet
+				{0} pound-foot
+				{0} pound-feet
 			
 			
-				newtonmeter
-				{0} newtonmeter
-				{0} newtonmeter
+				newtonmeter
+				{0} newtonmeter
+				{0} newtonmeter
 			
 			
 				kubieke kilometer
@@ -11025,6 +15421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hectoliter
 			
 			
+				liter
 				{0} liter
 				{0} liter
 				{0} per liter
@@ -11087,6 +15484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pint
 			
 			
+				cup
 				{0} cup
 				{0} cup
 			
@@ -11096,9 +15494,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fluid ounce
 			
 			
-				Imp. fluid ounce
-				{0} Imp. fluid ounce
-				{0} Imp. fluid ounce
+				Imp. fluid ounce
+				{0} Imp. fluid ounce
+				{0} Imp. fluid ounce
 			
 			
 				eetlepel
@@ -11111,9 +15509,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} theelepels
 			
 			
-				barrels
-				{0} barrel
-				{0} barrels
+				barrels
+				{0} barrel
+				{0} barrels
 			
 			
 				windstreek
@@ -11124,49 +15522,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}{1}
+			
 			
 				G
+				{0} G
+				{0} G
+			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
 			
 			
 				tr
 				{0} tr
 				{0} tr
 			
+			
+				rad
+				{0} rad
+				{0} rad
+			
 			
 				°
+				{0}°
+				{0}°
 			
 			
 				′
+				{0}′
+				{0}′
 			
 			
 				″
+				{0}″
+				{0}″
 			
 			
+				km²
+				{0} km²
+				{0} km²
 				{0} per km²
 			
 			
 				ha
+				{0} ha
+				{0} ha
 			
 			
+				m²
+				{0} m²
+				{0} m²
 				{0} per m²
 			
 			
+				cm²
+				{0} cm²
+				{0} cm²
 				{0} per cm²
 			
 			
+				mi²
+				{0} mi²
+				{0} mi²
 				{0} per mi²
 			
 			
+				acre
 				{0} acre
 				{0} acres
 			
-			
-				{0} per in²
+			
+				yd²
+				{0} yd²
+				{0} yd²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
+			
+				ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				in²
+				{0} in²
+				{0} in²
+				{0} per in²
 			
 			
 				K
@@ -11183,21 +15628,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 				{0} mmol/l
 			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+			
 			
 				procent
+				{0}%
+				{0}%
 			
 			
 				promille
-			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				{0}‰
+				{0}‰
 			
 			
 				l/km
@@ -11219,7 +15663,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg imp.
 				{0} mpg imp.
 			
+			
+				PB
+				{0} PB
+				{0} PB
+			
+			
+				TB
+				{0} TB
+				{0} TB
+			
+			
+				Tb
+				{0} Tb
+				{0} Tb
+			
+			
+				GB
+				{0} GB
+				{0} GB
+			
+			
+				Gb
+				{0} Gb
+				{0} Gb
+			
+			
+				MB
+				{0} MB
+				{0} MB
+			
+			
+				Mb
+				{0} Mb
+				{0} Mb
+			
+			
+				kB
+				{0} kB
+				{0} kB
+			
+			
+				kb
+				{0} kb
+				{0} kb
+			
+			
+				byte
+				{0} byte
+				{0} byte
+			
 			
+				bit
 				{0} bit
 				{0} bits
 			
@@ -11228,6 +15723,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eeuw
 				{0} eeuwen
 			
+			
+				decennia
+				{0} decennium
+				{0} decennia
+			
 			
 				jr
 				{0} jr
@@ -11287,49 +15787,183 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				A
+				{0} A
+				{0} A
+			
+			
+				mA
+				{0} mA
+				{0} mA
 			
 			
 				Ω
+				{0} Ω
+				{0} Ω
 			
 			
 				V
+				{0} V
+				{0} V
+			
+			
+				kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+				{0} cal
 			
 			
 				kcal
 				{0} kcal
 				{0} kcal
 			
+			
+				kJ
+				{0} kJ
+				{0} kJ
+			
 			
 				J
+				{0} J
+				{0} J
 			
-			
-				eV
-				{0} eV
-				{0} eV
+			
+				kWh
+				{0} kWh
+				{0} kWh
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				US therm
+				{0} US therm
+				{0} US therms
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
+			
+				GHz
+				{0} GHz
+				{0} GHz
 			
-			
-				N
-				{0} N
-				{0} N
+			
+				MHz
+				{0} MHz
+				{0} MHz
+			
+			
+				kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+				{0} Hz
+			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				pixels
+				{0} px
+				{0} px
+			
+			
+				megapixels
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
+			
+				km
+				{0} km
+				{0} km
+				{0}/km
 			
 			
 				m
+				{0} m
+				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
+			
+			
+				cm
+				{0} cm
+				{0} cm
+				{0}/cm
+			
+			
+				mm
+				{0} mm
+				{0} mm
+			
+			
+				µm
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+			
+			
+				pm
+				{0} pm
+				{0} pm
+			
+			
+				mi
+				{0} mi
+				{0} mi
 			
 			
 				yards
+				{0} yd
+				{0} yd
+			
+			
+				ft
+				{0} ft
+				{0} ft
+				{0}/ft
 			
 			
 				inches
+				{0} in
+				{0} in
+				{0}/in
+			
+			
+				pc
+				{0} pc
+				{0} pc
 			
 			
 				lj
@@ -11341,48 +15975,119 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} AE
 				{0} AE
 			
+			
+				fur
+				{0} fur
+				{0} fur
+			
 			
+				fm
 				{0} fth
 				{0} fth
 			
+			
+				nmi
+				{0} nmi
+				{0} nmi
+			
+			
+				smi
+				{0} smi
+				{0} smi
+			
 			
 				punten
+				{0} pt
+				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
+			
+				lx
+				{0} lx
+				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
+			
+				t
+				{0} t
+				{0} t
+			
+			
+				kg
+				{0} kg
+				{0} kg
+				{0}/kg
 			
 			
 				g
+				{0} g
+				{0} g
+				{0}/g
+			
+			
+				mg
+				{0} mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
+				{0} µg
 			
 			
 				ton
 				{0} ton
 				{0} ton
 			
-			
-				Da
-				{0} Da
-				{0} Da
+			
+				st
+				{0} st
+				{0} st
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+			
+				lb
+				{0} lb
+				{0} lb
+				{0}/lb
 			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+			
+				oz
+				{0} oz
+				{0} oz
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
+				{0} oz t
+			
+			
+				CD
+				{0} CD
+				{0} CD
+			
+			
+				GW
+				{0} GW
+				{0} GW
+			
+			
+				MW
+				{0} MW
+				{0} MW
+			
+			
+				kW
+				{0} kW
+				{0} kW
 			
 			
 				W
+				{0} W
+				{0} W
+			
+			
+				mW
+				{0} mW
+				{0} mW
 			
 			
 				pk
@@ -11394,35 +16099,122 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmHg
 				{0} mmHg
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				psi
+				{0} psi
+				{0} psi
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				inHg
+				{0} inHg
+				{0} inHg
+			
+			
+				bar
+				{0} bar
+				{0} bar
+			
+			
+				mbar
+				{0} mbar
+				{0} mbar
+			
+			
+				atm
+				{0} atm
+				{0} atm
+			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/u
 				{0} km/u
 				{0} km/u
 			
+			
+				m/s
+				{0} m/s
+				{0} m/s
+			
+			
+				mi/h
+				{0} mi/h
+				{0} mi/h
+			
 			
 				kt
 				{0} kt
 				{0} kt
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+			
+				°
+				{0}°
+				{0}°
 			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+			
+				°C
+				{0}°C
+				{0}°C
+			
+			
+				°F
+				{0}°F
+				{0}°F
+			
+			
+				K
+				{0} K
+				{0} K
+			
+			
+				km³
+				{0} km³
+				{0} km³
+			
+			
+				m³
+				{0} m³
+				{0} m³
+				{0}/m³
+			
+			
+				cm³
+				{0} cm³
+				{0} cm³
+				{0}/cm³
+			
+			
+				mi³
+				{0} mi³
+				{0} mi³
+			
+			
+				yd³
+				{0} yd³
+				{0} yd³
+			
+			
+				ft³
+				{0} ft³
+				{0} ft³
+			
+			
+				in³
+				{0} in³
+				{0} in³
+			
+			
+				ML
+				{0} ML
+				{0} ML
 			
 			
 				hl
@@ -11431,6 +16223,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				l
+				{0} l
+				{0} l
+				{0}/l
 			
 			
 				dl
@@ -11447,11 +16242,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				mpt
+				{0} mpt
+				{0} mpt
+			
 			
 				metrische cup
+				{0} mc
+				{0} mc
 			
 			
 				acre ft
+				{0} ac ft
+				{0} ac ft
+			
+			
+				bu
+				{0} bu
+				{0} bu
 			
 			
 				gal
@@ -11465,7 +16274,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} imp. gal
 				{0}/imp. gal
 			
+			
+				qt
+				{0} qt
+				{0} qt
+			
+			
+				pt
+				{0} pt
+				{0} pt
+			
 			
+				cup
 				{0} cup
 				{0} cup
 			
@@ -11474,11 +16294,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				el
 				{0} el
@@ -11489,11 +16304,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tl
 				{0} tl
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-			
 			
 				windstreek
 				{0} OL
@@ -11503,34 +16313,96 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}{1}
+			
 			
 				G
+				{0} G
+				{0} G
+			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
 			
 			
 				tr
 				{0} t
 				{0} t
 			
+			
+				rad
+				{0} rad
+				{0} rad
+			
 			
 				°
+				{0}°
+				{0}°
 			
 			
 				′
+				{0}′
+				{0}′
 			
 			
 				″
+				{0}″
+				{0}″
+			
+			
+				km²
+				{0} km²
+				{0} km²
+				{0}/km²
 			
 			
 				ha
+				{0} ha
+				{0} ha
+			
+			
+				m²
+				{0} m²
+				{0} m²
+				{0}/m²
+			
+			
+				cm²
+				{0} cm²
+				{0} cm²
+				{0}/cm²
+			
+			
+				mi²
+				{0} mi²
+				{0} mi²
+				{0}/mi²
 			
 			
+				acre
 				{0} acre
 				{0} acres
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
+			
+				yd²
+				{0} yd²
+				{0} yd²
+			
+			
+				ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				in²
+				{0} in²
+				{0} in²
+				{0}/in²
 			
 			
 				K
@@ -11547,18 +16419,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 				{0} mmol/l
 			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+			
+			
+				%
+				{0}%
+				{0}%
+			
 			
 				promille
-			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				{0}‰
+				{0}‰
 			
 			
 				l/km
@@ -11580,7 +16454,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} m/gUK
 				{0} m/gUK
 			
+			
+				PB
+				{0} PB
+				{0} PB
+			
+			
+				TB
+				{0} TB
+				{0} TB
+			
+			
+				Tb
+				{0} Tb
+				{0} Tb
+			
+			
+				GB
+				{0} GB
+				{0} GB
+			
+			
+				Gb
+				{0} Gb
+				{0} Gb
+			
+			
+				MB
+				{0} MB
+				{0} MB
+			
+			
+				Mb
+				{0} Mb
+				{0} Mb
+			
+			
+				kB
+				{0} kB
+				{0} kB
+			
+			
+				kb
+				{0} kb
+				{0} kb
+			
+			
+				byte
+				{0} byte
+				{0} byte
+			
 			
+				bit
 				{0} bit
 				{0} bits
 			
@@ -11599,16 +16524,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				m
 				{0} m
 				{0} m
+				{0}/m
 			
 			
 				w
 				{0} w
 				{0} w
+				{0}/w
 			
 			
 				d
 				{0} d
 				{0} d
+				{0}/d
 			
 			
 				u
@@ -11626,55 +16554,168 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				s
 				{0} s
 				{0} s
+				{0}/s
 			
 			
 				ms
 				{0} ms
 				{0} ms
 			
+			
+				μs
+				{0} μs
+				{0} μs
+			
+			
+				ns
+				{0} ns
+				{0} ns
+			
 			
 				A
+				{0} A
+				{0} A
+			
+			
+				mA
+				{0} mA
+				{0} mA
 			
 			
 				Ω
+				{0} Ω
+				{0} Ω
 			
 			
 				V
+				{0} V
+				{0} V
+			
+			
+				kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+				{0} cal
 			
 			
 				kcal
 				{0} kcal
 				{0} kcal
 			
+			
+				kJ
+				{0} kJ
+				{0} kJ
+			
 			
 				J
+				{0} J
+				{0} J
 			
-			
-				eV
-				{0} eV
-				{0} eV
+			
+				kWh
+				{0} kWh
+				{0} kWh
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				GHz
+				{0} GHz
+				{0} GHz
 			
-			
-				lbf
-				{0} lbf
-				{0} lbf
+			
+				MHz
+				{0} MHz
+				{0} MHz
 			
-			
-				N
-				{0} N
-				{0} N
+			
+				kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+				{0} Hz
+			
+			
+				px
+			
+			
+				MP
+			
+			
+				km
+				{0} km
+				{0} km
+				{0}/km
 			
 			
 				m
+				{0} m
+				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
+			
+			
+				cm
+				{0} cm
+				{0} cm
+				{0}/cm
+			
+			
+				mm
+				{0} mm
+				{0} mm
+			
+			
+				µm
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+			
+			
+				pm
+				{0} pm
+				{0} pm
+			
+			
+				mi
+				{0} mi
+				{0} mi
+			
+			
+				yd
+				{0} yd
+				{0} yd
+			
+			
+				ft
+				{0} ft
+				{0} ft
+				{0}/ft
 			
 			
+				in
 				{0}"
 				{0}"
+				{0}/in
+			
+			
+				pc
+				{0} pc
+				{0} pc
 			
 			
 				lj
@@ -11686,45 +16727,119 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} AE
 				{0} AE
 			
+			
+				fur
+				{0} fur
+				{0} fur
+			
 			
+				fm
 				{0} fth
 				{0} fth
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
+			
+				nmi
+				{0} nmi
+				{0} nmi
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
+			
+				smi
+				{0} smi
+				{0} smi
+			
+			
+				pt
+				{0} pt
+				{0} pt
+			
+			
+				lx
+				{0} lx
+				{0} lx
+			
+			
+				t
+				{0} t
+				{0} t
+			
+			
+				kg
+				{0} kg
+				{0} kg
+				{0}/kg
 			
 			
 				g
+				{0} g
+				{0} g
+				{0}/g
+			
+			
+				mg
+				{0} mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
+				{0} µg
 			
 			
 				ton
 				{0} ton
 				{0} ton
 			
-			
-				Da
-				{0} Da
-				{0} Da
+			
+				st
+				{0} st
+				{0} st
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
+			
+				lb
+				{0} lb
+				{0} lb
+				{0}/lb
 			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+			
+				oz
+				{0} oz
+				{0} oz
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
+				{0} oz t
+			
+			
+				CD
+				{0} CD
+				{0} CD
+			
+			
+				GW
+				{0} GW
+				{0} GW
+			
+			
+				MW
+				{0} MW
+				{0} MW
+			
+			
+				kW
+				{0} kW
+				{0} kW
 			
 			
 				W
+				{0} W
+				{0} W
+			
+			
+				mW
+				{0} mW
+				{0} mW
 			
 			
 				pk
@@ -11736,40 +16851,112 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmHg
 				{0} mmHg
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				psi
+				{0} psi
+				{0} psi
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				inHg
+				{0} inHg
+				{0} inHg
+			
+			
+				mbar
+				{0} mbar
+				{0} mbar
+			
+			
+				atm
+				{0} atm
+				{0} atm
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/u
 				{0} km/u
 				{0} km/u
 			
+			
+				m/s
+				{0} m/s
+				{0} m/s
+			
+			
+				mi/h
+				{0} mi/h
+				{0} mi/h
+			
 			
 				kt
 				{0} kt
 				{0} kt
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°
 				{0}°
 				{0}°
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+			
+				°F
+				{0}°F
+				{0}°F
 			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+			
+				K
+				{0} K
+				{0} K
+			
+			
+				km³
+				{0} km³
+				{0} km³
+			
+			
+				m³
+				{0} m³
+				{0} m³
+				{0}/m³
+			
+			
+				cm³
+				{0} cm³
+				{0} cm³
+				{0}/cm³
+			
+			
+				mi³
+				{0} mi³
+				{0} mi³
+			
+			
+				yd³
+				{0} yd³
+				{0} yd³
+			
+			
+				ft³
+				{0} ft³
+				{0} ft³
+			
+			
+				in³
+				{0} in³
+				{0} in³
+			
+			
+				ML
+				{0} ML
+				{0} ML
 			
 			
 				hl
@@ -11778,6 +16965,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				l
+				{0} l
+				{0} l
+				{0}/l
 			
 			
 				dl
@@ -11794,7 +16984,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				mpt
+				{0} mpt
+				{0} mpt
+			
 			
+				mc
 				{0}mc
 				{0}mc
 			
@@ -11803,6 +16999,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l/m²
 				{0} l/m²
 			
+			
+				bu
+				{0} bu
+				{0} bu
+			
 			
 				gal
 				{0} gal
@@ -11815,26 +17016,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}galIm
 				{0}/galIm
 			
+			
+				qt
+				{0} qt
+				{0} qt
+			
+			
+				pt
+				{0} pt
+				{0} pt
+			
+			
+				cup
+				{0} c
+				{0} c
+			
 			
 				fl oz
 				{0} fl oz
 				{0} fl oz
 			
 			
-				Imp. fl oz
 				{0} fl ozIm
 				{0} fl ozIm
 			
 			
 				el
+				{0} el
+				{0} el
 			
 			
 				tl
-			
-			
-				bbl
-				{0} bbl
-				{0} bbl
+				{0} tl
+				{0} tl
 			
 			
 				windstreek
@@ -11867,12 +17081,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} of {1}
 			{0} of {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} en {1}
-			{0} en {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/nl_AW.xml b/make/data/cldr/common/main/nl_AW.xml
index e70a88afbe9..413839a7f61 100644
--- a/make/data/cldr/common/main/nl_AW.xml
+++ b/make/data/cldr/common/main/nl_AW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl_BE.xml b/make/data/cldr/common/main/nl_BE.xml
index e0e59c6c9bd..94d9c820961 100644
--- a/make/data/cldr/common/main/nl_BE.xml
+++ b/make/data/cldr/common/main/nl_BE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl_BQ.xml b/make/data/cldr/common/main/nl_BQ.xml
index c08a3146579..98393151ce6 100644
--- a/make/data/cldr/common/main/nl_BQ.xml
+++ b/make/data/cldr/common/main/nl_BQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl_CW.xml b/make/data/cldr/common/main/nl_CW.xml
index fb738e5e6e4..386009f948e 100644
--- a/make/data/cldr/common/main/nl_CW.xml
+++ b/make/data/cldr/common/main/nl_CW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl_NL.xml b/make/data/cldr/common/main/nl_NL.xml
index 12513bf7d88..0347df5d8bf 100644
--- a/make/data/cldr/common/main/nl_NL.xml
+++ b/make/data/cldr/common/main/nl_NL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl_SR.xml b/make/data/cldr/common/main/nl_SR.xml
index 482fde74051..787e2297d11 100644
--- a/make/data/cldr/common/main/nl_SR.xml
+++ b/make/data/cldr/common/main/nl_SR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nl_SX.xml b/make/data/cldr/common/main/nl_SX.xml
index e5d33ad29e6..5473d5384bb 100644
--- a/make/data/cldr/common/main/nl_SX.xml
+++ b/make/data/cldr/common/main/nl_SX.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nmg.xml b/make/data/cldr/common/main/nmg.xml
index 83529f55827..2fe5a2e11c5 100644
--- a/make/data/cldr/common/main/nmg.xml
+++ b/make/data/cldr/common/main/nmg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mɔldavia
 			Madagaskar
 			Maŋ́ má Marshall
-			Macedonia
 			Mali
 			Myanmar
 			Mɔngolia
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á â ǎ ä ā b ɓ c d e é ê ě ē ǝ {ǝ\u0301} {ǝ\u0302} {ǝ\u030C} {ǝ\u0304} ɛ {ɛ\u0301} {ɛ\u0302} {ɛ\u030C} {ɛ\u0304} f g h i í î ǐ ï ī j k l m n ń ŋ o ó ô ǒ ö ō ɔ {ɔ\u0301} {ɔ\u0302} {ɔ\u030C} {ɔ\u0304} p r ŕ s t u ú û ǔ ū v w y]
 		[q x z]
 		[A B Ɓ C D E Ǝ Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		„
diff --git a/make/data/cldr/common/main/nmg_CM.xml b/make/data/cldr/common/main/nmg_CM.xml
index 6ac991ee99c..14f96c85d5d 100644
--- a/make/data/cldr/common/main/nmg_CM.xml
+++ b/make/data/cldr/common/main/nmg_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nn.xml b/make/data/cldr/common/main/nn.xml
index d35f067e106..fa6135b37c7 100644
--- a/make/data/cldr/common/main/nn.xml
+++ b/make/data/cldr/common/main/nn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -6806,11 +6806,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hestekraft
 				{0} hestekrefter
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				millimeter kvikksølv
 				{0} millimeter kvikksølv
@@ -6831,6 +6826,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} millibar
 				{0} millibar
 			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
+			
 			
 				kilometer per time
 				{0} kilometer per time
@@ -7498,11 +7498,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hk
 				{0} hk
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -7523,6 +7518,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/time
 				{0} km/t
@@ -7903,10 +7903,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}hk
 				{0}hk
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -7915,6 +7911,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				km/t
 				{0}km/t
diff --git a/make/data/cldr/common/main/nn_NO.xml b/make/data/cldr/common/main/nn_NO.xml
index e14cf443c9c..241c8ea0261 100644
--- a/make/data/cldr/common/main/nn_NO.xml
+++ b/make/data/cldr/common/main/nn_NO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nnh.xml b/make/data/cldr/common/main/nnh.xml
index abf7cfda6e0..98866ab4136 100644
--- a/make/data/cldr/common/main/nnh.xml
+++ b/make/data/cldr/common/main/nnh.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -45,7 +45,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à â ǎ b c d e é è ê ě ɛ {ɛ\u0301} {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} f g h i í ì j k l m ḿ n ń ŋ o ó ò ô ǒ ɔ {ɔ\u0301} {ɔ\u0300} {ɔ\u0302} {ɔ\u030C} p {pf} s {sh} t {ts} u ú ù û ǔ ʉ {ʉ\u0301} {ʉ\u0300} {ʉ\u0302} {ʉ\u030C} v w ẅ y ÿ z ʼ]
 		[q r x]
 		[A B C D E Ɛ F G H I J K L M N Ŋ O Ɔ P {Pf} R S {Sh} T {Ts} U Ʉ V W Ẅ Y Ÿ Z ʼ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[, ; \: ! ? . ' ‘ ’ « »]
 	
 	
diff --git a/make/data/cldr/common/main/nnh_CM.xml b/make/data/cldr/common/main/nnh_CM.xml
index 69c6878956f..3261f6a2470 100644
--- a/make/data/cldr/common/main/nnh_CM.xml
+++ b/make/data/cldr/common/main/nnh_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nus.xml b/make/data/cldr/common/main/nus.xml
index e4289d30894..7353df3a569 100644
--- a/make/data/cldr/common/main/nus.xml
+++ b/make/data/cldr/common/main/nus.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -115,7 +115,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a ä {a\u0331} b c d e ë {e\u0331} ɛ {ɛ\u0308} {ɛ\u0331} {ɛ\u0331\u0308} f g ɣ h i ï {i\u0331} j k l m n ŋ o ö {o\u0331} ɔ {ɔ\u0308} {ɔ\u0331} p q r s t u v w x y z]
 		[A B C D E Ɛ F G Ɣ H I J K L M N Ŋ O Ɔ P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/nus_SS.xml b/make/data/cldr/common/main/nus_SS.xml
index 25dd0436de0..6fbd3f11d3e 100644
--- a/make/data/cldr/common/main/nus_SS.xml
+++ b/make/data/cldr/common/main/nus_SS.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/nyn.xml b/make/data/cldr/common/main/nyn.xml
index a73246741c7..3127e4f9bd0 100644
--- a/make/data/cldr/common/main/nyn.xml
+++ b/make/data/cldr/common/main/nyn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moridova
 			Madagasika
 			Ebizinga bya Marshaa
-			Masedoonia
 			Mari
 			Myanamar
 			Mongoria
diff --git a/make/data/cldr/common/main/nyn_UG.xml b/make/data/cldr/common/main/nyn_UG.xml
index 1d0d7a58594..00bb44c8ec0 100644
--- a/make/data/cldr/common/main/nyn_UG.xml
+++ b/make/data/cldr/common/main/nyn_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/om.xml b/make/data/cldr/common/main/om.xml
index 3103c8aed89..35fcd45f926 100644
--- a/make/data/cldr/common/main/om.xml
+++ b/make/data/cldr/common/main/om.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -120,7 +120,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/om_ET.xml b/make/data/cldr/common/main/om_ET.xml
index c7527c5ca99..605c8443e64 100644
--- a/make/data/cldr/common/main/om_ET.xml
+++ b/make/data/cldr/common/main/om_ET.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/om_KE.xml b/make/data/cldr/common/main/om_KE.xml
index 5c9f9e47fdd..64156b06c3a 100644
--- a/make/data/cldr/common/main/om_KE.xml
+++ b/make/data/cldr/common/main/om_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/or.xml b/make/data/cldr/common/main/or.xml
index 6950abd7c77..ad9e970077f 100644
--- a/make/data/cldr/common/main/or.xml
+++ b/make/data/cldr/common/main/or.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -515,14 +515,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ୟିଡିସ୍
 			ୟୋରୁବା
 			କାନଟୋନେସେ
+			ଚାଇନିଜ୍‌, କାନଟୋନେସେ
 			ଜୁଆଙ୍ଗ
 			ଜାପୋଟେକ୍
 			ବ୍ଲିସିମ୍ବଲସ୍
 			ଜେନାଗା
 			ମାନାଙ୍କ ମରୋକିୟ ତାମାଜିଘାଟ୍
 			ଚାଇନିଜ୍‌
+			ଚାଇନିଜ୍, ମାଣ୍ଡାରିନ୍
 			ସରଳୀକୃତ ଚାଇନିଜ୍‌
+			ସରଳୀକୃତ ମାଣ୍ଡାରିନ୍ ଚାଇନିଜ୍
 			ପାରମ୍ପରିକ ଚାଇନିଜ୍‌
+			ପାରମ୍ପରିକ ମାଣ୍ଡାରିନ୍ ଚାଇନିଜ୍
 			ଜୁଲୁ
 			ଜୁନୀ
 			କୌଣସି ଲିଙ୍ଗୁଇଷ୍ଟ ସାମଗ୍ରୀ ନାହିଁ
@@ -737,7 +741,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ବେଲିଜ୍
 			କାନାଡା
 			କୋକୋସ୍ (କୀଲିଂ) ଦ୍ଵୀପପୁଞ୍ଜ
-			କଙ୍ଗୋ-କିନସାସା
+			କଙ୍ଗୋ (ଡିଆରସି)
 			କଙ୍ଗୋ (ଡିଆରସି)
 			ମଧ୍ୟ ଆଫ୍ରିକୀୟ ସାଧାରଣତନ୍ତ୍ର
 			କଙ୍ଗୋ-ବ୍ରାଜିଭିଲ୍ଲେ
@@ -1061,8 +1065,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[\u0B3C ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଏ ଐ ଓ ଔ \u0B01 ଂ ଃ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ {ଡ\u0B3C} ଢ {ଢ\u0B3C} ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯ ୟ ର ଲ ଳ ଵ ୱ ଶ ଷ ସ ହ ା \u0B3F ୀ \u0B41 \u0B42 \u0B43 େ ୈ ୋ ୌ \u0B4D]
 		[\u200C\u200D]
 		[ଅ ଆ ଇ ଈ ଉ ଊ ଋ ଏ ଐ ଓ ଔ କ ଖ ଗ ଘ ଙ ଚ ଛ ଜ ଝ ଞ ଟ ଠ ଡ ଢ ଣ ତ ଥ ଦ ଧ ନ ପ ଫ ବ ଭ ମ ଯ ର ଲ ଳ ଶ ଷ ସ ହ {କ\u0B4Dଷ}]
-		[\- , . % ‰ + 0୦ 1୧ 2୨ 3୩ 4୪ 5୫ 6୬ 7୭ 8୮ 9୯]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0୦ 1୧ 2୨ 3୩ 4୪ 5୫ 6୬ 7୭ 8୮ 9୯]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1193,54 +1197,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						{0} – {1}
 						
 							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
 						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							M – M
 						
@@ -1678,56 +1638,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -3126,6 +3039,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ଆକଟୋବ୍‌
 			
+			
+				କୋଷ୍ଟନେ
+			
 			
 				କୀଜିଲୋର୍ଡା
 			
@@ -4630,8 +4546,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			orya
 		
+		1
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4639,7 +4560,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5769,7 +5694,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ଭେନେଜୁଏଲାନ୍ ବୋଲିଭାର୍
 				ଭେନେଜୁଏଲାନ୍ ବୋଲିଭାର୍
 				ଭେନେଜୁଏଲାନ୍ ବୋଲିଭାର୍
-				VES
 			
 			
 				ଭୀଏତନାମୀୟ ଡଙ୍ଗ
@@ -5848,8 +5772,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}–{1}
 		
 		
-			{0} ଦିନ
-			{0} ଦିନଗୁଡ଼ିକ
+			{0} ଦିନ
+			{0} ଦିନଗୁଡ଼ିକ
 			ଡାହାଣରେ ଥିବା {0} ନିଅନ୍ତୁ
 		
 	
@@ -6185,6 +6109,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ବ୍ରିଟିଶ ଥର୍ମାଲ ଏକକ
 				{0} ବ୍ରିଟିଶ ଥର୍ମାଲ ଏକକ
 			
+			
+				ୟୁଏସ୍‌ ଥର୍ମ
+				{0} ୟୁଏସ୍‌ ଥର୍ମ
+				{0} ୟୁଏସ୍‌ ଥର୍ମ
+			
 			
 				ପାଉଣ୍ଡସ ଅଫ ଫୋର୍ସ
 				{0} ପାଉଣ୍ଡସ ଅଫ ଫୋର୍ସ
@@ -6424,11 +6353,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ହର୍ସପାୱାର୍
 				{0} ହର୍ସପାୱାର୍
 			
-			
-				ହେକ୍ଟୋପାସ୍କେଲ୍
-				{0} ହେକ୍ଟୋପାସ୍କେଲ୍
-				{0} ହେକ୍ଟୋପାସ୍କେଲ୍
-			
 			
 				ପାରାର ମିଲିମିଟର୍
 				ପାରାର {0} ମିଲିମିଟର୍
@@ -6444,6 +6368,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ପାରାର {0} ଇଞ୍ଜି
 				ପାରାର {0} ଇଞ୍ଜି
 			
+			
+				ବାର୍‌
+				{0} ବାର୍‌
+				{0} ବାର୍‌
+			
 			
 				ମିଲିବାର୍
 				{0} ମିଲିବାର୍
@@ -6454,6 +6383,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ଆଟମୋସ୍ପିଅର
 				{0} ଆଟମୋସ୍ପିଅର
 			
+			
+				ପା
+				{0} ପା
+				{0} ପା
+			
+			
+				ହେକ୍ଟୋପାସ୍କେଲ୍
+				{0} ହେକ୍ଟୋପାସ୍କେଲ୍
+				{0} ହେକ୍ଟୋପାସ୍କେଲ୍
+			
 			
 				କିଲୋପାସକଲ
 				{0} କିଲୋପାସକଲ
@@ -6661,6 +6600,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ଜି-ଫୋର୍ସ୍
 				{0} ଜି
@@ -6783,13 +6725,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ପରମାଇରିଆଡ
-				{0}‱
-				{0}‱
 			
 			
 				ମୋଲ
 				ମୋଲ
-				{0} mol
+				{0} ମୋଲ
 			
 			
 				ଲିଟର୍/କିମି
@@ -6871,6 +6811,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} c
 				{0} c
 			
+			
+				dec
+				{0} dec
+				{0} dec
+			
 			
 				ବର୍ଷ
 				{0} ବର୍ଷ
@@ -6980,23 +6925,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ଇଲେକ୍ଟ୍ରୋନ୍‌ ଭୋଲ୍ଟ
-				{0} eV
-				{0} eV
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				ୟୁଏସ୍‌ ଥର୍ମ
+				{0} ୟୁଏସ୍‌ ଥର୍ମ
+				{0} ୟୁଏସ୍‌ ଥର୍ମ
 			
 			
 				ପାଉଣ୍ଡ-ଫୋର୍ସ
-				{0} lbf
-				{0} lbf
 			
 			
 				ନ୍ୟୁଟନ
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -7115,8 +7054,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ସୋଲାର ରାଡି
-				{0} R☉
-				{0} R☉
 			
 			
 				ଲକ୍ସ
@@ -7125,8 +7062,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ସୋଲର ଲ୍ୟୁମିନୋସିଟିସ
-				{0} L☉
-				{0} L☉
 			
 			
 				ଟ
@@ -7189,13 +7124,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ଅର୍ଥ ମାସେସ
-				{0} M⊕
-				{0} M⊕
 			
 			
 				ସୋଲର ମାସେସ
-				{0} M☉
-				{0} M☉
 			
 			
 				ଗିୱା
@@ -7227,11 +7158,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ଏଚପି
 				{0} ଏଚପି
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -7247,6 +7173,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				ବାର୍‌
+				{0} ବାର୍‌
+				{0} ବାର୍‌
+			
 			
 				mbar
 				{0} mbar
@@ -7257,15 +7188,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				ପା
+				{0} ପା
+				{0} ପା
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				କିମି/ଘଣ୍ଟା
@@ -7307,16 +7238,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				କିମି³
 				{0} କିମି³
@@ -7434,8 +7355,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ଇମ୍ପ. ଏଫଏଲ ଓଜେ
-				{0} fl oz Imp.
-				{0} fl oz Imp.
 			
 			
 				ଖାଇବା ଚାମଚ
@@ -7449,8 +7368,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ବାରେଲ
-				{0} bbl
-				{0} bbl
 			
 			
 				ଦିଗ
@@ -7590,17 +7507,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} କିମ୍ବା {1}
 			{0} କିମ୍ବା {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, ଓ {1}
-			{0} ଓ {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, ଓ {1}
-			{0} ଓ {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/or_IN.xml b/make/data/cldr/common/main/or_IN.xml
index 311f3fef855..e07b92ad70c 100644
--- a/make/data/cldr/common/main/or_IN.xml
+++ b/make/data/cldr/common/main/or_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/os.xml b/make/data/cldr/common/main/os.xml
index e160009476c..0b0047c0f09 100644
--- a/make/data/cldr/common/main/os.xml
+++ b/make/data/cldr/common/main/os.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -143,8 +143,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[а ӕ б в г {гъ} д {дж} {дз} е ё ж з и й к {къ} л м н о п {пъ} р с т {тъ} у ф х {хъ} ц {цъ} ч {чъ} ш щ ъ ы ь э ю я]
 		[]
 		[А Ӕ Б В Г {Гъ} Д {Дж} {Дз} Е Ё Ж З И Й К {Къ} Л М Н О П {Пъ} Р С Т {Тъ} У Ф Х {Хъ} Ц {Цъ} Ч {Чъ} Ш Щ Ы Э Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0}…
 		…{0}
 		{0}…{1}
diff --git a/make/data/cldr/common/main/os_GE.xml b/make/data/cldr/common/main/os_GE.xml
index f9545473a7d..3f2b2293dac 100644
--- a/make/data/cldr/common/main/os_GE.xml
+++ b/make/data/cldr/common/main/os_GE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/os_RU.xml b/make/data/cldr/common/main/os_RU.xml
index de3d5dba96d..9fecf28769d 100644
--- a/make/data/cldr/common/main/os_RU.xml
+++ b/make/data/cldr/common/main/os_RU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pa.xml b/make/data/cldr/common/main/pa.xml
index 74c1dbeeb10..da77857e28f 100644
--- a/make/data/cldr/common/main/pa.xml
+++ b/make/data/cldr/common/main/pa.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -68,6 +68,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ਬਗਨੀਜ਼
 			ਬਲਿਨ
 			ਕੈਟਾਲਾਨ
+			ਚਕਮਾ
 			ਚੇਚਨ
 			ਸੀਬੂਆਨੋ
 			ਚੀਗਾ
@@ -107,9 +108,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ਯੂਨਾਨੀ
 			ਅੰਗਰੇਜ਼ੀ
 			ਅੰਗਰੇਜ਼ੀ (ਬਰਤਾਨਵੀ)
-			ਅੰਗਰੇਜ਼ੀ (ਯੂ.ਕੇ.)
 			ਅੰਗਰੇਜ਼ੀ (ਅਮਰੀਕੀ)
-			ਅੰਗਰੇਜ਼ੀ (ਯੂ.ਐੱਸ.)
 			ਇਸਪੇਰਾਂਟੋ
 			ਸਪੇਨੀ
 			ਸਪੇਨੀ (ਲਾਤੀਨੀ ਅਮਰੀਕੀ)
@@ -247,7 +246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ਮੇਂਡੇ
 			ਮੇਰੂ
 			ਮੋਰੀਸਿਅਨ
-			ਮੇਲੇਗਸੀ
+			ਮਾਲਾਗੈਸੀ
 			ਮਖੋਵਾ-ਮਿੱਟੋ
 			ਮੇਟਾ
 			ਮਾਰਸ਼ਲੀਜ਼
@@ -423,10 +422,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ਯਿਦਿਸ਼
 			ਯੋਰੂਬਾ
 			ਕੈਂਟੋਨੀਜ਼
+			ਚੀਨੀ, ਕੈਂਟੋਨੀਜ਼
 			ਮਿਆਰੀ ਮੋਰੋਕੇਨ ਟਾਮਾਜ਼ਿਕ
 			ਚੀਨੀ (ਮੈਂਡਰਿਨ)
+			ਚੀਨੀ, ਮੈਂਡਰਿਨ
 			ਚੀਨੀ (ਸਰਲ)
+			ਚੀਨੀ ਮੈਂਡਰਿਨ (ਸਰਲ)
 			ਚੀਨੀ (ਰਵਾਇਤੀ)
+			ਚੀਨੀ ਮੈਂਡਰਿਨ (ਰਵਾਇਤੀ)
 			ਜ਼ੁਲੂ
 			ਜ਼ੂਨੀ
 			ਬੋਲੀ ਸੰਬੰਧੀ ਕੋਈ ਸਮੱਗਰੀ ਨਹੀਂ
@@ -669,8 +672,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ਸੇਂਟ ਮਾਰਟਿਨ
 			ਮੈਡਾਗਾਸਕਰ
 			ਮਾਰਸ਼ਲ ਟਾਪੂ
-			ਮੈਕਡੋਨੀਆ
-			ਮੈਕਡੋਨੀਆ (ਪੂਰਵ ਯੂਗੋਸਲਾਵ ਮੈਕਡੋਨੀਆਈ ਗਣਰਾਜ)
+			ਉੱਤਰੀ ਮੈਕਡੋਨੀਆ
 			ਮਾਲੀ
 			ਮਿਆਂਮਾਰ (ਬਰਮਾ)
 			ਮੰਗੋਲੀਆ
@@ -780,6 +782,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ਵਾਨੂਆਟੂ
 			ਵਾਲਿਸ ਅਤੇ ਫੂਟੂਨਾ
 			ਸਾਮੋਆ
+			ਗਲਤ-ਉਚਾਰਨ
+			ਲਿਖਤ ਦੀ ਗਲਤ ਦਿਸ਼ਾ
 			ਕੋਸੋਵੋ
 			ਯਮਨ
 			ਮਾਯੋਟੀ
@@ -876,7 +880,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			ਮੀਟਰਿਕ
 			ਯੂ. ਕੇ.
-			ਯੂ. ਐਸ.
+			ਯੂ. ਐੱਸ.
 		
 		
 			ਬੋਲੀ: {0}
@@ -887,25 +891,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[\u0A71 \u0A70 \u0A3C ੦ ੧ ੨ ੩ ੪ ੫ ੬ ੭ ੮ ੯ ੴ ੳ ਉ ਊ ਓ ਅ ਆ ਐ ਔ ੲ ਇ ਈ ਏ ਸ {ਸ\u0A3C} ਹ ਕ ਖ {ਖ\u0A3C} ਗ {ਗ\u0A3C} ਘ ਙ ਚ ਛ ਜ {ਜ\u0A3C} ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ {ਫ\u0A3C} ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ \u0A4D ਾ ਿ ੀ \u0A41 \u0A42 \u0A47 \u0A48 \u0A4B \u0A4C]
 		[\u200C\u200D ਃ \u0A02 \u0A01 {ਲ\u0A3C}]
-		[ੴ ੳ ਉ ਊ ਓ ਅ ਆ ਐ ਔ ੲ ਇ ਈ ਏ ਸ ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ]
-		[\- , . % ‰ + 0੦ 1੧ 2੨ 3੩ 4੪ 5੫ 6੬ 7੭ 8੮ 9੯]
-		[\- ‐ – — , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] / \& ′ ″]
+		[ੳ ਅ ੲ ਸ ਹ ਕ ਖ ਗ ਘ ਙ ਚ ਛ ਜ ਝ ਞ ਟ ਠ ਡ ਢ ਣ ਤ ਥ ਦ ਧ ਨ ਪ ਫ ਬ ਭ ਮ ਯ ਰ ਲ ਵ ੜ]
+		[\- ‑ , . % ‰ + 0੦ 1੧ 2੨ 3੩ 4੪ 5੫ 6੬ 7੭ 8੮ 9੯]
+		[\- ‐ ‑ – — , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] / \& ′ ″]
+		{0}…
+		…{0}
+		{0}…{1}
+		{0} …
+		… {0}
+		{0} … {1}
+		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
+	
+		“
+		”
+		‘
+		’
+	
 	
 		
 			
@@ -941,6 +962,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1}, {0}
 						
 					
+					
+						{0} – {1}
+					
 				
 			
 			
@@ -961,6 +985,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਮੈਸਰਾ
 							ਨੇਜ਼ੀ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ਟੋਉਟ
 							ਬਾਬਾ
@@ -993,6 +1032,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਮੈਸਰਾ
 							ਨੇਜ਼ੀ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ਟੋਉਟ
 							ਬਾਬਾ
@@ -1043,6 +1097,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਨੇਹਾਸੇ
 							ਪਾਗੂਮੇਨ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ਮੇਸਕੇਰੇਮ
 							ਟੇਕੇਮਟ
@@ -1075,6 +1144,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਨੇਹਾਸੇ
 							ਪਾਗੂਮੇਨ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ਮੇਸਕੇਰੇਮ
 							ਟੇਕੇਮਟ
@@ -1107,6 +1191,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 			
+			
+				
+					
+						ERA0
+					
+					
+						ERA0
+					
+					
+						ERA0
+					
+				
+			
 			
 				
 					
@@ -1198,55 +1295,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
+						
+							h a – h a
+							h–h a
 						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+						
+							HH–HH
 						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
 						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
 						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							MM–MM
@@ -1720,56 +1802,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1881,6 +1916,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਅਵ
 							ਏਲੁਲ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ਤਿਸ਼ਰੀ
 							ਹੇਸ਼ਵਨ
@@ -1915,6 +1966,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਅਵ
 							ਏਲੁਲ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ਤਿਸ਼ਰੀ
 							ਹੇਸ਼ਵਨ
@@ -1933,6 +2000,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2054,6 +2132,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਦੂ-ਅਲ-ਕੀ.
 							ਦੂ-ਅਲ-ਹਿ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ਮੁਹੱਰਮ
 							ਸਫਰ
@@ -2084,6 +2176,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਦੂ-ਅਲ-ਕੀ.
 							ਦੂ-ਅਲ-ਹਿ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ਮੁਹੱਰਮ
 							ਸਫਰ
@@ -2100,6 +2206,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
+				
+					
+						{0} – {1}
+					
+				
 			
 			
 				
@@ -2118,6 +2240,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਬਾਹਮਨ
 							ਐਸਫੰਡ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ਫਾਰਵਰਡੀਨ
 							ਔਰਡਾਈਬਹੈਸ਼ਟ
@@ -2148,6 +2284,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ਬਾਹਮਨ
 							ਐਸਫੰਡ
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ਫਾਰਵਰਡੀਨ
 							ਔਰਡਾਈਬਹੈਸ਼ਟ
@@ -2164,6 +2314,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -2388,9 +2549,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਦਿਨ
-				ਬੀਤਿਆ ਕੱਲ੍ਹ
-				ਅੱਜ
-				ਭਲਕੇ
+				ਬੀਤਿਆ ਕੱਲ੍ਹ
+				ਅੱਜ
+				ਭਲਕੇ
 				
 					{0} ਦਿਨ ਵਿੱਚ
 					{0} ਦਿਨਾਂ ਵਿੱਚ
@@ -2402,9 +2563,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਦਿਨ
-				ਬੀਤਿਆ ਕੱਲ੍ਹ
-				ਅੱਜ
-				ਭਲਕੇ
+				ਬੀਤਿਆ ਕੱਲ੍ਹ
+				ਅੱਜ
+				ਭਲਕੇ
 				
 					{0} ਦਿਨ ਵਿੱਚ
 					{0} ਦਿਨਾਂ ਵਿੱਚ
@@ -3527,7 +3688,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਅਕਤੋਬੇ
 			
 			
-				ਕੋਸਟਨੇਏ
+				ਕੋਸਤਾਨਾਏ
 			
 			
 				ਕਿਜ਼ੀਲੋਰਡਾ
@@ -5084,11 +5245,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			guru
 		
 		1
 		
+			٫
 			,
 			٪
 			+
@@ -5098,9 +5261,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			؉
 			∞
 			NaN
+			٫
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5108,12 +5276,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
 			
@@ -5293,31 +5466,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਸੰਯੁਕਤ ਅਰਬ ਅਮੀਰਾਤ ਦਿਰਹਾਮ
 				ਸੰਯੁਕਤ ਅਰਬ ਅਮੀਰਾਤ ਦਿਰਹਾਮ
 				ਸੰਯੁਕਤ ਅਰਬ ਅਮੀਰਾਤ ਦਿਰਹਾਮ
+				AED
 			
 			
 				ਅਫ਼ਗਾਨ ਅਫ਼ਗਾਨੀ
 				ਅਫ਼ਗਾਨ ਅਫ਼ਗਾਨੀ
 				ਅਫ਼ਗਾਨ ਅਫ਼ਗਾਨੀ
+				AFN
 			
 			
 				ਅਲਬਾਨੀਆਈ ਲੇਕ
 				ਅਲਬਾਨੀਆਈ ਲੇਕ
 				ਅਲਬਾਨੀਆਈ ਲੇਕ
+				ALL
 			
 			
-				ਅਰਮੀਨੀਆਈ ਦਰਮ
-				ਅਰਮੀਨੀਆਈ ਦਰਮ
-				ਅਰਮੀਨੀਆਈ ਦਰਮ
+				ਅਰਮੀਨੀਆਈ ਦਰਾਮ
+				ਅਰਮੀਨੀਆਈ ਦਰਾਮ
+				ਅਰਮੀਨੀਆਈ ਦਰਾਮ
+				AMD
 			
 			
 				ਨੀਦਰਲੈਂਡਸ ਐਂਟੀਲੀਅਨ ਗਿਲਡਰ
 				ਨੀਦਰਲੈਂਡਸ ਐਂਟੀਲੀਅਨ ਗਿਲਡਰ
 				ਨੀਦਰਲੈਂਡਸ ਐਂਟੀਲੀਅਨ ਗਿਲਡਰ
+				ANG
 			
 			
 				ਅੰਗੋਲਾ ਕਵਾਂਜਾ
 				ਅੰਗੋਲਾ ਕਵਾਂਜਾ
 				ਅੰਗੋਲਾ ਕਵਾਂਜਾ
+				AOA
+				Kz
 			
 			
 				ਅਰਜਨਟੀਨੀ ਅਸਟਰਾਲ
@@ -5347,69 +5527,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਅਰਜਨਟੀਨੀ ਪੇਸੋ
 				ਅਰਜਨਟੀਨੀ ਪੇਸੋ
 				ਅਰਜਨਟੀਨੀ ਪੇਸੋ
+				ARS
 				$
 			
 			
 				ਆਸਟ੍ਰੇਲੀਆਈ ਡਾਲਰ
 				ਆਸਟ੍ਰੇਲੀਆਈ ਡਾਲਰ
 				ਆਸਟ੍ਰੇਲੀਆਈ ਡਾਲਰ
+				A$
+				$
 			
 			
 				ਅਰੂਬਨ ਫਲੋਰਿਨ
 				ਅਰੂਬਨ ਫਲੋਰਿਨ
 				ਅਰੂਬਨ ਫਲੋਰਿਨ
+				AWG
 			
 			
 				ਅਜ਼ਰਬਾਈਜਾਨ ਮਾਨਤ
 				ਅਜ਼ਰਬਾਈਜਾਨ ਮਾਨਤ
 				ਅਜ਼ਰਬਾਈਜਾਨ ਮਾਨਤ
+				AZN
 			
 			
 				ਬੋਸਨੀਆ-ਹਰਜ਼ੇਗੋਵੀਨਾ ਬਦਲਣਯੋਗ ਮਾਰਕ
 				ਬੋਸਨੀਆ-ਹਰਜ਼ੇਗੋਵੀਨਾ ਬਦਲਣਯੋਗ ਮਾਰਕ
 				ਬੋਸਨੀਆ-ਹਰਜ਼ੇਗੋਵੀਨਾ ਬਦਲਣਯੋਗ ਮਾਰਕ
+				BAM
+				KM
 			
 			
 				ਬਾਰਬਾਡੀਅਨ ਡਾਲਰ
 				ਬਾਰਬਾਡੀਅਨ ਡਾਲਰ
 				ਬਾਰਬਾਡੀਅਨ ਡਾਲਰ
+				BBD
 				$
 			
 			
 				ਬੰਗਲਾਦੇਸ਼ੀ ਟਕਾ
 				ਬੰਗਲਾਦੇਸ਼ੀ ਟਕਾ
 				ਬੰਗਲਾਦੇਸ਼ੀ ਟਕਾ
+				BDT
+				৳
 			
 			
 				ਬੁਲਗਾਰੀਆਈ ਲੇਵ
 				ਬੁਲਗਾਰੀਆਈ ਲੇਵ
 				ਬੁਲਗਾਰੀਆਈ ਲੇਵ
+				BGN
 			
 			
 				ਬਹਿਰੀਨੀ ਦਿਨਾਰ
 				ਬਹਿਰੀਨੀ ਦਿਨਾਰ
 				ਬਹਿਰੀਨੀ ਦਿਨਾਰ
+				BHD
 			
 			
 				ਬੁਰੁੰਡੀਆਈ ਫ੍ਰੈਂਕ
 				ਬੁਰੁੰਡੀਆਈ ਫ੍ਰੈਂਕ
 				ਬੁਰੁੰਡੀਆਈ ਫ੍ਰੈਂਕ
+				BIF
 			
 			
 				ਬਰਮੂਡਾ ਡਾਲਰ
 				ਬਰਮੂਡਾ ਡਾਲਰ
 				ਬਰਮੂਡਾ ਡਾਲਰ
+				BMD
 				$
 			
 			
 				ਬਰੂਨੇਈ ਡਾਲਰ
 				ਬਰੂਨੇਈ ਡਾਲਰ
 				ਬਰੂਨੇਈ ਡਾਲਰ
+				BND
+				$
 			
 			
 				ਬੋਲੀਵੀਅਨ ਬੋਲੀਵੀਅਨੋ
 				ਬੋਲੀਵੀਅਨ ਬੋਲੀਵੀਅਨੋ
 				ਬੋਲੀਵੀਅਨ ਬੋਲੀਵੀਅਨੋ
+				BOB
 				Bs
 			
 			
@@ -5452,6 +5649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਬ੍ਰਾਜ਼ੀਲੀਆਈ ਰੀਅਲ
 				ਬ੍ਰਾਜ਼ੀਲੀਆਈ ਰੀਅਲ
 				ਬ੍ਰਾਜ਼ੀਲੀਆਈ ਰੀਅਲ
+				R$
 				R$
 			
 			
@@ -5476,99 +5674,121 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਬਾਹਾਮੀਅਨ ਡਾਲਰ
 				ਬਾਹਾਮੀਅਨ ਡਾਲਰ
 				ਬਾਹਾਮੀਅਨ ਡਾਲਰ
+				BSD
 				$
 			
 			
 				ਭੂਟਾਨੀ ਐਂਗਲਟ੍ਰਮ
 				ਭੂਟਾਨੀ ਐਂਗਲਟ੍ਰਮ
 				ਭੂਟਾਨੀ ਐਂਗਲਟ੍ਰਮ
+				BTN
 			
 			
 				ਬੋਟਸਵਾਨਾ ਪੁਲਾ
 				ਬੋਟਸਵਾਨਾ ਪੁਲਾ
 				ਬੋਟਸਵਾਨਾ ਪੁਲਾ
+				BWP
+				P
 			
 			
 				ਬੇਲਾਰੂਸੀ ਰੂਬਲ
 				ਬੇਲਾਰੂਸੀ ਰੂਬਲ
 				ਬੇਲਾਰੂਸੀ ਰੂਬਲ
+				BYN
+				р.
 			
 			
 				ਬੇਲਾਰੂਸੀ ਰੂਬਲ (2000–2016)
 				ਬੇਲਾਰੂਸੀ ਰੂਬਲ (2000–2016)
 				ਬੇਲਾਰੂਸੀ ਰੂਬਲ (2000–2016)
+				BYR
 			
 			
 				ਬੇਲੀਜ਼ ਡਾਲਰ
 				ਬੇਲੀਜ਼ ਡਾਲਰ
 				ਬੇਲੀਜ਼ ਡਾਲਰ
+				BZD
 				$
 			
 			
 				ਕੇਨੇਡਿਆਈ ਡਾਲਰ
 				ਕੇਨੇਡਿਆਈ ਡਾਲਰ
 				ਕੇਨੇਡਿਆਈ ਡਾਲਰ
+				CA$
 				$
 			
 			
 				ਕਾਂਗੋਲੀਜ਼ ਫ੍ਰੈਂਕ
 				ਕਾਂਗੋਲੀਜ਼ ਫ੍ਰੈਂਕ
 				ਕਾਂਗੋਲੀਜ਼ ਫ੍ਰੈਂਕ
+				CDF
 			
 			
 				ਸਵਿਸ ਫ੍ਰੈਂਕ
 				ਸਵਿਸ ਫ੍ਰੈਂਕ
 				ਸਵਿਸ ਫ੍ਰੈਂਕ
+				CHF
 			
 			
 				ਚਿਲੀ ਪੇਸੋ
 				ਚਿਲੀ ਪੇਸੋ
 				ਚਿਲੀ ਪੇਸੋ
+				CLP
 				$
 			
 			
 				ਚੀਨੀ ਯੁਆਨ (ਔਫ਼ਸ਼ੋਰ)
 				ਚੀਨੀ ਯੁਆਨ (ਔਫ਼ਸ਼ੋਰ)
 				ਚੀਨੀ ਯੁਆਨ (ਔਫ਼ਸ਼ੋਰ)
+				CNH
 			
 			
 				ਚੀਨੀ ਯੁਆਨ
 				ਚੀਨੀ ਯੁਆਨ
 				ਚੀਨੀ ਯੁਆਨ
+				CN¥
+				¥
 			
 			
 				ਕੋਲੰਬਿਆਈ ਪੇਸੋ
 				ਕੋਲੰਬਿਆਈ ਪੇਸੋ
 				ਕੋਲੰਬਿਆਈ ਪੇਸੋ
+				COP
 				$
 			
 			
 				ਕੋਸਟਾ ਰੀਕਨ ਕੋਲਨ
 				ਕੋਸਟਾ ਰੀਕਨ ਕੋਲਨ
 				ਕੋਸਟਾ ਰੀਕਨ ਕੋਲਨ
+				CRC
 				₡
 			
 			
 				ਕਿਊਬਨ ਬਦਲਣਯੋਗ ਪੇਸੋ
 				ਕਿਊਬਨ ਬਦਲਣਯੋਗ ਪੇਸੋ
 				ਕਿਊਬਨ ਬਦਲਣਯੋਗ ਪੇਸੋ
+				CUC
 				$
 			
 			
 				ਕਿਊਬਨ ਪੇਸੋ
 				ਕਿਊਬਨ ਪੇਸੋ
 				ਕਿਊਬਨ ਪੇਸੋ
+				CUP
 				$
 			
 			
 				ਕੇਪ ਵਰਡੀਅਨ ਸਕੂਡੋ
 				ਕੇਪ ਵਰਡੀਅਨ ਸਕੂਡੋ
 				ਕੇਪ ਵਰਡੀਅਨ ਸਕੂਡੋ
+				CVE
 			
 			
 				ਚੈਕ ਗਣਰਾਜ ਕੋਰੁਨਾ
 				ਚੈਕ ਗਣਰਾਜ ਕੋਰੁਨਾ
 				ਚੈਕ ਗਣਰਾਜ ਕੋਰੁਨਾ
+				CZK
+				Kč
 			
 			
 				ਜਰਮਨ ਮਾਰਕ
@@ -5580,127 +5800,163 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਜ਼ੀਬੂਤੀਅਨ ਫ੍ਰੈਂਕ
 				ਜ਼ੀਬੂਤੀਅਨ ਫ੍ਰੈਂਕ
 				ਜ਼ੀਬੂਤੀਅਨ ਫ੍ਰੈਂਕ
+				DJF
 			
 			
 				ਡੈਨਿਸ਼ ਕਰੌਨ
 				ਡੈਨਿਸ਼ ਕਰੌਨ
 				ਡੈਨਿਸ਼ ਕਰੌਨ
+				DKK
+				kr
 			
 			
 				ਡੌਮਿਨਿਕਨ ਪੇਸੋ
 				ਡੌਮਿਨਿਕਨ ਪੇਸੋ
 				ਡੌਮਿਨਿਕਨ ਪੇਸੋ
+				DOP
 				$
 			
 			
 				ਅਲਜੀਰਿਆਈ ਦਿਨਾਰ
 				ਅਲਜੀਰਿਆਈ ਦਿਨਾਰ
 				ਅਲਜੀਰਿਆਈ ਦਿਨਾਰ
+				DZD
 			
 			
 				ਮਿਸਰੀ ਪੌਂਡ
 				ਮਿਸਰੀ ਪੌਂਡ
 				ਮਿਸਰੀ ਪੌਂਡ
+				EGP
+				E£
 			
 			
 				ਇਰੀਟ੍ਰਿਆਈ ਨਾਫ਼ਾ
 				ਇਰੀਟ੍ਰਿਆਈ ਨਾਫ਼ਾ
 				ਇਰੀਟ੍ਰਿਆਈ ਨਾਫ਼ਾ
+				ERN
 			
 			
 				ਇਥੋਪੀਆਈ ਬਿਰ
 				ਇਥੋਪੀਆਈ ਬਿਰ
 				ਇਥੋਪੀਆਈ ਬਿਰ
+				ETB
 			
 			
 				ਯੂਰੋ
 				ਯੂਰੋ
 				ਯੂਰੋ
+				€
+				€
 			
 			
 				ਫ਼ਿਜ਼ੀ ਡਾਲਰ
 				ਫ਼ਿਜ਼ੀ ਡਾਲਰ
 				ਫ਼ਿਜ਼ੀ ਡਾਲਰ
+				FJD
+				$
 			
 			
 				ਫ਼ਾਕਲੈਂਡ ਆਈਲੈਂਡਸ ਪੌਂਡ
 				ਫ਼ਾਕਲੈਂਡ ਆਈਲੈਂਡਸ ਪੌਂਡ
 				ਫ਼ਾਕਲੈਂਡ ਆਈਲੈਂਡਸ ਪੌਂਡ
+				FKP
 				£
 			
 			
 				ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ
 				ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ
 				ਬ੍ਰਿਟਿਸ਼ ਪੌਂਡ
+				£
+				£
 			
 			
 				ਜਾਰਜੀਆਈ ਲਾਰੀ
 				ਜਾਰਜੀਆਈ ਲਾਰੀ
 				ਜਾਰਜੀਆਈ ਲਾਰੀ
+				GEL
+				₾
 				₾
 			
 			
 				ਘਾਨਾਈ ਸੇਡੀ
 				ਘਾਨਾਈ ਸੇਡੀ
 				ਘਾਨਾਈ ਸੇਡੀ
+				GHS
 			
 			
 				ਜਿਬਰਾਲਟਰ ਪੌਂਡ
 				ਜਿਬਰਾਲਟਰ ਪੌਂਡ
 				ਜਿਬਰਾਲਟਰ ਪੌਂਡ
+				GIP
+				£
 			
 			
 				ਗੈਂਬੀਆਈ ਦਲਾਸੀ
 				ਗੈਂਬੀਆਈ ਦਲਾਸੀ
 				ਗੈਂਬੀਆਈ ਦਲਾਸੀ
+				GMD
 			
 			
 				ਗਿਨੀ ਫ੍ਰੈਂਕ
 				ਗਿਨੀ ਫ੍ਰੈਂਕ
 				ਗਿਨੀ ਫ੍ਰੈਂਕ
+				GNF
+				FG
 			
 			
 				ਗੁਆਟੇਮਾਲਾ ਕੁਏਟਜ਼ਲ
 				ਗੁਆਟੇਮਾਲਾ ਕੁਏਟਜ਼ਲ
 				ਗੁਆਟੇਮਾਲਾ ਕੁਏਟਜ਼ਲ
+				GTQ
 				Q
 			
 			
 				ਗੁਆਨਾਆਈ ਡਾਲਰ
 				ਗੁਆਨਾਆਈ ਡਾਲਰ
 				ਗੁਆਨਾਆਈ ਡਾਲਰ
+				GYD
 				$
 			
 			
 				ਹਾਂਗ ਕਾਂਗ ਡਾਲਰ
 				ਹਾਂਗ ਕਾਂਗ ਡਾਲਰ
 				ਹਾਂਗ ਕਾਂਗ ਡਾਲਰ
+				HK$
+				$
 			
 			
 				ਹਾਨਡੂਰਨ ਲੇਮਪਿਰਾ
 				ਹਾਨਡੂਰਨ ਲੇਮਪਿਰਾ
 				ਹਾਨਡੂਰਨ ਲੇਮਪਿਰਾ
+				HNL
 				L
 			
 			
 				ਕਰੋਏਸ਼ੀਆਈ ਕੁਨਾ
 				ਕਰੋਏਸ਼ੀਆਈ ਕੁਨਾ
 				ਕਰੋਏਸ਼ੀਆਈ ਕੁਨਾ
+				HRK
+				kn
 			
 			
 				ਹੈਤੀ ਗੌਰਡੇ
 				ਹੈਤੀ ਗੌਰਡੇ
 				ਹੈਤੀ ਗੌਰਡੇ
+				HTG
 			
 			
 				ਹੰਗਰੀ ਫੋਰਿੰਟ
 				ਹੰਗਰੀ ਫੋਰਿੰਟ
 				ਹੰਗਰੀ ਫੋਰਿੰਟ
+				HUF
+				Ft
 			
 			
 				ਇੰਡੋਨੇਸ਼ੀਆਈ ਰੁਪਿਆਹ
 				ਇੰਡੋਨੇਸ਼ੀਆਈ ਰੁਪਿਆਹ
 				ਇੰਡੋਨੇਸ਼ੀਆਈ ਰੁਪਿਆਹ
+				IDR
+				Rp
 			
 			
 				ਆਇਰਿਸ਼ ਪੌਂਡ
@@ -5717,291 +5973,376 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਇਜ਼ਰਾਈਲੀ ਨਵੀਂ ਸ਼ੇਕੇਲ
 				ਇਜ਼ਰਾਈਲੀ ਨਵੀਂ ਸ਼ੇਕੇਲ
 				ਇਜ਼ਰਾਈਲੀ ਨਵੀਂ ਸ਼ੇਕੇਲ
+				₪
+				₪
 			
 			
 				ਭਾਰਤੀ ਰੁਪਇਆ
 				ਭਾਰਤੀ ਰੁਪਇਆ
 				ਭਾਰਤੀ ਰੁਪਏ
+				₹
+				₹
 			
 			
 				ਇਰਾਕੀ ਦਿਨਾਰ
 				ਇਰਾਕੀ ਦਿਨਾਰ
 				ਇਰਾਕੀ ਦਿਨਾਰ
+				IQD
 			
 			
 				ਈਰਾਨੀ ਰਿਆਲ
 				ਈਰਾਨੀ ਰਿਆਲ
 				ਈਰਾਨੀ ਰਿਆਲ
+				IRR
 			
 			
-				ਆਈਸਲੈਂਡਿਕ ਕਰੌਨ
+				ਆਈਸਲੈਂਡੀ ਕਰੋਨਾ
 				ਆਈਸਲੈਂਡਿਕ ਕਰੌਨ
-				ਆਈਸਲੈਂਡਿਕ ਕਰੌਨ
+				ਆਈਸਲੈਂਡੀ ਕਰੋਨਾ
+				ISK
+				kr
 			
 			
 				ਜਮਾਇਕਨ ਡਾਲਰ
 				ਜਮਾਇਕਨ ਡਾਲਰ
 				ਜਮਾਇਕਨ ਡਾਲਰ
+				JMD
 				$
 			
 			
 				ਜਾਰਡਨ ਦਿਨਾਰ
 				ਜਾਰਡਨ ਦਿਨਾਰ
 				ਜਾਰਡਨ ਦਿਨਾਰ
+				JOD
 			
 			
 				ਜਪਾਨੀ ਯੇਨ
 				ਜਪਾਨੀ ਯੇਨ
 				ਜਪਾਨੀ ਯੇਨ
+				JP¥
+				¥
 			
 			
 				ਕੀਨੀਆਈ ਸ਼ਿਲਿੰਗ
 				ਕੀਨੀਆਈ ਸ਼ਿਲਿੰਗ
 				ਕੀਨੀਆਈ ਸ਼ਿਲਿੰਗ
+				KES
 			
 			
 				ਕਿਰਗਿਸਤਾਨੀ ਸੋਮ
 				ਕਿਰਗਿਸਤਾਨੀ ਸੋਮ
 				ਕਿਰਗਿਸਤਾਨੀ ਸੋਮ
+				KGS
 			
 			
 				ਕੰਬੋਡੀਆਈ ਰੀਅਲ
 				ਕੰਬੋਡੀਆਈ ਰੀਅਲ
 				ਕੰਬੋਡੀਆਈ ਰੀਅਲ
+				KHR
+				៛
 			
 			
 				ਕੋਮੋਰੀਅਨ ਫ੍ਰੈਂਕ
 				ਕੋਮੋਰੀਅਨ ਫ੍ਰੈਂਕ
 				ਕੋਮੋਰੀਅਨ ਫ੍ਰੈਂਕ
+				KMF
+				CF
 			
 			
 				ਉੱਤਰੀ ਕੋਰੀਆਈ ਵੋਨ
 				ਉੱਤਰੀ ਕੋਰੀਆਈ ਵੋਨ
 				ਉੱਤਰੀ ਕੋਰੀਆਈ ਵੋਨ
+				KPW
+				₩
 			
 			
 				ਦੱਖਣੀ ਕੋਰੀਆਈ ਵੋਨ
 				ਦੱਖਣੀ ਕੋਰੀਆਈ ਵੋਨ
 				ਦੱਖਣੀ ਕੋਰੀਆਈ ਵੋਨ
+				₩
+				₩
 			
 			
 				ਕੁਵੈਤੀ ਦਿਨਾਰ
 				ਕੁਵੈਤੀ ਦਿਨਾਰ
 				ਕੁਵੈਤੀ ਦਿਨਾਰ
+				KWD
 			
 			
 				ਕੇਮੈਨ ਆਈਲੈਂਡਸ ਡਾਲਰ
 				ਕੇਮੈਨ ਆਈਲੈਂਡਸ ਡਾਲਰ
 				ਕੇਮੈਨ ਆਈਲੈਂਡਸ ਡਾਲਰ
+				KYD
 				$
 			
 			
 				ਕਜ਼ਾਖਸਤਾਨੀ ਤੇਂਗੇ
 				ਕਜ਼ਾਖਸਤਾਨੀ ਤੇਂਗੇ
 				ਕਜ਼ਾਖਸਤਾਨੀ ਤੇਂਗੇ
+				KZT
+				₸
 			
 			
 				ਲਾਓਟਿਆਈ ਕਿਪ
 				ਲਾਓਟਿਆਈ ਕਿਪ
 				ਲਾਓਟਿਆਈ ਕਿਪ
+				LAK
+				₭
 			
 			
 				ਲੈਬਨਾਨੀ ਪੌਂਡ
 				ਲੈਬਨਾਨੀ ਪੌਂਡ
 				ਲੈਬਨਾਨੀ ਪੌਂਡ
+				LBP
+				L£
 			
 			
 				ਸ੍ਰੀਲੰਕਾਈ ਰੁਪਇਆ
 				ਸ੍ਰੀਲੰਕਾਈ ਰੁਪਇਆ
 				ਸ੍ਰੀਲੰਕਾਈ ਰੁਪਏ
+				LKR
+				Rs
 			
 			
 				ਲਾਈਬੀਰੀਆਈ ਡਾਲਰ
 				ਲਾਈਬੀਰੀਆਈ ਡਾਲਰ
 				ਲਾਈਬੀਰੀਆਈ ਡਾਲਰ
+				LRD
+				$
 			
 			
 				ਲਿਥੁਆਨੀਆਈ ਲਿਤਾਸ
 				ਲਿਥੁਆਨੀਆਈ ਲਿਤਾਸ
 				ਲਿਥੁਆਨੀਆਈ ਲਿਤਾਸ
+				LTL
 			
 			
 				ਲਾਟਵਿਆਈ ਲਾਟਸ
 				ਲਾਟਵਿਆਈ ਲਾਟਸ
 				ਲਾਟਵਿਆਈ ਲਾਟਸ
+				LVL
 			
 			
-				ਲੀਬੀਅਨ ਦਿਨਾਰ
-				ਲੀਬੀਅਨ ਦਿਨਾਰ
-				ਲੀਬੀਅਨ ਦਿਨਾਰ
+				ਲੀਬੀਆਈ ਦਿਨਾਰ
+				ਲੀਬੀਆਈ ਦਿਨਾਰ
+				ਲੀਬੀਆਈ ਦਿਨਾਰ
+				LYD
 			
 			
 				ਮੋਰੱਕਨ ਦਿਰਹਾਮ
 				ਮੋਰੱਕਨ ਦਿਰਹਾਮ
 				ਮੋਰੱਕਨ ਦਿਰਹਾਮ
+				MAD
 			
 			
 				ਮੋਲਡੋਵਨ ਲੇਉ
 				ਮੋਲਡੋਵਨ ਲੇਉ
 				ਮੋਲਡੋਵਨ ਲੇਉ
+				MDL
 			
 			
 				ਮਾਲਾਗਾਸੀ ਅਰਾਇਰੀ
 				ਮਾਲਾਗਾਸੀ ਅਰਾਇਰੀ
 				ਮਾਲਾਗਾਸੀ ਅਰਾਇਰੀ
+				MGA
+				Ar
 			
 			
 				ਮੈਕਡੋਨੀਆਈ ਡੇਨਾਰ
 				ਮੈਕਡੋਨੀਆਈ ਡੇਨਾਰ
 				ਮੈਕਡੋਨੀਆਈ ਡੇਨਾਰ
+				MKD
 			
 			
 				ਮਿਆਂਮਾਰ ਕਿਆਤ
 				ਮਿਆਂਮਾਰ ਕਿਆਤ
 				ਮਿਆਂਮਾਰ ਕਿਆਤ
+				MMK
+				K
 			
 			
 				ਮੰਗੋਲੀਆਈ ਤੁਗਰਿਕ
 				ਮੰਗੋਲੀਆਈ ਤੁਗਰਿਕ
 				ਮੰਗੋਲੀਆਈ ਤੁਗਰਿਕ
+				MNT
+				₮
 			
 			
 				ਮੇਕਾਨੀ ਪਟਾਕਾ
 				ਮੇਕਾਨੀ ਪਟਾਕਾ
 				ਮੇਕਾਨੀ ਪਟਾਕਾ
+				MOP
 			
 			
 				ਮੋਰਿਟਾਨੀਆਈ ਊਗੀਆ (1973–2017)
 				ਮੋਰਿਟਾਨੀਆਈ ਊਗੀਆ (1973–2017)
 				ਮੋਰਿਟਾਨੀਆਈ ਊਗੀਆ (1973–2017)
+				MRO
 			
 			
 				ਮੋਰਿਟਾਨੀਆਈ ਊਗੀਆ
 				ਮੋਰਿਟਾਨੀਆਈ ਊਗੀਆ
 				ਮੋਰਿਟਾਨੀਆਈ ਊਗੀਆ
+				MRU
 			
 			
 				ਮੌਰਿਸ਼ੀਆਈ ਰੁਪਇਆ
 				ਮੌਰਿਸ਼ੀਆਈ ਰੁਪਇਆ
 				ਮੌਰਿਸ਼ੀਆਈ ਰੁਪਏ
+				MUR
+				Rs
 			
 			
 				ਮਾਲਦੀਵੀ ਰੁਫੀਆ
 				ਮਾਲਦੀਵੀ ਰੁਫੀਆ
 				ਮਾਲਦੀਵੀ ਰੁਫੀਆ
+				MVR
 			
 			
 				ਮਾਲਾਵੀਆਈ ਕਵਾਚਾ
 				ਮਾਲਾਵੀਆਈ ਕਵਾਚਾ
 				ਮਾਲਾਵੀਆਈ ਕਵਾਚਾ
+				MWK
 			
 			
 				ਮੈਕਸੀਕਨ ਪੇਸੋ
 				ਮੈਕਸੀਕਨ ਪੇਸੋ
 				ਮੈਕਸੀਕਨ ਪੇਸੋ
+				MX$
 				$
 			
 			
 				ਮਲੇਸ਼ੀਆਈ ਰਿੰਗਿਟ
 				ਮਲੇਸ਼ੀਆਈ ਰਿੰਗਿਟ
 				ਮਲੇਸ਼ੀਆਈ ਰਿੰਗਿਟ
+				MYR
+				RM
 			
 			
 				ਮੋਜ਼ਾਮਬੀਕਨ ਮੈਟੀਕਲ
 				ਮੋਜ਼ਾਮਬੀਕਨ ਮੈਟੀਕਲ
 				ਮੋਜ਼ਾਮਬੀਕਨ ਮੈਟੀਕਲ
+				MZN
 			
 			
 				ਨਾਮੀਬੀਆਈ ਡਾਲਰ
 				ਨਾਮੀਬੀਆਈ ਡਾਲਰ
 				ਨਾਮੀਬੀਆਈ ਡਾਲਰ
+				NAD
+				$
 			
 			
 				ਨਾਇਜੀਰੀਆਈ ਨਾਇਰਾ
 				ਨਾਇਜੀਰੀਆਈ ਨਾਇਰਾ
 				ਨਾਇਜੀਰੀਆਈ ਨਾਇਰਾ
+				NGN
+				₦
 			
 			
 				ਨਿਕਾਰਾਗੁਆਈ ਕੋਰਡੋਬਾ
 				ਨਿਕਾਰਾਗੁਆਈ ਕੋਰਡੋਬਾ
 				ਨਿਕਾਰਾਗੁਆਈ ਕੋਰਡੋਬਾ
+				NIO
 				C$
 			
 			
 				ਨਾਰਵੇਜੀਆਈ ਕਰੌਨ
 				ਨਾਰਵੇਜੀਆਈ ਕਰੌਨ
 				ਨਾਰਵੇਜੀਆਈ ਕਰੌਨ
+				NOK
+				kr
 			
 			
 				ਨੇਪਾਲੀ ਰੁਪਇਆ
 				ਨੇਪਾਲੀ ਰੁਪਇਆ
 				ਨੇਪਾਲੀ ਰੁਪਏ
+				NPR
+				Rs
 			
 			
 				ਨਿਊਜ਼ੀਲੈਂਡ ਡਾਲਰ
 				ਨਿਊਜ਼ੀਲੈਂਡ ਡਾਲਰ
 				ਨਿਊਜ਼ੀਲੈਂਡ ਡਾਲਰ
+				NZ$
+				$
 			
 			
 				ਓਮਾਨੀ ਰਿਆਲ
 				ਓਮਾਨੀ ਰਿਆਲ
 				ਓਮਾਨੀ ਰਿਆਲ
+				OMR
 			
 			
 				ਪਨਾਮੇਨੀਅਨ ਬਾਲਬੋਆ
 				ਪਨਾਮੇਨੀਅਨ ਬਾਲਬੋਆ
 				ਪਨਾਮੇਨੀਅਨ ਬਾਲਬੋਆ
+				PAB
 			
 			
 				ਪੇਰੂਵੀਅਨ ਸੋਲ
 				ਪੇਰੂਵੀਅਨ ਸੋਲ
 				ਪੇਰੂਵੀਅਨ ਸੋਲ
+				PEN
 			
 			
 				ਪਾਪੂਆ ਨਿਊ ਗਿਨੀਆਈ ਕੀਨਾ
 				ਪਾਪੂਆ ਨਿਊ ਗਿਨੀਆਈ ਕੀਨਾ
 				ਪਾਪੂਆ ਨਿਊ ਗਿਨੀਆਈ ਕੀਨਾ
+				PGK
 			
 			
 				ਫਿਲਿਪੀਨੀ ਪੇਸੋ
 				ਫਿਲਿਪੀਨੀ ਪੇਸੋ
 				ਫਿਲਿਪੀਨੀ ਪੇਸੋ
+				PHP
+				₱
 			
 			
 				ਪਾਕਿਸਤਾਨੀ ਰੁਪਇਆ
 				ਪਾਕਿਸਤਾਨੀ ਰੁਪਇਆ
 				ਪਾਕਿਸਤਾਨੀ ਰੁਪਏ
+				PKR
+				Rs
 			
 			
 				ਪੋਲੈਂਡੀ ਜ਼ਲੌਟੀ
 				ਪੋਲੈਂਡੀ ਜ਼ਲੌਟੀ
 				ਪੋਲੈਂਡੀ ਜ਼ਲੌਟੀ
+				PLN
+				zł
 			
 			
 				ਪੈਰਾਗੁਵਾਇਨ ਗੁਆਰਾਨੀ
 				ਪੈਰਾਗੁਵਾਇਨ ਗੁਆਰਾਨੀ
 				ਪੈਰਾਗੁਵਾਇਨ ਗੁਆਰਾਨੀ
+				PYG
 				₲
 			
 			
 				ਕਤਰੀ ਰਿਆਲ
 				ਕਤਰੀ ਰਿਆਲ
 				ਕਤਰੀ ਰਿਆਲ
+				QAR
 			
 			
 				ਰੋਮਾਨੀਆਈ ਲੇਉ
 				ਰੋਮਾਨੀਆਈ ਲੇਉ
 				ਰੋਮਾਨੀਆਈ ਲੇਉ
+				RON
+				lei
 			
 			
 				ਸਰਬੀਆਈ ਦਿਨਾਰ
 				ਸਰਬੀਆਈ ਦਿਨਾਰ
 				ਸਰਬੀਆਈ ਦਿਨਾਰ
+				RSD
 			
 			
 				ਰੂਸੀ ਰੂਬਲ
 				ਰੂਸੀ ਰੂਬਲ
 				ਰੂਸੀ ਰੂਬਲ
+				RUB
+				₽
 			
 			
 				р.
@@ -6010,72 +6351,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਰਵਾਂਡਨ ਫ੍ਰੈਂਕ
 				ਰਵਾਂਡਨ ਫ੍ਰੈਂਕ
 				ਰਵਾਂਡਨ ਫ੍ਰੈਂਕ
+				RWF
+				RF
 			
 			
 				ਸਾਊਦੀ ਰਿਆਲ
 				ਸਾਊਦੀ ਰਿਆਲ
 				ਸਾਊਦੀ ਰਿਆਲ
+				SAR
 			
 			
 				ਸੋਲੋਮਨ ਆਈਲੈਂਡਸ ਡਾਲਰ
 				ਸੋਲੋਮਨ ਆਈਲੈਂਡਸ ਡਾਲਰ
 				ਸੋਲੋਮਨ ਆਈਲੈਂਡਸ ਡਾਲਰ
+				SBD
+				$
 			
 			
 				ਸੇਸ਼ਲਸ ਰੁਪਇਆ
 				ਸੇਸ਼ਲਸ ਰੁਪਇਆ
 				ਸੇਸ਼ਲਸ ਰੁਪਏ
+				SCR
 			
 			
 				ਸੂਡਾਨੀ ਪੌਂਡ
 				ਸੂਡਾਨੀ ਪੌਂਡ
 				ਸੂਡਾਨੀ ਪੌਂਡ
+				SDG
 			
 			
 				ਸਵੀਡਿਸ਼ ਕਰੋਨਾ
 				ਸਵੀਡਿਸ਼ ਕਰੋਨਾ
 				ਸਵੀਡਿਸ਼ ਕਰੋਨਾ
+				SEK
+				kr
 			
 			
 				ਸਿੰਗਾਪੁਰ ਡਾਲਰ
 				ਸਿੰਗਾਪੁਰ ਡਾਲਰ
 				ਸਿੰਗਾਪੁਰ ਡਾਲਰ
+				SGD
+				$
 			
 			
 				ਸੇਂਟ ਹੇਲੇਨਾ ਪੌਂਡ
 				ਸੇਂਟ ਹੇਲੇਨਾ ਪੌਂਡ
 				ਸੇਂਟ ਹੇਲੇਨਾ ਪੌਂਡ
+				SHP
+				£
 			
 			
 				ਸਿਏਰਾ ਲਿਓਨੀਅਨ ਲਿਓਨ
 				ਸਿਏਰਾ ਲਿਓਨੀਅਨ ਲਿਓਨ
 				ਸਿਏਰਾ ਲਿਓਨੀਅਨ ਲਿਓਨ
+				SLL
 			
 			
 				ਸੋਮਾਲੀ ਸ਼ਿਲਿੰਗ
 				ਸੋਮਾਲੀ ਸ਼ਿਲਿੰਗ
 				ਸੋਮਾਲੀ ਸ਼ਿਲਿੰਗ
+				SOS
 			
 			
 				ਸੂਰੀਨਾਮੀ ਡਾਲਰ
 				ਸੂਰੀਨਾਮੀ ਡਾਲਰ
 				ਸੂਰੀਨਾਮੀ ਡਾਲਰ
+				SRD
 				$
 			
 			
 				ਦੱਖਣੀ ਸੂਡਾਨੀ ਪੌਂਡ
 				ਦੱਖਣੀ ਸੂਡਾਨੀ ਪੌਂਡ
 				ਦੱਖਣੀ ਸੂਡਾਨੀ ਪੌਂਡ
+				SSP
+				£
 			
 			
 				ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ (1977–2017)
 				ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ (1977–2017)
 				ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ (1977–2017)
+				STD
 			
 			
 				ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ
 				ਸਾਉ ਟੋਮੀ ਅਤੇ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ
 				ਸਾਉ ਟੋਮੀ ਐਂਡ ਪ੍ਰਿੰਸਪੀ ਡੋਬਰਾ
+				STN
+				Db
 			
 			
 				ਸੋਵੀਅਤ ਰੂਬਲ
@@ -6087,74 +6449,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਸੀਰੀਆਈ ਪੌਂਡ
 				ਸੀਰੀਆਈ ਪੌਂਡ
 				ਸੀਰੀਆਈ ਪੌਂਡ
+				SYP
+				£
 			
 			
 				ਸਵਾਜ਼ੀ ਲਾਇਲੈਂਗਨੀ
 				ਸਵਾਜ਼ੀ ਲਾਇਲੈਂਗਨੀ
 				ਸਵਾਜ਼ੀ ਲਾਇਲੈਂਗਨੀ
+				SZL
 			
 			
 				ਥਾਈ ਬਾਹਤ
 				ਥਾਈ ਬਾਹਤ
 				ਥਾਈ ਬਾਹਤ
 				฿
+				฿
 			
 			
 				ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ
 				ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ
 				ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ
+				TJS
 			
 			
 				ਤੁਰਕਮੇਨਿਸਤਾਨੀ ਮਾਨਤ
 				ਤੁਰਕਮੇਨਿਸਤਾਨੀ ਮਾਨਤ
 				ਤੁਰਕਮੇਨਿਸਤਾਨੀ ਮਾਨਤ
+				TMT
 			
 			
 				ਟਿਉਨੀਸ਼ੀਆਈ ਦਿਨਾਰ
 				ਟਿਉਨੀਸ਼ੀਆਈ ਦਿਨਾਰ
 				ਟਿਉਨੀਸ਼ੀਆਈ ਦਿਨਾਰ
+				TND
 			
 			
 				ਟੌਂਗਨ ਪੈਂਗਾ
 				ਟੌਂਗਨ ਪੈਂਗਾ
 				ਟੌਂਗਨ ਪੈਂਗਾ
+				TOP
+				T$
 			
 			
 				ਤੁਰਕੀ ਲੀਰਾ
 				ਤੁਰਕੀ ਲੀਰਾ
 				ਤੁਰਕੀ ਲੀਰਾ
+				TRY
+				₺
+				TL
 			
 			
 				ਟ੍ਰਿਨੀਡਾਡ ਅਤੇ ਟੋਬਾਗੋ ਡਾਲਰ
 				ਟ੍ਰਿਨੀਡਾਡ ਅਤੇ ਟੋਬਾਗੋ ਡਾਲਰ
 				ਟ੍ਰਿਨੀਡਾਡ ਅਤੇ ਟੋਬਾਗੋ ਡਾਲਰ
+				TTD
 				$
 			
 			
 				ਨਵਾਂ ਤਾਇਵਾਨ ਡਾਲਰ
 				ਨਵਾਂ ਤਾਇਵਾਨ ਡਾਲਰ
 				ਨਵਾਂ ਤਾਇਵਾਨ ਡਾਲਰ
+				NT$
 				NT$
 			
 			
 				ਤਨਜ਼ਾਨੀਆਈ ਸ਼ਿਲਿੰਗ
 				ਤਨਜ਼ਾਨੀਆਈ ਸ਼ਿਲਿੰਗ
 				ਤਨਜ਼ਾਨੀਆਈ ਸ਼ਿਲਿੰਗ
+				TZS
 			
 			
 				ਯੂਕਰੇਨੀਆਈ ਰਿਵਨਿਆ
 				ਯੂਕਰੇਨੀਆਈ ਰਿਵਨਿਆ
 				ਯੂਕਰੇਨੀਆਈ ਰਿਵਨਿਆ
+				UAH
+				₴
 			
 			
 				ਯੂਗਾਂਡੀਆਈ ਸ਼ਿਲਿੰਗ
 				ਯੂਗਾਂਡੀਆਈ ਸ਼ਿਲਿੰਗ
 				ਯੂਗਾਂਡੀਆਈ ਸ਼ਿਲਿੰਗ
+				UGX
 			
 			
 				ਯੂ.ਐਸ. ਡਾਲਰ
 				ਯੂ.ਐਸ. ਡਾਲਰ
 				ਯੂ.ਐਸ. ਡਾਲਰ
+				US$
 				$
 			
 			
@@ -6170,12 +6551,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਉਰੂਗੁਵਾਇਨ ਪੇਸੋ
 				ਉਰੂਗੁਵਾਇਨ ਪੇਸੋ
 				ਉਰੂਗੁਵਾਇਨ ਪੇਸੋ
+				UYU
 				$
 			
 			
 				ਉਜ਼ਬੇਕਿਸਤਾਨ ਸੋਮ
 				ਉਜ਼ਬੇਕਿਸਤਾਨ ਸੋਮ
 				ਉਜ਼ਬੇਕਿਸਤਾਨ ਸੋਮ
+				UZS
 			
 			
 				ਵੇਨੇਜ਼ੂਏਲਨ ਬੋਲੀਵਰ (1871–2008)
@@ -6187,6 +6570,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਵੇਨੇਜ਼ੂਏਲਨ ਬੋਲੀਵਰ (2008–2018)
 				ਵੇਨੇਜ਼ੂਏਲਨ ਬੋਲੀਵਰ (2008–2018)
 				ਵੇਨੇਜ਼ੂਏਲਨ ਬੋਲੀਵਰ (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6199,6 +6583,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਵੀਅਤਨਾਮੀ ਡੋਂਗ
 				ਵੀਅਤਨਾਮੀ ਡੋਂਗ
 				ਵੀਅਤਨਾਮੀ ਡੋਂਗ
+				₫
+				₫
 			
 			
 				ਵੀਅਤਨਾਮੀ ਡੋਂਗ (1978–1985)
@@ -6210,16 +6596,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਵਾਨੂਆਟੂ ਵਾਟੂ
 				ਵਾਨੂਆਟੂ ਵਾਟੂ
 				ਵਾਨੂਆਟੂ ਵਾਟੂ
+				VUV
 			
 			
 				ਸਾਮੋਆਈ ਤਾਲਾ
 				ਸਾਮੋਆਈ ਤਾਲਾ
 				ਸਾਮੋਆਈ ਤਾਲਾ
+				WST
 			
 			
 				ਕੇਂਦਰੀ ਅਫ਼ਰੀਕੀ [CFA] ਫ੍ਰੈਂਕ
 				ਕੇਂਦਰੀ ਅਫ਼ਰੀਕੀ [CFA] ਫ੍ਰੈਂਕ
 				ਕੇਂਦਰੀ ਅਫ਼ਰੀਕੀ [CFA] ਫ੍ਰੈਂਕ
+				FCFA
 			
 			
 				ਚਾਂਦੀ
@@ -6252,6 +6641,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ
 				ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ
 				ਪੂਰਬੀ ਕੈਰੇਬੀਅਨ ਡਾਲਰ
+				EC$
 				$
 			
 			
@@ -6264,11 +6654,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਪੱਛਮੀ ਅਫ਼ਰੀਕੀ (CFA) ਫ੍ਰੈਂਕ
 				ਪੱਛਮੀ ਅਫ਼ਰੀਕੀ (CFA) ਫ੍ਰੈਂਕ
 				ਪੱਛਮੀ ਅਫ਼ਰੀਕੀ (CFA) ਫ੍ਰੈਂਕ
+				CFA
 			
 			
 				ਫ੍ਰੈਂਕ (CFP)
 				ਫ੍ਰੈਂਕ (CFP)
 				ਫ੍ਰੈਂਕ (CFP)
+				CFPF
 			
 			
 				ਅਗਿਆਤ ਮੁਦਰਾ
@@ -6280,20 +6672,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ਯਮਨੀ ਰਿਆਲ
 				ਯਮਨੀ ਰਿਆਲ
 				ਯਮਨੀ ਰਿਆਲ
+				YER
 			
 			
 				ਦੱਖਣੀ ਅਫਰੀਕੀ ਰੈਂਡ
 				ਦੱਖਣੀ ਅਫਰੀਕੀ ਰੈਂਡ
 				ਦੱਖਣੀ ਅਫਰੀਕੀ ਰੈਂਡ
+				ZAR
+				R
 			
 			
 				ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ
 				ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ
 				ਜ਼ਾਮਬੀਆਈ ਕਵਾਚਾ
+				ZMW
+				ZK
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
@@ -6418,14 +6817,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਹਿੱਸੇ ਪ੍ਰਤੀ ਮਿਲੀਅਨ
 			
 			
-				ਪ੍ਰਤੀਸ਼ਤ
-				{0} ਪ੍ਰਤੀਸ਼ਤ
-				{0} ਪ੍ਰਤੀਸ਼ਤ
+				ਪ੍ਰਤੀਸ਼ਤ
+				{0} ਪ੍ਰਤੀਸ਼ਤ
+				{0} ਪ੍ਰਤੀਸ਼ਤ
 			
 			
-				ਪਰਮਾਈਲ
-				{0} ਪਰਮਾਈਲ
-				{0} ਪਰਮਾਈਲ
+				ਪਰਮਾਈਲ
+				{0} ਪਰਮਾਈਲ
+				{0} ਪਰਮਾਈਲ
 			
 			
 				ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ
@@ -6458,9 +6857,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮੀਲ ਪ੍ਰਤੀ ਇੰਪ. ਗੈਲਨ
 			
 			
-				ਪੈਟਾਬਾਇਟ
-				{0} ਪੈਟਾਬਾਇਟ
-				{0} ਪੈਟਾਬਾਇਟ
+				ਪੈਟਾਬਾਇਟ
+				{0} ਪੈਟਾਬਾਇਟ
+				{0} ਪੈਟਾਬਾਇਟ
 			
 			
 				ਟੈਰਾਬਾਇਟ
@@ -6517,6 +6916,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਸਦੀ
 				{0} ਸਦੀਆਂ
 			
+			
+				ਦਹਾਕੇ
+				{0} ਦਹਾਕਾ
+				{0} ਦਹਾਕੇ
+			
 			
 				ਸਾਲ
 				{0} ਸਾਲ
@@ -6634,6 +7038,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਬਰਤਾਨਵੀ ਤਾਪ ਇਕਾਈ
 				{0} ਬਰਤਾਨਵੀ ਤਾਪ ਇਕਾਈ
 			
+			
+				US therms
+			
 			
 				ਪੌਂਡ ਬਲ
 				{0} ਪੌਂਡ ਬਲ
@@ -6664,6 +7071,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਹਰਟਜ਼
 				{0} ਹਰਟਜ਼
 			
+			
+				ਟਾਈਪੋਗ੍ਰਾਫ਼ਿਕ ਐਮ
+				{0} ਟਾਈਪੋਗ੍ਰਾਫ਼ਿਕ ਐਮ
+				{0} ਟਾਈਪੋਗ੍ਰਾਫ਼ਿਕ ਐਮ
+			
+			
+				ਪਿਕਸਲ
+				{0} ਪਿਕਸਲ
+				{0} ਪਿਕਸਲ
+			
+			
+				ਮੈਗਾਪਿਕਸਲ
+				{0} ਮੈਗਾਪਿਕਸਲ
+				{0} ਮੈਗਾਪਿਕਸਲ
+			
+			
+				ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ
+				{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ
+				{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ
+			
+			
+				ਪਿਕਸਲ ਪ੍ਰਤੀ ਇੰਚ
+				{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਇੰਚ
+				{0} ਪਿਕਸਲ ਪ੍ਰਤੀ ਇੰਚ
+			
+			
+				ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ
+				{0} ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ
+				{0} ਡਾਟ ਪ੍ਰਤੀ ਸੈਂਟੀਮੀਟਰ
+			
+			
+				ਡਾਟ ਪ੍ਰਤੀ ਇੰਚ
+				{0} ਡਾਟ ਪ੍ਰਤੀ ਇੰਚ
+				{0} ਡਾਟ ਪ੍ਰਤੀ ਇੰਚ
+			
 			
 				ਕਿਲੋਮੀਟਰ
 				{0} ਕਿਲੋਮੀਟਰ
@@ -6765,9 +7207,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮੀਲ-ਸਕੈਂਡਿਨੇਵਿਆਈ
 			
 			
-				ਪੁਆਇੰਟ
-				{0} ਪੁਆਇੰਟ
-				{0} ਪੁਆਇੰਟ
+				ਪੁਆਇੰਟ
+				{0} ਪੁਆਇੰਟ
+				{0} ਪੁਆਇੰਟ
 			
 			
 				ਸੋਲਰ ਰੇਡੀਅਸ
@@ -6888,11 +7330,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਹੌਰਸਪਾਵਰ
 				{0} ਹੌਰਸਪਾਵਰ
 			
-			
-				ਹੈਕਟੋਪਾਸਕਲ
-				{0} ਹੈਕਟੋਪਾਸਕਲ
-				{0} ਹੈਕਟੋਪਾਸਕਲ
-			
 			
 				ਮਿਲੀਮੀਟਰ ਪਾਰਾ
 				{0} ਮਿਲੀਮੀਟਰ ਪਾਰਾ
@@ -6908,15 +7345,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਇੰਚ ਪਾਰਾ
 				{0} ਇੰਚ ਪਾਰਾ
 			
+			
+				ਬਾਰ
+				{0} ਬਾਰ
+				{0} ਬਾਰ
+			
 			
 				ਮਿਲੀਬਾਰ
 				{0} ਮਿਲੀਬਾਰ
 				{0} ਮਿਲੀਬਾਰ
 			
 			
-				ਵਾਯੂਮੰਡਲ
-				{0} ਵਾਯੂਮੰਡਲ
-				{0} ਵਾਯੂਮੰਡਲ
+				ਵਾਯੂਮੰਡਲ
+				{0} ਵਾਯੂਮੰਡਲ
+				{0} ਵਾਯੂਮੰਡਲ
+			
+			
+				ਪੈਸਕਲ
+				{0} ਪੈਸਕਲ
+				{0} ਪੈਸਕਲ
+			
+			
+				ਹੈਕਟੋਪਾਸਕਲ
+				{0} ਹੈਕਟੋਪਾਸਕਲ
+				{0} ਹੈਕਟੋਪਾਸਕਲ
 			
 			
 				ਕਿੱਲੋਪਾਸਕਲ
@@ -6948,6 +7400,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਨੌਟ
 				{0} ਨੌਟ
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				ਦਰਜੇ ਸੈਲਸੀਅਸ
 				{0} ਦਰਜਾ ਸੈਲਸੀਅਸ
@@ -7114,16 +7571,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਬੈਰਲ
 			
 			
-				ਮੁੱਖ ਦਿਸ਼ਾ
-				{0}ਪੂ
-				{0}ਉ
-				{0}ਦੱ
-				{0}ਪੱ
+				ਮੁੱਖ ਦਿਸ਼ਾ
+				{0} ਪੂਰਬ
+				{0} ਉੱਤਰ
+				{0} ਦੱਖਣ
+				{0} ਪੱਛਮ
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}⋅{1}
+			
 			
 				ਗੁਰੂਤਾਕਰਸ਼ਣ ਬਲ
+				{0} G
+				{0} G
 			
 			
 				ਮੀਟਰ/ਸਕਿੰਟ²
@@ -7227,17 +7692,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਹਿੱਸੇ/ਮਿਲੀਅਨ
+				{0} ppm
+				{0} ppm
 			
 			
-				ਪ੍ਰਤੀਸ਼ਤ
+				ਪ੍ਰਤੀਸ਼ਤ
+				{0}%
+				{0}%
 			
 			
-				ਪਰਮਾਈਲ
+				ਪਰਮਾਈਲ
+				{0}‰
+				{0}‰
 			
 			
 				ਪ੍ਰਤੀ ਦਸ ਹਜ਼ਾਰ
-				{0}‱
-				{0}‱
 			
 			
 				ਮੋਲ
@@ -7265,31 +7734,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpg ਇੰਪ.
 			
 			
-				ਪੈਟਾਬਾਇਟ
+				ਪੈਟਾਬਾਇਟ
+				{0} PB
+				{0} PB
 			
 			
 				ਟੈਰਾਬਾਇਟ
+				{0} TB
+				{0} TB
 			
 			
 				ਟੇਰਾਬਿਟ
+				{0} Tb
+				{0} Tb
 			
 			
 				ਗੀਗਾਬਾਇਟ
+				{0} GB
+				{0} GB
 			
 			
 				Gbit
+				{0} Gb
+				{0} Gb
 			
 			
 				ਮੈਗਾਬਾਇਟ
+				{0} MB
+				{0} MB
 			
 			
 				ਮੈਗਾਬਿਟ
+				{0} Mb
+				{0} Mb
 			
 			
 				ਕਿਲੋਬਾਇਟ
+				{0} kB
+				{0} kB
 			
 			
 				ਕਿਲੋਬਿਟ
+				{0} kb
+				{0} kb
 			
 			
 				ਬਾਇਟ
@@ -7306,6 +7793,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਸਦੀ
 				{0} ਸਦੀ
 			
+			
+				ਦਹਾ
+				{0} ਦਹਾ
+				{0} ਦਹਾ
+			
 			
 				ਸਾਲ
 				{0} ਸਾਲ
@@ -7355,21 +7847,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਮਾਈਕਰੋਸਕਿੰਟ
+				{0} μs
+				{0} μs
 			
 			
 				ਨੈਨੋਸਕਿੰਟ
+				{0} ns
+				{0} ns
 			
 			
 				ਐਮਪੀਅਰ
+				{0} A
+				{0} A
 			
 			
 				ਮਿਲੀਐਮਪੀਅਰ
+				{0} mA
+				{0} mA
 			
 			
 				ਓਹਮ
+				{0} Ω
+				{0} Ω
 			
 			
 				ਵੋਲਟ
+				{0} V
+				{0} V
 			
 			
 				ਕਿ.ਕੈਲੋਰੀ
@@ -7393,6 +7897,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਜੂਲ
+				{0} J
+				{0} J
 			
 			
 				ਕਿ.ਵਾ.ਘੰ.
@@ -7401,24 +7907,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਇਲੈਕਟ੍ਰਾਨਵੋਲਟ
-				{0} eV
-				{0} eV
 			
 			
 				BTU
-				{0} Btu
-				{0} Btu
+			
+			
+				US therm
+				{0} US therm
+				{0} US therm
 			
 			
 				ਪੌਂਡ-ਬਲ
-				{0} lbf
-				{0} lbf
 			
 			
 				ਨਿਊਟਨ
 				{0} ਨਿ
 				{0} ਨਿ
 			
+			
+				GHz
+				{0} GHz
+				{0} GHz
+			
+			
+				MHz
+				{0} MHz
+				{0} MHz
+			
+			
+				kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+				{0} Hz
+			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				ਕਿ.ਮੀ.
 				{0} ਕਿ.ਮੀ.
@@ -7449,6 +8009,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਮਾਈਕਰੋਮੀਟਰ
+				{0} µm
+				{0} µm
 			
 			
 				ਨੈ.ਮੀ.
@@ -7492,6 +8054,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਪ੍ਰ.ਸ.
 				{0} ਪ੍ਰ.ਸ.
 			
+			
+				au
+				{0} au
+				{0} au
+			
 			
 				ਫਰਲਾਂਗ
 				{0} ਫਰਲਾਂਗ
@@ -7513,12 +8080,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਸਕੈਂਡ. ਮੀਲ
 			
 			
-				ਪੁਆਇੰਟ
+				ਪੁਆਇੰਟ
+				{0} pt
+				{0} pt
 			
 			
 				ਸੋਲਰ ਰੇਡੀਅਸ
-				{0} R☉
-				{0} R☉
 			
 			
 				ਲਕਸ
@@ -7527,8 +8094,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਸੋਲਰ ਲੂਮਨਾਸਿਟੀ
-				{0} L☉
-				{0} L☉
+			
+			
+				t
+				{0} t
+				{0} t
 			
 			
 				ਕਿ.ਗ੍ਰਾ.
@@ -7547,6 +8117,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮਿ.ਗ੍ਰਾ.
 				{0} ਮਿ.ਗ੍ਰਾ.
 			
+			
+				µg
+				{0} µg
+				{0} µg
+			
 			
 				ਟਨ
 				{0} ਟਨ
@@ -7586,13 +8161,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਅਰਥ ਮਾਸ
-				{0} M⊕
-				{0} M⊕
 			
 			
 				ਸੋਲਰ ਮਾਸ
-				{0} M☉
-				{0} M☉
 			
 			
 				ਗੀ.ਵਾਟ
@@ -7620,14 +8191,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮਿ.ਵਾਟ
 			
 			
+				hp
 				{0} ਹੌਰਸਪਾਵਰ
 				{0} ਹੌਰਸਪਾਵਰ
 			
-			
-				ਹੈ.ਪਾ.
-				{0} ਹੈ.ਪਾ.
-				{0} ਹੈ.ਪਾ.
-			
 			
 				ਮਿ.ਮੀ. ਪਾਰਾ
 				{0} ਮਿ.ਮੀ. ਪਾਰਾ
@@ -7643,15 +8210,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਇੰਚ ਪਾਰਾ
 				{0} ਇੰਚ ਪਾਰਾ
 			
+			
+				ਬਾਰ
+				{0} ਬਾਰ
+				{0} ਬਾਰ
+			
 			
 				ਮਿਲੀਬਾਰ
 				{0} ਮਿਲੀਬਾਰ
 				{0} ਮਿਲੀਬਾਰ
 			
 			
-				ਵਾ. ਮੰ.
-				{0} ਵਾ. ਮੰ.
-				{0} ਵਾ. ਮੰ.
+				ਵਾ. ਮੰ.
+				{0} ਵਾ. ਮੰ.
+				{0} ਵਾ. ਮੰ.
+			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				ਹੈ.ਪਾ.
+				{0} ਹੈ.ਪਾ.
+				{0} ਹੈ.ਪਾ.
 			
 			
 				ਕਿ.ਪਾ
@@ -7678,16 +8260,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮੀ.ਪ੍ਰ.ਘੰ.
 				{0} ਮੀ.ਪ੍ਰ.ਘੰ.
 			
+			
+				kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				ਦਰਜਾ ਸੈਲਸੀਅਸ
+				{0}°C
+				{0}°C
 			
 			
 				ਦਰਜਾ ਫਾਰੇਨਹਾਈਟ
+				{0}°F
+				{0}°F
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+			
+				K
+				{0} K
+				{0} K
 			
 			
 				ਨਿ⋅ਮੀ
@@ -7814,11 +8410,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਤ. ਔਂਸ
 				{0} ਤ. ਔਂਸ
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				ਟੇਬਲ ਸਪੂਨ
 				{0} ਟੇਬਲ ਸਪੂਨ
@@ -7835,7 +8426,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਬੈਰਲ
 			
 			
-				ਦਿਸ਼ਾ
+				ਦਿਸ਼ਾ
 				{0}ਪੂ
 				{0}ਉ
 				{0}ਦੱ
@@ -7843,6 +8434,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				{0}G
 				{0}Gs
@@ -7908,7 +8502,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਕੇਰਟ
 			
 			
-				ਪ੍ਰਤੀਸ਼ਤ
+				ਪ੍ਰਤੀਸ਼ਤ
+				{0}%
+				{0}%
 			
 			
 				{0}ਲਿ./ਕਿ.ਮੀ.
@@ -8096,6 +8692,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ਮਾਇਕ੍ਰੋ. ਮੀ.
+				{0} µm
+				{0} µm
 			
 			
 				ਨੈ.ਮੀ.
@@ -8221,11 +8819,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0} hp
 			
-			
-				ਹੈ.ਪਾ.
-				{0} ਹੈ.ਪਾ.
-				{0} ਹੈ.ਪਾ.
-			
 			
 				ਮਿ.ਮੀ. ਪਾਰਾ
 				{0} ਮਿ.ਮੀ. ਪਾਰਾ
@@ -8246,6 +8839,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮਿ.ਬਾ.
 				{0} ਮਿ.ਬਾ.
 			
+			
+				ਹੈ.ਪਾ.
+				{0} ਹੈ.ਪਾ.
+				{0} ਹੈ.ਪਾ.
+			
 			
 				ਕਿ.ਮੀ./ਘੰਟਾ
 				{0} ਕਿ.ਪ੍ਰ.ਘੰ.
@@ -8261,11 +8859,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਮੀ.ਪ੍ਰ.ਘੰ.
 				{0} ਮੀ.ਪ੍ਰ.ਘੰ.
 			
+			
+				°
+				{0}°
+				{0}°
+			
+			
+				°C
+				{0}°C
+				{0}°C
+			
 			
 				{0}°
 				{0}°
 			
 			
+				K
 				{0}°K
 				{0}°K
 			
@@ -8352,7 +8961,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ਤ. ਔਂਸ
 			
 			
-				ਦਿਸ਼ਾ
+				ਦਿਸ਼ਾ
 				{0}ਪੂ
 				{0}ਉ
 				{0}ਦੱ
@@ -8382,11 +8991,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, or {1}
 			{0} ਜਾਂ {1}
 		
+		
+			{0}, ਜਾਂ {1}
+		
+		
+			{0}, ਜਾਂ {1}
+		
 		
-			{0}, {1}
-			{0}, {1}
-			{0} ਅਤੇ {1}
-			{0} ਅਤੇ {1}
+			{0}, {1}
+			{0}, {1}
+			{0}, {1}
+			{0}, {1}
 		
 		
 			{0}, {1}
@@ -8401,10 +9016,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
 		
 		
 			{0}, {1}
diff --git a/make/data/cldr/common/main/pa_Arab.xml b/make/data/cldr/common/main/pa_Arab.xml
index 7166143d354..fa5f308469c 100644
--- a/make/data/cldr/common/main/pa_Arab.xml
+++ b/make/data/cldr/common/main/pa_Arab.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 			
 			
-			
+			
 			
-			
-			
-			
+			
+			
+			
 			
 			
-			
+			
 			
-			
+			
 			
 			
 			
@@ -782,7 +783,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -796,11 +797,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
-			
+			
 		
 		
 			świat
@@ -1074,7 +1075,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tadżykistan
 			Tokelau
 			Timor Wschodni
-			Timor-Leste
+			Timor-Leste
 			Turkmenistan
 			Tunezja
 			Tonga
@@ -1101,8 +1102,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis i Futuna
 			Samoa
-			Pseudoakcenty
-			Pseudodwukierunkowe
+			Pseudoakcenty
+			Pseudodwukierunkowe
 			Kosowo
 			Jemen
 			Majotta
@@ -1149,34 +1150,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			kalendarz
 			format waluty
-			Sortowanie ignorujące symbole
-			Odwrotne sortowanie ze znakami akcentowanymi
-			Porządek wielkie/małe litery
-			Sortowanie uwzględniające wielkość liter
-			porządek sortowania
-			Sortowanie znormalizowane
-			Sortowanie numeryczne
-			Siła sortowania
+			Sortowanie ignorujące symbole
+			Odwrotne sortowanie ze znakami akcentowanymi
+			Kolejność wielkie/małe litery
+			Sortowanie uwzględniające wielkość liter
+			kolejność sortowania
+			Sortowanie znormalizowane
+			Sortowanie numeryczne
+			Siła sortowania
 			waluta
 			cykl (12- lub 24-godzinny)
 			styl podziału wiersza
-			układ miar
+			system miar
 			cyfry
-			Strefa czasowa
-			Wariant regionalny
+			Strefa czasowa
+			Wariant regionalny
 			Do prywatnego użytku
 		
 		
 			kalendarz buddyjski
 			kalendarz chiński
 			Kalendarz koptyjski
-			kalendarz dangi
+			kalendarz koreański
 			kalendarz etiopski
 			Kalendarz etiopski Amete Alem
 			kalendarz gregoriański
 			kalendarz hebrajski
 			narodowy kalendarz hinduski
-			kalendarz islamski (metoda wzrokowa)
+			kalendarz muzułmański
 			kalendarz islamski (metoda obliczeniowa)
 			kalendarz islamski (Arabia Saudyjska, metoda wzrokowa)
 			kalendarz islamski (metoda obliczeniowa, epoka astronomiczna)
@@ -1199,16 +1200,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			chiński tradycyjny porządek sortowania - Big5
 			poprzedni porządek sortowania, dla zgodności
 			sortowanie słownikowe
-			domyślne sortowanie Unicode
+			domyślna kolejność sortowania Unicode
 			europejskie reguły określania kolejności
 			chiński uproszczony porządek sortowania - GB2312
 			porządek sortowania książki telefonicznej
 			sortowanie fonetyczne
 			porządek sortowania pinyin
 			sortowanie zreformowane
-			wyszukiwanie ogólnego użytku
+			wyszukiwanie ogólnego zastosowania
 			Wyszukiwanie według początkowej spółgłoski hangul
-			sortowanie standardowe
+			standardowa kolejność sortowania
 			porządek akcentów
 			tradycyjny porządek sortowania
 			sortowanie wg kluczy i ich liczby kresek
@@ -1231,8 +1232,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			luźny styl podziału wiersza
 			normalny styl podziału wiersza
 			ścisły styl podziału wiersza
-			BGN
-			UNGEGN
+			transliteracja BGN
+			transliteracja UNGEGN
 			system metryczny
 			imperialny system miar
 			amerykański system miar
@@ -1314,21 +1315,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a ą b c ć d e ę f g h i j k l ł m n ń o ó p r s ś t u w y z ź ż]
 		[à â å ä æ ç é è ê ë î ï ô ö œ q ß ù û ü v x ÿ]
 		[A Ą B C Ć D E Ę F G H I J K L Ł M N Ń O Ó P Q R S Ś T U V W X Y Z Ź Ż]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' " ” „ « » ( ) \[ \] \{ \} § @ * / \& # % † ‡ ′ ″ ° ~]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' " ” „ « » ( ) \[ \] \{ \} § @ * / \& # % † ‡ ′ ″ ° ~]
 		{0}…
 		…{0}
 		
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
@@ -1663,7 +1659,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							dd.MM.y–dd.MM.y G
 						
 						
-							E, dd.MM.y – E, dd.MM.y G
+							E, dd.MM.y – E, dd.MM.y G
 							E, dd.MM.y – E, dd.MM.y G
 							E, dd.MM.y – E, dd.MM.y GGGGG
 						
@@ -1682,7 +1678,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, d MMM y – E, d MMM y G
 						
 						
-							LLLL–LLLL y G
+							LLLL–LLLL y G
 							LLLL y – LLLL y G
 						
 					
@@ -2007,6 +2003,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2066,10 +2084,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d MMM
 						d MMMM
 						E, d MMMM
-						MMMM, 'tydz'. W
-						MMMM, 'tydz'. W
-						MMMM, 'tydz'. W
-						MMMM, 'tydz'. W
+						LLLL, 'tydz'. W
+						LLLL, 'tydz'. W
+						LLLL, 'tydz'. W
+						LLLL, 'tydz'. W
 						mm:ss
 						y
 						MM.y
@@ -2482,9 +2500,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				
 				
 					
 						
@@ -2633,9 +2648,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				r.
-				w zeszłym roku
-				w tym roku
-				w przyszłym roku
+				w zeszłym roku
+				w tym roku
+				w przyszłym roku
 				
 					za {0} rok
 					za {0} lata
@@ -2651,9 +2666,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				r.
-				w zeszłym roku
-				w tym roku
-				w przyszłym roku
+				w zeszłym roku
+				w tym roku
+				w przyszłym roku
 				
 					za {0} rok
 					za {0} lata
@@ -2741,9 +2756,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mies.
-				w zeszłym miesiącu
-				w tym miesiącu
-				w przyszłym miesiącu
+				w zeszłym mies.
+				w tym mies.
+				w przyszłym mies.
 				
 					za {0} mies.
 					za {0} mies.
@@ -2759,9 +2774,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mc
-				w zeszłym miesiącu
-				w tym miesiącu
-				w przyszłym miesiącu
+				w zeszłym mies.
+				w tym mies.
+				w przyszłym mies.
 				
 					za {0} mies.
 					za {0} mies.
@@ -2796,9 +2811,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				tydz.
-				w zeszłym tygodniu
-				w tym tygodniu
-				w przyszłym tygodniu
+				w zeszłym tyg.
+				w tym tyg.
+				w przyszłym tyg.
 				
 					za {0} tydz.
 					za {0} tyg.
@@ -2815,9 +2830,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				tydz.
-				w zeszłym tygodniu
-				w tym tygodniu
-				w przyszłym tygodniu
+				w zeszłym tyg.
+				w tym tyg.
+				w przyszłym tyg.
 				
 					za {0} tydz.
 					za {0} tyg.
@@ -2862,7 +2877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				dzień
+				dz.
 				przedwczoraj
 				pojutrze
 				
@@ -2879,8 +2894,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				dzień
+				d.
 				przedwczoraj
+				wcz.
+				dziś
+				jutro
 				pojutrze
 				
 					za {0} dzień
@@ -2911,7 +2929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dzień tyg.
 			
 			
-				dzień tyg.
+				dz. tyg.
 			
 			
 				dzień miesiąca
@@ -2920,7 +2938,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dzień mies.
 			
 			
-				dzień mies.
+				dz. mies.
 			
 			
 				w zeszłą niedzielę
@@ -4122,7 +4140,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktiubińsk
 			
 			
-				Kustanaj
+				Kustanaj
 			
 			
 				Kyzyłorda
@@ -5363,8 +5381,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					Moskwa
-					Moskwa (standardowy)
-					Moskwa (letni)
+					Moskwa (czas standardowy)
+					Moskwa (czas letni)
 				
 			
 			
@@ -5691,6 +5709,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5699,6 +5719,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tysiąc
@@ -5893,11 +5918,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peseta andorska
 			
 			
-				dirham arabski
-				dirham arabski
-				dirhamy arabskie
-				dirhamów arabskich
-				dirhama arabskiego
+				dirham ZEA
+				dirham ZEA
+				dirhamy ZEA
+				dirhamów ZEA
+				dirhama ZEA
+				AED
 			
 			
 				afgani (1927–2002)
@@ -5907,11 +5933,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afgani (1927–2002)
 			
 			
-				afgani
-				afgani
-				afgani
-				afgani
-				afgani
+				afgani afgańskie
+				afgani afgańskie
+				afgani afgańskie
+				afgani afgańskich
+				afgani afgańskiego
+				AFN
 			
 			
 				lek albański
@@ -5919,6 +5946,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leki albańskie
 				leków albańskich
 				leka albańskiego
+				ALL
 			
 			
 				dram armeński
@@ -5926,6 +5954,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dramy armeńskie
 				dramów armeńskich
 				dramy ormiańskiej
+				AMD
 			
 			
 				gulden antylski
@@ -5933,13 +5962,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guldeny antylskie
 				guldenów antylskich
 				guldena antylskiego
+				ANG
 			
 			
-				kwanza angolańska
-				kwanza angolańska
-				kwanzy angolańskie
-				kwanz angolańskich
-				kwanzy angolańskiej
+				kwanza angolska
+				kwanza angolska
+				kwanzy angolskie
+				kwanz angolskich
+				kwanzy angolskiej
+				AOA
 			
 			
 				kwanza angolańska (1977–1990)
@@ -5974,6 +6005,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos argentyńskie
 				pesos argentyńskich
 				peso argentyńskiego
+				ARS
 			
 			
 				szyling austriacki
@@ -5992,6 +6024,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				floriny arubańskie
 				florinów arubańskich
 				florina arubańskiego
+				AWG
 			
 			
 				manat azerbejdżański
@@ -6006,6 +6039,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manaty azerskie
 				manatów azerskich
 				manata azerskiego
+				AZN
 			
 			
 				dinar Bośni i Hercegowiny
@@ -6016,13 +6050,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marki zamienne Bośni i Hercegowiny
 				marek zamiennych Bośni i Hercegowiny
 				marki zamiennej Bośni i Hercegowiny
+				BAM
 			
 			
 				dolar Barbadosu
-				dolar Barbadosu
-				dolary Barbadosu
-				dolarów Barbadosu
-				dolara Barbadosu
+				dolar Barbadosu
+				dolary Barbadosu
+				dolarów Barbadosu
+				dolara Barbadosu
+				BBD
 			
 			
 				taka bengalska
@@ -6030,6 +6066,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				taka bengalskie
 				taka bengalskich
 				taka bengalskiej
+				BDT
 			
 			
 				frank belgijski (zamienny)
@@ -6064,6 +6101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lewy bułgarskie
 				lewów bułgarskich
 				lewa bułgarskiego
+				BGN
 			
 			
 				lew bułgarski (1879–1952)
@@ -6078,6 +6116,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary bahrańskie
 				dinarów bahrańskich
 				dinara bahrańskiego
+				BHD
 			
 			
 				frank burundyjski
@@ -6085,6 +6124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki burundyjskie
 				franków burundyjskich
 				franka burundyjskiego
+				BIF
 			
 			
 				dolar bermudzki
@@ -6092,6 +6132,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary bermudzkie
 				dolarów bermudzkich
 				dolara bermudzkiego
+				BMD
 			
 			
 				dolar brunejski
@@ -6099,13 +6140,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary brunejskie
 				dolarów brunejskich
 				dolara brunejskiego
+				BND
 			
 			
-				boliviano
-				boliviano
-				boliviano
-				boliviano
-				boliviano
+				boliviano boliwijskie
+				boliviano boliwijskie
+				boliviano boliwijskie
+				boliviano boliwijskich
+				boliviano boliwijskiego
+				BOB
 			
 			
 				peso boliwijskie
@@ -6141,6 +6184,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary bahamskie
 				dolarów bahamskich
 				dolara bahamskiego
+				BSD
 			
 			
 				ngultrum bhutański
@@ -6148,6 +6192,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ngultrum bhutańskie
 				ngultrum bhutańskich
 				ngultrum bhutańskiego
+				BTN
 			
 			
 				kyat birmański
@@ -6158,6 +6203,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pule botswańskie
 				pul botswańskich
 				puli botswańskiej
+				BWP
 			
 			
 				rubel białoruski (1994–1999)
@@ -6168,6 +6214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruble białoruskie
 				rubli białoruskich
 				rubla białoruskiego
+				BYN
 			
 			
 				rubel białoruski (2000–2016)
@@ -6182,6 +6229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary belizeńskie
 				dolarów belizeńskich
 				dolara belizeńskiego
+				BZD
 			
 			
 				dolar kanadyjski
@@ -6197,6 +6245,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki kongijskie
 				franków kongijskich
 				franka kongijskiego
+				CDF
 			
 			
 				frank szwajcarski
@@ -6204,6 +6253,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki szwajcarskie
 				franków szwajcarskich
 				franka szwajcarskiego
+				CHF
 			
 			
 				peso chilijskie
@@ -6211,13 +6261,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos chilijskie
 				pesos chilijskich
 				peso chilijskiego
+				CLP
 			
 			
-				juan chiński (rynek zewnętrzny)
-				juan chiński (rynek zewnętrzny)
-				juany chińskie (rynek zewnętrzny)
-				juanów chińskich (rynek zewnętrzny)
-				juana chińskiego (rynek zewnętrzny)
+				juan chiński (rynek zewnętrzny)
+				juan chiński (rynek zewnętrzny)
+				juany chińskie (rynek zewnętrzny)
+				juanów chińskich (rynek zewnętrzny)
+				juana chińskiego (rynek zewnętrzny)
+				CNH
 			
 			
 				juan chiński
@@ -6233,6 +6285,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos kolumbijskie
 				pesos kolumbijskich
 				peso kolumbijskiego
+				COP
 			
 			
 				colon kostarykański
@@ -6240,6 +6293,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				colony kostarykańskie
 				colonów kostarykańskich
 				colona kostarykańskiego
+				CRC
 			
 			
 				stary dinar serbski
@@ -6257,6 +6311,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos kubańskie wymienialne
 				pesos kubańskich wymienialnych
 				peso kubańskiego wymienialnego
+				CUC
 			
 			
 				peso kubańskie
@@ -6264,6 +6319,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos kubańskie
 				pesos kubańskich
 				peso kubańskiego
+				CUP
 			
 			
 				escudo zielonoprzylądkowe
@@ -6271,6 +6327,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				escudo zielonoprzylądkowe
 				escudo zielonoprzylądkowych
 				escudo zielonoprzylądkowego
+				CVE
 			
 			
 				funt cypryjski
@@ -6281,6 +6338,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				korony czeskie
 				koron czeskich
 				korony czeskiej
+				CZK
 			
 			
 				wschodnia marka wschodnioniemiecka
@@ -6298,6 +6356,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki dżibutyjskie
 				franków dżibutyjskich
 				franka dżibutyjskiego
+				DJF
 			
 			
 				korona duńska
@@ -6305,6 +6364,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				korony duńskie
 				koron duńskich
 				korony duńskiej
+				DKK
 			
 			
 				peso dominikańskie
@@ -6312,6 +6372,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos dominikańskie
 				pesos dominikańskich
 				peso dominikańskiego
+				DOP
 			
 			
 				dinar algierski
@@ -6319,6 +6380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary algierskie
 				dinarów algierskich
 				dinara algierskiego
+				DZD
 			
 			
 				sucre ekwadorski
@@ -6336,6 +6398,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty egipskie
 				funtów egipskich
 				funta egipskiego
+				EGP
 			
 			
 				nakfa erytrejska
@@ -6343,6 +6406,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nakfy erytrejskie
 				nakf erytrejskich
 				nakfy erytrejskiej
+				ERN
 			
 			
 				peseta hiszpańska (Konto A)
@@ -6360,9 +6424,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				birr etiopski
 				birr etiopski
-				birra etiopskie
-				birra etiopskich
+				birry etiopskie
+				birrów etiopskich
 				birra etiopskiego
+				ETB
 			
 			
 				euro
@@ -6380,6 +6445,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary fidżyjskie
 				dolarów fidżyjskich
 				dolara fidżyjskiego
+				FJD
 			
 			
 				funt falklandzki
@@ -6387,6 +6453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty falklandzkie
 				funtów falklandzkich
 				funta falklandzkiego
+				FKP
 			
 			
 				frank francuski
@@ -6412,17 +6479,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lari gruzińskie
 				lari gruzińskich
 				lari gruzińskiego
+				GEL
 				₾
 			
 			
 				cedi ghańskie (1979–2007)
 			
 			
-				cedi ghański
-				cedi ghański
+				cedi ghańskie
+				cedi ghańskie
 				cedi ghańskie
 				cedi ghańskich
 				cedi ghańskiego
+				GHS
 			
 			
 				funt gibraltarski
@@ -6430,6 +6499,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty gibraltarskie
 				funtów gibraltarskich
 				funta gibraltarskiego
+				GIP
 			
 			
 				dalasi gambijskie
@@ -6437,6 +6507,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dalasi gambijskie
 				dalasi gambijskich
 				dalasi gambijskiego
+				GMD
 			
 			
 				frank gwinejski
@@ -6444,6 +6515,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki gwinejskie
 				franków gwinejskich
 				franka gwinejskiego
+				GNF
 			
 			
 				syli gwinejskie
@@ -6460,6 +6532,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				quetzale gwatemalskie
 				quetzali gwatemalskich
 				quetzala gwatemalskiego
+				GTQ
 			
 			
 				escudo Gwinea Portugalska
@@ -6473,6 +6546,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary gujańskie
 				dolarów gujańskich
 				dolara gujańskiego
+				GYD
 			
 			
 				dolar hongkoński
@@ -6488,6 +6562,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lempiry honduraskie
 				lempir honduraskich
 				lempiry honduraskiej
+				HNL
 			
 			
 				dinar chorwacki
@@ -6498,13 +6573,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuny chorwackie
 				kun chorwackich
 				kuny chorwackiej
+				HRK
 			
 			
-				gourde haitańskie
-				gourde haitańskie
+				gourde haitański
+				gourde haitański
 				gourde haitańskie
 				gourde haitańskich
 				gourde haitańskiego
+				HTG
 			
 			
 				forint węgierski
@@ -6512,6 +6589,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				forinty węgierskie
 				forintów węgierskich
 				forinta węgierskiego
+				HUF
 			
 			
 				rupia indonezyjska
@@ -6519,6 +6597,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie indonezyjskie
 				rupii indonezyjskich
 				rupii indonezyjskiej
+				IDR
 			
 			
 				funt irlandzki
@@ -6548,6 +6627,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary irackie
 				dinarów irackich
 				dinara irackiego
+				IQD
 			
 			
 				rial irański
@@ -6555,6 +6635,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riale irańskie
 				riali irańskich
 				riala irańskiego
+				IRR
 			
 			
 				korona islandzka
@@ -6562,6 +6643,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				korony islandzkie
 				koron islandzkich
 				korony islandzkiej
+				ISK
 			
 			
 				lir włoski
@@ -6572,6 +6654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary jamajskie
 				dolarów jamajskich
 				dolara jamajskiego
+				JMD
 			
 			
 				dinar jordański
@@ -6579,6 +6662,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary jordańskie
 				dinarów jordańskich
 				dinara jordańskiego
+				JOD
 			
 			
 				jen japoński
@@ -6594,6 +6678,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				szylingi kenijskie
 				szylingów kenijskich
 				szylinga kenijskiego
+				KES
 			
 			
 				som kirgiski
@@ -6601,6 +6686,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somy kirgiskie
 				somów kirgiskich
 				soma kirgiskiego
+				KGS
 			
 			
 				riel kambodżański
@@ -6608,6 +6694,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riele kambodżańskie
 				rieli kambodżańskich
 				riela kambodżańskiego
+				KHR
 			
 			
 				frank komoryjski
@@ -6615,6 +6702,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki komoryjskie
 				franków komoryjskich
 				franka komoryjskiego
+				KMF
 			
 			
 				won północnokoreański
@@ -6622,6 +6710,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				wony północnokoreańskie
 				wonów północnokoreańskich
 				wona północnokoreańskiego
+				KPW
 			
 			
 				won południowokoreański
@@ -6637,6 +6726,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary kuwejckie
 				dinarów kuwejckich
 				dinara kuwejckiego
+				KWD
 			
 			
 				dolar kajmański
@@ -6644,6 +6734,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary kajmańskie
 				dolarów kajmańskich
 				dolara kajmańskiego
+				KYD
 			
 			
 				tenge kazachskie
@@ -6651,6 +6742,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tenge kazachskie
 				tenge kazachskich
 				tenge kazachskiego
+				KZT
 			
 			
 				kip laotański
@@ -6658,6 +6750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kipy laotańskie
 				kipów laotańskich
 				kipa laotańskiego
+				LAK
 			
 			
 				funt libański
@@ -6665,6 +6758,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty libańskie
 				funtów libańskich
 				funta libańskiego
+				LBP
 			
 			
 				rupia lankijska
@@ -6672,6 +6766,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie lankijskie
 				rupii lankijskich
 				rupii lankijskiej
+				LKR
 			
 			
 				dolar liberyjski
@@ -6679,6 +6774,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary liberyjskie
 				dolarów liberyjskich
 				dolara liberyjskiego
+				LRD
 			
 			
 				loti Lesoto
@@ -6712,6 +6808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary libijskie
 				dinarów libijskich
 				dinara libijskiego
+				LYD
 			
 			
 				dirham marokański
@@ -6719,6 +6816,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dirhamy marokańskie
 				dirhamów marokańskich
 				dirhama marokańskiego
+				MAD
 			
 			
 				frank marokański
@@ -6733,6 +6831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leje mołdawskie
 				lejów mołdawskich
 				leja mołdawskiego
+				MDL
 			
 			
 				ariary malgaski
@@ -6740,6 +6839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ariary malgaskie
 				ariary malgaskich
 				ariary malgaskiego
+				MGA
 			
 			
 				frank malgaski
@@ -6750,6 +6850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				denary macedońskie
 				denarów macedońskich
 				denara macedońskiego
+				MKD
 			
 			
 				frank malijski
@@ -6760,6 +6861,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kiaty birmańskie
 				kiatów birmańskich
 				kiata birmańskiego
+				MMK
 			
 			
 				tugrik mongolski
@@ -6767,6 +6869,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tugriki mongolskie
 				tugrików mongolskich
 				tugrika mongolskiego
+				MNT
 			
 			
 				pataca Makau
@@ -6774,6 +6877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pataca Makau
 				pataca Makau
 				pataca Makau
+				MOP
 			
 			
 				ouguiya mauretańska (1973–2017)
@@ -6783,11 +6887,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ouguiya mauretańskiej (1973–2017)
 			
 			
-				ouguiya mauretańska
-				ouguiya mauretańska
-				ouguiya mauretańskie
-				ouguiya mauretańskich
-				ouguiya mauretańskiej
+				ugija mauretańska
+				ugija mauretańska
+				ugija mauretańskie
+				ugija mauretańskich
+				ugija mauretańskiej
+				MRU
 			
 			
 				lira maltańska
@@ -6801,6 +6906,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie maurytyjskie
 				rupii maurytyjskich
 				rupii maurytyjskiej
+				MUR
 			
 			
 				rupia malediwska
@@ -6808,6 +6914,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie malediwskie
 				rupii malediwskich
 				rupii malediwskiej
+				MVR
 			
 			
 				kwacha malawijska
@@ -6815,6 +6922,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kwacha malawijskie
 				kwacha malawijskich
 				kwacha malawijskiej
+				MWK
 			
 			
 				peso meksykańskie
@@ -6833,6 +6941,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ringgity malezyjskie
 				ringgitów malezyjskich
 				ringgita malezyjskiego
+				MYR
 			
 			
 				escudo mozambickie
@@ -6846,6 +6955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				meticale mozambickie
 				meticali mozambickich
 				meticala mozambickiego
+				MZN
 			
 			
 				dolar namibijski
@@ -6853,6 +6963,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary namibijskie
 				dolarów namibijskich
 				dolara namibijskiego
+				NAD
 			
 			
 				naira nigeryjska
@@ -6860,6 +6971,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nairy nigeryjskie
 				nair nigeryjskich
 				nairy nigeryjskiej
+				NGN
 			
 			
 				cordoba nikaraguańska (1988–1991)
@@ -6874,6 +6986,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cordoby nikaraguańskie
 				cordob nikaraguańskich
 				cordoby nikaraguańskiej
+				NIO
 			
 			
 				gulden holenderski
@@ -6884,6 +6997,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				korony norweskie
 				koron norweskich
 				korony norweskiej
+				NOK
 			
 			
 				rupia nepalska
@@ -6891,6 +7005,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie nepalskie
 				rupii nepalskich
 				rupii nepalskiej
+				NPR
 			
 			
 				dolar nowozelandzki
@@ -6906,6 +7021,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riale omańskie
 				riali omańskich
 				riala omańskiego
+				OMR
 			
 			
 				balboa panamski
@@ -6913,6 +7029,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				balboa panamskie
 				balboa panamskich
 				balboa panamskiego
+				PAB
 			
 			
 				inti peruwiański
@@ -6923,6 +7040,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sole peruwiańskie
 				soli peruwiańskich
 				sola peruwiańskiego
+				PEN
 			
 			
 				sol peruwiański (1863–1965)
@@ -6933,11 +7051,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				PES
 			
 			
-				kina Papua Nowa Gwinea
+				kina papuańska
 				kina papuaska
 				kina papuaskie
 				kina papuaskich
 				kina papuaskiej
+				PGK
 			
 			
 				peso filipińskie
@@ -6945,6 +7064,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos filipińskie
 				pesos filipińskich
 				peso filipińskiego
+				PHP
 			
 			
 				rupia pakistańska
@@ -6952,6 +7072,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie pakistańskie
 				rupii pakistańskich
 				rupii pakistańskiej
+				PKR
 			
 			
 				złoty polski
@@ -6977,6 +7098,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guarani paragwajskie
 				guarani paragwajskich
 				guarani paragwajskiego
+				PYG
 			
 			
 				rial katarski
@@ -6984,6 +7106,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riale katarskie
 				riali katarskich
 				riala katarskiego
+				QAR
 			
 			
 				dolar rodezyjski
@@ -7001,6 +7124,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leje rumuńskie
 				lejów rumuńskich
 				leja rumuńskiego
+				RON
 				lej
 			
 			
@@ -7009,6 +7133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary serbskie
 				dinarów serbskich
 				dinara serbskiego
+				RSD
 			
 			
 				rubel rosyjski
@@ -7016,6 +7141,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ruble rosyjskie
 				rubli rosyjskich
 				rubla rosyjskiego
+				RUB
 			
 			
 				rubel rosyjski (1991–1998)
@@ -7030,6 +7156,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franki ruandyjskie
 				franków ruandyjskich
 				franka ruandyjskiego
+				RWF
 			
 			
 				rial saudyjski
@@ -7037,6 +7164,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riale saudyjskie
 				riali saudyjskich
 				riala saudyjskiego
+				SAR
 			
 			
 				dolar Wysp Salomona
@@ -7044,6 +7172,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary Wysp Salomona
 				dolarów Wysp Salomona
 				dolara Wysp Salomona
+				SBD
 			
 			
 				rupia seszelska
@@ -7051,6 +7180,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie seszelskie
 				rupii seszelskich
 				rupii seszelskiej
+				SCR
 			
 			
 				dinar sudański
@@ -7061,6 +7191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty sudańskie
 				funtów sudańskich
 				funta sudańskiego
+				SDG
 			
 			
 				funt sudański (1957–1998)
@@ -7075,6 +7206,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				korony szwedzkie
 				koron szwedzkich
 				korony szwedzkiej
+				SEK
 			
 			
 				dolar singapurski
@@ -7082,13 +7214,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary singapurskie
 				dolarów singapurskich
 				dolara singapurskiego
+				SGD
 			
 			
-				funt Wyspy Świętej Heleny
-				funt Wyspy Świętej Heleny
-				funty Wyspy Świętej Heleny
-				funtów Wyspy Świętej Heleny
-				funta Wyspy Świętej Heleny
+				funt Świętej Heleny
+				funt Świętej Heleny
+				funty Świętej Heleny
+				funtów Świętej Heleny
+				funta Świętej Heleny
+				SHP
 			
 			
 				tolar słoweński
@@ -7110,6 +7244,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leone sierraleońskie
 				leone sierraleońskich
 				leone sierraleońskiego
+				SLL
 			
 			
 				szyling somalijski
@@ -7117,6 +7252,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				szylingi somalijskie
 				szylingów somalijskich
 				szylinga somalijskiego
+				SOS
 			
 			
 				dolar surinamski
@@ -7124,6 +7260,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary surinamskie
 				dolarów surinamskich
 				dolara surinamskiego
+				SRD
 			
 			
 				gulden surinamski
@@ -7134,6 +7271,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty południowosudańskie
 				funtów południowosudańskich
 				funta południowosudańskiego
+				SSP
 			
 			
 				dobra Wysp Świętego Tomasza i Książęcej (1977–2017)
@@ -7148,6 +7286,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dobry Wysp Świętego Tomasza i Książęcej
 				dobr Wysp Świętego Tomasza i Książęcej
 				dobry Wysp Świętego Tomasza i Książęcej
+				STN
 			
 			
 				rubel radziecki
@@ -7165,6 +7304,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				funty syryjskie
 				funtów syryjskich
 				funta syryjskiego
+				SYP
 			
 			
 				lilangeni Suazi
@@ -7172,6 +7312,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				emalangeni Suazi
 				emalangeni Suazi
 				emalangeni Suazi
+				SZL
 			
 			
 				baht tajski
@@ -7179,6 +7320,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bahty tajskie
 				bahtów tajskich
 				bahta tajskiego
+				THB
 			
 			
 				rubel tadżycki
@@ -7189,6 +7331,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somoni tadżyckie
 				somoni tadżyckich
 				somoni tadżyckiego
+				TJS
 			
 			
 				manat turkmeński (1993–2009)
@@ -7203,6 +7346,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manaty turkmeńskie
 				manatów turkmeńskich
 				manata turkmeńskiego
+				TMT
 			
 			
 				dinar tunezyjski
@@ -7210,6 +7354,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinary tunezyjskie
 				dinarów tunezyjskich
 				dinara tunezyjskiego
+				TND
 			
 			
 				pa’anga tongijska
@@ -7217,6 +7362,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pa’anga tongijskie
 				pa’anga tongijskich
 				pa’anga tongijskiej
+				TOP
 			
 			
 				escudo timorskie
@@ -7234,6 +7380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liry tureckie
 				lir tureckich
 				liry tureckiej
+				TRY
 			
 			
 				dolar Trynidadu i Tobago
@@ -7241,6 +7388,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolary Trynidadu i Tobago
 				dolarów Trynidadu i Tobago
 				dolara Trynidadu i Tobago
+				TTD
 			
 			
 				nowy dolar tajwański
@@ -7257,6 +7405,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				szylingi tanzańskie
 				szylingów tanzańskich
 				szylinga tanzańskiego
+				TZS
 			
 			
 				hrywna ukraińska
@@ -7264,6 +7413,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hrywny ukraińskie
 				hrywien ukraińskich
 				hrywny ukraińskiej
+				UAH
 			
 			
 				karbowaniec ukraiński
@@ -7281,6 +7431,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				szylingi ugandyjskie
 				szylingów ugandyjskich
 				szylinga ugandyjskiego
+				UGX
 			
 			
 				dolar amerykański
@@ -7299,6 +7450,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos urugwajskie
 				pesos urugwajskich
 				peso urugwajskiego
+				UYU
 			
 			
 				som uzbecki
@@ -7306,6 +7458,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somy uzbeckie
 				somów uzbeckich
 				soma uzbeckiego
+				UZS
 			
 			
 				boliwar wenezuelski (1871–2008)
@@ -7327,6 +7480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				boliwary wenezuelskie
 				boliwarów wenezuelskich
 				boliwara wenezuelskiego
+				VES
 			
 			
 				dong wietnamski
@@ -7342,6 +7496,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vatu wanuackie
 				vatu wanuackich
 				vatu wanuackiego
+				VUV
 			
 			
 				tala samoańskie
@@ -7349,6 +7504,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tala samoańskie
 				tala samoańskich
 				tala samoańskiego
+				WST
 			
 			
 				frank CFA BEAC
@@ -7419,10 +7575,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				nieznana waluta
-				nieznana waluta
-				nieznanej waluty
-				nieznanej waluty
-				nieznanej waluty
+				(nieznana waluta)
+				(nieznana waluta)
+				(nieznana waluta)
+				(nieznana waluta)
 			
 			
 				dinar jemeński
@@ -7433,6 +7589,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				riale jemeńskie
 				riali jemeńskich
 				riala jemeńskiego
+				YER
 			
 			
 				nowy dinar jugosławiański
@@ -7449,6 +7606,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				randy południowoafrykańskie
 				randów południowoafrykańskich
 				randa południowoafrykańskiego
+				ZAR
 			
 			
 				kwacha zambijska (1968–2012)
@@ -7460,9 +7618,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				kwacha zambijska
 				kwacha zambijska
-				kwacha zambijskie
-				kwacha zambijskich
-				kwacha zambijskiej
+				kwachy zambijskie
+				kwach zambijskich
+				kwachy zambijskiej
+				ZMW
 			
 			
 				nowy zair zairski
@@ -7703,75 +7862,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mil na galon angielski
 				{0} mili na galon angielski
 			
+			
+				petabajty
+				{0} petabajt
+				{0} petabajty
+				{0} petabajtów
+				{0} petabajta
+			
 			
-				terabajty
-				{0} terabajt
-				{0} terabajty
-				{0} terabajtów
-				{0} terabajta
+				terabajty
+				{0} terabajt
+				{0} terabajty
+				{0} terabajtów
+				{0} terabajta
 			
 			
-				terabity
-				{0} terabit
-				{0} terabity
-				{0} terabitów
-				{0} terabitu
+				terabity
+				{0} terabit
+				{0} terabity
+				{0} terabitów
+				{0} terabitu
 			
 			
-				gigabajty
-				{0} gigabajt
-				{0} gigabajty
-				{0} gigabajtów
-				{0} gigabajta
+				gigabajty
+				{0} gigabajt
+				{0} gigabajty
+				{0} gigabajtów
+				{0} gigabajta
 			
 			
-				gigabity
-				{0} gigabit
-				{0} gigabity
-				{0} gigabitów
-				{0} gigabitu
+				gigabity
+				{0} gigabit
+				{0} gigabity
+				{0} gigabitów
+				{0} gigabitu
 			
 			
-				megabajty
-				{0} megabajt
-				{0} megabajty
-				{0} megabajtów
-				{0} megabajta
+				megabajty
+				{0} megabajt
+				{0} megabajty
+				{0} megabajtów
+				{0} megabajta
 			
 			
-				megabity
-				{0} megabit
-				{0} megabity
-				{0} megabitów
-				{0} megabitu
+				megabity
+				{0} megabit
+				{0} megabity
+				{0} megabitów
+				{0} megabitu
 			
 			
-				kilobajty
-				{0} kilobajt
-				{0} kilobajty
-				{0} kilobajtów
-				{0} kilobajta
+				kilobajty
+				{0} kilobajt
+				{0} kilobajty
+				{0} kilobajtów
+				{0} kilobajta
 			
 			
-				kilobity
-				{0} kilobit
-				{0} kilobity
-				{0} kilobitów
-				{0} kilobitu
+				kilobity
+				{0} kilobit
+				{0} kilobity
+				{0} kilobitów
+				{0} kilobitu
 			
 			
-				bajty
-				{0} bajt
-				{0} bajty
-				{0} bajtów
-				{0} bajta
+				bajty
+				{0} bajt
+				{0} bajty
+				{0} bajtów
+				{0} bajta
 			
 			
-				bity
-				{0} b
-				{0} bity
-				{0} bitów
-				{0} bitu
+				bity
+				{0} bit
+				{0} bity
+				{0} bitów
+				{0} bitu
 			
 			
 				wieki
@@ -7780,6 +7946,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} wieków
 				{0} wieku
 			
+			
+				dekady
+				{0} dekada
+				{0} dekady
+				{0} dekad
+				{0} dekady
+			
 			
 				lata
 				{0} rok
@@ -7858,32 +8031,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} nanosekundy
 			
 			
-				ampery
-				{0} amper
-				{0} ampery
-				{0} amperów
-				{0} ampera
+				ampery
+				{0} amper
+				{0} ampery
+				{0} amperów
+				{0} ampera
 			
 			
-				miliampery
-				{0} miliamper
-				{0} miliampery
-				{0} miliamperów
-				{0} miliampera
+				miliampery
+				{0} miliamper
+				{0} miliampery
+				{0} miliamperów
+				{0} miliampera
 			
 			
-				omy
-				{0} om
-				{0} omy
-				{0} omów
-				{0} oma
+				omy
+				{0} om
+				{0} omy
+				{0} omów
+				{0} oma
 			
 			
-				wolty
-				{0} wolt
-				{0} wolty
-				{0} woltów
-				{0} wolta
+				wolty
+				{0} wolt
+				{0} wolty
+				{0} woltów
+				{0} wolta
 			
 			
 				kilokalorie
@@ -7941,6 +8114,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} brytyjskich jednostek ciepła
 				{0} brytyjskiej jednostki ciepła
 			
+			
+				thermy amerykańskie
+				{0} therm amerykański
+				{0} thermy amerykańskie
+				{0} thermów amerykańskich
+				{0} therma amerykańskiego
+			
 			
 				funt-siła
 				{0} funt-siła
@@ -7956,32 +8136,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} niutona
 			
 			
-				gigaherce
-				{0} gigaherc
-				{0} gigaherce
-				{0} gigaherców
-				{0} gigaherca
+				gigaherce
+				{0} gigaherc
+				{0} gigaherce
+				{0} gigaherców
+				{0} gigaherca
 			
 			
-				megaherce
-				{0} megaherc
-				{0} megaherce
-				{0} megaherców
-				{0} megaherca
+				megaherce
+				{0} megaherc
+				{0} megaherce
+				{0} megaherców
+				{0} megaherca
 			
 			
-				kiloherce
-				{0} kiloherc
-				{0} kiloherce
-				{0} kiloherców
-				{0} kiloherca
+				kiloherce
+				{0} kiloherc
+				{0} kiloherce
+				{0} kiloherców
+				{0} kiloherca
 			
 			
-				herce
-				{0} herc
-				{0} herce
-				{0} herców
-				{0} herca
+				herce
+				{0} herc
+				{0} herce
+				{0} herców
+				{0} herca
+			
+			
+				firety
+				{0} firet
+				{0} firety
+				{0} firetów
+				{0} firetu
+			
+			
+				piksele
+				{0} piksel
+				{0} piksele
+				{0} pikseli
+				{0} piksela
+			
+			
+				megapiksele
+				{0} megapiksel
+				{0} megapiksele
+				{0} megapikseli
+				{0} megapiksela
 			
 			
 				kilometry
@@ -8112,7 +8313,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} punkt
 				{0} punkty
 				{0} punktów
-				{0} pkt.
+				{0} punktu
 			
 			
 				promienie Słońca
@@ -8129,7 +8330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} luksu
 			
 			
-				jasność Słońca
+				jasności Słońca
 				{0} jasność Słońca
 				{0} jasności Słońca
 				{0} jasności Słońca
@@ -8217,14 +8418,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} daltona
 			
 			
-				masa Ziemi
+				masy Ziemi
 				{0} masa Ziemi
 				{0} masy Ziemi
 				{0} mas Ziemi
 				{0} masa Ziemi
 			
 			
-				masa Słońca
+				masy Słońca
 				{0} masa Słońca
 				{0} masy Słońca
 				{0} mas Słońca
@@ -8272,41 +8473,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} koni mechanicznych
 				{0} konia mechanicznego
 			
-			
-				hektopaskale
-				{0} hektopaskal
-				{0} hektopaskale
-				{0} hektopaskali
-				{0} hektopaskala
-			
 			
-				milimetry słupa rtęci
-				{0} milimetr słupa rtęci
-				{0} milimetry słupa rtęci
-				{0} milimetrów słupa rtęci
-				{0} milimetra słupa rtęci
+				milimetry słupa rtęci
+				{0} milimetr słupa rtęci
+				{0} milimetry słupa rtęci
+				{0} milimetrów słupa rtęci
+				{0} milimetra słupa rtęci
 			
 			
-				funty na cal kwadratowy
-				{0} funt na cal kwadratowy
-				{0} funty na cal kwadratowy
-				{0} funtów na cal kwadratowy
-				{0} funta na cal kwadratowy
+				funty na cal kwadratowy
+				{0} funt na cal kwadratowy
+				{0} funty na cal kwadratowy
+				{0} funtów na cal kwadratowy
+				{0} funta na cal kwadratowy
 			
 			
-				cale słupa rtęci
+				cale słupa rtęci
 				{0} cal słupa rtęci
 				{0} cale słupa rtęci
 				{0} cali słupa rtęci
 				{0} cala słupa rtęci
 			
+			
+				bary
+				{0} bar
+				{0} bary
+				{0} barów
+				{0} bara
+			
 			
-				milibary
+				milibary
 				{0} millibar
 				{0} millibary
 				{0} millibarów
 				{0} millibara
 			
+			
+				atmosfery
+				{0} atmosfera
+				{0} atmosfery
+				{0} atmosfer
+				{0} atmosfery
+			
+			
+				paskale
+				{0} paskal
+				{0} paskale
+				{0} paskali
+				{0} paskala
+			
+			
+				hektopaskale
+				{0} hektopaskal
+				{0} hektopaskale
+				{0} hektopaskali
+				{0} hektopaskala
+			
 			
 				kilopaskale
 				{0} kilopaskal
@@ -8350,32 +8572,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} węzła
 			
 			
-				stopnie
-				{0} stopień
-				{0} stopnie
-				{0} stopni
-				{0} stopnia
+				stopnie
+				{0} stopień
+				{0} stopnie
+				{0} stopni
+				{0} stopnia
 			
 			
-				stopnie Celsjusza
+				stopnie Celsjusza
 				{0} stopień Celsjusza
 				{0} stopnie Celsjusza
 				{0} stopni Celsjusza
 				{0} stopnia Celsjusza
 			
 			
-				stopnie Fahrenheita
+				stopnie Fahrenheita
 				{0} stopień Fahrenheita
 				{0} stopnie Fahrenheita
 				{0} stopni Fahrenheita
 				{0} stopnia Fahrenheita
 			
 			
-				kelwiny
-				{0} kelwin
-				{0} kelwiny
-				{0} kelwinów
-				{0} kelwina
+				kelwiny
+				{0} kelwin
+				{0} kelwiny
+				{0} kelwinów
+				{0} kelwina
 			
 			
 				stopofunty
@@ -8443,11 +8665,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cala sześciennego
 			
 			
-				megalitry
-				{0} megalitr
-				{0} megalitry
-				{0} megalitrów
-				{0} megalitra
+				megalitry
+				{0} megalitr
+				{0} megalitry
+				{0} megalitrów
+				{0} megalitra
 			
 			
 				hektolitry
@@ -8500,11 +8722,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ćwierćkwarty metrycznej
 			
 			
-				akro-stopy
-				{0} akro-stopa
-				{0} akro-stopy
-				{0} akro-stóp
-				{0} akro-stopy
+				akrostopy
+				{0} akrostopa
+				{0} akrostopy
+				{0} akrostóp
+				{0} akrostopy
 			
 			
 				galony
@@ -8580,6 +8802,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				kierunek świata
+				{0} długości geograficznej wschodniej
+				{0} szerokości geograficznej północnej
+				{0} szerokości geograficznej południowej
+				{0} długości geograficznej zachodniej
 			
 		
 		
@@ -8605,8 +8831,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ha
 			
+			
+				mile kw.
+				{0} mila kw.
+				{0} mile kw.
+				{0} mil kw.
+				{0} mili kw.
+				{0}/mila kw.
+			
 			
 				akry
+				{0} akr
+				{0} akry
+				{0} akrów
+				{0} akra
+			
+			
+				jardy kw.
+				{0} jard kw.
+				{0} jardy kw.
+				{0} jardów kw.
+				{0} jarda kw.
+			
+			
+				stopy kw.
+				{0} stopa kw.
+				{0} stopy kw.
+				{0} stóp kw.
+				{0} stopy kw.
+			
+			
+				cale kw.
+				{0} cal kw.
+				{0} cale kw.
+				{0} cali kw.
+				{0} cala kw.
+				{0}/cal kw.
 			
 			
 				dunamy
@@ -8626,7 +8886,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mg/dl
 			
 			
-				milimole/litr
+				mmol/l
 				{0} mmol/l
 				{0} mmol/l
 				{0} mmol/l
@@ -8635,14 +8895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				części/milion
 			
-			
-				procent
-			
-			
-				promil
-			
 			
-				punkt bazowy
 				{0}‱
 				{0}‱
 				{0}‱
@@ -8684,18 +8937,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mi/gal ang.
 			
 			
-				bajty
-				{0} B
-				{0} B
-				{0} B
-				{0} B
+				B
+				{0} B
+				{0} B
+				{0} B
+				{0} B
 			
 			
-				bity
-				{0} b
-				{0} b
-				{0} b
-				{0} b
+				b
+				{0} b
+				{0} b
+				{0} b
+				{0} b
 			
 			
 				w.
@@ -8704,6 +8957,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} w.
 				{0} w.
 			
+			
+				dek
+				{0} dek
+				{0} dek
+				{0} dek
+				{0} dek
+			
 			
 				lata
 				{0} rok
@@ -8721,7 +8981,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/mies.
 			
 			
-				tygodnie
+				tyg.
 				{0} tydz.
 				{0} tyg.
 				{0} tyg.
@@ -8737,33 +8997,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/dzień
 			
 			
-				godziny
+				godz.
 				{0} godz.
 				{0} godz.
 				{0} godz.
 				{0} godz.
-			
-			
-				minuty
+				{0}/godz.
 			
 			
-				sekundy
+				sek.
 				{0} sek.
 				{0} sek.
 				{0} sek.
 				{0} sek.
 			
-			
-				milisekundy
-			
 			
-				ampery
+				A
 			
 			
-				omy
+				Ω
 			
 			
-				wolty
+				V
 			
 			
 				cal
@@ -8789,6 +9044,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				thermy amer.
+				{0} therm amer.
+				{0} thermy amer.
+				{0} thermów amer.
+				{0} therma amer.
+			
 			
 				funt-siła
 				{0} lbf
@@ -8797,17 +9059,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lbf
 			
 			
-				niuton
 				{0} N
 				{0} N
 				{0} N
 				{0} N
 			
-			
-				metry
+			
+				firet
+				{0} firet
+				{0} firety
+				{0} firetów
+				{0} firetu
 			
-			
-				centymetry
+			
+				m
 			
 			
 				mile
@@ -8816,8 +9081,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mil
 				{0} mili
 			
+			
+				jardy
+				{0} jard
+				{0} jardy
+				{0} jardów
+				{0} jarda
+			
 			
 				stopy
+				{0} stopa
+				{0} stopy
+				{0} stóp
+				{0} stopy
+				{0}/stopa
 			
 			
 				cale
@@ -8827,9 +9104,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cala
 				{0}/cal
 			
-			
-				lata świetlne
-			
 			
 				j.a.
 				{0} j.a.
@@ -8845,21 +9119,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Mm
 			
 			
-				punkty
+				pkt.
 				{0} pkt.
 				{0} pkt.
 				{0} pkt.
 				{0} pkt.
 			
 			
-				promienie Słońca
 				{0} R☉
 				{0} R☉
 				{0} R☉
 				{0} R☉
 			
 			
-				jasność Słońca
 				{0} L☉
 				{0} L☉
 				{0} L☉
@@ -8868,8 +9140,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				g
 			
+			
+				krótkie tony
+				{0} krótka tona
+				{0} krótkie tony
+				{0} krótkich ton
+				{0} krótkiej tony
+			
 			
 				funty
+				{0} funt
+				{0} funty
+				{0} funtów
+				{0} funta
+				{0}/funt
 			
 			
 				karaty
@@ -8886,14 +9170,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Da
 			
 			
-				masa Ziemi
 				{0} M⊕
 				{0} M⊕
 				{0} M⊕
 				{0} M⊕
 			
 			
-				masa Słońca
 				{0} M☉
 				{0} M☉
 				{0} M☉
@@ -8923,6 +9205,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} MPa
 				{0} MPa
 			
+			
+				mile/h
+				{0} mila/h
+				{0} mile/h
+				{0} mil/h
+				{0} mili/h
+			
 			
 				w.
 				{0} w.
@@ -8930,6 +9219,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} w.
 				{0} w.
 			
+			
+				st. C
+				{0} st. C
+				{0} st. C
+				{0} st. C
+				{0} st. C
+			
 			
 				lbf⋅ft
 				{0} lbf⋅ft
@@ -8944,12 +9240,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} N⋅m
 				{0} N⋅m
 			
+			
+				mile sześc.
+				{0} mila sześc.
+				{0} mile sześc.
+				{0} mil sześc.
+				{0} mili sześc.
+			
+			
+				jardy sześc.
+				{0} jard sześc.
+				{0} jardy sześc.
+				{0} jardów sześc.
+				{0} jarda sześc.
+			
+			
+				stopy sześc.
+				{0} stopa sześc.
+				{0} stopy sześc.
+				{0} stóp sześc.
+				{0} stopy sześc.
+			
+			
+				cale sześc.
+				{0} cal sześc.
+				{0} cale sześc.
+				{0} cali sześc.
+				{0} cala sześc.
+			
 			
-				Ml
-				{0} Ml
-				{0} Ml
-				{0} Ml
-				{0} Ml
+				Ml
+				{0} Ml
+				{0} Ml
+				{0} Ml
+				{0} Ml
 			
 			
 				hl
@@ -8982,6 +9306,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ml
 				{0} ml
 			
+			
+				półkwarty metr.
+				{0} półkwarta metr.
+				{0} półkwarty metr.
+				{0} półkwart metr.
+				{0} półkwarty metr.
+			
+			
+				ćwierćkwarty metr.
+				{0} ćwierćkwarta metr.
+				{0} ćwierćkwarty metr.
+				{0} ćwierćkwart metr.
+				{0} ćwierćkwarty metr.
+			
+			
+				akrostopy
+				{0} akrostopa
+				{0} akrostopy
+				{0} akrostóp
+				{0} akrostopy
+			
 			
 				gal
 				{0} gal
@@ -8998,11 +9343,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gal ang.
 				{0}/gal ang.
 			
+			
+				kwarty
+				{0} kwarta
+				{0} kwarty
+				{0} kwart
+				{0} kwarty
+			
 			
 				półkwarty
+				{0} półkwarta
+				{0} półkwarty
+				{0} półkwart
+				{0} półkwarty
 			
 			
 				ćwierćkwarty
+				{0} ćwierćkwarta
+				{0} ćwierćkwarty
+				{0} ćwierćkwart
+				{0} ćwierćkwarty
 			
 			
 				fl oz
@@ -9062,6 +9422,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}″
 			
+			
+				%
+			
 			
 				l/100 km
 				{0} l/100 km
@@ -9070,21 +9433,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l/100 km
 			
 			
-				rok
+				r.
 				{0} r.
 				{0} l.
 				{0} l.
 				{0} r.
 			
 			
-				miesiąc
+				m-c
 				{0} m-c
 				{0} m-ce
 				{0} m-cy
 				{0} m-ca
 			
 			
-				tydzień
+				tydz.
 				{0} tydz.
 				{0} tyg.
 				{0} tyg.
@@ -9099,20 +9462,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/d.
 			
 			
-				godzina
+				g.
 				{0} g.
 				{0} g.
 				{0} g.
 				{0} g.
 			
 			
-				minuty
+				min
 			
 			
-				sekundy
+				s
+				{0} s
+				{0} s
+				{0} s
+				{0} s
+			
+			
+				ms
 			
 			
-				metr
+				m
+			
+			
+				cm
 			
 			
 				mile
@@ -9138,16 +9511,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} KM
 			
 			
-				{0}°
-				{0}°
-				{0}°
-				{0}°
+				°C
+				{0}°C
+				{0}°C
+				{0}°C
+				{0}°C
 			
 			
-				litr
+				l
 			
 			
-				kierunek
+				kierunek
 			
 		
 		
diff --git a/make/data/cldr/common/main/pl_PL.xml b/make/data/cldr/common/main/pl_PL.xml
index f9c668b615a..a0ca9ea1a2b 100644
--- a/make/data/cldr/common/main/pl_PL.xml
+++ b/make/data/cldr/common/main/pl_PL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/prg.xml b/make/data/cldr/common/main/prg.xml
index 6622b570b73..2dca1220478 100644
--- a/make/data/cldr/common/main/prg.xml
+++ b/make/data/cldr/common/main/prg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -137,7 +137,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mōnakō
 			Mōldawija
 			Mōntenegran
-			Macedōnija
 			Mālta
 			Meksiku
 			Nikarāgwa
@@ -192,8 +191,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ā b c d ḑ e ē f g ģ h i ī j k ķ l m n ņ o ō p q r ŗ s š t ț u ū v w x y z ž]
 		[]
 		[A Ā B C D Ḑ E Ē F G Ģ H I Ī J K Ķ L M N Ņ O Ō P Q R Ŗ S Š T Ț U Ū V W X Y Z Ž]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … “ „ ( ) \[ \] \{ \}]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … “ „ ( ) \[ \] \{ \}]
 	
 	
 		„
diff --git a/make/data/cldr/common/main/prg_001.xml b/make/data/cldr/common/main/prg_001.xml
index acc388f7885..6f8b6b910c8 100644
--- a/make/data/cldr/common/main/prg_001.xml
+++ b/make/data/cldr/common/main/prg_001.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ps.xml b/make/data/cldr/common/main/ps.xml
index 27b19f5a8d0..ba599202496 100644
--- a/make/data/cldr/common/main/ps.xml
+++ b/make/data/cldr/common/main/ps.xml
@@ -7,13 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
 		
 			{0} ({1})
-			{0}, {1}
 			{0}: {1}
 		
 		
@@ -48,14 +47,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			بالنی
 			باسا
 			بېلاروسي
-			بیبا
+			بيمبا
 			بينا
 			بلغاري
 			بهوجپوري
 			بسلاما
 			بینی
 			سکسيکا
-			بامره
+			بمبارا
 			بنگالي
 			تبتي
 			برېتون
@@ -65,7 +64,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			بلین
 			کټلاني
 			چکما
-			چيچيني
+			چيچني
 			سیبوانوي
 			چيگايي
 			چمورو
@@ -81,7 +80,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			د کليسا سلاوي
 			چوواشي
 			ويلشي
-			دانمارکي
+			ډنمارکي
 			داکوتا
 			درگوا
 			ټایټا
@@ -90,34 +89,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سوئس لوی جرمن
 			داگرب
 			زرما
-			لوړې سربي
+			کښته سربيايي
 			دوالا
 			ديویهی
 			جولا فوني
 			ژونگکه
 			ډزاګا
-			ایمو
+			ايمبو
 			ايو
 			افک
 			اکجک
 			یوناني
-			انګریزي
-			انګليسي (AU)
+			انګليسي
+			آسټرالياوي انګليسي
 			کاناډايي انګلیسي
 			بريتانوی انګلیسي
 			انګليسي (GB)
-			انګليسي (US)
-			انګليسي (US)
+			د متحده آيالاتو انګليسي
 			اسپرانتو
 			هسپانوي
 			لاتيني امريکايي هسپانوي
 			اروپايي هسپانوي
-			ميکسيکو هسپانوي
+			ميکسيکي هسپانوي
 			حبشي
 			باسکي
 			اوونڊو
 			فارسي
-			فلاحہ
+			فولاح
 			فینلنډي
 			فلیپیني
 			فجیان
@@ -127,7 +125,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			کاناډايي فرانسوي
 			سويسي فرانسوي
 			فرائیلیین
-			فريزي
+			لوېديځ فريشي
 			ائيرلېنډي
 			gaa
 			سکاټلېنډي ګېلک
@@ -143,16 +141,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ګیچین
 			هوسا
 			هوایی
-			عبري
+			عبراني
 			هندي
 			ھلیګینون
 			همونګ
-			کروواسي
-			پورته صربي
-			هيٽي کرولي
+			کروايشيايي
+			پورته سربيايي
+			هيټي کريول
 			هنگري
 			ھوپا
-			ارمني
+			آرمينيايي
 			هیرورو
 			انټرلنګوا
 			ابن
@@ -169,7 +167,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			انوکتیتوت
 			جاپاني
 			لوجبان
-			نګبا
+			نګومبا
 			ماچمی
 			جاوايي
 			جورجيائي
@@ -179,7 +177,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			کامبا
 			کابیرین
 			تایپ
-			ماکډون
+			ميکونډي
 			کابوورډیانو
 			کورو
 			خاسې
@@ -192,23 +190,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			کلینجن
 			خمر
 			کیمبوندو
-			کنأډه
+			کناډا
 			کوریایی
-			کنکني
+			کونکاني
 			کیلي
 			کنوری
 			کراچی بالکر
 			کاریلین
 			کورخ
 			کشمیري
-			شمبلا
+			شمبالا
 			بفیا
-			کولوگنيسي
+			کولوګنيايي
 			کردي
 			کومک
 			کومی
-			کرونيشي
-			کرګيز
+			کورنيشي
+			کرغيزي
 			لاتیني
 			لاډینو
 			لنګی
@@ -216,8 +214,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			لیګغیان
 			ګانده
 			لمبرگیانی
-			لکټو
-			لنگلا
+			لکوټا
+			لنګالا
 			لاو
 			لوزی
 			شمالي لوری
@@ -255,7 +253,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ملایا
 			مالټايي
 			مندانګ
-			څو ژبو
+			متعدد ژبې
 			کريکي
 			مرانديز
 			برمایی
@@ -289,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			اوکسيټاني
 			اورومو
 			اوڊيا
-			اوسیٹک
+			اوسيټک
 			پنجابي
 			پانګاسین
 			پمپانگا
@@ -315,6 +313,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			روسي
 			اروماني
 			کینیارونډا
+			روا
 			سنسکریټ
 			سنډاوی
 			سخا
@@ -349,7 +348,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سوران ټونګو
 			سواتی
 			سهو
-			سيسوتو
+			سويلي سوتو
 			سوډاني
 			سکوما
 			سویډنی
@@ -357,7 +356,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			کانګو سواهلی
 			کومورياني
 			سوریاني
-			تامیل
+			تامل
 			تېليګو
 			تیمني
 			تیسو
@@ -384,7 +383,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			مرکزی اطلس تمازائيٹ
 			ادمورت
 			اويغوري
-			اوکرانايي
+			اوکرايني
 			امبوندو
 			نامعلومه ژبه
 			اردو
@@ -407,10 +406,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			يديش
 			یوروبا
 			کانټوني
-			معياري مراکش تمازټیټ
+			چايني، کانټونيز
+			معياري مراکشي تمازيټ
 			چیني
+			چيني، ماندرين
 			ساده چيني
+			چيني ماندرين چيني
 			دوديزه چيني
+			دوديزه ماندرين چيني
 			زولو
 			زوني
 			نه ژبني منځپانګه
@@ -435,7 +438,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
 			
 			
@@ -450,9 +453,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
+			
 			
-			
+			
 			
 			
 			
@@ -469,7 +472,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			افريقا
 			شمالی امریکا
 			سويلي امريکا
-			سمندريه
+			اوقيانوسيه
 			لویدیځ افریقا
 			منخنۍ امريکا
 			ختیځ افریقا
@@ -491,9 +494,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			منځنۍ آسيا
 			لویدیځ آسیا
 			اروپا
-			ختيځه اروپا
+			ختيځ اروپا
 			شمالي اروپا
-			لویدیځه اروپا
+			لوېديځ اروپا
 			سب سهارن افريقا
 			لاتیني امریکا
 			اسينشان ټاپو
@@ -611,7 +614,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			مجارستان
 			د کناري ټاپوګان
 			اندونیزیا
-			ایرلینډ
+			آيرلېنډ
 			اسراييل
 			د آئل آف مین
 			هند
@@ -632,7 +635,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سینټ کټس او نیویس
 			شمالی کوریا
 			سویلي کوریا
-			کویټ
+			کويت
 			کیمان ټاپوګان
 			قزاقستان
 			لاوس
@@ -640,7 +643,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سینټ لوسیا
 			لیختن اشتاین
 			سريلنکا
-			لایبریا
+			لايبيريا
 			لسوتو
 			لیتوانیا
 			لوګزامبورګ
@@ -651,19 +654,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			مولدوا
 			مونټینیګرو
 			سینټ مارټن
-			مدګاسکار
+			مدغاسکر
 			مارشل ټاپوګان
 			شمالي مقدونيه
 			مالي
 			ميانمار (برما)
-			مغولستان
+			منګوليا
 			مکاو سار چین
 			مکاو
 			شمالي ماريانا ټاپوګان
 			مارټینیک
 			موریتانیا
 			مانټیسیرت
-			مالتا
+			مالټا
 			موریشیس
 			مالديپ
 			مالاوي
@@ -777,6 +780,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			اسعارو بڼه
 			ترتيب
 			اسعارو
+			د ساعت چکر (۱۲ پرتله ۲۴)
+			د ماتې کرښې ډول
+			د ناپ نظام
+			شمېرې
 		
 		
 			بودايي جنتري
@@ -786,25 +793,67 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ګريګورين جنتري
 			جورجویان جنتري
 			اسلامي جنتري
-			د اسلامي جنتري (جدولي، د مدني عصر)
+			اسلامي جنتري (جدولي، مدني عصر)
 			اسلامي جنتري (جدولي، ستورپوهنيز عصر)
 			ISO-8601 جنتري
-			د جاپاني جنتري
-			د فارسي جنتري
+			جاپاني جنتري
+			فارسي جنتري
 			منگوو جنتري
 			محاسبه اسعارو بڼه
 			معياري اسعارو بڼه
-			ڊفالٽ یونیکوډ ترتیب
-			عمومي موخو د لټون
+			ډيفالټ يونيکوډ ترتيب
+			د عمومي موخي لټون
 			معياري د لټې ترتيب
+			د ۱۲ ساعتو نظام (۰ـ۱۱)
+			د ۱۲ ساعتو نظام (۱ ـ ۱۲)
+			د ۲۴ ساعتو نظام (۰ـ۲۳)
+			د ساعتو نظام (۱ـ۲۴)
+			د غړندې ماتې کرښې ډول
+			د عادي ماتې کرښې ډول
+			د سختې ماتې کرښې ډول
+			ميټرک نظام
+			امپيريل د ناپ نظام
+			د متحده آيالاتو د ناپ نظام
 			عربي - انډیک عددونه
 			غځېدلې عربي ۔ اينډيک عدد
+			آرمينيايي اعداد
+			آرمينيايي کوچني اعداد
+			د بنګلا اعداد
+			ديوانګري اعداد
+			ايتهوپيايي اعداد
+			د بشپړه پراختيا اعداد
+			ګريګورين اعداد
+			يوناني اعداد
+			يوناني کوچني اعداد
+			ګوجراتي اعداد
+			ګرمخې اعداد
+			چايني اعشاري اعداد
+			ساده چيني اعداد
+			ساده چيني مالي اعداد
+			دوديز چيني اعداد
+			دوديز چيني مالي اعداد
+			عبراني اعداد
+			جاپاني اعداد
+			جاپاني مالي اعداد
+			خمري اعداد
+			کاناډا يي اعداد
+			لاوي اعداد
 			لويديځ عددونه
+			ملاي لام اعداد
+			د ميانمار اعداد
+			د اوډيا اعداد
+			رومن اعداد
+			رومن کوچني اعداد
+			دوديز تامل اعداد
+			تامل اعداد
+			تيلوګو اعداد
+			تايي اعداد
+			تبتي اعداد
 		
 		
 			مېټرک
 			بريتاني
-			امريکايي
+			متحده ايالات
 		
 		
 			ژبه: {0}
@@ -821,37 +870,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u064E \u0650 \u064F \u064B \u064D \u064C \u0651 \u0652 \u0654 \u0670 آ ا أ ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ گ ل م ن ڼ ه ة و ؤ ی ي ې ۍ ئ]
 		[\u200C \u200D \u200E\u200F ے]
 		[آ ا ء ب پ ت ټ ث ج ځ چ څ ح خ د ډ ذ ر ړ ز ژ ږ س ش ښ ص ض ط ظ ع غ ف ق ک ګ ل م ن ڼ ه و ی]
-		[\u200E \- , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
+		[\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + − 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
 		[، ; \: ! ۔ ' ‘ ( ) \[ \] \{ \} /]
 		{0}…
 		…{0}
 		{0}…{1}
-		{0} …
-		… {0}
-		{0} … {1}
-		?
 		
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
 		
 	
-	
-		“
-		”
-		‘
-		’
-	
 	
 		
 			
@@ -945,17 +979,46 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
-							d–d
+							d – d
+						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+						
+						
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y GGGGG – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
+						
+						
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
 						
 						
 							MM–MM
@@ -1028,7 +1091,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							مۍ
 							جون
 							جولای
-							اگست
+							اګست
 							سېپتمبر
 							اکتوبر
 							نومبر
@@ -1056,7 +1119,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							مۍ
 							جون
 							جولای
-							اگست
+							اګست
 							سېپتمبر
 							اکتوبر
 							نومبر
@@ -1072,7 +1135,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							مۍ
 							جون
 							جولای
-							اگست
+							اګست
 							سپتمبر
 							اکتوبر
 							نومبر
@@ -1100,7 +1163,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							مۍ
 							جون
 							جولای
-							اگست
+							اګست
 							سپتمبر
 							اکتوبر
 							نومبر
@@ -1263,7 +1326,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						له میلاد څخه وړاندې
 						له عام پېر دمخه
 						له میلاد څخه وروسته
-						CE
+						عام پېر
 					
 					
 						له میلاد وړاندې
@@ -1344,8 +1407,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						h B
 						h:mm B
 						h:mm:ss B
-						d
-						ccc
 						E h:mm B
 						E h:mm:ss B
 						d, E
@@ -1372,9 +1433,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MM-dd, E
 						LLL
 						MMM d
-						MMM d, E
+						E, MMM d
 						MMMM d
-						اونۍ W د MMMM
+						اونۍ‘ W د MMMM‘
 						اونۍ W د MMMM
 						mm:ss
 						y
@@ -1395,56 +1456,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1518,12 +1532,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							y MMM–MMM
-							y MMM – y MMM
+							MMM y – MMM y
 						
 						
 							y MMM d–d
 							y MMM d – MMM d
-							y MMM d – y MMM d
+							MMM d, y – MMM d, y
 						
 						
 							y MMM d, E – MMM d, E
@@ -1645,17 +1659,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 						
 							محرم
-							صفره
+							صفر
 							ربيع
 							ربيع II
-							جماعه
-							جموما II
-							راجاب
+							جماد ۱
+							جماد ۲
+							رجب
 							شعبان
 							رمضان
 							شوال
 							دالقاعده
-							حلال حج
+							ذي الحج
 						
 						
 							1
@@ -1673,33 +1687,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							محرم
-							د صفرې د
+							صفر
 							ربيع
 							ربيع II
 							جماعه
 							جموما II
-							راجاب
+							رجب
 							شعبان
 							رمضان
 							شوال
-							دالقاعده
-							حلال حج
+							ذي القعده
+							ذي الحج
 						
 					
 					
 						
 							محرم
-							صفره
+							صفر
 							ربيع
 							ربيع II
 							جماعه
-							جموما II
-							راجاب
+							جمادي ۲
+							رجب
 							شعبان
 							رمضان
 							شوال
 							دالقاعده
-							حلال حج
+							ذي الحج
 						
 						
 							1
@@ -1717,17 +1731,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 						
 							محرم
-							د صفرې د
+							صفر
 							ربيع
 							ربيع II
 							جماعه
 							جموما II
-							راجاب
+							رجب
 							شعبان
 							رمضان
 							شوال
 							دالقاعده
-							حلال حج
+							ذي الحج
 						
 					
 				
@@ -1808,18 +1822,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							کب
 						
 						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
+							۱
+							۲
+							۳
+							۴
+							۵
+							۶
+							۷
+							۸
+							۹
+							۱۰
+							۱۱
+							۱۲
 						
 						
 							وری
@@ -1852,18 +1866,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							کب
 						
 						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
+							۱
+							۲
+							۳
+							۴
+							۵
+							۶
+							۷
+							۸
+							۹
+							۱۰
+							۱۱
+							۱۲
 						
 						
 							وری
@@ -1902,7 +1916,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				کال
 				پروسږکال
 				سږکال
-				بل کال
+				راتلونکی کال
 				
 					په {0} کال کې
 					په {0} کالونو کې
@@ -1914,9 +1928,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				کال
-				پروسږکال
-				سږکال
-				بل کال
+				تېر کال
+				سږ کال
+				روتلونکی کال
 				
 					په {0} کال کې
 					په {0} کالونو کې
@@ -1928,9 +1942,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				کال
-				پروسږکال
-				سږکال
-				بل کال
+				تير کال
+				سږ کال
+				راتلونکی کال
 				
 					په {0} کال کې
 					په {0} کالونو کې
@@ -1940,23 +1954,128 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} کاله مخکې
 				
 			
+			
+				څلورمه برخه
+				ورستۍ ربع
+				دا ربع
+				راتلونکې ربع
+				
+					په {0} ربع کې
+					په {0} ربعو کې
+				
+				
+					{0} ربع مخکې
+					{0} ربعې مخکې
+				
+			
+			
+				څلورمه برخه
+				
+					په {0} ربع کې
+					په {0} ربعو کې
+				
+				
+					{0} ربع مخکې
+					{0} ربعې مخکې
+				
+			
+			
+				څلورمه برخه
+				
+					په {0} ربع کې
+					په {0} ربعو کې
+				
+				
+					{0} ربع مخکې
+					{0} ربعې مخکې
+				
+			
 			
 				مياشت
+				تېره مياشت
+				دا مياشت
+				راتلونکې مياشت
+				
+					په {0} مياشت کې
+					په {0} مياشتو کې
+				
+				
+					{0} مياشت مخکې
+					{0} مياشتې مخکې
+				
 			
 			
 				مياشت
+				تېره مياشت
+				دا مياشت
+				راتلونکې مياشت
+				
+					په {0} مياشت کې
+					په {0} مياشت کې
+				
+				
+					{0} مياشت مخکې
+					{0} مياشت مخکې
+				
 			
 			
 				مياشت
+				تېره مياشت
+				دا مياشت
+				راتلونکې مياشت
+				
+					په {0} مياشت کې
+					په {0} مياشت کې
+				
+				
+					{0} مياشت مخکې
+					{0} مياشت مخکې
+				
 			
 			
 				اونۍ
+				تيره اونۍ
+				دا اونۍ
+				راتلونکې اونۍ
+				
+					په {0} اونۍ کې
+					په {0} اونيو کې
+				
+				
+					{0} اونۍ مخکې
+					{0} اونۍ مخکې
+				
+				اونۍ د {0}
 			
 			
 				اونۍ
+				تېره اونۍ
+				دا اونۍ
+				راتلونکې اونۍ
+				
+					په {0} اونۍ کې
+					په {0} اونۍ کې
+				
+				
+					{0} اونۍ مخکې
+					{0} اونۍ مخکې
+				
+				اونۍ د {0}
 			
 			
 				اونۍ
+				تېره اونۍ
+				دا اونۍ
+				راتلونکې اونۍ
+				
+					په {0} اونۍ کې
+					په {0} اونۍ کې
+				
+				
+					{0} اونۍ مخکې
+					{0} اونۍ مخکې
+				
+				اونۍ د {0}
 			
 			
 				د مياشتې اونۍ
@@ -1969,12 +2088,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ورځ
+				پرون
+				نن
+				سبا
+				
+					په {0} ورځ کې
+					په {0} ورځو کې
+				
+				
+					{0} ورځ مخکې
+					{0} ورځې مخکې
+				
 			
 			
 				ورځ
+				پرون
+				نن
+				سبا
+				
+					په {0} ورځ کې
+					په {0} ورځو کې
+				
+				
+					{0} ورځ مخکې
+					{0} ورځې مخکې
+				
 			
 			
 				ورځ
+				پرون
+				نن
+				سبا
+				
+					په {0} ورځ کې
+					په {0} ورځو کې
+				
+				
+					{0} ورځ مخکې
+					{0} ورځې مخکې
+				
 			
 			
 				د کال ورځ
@@ -2003,6 +2155,279 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				د مياشتې اونۍ ورځ
 			
+			
+				تېره يکشنبه
+				دا يکشنبه
+				راتلونکې يکشنبه
+				
+					په {0} يکشنبه کې
+					په {0} يکشنبو کې
+				
+				
+					{0} يکشنبه مخکې
+					{0} يکشنبې مخکې
+				
+			
+			
+				تېره يکشنبه
+				دا يکشنبه
+				راتلونکې يکشنبه
+				
+					په {0} يکشنبه کې
+					په {0} يکشنبه کې
+				
+				
+					{0} يکشنبه مخکې
+					{0} يکشنبه مخکې
+				
+			
+			
+				تېره يکشنبه
+				دا يکشنبه
+				راتلونکې يکشنبه
+				
+					په {0} يکشنبه کې
+					په {0} يکشنبه کې
+				
+				
+					{0} يکشنبه مخکې
+					{0} يکشنبه مخکې
+				
+			
+			
+				تېره دوشنبه
+				دا دوشنبه
+				راتلونکې دوشنبه
+				
+					په {0} دوشنبه کې
+					په {0} دوشنبو کې
+				
+				
+					{0} دوشنبه مخکې
+					{0} دوشنبې مخکې
+				
+			
+			
+				تېره دوشنبه
+				دا دوشنبه
+				راتلونکې دوشنبه
+				
+					په {0} دوشنبه کې
+					په {0} دوشنبه کې
+				
+				
+					{0} دوشنبه مخکې
+					{0} دوشنبه مخکې
+				
+			
+			
+				تېره دوشنبه
+				دا دوشنبه
+				راتلونکې دوشنبه
+				
+					په {0} دوشنبه کې
+					په {0} دوشنبه کې
+				
+				
+					{0} دوشنبه مخکې
+					{0} دوشنبه مخکې
+				
+			
+			
+				تيره سه شنبه
+				دا سه شنبه
+				راتلونکې سه شنبه
+				
+					په {0} سه شنبه کې
+					په {0} سه شنبو کې
+				
+				
+					{0} سه شنبه مخکې
+					{0} سه شنبې مخکې
+				
+			
+			
+				تېره سه شنبه
+				دا سه شنبه
+				راتلونکې سه شنبه
+				
+					په {0} سه شنبه کې
+					په {0} سه شنبه کې
+				
+				
+					{0} سه شنبه مخکې
+					{0} سه شنبه مخکې
+				
+			
+			
+				تيره سه شنبه
+				دا سه شنبه
+				راتلونکې سه شنبه
+				
+					په {0} سه شنبه کې
+					په {0} سه شنبه کې
+				
+				
+					{0} سه شنبه مخکې
+					{0} سه شنبه مخکې
+				
+			
+			
+				تېره چارشنبه
+				دا چارشنبه
+				راتلونکې چارشنبه
+				
+					په {0} چارشنبه کې
+					په {0} چارشنبو کې
+				
+				
+					{0} چارشنبه مخکې
+					{0} چارشنبې مخکې
+				
+			
+			
+				تېره چارشنبه
+				دا چارشنبه
+				راتلونکې چارشنبه
+				
+					په {0} چارشنبه کې
+					په {0} چارشنبه کې
+				
+				
+					{0} چارشنبه مخکې
+					{0} چارشنبه مخکې
+				
+			
+			
+				تېره چارشنبه
+				دا چارشنبه
+				راتلونکې چارشنبه
+				
+					په {0} چارشنبه کې
+					په {0} چارشنبه کې
+				
+				
+					{0} چارشنبه مخکې
+					{0} چارشنبه مخکې
+				
+			
+			
+				تېره پنجشنبه
+				دا پنجشنبه
+				راتلونکې پنجشنبه
+				
+					په {0} پنجشنبه کې
+					په {0} پنجشنبو کې
+				
+				
+					{0} پنجشنبه مخکې
+					{0} پنجشنبې مخکې
+				
+			
+			
+				تېره پنجشنبه
+				دا پنجشنبه
+				راتلونکې پنجشنبه
+				
+					په {0} پنجشنبه کې
+					په {0} پنجشنبه کې
+				
+				
+					{0} پنجشنبه مخکې
+					{0} پنجشنبه مخکې
+				
+			
+			
+				تېره پنجشنبه
+				دا پنجشنبه
+				راتلونکې پنجشنبه
+				
+					په {0} پنجشنبه کې
+					په {0} پنجشنبه کې
+				
+				
+					{0} پنجشنبه مخکې
+					{0} پنجشنبه مخکې
+				
+			
+			
+				تېره جمعه
+				دا جمعه
+				راتلونکې جمعه
+				
+					په {0} جمعه کې
+					په {0} جمعو کې
+				
+				
+					{0} جمعه مخکې
+					{0} جمعې مخکې
+				
+			
+			
+				تېره جمعه
+				دا جمعه
+				راتلونکې جمعه
+				
+					په {0} جمعه کې
+					په {0} جمعه کې
+				
+				
+					{0} جمعه مخکې
+					{0} جمعه مخکې
+				
+			
+			
+				تېره جمعه
+				دا جمعه
+				راتلونکې جمعه
+				
+					په {0} جمعه کې
+					په {0} جمعه کې
+				
+				
+					{0} جمعه مخکې
+					{0} جمعه مخکې
+				
+			
+			
+				تېره شنبه
+				دا شنبه
+				راتلونکې شنبه
+				
+					په {0} شنبه کې
+					په {0} شنبو کې
+				
+				
+					{0} شنبه مخکې
+					{0} شنبې مخکې
+				
+			
+			
+				تېره شنبه
+				دا شنبه
+				راتلونکې شنبه
+				
+					په {0} شنبه کې
+					په {0} شنبه کې
+				
+				
+					{0} شنبه مخکې
+					{0} شنبه مخکې
+				
+			
+			
+				تېره شنبه
+				دا شنبه
+				راتلونکې شنبه
+				
+					په {0} شنبه کې
+					په {0} شنبه کې
+				
+				
+					{0} شنبه مخکې
+					{0} شنبه مخکې
+				
+			
 			
 				ورځ شېبه
 			
@@ -2014,30 +2439,105 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ساعت
+				دا ساعت
+				
+					په {0} ساعت کې
+					په {0} ساعتو کې
+				
+				
+					{0} ساعت مخکې
+					{0} ساعتونه مخکې
+				
 			
 			
 				ساعت
+				
+					په {0} ساعت کې
+					په {0} ساعت کې
+				
+				
+					{0} ساعت مخکې
+					{0} ساعت مخکې
+				
 			
 			
 				ساعت
+				
+					په {0} ساعت کې
+					په {0} ساعت کې
+				
+				
+					{0} ساعت مخکې
+					{0} ساعت مخکې
+				
 			
 			
 				دقيقه
+				دا دقيقه
+				
+					په {0} دقيقه کې
+					په {0} دقيقو کې
+				
+				
+					{0} دقيقه مخکې
+					{0} دقيقې مخکې
+				
 			
 			
 				دقيقه
+				
+					په {0} دقيقه کې
+					په {0} دقيقه کې
+				
+				
+					{0} دقيقه مخکې
+					{0} دقيقه مخکې
+				
 			
 			
 				دقيقه
+				
+					په {0} دقيقه کې
+					په {0} دقيقه کې
+				
+				
+					{0} دقيقه مخکې
+					{0} دقيقه مخکې
+				
 			
 			
 				ثانيه
+				اوس
+				
+					په {0} ثانيه کې
+					په {0} ثانيو کې
+				
+				
+					{0} ثانيه مخکې
+					{0} ثانيې مخکې
+				
 			
 			
 				ثانيه
+				
+					په {0} ثانيه کې
+					په {0} ثانيه کې
+				
+				
+					{0} ثانيه مخکې
+					{0} ثانيه مخکې
+				
 			
 			
 				ثانيه
+				
+					په {0} ثانيه کې
+					په {0} ثانيه کې
+				
+				
+					{0} ثانيه کې
+					{0} ثانيه کې
+				
 			
 			
 				وخت سيمه
@@ -2062,7 +2562,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					همغږۍ نړیواله موده
+					همغږى نړیوال وخت
 				
 			
 			
@@ -2083,29 +2583,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				انګیلا
 			
+			
+				تيران
+			
 			
-				ییران
+				يريوان
 			
 			
 				لونده
 			
 			
-				رورها
+				رودرا
 			
 			
-				پالر
+				پالمر
 			
 			
-				ټول
+				ټرول
 			
 			
 				سیوا
 			
 			
-				مسونسن
+				ماوسن
 			
 			
-				دیویس
+				ډيوس
 			
 			
 				واستوک
@@ -2114,10 +2617,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				کیسي
 			
 			
-				ډومونټ ډي اوورول
+				ډومونټ ډي ارول
+			
+			
+				مکمرډو
 			
 			
-				ریو ګیلیلیګوس
+				ريو ګيليګوس
 			
 			
 				مینډوزا
@@ -2129,7 +2635,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				اوشوایا
 			
 			
-				لا ریوج
+				لاريوجا
 			
 			
 				سان لویس
@@ -2141,28 +2647,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سالټا
 			
 			
-				جوجو
+				جوجوي
 			
 			
 				ټيکووم
 			
 			
-				کوډوبا
+				کورډوبا
 			
 			
 				بينوس اييرز
 			
 			
-				پیگو پیگو
+				پيګو پيګو
 			
 			
 				ویانا
 			
 			
-				پورت
+				پرت
 			
 			
-				ایولیکا
+				ايوکلا
 			
 			
 				ډارون
@@ -2171,7 +2677,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				اډیلایډ
 			
 			
-				مات شوی هیل
+				بروکن هل
 			
 			
 				کرري
@@ -2192,22 +2698,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				بریسبن
 			
 			
-				مکاکري
+				مکواري
 			
 			
-				رب هیله
+				لارډ هوي
 			
 			
 				آروبا
 			
 			
-				ماریاهمین
+				ميريهام
 			
 			
 				باکو
 			
 			
-				سرجیو
+				سيراجيوا
 			
 			
 				باربادوس
@@ -2219,7 +2725,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				بروسلز
 			
 			
-				اوواګاګواګو
+				اوګوډوګو
 			
 			
 				صوفیا
@@ -2261,7 +2767,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				بوا ویسټا
 			
 			
-				منوس
+				مناوس
 			
 			
 				کویابا
@@ -2288,7 +2794,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				فورتیلزا
 			
 			
-				مایسیو
+				ماسيو
 			
 			
 				ریسیفي
@@ -2315,7 +2821,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				داوسن
 			
 			
-				سپین آس
+				وايټ هارس
 			
 			
 				انوک
@@ -2333,13 +2839,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				کرسټون
 			
 			
-				زرونیف
+				يلونايف
 			
 			
 				ایډمونټن
 			
 			
-				اوسنی بدلون
+				سويفټ کرنټ
 			
 			
 				کیمبرج بي
@@ -2351,19 +2857,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				وینپیګ
 			
 			
-				غوڅ
+				ريسالوټ
 			
 			
 				د باران باران
 			
 			
-				رانکين لط
+				رينکن انلټ
 			
 			
 				اتیکوکن
 			
 			
-				د تندر خلیج
+				تنډر بی
 			
 			
 				نیپګون
@@ -2375,10 +2881,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				اقلیټ
 			
 			
-				پيننټيرګ
+				پينګنرچونګ
 			
 			
-				مونټون
+				مونکټون
 			
 			
 				هیلفکس
@@ -2393,10 +2899,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				بلانک-سابلون
 			
 			
-				د سینټ جان
+				سینټ جانز
 			
 			
-				کوکوس
+				کوکوز
 			
 			
 				کينشاسا
@@ -2405,7 +2911,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				لبوباشي
 			
 			
-				بنوګي
+				بانګوي
+			
+			
+				برازاويل
 			
 			
 				زریچ
@@ -2414,7 +2923,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ابيجان
 			
 			
-				راروتاګون
+				راروټونګا
 			
 			
 				ایسټر
@@ -2426,7 +2935,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سنتياګو
 			
 			
-				ډالاله
+				دوالا
+			
+			
+				اورومقي
 			
 			
 				شنگھائی
@@ -2438,34 +2950,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				کوستاریکا
 			
 			
-				هایانا
+				هوانا
 			
 			
-				کېپ وردا
+				کيپ ورډ
 			
 			
-				کیکاو
+				کوراکاؤ
 			
 			
-				کریمیس
+				کريسمس
 			
 			
 				نیکوسیا
 			
+			
+				فاماګستا
+			
 			
 				پراګ
 			
 			
-				بسینګین
+				بوسينجن
 			
 			
-				برلین
+				برلن
 			
 			
 				جبوتي
 			
 			
-				کوپینګنګ
+				کوپن هيګن
 			
 			
 				دومینیکا
@@ -2474,13 +2989,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سنتو ډومینګو
 			
 			
-				الګیرز
+				الجييرز
 			
 			
 				ګالپګوس
 			
 			
-				ګویاګل
+				ګوياکل
 			
 			
 				تالين
@@ -2492,34 +3007,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				الیون
 			
 			
-				اساماره
+				اسماره
 			
 			
-				کیري
+				کناري
+			
+			
+				سيوټا
 			
 			
 				میډریډ
 			
 			
-				اضافی ابابا
+				اديس ابابا
 			
 			
 				هیلسنکی
 			
 			
-				في جي
+				فجي
 			
 			
 				سټنلي
 			
 			
-				چکوک
+				چوک
 			
 			
 				پونپي
 			
 			
-				کوسیرا
+				کوسراي
 			
 			
 				فارو
@@ -2532,7 +3050,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د انګلستان سمر وخت
+					بريتانوي د اوړي وخت
 				
 				لندن
 			
@@ -2557,8 +3075,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				تول
 			
+			
+				نووک
+			
+			
+				اټوکوټورمیټ
+			
 			
-				ډنمارک هاربر
+				ډنمارکشان
 			
 			
 				بانجول
@@ -2573,10 +3097,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مالابو
 			
 			
-				ایترین
+				ايتنز
 			
 			
-				سویل جورجیا
+				سويلي جورجيا
 			
 			
 				ګواتمالا
@@ -2585,7 +3109,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ګوام
 			
 			
-				بسو
+				بساؤ
 			
 			
 				ګیانا
@@ -2603,10 +3127,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				پورټ ایو - پرنس
 			
 			
-				بوډاپیس
+				بداپسټ
 			
 			
-				جاکارټا
+				جکارتا
 			
 			
 				پونټینیک
@@ -2615,13 +3139,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مکاسار
 			
 			
-				جاپورا
+				جاياپورا
 			
 			
-				ډوبلین
+				
+					آيرش معياري وخت
+				
+				ډبلن
 			
 			
-				یهودان
+				يروشلم
 			
 			
 				د آئل آف مین
@@ -2630,7 +3157,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				کولکته
 			
 			
-				چارګوس
+				چاګوس
 			
 			
 				بغداد
@@ -2639,7 +3166,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				تهران
 			
 			
-				ريکسجيک
+				ريکجاويک
 			
 			
 				روم
@@ -2663,31 +3190,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				بشکیک
 			
 			
-				دوم قلم
+				پنوم پن
+			
+			
+				انډربري
+			
+			
+				کيريټماټي
 			
 			
-				ترارو
+				تاراوا
 			
 			
-				کومو
+				کومورو
 			
 			
 				سینټ کټس
 			
 			
-				پیونگګنګ
+				پيانګ يانګ
 			
 			
 				سیول
 			
 			
-				کویټ
+				کوېت
 			
 			
 				کیمن
 			
 			
-				اکاټو
+				اکټاو
 			
 			
 				اورل
@@ -2698,14 +3231,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				اکتوب
 			
+			
+				کوستانې
+			
 			
-				قزیلیلرا
+				قيزي لورډا
 			
 			
 				الماتی
 			
 			
-				وینټینیا
+				وينټين
 			
 			
 				بیروت
@@ -2714,7 +3250,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سینټ لوسیا
 			
 			
-				وادز
+				واډوز
 			
 			
 				کولمبو
@@ -2723,16 +3259,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مونروفیا
 			
 			
-				مسرو
+				مسيرو
 			
 			
-				ویلیونس
+				ويلنيوس
 			
 			
 				لوګزامبورګ
 			
 			
-				ریګ
+				ريګا
 			
 			
 				تريپولي
@@ -2747,16 +3283,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				چیسینو
 			
 			
-				پوډورګویکا
+				پوډګوريکا
 			
 			
-				مارګټ
+				ميريګاټ
 			
 			
-				انتوننارو
+				انتانناريوو
 			
 			
-				کجیجینین
+				کواجلين
 			
 			
 				مجورو
@@ -2770,8 +3306,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				یانګون
 			
+			
+				هاوډ
+			
 			
-				اللانبیر
+				اولان باټر
+			
+			
+				چويبلسان
 			
 			
 				مکاو
@@ -2789,16 +3331,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مانټیسیرت
 			
 			
-				مالتا
+				مالټا
 			
 			
-				ماوريشوس
+				ماريشيس
 			
 			
 				مالديپ
 			
+			
+				بلنټاير
+			
 			
-				تجهان
+				تجوانا
 			
 			
 				هرموسیلو
@@ -2821,17 +3366,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				مکسيکو ښار
 			
+			
+				ميټاموروس
+			
 			
-				مرده
+				ميريډا
 			
 			
-				کینن
+				کينکن
 			
 			
 				کولالمپور
 			
 			
-				کوچيګ
+				کوچنګ
 			
 			
 				ماپوټو
@@ -2840,7 +3388,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				وینهوک
 			
 			
-				نواما
+				نوميا
 			
 			
 				نیمي
@@ -2870,13 +3418,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				نیوو
 			
 			
-				چامام
+				چاتام
 			
 			
 				اکلند
 			
 			
-				مسکټ
+				مسقط
 			
 			
 				پاناما
@@ -2885,16 +3433,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				لیما
 			
 			
-				ټیټیټي
+				ټهيټي
 			
 			
-				مارکسونه
+				مارکيساس
 			
 			
-				ګيمبي
+				ګيمبير
 			
 			
-				پور موورسبی
+				پورټ مورسبی
+			
+			
+				بوګن ویل
 			
 			
 				منیلا
@@ -2906,7 +3457,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				وارسا
 			
 			
-				ميکلين
+				ميکويلان
+			
+			
+				پيټيکيرن
 			
 			
 				پورتو ریکو
@@ -2917,14 +3471,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				هبرون
 			
+			
+				ايزورس
+			
 			
-				مایررا
+				مديرا
 			
 			
 				لیسبون
 			
 			
-				پلو
+				پلاو
 			
 			
 				اسونسيون
@@ -2933,7 +3490,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				قطر
 			
 			
-				ریونیو
+				ري يونين
 			
 			
 				بخارست
@@ -2942,7 +3499,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				بلغاد
 			
 			
-				کیليینګراډر
+				کيلنينګراډ
 			
 			
 				سیمفروپول
@@ -2951,7 +3508,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ماسکو
 			
 			
-				والګراډر
+				والګوګراډ
 			
 			
 				سراتف
@@ -2960,7 +3517,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				آسترخان
 			
 			
-				ایلیانوفس
+				اليانوسک
 			
 			
 				کیروف
@@ -2969,13 +3526,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سمارا
 			
 			
-				یاراتینینګ برګ
+				يکاټيرنبرګ
 			
 			
-				اوک
+				اومسک
 			
 			
-				نووسوسبیرک
+				نووسيبرسک
 			
 			
 				برنول
@@ -2987,34 +3544,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				نووکوزنیټک
 			
 			
-				کریسایویارسک
+				کريسنويارسک
 			
 			
-				ایرکوټس
+				ارکوټسک
 			
 			
 				چيتا
 			
 			
-				یااکټس
+				ياکوټسک
 			
 			
 				ولادیوستاک
 			
 			
-				خندګي
+				خنديګا
 			
 			
-				سخنین
+				سخالين
 			
 			
-				اوسترا
+				اوستنيرا
 			
 			
 				مګدان
 			
 			
-				سنینیکولوژیک
+				سريډنيکوليمسک
 			
 			
 				کامچاتکا
@@ -3029,10 +3586,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				رياض
 			
 			
-				ګالالکنال
+				ګواډلکينال
 			
 			
-				مای
+				ماهي
 			
 			
 				خرتوم
@@ -3047,13 +3604,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سینټ هیلینا
 			
 			
-				لوججانا
+				لوبجانا
 			
 			
-				لاندینبیبین
+				لانګيربين
 			
 			
-				براتسکوا
+				براټسلاوا
 			
 			
 				فریټون
@@ -3080,22 +3637,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ايل سلوادور
 			
 			
-				د کمتر شهزاده درې میاشتنۍ
+				لوور پرنس کوارټر
 			
 			
 				دمشق
 			
+			
+				مبابانې
+			
 			
 				لوی ترک
 			
 			
 				نجامینا
 			
+			
+				کرګولين
+			
 			
 				لووم
 			
 			
-				بانکاک
+				بنکاک
 			
 			
 				دوشنبي
@@ -3104,7 +3667,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				فوکافو
 			
 			
-				ديلي
+				دلي
 			
 			
 				اشغ آباد
@@ -3116,16 +3679,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ټونګاتاپو
 			
 			
-				استانبول
+				استنبول
 			
 			
 				د اسپانیا بندر
 			
 			
-				فرهفتی
+				فونافوتي
 			
 			
-				تاپي
+				تايپي
 			
 			
 				دار السلام
@@ -3143,7 +3706,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				کمپاله
 			
 			
-				میډیا
+				ميډوی
 			
 			
 				ویک
@@ -3155,13 +3718,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				نوم
 			
 			
-				جانستون
+				جانسټن
 			
 			
 				اینکریج
 			
 			
-				یاکتټ
+				ياکوټټ
 			
 			
 				سیټکا
@@ -3185,13 +3748,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ډنور
 			
 			
-				بيلاه، شمالي داکوتا
+				بيولا، شمالي ډاکوټا
 			
 			
 				نوی سلیم، شمالي داکوتا
 			
 			
-				مرکز، د شمالي ټاپو
+				مرکز، شمالي ډاکوټا
 			
 			
 				شیکاګو
@@ -3200,34 +3763,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مینومین
 			
 			
-				وینینسین، انډا
+				وينسينس، انډيانا
 			
 			
-				پیتربورګ، انډيانا
+				پيټسبرګ، انډيانا
 			
 			
-				ښار، انډیا ته ووایی
+				ټل سټي، انډيانا
 			
 			
-				نکس، اندیانا
+				نوکس انډيانا
 			
 			
-				ویناماسک، انډی
+				وينامک انډيانا
 			
 			
-				مارینګ، انډیانا
+				مورينګو انډيانا
 			
 			
-				انډولپولیس
+				انډيانا پوليس
 			
 			
 				لوئس ویل
 			
 			
-				ویوی، انډیډا
+				ویوی، انډيانا
 			
 			
-				مونټیکیلو، کینیسي
+				مونټيسيلو، کونټکی
 			
 			
 				ډایټروټ
@@ -3242,7 +3805,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				سمرقند
 			
 			
-				تاشکند
+				تاشقند
 			
 			
 				ویټیکان
@@ -3257,13 +3820,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ټورتولا
 			
 			
-				سایټ توماس
+				سينټ تهامس
 			
 			
-				هو چي مينه
+				هو چي من ښار
 			
 			
-				ایات
+				عفات
 			
 			
 				والس
@@ -3278,10 +3841,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				میټوت
 			
 			
-				جوهانبرګ
+				جوهانسبرګ
 			
 			
-				لسیکا
+				لوساکا
 			
 			
 				هرارې
@@ -3317,14 +3880,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					الاسکا وخت
 					الاسکا معياري وخت
-					د الاسکا د ورځې روښانه کول
-				
-			
-			
-				
-					الماتا په وخت
-					∅∅∅
-					∅∅∅
+					الاسکا د ورځې روښانه وخت
 				
 			
 			
@@ -3338,7 +3894,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					مرکزي وخت
 					مرکزي معياري وخت
-					مرکزي رڼا ورځې وخت
+					مرکزي د ورځې روښانه وخت
 				
 			
 			
@@ -3364,16 +3920,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د اپیا وخت
-					د اپیا معياري وخت
-					د اپیا د ورځې وخت
+					اپیا وخت
+					اپیا معياري وخت
+					اپيا د ورځې روښانه وخت
 				
 			
 			
 				
 					عربي وخت
 					عربي معیاري وخت
-					د عربي ورځپاڼې وخت
+					عربي د ورځې روښانه وخت
 				
 			
 			
@@ -3385,70 +3941,77 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					غربي ارجنټاین وخت
-					غربي ارجنټاین معیاری وخت
-					غربي ارجنټاین اوړي وخت
+					لوېديځ ارجنټاين وخت
+					لوېديځ ارجنټاين معياري وخت
+					لوېديځ ارجنټاين اوړي وخت
 				
 			
 			
 				
 					ارمنستان وخت
 					ارمنستان معياري وخت
-					ارمنستان سمر وخت
+					ارمنستان اوړي وخت
 				
 			
 			
 				
-					اتلانتیک د وخت
+					اتلانتیک وخت
 					اتلانتیک معياري وخت
 					اتلانتیک د رڼا ورځې وخت
 				
 			
 			
 				
-					د مرکزي آسټر وخت
-					د اسټرالیا مرکزي مرکزي معیار
-					د آسټرالیا مرکزي مرکزی ورځ
+					مرکزي آستراليا وخت
+					آسترالوي مرکزي معياري وخت
+					آسترالوي مرکزي د ورځې روښانه وخت
 				
 			
 			
 				
-					د آسټرالیا مرکزی لویدیځ وخت
-					د آسټرالیا مرکزي لویدیځ معیاري وخت
-					د آسټرالیا مرکزي مرکزی لویدیځ د وخت وخت
+					آسترالوي مرکزي لوېديځ وخت
+					آسترالوي مرکزي لوېديځ معياري وخت
+					آسترالوي مرکزي لوېديځ د ورځې روښانه وخت
 				
 			
 			
 				
-					د ختیځ آسټر وخت
-					د آسټرالیا ختیځ معیاري وخت
-					د اسټرالیا ختیځ ختیځ ورځی وخت
+					ختيځ آستراليا وخت
+					آسترالوي ختيځ معياري وخت
+					آسترالوي ختيځ د ورځې روښانه وخت
 				
 			
 			
 				
-					د لویدیځ آسټرالیا وخت
-					د اسټرالیا لویدیز معیار
-					د اسټرالیا لویدیځ د ورځې وخت
+					لوېديځ آستراليا وخت
+					آسترالوي لوېديځ معياري وخت
+					آسترالوي لوېديځ د ورځې روښانه وخت
 				
 			
 			
 				
 					د آذربايجان وخت
 					آذربايجان معياري وخت
-					د اذرباییجان سمر وخت
+					اذرباییجان اوړي وخت
+				
+			
+			
+				
+					ايزورس وخت
+					ايزورس معياري وخت
+					ايزورس اوړي وخت
 				
 			
 			
 				
 					بنگله دېش وخت
-					د بنګلادیش معیاري وخت
-					د بنگله دیش د سمر وخت
+					بنګلادیش معیاري وخت
+					بنګله ديش اوړي وخت
 				
 			
 			
 				
-					د بوتان وخت
+					بهوټان وخت
 				
 			
 			
@@ -3465,7 +4028,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د بروني درسلام وخت
+					برونايي دارالسلام وخت
 				
 			
 			
@@ -3482,9 +4045,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					چامام وخت
-					د چمتم معياري وخت
-					د چتام ورځی وخت
+					چاتام وخت
+					چاتام معياري وخت
+					چاتام د ورځې روښانه وخت
 				
 			
 			
@@ -3510,12 +4073,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د کریسټ ټاپو وخت
+					کريسمس ټاپو وخت
 				
 			
 			
 				
-					د کوکوز ټاپوز وخت
+					کوکوز ټاپوګانو وخت
 				
 			
 			
@@ -3527,31 +4090,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د کوک ټاپوز وخت
-					د کوک ټاپوز معياري وخت
-					د کوک ټاپو نیمه سمر وخت
+					کوک ټاپوګانو وخت
+					کوک ټاپوګانو معياري وخت
+					کوک ټاپوګانو نيم اوړي وخت
 				
 			
 			
 				
-					کیوبا د وخت
+					کيوبا وخت
 					کیوبا معياري وخت
 					کیوبا د رڼا ورځې وخت
 				
 			
 			
 				
-					دیوس وخت
+					ډيوس وخت
 				
 			
 			
 				
-					ډومونټ-ډیریلوی وخت
+					ډومونټ ډي ارول
 				
 			
 			
 				
-					ختیځ ختیځ تیمور وخت
+					ختيځ تيمور وخت
 				
 			
 			
@@ -3568,26 +4131,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					منځنۍ اروپا وخت
+					مرکزي اروپايي وخت
 					د مرکزي اروپا معیاري وخت
 					وسطي اروپايي د اوړي وخت
 				
 			
+			
+				
+					ختيځ اروپايي وخت
+					ختيځ اروپايي معياري وخت
+					ختيځ اروپايي اوړي وخت
+				
+			
 			
 				
-					نور ختیځ ختیځ اروپا وخت
+					لرې ختيځ اروپايي وخت
 				
 			
 			
 				
-					لوېديزې اروپا وخت
-					د لودیځې اروپا معیاري وخت
-					د لودیځې اورپا د اوړي وخت
+					لوېديځ اروپايي وخت
+					لوېديځ اروپايي معياري وخت
+					لوېديځ اروپايي اوړي وخت
 				
 			
 			
 				
-					د فوکلنډ ټاپو وخت
+					فوکلنډ ټاپو وخت
 					د فوکلنډ ټاپو معیاری وخت
 					د فوکلنډ ټاپو اوړي وخت
 				
@@ -3595,8 +4165,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				
 					فجی وخت
-					د فجی معياري وخت
-					د فجی سمر وخت
+					فجی معياري وخت
+					فجي د اوړي وخت
 				
 			
 			
@@ -3616,7 +4186,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د ګیمبریر وخت
+					ګيمبير وخت
 				
 			
 			
@@ -3628,12 +4198,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د ګیلبرټ جزیره وخت
+					جلبرټ ټاپوګانو وخت
 				
 			
 			
 				
-					گرينويچ وخت
+					ګرينويچ معياري وخت
 				
 			
 			
@@ -3652,7 +4222,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د خلیج معياري وخت
+					خلیج معياري وخت
 				
 			
 			
@@ -3669,9 +4239,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د هانګ کانګ د وخت
-					د هانګ کانګ معياري وخت
-					د هانګ کانګ اوړي وخت
+					هانګ کانګ وخت
+					هانګ کانګ معياري وخت
+					هانګ کانګ اوړي وخت
 				
 			
 			
@@ -3683,7 +4253,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د هند معیاري وخت
+					هند معیاري وخت
 				
 			
 			
@@ -3693,55 +4263,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د اندوچینا وخت
+					انډوچاینه وخت
 				
 			
 			
 				
-					د اندونیزیا مرکزي وخت
+					مرکزي ادونيزيا وخت
 				
 			
 			
 				
-					د اندونیزیا وخت
+					اندونیزیا وخت
 				
 			
 			
 				
-					د لویدیځ اندونیزیا وخت
+					لویدیځ اندونیزیا وخت
 				
 			
 			
 				
-					د ایران وخت
-					د ایران معياري وخت
-					د ایران د ورځې وخت
+					ایران وخت
+					ایران معياري وخت
+					ايران د ورځې روښانه وخت
 				
 			
 			
 				
-					د ارکوټس وخت
-					د ارکوټس معياري وخت
-					د ایککوټس سمر وخت
+					ارکوټسک وخت
+					ارکوټسک معياري وخت
+					ارکوټسک اوړي وخت
 				
 			
 			
 				
-					د اسراییل وخت
-					د اسراییل معياري وخت
-					د اسراییلو د ورځې وخت
+					اسراییل وخت
+					اسراییل معياري وخت
+					اسراييل د ورځې روښانه وخت
 				
 			
 			
 				
-					جاپان د وخت
-					د جاپان معياري وخت
-					جاپان د رڼا ورځې وخت
+					جاپان وخت
+					جاپان معياري وخت
+					جاپان د ورځې روښانه وخت
 				
 			
 			
 				
-					ختیځ د قزاقستان د وخت
+					ختيځ قازقستان وخت
 				
 			
 			
@@ -3751,21 +4321,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					کوريا وخت
-					کوريا معياري وخت
-					د کوریا د ورځې د ورځې وخت
+					کوريايي وخت
+					کوريايي معياري وخت
+					کوريايي د ورځې روښانه وخت
 				
 			
 			
 				
-					کوسیرا وخت
+					کوسراي وخت
 				
 			
 			
 				
-					کریسایویسسک وخت
-					کریسایویارسک معیاري وخت
-					کریسایویارسک سمر وخت
+					کريسنويارسک وخت
+					کريسنويارسک معياري وخت
+					کريسنويارسک اوړي وخت
 				
 			
 			
@@ -3775,26 +4345,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د کرښې ټاټوبي وخت
+					لاين ټاپوګانو وخت
 				
 			
 			
 				
-					رب های وخت
-					رب های معیاري وخت
-					رب هاو د ورځې د رڼا وخت
+					لارډ هوي وخت
+					لارډ هوي معياري وخت
+					لارډ هوي د ورځې روښانه وخت
 				
 			
 			
 				
-					د مکاکري ټاپو وخت
+					مکواري ټاپو وخت
 				
 			
 			
 				
-					د مګدان وخت
-					میګډان معياري وخت
-					د مګمان سمر وخ
+					ميګډان وخت
+					ميګډان معياري وخت
+					ميګډان اوړي وخت
 				
 			
 			
@@ -3804,7 +4374,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					مالديف وخت
+					مالديپ وخت
 				
 			
 			
@@ -3814,19 +4384,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					مارشیل ټاپو وخت
+					مارشل ټاپوګانو وخت
 				
 			
 			
 				
-					ماریسیس وخت
+					ماريشيس وخت
 					ماریشیس معياري وخت
-					ماریسیس سمر وخت
+					ماريشيس د اوړي وخت
 				
 			
 			
 				
-					دسونسن وخت
+					ماوسن وخت
 				
 			
 			
@@ -3845,9 +4415,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					دلانانباټ وخت
-					اولان بټر معیاري وخت
-					دلان بیتر سمر وخت
+					اولان باټر وخت
+					اولان باټر معیاري وخت
+					اولان باټر اوړي وخت
 				
 			
 			
@@ -3859,7 +4429,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د میانمار وخت
+					میانمار وخت
 				
 			
 			
@@ -3874,23 +4444,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د نیو کالیډونیا وخت
-					نوی کالیډونیا معياري وخت
-					د نیو کالیډونیا سمر وخت
+					نیو کالیډونیا وخت
+					نيو کالیډونیا معياري وخت
+					نيو کايډونيا اوړي وخت
 				
 			
 			
 				
-					د نیوزی لینڈ وخت
-					د نیوزی لینڈ معیاري وخت
-					د نیوزی لینڈ د ورځې د رڼا وخت
+					نيوزي لېنډ وخت
+					نيوزي لېنډ معياري وخت
+					نيوزي لېنډ د ورځې روښانه وخت
 				
 			
 			
 				
-					د نوي فیلډلینډ وخت
+					نيو فاونډلېنډ وخت
 					د نوي فیلډلینډ معیاری وخت
-					د نوي فیلډلینډ رڼا ورځې وخت
+					نيو فاونډلېنډ د ورځې روښانه وخت
 				
 			
 			
@@ -3912,23 +4482,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د نووسوسبیرک وخت
-					د نووسوسبیرک معياري وخت
-					نووسوسبیرک سمر وخت
+					نووسيبرسک وخت
+					نووسيبرسک معياري وخت
+					نووسيبرسک اوړي وخت
 				
 			
 			
 				
-					اوزک وخت
-					د اوزک معياري وخت
-					اوسمک سمر وخت
+					اومسک وخت
+					اومسک معياري وخت
+					اومسک اوړي وخت
 				
 			
 			
 				
-					د پاکستان وخت
-					د پاکستان معیاري وخت
-					د پاکستان سمر وخت
+					پاکستان وخت
+					پاکستان معیاري وخت
+					پاکستان اوړي وخت
 				
 			
 			
@@ -3943,7 +4513,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					پاراګوای د وخت
+					پيراګوای وخت
 					پیراګوای معياري وخت
 					پاراګوای اوړي وخت
 				
@@ -3957,9 +4527,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د فلپین وخت
-					فلپین معياري وخت
-					د فلپین سمر وخت
+					فلپاين وخت
+					فلپاين معياري وخت
+					فلپاين اوړي وخت
 				
 			
 			
@@ -3981,36 +4551,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					پونپپ وخت
+					پونيپ وخت
 				
 			
 			
 				
-					پیونگګنګ وخت
+					پيانګ يانګ وخت
 				
 			
 			
 				
-					د غبرګون وخت
+					ري يونين وخت
 				
 			
 			
 				
-					د رورېټا وخت
+					رودرا وخت
 				
 			
 			
 				
-					د سخنین وخت
+					سخلين وخت
 					سخلین معياري وخت
-					د سخلین سمر وخت
+					سخلين اوړي وخت
 				
 			
 			
 				
 					سموا وخت
-					سموډ معياري وخت
-					د سموا د ورځې روښانه کول
+					سموا معياري وخت
+					سموا د ورځې روښانه وخت
 				
 			
 			
@@ -4020,12 +4590,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د سنګاپور معیاري وخت
+					سنګاپور معیاري وخت
 				
 			
 			
 				
-					د سلیمان ټاپوګانو وخت
+					سلیمان ټاپوګانو وخت
 				
 			
 			
@@ -4045,19 +4615,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					ټیټيټي وخت
+					ټهيټي وخت
 				
 			
 			
 				
-					تاپي وخت
-					تاپي معياري وخت
-					د تاپي د رڼا ورځۍ وخت
+					تايپي وخت
+					تايپي معياري وخت
+					تايپي د ورځې روښانه وخت
 				
 			
 			
 				
-					تاجکستان د وخت
+					تاجکستان وخت
 				
 			
 			
@@ -4069,12 +4639,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					ټونګا وخت
 					د ټونګ معياري وخت
-					د ټونګ سمر وخت
+					ټونګا اوړي وخت
 				
 			
 			
 				
-					د چوکو وخت
+					چوک وخت
 				
 			
 			
@@ -4086,7 +4656,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د تووالو وخت
+					تووالو وخت
 				
 			
 			
@@ -4098,7 +4668,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					د ازبکستان وخت
+					ازبکستان وخت
 					ازبکستان معياري وخت
 					ازبکستان اوړي وخت
 				
@@ -4106,8 +4676,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				
 					د وناتو وخت
-					د وناتو معياري وخت
-					وانوات سمر وخت
+					ونواتو معياري وخت
+					ونواتو اوړي وخت
 				
 			
 			
@@ -4118,30 +4688,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				
 					ولادیوستاک وخت
-					ولادیوستکو معياري وخت
-					ولادیوستک سمر وخت
+					ولاديوستاک معياري وخت
+					ولاديوستاک اوړي وخت
 				
 			
 			
 				
-					د والګوګراد وخت
-					د والګوګراد معياري وخت
-					د والګوګراد د اوړي وخت
+					والګوګراد وخت
+					والګوګراد معياري وخت
+					والګوګراد اوړي وخت
 				
 			
 			
 				
-					د واستوک وخت
+					واستوک وخت
 				
 			
 			
 				
-					دک ټاپو وخت
+					ويک تاپو وخت
 				
 			
 			
 				
-					والیس او فوتونا وخت
+					والس او فوتونا وخت
 				
 			
 			
@@ -4252,13 +4822,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
-		
-			
-				
-					#E0
-				
-			
-		
 		
 			
 				
@@ -4286,7 +4849,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					#,##0.00 ¤
 				
 				
-					#,##0.00 ¤
+					¤#,##0.00;(¤#,##0.00)
 				
 			
 			
@@ -4306,9 +4869,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					0G ¤
 					0G ¤
 					00G ¤
-					00G ¤
-					000G ¤
-					000G ¤
+					¤00B
+					¤000B
+					¤000B
 					0T ¤
 					0T ¤
 					00T ¤
@@ -4321,6 +4884,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} {1}
 		
 		
+			
+				متحده عرب امارات درهم
+				UAE درهم
+				UAE درهمې
+			
 			
 				افغانۍ (1927–2002)
 				افغانۍ (1927–2002)
@@ -4332,26 +4900,790 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				افغانۍ
 				؋
 			
+			
+				البانوي لک
+				البانوي لک
+				البانوي لکي
+			
+			
+				ارمينيايي ډرام
+				ارمينيايي ډرام
+				ارمينيايي ډرامز
+			
+			
+				هالېنډي انټيليايي ګيلډر
+				هالېنډې انټيليايي ګيلډر
+				هالېنډي انټيليايي ګيلډر
+			
+			
+				انګولي کوانزا
+				انګولي کوانزا
+				انګولي کوانزې
+			
+			
+				ارجنټاين پسو
+				ارجنټاين پسو
+				ارجنټاين پسوز
+			
+			
+				آسترالوي ډالر
+				آسترالوي ډالر
+				آسترالوي ډالرې
+				A$
+			
+			
+				اروبايي فلورن
+				اروبايي فلورن
+				اروبايي فلورن
+			
+			
+				آزربايجاني منت
+				آزربايجاني منت
+				آزربايجاني منتس
+			
+			
+				بوسنيا هرزګوينيايي بدلېدونکې مارک
+				بوسنيا هرزګوينيايي بدلېدونکي مارک
+				بوسنيا هرزګوينيايي بدلېدونکي مارکس
+			
+			
+				باربيډين ډالر
+				باربيډين ډالر
+				باربيډين ډالرې
+			
+			
+				بنګالۍ ټاکه
+				بنګالۍ ټاکه
+				بنګالۍ ټاکاس
+			
+			
+				بلغاري ليو
+				بلغاري ليو
+				بلغاري ليوا
+			
+			
+				بحريني دينار
+				بحريني دينار
+				بحريني دينارونه
+			
+			
+				برونډي فرانک
+				برونډي فرانک
+				برونډي فرانکس
+			
+			
+				برمودا ډالر
+				برمودي ډالر
+				برمودي ډالرې
+			
+			
+				برونايي ډالر
+				برونايي ډالر
+				برونايي ډالرې
+			
+			
+				بوليوي بوليويانو
+				بوليوي بوليويانو
+				بوليوي بوليويانو
+			
+			
+				برازيلي ريل
+				برازيلي ريل
+				برازيلي ريلز
+			
+			
+				بهاماسي ډالر
+				بهاماسي ډالر
+				بهاماسي ډالرې
+			
+			
+				بهوټانۍ انګولټرم
+				بهوټانۍ انګولټرم
+				بهوټانۍ انګولټرمس
+			
+			
+				بوټسواني پولا
+				بوټسواني پولا
+				بوټسواني پولاز
+			
+			
+				بلاروسي روبل
+				بلاروسي روبل
+				بلاروسي روبلز
+				р.
+			
+			
+				بليز ډالر
+				بليز ډالر
+				بليز ډالرې
+			
+			
+				کاناډايي ډالر
+				کاناډايي ډالر
+				کاناډايي ډالرې
+				CA$
+			
+			
+				کانګولي فرانک
+				کانګولي فرانک
+				کانګولي فرانکس
+			
+			
+				سويسي فرانک
+				سويسي فرانک
+				سويسي فرانکس
+			
+			
+				چلي پسو
+				چلي پسو
+				چلي پسوز
+			
+			
+				چيني يوان (آف شور)
+				چيني يوان (آف شور)
+				چيني يوان (آف شور)
+			
+			
+				چيني يوان
+				چيني يوان
+				چيني يوان
+			
+			
+				کولمبين پسو
+				کولمبين پسو
+				کولمبين پسوز
+			
+			
+				کوسټا ريکن کولون
+				کوسټا ريکن کولون
+				کوسټا ريکن کولونز
+			
+			
+				کيوبايي بدلېدونکي پسو
+				کيوبايي بدلېدونکې پسو
+				کيوبايي بدلېدونکې پسوز
+			
+			
+				کيوبايي پسو
+				کيوبايي پسو
+				کيوبايي پسوز
+			
+			
+				کيپ وردين اسکوډو
+				کيپ وردين اسکوډو
+				کيپ وردين اسکوډوز
+			
+			
+				چيک کرونا
+				چيک کرونا
+				چيک کروناز
+			
+			
+				جبوتي فرانک
+				جبوتي فرانک
+				جبوتي فرانکس
+			
+			
+				ډنمارکي کرون
+				ډنمارکي کرون
+				ډنمارکي کرونر
+			
+			
+				دومينيکا پسو
+				دومينيکا پسو
+				دومينيکا پسوز
+			
+			
+				الجيرين دينار
+				الجيرين دينار
+				الجيرين دينارې
+			
+			
+				مصري پونډ
+				مصري پونډ
+				مصري پونډونه
+			
+			
+				ايريټرين نکفا
+				ايريټرين نکفا
+				ايريټرين نکفاس
+			
+			
+				ايتهوپيايي بر
+				ايتهوپيايي بر
+				ايتهوپيايي برز
+			
+			
+				يورو
+				يورو
+				يوروز
+			
+			
+				فجي ډالر
+				فجي ډالر
+				فجي ډالرې
+			
+			
+				پاکلېنډ ټاپوګانو پونډ
+				پاکلېنډ ټاپوګانو پونډ
+				پاکلېنډ ټاپوګانو پونډز
+			
+			
+				برتانوې پونډ
+				برتانوې پونډ
+				برتانوې پونډونه
+			
+			
+				جارجیاېي لارې
+				جارجیا لاري
+				جارجیاېي لارېز
+			
+			
+				ګانين سيډي
+				ګانين سيډي
+				ګانين سيډيز
+			
+			
+				جبل الطارقي پونډ
+				جبل الطارقي پونډ
+				جبل الطارقي پونډونه
+			
+			
+				ګيمبين دلاسې
+				ګيمبين دلاسې
+				ګيمبين دلاسېز
+			
+			
+				ګنې فرانک
+				ګنې فرانک
+				ګنې فرانکس
+			
+			
+				ګويټيمالن کوټزل
+				ګويټيمالن کوټزل
+				ګويټيمالن کوټزلز
+			
+			
+				ګايانيز ډالر
+				ګايانيز ډالر
+				ګايانيز ډالرز
+			
+			
+				هانګ کانګ ډالر
+				هانګ کانګ ډالر
+				هانګ کانګ ډالرې
+			
+			
+				هونډوران ليمپيرا
+				هونډوران ليمپيرا
+				هونډوران ليمپيراز
+			
+			
+				کروشيايي کونا
+				کروشيايي کونا
+				کروشيايي کوناز
+			
+			
+				هيټي ګورډ
+				هيټي ګورډ
+				هيټي ګورډز
+			
+			
+				هنګري فورنټ
+				هنګري فورنټ
+				هنګري فورنټز
+			
+			
+				انډونيشي روپيا
+				انډونيشي روپيا
+				انډونيشي روپۍ
+			
+			
+				اسرايلي نيو شيکل
+				اسرايلي نيو شيکل
+				اسرايلي نيو شيکلز
+			
+			
+				عراقي دينار
+				عراقي دينار
+				عراقي دينارونه
+			
+			
+				ايراني ريال
+				ايراني ريال
+				ايراني ريالونه
+			
+			
+				آيسلېنډي کرونا
+				آيسلېنډي کرونا
+				آيسلېنډي کرونر
+			
+			
+				جمايکايي ډالر
+				جمايکايي ډالر
+				جمايکايي ډالرې
+			
+			
+				اردني دينار
+				اردني دينار
+				اردني دينارونه
+			
+			
+				جاپاني ين
+				جاپاني ين
+				جاپاني ين
+			
+			
+				کينيايي شيلنګ
+				کينيايي شيلنګ
+				کينيايي شيلنګز
+			
+			
+				کرغزستاني سوم
+				کرغزستاني سوم
+				کرغزستاني سومز
+			
+			
+				کمبوډي ريل
+				کمبوډي ريل
+				کمبوډي ريلس
+			
+			
+				کوموري فرانک
+				کوموري فرانک
+				کوموري فرانکس
+			
+			
+				شمالي کوريايي وان
+				شمالي کوريايي وان
+				شمالي کوريايي وان
+			
+			
+				جنوبي کوريايي وان
+				جنوبي کوريايي وان
+				جنوبي کوريايي وان
+			
+			
+				کويتي دينار
+				کويتي دينار
+				کويتي دينارونه
+			
+			
+				کيمن ټاپوګانو ډالر
+				کيمن ټاپوګانو ډالر
+				کيمن ټاپوګانو ډالرې
+			
+			
+				قازقستاني ټينج
+				قازقستاني ټينج
+				قازقستاني ټينجز
+			
+			
+				لاشې کپ
+				لاشې کپ
+				لاشې کپس
+			
+			
+				لبناني پونډ
+				لبناني پونډ
+				لبناني پونډونه
+			
+			
+				سري لنکن روپۍ
+				سري لنکن روپۍ
+				سري لنکن روپۍ
+			
+			
+				لايبيرين ډالر
+				لايبيرين ډالر
+				لايبيرين ډالرې
+			
+			
+				ليبياېي دينار
+				ليبياېي دينار
+				ليبياېي دينارونه
+			
+			
+				مراکشي درهم
+				مراکشي درهم
+				مراکشي درهمونه
+			
+			
+				مالډوي ليو
+				مالډوي ليو
+				مالډوي لي
+			
+			
+				ملاګاسي ارياري
+				ملاګاسي ارياري
+				ملاګاسي ارياريز
+			
+			
+				مسيډونايي دينار
+				مسيډونايي دينار
+				مسيډونايي دينارې
+			
+			
+				ميانماري کيات
+				ميانماري کيات
+				ميانماري کياتې
+			
+			
+				منګوليايي توګريک
+				منګوليايي توګريک
+				منګوليايي توګريکس
+			
+			
+				مکانيز پټاکا
+				مکانيز پټاکا
+				مکانيز پټاکاز
+			
+			
+				موريشيسي ډالر
+				موريشيسي ډالر
+				موريشيسي ډالرې
+			
+			
+				موريشيسي روپۍ
+				موريشيسي روپۍ
+				موريشيسي روپۍ
+			
+			
+				مالديپي روپيا
+				مالديپي روپيا
+				مالديپي روپيا
+			
+			
+				ملاوي کواچا
+				ملاوي کواچا
+				ملاوي کواچاز
+			
+			
+				ميکسيکن پيسو
+				ميکسيکن پيسو
+				ميکسيکن پيسوز
+			
+			
+				ملايشي رنګټ
+				ملايشي رنګټ
+				ملايشي رنګټې
+			
+			
+				موزمبيقي ميټيکل
+				موزمبيقي ميټيکل
+				موزمبيقي ميټيکلز
+			
+			
+				نيميبيايي ډالر
+				بيميبيايي ډالر
+				نيميبيايي ډالرې
+			
+			
+				نايجيري نايرا
+				نايجيري نايرا
+				نايجيري نايراز
+			
+			
+				نيکاراګون کورډوبا
+				نيکاراګون کورډوبا
+				نيکاراګون کورډوباز
+				C$
+			
+			
+				نارويجين کرون
+				نارويجين کرون
+				نارويجين کرونر
+			
+			
+				نيپالي روپۍ
+				نيپالي روپۍ
+				نيپالي روپۍ
+			
+			
+				نيوزي لينډي ډالر
+				نيوزي لينډي ډالر
+				نيوزي لينډي ډالرې
+			
+			
+				عماني ريال
+				عماني ريال
+				عماني ريالونه
+			
+			
+				پانامۍ بالبوا
+				پانامۍ بالبوا
+				پانامۍ بالبوې
+			
+			
+				پيروين سول
+				پيروين سول
+				پيروين سولز
+			
+			
+				پاپوا نيوګاني کينا
+				پاپوا نيوګاني کينا
+				پاپوا نيوګاني کينا
+			
+			
+				فلپاينۍ پسو
+				فلپاينۍ پسو
+				فلپاينۍ پسوز
+			
 			
 				پاکستانۍ کلداره
 				پاکستانۍ کلداره
 				پاکستانۍ کلدارې
 			
+			
+				پولينډي زلوټي
+				پولينډي زلوټي
+				پولينډي زلوټيز
+			
+			
+				پيراګوين ګوراني
+				پيراګوين ګوراني
+				پيراګوين ګوراني
+			
+			
+				قطري ريال
+				قطري ريال
+				قطري ريالونه
+			
+			
+				روماني ليو
+				روماني ليو
+				روماني لي
+			
+			
+				سربيايي دينار
+				سربيايي دينار
+				سربيايي دينارې
+			
+			
+				روسي روبل
+				روسي روبل
+				روسي روبلز
+			
+			
+				روانډي فرانک
+				روانډي فرانک
+				روانډي فرانکس
+			
+			
+				سعودي ريال
+				سعودي ريال
+				سعودي ريالونه
+			
+			
+				سولومن ټاپوګانو ډالر
+				سولومن ټاپوګانو ډالر
+				سولومن ټاپوګانو ډالرې
+			
+			
+				سيچيليسي روپۍ
+				سيچيليسي روپۍ
+				سيچيليسي روپۍ
+			
+			
+				سوډاني پونډ
+				سوډاني پونډ
+				سوډاني پونډونه
+			
+			
+				سويډني کرونا
+				سويډني کرونا
+				سويډني کرونر
+			
+			
+				سنګاپور ډالر
+				سنګاپور ډالر
+				سنګاپور ډالرې
+				SGD
+				$
+			
+			
+				سينټ هيلينا پونډ
+				سينټ هيلينا پونډ
+				سينټ هيلينا پونډونه
+			
+			
+				سيرا ليوني ليون
+				سيرا ليوني ليون
+				سيرا ليوني ليونونه
+			
+			
+				سومالي شيلنګ
+				سومالي شيلنګ
+				سومالي شيلنګز
+			
+			
+				سورينيمي ډالر
+				سورينيمي ډالر
+				سورينيمي ډالرې
+			
+			
+				جنوب سوډاني پونډ
+				جنوب سوډاني پونډ
+				جنوب سوډاني پونډونه
+			
+			
+				ساو ټوم او پرينسپي ډوبرا
+				ساو ټوم او پرينسپي ډوبرا
+				ساو ټوم او پرينسپي ډوبراس
+			
+			
+				سوريايي پونډ
+				سوريايي پونډ
+				سوريايي پونډونه
+			
+			
+				سوازي ليلانګيني
+				سوازي ليلانګيني
+				سوازي ايمالانګيني
+			
+			
+				تهايي بات
+				تهايي بات
+				تهايي باتونه
+				THB
+				฿
+			
+			
+				تاجکستاني سوموني
+				تاجکستاني سوموني
+				تاجکستاني سومونيونه
+			
+			
+				ترکمانستاني منت
+				ترکمانستاني منت
+				ترکمانستاني منت
+			
+			
+				تونسي دينار
+				تونسي دينار
+				تونسي دينار
+			
+			
+				ټونګن پانګا
+				ټونګن پانګا
+				ټونګن پانګا
+			
+			
+				ترکي ليرا
+				ترکي ليرا
+				ترکي ليرا
+			
+			
+				ټرينيډاډ او ټوباګو ډالر
+				ټرينيډاډ او ټوباګو ډالر
+				ټرينيډاډ او ټوباګو ډالرې
+			
+			
+				نيو تائيواني ډالر
+				نيو تائيواني ډالر
+				نيو تائيواني ډالرې
+			
+			
+				تنزاني شيلنګ
+				تنزاني شيلنګ
+				تنزاني شيلنګز
+			
+			
+				اوکرايني هريونيا
+				اوکرايني هريونيا
+				اوکرايني هريونياز
+			
+			
+				يوګانډي شيلنګ
+				يوګانډي شيلنګ
+				يوګانډي شيلنګز
+			
+			
+				امريکايي ډالر
+				امريکايي ډالر
+				امريکايي ډالرې
+				$
+			
+			
+				يوراګوي پسو
+				يوراګوي پسو
+				يوراګوي پسوز
+			
+			
+				ازبکستاني سوم
+				ازبکستاني سوم
+				ازبکستاني سوم
+			
+			
+				وينزويلي بوليوار
+				وينزويلي بوليوار
+				وينزويلي بوليوارز
+			
+			
+				ويتنامي ډونګ
+				ويتنامي ډونګ
+				ويتنامي ډونګ
+				₫
+			
+			
+				ونواتو واتو
+				ونواتو واتو
+				ونواتو واتوس
+			
+			
+				سموون تالا
+				سموون تالا
+				سموون تالا
+			
+			
+				مرکزي افريقايي CFA فرانک
+				مرکزي افريقايي CFA فرانک
+				مرکزي افريقايي CFA فرانکس
+			
+			
+				ختيځ کربين ډالر
+				ختيځ کربين ډالر
+				ختيځ کربين ډالرې
+			
+			
+				ختيځ افريقايي CFA فرانک
+				ختيځ افريقايي CFA فرانک
+				ختيځ افريقايي CFA فرانکس
+			
+			
+				CFP فرانک
+				CFP فرانک
+				CFP فرانکس
+			
 			
 				نامعلومه مروجه پېسې
 				(د نامعلومه مروجه پېسو واحد)
 				(نامعلومه مروجه پېسې)
 			
+			
+				يمني ريال
+				يمني ريال
+				يمني ريالونه
+			
+			
+				جنوبي افريقاېي رنډ
+				جنوبي افريقاېي رنډ
+				جنوبي افريقاېي رنډ
+			
+			
+				زيمبي کواچا
+				زيمبي کواچا
+				زيمبي کواچاز
+			
 		
 		
 			~{0}
-			≥{0}
+			{0}+
 			≤{0}
-			{0}–{1}
 		
 		
-			{0} قلمونه
-			{0}?
+			{0} ورځ
+			{0} ورځې
 			{0} کور کیڼ اړخ ته دی
 		
 	
@@ -4365,6 +5697,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} د جاذبې قوه
 				{0} د جاذبې قوه
 			
+			
+				ميترز في مربع سيکنډ
+				{0} ميتر في مربع سيکنډ
+				{0} ميتر في مربع سيکنډ
+			
 			
 				انقلاب
 				{0} انقلاب
@@ -4401,6 +5738,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هيکتر
 				{0} هيکترې
 			
+			
+				مربع متره
+				{0} مربع متر
+				{0} مربع متره
+				{0} في مربع متر
+			
 			
 				مربع سنتي متر
 				{0} مربع سنتي متر
@@ -4455,7 +5798,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ملي مول في ليټر
 			
 			
-				پاړتس في مليون
+				پارټتس في مليون
 				{0} پارټ في مليون
 				{0} پارټس في مليون
 			
@@ -4554,6 +5897,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} بټ
 				{0} بټس
 			
+			
+				پېړۍ
+				{0} پېړۍ
+				{0} پيړۍ
+			
+			
+				لسيزې
+				{0} لسيزه
+				{0} لسيزې
+			
 			
 				کالونه
 				{0} کال
@@ -4578,13 +5931,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ورځې
 				{0} په هره ورځ کې
 			
+			
+				دقيقې
+			
+			
+				ثانيې
+			
 			
 				مايکرو ثانيه
 				{0} μs
 				{0} μs
 			
 			
-				نينو ثانيه
+				نينو ثانيې
 				{0} ns
 				{0} ns
 			
@@ -4678,6 +6037,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هرټز
 				{0} هرټز
 			
+			
+				ميګا فکسلسز
+			
 			
 				کيلو ميتره
 				{0} کيلومتر
@@ -4743,6 +6105,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} انچې
 				{0} هر انچ
 			
+			
+				پارسيکس
+				{0} في ثانيه
+				{0} في ثانيې
+			
 			
 				نوري کالونه
 				{0} نوري کال
@@ -4763,11 +6130,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} سکېنډنيوين ميل
 				{0} سکېنډنيوين ميلونه
 			
+			
+				نمرې
+				{0} نمره
+				{0} نمرې
+			
 			
 				لمريزې وړانګې
 				{0} لمريزه وړانګه
 				{0} لمريزې وړانګې
 			
+			
+				لکس
+			
 			
 				لمريز ځلښتونه
 				{0} لمريز ځلښت
@@ -4818,9 +6193,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} في اونس
 			
 			
-				ټروي اونسز
-				{0} ټروي اونس
-				{0} ټروي اونسز
+				ټراي اونسز
+				{0} ټرای اونس
+				{0} ټرای اونسز
 			
 			
 				قيراط
@@ -4872,20 +6247,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هارس پاور
 				{0} هارس پاور
 			
-			
-				هيکټو پاسکلز
-				{0} هيکټو پاسکل
-				{0} هيکټو پاسکلز
-			
 			
 				د پارې ملي مترز
 				{0} د پارې ملي متر
 				{0} د پارې ملي مترز
 			
 			
-				پاونډ في مربع انچ
+				پاونډز في مربع انچ
 				{0} پاونډ في مربع انچ
-				{0} پاونډ في مربع انچ
+				{0} پاونډز في مربع انچ
 			
 			
 				د پارې انچې
@@ -4898,19 +6268,27 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ملي بارز
 			
 			
-				اتموسفيرز
-				{0} اتموسفير
-				{0} اتموسفيرز
+				اټموسپیرز
+				{0} اتموسپير
+				{0} اتموسپيرز
+			
+			
+				پاسکیلز
+			
+			
+				هيکټو پاسکیلز
+				{0} هيکټو پاسکیل
+				{0} هيکټو پاسکیلز
 			
 			
-				کيلو پاسکلز
-				{0} کيلو پاسکل
-				{0} کيلو پاسکلز
+				کيلو پاسکیلز
+				{0} کيلو پاسکیل
+				{0} کيلو پاسکیلز
 			
 			
-				ميګا پاسکلز
-				{0} ميګا پاسکل
-				{0} ميګا پاسکلز
+				ميګا پاسکلیلز
+				{0} ميګا پاسکیل
+				{0} ميګا پاسکیلز
 			
 			
 				کيلو متر في ساعت
@@ -5111,7 +6489,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}′
 			
 			
-				آرکیسی
+				آرکسیکس
 				{0}″
 				{0}″
 			
@@ -5202,8 +6580,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				زرمه
-				{0}‱
-				{0}‱
 			
 			
 				مول
@@ -5290,6 +6666,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} c
 				{0} c
 			
+			
+				لسيزه
+				{0} لسيزه
+				{0} لسيزه
+			
 			
 				کالونه
 				{0} y
@@ -5327,7 +6708,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/min
 			
 			
-				sec
+				ثانيې
 				{0} s
 				{0} s
 				{0}/s
@@ -5399,8 +6780,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				اليکټران وولټ
-				{0} eV
-				{0} eV
 			
 			
 				BTU
@@ -5409,13 +6788,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				پاونډ قوه
-				{0} lbf
-				{0} lbf
 			
 			
 				نيوټن
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -5534,8 +6909,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				لمريزې وړانګې
-				{0} R☉
-				{0} R☉
 			
 			
 				lx
@@ -5544,8 +6917,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				لمريز ځلښتونه
-				{0} L☉
-				{0} L☉
 			
 			
 				t
@@ -5603,18 +6974,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ډالټنز
-				{0} Da
-				{0} Da
 			
 			
 				د زمکې حجمونه
-				{0} M⊕
-				{0} M⊕
 			
 			
 				لمريز حجم
-				{0} M☉
-				{0} M☉
 			
 			
 				GW
@@ -5646,11 +7011,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHg
@@ -5666,6 +7026,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -5676,15 +7041,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/hour
@@ -5726,16 +7086,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -5853,8 +7203,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				امپيريل مايع اونس
-				{0} fl oz Imp.
-				{0} fl oz Imp.
 			
 			
 				tbsp
@@ -5868,8 +7216,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				بېرل
-				{0} bbl
-				{0} bbl
 			
 			
 				اړخ
@@ -5921,7 +7267,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				min
 				{0} min
-				{0} min
+				{0}m
 			
 			
 				sec
@@ -5974,7 +7320,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}°C
 			
 			
-				liter
 				{0}L
 				{0}L
 			
@@ -6004,15 +7349,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} او {1}
 		
 		
-			{0}, {1}
-			{0}، {1}
-			{0}, {1}
 			{0}، {1}
 		
 		
-			{0}, {1}
-			{0}، {1}
-			{0}، او {1}
 			{0} او {1}
 		
 		
@@ -6042,7 +7381,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		{0} - ټول
-		{0}: {1}
 		{0} - مطابقت
 		{0} - منسلک
 		{0} - غځېدلی
@@ -6063,11 +7401,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		بریل
 		ودانۍ
 		ګولۍ یا ستوری
-		کنسینټل جامو
+		کانسو نینټل جامو
 		د پېسو سمبول
 		ډش یا نښلونکی
 		عدد
-		ڈنگبت
+		ډینګبټ
 		د اټکل سمبول
 		ښکته غشی
 		ښکته پورته غشی
@@ -6083,22 +7421,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		د بشپړ پراختيا بله بڼه
 		جيوميتريکي شکل
 		د نيمايي پراختيا بله بڼه
-		د حني کرکټر
+		د حني کریکټر
 		د حني سخت دريځه
 		هانجا
-		حنيزي (ساده)
-		حنيزي (روايتي)
+		هانزي (ساده)
+		هانزي (روایتي)
 		زړه
 		تاريخي سکرېپټ
-		د اډیګرافیک ډيسک کرکټر
+		د اډیوګرافیک ډيسک کرکټر
 		جاپاني کانا
 		کنبن
 		کانجی
-		کیکاپ
-		کڼ اړخ ته غشی
-		کڼ اړخ او ښۍ اړخ ته غشی
+		کیکیپ
+		کیڼ اړخ ته غشی
+		کیڼ اړخ او ښۍ اړخ ته غشی
 		د توري په څېر سمبول
-		د محدود استعمال
+		محدود استعمال
 		نارینه
 		ریاضی سمبول
 		د منځني ختیځ سکرېپټ
@@ -6134,7 +7472,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		سفر یا ځای
 		پورته غشي
 		بله بڼه
-		غږ جامو
+		وکيليک جامو
 		موسم
 		لويديځ آسيايي سکريپټ
 		سپين ځای
@@ -6145,7 +7483,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		کاږه
 		پراختيا
 		وزن
-		کرسيو
+		کوږ ليک
 		کيپشن
 		ټيکسټ
 		ټيټلنګ
diff --git a/make/data/cldr/common/main/ps_AF.xml b/make/data/cldr/common/main/ps_AF.xml
index 6541cd5f0c7..5996b81b9f3 100644
--- a/make/data/cldr/common/main/ps_AF.xml
+++ b/make/data/cldr/common/main/ps_AF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ps_PK.xml b/make/data/cldr/common/main/ps_PK.xml
index 4b93069692f..64eeb184ea8 100644
--- a/make/data/cldr/common/main/ps_PK.xml
+++ b/make/data/cldr/common/main/ps_PK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt.xml b/make/data/cldr/common/main/pt.xml
index 4d6e6bd334f..d14363fd3bc 100644
--- a/make/data/cldr/common/main/pt.xml
+++ b/make/data/cldr/common/main/pt.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -52,7 +52,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			awadhi
 			aimará
 			azerbaijano
-			azeri
+			azerbaijano
 			azeri sul
 			bashkir
 			balúchi
@@ -91,7 +91,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			caribe
 			cayuga
 			atsam
-			Chakma
+			chakma
 			checheno
 			cebuano
 			chiga
@@ -144,7 +144,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			grego
 			elamite
 			inglês
-			inglês (EUA)
 			inglês médio
 			esperanto
 			espanhol
@@ -532,14 +531,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			iídiche
 			iorubá
 			cantonês
+			cantonês (tradicional)
 			zhuang
 			zapoteco
 			símbolos blis
 			zenaga
 			tamazirte marroqino padrão
 			chinês
+			chinês, mandarim
 			chinês simplificado
+			chinês mandarim (simplificado)
 			chinês tradicional
+			chinês mandarim (tradicional)
 			zulu
 			zunhi
 			sem conteúdo linguístico
@@ -635,7 +638,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -796,11 +799,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Espanha
 			Etiópia
 			União Europeia
-			zona do euro
+			zona do euro
 			Finlândia
 			Fiji
 			Ilhas Malvinas
-			Ilhas Falkland (Ilhas Malvinas)
+			Ilhas Malvinas (Ilhas Falkland)
 			Micronésia
 			Ilhas Faroe
 			França
@@ -947,7 +950,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			El Salvador
 			Sint Maarten
 			Síria
-			Suazilândia
+			Essuatíni
+			Suazilândia
 			Tristão da Cunha
 			Ilhas Turcas e Caicos
 			Chade
@@ -984,8 +988,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis e Futuna
 			Samoa
-			Pseudossotaques
-			Pseudobidi
+			Pseudossotaques
+			Pseudobidirecional
 			Kosovo
 			Iêmen
 			Mayotte
@@ -1040,22 +1044,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			Calendário
 			Formato de moeda
-			Ignorar classificação de símbolos
-			Classificação reversa de acentos
-			Ordem de maiúsculas/minúsculas
-			Ordem com diferenciação de maiúsculas e minúsculas
+			Ignorar classificação de símbolos
+			Classificação de acentos invertida
+			Ordem de maiúsculas/minúsculas
+			Classificação com distinção entre maiúsculas e minúsculas
 			Ordenação
-			Classificação normalizada
-			Classificação numérica
-			Intensidade da classificação
+			Classificação normalizada
+			Classificação numérica
+			Prioridade da classificação
 			Moeda
 			Ciclo de horário (12 vs. 24)
 			Estilo de quebra de linha
 			Sistema de medição
 			Números
-			Fuso horário
-			Variante de localidade
-			Uso privado
+			Fuso horário
+			Variante de localidade
+			Uso privado
 		
 		
 			Calendário Budista
@@ -1110,8 +1114,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Classificar acentos/maiúsculas e minúsculas/largura/kana
 			Classificar acentos
 			Classificar acentos/maiúsculas e minúsculas/largura
-			Extensão total
-			Extensão total
+			Largura inteira
+			Meia largura
 			Numérico
 			Sistema de 12 horas (0–11)
 			Sistema de 12 horas (1–12)
@@ -1126,7 +1130,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sistema de medição imperial
 			Sistema de medição americano
 			Algarismos indo-arábicos
-			Algarismos indo-arábicos por extenso
+			Algarismos indo-arábicos estendidos
 			Algarismos armênios
 			Algarismos armênios minúsculos
 			Algarismos bengali
@@ -1168,8 +1172,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			métrico
-			inglês
-			americano
+			Reino Unido
+			Estados Unidos
 		
 		
 			Idioma: {0}
@@ -1203,21 +1207,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a á à â ã b c ç d e é ê f g h i í j k l m n o ó ò ô õ p q r s t u ú v w x y z]
 		[ª ă å ä ā æ è ĕ ë ē ì ĭ î ï ī ñ º ŏ ö ø ō œ ù ŭ û ü ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}… {1}
 		{0}…
 		
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
@@ -1444,56 +1443,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
-						
 						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+							h:mm – h:mm B
 						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h'h' a – h'h' a
 							h'h' - h'h' a
@@ -1590,18 +1545,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							jan
-							fev
-							mar
-							abr
-							mai
-							jun
-							jul
-							ago
-							set
-							out
-							nov
-							dez
+							jan.
+							fev.
+							mar.
+							abr.
+							mai.
+							jun.
+							jul.
+							ago.
+							set.
+							out.
+							nov.
+							dez.
 						
 						
 							J
@@ -1633,20 +1588,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
-						
-							jan
-							fev
-							mar
-							abr
-							mai
-							jun
-							jul
-							ago
-							set
-							out
-							nov
-							dez
-						
 						
 							J
 							F
@@ -1680,13 +1621,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							dom
-							seg
-							ter
-							qua
-							qui
-							sex
-							sáb
+							dom.
+							seg.
+							ter.
+							qua.
+							qui.
+							sex.
+							sáb.
 						
 						
 							D
@@ -1697,15 +1638,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							S
 							S
 						
-						
-							dom
-							seg
-							ter
-							qua
-							qui
-							sex
-							sáb
-						
 						
 							domingo
 							segunda-feira
@@ -1717,15 +1649,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
-						
-							dom
-							seg
-							ter
-							qua
-							qui
-							sex
-							sáb
-						
 						
 							D
 							S
@@ -1735,15 +1658,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							S
 							S
 						
-						
-							dom
-							seg
-							ter
-							qua
-							qui
-							sex
-							sáb
-						
 						
 							domingo
 							segunda-feira
@@ -1899,6 +1813,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2189,9 +2125,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ano
-				ano passado
-				este ano
-				próximo ano
+				ano passado
+				este ano
+				próximo ano
 				
 					em {0} ano
 					em {0} anos
@@ -2203,16 +2139,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ano
-				ano passado
-				este ano
-				próximo ano
+				ano passado
+				este ano
+				próximo ano
 				
 					em {0} ano
 					em {0} anos
 				
 				
 					há {0} ano
-					{0} anos atrás
+					há {0} anos
 				
 			
 			
@@ -2240,7 +2176,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 				
 					há {0} trim.
-					{0} trim. atrás
+					há {0} trim.
 				
 			
 			
@@ -2273,9 +2209,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mês
-				mês passado
-				este mês
-				próximo mês
+				mês passado
+				este mês
+				próximo mês
 				
 					em {0} mês
 					em {0} meses
@@ -2287,9 +2223,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mês
-				mês passado
-				este mês
-				próximo mês
+				mês passado
+				este mês
+				próximo mês
 				
 					em {0} mês
 					em {0} meses
@@ -2316,9 +2252,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
-				semana passada
-				esta semana
-				próxima semana
+				semana passada
+				esta semana
+				próxima semana
 				
 					em {0} sem.
 					em {0} sem.
@@ -2331,9 +2267,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sem.
-				semana passada
-				esta semana
-				próxima semana
+				semana passada
+				esta semana
+				próxima semana
 				
 					em {0} sem.
 					em {0} sem.
@@ -2471,7 +2407,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 				
 					há {0} segunda-feira
-					{0} segundas-feiras atrás
+					há {0} segundas-feiras
 				
 			
 			
@@ -2548,7 +2484,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					em {0} quartas-feiras
 				
 				
-					há {0} quartas-feiras
+					há {0} quarta-feira
 					há {0} quartas-feiras
 				
 			
@@ -2838,17 +2774,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Cidade desconhecida
 			
+			
+				Andorra
+			
+			
+				Dubai
+			
+			
+				Cabul
+			
 			
 				Antígua
 			
+			
+				Anguila
+			
 			
 				Tirana
 			
+			
+				Yerevan
+			
 			
 				Luanda
 			
+			
+				Rothera
+			
+			
+				Palmer
+			
+			
+				Troll
+			
 			
-				Showa
+				Syowa
+			
+			
+				Mawson
+			
+			
+				Davis
+			
+			
+				Vostok
+			
+			
+				Casey
+			
+			
+				McMurdo
 			
 			
 				Rio Gallegos
@@ -2886,12 +2861,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Buenos Aires
 			
+			
+				Pago Pago
+			
 			
 				Viena
 			
+			
+				Perth
+			
+			
+				Eucla
+			
+			
+				Darwin
+			
+			
+				Adelaide
+			
+			
+				Broken Hill
+			
+			
+				Currie
+			
+			
+				Melbourne
+			
+			
+				Hobart
+			
+			
+				Lindeman
+			
+			
+				Sydney
+			
+			
+				Brisbane
+			
+			
+				Macquarie
+			
+			
+				Lord Howe
+			
 			
 				Aruba
 			
+			
+				Mariehamn
+			
+			
+				Baku
+			
 			
 				Sarajevo
 			
@@ -2925,6 +2948,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bermudas
 			
+			
+				Brunei
+			
 			
 				La Paz
 			
@@ -2983,11 +3009,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Nassau
 			
 			
-				Timphu
+				Thimphu
 			
 			
 				Gaborone
 			
+			
+				Minsk
+			
 			
 				Belize
 			
@@ -3075,6 +3104,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Saint John’s
 			
+			
+				Cocos
+			
 			
 				Kinshasa
 			
@@ -3093,6 +3125,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Abidjan
 			
+			
+				Rarotonga
+			
 			
 				Ilha de Páscoa
 			
@@ -3105,6 +3140,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Douala
 			
+			
+				Urumqi
+			
 			
 				Xangai
 			
@@ -3123,9 +3161,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Curaçao
 			
+			
+				Christmas
+			
 			
 				Nicósia
 			
+			
+				Famagusta
+			
 			
 				Praga
 			
@@ -3156,6 +3200,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Guaiaquil
 			
+			
+				Tallinn
+			
 			
 				Cairo
 			
@@ -3168,6 +3215,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Canárias
 			
+			
+				Ceuta
+			
 			
 				Madri
 			
@@ -3177,9 +3227,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Helsinque
 			
+			
+				Fiji
+			
 			
 				Stanley
 			
+			
+				Kosrae
+			
 			
 				Ilhas Faroe
 			
@@ -3198,6 +3254,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Granada
 			
+			
+				Tbilisi
+			
 			
 				Caiena
 			
@@ -3243,12 +3302,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Guatemala
 			
+			
+				Guam
+			
 			
 				Bissau
 			
 			
 				Guiana
 			
+			
+				Hong Kong
+			
 			
 				Tegucigalpa
 			
@@ -3264,12 +3329,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Jacarta
 			
-			
-				Macáçar
+			
+				Pontianak
+			
+			
+				Jayapura
 			
 			
 				
-					Horário Padrão da Irlanda
+					Horário Padrão Irlandês
 				
 				Dublin
 			
@@ -3279,6 +3347,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ilha de Man
 			
+			
+				Calcutá
+			
+			
+				Chagos
+			
 			
 				Bagdá
 			
@@ -3306,6 +3380,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Nairóbi
 			
+			
+				Bishkek
+			
+			
+				Phnom Penh
+			
+			
+				Enderbury
+			
+			
+				Kiritimati
+			
 			
 				Taraua
 			
@@ -3315,17 +3401,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				São Cristóvão
 			
+			
+				Pyongyang
+			
 			
 				Seul
 			
+			
+				Kuwait
+			
 			
 				Cayman
 			
+			
+				Aktau
+			
+			
+				Oral
+			
+			
+				Atyrau
+			
 			
-				Aqtöbe
+				Aktobe
 			
 			
-				Qostanay
+				Qostanay
+			
+			
+				Qyzylorda
+			
+			
+				Almaty
+			
+			
+				Vientiane
 			
 			
 				Beirute
@@ -3333,12 +3443,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Santa Lúcia
 			
+			
+				Vaduz
+			
+			
+				Colombo
+			
 			
 				Monróvia
 			
 			
 				Maseru
 			
+			
+				Vilnius
+			
 			
 				Luxemburgo
 			
@@ -3354,21 +3473,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Mônaco
 			
+			
+				Chisinau
+			
+			
+				Podgorica
+			
 			
 				Marigot
 			
 			
 				Antananarivo
 			
+			
+				Kwajalein
+			
+			
+				Majuro
+			
+			
+				Skopje
+			
 			
 				Bamako
 			
+			
+				Rangum
+			
+			
+				Hovd
+			
 			
 				Ulan Bator
 			
+			
+				Choibalsan
+			
 			
 				Macau
 			
+			
+				Saipan
+			
 			
 				Martinica
 			
@@ -3424,7 +3570,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cancún
 			
 			
-				Kuala Lampur
+				Kuala Lumpur
+			
+			
+				Kuching
 			
 			
 				Maputo
@@ -3438,6 +3587,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Niamey
 			
+			
+				Norfolk
+			
 			
 				Lagos
 			
@@ -3451,7 +3603,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Oslo
 			
 			
-				Catmandu
+				Katmandu
+			
+			
+				Nauru
+			
+			
+				Niue
+			
+			
+				Chatnam
+			
+			
+				Auckland
 			
 			
 				Mascate
@@ -3465,8 +3629,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Taiti
 			
+			
+				Marquesas
+			
+			
+				Gambier
+			
+			
+				Port Moresby
+			
+			
+				Bougainville
+			
+			
+				Manila
+			
 			
-				Carachi
+				Karachi
 			
 			
 				Varsóvia
@@ -3474,11 +3653,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Miquelon
 			
+			
+				Pitcairn
+			
 			
 				Porto Rico
 			
+			
+				Gaza
+			
 			
-				Hebrom
+				Hebron
 			
 			
 				Açores
@@ -3489,9 +3674,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lisboa
 			
+			
+				Palau
+			
 			
 				Assunção
 			
+			
+				Catar
+			
 			
 				Reunião
 			
@@ -3504,30 +3695,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kaliningrado
 			
+			
+				Simferopol
+			
 			
 				Moscou
 			
 			
 				Volgogrado
 			
+			
+				Saratov
+			
 			
 				Astracã
 			
 			
 				Ulianovsk
 			
+			
+				Kirov
+			
+			
+				Samara
+			
 			
 				Ecaterimburgo
 			
+			
+				Omsk
+			
+			
+				Novosibirsk
+			
+			
+				Barnaul
+			
+			
+				Tomsk
+			
+			
+				Novokuznetsk
+			
+			
+				Krasnoyarsk
+			
+			
+				Irkutsk
+			
+			
+				Chita
+			
+			
+				Yakutsk
+			
+			
+				Vladivostok
+			
+			
+				Khandyga
+			
 			
 				Sacalina
 			
+			
+				Ust-Nera
+			
+			
+				Magadan
+			
+			
+				Srednekolymsk
+			
+			
+				Kamchatka
+			
+			
+				Anadyr
+			
 			
 				Kigali
 			
 			
 				Riade
 			
+			
+				Guadalcanal
+			
 			
 				Mahé
 			
@@ -3538,7 +3792,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Estocolmo
 			
 			
-				Cingapura
+				Singapura
 			
 			
 				Santa Helena
@@ -3546,9 +3800,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Liubliana
 			
+			
+				Longyearbyen
+			
+			
+				Bratislava
+			
 			
 				Freetown
 			
+			
+				San Marino
+			
 			
 				Dakar
 			
@@ -3582,27 +3845,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				N’Djamena
 			
+			
+				Kerguelen
+			
 			
 				Lomé
 			
+			
+				Bangkok
+			
 			
 				Duchambe
 			
+			
+				Fakaofo
+			
+			
+				Dili
+			
 			
 				Asgabate
 			
 			
 				Túnis
 			
+			
+				Tongatapu
+			
 			
 				Istambul
 			
 			
 				Port of Spain
 			
+			
+				Funafuti
+			
+			
+				Taipei
+			
 			
 				Dar es Salaam
 			
+			
+				Uzhgorod
+			
 			
 				Kiev
 			
@@ -3612,12 +3899,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kampala
 			
+			
+				Midway
+			
+			
+				Wake
+			
 			
 				Adak
 			
 			
 				Nome
 			
+			
+				Johnston
+			
 			
 				Anchorage
 			
@@ -3702,6 +3998,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Samarcanda
 			
+			
+				Tashkent
+			
 			
 				Vaticano
 			
@@ -3720,11 +4019,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Éfaté
 			
+			
+				Wallis
+			
 			
-				Ápia
+				Apia
 			
 			
-				Adem
+				Áden
 			
 			
 				Mayotte
@@ -4115,7 +4417,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horário da Antártida e do Sul da França
+					Horário dos Territórios Franceses do Sul e Antártida
 				
 			
 			
@@ -4301,7 +4603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horário das Ilhas Line
+					Horário das Ilhas da Linha
 				
 			
 			
@@ -4476,7 +4778,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horário de Papua Nova Guiné
+					Horário de Papua-Nova Guiné
 				
 			
 			
@@ -4507,9 +4809,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Horário de Saint Pierre e Miquelon
-					Horário Padrão de Saint Pierre e Miquelon
-					Horário de Verão de Saint Pierre e Miquelon
+					Horário de São Pedro e Miquelão
+					Horário Padrão de São Pedro e Miquelão
+					Horário Verão de São Pedro e Miquelão
 				
 			
 			
@@ -4719,6 +5021,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4727,6 +5031,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 mil
@@ -4848,6 +5157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dirham dos Emirados Árabes Unidos
 				Dirham dos EAU
 				Dirhams dos EAU
+				AED
 			
 			
 				Afegane (1927–2002)
@@ -4858,6 +5168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afegane afegão
 				Afegane afegão
 				Afeganes afegãos
+				AFN
 			
 			
 				Lek Albanês (1946–1965)
@@ -4868,21 +5179,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lek albanês
 				Lek albanês
 				Leks albaneses
+				ALL
 			
 			
 				Dram armênio
 				Dram armênio
 				Drams armênios
+				AMD
 			
 			
 				Florim das Antilhas Holandesas
 				Florim das Antilhas Holandesas
 				Florins das Antilhas Holandesas
+				ANG
 			
 			
 				Kwanza angolano
 				Kwanza angolano
 				Kwanzas angolanos
+				AOA
 				Kz
 			
 			
@@ -4924,6 +5239,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peso argentino
 				Peso argentino
 				Pesos argentinos
+				ARS
 				$
 			
 			
@@ -4942,6 +5258,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Florim arubano
 				Florim arubano
 				Florins arubanos
+				AWG
 			
 			
 				Manat azerbaijano (1993–2006)
@@ -4952,6 +5269,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Manat azeri
 				Manat azeri
 				Manats azeris
+				AZN
 			
 			
 				Dinar da Bósnia-Herzegovina (1992–1994)
@@ -4962,6 +5280,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Marco conversível da Bósnia e Herzegovina
 				Marco conversível da Bósnia e Herzegovina
 				Marcos conversíveis da Bósnia e Herzegovina
+				BAM
 				KM
 			
 			
@@ -4973,12 +5292,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar barbadense
 				Dólar barbadense
 				Dólares barbadenses
+				BBD
 				$
 			
 			
 				Taka bengali
 				Taka bengali
 				Takas bengalis
+				BDT
 				৳
 			
 			
@@ -5010,6 +5331,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lev búlgaro
 				Lev búlgaro
 				Levs búlgaros
+				BGN
 			
 			
 				Lev búlgaro (1879–1952)
@@ -5020,28 +5342,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dinar bareinita
 				Dinar bareinita
 				Dinares bareinitas
+				BHD
 			
 			
 				Franco burundiano
 				Franco burundiano
 				Francos burundianos
+				BIF
 			
 			
 				Dólar bermudense
 				Dólar bermudense
 				Dólares bermudenses
+				BMD
 				$
 			
 			
 				Dólar bruneano
 				Dólar bruneano
 				Dólares bruneanos
+				BND
 				$
 			
 			
 				Boliviano da Bolívia
 				Boliviano da Bolívia
 				Bolivianos da Bolívia
+				BOB
 				Bs
 			
 			
@@ -5078,6 +5405,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Real brasileiro
 				Real brasileiro
 				Reais brasileiros
+				R$
 				R$
 			
 			
@@ -5099,12 +5427,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar bahamense
 				Dólar bahamense
 				Dólares bahamenses
+				BSD
 				$
 			
 			
 				Ngultrum butanês
 				Ngultrum butanês
 				Ngultruns butaneses
+				BTN
 			
 			
 				Kyat birmanês
@@ -5115,6 +5445,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Pula botsuanesa
 				Pula botsuanesa
 				Pulas botsuanesas
+				BWP
 				P
 			
 			
@@ -5126,29 +5457,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rublo bielorrusso
 				Rublo bielorrusso
 				Rublos bielorrussos
+				BYN
 				р.
 			
 			
 				Rublo bielorrusso (2000–2016)
 				Rublo bielorrusso (2000–2016)
 				Rublos bielorrussos (2000–2016)
+				BYR
 			
 			
 				Dólar belizenho
 				Dólar belizenho
 				Dólares belizenhos
+				BZD
 				$
 			
 			
 				Dólar canadense
 				Dólar canadense
 				Dólares canadenses
+				CA$
 				$
 			
 			
 				Franco congolês
 				Franco congolês
 				Francos congoleses
+				CDF
 			
 			
 				Euro WIR
@@ -5159,6 +5495,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franco suíço
 				Franco suíço
 				Francos suíços
+				CHF
 			
 			
 				Franco WIR
@@ -5179,10 +5516,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peso chileno
 				Peso chileno
 				Pesos chilenos
+				CLP
 				$
 			
 			
-				Renminbi chinês (offshore)
+				Yuan chinês (offshore)
 				Yuan chinês (offshore)
 				Yuans chineses (offshore)
 				CNH
@@ -5193,15 +5531,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólares do Banco Popular da China
 			
 			
-				Renminbi chinês
+				Yuan chinês
 				Yuan chinês
 				Yuans chineses
+				CN¥
 				¥
 			
 			
 				Peso colombiano
 				Peso colombiano
 				Pesos colombianos
+				COP
 				$
 			
 			
@@ -5213,6 +5553,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Colón costarriquenho
 				Colón costarriquenho
 				Colóns costarriquenhos
+				CRC
 				₡
 			
 			
@@ -5229,18 +5570,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peso cubano conversível
 				Peso cubano conversível
 				Pesos cubanos conversíveis
+				CUC
 				$
 			
 			
 				Peso cubano
 				Peso cubano
 				Pesos cubanos
+				CUP
 				$
 			
 			
 				Escudo cabo-verdiano
 				Escudo cabo-verdiano
 				Escudos cabo-verdianos
+				CVE
 			
 			
 				Libra cipriota
@@ -5251,6 +5595,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Coroa tcheca
 				Coroa tcheca
 				Coroas tchecas
+				CZK
 				Kč
 			
 			
@@ -5267,23 +5612,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franco djiboutiano
 				Franco djiboutiano
 				Francos djiboutianos
+				DJF
 			
 			
 				Coroa dinamarquesa
 				Coroa dinamarquesa
 				Coroas dinamarquesas
+				DKK
 				kr
 			
 			
 				Peso dominicano
 				Peso dominicano
 				Pesos dominicanos
+				DOP
 				$
 			
 			
 				Dinar argelino
 				Dinar argelino
 				Dinares argelinos
+				DZD
 			
 			
 				Sucre equatoriano
@@ -5304,12 +5653,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libra egípcia
 				Libra egípcia
 				Libras egípcias
+				EGP
 				E£
 			
 			
 				Nakfa da Eritreia
 				Nakfa da Eritreia
 				Nakfas da Eritreia
+				ERN
 			
 			
 				Peseta espanhola (conta A)
@@ -5330,11 +5681,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Birr etíope
 				Birr etíope
 				Birrs etíopes
+				ETB
 			
 			
 				Euro
 				Euro
 				Euros
+				€
 				€
 			
 			
@@ -5346,12 +5699,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar fijiano
 				Dólar fijiano
 				Dólares fijianos
+				FJD
 				$
 			
 			
 				Libra malvinense
 				Libra malvinense
 				Libras malvinenses
+				FKP
 				£
 			
 			
@@ -5363,6 +5718,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libra esterlina
 				Libra esterlina
 				Libras esterlinas
+				£
 				£
 			
 			
@@ -5374,6 +5730,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lari georgiano
 				Lari georgiano
 				Laris georgianos
+				GEL
 				₾
 				₾
 			
@@ -5386,22 +5743,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cedi ganês
 				Cedi ganês
 				Cedis ganeses
+				GHS
 			
 			
 				Libra de Gibraltar
 				Libra de Gibraltar
 				Libras de Gibraltar
+				GIP
 				£
 			
 			
 				Dalasi gambiano
 				Dalasi gambiano
 				Dalasis gambianos
+				GMD
 			
 			
 				Franco guineano
 				Franco guineano
 				Francos guineanos
+				GNF
 				FG
 			
 			
@@ -5423,6 +5784,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Quetzal guatemalteco
 				Quetzal guatemalteco
 				Quetzais guatemaltecos
+				GTQ
 				Q
 			
 			
@@ -5439,17 +5801,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar guianense
 				Dólar guianense
 				Dólares guianenses
+				GYD
 				$
 			
 			
 				Dólar de Hong Kong
 				Dólar de Hong Kong
 				Dólares de Hong Kong
+				HK$
+				$
 			
 			
 				Lempira hondurenha
 				Lempira hondurenha
 				Lempiras hondurenhas
+				HNL
 				L
 			
 			
@@ -5461,23 +5827,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kuna croata
 				Kuna croata
 				Kunas croatas
+				HRK
 				kn
 			
 			
 				Gourde haitiano
 				Gourde haitiano
 				Gourdes haitianos
+				HTG
 			
 			
 				Florim húngaro
 				Florim húngaro
 				Florins húngaros
+				HUF
 				Ft
 			
 			
 				Rupia indonésia
 				Rupia indonésia
 				Rupias indonésias
+				IDR
 				Rp
 			
 			
@@ -5499,22 +5869,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Novo shekel israelense
 				Novo shekel israelense
 				Novos shekels israelenses
+				₪
 				₪
 			
 			
 				Rupia indiana
 				Rupia indiana
 				Rupias indianas
+				₹
+				₹
 			
 			
 				Dinar iraquiano
 				Dinar iraquiano
 				Dinares iraquianos
+				IQD
 			
 			
 				Rial iraniano
 				Rial iraniano
 				Riales iranianos
+				IRR
 			
 			
 				Coroa antiga islandesa
@@ -5525,6 +5900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Coroa islandesa
 				Coroa islandesa
 				Coroas islandesas
+				ISK
 				kr
 			
 			
@@ -5536,45 +5912,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar jamaicano
 				Dólar jamaicano
 				Dólares jamaicanos
+				JMD
 				$
 			
 			
 				Dinar jordaniano
 				Dinar jordaniano
 				Dinares jordanianos
+				JOD
 			
 			
 				Iene japonês
 				Iene japonês
 				Ienes japoneses
+				JP¥
 				¥
 			
 			
 				Xelim queniano
 				Xelim queniano
 				Xelins quenianos
+				KES
 			
 			
 				Som quirguiz
 				Som quirguiz
 				Sons quirguizes
+				KGS
 			
 			
 				Riel cambojano
 				Riel cambojano
 				Rieles cambojanos
+				KHR
 				៛
 			
 			
 				Franco comoriano
 				Franco comoriano
 				Francos comorianos
+				KMF
 				CF
 			
 			
 				Won norte-coreano
 				Won norte-coreano
 				Wons norte-coreanos
+				KPW
 				₩
 			
 			
@@ -5591,47 +5975,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Won sul-coreano
 				Won sul-coreano
 				Wons sul-coreanos
+				₩
 				₩
 			
 			
 				Dinar kuwaitiano
 				Dinar kuwaitiano
 				Dinares kuwaitianos
+				KWD
 			
 			
 				Dólar das Ilhas Cayman
 				Dólar das Ilhas Cayman
 				Dólares das Ilhas Cayman
+				KYD
 				$
 			
 			
 				Tenge cazaque
 				Tenge cazaque
 				Tenges cazaques
+				KZT
 				₸
 			
 			
 				Kip laosiano
 				Kip laosiano
 				Kips laosianos
+				LAK
 				₭
 			
 			
 				Libra libanesa
 				Libra libanesa
 				Libras libanesas
+				LBP
 				L£
 			
 			
 				Rupia do Sri Lanka
 				Rupia do Sri Lanka
 				Rupias do Sri Lanka
+				LKR
 				Rs
 			
 			
 				Dólar liberiano
 				Dólar liberiano
 				Dólares liberianos
+				LRD
 				$
 			
 			
@@ -5678,11 +6070,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dinar líbio
 				Dinar líbio
 				Dinares líbios
+				LYD
 			
 			
 				Dirham marroquino
 				Dirham marroquino
 				Dirhams marroquinos
+				MAD
 			
 			
 				Franco marroquino
@@ -5703,11 +6097,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Leu moldávio
 				Leu moldávio
 				Leus moldávios
+				MDL
 			
 			
 				Ariary malgaxe
 				Ariary malgaxe
 				Ariarys malgaxes
+				MGA
 				Ar
 			
 			
@@ -5719,6 +6115,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dinar macedônio
 				Dinar macedônio
 				Dinares macedônios
+				MKD
 			
 			
 				Dinar macedônio (1992–1993)
@@ -5734,23 +6131,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Quiat de Myanmar
 				Quiat de Myanmar
 				Quiat de Myanmar
+				MMK
 				K
 			
 			
 				Tugrik mongol
 				Tugrik mongol
 				Tugriks mongóis
+				MNT
 				₮
 			
 			
 				Pataca de Macau
 				Pataca de Macau
 				Patacas de Macau
+				MOP
 			
 			
 				Ouguiya mauritana (1973–2017)
 				Ouguiya mauritana (1973–2017)
 				Ouguiyas mauritanas (1973–2017)
+				MRO
 			
 			
 				Ouguiya mauritana
@@ -5772,22 +6173,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rupia mauriciana
 				Rupia mauriciana
 				Rupias mauricianas
+				MUR
 				Rs
 			
 			
 				Rupia maldivana
 				Rupia maldivana
 				Rupias maldivanas
+				MVR
 			
 			
 				Kwacha malauiana
 				Kwacha malauiana
 				Kwachas malauianas
+				MWK
 			
 			
 				Peso mexicano
 				Peso mexicano
 				Pesos mexicanos
+				MX$
 				$
 			
 			
@@ -5804,6 +6209,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ringgit malaio
 				Ringgit malaio
 				Ringgits malaios
+				MYR
 				RM
 			
 			
@@ -5820,17 +6226,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Metical moçambicano
 				Metical moçambicano
 				Meticais moçambicanos
+				MZN
 			
 			
 				Dólar namibiano
 				Dólar namibiano
 				Dólares namibianos
+				NAD
 				$
 			
 			
 				Naira nigeriana
 				Naira nigeriana
 				Nairas nigerianas
+				NGN
 				₦
 			
 			
@@ -5842,6 +6251,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Córdoba nicaraguense
 				Córdoba nicaraguense
 				Córdobas nicaraguenses
+				NIO
 				C$
 			
 			
@@ -5853,29 +6263,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Coroa norueguesa
 				Coroa norueguesa
 				Coroas norueguesas
+				NOK
 				kr
 			
 			
 				Rupia nepalesa
 				Rupia nepalesa
 				Rupias nepalesas
+				NPR
 				Rs
 			
 			
 				Dólar neozelandês
 				Dólar neozelandês
 				Dólares neozelandeses
+				NZ$
 				$
 			
 			
 				Rial omanense
 				Rial omanense
 				Riales omanenses
+				OMR
 			
 			
 				Balboa panamenho
 				Balboa panamenho
 				Balboas panamenhos
+				PAB
 			
 			
 				Inti peruano
@@ -5886,6 +6301,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Novo sol peruano
 				Novo sol peruano
 				Novos sóis peruanos
+				PEN
 			
 			
 				Sol peruano (1863–1965)
@@ -5896,23 +6312,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kina papuásia
 				Kina papuásia
 				Kinas papuásias
+				PGK
 			
 			
 				Peso filipino
 				Peso filipino
 				Pesos filipinos
+				PHP
 				₱
 			
 			
 				Rupia paquistanesa
 				Rupia paquistanesa
 				Rupias paquistanesas
+				PKR
 				Rs
 			
 			
 				Zloty polonês
 				Zloty polonês
 				Zlotys poloneses
+				PLN
 				zł
 			
 			
@@ -5930,12 +6350,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guarani paraguaio
 				Guarani paraguaio
 				Guaranis paraguaios
+				PYG
 				₲
 			
 			
 				Rial catariano
 				Rial catariano
 				Riales catarianos
+				QAR
 			
 			
 				Dólar rodesiano
@@ -5951,17 +6373,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Leu romeno
 				Leu romeno
 				Leus romenos
+				RON
 				L
 			
 			
 				Dinar sérvio
 				Dinar sérvio
 				Dinares sérvios
+				RSD
 			
 			
 				Rublo russo
 				Rublo russo
 				Rublos russos
+				RUB
 				₽
 			
 			
@@ -5973,23 +6398,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franco ruandês
 				Franco ruandês
 				Francos ruandeses
+				RWF
 				RF
 			
 			
 				Riyal saudita
 				Riyal saudita
 				Riyales sauditas
+				SAR
 			
 			
 				Dólar das Ilhas Salomão
 				Dólar das Ilhas Salomão
 				Dólares das Ilhas Salomão
+				SBD
 				$
 			
 			
 				Rupia seichelense
 				Rupia seichelense
 				Rupias seichelenses
+				SCR
 			
 			
 				Dinar sudanês (1992–2007)
@@ -6000,6 +6429,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libra sudanesa
 				Libra sudanesa
 				Libras sudanesas
+				SDG
 			
 			
 				Libra sudanesa (1957–1998)
@@ -6010,18 +6440,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Coroa sueca
 				Coroa sueca
 				Coroas suecas
+				SEK
 				kr
 			
 			
 				Dólar singapuriano
 				Dólar singapuriano
 				Dólares singapurianos
+				SGD
 				$
 			
 			
 				Libra de Santa Helena
 				Libra de Santa Helena
 				Libras de Santa Helena
+				SHP
 				£
 			
 			
@@ -6038,16 +6471,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Leone de Serra Leoa
 				Leone de Serra Leoa
 				Leones de Serra Leoa
+				SLL
 			
 			
 				Xelim somali
 				Xelim somali
 				Xelins somalis
+				SOS
 			
 			
 				Dólar surinamês
 				Dólar surinamês
 				Dólares surinameses
+				SRD
 				$
 			
 			
@@ -6059,12 +6495,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libra sul-sudanesa
 				Libra sul-sudanesa
 				Libras sul-sudanesas
+				SSP
 				£
 			
 			
 				Dobra de São Tomé e Príncipe (1977–2017)
 				Dobra de São Tomé e Príncipe (1977–2017)
 				Dobras de São Tomé e Príncipe (1977–2017)
+				STD
 			
 			
 				Dobra de São Tomé e Príncipe
@@ -6087,12 +6525,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Libra síria
 				Libra síria
 				Libras sírias
+				SYP
 				S£
 			
 			
 				Lilangeni suazi
 				Lilangeni suazi
 				Lilangenis suazis
+				SZL
 			
 			
 				Baht tailandês
@@ -6110,6 +6550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Somoni tadjique
 				Somoni tadjique
 				Somonis tadjiques
+				TJS
 			
 			
 				Manat do Turcomenistão (1993–2009)
@@ -6120,16 +6561,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Manat turcomeno
 				Manat turcomeno
 				Manats turcomenos
+				TMT
 			
 			
 				Dinar tunisiano
 				Dinar tunisiano
 				Dinares tunisianos
+				TND
 			
 			
 				Paʻanga tonganesa
 				Paʻanga tonganesa
 				Paʻangas tonganesas
+				TOP
 				T$
 			
 			
@@ -6146,6 +6590,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Lira turca
 				Lira turca
 				Liras turcas
+				TRY
 				₺
 				TL
 			
@@ -6153,23 +6598,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar de Trinidad e Tobago
 				Dólar de Trinidad e Tobago
 				Dólares de Trinidad e Tobago
+				TTD
 				$
 			
 			
 				Novo dólar taiwanês
 				Novo dólar taiwanês
 				Novos dólares taiwaneses
+				NT$
 				NT$
 			
 			
 				Xelim tanzaniano
 				Xelim tanzaniano
 				Xelins tanzanianos
+				TZS
 			
 			
 				Hryvnia ucraniano
 				Hryvnia ucraniano
 				Hryvnias ucranianos
+				UAH
 				₴
 			
 			
@@ -6186,11 +6635,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Xelim ugandense
 				Xelim ugandense
 				Xelins ugandenses
+				UGX
 			
 			
 				Dólar americano
 				Dólar americano
 				Dólares americanos
+				US$
 				$
 			
 			
@@ -6217,12 +6668,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Peso uruguaio
 				Peso uruguaio
 				Pesos uruguaios
+				UYU
 				$
 			
 			
 				Som uzbeque
 				Som uzbeque
 				Sons uzbeques
+				UZS
 			
 			
 				Bolívar venezuelano (1871–2008)
@@ -6233,6 +6686,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolívar venezuelano (2008–2018)
 				Bolívar venezuelano (2008–2018)
 				Bolívares venezuelanos (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6245,6 +6699,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dong vietnamita
 				Dong vietnamita
 				Dongs vietnamitas
+				₫
 				₫
 			
 			
@@ -6256,16 +6711,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vatu de Vanuatu
 				Vatu de Vanuatu
 				Vatus de Vanuatu
+				VUV
 			
 			
 				Tala samoano
 				Tala samoano
 				Talas samoanos
+				WST
 			
 			
 				Franco CFA de BEAC
 				Franco CFA de BEAC
 				Francos CFA de BEAC
+				FCFA
 			
 			
 				Prata
@@ -6301,6 +6759,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dólar do Caribe Oriental
 				Dólar do Caribe Oriental
 				Dólares do Caribe Oriental
+				EC$
 				$
 			
 			
@@ -6327,6 +6786,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franco CFA de BCEAO
 				Franco CFA de BCEAO
 				Francos CFA de BCEAO
+				CFA
 			
 			
 				Paládio
@@ -6337,6 +6797,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Franco CFP
 				Franco CFP
 				Francos CFP
+				CFPF
 			
 			
 				Platina
@@ -6367,6 +6828,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rial iemenita
 				Rial iemenita
 				Riales iemenitas
+				YER
 			
 			
 				Dinar forte iugoslavo (1966–1990)
@@ -6397,6 +6859,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rand sul-africano
 				Rand sul-africano
 				Rands sul-africanos
+				ZAR
 				R
 			
 			
@@ -6409,6 +6872,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwacha zambiano
 				Kwacha zambiano
 				Kwachas zambianos
+				ZMW
 				ZK
 			
 			
@@ -6540,9 +7004,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} por polegada quadrada
 			
 			
-				dunams
-				{0} dunam
-				{0} dunams
+				dunans
+				{0} dunam
+				{0} dunans
 			
 			
 				kilates
@@ -6575,14 +7039,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} por mil
 			
 			
-				ponto base
-				{0} ponto base
-				{0} pontos base
+				{0} ponto base
+				{0} pontos base
 			
 			
-				mols
-				{0} mol
-				{0} mols
+				mols
+				{0} mol
+				{0} mols
 			
 			
 				litros por quilômetro
@@ -6651,18 +7114,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				bytes
-				{0} byte
+				{0} bytes
 				{0} bytes
 			
 			
 				bits
-				{0} bit
+				{0} bits
 				{0} bits
 			
 			
 				séculos
 				{0} século
-				{0} sécs.
+				{0} séculos
+			
+			
+				décadas
+				{0} década
+				{0} décadas
 			
 			
 				anos
@@ -6772,24 +7240,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilowatts-hora
 			
 			
-				elétrons-volt
-				{0} elétron-volt
-				{0} elétrons-volt
+				elétrons-volt
+				{0} elétron-volt
+				{0} elétrons-volt
 			
 			
-				unidades térmicas britânicas
-				{0} unidade térmica britânica
-				{0} unidades térmicas britânicas
+				unidades térmicas britânicas
+				{0} unidade térmica britânica
+				{0} unidades térmicas britânicas
+			
+			
+				unidades térmicas norte-americanas
+				{0} unidade térmica norte-americana
+				{0} unidades térmicas norte-americanas
 			
 			
-				libras de força
-				{0} libra de força
-				{0} libras de força
+				libras de força
+				{0} libra de força
+				{0} libras de força
 			
 			
-				newtons
-				{0} newton
-				{0} newtons
+				newtons
+				{0} newton
+				{0} newtons
 			
 			
 				gigahertz
@@ -6811,6 +7284,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				em tipográfico
+			
+			
+				pixels
+				{0} pixel
+				{0} pixels
+			
+			
+				megapixels
+				{0} megapixel
+				{0} megapixels
+			
+			
+				pixels por centímetro
+				{0} pixel por centímetro
+				{0} pixels por centímetro
+			
+			
+				pixels por polegada
+				{0} pixel por polegada
+				{0} pixels por polegada
+			
+			
+				pontos por centímetro
+				{0} ponto por centímetro
+				{0} pontos por centímetro
+			
+			
+				pontos por polegada
+				{0} ponto por polegada
+				{0} pontos por polegada
+			
 			
 				quilômetros
 				{0} quilômetro
@@ -6917,9 +7423,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pontos
 			
 			
-				raios solares
-				{0} raio solar
-				{0} raios solares
+				raios solares
+				{0} raio solar
+				{0} raios solares
 			
 			
 				lux
@@ -6927,9 +7433,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				luminosidades solares
-				{0} luminosidade solar
-				{0} luminosidades solares
+				luminosidades solares
+				{0} luminosidade solar
+				{0} luminosidades solares
 			
 			
 				toneladas métricas
@@ -6991,19 +7497,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilates
 			
 			
-				daltons
-				{0} dalton
-				{0} daltons
+				daltons
+				{0} dalton
+				{0} daltons
 			
 			
-				Massas da Terra
-				{0} Massa da Terra
-				{0} Massas da Terra
+				massa terrestre
+				{0} massa terrestre
+				{0} massas terrestres
 			
 			
-				massas solares
-				{0} massa solar
-				{0} massas solares
+				massas solares
+				{0} massa solar
+				{0} massas solares
 			
 			
 				gigawatts
@@ -7035,21 +7541,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cavalo-vapor
 				{0} cavalos-vapor
 			
-			
-				hectopascais
-				{0} hectopascal
-				{0} hectopascais
-			
 			
 				milímetros de mercúrio
 				{0} milímetro de mercúrio
 				{0} milímetros de mercúrio
 			
+			
+				libras por polegada quadrada
+				{0} libra por polegada quadrada
+				{0} libras por polegada quadrada
+			
 			
 				polegadas de mercúrio
 				{0} polegada de mercúrio
 				{0} polegadas de mercúrio
 			
+			
+				bars
+				{0} bar
+				{0} bars
+			
 			
 				milibares
 				{0} milibar
@@ -7060,15 +7571,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfera
 				{0} atmosferas
 			
+			
+				pascais
+				{0} pascal
+				{0} pascais
+			
+			
+				hectopascais
+				{0} hectopascal
+				{0} hectopascais
+			
 			
-				quilopascais
-				{0} quilopascal
-				{0} quilopascais
+				quilopascais
+				{0} quilopascal
+				{0} quilopascais
 			
 			
-				megapascais
-				{0} megapascal
-				{0} megapascais
+				megapascais
+				{0} megapascal
+				{0} megapascais
 			
 			
 				quilômetros por hora
@@ -7086,7 +7607,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} milhas por hora
 			
 			
-				nó
+				nós
 				{0} nó
 				{0} nós
 			
@@ -7106,14 +7627,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kelvins
 			
 			
-				pés-libra
-				{0} pé-libra
-				{0} pés-libra
+				pés-libra
+				{0} pé-libra
+				{0} pés-libra
 			
 			
-				newton-metros
-				{0} newton-metro
-				{0} newton-metros
+				newton-metros
+				{0} newton-metro
+				{0} newton-metros
 			
 			
 				quilômetros cúbicos
@@ -7231,9 +7752,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} onças fluidas
 			
 			
-				onças fluidas imperiais
-				{0} onça fluida imperial
-				{0} onças fluidas imperiais
+				onças fluidas imperiais
+				{0} onça fluida imperial
+				{0} onças fluidas imperiais
 			
 			
 				colheres de sopa
@@ -7246,13 +7767,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} colheres de chá
 			
 			
-				barris
-				{0} barril
-				{0} barris
+				barris
+				{0} barril
+				{0} barris
 			
 			
 				direção cardeal
-				{0}O
+				{0} leste
+				{0} norte
+				{0} sul
+				{0} oeste
 			
 		
 		
@@ -7283,10 +7807,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				metros²
-				{0} por m²
-			
-			
-				{0} por cm²
 			
 			
 				milhas²
@@ -7307,9 +7827,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} por pol²
 			
 			
-				dunams
-				{0} dunam
-				{0} dunams
+				dunans
+				{0} dunam
+				{0} dunans
 			
 			
 				kilates
@@ -7340,14 +7860,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				ponto base
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				ponto base
 			
 			
 				litros/km
@@ -7398,11 +7911,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				kbit
 			
+			
+				{0} bytes
+				{0} bytes
+			
+			
+				{0} bits
+				{0} bits
+			
 			
 				séc.
 				{0} séc.
 				{0} sécs.
 			
+			
+				déc.
+				{0} déc.
+				{0} déc.
+			
 			
 				anos
 				{0} ano
@@ -7454,6 +7980,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				volts
 			
+			
+				cal
+				{0} cal
+				{0} cal
+			
 			
 				quilojoule
 			
@@ -7464,27 +7995,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kW-hora
 			
 			
-				elétron-volt
-				{0} eV
-				{0} eV
+				elétron-volt
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+				{0} BTU
+				{0} BTU
+			
+			
+				thm EUA
+				{0} thm EUA
+				{0} thm EUA
 			
 			
-				libra-força
-				{0} lbf
-				{0} lbf
+				libra-força
 			
 			
-				newton
-				{0} N
-				{0} N
+				newton
+			
+			
+				pixels
+			
+			
+				megapixels
 			
 			
-				metros
+				m
 			
 			
 				milhas
@@ -7534,23 +8070,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pontos
 			
 			
-				raios solares
-				{0} R☉
-				{0} R☉
+				raios solares
 			
 			
 				lux
 			
 			
-				luminosidades solares
-				{0} L☉
-				{0} L☉
+				luminosidades solares
+			
+			
+				t
+				{0} t
+				{0} t
 			
 			
 				gramas
 			
 			
 				toneladas
+				{0} tn
+				{0} tn
 			
 			
 				stones
@@ -7563,23 +8102,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				quilates
-				{0} ql
-				{0} ql
+				{0} ct
+				{0} ct
 			
 			
-				daltons
-				{0} Da
-				{0} Da
+				daltons
 			
 			
-				Massas da Terra
-				{0} M⊕
-				{0} M⊕
+				massas terrestres
 			
 			
-				massas solares
-				{0} M☉
-				{0} M☉
+				massas solares
 			
 			
 				watts
@@ -7594,21 +8127,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmHg
 				{0} mmHg
 			
+			
+				{0} bar
+				{0} bars
+			
 			
 				atm
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
-			
 			
 				metros/seg
 			
@@ -7632,16 +8159,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} °F
 				{0} °F
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				jardas³
 			
@@ -7653,6 +8170,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pol³
 				{0} pol³
 			
+			
+				Ml
+				{0} Ml
+				{0} Ml
+			
 			
 				hl
 				{0} hl
@@ -7719,29 +8241,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
-				CS
-				{0} CS
-				{0} CS
+				c. sopa
+				{0} c. sopa
+				{0} c. sopa
 			
 			
-				cc
-				{0} cc
-				{0} cc
+				c. chá
+				{0} c. chá
+				{0} c. chá
 			
 			
-				barril
-				{0} bbl
-				{0} bbl
+				barril
 			
 			
 				direção
-				{0}O
+				{0} L
+				{0} N
+				{0} S
+				{0} O
 			
 		
 		
@@ -7761,6 +8279,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} acres
 			
 			
+				%
 				{0}%
 				{0}%
 			
@@ -7770,33 +8289,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l/100 km
 			
 			
-				séc.
-				{0} séc.
-				{0} sécs.
+				séc.
+				{0} séc.
+				{0} sécs.
 			
 			
 				ano
 				{0} ano
 				{0} anos
-				{0}/ano
+				{0}/ano
 			
 			
 				mês
 				{0} mês
 				{0} meses
-				{0}/mês
+				{0}/mês
 			
 			
 				sem.
 				{0} sem.
 				{0} sem.
-				{0}/sem.
+				{0}/sem.
 			
 			
 				dia
 				{0} dia
 				{0} dias
-				{0}/dia
+				{0}/dia
 			
 			
 				hora
@@ -7807,10 +8326,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} s
 				{0}/seg
 			
+			
+				ms
+			
 			
-				metro
+				m
 			
 			
+				mil
 				{0} milha
 				{0} milhas
 			
@@ -7852,8 +8375,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mn
 				{0} mn
 			
+			
+				{0}kg
+				{0}kg
+			
 			
 				grama
+				{0}g
+				{0}g
 			
 			
 				ton
@@ -7883,12 +8412,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				{0}km/h
+				{0}km/h
+			
 			
 				nó
 				{0} nó
 				{0} nós
 			
 			
+				°C
 				{0} °C
 				{0} °C
 			
@@ -7896,11 +8430,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}°F
 				{0}°F
 			
+			
+				ft³
+			
 			
 				litro
+				{0}l
+				{0}l
+			
+			
+				fl. oz.
+				{0} fl. oz.
+				{0} fl. oz.
 			
 			
 				direção
+				{0}L
 				{0}O
 			
 		
@@ -7920,12 +8465,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} e {1}
 		
 		
-			{0} ou {1}
-			{0} ou {1}
+			{0} ou {1}
+			{0} ou {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -7940,8 +8483,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} e {1}
 		
 		
-			{0} e {1}
-			{0} e {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
+			{0} {1}
 		
 		
 			{0} e {1}
diff --git a/make/data/cldr/common/main/pt_AO.xml b/make/data/cldr/common/main/pt_AO.xml
index 3bfb2065d42..20d44ec1068 100644
--- a/make/data/cldr/common/main/pt_AO.xml
+++ b/make/data/cldr/common/main/pt_AO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_BR.xml b/make/data/cldr/common/main/pt_BR.xml
index 8992292835f..f1c77a1b643 100644
--- a/make/data/cldr/common/main/pt_BR.xml
+++ b/make/data/cldr/common/main/pt_BR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_CH.xml b/make/data/cldr/common/main/pt_CH.xml
index 08d09eb8511..ff0bc14ec6c 100644
--- a/make/data/cldr/common/main/pt_CH.xml
+++ b/make/data/cldr/common/main/pt_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_CV.xml b/make/data/cldr/common/main/pt_CV.xml
index 598846ec847..f95da74d914 100644
--- a/make/data/cldr/common/main/pt_CV.xml
+++ b/make/data/cldr/common/main/pt_CV.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -15,7 +15,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			
 				
-					∅∅∅
+					AZOT
 					∅∅∅
 					∅∅∅
 				
diff --git a/make/data/cldr/common/main/pt_GQ.xml b/make/data/cldr/common/main/pt_GQ.xml
index 0cb4b7458df..e0e3e783255 100644
--- a/make/data/cldr/common/main/pt_GQ.xml
+++ b/make/data/cldr/common/main/pt_GQ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_GW.xml b/make/data/cldr/common/main/pt_GW.xml
index 5ff91bce515..7ecdc66d9a7 100644
--- a/make/data/cldr/common/main/pt_GW.xml
+++ b/make/data/cldr/common/main/pt_GW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_LU.xml b/make/data/cldr/common/main/pt_LU.xml
index 963c0bb8bc9..d13af2cff7b 100644
--- a/make/data/cldr/common/main/pt_LU.xml
+++ b/make/data/cldr/common/main/pt_LU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_MO.xml b/make/data/cldr/common/main/pt_MO.xml
index e43038fde70..a8c2efb68ab 100644
--- a/make/data/cldr/common/main/pt_MO.xml
+++ b/make/data/cldr/common/main/pt_MO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_MZ.xml b/make/data/cldr/common/main/pt_MZ.xml
index 6edf759a21b..088328efd28 100644
--- a/make/data/cldr/common/main/pt_MZ.xml
+++ b/make/data/cldr/common/main/pt_MZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_PT.xml b/make/data/cldr/common/main/pt_PT.xml
index 145ee3fc338..b6813ab52ae 100644
--- a/make/data/cldr/common/main/pt_PT.xml
+++ b/make/data/cldr/common/main/pt_PT.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 		
 	
@@ -22,10 +22,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			mapuche
 			árabe do Négede
 			avaric
+			azeri
 			bamun
 			ghomala
 			bengalês
 			buriat
+			changma
 			chuquês
 			jargão chinook
 			cherokee
@@ -69,7 +71,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ganda
 			crioulo de Louisiana
 			luri do norte
-			luo
 			makassarês
 			macedónio
 			mohawk
@@ -79,6 +80,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			baixo-alemão
 			baixo-saxão
 			neerlandês
+			flamengo
 			norueguês nynorsk
 			nórdico antigo
 			occitano
@@ -94,6 +96,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			português do Brasil
 			português europeu
 			rajastanês
+			moldávio
 			root
 			sami do norte
 			irlandês antigo
@@ -109,12 +112,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			tatar
 			tamazight do Atlas Central
 			usbeque
-			vai
 			uólofe
 			xosa
 			soga
 			ioruba
 			tamazight marroquino padrão
+			chinês mandarim
+			chinês simplificado
+			chinês mandarim simplificado
+			chinês tradicional
+			chinês mandarim tradicional
 			zuni
 			zaza
 		
@@ -205,7 +212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			São Marinho
 			Salvador
 			São Martinho (Sint Maarten)
-			Essuatíni
+			Territórios Austrais Franceses
 			Tajiquistão
 			Toquelau
 			Turquemenistão
@@ -214,6 +221,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Usbequistão
 			Ilhas Virgens dos EUA
 			Vietname
+			pseudoacentos
+			pseudobidirecional
 			Iémen
 			Maiote
 			Zimbabué
@@ -229,14 +238,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			Formato monetário
-			Ordenação de acentos invertida
-			Ordenação sensível a maiúsculas e minúsculas
-			Ordenação normalizada
-			Ordenação numérica
-			Força da ordenação
+			Ignorar ordenação de símbolos
+			Ordenação de acentos invertida
+			Ordenação de maiúsculas/minúsculas
+			Ordenação sensível a maiúsculas e minúsculas
+			Ordenação normalizada
+			Ordenação numérica
+			Força da ordenação
 			Ciclo horário (12 vs. 24)
 			Sistema de medida
-			Utilização privada
+			Variante de região
 		
 		
 			Calendário budista
@@ -284,7 +295,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Ordenar acentos
 			Ordenar acentos/tipo de letra/largura
 			Largura completa
-			Meia largura
 			Estilo flexível de quebra de linha
 			Estilo padrão de quebra de linha
 			Estilo estrito de quebra de linha
@@ -335,8 +345,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' " “ ” « » ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' " “ ” « » ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -405,15 +415,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' U
+						
+					
+					
+						
+							d 'de' MMMM 'de' U
+						
+					
 					
 						
 							d 'de' MMM 'de' U
 						
 					
+					
+						
+							dd/MM/yy
+						
+					
 				
 			
 			
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y G
+						
+					
+					
+						
+							d 'de' MMMM 'de' y G
+						
+					
+					
+						
+							d MMM y G
+						
+					
 					
 						
 							d/M/y G
@@ -489,13 +529,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				
-					
-						
-							janeiro
-						
-					
-				
 				
 					
 						
@@ -560,7 +593,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						
 							a.m.
-							meio-dia
 							p.m.
 						
 						
@@ -575,11 +607,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							da manhã
-							meio-dia
 							da tarde
-							da manhã
-							da tarde
-							da noite
 						
 					
 					
@@ -604,6 +632,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							EEEE, d 'de' MMMM 'de' y
+						
+					
+					
+						
+							d 'de' MMMM 'de' y
+						
+					
 					
 						
 							dd/MM/y
@@ -678,6 +716,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y GGGGG – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+							E, d/M/y – E, d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h–h a
 						
@@ -810,10 +886,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					dentro de {0} trim.
 					dentro de {0} trim.
 				
-				
-					há {0} trim.
-					há {0} trim.
-				
 			
 			
 				trim. passado
@@ -874,29 +946,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				anteontem
-				ontem
-				hoje
-				amanhã
-				depois de amanhã
 				
 					dentro de {0} dia
 					dentro de {0} dias
 				
 			
 			
-				anteontem
+				ontem
 				hoje
-				depois de amanhã
+				amanhã
 				
 					dentro de {0} dia
 					dentro de {0} dias
 				
 			
 			
-				anteontem
+				ontem
 				hoje
-				depois de amanhã
+				amanhã
 				
 					+{0} dia
 					+{0} dias
@@ -992,10 +1059,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					dentro de {0} quarta-feira
 					dentro de {0} quartas-feiras
 				
-				
-					há {0} quarta-feira
-					há {0} quartas-feiras
-				
 			
 			
 				quarta passada
@@ -1194,102 +1257,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					Hora Coordenada Universal
 				
 			
-			
-				Andorra
-			
-			
-				Dubai
-			
-			
-				Cabul
-			
-			
-				Anguila
-			
 			
 				Erevan
 			
-			
-				Rothera
-			
-			
-				Palmer
-			
-			
-				Troll
-			
-			
-				Syowa
-			
-			
-				Mawson
-			
-			
-				Davis
-			
-			
-				Vostok
-			
-			
-				Casey
-			
 			
 				Dumont d’Urville
 			
-			
-				McMurdo
-			
 			
 				Tucumán
 			
-			
-				Pago Pago
-			
-			
-				Perth
-			
-			
-				Eucla
-			
-			
-				Darwin
-			
-			
-				Adelaide
-			
-			
-				Broken Hill
-			
-			
-				Currie
-			
-			
-				Melbourne
-			
-			
-				Hobart
-			
-			
-				Lindeman
-			
-			
-				Sydney
-			
-			
-				Brisbane
-			
-			
-				Macquarie
-			
 			
 				Ilha de Lord Howe
 			
-			
-				Mariehamn
-			
-			
-				Baku
-			
 			
 				Daca
 			
@@ -1299,17 +1278,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Porto-Novo
 			
-			
-				Brunei
-			
 			
 				Araguaina
 			
 			
 				Baía
 			
-			
-				Minsk
+			
+				Timphu
 			
 			
 				St. John’s
@@ -1317,15 +1293,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ilhas Cocos
 			
-			
-				Rarotonga
-			
 			
 				Ilha da Páscoa
 			
-			
-				Urumqi
-			
 			
 				Curaçau
 			
@@ -1344,12 +1314,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Domínica
 			
-			
-				Tallinn
-			
-			
-				Ceuta
-			
 			
 				Madrid
 			
@@ -1359,18 +1323,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Helsínquia
 			
-			
-				Fiji
-			
 			
 				Chuuk
 			
 			
 				Pohnpei
 			
-			
-				Kosrae
-			
 			
 				Faroé
 			
@@ -1379,38 +1337,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					Hora de verão Britânica
 				
 			
-			
-				Tbilisi
-			
-			
-				Guam
-			
-			
-				Hong Kong
-			
 			
 				Port-au-Prince
 			
-			
-				Pontianak
-			
 			
 				Macassar
 			
-			
-				Jayapura
-			
 			
 				
 					Hora de verão da Irlanda
 				
 			
-			
-				Calcutá
-			
-			
-				Chagos
-			
 			
 				Bagdade
 			
@@ -1423,24 +1360,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Nairobi
 			
-			
-				Bishkek
-			
-			
-				Phnom Penh
-			
-			
-				Enderbury
-			
-			
-				Kiritimati
-			
 			
 				Tarawa
 			
-			
-				Pyongyang
-			
 			
 				Koweit
 			
@@ -1450,29 +1372,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aqtau
 			
-			
-				Oral
-			
 			
 				Aqtobe
 			
-			
-				Qyzylorda
-			
-			
-				Almaty
-			
-			
-				Vientiane
-			
-			
-				Vaduz
-			
-			
-				Colombo
-			
-			
-				Vilnius
+			
+				Kostanay
 			
 			
 				Tripoli
@@ -1480,36 +1384,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Mónaco
 			
-			
-				Chisinau
-			
-			
-				Podgorica
-			
-			
-				Kwajalein
-			
-			
-				Majuro
-			
-			
-				Skopje
-			
 			
 				Bamaco
 			
 			
 				Yangon
 			
-			
-				Hovd
-			
-			
-				Choibalsan
-			
-			
-				Saipan
-			
 			
 				Monserrate
 			
@@ -1522,192 +1402,66 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Cancun
 			
-			
-				Kuala Lumpur
-			
-			
-				Kuching
-			
 			
 				Niamei
 			
-			
-				Norfolk
-			
 			
 				Amesterdão
 			
-			
-				Nauru
-			
-			
-				Niue
+			
+				Catmandu
 			
 			
 				Chatham
 			
-			
-				Auckland
-			
-			
-				Marquesas
-			
-			
-				Gambier
-			
-			
-				Port Moresby
-			
-			
-				Bougainville
-			
-			
-				Manila
+			
+				Carachi
 			
 			
 				Ilhas Pitcairn
 			
-			
-				Gaza
-			
-			
-				Hebron
-			
-			
-				Palau
-			
-			
-				Catar
-			
 			
 				Caliningrado
 			
-			
-				Simferopol
-			
 			
 				Moscovo
 			
-			
-				Samara
-			
-			
-				Omsk
-			
-			
-				Novosibirsk
-			
-			
-				Novokuznetsk
-			
-			
-				Krasnoyarsk
-			
-			
-				Irkutsk
-			
-			
-				Chita
-			
-			
-				Yakutsk
-			
-			
-				Vladivostok
-			
-			
-				Khandyga
-			
-			
-				Ust-Nera
-			
-			
-				Magadan
-			
-			
-				Srednekolymsk
-			
-			
-				Kamchatka
-			
-			
-				Anadyr
-			
-			
-				Guadalcanal
-			
 			
 				Mahe
 			
-			
-				Singapura
-			
-			
-				Longyearbyen
-			
-			
-				Bratislava
-			
 			
 				São Marinho
 			
 			
 				Dacar
 			
+			
+				Salvador
+			
 			
 				Ndjamena
 			
-			
-				Kerguelen
-			
 			
 				Banguecoque
 			
-			
-				Fakaofo
-			
-			
-				Dili
-			
 			
 				Tunes
 			
-			
-				Tongatapu
-			
 			
 				Porto de Espanha
 			
-			
-				Funafuti
-			
 			
 				Taipé
 			
-			
-				Uzhgorod
-			
 			
 				Campala
 			
-			
-				Midway
-			
-			
-				Wake
-			
-			
-				Johnston
-			
 			
 				Nova Iorque
 			
 			
 				Montevideu
 			
-			
-				Tashkent
-			
 			
 				St. Thomas
 			
@@ -1717,11 +1471,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Efate
 			
-			
-				Wallis
-			
-			
-				Apia
+			
+				Adem
 			
 			
 				Lusaca
@@ -1793,30 +1544,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Hora Central
-					Hora padrão Central
-					Hora de verão Central
+					Hora central norte-americana
+					Hora padrão central norte-americana
+					Hora de verão central norte-americana
 				
 			
 			
 				
-					Hora Oriental
-					Hora padrão Oriental
-					Hora de verão Oriental
+					Hora oriental norte-americana
+					Hora padrão oriental norte-americana
+					Hora de verão oriental norte-americana
 				
 			
 			
 				
-					Hora da Montanha
-					Hora padrão da Montanha
-					Hora de verão da Montanha
+					Hora de montanha norte-americana
+					Hora padrão de montanha norte-americana
+					Hora de verão de montanha norte-americana
 				
 			
 			
 				
-					Hora do Pacífico
-					Hora padrão do Pacífico
-					Hora de verão do Pacífico
+					Hora do Pacífico norte-americana
+					Hora padrão do Pacífico norte-americana
+					Hora de verão do Pacífico norte-americana
 				
 			
 			
@@ -2728,15 +2479,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		2
 		
 			 
-			+
-			-
 		
 		
-			
-				
-					#,##0.###
-				
-			
 			
 				
 					0 milhão
@@ -2822,57 +2566,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			
-				Dirham dos Emirados Árabes Unidos
-				Dirhams dos Emirados Árabes Unidos
-				AED
+				dirham dos Emirados Árabes Unidos
+				dirham dos Emirados Árabes Unidos
+				sdirham dos Emirados Árabes Unidos
 			
 			
 				Afeghani (1927–2002)
 			
 			
-				Afegani do Afeganistão
-				Afegani do Afeganistão
-				Afeganis do Afeganistão
-				AFN
+				afegâni afegão
+				afegâni afegão
+				afegânis afegãos
 			
 			
 				lek albanês
 				lek albanês
 				leks albaneses
-				ALL
 			
 			
-				Dram arménio
-				Dram arménio
-				Drams arménios
-				AMD
+				dram arménio
+				dram arménio
+				drams arménios
 			
 			
-				ANG
+				florim das Antilhas Holandesas
+				florim das Antilhas Holandesas
+				florins das Antilhas Holandesas
 			
 			
 				kwanza angolano
 				kwanza angolano
 				kwanzas angolanos
-				AOA
 			
 			
 				peso argentino
 				peso argentino
 				pesos argentinos
-				ARS
+			
+			
+				dólar australiano
+				dólar australiano
+				dólares australianos
 			
 			
 				florim de Aruba
 				florim de Aruba
 				florins de Aruba
-				AWG
 			
 			
-				Manat do Azerbaijão
-				Manat do Azerbaijão
-				Manats do Azerbaijão
-				AZN
+				manat azeri
+				manat azeri
+				manats azeris
 			
 			
 				Dinar da Bósnia-Herzegóvina
@@ -2881,19 +2625,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marco bósnio-herzegóvino conversível
 				marco bósnio-herzegóvino conversível
 				marcos bósnio-herzegóvinos conversíveis
-				BAM
 			
 			
 				dólar barbadense
 				dólar barbadense
 				dólares barbadenses
-				BBD
 			
 			
-				Taka de Bangladesh
-				Taka de Bangladesh
-				Takas de Bangladesh
-				BDT
+				taka bengali
+				taka bengali
+				takas bengalis
 			
 			
 				Franco belga (convertível)
@@ -2902,61 +2643,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lev búlgaro
 				lev búlgaro
 				levs búlgaros
-				BGN
 			
 			
-				Dinar baremita
-				Dinar baremita
-				Dinares baremitas
-				BHD
+				dinar baremita
+				dinar baremita
+				dinares baremitas
 			
 			
 				franco burundiano
 				franco burundiano
 				francos burundianos
-				BIF
 			
 			
 				dólar bermudense
 				dólar bermudense
 				dólares bermudense
-				BMD
 			
 			
-				Dólar bruneíno
-				Dólar bruneíno
-				Dólares bruneínos
-				BND
+				dólar bruneano
+				dólar bruneano
+				dólares bruneanos
 			
 			
 				boliviano
 				boliviano
 				bolivianos
-				BOB
 			
 			
 				real brasileiro
 				real brasileiro
 				reais brasileiros
-				R$
 			
 			
 				dólar das Bahamas
 				dólar das Bahamas
 				dólares das Bahamas
-				BSD
 			
 			
-				Ngultrum do Butão
-				Ngultrum do Butão
-				Ngultruns do Butão
-				BTN
+				ngultrum butanês
+				ngultrum butanês
+				ngultrumes butaneses
 			
 			
-				Pula de Botswana
-				Pula de Botswana
-				Pulas de Botswana
-				BWP
+				pula de Botswana
+				pula de Botswana
+				pulas de Botswana
 			
 			
 				Rublo novo bielorusso (1994–1999)
@@ -2966,79 +2697,65 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rublo bielorrusso
 				rublos bielorrussos
 			
-			
-				BYR
-			
 			
 				dólar belizense
 				dólar belizense
 				dólares belizense
-				BZD
 			
 			
 				dólar canadiano
 				dólar canadiano
 				dólares canadianos
-				CA$
 			
 			
 				franco congolês
 				franco congolês
 				francos congoleses
-				CDF
 			
 			
 				franco suíço
 				franco suíço
 				francos suíços
-				CHF
 			
 			
 				peso chileno
 				peso chileno
 				pesos chilenos
-				CLP
 			
 			
-				yuan offshore
-				yuan offshore
-				yuans offshore
+				yuan offshore
+				yuan offshore
+				yuans offshore
 			
 			
 				yuan
 				yuan
 				yuans
-				CN¥
 			
 			
 				peso colombiano
 				peso colombiano
 				pesos colombianos
-				COP
 			
 			
 				colon costa-riquenho
 				colon costa-riquenho
 				colons costa-riquenho
-				CRC
 			
 			
 				peso cubano conversível
 				peso cubano conversível
 				pesos cubanos conversíveis
-				CUC
 			
 			
 				peso cubano
 				peso cubano
 				pesos cubanos
-				CUP
 			
 			
 				escudo cabo-verdiano
 				escudo cabo-verdiano
 				escudos cabo-verdianos
-				CVE
 			
 			
 				Libra de Chipre
@@ -3047,28 +2764,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				coroa checa
 				coroa checa
 				coroas checas
-				CZK
 			
 			
 				franco jibutiano
 				franco jibutiano
 				francos jibutianos
-				DJF
 			
 			
 				coroa dinamarquesa
 				coroa dinamarquesa
 				coroas dinamarquesas
-				DKK
 			
 			
-				DOP
+				peso dominicano
+				peso dominicano
+				pesos dominicanos
 			
 			
 				dinar argelino
 				dinar argelino
 				dinares argelinos
-				DZD
 			
 			
 				Unidad de Valor Constante (UVC) do Equador
@@ -3077,46 +2792,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libra egípcia
 				libra egípcia
 				libras egípcias
-				EGP
 			
 			
 				nakfa eritreia
 				nakfa eritreia
 				nakfas eritreias
-				ERN
 			
 			
 				birr etíope
 				birr etíope
 				birres etíopes
-				ETB
 			
 			
 				euro
 				euro
 				euros
-				€
 			
 			
-				Dólar de Fiji
-				Dólar de Fiji
-				Dólares de Fiji
-				FJD
+				dólar fijiano
+				dólar fijiano
+				dólares fijianos
 			
 			
 				libra das Ilhas Falkland
 				libra das Ilhas Falkland
 				libras das Ilhas Falkland
-				FKP
 			
 			
 				libra esterlina britânica
 				libra esterlina britânica
 				libras esterlinas britânicas
-				£
 			
 			
-				GEL
+				lari georgiano
+				lari georgiano
+				laris georgianos
 			
 			
 				Cedi do Gana
@@ -3125,158 +2835,166 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cedi ganês
 				cedi ganês
 				cedis ganeses
-				GHS
 			
 			
 				libra de Gibraltar
 				libra de Gibraltar
 				libras de Gibraltar
-				GIP
 			
 			
 				dalasi gambiano
 				dalasi gambiano
 				dalasis gambianos
-				GMD
 			
 			
 				franco guineense
 				franco guineense
 				francos guineenses
-				GNF
 			
 			
 				quetzal da Guatemala
 				quetzal da Guatemala
 				quetzales da Guatemala
-				GTQ
 			
 			
 				dólar da Guiana
 				dólar da Guiana
 				dólares da Guiana
-				GYD
 			
 			
-				HK$
-				$
+				dólar de Hong Kong
+				dólar de Hong Kong
+				dólares de Hong Kong
 			
 			
 				lempira das Honduras
 				lempira das Honduras
 				lempiras das Honduras
-				HNL
 			
 			
 				kuna croata
 				kuna croata
 				kunas croatas
-				HRK
 			
 			
-				HTG
+				gourde haitiano
+				gourde haitiano
+				gourdes haitianos
 			
 			
 				forint húngaro
 				forint húngaro
 				forints húngaros
-				HUF
 			
 			
-				IDR
+				rupia indonésia
+				rupia indonésia
+				rupias indonésias
 			
 			
-				Sheqel novo israelita
-				Sheqel novo israelita
-				Sheqels novos israelitas
-				₪
+				sheqel novo israelita
+				sheqel novo israelita
+				sheqels novos israelitas
 			
 			
-				₹
-				₹
+				rupia indiana
+				rupia indiana
+				rupias indianas
 			
 			
-				IQD
+				dinar iraquiano
+				dinar iraquiano
+				dinares iraquianos
 			
 			
-				Rial iraniano
-				Riais iranianos
-				IRR
+				rial iraniano
+				rial iraniano
+				riais iranianos
 			
 			
 				coroa islandesa
 				coroa islandesa
 				coroas islandesas
-				ISK
 			
 			
-				JMD
+				dólar jamaicano
+				dólar jamaicano
+				dólares jamaicanos
 			
 			
-				JOD
+				dinar jordaniano
+				dinar jordaniano
+				dinares jordanianos
 			
 			
-				JP¥
+				iene japonês
+				iene japonês
+				ienes japoneses
 			
 			
 				xelim queniano
 				xelim queniano
 				xelins quenianos
-				KES
 			
 			
-				Som do Quirguistão
-				Som do Quirguistão
-				Sons do Quirguistão
-				KGS
+				som quirguiz
+				som quirguiz
+				somes quirguizes
 			
 			
-				KHR
+				riel cambojano
+				riel cambojano
+				rieles cambojanos
 			
 			
 				franco comoriano
 				franco comoriano
 				francos comorianos
-				KMF
 			
 			
-				KPW
+				won norte-coreano
+				won norte-coreano
+				wons norte-coreanos
 			
 			
-				₩
+				won sul-coreano
+				won sul-coreano
+				wons sul-coreano
 			
 			
-				KWD
+				dinar kuwaitiano
+				dinar kuwaitiano
+				dinares kuwaitianos
 			
 			
-				Dólar das Ilhas Caimão
-				Dólar das Ilhas Caimão
-				Dólares das Ilhas Caimão
-				KYD
+				dólar das Ilhas Caimão
+				dólar das Ilhas Caimão
+				dólares das Ilhas Caimão
 			
 			
-				Tenge do Cazaquistão
-				Tenge do Cazaquistão
-				Tenges do Cazaquistão
-				KZT
+				tenge cazaque
+				tenge cazaque
+				tenges cazaques
 			
 			
-				Kip de Laos
-				Kip de Laos
-				Kips de Laos
-				LAK
+				kip laosiano
+				kip laosiano
+				kips laosianos
 			
 			
-				LBP
+				libra libanesa
+				libra libanesa
+				libras libanesas
 			
 			
-				LKR
+				rupia do Sri Lanka
+				rupia do Sri Lanka
+				rupias do Sri Lanka
 			
 			
 				dólar liberiano
 				dólar liberiano
 				dólares liberianos
-				LRD
 			
 			
 				Litas da Lituânia
@@ -3294,55 +3012,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar líbio
 				dinar líbio
 				dinares líbios
-				LYD
 			
 			
 				dirham marroquino
 				dirham marroquino
 				dirhams marroquinos
-				MAD
 			
 			
 				leu moldavo
 				leu moldavo
 				leus moldavos
-				MDL
 			
 			
 				ariari malgaxe
 				ariari malgaxe
 				ariaris malgaxes
-				MGA
 			
 			
 				dinar macedónio
 				dinar macedónio
 				dinares macedónios
-				MKD
 			
 			
 				Franco do Mali
 			
 			
-				Kyat de Mianmar
-				Kyat de Mianmar
-				Kyats de Mianmar
-				MMK
+				kyat de Mianmar
+				kyat de Mianmar
+				kyats de Mianmar
 			
 			
-				Tugrik da Mongólia
-				Tugrik da Mongólia
-				Tugriks da Mongólia
-				MNT
+				tugrik mongol
+				tugrik mongol
+				tugriks mongóis
 			
 			
-				MOP
+				pataca macaense
+				pataca macaense
+				patacas macaenses
 			
 			
 				ouguiya mauritana (1973–2017)
 				ouguiya mauritana (1973–2017)
 				ouguiyas mauritanas (1973–2017)
-				MRO
 			
 			
 				ouguiya mauritana
@@ -3353,25 +3065,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupia mauriciana
 				rupia mauriciana
 				rupias mauricianas
-				MUR
 			
 			
-				Rupia das Ilhas Maldivas
-				Rupia das Ilhas Maldivas
-				Rupias das Ilhas Maldivas
-				MVR
+				rupia maldivana
+				rupia maldivana
+				rupias maldivanas
 			
 			
 				kwacha malauiano
 				kwacha malauiano
 				kwachas malauianos
-				MWK
 			
 			
 				peso mexicano
 				peso mexicano
 				pesos mexicanos
-				MX$
 			
 			
 				Peso Plata mexicano (1861–1992)
@@ -3380,22 +3088,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Unidad de Inversion (UDI) mexicana
 			
 			
-				MYR
+				ringgit malaio
+				ringgit malaio
+				ringgits malaios
 			
 			
 				metical moçambicano
 				metical moçambicano
 				meticais moçambicanos
-				MZN
 			
 			
-				Dólar da Namíbia
-				Dólar da Namíbia
-				Dólares da Namíbia
-				NAD
+				dólar namibiano
+				dólar namibiano
+				dólares namibianos
 			
 			
-				NGN
+				naira nigeriana
+				naira nigeriana
+				nairas nigerianas
 			
 			
 				Córdoba nicaraguano (1988–1991)
@@ -3406,64 +3116,68 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				córdoba nicaraguano
 				córdoba nicaraguano
 				córdobas nicaraguanos
-				NIO
 			
 			
 				coroa norueguesa
 				coroa norueguesa
 				coroas norueguesas
-				NOK
 			
 			
-				NPR
+				rupia nepalesa
+				rupia nepalesa
+				rupias nepalesas
 			
 			
-				NZ$
+				dólar neozelandês
+				dólar neozelandês
+				dólares neozelandeses
 			
 			
-				Rial de Omã
-				Rial de Omã
-				Riais de Omã
-				OMR
+				rial omanense
+				rial omanense
+				riais omanenses
 			
 			
 				balboa do Panamá
 				balboa do Panamá
 				balboas do Panamá
-				PAB
 			
 			
 				sol peruano
 				sol peruano
 				sóis peruanos
-				PEN
 			
 			
 				Sol peruano (1863–1965)
 				Soles peruanos (1863–1965)
 			
 			
-				Kina da Papua-Nova Guiné
-				Kina da Papua-Nova Guiné
-				Kinas da Papua-Nova Guiné
-				PGK
+				kina papuásia
+				kina papuásia
+				kinas papuásias
 			
 			
-				PHP
+				peso filipino
+				peso filipino
+				pesos filipinos
 			
 			
-				PKR
+				rupia paquistanesa
+				rupia paquistanesa
+				rupias paquistanesas
 			
 			
 				zloti polaco
 				zloti polaco
 				zlotis polacos
-				PLN
 			
 			
 				Zloti polaco (1950–1995)
 			
 			
+				escudo português
+				escudo português
+				escudos portugueses
 				​
 				$
 				,
@@ -3472,98 +3186,86 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guarani paraguaio
 				guarani paraguaio
 				guaranis paraguaios
-				PYG
 			
 			
-				Rial do Catar
-				Rial do Catar
-				Riais do Catar
-				QAR
+				rial catarense
+				rial catarense
+				riais catarenses
 			
 			
 				leu romeno
 				leu romeno
 				leus romenos
-				RON
 			
 			
 				dinar sérvio
 				dinar sérvio
 				dinares sérvios
-				RSD
 			
 			
 				rublo russo
 				rublo russo
 				rublos russos
-				RUB
 			
 			
 				franco ruandês
 				franco ruandês
 				francos ruandeses
-				RWF
 			
 			
-				Rial saudita
-				Rial saudita
-				Riais sauditas
-				SAR
+				rial saudita
+				rial saudita
+				riais sauditas
 			
 			
-				SBD
+				dólar das Ilhas Salomão
+				dólar das Ilhas Salomão
+				dólares das Ilhas Salomão
 			
 			
 				rupia seichelense
 				rupia seichelense
 				rupias seichelenses
-				SCR
 			
 			
 				libra sudanesa
 				libra sudanesa
 				libras sudanesas
-				SDG
 			
 			
 				coroa sueca
 				coroa sueca
 				coroas suecas
-				SEK
 			
 			
-				Dólar de Singapura
-				Dólar de Singapura
-				Dólares de Singapura
-				SGD
+				dólar singapuriano
+				dólar singapuriano
+				dólares singapurianos
 			
 			
 				libra santa-helenense
-				SHP
+				libra santa-helenense
+				libras santa-helenenses
 			
 			
-				SLL
+				leone de Serra Leoa
+				leone de Serra Leoa
+				leones de Serra Leoa
 			
 			
 				xelim somali
 				xelim somali
 				xelins somalis
-				SOS
 			
 			
 				dólar do Suriname
 				dólar do Suriname
 				dólares do Suriname
-				SRD
 			
 			
 				libra sul-sudanesa
 				libra sul-sudanesa
 				libras sul-sudanesas
-				SSP
-			
-			
-				STD
 			
 			
 				dobra de São Tomé e Príncipe
@@ -3571,91 +3273,90 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dobras de São Tomé e Príncipe
 			
 			
-				SYP
+				libra síria
+				libra síria
+				libras sírias
 				£
 			
 			
-				Lilangeni da Suazilândia
-				Lilangeni da Suazilândia
-				Lilangenis da Suazilândia
-				SZL
+				lilangeni suázi
+				lilangeni suázi
+				lilangenis suázis
 			
 			
-				Baht da Tailândia
-				Baht da Tailândia
-				Bahts da Tailândia
+				baht tailandês
+				baht tailandês
+				bahts tailandeses
 			
 			
-				Somoni do Tajaquistão
-				Somoni do Tajaquistão
-				Somonis do Tajaquistão
-				TJS
+				somoni tajique
+				somoni tajique
+				somonis tajiques
 			
 			
-				Manat do Turquemenistão
-				Manat do Turquemenistão
-				Manats do Turquemenistão
-				TMT
+				manat turcomeno
+				manat turcomeno
+				manats turcomenos
 			
 			
 				dinar tunisino
 				dinar tunisino
 				dinares tunisinos
-				TND
 			
 			
-				Paʻanga de Tonga
-				Paʻanga de Tonga
-				Paʻangas de Tonga
-				TOP
+				paʻanga tonganesa
+				paʻanga tonganesa
+				paʻangas tonganesas
 			
 			
-				TRY
+				lira turca
+				lira turca
+				liras turcas
 			
 			
-				Dólar de Trindade e Tobago
-				Dólar de Trindade e Tobago
-				Dólares de Trindade e Tobago
-				TTD
+				dólar de Trindade e Tobago
+				dólar de Trindade e Tobago
+				dólares de Trindade e Tobago
 			
 			
-				NT$
+				novo dólar taiwanês
+				novo dólar taiwanês
+				novos dólares taiwaneses
 			
 			
-				TZS
+				xelim tanzaniano
+				xelim tanzaniano
+				xelins tanzanianos
 			
 			
 				hryvnia ucraniano
 				hryvnia ucraniano
 				hryvnias ucranianos
-				UAH
 			
 			
-				UGX
+				xelim ugandense
+				xelim ugandense
+				xelins ugandenses
 			
 			
 				dólar dos Estados Unidos
 				dólar dos Estados Unidos
 				dólares dos Estados Unidos
-				US$
 			
 			
 				peso uruguaio
 				peso uruguaio
 				pesos uruguaios
-				UYU
 			
 			
-				Som do Uzbequistão
-				Som do Uzbequistão
-				Sons do Uzbequistão
-				UZS
+				som uzbeque
+				som uzbeque
+				somes uzbeques
 			
 			
 				bolívar (2008–2018)
 				bolívar (2008–2018)
 				bolívares (2008–2018)
-				VEF
 			
 			
 				bolívar
@@ -3663,25 +3364,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolívares
 			
 			
-				₫
+				dong vietnamita
+				dong vietnamita
+				dongs vietnamitas
 			
 			
-				VUV
+				vatu de Vanuatu
+				vatu de Vanuatu
+				vatus de Vanuatu
 			
 			
-				WST
+				tala samoano
+				tala samoano
+				talas samoanos
 			
 			
 				franco CFA (BEAC)
 				franco CFA (BEAC)
 				francos CFA (BEAC)
-				FCFA
 			
 			
-				Dólar das Caraíbas Orientais
-				Dólar das Caraíbas Orientais
-				Dólares das Caraíbas Orientais
-				EC$
+				dólar das Caraíbas Orientais
+				dólar das Caraíbas Orientais
+				dólares das Caraíbas Orientais
 			
 			
 				direito especial de saque
@@ -3694,10 +3399,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franco CFA (BCEAO)
 				franco CFA (BCEAO)
 				francos CFA (BCEAO)
-				CFA
 			
 			
-				CFPF
+				franco CFP
+				franco CFP
+				francos CFP
 			
 			
 				moeda desconhecida
@@ -3705,9 +3411,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				(moedas desconhecidas)
 			
 			
-				Rial iemenita
-				Riais iemenitas
-				YER
+				rial iemenita
+				rial iemenita
+				riais iemenitas
 			
 			
 				Dinar forte jugoslavo
@@ -3719,7 +3425,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dinar conversível jugoslavo
 			
 			
-				ZAR
+				rand sul-africano
+				rand sul-africano
+				rands sul-africanos
 			
 			
 				Kwacha zambiano (1968–2012)
@@ -3727,7 +3435,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwachas zambianos (1968–2012)
 			
 			
-				ZMW
+				kwacha zambiano
+				kwacha zambiano
+				kwachas zambianos
 			
 			
 				Dólar do Zimbabwe
@@ -3767,9 +3477,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilates
 			
 			
-				milimoles por litro
-				{0} milimole por litro
-				{0} milimoles por litro
+				milimoles por litro
+				{0} milimole por litro
+				{0} milimoles por litro
 			
 			
 				litros por quilómetro
@@ -3789,10 +3499,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bit
 				{0} bits
 			
-			
-				{0} século
-				{0} séculos
-			
 			
 				{0}/h
 			
@@ -3805,9 +3511,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilocalorias
 			
 			
-				eletrões-volts
-				{0} eletrão-volt
-				{0} eletrões-volts
+				eletrões-volts
+				{0} eletrão-volt
+				{0} eletrões-volts
+			
+			
+				píxel
+				{0} píxel
+				{0} píxeis
+			
+			
+				megapíxeis
+				{0} megapíxel
+				{0} megapíxeis
+			
+			
+				píxeis por centímetro
+				{0} píxel por centímetro
+				{0} píxeis por centímetro
+			
+			
+				píxeis por polegada
+				{0} píxel por polegada
+				{0} píxeis por polegada
 			
 			
 				quilómetros
@@ -3838,6 +3564,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				milha escandinava
 			
+			
+				{0} massa da Terra
+				{0} massas da Terra
+			
 			
 				psi
 				{0} psi
@@ -3848,7 +3578,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilómetro por hora
 				{0} quilómetros por hora
 			
+			
+				nó
+			
 			
+				{0}°
 				{0}°
 			
 			
@@ -3857,7 +3591,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quilómetros cúbicos
 			
 			
-				chávenas métricas
+				chávenas métricas
 				{0} chávena métrica
 				{0} chávenas métricas
 			
@@ -3867,10 +3601,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} chávenas
 			
 			
-				{0} este
-				{0} norte
-				{0} sul
-				{0} Oeste
+				{0} este
+				{0} Oeste
 			
 		
 		
@@ -3953,7 +3685,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kt
 			
 			
-				milimole/litro
+				milimole/litro
 			
 			
 				l/100km
@@ -4082,7 +3814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				eletrão-volt
+				eletrão-volt
 			
 			
 				GHz
@@ -4104,12 +3836,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				píxeis
+			
+			
+				megapíxeis
+			
+			
+				ppp
+				{0} ppp
+				{0} ppp
+			
 			
 				km
 				{0} km
 				{0} km
 			
 			
+				metros
 				{0} m
 				{0} m
 			
@@ -4166,17 +3910,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				smi
+				{0} smi
 				{0} smi
 			
 			
 				{0} lx
 				{0} lx
 			
-			
-				t
-				{0} t
-				{0} t
-			
 			
 				kg
 				{0} kg
@@ -4213,9 +3953,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} oz t
 				{0} oz t
 			
-			
-				{0} ct
-				{0} ct
+			
+				massas da Terra
 			
 			
 				GW
@@ -4241,11 +3980,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mW
 				{0} mW
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -4266,6 +4000,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -4337,7 +4076,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} l
 			
 			
-				chám
+				chám
 				{0} chám
 				{0} chám
 			
@@ -4366,7 +4105,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cháv.
 			
 			
-				onças fluidas imp.
+				onças fluidas imp.
 				{0} onça fluida imp.
 				{0} onças fluidas imp.
 			
@@ -4375,11 +4114,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cs
 				{0} cs
 			
+			
+				cc
+				{0} cc
+				{0} cc
+			
 			
-				{0} E
-				{0} N
-				{0} S
-				{0} O
+				{0} E
 			
 		
 		
@@ -4422,6 +4163,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} h
 			
 			
+				min
 				{0} min
 				{0} min
 			
@@ -4430,7 +4172,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/s
 			
 			
-				ms
 				{0} ms
 				{0} ms
 			
@@ -4440,6 +4181,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} km
 			
 			
+				metro
 				{0} m
 				{0} m
 			
@@ -4508,7 +4250,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mi/h
 			
 			
-				°C
 				{0}°C
 				{0}°C
 			
@@ -4538,6 +4279,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			{0}, {1}
 			{0}, {1}
+			{0} e {1}
+			{0} e {1}
 		
 		
 			{0}, {1}
@@ -4553,7 +4296,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} – diversos
 		{0} – outro
 		{0} – escritas
-		{0} traço
 		desenho enquadrado
 		ponto ou estrela
 		jamo consoante
diff --git a/make/data/cldr/common/main/pt_ST.xml b/make/data/cldr/common/main/pt_ST.xml
index 37f7d237e14..4e0775545dd 100644
--- a/make/data/cldr/common/main/pt_ST.xml
+++ b/make/data/cldr/common/main/pt_ST.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/pt_TL.xml b/make/data/cldr/common/main/pt_TL.xml
index 64e4fdf051c..15f3076d474 100644
--- a/make/data/cldr/common/main/pt_TL.xml
+++ b/make/data/cldr/common/main/pt_TL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/qu.xml b/make/data/cldr/common/main/qu.xml
index 31e1095dde5..e0a7b519ae5 100644
--- a/make/data/cldr/common/main/qu.xml
+++ b/make/data/cldr/common/main/qu.xml
@@ -7,56 +7,84 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
 		
 			Afrikaans Simi
+			Aghem Simi
+			Akan Simi
 			Amarico Simi
 			Arabe Simi
 			Mapuche Simi
 			Asames Simi
+			Asu Simi
+			Asturiano Simi
 			Aymara Simi
 			Azerbaiyano Simi
+			Azerí Simi
 			Baskir Simi
+			Basaa Simi
 			Bielorruso Simi
+			Bemba Simi
+			Bena Simi
 			Bulgaro Simi
+			Bambara Simi
 			Bangla Simi
 			Tibetano Simi
 			Breton Simi
+			Bodo Simi
 			Bosnio Simi
 			Catalan Simi
+			Chakma Simi
+			Checheno Simi
+			Cebuano Simi
+			Kiga Simi
 			Cheroqui Simi
 			Chawpi Kurdo Simi
 			Corso Simi
 			Checo Simi
+			Eslavo Eclesiástico Simi
 			Gales Simi
 			Danes Simi
+			Taita Simi
 			Aleman Simi
+			Zarma Simi
 			Bajo Sorbio Simi
+			Duala Simi
 			Divehi Simi
+			Jola-Fonyi Simi
+			Butanés Simi
+			Embu Simi
+			Ewé Simi
 			Griego Simi
 			Ingles Simi
 			Ingles Simi (GB)
 			Ingles Simi (US)
+			Esperanto Simi
 			Español Simi
 			Español Simi (Latino América)
 			Estonio Simi
 			Euskera Simi
+			Ewondo Simi
 			Persa Simi
 			Fulah Simi
 			Fines Simi
 			Filipino Simi
 			Feroes Simi
 			Frances Simi
+			Friulano Simi
 			Frison Simi
 			Irlandes Simi
 			Gaelico Escoces Simi
 			Gallego Simi
 			Alsaciano Simi
 			Gujarati Simi
+			Guzí Simi
+			Manés Simi
 			Hausa Simi
+			Hawaiano Simi
 			Hebreo Simi
 			Hindi Simi
 			Hmong Daw Simi
@@ -65,6 +93,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Haitiano Criollo Simi
 			Hungaro Simi
 			Armenio Simi
+			Interlingua Simi
 			Indonesio Simi
 			Igbo Simi
 			Yi Simi
@@ -72,18 +101,50 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Italiano Simi
 			Inuktitut Simi
 			Japones Simi
+			Ngomba Simi
+			Machame Simi
+			Javanés Simi
 			Georgiano Simi
+			Cabilio Simi
+			Kamba Simi
+			Makonde Simi
+			Caboverdiano Simi
+			Koyra Chiini Simi
+			Kikuyu Simi
 			Kazajo Simi
+			Kako Simi
 			Groenlandes Simi
+			Kalenjin Simi
 			Khmer Simi
 			Kannada Simi
 			Coreano Simi
 			Konkani Simi
+			Cachemir Simi
+			Shambala Simi
+			Bafia Simi
+			Kölsch Simi
+			Kurdo Simi
+			Córnico Simi
 			Kirghiz Simi
+			Latín Simi
+			Langi Simi
 			Luxemburgues Simi
+			Luganda Simi
+			Lakota Simi
+			Lingala Simi
 			Lao Simi
+			Luri septentrional Simi
 			Lituano Simi
+			Luba-Katanga Simi
+			Luo Simi
+			Luyia Simi
 			Leton Simi
+			Masai Simi
+			Meru Simi
+			Mauriciano Simi
+			Malgache Simi
+			Makhuwa-Meetto Simi
+			Metaʼ Simi
 			Maori Simi
 			Macedonio Simi
 			Malayalam Simi
@@ -92,122 +153,214 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Marathi Simi
 			Malayo Simi
 			Maltes Simi
+			Mundang Simi
+			Idiomas M´últiples Simi
+			Birmano Simi
+			Mazandaraní Simi
+			Nama Simi
+			Noruego Bokmål Simi
+			Ndebele septentrional Simi
+			Bajo Alemán Simi
 			Nepali Simi
 			Neerlandes Simi
+			Flamenco Simi
+			Kwasio Ngumba Simi
+			Noruego Nynorsk Simi
+			Ngiemboon Simi
 			Noruego Simi
 			Sesotho Sa Leboa Simi
+			Nuer Simi
+			Nyanja Simi
+			Nyankole Simi
 			Occitano Simi
+			Oromo Simi
 			Odia Simi
+			Osetio Simi
 			Punyabi Simi
 			Papiamento Simi
 			Polaco Simi
+			Prusiano Simi
 			Pashto Simi
 			Portugues Simi
 			Runasimi
 			Kʼicheʼ Simi
 			Romanche Simi
+			Rundi Simi
 			Rumano Simi
+			Rombo Simi
 			Ruso Simi
 			Kinyarwanda Simi
+			Rwa Simi
 			Sanscrito Simi
 			Sakha Simi
+			Samburu Simi
+			Sangu Simi
 			Sindhi Simi
 			Chincha Sami Simi
+			Sena Simi
+			Koyraboro Senni Simi
+			Sango Simi
+			Tashelhit Simi
 			Cingales Simi
 			Eslovaco Simi
 			Esloveno Simi
+			Samoano Simi
 			Qulla Sami Simi
 			Sami Lule Simi
 			Sami Inari Simi
 			Sami Skolt Simi
+			Shona Simi
+			Somali Simi
 			Albanes Simi
 			Serbio Simi
+			Soto Meridional Simi
+			Sundanés Simi
 			Sueco Simi
 			Suajili Simi
 			Suajili Simi (Congo (RDC))
 			Siriaco Simi
 			Tamil Simi
 			Telugu Simi
+			Teso Simi
 			Tayiko Simi
 			Tailandes Simi
 			Tigriña Simi
 			Turcomano Simi
 			Setsuana Simi
+			Tongano Simi
 			Turco Simi
 			Tartaro Simi
+			Tasawaq Simi
+			Tamazight Simi
 			Uigur Simi
 			Ucraniano Simi
+			Mana Riqsisqa Simi
 			Urdu Simi
 			Uzbeko Simi
+			Vai Simi
 			Vietnamita Simi
+			Volapük Simi
+			Vunjo Simi
+			Walser Simi
 			Wolof Simi
 			Isixhosa Simi
+			Soga Simi
+			Yangben Simi
+			Yiddish Simi
 			Yoruba Simi
+			Cantonés Simi
+			Chino Cantonés Simi
+			Bereber Marroquí Estándar Simi
 			Chino Simi
+			Chino Mandarín Simi
+			Chino Simplificado Simi
+			Chino Mandarín Simplificado Simi
+			Chino Tradicional Simi
+			Chino Mandarín Tradicional Simi
 			Isizulu Simi
+			Sin contenido linguístico
 		
 		
+			Islas Ascensión
 			Andorra
+			Emiratos Árabes Unidos
 			Afganistán
+			Antigua y Barbuda
+			Anguila
 			Albania
 			Armenia
 			Angola
+			Antártida
 			Argentina
 			Samoa Americana
 			Austria
 			Australia
+			Aruba
+			Islas Åland
 			Azerbaiyán
+			Bosnia y Herzegovina
+			Barbados
 			Bangladesh
 			Bélgica
+			Burkina Faso
 			Bulgaria
 			Baréin
 			Burundi
 			Benín
+			San Bartolomé
+			Bermudas
 			Brunéi
 			Bolivia
 			Bonaire
 			Brasil
 			Bahamas
 			Bután
+			Isla Bouvet
 			Botsuana
 			Belarús
+			Belice
+			Canadá
 			Islas Cocos
 			Congo (RDC)
+			Congo (RDC)
+			República Centroafricana
 			Congo
+			Congo
 			Suiza
 			Côte d’Ivoire
+			Côte d’Ivoire
+			Islas Cook
 			Chile
 			Camerún
 			China
 			Colombia
+			Isla Clipperton
 			Costa Rica
 			Cuba
+			Cabo Verde
 			Curazao
 			Isla Christmas
 			Chipre
+			Chequia
+			República Checa
 			Alemania
+			Diego García
 			Yibuti
 			Dinamarca
 			Dominica
+			República Dominicana
 			Argelia
+			Ceuta y Melilla
 			Ecuador
 			Estonia
 			Egipto
+			Sahara Occidental
 			Eritrea
 			España
 			Etiopía
 			Finlandia
 			Fiyi
+			Islas Malvinas
+			Islas Malvinas
 			Micronesia
+			Islas Feroe
 			Francia
 			Gabón
 			Reino Unido
+			Reino Unido
+			Granada
+			Georgia
+			Guayana Francesa
 			Guernesey
 			Ghana
+			Gibraltar
+			Groenlandia
 			Gambia
 			Guinea
+			Guadalupe
 			Guinea Ecuatorial
 			Grecia
+			Georgia del Sur e Islas Sandwich del Sur
 			Guatemala
 			Guam
 			Guinea-Bisáu
@@ -217,15 +370,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Honduras
 			Croacia
 			Haití
+			Hungría
+			Islas Canarias
 			Indonesia
+			Irlanda
 			Israel
+			Isla de Man
 			India
+			Territorio Británico del Océano Índico
 			Irak
 			Irán
 			Islandia
 			Italia
 			Jersey
+			Jamaica
 			Jordania
+			Japón
 			Kenia
 			Kirguistán
 			Camboya
@@ -235,9 +395,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Corea del Norte
 			Corea del Sur
 			Kuwait
+			Islas Caimán
 			Kazajistán
 			Laos
 			Líbano
+			Santa Lucia
 			Liechtenstein
 			Sri Lanka
 			Liberia
@@ -245,23 +407,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Lituania
 			Luxemburgo
 			Letonia
+			Libia
 			Marruecos
 			Mónaco
 			Moldova
+			Montenegro
 			San Martín
 			Madagascar
 			Islas Marshall
 			Macedonia del Norte
 			Malí
 			Myanmar
+			Mongolia
 			Macao RAE
 			Islas Marianas del Norte
+			Martinica
 			Mauritania
+			Montserrat
 			Malta
 			Mauricio
 			Maldivas
 			Malawi
 			México
+			Malasia
 			Mozambique
 			Namibia
 			Nueva Caledonia
@@ -273,6 +441,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Noruega
 			Nepal
 			Nauru
+			Niue
+			Nueva Zelanda
 			Omán
 			Panamá
 			Perú
@@ -289,15 +459,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Palaos
 			Paraguay
 			Qatar
+			Reunión
+			Rumania
 			Serbia
 			Rusia
 			Ruanda
 			Arabia Saudí
+			Islas Salomón
 			Seychelles
 			Sudán
 			Suecia
 			Singapur
+			Santa Elena
 			Eslovenia
+			Svalbard y Jan Mayen
 			Eslovaquia
 			Sierra Leona
 			San Marino
@@ -310,37 +485,121 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Sint Maarten
 			Siria
 			Suazilandia
+			Suazilandia
+			Tristán de Acuña
+			Islas Turcas y Caicos
 			Chad
 			Territorios Australes Franceses
 			Togo
 			Tailandia
 			Tayikistán
+			Tokelau
 			Timor-Leste
+			Timor-Leste
+			Turkmenistán
 			Túnez
 			Tonga
 			Turquía
 			Trinidad y Tobago
+			Tuvalu
+			Taiwán
 			Tanzania
+			Ucrania
 			Uganda
 			Islas menores alejadas de los EE.UU.
 			Estados Unidos
+			Estados Unidos
 			Uruguay
 			Uzbekistán
 			Santa Sede (Ciudad del Vaticano)
+			San Vicente y las Granadinas
 			Venezuela
+			Islas Vírgenes Británicas
 			EE.UU. Islas Vírgenes
 			Vietnam
 			Vanuatu
 			Wallis y Futuna
 			Samoa
+			Kosovo
 			Yemen
+			Mayotte
 			Sudáfrica
 			Zambia
 			Zimbabue
 		
-		
-			Valenciano Simi
-		
+		
+			Intiwatana
+			Imayna Qullqi kaynin
+			Ñiqinchana
+			qullqi
+			Ciclo de Horas (12 vs 24)
+			Siqi paway kaynin
+			Tupuy Kamay
+			Yupaykuna
+		
+		
+			Budista Intiwatana
+			Chino Intiwatana
+			Dangi Intiwatana
+			Etiope Intiwatana
+			Gregoriano Intiwatana
+			Hebreo Intiwatana
+			Islamico Intiwatana
+			ISO-8601 Intiwatana
+			Japones Intiwatana
+			Persa Intiwatana
+			Minguo Intiwatana
+			Yupana Qullqi imayna kaynin
+			Estandar nisqa qullqi imayna kaynin
+			Ñawpaqchasqa Unicode Nisqa Ñiqinchana
+			Llapanpaq maskana
+			Estandar nisqa Ñiqinchana
+			12 hora kaynin (0–11)
+			12 hora kaynin (1–12)
+			24 hora kaynin (0–23)
+			24 hora kaynin (1–24)
+			Siqi paway chinkachiy kaynin
+			Siqi paway Normal kaynin
+			Siqi paway Chiqa kaynin
+			Metrico Kamay
+			Metrico Ingles Kamay
+			Metrico Americano Kamay
+			Arabe Sananpakuna
+			Arabe Mirachisqa Sananpakuna
+			Armenio Sananpakuna
+			Armenio Uchuy Sananpakuna
+			Bangla Sananpakuna
+			Devanagari Sananpakuna
+			Etiope Sananpakuna
+			Llapan kinray Sananpakuna
+			Gregoriano Yupaykuna
+			Griego Yupaykuna
+			Griego Uchuy Yupaykuna
+			Gujarati Sananpakuna
+			Gurmukhi Sananpakuna
+			Chunkachasqa Chino Yupaykuna
+			Uchuyachusqa Chino Yupaypakuna
+			Uchuyachisqa Qullqi Chino Yupaypakuna
+			Kikin Chino Yupaypakuna
+			Kikin Qullqi Chino Yupaypakuna
+			Hebreo Yupaykuna
+			Japones Yupaykuna
+			Japones Qullqi Yupaykuna
+			Khmer Sananpakuna
+			Kannada Sananpakuna
+			Lao Sananpakuna
+			Occidental Sananpakuna
+			Malayalam Sananpakuna
+			Myanmar Sananpakuna
+			Odia Sananpakuna
+			Romano Sananpakuna
+			Roman Uchuy Yupaykuna
+			Kikin Tamil Yupaykuna
+			Tamil Sananpakuna
+			Telegu Sananpakuna
+			Thai Sananpakuna
+			Tibetano Sananpakuna
+		
 	
 	
 		
@@ -352,7 +611,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a {ch} {chʼ} h i k {kʼ} l {ll} m n ñ p {pʼ} q {qʼ} s t {tʼ} u w y]
 		[á à ă â å ä ã ā æ b c ç d e é è ĕ ê ë ē f g í ì ĭ î ï ī j o ó ò ŏ ô ö ø ō œ r ú ù ŭ û ü ū v x ÿ z]
 		[A {Ch} H I K L {Ll} M N Ñ P Q S T U W Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
@@ -448,6 +707,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							MM-y GGGGG – MM-y GGGGG
+							MM-y GGGGG – MM-y GGGGG
+							MM-y – MM-y GGGGG
+						
+						
+							d-MM-y – d–MM-y GGGGG
+							d-MM-y GGGG – d-MM-y GGGGG
+							d-MM-y – d-MM-y GGGGG
+							d-MM-y – d-MM-y GGGGG
+						
+						
+							E, d-MM-y – E, d-MM-y GGGGG
+							E, d-MM-y GGGG – E, d-MM-y GGGGG
+							E, d-MM-y – E, d-MM-y GGGGG
+							E, d-MM-y – E, d-MM-y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							MM–MM
 						
@@ -752,11 +1049,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						BCE
+						BCE
 						d.C.
 						CE
 					
 					
 						BCE
+						BCE
 						d.C.
 						CE
 					
@@ -885,6 +1184,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
+						
+							y G – y G
+							y–y G
+						
+						
+							MM-y GGGGG – MM-y GGGGG
+							MM-y – MM-y GGGGG
+							MM-y – MM-y GGGGG
+						
+						
+							dd-MM-y – dd-MM-y GGGGG
+							dd-MM-y GGGGG – dd-MM-y GGGGG
+							dd-MM-y – dd-MM-y GGGGG
+							dd-MM-y – dd-MM-y GGGGG
+						
+						
+							E, dd-MM-y – E, dd-MM-y GGGGG
+							E, dd-MM-y GGGG – E, dd-MM-y GGGGG
+							E, dd-MM-y – E, dd-MM-y GGGGG
+							E, dd-MM-y – E, dd-MM-y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM y – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d, MMM y G
+							d, MMM y G – d, MMM y G
+							d, MMM – d, MMM y G
+							d, MMM y – d, MMM y G
+						
+						
+							E, d MMM – E, d MMM y G
+							E, d MMM y G – E, d MMM y G
+							E, d MMM d – E, d MMM y G
+							E, d MMM y – E, d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -1522,6 +1859,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Honolulu
 			
+			
+				
+					Tiqsimuyuntin Tupachisqa Hora
+				
+			
+			
+				Mana risisqa llaqta
+			
 			
 				Andorra
 			
@@ -1535,13 +1880,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Antigua
 			
 			
-				Anguilla
+				Anguila
 			
 			
-				Tirane
+				Tirana
 			
 			
-				Yerevan
+				Ereván
 			
 			
 				Luanda
@@ -1616,7 +1961,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Pago Pago
 			
 			
-				Vienna
+				Viena
 			
 			
 				Perth
@@ -1628,7 +1973,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Darwin
 			
 			
-				Adelaide
+				Adelaida
 			
 			
 				Broken Hill
@@ -1646,7 +1991,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Lindeman
 			
 			
-				Sydney
+				Sidney
 			
 			
 				Brisbane
@@ -1676,7 +2021,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Dhaka
 			
 			
-				Brussels
+				Bruselas
 			
 			
 				Ouagadougou
@@ -1685,7 +2030,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Sofia
 			
 			
-				Bahrain
+				Baréin
 			
 			
 				Bujumbura
@@ -1694,7 +2039,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Porto-Novo
 			
 			
-				St. Barthelemy
+				San Bartolomé
 			
 			
 				Bermuda
@@ -1769,7 +2114,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Minsk
 			
 			
-				Belize
+				Belice
 			
 			
 				Dawson
@@ -1853,7 +2198,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Blanc-Sablon
 			
 			
-				St. John’s
+				San Juan de Terranova
 			
 			
 				Cocos
@@ -1874,7 +2219,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Zurich
 			
 			
-				Abidjan
+				Abiyán
 			
 			
 				Rarotonga
@@ -1889,13 +2234,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Santiago
 			
 			
-				Douala
+				Duala
 			
 			
 				Urumqi
 			
 			
-				Shanghai
+				Shangái
 			
 			
 				Bogota
@@ -1904,13 +2249,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Costa Rica
 			
 			
-				Havana
+				La Habana
 			
 			
-				Cape Verde
+				Cabo Verde
 			
 			
-				Curacao
+				Curazao
 			
 			
 				Christmas
@@ -1922,7 +2267,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Famagusta
 			
 			
-				Prague
+				Praga
 			
 			
 				Busingen
@@ -1931,10 +2276,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Berlin
 			
 			
-				Djibouti
+				Yibuti
 			
 			
-				Copenhagen
+				Copenhague
 			
 			
 				Dominica
@@ -1943,7 +2288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Santo Domingo
 			
 			
-				Algiers
+				Argel
 			
 			
 				Galapagos
@@ -1955,7 +2300,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tallinn
 			
 			
-				Cairo
+				El Cairo
 			
 			
 				El Aaiun
@@ -1964,7 +2309,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Asmara
 			
 			
-				Canary
+				Canarias
 			
 			
 				Ceuta
@@ -1973,7 +2318,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Madrid
 			
 			
-				Addis Ababa
+				Adís Abeba
 			
 			
 				Helsinki
@@ -2003,13 +2348,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Libreville
 			
 			
-				London
+				
+					Hora de Verano Británico
+				
+				Londres
 			
 			
-				Grenada
+				Granada
 			
 			
-				Tbilisi
+				Tiflis
 			
 			
 				Cayenne
@@ -2018,7 +2366,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Guernsey
 			
 			
-				Accra
+				Acra
 			
 			
 				Gibraltar
@@ -2042,7 +2390,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Conakry
 			
 			
-				Guadeloupe
+				Guadalupe
 			
 			
 				Malabo
@@ -2051,7 +2399,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Athens
 			
 			
-				South Georgia
+				Georgia del Sur
 			
 			
 				Guatemala
@@ -2075,31 +2423,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Zagreb
 			
 			
-				Port-au-Prince
+				Puerto Príncipe
 			
 			
 				Budapest
 			
 			
-				Jakarta
+				Yakarta
 			
 			
 				Pontianak
 			
 			
-				Makassar
+				Macasar
 			
 			
 				Jayapura
 			
 			
+				
+					Hora Estandar de Irlanda
+				
 				Dublin
 			
 			
 				Jerusalem
 			
 			
-				Isle of Man
+				Isla de Man
 			
 			
 				Kolkata
@@ -2108,16 +2459,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Chagos
 			
 			
-				Baghdad
+				Bagdad
 			
 			
-				Tehran
+				Teherán
 			
 			
 				Reykjavik
 			
 			
-				Rome
+				Roma
 			
 			
 				Jersey
@@ -2126,10 +2477,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Jamaica
 			
 			
-				Amman
+				Amán
 			
 			
-				Tokyo
+				Tokio
 			
 			
 				Nairobi
@@ -2153,13 +2504,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Comoro
 			
 			
-				St. Kitts
+				San Cristobal
 			
 			
-				Pyongyang
+				Pionyang
 			
 			
-				Seoul
+				Seúl
 			
 			
 				Kuwait
@@ -2168,7 +2519,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Cayman
 			
 			
-				Aqtau
+				Aktau
 			
 			
 				Oral
@@ -2177,10 +2528,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Atyrau
 			
 			
-				Aqtobe
+				Aktobe
+			
+			
+				Kostanái
 			
 			
-				Qyzylorda
+				Kyzylorda
 			
 			
 				Almaty
@@ -2192,7 +2546,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Beirut
 			
 			
-				St. Lucia
+				Santa Lucia
 			
 			
 				Vaduz
@@ -2210,7 +2564,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Vilnius
 			
 			
-				Luxembourg
+				Luxemburgo
 			
 			
 				Riga
@@ -2249,25 +2603,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Bamako
 			
 			
-				Rangoon
+				Rangún
 			
 			
 				Hovd
 			
 			
-				Ulaanbaatar
+				Ulan Bator
 			
 			
 				Choibalsan
 			
 			
-				Macau
+				Macao
 			
 			
 				Saipan
 			
 			
-				Martinique
+				Martinica
 			
 			
 				Nouakchott
@@ -2282,7 +2636,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mauritius
 			
 			
-				Maldives
+				Maldivas
 			
 			
 				Blantyre
@@ -2309,7 +2663,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Monterrey
 			
 			
-				Mexico City
+				Ciudad de Mexico
 			
 			
 				Matamoros
@@ -2354,7 +2708,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Oslo
 			
 			
-				Kathmandu
+				Katmandú
 			
 			
 				Nauru
@@ -2369,7 +2723,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Auckland
 			
 			
-				Muscat
+				Mascate
 			
 			
 				Panama
@@ -2399,7 +2753,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Karachi
 			
 			
-				Warsaw
+				Varsovia
 			
 			
 				Miquelon
@@ -2423,7 +2777,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Madeira
 			
 			
-				Lisbon
+				Lisboa
 			
 			
 				Palau
@@ -2432,28 +2786,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Asuncion
 			
 			
-				Qatar
+				Catar
 			
 			
 				Reunion
 			
 			
-				Bucharest
+				Bucarest
 			
 			
 				Belgrade
 			
 			
-				Kaliningrad
+				Kaliningrado
 			
 			
 				Simferopol
 			
 			
-				Moscow
+				Moscú
 			
 			
-				Volgograd
+				Volgogrado
 			
 			
 				Saratov
@@ -2471,7 +2825,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Samara
 			
 			
-				Yekaterinburg
+				Ekaterinburgo
 			
 			
 				Omsk
@@ -2528,7 +2882,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Kigali
 			
 			
-				Riyadh
+				Riad
 			
 			
 				Guadalcanal
@@ -2537,19 +2891,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mahe
 			
 			
-				Khartoum
+				Jartum
 			
 			
-				Stockholm
+				Estocolmo
 			
 			
-				Singapore
+				Singapur
 			
 			
-				St. Helena
+				Santa Elena
 			
 			
-				Ljubljana
+				Liubliana
 			
 			
 				Longyearbyen
@@ -2567,7 +2921,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Dakar
 			
 			
-				Mogadishu
+				Mogadiscio
 			
 			
 				Paramaribo
@@ -2585,7 +2939,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Lower Prince’s Quarter
 			
 			
-				Damascus
+				Damasco
 			
 			
 				Mbabane
@@ -2606,7 +2960,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Bangkok
 			
 			
-				Dushanbe
+				Dusambé
 			
 			
 				Fakaofo
@@ -2615,19 +2969,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Dili
 			
 			
-				Ashgabat
+				Asjabad
 			
 			
-				Tunis
+				Tunez
 			
 			
 				Tongatapu
 			
 			
-				Istanbul
+				Estambul
 			
 			
-				Port of Spain
+				Puerto España
 			
 			
 				Funafuti
@@ -2662,6 +3016,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Nome
 			
+			
+				Johnston
+			
 			
 				Anchorage
 			
@@ -2744,16 +3101,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Montevideo
 			
 			
-				Samarkand
+				Samarcanda
 			
 			
-				Tashkent
+				Taskent
 			
 			
-				Vatican
+				El Vaticano
 			
 			
-				St. Vincent
+				San Vicente
 			
 			
 				Caracas
@@ -2762,7 +3119,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tortola
 			
 			
-				St. Thomas
+				Santo Tomas
 			
 			
 				Ho Chi Minh
@@ -2783,7 +3140,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mayotte
 			
 			
-				Johannesburg
+				Johannesburgo
 			
 			
 				Lusaka
@@ -2793,40 +3150,167 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Afghanistan Time
+					Hora de Afganistán
+				
+			
+			
+				
+					Hora de Africa Central
+				
+			
+			
+				
+					Hora de Africa Oriental
+				
+			
+			
+				
+					Hora de Sudafrica
+				
+			
+			
+				
+					Hora de Africa Occidental
+					Hora Estandar de Africa Occidental
+					Hora Estandar de Verano de Africa Occidental
+				
+			
+			
+				
+					Hora de Alaska
+					Hora Estandar de Alaska
+					Hora de Verano de Alaska
+				
+			
+			
+				
+					Hora de Amazonas
+					Hora Estandar de Amazonas
+					Hora de Verano de Amazonas
+				
+			
+			
+				
+					Hora Central
+					Estandard Hora Central
+					Hora Central de Verano
+				
+			
+			
+				
+					Hora del Este
+					Hora Estandar del Este
+					Hora de Verano del Este
+				
+			
+			
+				
+					Hora de la Montaña
+					Hora Estandar de la Montaña
+					Hora de Verano de la Montaña
+				
+			
+			
+				
+					Hora del Pacífico
+					Hora Estandar del Pacífico
+					Hora de Verano del Pacífico
+				
+			
+			
+				
+					Hora de Apia
+					Hora Estandar de Apia
+					Hora de Verano de Apia
+				
+			
+			
+				
+					Hora de Arabia
+					Hora Estandar de Arabia
+					Hora de Verano de Arabia
 				
 			
 			
 				
-					Argentina Time
-					Argentina Standard Time
-					Argentina Summer Time
+					Hora de Argentina
+					Hora Estandar de Argentina
+					Hora de Verano de Argentina
+				
+			
+			
+				
+					Hora del Oeste de Argentina
+					Hora Estandar del Oeste de Argentina
+					Hora de Verano del Oeste de Argentina
 				
 			
 			
 				
-					Armenia Time
-					Armenia Standard Time
-					Armenia Summer Time
+					Hora de Armenia
+					Hora Estandar de Armenia
+					Hora de Verano de Armenia
+				
+			
+			
+				
+					Hora del Atlántico
+					Hora Estandar del Atlántico
+					Hora De Verano del Atlántico
+				
+			
+			
+				
+					Hora de Australia Central
+					Hora Estandar de Australia Central
+					Hora de Verano de Australia Central
+				
+			
+			
+				
+					Hora de Australia Central Occidental
+					Hora Estandar de Australia Central Occidental
+					Hora de Verano de Australia Central Occidental
+				
+			
+			
+				
+					Hora de Australia Oriental
+					Hora Estandar de Australia Oriental
+					Hora de Verano de Australia Oriental
+				
+			
+			
+				
+					Hora de Australia Occidental
+					Hora Estandar de Australia Occidental
+					Hora de Verano de Australia Occidental
 				
 			
 			
 				
-					Azerbaijan Time
-					Azerbaijan Standard Time
-					Azerbaijan Summer Time
+					Hora de Azerbaiyán
+					Hora Estandar de Azerbaiyán
+					Hora de Verano de Azerbaiyán
+				
+			
+			
+				
+					Hora de las Azores
+					Hora Estandar de las Azores
+					Hora de Verano de las Azores
 				
 			
 			
 				
-					Bangladesh Time
-					Bangladesh Standard Time
-					Bangladesh Summer Time
+					Hora de Bangladesh
+					Hora Estandar de Bangladesh
+					Hora de Verano de Bangladesh
 				
 			
 			
 				
-					Bhutan Time
+					Hora de Bután
 				
 			
 			
@@ -2834,292 +3318,718 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Bolivia Time
 				
 			
+			
+				
+					Hora de Brasilia
+					Hora Estandar de Brasilia
+					Hora de Verano de Brasilia
+				
+			
 			
 				
-					Brunei Darussalam Time
+					Hora de Brunei Darussalam
+				
+			
+			
+				
+					Hora de Cabo Verde
+					Hora Estandar de Cabo Verde
+					Hora de Verano de Cabo Verde
+				
+			
+			
+				
+					Hora Estandar de Chamorro
+				
+			
+			
+				
+					Hora de Chatham
+					Hora Estandar de Chatham
+					Hora de Verano de Chatham
 				
 			
 			
 				
-					Chile Time
-					Chile Standard Time
-					Chile Summer Time
+					Hora de Chile
+					Hora Estandar de Chile
+					Hora de Verano de Chile
 				
 			
 			
 				
-					China Time
-					China Standard Time
-					China Daylight Time
+					Hora de China
+					Hora Estandar de China
+					Hora de Verano de China
+				
+			
+			
+				
+					Hora de Choybalsan
+					Hora Estandar de Choybalsan
+					Hora de Verano de Choybalsan
+				
+			
+			
+				
+					Hora de Isla Christmas
+				
+			
+			
+				
+					Hora de Islas Cocos
 				
 			
 			
 				
-					Colombia Time
-					Colombia Standard Time
-					Colombia Summer Time
+					Hora de Colombia
+					Hora Estandar de Colombia
+					Hora de Verano de Colombia
 				
 			
 			
 				
-					Cook Islands Time
-					Cook Islands Standard Time
-					Cook Islands Half Summer Time
+					Hora de Islas Cook
+					Hora Estandar de Isla Cocos
+					Hora de Verano de Isla Cocos
 				
 			
 			
 				
-					Cuba Time
-					Cuba Standard Time
-					Cuba Daylight Time
+					Hora de Cuba
+					Hora Estandar de Cuba
+					Hora de Verano de Cuba
+				
+			
+			
+				
+					Hora de Davis
+				
+			
+			
+				
+					Hora de Dumont-d’Urville
+				
+			
+			
+				
+					Hora de Timor Oriental
+				
+			
+			
+				
+					Hora de Isla de Pascua
+					Hora Estandar de Isla de Pascua
+					Hora de Verano de Isla de Pascua
 				
 			
 			
 				
-					Ecuador Time
+					Hora de Ecuador
+				
+			
+			
+				
+					Hora de Europa Central
+					Hora Estandar de Europa Central
+					Hora de Verano de Europa Central
+				
+			
+			
+				
+					Hora de Europa Oriental
+					Hora Estandar de Europa Oriental
+					Hora de Verano de Europa Oriental
+				
+			
+			
+				
+					Hora de Verano más Oriental de Europa
+				
+			
+			
+				
+					Hora de Europa Occidental
+					Hora Estandar de Europa Occidental
+					Hora de Verano de Europa Occidental
 				
 			
 			
 				
-					Falkland Islands Time
-					Falkland Islands Standard Time
-					Falkland Islands Summer Time
+					Hora de Islas Malvinas
+					Hora Estandar de Islas Malvinas
+					Hora de Verano de Islas Malvinas
 				
 			
 			
 				
-					Fiji Time
-					Fiji Standard Time
-					Fiji Summer Time
+					Hora de Fiji
+					Hora Estandar de Fiji
+					Hora de Verano de Fiji
 				
 			
 			
 				
-					French Guiana Time
+					Hora de Guayana Francesa
+				
+			
+			
+				
+					Hora Francés meridional y antártico
+				
+			
+			
+				
+					Hora de Islas Galápagos
+				
+			
+			
+				
+					Hora de Gambier
 				
 			
 			
 				
-					Georgia Time
-					Georgia Standard Time
-					Georgia Summer Time
+					Hora de Georgia
+					Hora Estandar de Georgia
+					Hora de Verano de Georgia
+				
+			
+			
+				
+					Hora de Islas Gilbert
+				
+			
+			
+				
+					Hora del Meridiano de Greenwich
 				
 			
 			
 				
-					East Greenland Time
-					East Greenland Standard Time
-					East Greenland Summer Time
+					Hora de Groenlandia
+					Hora Estandar de Groenlandia
+					Hora de Verano de Groenlandia
+				
+			
+			
+				
+					Hora de Groenlandia Occidental
+					Hora Estandar de Groenlandia Occidental
+					Hora de Verano de Groenlandia Occidental
+				
+			
+			
+				
+					Hora Estandar del Golfo
+				
+			
+			
+				
+					Hora de Guyana
+				
+			
+			
+				
+					Hora de Hawai-Aleutiano
+					Hora Estandar de Hawai-Aleutiano
+					Hora de Verano de Hawai-Aleutiano
 				
 			
 			
 				
-					Hong Kong Time
-					Hong Kong Standard Time
-					Hong Kong Summer Time
+					Hora de Hong Kong
+					Hora Estandar de Hong Kong
+					Hora de Verano de Hong Kong
+				
+			
+			
+				
+					Hora de Hovd
+					Hora Estandar de Hovd
+					Hora de Verano de Hovd
 				
 			
 			
 				
-					India Standard Time
+					Hora Estandar de India
+				
+			
+			
+				
+					Hora del Oceano Índico
+				
+			
+			
+				
+					Hora de Indochina
 				
 			
 			
 				
-					Central Indonesia Time
+					Hora de Indonesia Central
 				
 			
 			
 				
-					Eastern Indonesia Time
+					Hora de Indonesia Oriental
+				
+			
+			
+				
+					Hora de Indonesia Occidental
 				
 			
 			
 				
-					Iran Time
-					Iran Standard Time
-					Iran Daylight Time
+					Hora de Irán
+					Hora Estandar de Irán
+					Hora de Verano de Irán
+				
+			
+			
+				
+					Hora de Irkutsk
+					Hora Estandar de Irkutsk
+					Hora de Verano de Irkutsk
 				
 			
 			
 				
-					Israel Time
-					Israel Standard Time
-					Israel Daylight Time
+					Hora de Israel
+					Hora Estandar de Israel
+					Hora de Verano de Israel
 				
 			
 			
 				
-					Japan Time
-					Japan Standard Time
-					Japan Daylight Time
+					Hora de Japón
+					Hora Estandar de Japón
+					Hora de Verano de Japón
 				
 			
 			
 				
-					East Kazakhstan Time
+					Hora de Kazajistán Oriental
 				
 			
 			
 				
-					West Kazakhstan Time
+					Hora de Kazajistán del Oeste
+				
+			
+			
+				
+					Hora de Corea
+					Hora Estandar de Corea
+					Hora de Verano de Corea
+				
+			
+			
+				
+					Hora de Kosrae
+				
+			
+			
+				
+					Hora de Krasnoyarsk
+					Hora Estandar de Krasnoyarsk
+					Hora de Verano de Krasnoyarsk
+				
+			
+			
+				
+					Hora de Kirguistán
+				
+			
+			
+				
+					Hora de Espóradas Ecuatoriales
+				
+			
+			
+				
+					Hora de Lord Howe
+					Hora Estandar de Lord Howe
+					Hora de Verano de Lord Howe
+				
+			
+			
+				
+					Hora de Isla Macquarie
+				
+			
+			
+				
+					Hora de Magadan
+					Hora Estandar de Magadan
+					Hora de Verano de Magadan
 				
 			
 			
 				
-					Malaysia Time
+					Hora de Malasia
 				
 			
 			
 				
-					Maldives Time
+					Hora de Maldivas
+				
+			
+			
+				
+					Hora de Marquesas
+				
+			
+			
+				
+					Hora de Islas Marshall
 				
 			
 			
 				
-					Mauritius Time
-					Mauritius Standard Time
-					Mauritius Summer Time
+					Hora de Mauricio
+					Hora Estandar de Mauricio
+					Hora de Verano de Mauricio
+				
+			
+			
+				
+					Hora de Mawson
+				
+			
+			
+				
+					Hora Estandar de Verano de México
+					Hora Estandar del Noroeste de México
+					Hora de Verano del Noroeste de México
+				
+			
+			
+				
+					Hora del Pacífico Mexicano
+					Hora Estandar del Pacífico Mexicano
+					Hora de Verano del Pacífico Mexicano
+				
+			
+			
+				
+					Hora de Ulán Bator
+					Hora Estandar de Ulán Bator
+					Hora de Verano de Ulán Bator
+				
+			
+			
+				
+					Hora de Moscú
+					Hora Estandar de Moscú
+					Hora de Verano de Moscú
 				
 			
 			
 				
-					Myanmar Time
+					Hora de Myanmar
 				
 			
 			
 				
-					Nauru Time
+					Hora de Nauru
 				
 			
 			
 				
-					Nepal Time
+					Hora de Nepal
 				
 			
 			
 				
-					New Caledonia Time
-					New Caledonia Standard Time
-					New Caledonia Summer Time
+					Hora de Nueva Caledonia
+					Hora Estandar de Nueva Caledonia
+					Hora de Verano de Nueva Caledonia
 				
 			
 			
 				
-					New Zealand Time
-					New Zealand Standard Time
-					New Zealand Daylight Time
+					Hora de Nueva Zelanda
+					Hora Estandar de Nueva Zelanda
+					Hora de Verano de Nueva Zelanda
+				
+			
+			
+				
+					Hora de Terranova
+					Hora Estandar de Terranova
+					Hora de Verano de Terranova
 				
 			
 			
 				
-					Niue Time
+					Hora de Niue
+				
+			
+			
+				
+					Hora de la Isla Norfolk
+				
+			
+			
+				
+					Hora de Fernando de Noronha
+					Hora Estandar de Fernando de Noronha
+					Hora de Verano de Fernando de Noronha
+				
+			
+			
+				
+					Hora de Novosibirsk
+					Hora Estandar de Novosibirsk
+					Hora de Verano de Novosibirsk
+				
+			
+			
+				
+					Hora de Omsk
+					Hora Estandar de Omsk
+					Hora de Verano de Omsk
 				
 			
 			
 				
-					Pakistan Time
-					Pakistan Standard Time
-					Pakistan Summer Time
+					Hora de Pakistán
+					Hora Estandar de Pakistán
+					Hora de Verano de Pakistán
 				
 			
 			
 				
-					Palau Time
+					Hora de Palau
 				
 			
 			
 				
-					Papua New Guinea Time
+					Hora de Papua Nueva Guinea
 				
 			
 			
 				
-					Paraguay Time
-					Paraguay Standard Time
-					Paraguay Summer Time
+					Hora de Paraguay
+					Hora Estandar de Paraguay
+					Hora de Verano de Paraguay
 				
 			
 			
+				
+					Hora de Perú
+					Hora Estandar de Perú
+					Hora de Verano de Perú
+				
 				
 					PET
 					PET
 					PEST
 				
 			
+			
+				
+					Hora de Filipinas
+					Hora Estandar de Filipinas
+					Hora de Verano de Filipinas
+				
+			
+			
+				
+					Hora de Islas Phoenix
+				
+			
+			
+				
+					Hora de San Pedro y Miquelón
+					Hora Estandar de San Pedro y Miquelón
+					Hora de Verano de San Pedro y Miquelón
+				
+			
+			
+				
+					Hora de Pitcairn
+				
+			
+			
+				
+					Hora de Pohnpei
+				
+			
+			
+				
+					Hora de Pionyang
+				
+			
 			
 				
-					Reunion Time
+					Hora de Réunion
+				
+			
+			
+				
+					Hora de Rothera
+				
+			
+			
+				
+					Hora de Sakhalin
+					Hora Estandar de Sakhalin
+					Hora de Verano de Sakhalin
 				
 			
 			
 				
-					Samoa Time
-					Samoa Standard Time
-					Samoa Daylight Time
+					Hora de Samoa
+					Hora Estandar de Samoa
+					Hora de Verano de Samoa
 				
 			
 			
 				
-					Seychelles Time
+					Hora de Seychelles
 				
 			
 			
 				
-					Singapore Standard Time
+					Hora Estandar de Singapur
 				
 			
 			
 				
-					Solomon Islands Time
+					Hora de Islas Salomón
+				
+			
+			
+				
+					Hora de Georgia del Sur
+				
+			
+			
+				
+					Hora de Surinam
+				
+			
+			
+				
+					Hora de Syowa
+				
+			
+			
+				
+					Hora de Tahiti
+				
+			
+			
+				
+					Hora de Taipéi
+					Hora Estandar de Taipéi
+					Hora de Verano de Taipéi
 				
 			
 			
 				
-					Tajikistan Time
+					Hora de Tayikistán
 				
 			
 			
 				
-					Tokelau Time
+					Hora de Tokelau
 				
 			
 			
 				
-					Tonga Time
-					Tonga Standard Time
-					Tonga Summer Time
+					Hora de Tonga
+					Hora Estandar de Tonga
+					Hora de Verano de Tonga
+				
+			
+			
+				
+					Hora de Chuuk
 				
 			
 			
 				
-					Turkmenistan Time
-					Turkmenistan Standard Time
-					Turkmenistan Summer Time
+					Hora de Turkmenistán
+					Hora Estandar de Turkmenistán
+					Hora de Verano de Turkmenistán
 				
 			
 			
 				
-					Tuvalu Time
+					Hora de Tuvalu
+				
+			
+			
+				
+					Hora de Uruguay
+					Hora Estandar de Uruguay
+					Hora de Verano de Uruguay
 				
 			
 			
 				
-					Uzbekistan Time
-					Uzbekistan Standard Time
-					Uzbekistan Summer Time
+					Hora de Uzbekistán
+					Hora Estandar de Uzbekistán
+					Hora de Verano de Uzbekistán
 				
 			
 			
 				
-					Vanuatu Time
-					Vanuatu Standard Time
-					Vanuatu Summer Time
+					Hora de Vanuatu
+					Hora Estandar de Vanuatu
+					Hora de Verano de Vanuatu
+				
+			
+			
+				
+					Hora de Venezuela
+				
+			
+			
+				
+					Hora de Vladivostok
+					Hora Estandar de Vladivostok
+					Hora de Verano de Vladivostok
+				
+			
+			
+				
+					Hora de Volgogrado
+					Hora Estandar de Volgogrado
+					Hora de Verano de Volgogrado
+				
+			
+			
+				
+					Hora de Vostok
+				
+			
+			
+				
+					Hora de Isla Wake
 				
 			
 			
 				
-					Wallis & Futuna Time
+					Hora de Wallis y Futuna
+				
+			
+			
+				
+					Hora de Yakutsk
+					Hora Estandar de Yakutsk
+					Hora de Verano de Yakutsk
+				
+			
+			
+				
+					Hora de Ekaterinburgo
+					Hora Estandar de Ekaterinburgo
+					Hora de Verano de Ekaterinburgo
 				
 			
 		
@@ -3219,9 +4129,760 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} {1}
 		
 		
+			
+				AED
+			
+			
+				Afgani Afgano
+				Afgani afgano
+				AFN
+			
+			
+				Lek albanés
+				Lek albanés
+				ALL
+			
+			
+				AMD
+			
+			
+				Florín Antillano Neerlandés
+				Florín antillano neerlandés
+				ANG
+			
+			
+				Kwanza Angoleño
+				Kwanza angoleño
+				AOA
+			
+			
+				Peso Argentino
+				Peso argentino
+				ARS
+			
+			
+				Dólar Australiano
+				Dólar Australiano
+			
+			
+				Florín Arubeño
+				Florín arubeño
+				AWG
+			
+			
+				AZN
+			
+			
+				Marco Bosnioherzegovino
+				Marco bosnioherzegovino
+				BAM
+			
+			
+				Dólar de Barbados
+				Dólar de Barbados
+				BBG
+			
+			
+				Taka Bangladesí
+				Taka bangladesí
+				BDT
+			
+			
+				Lev
+				Lev
+				BGN
+			
+			
+				Dinar Bareiní
+				Dinar bareiní
+				BHD
+			
+			
+				Franco Burundés
+				Franco burundés
+				BIF
+			
+			
+				Dólar Bermudeño
+				Dólar bermudeño
+				DBM
+			
+			
+				Dólar de Brunéi
+				Dólar de Brunéi
+				BND
+			
+			
+				Boliviano
+				Boliviano
+				BOB
+			
+			
+				Real Brasileño
+				Real brasileño
+			
+			
+				Dólar Bahameño
+				Dólar bahameño
+				BSD
+			
+			
+				Ngultrum Butanés
+				Ngultrum butanés
+				BTN
+			
+			
+				Pula Botswano
+				Pula Botswano
+				BWP
+			
+			
+				Nuevo Rublo Bielorruso
+				Nuevo rublo bielorruso
+				BYN
+			
+			
+				Dólar Beliceño
+				Dólar beliceño
+				DBZ
+			
+			
+				Dólar Canadiense
+				Dólar canadiense
+				$CA
+			
+			
+				Franco Congoleño
+				Franco congoleño
+				CDF
+			
+			
+				Franco Suizo
+				Franco suizo
+				CHF
+			
+			
+				Peso Chileno
+				Peso chileno
+				CLP
+			
+			
+				Yuan Chino (offshore)
+				Yuan chino (offshore)
+				CNH
+			
+			
+				Yuan Chino
+				Yuan chino
+			
+			
+				Peso Colombiano
+				Peso colombiano
+				COP
+			
+			
+				Colón Costarricense
+				Colón costarricense
+				CRC
+			
+			
+				Peso Cubano Convertible
+				Peso cubano convertible
+				CUC
+			
+			
+				Peso Cubano
+				Peso cubano
+				CUP
+			
+			
+				Escudo Caboverdiano
+				Escudo caboverdiano
+				CVE
+			
+			
+				Corona Checa
+				Corona checa
+				CZK
+			
+			
+				Franco Yibutiano
+				Franco yibutiano
+				DJF
+			
+			
+				Corona Danesa
+				Corona danesa
+				DKK
+			
+			
+				Peso Dominicano
+				Peso dominicano
+				DOP
+			
+			
+				Dinar Argelino
+				Dinar argelino
+				DZD
+			
+			
+				Libra Egipcia
+				Libra egipcia
+				EGP
+			
+			
+				Nakfa Eritreano
+				Nakfa Eritreano
+				ERN
+			
+			
+				Birr Etíope
+				Birr etíope
+				ETB
+			
+			
+				Euro
+				euro
+			
+			
+				Dólar Fiyiano
+				FJD
+			
+			
+				Libra Malvinense
+				Libra malvinense
+				FKP
+			
+			
+				Libra Esterlina
+				Libra esterlina
+			
+			
+				Lari Georgiano
+				Lari georgiano
+				GEL
+			
+			
+				Cedi Ganés
+				Cedi ganés
+				GHS
+			
+			
+				Libra Gibraltareña
+				Libra gibraltareña
+				GIP
+			
+			
+				Dalasi
+				Dalasi
+				GMD
+			
+			
+				Franco Guineano
+				Franco guineano
+				GNF
+			
+			
+				Quetzal Guatemalteco
+				Quetzal guatemalteco
+				GTQ
+			
+			
+				Dólar Guyanés
+				Dólar guyanés
+				GYD
+			
+			
+				Dólar de Hong Kong
+				Dólar de Hong Kong
+			
+			
+				Lempira Hondureño
+				Lempira hondureño
+				HNL
+			
+			
+				Kuna Croata
+				Kuna croata
+				HRK
+			
+			
+				Gourde Haitiano
+				Gourde haitiano
+				HTG
+			
+			
+				Florín Húngaro
+				Florín húngaro
+				HUF
+			
+			
+				Rupia Indonesia
+				Rupia indonesia
+				IDR
+			
+			
+				Nuevo Séquel
+				Nuevo séquel
+			
+			
+				Rupia India
+				Rupia india
+			
+			
+				Dinar Iraquí
+				Dinar iraquí
+				IQD
+			
+			
+				Rial Iraní
+				Rial iraní
+				IRR
+			
+			
+				Corona Islandesa
+				Corona islandesa
+				ISK
+			
+			
+				Dólar Jamaiquino
+				Dólar jamaiquino
+				JMD
+			
+			
+				Dinar Jordano
+				Dinar jordano
+				JOD
+			
+			
+				Yen Japonés
+				Yen japonés
+			
+			
+				Chelín Keniano
+				Chelín keniano
+				KES
+			
+			
+				Som Kirguís
+				Som kirguís
+				KGS
+			
+			
+				Riel Camboyano
+				Riel camboyano
+				KHR
+			
+			
+				Franco Comorense
+				Franco comorense
+				KMF
+			
+			
+				Won Norcoreano
+				Won norcoreano
+				KPW
+			
+			
+				Won Surcoreano
+				Won surcoreano
+			
+			
+				Dinar Kuwaití
+				Dinar kuwaití
+				KWD
+			
+			
+				Dólar de las Islas Caimán
+				Dólar de las islas caimán
+				KYD
+			
+			
+				Tenge Kazajo
+				Tenge kazajo
+				KZT
+			
+			
+				Kip Laosiano
+				Kip laosiano
+				LAK
+			
+			
+				Libra Libanesa
+				Libra libanesa
+				LBP
+			
+			
+				Rupia de Sri Lanka
+				Rupia de Sri Lanka
+				LKR
+			
+			
+				Dólar Liberiano
+				Dólar liberiano
+				LRD
+			
+			
+				Dinar Libio
+				Dinar libio
+				LYD
+			
+			
+				Dírham Marroquí
+				Dírham marroquí
+				MAD
+			
+			
+				Leu Moldavo
+				Leu moldavo
+				MDL
+			
+			
+				Ariary Malgache
+				Ariary malgache
+				MGA
+			
+			
+				Dinar Macedonio
+				Dinar macedonio
+				MKD
+			
+			
+				Kyat Birmano
+				Kyat birmano
+				MMK
+			
+			
+				Tugrik Mongol
+				Tugrik mongol
+				MNT
+			
+			
+				Pataca Macaense
+				Pataca macaense
+				MOP
+			
+			
+				Uguiya Mauritano
+				Uguiya Mauritano
+				MRU
+			
+			
+				Rupia de Mauricio
+				Rupia de mauricio
+				MUR
+			
+			
+				Rupia de Maldivas
+				Rupia de Maldivas
+				MVR
+			
+			
+				Kwacha Malauí
+				Kwacha malauí
+				MWK
+			
+			
+				Peso Mexicano
+				Peso mexicano
+			
+			
+				Ringgit Malayo
+				Ringgit malayo
+				MYR
+			
+			
+				Metical Mozambiqueño
+				Metical mozambiqueño
+				MZN
+			
+			
+				Dólar Namibio
+				Dólar namibio
+				NAD
+			
+			
+				Naira Nigeriano
+				Naira nigeriano
+				NGN
+			
+			
+				Córdova Nicaragüense
+				Córdova nicaragüense
+				NIO
+			
+			
+				Corona Noruega
+				Corona noruega
+				NOK
+			
+			
+				Rupia Nepalí
+				Rupia Nepalí
+				NPR
+			
+			
+				Dólar Neozelandés
+				Dólar neozelandés
+			
+			
+				Rial Omaní
+				Rial omaní
+				OMR
+			
+			
+				Balboa Panameño
+				Balboa panameño
+				PAB
+			
 			
+				Sol Peruano
+				Sol peruano
 				S/
 			
+			
+				Kina Papuano
+				Kina papuano
+				PGK
+			
+			
+				Peso Filipino
+				Peso filipino
+				PHP
+			
+			
+				Rupia Pakistaní
+				Rupia pakistaní
+				PKR
+			
+			
+				Zloty
+				Zloty
+				PLN
+			
+			
+				Guaraní Paraguayo
+				Guaraní paraguayo
+				PYG
+			
+			
+				Riyal Catarí
+				Riyal catarí
+				QAR
+			
+			
+				Leu Rumano
+				Leu rumano
+				RON
+			
+			
+				Dinar Serbio
+				Dinar serbio
+				RSD
+			
+			
+				Rublo Ruso
+				Rublo ruso
+				RUB
+			
+			
+				Franco Ruandés
+				Franco ruandés
+				RWF
+			
+			
+				Riyal Saudí
+				Riyal saudí
+				SAR
+			
+			
+				Dólar de las Islas Salomón
+				Dólar de las Islas Salomón
+				SBD
+			
+			
+				Rupia de Seychelles
+				Rupia de seychelles
+				SCR
+			
+			
+				Libra Sudanesa
+				Libra sudanesa
+				SDG
+			
+			
+				Corona Sueca
+				Corona sueca
+				SEK
+			
+			
+				Dólar de Singapur
+				Dólar de Singapur
+				SGD
+			
+			
+				Libra de Santa Helena
+				Libra de santa helena
+				SHP
+			
+			
+				Leone de Sierra Leona
+				Leone de sierra leona
+				SLL
+			
+			
+				Chelín Somalí
+				Chelín somalí
+				SOS
+			
+			
+				Dólar Surinamés
+				Dólar Surinamés
+				SRD
+			
+			
+				Libra Sursudanesa
+				Libra sursudanesa
+				SSP
+			
+			
+				Dobra Santotomense
+				Dobra santotomense
+				STN
+			
+			
+				Libra Siria
+				Libra siria
+				SYP
+			
+			
+				Lilangeni Swazi
+				Lilangeni swazi
+				SZL
+			
+			
+				Baht Tailandés
+				Baht tailandés
+				THB
+			
+			
+				Somoni Tayiko
+				Somoni tayiko
+				TJS
+			
+			
+				Manat Turcomano
+				Manat turcomano
+				TMT
+			
+			
+				Dinar Tunecino
+				Dinar tunecino
+				TND
+			
+			
+				Paʻanga Tongano
+				Paʻanga tongano
+				TOP
+			
+			
+				Lira Turca
+				Lira turca
+				TRY
+			
+			
+				Dólar de Trinidad y Tobago
+				Dólar de trinidad y tobago
+				TTD
+			
+			
+				Nuevo Dólar Taiwanés
+				Nuevo dólar taiwanés
+			
+			
+				Chelín Tanzano
+				Chelín tanzano
+				TZS
+			
+			
+				Grivna
+				Grivna
+				UAH
+			
+			
+				Chelín Ugandés
+				Chelín ugandés
+				UGX
+			
+			
+				Dólar Americano
+				Dólar americano
+				$US
+			
+			
+				Peso Uruguayo
+				Peso uruguayo
+				UYU
+			
+			
+				Som Ubzeko
+				Som Ubzeko
+				UZS
+			
+			
+				Bolívar Venezolano
+				Bolívar venezolano
+				VES
+			
+			
+				Dong Vietnamita
+				Dong vietnamita
+			
+			
+				Vatu Vanuatu
+				Vatu vanuatu
+				VUV
+			
+			
+				Tala Samoano
+				Tala samoano
+				WST
+			
+			
+				Franco CFA de África Central
+				Franco CFA de áfrica central
+			
+			
+				Dólar del Caribe Oriental
+				Dólar del caribe oriental
+			
+			
+				Franco CFA de África Occidental
+				Franco CFA de áfrica occidental
+			
+			
+				Franco CFP
+				Franco CFP
+			
+			
+				Mana riqsisqa Qullqi
+				Mana riqsisqa qullqi
+			
+			
+				Rial Yemení
+				Rial yemení
+				YER
+			
+			
+				Rand Sudafricano
+				Rand sudafricano
+				ZAR
+			
+			
+				Kwacha Zambiano
+				Kwacha zambiano
+				ZMW
+			
 		
 		
 			~{0}
@@ -3231,6 +4892,376 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		
+			
+				kilómetro cuadrado
+				{0} kilómetro cuadrado
+				{0}/kilómetro cuadrado
+			
+			
+				hectárea
+				{0} hectárea
+			
+			
+				metro cuadrado
+				{0} metro cuadrado
+				{0}/metro cuadrado
+			
+			
+				centímetro cuadrado
+				{0} centímetro cuadrado
+				{0}/centímetro cuadrado
+			
+			
+				milla cuadrada
+				{0} milla cuadrada
+				{0}/milla cuadrada
+			
+			
+				acre
+				{0} acre
+			
+			
+				yarda cuadrada
+				{0} yarda cuadrada
+			
+			
+				pie cuadrado
+				{0} pie cuadrado
+			
+			
+				pulgada cuadrada
+				{0} pulgada cuadrada
+				{0}/pulgada cuadrada
+			
+			
+				dunam
+				{0} dunam
+			
+			
+				siglos
+				{0} siglos
+			
+			
+				décadas
+				{0} décadas
+			
+			
+				wata
+				{0} wata
+				{0} por wata
+			
+			
+				killa
+				{0} killa
+				{0}/k
+			
+			
+				semana
+				{0} semana
+				{0} por semana
+			
+			
+				punchaw
+				{0} punchaw
+				{0}/p
+			
+			
+				hora
+				{0} hora
+				{0}/h
+			
+			
+				minuto
+				{0} minuto
+				{0} por minuto
+			
+			
+				segundo
+				{0} segundo
+				{0} por segundo
+			
+			
+				milisegundo
+				{0} milisegundo
+			
+			
+				microsegundo
+				{0} microsegundo
+			
+			
+				nanosegundo
+				{0} nanosegundo
+			
+			
+				tipográfico em
+				{0} tipográfico em
+			
+			
+				pixels
+				{0} pixels
+			
+			
+				megapixels
+				{0} megapixels
+			
+			
+				pixels por centímetro
+				{0} pixels por centímetro
+			
+			
+				pixels por pulgada
+				{0} pixels por pulgada
+			
+			
+				puntos por centímetro
+				{0} puntos por centímetro
+			
+			
+				puntos por pulgada
+				{0} puntos por pulgada
+			
+			
+				kilómetro
+				{0} kilómetro
+				{0}/km
+			
+			
+				metro
+				{0} metro
+				{0}/m
+			
+			
+				decímetro
+				{0} decímetro
+			
+			
+				centímetro
+				{0} centímetro
+				{0}/centímetro
+			
+			
+				milímetro
+				{0} milímetro
+			
+			
+				micrómetro
+				{0} micrómetro
+			
+			
+				nanómetro
+				{0} nanómetro
+			
+			
+				picómetro
+				{0} picómetro
+			
+			
+				milla
+				{0} milla
+			
+			
+				yarda
+				{0} yarda
+			
+			
+				pie
+				{0} pie
+				{0}/pie
+			
+			
+				pulgada
+				{0} pulgada
+				{0}/pulgada
+			
+			
+				parsecs
+				{0} parsecs
+			
+			
+				años luz
+				{0} años luz
+			
+			
+				unidades astronómicas
+				{0} unidades astronómicas
+			
+			
+				millas naúticas
+				{0} millas naúticas
+			
+			
+				milla escandinava
+				{0} milla escandinava
+			
+			
+				puntos
+				{0} puntos
+			
+			
+				radiación solar
+				{0} radiación solar
+			
+			
+				kilómetro cúbico
+				{0} kilómetro cúbico
+			
+			
+				metro cúbico
+				{0} metro cúbico
+				{0}/metro cúbico
+			
+			
+				centímetro cúbico
+				{0} centímetro cúbico
+				{0}/centímetro cúbico
+			
+			
+				milla cúbica
+				{0} milla cúbica
+			
+			
+				yarda cúbica
+				{0} yarda cúbica
+			
+			
+				pie cúbico
+				{0} pie cúbico
+			
+			
+				pulgada cúbica
+				{0} pulgada cúbica
+			
+			
+				megalitro
+				{0} megalitro
+			
+			
+				hectolitro
+				{0} hectolitro
+			
+			
+				litro
+				{0} litro
+				{0}/litro
+			
+			
+				decilitro
+				{0} decilitro
+			
+			
+				centilitro
+				{0} centilitro
+			
+			
+				mililitro
+				{0} mililitro
+			
+			
+				pinta métrica
+				{0} pinta métrica
+			
+			
+				taza métrica
+				{0} taza métrica
+			
+			
+				acre-pie
+				{0} acre-pie
+			
+			
+				galón
+				{0} US galón
+				{0}/US galón
+			
+			
+				UK galón
+				{0} UK galón
+				{0}/UK galón
+			
+			
+				cuarto
+				{0} cuarto
+			
+			
+				pinta
+				{0} pinta
+			
+			
+				taza
+				{0} taza
+			
+			
+				Onza líquida
+				{0} US Onza líquida
+			
+			
+				UK Onza líquida
+				{0} UK Onza líquida
+			
+			
+				cucharada
+				{0} cucharada
+			
+			
+				cucharadita
+				{0} cucharadita
+			
+			
+				barril
+				{0} barril
+			
+		
+		
+			
+				wata
+				{0} w
+			
+			
+				killa
+				{0} k
+			
+			
+				semana
+				{0} s
+			
+			
+				punchaw
+				{0} p
+			
+			
+				hora
+				{0} h
+			
+			
+				segundo
+				{0} s
+			
+			
+				milisegundo
+				{0} ms
+			
+			
+				km
+				{0}km
+			
+			
+				metro
+				{0} m
+			
+			
+				cm
+				{0} cm
+			
+			
+				mm
+				{0} mm
+			
+			
+				litro
+				{0} litro
+			
+		
 		
 			h:mm
 		
@@ -3241,4 +5272,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			m:ss
 		
 	
+	
+		
+			{0}, {1}
+			{0}, utaq {1}
+			{0} utaq {1}
+		
+		
+			{0}, utaq {1}
+			{0} utaq {1}
+		
+		
+			{0}, utaq {1}
+			{0} utaq {1}
+		
+	
 
diff --git a/make/data/cldr/common/main/qu_BO.xml b/make/data/cldr/common/main/qu_BO.xml
index 8e209bb768a..72d6028106e 100644
--- a/make/data/cldr/common/main/qu_BO.xml
+++ b/make/data/cldr/common/main/qu_BO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/qu_EC.xml b/make/data/cldr/common/main/qu_EC.xml
index 38b1b51ab7e..92b3e48c144 100644
--- a/make/data/cldr/common/main/qu_EC.xml
+++ b/make/data/cldr/common/main/qu_EC.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/qu_PE.xml b/make/data/cldr/common/main/qu_PE.xml
index b744979765c..c82a2d5d984 100644
--- a/make/data/cldr/common/main/qu_PE.xml
+++ b/make/data/cldr/common/main/qu_PE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/rm.xml b/make/data/cldr/common/main/rm.xml
index 42f857881d1..fe219943d9c 100644
--- a/make/data/cldr/common/main/rm.xml
+++ b/make/data/cldr/common/main/rm.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -118,9 +118,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			englais australian
 			englais canadais
 			englais britannic
-			englais (GB)
 			englais american
-			englais (US)
 			englais mesaun
 			esperanto
 			spagnol
@@ -761,7 +759,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Saint Martin
 			Madagascar
 			Inslas da Marshall
-			Macedonia
 			Mali
 			Myanmar
 			Mongolia
@@ -961,12 +958,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
-							EEEE, 'ils' d 'da' MMMM y G
+							EEEE, 'ils' d MMMM y G
 						
 					
 					
 						
-							d 'da' MMMM y G
+							d MMMM y G
 						
 					
 					
@@ -976,40 +973,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						
-							dd-MM-yy GGGGG
+							dd-MM-y GGGGG
 						
 					
 				
 				
 					
 						d
+						ccc
 						E d.
-						H
-						HH:mm
-						HH:mm:ss
-						H:mm
+						E h:mm a
+						E HH:mm
+						E h:mm:ss a
+						E HH:mm:ss
+						y G
+						LLL y G
+						dd-MM-y GGGGG
+						E, dd-MM-y GGGGG
+						d MMMM y G
+						E, d MMMM y G
+						h a
+						HH
+						h:mm a
+						HH:mm
+						h:mm:ss a
+						HH:mm:ss
+						h:mm:ss a v
+						HH:mm:ss v
+						h:mm a v
+						HH:mm v
 						L
-						d.M.
-						E, d.M.
-						d.MM.
-						dd.MM.
+						dd-MM
+						E, dd-MM
 						LLL
-						d. MMM
-						E d. MMM
-						d. MMMM
-						E d. MMMM
-						mm:ss
+						dd-MM
+						E, dd-MM
+						d MMMM
+						E, d MMMM
 						mm:ss
-						y
-						y-M
-						E, y-M-d
-						MM.y
-						dd.MM.y
-						MMM y
-						E, d. MMM y
-						MMMM y
-						QQQ y
-						QQQQ y
+						y G
+						MM-y GGGGG
+						E, dd-MM-y GGGGG
+						LLL y G
+						dd-MM-y GGGGG
+						E, dd-MM-y GGGGG
+						LLLL y G
+						d MMMM y G
+						E, d MMMM y G
+						QQQ y G
+						QQQQ y G
 					
 					
 						{0} - {1}
@@ -1020,76 +1032,108 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							h a – h a
 							h–h a
 						
+						
+							HH–HH
+						
 						
 							h:mm a – h:mm a
 							h:mm–h:mm a
 							h:mm–h:mm a
 						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
 						
 							h:mm a – h:mm a v
 							h:mm–h:mm a v
 							h:mm–h:mm a v
 						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
 						
 							h a – h a v
 							h–h a v
 						
+						
+							HH–HH v
+						
 						
-							M.–M.
+							LL–LL
 						
 						
-							dd.MM. – dd.MM.
-							dd.MM. – dd.MM.
+							dd-MM – dd-MM
+							dd-MM – dd-MM
 						
 						
-							E, dd.MM. – E, dd.MM.
-							E, dd.MM. – E, dd.MM.
+							E, dd-MM – E, dd-MM
+							E, dd-MM – E, dd-MM
 						
 						
-							MMM–MMM
+							LLL–LLL
 						
 						
-							d.–d. MMM
-							d. MMM – d. MMM
+							dd-MM – dd-MM
+							dd-MM – dd-MM
 						
 						
-							E, d. – E, d. MMM
-							E, d. MMM – E, d. MMM
+							E, dd-MM – E, dd-MM
+							E, dd-MM – E, dd-MM
+						
+						
+							d.–d MMMM
+							d MMMM – d MMMM
+						
+						
+							E, d. – E, d MMMM
+							E, d MMMM – E, d MMMM
 						
 						
-							y–y
+							y–y G
 						
 						
-							MM.y – MM.y
-							MM.y – MM.y
+							LL-y – LL-y GGGGG
+							LL-y – LL-y GGGGG
 						
 						
-							dd.MM.y – dd.MM.y
-							dd.MM.y – dd.MM.y
-							dd.MM.y – dd.MM.y
+							dd-MM-y – dd-MM-y GGGGG
+							dd-MM-y – dd-MM-y GGGGG
+							dd-MM-y – dd-MM-y GGGGG
 						
 						
-							E, dd.MM.y – E, dd.MM.y
-							E, dd.MM.y – E, dd.MM.y
-							E, dd.MM.y – E, dd.MM.y
+							E, dd-MM-y – E, dd-MM-y GGGGG
+							E, dd-MM-y – E, dd-MM-y GGGGG
+							E, dd-MM-y – E, dd-MM-y GGGGG
 						
 						
-							MMM–MMM y
-							MMM y – MMM y
+							LLL–LLL y G
+							LLL y – LLL y G
 						
 						
-							d.–d. MMM y
-							d. MMM – d. MMM y
-							d. MMM y – d. MMM y
+							dd-MM-y – dd-MM-y GGGGG
+							dd-MM-y – dd-MM-y GGGGG
+							dd-MM-y – dd-MM-y GGGGG
 						
 						
-							E, d. – E, d. MMM y
-							E, d. MMM – E, d. MMM y
-							E, d. MMM y – E, d. MMM y
+							E, dd-MM-y – E, dd-MM-y GGGGG
+							E, dd-MM-y – E, dd-MM-y GGGGG
+							E, dd-MM-y – E, dd-MM-y GGGGG
 						
 						
-							MM – MM.y
-							MM.y – MM.y
+							LLLL–LLLL y G
+							LLLL y – LLLL y G
+						
+						
+							d.–d MMMM y G
+							d MMMM – d MMMM y G
+							d MMMM y – d MMMM y G
+						
+						
+							E, d. – E, d MMMM y G
+							E, d MMMM – E, d MMMM y G
+							E, d MMMM y – E, d MMMM y G
 						
 					
 				
@@ -1126,18 +1170,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							D
 						
 						
-							schaner
-							favrer
-							mars
-							avrigl
-							matg
-							zercladur
-							fanadur
-							avust
-							settember
-							october
-							november
-							december
+							da schaner
+							da favrer
+							da mars
+							d’avrigl
+							da matg
+							da zercladur
+							da fanadur
+							d’avust
+							da settember
+							d’october
+							da november
+							da december
 						
 					
 					
@@ -1352,12 +1396,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
-							EEEE, 'ils' d 'da' MMMM y
+							EEEE, 'ils' d MMMM y
 						
 					
 					
 						
-							d 'da' MMMM y
+							d MMMM y
 						
 					
 					
@@ -1422,14 +1466,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						E HH:mm
 						E h:mm:ss a
 						E HH:mm:ss
-						G y
-						G y MMM
-						G y MMM d
-						G y MMM d, E
+						y G
+						LLL y G
+						dd-MM-y GGGGG
+						E, dd-MM-y GGGGG
+						d MMMM y G
+						E, d MMMM y G
 						h a
 						HH
-						HH:mm
-						HH:mm:ss
 						h:mm a
 						HH:mm
 						h:mm:ss a
@@ -1439,29 +1483,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						h:mm a v
 						HH:mm v
 						L
-						d.M.
-						E, d.M.
-						d.MM.
-						dd.MM.
+						dd-MM
+						E, dd-MM
 						LLL
-						d. MMM
-						E d. MMM
-						d. MMMM
-						E d. MMMM
-						mm:ss
+						dd-MM
+						E, dd-MM
+						d MMMM
+						E, d MMMM
 						mm:ss
 						y
-						y-M
-						y-MM-dd
-						E, y-M-d
-						MM.y
-						dd.MM.y
-						MMM y
-						y MMM d
-						y MMM d, E
-						y MMMM
-						y QQQ
-						y QQQQ
+						LL-y
+						dd-MM-y
+						E, dd-MM-y
+						LLL y
+						dd-MM-y
+						E, dd-MM-y
+						LLLL y
+						d MMMM y
+						E, d MMMM y
+						QQQ y
+						QQQQ y
 					
 					
 						{0} {1}
@@ -1504,61 +1545,79 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							HH–HH v
 						
 						
-							MM–MM
+							LL–LL
 						
 						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
+							dd-MM – dd-MM
+							dd-MM – dd-MM
 						
 						
-							MM-dd, E – MM-dd, E
-							MM-dd, E – MM-dd, E
+							E, dd-MM – E, dd-MM
+							E, dd-MM – E, dd-MM
 						
 						
 							LLL–LLL
 						
 						
-							MMM d–d
-							MMM d – MMM d
+							dd-MM – dd-MM
+							dd-MM – dd-MM
 						
 						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
+							E, dd-MM – E, dd-MM
+							E, dd-MM – E, dd-MM
+						
+						
+							d.–d MMMM
+							d MMMM – d MMMM
+						
+						
+							E, d. – E, d MMMM
+							E, d MMMM – E, d MMMM
 						
 						
 							y–y
 						
 						
-							y-MM – y-MM
-							y-MM – y-MM
+							LL-y – LL-y
+							LL-y – LL-y
 						
 						
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
+							dd-MM-y – dd-MM-y
+							dd-MM-y – dd-MM-y
+							dd-MM-y – dd-MM-y
 						
 						
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
+							E, dd-MM-y – E, dd-MM-y
+							E, dd-MM-y – E, dd-MM-y
+							E, dd-MM-y – E, dd-MM-y
 						
 						
-							y MMM–MMM
-							y MMM – y MMM
+							LLL–LLL y
+							LLL y – LLL y
 						
 						
-							y MMM d–d
-							y MMM d – MMM d
-							y MMM d – y MMM d
+							dd-MM-y – dd-MM-y
+							dd-MM-y – dd-MM-y
+							dd-MM-y – dd-MM-y
 						
 						
-							y MMM d, E – MMM d, E
-							y MMM d, E – MMM d, E
-							y MMM d, E – y MMM d, E
+							E, dd-MM-y – E, dd-MM-y
+							E, dd-MM-y – E, dd-MM-y
+							E, dd-MM-y – E, dd-MM-y
 						
 						
-							y MMMM–MMMM
-							y MMMM – y MMMM
+							LLLL–LLLL y
+							LLLL y – LLLL y
+						
+						
+							d.–d MMMM y
+							d MMMM – d MMMM y
+							d MMMM y – d MMMM y
+						
+						
+							E, d. – E, d MMMM y
+							E, d MMMM – E, d MMMM y
+							E, d MMMM y – E, d MMMM y
 						
 					
 				
diff --git a/make/data/cldr/common/main/rm_CH.xml b/make/data/cldr/common/main/rm_CH.xml
index 80371e61bb8..904b9238569 100644
--- a/make/data/cldr/common/main/rm_CH.xml
+++ b/make/data/cldr/common/main/rm_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/rn.xml b/make/data/cldr/common/main/rn.xml
index df9a1b0c22d..dfe9ac29f15 100644
--- a/make/data/cldr/common/main/rn.xml
+++ b/make/data/cldr/common/main/rn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moludavi
 			Madagasikari
 			Izinga rya Marishari
-			Masedoniya
 			Mali
 			Birimaniya
 			Mongoliya
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		”
diff --git a/make/data/cldr/common/main/rn_BI.xml b/make/data/cldr/common/main/rn_BI.xml
index 2fc88a53e7c..3ebc7315c3a 100644
--- a/make/data/cldr/common/main/rn_BI.xml
+++ b/make/data/cldr/common/main/rn_BI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ro.xml b/make/data/cldr/common/main/ro.xml
index 2f909d2523f..42f2a4aa7c6 100644
--- a/make/data/cldr/common/main/ro.xml
+++ b/make/data/cldr/common/main/ro.xml
@@ -9,10 +9,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
+		
+			{0} ({1})
+			{0}, {1}
+			{0}: {1}
+		
 		
 			afar
 			abhază
@@ -527,14 +532,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			idiș
 			yoruba
 			cantoneză
+			chineză, cantoneză
 			zhuang
 			zapotecă
 			simboluri Bilss
 			zenaga
 			tamazight standard marocană
 			chineză
+			chineză, mandarină
 			chineză simplificată
+			chineză mandarină simplificată
 			chineză tradițională
+			chineză mandarină tradițională
 			zulu
 			zuni
 			fară conținut lingvistic
@@ -877,7 +886,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Somalia
 			Suriname
 			Sudanul de Sud
-			Sao Tome și Principe
+			São Tomé și Príncipe
 			El Salvador
 			Sint-Maarten
 			Siria
@@ -965,23 +974,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Wade-Giles
 		
 		
+			calendar
 			Format monedă
-			Ordonare cu simbolurile ignorate
-			Ordonare inversă după accent
-			Ordonare după majuscule/minuscule
-			Ordonare care ține seama de majuscule/minuscule
+			sortare cu ignorarea simbolurilo
+			sortare inversă după accent
+			sortare după majuscule/minuscule
+			sortare care ține seama de majuscule/minuscule
 			ordine de sortare
-			Ordonare normalizată
-			Ordonare numerică
-			Puterea ordonării
+			sortare normalizată
+			sortare numerică
+			puterea sortării
 			monedă
 			ciclu orar (12 sau 24)
 			stil de întrerupere a liniei
 			sistem de unități de măsură
 			numere
-			Fusul orar
-			Varianta locală
-			Utilizare privată
+			fus orar
+			variantă locală
+			utilizare privată
 		
 		
 			calendar budist
@@ -1113,8 +1123,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a ă â b c d e f g h i î j k l m n o p r s ș t ț u v w x y z]
 		[á à å ä ç é è ê ë ñ ö q ş ţ ü]
 		[A Ă Â B C D E F G H I Î J K L M N O P Q R S Ș T Ț U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ " “ ” „ « » ( ) \[ \] @ * /]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ " “ ” „ « » ( ) \[ \] @ * /]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1123,19 +1133,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		...
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1202,13 +1216,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						d
+						ccc
 						E d
 						y G
 						MMM y G
 						d MMM y G
 						E, d MMM y G
+						L
 						dd.MM
 						E, dd.MM
+						LLL
 						d MMM
 						E, d MMM
 						d MMMM
@@ -1226,6 +1244,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y G
 					
 					
+						{0} – {1}
+						
+							d–d
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -1368,6 +1422,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Mesori
 							Pi Kogi Enavot
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Thout
 							Paopi
@@ -1400,6 +1469,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Mesori
 							Pi Kogi Enavot
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Thout
 							Paopi
@@ -1450,6 +1534,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							nehase
 							pagumen
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							meskerem
 							taqemt
@@ -1482,6 +1581,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							nehase
 							pagumen
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							meskerem
 							taqemt
@@ -1604,15 +1718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
@@ -1654,6 +1759,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, d MMM – E, d MMM y G
 							E, d MMM y – E, d MMM y G
 						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2033,6 +2170,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2114,21 +2273,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
 						
-							G y – G y
-							G y–y
+							y G – y G
+							y – y G
 						
 						
 							MM.y GGGGG – MM.y GGGGG
@@ -2275,6 +2425,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Av
 							Elul
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tișrei
 							Heșvan
@@ -2309,6 +2475,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Av
 							Elul
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tișrei
 							Heșvan
@@ -2353,6 +2535,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Magh
 							Phalguna
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Chaitra
 							Vaisakha
@@ -2383,6 +2579,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Magh
 							Phalguna
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Chaitra
 							Vaisakha
@@ -2399,8 +2609,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 			
 			
+				
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+					
+						
+							Muh.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Rabiʻ I
+							Rabiʻ II
+							Jumada I
+							Jumada II
+							Rajab
+							Shaʻban
+							Ramadan
+							Shawwal
+							Dhuʻl-Qiʻdah
+							Dhuʻl-Hijjah
+						
+					
+				
 				
 					
 						A.H.
@@ -2408,6 +2719,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						AH
 					
+					
+						AH
+					
 				
 			
 			
@@ -2427,6 +2741,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Bahman
 							Esfand
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Farvardin
 							Ordibehesht
@@ -2457,6 +2785,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Bahman
 							Esfand
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Farvardin
 							Ordibehesht
@@ -2675,9 +3017,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				săpt.
-				săpt. trecută
-				săpt. aceasta
-				săpt. viitoare
+				săpt. trecută
+				săpt. aceasta
+				săpt. viitoare
 				
 					peste {0} săpt.
 					peste {0} săpt.
@@ -2692,9 +3034,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				săpt.
-				săpt. trecută
-				săptămâna aceasta
-				săpt. viitoare
+				săpt. trecută
+				săpt. aceasta
+				săpt. viitoare
 				
 					+{0} săpt.
 					+{0} săpt.
@@ -3943,7 +4285,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aktobe
 			
 			
-				Kostanay
+				Kostanay
 			
 			
 				Kyzylorda
@@ -4026,9 +4368,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Choibalsan
 			
-			
-				Macao
-			
 			
 				Saipan
 			
@@ -5519,6 +5858,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5527,6 +5868,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 mie
@@ -5687,36 +6033,43 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dirham din Emiratele Arabe Unite
 				dirhami din Emiratele Arabe Unite
 				dirhami din Emiratele Arabe Unite
+				AED
 			
 			
 				afgani afgan
 				afgani afgan
 				afgani afgani
 				afgani afgani
+				AFN
 			
 			
 				leka albaneză
 				leka albaneză
 				leka albaneze
 				leka albaneze
+				ALL
 			
 			
 				dram armenesc
 				dram armenesc
 				drami armenești
 				drami armenești
+				AMD
 			
 			
 				gulden din Antilele Olandeze
 				gulden din Antilele Olandeze
 				guldeni din Antilele Olandeze
 				guldeni din Antilele Olandeze
+				ANG
 			
 			
 				kwanza angoleză
 				kwanza angoleză
 				kwanze angoleze
 				kwanze angoleze
+				AOA
+				Kz
 			
 			
 				peso argentinian (1983–1985)
@@ -5729,6 +6082,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso argentinian
 				pesos argentinieni
 				pesos argentinieni
+				ARS
+				$
 			
 			
 				șiling austriac
@@ -5742,12 +6097,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolari australieni
 				dolari australieni
 				AUD
+				$
 			
 			
 				florin aruban
 				florin aruban
 				florini arubani
 				florini arubani
+				AWG
 			
 			
 				manat azer (1993–2006)
@@ -5757,6 +6114,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manat azer
 				manați azeri
 				manați azeri
+				AZN
 			
 			
 				dinar Bosnia-Herțegovina (1992–1994)
@@ -5769,18 +6127,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marcă convertibilă din Bosnia și Herțegovina
 				mărci convertibile din Bosnia și Herțegovina
 				mărci convertibile din Bosnia și Herțegovina
+				BAM
+				KM
 			
 			
 				dolar din Barbados
 				dolar din Barbados
 				dolari din Barbados
 				dolari din Barbados
+				BBD
+				$
 			
 			
 				taka din Bangladesh
 				taka din Bangladesh
 				taka din Bangladesh
 				taka din Bangladesh
+				BDT
+				৳
 			
 			
 				franc belgian (convertibil)
@@ -5805,36 +6169,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leva bulgărească
 				leva bulgărești
 				leva bulgărești
+				BGN
 			
 			
 				dinar din Bahrain
 				dinar din Bahrain
 				dinari din Bahrain
 				dinari din Bahrain
+				BHD
 			
 			
 				franc burundez
 				franc burundez
 				franci burundezi
 				franci burundezi
+				BIF
 			
 			
 				dolar din Bermuda
 				dolar din Bermuda
 				dolari din Bermuda
 				dolari din Bermuda
+				BMD
+				$
 			
 			
 				dolar din Brunei
 				dolar din Brunei
 				dolari din Brunei
 				dolari Brunei
+				BND
+				$
 			
 			
 				boliviano bolivian
 				boliviano bolivian
 				boliviano bolivieni
 				boliviano bolivieni
+				BOB
+				Bs
 			
 			
 				peso bolivian
@@ -5854,6 +6227,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				reali brazilieni
 				reali brazilieni
 				BRL
+				R$
 			
 			
 				cruzeiro brazilian (1993–1994)
@@ -5863,12 +6237,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolar din Bahamas
 				dolari din Bahamas
 				dolari din Bahamas
+				BSD
+				$
 			
 			
 				ngultrum din Bhutan
 				ngultrum din Bhutan
 				ngultrum din Bhutan
 				ngultrum din Bhutan
+				BTN
 			
 			
 				kyat birman
@@ -5878,24 +6255,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pula Botswana
 				pula Botswana
 				pula Botswana
+				BWP
+				P
 			
 			
 				rublă belarusă
 				rublă belarusă
 				ruble belaruse
 				ruble belaruse
+				BYN
+				р.
 			
 			
 				rublă belarusă (2000–2016)
 				rublă belarusă (2000–2016)
 				ruble belaruse (2000–2016)
 				ruble belaruse (2000–2016)
+				BYR
 			
 			
 				dolar din Belize
 				dolar din Belize
 				dolari din Belize
 				dolari din Belize
+				BZD
+				$
 			
 			
 				dolar canadian
@@ -5903,30 +6287,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolari canadieni
 				dolari canadieni
 				CAD
+				$
 			
 			
 				franc congolez
 				franc congolez
 				franci congolezi
 				franci congolezi
+				CDF
 			
 			
 				franc elvețian
 				franc elvețian
 				franci elvețieni
 				franci elvețieni
+				CHF
 			
 			
 				peso chilian
 				peso chilian
 				pesos chilieni
 				pesos chilieni
+				CLP
+				$
 			
 			
 				yuan chinezesc (offshore)
 				yuan chinezesc (offshore)
 				yuani chinezești (offshore)
 				yuani chinezești (offshore)
+				CNH
 			
 			
 				yuan chinezesc
@@ -5934,18 +6324,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				yuani chinezești
 				yuani chinezești
 				CNY
+				¥
 			
 			
 				peso columbian
 				peso columbian
 				pesos columbieni
 				pesos columbieni
+				COP
+				$
 			
 			
 				colon costarican
 				colon costarican
 				coloni costaricani
 				coloni costaricani
+				CRC
+				₡
 			
 			
 				dinar Serbia și Muntenegru (2002–2006)
@@ -5958,18 +6353,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso cubanez convertibil
 				pesos cubanezi convertibili
 				pesos cubanezi convertibili
+				CUC
+				$
 			
 			
 				peso cubanez
 				peso cubanez
 				pesos cubanezi
 				pesos cubanezi
+				CUP
+				$
 			
 			
 				escudo din Capul Verde
 				escudo din Capul Verde
 				escudo din Capul Verde
 				escudo din Capul Verde
+				CVE
 			
 			
 				liră cipriotă
@@ -5982,6 +6382,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				coroană cehă
 				coroane cehe
 				coroane cehe
+				CZK
+				Kč
 			
 			
 				marcă est-germană
@@ -6000,24 +6402,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franc djiboutian
 				franci djiboutieni
 				franci djiboutieni
+				DJF
 			
 			
 				coroană daneză
 				coroană daneză
 				coroane daneze
 				coroane daneze
+				DKK
+				kr
 			
 			
 				peso dominican
 				peso dominican
 				pesos dominicani
 				pesos dominicani
+				DOP
+				$
 			
 			
 				dinar algerian
 				dinar algerian
 				dinari algerieni
 				dinari algerieni
+				DZD
 			
 			
 				sucre Ecuador
@@ -6033,12 +6441,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liră egipteană
 				lire egiptene
 				lire egiptene
+				EGP
+				E£
 			
 			
 				nakfa eritreeană
 				nakfa eritreeană
 				nakfa eritreene
 				nakfa eritreene
+				ERN
 			
 			
 				peseta spaniolă (cont A)
@@ -6057,6 +6468,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				birr etiopian
 				birri etiopieni
 				birri etiopieni
+				ETB
 			
 			
 				euro
@@ -6064,6 +6476,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				euro
 				euro
 				EUR
+				€
 			
 			
 				marcă finlandeză
@@ -6076,12 +6489,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolar fijian
 				dolari fijieni
 				dolari fijieni
+				FJD
+				$
 			
 			
 				liră din Insulele Falkland
 				liră din Insulele Falkland
 				lire din Insulele Falkland
 				lire din Insulele Falkland
+				FKP
+				£
 			
 			
 				franc francez
@@ -6095,12 +6512,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lire sterline
 				lire sterline
 				GBP
+				£
 			
 			
 				lari georgian
 				lari georgian
 				lari georgieni
 				lari georgieni
+				GEL
+				₾
 				₾
 			
 			
@@ -6111,24 +6531,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cedi ghanez
 				cedi ghanezi
 				cedi ghanezi
+				GHS
 			
 			
 				liră din Gibraltar
 				liră din Gibraltar
 				lire din Gibraltar
 				lire Gibraltar
+				GIP
+				£
 			
 			
 				dalasi din Gambia
 				dalasi din Gambia
 				dalasi din Gambia
 				dalasi din Gambia
+				GMD
 			
 			
 				franc guineean
 				franc guineean
 				franci guineeni
 				franci guineeni
+				GNF
+				FG
 			
 			
 				drahmă grecească
@@ -6141,6 +6567,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				quetzal guatemalez
 				quetzali guatemalezi
 				quetzali guatemalezi
+				GTQ
+				Q
 			
 			
 				peso Guineea-Bissau
@@ -6153,6 +6581,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolar guyanez
 				dolari guyanezi
 				dolari guyanezi
+				GYD
+				$
 			
 			
 				dolar din Hong Kong
@@ -6160,12 +6590,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolari din Hong Kong
 				dolari din Hong Kong
 				HKD
+				$
 			
 			
 				lempira honduriană
 				lempiră honduriană
 				lempire honduriene
 				lempire honduriene
+				HNL
+				L
 			
 			
 				dinar croat
@@ -6178,24 +6611,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuna croată
 				kune croate
 				kune croate
+				HRK
+				kn
 			
 			
 				gourde din Haiti
 				gourde din Haiti
 				gourde din Haiti
 				gourde din Haiti
+				HTG
 			
 			
 				forint maghiar
 				forint maghiar
 				forinți maghiari
 				forinți maghiari
+				HUF
+				Ft
 			
 			
 				rupie indoneziană
 				rupie indoneziană
 				rupii indoneziene
 				rupii indoneziene
+				IDR
+				Rp
 			
 			
 				liră irlandeză
@@ -6215,6 +6655,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				șecheli israelieni noi
 				șecheli israelieni noi
 				ILS
+				₪
 			
 			
 				rupie indiană
@@ -6222,24 +6663,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupii indiene
 				rupii indiene
 				INR
+				₹
 			
 			
 				dinar irakian
 				dinar irakian
 				dinari irakieni
 				dinari irakieni
+				IQD
 			
 			
 				rial iranian
 				rial iranian
 				riali iranieni
 				riali iranieni
+				IRR
 			
 			
 				coroană islandeză
 				coroană islandeză
 				coroane islandeze
 				coroane islandeze
+				ISK
+				kr
 			
 			
 				liră italiană
@@ -6252,12 +6698,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolar jamaican
 				dolari jamaicani
 				dolari jamaicani
+				JMD
+				$
 			
 			
 				dinar iordanian
 				dinar iordanian
 				dinari iordanieni
 				dinari iordanieni
+				JOD
 			
 			
 				yen japonez
@@ -6265,36 +6714,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				yeni japonezi
 				yeni japonezi
 				JPY
+				¥
 			
 			
 				șiling kenyan
 				șiling kenyan
 				șilingi kenyeni
 				șilingi kenyeni
+				KES
 			
 			
 				som kârgâz
 				som kârgâz
 				somi kârgâzi
 				somi kârgâzi
+				KGS
 			
 			
 				riel cambodgian
 				riel cambodgian
 				rieli cambodgieni
 				rieli cambodgieni
+				KHR
+				៛
 			
 			
 				franc comorian
 				franc comorian
 				franci comorieni
 				franci comorieni
+				KMF
+				CF
 			
 			
 				won nord-coreean
 				won nord-coreean
 				woni nord-coreeni
 				woni nord-coreeni
+				KPW
+				₩
 			
 			
 				won sud-coreean
@@ -6302,48 +6760,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				woni sud-coreeni
 				woni sud-coreeni
 				KRW
+				₩
 			
 			
 				dinar kuweitian
 				dinar kuweitian
 				dinari kuweitieni
 				dinari kuweitieni
+				KWD
 			
 			
 				dolar din Insulele Cayman
 				dolar din Insulele Cayman
 				dolari din Insulele Cayman
 				dolari din Insulele Cayman
+				KYD
+				$
 			
 			
 				tenge kazahă
 				tenge kazahă
 				tenge kazahe
 				tenge kazahe
+				KZT
+				₸
 			
 			
 				kip laoțian
 				kip laoțian
 				kipi laoțieni
 				kipi laoțieni
+				LAK
+				₭
 			
 			
 				liră libaneză
 				liră libaneză
 				lire libaneze
 				lire libaneze
+				LBP
+				L£
 			
 			
 				rupie srilankeză
 				rupie srilankeză
 				rupii srilankeze
 				rupii srilankeze
+				LKR
+				Rs
 			
 			
 				dolar liberian
 				dolar liberian
 				dolari liberieni
 				dolari liberieni
+				LRD
+				$
 			
 			
 				loti lesothian
@@ -6353,6 +6825,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				litu lituanian
 				lite lituaniene
 				lite lituaniene
+				LTL
 			
 			
 				franc convertibil luxemburghez
@@ -6377,6 +6850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lats letonian
 				lats letonieni
 				lats letonieni
+				LVL
 			
 			
 				rublă Letonia
@@ -6389,12 +6863,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar libian
 				dinari libieni
 				dinari libieni
+				LYD
 			
 			
 				dirham marocan
 				dirham marocan
 				dirhami marocani
 				dirhami marocani
+				MAD
 			
 			
 				franc marocan
@@ -6407,12 +6883,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu moldovenesc
 				lei moldovenești
 				lei moldovenești
+				MDL
 			
 			
 				ariary malgaș
 				ariary malgaș
 				ariary malgași
 				ariary malgași
+				MGA
+				Ar
 			
 			
 				franc Madagascar
@@ -6425,6 +6904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dinar macedonean
 				dinari macedoneni
 				dinari macedoneni
+				MKD
 			
 			
 				franc Mali
@@ -6437,30 +6917,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kyat din Myanmar
 				kyați din Myanmar
 				kyați din Myanmar
+				MMK
+				K
 			
 			
 				tugrik mongol
 				tugrik mongol
 				tugrici mongoli
 				tugrici mongoli
+				MNT
+				₮
 			
 			
 				pataca din Macao
 				pataca din Macao
 				pataca din Macao
 				pataca din Macao
+				MOP
 			
 			
 				ouguiya mauritană (1973–2017)
 				ouguiya mauritană (1973–2017)
 				ouguiya mauritane (1973–2017)
 				ouguiya mauritane (1973–2017)
+				MRO
 			
 			
 				ouguiya mauritană
 				ouguiya mauritană
 				ouguiya mauritane
 				ouguiya mauritane
+				MRU
 			
 			
 				liră malteză
@@ -6473,18 +6960,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rupie mauritiană
 				rupii mauritiene
 				rupii mauritiene
+				MUR
+				Rs
 			
 			
 				rufiyaa maldiviană
 				rufiyaa maldiviană
 				rufiyaa maldiviene
 				rufiyaa maldiviene
+				MVR
 			
 			
 				kwacha malawiană
 				kwacha malawiană
 				kwache malawiene
 				kwache malawiene
+				MWK
 			
 			
 				peso mexican
@@ -6492,6 +6983,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pesos mexicani
 				pesos mexicani
 				MXN
+				$
 			
 			
 				peso mexican de argint (1861–1992)
@@ -6504,6 +6996,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ringgit malaiezian
 				ringgit malaiezieni
 				ringgit malaiezieni
+				MYR
+				RM
 			
 			
 				escudo Mozambic
@@ -6516,18 +7010,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				metical mozambican
 				metical mozambicani
 				metical mozambicani
+				MZN
 			
 			
 				dolar namibian
 				dolar namibian
 				dolari namibieni
 				dolari namibieni
+				NAD
+				$
 			
 			
 				naira nigeriană
 				naira nigeriană
 				naire nigeriene
 				naire nigeriene
+				NGN
+				₦
 			
 			
 				cordoba nicaraguană (1988–1991)
@@ -6537,6 +7036,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cordoba nicaraguană
 				cordobe nicaraguane
 				cordobe nicaraguane
+				NIO
+				C$
 			
 			
 				gulden olandez
@@ -6549,12 +7050,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				coroană norvegiană
 				coroane norvegiene
 				coroane norvegiene
+				NOK
+				kr
 			
 			
 				rupie nepaleză
 				rupie nepaleză
 				rupii nepaleze
 				rupii nepaleze
+				NPR
+				Rs
 			
 			
 				dolar neozeelandez
@@ -6562,18 +7067,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolari neozeelandezi
 				dolari neozeelandezi
 				NZD
+				$
 			
 			
 				rial omanez
 				rial omanez
 				riali omanezi
 				riali omanezi
+				OMR
 			
 			
 				balboa panameză
 				balboa panameză
 				balboa panameze
 				balboa panameze
+				PAB
 			
 			
 				inti peruvian
@@ -6583,6 +7091,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sol peruvian
 				soli peruvieni
 				soli peruvieni
+				PEN
 			
 			
 				sol peruvian (1863–1965)
@@ -6595,24 +7104,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kina din Papua-Noua Guinee
 				kina din Papua-Noua Guinee
 				kina din Papua-Noua Guinee
+				PGK
 			
 			
 				peso filipinez
 				peso filipinez
 				pesos filipinezi
 				pesos filipinezi
+				PHP
+				₱
 			
 			
 				rupie pakistaneză
 				rupie pakistaneză
 				rupii pakistaneze
 				rupii pakistaneze
+				PKR
+				Rs
 			
 			
 				zlot polonez
 				zlot polonez
 				zloți polonezi
 				zloți polonezi
+				PLN
+				zł
 			
 			
 				zlot polonez (1950–1995)
@@ -6625,12 +7141,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guarani paraguayan
 				guarani paraguayeni
 				guarani paraguayeni
+				PYG
+				₲
 			
 			
 				rial qatarian
 				rial qatarian
 				riali qatarieni
 				riali qatarieni
+				QAR
 			
 			
 				dolar rhodesian
@@ -6649,42 +7168,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leu românesc
 				lei românești
 				lei românești
+				RON
+				lei
 			
 			
 				dinar sârbesc
 				dinar sârbesc
 				dinari sârbești
 				dinari sârbești
+				RSD
 			
 			
 				rublă rusească
 				rublă rusească
 				ruble rusești
 				ruble rusești
+				RUB
+				₽
 			
 			
 				franc rwandez
 				franc rwandez
 				franci rwandezi
 				franci rwandezi
+				RWF
+				RF
 			
 			
 				rial saudit
 				rial saudit
 				riali saudiți
 				riali saudiți
+				SAR
 			
 			
 				dolar din Insulele Solomon
 				dolar din Insulele Solomon
 				dolari din Insulele Solomon
 				dolari din Insulele Solomon
+				SBD
+				$
 			
 			
 				rupie din Seychelles
 				rupie din Seychelles
 				rupii din Seychelles
 				rupii din Seychelles
+				SCR
 			
 			
 				dinar sudanez
@@ -6697,6 +7227,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liră sudaneză
 				lire sudaneze
 				lire sudaneze
+				SDG
 			
 			
 				liră sudaneză (1957–1998)
@@ -6709,18 +7240,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				coroană suedeză
 				coroane suedeze
 				coroane suedeze
+				SEK
+				kr
 			
 			
 				dolar singaporez
 				dolar singaporez
 				dolari singaporezi
 				dolari singaporezi
+				SGD
+				$
 			
 			
 				liră Insula Sf. Elena
 				liră Insula Sf. Elena
 				lire Insula Sf. Elena
 				lire Insula Sf. Elena
+				SHP
+				£
 			
 			
 				tolar sloven
@@ -6739,18 +7276,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				leone din Sierra Leone
 				leoni din Sierra Leone
 				leoni din Sierra Leone
+				SLL
 			
 			
 				șiling somalez
 				șiling somalez
 				șilingi somalezi
 				șilingi somalezi
+				SOS
 			
 			
 				dolar surinamez
 				dolar surinamez
 				dolari surinamezi
 				dolari surinamezi
+				SRD
+				$
 			
 			
 				gulden Surinam
@@ -6763,18 +7304,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liră din Sudanul de Sud
 				lire din Sudanul de Sud
 				lire din Sudanul de Sud
+				SSP
+				£
 			
 			
 				dobra Sao Tome și Principe (1977–2017)
 				dobra Sao Tome și Principe (1977–2017)
 				dobre Sao Tome și Principe (1977–2017)
 				dobre Sao Tome și Principe (1977–2017)
+				STD
 			
 			
 				dobra Sao Tome și Principe
 				dobra Sao Tome și Principe
 				dobre Sao Tome și Principe
 				dobre Sao Tome și Principe
+				STN
+				Db
 			
 			
 				rublă sovietică
@@ -6793,18 +7339,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liră siriană
 				lire siriene
 				lire siriene
+				SYP
+				£
 			
 			
 				lilangeni din Swaziland
 				lilangeni din Swaziland
 				emalangeni din Swaziland
 				emalangeni din Swaziland
+				SZL
 			
 			
 				baht thailandez
 				baht thailandez
 				bahți thailandezi
 				bahți thailandezi
+				THB
+				฿
 			
 			
 				rublă Tadjikistan
@@ -6817,6 +7368,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				somoni tajdic
 				somoni tadjici
 				somoni tadjici
+				TJS
 			
 			
 				manat turkmen (1993–2009)
@@ -6829,18 +7381,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				manat turkmen
 				manat turkmeni
 				manat turkmeni
+				TMT
 			
 			
 				dinar tunisian
 				dinar tunisian
 				dinari tunisieni
 				dinari tunisieni
+				TND
 			
 			
 				pa’anga tongană
 				pa’anga tongană
 				pa’anga tongane
 				pa’anga tongane
+				TOP
+				T$
 			
 			
 				liră turcească (1922–2005)
@@ -6853,12 +7409,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				liră turcească
 				lire turcești
 				lire turcești
+				TRY
+				₺
+				TL
 			
 			
 				dolar din Trinidad-Tobago
 				dolar din Trinidad-Tobago
 				dolari din Trinidad-Tobago
 				dolari din Trinidad-Tobago
+				TTD
+				$
 			
 			
 				dolar nou din Taiwan
@@ -6873,12 +7434,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				șiling tanzanian
 				șilingi tanzanieni
 				șilingi tanzanieni
+				TZS
 			
 			
 				hryvna ucraineană
 				hryvna ucrainiană
 				hryvna ucrainiene
 				hryvna ucrainiene
+				UAH
+				₴
 			
 			
 				carboavă ucraineană
@@ -6897,6 +7461,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				șiling ugandez
 				șilingi ugandezi
 				șilingi ugandezi
+				UGX
 			
 			
 				dolar american
@@ -6904,6 +7469,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolari americani
 				dolari americani
 				USD
+				$
 			
 			
 				dolar american (ziua următoare)
@@ -6928,12 +7494,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peso uruguayan
 				pesos uruguayeni
 				pesos uruguayeni
+				UYU
+				$
 			
 			
 				sum Uzbekistan
 				sum Uzbekistan
 				sum Uzbekistan
 				sum Uzbekistan
+				UZS
 			
 			
 				bolivar Venezuela (1871–2008)
@@ -6946,12 +7515,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bolivar venezuelean (2008–2018)
 				bolivari venezueleni (2008–2018)
 				bolivari venezueleni (2008–2018)
+				VEF
+				Bs
 			
 			
 				bolivar venezuelean
 				bolivar venezuelean
 				bolivari venezueleni
 				bolivari venezueleni
+				VES
 			
 			
 				dong vietnamez
@@ -6959,24 +7531,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dongi vietnamezi
 				dongi vietnamezi
 				VND
+				₫
 			
 			
 				vatu din Vanuatu
 				vatu din Vanuatu
 				vatu din Vanuatu
 				vatu din Vanuatu
+				VUV
 			
 			
 				tala samoană
 				tala samoană
 				tala samoane
 				tala samoană
+				WST
 			
 			
 				franc CFA BEAC
 				franc CFA BEAC
 				franci CFA BEAC
 				franci CFA central-africani
+				FCFA
 			
 			
 				argint
@@ -7002,6 +7578,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dolari din Caraibele de Est
 				dolari din Caraibele de Est
 				XCD
+				$
 			
 			
 				drepturi speciale de tragere
@@ -7023,6 +7600,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franc CFA BCEAO
 				franci CFA BCEAO
 				franci CFA BCEAO
+				CFA
 			
 			
 				paladiu
@@ -7032,6 +7610,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franc CFP
 				franci CFP
 				franci CFP
+				CFPF
 			
 			
 				platină
@@ -7056,6 +7635,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rial yemenit
 				riali yemeniți
 				riali yemeniți
+				YER
 			
 			
 				dinar iugoslav greu
@@ -7083,6 +7663,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rand sud-african
 				ranzi sud-africani
 				ranzi sud-africani
+				ZAR
+				R
 			
 			
 				kwacha zambian (1968–2012)
@@ -7095,6 +7677,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kwacha zambian
 				kwache zambiene
 				kwache zambiene
+				ZMW
+				ZK
 			
 			
 				zair nou
@@ -7116,7 +7700,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			~{0}
 			≥{0}
+			≤{0}
 			{0} - {1}
 		
 		
@@ -7132,6 +7718,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} pe {1}
 			
+			
+				{0}-{1}
+			
 			
 				forță g
 				{0} forță g
@@ -7234,10 +7823,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pe inchi pătrat
 			
 			
-				dunami
-				{0} dunam
-				{0} dunami
-				{0} de dunami
+				dunami
+				{0} dunam
+				{0} dunami
+				{0} de dunami
 			
 			
 				karate
@@ -7270,21 +7859,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} de procente
 			
 			
+				‰
 				la mie
 				{0} la mie
 				{0} la mie
 			
 			
-				‱
-				{0} la zece mii
-				{0} la zece mii
-				{0} la zece mii
+				{0} la zece mii
+				{0} la zece mii
+				{0} la zece mii
 			
 			
-				moli
-				{0} mol
-				{0} moli
-				{0} de moli
+				moli
+				{0} mol
+				{0} moli
+				{0} de moli
 			
 			
 				litri pe kilometru
@@ -7382,6 +7971,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} secole
 				{0} de secole
 			
+			
+				decenii
+				{0} deceniu
+				{0} decenii
+				{0} de decenii
+			
 			
 				ani
 				{0} an
@@ -7516,16 +8111,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} de electronvolți
 			
 			
-				unități termice britanice
-				{0} unitate termică britanică
-				{0} unități termice britanice
-				{0} de unități termice britanice
+				unități termice britanice
+				{0} unitate termică britanică
+				{0} unități termice britanice
+				{0} de unități termice britanice
+			
+			
+				thermi S.U.A.
+				{0} therm S.U.A.
+				{0} thermi S.U.A.
+				{0} de thermi S.U.A.
 			
 			
-				livre-forță
-				{0} livră-forță
-				{0} livre-forță
-				{0} de livre-forță
+				livre-forță
+				{0} livră-forță
+				{0} livre-forță
+				{0} de livre-forță
 			
 			
 				newtoni
@@ -7557,6 +8158,45 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertzi
 				{0} de hertzi
 			
+			
+				em tipografic
+			
+			
+				pixeli
+				{0} pixel
+				{0} pixeli
+				{0} de pixeli
+			
+			
+				megapixeli
+				{0} megapixel
+				{0} megapixeli
+				{0} de megapixel
+			
+			
+				pixeli pe centimetru
+				{0} pixel pe centimetru
+				{0} pixeli pe centimetru
+				{0} de pixeli pe centimetru
+			
+			
+				pixeli pe inch
+				{0} pixel pe inch
+				{0} pixeli pe inch
+				{0} de pixeli pe inch
+			
+			
+				puncte pe centimeru
+				{0} punct pe centimetru
+				{0} puncte pe centimetru
+				{0} de puncte pe centimetru
+			
+			
+				puncte pe inch
+				{0} punct pe inch
+				{0} puncte pe inch
+				{0} de puncte pe inch
+			
 			
 				kilometri
 				{0} kilometru
@@ -7671,10 +8311,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} de puncte
 			
 			
-				raze solare
-				{0} rază solară
-				{0} raze solare
-				{0} de raze solare
+				raze solare
+				{0} rază solară
+				{0} raze solare
+				{0} de raze solare
 			
 			
 				lucși
@@ -7806,12 +8446,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} cai putere
 				{0} de cai putere
 			
-			
-				hectopascali
-				{0} hectopascal
-				{0} hectopascali
-				{0} de hectopascali
-			
 			
 				milimetri coloană de mercur
 				{0} milimetru coloană de mercur
@@ -7830,6 +8464,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inchi coloană de mercur
 				{0} de inchi coloană de mercur
 			
+			
+				bari
+				{0} bar
+				{0} bari
+				{0} de bari
+			
 			
 				milibari
 				{0} milibar
@@ -7842,6 +8482,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfere
 				{0} de atmosfere
 			
+			
+				pascali
+				{0} pascal
+				{0} pascali
+				{0} de pascali
+			
+			
+				hectopascali
+				{0} hectopascal
+				{0} hectopascali
+				{0} de hectopascali
+			
 			
 				kilopascali
 				{0} kilopascal
@@ -7903,16 +8555,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} de kelvini
 			
 			
-				livră-forță picioare
-				{0} livră-forță picior
-				{0} livră-forță picioare
-				{0} de livră-forță picioare
+				livră-forță picioare
+				{0} livră-forță picior
+				{0} livră-forță picioare
+				{0} de livră-forță picioare
 			
 			
 				newton-metri
-				{0} newton-metru
-				{0} newton-metri
-				{0} de newton-metri
+				{0} newton metru
+				{0} newton metri
+				{0} de newton metri
 			
 			
 				kilometri cubi
@@ -8052,10 +8704,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} de uncii lichide
 			
 			
-				uncii lichide imperiale
-				{0} uncie lichidă imperială
-				{0} uncii lichide imperiale
-				{0} de uncii lichide imperiale
+				uncii lichide imperiale
+				{0} uncie lichidă imperială
+				{0} uncii lichide imperiale
+				{0} de uncii lichide imperiale
 			
 			
 				linguri
@@ -8070,10 +8722,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} de lingurițe
 			
 			
-				barili
-				{0} baril
-				{0} barili
-				{0} de barili
+				barili
+				{0} baril
+				{0} barili
+				{0} de barili
 			
 			
 				punct cardinal
@@ -8084,6 +8736,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}{1}
+			
 			
 				forță g
 				{0} G
@@ -8131,6 +8789,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} km²
 				{0} km²
 				{0} km²
+				{0}/km²
 			
 			
 				ha
@@ -8157,6 +8816,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mi²
 				{0} mi²
 				{0} mi²
+				{0}/mi²
 			
 			
 				acri
@@ -8184,10 +8844,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/in²
 			
 			
-				dunami
-				{0} dunam
-				{0} dunami
-				{0} dunami
+				dunami
+				{0} dunam
+				{0} dunami
+				{0} dunami
+			
+			
+				kt
+				{0} kt
+				{0} kt
+				{0} kt
 			
 			
 				mg/dl
@@ -8201,17 +8867,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mmol/l
 				{0} mmol/l
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
+			
+				ppm
+				{0} ppm
+				{0} ppm
+				{0} ppm
+			
+			
+				%
+				{0}%
+				{0}%
+				{0}%
+			
+			
+				‰
+				{0}‰
+				{0}‰
+				{0}‰
 			
 			
-				mol
-				{0} mol
-				{0} moli
-				{0} moli
+				{0} mol
+				{0} moli
+				{0} moli
 			
 			
 				l/km
@@ -8237,6 +8914,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mi/gal imp.
 				{0} mi/gal imp.
 			
+			
+				PB
+				{0} PB
+				{0} PB
+				{0} PB
+			
 			
 				TB
 				{0} TB
@@ -8303,6 +8986,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} sec.
 				{0} sec.
 			
+			
+				dec.
+				{0} dec.
+				{0} dec.
+				{0} dec.
+			
 			
 				ani
 				{0} an
@@ -8437,16 +9126,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eV
 			
 			
-				BTU
-				{0} BTU
-				{0} BTU
-				{0} BTU
+				BTU
+				{0} BTU
+				{0} BTU
+				{0} BTU
+			
+			
+				thm
+				{0} thm
+				{0} thm
+				{0} thm
 			
 			
-				livră-forță
-				{0} lbf
-				{0} lbf
-				{0} lbf
+				livră-forță
 			
 			
 				N
@@ -8478,6 +9170,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				pixeli
+			
+			
+				ppc
+				{0} ppc
+				{0} ppc
+				{0} ppc
+			
+			
+				dpc
+				{0} dpc
+				{0} dpc
+				{0} dpc
+			
 			
 				km
 				{0} km
@@ -8585,11 +9292,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} smi
 				{0} smi
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
+			
+				pt
+				{0} pt
+				{0} pt
+				{0} pt
 			
 			
 				lx
@@ -8721,12 +9428,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CP
 				{0} CP
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8745,12 +9446,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} in Hg
 				{0} in Hg
 			
+			
+				bar
+			
 			
 				mbar
 				{0} mbar
 				{0} mbar
 				{0} mbar
 			
+			
+				atm
+				{0} atm
+				{0} atm
+				{0} atm
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8812,10 +9528,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 			
 			
-				livră-forță picior
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				livră-forță picior
 			
 			
 				N⋅m
@@ -8961,10 +9674,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				fl oz imp.
-				{0} fl oz imp.
-				{0} fl oz imp.
-				{0} fl oz imp.
+				fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
+				{0} fl oz imp.
 			
 			
 				tbsp
@@ -8979,10 +9692,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 			
 			
-				baril
-				{0} bbl
-				{0} bbl
-				{0} bbl
+				baril
 			
 			
 				direcție
@@ -8993,11 +9703,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}{1}
+			
 			
 				{0} G
 				{0} G
 				{0} G
 			
+			
+				m/s²
+				{0} m/s²
+				{0} m/s²
+				{0} m/s²
+			
+			
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				{0}′
 				{0}′
@@ -9008,11 +9735,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}″
 			
+			
+				{0} km²
+				{0} km²
+				{0} km²
+			
+			
+				{0} ha
+				{0} ha
+				{0} ha
+			
+			
+				{0} m²
+				{0} m²
+				{0} m²
+			
+			
+				{0} mi²
+				{0} mi²
+				{0} mi²
+			
 			
 				{0} ac.
 				{0} ac.
 				{0} ac.
 			
+			
+				{0} ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				%
+				{0}%
+				{0}%
+				{0}%
+			
 			
 				l/100 km
 				{0} l/100 km
@@ -9058,6 +9816,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} h
 				{0} h
 				{0} h
+				{0}/h
 			
 			
 				m
@@ -9071,6 +9830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} s
 				{0} s
 				{0} s
+				{0}/s
 			
 			
 				ms
@@ -9078,23 +9838,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ms
 				{0} ms
 			
+			
+				μs
+				{0} μs
+				{0} μs
+				{0} μs
+			
+			
+				ns
+				{0} ns
+				{0} ns
+				{0} ns
+			
 			
 				km
 				{0} km
 				{0} km
 				{0} km
+				{0}/km
 			
 			
 				m
 				{0} m
 				{0} m
 				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
+				{0} dm
 			
 			
 				cm
 				{0} cm
 				{0} cm
 				{0} cm
+				{0}/cm
 			
 			
 				mm
@@ -9102,6 +9883,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mm
 				{0} mm
 			
+			
+				µm
+				{0} µm
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+				{0} nm
+			
+			
+				pm
+				{0} pm
+				{0} pm
+				{0} pm
+			
+			
+				mi
+				{0} mi
+				{0} mi
+				{0} mi
+			
+			
+				yd
+				{0} yd
+				{0} yd
+				{0} yd
+			
+			
+				ft
+				{0} ft
+				{0} ft
+				{0} ft
+				{0}/ft
+			
+			
+				in
+				{0} in
+				{0} in
+				{0} in
+				{0}/in
+			
+			
+				pc
+				{0} pc
+				{0} pc
+				{0} pc
+			
 			
 				a.l.
 				{0} a.l.
@@ -9120,17 +9951,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mn
 				{0} mn
 			
+			
+				smi
+				{0} smi
+				{0} smi
+				{0} smi
+			
+			
+				pt
+				{0} pt
+				{0} pt
+				{0} pt
+			
+			
+				t
+				{0} t
+				{0} t
+				{0} t
+			
 			
 				kg
 				{0} kg
 				{0} kg
 				{0} kg
+				{0}/kg
 			
 			
 				g
 				{0} g
 				{0} g
 				{0} g
+				{0}/g
+			
+			
+				mg
+				{0} mg
+				{0} mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
+				{0} µg
+				{0} µg
 			
 			
 				t.s.
@@ -9138,37 +10001,135 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} t.s.
 				{0} t.s.
 			
+			
+				st
+				{0} st
+				{0} st
+				{0} st
+			
+			
+				lb
+				{0} lb
+				{0} lb
+				{0} lb
+				{0}/lb
+			
+			
+				oz
+				{0} oz
+				{0} oz
+				{0} oz
+				{0}/oz
+			
+			
+				oz t
+				{0} oz t
+				{0} oz t
+				{0} oz t
+			
 			
 				carate
 				{0} ct
 				{0} ct
 				{0} ct
 			
+			
+				{0} kW
+				{0} kW
+				{0} kW
+			
+			
+				{0} W
+				{0} W
+				{0} W
+			
 			
 				{0} CP
 				{0} CP
 				{0} CP
 			
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+				{0} psi
+				{0} psi
+			
 			
 				in Hg
 			
 			
+				mbar
 				{0} mb
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
 				{0} km/h
 				{0} km/h
 			
+			
+				m/s
+				{0} m/s
+				{0} m/s
+				{0} m/s
+			
+			
+				mi/h
+				{0} mi/h
+				{0} mi/h
+				{0} mi/h
+			
+			
+				kn
+				{0} kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0} °C
 				{0} °C
 				{0} °C
 			
+			
+				°F
+			
+			
+				K
+				{0} K
+				{0} K
+				{0} K
+			
+			
+				{0} km³
+				{0} km³
+				{0} km³
+			
+			
+				{0} mi³
+				{0} mi³
+				{0} mi³
+			
 			
 				l
 				{0} l
@@ -9201,12 +10162,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} și {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0} sau {1}
 			{0} sau {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/ro_MD.xml b/make/data/cldr/common/main/ro_MD.xml
index a87d9bcbe36..1ca44be68f8 100644
--- a/make/data/cldr/common/main/ro_MD.xml
+++ b/make/data/cldr/common/main/ro_MD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -167,7 +167,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
 			
 				{0} an
 				{0} ani
@@ -179,11 +178,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} luni
 				{0} luni
 			
-			
-				{0} săpt.
-				{0} săpt.
-				{0} săpt.
-			
 			
 				{0} zi
 				{0} zile
@@ -197,9 +191,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				msec
-				{0} ms
-				{0} ms
-				{0} ms
 			
 		
 	
diff --git a/make/data/cldr/common/main/ro_RO.xml b/make/data/cldr/common/main/ro_RO.xml
index 38efdc166a5..6c074d4cab9 100644
--- a/make/data/cldr/common/main/ro_RO.xml
+++ b/make/data/cldr/common/main/ro_RO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/rof.xml b/make/data/cldr/common/main/rof.xml
index 680e878769d..e1e4207cbe8 100644
--- a/make/data/cldr/common/main/rof.xml
+++ b/make/data/cldr/common/main/rof.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/rof_TZ.xml b/make/data/cldr/common/main/rof_TZ.xml
index 7ea926ac29c..fcf80699e6f 100644
--- a/make/data/cldr/common/main/rof_TZ.xml
+++ b/make/data/cldr/common/main/rof_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/root.xml b/make/data/cldr/common/main/root.xml
index 02a09b0231a..d78e5da01e4 100644
--- a/make/data/cldr/common/main/root.xml
+++ b/make/data/cldr/common/main/root.xml
@@ -13,7 +13,7 @@ for derived annotations.
 -->
 
 	
-		
+		
 		
 	
 	
@@ -42,8 +42,8 @@ for derived annotations.
 	
 		[]
 		[]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ( ) \[ \] \{ \}]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ; \: ! ? . ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -103,7 +103,6 @@ for derived annotations.
 					
 					
 						BE
-						
 					
 					
 						
@@ -204,7 +203,6 @@ for derived annotations.
 				
 					
 				
-				
 				
 					
 						
@@ -376,7 +374,6 @@ for derived annotations.
 					
 					
 						
-							
 							r-MM-dd
 						
 					
@@ -1597,7 +1594,6 @@ for derived annotations.
 					
 					
 						AM
-						
 					
 					
 						
@@ -1763,7 +1759,6 @@ for derived annotations.
 					
 					
 						AH
-						
 					
 					
 						
@@ -1901,9 +1896,6 @@ for derived annotations.
 						
 					
 					
-						
 						Taika (645–650)
 						Hakuchi (650–671)
 						Hakuhō (672–686)
@@ -2486,7 +2478,6 @@ for derived annotations.
 					
 						
 					
-					
 					
 						Before R.O.C.
 						R.O.C.
@@ -2581,7 +2572,7 @@ for derived annotations.
 				
 					-{0} w
 				
-				the week of {0} 
+				the week of {0}
 			
 			
 				
@@ -2959,9 +2950,9 @@ for derived annotations.
 			٫
 			٬
 			؛
-			٪؜ 
-			؜+ 
-			؜- 
+			٪؜
+			؜+
+			؜-
 			اس
 			×
 			؉
@@ -2974,8 +2965,8 @@ for derived annotations.
 			٬
 			؛
 			٪
-			‎+‎ 
-			‎-‎ 
+			‎+‎
+			‎-‎
 			×۱۰^
 			×
 			؉
@@ -4248,6 +4239,9 @@ for derived annotations.
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				g-force
 				{0} G
@@ -4417,6 +4411,10 @@ for derived annotations.
 				c
 				{0} c
 			
+			
+				dec
+				{0} dec
+			
 			
 				yr
 				{0} y
@@ -4524,6 +4522,10 @@ for derived annotations.
 				Btu
 				{0} Btu
 			
+			
+				US therm
+				{0} US therm
+			
 			
 				lbf
 				{0} lbf
@@ -4548,6 +4550,34 @@ for derived annotations.
 				Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+			
+			
+				px
+				{0} px
+			
+			
+				MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -4729,10 +4759,6 @@ for derived annotations.
 				hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -4745,6 +4771,10 @@ for derived annotations.
 				inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -4753,6 +4783,14 @@ for derived annotations.
 				atm
 				{0} atm
 			
+			
+				Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -4926,13 +4964,13 @@ for derived annotations.
 			
 		
 		
-			h:mm 
+			h:mm
 		
 		
-			h:mm:ss 
+			h:mm:ss
 		
 		
-			m:ss 
+			m:ss
 		
 	
 	
@@ -4987,7 +5025,6 @@ for derived annotations.
 		{0} — other
 		scripts — {0}
 		{0} strokes
-		
 		activity
 		African script
 		American script
@@ -5146,79 +5183,3 @@ for derived annotations.
 		slashed zero
 	
 
-
diff --git a/make/data/cldr/common/main/ru.xml b/make/data/cldr/common/main/ru.xml
index 73f00dc725f..66d6af22581 100644
--- a/make/data/cldr/common/main/ru.xml
+++ b/make/data/cldr/common/main/ru.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -39,7 +39,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			староанглийский
 			ангика
 			арабский
-			литературный арабский
+			арабский литературный
 			арамейский
 			мапуче
 			арапахо
@@ -349,14 +349,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			бирманский
 			миене
 			эрзянский
-			мазендеранский
+			мазандеранский
 			науру
 			миньнань
 			неаполитанский
 			нама
 			норвежский букмол
 			северный ндебеле
-			нижнегерманский
+			нижненемецкий
 			нижнесаксонский
 			непальский
 			неварский
@@ -544,14 +544,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			идиш
 			йоруба
 			кантонский
+			юэ
 			чжуань
 			сапотекский
 			блиссимволика
 			зенагский
 			тамазигхтский
 			китайский
+			севернокитайский
 			китайский, упрощенное письмо
+			севернокитайский, упрощенное письмо
 			китайский, традиционное письмо
+			севернокитайский, традиционное письмо
 			зулу
 			зуньи
 			нет языкового материала
@@ -612,7 +616,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -802,7 +806,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Республика Конго
 			Швейцария
 			Кот-д’Ивуар
-			Берег Слоновой Кости
 			Острова Кука
 			Чили
 			Камерун
@@ -1070,22 +1073,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			календарь
 			формат валюты
-			Игнорировать символы при сортировке
-			Обратная сортировка по акценту
-			Сортировка по верхнему или нижнему регистру
-			Сортировка с учетом регистра
+			сортировка без учета символов
+			обратная сортировка по акценту
+			сортировка по верхнему или нижнему регистру
+			сортировка с учетом регистра
 			порядок сортировки
-			Нормализованная сортировка
-			Сортировка чисел
-			Эффективность сортировки
+			нормализованная сортировка
+			числовая сортировка
+			эффективность сортировки
 			валюта
-			формат времени (12 или 24)
+			формат времени (12- или 24-часовой)
 			стиль перевода строки
 			система мер
 			цифры
-			Часовой пояс
-			Вариант региональных настроек
-			Частное
+			часовой пояс
+			вариант региональных настроек
+			частное
 		
 		
 			буддийский календарь
@@ -1286,8 +1289,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б в г д е ё ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я]
 		[{а\u0301} {е\u0301} {и\u0301} {о\u0301} {у\u0301} {ы\u0301} {э\u0301} {ю\u0301} {я\u0301}]
 		[А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ы Э Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ " “ „ « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1301,13 +1304,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1480,6 +1478,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							мисра
 							наси
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							тот
 							бабэ
@@ -1512,6 +1525,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							мисра
 							наси
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							тот
 							бабэ
@@ -1562,6 +1590,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							нахасэ
 							эпагомен
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							мескерем
 							текемт
@@ -1594,6 +1637,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							нахасэ
 							эпагомен
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							мескерем
 							текемт
@@ -1715,12 +1773,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -2146,6 +2199,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						до н. э.
+						до н. э.
 						н. э.
 						н. э.
 					
@@ -2177,6 +2231,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2259,12 +2335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -2423,6 +2494,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ав
 							элул
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							тишрей
 							хешван
@@ -2457,6 +2544,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ав
 							элул
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							тишрей
 							хешван
@@ -2479,6 +2582,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						от сотворения мира
 					
+					
+						AM
+					
+					
+						AM
+					
 				
 			
 			
@@ -2498,6 +2607,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							магха
 							пхалгуна
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							чайтра
 							ваисакха
@@ -2528,6 +2651,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							магха
 							пхалгуна
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							чайтра
 							ваисакха
@@ -2573,6 +2710,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							зуль-к.
 							зуль-х.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							мухаррам
 							сафар
@@ -2603,6 +2754,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							зуль-к.
 							зуль-х.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							мухаррам
 							сафар
@@ -2623,6 +2788,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						после хиджры
 					
+					
+						AH
+					
+					
+						AH
+					
 				
 			
 			
@@ -2885,6 +3056,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							бахман
 							эсфанд
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							фарвардин
 							ордибехешт
@@ -2915,6 +3100,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							бахман
 							эсфанд
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							фарвардин
 							ордибехешт
@@ -2990,9 +3189,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				г.
-				в прошлом г.
-				в этом г.
-				в след. г.
+				в прошлом г.
+				в этом г.
+				в след. г.
 				
 					через {0} г.
 					через {0} г.
@@ -3008,9 +3207,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				г.
-				в пр. г.
-				в эт. г.
-				в сл. г.
+				в пр. г.
+				в эт. г.
+				в сл. г.
 				
 					+{0} г.
 					+{0} г.
@@ -3098,9 +3297,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мес.
-				в прошлом мес.
-				в этом мес.
-				в следующем мес.
+				в прошлом мес.
+				в этом мес.
+				в следующем мес.
 				
 					через {0} мес.
 					через {0} мес.
@@ -3116,9 +3315,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мес.
-				в пр. мес.
-				в эт. мес.
-				в след. мес.
+				в пр. мес.
+				в эт. мес.
+				в след. мес.
 				
 					+{0} мес.
 					+{0} мес.
@@ -3153,9 +3352,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				нед.
-				на прошлой нед.
-				на этой нед.
-				на следующей нед.
+				на прошлой нед.
+				на этой нед.
+				на следующей нед.
 				
 					через {0} нед.
 					через {0} нед.
@@ -3172,9 +3371,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				нед.
-				на пр. нед.
-				на эт. нед.
-				на след. неделе
+				на пр. нед.
+				на эт. нед.
+				на след. нед.
 				
 					+{0} нед.
 					+{0} нед.
@@ -3221,6 +3420,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				дн.
 				позавчера
+				вчера
+				сегодня
+				завтра
 				послезавтра
 				
 					через {0} дн.
@@ -3238,6 +3440,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				дн.
 				позавчера
+				вчера
+				сегодня
+				завтра
 				послезавтра
 				
 					+{0} дн.
@@ -3665,32 +3870,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ч
 				в этот час
 				
-					через {0} ч.
-					через {0} ч.
-					через {0} ч.
-					через {0} ч.
+					через {0} ч
+					через {0} ч
+					через {0} ч
+					через {0} ч
 				
 				
-					{0} ч. назад
-					{0} ч. назад
-					{0} ч. назад
-					{0} ч. назад
+					{0} ч назад
+					{0} ч назад
+					{0} ч назад
+					{0} ч назад
 				
 			
 			
 				ч
 				в этот час
 				
-					+{0} ч.
-					+{0} ч.
-					+{0} ч.
-					+{0} ч.
+					+{0} ч
+					+{0} ч
+					+{0} ч
+					+{0} ч
 				
 				
-					-{0} ч.
-					-{0} ч.
-					-{0} ч.
-					-{0} ч.
+					-{0} ч
+					-{0} ч
+					-{0} ч
+					-{0} ч
 				
 			
 			
@@ -3727,16 +3932,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				мин
 				
-					+{0} мин.
-					+{0} мин.
-					+{0} мин.
-					+{0} мин.
+					+{0} мин
+					+{0} мин
+					+{0} мин
+					+{0} мин
 				
 				
-					-{0} мин.
-					-{0} мин.
-					-{0} мин.
-					-{0} мин.
+					-{0} мин
+					-{0} мин
+					-{0} мин
+					-{0} мин
 				
 			
 			
@@ -4130,7 +4335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Икалуит
 			
 			
-				Пангниртунг
+				Пангниртанг
 			
 			
 				Монктон
@@ -4481,7 +4686,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Актобе
 			
 			
-				Костанай
+				Костанай
 			
 			
 				Кызылорда
@@ -4886,7 +5091,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Сальвадор
 			
 			
-				Лоуэр-Принсес-Куортер
+				Лоуэр-Принс-Куотер
 			
 			
 				Дамаск
@@ -6083,6 +6288,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 тысяча
@@ -6282,6 +6492,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				дирхама ОАЭ
 				дирхамов ОАЭ
 				дирхама ОАЭ
+				AED
 			
 			
 				Афгани (1927–2002)
@@ -6292,6 +6503,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				афгани
 				афгани
 				афгани
+				AFN
 			
 			
 				албанский лек
@@ -6299,6 +6511,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				албанских лека
 				албанских леков
 				албанского лека
+				ALL
 			
 			
 				армянский драм
@@ -6306,6 +6519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				армянских драма
 				армянских драмов
 				армянского драма
+				AMD
 			
 			
 				нидерландский антильский гульден
@@ -6313,6 +6527,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нидерландских антильских гульдена
 				нидерландских антильских гульденов
 				нидерландского антильского гульдена
+				ANG
 			
 			
 				ангольская кванза
@@ -6320,6 +6535,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ангольские кванзы
 				ангольских кванз
 				ангольской кванзы
+				AOA
 				Kz
 			
 			
@@ -6351,6 +6567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				аргентинских песо
 				аргентинских песо
 				аргентинского песо
+				ARS
 				$
 			
 			
@@ -6362,6 +6579,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				австралийских доллара
 				австралийских долларов
 				австралийского доллара
+				A$
 				$
 			
 			
@@ -6370,6 +6588,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				арубанских флорина
 				арубанских флоринов
 				арубанского флорина
+				AWG
 			
 			
 				Старый азербайджанский манат
@@ -6380,6 +6599,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				азербайджанских маната
 				азербайджанских манатов
 				азербайджанского маната
+				AZN
 			
 			
 				Динар Боснии и Герцеговины
@@ -6390,6 +6610,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				конвертируемые марки Боснии и Герцеговины
 				конвертируемых марок Боснии и Герцеговины
 				конвертируемой марки Боснии и Герцеговины
+				BAM
 				KM
 			
 			
@@ -6398,6 +6619,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				барбадосских доллара
 				барбадосских долларов
 				барбадосского доллара
+				BBD
 				$
 			
 			
@@ -6406,6 +6628,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бангладешские таки
 				бангладешских так
 				бангладешской таки
+				BDT
 				৳
 			
 			
@@ -6426,6 +6649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				болгарских лева
 				болгарских левов
 				болгарского лева
+				BGN
 			
 			
 				бахрейнский динар
@@ -6433,6 +6657,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бахрейнских динара
 				бахрейнских динаров
 				бахрейнского динара
+				BHD
 			
 			
 				бурундийский франк
@@ -6440,6 +6665,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бурундийских франка
 				бурундийских франков
 				бурундийского франка
+				BIF
 			
 			
 				бермудский доллар
@@ -6447,6 +6673,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бермудских доллара
 				бермудских долларов
 				бермудского доллара
+				BMD
 				$
 			
 			
@@ -6455,6 +6682,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				брунейских доллара
 				брунейских долларов
 				брунейского доллара
+				BND
 				$
 			
 			
@@ -6463,6 +6691,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				боливийских боливиано
 				боливийских боливиано
 				боливийского боливиано
+				BOB
 				Bs
 			
 			
@@ -6486,6 +6715,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бразильских реала
 				бразильских реалов
 				бразильского реала
+				R$
 				R$
 			
 			
@@ -6500,6 +6730,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				багамских доллара
 				багамских долларов
 				багамского доллара
+				BSD
 				$
 			
 			
@@ -6508,6 +6739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бутанских нгултрума
 				бутанских нгултрумов
 				бутанского нгултрума
+				BTN
 			
 			
 				Джа
@@ -6518,6 +6750,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ботсванские пулы
 				ботсванских пул
 				ботсванской пулы
+				BWP
 				P
 			
 			
@@ -6529,6 +6762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белорусских рубля
 				белорусских рублей
 				белорусского рубля
+				BYN
 				р.
 			
 			
@@ -6537,6 +6771,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белорусских рубля (2000–2016)
 				белорусских рублей (2000–2016)
 				белорусского рубля (2000–2016)
+				BYR
 			
 			
 				белизский доллар
@@ -6544,6 +6779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белизских доллара
 				белизских долларов
 				белизского доллара
+				BZD
 				$
 			
 			
@@ -6552,6 +6788,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				канадских доллара
 				канадских долларов
 				канадского доллара
+				CA$
 				$
 			
 			
@@ -6560,6 +6797,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				конголезских франка
 				конголезских франков
 				конголезского франка
+				CDF
 			
 			
 				WIR евро
@@ -6570,6 +6808,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				швейцарских франка
 				швейцарских франков
 				швейцарского франка
+				CHF
 			
 			
 				WIR франк
@@ -6583,6 +6822,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чилийских песо
 				чилийских песо
 				чилийского песо
+				CLP
 				$
 			
 			
@@ -6599,6 +6839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				китайских юаня
 				китайских юаней
 				китайского юаня
+				CN¥
 				¥
 			
 			
@@ -6607,6 +6848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				колумбийских песо
 				колумбийских песо
 				колумбийского песо
+				COP
 				$
 			
 			
@@ -6618,6 +6860,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				костариканских колона
 				костариканских колонов
 				костариканского колона
+				CRC
 				₡
 			
 			
@@ -6632,6 +6875,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубинских конвертируемых песо
 				кубинских конвертируемых песо
 				кубинского конвертируемого песо
+				CUC
 				$
 			
 			
@@ -6640,6 +6884,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубинских песо
 				кубинских песо
 				кубинского песо
+				CUP
 				$
 			
 			
@@ -6648,6 +6893,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				эскудо Кабо-Верде
 				эскудо Кабо-Верде
 				эскудо Кабо-Верде
+				CVE
 			
 			
 				Кипрский фунт
@@ -6658,6 +6904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чешские кроны
 				чешских крон
 				чешской кроны
+				CZK
 				Kč
 			
 			
@@ -6672,6 +6919,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				франка Джибути
 				франков Джибути
 				франка Джибути
+				DJF
 			
 			
 				датская крона
@@ -6679,6 +6927,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				датские кроны
 				датских крон
 				датской кроны
+				DKK
 				kr
 			
 			
@@ -6687,6 +6936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доминиканских песо
 				доминиканских песо
 				доминиканского песо
+				DOP
 				$
 			
 			
@@ -6695,6 +6945,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				алжирских динара
 				алжирских динаров
 				алжирского динара
+				DZD
 			
 			
 				Эквадорский сукре
@@ -6711,6 +6962,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				египетских фунта
 				египетских фунтов
 				египетского фунта
+				EGP
 				E£
 			
 			
@@ -6719,6 +6971,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				эритрейские накфы
 				эритрейских накф
 				эритрейской накфы
+				ERN
 			
 			
 				Испанская песета (А)
@@ -6735,6 +6988,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				эфиопских быра
 				эфиопских быров
 				эфиопского быра
+				ETB
 			
 			
 				евро
@@ -6742,6 +6996,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				евро
 				евро
 				евро
+				€
 				€
 			
 			
@@ -6753,6 +7008,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доллара Фиджи
 				долларов Фиджи
 				доллара Фиджи
+				FJD
 				$
 			
 			
@@ -6761,6 +7017,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фунта Фолклендских островов
 				фунтов Фолклендских островов
 				фунта Фолклендских островов
+				FKP
 				£
 			
 			
@@ -6772,6 +7029,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				британских фунта стерлингов
 				британских фунтов стерлингов
 				британского фунта стерлингов
+				£
 				£
 			
 			
@@ -6783,6 +7041,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				грузинских лари
 				грузинских лари
 				грузинского лари
+				GEL
 				ლ
 				₾
 			
@@ -6795,6 +7054,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ганских седи
 				ганских седи
 				ганского седи
+				GHS
 			
 			
 				гибралтарский фунт
@@ -6802,6 +7062,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гибралтарских фунта
 				гибралтарских фунтов
 				гибралтарского фунта
+				GIP
 				£
 			
 			
@@ -6810,6 +7071,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гамбийских даласи
 				гамбийских даласи
 				гамбийского даласи
+				GMD
 			
 			
 				гвинейский франк
@@ -6817,6 +7079,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гвинейских франка
 				гвинейских франков
 				гвинейского франка
+				GNF
 				FG
 			
 			
@@ -6834,6 +7097,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гватемальских кетсаля
 				гватемальских кетсалей
 				гватемальского кетсаля
+				GTQ
 				Q
 			
 			
@@ -6848,6 +7112,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гайанских доллара
 				гайанских долларов
 				гайанского доллара
+				GYD
 				$
 			
 			
@@ -6856,6 +7121,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гонконгских доллара
 				гонконгских долларов
 				гонконгского доллара
+				HK$
 				$
 			
 			
@@ -6864,6 +7130,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гондурасские лемпиры
 				гондурасских лемпир
 				гондурасской лемпиры
+				HNL
 				L
 			
 			
@@ -6875,6 +7142,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				хорватские куны
 				хорватских кун
 				хорватской куны
+				HRK
 				kn
 			
 			
@@ -6883,6 +7151,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гаитянских гурда
 				гаитянских гурдов
 				гаитянского гурда
+				HTG
 			
 			
 				венгерский форинт
@@ -6890,6 +7159,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венгерских форинта
 				венгерских форинтов
 				венгерского форинта
+				HUF
 				Ft
 			
 			
@@ -6898,6 +7168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				индонезийские рупии
 				индонезийских рупий
 				индонезийской рупии
+				IDR
 				Rp
 			
 			
@@ -6912,6 +7183,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				новых израильских шекеля
 				новых израильских шекелей
 				нового израильского шекеля
+				₪
 				₪
 			
 			
@@ -6920,6 +7192,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				индийские рупии
 				индийских рупий
 				индийской рупии
+				₹
 				₹
 			
 			
@@ -6928,6 +7201,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				иракских динара
 				иракских динаров
 				иракского динара
+				IQD
 			
 			
 				иранский риал
@@ -6935,6 +7209,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				иранских риала
 				иранских риалов
 				иранского риала
+				IRR
 			
 			
 				исландская крона
@@ -6942,6 +7217,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				исландские кроны
 				исландских крон
 				исландской кроны
+				ISK
 				kr
 			
 			
@@ -6953,6 +7229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ямайских доллара
 				ямайских долларов
 				ямайского доллара
+				JMD
 				$
 			
 			
@@ -6961,6 +7238,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				иорданских динара
 				иорданских динаров
 				иорданского динара
+				JOD
 			
 			
 				японская иена
@@ -6977,6 +7255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кенийских шиллинга
 				кенийских шиллингов
 				кенийского шиллинга
+				KES
 			
 			
 				киргизский сом
@@ -6984,6 +7263,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				киргизских сома
 				киргизских сомов
 				киргизского сома
+				KGS
 			
 			
 				камбоджийский риель
@@ -6991,6 +7271,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				камбоджийских риеля
 				камбоджийских риелей
 				камбоджийского риеля
+				KHR
 				៛
 			
 			
@@ -6999,6 +7280,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				коморских франка
 				коморских франков
 				коморского франка
+				KMF
 				CF
 			
 			
@@ -7007,6 +7289,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				северокорейские воны
 				северокорейских вон
 				северокорейской воны
+				KPW
 				₩
 			
 			
@@ -7015,6 +7298,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				южнокорейские воны
 				южнокорейских вон
 				южнокорейской воны
+				₩
 				₩
 			
 			
@@ -7023,6 +7307,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кувейтских динара
 				кувейтских динаров
 				кувейтского динара
+				KWD
 			
 			
 				доллар Островов Кайман
@@ -7030,6 +7315,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доллара Островов Кайман
 				долларов Островов Кайман
 				доллара Островов Кайман
+				KYD
 				$
 			
 			
@@ -7038,6 +7324,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				казахских тенге
 				казахских тенге
 				казахского тенге
+				KZT
 				₸
 			
 			
@@ -7046,6 +7333,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				лаосских кипа
 				лаосских кипов
 				лаосского кипа
+				LAK
 				₭
 			
 			
@@ -7054,6 +7342,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ливанских фунта
 				ливанских фунтов
 				ливанского фунта
+				LBP
 				L£
 			
 			
@@ -7062,6 +7351,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шри-ланкийские рупии
 				шри-ланкийских рупий
 				шри-ланкийской рупии
+				LKR
 				Rs
 			
 			
@@ -7070,6 +7360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				либерийских доллара
 				либерийских долларов
 				либерийского доллара
+				LRD
 				$
 			
 			
@@ -7081,6 +7372,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				литовских лита
 				литовских литов
 				литовского лита
+				LTL
 			
 			
 				Литовский талон
@@ -7100,6 +7392,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				латвийских лата
 				латвийских латов
 				латвийского лата
+				LVL
 			
 			
 				Латвийский рубль
@@ -7110,6 +7403,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ливийских динара
 				ливийских динаров
 				ливийского динара
+				LYD
 			
 			
 				марокканский дирхам
@@ -7117,6 +7411,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				марокканских дирхама
 				марокканских дирхамов
 				марокканского дирхама
+				MAD
 			
 			
 				Марокканский франк
@@ -7127,6 +7422,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				молдавских лея
 				молдавских леев
 				молдавского лея
+				MDL
 			
 			
 				малагасийский ариари
@@ -7134,6 +7430,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малагасийских ариари
 				малагасийских ариари
 				малагасийского ариари
+				MGA
 				Ar
 			
 			
@@ -7145,6 +7442,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				македонских денара
 				македонских денаров
 				македонского денара
+				MKD
 			
 			
 				Малийский франк
@@ -7155,6 +7453,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мьянманских кьята
 				мьянманских кьятов
 				мьянманского кьята
+				MMK
 				K
 			
 			
@@ -7163,6 +7462,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				монгольских тугрика
 				монгольских тугриков
 				монгольского тугрика
+				MNT
 				₮
 			
 			
@@ -7171,6 +7471,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				патаки Макао
 				патак Макао
 				патаки Макао
+				MOP
 			
 			
 				мавританская угия (1973–2017)
@@ -7178,6 +7479,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мавританские угии (1973–2017)
 				мавританских угий (1973–2017)
 				мавританской угии (1973–2017)
+				MRO
 			
 			
 				мавританская угия
@@ -7199,6 +7501,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				маврикийские рупии
 				маврикийских рупий
 				маврикийской рупии
+				MUR
 				Rs
 			
 			
@@ -7207,6 +7510,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мальдивские руфии
 				мальдивских руфий
 				мальдивской руфии
+				MVR
 			
 			
 				малавийская квача
@@ -7214,6 +7518,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малавийские квачи
 				малавийских квач
 				малавийской квачи
+				MWK
 			
 			
 				мексиканский песо
@@ -7221,6 +7526,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мексиканских песо
 				мексиканских песо
 				мексиканского песо
+				MX$
 				$
 			
 			
@@ -7235,6 +7541,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малайзийских ринггита
 				малайзийских ринггитов
 				малайзийского ринггита
+				MYR
 				RM
 			
 			
@@ -7249,6 +7556,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мозамбикских метикала
 				мозамбикских метикалов
 				мозамбикского метикала
+				MZN
 			
 			
 				доллар Намибии
@@ -7256,6 +7564,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доллара Намибии
 				долларов Намибии
 				доллара Намибии
+				NAD
 				$
 			
 			
@@ -7264,6 +7573,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нигерийские найры
 				нигерийских найр
 				нигерийской найры
+				NGN
 				₦
 			
 			
@@ -7275,6 +7585,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				никарагуанские кордобы
 				никарагуанских кордоб
 				никарагуанской кордобы
+				NIO
 				C$
 			
 			
@@ -7286,6 +7597,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				норвежские кроны
 				норвежских крон
 				норвежской кроны
+				NOK
 				kr
 			
 			
@@ -7294,6 +7606,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				непальские рупии
 				непальских рупий
 				непальской рупии
+				NPR
 				Rs
 			
 			
@@ -7302,6 +7615,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				новозеландских доллара
 				новозеландских долларов
 				новозеландского доллара
+				NZ$
 				$
 			
 			
@@ -7310,6 +7624,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				оманских риала
 				оманских риалов
 				оманского риала
+				OMR
 			
 			
 				панамский бальбоа
@@ -7317,6 +7632,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				панамских бальбоа
 				панамских бальбоа
 				панамского бальбоа
+				PAB
 			
 			
 				Перуанское инти
@@ -7327,6 +7643,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				перуанских соля
 				перуанских солей
 				перуанского соля
+				PEN
 			
 			
 				Перуанский соль (1863–1965)
@@ -7342,6 +7659,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кины Папуа – Новой Гвинеи
 				кин Папуа – Новой Гвинеи
 				кины Папуа – Новой Гвинеи
+				PGK
 			
 			
 				филиппинский песо
@@ -7349,6 +7667,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				филиппинских песо
 				филиппинских песо
 				филиппинского песо
+				PHP
 				₱
 			
 			
@@ -7357,6 +7676,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				пакистанские рупии
 				пакистанских рупий
 				пакистанской рупии
+				PKR
 				Rs
 			
 			
@@ -7365,6 +7685,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				польских злотых
 				польских злотых
 				польского злотого
+				PLN
 				zł
 			
 			
@@ -7379,6 +7700,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				парагвайских гуарани
 				парагвайских гуарани
 				парагвайского гуарани
+				PYG
 				₲
 			
 			
@@ -7387,6 +7709,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				катарских риала
 				катарских риалов
 				катарского риала
+				QAR
 			
 			
 				Родезийский доллар
@@ -7400,6 +7723,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				румынских лея
 				румынских леев
 				румынского лея
+				RON
 				L
 			
 			
@@ -7408,6 +7732,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сербских динара
 				сербских динаров
 				сербского динара
+				RSD
 			
 			
 				российский рубль
@@ -7428,6 +7753,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				франка Руанды
 				франков Руанды
 				франка Руанды
+				RWF
 				RF
 			
 			
@@ -7436,6 +7762,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				саудовских рияла
 				саудовских риялов
 				саудовского рияла
+				SAR
 			
 			
 				доллар Соломоновых Островов
@@ -7443,6 +7770,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доллара Соломоновых Островов
 				долларов Соломоновых Островов
 				доллара Соломоновых Островов
+				SBD
 				$
 			
 			
@@ -7451,6 +7779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сейшельские рупии
 				сейшельских рупий
 				сейшельской рупии
+				SCR
 			
 			
 				Суданский динар
@@ -7461,6 +7790,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				суданских фунта
 				суданских фунтов
 				суданского фунта
+				SDG
 			
 			
 				Старый суданский фунт
@@ -7471,6 +7801,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шведские кроны
 				шведских крон
 				шведской кроны
+				SEK
 				kr
 			
 			
@@ -7479,6 +7810,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сингапурских доллара
 				сингапурских долларов
 				сингапурского доллара
+				SGD
 				$
 			
 			
@@ -7487,6 +7819,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фунта острова Святой Елены
 				фунтов острова Святой Елены
 				фунта острова Святой Елены
+				SHP
 				£
 			
 			
@@ -7501,6 +7834,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				леоне
 				леоне
 				леоне
+				SLL
 			
 			
 				сомалийский шиллинг
@@ -7508,6 +7842,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сомалийских шиллинга
 				сомалийских шиллингов
 				сомалийского шиллинга
+				SOS
 			
 			
 				суринамский доллар
@@ -7515,6 +7850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				суринамских доллара
 				суринамских долларов
 				суринамского доллара
+				SRD
 				$
 			
 			
@@ -7526,6 +7862,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				южносуданских фунта
 				южносуданских фунтов
 				южносуданского фунта
+				SSP
 				£
 			
 			
@@ -7534,6 +7871,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				добры Сан-Томе и Принсипи (1977–2017)
 				добр Сан-Томе и Принсипи (1977–2017)
 				добры Сан-Томе и Принсипи (1977–2017)
+				STD
 			
 			
 				добра Сан-Томе и Принсипи
@@ -7556,6 +7894,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сирийских фунта
 				сирийских фунтов
 				сирийского фунта
+				SYP
 				£
 			
 			
@@ -7564,6 +7903,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				свазилендских лилангени
 				свазилендских лилангени
 				свазилендского лилангени
+				SZL
 			
 			
 				таиландский бат
@@ -7583,6 +7923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				таджикских сомони
 				таджикских сомони
 				таджикского сомони
+				TJS
 			
 			
 				Туркменский манат
@@ -7601,6 +7942,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				тунисских динара
 				тунисских динаров
 				тунисского динара
+				TND
 			
 			
 				тонганская паанга
@@ -7608,6 +7950,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				тонганские паанги
 				тонганских паанг
 				тонганской паанги
+				TOP
 				T$
 			
 			
@@ -7626,6 +7969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				турецкие лиры
 				турецких лир
 				турецкой лиры
+				TRY
 				₺
 				TL
 			
@@ -7635,6 +7979,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доллара Тринидада и Тобаго
 				долларов Тринидада и Тобаго
 				доллара Тринидада и Тобаго
+				TTD
 				$
 			
 			
@@ -7643,6 +7988,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				новых тайваньских доллара
 				новых тайваньских долларов
 				нового тайваньского доллара
+				NT$
 				NT$
 			
 			
@@ -7651,6 +7997,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				танзанийских шиллинга
 				танзанийских шиллингов
 				танзанийского шиллинга
+				TZS
 			
 			
 				украинская гривна
@@ -7674,6 +8021,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				угандийских шиллинга
 				угандийских шиллингов
 				угандийского шиллинга
+				UGX
 			
 			
 				доллар США
@@ -7702,6 +8050,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				уругвайских песо
 				уругвайских песо
 				уругвайского песо
+				UYU
 				$
 			
 			
@@ -7710,6 +8059,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				узбекских сума
 				узбекских сумов
 				узбекского сума
+				UZS
 			
 			
 				Венесуэльский боливар (1871–2008)
@@ -7720,6 +8070,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венесуэльских боливара (2008–2018)
 				венесуэльских боливаров (2008–2018)
 				венесуэльского боливара (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -7736,6 +8087,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				вьетнамских донга
 				вьетнамских донгов
 				вьетнамского донга
+				₫
 				₫
 			
 			
@@ -7744,6 +8096,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				вату Вануату
 				вату Вануату
 				вату Вануату
+				VUV
 			
 			
 				самоанская тала
@@ -7751,6 +8104,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				самоанские талы
 				самоанских тал
 				самоанской талы
+				WST
 			
 			
 				франк КФА BEAC
@@ -7758,6 +8112,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				франка КФА ВЕАС
 				франков КФА ВЕАС
 				франка КФА ВЕАС
+				FCFA
 			
 			
 				Серебро
@@ -7783,6 +8138,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				восточно-карибских доллара
 				восточно-карибских долларов
 				восточно-карибского доллара
+				EC$
 				$
 			
 			
@@ -7803,6 +8159,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				франка КФА ВСЕАО
 				франков КФА ВСЕАО
 				франка КФА ВСЕАО
+				CFA
 			
 			
 				Палладий
@@ -7813,6 +8170,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				французских тихоокеанских франка
 				французских тихоокеанских франков
 				французского тихоокеанского франка
+				CFPF
 			
 			
 				Платина
@@ -7840,6 +8198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				йеменских риала
 				йеменских риалов
 				йеменского риала
+				YER
 			
 			
 				Югославский твердый динар
@@ -7859,6 +8218,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				южноафриканских рэнда
 				южноафриканских рэндов
 				южноафриканского рэнда
+				ZAR
 				R
 			
 			
@@ -7874,6 +8234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				замбийские квачи
 				замбийских квач
 				замбийской квачи
+				ZMW
 				ZK
 			
 			
@@ -8200,6 +8561,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} веков
 				{0} века
 			
+			
+				десятилетия
+				{0} десятилетие
+				{0} десятилетия
+				{0} десятилетий
+				{0} десятилетия
+			
 			
 				годы
 				{0} год
@@ -8361,6 +8729,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} британских тепловых единиц
 				{0} британской тепловой единицы
 			
+			
+				американский терм
+				{0} американский терм
+				{0} американских терма
+				{0} американских термов
+				{0} американского терма
+			
 			
 				фунт-силы
 				{0} фунт-сила
@@ -8403,6 +8778,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} герц
 				{0} герца
 			
+			
+				эм
+				{0} эм
+				{0} эм
+				{0} эм
+				{0} эм
+			
+			
+				пиксели
+				{0} пиксель
+				{0} пикселя
+				{0} пикселей
+				{0} пикселя
+			
+			
+				мегапиксели
+				{0} мегапиксель
+				{0} мегапикселя
+				{0} мегапикселей
+				{0} мегапикселя
+			
+			
+				пиксели на сантиметр
+				{0} пиксель на сантиметр
+				{0} пикселя на сантиметр
+				{0} пикселей на сантиметр
+				{0} пикселя на сантиметр
+			
+			
+				пиксели на дюйм
+				{0} пиксель на дюйм
+				{0} пикселя на дюйм
+				{0} пикселей на дюйм
+				{0} пикселя на дюйм
+			
+			
+				точки на сантиметр
+				{0} точка на сантиметр
+				{0} точки на сантиметр
+				{0} точек на сантиметр
+				{0} точки на сантиметр
+			
+			
+				точки на дюйм
+				{0} точка на дюйм
+				{0} точки на дюйм
+				{0} точек на дюйм
+				{0} точки на дюйм
+			
 			
 				километры
 				{0} километр
@@ -8559,7 +8983,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				люксы
 				{0} люкс
 				{0} люкса
-				{0} люкс
+				{0} люксов
 				{0} люкса
 			
 			
@@ -8713,13 +9137,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} лошадиных сил
 				{0} лошадиной силы
 			
-			
-				гектопаскали
-				{0} гектопаскаль
-				{0} гектопаскаля
-				{0} гектопаскалей
-				{0} гектопаскаля
-			
 			
 				миллиметры ртутного столба
 				{0} миллиметр ртутного столба
@@ -8741,6 +9158,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} дюймов ртутного столба
 				{0} дюйма ртутного столба
 			
+			
+				бары
+				{0} бар
+				{0} бара
+				{0} бар
+				{0} бара
+			
 			
 				миллибары
 				{0} миллибар
@@ -8755,6 +9179,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфер
 				{0} атмосферы
 			
+			
+				паскали
+				{0} паскаль
+				{0} паскаля
+				{0} паскалей
+				{0} паскаля
+			
+			
+				гектопаскали
+				{0} гектопаскаль
+				{0} гектопаскаля
+				{0} гектопаскалей
+				{0} гектопаскаля
+			
 			
 				килопаскали
 				{0} килопаскаль
@@ -8812,18 +9250,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} градуса Цельсия
 			
 			
-				градусы по Фаренгейту
-				{0} градус по Фаренгейту
-				{0} градуса по Фаренгейту
-				{0} градусов по Фаренгейту
-				{0} градуса по Фаренгейту
+				градусы Фаренгейта
+				{0} градус Фаренгейта
+				{0} градуса Фаренгейта
+				{0} градусов Фаренгейта
+				{0} градуса Фаренгейта
 			
 			
-				градусы по Кельвину
-				{0} градус по Кельвину
-				{0} градуса по Кельвину
-				{0} градусов по Кельвину
-				{0} градуса по Кельвину
+				кельвины
+				{0} кельвин
+				{0} кельвина
+				{0} кельвинов
+				{0} кельвина
 			
 			
 				фунт-футы
@@ -9205,7 +9643,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				‱
 				{0} ‱
 				{0} ‱
 				{0} ‱
@@ -9234,17 +9671,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				миль/гал
-				{0} миля/галл.
-				{0} мили/галл.
-				{0} миль/галл.
-				{0} мили/галл.
+				{0} миля/гал
+				{0} мили/гал
+				{0} миль/гал
+				{0} мили/гал
 			
 			
 				мили/имп. гал
 				{0} миля/имп. гал
 				{0} мили/имп. гал
 				{0} миль/имп. гал
-				{0} мили/имп. галл.
+				{0} мили/имп. гал
 			
 			
 				ПБ
@@ -9330,6 +9767,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} в.
 				{0} в.
 			
+			
+				10-летие
+				{0} 10-летие
+				{0} 10-летия
+				{0} 10-летий
+				{0} 10-летия
+			
 			
 				г.
 				{0} г.
@@ -9363,15 +9807,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/д
 			
 			
-				ч.
-				{0} ч.
-				{0} ч.
-				{0} ч.
-				{0} ч.
+				ч
+				{0} ч
+				{0} ч
+				{0} ч
+				{0} ч
 				{0}/ч
 			
 			
-				мин
+				мин.
 				{0} мин.
 				{0} мин.
 				{0} мин.
@@ -9491,12 +9935,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} БТЕ
 				{0} БТЕ
 			
+			
+				терм США
+				{0} терм США
+				{0} терма США
+				{0} термов США
+				{0} терма США
+			
 			
-				фнт-с
-				{0} фнт-с
-				{0} фнт-с
-				{0} фнт-с
-				{0} фнт-с
+				фнт-с
+				{0} фнт-с
+				{0} фнт-с
+				{0} фнт-с
+				{0} фнт-с
 			
 			
 				Н
@@ -9533,6 +9984,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Гц
 				{0} Гц
 			
+			
+				эм
+				{0} эм
+				{0} эм
+				{0} эм
+				{0} эм
+			
+			
+				пкс
+				{0} пкс
+				{0} пкс
+				{0} пкс
+				{0} пкс
+			
+			
+				Мпкс
+				{0} Мпкс
+				{0} Мпкс
+				{0} Мпкс
+				{0} Мпкс
+			
+			
+				пкс/см
+				{0} пкс/см
+				{0} пкс/см
+				{0} пкс/см
+				{0} пкс/см
+			
+			
+				пкс/дюйм
+				{0} пкс/дюйм
+				{0} пкс/дюйм
+				{0} пкс/дюйм
+				{0} пкс/дюйм
+			
+			
+				тчк/см
+				{0} тчк/см
+				{0} тчк/см
+				{0} тчк/см
+				{0} тчк/см
+			
+			
+				тчк/дюйм
+				{0} тчк/дюйм
+				{0} тчк/дюйм
+				{0} тчк/дюйм
+				{0} тчк/дюйм
+			
 			
 				км
 				{0} км
@@ -9692,13 +10192,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} лк
 				{0} лк
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				т
 				{0} т
@@ -9787,20 +10280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Да
 				{0} Да
 			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				ГВт
 				{0} ГВт
@@ -9837,18 +10316,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мВт
 			
 			
-				л.с.
-				{0} л.с.
-				{0} л.с.
-				{0} л.с.
-				{0} л.с.
-			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
+				л. с.
+				{0} л. с.
+				{0} л. с.
+				{0} л. с.
+				{0} л. с.
 			
 			
 				мм рт. ст.
@@ -9859,10 +10331,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ф. на дюйм²
-				{0} ф./дюйм²
-				{0} ф./дюйм²
-				{0} ф./дюйм²
-				{0} ф./дюйм²
+				{0} ф/дюйм²
+				{0} ф/дюйм²
+				{0} ф/дюйм²
+				{0} ф/дюйм²
 			
 			
 				д. рт. ст.
@@ -9871,6 +10343,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} д. рт. ст.
 				{0} д. рт. ст.
 			
+			
+				бар
+				{0} бар
+				{0} бар
+				{0} бар
+				{0} бар
+			
 			
 				мбар
 				{0} мбар
@@ -9885,6 +10364,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атм
 				{0} атм
 			
+			
+				Па
+				{0} Па
+				{0} Па
+				{0} Па
+				{0} Па
+			
+			
+				гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+			
 			
 				кПа
 				{0} кПа
@@ -9943,10 +10436,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°F
-				{0}°F
-				{0}°F
-				{0}°F
-				{0}°F
+				{0} °F
+				{0} °F
+				{0} °F
+				{0} °F
 			
 			
 				K
@@ -10578,13 +11071,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} л.с.
 				{0} л.с.
 			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-			
 			
 				мм рт. ст.
 				{0} мм рт. ст.
@@ -10608,10 +11094,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мбар
-				{0} мбар
-				{0} мбар
-				{0} мбар
-				{0} мбар
+				{0} мбар
+				{0} мбар
+				{0} мбар
+				{0} мбар
+			
+			
+				гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
 			
 			
 				км/ч
@@ -10622,17 +11115,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				м/с
-				{0} м/с
-				{0} м/с
-				{0} м/с
-				{0} м/с
+				{0} м/с
+				{0} м/с
+				{0} м/с
+				{0} м/с
 			
 			
 				мили/час
-				{0} миль/ч
-				{0} миль/ч
-				{0} миль/ч
-				{0} миль/ч
+				{0} миль/ч
+				{0} миль/ч
+				{0} миль/ч
+				{0} миль/ч
 			
 			
 				уз
@@ -10641,6 +11134,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} уз
 				{0} уз
 			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0} °C
@@ -10648,6 +11148,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} °C
 				{0} °C
 			
+			
+				°F
+				{0}°F
+				{0} °F
+				{0}°F
+				{0}°F
+			
+			
+				K
+				{0} K
+				{0} K
+				{0} K
+				{0} K
+			
 			
 				{0} км³
 				{0} км³
@@ -10699,8 +11213,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} или {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/ru_BY.xml b/make/data/cldr/common/main/ru_BY.xml
index 0e956282ca1..e93b4d567f3 100644
--- a/make/data/cldr/common/main/ru_BY.xml
+++ b/make/data/cldr/common/main/ru_BY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ru_KG.xml b/make/data/cldr/common/main/ru_KG.xml
index b12309c44ca..b5d433a35c7 100644
--- a/make/data/cldr/common/main/ru_KG.xml
+++ b/make/data/cldr/common/main/ru_KG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ru_KZ.xml b/make/data/cldr/common/main/ru_KZ.xml
index 7d4bcfb0a39..75c032083b5 100644
--- a/make/data/cldr/common/main/ru_KZ.xml
+++ b/make/data/cldr/common/main/ru_KZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ru_MD.xml b/make/data/cldr/common/main/ru_MD.xml
index 1578130f23e..a1cf91d95fb 100644
--- a/make/data/cldr/common/main/ru_MD.xml
+++ b/make/data/cldr/common/main/ru_MD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ru_RU.xml b/make/data/cldr/common/main/ru_RU.xml
index 329fc61dccc..4cfe3ede57f 100644
--- a/make/data/cldr/common/main/ru_RU.xml
+++ b/make/data/cldr/common/main/ru_RU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ru_UA.xml b/make/data/cldr/common/main/ru_UA.xml
index 4a0af57fa30..031bed6cfed 100644
--- a/make/data/cldr/common/main/ru_UA.xml
+++ b/make/data/cldr/common/main/ru_UA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/rw.xml b/make/data/cldr/common/main/rw.xml
index e72c127f87f..12ec9ad7548 100644
--- a/make/data/cldr/common/main/rw.xml
+++ b/make/data/cldr/common/main/rw.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -119,7 +119,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Inyezulu
 		
 		
-			Masedoniya y'Amajyaruguru
+			Masedoniya y’Amajyaruguru
 			U Rwanda
 			Tonga
 		
@@ -127,7 +127,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/rw_RW.xml b/make/data/cldr/common/main/rw_RW.xml
index 7ca2750a10b..51416f4f8e6 100644
--- a/make/data/cldr/common/main/rw_RW.xml
+++ b/make/data/cldr/common/main/rw_RW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/rwk.xml b/make/data/cldr/common/main/rwk.xml
index 42bea55464f..cbafa6109c1 100644
--- a/make/data/cldr/common/main/rwk.xml
+++ b/make/data/cldr/common/main/rwk.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/rwk_TZ.xml b/make/data/cldr/common/main/rwk_TZ.xml
index c6c4d84c537..5a47b0724b6 100644
--- a/make/data/cldr/common/main/rwk_TZ.xml
+++ b/make/data/cldr/common/main/rwk_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sah.xml b/make/data/cldr/common/main/sah.xml
index f822efcd3c7..0437652886a 100644
--- a/make/data/cldr/common/main/sah.xml
+++ b/make/data/cldr/common/main/sah.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -145,7 +145,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[а б г ҕ д {дь} и й к л м н {нь} ҥ о ө п р с т у ү х һ ч ы э]
 		[в е ё ж з ф ц ш щ ъ ь ю я]
 		[А Б Г Ҕ Д {Дь} И Й К Л М Н {Нь} Ҥ О Ө П Р С Т У Ү Х Һ Ч Ы Э]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[\:]
 		{0}…
 		…{0}
@@ -1514,6 +1514,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				гектаар
 				{0} гектаар
 			
+			
+				кыбатыраатынай сэнтимиэтир
+				{0} кыбатыраатынай сэнтимиэтир
+			
 			
 				караат
 				{0} караат
@@ -1652,7 +1656,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				миэтэрэ
 				{0} миэтэрэ
-				миэтэргэ {0}
+				миэтиргэ {0}
 			
 			
 				миилэ
diff --git a/make/data/cldr/common/main/sah_RU.xml b/make/data/cldr/common/main/sah_RU.xml
index afe507dc233..9700961f6e6 100644
--- a/make/data/cldr/common/main/sah_RU.xml
+++ b/make/data/cldr/common/main/sah_RU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/saq.xml b/make/data/cldr/common/main/saq.xml
index e4f3b82218c..d8b5ad9af59 100644
--- a/make/data/cldr/common/main/saq.xml
+++ b/make/data/cldr/common/main/saq.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/saq_KE.xml b/make/data/cldr/common/main/saq_KE.xml
index 6b9591bf938..53fe461049a 100644
--- a/make/data/cldr/common/main/saq_KE.xml
+++ b/make/data/cldr/common/main/saq_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sbp.xml b/make/data/cldr/common/main/sbp.xml
index 9f2fb30fd80..4326cda41c6 100644
--- a/make/data/cldr/common/main/sbp.xml
+++ b/make/data/cldr/common/main/sbp.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molidova
 			Bukini
 			Figunguli ifya Malishali
-			Masedoniya
 			Mali
 			Muyama
 			Mongoliya
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c d e f g h i j k l m n o p s t u v w y]
 		[q r x z]
 		[A B C D E F G H I J K L M N O P S T U V W Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/sbp_TZ.xml b/make/data/cldr/common/main/sbp_TZ.xml
index f766f318754..14d0bb9cb1e 100644
--- a/make/data/cldr/common/main/sbp_TZ.xml
+++ b/make/data/cldr/common/main/sbp_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sd.xml b/make/data/cldr/common/main/sd.xml
index 3b9e0d32454..00ffc32bf1a 100644
--- a/make/data/cldr/common/main/sd.xml
+++ b/make/data/cldr/common/main/sd.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -296,7 +296,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			پولش
 			پرشن
 			پشتو
-			پرتگالي
+			پورٽگليز
 			برازيلي پرتگالي
 			يورپي پرتگالي
 			ڪيچوا
@@ -403,10 +403,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			يدش
 			يوروبا
 			ڪينٽونيز
+			چيني، ڪينٽونيز
 			معياري مراڪشي تامازائيٽ
 			چيني
+			چيني، مندارن
 			آسان چینی
+			سادي مندارن چيني
 			روايتي چيني
+			رواجي مندارن چيني
 			زولو
 			زوني
 			ڪوئي ٻولي جو مواد ڪونهي
@@ -435,7 +439,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
+			
 			
 			
 			
@@ -445,14 +451,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
+			
 			
 			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -649,8 +658,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سينٽ مارٽن
 			مداگيسڪر
 			مارشل ڀيٽ
-			ميسي ڊونيا
-			ميڪدونيا
+			شمالي مقدونيا
 			مالي
 			ميانمار (برما)
 			منگوليا
@@ -702,7 +710,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			سربيا
 			روس
 			روانڊا
-			سعودی عرب
+			سعودي عرب
 			سولومون ٻيٽَ
 			شي شلز
 			سوڊان
@@ -863,7 +871,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[ء آ ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ ف ڦ ق ک ڪ گ {گھ} ڱ ڳ ل م ن ڻ ه ھ و ي]
 		[\u064E \u064F \u0650 ئ]
 		[ا ب ٻ پ ڀ ت ث ٺ ٽ ٿ ج {جھ} ڃ ڄ چ ڇ ح خ د ذ ڊ ڌ ڍ ڏ ر ز ڙ س ش ص ض ط ظ ع غ ف ڦ ق ک ڪ گ {گھ} ڱ ڳ ل م ن ڻ ه ھ و ي]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 		[⹁ ⁏ \: ! ۔ ‘ ( ) \[ \] \{ \} /]
 		{0}…
 		…{0}
@@ -871,22 +879,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} …
 		… {0}
 		{0} … {1}
-		?
-		
-			[\:∶]
-		
 		
+			[؉‰]
 			[\$﹩＄$]
 			[£₤]
+			[¥￥]
+			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
 		“
 		”
-		‘
 		’
 	
 	
@@ -992,44 +1004,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							MM–MM
 						
@@ -1645,6 +1619,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				سال
+				پوئين سال
+				هن سال
+				اڳيئن سال
 				
 					{0} سالن ۾
 					{0} سالن ۾
@@ -2916,6 +2893,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ايڪٽوب
 			
+			
+				ڪوٽانسي
+			
 			
 				ڪيزلورڊا
 			
@@ -4417,8 +4397,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			arab
 		
+		1
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4426,32 +4411,37 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			NaN
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ھزار
 					0 ھزار
 					00 ھزار
-					00K
-					000K
-					000K
-					0M
-					0M
-					00M
-					00M
-					000M
-					000M
-					0G
-					0G
-					00G
-					00G
-					000G
-					000G
-					0T
-					0T
-					00T
-					00T
-					000T
-					000T
+					00 هزار
+					000 هزار
+					000 هزار
+					0 ملين
+					0 ملين
+					00 ملين
+					00 ملين
+					000 ملين
+					000 ملين
+					0 بلين
+					0 بلين
+					00 بلين
+					00 بلين
+					000 بلين
+					000 بلين
+					0 ٽرلين
+					0 ٽرلين
+					00 ٽرلين
+					00 ٽرلين
+					000 ٽرلين
+					000 ٽرلين
 				
 			
 			
@@ -4468,12 +4458,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					00M
 					000M
 					000M
-					0G
-					0G
-					00G
-					00G
-					000G
-					000G
+					0B
+					0B
+					00B
+					00B
+					000B
+					000B
 					0T
 					0T
 					00T
@@ -4542,783 +4532,1029 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				گڏيل عرب امارات درهم
 				گڏيل عرب امارات درهم
 				گڏيل عرب امارات درهم
+				AED
 			
 			
 				افغاني افغاني
 				افغاني افغاني
 				افغاني افغاني
+				AFN
 			
 			
 				الباني ليڪ
 				الباني ليڪ
 				الباني ليڪ
+				ALL
 			
 			
 				ارماني ڊرم
 				ارماني ڊرم
 				ارماني ڊرم
+				AMD
 			
 			
 				نيڌرلينڊ انٽليئن گلڊر
 				نيڌرلينڊ انٽليئن گلڊر
 				نيڌرلينڊ انٽليئن گلڊر
+				ANG
 			
 			
 				انگوليائي ڪوانزا
 				انگوليائي ڪوانزا
 				انگوليائي ڪوانزا
+				AOA
+				Kz
 			
 			
 				ارجنٽائن پيسو
 				ارجنٽائن پيسو
 				ارجنٽائن پيسو
+				ARS
+				$
 			
 			
 				آسٽريلوي ڊالر
 				آسٽريلوي ڊالر
 				آسٽريلوي ڊالر
+				A$
+				$
 			
 			
 				اروبن فلورن
 				اروبن فلورن
 				اروبن فلورن
+				AWG
 			
 			
 				آذربائيجاني منت
 				آذربائيجاني منت
 				آذربائيجاني منت
+				AZN
 			
 			
 				بوسنيا هرزگوينا ڪنورٽبل مارڪ
 				بوسنيا هرزگوينا ڪنورٽبل مارڪ
 				بوسنيا هرزگوينا ڪنورٽبل مارڪ
+				BAM
+				KM
 			
 			
 				باربيڊين ڊالر
 				باربيڊين ڊالر
 				باربيڊين ڊالر
+				BBD
+				$
 			
 			
 				بنگلاديشي ٽڪا
 				بنگلاديشي ٽڪا
 				بنگلاديشي ٽڪا
+				BDT
+				৳
 			
 			
 				بلغارین لیو
 				بلغارین لیو
 				بلغارین لیو
+				BGN
 			
 			
 				بحريني دينار
 				بحريني دينار
 				بحريني دينار
+				BHD
 			
 			
 				برونڊي فرينڪ
 				برونڊي فرينڪ
 				برونڊي فرينڪ
+				BIF
 			
 			
 				برمودي ڊالر
 				برمودي ڊالر
 				برمودي ڊالر
+				BMD
+				$
 			
 			
 				برونائي ڊالر
 				برونائي ڊالر
 				برونائي ڊالر
+				BND
+				$
 			
 			
 				بولیوین بولیویانو
 				بولیوین بولیویانو
 				بولیوین بولیویانو
+				BOB
+				Bs
 			
 			
 				برازيلي ريل
 				برازيلي ريل
 				برازيلي ريل
+				R$
+				R$
 			
 			
 				بهاماني ڊادلر
 				بهاماني ڊادلر
 				بهاماني ڊادلر
+				BSD
+				$
 			
 			
 				ڀوٽاني گلٽرم
 				ڀوٽاني گلٽرم
 				ڀوٽاني گلٽرم
+				BTN
 			
 			
 				بوستواني پولا
 				بوستواني پولا
 				بوستواني پولا
+				BWP
+				P
 			
 			
 				بیلاروسی ربل
 				بیلاروسی ربل
 				بیلاروسی ربل
+				BYN
+				р.
 			
 			
 				BYR
 				BYR
 				BYR
+				BYR
 			
 			
 				بيليز ڊالر
 				بيليز ڊالر
 				بيليز ڊالر
+				BZD
+				$
 			
 			
 				ڪئينڊيائي ڊالر
 				ڪئينڊيائي ڊالر
 				ڪئينڊيائي ڊالر
+				CA$
+				$
 			
 			
 				ڪانگو فرينڪ
 				ڪانگو فرينڪ
 				ڪانگو فرينڪ
+				CDF
 			
 			
 				سوئس فرينڪ
 				سوئس فرينڪ
 				سوئس فرينڪ
+				CHF
 			
 			
 				چلي پيسو
 				چلي پيسو
 				چلي پيسو
+				CLP
+				$
 			
 			
 				چيني يوآن (غير ملڪي)
 				چيني يوآن (غير ملڪي)
 				چيني يوآن (غير ملڪي)
+				CNH
 			
 			
 				چيني يوآن
 				چيني يوآن
 				چيني يوآن
+				CN¥
+				¥
 			
 			
 				ڪولمبيائي پيسو
 				ڪولمبيائي پيسو
 				ڪولمبيائي پيسو
+				COP
+				$
 			
 			
 				ڪوسٽا ريڪا ڪولن
 				ڪوسٽا ريڪا ڪولن
 				ڪوسٽا ريڪا ڪولن
+				CRC
+				₡
 			
 			
 				ڪيوبن ڪنورٽيبل پيسو
 				ڪيوبن ڪنورٽيبل پيسو
 				ڪيوبن ڪنورٽيبل پيسو
+				CUC
+				$
 			
 			
 				ڪيوبن پيسو
 				ڪيوبن پيسو
 				ڪيوبن پيسو
+				CUP
+				$
 			
 			
 				ڪيپ وردي ايسڪوڊو
 				ڪيپ وردي ايسڪوڊو
 				ڪيپ وردي ايسڪوڊو
+				CVE
 			
 			
 				چيڪ ڪرونا
 				چيڪ ڪرونا
 				چيڪ ڪرونا
+				CZK
+				Kč
 			
 			
 				جبوتي فرينڪ
 				جبوتي فرينڪ
 				جبوتي فرينڪ
+				DJF
 			
 			
 				دانش ڪرون
 				دانش ڪرون
 				دانش ڪرون
+				DKK
+				kr
 			
 			
 				ڊومينيڪن پيسو
 				ڊومينيڪن پيسو
 				ڊومينيڪن پيسو
+				DOP
+				$
 			
 			
 				الجيريائي دينار
 				الجيريائي دينار
 				الجيريائي دينار
+				DZD
 			
 			
 				مصري پائونڊ
 				مصري پائونڊ
 				مصري پائونڊ
+				EGP
+				E£
 			
 			
 				ايريٽيريائي ناڪفا
 				ايريٽيريائي ناڪفا
 				ايريٽيريائي ناڪفا
+				ERN
 			
 			
 				ايٿوپيائي بر
 				ايٿوپيائي بر
 				ايٿوپيائي بر
+				ETB
 			
 			
 				يورو
 				يورو
 				يورو
+				€
+				€
 			
 			
 				فجي ڊالر
 				فجي ڊالر
 				فجي ڊالر
+				FJD
+				$
 			
 			
 				فاڪلينڊ ٻيٽ پائونڊ
 				فاڪلينڊ ٻيٽ پائونڊ
 				فاڪلينڊ ٻيٽ پائونڊ
+				FKP
+				£
 			
 			
 				برطانوي پائونڊ
 				برطانوي پائونڊ
 				برطانوي پائونڊ
+				£
+				£
 			
 			
 				جارجيائي لاري
 				جارجيائي لاري
 				جارجيائي لاري
+				GEL
+				₾
 			
 			
 				گهانين سيدي
 				گهانين سيدي
 				گهانين سيدي
+				GHS
 			
 			
 				جبرالٽر پائونڊ
 				جبرالٽر پائونڊ
 				جبرالٽر پائونڊ
+				GIP
+				£
 			
 			
 				گيمبيا دلاسائي
 				گيمبيا دلاسائي
 				گيمبيا دلاسائي
+				GMD
 			
 			
 				گني فرينڪ
 				گني فرينڪ
 				گني فرينڪ
+				GNF
+				FG
 			
 			
 				گوئٽي مالا ڪٽزل
 				گوئٽي مالا ڪٽزل
 				گوئٽي مالا ڪٽزل
+				GTQ
+				Q
 			
 			
 				گيانا ڊالر
 				گيانا ڊالر
 				گيانا ڊالر
+				GYD
+				$
 			
 			
 				هانگ ڪانگ ڊالر
 				هانگ ڪانگ ڊالر
 				هانگ ڪانگ ڊالر
+				HK$
+				$
 			
 			
 				هونڊوراس ليمپرا
 				هونڊوراس ليمپرا
 				هونڊوراس ليمپرا
+				HNL
+				L
 			
 			
 				ڪروشيائي ڪونا
 				ڪروشيائي ڪونا
 				ڪروشيائي ڪونا
+				HRK
+				kn
 			
 			
 				هيٽي گورڊي
 				هيٽي گورڊي
 				هيٽي گورڊي
+				HTG
 			
 			
 				هنگيرين فورنٽ
 				هنگيرين فورنٽ
 				هنگيرين فورنٽ
+				HUF
+				Ft
 			
 			
 				انڊونيشيائي رپيه
 				انڊونيشيائي رپيه
 				انڊونيشيائي رپيه
+				IDR
+				Rp
 			
 			
 				اسرائيلي نيو شيڪل
 				اسرائيلي نيو شيڪل
 				اسرائيلي نيو شيڪل
+				₪
+				₪
 			
 			
 				انڊين رپي
 				انڊين رپي
 				انڊين رپي
+				₹
+				₹
 			
 			
 				عراقي دينار
 				عراقي دينار
 				عراقي دينار
+				IQD
 			
 			
 				ايراني ريال
 				ايراني ريال
 				ايراني ريال
+				IRR
 			
 			
 				آئيس لينڊي ڪرونا
 				آئيس لينڊي ڪرونا
 				آئيس لينڊي ڪرونا
+				ISK
+				kr
 			
 			
 				جميڪائي ڊالر
 				جميڪائي ڊالر
 				جميڪائي ڊالر
+				JMD
+				$
 			
 			
 				اردني دينار
 				اردني دينار
 				اردني دينار
+				JOD
 			
 			
 				جاپاني يين
 				جاپاني يين
 				جاپاني يين
+				JP¥
+				¥
 			
 			
 				ڪينيائي سلنگ
 				ڪينيائي سلنگ
 				ڪينيائي سلنگ
+				KES
 			
 			
 				ڪرغزستاني سوم
 				ڪرغزستاني سوم
 				ڪرغزستاني سوم
+				KGS
 			
 			
 				ڪمبوڊيائي ريال
 				ڪمبوڊيائي ريال
 				ڪمبوڊيائي ريال
+				KHR
+				៛
 			
 			
 				ڪوموريائي فرينڪ
 				ڪوموريائي فرينڪ
 				ڪوموريائي فرينڪ
+				KMF
+				CF
 			
 			
 				اتر ڪوريائي ون
 				اتر ڪوريائي ون
 				اتر ڪوريائي ون
+				KPW
+				₩
 			
 			
 				ڏکڻ ڪوريائي ون
 				ڏکڻ ڪوريائي ون
 				ڏکڻ ڪوريائي ون
+				₩
+				₩
 			
 			
 				ڪويتي دينار
 				ڪويتي دينار
 				ڪويتي دينار
+				KWD
 			
 			
 				ڪيمين ٻيٽ ڊالر
 				ڪيمين ٻيٽ ڊالر
 				ڪيمين ٻيٽ ڊالر
+				KYD
+				$
 			
 			
 				قازقستان ٽينگا
 				قازقستان ٽينگا
 				قازقستان ٽينگا
+				KZT
+				₸
 			
 			
 				لائوشيائي ڪپ
 				لائوشيائي ڪپ
 				لائوشيائي ڪپ
+				LAK
+				₭
 			
 			
 				لبناني پائونڊ
 				لبناني پائونڊ
 				لبناني پائونڊ
+				LBP
+				L£
 			
 			
 				سري لنڪن رپي
 				سري لنڪن رپي
 				سري لنڪن رپي
+				LKR
+				Rs
 			
 			
 				لائبیریائی ڊالر
 				لائبیریائی ڊالر
 				لائبیریائی ڊالر
+				LRD
+				$
 			
 			
 				لبيائي دينار
 				لبيائي دينار
 				لبيائي دينار
+				LYD
 			
 			
 				موروڪيائي درهم
 				موروڪيائي درهم
 				موروڪيائي درهم
+				MAD
 			
 			
 				مالديپ ليو
 				مالديپ ليو
 				مالديپ ليو
+				MDL
 			
 			
 				ملاگاسي اریاری
 				ملاگاسي اریاری
 				ملاگاسي اریاری
+				MGA
+				Ar
 			
 			
 				ميسي ڊوني دينار
 				ميسي ڊوني دينار
 				ميسي ڊوني دينار
+				MKD
 			
 			
 				ميانمار ڪياٽ
 				ميانمار ڪياٽ
 				ميانمار ڪياٽ
+				MMK
+				K
 			
 			
 				منگولي تجرڪ
 				منگولي تجرڪ
 				منگولي تجرڪ
+				MNT
+				₮
 			
 			
 				ميڪانيز پٽاڪا
 				ميڪانيز پٽاڪا
 				ميڪانيز پٽاڪا
+				MOP
 			
 			
 				موريشيائي اوگوئیا (1973–2017)
 				موريشيائي اوگوئیا (1973–2017)
 				موريشيائي اوگوئیا (1973–2017)
+				MRO
 			
 			
 				موريشيائي اوگوئیا
 				موريشيائي اوگوئیا
 				موريشيائي اوگوئیا
+				MRU
 			
 			
 				ماريشيائي رپي
 				ماريشين روپي
 				ماريشيائي رپي
+				MUR
+				Rs
 			
 			
 				مالديپ روفيا
 				مالديپ روفيا
 				مالديپ روفيا
+				MVR
 			
 			
 				ملاوي ڪواچا
 				ملاوي ڪواچا
 				ملاوي ڪواچا
+				MWK
 			
 			
 				ميڪسيڪو پيسو
 				ميڪسيڪو پيسو
 				ميڪسيڪو پيسو
+				MX$
+				$
 			
 			
 				ملائيشيائي رنگٽ
 				ملائيشيائي رنگٽ
 				ملائيشيائي رنگٽ
+				MYR
+				RM
 			
 			
 				موزمبيق ميٽيڪل
 				موزمبيق ميٽيڪل
 				موزمبيق ميٽيڪل
+				MZN
 			
 			
 				نميبائي ڊالر
 				نميبائي ڊالر
 				نميبائي ڊالر
+				NAD
+				$
 			
 			
 				نائجريائي نائرا
 				نائجريائي نائرا
 				نائجريائي نائرا
+				NGN
+				₦
 			
 			
 				نڪارا گوا ڪارڊوبا
 				نڪارا گوا ڪارڊوبا
 				نڪارا گوا ڪارڊوبا
+				NIO
+				C$
 			
 			
 				نارويائي ڪرون
 				نارويائي ڪرون
 				نارويائي ڪرون
+				NOK
+				kr
 			
 			
 				نيپالي رپي
 				نيپالي رپي
 				نيپالي رپي
+				NPR
+				Rs
 			
 			
 				نيوزي لينڊي ڊالر
 				نيوزي لينڊي ڊالر
 				نيوزي لينڊي ڊالر
+				NZ$
+				$
 			
 			
 				عماني ريال
 				عماني ريال
 				عماني ريال
+				OMR
 			
 			
 				پاناما پالبوا
 				پاناما پالبوا
 				پاناما پالبوا
+				PAB
 			
 			
 				پيرو سول
 				پيرو سول
 				پيرو سول
+				PEN
 			
 			
 				پاپوا نيو گني ڪنا
 				پاپوا نيو گني ڪنا
 				پاپوا نيو گني ڪنا
+				PGK
 			
 			
 				فلپائني پيسو
 				فلپائني پيسو
 				فلپائني پيسو
+				PHP
+				₱
 			
 			
 				پاڪستاني رپي
 				پاڪستاني رپي
 				پاڪستاني رپي
 				Rs
+				Rs
 			
 			
 				پولش زلاٽي
 				پولش زلاٽي
 				پولش زلاٽي
+				PLN
+				zł
 			
 			
 				پيراگوئي گاراني
 				پيراگوئي گاراني
 				پيراگوئي گاراني
+				PYG
+				₲
 			
 			
 				قطري ريال
 				قطري ريال
 				قطري ريال
+				QAR
 			
 			
 				رومانیائي لیو
 				رومانیائي لیو
 				رومانیائي لیو
+				RON
+				lei
 			
 			
 				سربيا دينار
 				سربيا دينار
 				سربيا دينار
+				RSD
 			
 			
 				روسي ربل
 				روسي ربل
 				روسي ربل
+				RUB
+				₽
 			
 			
 				روانڊا فرينڪ
 				روانڊا فرينڪ
 				روانڊا فرينڪ
+				RWF
+				RF
 			
 			
 				سعودي ريال
 				سعودي ريال
 				سعودي ريال
+				SAR
 			
 			
 				سولومان ٻيٽ ڊالر
 				سولومان ٻيٽ ڊالر
 				سولومان ٻيٽ ڊالر
+				SBD
+				$
 			
 			
 				سشلي رپي
 				سشلي رپي
 				سشلي رپي
+				SCR
 			
 			
 				سوڊاني پائونڊ
 				سوڊاني پائونڊ
 				سوڊاني پائونڊ
+				SDG
 			
 			
 				سويڊني ڪرونا
 				سويڊني ڪرونا
 				سويڊني ڪرونا
+				SEK
+				kr
 			
 			
 				سنگاپوري ڊالر
 				سنگاپوري ڊالر
 				سنگاپوري ڊالر
+				SGD
+				$
 			
 			
 				سينٽ هيلنا پائونڊ
 				سينٽ هيلنا پائونڊ
 				سينٽ هيلنا پائونڊ
+				SHP
+				£
 			
 			
 				سیرا لیونيائي لیون
 				سیرا لیونيائي لیون
 				سیرا لیونيائي لیون
+				SLL
 			
 			
 				سومالي شلنگ
 				سومالي شلنگ
 				سومالي شلنگ
+				SOS
 			
 			
 				سرينامي ڊالر
 				سرينامي ڊالر
 				سرينامي ڊالر
+				SRD
+				$
 			
 			
 				ڏکڻ سوڊاني پائونڊ
 				ڏکڻ سوڊاني پائونڊ
 				ڏکڻ سوڊاني پائونڊ
+				SSP
+				£
 			
 			
 				سائو ٽوم ۽ پرنسپي دوبرا (1977–2017)
 				سائو ٽوم ۽ پرنسپي دوبرا (1977–2017)
 				سائو ٽوم ۽ پرنسپي دوبرا (1977–2017)
+				STD
 			
 			
 				سائو ٽوم ۽ پرنسپي دوبرا
 				سائو ٽوم ۽ پرنسپي دوبرا
 				سائو ٽوم ۽ پرنسپي دوبرا
+				STN
+				Db
 			
 			
 				سيريائي پائونڊ
 				سيريائي پائونڊ
 				سيريائي پائونڊ
+				SYP
+				£
 			
 			
 				سوازي للانگيني
 				سوازي للانگيني
 				سوازي للانگيني
+				SZL
 			
 			
 				ٿائي باهت
 				ٿائي باهت
 				ٿائي باهت
+				THB
+				฿
 			
 			
 				تاجڪستاني سوموني
 				تاجڪستاني سوموني
 				تاجڪستاني سوموني
+				TJS
 			
 			
 				ترڪمانستان منت
 				ترڪمانستان منت
 				ترڪمانستان منت
+				TMT
 			
 			
 				تیونس دینار
 				تیونس دینار
 				تیونس دینار
+				TND
 			
 			
 				تونگن پانگا
 				تونگن پانگا
 				تونگن پانگا
+				TOP
+				T$
 			
 			
 				ترڪي لرا
 				ترڪي لرا
 				ترڪي لرا
+				TRY
+				₺
+				TL
 			
 			
 				ٽرينڊيڊ ۽ ٽوباگو ڊالر
 				ٽرينڊيڊ ۽ ٽوباگو ڊالر
 				ٽرينڊيڊ ۽ ٽوباگو ڊالر
+				TTD
+				$
 			
 			
 				نيو تائيوان ڊالر
 				نيو تائيوان ڊالر
 				نيو تائيوان ڊالر
+				NT$
+				$
 			
 			
 				تنزانيائي شلنگ
 				تنزانيائي شلنگ
 				تنزانيائي شلنگ
+				TZS
 			
 			
 				یوڪرائن هریونیا
 				یوڪرائن هریونیا
 				یوڪرائن هریونیا
+				UAH
+				₴
 			
 			
 				يگانڊا شلنگ
 				يگانڊا شلنگ
 				يگانڊا شلنگ
+				UGX
 			
 			
 				آمريڪي ڊالر
 				آمريڪي ڊالر
 				آمريڪي ڊالر
+				US$
+				$
 			
 			
 				يوروگوئي پيسو
 				يوروگوئي پيسو
 				يوروگوئي پيسو
+				UYU
+				$
 			
 			
 				ازبڪستاني سوم
 				ازبڪستاني سوم
 				ازبڪستاني سوم
+				UZS
 			
 			
 				Venezuelan Bolívar (2008–2018)
 				وینزویلا بولیور (2008–2018)
 				وینزویلا بولیور (2008–2018)
+				VEF
+				Bs
 			
 			
 				وینزویلا بولیور
 				وینزویلا بولیور
 				وینزویلا بولیور
-				VES
 			
 			
 				ويٽنامي ڊونگ
 				ويٽنامي ڊونگ
 				ويٽنامي ڊونگ
+				₫
+				₫
 			
 			
 				وانواتو واتو
 				وانواتو واتو
 				وانواتو واتو
+				VUV
 			
 			
 				ساموآن ٽالا
 				ساموآن ٽالا
 				ساموآن ٽالا
+				WST
 			
 			
 				وچ آفريڪا فرينڪ
 				وچ آفريڪا فرينڪ
 				وچ آفريڪا فرينڪ
+				FCFA
 			
 			
 				اوڀر ڪيريبين ڊالر
 				اوڀر ڪيريبين ڊالر
 				اوڀر ڪيريبين ڊالر
+				EC$
+				$
 			
 			
 				اولهه آفريڪا فرينڪ
 				اولهه آفريڪا فرينڪ
 				اولهه آفريڪا فرينڪ
+				CFA
 			
 			
 				CFP فرينڪ
 				CFP فرينڪ
 				CFP فرينڪ
+				CFPF
 			
 			
 				اڻڄاتل سڪو
@@ -5329,16 +5565,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				يمني ريال
 				يمني ريال
 				يمني ريال
+				YER
 			
 			
 				ڏکڻ آفريقي رانڊ
 				ڏکڻ آفريقي رانڊ
 				ڏکڻ آفريقي رانڊ
+				ZAR
+				R
 			
 			
 				زمبائي ڪواچا
 				زمبائي ڪواچا
 				زمبائي ڪواچا
+				ZMW
+				ZK
 			
 		
 		
@@ -5358,6 +5599,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				في {1} تي {0}
 			
+			
+				{0}⋅{1}
+			
 			
 				ڪشش ثقل
 				{0} ڪشش ثقل
@@ -5568,6 +5812,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} c
 				{0} صديون
 			
+			
+				ڏهاڪا
+				{0} ڏهاڪو
+				{0} ڏهاڪا
+			
 			
 				سال
 				{0} سال
@@ -5685,6 +5934,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} برٽش ٿرمل يونٽ
 				{0} برٽش ٿرمل يونٽس
 			
+			
+				US ٿرمس
+				{0} US ٿرم
+				{0} US ٿرمس
+			
 			
 				پائونڊز آف فورس
 				{0} پائونڊ آف فورس
@@ -5715,6 +5969,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هرٽز
 				{0} هرٽز
 			
+			
+				ٽائپوگرافڪ em
+				{0} em
+				{0} ems
+			
+			
+				پگزلس
+				{0} پگزل
+				{0} پگزلس
+			
+			
+				ميگا پگزلس
+				{0} ميگا پگزل
+				{0} ميگا پگزلس
+			
+			
+				پگزلس في سينٽي ميٽر
+				{0} پگزل في سينٽي ميٽر
+				{0} پگزلس في سينٽي ميٽر
+			
+			
+				پگزلس في انچ
+				{0} پگزل في انچ
+				{0} پگزلس في انچ
+			
+			
+				في سينٽي ميٽر ڊاٽس
+				{0} في سينٽي ميٽر ڊاٽ
+				{0} في سينٽي ميٽر ڊاٽس
+			
+			
+				ڊاٽس في انچ
+				{0} ڊاٽ في انچ
+				{0} ڊاٽس في انچ
+			
 			
 				ڪلوميٽر
 				{0} ڪلوميٽر
@@ -5924,11 +6213,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هارس پاور
 				{0} هارس پاور
 			
-			
-				هيڪٽوپاسڪلز
-				{0} هيڪٽوپاسڪلز
-				{0} هيڪٽوپاسڪلز
-			
 			
 				مرڪري جو ملي ميٽر
 				مرڪري جو {0} ملي ميٽر
@@ -5944,6 +6228,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مرڪري جا {0} انچز
 				مرڪري جا {0} انچز
 			
+			
+				بارس
+				{0} بار
+				{0} بارس
+			
 			
 				ملي بارز
 				{0} ملي بارز
@@ -5954,6 +6243,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ايٽماس فيئر
 				{0} ايٽماس فيئر
 			
+			
+				پاسڪلز
+				{0} پاسڪل
+				{0} پاسڪلز
+			
+			
+				هيڪٽوپاسڪلز
+				{0} هيڪٽوپاسڪلز
+				{0} هيڪٽوپاسڪلز
+			
 			
 				ڪلو پاسڪلز
 				{0} ڪلو پاسڪل
@@ -6161,6 +6460,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ڪشش ثقل
 				{0} ڪشش ثقل
@@ -6371,6 +6673,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} c
 				{0} c
 			
+			
+				ڏهاڪا
+				{0} ڏهاڪو
+				{0} ڏهاڪا
+			
 			
 				سال
 				{0} سال
@@ -6488,6 +6795,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Btu
 				{0} Btu
 			
+			
+				US ٿرم
+				{0} US ٿرم
+				{0} US ٿرمس
+			
 			
 				پائونڊ-فورس
 				{0} lbf
@@ -6518,6 +6830,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هرٽز
 				{0} هرٽز
 			
+			
+				پگزل
+			
+			
+				megapixels
+			
 			
 				ڪلوميٽر
 				{0} ڪلوميٽر
@@ -6727,11 +7045,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} هارس پاور
 				{0} هارس پاور
 			
-			
-				هيڪٽوپاسڪلز
-				{0} هيڪٽوپاسڪلز
-				{0} هيڪٽوپاسڪلز
-			
 			
 				مرڪري جو ملي ميٽر
 				مرڪري جو {0} ملي ميٽر
@@ -6747,6 +7060,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				مرڪري جا {0} انچز
 				مرڪري جا {0} انچز
 			
+			
+				بار
+				{0} بار
+				{0} بارس
+			
 			
 				ملي بارز
 				{0} ملي بارز
@@ -6757,6 +7075,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} ايٽماس فيئر
 				{0} ايٽماس فيئر
 			
+			
+				هيڪٽوپاسڪلز
+				{0} هيڪٽوپاسڪلز
+				{0} هيڪٽوپاسڪلز
+			
 			
 				kPa
 				{0} kPa
@@ -6964,6 +7287,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				%
 				{0}%
@@ -7103,15 +7429,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} يا {1}
 		
 		
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
 		
 			{0}, {1}
 			{0}, {1}
-			{0}، ۽ {1}
-			{0} ۽ {1}
 		
 		
 			{0}, {1}
@@ -7295,7 +7618,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		ايڪسٽرا-ڪارو
 		الٽرا ڪارو
 		الٽرا ڳرو
-		vertical fractions
+		امودي فريڪشن
 		ڪيپيٽل وٿي
 		اختياري لگيچرز
 		ڊائگونل فريڪشن
diff --git a/make/data/cldr/common/main/sd_PK.xml b/make/data/cldr/common/main/sd_PK.xml
index b9eef44635e..ef7a7683c5a 100644
--- a/make/data/cldr/common/main/sd_PK.xml
+++ b/make/data/cldr/common/main/sd_PK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/se.xml b/make/data/cldr/common/main/se.xml
index 59dcfd7523e..55e00daed6e 100644
--- a/make/data/cldr/common/main/se.xml
+++ b/make/data/cldr/common/main/se.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -321,7 +321,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Frankriikka Saint Martin
 			Madagaskar
 			Marshallsullot
-			Makedonia
 			Mali
 			Burma
 			Mongolia
@@ -1661,12 +1660,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hevosvoima
 				{0} hevosvoima
 			
-			
-				hehtopascal
-				{0} hehtopascal
-				{0} hehtopascal
-				{0} hehtopascal
-			
 			
 				bealgi kvikksølv
 				{0} bealgi kvikksølv
@@ -1679,6 +1672,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} millibar
 				{0} millibar
 			
+			
+				hehtopascal
+				{0} hehtopascal
+				{0} hehtopascal
+				{0} hehtopascal
+			
 			
 				kilomehtera kohti diibmu
 				{0} kilomehter kohti diibmu
@@ -2035,12 +2034,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hv
 				{0} hv
 			
-			
-				hehtopascal
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				bealgi kvikksølv
 				{0} bealgi Hg
@@ -2053,6 +2046,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mbar
 				{0} mbar
 			
+			
+				hehtopascal
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kilomehtera kohti diibmu
 				{0} km/h
@@ -2409,11 +2408,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}hv
 				{0}hv
 			
-			
-				{0}hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				{0} bealgi Hg
 				{0} bealgi Hg
@@ -2424,6 +2418,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}mbar
 				{0}mbar
 			
+			
+				{0}hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				{0}km/h
 				{0}km/h
diff --git a/make/data/cldr/common/main/se_FI.xml b/make/data/cldr/common/main/se_FI.xml
index 74ac7e77a1f..b144fd60dd4 100644
--- a/make/data/cldr/common/main/se_FI.xml
+++ b/make/data/cldr/common/main/se_FI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -44,6 +44,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			thaigiella
 			vietnamagiella
 			álkes kiinnágiella
+			árbevirolaš kiinnágiella
 		
 		
 			
@@ -653,9 +654,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ovddet beaivvi
-				ikte
-				odne
-				ihttin
 				don beaivve
 				
 					{0} beaivve siste
diff --git a/make/data/cldr/common/main/se_NO.xml b/make/data/cldr/common/main/se_NO.xml
index f7fc39994ee..d78709737a1 100644
--- a/make/data/cldr/common/main/se_NO.xml
+++ b/make/data/cldr/common/main/se_NO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/se_SE.xml b/make/data/cldr/common/main/se_SE.xml
index 3c436a3786c..d05bebfbf4f 100644
--- a/make/data/cldr/common/main/se_SE.xml
+++ b/make/data/cldr/common/main/se_SE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/seh.xml b/make/data/cldr/common/main/seh.xml
index 49c0c808fc5..44b62355613 100644
--- a/make/data/cldr/common/main/seh.xml
+++ b/make/data/cldr/common/main/seh.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldávia
 			Madagascar
 			Ilhas Marshall
-			Macedônia
 			Mali
 			Mianmar
 			Mongólia
@@ -287,7 +286,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[a á à â ã b c ç d e é ê f g h i í j k l m n o ó ò ô õ p q r s t u ú v w x y z]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/seh_MZ.xml b/make/data/cldr/common/main/seh_MZ.xml
index 6038169753d..19b21e677fc 100644
--- a/make/data/cldr/common/main/seh_MZ.xml
+++ b/make/data/cldr/common/main/seh_MZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ses.xml b/make/data/cldr/common/main/ses.xml
index 676f1088418..db0691d758a 100644
--- a/make/data/cldr/common/main/ses.xml
+++ b/make/data/cldr/common/main/ses.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldovi
 			Madagascar
 			Maršal gungey
-			Maacedooni
 			Maali
 			Maynamar
 			Mongooli
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]
 		[v]
 		[A Ã B C D E Ẽ F G H I J K L M N Ɲ Ŋ O Õ P Q R S Š T U W X Y Z Ž]
-		[  \- . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/ses_ML.xml b/make/data/cldr/common/main/ses_ML.xml
index 5a4501924ce..1bcea532142 100644
--- a/make/data/cldr/common/main/ses_ML.xml
+++ b/make/data/cldr/common/main/ses_ML.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sg.xml b/make/data/cldr/common/main/sg.xml
index 54903f68109..4c30faaad55 100644
--- a/make/data/cldr/common/main/sg.xml
+++ b/make/data/cldr/common/main/sg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldavùii
 			Madagaskära
 			Âzûâ Märshâl
-			Maseduäni
 			Malïi
 			Myämâra
 			Mongolïi
@@ -290,7 +289,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a â ä b d e ê ë f g h i î ï j k l m n o ô ö p r s t u ù û ü v w y z]
 		[c q x]
 		[A B D E F G H I J K L M N O P R S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/sg_CF.xml b/make/data/cldr/common/main/sg_CF.xml
index da570602338..a1cde6e8e33 100644
--- a/make/data/cldr/common/main/sg_CF.xml
+++ b/make/data/cldr/common/main/sg_CF.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/shi.xml b/make/data/cldr/common/main/shi.xml
index 918543e4dcf..b9f1bd9a0cf 100644
--- a/make/data/cldr/common/main/shi.xml
+++ b/make/data/cldr/common/main/shi.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ⵎⵓⵍⴷⵓⴼⵢⴰ
 			ⵎⴰⴷⴰⵖⴰⵛⵇⴰⵔ
 			ⵜⵉⴳⵣⵉⵔⵉⵏ ⵏ ⵎⴰⵔⵛⴰⵍ
-			ⵎⴰⵙⵉⴷⵓⵏⵢⴰ
 			ⵎⴰⵍⵉ
 			ⵎⵢⴰⵏⵎⴰⵔ
 			ⵎⵏⵖⵓⵍⵢⴰ
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[ⴰ ⴱ ⴳ {ⴳⵯ} ⴷ ⴹ ⴻ ⴼ ⴽ {ⴽⵯ} ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ]
 		[ⴰ ⴱ ⴳ ⴷ ⴹ ⴻ ⴼ ⴽ ⵀ ⵃ ⵄ ⵅ ⵇ ⵉ ⵊ ⵍ ⵎ ⵏ ⵓ ⵔ ⵕ ⵖ ⵙ ⵚ ⵛ ⵜ ⵟ ⵡ ⵢ ⵣ ⵥ]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/shi_Latn.xml b/make/data/cldr/common/main/shi_Latn.xml
index 4a0ec832924..f19c4ffc81e 100644
--- a/make/data/cldr/common/main/shi_Latn.xml
+++ b/make/data/cldr/common/main/shi_Latn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 			
 			
-			
+			
 			
 			
 			
@@ -920,7 +920,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Salvador
 			Sint Maarten
 			Sirija
-			Svazi
+			Esvatini
+			Svazi
 			Tristan da Cunha
 			Otoki Turks in Caicos
 			Čad
@@ -957,8 +958,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis in Futuna
 			Samoa
-			psevdonaglasi
-			psevdobidi
+			psevdonaglasi
+			psevdobidi
 			Kosovo
 			Jemen
 			Mayotte
@@ -1005,22 +1006,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			koledar
 			oblika zapisa valute
-			Razvrščanje s prezrtimi znaki
-			Razvrščanje z obratnimi naglasi
-			Razvrščanje velike črke/male črke
-			Razvrščanje, občutljivo na velike/male črke
+			Razvrščanje s prezrtimi znaki
+			Razvrščanje z obratnimi naglasi
+			Razvrščanje velike črke/male črke
+			Razvrščanje, občutljivo na velike/male črke
 			razvrščanje
-			Normalizirano razvrščanje
-			Številsko razvrščanje
-			Moč razvrščanja
+			Normalizirano razvrščanje
+			Številsko razvrščanje
+			Moč razvrščanja
 			valuta
 			urni prikaz (12 ali 24)
 			Slog preloma vrstic
 			merski sistem
 			številke
-			Časovni pas
-			Različica območnih nastavitev
-			Private-Use
+			Časovni pas
+			Različica območnih nastavitev
+			Zasebna-uporaba
 		
 		
 			budistični koledar
@@ -1079,8 +1080,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Razvrščanje po naglasih/velikih črkah/malih črkah/širini/kana
 			Razvrščanje naglasov
 			Razvrščanje po naglasih/velikih črkah/malih črkah/širini
-			Polna širina
-			Polovična širina
+			Polna širina
+			Polovična širina
 			Številsko
 			12-urni sistem (0–11)
 			12-urni sistem (1–12)
@@ -1089,8 +1090,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Prosti slog preloma vrstic
 			Običajni slog preloma vrstic
 			Strogi slog preloma vrstic
-			BGN
-			UNGEGN
+			BGN
+			UNGEGN
 			metrični sistem
 			imperialni merski sistem
 			merski sistem Združenih držav
@@ -1188,7 +1189,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[á à ă â å ä ā æ ç ć đ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ö ø ō œ q ú ù ŭ û ü ū w x y ÿ]
 		[A B C Č Ć D Đ E F G H I J K L M N O P Q R S Š T U V W X Y Z Ž]
 		[, . % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- – , ; \: ! ? . … ' " „ ‟ « » ( ) \[ \] \{ \} @ *]
+		[\- ‑ – , ; \: ! ? . … ' " „ ‟ « » ( ) \[ \] \{ \} @ *]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1329,53 +1330,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						{0}–{1}
 						
 							h B–h B
-							h–h B
 						
 						
 							h:mm B–h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
 						
 						
 							d.–d.
 						
 						
-							G y – G y
-							G y–y
+							y G–y G
+							y–y G
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							M y GGGGG–M y GGGGG
+							M y–M y GGGGG
+							M y–M y GGGGG
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							d. M y–d. M y GGGGG
+							d. M y GGGGG–d. M y GGGGG
+							d. M y–d. M y GGGGG
+							d. M y–d. M y GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E, d. M y–E, d. M y GGGGG
+							E, d. M y GGGGG–E, d. M y GGGGG
+							E, d. M y–E, d. M y GGGGG
+							E, d. M y–E, d. M y GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G–MMM y G
+							MMM–MMM y G
+							MMM y–MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d.–d. MMM y G
+							d. MMM y G–d. MMM y G
+							d. MMM–d. MMM y G
+							d. MMM y–d. MMM y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E, d. MMM–E, d. MMM y G
+							E, d. MMM y G–E, d. MMM y G
+							E, d. MMM–E, d. MMM y G
+							E, d. MMM y–E, d. MMM y G
 						
 						
 							h a – h a
@@ -1436,35 +1434,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 						
 							M.–M. y
-							M. y – M. y
+							M. y–M. y
 						
 						
-							d. M. y – d. M. y
-							d. M. – d. M. y
-							d. M. y – d. M. y
+							d. M. y–d. M. y
+							d. M.–d. M. y
+							d. M. y–d. M. y
 						
 						
-							E, d. – E, d. M. y
-							E, d. M. – E, d. M. y
-							E, d. M. y – E, d. M. y
+							E, d.–E, d. M. y
+							E, d. M.–E, d. M. y
+							E, d. M. y–E, d. M. y
 						
 						
-							MMM – MMM y
-							MMM y – MMM y
+							MMM–MMM y
+							MMM y–MMM y
 						
 						
 							d.–d. MMM y
-							d. MMM – d. MMM y
-							d. MMM y – d. MMM y
+							d. MMM–d. MMM y
+							d. MMM y–d. MMM y
 						
 						
-							E, d. MMM – E, d. MMM y
-							E, d. MMM – E, d. MMM y
-							E, d. MMM y – E, d. MMM y
+							E, d. MMM–E, d. MMM y
+							E, d. MMM–E, d. MMM y
+							E, d. MMM y–E, d. MMM y
 						
 						
 							MMMM–MMMM y
-							MMMM y – MMMM y
+							MMMM y–MMMM y
 						
 					
 				
@@ -1788,6 +1786,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -1844,10 +1864,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d. MMM
 						E, d. MMM
 						d. MMMM
-						W. 'teden' 'v' MMMM
-						W. 'teden' 'v' MMMM
-						W. 'teden' 'v' MMMM
-						W. 'teden' 'v' MMMM
+						MMMM: W. 'teden'
+						MMMM: W. 'teden'
+						MMMM: W. 'teden'
+						MMMM: W. 'teden'
 						mm:ss
 						y
 						M/y
@@ -1859,10 +1879,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						MMMM y
 						QQQ y
 						QQQQ y
-						w. 'teden' 'v' Y
-						w. 'teden' 'v' Y
-						w. 'teden' 'v' Y
-						w. 'teden' 'v' Y
+						w. 'teden' 'leta' Y
+						w. 'teden' 'leta' Y
+						w. 'teden' 'leta' Y
+						w. 'teden' 'leta' Y
 					
 					
 						{0} {1}
@@ -1882,42 +1902,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d.–d.
 						
 						
-							G y – G y
-							G y–y
+							y G–y G
+							y–y G
 						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							MM. y GGGGG–MM. y GGGGG
+							MM. y–MM. y GGGGG
+							MM. y–MM. y GGGGG
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							d. MM. y–d. MM. y GGGGG
+							d. MM. y GGGGG–d. MM. y GGGGG
+							d. MM. y–d. MM. y GGGGG
+							d. MM. y–d. MM. y GGGGG
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E, d. MM. y–E, d. MM. y GGGGG
+							E, d. MM. y GGGGG–E, d. MM. y GGGGG
+							E, d. MM. y–E, d. MM. y GGGGG
+							E, d. MM. y–E, d. MM. y GGGGG
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G–MMM y G
+							MMM–MMM y G
+							MMM y–MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d.–d. MMM y G
+							d. MMM y G–d. MMM y G
+							d. MMM–d. MMM y G
+							d. MMM y–d. MMM y G
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E, d. MMM–E, d. MMM y G
+							E, d. MMM y G–E, d. MMM y G
+							E, d. MMM–E, d. MMM y G
+							E, d. MMM y–E, d. MMM y G
 						
 						
 							h a–h a
@@ -1986,9 +2006,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d. M. y–d. M. y
 						
 						
-							E, d. – E, d. M. y
-							E, d. M. – E, d. M. y
-							E, d. M. y – E, d. M. y
+							E, d.–E, d. M. y
+							E, d. M.–E, d. M. y
+							E, d. M. y–E, d. M. y
 						
 						
 							MMM–MMM y
@@ -2058,9 +2078,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				leto
-				lani
-				letos
-				naslednje leto
+				lani
+				letos
+				naslednje leto
 				
 					čez {0} leto
 					čez {0} leti
@@ -2076,9 +2096,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				leto
-				lani
-				letos
-				naslednje leto
+				lani
+				letos
+				naslednje leto
 				
 					čez {0} leto
 					čez {0} leti
@@ -2166,9 +2186,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mes.
-				prejšnji mesec
-				ta mesec
-				naslednji mesec
+				prejšnji mesec
+				ta mesec
+				naslednji mesec
 				
 					čez {0} mes.
 					čez {0} mes.
@@ -2184,9 +2204,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				mes.
-				prejšnji mesec
-				ta mesec
-				naslednji mesec
+				prejšnji mesec
+				ta mesec
+				naslednji mesec
 				
 					čez {0} mes.
 					čez {0} mes.
@@ -2221,9 +2241,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ted.
-				prejšnji teden
-				ta teden
-				naslednji teden
+				prejšnji teden
+				ta teden
+				naslednji teden
 				
 					čez {0} ted.
 					čez {0} ted.
@@ -2240,9 +2260,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ted.
-				prejšnji teden
-				ta teden
-				naslednji teden
+				prejšnji teden
+				ta teden
+				naslednji teden
 				
 					čez {0} ted.
 					čez {0} ted.
@@ -2289,9 +2309,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				dan
 				predvčerajšnjim
-				včeraj
-				danes
-				jutri
+				včeraj
+				danes
+				jutri
 				pojutrišnjem
 				
 					čez {0} dan
@@ -2309,9 +2329,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				dan
 				predvčerajšnjim
-				včeraj
-				danes
-				jutri
+				včeraj
+				danes
+				jutri
 				pojutrišnjem
 				
 					čez {0} dan
@@ -2360,7 +2380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					čez {0} nedeljo
 					čez {0} nedelji
-					čez {0} nedelj
+					čez {0} nedelje
 					čez {0} nedelj
 				
 				
@@ -3475,7 +3495,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Otok Man
 			
 			
-				Kolkata
+				Kalkuta
 			
 			
 				Chagos
@@ -3552,6 +3572,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktobe
 			
+			
+				Kostanaj
+			
 			
 				Kizlorda
 			
@@ -3571,7 +3594,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vaduz
 			
 			
-				Colombo
+				Kolombo
 			
 			
 				Monrovia
@@ -5086,8 +5109,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tisoč
@@ -5787,6 +5816,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				evra
 				evri
 				evrov
+				€
+				€
 			
 			
 				finska marka
@@ -6274,6 +6305,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mavretanski uguiji
 				mavretanske uguije
 				mavretanskih uguij
+				MRU
 			
 			
 				malteška lira
@@ -6673,6 +6705,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				saotomejske dobre
 				saotomejskih dober
 				STN
+				Db
 			
 			
 				sovjetski rubelj
@@ -6863,6 +6896,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelska bolivarja
 				venezuelski bolivarji
 				venezuelskih bolivarjev
+				VES
 			
 			
 				vientnamski dong
@@ -7026,7 +7060,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
-			≥{0}
+			~ {0}
+			≥ {0}
+			≤ {0}
 			{0}–{1}
 		
 		
@@ -7138,7 +7174,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} akrov
 			
 			
-				kvadratni yard
+				kvadratni jard
 				{0} kvadratni jard
 				{0} kvadratna jarda
 				{0} kvadratni jardi
@@ -7230,7 +7266,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} litrov na kilometer
 			
 			
-				L/100km
 				{0} liter na 100 kilometrov
 				{0} litra na 100 kilometrov
 				{0} litri na 100 kilometrov
@@ -7733,10 +7768,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mikrogramov
 			
 			
-				tone
+				ameriške tone
 				{0} ameriška tona
 				{0} ameriški toni
-				{0} tone
+				{0} ameriške tone
 				{0} ameriških ton
 			
 			
@@ -7832,13 +7867,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} konjske moči
 				{0} konjskih moči
 			
-			
-				hektopaskali
-				{0} hektopaskal
-				{0} hektopaskala
-				{0} hektopaskali
-				{0} hektopaskalov
-			
 			
 				milimetri živega srebra
 				{0} milimeter živega srebra
@@ -7860,6 +7888,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} palci živega srebra
 				{0} palcev živega srebra
 			
+			
+				{0} bar
+				{0} bara
+				{0} bari
+				{0} barov
+			
 			
 				milibari
 				{0} milibar
@@ -7874,6 +7908,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfere
 				{0} atmosfer
 			
+			
+				paskali
+				{0} paskal
+				{0} paskala
+				{0} paskali
+				{0} paskalov
+			
+			
+				hektopaskali
+				{0} hektopaskal
+				{0} hektopaskala
+				{0} hektopaskali
+				{0} hektopaskalov
+			
 			
 				kilopaskali
 				{0} kilopaskal
@@ -8157,6 +8205,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				G
 				{0} G
@@ -8289,18 +8340,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kt
 			
 			
-				mg/dL
-				{0} mg/dL
-				{0} mg/dL
-				{0} mg/dL
-				{0} mg/dL
+				mg/dl
+				{0} mg/dl
+				{0} mg/dl
+				{0} mg/dl
+				{0} mg/dl
 			
 			
-				mmol/L
-				{0} mmol/L
-				{0} mmol/L
-				{0} mmol/L
-				{0} mmol/L
+				mmol/l
+				{0} mmol/l
+				{0} mmol/l
+				{0} mmol/l
+				{0} mmol/l
 			
 			
 				ppm
@@ -8338,11 +8389,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mol
 			
 			
-				L/km
-				{0} L/km
-				{0} L/km
-				{0} L/km
-				{0} L/km
+				l/km
+				{0} l/km
+				{0} l/km
+				{0} l/km
+				{0} l/km
 			
 			
 				l/100 km
@@ -8449,6 +8500,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} stol.
 				{0} stol.
 			
+			
+				dec
+				{0} dec
+				{0} dec
+				{0} dec
+				{0} dec
+			
 			
 				let
 				{0} l
@@ -8610,6 +8668,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				US therm
+				{0} US therm
+				{0} US therm
+				{0} US therm
+				{0} US therm
+			
 			
 				lbf
 				{0} lbf
@@ -8652,6 +8717,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -8947,13 +9061,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} KM
 				{0} KM
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mmHg
 				{0} mmHG
@@ -8975,6 +9082,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -8989,6 +9103,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -9132,11 +9260,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Ml
 			
 			
-				hL
-				{0} hL
-				{0} hL
-				{0} hL
-				{0} hL
+				hl
+				{0} hl
+				{0} hl
+				{0} hl
+				{0} hl
 			
 			
 				l
@@ -9147,18 +9275,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/l
 			
 			
-				dL
-				{0} dL
-				{0} dL
-				{0} dL
-				{0} dL
+				dl
+				{0} dl
+				{0} dl
+				{0} dl
+				{0} dl
 			
 			
-				cL
-				{0} cL
-				{0} cL
-				{0} cL
-				{0} cL
+				cl
+				{0} cl
+				{0} cl
+				{0} cl
+				{0} cl
 			
 			
 				ml
@@ -9489,12 +9617,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} KM
 				{0} KM
 			
-			
-				{0} hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -9507,6 +9629,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -9577,15 +9705,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} ali {1}
 			{0} ali {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} in {1}
-			{0} in {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
 			{0} in {1}
 			{0} in {1}
 		
diff --git a/make/data/cldr/common/main/sl_SI.xml b/make/data/cldr/common/main/sl_SI.xml
index 3348b6d9763..86ad0be62ce 100644
--- a/make/data/cldr/common/main/sl_SI.xml
+++ b/make/data/cldr/common/main/sl_SI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/smn.xml b/make/data/cldr/common/main/smn.xml
index a76267f0002..38bf96d595a 100644
--- a/make/data/cldr/common/main/smn.xml
+++ b/make/data/cldr/common/main/smn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -102,9 +102,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Australia eŋgâlâskielâ
 			Kanada eŋgâlâskielâ
 			Britannia eŋgâlâskielâ
-			eŋgâlâskielâ (OK)
 			Amerika eŋgâlâskielâ
-			eŋgâlâskielâ (USA)
 			esperantokielâ
 			espanjakielâ
 			Läättin-Amerika espanjakielâ
@@ -564,7 +562,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			St. Martin
 			Madagaskar
 			Marshallsuolluuh
-			OJT Makedonia
 			Mali
 			Myanmar (Burma)
 			Mongolia
@@ -695,7 +692,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a â b c č d đ e f g h i j k l m n ŋ o p r s š t u v y z ž ä á]
 		[à ç é è í ñ ń ó ò q ú ü w x æ ø å ã ö]
 		[A Â B C Č D Đ E F G H I J K L M N Ŋ O P R S Š T U V Y Z Ž Ä Á]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/smn_FI.xml b/make/data/cldr/common/main/smn_FI.xml
index 5cb069a5342..a92f81fdc06 100644
--- a/make/data/cldr/common/main/smn_FI.xml
+++ b/make/data/cldr/common/main/smn_FI.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sn.xml b/make/data/cldr/common/main/sn.xml
index 1a43c7c0edd..9f964eb29b2 100644
--- a/make/data/cldr/common/main/sn.xml
+++ b/make/data/cldr/common/main/sn.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Madagascar
 			Zvitsuwa zveMarshall
-			Macedonia
 			Mali
 			Myanmar
 			Mongolia
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c d e f g h i j k l m n o p r s t u v w y z]
 		[q x]
 		[A B C D E F G H I J K L M N O P R S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		”
diff --git a/make/data/cldr/common/main/sn_ZW.xml b/make/data/cldr/common/main/sn_ZW.xml
index 2cd4fde5971..df04ceb1b48 100644
--- a/make/data/cldr/common/main/sn_ZW.xml
+++ b/make/data/cldr/common/main/sn_ZW.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/so.xml b/make/data/cldr/common/main/so.xml
index 54aa0649241..9c05a469b71 100644
--- a/make/data/cldr/common/main/so.xml
+++ b/make/data/cldr/common/main/so.xml
@@ -7,15 +7,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
-		
-			{0} ({1})
-			{0}, {1}
-			{0}: {1}
-		
 		
 			Afrikaanka
 			Ageem
@@ -68,7 +63,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Ingiriis Biritish
 			Ingiriiska Boqortooyada Midooday
 			Ingiriis Maraykan
-			Ingiriisi (US)
 			Isberaanto
 			Isbaanish
 			Isbaanishka Laatiin Ameerika
@@ -266,7 +260,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
 			
 			
 			
@@ -274,10 +267,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
-			
 			
-			
 			
 			
 			
@@ -291,7 +281,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
-			
 			
 			
 			
@@ -394,7 +383,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Jili
 			Kaameruun
 			Shiinaha
-			Kolombiya
 			Jasiiradda Kilibarton
 			Kosta Riika
 			Kuuba
@@ -447,7 +435,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Guwaatamaala
 			Guaam
 			Gini-Bisaaw
-			Guyana
 			Hong Kong
 			Hong Kong
 			Jasiiradda Haad & MakDonald
@@ -596,7 +583,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Jasiiradaha ka baxsan Maraykanka
 			Qaramada Midoobay
 			Maraykanka
-			US
 			Uruguwaay
 			Uusbakistaan
 			Faatikaan
@@ -608,8 +594,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Fanuaatu
 			Walis & Futuna
 			Samoowa
-			XA
-			XB
 			Koosofo
 			Yaman
 			Mayotte
@@ -693,8 +677,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			Metrik
-			UK
-			US
 		
 		
 			Luuqad : {0}
@@ -704,48 +686,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
-		[]
 		[B C D F G H J K L M N Q R S T W X Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
-		{0}…
-		…{0}
-		{0}…{1}
-		{0} …
-		… {0}
-		{0} … {1}
-		?
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		
-			[\--/]
 			[\:∶]
 		
 		
-			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
-			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
-		
-		
-			[,٫︐﹐，]
-			[.․﹒．｡]
 		
 	
-	
-		“
-		”
-		‘
-		’
-	
 	
 		
 			
@@ -793,37 +746,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						d, E
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
-						L
 						M/d
 						E, M/d
-						LLL
 						MMM d
 						E, MMM d
-						MMMM d
 						E, MMMM d
-						mm:ss
 						y
 						M/y
 						E, M/d/y
@@ -844,19 +775,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						QQQQ y G
 					
 					
-						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
-						
-							d–d
-						
 						
 							y G – y G
 							y – y G
@@ -1069,7 +987,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							Axd
 							Isn
-							Slsa
+							Tldo
 							Arbc
 							Khms
 							Jmc
@@ -1078,7 +996,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							A
 							I
-							S
+							T
 							A
 							Kh
 							J
@@ -1087,7 +1005,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							Axd
 							Isn
-							Slsa
+							Tldo
 							Arbc
 							Khms
 							Jmc
@@ -1096,10 +1014,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							Axad
 							Isniin
-							Salaasa
-							Arbaca
+							Talaado
+							Arbaco
 							Khamiis
-							Jimce
+							Jimco
 							Sabti
 						
 					
@@ -1107,7 +1025,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							Axd
 							Isn
-							Slsa
+							Tldo
 							Arbc
 							Khms
 							Jmc
@@ -1116,7 +1034,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							A
 							I
-							S
+							T
 							A
 							Kh
 							J
@@ -1125,7 +1043,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							Axd
 							Isn
-							Slsa
+							Tldo
 							Arbc
 							Khms
 							Jmc
@@ -1134,10 +1052,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							Axad
 							Isniin
-							Salaasa
-							Arbaca
+							Talaado
+							Arbaco
 							Khamiis
-							Jimce
+							Jimco
 							Sabti
 						
 					
@@ -1150,12 +1068,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							R3
 							R4
 						
-						
-							1
-							2
-							3
-							4
-						
 						
 							Rubaca 1aad
 							Rubaca 2aad
@@ -1170,12 +1082,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							R3
 							R4
 						
-						
-							1
-							2
-							3
-							4
-						
 						
 							Rubaca 1aad
 							Rubaca 2aad
@@ -1204,10 +1110,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							GH
 							GD
 						
-						
-							GH
-							GD
-						
 						
 							GH
 							GD
@@ -1294,44 +1196,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						d, E
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
 						y G
 						MMM y G
 						MMM d, y G
 						E, MMM d, y G
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
 						h:mm:ss a v
-						HH:mm:ss v
-						h:mm a v
-						HH:mm v
-						L
 						M/d
 						E, M/d
-						LLL
-						MMM d
 						E, MMM d
-						MMMM d
 						E, MMMM d
 						'toddobaadka' W 'ee' MMMM
 						'toddobaadka' W 'ee' MMMM
-						mm:ss
-						y
 						M/y
 						M/d/y
 						E, M/d/y
@@ -1344,23 +1219,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						'toddobaadka' w 'ee' Y
 						'toddobaadka' w 'ee' Y
 					
-					
-						{0} {1}
-					
 					
 						{0} - {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
-						
-							d–d
-						
 						
 							y G – y G
 							y – y G
@@ -1399,38 +1259,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, MMM d – E, MMM d, y G
 							E, MMM d, y – E, MMM d, y G
 						
-						
-							h a – h a
-							h–h a
-						
-						
-							HH–HH
-						
-						
-							h:mm a – h:mm a
-							h:mm–h:mm a
-							h:mm–h:mm a
-						
-						
-							HH:mm–HH:mm
-							HH:mm–HH:mm
-						
-						
-							h:mm a – h:mm a v
-							h:mm–h:mm a v
-							h:mm–h:mm a v
-						
-						
-							HH:mm–HH:mm v
-							HH:mm–HH:mm v
-						
-						
-							h a – h a v
-							h–h a v
-						
-						
-							HH–HH v
-						
 						
 							M–M
 						
@@ -1453,9 +1281,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							E, MMM d – E, MMM d
 							E, dd MMM – E, dd MMM
 						
-						
-							y–y
-						
 						
 							MM/y – MM/y
 							MM/y – MM/y
@@ -1491,6 +1316,75 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 				
 			
+			
+				
+					
+						
+							Mux.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dhuʻl-Q.
+							Dhuʻl-H.
+						
+						
+							Muxarram
+							Safar
+							Rabic al-awwal
+							Rabic al-thani
+							Jumada al-awwal
+							jumada al-thani
+							Rajab
+							Shacban
+							Ramadan
+							Shawwal
+							Dul al-qacda
+							Dul xijjah
+						
+					
+					
+						
+							Mux.
+							Saf.
+							Rab. I
+							Rab. II
+							Jum. I
+							Jum. II
+							Raj.
+							Sha.
+							Ram.
+							Shaw.
+							Dul-Q.
+							Dul-X.
+						
+						
+							Muxarram
+							Safar
+							Rabic al-awwal
+							Rabic al-thani
+							Jumada al-awwal
+							jumada al-thani
+							Rajab
+							Shacban
+							Ramadan
+							Shawwal
+							Dul al-qacdah
+							Dul xijjah
+						
+					
+				
+				
+					
+						HD
+					
+				
+			
 		
 		
 			
@@ -1518,9 +1412,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				snd
-				Sannadkii hore
-				Sannadkan
-				Sannadka danbe
 				
 					{0} snd
 					{0} snd
@@ -1535,14 +1426,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Sannadkii la soo dhaafay
 				Sannadkan
 				Sannadka xiga
-				
-					{0} snd
-					{0} snd
-				
-				
-					{0} snd khr
-					{0} Snd khr
-				
 			
 			
 				Rubuc
@@ -1571,14 +1454,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				rbc
-				
-					{0} rbc
-					{0} rbc
-				
-				
-					{0} rbc khr
-					{0} rbc khr
-				
 			
 			
 				Bil
@@ -1595,10 +1470,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Bil-gaaban
-				Bishii hore
-				Bishan
-				Bisha danbe
 				
 					{0} bil
 					{0} bil
@@ -1609,18 +1480,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 			
-				Bil-gaaban
-				Bishii hore
-				Bishan
-				Bisha danbe
-				
-					{0} bil
-					{0} bil
-				
-				
-					{0} bil khr
-					{0} bil khr
-				
+				bil
 			
 			
 				Toddobaad
@@ -1639,9 +1499,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				tdbd
-				Toddobaadkii hore
-				Usbuucan
-				Toddobaadka danbe
 				
 					{0} tdbd
 					{0} tdbd
@@ -1655,27 +1512,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				tdbd
 				Toddobaadkii hore
-				Usbuucan
+				Toddobaadkan
 				Toddobaadka danbe
-				
-					{0} tdbd
-					{0} tdbd
-				
-				
-					{0} tdbd khr
-					{0} tdbd khr
-				
 				Tdbdka {0}
 			
 			
 				Toddobaadka Bisha
 			
-			
-				tdbdka bsha
-			
-			
-				tdbdka bsha
-			
 			
 				maalin
 				Shalay
@@ -1692,9 +1535,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				mln
-				Shalay
-				Maanta
-				Berri
 				
 					{0} mln
 					{0} mlmd
@@ -1706,17 +1546,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				mln
-				Shalay
-				Maanta
-				Berri
-				
-					{0} mln
-					{0} mlmd
-				
-				
-					{0} mln khr
-					{0} mlmd khr
-				
 			
 			
 				maalinta sannadka
@@ -1724,9 +1553,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				mlnta sndka
 			
-			
-				mlnta sndka
-			
 			
 				maalinta toddobaadka
 			
@@ -1758,31 +1584,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} Axadood kahor
 				
 			
-			
-				Axdi hre
-				Axdn
-				Axda dbe
-				
-					{0} Axd
-					{0} Axd
-				
-				
-					{0} Axd khr
-					{0} axd khr
-				
-			
 			
-				Axdi hre
-				Axdn
-				Axda dbe
-				
-					{0} Axd
-					{0} Axd
-				
-				
-					{0} Axd khr
-					{0} axd khr
-				
+				axadii hore
+				axadan
+				axada xigta
 			
 			
 				Isniintii hore
@@ -1814,52 +1619,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Isnti hre
 				Isntn
 				Isnta dbe
-				
-					{0} Isn
-					{0} Isn
-				
-				
-					{0} Isn khr
-					{0} Isn khr
-				
 			
 			
-				Salaasadii hore
-				Salaasadan
-				Salaasada danbe
+				Talaadadii hore
+				Talaadadan
+				Talaadada xigta
 				
-					{0} Salaasa
-					{0} Salaasood
+					{0} Talaado
+					{0} Talaadood
 				
 				
-					{0} Salaasa kahor
-					{0} Salaasood kahor
+					{0} Talaado kahor
+					{0} Talaadood kahor
 				
 			
 			
-				Slsdi hre
-				Slsdn
-				Slsda dbe
+				Tlddi hre
+				Tlddn
+				Tldda xgta
 				
-					{0} Slsa
-					{0} Slsa
+					{0} Tldo
+					{0} Tldo
 				
 				
-					{0} Slsa khr
-					{0} Slsa khr
+					{0} Tldo khr
+					{0} Tldod khr
 				
 			
 			
-				Slsdi hre
-				Slsdn
-				Slsda dbe
+				Tlddi hre
+				Tlddn
+				Tldda xgta
 				
-					{0} Slsa
-					{0} Slsa
+					{0} Tldo
+					{0} Tldo
 				
 				
-					{0} Slsa khr
-					{0} Slsa khr
+					{0} Tldo khr
+					{0} Tldod khr
 				
 			
 			
@@ -1888,19 +1685,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} Arbc khr
 				
 			
-			
-				Arbcdi hre
-				Arbcdn
-				Arbcda dbe
-				
-					{0} Arbc
-					{0} Arbc
-				
-				
-					{0} Arbc khr
-					{0} Arbc khr
-				
-			
 			
 				Khamiistii hore
 				Khamiistan
@@ -1927,19 +1711,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} khms khr
 				
 			
-			
-				Khmsti hre
-				Khmstn
-				Khmsta dbe
-				
-					{0} khms
-					{0} khms
-				
-				
-					{0} khms khr
-					{0} khms khr
-				
-			
 			
 				Jimcihii hore
 				Jimcahan
@@ -1966,19 +1737,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} jmc khr
 				
 			
-			
-				Jmchi hre
-				Jmchn
-				Jmcha dbe
-				
-					{0} Jmc
-					{0} Jmc
-				
-				
-					{0} Jmc khr
-					{0} jmc khr
-				
-			
 			
 				Sabtidii hore
 				Sabtidan
@@ -2005,19 +1763,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} Sbti khr
 				
 			
-			
-				Sbtdi hre
-				Sbtdn
-				Sbtda dbe
-				
-					{0} Sbti
-					{0} Sbti
-				
-				
-					{0} Sbti khr
-					{0} Sbti khr
-				
-			
 			
 				GH/GD
 			
@@ -2052,14 +1797,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				scd
-				
-					{0} scd
-					{0} scd
-				
-				
-					{0} scd khr
-					{0} scd khr
-				
 			
 			
 				daqiiqad
@@ -2081,18 +1818,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					{0} dqqd khr
-					{0} dqqd khr
-				
-			
-			
-				dqqd
-				
-					{0} dqqd
-					{0} dqqd
-				
-				
-					{0} dqqd khr
-					{0} dqqd khr
+					{0} daqiiqadood kahor
 				
 			
 			
@@ -2118,17 +1844,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					{0} ilbrqsi khr
 				
 			
-			
-				ilbrqsi
-				
-					{0} ilbrqsi
-					{0} ilbrqsi
-				
-				
-					{0} ilbrqsi khr
-					{0} ilbrqsi khr
-				
-			
 			
 				wakhtiga aagga
 			
@@ -2140,13 +1855,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			+HH:mm;-HH:mm
-			GMT{0}
-			GMT
 			Waqtiga {0}
 			Waqtiga Dharaarta ee {0}
 			Waqtiga Caadiga Ah ee {0}
-			{1} ({0})
 			
 				
 					Waqtiga Isku-xiran ee Caalamka
@@ -2191,9 +1902,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Siyowa
 			
-			
-				Mawson
-			
 			
 				Dafis
 			
@@ -2230,12 +1938,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Katamaarka
 			
-			
-				Salta
-			
-			
-				Jujuy
-			
 			
 				Tukuumaan
 			
@@ -2257,9 +1959,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Yukla
 			
-			
-				Darwin
-			
 			
 				Adelayde
 			
@@ -2275,9 +1974,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Hubaart
 			
-			
-				Lindeman
-			
 			
 				Sidney
 			
@@ -2290,21 +1986,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Lod How
 			
-			
-				Aruba
-			
 			
 				Maarihaam
 			
-			
-				Baku
-			
 			
 				Sarayeefo
 			
-			
-				Barbados
-			
 			
 				Dhaaka
 			
@@ -2320,9 +2007,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Baxreyn
 			
-			
-				Bujumbura
-			
 			
 				Boorto-Noofo
 			
@@ -2365,9 +2049,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Kaambo Garandi
 			
-			
-				Belem
-			
 			
 				Araguwayna
 			
@@ -2428,9 +2109,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Yelowneyf
 			
-			
-				Edmonton
-			
 			
 				Iswift Karent
 			
@@ -2461,9 +2139,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Nibiigoon
 			
-			
-				Toronto
-			
 			
 				Iqaaluut
 			
@@ -2491,9 +2166,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Kokos
 			
-			
-				Kinshasa
-			
 			
 				Lubumbaashi
 			
@@ -2509,9 +2181,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Abidjaan
 			
-			
-				Rarotonga
-			
 			
 				Iistar
 			
@@ -2524,15 +2193,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Douaala
 			
-			
-				Urumqi
-			
 			
 				Shanghaay
 			
-			
-				Bogota
-			
 			
 				Kosta Riika
 			
@@ -2551,9 +2214,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Nikosiya
 			
-			
-				Famagusta
-			
 			
 				Baraag
 			
@@ -2593,9 +2253,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				El Ceyuun
 			
-			
-				Asmara
-			
 			
 				Kanari
 			
@@ -2605,15 +2262,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Maadriid
 			
-			
-				Addis Ababa
-			
 			
 				Heleniski
 			
-			
-				Fiji
-			
 			
 				Istaanley
 			
@@ -2656,33 +2307,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Akra
 			
-			
-				Gibraltar
-			
 			
 				Tuul
 			
-			
-				Nuuk
-			
 			
 				Itoqortoomiit
 			
 			
 				Daanmaakshaan
 			
-			
-				Banjul
-			
 			
 				Conakri
 			
 			
 				Guwadeluub
 			
-			
-				Malabo
-			
 			
 				Atens
 			
@@ -2767,15 +2406,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ammaan
 			
-			
-				Tokyo
-			
 			
 				Nayroobi
 			
-			
-				Bishkek
-			
 			
 				Benom Ben
 			
@@ -2785,9 +2418,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Kiritimaati
 			
-			
-				Tarawa
-			
 			
 				Komoro
 			
@@ -2809,15 +2439,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Aktaw
 			
-			
-				Oral
-			
 			
 				Atiyraw
 			
-			
-				Aqtobe
-			
 			
 				Kostanay
 			
@@ -2890,15 +2514,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Bamaako
 			
-			
-				Yangon
-			
 			
 				Hofud
 			
-			
-				Ulaanbaatar
-			
 			
 				Joybalsan
 			
@@ -2917,9 +2535,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Moontseraat
 			
-			
-				Malta
-			
 			
 				Morishiyaas
 			
@@ -2953,9 +2568,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Meksiko Siti
 			
-			
-				Matamoros
-			
 			
 				Meriida
 			
@@ -2992,9 +2604,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Amsterdaam
 			
-			
-				Oslo
-			
 			
 				Katmandu
 			
@@ -3019,9 +2628,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Liima
 			
-			
-				Tahiti
-			
 			
 				Marquwesas
 			
@@ -3040,9 +2646,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Karaaji
 			
-			
-				Warsaw
-			
 			
 				Miiquulon
 			
@@ -3055,18 +2658,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Qasa
 			
-			
-				Hebron
-			
 			
 				Asores
 			
 			
 				Madeera
 			
-			
-				Lisbon
-			
 			
 				Balaw
 			
@@ -3085,9 +2682,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Bilgaraydh
 			
-			
-				Kaliningrad
-			
 			
 				Simferobol
 			
@@ -3109,24 +2703,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Kiroof
 			
-			
-				Samara
-			
 			
 				Yekaterinbaag
 			
-			
-				Omsk
-			
 			
 				Nofosibirsik
 			
 			
 				Barnaauul
 			
-			
-				Tomsk
-			
 			
 				Nofokusnetsik
 			
@@ -3148,12 +2733,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Khandiyga
 			
-			
-				Sakhalin
-			
-			
-				Ust-Nera
-			
 			
 				Magedan
 			
@@ -3166,18 +2745,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Anadiyr
 			
-			
-				Kigali
-			
 			
 				Riyaad
 			
 			
 				Cuadalkanal
 			
-			
-				Mahe
-			
 			
 				Khartuum
 			
@@ -3187,9 +2760,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Singabuur
 			
-			
-				St. Helena
-			
 			
 				Lubalaana
 			
@@ -3205,18 +2775,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				San Mariino
 			
-			
-				Dakar
-			
 			
 				Muqdisho
 			
 			
 				Baramaribo
 			
-			
-				Juba
-			
 			
 				Saw Toom
 			
@@ -3247,18 +2811,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Bangkook
 			
-			
-				Dushanbe
-			
 			
 				fakofo
 			
-			
-				Dili
-			
-			
-				Ashgabat
-			
 			
 				Tuunis
 			
@@ -3271,9 +2826,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Boort of Isbayn
 			
-			
-				Funafuti
-			
 			
 				Teybey
 			
@@ -3292,15 +2844,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Kambaala
 			
-			
-				Midway
-			
-			
-				Wake
-			
-			
-				Adak
-			
 			
 				Noom
 			
@@ -3412,9 +2955,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Hoo Ji Mih Siti
 			
-			
-				Efate
-			
 			
 				Walis
 			
@@ -4318,29 +3858,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		latn
-		
-			latn
-		
-		1
 		
-			.
-			,
-			%
-			+
-			-
-			E
-			×
-			‰
-			∞
 			MaL
 		
 		
-			
-				
-					#,##0.###
-				
-			
 			
 				
 					0 Kun
@@ -4371,47 +3892,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					0K
-					0K
-					00K
-					00K
-					000K
-					000K
-					0M
-					0M
-					00M
-					00M
-					000M
-					000M
 					0B
 					0B
 					00B
 					00B
 					000B
 					000B
-					0T
-					0T
-					00T
-					00T
-					000T
-					000T
 				
 			
 		
-		
-			
-				
-					#E0
-				
-			
-		
-		
-			
-				
-					#,##0%
-				
-			
-		
 		
 			
 				
@@ -4449,606 +3938,458 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					¤000T
 				
 			
-			{0} {1}
-			{0} {1}
 		
 		
 			
 				Dirhamka Isutaga Imaaraatka Carabta
 				dirhamka Isutaga Imaaraatka Carabta
 				dirhamka Isutaga Imaaraatka Carabta
-				AED
 			
 			
 				Afgan Afgani
 				Afgan Afgani
 				Afgan Afgani
-				AFN
 			
 			
 				Lekta Albaniya
 				lekta Abaniya
 				lekta Albaniya
-				ALL
 			
 			
 				Daraamka Armeniya
 				daraamka Armeniya
 				daraamka Armeniya
-				AMD
 			
 			
 				Galdarka Nadarlaan Antiliyaan
 				galdarka Nadarlaan Antiliyaan
 				galdarada Nadarlaan Antiliyaan
-				ANG
 			
 			
 				Kawansada Angola
 				kawansada Angola
 				kawansada Angola
-				AOA
-				Kz
 			
 			
 				Beesada Arjentiin
 				Beesada Arjentiin
 				Beesada Arjentiin
-				ARS
-				$
 			
 			
 				Doolarka Astaraaliya
 				doolarka Astaraaliya
 				doolarada Astaraaliya
-				A$
-				$
 			
 			
 				Foloorinta Aruban
 				foloorinta Aruban
 				foloorinta Aruban
-				AWG
 			
 			
 				Manaata Asarbeyjan
 				manaata Asarbeyjan
 				manaata Asarbeyjan
-				AZN
 			
 			
 				Konfatibal Maakta Bosnia-Hersogofina
 				konfatibal maakta Bosnia-Hersogofina
 				konfatibal maakta Bosnia-Hersogofina
-				BAM
-				KM
 			
 			
 				Doolarka Barbaadiyaan
 				doolarka Barbaadiyaan
 				doolarada Barbaadiyaan
 				DBB
-				$
 			
 			
 				Taka Bangledesh
 				taka Bangledesh
 				taka Bangledesh
-				BDT
-				৳
 			
 			
 				Lefta Bulgariya
 				lefta Bulgariya
 				lefta Bulgariya
-				BGN
 			
 			
 				Dinaarka Baxreyn
 				dinaarka Baxreyn
 				dinaarka Baxreyn
-				BHD
 			
 			
 				Faranka Burundi
 				faranka Burundi
 				faranka Burundi
-				BIF
 			
 			
 				Doolarka Barmuuda
 				doolarka Barmuuda
-				doolarada Barmuuda
-				BMD
-				$
+				Doolarka Barmuuda
 			
 			
 				Doolarka Buruney
 				doolarka Buruney
 				doolarada Buruney
-				BND
-				$
 			
 			
 				Bolifiyanada Bolifiya
 				Bolifiyanada Bolifiya
 				Bolifiyanada Bolifiya
-				BOB
-				Bs
 			
 			
 				Realka Barasil
 				Realka Barasil
 				Realada Barasil
-				R$
-				R$
 			
 			
 				Doolarka Bahamaas
 				doolarka Bahamaas
 				doolarada Bahamaas
-				BSD
-				$
 			
 			
 				Nugultaramta Butan
 				nugultaramta Butan
 				nugultaramta Butan
-				BTN
 			
 			
 				Buulada Botswana
 				buulada Botswana
 				buulada Botswana
-				BWP
-				P
 			
 			
 				Rubalka Belarus
 				rubalka Belarus
 				rubalka Belarus
-				BYN
-				р.
 			
 			
 				Doolarka Beelisa
 				doolarka Beelisa
 				doolarada Beelisa
-				BZD
-				$
 			
 			
 				Doolarka Kanada
 				doolarka Kanada
 				doolarada Kanada
-				CA$
-				$
 			
 			
 				Faranka Kongo
 				faranka Kongo
 				faranka Kongo
-				CDF
 			
 			
 				Faranka Iswiska
 				Faranka Iswiska
 				Faranka Iswiska
-				CHF
 			
 			
 				Beesada Jili
 				Beesada Jili
 				Beesada Jili
-				CLP
-				$
 			
 			
 				Yuwanta Shiinaha (Ofshoor)
 				yuwanta Shiinaha (Ofshoor)
 				yuwanta Shiinaha (Ofshoor)
-				CNH
 			
 			
 				Yuwanta Shiinaha
 				yuwanta Shiinaha
 				yuwanta Shiinaha
-				CN¥
-				¥
 			
 			
 				Beesada Kolombiya
 				Beesada Kolombiya
 				Beesada Kolombiya
-				COP
-				$
 			
 			
 				Kolonka Kosta Riika
 				kolonka Kosta Riika
 				kolonka Kosta Riika
-				CRC
-				₡
 			
 			
 				Beesada Konfatibal ee Kuuba
 				beesada konfatibal ee Kuuba
 				beesada konfatibal ee Kuuba
-				CUC
-				$
 			
 			
 				Beesada Kuuba
 				Beesada Kuuba
 				Beesada Kuuba
-				CUP
-				$
 			
 			
 				Eskudo Keyb Farde
 				eskudo Keyb Farde
 				eskudo Keyb Farde
-				CVE
 			
 			
 				Korunada Jeek
 				korunada Jeek
 				korunada Jeek
-				CZK
-				Kč
 			
 			
 				Faran Jabuuti
 				faranka Jabuuti
 				faranka Jabuuti
-				DJF
 			
 			
 				Koronka Danishka
 				Koronka Danishka
 				Koronka Danishka
-				DKK
-				kr
 			
 			
 				Beesada Dominiika
 				beesada Dominiika
 				beesada Dominiika
-				DOP
-				$
 			
 			
 				Dinaarka Aljeriya
 				dinaarka Aljeriya
 				dinaarka Aljeriya
-				DZD
 			
 			
 				Bowndka Masar
 				bowndka Masar
 				bowndka Masar
-				EGP
-				E£
 			
 			
 				Nakfada Eritriya
 				nakfada Eritriya
 				nafkada Eritriya
-				ERN
 			
 			
 				Birta Itoobbiya
 				birta Itoobbiya
 				birta Itoobbiya
-				ETB
 			
 			
 				Yuuroo
 				yuuroo
 				yuuroo
-				€
-				€
 			
 			
 				Doolarka Fiji
 				doolarka Fiji
 				doolarada Fiji
-				FJD
-				$
 			
 			
 				Bowndka Faalklaan Aylaanis
 				Bowndka Faalklaan Aylaanis
 				Bowndka Faalklaan Aylaanis
-				FKP
-				£
 			
 			
 				Bowndka Biritishka
 				Bowndka Biritishka
 				Bowndka Biritishka
-				£
-				£
 			
 			
 				Laariga Joorjiya
 				laariga Joorjiya
 				laariga Joorjiya
-				GEL
-				₾
 			
 			
 				Sedida Gana
 				sedida Gana
 				sedida Gana
-				GHS
 			
 			
 				Bowndka Gibraltar
 				bowndka Gibraltar
 				bowndka Gibraltar
-				GIP
-				£
 			
 			
 				Dalasida Gambiya
 				Dalasida Gambiya
 				Dalasida Gambiya
-				GMD
 			
 			
 				Faranka Gini
 				faranka Gini
 				faranka Gini
-				GNF
-				FG
 			
 			
 				Kuwestalka Guwatemala
 				kuwestalka Guwatemala
 				kuwestalka Guwatemala
-				GTQ
-				Q
 			
 			
 				Doolarka Guyanes
 				Doolarka Guyanes
 				Doolarada Guyanes
-				GYD
-				$
 			
 			
 				Doolarka Hoon Koon
-				Doolarada Hoon Koon
-				Doolarada Hoon Koon
-				HK$
-				$
+				Doolarada Hoon Koon
+				Doolarada Hoon Koon
 			
 			
 				Lembirada Honduras
 				lembirada Honduras
 				lembirada Honduras
-				HNL
-				L
 			
 			
 				Kunada Korooshiya
 				kunada Korooshiya
 				kunada Korooshiya
-				HRK
-				kn
 			
 			
 				Goordada Hiyati
 				goordada Hiyati
 				goordada Hiyati
-				HTG
 			
 			
 				Forintiska Hangari
 				forintiska Hangari
 				forintiska Hangari
-				HUF
-				Ft
 			
 			
 				Rubiah Indonesiya
 				rubiah Indonesiya
 				rubiah Indonesiya
-				IDR
-				Rp
 			
 			
 				Niyuu Shekelka Israaiil
 				niyuu shekelka Israaiil
 				niyuu shekelka Israaiil
-				₪
-				₪
 			
 			
 				Rubiga Hindiya
 				rubiga Hindiya
 				rubiga Hindiya
-				₹
-				₹
 			
 			
 				Dinaarka Ciraaq
 				dinaarka Ciraaq
 				dinaarka Ciraaq
-				IQD
 			
 			
 				Riyaalka Iran
 				riyaalka Iran
 				riyaalka Iran
-				IRR
 			
 			
 				Koronada Eysland
 				Koronada Eysland
 				Koronada Eysland
-				ISK
-				kr
 			
 			
 				Doolarka Jamayka
 				doolarka Jamayka
 				doolarada Jamayka
-				JMD
-				$
 			
 			
 				Dinaarka Urdun
 				dinaarka Urdun
 				dinaarka Urdun
-				JOD
 			
 			
 				Yenta Jabaan
 				yenta Jabaan
 				yenta Jabaan
-				JP¥
-				¥
 			
 			
 				Shilingka Kenya
 				shilingka Kenya
 				shilingka Kenya
-				KES
 			
 			
 				Somta Kiyrgiystan
 				somta Kiyriygstan
 				somta Kiyrgiystan
-				KGS
 			
 			
 				Riyf kambodiya
 				Riyf Kambodiya
 				Riyf kambodiya
-				KHR
-				៛
 			
 			
 				Faranka Komoros
 				faranka Komoros
 				faranka Komoros
-				KMF
-				CF
 			
 			
 				Wonka Waqooyiga Kuuriya
 				wonka Waqooyiga Kuuriya
 				wonka Waqooyiga Kuuriya
-				KPW
-				₩
 			
 			
 				Wonka Koonfur Kuuriya
 				wonka Koonfur Kuuriya
 				wonka Koonfur Kuuriya
-				₩
-				₩
 			
 			
 				Dinaarka Kuweyt
 				dinaarka Kuweyt
 				dinaarka Kuweyt
-				KWD
 			
 			
 				Doolarka Kayman Aylaanis
 				doolarka Kayman Aylaanis
 				Doolarada Kayman Aylaanis
-				KYD
-				$
 			
 			
 				Tengeda Kasakhstan
 				tengeda Kasakhstan
 				tengeda Kasakhstan
-				KZT
-				₸
 			
 			
 				Kib Laoti
 				kib Laoti
 				kib Laoti
-				LAK
-				₭
 			
 			
 				Bowndka Lubnaan
 				bowndka Lubnaan
 				Bowndka Lubnaan
-				LBP
-				L£
 			
 			
 				Rubiga Siri lanka
 				rubiga Siri Lanka
 				rubiga Siri lanka
-				LKR
-				Rs
 			
 			
 				Doolarka Liberiya
 				doolarka Liberiya
 				doolarka Liberiya
-				LRD
-				$
 			
 			
 				Dinaarka Libya
 				dinaarka Libya
 				dinaarka Libya
-				LYD
 			
 			
 				Dirhamka Moroko
 				dirhamka Moroko
 				dirhamka Moroko
-				MAD
 			
 			
 				Leeyuuda Moldofa
 				leeyuuda Moldofa
 				leeyuuda Moldofa
-				MDL
 			
 			
 				Arayrida Madagaskar
 				arayrida Madagaskar
 				arayrida Madagaskar
-				MGA
-				Ar
 			
 			
 				Denaarka Masedoniya
 				denaarka Masedoniya
 				denaarka Masedoniya
-				MKD
 			
 			
 				Kayatda Mayanmaar
 				kayatda Mayanmaar
 				kayatda Mayanmaar
-				MMK
-				K
 			
 			
 				Tugrikta Mongoliya
 				tugrikta Mongoliya
 				tugrikta Mongoliya
-				MNT
-				₮
 			
 			
 				Bataka Makana
 				bataka Makana
 				bataka Makana
-				MOP
 			
 			
 				Oogiya Mawritaniya (1973–2017)
@@ -5060,225 +4401,171 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Oogiyada Mawritaaniya
 				oogiyada Mawritaniya
 				oogiyada Mawritaniya
-				MRU
 			
 			
 				Rubiga Mowrishiya
 				rubiga Mowrishiya
 				rubiga Mowrishiya
-				MUR
-				Rs
 			
 			
 				Rufiyada Maldifiya
 				rufiyada Maldifiya
 				rufiyada Maldifiya
-				MVR
 			
 			
 				Kawajada Malawi
 				kawajada Malawi
 				kawajada Malawi
-				MWK
 			
 			
 				Beesada Meksiko
 				Beesada Meksiko
 				beesada Meksiko
-				MX$
-				$
 			
 			
 				Ringitda Malayshiya
 				ringitda Malayshiya
 				ringitda Malayshiya
-				MYR
-				RM
 			
 			
 				Metikalka Mosambik
 				metikalka Mosambik
 				Metikalka Mosambik
-				MZN
 			
 			
 				Doolarka Namibiya
 				doolarka Namibiya
 				doolarka Namibiya
-				NAD
-				$
 			
 			
 				Nairada Neyjeeriya
 				nairada Neyjeeriya
 				nairada Neyjeeriya
-				NGN
-				₦
 			
 			
 				Kordobada Nikargow
 				Kordobada Nikargow
 				Kordobada Nikargow
-				NIO
-				C$
 			
 			
 				Koronka Norway
 				Koronka Norway
 				Koronka Norway
-				NOK
-				kr
 			
 			
 				Rubiga Nebal
 				rubiga Nebal
 				rubiga Nebal
-				NPR
-				Rs
 			
 			
 				Doolarka Niyuu Siyalaan
 				doolarka Niyuu siyalaan
 				doolarada Niyuu Siyalaan
-				NZ$
-				$
 			
 			
 				Riyaalka Cumaan
 				riyaalka Cumaan
 				riyaalka Cumaan
-				OMR
 			
 			
 				Balbow Banama
 				balbaw Banama
 				balbow Banama
-				PAB
 			
 			
 				Solsha Beeru
 				Solsha Beeru
 				Solsha Beeru
-				PEN
 			
 			
 				Kinada Babua Niyuu Gini
 				kinada Babua Niyuu Gini
 				kinada Babua Niyuu Gini
-				PGK
 			
 			
 				Biso Filibin
 				biso Filibin
 				biso Filibin
-				PHP
-				₱
 			
 			
 				Rubiga Bakistan
 				rubiga Bakistan
 				rubiga Bakistan
-				PKR
-				Rs
 			
 			
 				Solotida Bolaan
 				solotida Bolaan
 				solotida Bolaan
-				PLN
-				zł
 			
 			
 				Guranida Baraguway
 				Guranida Baraguway
 				Guranida Baraguway
-				PYG
-				₲
 			
 			
 				Riyaalka Qatar
 				riyaalka Qatar
 				riyaalka Qatar
-				QAR
 			
 			
 				Liyuuda Romaniya
 				liyuuda Romaniya
 				liyuuda Romaniya
-				RON
-				lei
 			
 			
 				Dinaarka Serbiya
 				dinaarka Serbiya
 				dinaarka Serbiya
-				RSD
 			
 			
 				Rubalka Ruushka
 				rubalka Ruushka
 				rubalka Ruushka
-				RUB
-				₽
 			
 			
 				Faranka Ruwanda
 				Faranka Ruwanda
 				Faranka Ruwanda
-				RWF
-				RF
 			
 			
 				Riyaalka Sacuudiga
 				Riyaalka Sacuudiga
 				riyaalka Sacuudiga
-				SAR
 			
 			
 				Doolarka Solomon Aylaanis
 				doolarka Solomon Aylaanis
 				doolarada Solomon Aylaanis
-				SBD
-				$
 			
 			
 				Rubiga Siisalis
 				rubiga Siisalis
 				rubiga Siisalis
-				SCR
 			
 			
 				Bowndka Suudaan
 				bowndka Suudaan
 				bowndka Suudaan
-				SDG
 			
 			
 				Koronka Isweden
 				Koronka Isweden
 				Koronka Isweden
-				SEK
-				kr
 			
 			
 				Doolarka Singabuur
 				doolarka Singabuur
 				doolarka Singabuur
-				SGD
-				$
 			
 			
 				Bowndka St Helen
-				bowndka St Helen
-				Bowndka St Helen
-				SHP
-				£
+				bowndka St Helen
+				Bowndka St Helen
 			
 			
 				Leonka Sira Leon
 				leonka Sira Leon
 				leonka Sira Leon
-				SLL
 			
 			
 				Shilingka Soomaaliya
@@ -5288,128 +4575,96 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Doolarka Surinamees
 				Doolarka Surinamees
 				Doolarada Surinamees
-				SRD
-				$
 			
 			
 				Bowndka Koonfurta Suudaan
 				Bowndka Koonfurta Suudaan
 				Bowndka Koonfurta Suudaan
-				SSP
-				£
 			
 			
 				Dobra Sao Tome & Birinsibi
 				dobrada Sao Tome Birinsibi
 				dobrada Sao Tome & Birinsibi
-				STN
-				Db
 			
 			
 				Bowndka Suuriya
 				bowndka Suuriya
 				bowndka Suuriya
-				SYP
-				£
 			
 			
 				Lilangeenida iswaasi
 				lilengeenida Iswaasi
 				lilangeenida iswaasi
-				SZL
 			
 			
 				Baatka Taylaan
 				Baatda Taylaan
 				baatda Taylaan
-				THB
-				฿
 			
 			
 				Somoonida Tajikistan
 				soomonida Tajikistan
 				somoonida Tajikistan
-				TJS
 			
 			
 				Manaata Turkmenistan
 				manaata Turkmenistan
 				manaata Turkmenistan
-				TMT
 			
 			
 				Dinaarka Tunisiya
 				dinaarka Tunisiya
 				dinaarka Tunisiya
-				TND
 			
 			
 				Ba’angada Tonga
 				ba’angada Tonga
 				ba’angada Tonga
-				TOP
-				T$
 			
 			
 				Liirada Turkiga
 				liirada Turkiga
 				liirada Turkiga
-				TRY
-				₺
-				TL
 			
 			
 				Doolarka Tirinidad iyo Tobago
 				doolarka Tirinidad iyo Tobago
 				doolarada Tirinidad iyo Tobago
-				TTD
-				$
 			
 			
 				Doolarka Taywaanta Cusub
 				doolarka Taywaanta Cusub
 				doolarada Taywaanta Cusub
-				NT$
-				$
 			
 			
 				Shilingka Tansaaniya
 				Shilingka Tansaaniya
 				Shilingka Tansaaniya
-				TZS
 			
 			
 				Hirfiniyada Yukreeyn
 				hirfiniyada Yukreeyn
 				hirfiniyada Yukreeyn
-				UAH
-				₴
 			
 			
 				Shilingka Yugandha
 				shilingka Yugandha
 				shilingka Yugandha
-				UGX
 			
 			
 				Doolarka Mareeykanka
 				doolarka Mareeykanka
 				doolarada Mareeykanka
-				US$
-				$
 			
 			
 				Beesada Urugway
 				Beesada Urugway
 				Beesada Urugway
-				UYU
-				$
 			
 			
 				Somta Usbekistan
 				somta Usbekistan
 				somta Usbekistan
-				UZS
 			
 			
 				Bolifar Fenesuala (2008–2018)
@@ -5422,51 +4677,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Bolifarada Fenesuwela
 				Bolifarada Fenesuwela
 				Bolifarada Fenesuwela
-				VES
 			
 			
 				Dongta Fitnaam
 				dongta Fitnaam
 				dongta Fitnaam
-				₫
-				₫
 			
 			
 				Fatu Fanuatu
 				fatu Fanuatu
 				fatu Fanuatu
-				VUV
 			
 			
 				Tala Samao
 				tala Samao
 				tala Samao
-				WST
 			
 			
 				Faranka CFA ee Bartamaha Afrika
 				faranka CFA ee Bartamaha Afrika
 				faranka CFA ee Bartamaha Afrika
-				FCFA
 			
 			
 				Doolarka Iist Kaaribyan
 				doolarka Iist Kaaribyan
 				doolarada Iist Kaaribyan
-				EC$
-				$
 			
 			
 				Faranka CFA Galbeedka Afrika
 				faranka CFA Galbeedka Afrika
 				faranka CFA Galbeedka Afrika
-				CFA
 			
 			
 				Faranka CFP
 				Faranka CFP
 				Faranka CFP
-				CFPF
 			
 			
 				Lacag aan la aqoon
@@ -5477,29 +4722,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Riyaalka Yemen
 				riyaalka Yemen
 				riyaalka Yemen
-				YER
 			
 			
 				Randka Koonfur Afrika
 				randka Koonfur Afrika
 				randka Koonfur Afrika
-				ZAR
-				R
 			
 			
 				Kawajada Sambiya
 				Kawaja Sambiya
 				Kawajada Sambiya
-				ZMW
-				ZK
 			
 		
-		
-			~{0}
-			≥{0}
-			≤{0}
-			{0}–{1}
-		
 		
 			{0} maalin
 			{0} maalmood
@@ -5508,9 +4742,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		
-			
-				{0}/{1}
-			
 			
 				cadaadis dib ku riixaya
 				{0} cadaadis dib ku riixaya
@@ -5713,13 +4944,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				bitis
-				{0} bit
-				{0} bit
 			
 			
 				qarni
 				{0} qarni
-				{0} qarni
+				{0} qarniyo
+			
+			
+				rubuc qarni
+				rubuc qarni
+				{0} dec
 			
 			
 				Sannado
@@ -5752,7 +4986,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} saacadiiba
 			
 			
-				daqiiqad
 				{0} daqiiqad
 				{0} daqiiqo
 				{0} daqiiqadiiba
@@ -5789,7 +5022,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} miliambeer
 			
 			
-				ohmis
 				{0} ohm
 				{0} ohm
 			
@@ -5844,7 +5076,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} rodolo xoog
 			
 			
-				nuyuuton
 				{0} nuyuuton
 				{0} nuyuuton
 			
@@ -5868,6 +5099,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} haart
 				{0} haart
 			
+			
+				dhibco halkii sentimitir
+				dhibco halkii sentimitir
+				{0} dhibco halkii sentimitirkii
+			
+			
+				dhibco injigiiba
+				{0} dhibic injigiiba
+				{0} dhibic injigiiba
+			
 			
 				Kiilo mitir
 				{0} kiilo mitir
@@ -5964,7 +5205,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} dhibco
 			
 			
-				raadiyas qoraxeed
 				{0} raadiyas qoraxeed
 				{0} raadiyas qoraxeed
 			
@@ -6077,11 +5317,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} horasbaawar
 				{0} horasbaawar
 			
-			
-				hektobaskalis
-				{0} hektobaskal
-				{0} hektobaskal
-			
 			
 				milimitir maarkuri
 				{0} milimitir maarkuri
@@ -6107,6 +5342,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} hawada agagaarka
 				{0} hawada agagaarka
 			
+			
+				hektobaskalis
+				{0} hektobaskal
+				{0} hektobaskal
+			
 			
 				Kiilobaskalis
 				{0} kiilobaskal
@@ -6137,11 +5377,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} nott
 				{0} nott
 			
-			
-				°
-				{0}°
-				{0}°
-			
 			
 				degriis Selsiyaas
 				{0} degrii Selsiyaas
@@ -6311,13 +5546,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				{0}/{1}
-			
 			
 				cadaadis dib ku riixaya
-				{0} C
-				{0} C
+				{0} C
+				{0} C
 			
 			
 				mitir/ilbrqsi²
@@ -6349,12 +5581,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} aarkseken
 				{0} aarkseken
 			
-			
-				km²
-				{0} km²
-				{0} km²
-				{0}/km²
-			
 			
 				hektar
 				{0} hk
@@ -6362,20 +5588,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				mitir jibaaran
-				{0} m²
-				{0} m²
-				{0}/m²
-			
-			
-				cm²
-				{0} cm²
-				{0} cm²
-				{0}/cm²
 			
 			
 				meyl jibaaran
-				{0} my²
-				{0} my²
+				{0} my²
+				{0} my²
 				{0}/my²
 			
 			
@@ -6385,19 +5602,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				yaardi jibaaran
-				{0} yd²
-				{0} yd²
 			
 			
 				fiit jibaaran
-				{0} ft²
-				{0} ft²
 			
 			
 				injis²
-				{0} in²
-				{0} in²
-				{0}/in²
 			
 			
 				dunaam
@@ -6409,16 +5619,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} kr
 				{0} kr
 			
-			
-				mg/dL
-				{0} mg/dL
-				{0} mg/dL
-			
-			
-				mmol/L
-				{0} mmol/L
-				{0} mmol/L
-			
 			
 				baart/milyan
 				{0} bbm
@@ -6426,13 +5626,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				boqolkiiba
-				{0}%
-				{0}%
 			
 			
 				baarmiil
-				{0}‰
-				{0}‰
 			
 			
 				bermiraad
@@ -6446,18 +5642,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				litar/km
-				{0} L/km
-				{0} L/km
-			
-			
-				L/100km
-				{0} L/100km
-				{0} L/100km
 			
 			
 				meyl/gal
-				{0} mpg US
-				{0} mpg US
 			
 			
 				meyl/gal imb.
@@ -6471,54 +5658,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				TBeyt
-				{0} TB
-				{0} TB
 			
 			
 				Tbit
-				{0} Tb
-				{0} Tb
 			
 			
 				GBeyt
-				{0} GB
-				{0} GB
 			
 			
 				Gbit
-				{0} Gb
-				{0} Gb
 			
 			
 				MBeyt
-				{0} MB
-				{0} MB
 			
 			
 				Mbit
-				{0} Mb
-				{0} Mb
 			
 			
 				kBeyt
-				{0} kB
-				{0} kB
 			
 			
 				kbit
-				{0} kb
-				{0} kb
 			
 			
 				beyt
 				{0} beyt
 				{0} beyt
 			
-			
-				bit
-				{0} bit
-				{0} bit
-			
 			
 				q
 				{0} q
@@ -6568,8 +5734,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				milisek
-				{0} ms
-				{0} ms
 			
 			
 				mykseken
@@ -6583,28 +5747,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				ambs
-				{0} A
-				{0} A
 			
 			
 				miliambs
-				{0} mA
-				{0} mA
 			
 			
 				ohmis
-				{0} Ω
-				{0} Ω
 			
 			
 				fooltis
-				{0} V
-				{0} V
 			
 			
 				kilokalooris
-				{0} Kkal
-				{0} Kkal
+				{0} Kkal
+				{0} Kkal
 			
 			
 				kal
@@ -6618,13 +5774,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				kiilojuul
-				{0} kJ
-				{0} kJ
 			
 			
 				juules
-				{0} J
-				{0} J
 			
 			
 				KW-saacad
@@ -6651,63 +5803,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} N
 				{0} N
 			
-			
-				GHz
-				{0} GHz
-				{0} GHz
+			
+				dhsm
+				dhsm
+				{0} dhsm
 			
-			
-				MHz
-				{0} MHz
-				{0} MHz
-			
-			
-				kHz
-				{0} kHz
-				{0} kHz
-			
-			
-				Hz
-				{0} Hz
-				{0} Hz
-			
-			
-				km
-				{0} km
-				{0} km
-				{0}/km
+			
+				dhbi
+				{0} dhbi
+				{0} dhbi
 			
 			
 				m
-				{0} m
-				{0} m
-				{0}/m
 			
 			
-				dm
 				{0}dm
 				{0}dm
 			
-			
-				cm
-				{0} cm
-				{0} cm
-				{0}/cm
-			
-			
-				mm
-				{0} mm
-				{0} mm
-			
 			
 				µmitir
-				{0} µm
-				{0} µm
-			
-			
-				nm
-				{0} nm
-				{0} nm
 			
 			
 				bm
@@ -6721,20 +5835,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				yaardi
-				{0} yd
-				{0} yd
-			
-			
-				ft
-				{0} ft
-				{0} ft
-				{0}/ft
 			
 			
 				injis
-				{0} in
-				{0} in
-				{0}/in
 			
 			
 				bs
@@ -6768,50 +5871,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				raadiyas qoraxeed
-				{0} R☉
-				{0} R☉
 			
 			
 				laks
-				{0} lx
-				{0} lx
 			
 			
 				iftiinada qorraxda
 				{0} L☉
 				{0} L☉
 			
-			
-				t
-				{0} t
-				{0} t
-			
-			
-				kg
-				{0} kg
-				{0} kg
-				{0}/kg
-			
 			
 				garaam
-				{0} g
-				{0} g
-				{0}/g
-			
-			
-				mg
-				{0} mg
-				{0} mg
-			
-			
-				µg
-				{0} µg
-				{0} µg
 			
 			
 				tan
-				{0} tn
-				{0} tn
 			
 			
 				bownd
@@ -6837,8 +5910,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				dalton
-				{0} Da
-				{0} Da
 			
 			
 				cufk Dhulka
@@ -6850,41 +5921,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} CQ
 				{0} CQ
 			
-			
-				GW
-				{0} GW
-				{0} GW
-			
-			
-				MW
-				{0} MW
-				{0} MW
-			
-			
-				kW
-				{0} kW
-				{0} kW
-			
 			
 				waat
-				{0} W
-				{0} W
-			
-			
-				mW
-				{0} mW
-				{0} mW
 			
 			
 				hb
 				{0} hb
 				{0} hb
 			
-			
-				hBa
-				{0} hBa
-				{0} hBa
-			
 			
 				mmHg
 				{0} mmHg
@@ -6895,21 +5939,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} bij
 				{0} bij
 			
-			
-				inHg
-				{0} inHg
-				{0} inHg
-			
-			
-				mbar
-				{0} mbar
-				{0} mbar
-			
 			
 				ha
 				{0} ha
 				{0} ha
 			
+			
+				hBa
+				{0} hBa
+				{0} hBa
+			
 			
 				kBa
 				{0} kBa
@@ -6940,25 +5979,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} nt
 				{0} nt
 			
-			
-				°
-				{0}°
-				{0}°
-			
 			
 				deg. C
-				{0}°C
-				{0}°C
 			
 			
 				deg. F
-				{0}°F
-				{0}°F
-			
-			
-				K
-				{0} K
-				{0} K
 			
 			
 				bwd⋅ft
@@ -6970,23 +5995,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} N⋅m
 				{0} N⋅m
 			
-			
-				km³
-				{0} km³
-				{0} km³
-			
-			
-				m³
-				{0} m³
-				{0} m³
-				{0}/m³
-			
-			
-				cm³
-				{0} cm³
-				{0} cm³
-				{0}/cm³
-			
 			
 				my³
 				{0} my³
@@ -6994,28 +6002,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				yaardi³
-				{0} yd³
-				{0} yd³
 			
 			
 				fiit³
-				{0} ft³
-				{0} ft³
 			
 			
 				inji³
-				{0} in³
-				{0} in³
-			
-			
-				ML
-				{0} ML
-				{0} ML
-			
-			
-				hL
-				{0} hL
-				{0} hL
 			
 			
 				litar
@@ -7023,21 +6015,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} L
 				{0}/L
 			
-			
-				dL
-				{0} dL
-				{0} dL
-			
 			
 				sL
 				{0} sL
 				{0} sL
 			
-			
-				mL
-				{0} mL
-				{0} mL
-			
 			
 				mbt
 				{0} mbt
@@ -7087,8 +6069,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				imb. owniska dareeraha
-				{0} own dr imb.
-				{0} own dr imb.
+				{0} own dr imb.
+				{0} own dr imb.
 			
 			
 				mlqcd
@@ -7114,18 +6096,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 		
 		
-			
-				{0}/{1}
-			
 			
 				%
-				{0}%
-				{0}%
-			
-			
-				L/100km
-				{0} L/100km
-				{0} L/100km
 			
 			
 				snd
@@ -7160,7 +6132,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}d
 			
 			
-				ilbrqsi
 				{0}il
 				{0}il
 			
@@ -7170,7 +6141,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}ms
 			
 			
-				km
 				{0}km
 				{0}km
 			
@@ -7180,17 +6150,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}m
 			
 			
-				cm
 				{0}cm
 				{0}cm
 			
 			
-				mm
 				{0}mm
 				{0}mm
 			
 			
-				kg
 				{0}kg
 				{0}kg
 			
@@ -7206,8 +6173,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				°C
-				{0}°C
-				{0}°C
 			
 			
 				litar
@@ -7222,38 +6187,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}G
 			
 		
-		
-			h:mm
-		
-		
-			h:mm:ss
-		
-		
-			m:ss
-		
 	
 	
 		
-			{0}, {1}
-			{0}, {1}
 			{0} iyo {1}
 			{0} iyo {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0} ama {1}
-			{0} ama {1}
-		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} ama {1}
-			{0} ama {1}
-		
-		
-			{0}, {1}
-			{0}, {1}
 			{0} ama {1}
 			{0} ama {1}
 		
@@ -7264,26 +6204,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}, {1}
 		
 		
-			{0}, {1}
 			{0}, {1}
 			{0} & {1}
 			{0} & {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0} iyo {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -7296,7 +6225,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		{0} dhamaan
-		{0}: {1}
 		{0} — waafaqsanaanta
 		{0}— xiran
 		{0}— dheereyey
diff --git a/make/data/cldr/common/main/so_DJ.xml b/make/data/cldr/common/main/so_DJ.xml
index 6ac5e37a324..ff4929d00e4 100644
--- a/make/data/cldr/common/main/so_DJ.xml
+++ b/make/data/cldr/common/main/so_DJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/so_ET.xml b/make/data/cldr/common/main/so_ET.xml
index a9385a78f51..7be4777a16a 100644
--- a/make/data/cldr/common/main/so_ET.xml
+++ b/make/data/cldr/common/main/so_ET.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/so_KE.xml b/make/data/cldr/common/main/so_KE.xml
index 1f8daa83a63..46a88ec2681 100644
--- a/make/data/cldr/common/main/so_KE.xml
+++ b/make/data/cldr/common/main/so_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/so_SO.xml b/make/data/cldr/common/main/so_SO.xml
index 812365ffaa2..3ab9e625033 100644
--- a/make/data/cldr/common/main/so_SO.xml
+++ b/make/data/cldr/common/main/so_SO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sq.xml b/make/data/cldr/common/main/sq.xml
index 1ca727f8601..c08c83051f1 100644
--- a/make/data/cldr/common/main/sq.xml
+++ b/make/data/cldr/common/main/sq.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -415,10 +415,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			jidisht
 			jorubaisht
 			kantonezisht
+			kinezishte kantoneze
 			tamaziatishte standarde marokene
 			kinezisht
+			kinezishte mandarine
 			kinezishte e thjeshtuar
+			kinezishte mandarine (e thjeshtuar)
 			kinezishte tradicionale
+			kinezishte mandarine (tradicionale)
 			zuluisht
 			zunisht
 			nuk ka përmbajtje gjuhësore
@@ -881,8 +885,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c ç d {dh} e ë f g {gj} h i j k l {ll} m n {nj} o p q r {rr} s {sh} t {th} u v x {xh} y z {zh}]
 		[w]
 		[A B C Ç D {DH} E Ë F G {GJ} H I J K L {LL} M N {NJ} O P Q R {RR} S {SH} T {TH} U V X {XH} Y Z {ZH}]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \& # ′ ″ ~]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] § @ * / \& # ′ ″ ~]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -890,21 +894,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		… {0}
 		{0} … {1}
 		?
-		
-			[\:∶]
-		
-		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
-			[\$﹩＄$]
-			[£₤]
-			[¥￥]
-			[₩￦]
-		
-		
-			[\-‒⁻₋−➖﹣－]
-		
 	
 	
 		«
@@ -3047,6 +3036,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktobe
 			
+			
+				Kostanaj
+			
 			
 				Kizilorda
 			
@@ -4636,6 +4628,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			,
 			 
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4644,6 +4638,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 mijë
@@ -4760,11 +4759,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dirhami i Emirateve të Bashkuara Arabe
 				dirham i Emirateve të Bashkuara Arabe
 				dirhamë të Emirateve të Bashkuara Arabe
+				AED
 			
 			
 				Afgani afgan
 				afgan afgan
 				afganë afgan
+				AFN
 			
 			
 				Leku shqiptar
@@ -4776,456 +4777,604 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dramia armene
 				drami armene
 				drami armene
+				AMD
 			
 			
 				Gilderi antilian holandez
 				gilder antilian holandez
 				gilderë antilian holandez
+				ANG
 			
 			
 				Kuanza e Angolës
 				kuanzë angole
 				kuanza angole
+				AOA
+				AOA
 			
 			
 				Pesoja argjentinase
 				peso argjentinase
 				peso argjentinase
+				ARS
+				ARS
 			
 			
 				Dollari australian
 				dollar australian
 				dollarë australian
+				A$
+				AUD
 			
 			
 				Florini aruban
 				florin aruban
 				florinë aruban
+				AWG
 			
 			
 				Manata azerbajxhanase
 				manatë azerbajxhanase
 				manata azerbajxhanase
+				AZN
 			
 			
 				Marka e Bosnjë-Hercegovinës [e shkëmbyeshme]
 				markë e Bosnjë-Hercegovinës [e shkëmbyeshme]
 				marka të Bosnjë-Hercegovinës [të shkëmbyeshme]
+				BAM
+				BAM
 			
 			
 				Dollari barbadian
 				dollar barbadian
 				dollarë barbadian
+				BBD
+				BBD
 			
 			
 				Taka e Bangladeshit
 				takë bangladeshi
 				taka bangladeshi
+				BDT
+				BDT
 			
 			
 				Leva bullgare
 				levë bullgare
 				leva bullgare
+				BGN
 			
 			
 				Dinari i Bahreinit
 				dinar bahreini
 				dinarë bahreini
+				BHD
 			
 			
 				Franga burundiane
 				frangë burundiane
 				franga burundiane
+				BIF
 			
 			
 				Dollari i Bermudeve
 				dollar bermude
 				dollarë bermude
+				BMD
+				BMD
 			
 			
 				Dollari i Bruneit
 				dollar brunei
 				dollarë brunei
+				BND
+				BND
 			
 			
 				Boliviani i Bolivisë
 				bolivian i Bolivisë
 				bolivianë të Bolivisë
+				BOB
+				BOB
 			
 			
 				Reali brazilian
 				real brazilian
 				realë brazilian
+				BRL
+				BRL
 			
 			
 				Dollari i Bahamasit
 				dollar bahamez
 				dollarë bahamez
+				BSD
+				BSD
 			
 			
 				Ngultrumi butanez
 				ngultrum butanez
 				ngultrumë butanez
+				BTN
 			
 			
 				Pula botsuane
 				pulë botsuane
 				pula botsuane
+				BWP
+				BWP
 			
 			
 				Rubla bjelloruse
 				rubël bjelloruse
 				rubla bjelloruse
+				BYN
+				BYN
 			
 			
 				Rubla bjelloruse (2000–2016)
 				rubël bjelloruse (2000–2016)
 				rubla bjelloruse (2000–2016)
+				BYR
 			
 			
 				Dollari i Ishujve Belize
 				dollar belize
 				dollarë belize
+				BZD
+				BZD
 			
 			
 				Dollari kanadez
 				dollar kanadez
 				dollarë kanadez
+				CA$
+				CAD
 			
 			
 				Franga kongole
 				frangë kongole
 				franga kongole
+				CDF
 			
 			
 				Franga zvicerane
 				frangë zvicerane
 				franga zvicerane
+				CHF
 			
 			
 				Pesoja kiliane
 				peso kiliane
 				peso kiliane
+				CLP
+				CLP
 			
 			
 				Juani kinez (për treg të jashtëm)
 				juan kinez (për treg të jashtëm)
 				juanë kinez (për treg të jashtëm)
+				CNH
 			
 			
 				Juani kinez
 				juan kinez
 				juanë kinez
+				CN¥
+				CNY
 			
 			
 				Pesoja kolumbiane
 				peso kolumbiane
 				peso kolumbiane
+				COP
+				COP
 			
 			
 				Koloni kostarikan
 				kolon kostarikan
 				kolonë kostarikan
+				CRC
+				CRC
 			
 			
 				Pesoja kubaneze e shkëmbyeshme
 				peso kubaneze e shkëmbyeshme
 				peso kubaneze e shkëmbyeshme
+				CUC
+				CUC
 			
 			
 				Pesoja kubaneze
 				peso kubaneze
 				peso kubaneze
+				CUP
+				CUP
 			
 			
 				Eskudoja e Kepit të Gjelbër
 				eskudo e Kepit të Gjelbër
 				eskudo të Kepit të Gjelbër
+				CVE
 			
 			
 				Koruna e Çekisë
 				korunë çeke
 				koruna çeke
+				CZK
+				CZK
 			
 			
 				Franga xhibutiane
 				frangë xhibutiane
 				franga xhibutiane
+				DJF
 			
 			
 				Korona daneze
 				koronë daneze
 				korona daneze
+				DKK
+				DKK
 			
 			
 				Pesoja dominikane
 				peso dominikane
 				peso dominikane
+				DOP
+				DOP
 			
 			
 				Dinari algjerian
 				dinar algjerian
 				dinarë algjerian
+				DZD
 			
 			
 				Sterlina egjiptiane
 				sterlinë egjiptiane
 				sterlina egjiptiane
+				EGP
+				EGP
 			
 			
 				Nakfa e Eritresë
 				nakfë eritreje
 				nakfa eritreje
+				ERN
 			
 			
 				Bira etiopiane
 				birë etiopiane
 				bira etiopiane
+				ETB
 			
 			
 				Euroja
 				euro
 				euro
+				€
+				EUR
 			
 			
 				Dollari i Fixhit
 				dollar fixhi
 				dollarë fixhi
+				FJD
+				FJD
 			
 			
 				Stërlina e Ishujve Falkland
 				stërlinë e Ishujve Falkland
 				stërlina të Ishujve Falkland
+				FKP
+				FKP
 			
 			
 				Sterlina britanike
 				sterlinë britanike
 				sterlina britanike
+				£
+				GBP
 			
 			
 				Laria gjeorgjiane
 				lari gjeorgjian
 				lari gjeorgjiane
+				GEL
+				GEL
 			
 			
 				Sejda ganeze
 				sejdë ganeze
 				sejda ganeze
+				GHS
 			
 			
 				Sterlina e Gjibraltarit
 				sterlinë gjibraltari
 				sterlina gjibraltari
+				GIP
+				GIP
 			
 			
 				Dalasi gambian
 				dalas gambian
 				dalasë gambian
+				GMD
 			
 			
 				Franga guinease
 				frangë guineje
 				franga guineje
+				GNF
+				GNF
 			
 			
 				Kuecali i Guatemalës
 				kuecal guatemalas
 				kuecalë guatemalas
+				GTQ
+				GTQ
 			
 			
 				Dollari guajanez
 				dollar guajanez
 				dollarë guajanez
+				GYD
+				GYD
 			
 			
 				Dollari i Hong-Kongut
 				dollar hong-kongu
 				dollarë hong-kongu
+				HK$
+				HKS
 			
 			
 				Lempira hondurase
 				lempirë hondurase
 				lempira hondurase
+				HNL
+				HNL
 			
 			
 				Kuna kroate
 				kunë kroate
 				kuna kroate
+				HRK
+				HRK
 			
 			
 				Gurdi haitian
 				gurd haitian
 				gurdë haitian
+				HTG
 			
 			
 				Forinta hungareze
 				forintë hungareze
 				forinta hungareze
+				HUF
+				HUF
 			
 			
 				Rupia indoneziane
 				rupi indoneziane
 				rupi indoneziane
+				IDR
+				IDR
 			
 			
 				Shekeli izrealit
 				shekel izrealit
 				shekelë izrealit
+				₪
+				ILS
 			
 			
 				Rupia indiane
 				rupi indiane
 				rupi indiane
+				₹
+				INR
 			
 			
 				Dinari irakian
 				dinar irakian
 				dinarë irakian
+				IQD
 			
 			
 				Riali iranian
 				rial iranian
 				rialë iranian
+				IRR
 			
 			
 				Korona islandeze
 				koronë islandeze
 				korona islandeze
+				ISK
+				ISK
 			
 			
 				Dollari xhamajkan
 				dollar xhamajkan
 				dollarë xhamajkan
+				JMD
+				JMD
 			
 			
 				Dinari jordanez
 				dinar jordanez
 				dinarë jordanez
+				JOD
 			
 			
 				Jeni japonez
 				jen japonez
 				jenë japonez
+				JP¥
+				JPY
 			
 			
 				Shilinga keniane
 				shilingë keniane
 				shilinga keniane
+				KES
 			
 			
 				Soma kirgize
 				somë kirgize
 				soma kirgize
+				KGS
 			
 			
 				Riali kamboxhian
 				rial kamboxhian
 				rialë kamboxhian
+				KHR
+				KHR
 			
 			
 				Franga komore
 				frangë komore
 				franga komori
+				KMF
+				KMF
 			
 			
 				Uoni koreano-verior
 				uon koreano-verior
 				uonë koreano-verior
+				KPW
+				KPW
 			
 			
 				Uoni koreano-jugor
 				uon koreano-jugor
 				uonë koreano-jugor
+				₩
+				KRW
 			
 			
 				Dinari kuvajtian
 				dinar kuvajtian
 				dinarë kuvajtian
+				KWD
 			
 			
 				Dollari i Ishujve Kajman
 				dollar i Ishujve Kajman
 				dollarë të Ishujve Kajman
+				KYD
+				KYD
 			
 			
 				Tenga kazake
 				tengë kazake
 				tenga kazake
+				KZT
+				KZT
 			
 			
 				Kipa e Laosit
 				kipë laosi
 				kipa laosi
+				LAK
+				LAK
 			
 			
 				Sterlina libaneze
 				sterlinë libaneze
 				sterlina libaneze
+				LBP
+				LBP
 			
 			
 				Rupia e Sri-Lankës
 				rupi sri-lanke
 				rupi sri-lanke
+				LKR
+				LKR
 			
 			
 				Dollari liberian
 				dollar liberian
 				dollarë liberian
+				LRD
+				LRD
 			
 			
 				Lita lituaneze
 				litë lituaneze
 				lita lituaneze
+				LTL
 			
 			
 				Lata letoneze
 				latë letoneze
 				lata letoneze
+				LVL
 			
 			
 				Dinari libian
 				dinar libian
 				dinarë libian
+				LYD
 			
 			
 				Dirhami maroken
 				dirham maroken
 				dirhamë maroken
+				MAD
 			
 			
 				Leuja moldave
 				leu moldave
 				leu moldave
+				MDL
 			
 			
 				Arieri malagez
 				arier malagez
 				arierë malagez
+				MGA
+				MGA
 			
 			
 				Denari maqedonas
 				denar maqedonas
 				denarë maqedonas
+				MKD
 			
 			
 				Kiata e Mianmarit
 				kiatë mianmari
 				kiata mianmari
+				MMK
+				MMK
 			
 			
 				Tugrika mongole
 				tugrikë mongole
 				tugrika mongole
+				MNT
+				MNT
 			
 			
 				Pataka e Makaos
 				patakë e Makaos
 				pataka të Makaos
+				MOP
 			
 			
 				Ugija mauritane (1973–2017)
 				ugijë mauritane (1973–2017)
 				ugija mauritane (1973–2017)
+				MRO
 			
 			
 				Ugija mauritane
@@ -5236,272 +5385,358 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rupia mauritiane
 				rupi mauritiane
 				rupi mauritiane
+				MUR
+				MUR
 			
 			
 				Rufiu i Maldivit
 				rufi maldivi
 				rufi maldivi
+				MVR
 			
 			
 				Kuaça malaviane
 				kuaçë malaviane
 				kuaça malaviane
+				MWK
 			
 			
 				Pesoja meksikane
 				peso meksikane
 				peso meksikane
+				MX$
+				MXN
 			
 			
 				Ringiti malajzian
 				ringit malajzian
 				ringitë malajzian
+				MYR
+				MYR
 			
 			
 				Metikali i Mozambikut
 				metikal mozambiku
 				metikalë mozambiku
+				MZN
 			
 			
 				Dollari i Namibisë
 				dollar namibie
 				dollarë namibie
+				NAD
+				NAD
 			
 			
 				Naira nigeriane
 				nairë nigeriane
 				naira nigeriane
+				NGN
+				NGN
 			
 			
 				Kordoba nikaraguane
 				kordobë nikaraguane
 				kordoba nikaraguane
+				NIO
+				NIO
 			
 			
 				Korona norvegjeze
 				koronë norvegjeze
 				korona norvegjeze
+				NOK
+				NOK
 			
 			
 				Rupia nepaleze
 				rupi nepaleze
 				rupi nepaleze
+				NPR
+				NPR
 			
 			
 				Dollari i Zelandës së Re
 				dollar i Zelandës së Re
 				dollarë të Zelandës së Re
+				NZ$
+				NZD
 			
 			
 				Riali i Omanit
 				rial omani
 				rialë omani
+				OMR
 			
 			
 				Balboa panameze
 				balboa panameze
 				balboa panameze
+				PAB
 			
 			
 				Sola peruane
 				solë peruane
 				sola peruane
+				PEN
 			
 			
 				Kina e Guinesë së Re-Papua
 				kinë e Guinesë së Re-Papua
 				kina të Guinesë së Re-Papua
+				PGK
 			
 			
 				Pesoja filipinase
 				peso filipinase
 				peso filipinase
+				PHP
+				PHP
 			
 			
 				Rupia pakistaneze
 				rupi pakistaneze
 				rupi pakistaneze
+				PKR
+				PKR
 			
 			
 				Zllota polake
 				zllotë polake
 				zllota polake
+				PLN
+				PLN
 			
 			
 				Guarani paraguaian
 				guaran paraguaian
 				guaranë paraguaian
+				PYG
+				PYG
 			
 			
 				Riali i Katarit
 				rial katari
 				rialë katari
+				QAR
 			
 			
 				Leuja rumune
 				leu rumune
 				leu rumune
+				RON
+				RON
 			
 			
 				Dinari serb
 				dinar serb
 				dinarë serb
+				RSD
 			
 			
 				Rubla ruse
 				rubël ruse
 				rubla ruse
+				RUB
+				RUB
 			
 			
 				Franga ruandeze
 				frangë ruandeze
 				franga ruandeze
+				RWF
+				RWF
 			
 			
 				Riali saudit
 				rial saudit
 				rialë saudit
+				SAR
 			
 			
 				Dollari i Ishujve Solomonë
 				dollar i Ishujve Solomonë
 				dollarë të Ishujve Solomonë
+				SBD
+				SBD
 			
 			
 				Rupia e Ishujve Sishelë
 				rupi e Ishujve Sishelë
 				rupi të Ishujve Sishelë
+				SCR
 			
 			
 				Sterlina sudaneze
 				sterlinë sudaneze
 				sterlina sudaneze
+				SDG
 			
 			
 				Korona suedeze
 				koronë suedeze
 				korona suedeze
+				SEK
+				SEK
 			
 			
 				Dollari i Singaporit
 				dollar singapori
 				dollarë singapori
+				SGD
+				SGD
 			
 			
 				Sterlina e Ishullit të Shën-Helenës
 				sterlinë e Ishullit të Shën-Helenës
 				sterlina e Ishullit të Shën-Helenës
+				SHP
+				SHP
 			
 			
 				Leoni i Sierra-Leones
 				leon i Sierra-Leones
 				leonë të Sierra-Leones
+				SLL
 			
 			
 				Shilinga somaleze
 				shilingë somaleze
 				shilinga somaleze
+				SOS
 			
 			
 				Dollari surinamez
 				dollar surinamez
 				dollarë surinamez
+				SRD
+				SRD
 			
 			
 				Sterlina sudanezo-jugore
 				sterlinë sudanezo-jugore
 				sterlina sudanezo-jugore
+				SSP
+				SSP
 			
 			
 				Dobra e Sao-Tomes dhe Prinsipes (1977–2017)
 				dobër e Sao-Tomes dhe Prinsipes (1977–2017)
 				dobra të Sao-Tomes dhe Prinsipes (1977–2017)
+				STD
 			
 			
 				Dobra e Sao-Tomes dhe Prinsipes
 				dobër e Sao-Tomes dhe Prinsipes
 				dobra të Sao-Tomes dhe Prinsipes
+				STN
+				STN
 			
 			
 				Sterlina siriane
 				sterlinë siriane
 				sterlina siriane
+				SYP
+				SYP
 			
 			
 				Lilangeni i Suazilandës
 				lilangen suazilande
 				lilangenë suazilande
+				SZL
 			
 			
 				Bata tajlandeze
 				batë tajlandeze
 				bata tajlandeze
 				฿
+				THB
 			
 			
 				Somona taxhike
 				somonë taxhike
 				somona taxhike
+				TJS
 			
 			
 				Manata turkmene
 				manatë turkmene
 				manata turkmene
+				TMT
 			
 			
 				Dinari tunizian
 				dinar tunizian
 				dinarë tunizian
+				TND
 			
 			
 				Panga tongane
 				pangë tongane
 				panga tongane
+				TOP
+				TOP
 			
 			
 				Lira turke
 				lirë turke
 				lira turke
+				TRY
+				TRY
+				TRY
 			
 			
 				Dollari i Trinidadit dhe Tobagos
 				dollar i Trinidadit dhe Tobagos
 				dollarë të Trinidadit dhe Tobagos
+				TTD
+				TTD
 			
 			
 				Dollari tajvanez
 				dollar tajvanez
 				dollarë tajvanez
+				NT$
+				TWD
 			
 			
 				Shilinga e Tanzanisë
 				shilingë tanzanie
 				shilinga tanzanie
+				TZS
 			
 			
 				Rivnia ukrainase
 				rivni ukrainase
 				rivni ukrainase
+				UAH
+				UAH
 			
 			
 				Shilinga ugandeze
 				shilingë ugandeze
 				shilinga ugandeze
+				UGX
 			
 			
 				Dollari amerikan
 				dollar amerikan
 				dollarë amerikan
+				US$
+				USD
 			
 			
 				Pesoja uruguaiane
 				peso uruguaiane
 				peso uruguaiane
+				UYU
+				UYU
 			
 			
 				Soma uzbeke
 				somë uzbeke
 				soma uzbeke
+				UZS
 			
 			
 				Bolivari venezuelian (2008–2018)
@@ -5513,41 +5748,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Bolivari venezuelas
 				bolivar venezuelas
 				bolivarë venezuelas
+				VES
 			
 			
 				Donga vietnameze
 				dongë vietnameze
 				donga vietnameze
+				₫
+				VND
 			
 			
 				Vatuja e Vanuatusë
 				vatu vanuatuje
 				vatu vanuatuje
+				VUV
 			
 			
 				Tala samoane
 				talë samoane
 				tala samoane
+				WST
 			
 			
 				Franga kamerunase
 				frangë kamerunase
 				franga kamerunase
+				FCFA
 			
 			
 				Dollari i Karaibeve Lindore
 				dollar i Karaibeve Lindore
 				dollarë të Karaibeve Lindore
+				EC$
+				XCD
 			
 			
 				Franga e Bregut të Fildishtë
 				frangë e Bregut të Fildishtë
 				franga të Bregut të Fildishtë
+				CFA
 			
 			
 				Franga franceze e Polinezisë
 				frangë franceze e Polinezisë
 				franga franceze të Polinezisë
+				CFPF
 			
 			
 				Valutë e panjohur
@@ -5558,16 +5803,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Riali i Jemenit
 				rial jemeni
 				rialë jemeni
+				YER
 			
 			
 				Randi afrikano-jugor
 				rand afrikano-jugor
 				randë afrikano-jugor
+				ZAR
+				ZAR
 			
 			
 				Kuaça e Zambikut
 				kuaçë zambiku
 				kuaça zambiku
+				ZMW
+				ZMW
 			
 		
 		
@@ -5799,6 +6049,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} shekull
 				{0} shekuj
 			
+			
+				dekada
+				{0} dekadë
+				{0} dekada
+			
 			
 				vjet
 				{0} vit
@@ -5916,6 +6171,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} njësi termale britanike
 				{0} njësi termale britanike
 			
+			
+				njësi termale amerikane
+				{0} njësi termale amerikane
+				{0} njësi termale amerikane
+			
 			
 				paund force
 				{0} paund force
@@ -5946,6 +6206,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} herc
 				{0} herc
 			
+			
+				em tipografike
+				{0} em tipografike
+				{0} em tipografike
+			
+			
+				pikselë
+				{0} piksel
+				{0} pikselë
+			
+			
+				megapikselë
+				{0} megapiksel
+				{0} megapikselë
+			
+			
+				pikselë për centimetër
+				{0} piksel për centimetër
+				{0} pikselë për centimetër
+			
+			
+				pikselë për inç
+				{0} piksel për inç
+				{0} pikselë për inç
+			
+			
+				pika për centimetër
+				{0} pikë për centimetër
+				{0} pika për centimetër
+			
+			
+				pika për inç
+				{0} pikë për inç
+				{0} pika për inç
+			
 			
 				kilometra
 				{0} kilometër
@@ -6155,11 +6450,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kalë-fuqi
 				{0} kuaj-fuqi
 			
-			
-				hektopaskal
-				{0} hektopaskal
-				{0} hektopaskal
-			
 			
 				milimetra mërkuri
 				{0} milimetër mërkuri
@@ -6175,6 +6465,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inç merkuri
 				{0} inç merkuri
 			
+			
+				bare
+				{0} bar
+				{0} bare
+			
 			
 				milibare
 				{0} milibar
@@ -6185,6 +6480,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosferë
 				{0} atmosferë
 			
+			
+				hektopaskal
+				{0} hektopaskal
+				{0} hektopaskal
+			
 			
 				kilopaskal
 				{0} kilopaskal
@@ -6512,16 +6812,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				L/km
 				{0} L/km
@@ -6602,6 +6892,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} shek.
 				{0} shek.
 			
+			
+				dekada
+				{0} dekadë
+				{0} dekada
+			
 			
 				vjet
 				{0} vit
@@ -6709,25 +7004,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-				{0} eV
-			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-			
-			
-				N
-				{0} N
-				{0} N
+			
+				UStu
+				UStu
+				{0} UStu
 			
 			
 				GHz
@@ -6844,21 +7124,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -6913,21 +7183,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 				{0} CD
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -6958,11 +7213,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -6988,15 +7238,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/orë
@@ -7038,16 +7283,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -7163,11 +7398,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -7178,11 +7408,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 				{0} tsp
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-			
 			
 				drejtimi
 				{0} L
@@ -7368,11 +7593,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7393,6 +7613,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/orë
 				{0} km/orë
@@ -7465,12 +7690,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} ose {1}
 			{0} ose {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} dhe {1}
-			{0} dhe {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/sq_AL.xml b/make/data/cldr/common/main/sq_AL.xml
index 0a5d71593fa..7c8343c7008 100644
--- a/make/data/cldr/common/main/sq_AL.xml
+++ b/make/data/cldr/common/main/sq_AL.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sq_MK.xml b/make/data/cldr/common/main/sq_MK.xml
index dbae8b36ce2..dc1a03f3193 100644
--- a/make/data/cldr/common/main/sq_MK.xml
+++ b/make/data/cldr/common/main/sq_MK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sq_XK.xml b/make/data/cldr/common/main/sq_XK.xml
index fdc4d6d8998..51b364cf8c2 100644
--- a/make/data/cldr/common/main/sq_XK.xml
+++ b/make/data/cldr/common/main/sq_XK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sr.xml b/make/data/cldr/common/main/sr.xml
index ea2d15acf30..bf1c78ba4a8 100644
--- a/make/data/cldr/common/main/sr.xml
+++ b/make/data/cldr/common/main/sr.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -81,7 +81,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			кадо
 			карипски
 			атсам
-			ccp
 			чеченски
 			себуански
 			чига
@@ -118,7 +117,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			динка
 			зарма
 			догри
-			доњи лужичкосрпски
+			доњолужичкосрпски
 			дуала
 			средњехоландски
 			малдивски
@@ -135,9 +134,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			еламитски
 			енглески
 			енглески (Велика Британија)
-			енглески (УК)
 			енглески (Сједињене Америчке Државе)
-			енглески (САД)
 			средњеенглески
 			есперанто
 			шпански
@@ -194,7 +191,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			хмоншки
 			хири моту
 			хрватски
-			горњи лужичкосрпски
+			горњолужичкосрпски
 			хаићански
 			мађарски
 			хупа
@@ -517,12 +514,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			јидиш
 			јоруба
 			кантонски
+			кантонски кинески
 			џуаншки
 			запотечки
 			блисимболи
 			зенага
 			стандардни марокански тамазигт
 			кинески
+			мандарински кинески
 			поједностављени кинески
 			традиционални кинески
 			зулу
@@ -698,7 +697,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Источна Европа
 			Северна Европа
 			Западна Европа
-			Африка јужно од Сахаре
+			Подсахарска Африка
 			Латинска Америка
 			Острво Асенсион
 			Андора
@@ -777,7 +776,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Еритреја
 			Шпанија
 			Етиопија
-			Европска Унија
+			Европска унија
 			Еврозона
 			Финска
 			Фиџи
@@ -930,6 +929,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Свети Мартин (Холандија)
 			Сирија
 			Свазиленд
+			Свазиленд
 			Тристан да Куња
 			Острва Туркс и Каикос
 			Чад
@@ -966,8 +966,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Валис и Футуна
 			Самоа
-			XA
-			XB
 			Косово
 			Јемен
 			Мајот
@@ -1012,22 +1010,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			календар
 			формат валуте
-			Сортирање уз игнорисање симбола
-			Сортирање према обрнутим акцентима
-			Ређање према малом/великом слову
-			Сортирање према малом/великом слову
+			Сортирање уз игнорисање симбола
+			Сортирање према обрнутим акцентима
+			Ређање према малом/великом слову
+			Сортирање према малом/великом слову
 			редослед сортирања
-			Нормализовано сортирање
-			Нумеричко сортирање
-			Сортирање према јачини
+			нормализовано сортирање
+			нумеричко сортирање
+			сортирање према јачини
 			валута
 			приказивање времена (12- или 24-часовно)
 			стил прелома реда
 			систем мерних јединица
 			бројеви
-			Временска зона
-			Варијанта локалитета
-			Приватна употреба
+			Временска зона
+			Варијанта локалитета
+			Приватна употреба
 		
 		
 			будистички календар
@@ -1153,8 +1151,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б в г д ђ е ж з и ј к л љ м н њ о п р с т ћ у ф х ц ч џ ш]
 		[{а\u0302} {е\u0302} ё й {и\u0302} {о\u0302} {у\u0302} щ ъ ы ь э ю я]
 		[А Б В Г Д Ђ Е Ж З И Ј К Л Љ М Н Њ О П Р С Т Ћ У Ф Х Ц Ч Џ Ш]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] \{ \} * #]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – , ; \: ! ? . … ‘ ‚ “ „ ( ) \[ \] \{ \} * #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1166,13 +1164,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 		
 		
 			[\-‒⁻₋−➖﹣－]
@@ -1329,55 +1322,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
+						
+							h a – h a
+							h–h a
 						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+						
+							HH–HH
 						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
 						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
 						
 						
 							h:mm a – h:mm a v
@@ -1735,15 +1697,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						пре нове ере
-						BCE
 						нове ере
-						CE
 					
 					
 						п. н. е.
-						BCE
+						п. н. е.
 						н. е.
-						CE
+						н. е.
 					
 					
 						п.н.е.
@@ -1772,6 +1732,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -1855,56 +1837,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -2426,9 +2361,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				год.
-				прошле год.
-				ове год.
-				следеће год.
+				прошле год.
+				ове год.
+				следеће год.
 				
 					за {0} год.
 					за {0} год.
@@ -2442,9 +2377,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				г.
-				прошле г.
-				ове г.
-				следеће г.
+				прошле г.
+				ове г.
+				следеће г.
 				
 					за {0} г.
 					за {0} г.
@@ -2522,9 +2457,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мес.
-				прошлог мес.
-				овог мес.
-				следећег мес.
+				прошлог мес.
+				овог мес.
+				следећег мес.
 				
 					за {0} мес.
 					за {0} мес.
@@ -2538,9 +2473,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				м.
-				прошлог м.
-				овог м.
-				следећег м.
+				прошлог м.
+				овог м.
+				следећег м.
 				
 					за {0} м.
 					за {0} м.
@@ -2588,9 +2523,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				н.
-				прошле н.
-				ове н.
-				следеће н.
+				прошле н.
+				ове н.
+				следеће н.
 				
 					за {0} н.
 					за {0} н.
@@ -2724,9 +2659,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				пр. нед.
-				у нед
-				сл. нед.
+				пр. нед.
+				у нед
+				сл. нед.
 				
 					за {0} недељу
 					за {0} недеље
@@ -3557,7 +3492,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Зеленортска Острва
 			
 			
-				Кирасо
+				Курасао
 			
 			
 				Божић
@@ -3833,7 +3768,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Акутобе
 			
 			
-				Qostanay
+				Костанај
 			
 			
 				Кизилорда
@@ -5436,14 +5371,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			,
 			.
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 хиљада
@@ -5604,6 +5548,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				УАЕ дирхам
 				УАЕ дирхама
 				УАЕ дирхама
+				AED
 			
 			
 				Авганистански авгани (1927–2002)
@@ -5616,6 +5561,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				aвганистански авгани
 				авганистанска авгана
 				авганистанских авгана
+				AFN
 			
 			
 				стари албански лек
@@ -5634,18 +5580,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				јерменски драм
 				јерменска драма
 				јерменска драма
+				AMD
 			
 			
 				Холандскоантилски гулден
 				холандскоантилски гулден
 				холандскоантилска гулдена
 				холандскоантилских гулдена
+				ANG
 			
 			
 				Анголска кванза
 				анголска кванза
 				анголске кванзе
 				анголских кванзи
+				AOA
 				Kz
 			
 			
@@ -5695,6 +5644,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				аргентински пезос
 				аргентинска пезоса
 				аргентинских пезоса
+				ARS
 				$
 			
 			
@@ -5716,6 +5666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				арубански флорин
 				арубанска флорина
 				арубанских флорина
+				AWG
 			
 			
 				Азербејџански манат (1993–2006)
@@ -5728,6 +5679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				азербејџански манат
 				азербејџанска маната
 				азербејџанских маната
+				AZN
 			
 			
 				Босанско-Херцеговачки динар
@@ -5754,6 +5706,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				барбадошки долар
 				барбадошка долара
 				барбадошких долара
+				BBD
 				$
 			
 			
@@ -5761,6 +5714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бангладешка така
 				бангладешке таке
 				бангладешких така
+				BDT
 				৳
 			
 			
@@ -5798,6 +5752,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бугарски лев
 				бугарска лева
 				бугарских лева
+				BGN
 			
 			
 				Стари бугарски лев
@@ -5810,18 +5765,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бахреински динар
 				бахреинскa динара
 				бахреинских динара
+				BHD
 			
 			
 				Бурундски франак
 				бурундски франак
 				бурундска франка
 				бурундских франакa
+				BIF
 			
 			
 				Бермудски долар
 				бермудски долар
 				бермудска долара
 				бермудских долара
+				BMD
 				$
 			
 			
@@ -5829,6 +5787,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				брунејски долар
 				брунејска долара
 				брунејских долара
+				BND
 				$
 			
 			
@@ -5836,6 +5795,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				боливијски боливијано
 				боливијска боливијана
 				боливијских боливијана
+				BOB
 				Bs
 			
 			
@@ -5879,6 +5839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бразилски реал
 				бразилска реала
 				бразилских реала
+				R$
 				R$
 			
 			
@@ -5904,6 +5865,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бахамски долар
 				бахамска долара
 				бахамских долара
+				BSD
 				$
 			
 			
@@ -5911,6 +5873,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бутански нгултрум
 				бутанска нгултрума
 				бутанских нгултрума
+				BTN
 			
 			
 				Бурмански кјат
@@ -5923,6 +5886,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				боцванска пула
 				боцванске пуле
 				боцванских пула
+				BWP
 				P
 			
 			
@@ -5936,6 +5900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белоруска рубља
 				белоруске рубље
 				белоруских рубљи
+				BYN
 				р.
 			
 			
@@ -5949,6 +5914,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белиски долар
 				белиска долара
 				белиских долара
+				BZD
 				$
 			
 			
@@ -5956,6 +5922,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				канадски долар
 				канадска долара
 				канадских долара
+				CA$
 				$
 			
 			
@@ -5963,6 +5930,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				конгоански франак
 				конгоанска франка
 				конгоанских франака
+				CDF
 			
 			
 				WIR евро
@@ -6000,6 +5968,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чилеански пезос
 				чилеанска пезоса
 				чилеанских пезоса
+				CLP
 				$
 			
 			
@@ -6020,6 +5989,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кинески јуан
 				кинеска јуана
 				кинеских јуана
+				CN¥
 				¥
 			
 			
@@ -6027,6 +5997,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				колумбијски пезос
 				колумбијска пезоса
 				колумбијских пезоса
+				COP
 				$
 			
 			
@@ -6040,6 +6011,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				костарикански колон
 				костариканска колона
 				костарикански колони
+				CRC
 				₡
 			
 			
@@ -6059,6 +6031,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубански конвертибилни пезос
 				кубанска конвертибилна пезоса
 				кубанских конвертибилних пезоса
+				CUC
 				$
 			
 			
@@ -6066,6 +6039,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубански пезос
 				кубанска пезоса
 				кубанских пезоса
+				CUP
 				$
 			
 			
@@ -6073,6 +6047,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				зеленортски ескудо
 				зеленортска ескуда
 				зеленортских ескуда
+				CVE
 			
 			
 				Кипарска фунта
@@ -6085,6 +6060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чешка круна
 				чешке круне
 				чешких крунa
+				CZK
 				Kč
 			
 			
@@ -6100,10 +6076,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				немачких марака
 			
 			
-				Џибутански франак
-				џибутански франак
-				џибутанскa франкa
-				џибутанских франакa
+				Џибутски франак
+				џибутски франак
+				џибутска франка
+				џибутских франака
+				DJF
 			
 			
 				Данска круна
@@ -6118,6 +6095,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доминикански пезос
 				доминиканска пезоса
 				доминиканских пезоса
+				DOP
 				$
 			
 			
@@ -6125,6 +6103,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				алжирски динар
 				алжирска динара
 				алжирских динара
+				DZD
 			
 			
 				Еквадорски сакр
@@ -6149,6 +6128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				египатска фунта
 				египатске фунте
 				египатских фунти
+				EGP
 				E£
 			
 			
@@ -6156,6 +6136,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				еритрејска накфа
 				еритрејске накфе
 				еритрејских накфи
+				ERN
 			
 			
 				Шпанска пезета (рачун)
@@ -6180,6 +6161,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				етиопски бир
 				етиопска бира
 				етиопских бира
+				ETB
 			
 			
 				Евро
@@ -6200,6 +6182,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фиџијски долар
 				фиџијска долара
 				фиџијских долара
+				FJD
 				$
 			
 			
@@ -6207,6 +6190,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фокландска фунта
 				фокландске фунте
 				фокландских фунти
+				FKP
 				£
 			
 			
@@ -6234,6 +6218,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				грузијски лари
 				грузијска ларија
 				грузијских ларија
+				GEL
 				ლ
 				ლ
 			
@@ -6248,12 +6233,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гански седи
 				ганска седија
 				ганских седија
+				GHS
 			
 			
 				Гибралтарска фунта
 				гибралтарска фунта
 				гибралтарске фунте
 				гибралтарских фунти
+				GIP
 				£
 			
 			
@@ -6261,12 +6248,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гамбијски даласи
 				гамбијских даласија
 				гамбијских даласија
+				GMD
 			
 			
 				Гвинејски франак
 				гвинејски франак
 				гвинејска франка
 				гвинејских франака
+				GNF
 				FG
 			
 			
@@ -6292,6 +6281,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гватемалски кецал
 				гватемалска кецала
 				гватемалских кецала
+				GTQ
 				Q
 			
 			
@@ -6311,6 +6301,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гвајански долар
 				гвајанска долара
 				гвајанских долара
+				GYD
 				$
 			
 			
@@ -6318,6 +6309,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				хонгконшки долар
 				хонгконшка долара
 				хонгконшких долара
+				HK$
 				$
 			
 			
@@ -6325,6 +6317,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				хондурашка лемпира
 				хондурашке лемпире
 				хондурашких лемпира
+				HNL
 				L
 			
 			
@@ -6338,6 +6331,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				хрватска куна
 				хрватске куне
 				хрватских куна
+				HRK
 				kn
 			
 			
@@ -6345,6 +6339,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				хаићански гурд
 				хаићанска гурда
 				хаићанских гурда
+				HTG
 			
 			
 				Мађарска форинта
@@ -6359,6 +6354,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				индонежанска рупија
 				индонежанске рупије
 				индонежанских рупијa
+				IDR
 				Rp
 			
 			
@@ -6384,6 +6380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				израелски нови шекел
 				израелска нова шекела
 				израелских нових шекела
+				₪
 				₪
 			
 			
@@ -6391,6 +6388,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				индијска рупија
 				индијске рупије
 				индијских рупија
+				₹
 				₹
 			
 			
@@ -6398,12 +6396,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ирачки динар
 				ирачка динара
 				ирачких динара
+				IQD
 			
 			
 				Ирански риjал
 				ирански ријал
 				иранска ријала
 				иранских ријала
+				IRR
 			
 			
 				Стара исландска круна
@@ -6430,6 +6430,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jамајчански долар
 				jамајчанска долара
 				jамајчанскиx долара
+				JMD
 				$
 			
 			
@@ -6437,6 +6438,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				јордански динар
 				јорданскa динара
 				јорданских динара
+				JOD
 			
 			
 				Јапански јен
@@ -6451,18 +6453,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кенијски шилинг
 				кенијска шилинга
 				кенијских шилинга
+				KES
 			
 			
 				Киргистански сом
 				киргистански сом
 				киргистанска сома
 				киргистанских сома
+				KGS
 			
 			
 				Kамбоџански ријел
 				камбоџански ријел
 				камбоџанска ријела
 				камбоџанских ријела
+				KHR
 				៛
 			
 			
@@ -6470,6 +6475,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				коморски франак
 				коморскa франкa
 				коморских франакa
+				KMF
 				CF
 			
 			
@@ -6477,6 +6483,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				севернокорејски вон
 				севернокорејска вона
 				севернокорејских вона
+				KPW
 				₩
 			
 			
@@ -6504,12 +6511,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кувајтски динар
 				кувајтскa динара
 				кувајтских динара
+				KWD
 			
 			
 				Кајмански долар
 				кајмански долар
 				кајманска долара
 				кајманских долара
+				KYD
 				$
 			
 			
@@ -6517,6 +6526,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				казахстански тенге
 				казахстанска тенгеа
 				казахстанских тенгеа
+				KZT
 				₸
 			
 			
@@ -6524,6 +6534,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				лаошки кип
 				лаошка кипа
 				лаошких кипи
+				LAK
 				₭
 			
 			
@@ -6531,6 +6542,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				либанскa фунтa
 				либанскe фунтe
 				либанских фунти
+				LBP
 				L£
 			
 			
@@ -6538,6 +6550,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шриланканска рупија
 				шриланканскe рупијe
 				шриланканских рупија
+				LKR
 				Rs
 			
 			
@@ -6545,6 +6558,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				либеријски долар
 				либеријска долара
 				либеријских долара
+				LRD
 				$
 			
 			
@@ -6558,6 +6572,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				литвански литас
 				литванска литаса
 				литванских литаса
+				LTL
 			
 			
 				Литвански талонас
@@ -6588,6 +6603,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				латвијски лат
 				латвијска лата
 				латвијских лата
+				LVL
 			
 			
 				Латвијска рубља
@@ -6600,12 +6616,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				либијски динар
 				либијскa динарa
 				либијских динарa
+				LYD
 			
 			
 				Марокански дирхам
 				марокански дирхам
 				мароканска дирхама
 				мароканских дирхама
+				MAD
 			
 			
 				Марокански франак
@@ -6630,12 +6648,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				молдaвски леј
 				молдaвскa леја
 				молдaвских леја
+				MDL
 			
 			
 				Мадагаскарски ариари
 				мадагаскарски ариари
 				мадагаскарска ариарија
 				мадагаскарских ариарија
+				MGA
 				Ar
 			
 			
@@ -6648,7 +6668,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Македонски денар
 				македонски денар
 				македонска денара
-				македонских динара
+				македонских денара
+				MKD
 			
 			
 				Стари македонски денар
@@ -6667,6 +6688,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мјанмарски кјат
 				мјанмарскa кјатa
 				мјанмарских кјатa
+				MMK
 				K
 			
 			
@@ -6674,6 +6696,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				монголски тугрик
 				монголскa тугрика
 				монголских тугрика
+				MNT
 				₮
 			
 			
@@ -6681,18 +6704,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				макаоска патака
 				макаоске патаке
 				макаоских патака
+				MOP
 			
 			
 				Мауританијска oгија (1973–2017)
 				мауританијска oгија (1973–2017)
 				мауританијскe oгијe (1973–2017)
 				мауританијских oгијa (1973–2017)
+				MRO
 			
 			
-				Мауританијска oгија
-				мауританијска oгија
-				мауританијскe oгијe
-				мауританијских oгијa
+				Мауританска огија
+				мауританска огија
+				мауританске огије
+				мауританских огија
+				MRU
 			
 			
 				Малтешка лира
@@ -6711,6 +6737,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				маурицијска рупија
 				маурицијскe рупијe
 				маурицијских рупија
+				MUR
 				Rs
 			
 			
@@ -6718,18 +6745,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малдивскa руфија
 				малдивскe руфијe
 				малдивских руфија
+				MVR
 			
 			
 				Малавијска квача
 				малавијска квача
 				малавијске кваче
 				малавијских квача
+				MWK
 			
 			
 				Мексички пезос
 				мексички пезос
 				мексичка пезоса
 				мексичких пезоса
+				MX$
 				$
 			
 			
@@ -6749,6 +6779,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малезијски рингит
 				малезијска рингита
 				малезијских рингита
+				MYR
 				RM
 			
 			
@@ -6768,12 +6799,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мозамбички метикал
 				мозамбичка метикала
 				мозамбичких метикала
+				MZN
 			
 			
 				Намибијски долар
 				намибијски долар
 				намибијска долара
 				намибијских долара
+				NAD
 				$
 			
 			
@@ -6781,6 +6814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нигеријска наира
 				нигеријске наире
 				нигеријских наира
+				NGN
 				₦
 			
 			
@@ -6794,6 +6828,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				никарагванска златна кордоба
 				никарагванске златне кордобе
 				никарагванских златних кордоба
+				NIO
 				C$
 			
 			
@@ -6815,6 +6850,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				непалска рупија
 				непалске рупије
 				непалских рупија
+				NPR
 				Rs
 			
 			
@@ -6830,12 +6866,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				омански ријал
 				оманскa ријала
 				оманских ријала
+				OMR
 			
 			
 				Панамска балбоа
 				панамска балбоа
 				панамске балбое
 				панамских балбоа
+				PAB
 			
 			
 				Перуански инти
@@ -6848,6 +6886,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				перуански сол
 				перуанска сола
 				перуанских сола
+				PEN
 			
 			
 				Перуански сол (1863–1965)
@@ -6861,12 +6900,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				папуанска кина
 				папуанскe кинe
 				папуанских кинa
+				PGK
 			
 			
 				Филипински пезос
 				филипински пезос
 				филипинска пезоса
 				филипинских пезоса
+				PHP
 				₱
 			
 			
@@ -6874,6 +6915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				пакистанска рупија
 				пакистанске рупије
 				пакистанских рупија
+				PKR
 				Rs
 			
 			
@@ -6881,6 +6923,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				пољски злот
 				пољска злота
 				пољских злота
+				PLN
 				zł
 			
 			
@@ -6900,6 +6943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				парагвајски гварани
 				парагвајска гваранија
 				парагвајских гваранија
+				PYG
 				₲
 			
 			
@@ -6907,6 +6951,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				катарски ријал
 				катарска ријала
 				катарских ријала
+				QAR
 			
 			
 				Родејскидолар
@@ -6925,6 +6970,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				румунски леј
 				румунскa леја
 				румунских леја
+				RON
 				lei
 			
 			
@@ -6932,12 +6978,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				српски динар
 				српска динара
 				српских динара
+				RSD
 			
 			
 				Руска рубља
 				руска рубља
 				руске рубље
 				руских рубљи
+				RUB
 				₽
 			
 			
@@ -6951,6 +6999,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				руандски франак
 				руандскa франка
 				руандских франака
+				RWF
 				RF
 			
 			
@@ -6958,12 +7007,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				саудијски ријал
 				саудијска ријала
 				саудијских ријала
+				SAR
 			
 			
 				Соломонски долар
 				соломонски долар
 				соломонска долара
 				соломонских долара
+				SBD
 				$
 			
 			
@@ -6971,6 +7022,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сејшелска рупија
 				сејшелске рупије
 				сејшелских рупија
+				SCR
 			
 			
 				Стари судански динар
@@ -6983,6 +7035,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				суданска фунта
 				суданске фунте
 				суданских фунти
+				SDG
 			
 			
 				Стара суданска фунта
@@ -7003,13 +7056,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сингапурски долар
 				сингапурска долара
 				сингапурских долара
+				SGD
 				$
 			
 			
-				Св. јеленска фунта
-				св. јеленска фунта
-				св. јеленске фунте
-				св. јеленских фунти
+				Свете Јелене фунта
+				Свете Јелене фунта
+				Свете Јелене фунте
+				Свете Јелене фунти
+				SHP
 				£
 			
 			
@@ -7029,18 +7084,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сијералеонски леоне
 				сијералеонска леона
 				сијералеонских леона
+				SLL
 			
 			
 				Сомалијски шилинг
 				сомалијски шилинг
 				сомалијска шилинга
 				сомалијских шилинга
+				SOS
 			
 			
 				Суринамски долар
 				суринамски долар
 				суринамска долара
 				суринамских долара
+				SRD
 				$
 			
 			
@@ -7054,6 +7112,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				јужносуданска фунта
 				јужносуданскe фунтe
 				јужносуданских фунти
+				SSP
 				£
 			
 			
@@ -7061,6 +7120,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				саотомска добра (1977–2017)
 				саотомске добре (1977–2017)
 				саотомских добри (1977–2017)
+				STD
 			
 			
 				Саотомска добра
@@ -7068,6 +7128,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				саотомске добре
 				саотомских добри
 				STN
+				Db
 			
 			
 				Совјетска рубља
@@ -7086,6 +7147,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сиријска фунта
 				сиријске фунте
 				сиријских фунти
+				SYP
 				£
 			
 			
@@ -7100,6 +7162,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				тајландски бат
 				тајландска бата
 				тајландских бата
+				THB
 				฿
 			
 			
@@ -7113,6 +7176,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				таџикистански сомон
 				таџикистанска сомона
 				таџикистанских сомона
+				TJS
 			
 			
 				Туркменистански манат (1993–2009)
@@ -7125,18 +7189,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				туркменистански манат
 				туркменистанскa манатa
 				туркменистанских маната
+				TMT
 			
 			
 				Туниски динар
 				туниски динар
 				туниска динара
 				туниских динара
+				TND
 			
 			
 				Тонганска панга
 				тонганска панга
 				тонганске панге
 				тонганских панги
+				TOP
 				T$
 			
 			
@@ -7156,6 +7223,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				турска лира
 				турске лире
 				турских лира
+				TRY
 				₺
 				TL
 			
@@ -7164,6 +7232,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				тринидад-тобагошки долар
 				тринидад-тобагошка долара
 				тринидад-тобагошких долара
+				TTD
 				$
 			
 			
@@ -7171,6 +7240,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нови тајвански долар
 				нова тајванска долара
 				нових тајванских долара
+				NT$
 				NT$
 			
 			
@@ -7178,12 +7248,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				танзанијски шилинг
 				танзанијска шилинга
 				танзанијских шилинга
+				TZS
 			
 			
 				Украјинска хривња
 				украјинскa хривњa
 				украјинскe гривнe
 				украјинских хривњи
+				UAH
 				₴
 			
 			
@@ -7203,12 +7275,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				угандски шилинг
 				угандскa шилинга
 				угандских шилинга
+				UGX
 			
 			
 				Амерички долар
 				амерички долар
 				америчка долара
 				америчких долара
+				US$
 				$
 			
 			
@@ -7240,6 +7314,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				уругвајски пезос
 				уругвајска пезоса
 				уругвајских пезоса
+				UYU
 				$
 			
 			
@@ -7247,6 +7322,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				узбекистански сом
 				узбекистанска сома
 				узбекистанских сома
+				UZS
 			
 			
 				Венецуелански боливар (1871–2008)
@@ -7259,6 +7335,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венецуелански боливар (2008–2018)
 				венецуеланска боливара (2008–2018)
 				венецуеланских боливара (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -7266,6 +7343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венецуелански боливар
 				венецуеланска боливара
 				венецуеланских боливара
+				VES
 			
 			
 				Вијетнамски донг
@@ -7286,18 +7364,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				вануатски вату
 				вануатскa ватуa
 				вануатских ватуa
+				VUV
 			
 			
 				Самоанска тала
 				самоанска тала
 				самоанске тале
 				самоанских тала
+				WST
 			
 			
 				CFA франак BEAC
 				CFA франак BEAC
 				CFA франка BEAC
 				CFA франака BEAC
+				FCFA
 			
 			
 				Сребро
@@ -7340,6 +7421,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				источнокарипски долар
 				источнокарипскa доларa
 				источнокарипскиx доларa
+				EC$
 				$
 			
 			
@@ -7384,6 +7466,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP франак
 				CFP франка
 				CFP франака
+				CFPF
 			
 			
 				Платина
@@ -7420,6 +7503,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				јеменски ријал
 				јеменска ријала
 				jеменских ријала
+				YER
 			
 			
 				Југословенски тврди динар
@@ -7470,6 +7554,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				замбијска квача
 				замбијске кваче
 				замбијских квача
+				ZMW
 				ZK
 			
 			
@@ -7504,7 +7589,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			~{0}
 			≥{0}
+			≤{0}
 			{0}–{1}
 		
 		
@@ -7519,6 +7606,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ге сила
 				{0} ге сила
@@ -7662,12 +7752,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} промила
 				{0} промила
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-			
 			
 				моли
 				{0} мол
@@ -7770,6 +7854,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} века
 				{0} векова
 			
+			
+				деценије
+				{0} деценија
+				{0} дец.
+				{0} деценија
+			
 			
 				године
 				{0} година
@@ -7905,9 +7995,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Британска термална јединица
-				{0} Btu
-				{0} Btu
-				{0} Btu
+			
+			
+				US therms
+				{0} US therm
+				{0} US therms
+				{0} US therms
 			
 			
 				фунти силе
@@ -8070,12 +8163,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} лукса
 				{0} лукса
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				метричке тоне
 				{0} метричка тона
@@ -8194,12 +8281,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} коњске снаге
 				{0} коњских снага
 			
-			
-				хектопаскали
-				{0} хектопаскал
-				{0} хектопаскала
-				{0} хектопаскала
-			
 			
 				милиметри живиног стуба
 				{0} милиметар живиног стуба
@@ -8218,6 +8299,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} инча живиног стуба
 				{0} инча живиног стуба
 			
+			
+				бари
+				{0} бар
+				{0} бара
+				{0} бара
+			
 			
 				милибари
 				{0} милибар
@@ -8230,6 +8317,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфере
 				{0} атмосфера
 			
+			
+				паскали
+				{0} паскал
+				{0} паскала
+				{0} паскала
+			
+			
+				хектопаскали
+				{0} хектопаскал
+				{0} хектопаскала
+				{0} хектопаскала
+			
 			
 				килопаскали
 				{0} килопаскал
@@ -8475,6 +8574,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				ге сила
 				{0} G
@@ -8618,18 +8720,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 				{0}‰
 			
-			
-				‱
-				{0}‱
-				{0}‱
-				{0}‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
-				{0} mol
-			
 			
 				L/km
 				{0} L/km
@@ -8726,6 +8816,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} в
 				{0} в
 			
+			
+				дец.
+				{0} дец.
+				{0} дец.
+				{0} дец.
+			
 			
 				год.
 				{0} год
@@ -8859,23 +8955,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} eV
 				{0} eV
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
-				{0} Btu
-			
-			
-				lbf
-				{0} lbf
-				{0} lbf
-				{0} lbf
+			
+				US therm
+				{0} US therm
+				{0} US therms
+				{0} US therms
 			
 			
 				њутн
-				{0} N
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -8901,6 +8988,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				em
+				{0} em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+				{0} px
+			
+			
+				MP
+				{0} MP
+				{0} MP
+				{0} MP
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				km
 				{0} km
@@ -9014,24 +9143,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lx
 				{0} lx
 				{0} lx
 				{0} lx
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -9096,24 +9213,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} CD
 				{0} CD
 			
-			
-				Da
-				{0} Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				GW
 				{0} GW
@@ -9150,12 +9249,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -9174,6 +9267,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bar
+				{0} bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -9186,17 +9285,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-				{0} kPa
+			
+				Pa
+				{0} Pa
+				{0} Pa
+				{0} Pa
 			
-			
-				MPa
-				{0} MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -9246,18 +9345,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -9395,12 +9482,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				каш.
 				{0} каш.
@@ -9413,12 +9494,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кашич.
 				{0} кашич.
 			
-			
-				bbl
-				{0} bbl
-				{0} bbl
-				{0} bbl
-			
 			
 				правац
 				{0}И
@@ -9431,11 +9506,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				{0} G
 				{0} G
 				{0} G
 			
+			
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				{0}′
 				{0}′
@@ -9628,11 +9711,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кс
 				{0} кс
 			
-			
-				{0} hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -9643,6 +9721,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -9717,12 +9800,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} или {1}
 			{0} или {1}
 		
-		
-			{0}, {1}
-			{0}, {1}
-			{0} и {1}
-			{0} и {1}
-		
 		
 			{0}, {1}
 			{0}, {1}
diff --git a/make/data/cldr/common/main/sr_Cyrl.xml b/make/data/cldr/common/main/sr_Cyrl.xml
index 9dc770b30eb..fef0c0b8d2e 100644
--- a/make/data/cldr/common/main/sr_Cyrl.xml
+++ b/make/data/cldr/common/main/sr_Cyrl.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
+			
 			
-			
+			
 			
 			
 			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -672,19 +676,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
 			
 			
 			
-			
+			
 			
 			
 			
 			
-			
-			
+			
+			
 			
 			
 			
@@ -703,7 +708,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -719,7 +724,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -735,10 +740,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -750,7 +757,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -773,8 +780,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
-			
+			
 			
 			
 			
@@ -784,13 +792,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
-			
-			
+			
+			
 			
-			
+			
 			
 			
 			
@@ -798,11 +806,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -816,12 +824,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
 			
-			
+			
 			
 			
 			
@@ -908,7 +916,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kongo-Brazzaville
 			Republiken Kongo
 			Schweiz
-			Elfenbenskusten
+			Côte d’Ivoire
 			Côte d’Ivoire
 			Cooköarna
 			Chile
@@ -923,7 +931,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Julön
 			Cypern
 			Tjeckien
-			CZ
+			Tjeckien
 			Tyskland
 			Diego Garcia
 			Djibouti
@@ -944,6 +952,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Finland
 			Fiji
 			Falklandsöarna
+			Falklandsöarna
 			Mikronesien
 			Färöarna
 			Frankrike
@@ -1091,6 +1100,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Syrien
 			Swaziland
+			Eswatini
 			Tristan da Cunha
 			Turks- och Caicosöarna
 			Tchad
@@ -1127,8 +1137,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis- och Futunaöarna
 			Samoa
-			fejkade accenter (för test)
-			fejkad bidi (för test)
+			fejkade accenter (för test)
+			fejkad bidi (för test)
 			Kosovo
 			Jemen
 			Mayotte
@@ -1145,11 +1155,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			1694 års stavning
 			1959 års stavning
 			1943 års stavning
+			akapuem (twi)
 			1997 års ALA-LC
 			Aluku-dialekt
 			stavning enligt 1990 års överenskommelse
+			aranesiska (occitanska)
 			östarmeniska
 			västarmeniska
+			asante (twi)
+			auvergniska (occitanska)
 			1926 års stavning
 			balanka-dialekt
 			barlavento-dialekt
@@ -1159,14 +1173,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Bila-dialekt
 			Bohorič-alfabetet
 			boontling
+			cisalpinska (occitanska)
 			stavning enligt 1945 års konvention mellan Portugal och Brasilien
 			kornisk engelska
+			croissant-occitanska
 			Dajnko-alfabetet
 			ekavisk dialekt
 			tidig modern engelska
 			internationell fonetisk notation - IPA
+			Kirshenbaums fonetiska alfabet
+			nordamerikanskt fonetiskt alfabet
 			uralisk fonetisk notation
 			X-SAMPA fonetisk notation
+			Gascogne-occitanska
+			klassisk occitanska
+			italiensk-inspirerad occitanska
+			Mistral-occitanska
 			Hepburn
 			högnorsk dialekt
 			h-system
@@ -1179,6 +1201,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			kociewiska
 			standardstavning
 			laukika-dialekt
+			Limousin-occitanska
+			languedociska
 			Lipovaz-dialekt
 			1918 års stavning
 			Metelko-alfabetet
@@ -1186,6 +1210,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Ndyuka-dialekt
 			natisonsk dialekt
 			Newfoundland-engelska
+			Nice-occitanska
 			Njiva-dialekt
 			nulik-stavning
 			Osojane-dialekt
@@ -1198,6 +1223,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			pinyin
 			polytonisk stavning
 			Posix
+			provensalska
 			puter-dialekt
 			reformerad stavning
 			klassisk volapük
@@ -1221,27 +1247,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			vedisk dialekt
 			valensisk dialekt
 			vallader-dialekt
+			vivaroalpinska (occitanska)
 			Wade-Giles
 			x-system
 		
 		
 			kalender
 			valutaformat
-			Ignorera symboler vid sortering
-			Sortera accenter omvänt
-			Ordna efter versaler/gemener
-			Skiftlägeskänslig sortering
+			Ignorera symboler vid sortering
+			Sortera accenter omvänt
+			Ordna efter versaler/gemener
+			Skiftlägeskänslig sortering
 			sorteringsordning
-			Normaliserad sortering
-			Numerisk sortering
-			Sorteringsstyrka
+			Normaliserad sortering
+			Numerisk sortering
+			Sorteringsstyrka
 			valuta
 			12- eller 24-timmarsklocka
 			radbrytningstyp
 			enhetssystem
 			siffror
-			Tidszon
-			Språkvariant
+			Tidszon
+			Språkvariant
 			privat
 		
 		
@@ -1428,7 +1455,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[á â ã ā ç è ë í î ï ī ñ ó ú ÿ ü æ ø]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]
 		[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1440,16 +1467,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
-			[£₤]
-			[¥￥]
-			[₩￦]
-		
-		
-			[\-‒⁻₋−➖﹣－]
 		
 	
 	
@@ -1465,20 +1483,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						Buddhistisk era
 					
+					
+						BE
+					
+					
+						BE
+					
 				
 				
 					
 						MMMM y G
 					
 					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
+						
+							h:mm–h:mm a v
 						
 					
 				
@@ -1570,13 +1588,76 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						
-							h B – h B
-						
-					
-				
+			
+			
+				
+					
+						
+							
+								jia-zi
+								yi-chou
+								bing-yin
+								ding-mao
+								wu-chen
+								ji-si
+								geng-wu
+								xin-wei
+								ren-shen
+								gui-you
+								jia-xu
+								yi-hai
+								bing-zi
+								ding-chou
+								wu-yin
+								ji-mao
+								geng-chen
+								xin-si
+								ren-wu
+								gui-wei
+								jia-shen
+								yi-you
+								bing-xu
+								ding-hai
+								wu-zi
+								ji-chou
+								geng-yin
+								xin-mao
+								ren-chen
+								gui-si
+								jia-wu
+								yi-wei
+								bing-shen
+								ding-you
+								wu-xu
+								ji-hai
+								geng-zi
+								xin-chou
+								ren-yin
+								gui-mao
+								jia-chen
+								yi-si
+								bing-wu
+								ding-wei
+								wu-shen
+								ji-you
+								geng-xu
+								xin-hai
+								ren-zi
+								gui-chou
+								jia-yin
+								yi-mao
+								bing-chen
+								ding-si
+								wu-wu
+								ji-wei
+								geng-shen
+								xin-you
+								ren-xu
+								gui-hai
+							
+						
+					
+				
 			
 			
 				
@@ -1740,25 +1821,73 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
-							h – h B
+							h – h B
 						
 						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
+							h:mm – h:mm B
+							h:mm – h:mm B
 						
 						
 							d–d
 						
+						
+							y – y G
+						
+						
+							y-MM-dd, E – y-MM-dd, E GGGGG
+							y-MM-dd, E GGGG – y-MM-dd, E GGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y G – MMM y
+						
+						
+							d–d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y G – d MMM d y
+						
+						
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
 						
 							HH:mm – HH:mm
 							HH:mm – HH:mm
 						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							HH:mm – HH:mm v
 							HH:mm – HH:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
+						
 						
 							M–M
 						
@@ -2132,6 +2261,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d MMM y
 						
 					
+					
+						
+							y-MM-dd
+						
+					
 				
 				
 					
@@ -2142,16 +2276,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
+							HH:mm:ss z
 							HH.mm.ss z
 						
 					
 					
 						
+							HH:mm:ss
 							HH.mm.ss
 						
 					
 					
 						
+							HH:mm
 							HH.mm
 						
 					
@@ -2237,11 +2374,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -2249,42 +2384,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d–d
 						
 						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							y G – y G
+							y–y G
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d–d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y G – d MMM y
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							d MMM y G, E – d MMM, E
+							d MMM y G, E – d MMM y G, E
+							d MMM y G, E – d MMM, E
+							d MMM y G, E – d MMM y, E
 						
 						
 							h a – h a
@@ -2453,15 +2571,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						Anno Mundi
 					
+					
+						AM
+					
+					
+						AM
+					
 				
 				
 					
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -2582,81 +2704,276 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						efter Hirja
 					
+					
+						AH
+					
+					
+						AH
+					
 				
-				
-					
-						
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-					
-				
 			
 			
 				
 					
+						Taika (645–650)
+						Hakuchi (650–671)
+						Hakuhō (672–686)
+						Shuchō (686–701)
+						Taihō (701–704)
+						Keiun (704–708)
+						Wadō (708–715)
+						Reiki (715–717)
+						Yōrō (717–724)
+						Jinki (724–729)
 						Tempyō (729–749)
 						Tempyō-kampō (749–749)
 						Tempyō-shōhō (749–757)
 						Tempyō-hōji (757–765)
 						Temphō-jingo (765–767)
+						Jingo-keiun (767–770)
+						Hōki (770–780)
+						Ten-ō (781–782)
+						Enryaku (782–806)
+						Daidō (806–810)
+						Kōnin (810–824)
+						Tenchō (824–834)
+						Jōwa (834–848)
+						Kajō (848–851)
+						Ninju (851–854)
 						Saiko (854–857)
 						Tennan (857–859)
+						Jōgan (859–877)
 						Genkei (877–885)
+						Ninna (885–889)
 						Kampyō (889–898)
+						Shōtai (898–901)
+						Engi (901–923)
+						Enchō (923–931)
 						Shōhei (931–938)
+						Tengyō (938–947)
+						Tenryaku (947–957)
+						Tentoku (957–961)
+						Ōwa (961–964)
+						Kōhō (964–968)
+						Anna (968–970)
+						Tenroku (970–973)
 						Ten-en (973–976)
+						Jōgen (976–978)
+						Tengen (978–983)
+						Eikan (983–985)
+						Kanna (985–987)
 						Ei-en (987–989)
+						Eiso (989–990)
+						Shōryaku (990–995)
+						Chōtoku (995–999)
+						Chōhō (999–1004)
+						Kankō (1004–1012)
+						Chōwa (1012–1017)
+						Kannin (1017–1021)
+						Jian (1021–1024)
+						Manju (1024–1028)
+						Chōgen (1028–1037)
+						Chōryaku (1037–1040)
+						Chōkyū (1040–1044)
+						Kantoku (1044–1046)
+						Eishō (1046–1053)
+						Tengi (1053–1058)
+						Kōhei (1058–1065)
+						Jiryaku (1065–1069)
+						Enkyū (1069–1074)
+						Shōho (1074–1077)
+						Shōryaku (1077–1081)
 						Eiho (1081–1084)
+						Ōtoku (1084–1087)
+						Kanji (1087–1094)
 						Kaho (1094–1096)
+						Eichō (1096–1097)
 						Shōtoku (1097–1099)
+						Kōwa (1099–1104)
+						Chōji (1104–1106)
+						Kashō (1106–1108)
+						Tennin (1108–1110)
+						Ten-ei (1110–1113)
+						Eikyū (1113–1118)
 						Gen-ei (1118–1120)
 						Hoan (1120–1124)
+						Tenji (1124–1126)
+						Daiji (1126–1131)
+						Tenshō (1131–1132)
+						Chōshō (1132–1135)
 						Hoen (1135–1141)
+						Eiji (1141–1142)
+						Kōji (1142–1144)
 						Tenyō (1144–1145)
+						Kyūan (1145–1151)
+						Ninpei (1151–1154)
+						Kyūju (1154–1156)
 						Hogen (1156–1159)
+						Heiji (1159–1160)
+						Eiryaku (1160–1161)
+						Ōho (1161–1163)
+						Chōkan (1163–1165)
+						Eiman (1165–1166)
 						Nin-an (1166–1169)
+						Kaō (1169–1171)
+						Shōan (1171–1175)
+						Angen (1175–1177)
+						Jishō (1177–1181)
+						Yōwa (1181–1182)
+						Juei (1182–1184)
 						Genryuku (1184–1185)
+						Bunji (1185–1190)
+						Kenkyū (1190–1199)
+						Shōji (1199–1201)
+						Kennin (1201–1204)
+						Genkyū (1204–1206)
 						Ken-ei (1206–1207)
 						Shōgen (1207–1211)
+						Kenryaku (1211–1213)
+						Kenpō (1213–1219)
 						Shōkyū (1219–1222)
+						Jōō (1222–1224)
+						Gennin (1224–1225)
+						Karoku (1225–1227)
+						Antei (1227–1229)
+						Kanki (1229–1232)
+						Jōei (1232–1233)
 						Tempuku (1233–1234)
+						Bunryaku (1234–1235)
+						Katei (1235–1238)
+						Ryakunin (1238–1239)
 						En-ō (1239–1240)
+						Ninji (1240–1243)
+						Kangen (1243–1247)
+						Hōji (1247–1249)
+						Kenchō (1249–1256)
+						Kōgen (1256–1257)
+						Shōka (1257–1259)
+						Shōgen (1259–1260)
 						Bun-ō (1260–1261)
+						Kōchō (1261–1264)
 						Bun-ei (1264–1275)
+						Kenji (1275–1278)
+						Kōan (1278–1288)
+						Shōō (1288–1293)
+						Einin (1293–1299)
+						Shōan (1299–1302)
+						Kengen (1302–1303)
+						Kagen (1303–1306)
+						Tokuji (1306–1308)
 						Enkei (1308–1311)
+						Ōchō (1311–1312)
+						Shōwa (1312–1317)
+						Bunpō (1317–1319)
+						Genō (1319–1321)
 						Genkyō (1321–1324)
+						Shōchū (1324–1326)
 						Kareki (1326–1329)
+						Gentoku (1329–1331)
+						Genkō (1331–1334)
 						Kemmu (1334–1336)
+						Engen (1336–1340)
+						Kōkoku (1340–1346)
+						Shōhei (1346–1370)
+						Kentoku (1370–1372)
+						Bunchū (1372–1375)
+						Tenju (1375–1379)
+						Kōryaku (1379–1381)
+						Kōwa (1381–1384)
+						Genchū (1384–1392)
+						Meitoku (1384–1387)
+						Kakei (1387–1389)
+						Kōō (1389–1390)
+						Meitoku (1390–1394)
+						Ōei (1394–1428)
+						Shōchō (1428–1429)
+						Eikyō (1429–1441)
+						Kakitsu (1441–1444)
 						Bun-an (1444–1449)
+						Hōtoku (1449–1452)
+						Kyōtoku (1452–1455)
+						Kōshō (1455–1457)
+						Chōroku (1457–1460)
+						Kanshō (1460–1466)
+						Bunshō (1466–1467)
+						Ōnin (1467–1469)
+						Bunmei (1469–1487)
+						Chōkyō (1487–1489)
+						Entoku (1489–1492)
+						Meiō (1492–1501)
+						Bunki (1501–1504)
+						Eishō (1504–1521)
+						Taiei (1521–1528)
+						Kyōroku (1528–1532)
 						Tenmon (1532–1555)
+						Kōji (1555–1558)
+						Eiroku (1558–1570)
+						Genki (1570–1573)
+						Tenshō (1573–1592)
+						Bunroku (1592–1596)
+						Keichō (1596–1615)
 						Genwa (1615–1624)
 						Kan-ei (1624–1644)
+						Shōho (1644–1648)
+						Keian (1648–1652)
 						Shōō (1652–1655)
 						Meiryaku (1655–1658)
+						Manji (1658–1661)
+						Kanbun (1661–1673)
+						Enpō (1673–1681)
 						Tenwa (1681–1684)
+						Jōkyō (1684–1688)
+						Genroku (1688–1704)
+						Hōei (1704–1711)
+						Shōtoku (1711–1716)
+						Kyōhō (1716–1736)
+						Genbun (1736–1741)
+						Kanpō (1741–1744)
+						Enkyō (1744–1748)
 						Kan-en (1748–1751)
 						Hōryaku (1751–1764)
+						Meiwa (1764–1772)
 						An-ei (1772–1781)
+						Tenmei (1781–1789)
+						Kansei (1789–1801)
+						Kyōwa (1801–1804)
+						Bunka (1804–1818)
+						Bunsei (1818–1830)
+						Tenpō (1830–1844)
+						Kōka (1844–1848)
+						Kaei (1848–1854)
+						Ansei (1854–1860)
 						Man-en (1860–1861)
+						Bunkyū (1861–1864)
+						Genji (1864–1865)
+						Keiō (1865–1868)
+						Meiji
+						Taishō
+						Shōwa
+						Heisei
 					
 				
 				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 				
 			
 			
@@ -2726,20 +3043,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						Anno Persarum
 					
+					
+						AP
+					
+					
+						AP
+					
 				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-					
-				
 			
 			
 				
@@ -3089,9 +3399,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				mån. förra veckan
-				mån. denna vecka
-				mån. nästa vecka
 				
 					+{0} må.
 					+{0} må.
@@ -5723,15 +6030,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			٫
 			 
+			؛
+			٪؜
+			؜+
 			؜−
 			×۱۰^
+			×
 			؉‏
+			∞
+			:
 		
 		
 			,
 			 
+			؛
+			٪
+			‎+‎
 			‎−‎
+			×۱۰^
+			×
+			؉
+			∞
 			:
 		
 		
@@ -5740,7 +6061,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			,
 			 
+			;
 			%
+			+
 			−
 			×10^
 			×
@@ -5751,6 +6074,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 tusen
@@ -5872,6 +6200,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Förenade Arabemiratens dirham
 				Förenade Arabemiratens dirham
 				Förenade Arabemiratens dirham
+				AED
 			
 			
 				afghani (1927–2002)
@@ -5882,6 +6211,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				afghansk afghani
 				afghansk afghani
 				afghanska afghani
+				AFN
 			
 			
 				albansk lek (1946–1965)
@@ -5892,21 +6222,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				albansk lek
 				albansk lek
 				albanska leke
+				ALL
 			
 			
 				armenisk dram
 				armenisk dram
 				armeniska dram
+				AMD
 			
 			
 				Nederländska Antillernas gulden
 				Nederländska Antillernas gulden
 				Nederländska Antillernas gulden
+				ANG
 			
 			
 				angolansk kwanza
 				angolansk kwanza
 				angolanska kwanza
+				AOA
 				Kz
 			
 			
@@ -5930,14 +6264,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinska australer
 			
 			
-				argentisk peso (1970–1983)
-				argentisk peso (1970–1983)
-				argentiska pesos (1970–1983)
+				argentisk peso (1970–1983)
+				argentisk peso (1970–1983)
+				argentiska pesos (1970–1983)
 			
 			
-				argentisk peso (1881–1969)
-				argentisk peso (1881–1969)
-				argentiska pesos (1881–1969)
+				argentisk peso (1881–1969)
+				argentisk peso (1881–1969)
+				argentiska pesos (1881–1969)
 			
 			
 				argentinsk peso (1983–1985)
@@ -5948,6 +6282,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				argentinsk peso
 				argentinsk peso
 				argentinska pesos
+				ARS
 				$
 			
 			
@@ -5966,6 +6301,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				arubansk florin
 				arubansk florin
 				arubanska floriner
+				AWG
 			
 			
 				azerbajdzjansk manat (1993–2006)
@@ -5976,22 +6312,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				azerbajdzjansk manat
 				azerbajdzjansk manat
 				azerbajdzjanska manat
+				AZN
 			
 			
 				bosnisk-hercegovinsk dinar (1992–1994)
 				bosnisk-hercegovinsk dinar (1992–1994)
 				bosnisk-hercegovinska dinarer (1992–1994)
+				BAD
 			
 			
 				bosnisk-hercegovinsk mark (konvertibel)
 				bosnisk-hercegovinsk mark (konvertibel)
 				bosnisk-hercegovinska mark (konvertibla)
+				BAM
 				KM
 			
 			
-				bosnisk-hercegovinsk dinar (1994–1998)
-				bosnisk-hercegovinsk dinar (1994–1998)
-				bosnisk-hercegovinska dinarer (1994–1998)
+				bosnisk-hercegovinsk dinar (1994–1998)
+				bosnisk-hercegovinsk dinar (1994–1998)
+				bosnisk-hercegovinska dinarer (1994–1998)
 			
 			
 				Barbados-dollar
@@ -6004,6 +6343,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bangladeshisk taka
 				bangladeshisk taka
 				bangladeshiska taka
+				BDT
 				৳
 			
 			
@@ -6022,34 +6362,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				belgiska franc (finansiella)
 			
 			
-				bulgarisk hård lev (1962–1999)
-				bulgarisk hård lev (1962–1999)
-				bulgariska hård lev (1962–1999)
+				bulgarisk hård lev (1962–1999)
+				bulgarisk hård lev (1962–1999)
+				bulgariska hårda lev (1962–1999)
 			
 			
-				bulgarisk lev (1952–1962)
-				bulgarisk lev (1952–1962)
-				bulgariska lev (1952–1962)
+				bulgarisk lev (1952–1962)
+				bulgarisk lev (1952–1962)
+				bulgariska lev (1952–1962)
 			
 			
 				bulgarisk lev
 				bulgarisk lev
 				bulgariska leva
+				BGN
 			
 			
-				bulgarisk lev (1881–1952)
-				bulgarisk lev (1881–1952)
-				bulgarisk lev (1881–1952)
+				bulgarisk lev (1881–1952)
+				bulgarisk lev (1881–1952)
+				bulgarisk lev (1881–1952)
 			
 			
 				bahrainsk dinar
 				bahrainsk dinar
 				bahrainska dinarer
+				BHD
 			
 			
 				burundisk franc
 				burundisk franc
 				burundiska franc
+				BIF
 			
 			
 				Bermuda-dollar
@@ -6062,18 +6405,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bruneisk dollar
 				bruneisk dollar
 				bruneiska dollar
+				BND
 				$
 			
 			
 				boliviansk boliviano
 				boliviansk boliviano
 				bolivianska bolivianos
+				BOB
 				Bs
 			
 			
-				boliviansk boliviano (1864–1963)
-				boliviansk boliviano (1864–1963)
-				bolivianska bolivianos (1864–1963)
+				boliviansk boliviano (1864–1963)
+				boliviansk boliviano (1864–1963)
+				bolivianska bolivianos (1864–1963)
 			
 			
 				boliviansk peso
@@ -6118,9 +6463,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				brasilianska cruzeiros
 			
 			
-				brasiliansk cruzeiro (1942–1967)
-				brasiliansk cruzeiro (1942–1967)
-				brasilianska cruzeiros (1942–1967)
+				brasiliansk cruzeiro (1942–1967)
+				brasiliansk cruzeiro (1942–1967)
+				brasilianska cruzeiros (1942–1967)
 			
 			
 				bahamansk dollar
@@ -6133,6 +6478,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				bhutanesisk ngultrum
 				bhutanesisk ngultrum
 				bhutanesiska ngultrum
+				BTN
 			
 			
 				burmesisk kyat
@@ -6143,6 +6489,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				botswansk pula
 				botswansk pula
 				botswanska pula
+				BWP
 				P
 			
 			
@@ -6154,12 +6501,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				vitrysk rubel
 				vitrysk rubel
 				vitryska rubel
+				BYN
 				р.
 			
 			
 				vitrysk rubel (2000–2016)
 				vitrysk rubel (2000–2016)
 				vitryska rubel (2000–2016)
+				BYR
 			
 			
 				belizisk dollar
@@ -6179,6 +6528,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kongolesisk franc
 				kongolesisk franc
 				kongolesiska franc
+				CDF
 			
 			
 				euro (konvertibelt konto, WIR Bank, Schweiz)
@@ -6189,6 +6539,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				schweizisk franc
 				schweizisk franc
 				schweiziska franc
+				CHF
 			
 			
 				franc (konvertibelt konto, WIR Bank, Schweiz)
@@ -6196,9 +6547,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				franc (konvertibelt konto, WIR Bank, Schweiz)
 			
 			
-				chilensk escudo (1960–1975)
-				chilensk escudo (1960–1975)
-				chilenska escudos (1960–1975)
+				chilensk escudo (1960–1975)
+				chilensk escudo (1960–1975)
+				chilenska escudos (1960–1975)
 			
 			
 				chilensk unidad de fomento
@@ -6209,17 +6560,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				chilensk peso
 				chilensk peso
 				chilenska pesos
+				CLP
 				$
 			
 			
-				CNH
-				CNH
+				kinesisk yuan (offshore)
+				kinesisk yuan (offshore)
 				CNH
 			
 			
 				kinesisk dollar
 				kinesisk dollar
 				kinesiska dollar
+				CNX
 			
 			
 				kinesisk yuan
@@ -6232,6 +6585,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				colombiansk peso
 				colombiansk peso
 				colombianska pesos
+				COP
 				$
 			
 			
@@ -6243,6 +6597,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				costarikansk colón
 				costarikansk colón
 				costarikanska colón
+				CRC
 				₡
 			
 			
@@ -6259,28 +6614,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kubansk peso (konvertibel)
 				kubansk peso (konvertibel)
 				kubanska pesos (konvertibla)
+				CUC
 				$
 			
 			
 				kubansk peso
 				kubansk peso
 				kubanska pesos
+				CUP
 				$
 			
 			
 				kapverdisk escudo
 				kapverdisk escudo
 				kapverdiska escudos
+				CVE
 			
 			
 				cypriotiskt pund
 				cypriotiskt pund
 				cypriotiska pund
+				CYP
 			
 			
 				tjeckisk koruna
 				tjeckisk koruna
 				tjeckiska koruna
+				CZK
 				Kč
 			
 			
@@ -6297,6 +6657,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				djiboutisk franc
 				djiboutisk franc
 				djiboutiska franc
+				DJF
 			
 			
 				dansk krona
@@ -6316,6 +6677,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				algerisk dinar
 				algerisk dinar
 				algeriska dinarer
+				DZD
 			
 			
 				ecuadoriansk sucre
@@ -6344,6 +6706,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				eritreansk nakfa
 				eritreansk nakfa
 				eritreanska nakfa
+				ERN
 			
 			
 				spansk peseta (konto)
@@ -6365,11 +6728,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				etiopisk birr
 				etiopisk birr
 				etiopiska birr
+				ETB
 			
 			
 				euro
 				euro
 				euro
+				€
 				€
 			
 			
@@ -6381,12 +6746,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fijidollar
 				Fijidollar
 				Fijidollar
+				FJD
 				$
 			
 			
 				Falklandspund
 				Falklandspund
 				Falklandspund
+				FKP
 				£
 			
 			
@@ -6410,6 +6777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				georgisk lari
 				georgisk lari
 				georgiska lari
+				GEL
 				₾
 				₾
 			
@@ -6422,22 +6790,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ghanansk cedi
 				ghanansk cedi
 				ghananska cedi
+				GHS
 			
 			
 				gibraltiskt pund
 				gibraltiskt pund
 				gibraltiska pund
+				GIP
 				£
 			
 			
 				gambisk dalasi
 				gambisk dalasi
 				gambiska dalasi
+				GMD
 			
 			
 				guineansk franc
 				guineansk franc
 				guineanska franc
+				GNF
 				FG
 			
 			
@@ -6459,6 +6831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				guatemalansk quetzal
 				guatemalansk quetzal
 				guatemalanska quetzal
+				GTQ
 				Q
 			
 			
@@ -6475,6 +6848,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guyanadollar
 				Guyanadollar
 				Guyanadollar
+				GYD
 				$
 			
 			
@@ -6488,6 +6862,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				honduransk lempira
 				honduransk lempira
 				honduranska lempira
+				HNL
 				L
 			
 			
@@ -6499,23 +6874,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kroatisk kuna
 				kroatisk kuna
 				kroatiska kunor
+				HRK
 				kn
 			
 			
 				haitisk gourde
 				haitisk gourde
 				haitiska gourder
+				HTG
 			
 			
 				ungersk forint
 				ungersk forint
 				ungerska forinter
+				HUF
 				Ft
 			
 			
 				indonesisk rupie
 				indonesisk rupie
 				indonesiska rupier
+				IDR
+				Rp
 			
 			
 				irländskt pund
@@ -6537,6 +6917,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				israelisk ny shekel
 				israelisk ny shekel
 				israeliska nya shekel
+				₪
 				₪
 			
 			
@@ -6550,16 +6931,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				irakisk dinar
 				irakisk dinar
 				irakiska dinarer
+				IQD
 			
 			
 				iransk rial
 				iransk rial
 				iranska rial
+				IRR
 			
 			
 				isländsk gammal krona
 				isländsk gammal krona
 				isländska kronor (1874–1981)
+				ISJ
 			
 			
 				isländsk krona
@@ -6572,6 +6956,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				italiensk lire
 				italiensk lire
 				italienska lire
+				ITL
 			
 			
 				Jamaica-dollar
@@ -6584,6 +6969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jordansk dinar
 				jordansk dinar
 				jordanska dinarer
+				JOD
 			
 			
 				japansk yen
@@ -6596,39 +6982,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kenyansk shilling
 				kenyansk shilling
 				kenyanska shilling
+				KES
 			
 			
 				kirgizisk som
 				kirgizisk som
 				kirgiziska somer
+				KGS
 			
 			
 				kambodjansk riel
 				kambodjansk riel
 				kambodjanska riel
+				KHR
 				៛
 			
 			
 				komorisk franc
 				komorisk franc
 				komoriska franc
+				KMF
 				CF
 			
 			
 				nordkoreansk won
 				nordkoreansk won
 				nordkoreanska won
+				KPW
 				₩
 			
 			
-				sydkoreansk hwan (1953–1962)
-				sydkoreansk hwan (1953–1962)
-				sydkoreanska hwan (1953–1962)
+				sydkoreansk hwan (1953–1962)
+				sydkoreansk hwan (1953–1962)
+				sydkoreanska hwan (1953–1962)
 			
 			
-				sydkoreansk won (1945–1953)
-				sydkoreansk won (1945–1953)
-				sydkoreanska won (1945–1953)
+				sydkoreansk won (1945–1953)
+				sydkoreansk won (1945–1953)
+				sydkoreanska won (1945–1953)
 			
 			
 				sydkoreansk won
@@ -6641,41 +7032,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kuwaitisk dinar
 				kuwaitisk dinar
 				kuwaitiska dinarer
+				KWD
 			
 			
 				Cayman-dollar
 				Cayman-dollar
 				Cayman-dollar
+				KYD
 				$
 			
 			
 				kazakisk tenge
 				kazakisk tenge
 				kazakiska tenge
+				KZT
 				₸
 			
 			
 				laotisk kip
 				laotisk kip
 				laotiska kip
+				LAK
 				₭
 			
 			
 				libanesiskt pund
 				libanesiskt pund
 				libanesiska pund
+				LBP
 				L£
 			
 			
 				srilankesisk rupie
 				srilankesisk rupie
 				srilankesiska rupier
+				LKR
 				Rs
 			
 			
 				liberiansk dollar
 				liberiansk dollar
 				liberianska dollar
+				LRD
 				$
 			
 			
@@ -6712,6 +7110,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lettisk lats
 				lettisk lats
 				lettiska lati
+				LVL
 			
 			
 				lettisk rubel
@@ -6722,11 +7121,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				libysk dinar
 				libysk dinar
 				libyska dinarer
+				LYD
 			
 			
 				marockansk dirham
 				marockansk dirham
 				marockanska dirhamer
+				MAD
 			
 			
 				marockansk franc
@@ -6734,24 +7135,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				marockanska franc
 			
 			
-				monegaskisk franc (–2001)
-				monegaskisk franc (–2001)
-				monegaskiska franc (–2001)
+				monegaskisk franc (–2001)
+				monegaskisk franc (–2001)
+				monegaskiska franc (–2001)
 			
 			
-				moldavisk cupon (1992–1993)
-				moldavisk cupon (1992–1993)
-				moldaviska cupon (1992–1993)
+				moldavisk cupon (1992–1993)
+				moldavisk cupon (1992–1993)
+				moldaviska cupon (1992–1993)
 			
 			
 				moldavisk leu
 				moldavisk leu
 				moldaviska lei
+				MDL
 			
 			
 				madagaskisk ariary
 				madagaskisk ariary
 				madagaskiska ariary
+				MGA
 				Ar
 			
 			
@@ -6763,11 +7166,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				makedonisk denar
 				makedonisk denar
 				makedoniska denarer
+				MKD
 			
 			
 				makedonisk denar (1992–1993)
 				makedonisk denar (1992–1993)
 				makedoniska denarer (1992–1993)
+				MKN
 			
 			
 				malisk franc
@@ -6778,23 +7183,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				myanmarisk kyat
 				myanmarisk kyat
 				myanmariska kyat
+				MMK
 				K
 			
 			
 				mongolisk tögrög
 				mongolisk tögrög
 				mongoliska tögrög
+				MNT
 				₮
 			
 			
 				makanesisk pataca
 				makanesisk pataca
 				makanesiska pataca
+				MOP
 			
 			
 				mauretansk ouguiya (1973–2017)
 				mauretansk ouguiya (1973–2017)
 				mauretanska ouguiya (1973–2017)
+				MRO
 			
 			
 				mauretansk ouguiya
@@ -6805,6 +7214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				maltesisk lire
 				maltesisk lire
 				maltesiska lire
+				MTL
 			
 			
 				maltesiskt pund
@@ -6815,27 +7225,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mauritisk rupie
 				mauritisk rupie
 				mauritiska rupier
+				MUR
 				Rs
 			
 			
-				maldivisk rupie
-				maldivisk rupie
-				maldiviska rupier
+				maldivisk rupie
+				maldivisk rupie
+				maldiviska rupier
+				MVP
 			
 			
 				maldivisk rufiyaa
 				maldivisk rufiyaa
 				maldiviska rufiyer
+				MVR
 			
 			
 				malawisk kwacha
 				malawisk kwacha
 				malawiska kwacha
+				MWK
 			
 			
 				mexikansk peso
 				mexikansk peso
 				mexikanska pesos
+				MX$
 				$
 			
 			
@@ -6852,6 +7267,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				malaysisk ringgit
 				malaysisk ringgit
 				malaysiska ringgiter
+				MYR
 				RM
 			
 			
@@ -6868,28 +7284,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				moçambikisk metical
 				moçambikisk metical
 				moçambikiska metical
+				MZN
 			
 			
 				namibisk dollar
 				namibisk dollar
 				namibiska dollar
+				NAD
 				$
 			
 			
 				nigeriansk naira
 				nigeriansk naira
 				nigerianska naira
+				NGN
 				₦
 			
 			
 				nicaraguansk córdoba (1998–1991)
 				nicaraguansk córdoba (1998–1991)
 				nicaraguanska córdobas (1988–1991)
+				NIC
 			
 			
 				nicaraguansk córdoba
 				nicaraguansk córdoba
 				nicaraguanska córdobas
+				NIO
 				C$
 			
 			
@@ -6908,6 +7329,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				nepalesisk rupie
 				nepalesisk rupie
 				nepalesiska rupier
+				NPR
 				Rs
 			
 			
@@ -6921,11 +7343,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				omansk rial
 				omansk rial
 				omanska rial
+				OMR
 			
 			
 				panamansk balboa
 				panamansk balboa
 				panamanska balboa
+				PAB
 			
 			
 				peruansk inti
@@ -6936,6 +7360,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				peruansk sol
 				peruansk sol
 				peruanska sol
+				PEN
 			
 			
 				peruansk sol (1863–1965)
@@ -6946,23 +7371,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				papuansk kina
 				papuansk kina
 				papuanska kinor
+				PGK
 			
 			
 				filippinsk peso
 				filippinsk peso
 				filippinska pesos
+				PHP
 				₱
 			
 			
 				pakistansk rupie
 				pakistansk rupie
 				pakistanska rupier
+				PKR
 				Rs
 			
 			
 				polsk zloty
 				polsk zloty
 				polska zloty
+				PLN
 				zł
 			
 			
@@ -6979,12 +7408,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				paraguayansk guarani
 				paraguayansk guarani
 				paraguayska guarani
+				PYG
 				₲
 			
 			
 				qatarisk rial
 				qatarisk rial
 				qatariska rial
+				QAR
 			
 			
 				rhodesisk dollar
@@ -7000,45 +7431,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				rumänsk leu
 				rumänsk leu
 				rumänska lei
+				RON
 				L
 			
 			
 				serbisk dinar
 				serbisk dinar
 				serbiska dinarer
+				RSD
 			
 			
 				rysk rubel
 				rysk rubel
 				ryska rubel
+				RUB
 				₽
 			
 			
 				rysk rubel (1991–1998)
-				rysk rubel (1991–1998)
-				ryska rubel (1991–1998)
+				rysk rubel (1991–1998)
+				ryska rubel (1991–1998)
 			
 			
 				rwandisk franc
 				rwandisk franc
 				rwandiska franc
+				RWF
 				RF
 			
 			
 				saudisk riyal
 				saudisk riyal
 				saudiska riyal
+				SAR
 			
 			
 				Salomondollar
 				Salomondollar
 				Salomondollar
+				SBD
 				$
 			
 			
 				seychellisk rupie
 				seychellisk rupie
 				seychelliska rupier
+				SCR
 			
 			
 				sudansk dinar (1992–2007)
@@ -7049,6 +7487,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sudanesiskt pund
 				sudanesiskt pund
 				sudanesiska pund
+				SDG
 			
 			
 				sudanskt pund (1916–1992)
@@ -7066,38 +7505,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				singaporiansk dollar
 				singaporiansk dollar
 				singaporianska dollar
+				SGD
 				$
 			
 			
 				S:t Helena-pund
 				S:t Helena-pund
 				S:t Helena-pund
+				SHP
 				£
 			
 			
 				slovensk tolar
 				slovensk tolar
 				slovenska tolar
+				SIT
 			
 			
 				slovakisk koruna
-				slovakisk krona
-				slovakiska korunor
+				slovakisk krona
+				slovakiska korunor
 			
 			
 				sierraleonsk leone
 				sierraleonsk leone
 				sierraleonska leoner
+				SLL
 			
 			
 				somalisk shilling
 				somalisk shilling
 				somaliska shilling
+				SOS
 			
 			
 				surinamesisk dollar
 				surinamesisk dollar
 				surinamesiska dollar
+				SRD
 				$
 			
 			
@@ -7109,12 +7554,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sydsudanesiskt pund
 				sydsudanesiskt pund
 				sydsudanesiska pund
+				SSP
 				£
 			
 			
 				saotomeansk dobra (1977–2017)
 				saotomeansk dobra (1977–2017)
 				saotomeanska dobra (1977–2017)
+				STD
 			
 			
 				saotomeansk dobra
@@ -7123,29 +7570,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				sovjetisk rubel
-				sovjetisk rubel
-				sovjetiska rubler
+				sovjetisk rubel
+				sovjetiska rubler
 			
 			
 				salvadoransk colón
-				salvadoransk colón
-				salvadoranska colón
+				salvadoransk colón
+				salvadoranska colón
 			
 			
 				syriskt pund
 				syriskt pund
 				syriska pund
+				SYP
 				£
 			
 			
 				swaziländsk lilangeni
 				swaziländsk lilangeni
 				swaziländska lilangeni
+				SZL
 			
 			
 				thailändsk baht
 				thailändsk baht
 				thailändska baht
+				THB
 				฿
 			
 			
@@ -7158,6 +7608,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tadzjikisk somoni
 				tadzjikisk somoni
 				tadzjikiska somoni
+				TJS
 			
 			
 				turkmenistansk manat (1993–2009)
@@ -7168,32 +7619,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				turkmenistansk manat
 				turkmenistansk manat
 				turkmenistanska manat
+				TMT
 			
 			
 				tunisisk dinar
 				tunisisk dinar
 				tunisiska dinarer
+				TND
 			
 			
 				tongansk paʻanga
 				tongansk paʻanga
 				tonganska paʻanga
+				TOP
 				T$
 			
 			
-				timoriansk escudo
-				östtimoresisk escudo
-				timorianska escudos
+				östtimoresisk escudo
+				östtimoresisk escudo
+				östtimoresiska escudos
 			
 			
 				turkisk lire (1922–2005)
 				turkisk lire (1922–2005)
 				turkiska lire (1922–2005)
+				TRL
 			
 			
 				turkisk lira
 				turkisk lira
 				turkiska lira
+				TRY
 				₺
 				TL
 			
@@ -7201,6 +7657,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Trinidad och Tobago-dollar
 				Trinidad och Tobago-dollar
 				Trinidad och Tobago-dollar
+				TTD
 				$
 			
 			
@@ -7214,32 +7671,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tanzanisk shilling
 				tanzanisk shilling
 				tanzaniska shilling
+				TZS
 			
 			
 				ukrainsk hryvnia
 				ukrainsk hryvnia
 				ukrainska hryvnia
+				UAH
 				₴
 			
 			
 				ukrainsk karbovanetz
-				ukrainsk karbovanetz (1992–1996)
-				ukrainska karbovanetz (1992–1996)
+				ukrainsk karbovanetz (1992–1996)
+				ukrainska karbovanetz (1992–1996)
 			
 			
 				ugandisk shilling (1966–1987)
-				ugandisk shilling (1966–1987)
-				ugandiska shilling (1966–1987)
+				ugandisk shilling (1966–1987)
+				ugandiska shilling (1966–1987)
 			
 			
 				ugandisk shilling
 				ugandisk shilling
 				ugandiska shilling
+				UGX
 			
 			
 				US-dollar
 				US-dollar
 				US-dollar
+				US$
 				$
 			
 			
@@ -7266,12 +7727,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				uruguayansk peso
 				uruguayansk peso
 				uruguayanska pesos
+				UYU
 				$
 			
 			
 				uzbekisk sum
 				uzbekisk sum
 				uzbekiska sum
+				UZS
 			
 			
 				venezuelansk bolivar (1871–2008)
@@ -7282,6 +7745,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				venezuelansk bolívar (2008–2018)
 				venezuelansk bolívar (2008–2018)
 				venezuelanska bolívar (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -7297,24 +7761,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				₫
 			
 			
-				vietnamesisk dong (1978–1985)
-				vietnamesisk dong (1978–1985)
-				vietnamesiska dong (1978–1985)
+				vietnamesisk dong (1978–1985)
+				vietnamesisk dong (1978–1985)
+				vietnamesiska dong (1978–1985)
 			
 			
 				vanuatisk vatu
 				vanuatisk vatu
 				vanuatiska vatu
+				VUV
 			
 			
 				västsamoansk tala
 				västsamoansk tala
 				västsamoanska tala
+				WST
 			
 			
 				centralafrikansk franc
 				centralafrikansk franc
 				centralafrikanska franc
+				FCFA
 			
 			
 				silver
@@ -7328,17 +7795,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				europeisk kompositenhet
-				europeisk gammal kompositenhet
+				europeisk kompositenhet
 				europeiska kompositenheter
 			
 			
 				europeisk monetär enhet
-				europeisk gammal monetär enhet
+				europeisk monetär enhet
 				europeiska monetära enheter
 			
 			
 				europeisk kontoenhet (XBC)
-				europeisk gammal kontoenhet
+				europeisk kontoenhet (XBC)
 				europeiska kontoenheter (XBC)
 			
 			
@@ -7350,6 +7817,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				östkaribisk dollar
 				östkaribisk dollar
 				östkaribiska dollar
+				EC$
 				$
 			
 			
@@ -7376,6 +7844,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				västafrikansk franc
 				västafrikansk franc
 				västafrikanska franc
+				CFA
 			
 			
 				palladium
@@ -7386,6 +7855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP-franc
 				CFP-franc
 				CFP-franc
+				CFPF
 			
 			
 				platina
@@ -7398,19 +7868,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				RINET-fond
 			
 			
-				latinamerikansk sucre
-				latinamerikansk sucre
-				latinamerikanska sucre
+				latinamerikansk sucre
+				latinamerikansk sucre
+				latinamerikanska sucre
 			
 			
-				test-valutakod
-				(valutakod för teständamål)
-				test-valutakod
+				testvalutaenhet
+				testvalutaenhet
+				testvalutaenheter
+				XTS
 			
 			
-				afrikansk kontoenhet
-				afrikansk kontoenhet
-				afrikanska kontoenheter
+				afrikansk kontoenhet
+				afrikansk kontoenhet
+				afrikanska kontoenheter
 			
 			
 				okänd valuta
@@ -7426,6 +7897,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				jemenitisk rial
 				jemenitisk rial
 				jemenitiska rial
+				YER
 			
 			
 				jugoslavisk dinar (1966–1990)
@@ -7446,9 +7918,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				YUN
 			
 			
-				jugoslavisk dinar (1992–1993)
-				jugoslavisk dinar (1992–1993)
-				jugoslaviska dinarer (1992–1993)
+				jugoslavisk dinar (1992–1993)
+				jugoslavisk dinar (1992–1993)
+				jugoslaviska dinarer (1992–1993)
 			
 			
 				sydafrikansk rand (finansiell)
@@ -7459,6 +7931,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				sydafrikansk rand
 				sydafrikansk rand
 				sydafrikanska rand
+				ZAR
 				R
 			
 			
@@ -7470,6 +7943,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				zambisk kwacha
 				zambisk kwacha
 				zambiska kwacha
+				ZMW
 				ZK
 			
 			
@@ -7488,19 +7962,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zimbabwe-dollar
 			
 			
-				Zimbabwe-dollar (2009)
-				Zimbabwe-dollar (2009)
-				Zimbabwe-dollar (2009)
+				Zimbabwe-dollar (2009)
+				Zimbabwe-dollar (2009)
+				Zimbabwe-dollar (2009)
 			
 			
-				Zimbabwe-dollar (2008)
-				Zimbabwe-dollar (2008)
-				Zimbabwe-dollar (2008)
+				Zimbabwe-dollar (2008)
+				Zimbabwe-dollar (2008)
+				Zimbabwe-dollar (2008)
 			
 		
 		
 			~{0}
-			≥{0}
+			⩾{0}
 			≤{0}
 			{0}‒{1}
 		
@@ -7516,6 +7990,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} per {1}
 			
+			
+				{0}-{1}
+			
 			
 				gånger jordens gravitation
 				{0} gånger jordens gravitation
@@ -7602,9 +8079,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} per kvadrattum
 			
 			
-				turkiska dunam
-				{0} turkiskt dunam
-				{0} turkiska dunam
+				turkiska dunam
+				{0} turkiskt dunam
+				{0} turkiska dunam
 			
 			
 				karat
@@ -7637,14 +8114,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} promille
 			
 			
-				promyriad
-				{0} promyriad
-				{0} promyriad
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				promyriad
+				{0} promyriad
+				{0} promyriad
 			
 			
 				liter per kilometer
@@ -7726,6 +8198,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} århundrade
 				{0} århundraden
 			
+			
+				årtionden
+				{0} årtionde
+				{0} årtionden
+			
 			
 				år
 				{0} år
@@ -7834,14 +8311,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kilowattimmar
 			
 			
-				elektronvolt
-				{0} elektronvolt
-				{0} elektronvolt
+				elektronvolt
+				{0} elektronvolt
+				{0} elektronvolt
 			
 			
-				British thermal units
-				{0} British thermal unit
-				{0} British thermal units
+				British thermal units
+				{0} British thermal unit
+				{0} British thermal units
 			
 			
 				pounds of force
@@ -7849,9 +8326,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pounds of force
 			
 			
-				newton
-				{0} newton
-				{0} newton
+				newton
+				{0} newton
+				{0} newton
 			
 			
 				gigahertz
@@ -7873,6 +8350,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				typografisk em
+			
+			
+				pixel
+				{0} pixel
+				{0} pixel
+			
+			
+				megapixel
+				{0} megapixel
+				{0} megapixel
+			
+			
+				pixel per centimeter
+				{0} pixel per centimeter
+				{0} pixel per centimeter
+			
+			
+				pixel per tum
+				{0} pixel per tum
+				{0} pixel per tum
+			
+			
+				bildpunkter per centimeter
+				{0} bildpunkt per centimeter
+				{0} bildpunkter per centimeter
+			
+			
+				bildpunkter per tum
+				{0} bildpunkt per tum
+				{0} bildpunkter per tum
+			
 			
 				kilometer
 				{0} kilometer
@@ -8053,19 +8563,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} karat
 			
 			
-				dalton
-				{0} dalton
-				{0} dalton
+				dalton
+				{0} dalton
+				{0} dalton
 			
 			
-				gånger Jordens massa
-				{0} gånger Jordens massa
-				{0} gånger Jordens massa
+				gånger Jordens massa
+				{0} gånger Jordens massa
+				{0} gånger Jordens massa
 			
 			
-				gånger Solens massa
-				{0} gånger Solens massa
-				{0} gånger Solens massa
+				gånger Solens massa
+				{0} gånger Solens massa
+				{0} gånger Solens massa
 			
 			
 				gigawatt
@@ -8097,11 +8607,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hästkraft
 				{0} hästkrafter
 			
-			
-				hektopascal
-				{0} hektopascal
-				{0} hektopascal
-			
 			
 				millimeter kvicksilver
 				{0} millimeter kvicksilver
@@ -8127,15 +8632,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfär
 				{0} atmosfärer
 			
+			
+				pascal
+				{0} pascal
+				{0} pascal
+			
+			
+				hektopascal
+				{0} hektopascal
+				{0} hektopascal
+			
 			
-				kilopascal
-				{0} kilopascal
-				{0} kilopascal
+				kilopascal
+				{0} kilopascal
+				{0} kilopascal
 			
 			
-				megapascal
-				{0} megapascal
-				{0} megapascal
+				megapascal
+				{0} megapascal
+				{0} megapascal
 			
 			
 				kilometer per timme
@@ -8183,9 +8698,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pound-feet
 			
 			
-				newton-meter
-				{0} newton-meter
-				{0} newton-meter
+				newton-meter
+				{0} newton-meter
+				{0} newton-meter
 			
 			
 				kubikkilometer
@@ -8307,11 +8822,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fluid ounce
 				{0} fluid ounces
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				matskedar
 				{0} matsked
@@ -8324,8 +8834,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				råoljetunnor
-				{0} tunna
-				{0} tunnor
+				{0} tunna
+				{0} tunnor
 			
 			
 				kompassriktning
@@ -8424,11 +8934,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tum²
 				{0}/tum²
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} kar
@@ -8460,14 +8965,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ‰
 			
 			
-				‱
-				{0} ‱
-				{0} ‱
-			
-			
-				mol
-				{0} mol
-				{0} mol
+				{0} ‱
+				{0} ‱
 			
 			
 				liter/km
@@ -8549,6 +9048,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} årh
 				{0} årh
 			
+			
+				årt
+				{0} årt
+				{0} årt
+			
 			
 				år
 				{0} år
@@ -8656,25 +9160,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 				{0} kWh
 			
-			
-				eV
-				{0} eV
-				{0} eV
-			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
 			
 			
 				pound-force
-				{0} lbf
-				{0} lbf
 			
 			
-				newton
-				{0} N
-				{0} N
+				newton
 			
 			
 				GHz
@@ -8696,6 +9189,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				Mpx
+				{0} Mpx
+				{0} Mpx
+			
+			
+				px/cm
+				{0} px/cm
+				{0} px/cm
+			
+			
+				px/tum
+				{0} px/tum
+				{0} px/tum
+			
+			
+				d/cm
+				{0} d/cm
+				{0} d/cm
+			
+			
+				d/tum
+				{0} d/tum
+				{0} d/tum
+			
 			
 				km
 				{0} km
@@ -8801,21 +9319,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} pt
 				{0} pt
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lux
 				{0} lux
 				{0} lux
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				t
 				{0} t
@@ -8876,19 +9384,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ct
 			
 			
-				dalton
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
+				dalton
 			
 			
 				GW
@@ -8920,11 +9416,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hk
 				{0} hk
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8950,15 +9441,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
-				{0} MPa
+			
+				hPa
+				{0} hPa
+				{0} hPa
 			
 			
 				km/h
@@ -9000,16 +9486,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -9130,11 +9606,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				msk
 				{0} msk
@@ -9168,6 +9639,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}G
 			
 			
+				m/s²
 				{0}m/s²
 				{0}m/s²
 			
@@ -9177,21 +9649,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}varv
 			
 			
+				rad
 				{0}rad
 				{0}rad
 			
 			
 				°
+				{0}°
+				{0}°
 			
 			
 				bågmin
+				{0}′
+				{0}′
 			
 			
 				bågsek
+				{0}″
+				{0}″
 			
 			
+				km²
 				{0}km²
 				{0}km²
+				{0}/km²
 			
 			
 				ha
@@ -9199,17 +9680,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ha
 			
 			
+				m²
 				{0}m²
 				{0}m²
+				{0}/m²
 			
 			
+				cm²
 				{0}cm²
 				{0}cm²
+				{0}/cm²
 			
 			
 				eng. mil²
-				{0} mi²
-				{0} mi²
 				{0}/en.mil²
 			
 			
@@ -9239,32 +9722,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} krt
 			
 			
+				mg/dL
 				{0}mg/dL
 				{0}mg/dL
 			
 			
+				mmol/L
 				{0}mmol/L
 				{0}mmol/L
 			
 			
 				miljondelar
+				{0} ppm
+				{0} ppm
 			
 			
 				%
 				{0} %
 				{0} %
 			
+			
+				‰
+				{0}‰
+				{0}‰
+			
 			
-				‱
 				{0}‱
 				{0}‱
 			
 			
-				mol
 				{0}mol
 				{0}mol
 			
 			
+				L/km
 				{0}L/km
 				{0}L/km
 			
@@ -9284,18 +9775,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}UK mpg
 			
 			
+				Tb
 				{0}Tb
 				{0}Tb
 			
 			
+				Gb
 				{0}Gb
 				{0}Gb
 			
 			
+				Mb
 				{0}Mb
 				{0}Mb
 			
 			
+				kb
 				{0}kb
 				{0}kb
 			
@@ -9310,15 +9805,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}b
 			
 			
-				årh
-				{0}årh
-				{0}årh
+				årh
+				{0}årh
+				{0}årh
+			
+			
+				{0}årt
+				{0}årt
 			
 			
 				år
 				{0}å
 				{0}å
-				{0}/år
+				{0}/år
 			
 			
 				m
@@ -9330,27 +9829,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				v
 				{0}v
 				{0}v
-				{0}/v
+				{0}/v
 			
 			
 				d
 				{0}d
 				{0}d
+				{0}/d
 			
 			
 				h
 				{0}h
 				{0}h
+				{0}/h
 			
 			
 				m
 				{0}m
 				{0}m
+				{0}/m
 			
 			
 				sek
 				{0}s
 				{0}s
+				{0}/s
 			
 			
 				ms
@@ -9358,12 +9861,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ms
 			
 			
-				{0}μs
-				{0}μs
+				μs
+				{0}μs
+				{0}μs
 			
 			
-				{0}ns
-				{0}ns
+				ns
+				{0}ns
+				{0}ns
 			
 			
 				A
@@ -9371,6 +9876,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}A
 			
 			
+				mA
 				{0}mA
 				{0}mA
 			
@@ -9384,12 +9890,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}V
 				{0}V
 			
+			
+				kcal
+				{0} kcal
+				{0} kcal
+			
+			
+				cal
+				{0} cal
+				{0} cal
+			
 			
 				kcal
 				{0} kcal
 				{0} kcal
 			
 			
+				kJ
 				{0}kJ
 				{0}kJ
 			
@@ -9399,32 +9916,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}J
 			
 			
+				kWh
 				{0}kWh
 				{0}kWh
 			
 			
-				eV
 				{0}eV
 				{0}eV
 			
 			
-				newton
 				{0}N
 				{0}N
 			
 			
+				GHz
 				{0}GHz
 				{0}GHz
 			
 			
+				MHz
 				{0}MHz
 				{0}MHz
 			
 			
+				kHz
 				{0}kHz
 				{0}kHz
 			
 			
+				Hz
 				{0}Hz
 				{0}Hz
 			
@@ -9432,13 +9952,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				km
 				{0}km
 				{0}km
+				{0}/km
 			
 			
 				m
 				{0}m
 				{0}m
+				{0}/m
 			
 			
+				dm
 				{0}dm
 				{0}dm
 			
@@ -9446,6 +9969,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cm
 				{0}cm
 				{0}cm
+				{0}/cm
 			
 			
 				mm
@@ -9458,10 +9982,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}μm
 			
 			
+				nm
 				{0}nm
 				{0}nm
 			
 			
+				pm
 				{0}pm
 				{0}pm
 			
@@ -9522,17 +10048,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mil
 				{0}mil
 			
+			
+				pt
+				{0} pt
+				{0} pt
+			
 			
-				R☉
 				{0}R☉
 				{0}R☉
 			
+			
+				lux
+			
 			
-				L☉
 				{0}L☉
 				{0}L☉
 			
 			
+				t
 				{0}t
 				{0}t
 			
@@ -9540,13 +10073,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kg
 				{0}kg
 				{0}kg
+				{0}/kg
 			
 			
 				g
 				{0}g
 				{0}g
+				{0}/g
 			
 			
+				mg
 				{0}mg
 				{0}mg
 			
@@ -9593,24 +10129,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}Da
 			
 			
-				M⊕
 				{0}M⊕
 				{0}M⊕
 			
 			
-				M☉
 				{0}M☉
 				{0}M☉
 			
 			
+				GW
 				{0}GW
 				{0}GW
 			
 			
+				MW
 				{0}MW
 				{0}MW
 			
 			
+				kW
 				{0}kW
 				{0}kW
 			
@@ -9620,6 +10157,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}W
 			
 			
+				mW
 				{0}mW
 				{0}mW
 			
@@ -9628,11 +10166,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hk
 				{0}hk
 			
-			
-				hPa
-				{0}hPa
-				{0}hPa
-			
 			
 				mm Hg
 				{0}mm Hg
@@ -9654,16 +10187,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mbar
 			
 			
+				atm
 				{0}atm
 				{0}atm
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
-				kPa
 				{0}kPa
 				{0}kPa
 			
 			
-				MPa
 				{0}MPa
 				{0}MPa
 			
@@ -9673,6 +10210,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}km/h
 			
 			
+				m/s
 				{0}m/s
 				{0}m/s
 			
@@ -9698,6 +10236,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°F
+				{0}°F
+				{0}°F
 			
 			
 				K
@@ -9705,21 +10245,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}K
 			
 			
-				N⋅m
 				{0}Nm
 				{0}Nm
 			
 			
+				km³
 				{0}km³
 				{0}km³
 			
 			
+				m³
 				{0}m³
 				{0}m³
+				{0}/m³
 			
 			
+				cm³
 				{0}cm³
 				{0}cm³
+				{0}/cm³
 			
 			
 				eng. mil³
@@ -9742,10 +10286,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tum³
 			
 			
+				ML
 				{0}ML
 				{0}ML
 			
 			
+				hL
 				{0}hL
 				{0}hL
 			
@@ -9756,14 +10302,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/L
 			
 			
+				dL
 				{0}dL
 				{0}dL
 			
 			
+				cL
 				{0}cL
 				{0}cL
 			
 			
+				mL
 				{0}mL
 				{0}mL
 			
@@ -9831,8 +10380,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				oljefat
-				{0} fat
-				{0} fat
 			
 			
 				riktning
@@ -10015,33 +10562,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		lutande
 		extralutande
 		ultrakondenserad
-		∅∅∅
 		ultrasmal
 		extrakondenserad
-		∅∅∅
 		extrasmal
 		kondenserad
-		∅∅∅
 		smal
 		halvkondenserad
-		∅∅∅
 		halvsmal
 		normalbredd
 		halvexpanderad
-		∅∅∅
 		halvbred
 		expanderad
-		∅∅∅
 		bred
 		extraexpanderad
-		∅∅∅
 		extra bred
 		ultraexpanderad
-		∅∅∅
 		ultrabred
 		ultramager
 		extramager
-		∅∅∅
 		mager
 		halvmager
 		kvartsmager
@@ -10052,17 +10590,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		fet
 		extrafet
 		ultrafet
-		∅∅∅
 		hyperfet
-		∅∅∅
-		∅∅∅
 		vertikala bråk
 		versalavstånd
 		valfria ligaturer
 		diagonala bråk
 		versala siffror
 		gemena siffror
-		upphöjda gemener
+		upphöjda gemener efter siffror
 		proportionerliga siffror
 		kapitäler
 		tabulära siffror
diff --git a/make/data/cldr/common/main/sv_AX.xml b/make/data/cldr/common/main/sv_AX.xml
index 0590ef70513..a29ef1da486 100644
--- a/make/data/cldr/common/main/sv_AX.xml
+++ b/make/data/cldr/common/main/sv_AX.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sv_FI.xml b/make/data/cldr/common/main/sv_FI.xml
index 15cd4b1e2f7..f768a7e3c6f 100644
--- a/make/data/cldr/common/main/sv_FI.xml
+++ b/make/data/cldr/common/main/sv_FI.xml
@@ -7,14 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		
-			kirgiziska
-		
 		
 			
 		
@@ -28,9 +25,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			kinesiska i strecksorteringsordning
 		
 	
-	
-		[a à b c d e é f g h i j k l m n o p q r s t u v x y z å ä ö]
-	
 	
 		
 			
@@ -52,22 +46,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 				
-				
-					
-						
-							dd-MM-y
-						
-					
-				
+				
+					
+						h.mm B
+						h.mm.ss B
+						E h.mm B
+						E h.mm.ss B
+						E h.mm a
+						E HH.mm
+						E h.mm.ss a
+						E HH.mm.ss
+						h.mm a
+						HH.mm
+						h.mm.ss a
+						HH.mm.ss
+						h.mm.ss a v
+						HH.mm.ss v
+						h.mm a v
+						HH.mm v
+						d.M
+						E d.M
+						d.M
+						dd.MM
+						mm.ss
+					
+				
 			
 		
 	
+	
+		
+			.
+			:
+		
+	
 	
-		
-			
-				grader Celsius
-			
-		
 		
 			
 				{0} km/h
diff --git a/make/data/cldr/common/main/sv_SE.xml b/make/data/cldr/common/main/sv_SE.xml
index 56b3dc74859..a6c19f38511 100644
--- a/make/data/cldr/common/main/sv_SE.xml
+++ b/make/data/cldr/common/main/sv_SE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sw.xml b/make/data/cldr/common/main/sw.xml
index c76c91f2015..7cfc4aa8d85 100644
--- a/make/data/cldr/common/main/sw.xml
+++ b/make/data/cldr/common/main/sw.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -78,6 +78,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kiblin
 			Kimedumba
 			Kikatalani
+			Kichakma
 			Kichechenia
 			Kichebuano
 			Kichiga
@@ -119,7 +120,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kiingereza (Canada)
 			Kiingereza (Uingereza)
 			Kiingereza (UK)
-			Kiingereza (US)
 			Kiesperanto
 			Kihispania
 			Kihispania (Amerika ya Latini)
@@ -338,7 +338,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kiromanshi
 			Kirundi
 			Kiromania
-			Kimoldova cha Romania
+			Kimoldova cha Romania
 			Kirombo
 			Kiroot
 			Kirusi
@@ -442,10 +442,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kiyiddi
 			Kiyoruba
 			Kikantoni
+			Kichina, Kikantoni
 			Kiberber Sanifu cha Moroko
 			Kichina
+			Kichina sanifu
 			Kichina (Kilichorahisishwa)
 			Kichina cha Jadi
+			Kichina (cha jadi)
 			Kizulu
 			Kizuni
 			Hakuna maudhui ya lugha
@@ -530,7 +533,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Ulaya ya Mashariki
 			Ulaya ya Kaskazini
 			Ulaya ya Magharibi
-			Afrika Kusine mwa Jangwa la Sahara
+			Afrika Kusini mwa Jangwa la Sahara
 			Amerika ya Kilatini
 			Kisiwa cha Ascension
 			Andorra
@@ -689,13 +692,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			St. Martin
 			Madagaska
 			Visiwa vya Marshall
-			Macedonia
-			Macedonia (FYROM)
+			Masedonia ya Kaskazini
 			Mali
 			Myanmar (Burma)
 			Mongolia
-			Macau SAR China
-			Macau
+			Makau SAR China
+			Makau
 			Visiwa vya Mariana vya Kaskazini
 			Martinique
 			Moritania
@@ -763,7 +765,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Syria
 			Uswazi
-			SZ
+			Uswazi
 			Tristan da Cunha
 			Visiwa vya Turks na Caicos
 			Chad
@@ -800,6 +802,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis na Futuna
 			Samoa
+			Lafudhi Bandia
+			Lafudhi Bidi
 			Kosovo
 			Yemeni
 			Mayotte
@@ -824,8 +828,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Mtindo wa Kukata Mstari
 			Mfumo wa Vipimo
 			Nambari
-			Ukanda Saa
-			Tofauti ya Mandhari
+			Saa za Eneo
+			Lahaja za Lugha
 			Matumizi ya Kibinafsi
 		
 		
@@ -953,8 +957,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b {ch} d e f g h i j k l m n o p r s t u v w y z]
 		[c q x]
 		[A B C D E F G H I J K L M N O P R S T U V W Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- , ; \: ! ? . ' " ( ) \[ \] \{ \}]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ; \: ! ? . ' " ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -963,14 +967,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1071,15 +1084,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
@@ -1110,16 +1114,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							MMM y – MMM y G
 						
 						
-							d – d MMM, y G
-							d MMM, y G – d MMM, y G
-							d MMM – d MMM, y G
-							d MMM, y – d MMM, y G
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
 						
 						
-							E, d MMM – E, d MMM, y G
-							E, d MMM, y G – E, d MMM, y G
-							E, d MMM – E, d MMM, y G
-							E, d MMM, y – E, d MMM, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
 						
 						
 							h a – h a
@@ -1429,7 +1433,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							saa sita za usiku
 							AM
-							saa sita za mchana
+							adhuhuri
 							PM
 							alfajiri
 							asubuhi
@@ -1464,7 +1468,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							saa sita za usiku
 							AM
-							saa sita za mchana
+							adhuhuri
 							PM
 							alfajiri
 							asubuhi
@@ -1591,7 +1595,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						y G
 						MMM y G
 						d MMM y G
-						E, MMM d, y G
+						E, d MMM y G
 						h a
 						HH
 						h:mm a
@@ -1619,7 +1623,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, d/M/y
 						MMM y
 						d MMM y
-						E, MMM d, y
+						E, d MMM y
 						MMMM y
 						y QQQ
 						QQQQ y
@@ -1631,15 +1635,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
@@ -1670,13 +1665,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							MMM y – MMM y G
 						
 						
-							MMM d – d, y G
-							MMM d, y G – MMM d, y G
-							MMM d – MMM d, y G
-							MMM d, y – MMM d, y G
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
 						
 						
-							E, MMM d – E, MMM d, y G
+							E, d MMM – E, d MMM y G
 							E, MMM d, y G – E, MMM d, y G
 							E, MMM d – E, MMM d, y G
 							E, MMM d, y – E, MMM d, y G
@@ -4612,16 +4607,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
+		1
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					elfu 0;elfu -0
@@ -4738,251 +4748,331 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Dirham ya Falme za Kiarabu
 				dirham ya Falme za Kiarabu
 				dirham za Falme za Kiarabu
+				AED
 			
 			
 				Afghani ya Afghanistan
 				afghani ya Afghanistan
 				afghani za Afghanistan
+				AFN
 			
 			
 				Lek ya Albania
 				lek ya Albania
 				lek za Albania
+				ALL
 			
 			
 				Dram ya Armenia
 				dram ya Armenia
 				dram za Armenia
+				AMD
 			
 			
 				Guilder ya Antili za Kiholanzi
 				guilder ya Antili za Kiholanzi
 				guilder za Antili za Kiholanzi
+				ANG
 			
 			
 				Kwanza ya Angola
 				kwanza ya Angola
 				kwanza za Angola
+				AOA
+				Kz
 			
 			
 				Peso ya Argentina
 				Peso ya Argentina
 				Peso za Argentina
+				ARS
+				$
 			
 			
 				Dola ya Australia
 				dola ya Australia
 				dola za Australia
+				A$
+				$
 			
 			
 				Florin ya Aruba
 				florin ya Aruba
 				florin za Aruba
+				AWG
 			
 			
 				Manat ya Azerbaijan
 				manat ya Azerbaijan
 				manat za Azerbaijan
+				AZN
 			
 			
 				Convertible Mark ya Bosnia na Hezegovina
 				convertible mark ya Bosnia na Hezegovina
 				convertible mark za Bosnia na Hezegovina
+				BAM
+				KM
 			
 			
 				Dola ya Barbados
 				dola ya Barbados
 				dola za Barbados
+				BBD
+				$
 			
 			
 				Taka ya Bangladesh
 				taka ya Bangladesh
 				taka za Bangladesh
+				BDT
+				৳
 			
 			
 				Lev ya Bulgaria
 				lev ya Bulgaria
 				lev za Bulgaria
+				BGN
 			
 			
 				Dinar ya Bahrain
 				dinar ya Bahrain
 				dinar za Bahrain
+				BHD
 			
 			
 				Faranga ya Burundi
 				faranga ya Burundi
 				faranga za Burundi
+				BIF
 			
 			
 				Dola ya Bermuda
 				dola ya Bermuda
 				dola za Bermuda
+				BMD
+				$
 			
 			
 				Dola ya Brunei
 				dola ya Brunei
 				dola za Brunei
+				BND
+				$
 			
 			
 				Boliviano ya Bolivia
 				Boliviano ya Bolivia
 				Boliviano za Bolivia
+				BOB
+				Bs
 			
 			
 				Real ya Brazil
 				Real ya Brazil
 				Real za Brazil
+				R$
+				R$
 			
 			
 				Dola ya Bahamas
 				dola ya Bahamas
 				dola za Bahamas
+				BSD
+				$
 			
 			
 				Ngultrum ya Bhutan
 				ngultrum ya Bhutan
 				ngultrum za Bhutan
+				BTN
 			
 			
 				Pula ya Botswana
 				pula ya Botswana
 				pula za Botswana
+				BWP
+				P
 			
 			
 				Ruble ya Belarus
 				ruble ya Belarus
 				ruble za Belarus
+				BYN
+				р.
 			
 			
 				Ruble ya Belarusi (2000–2016)
 				Ruble ya Belarusi (2000–2016)
 				Ruble za Belarusi (2000–2016)
+				BYR
 			
 			
 				Dola ya Belize
 				dola ya Belize
 				dola za Belize
+				BZD
+				$
 			
 			
 				Dola ya Canada
 				dola ya Canada
 				dola za Canada
+				CA$
+				$
 			
 			
 				Faranga ya Kongo
 				faranga ya Kongo
 				faranga za Kongo
+				CDF
 			
 			
 				Faranga ya Uswisi
 				faranga ya Uswisi
 				faranga za Uswisi
+				CHF
 			
 			
 				Peso ya Chile
 				Peso ya Chile
 				Peso za Chile
+				CLP
+				$
 			
 			
 				Yuan ya Uchina (huru)
 				yuan ya Uchina (huru)
 				yuan ya Uchina (huru)
+				CNH
 			
 			
 				Yuan ya Uchina
 				yuan ya Uchina
 				yuan za Uchina
+				CN¥
+				¥
 			
 			
 				Peso ya Colombia
 				Peso ya Colombia
 				Peso za Colombia
+				COP
+				$
 			
 			
 				Colon ya Costa Rica
 				colon ya Costa Rica
 				colon za Costa Rica
+				CRC
+				₡
 			
 			
 				Peso ya Cuba Inayoweza Kubadilishwa
 				Peso ya Cuba Inayoweza Kubadilishwa
 				Peso za Cuba Zinazoweza Kubadilishwa
+				CUC
+				$
 			
 			
 				Peso ya Cuba
 				Peso ya Cuba
 				Peso za Cuba
+				CUP
+				$
 			
 			
 				Eskudo ya Cape Verde
 				eskudo ya Cape Verde
 				eskudo za Cape Verde
+				CVE
 			
 			
 				CZK
 				koruna ya Jamhuri ya Czech
 				koruna za Jamhuri ya Czech
+				CZK
+				Kč
 			
 			
 				Faranga ya Djibouti
 				faranga ya Djibouti
 				faranga za Djibouti
+				DJF
 			
 			
 				Krone ya Denmark
 				krone ya Denmark
 				krone za Denmark
+				DKK
+				kr
 			
 			
 				Peso ya Dominica
 				peso ya Dominica
 				peso za Dominica
+				DOP
+				$
 			
 			
 				Dinar ya Aljeria
 				dinar ya Aljeria
 				dinar za Aljeria
+				DZD
 			
 			
 				Pauni ya Misri
 				pauni ya Misri
 				pauni za Misri
+				EGP
+				E£
 			
 			
 				Nakfa ya Eritrea
 				nakfa ya Eritrea
 				nakfa za Eritrea
+				ERN
 			
 			
 				Birr ya Uhabeshi
 				birr ya Uhabeshi
 				birr za Uhabeshi
+				ETB
 			
 			
 				Yuro
 				yuro
 				yuro
+				€
+				€
 			
 			
 				Dola ya Fiji
 				dola ya Fiji
 				dola za Fiji
+				FJD
+				$
 			
 			
 				Pauni ya Visiwa vya Falkland
 				Pauni ya Visiwa vya Falkland
 				Pauni za Visiwa vya Falkland
+				FKP
+				£
 			
 			
 				Pauni ya Uingereza
 				pauni ya Uingereza
 				pauni za Uingereza
+				£
+				£
 			
 			
 				Lari ya Georgia
 				lari ya Georgia
 				lari za Georgia
+				GEL
+				₾
 				₾
 			
 			
@@ -4992,21 +5082,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cedi ya Ghana
 				cedi ya Ghana
 				cedi za Ghana
+				GHS
 			
 			
 				Pauni ya Gibraltar
 				pauni ya Gibraltar
 				pauni za Gibraltar
+				GIP
+				£
 			
 			
 				Dalasi ya Gambia
 				dalasi ya Gambia
 				dalasi za Gambia
+				GMD
 			
 			
 				Faranga ya Guinea
 				faranga ya Guinea
 				faranga za Guinea
+				GNF
+				FG
 			
 			
 				Faranga ya Gine
@@ -5015,81 +5111,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Quetzal ya Guatemala
 				quetzal ya Guatemala
 				quetzal za Guatemala
+				GTQ
+				Q
 			
 			
 				Dola ya Guyana
 				Dola ya Guyana
 				Dola za Guyana
+				GYD
+				$
 			
 			
 				Dola ya Hong Kong
 				dola ya Hong Kong
 				dola za Hong Kong
+				HK$
+				$
 			
 			
 				Lempira ya Hondurasi
 				lempira ya Hondurasi
 				lempira za Hondurasi
+				HNL
+				L
 			
 			
 				Kuna ya Croatia
 				kuna ya Croatia
 				kuna za Croatia
+				HRK
+				kn
 			
 			
 				Gourde ya Haiti
 				gourde ya Haiti
 				gourde za Haiti
+				HTG
 			
 			
 				Forint ya Hungaria
 				forint ya Hungaria
 				forint za Hungaria
+				HUF
+				Ft
 			
 			
 				Rupiah ya Indonesia
 				rupiah ya Indonesia
 				rupiah za Indonesia
+				IDR
+				Rp
 			
 			
 				Shekeli Mpya ya Israel
 				shekeli mpya ya Israel
 				shekeli mpya za Israel
+				₪
+				₪
 			
 			
 				Rupia ya India
 				rupia ya India
 				rupia za India
+				₹
+				₹
 			
 			
 				Dinar ya Iraq
 				dinar ya Iraq
 				dinar za Iraq
+				IQD
 			
 			
 				Rial ya Iran
 				rial ya Iran
 				rial za Iran
+				IRR
 			
 			
 				Krona ya Aisilandi
 				krona ya Aisilandi
 				krona za Aisilandi
+				ISK
+				kr
 			
 			
 				Dola ya Jamaica
 				dola ya Jamaica
 				dola za Jamaica
+				JMD
+				$
 			
 			
 				Dinar ya Jordan
 				dinar ya Jordan
 				dinar za Jordan
+				JOD
 			
 			
 				Yen ya Ujapani
 				yen ya Ujapani
 				yen za Ujapani
+				JP¥
+				¥
 			
 			
 				Shilingi ya Kenya
@@ -5101,61 +5225,83 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Som ya Kyrgystan
 				som ya Kyrgystan
 				som za Kyrgystan
+				KGS
 			
 			
 				Riel ya Cambodia
 				riel ya Cambodia
 				riel za Cambodia
+				KHR
+				៛
 			
 			
 				Faranga ya Comoros
 				faranga ya Comoros
 				faranga za Comoros
+				KMF
+				CF
 			
 			
 				Won ya Korea Kaskazini
 				won ya Korea Kaskazini
 				won za Korea Kaskazini
+				KPW
+				₩
 			
 			
 				Won ya Korea Kusini
 				won ya Korea Kusini
 				won za Korea Kusini
+				₩
+				₩
 			
 			
 				Dinar ya Kuwait
 				dinar ya Kuwait
 				dinar za Kuwait
+				KWD
 			
 			
 				Dola ya Visiwa vya Cayman
 				dola ya Visiwa vya Cayman
 				Dola ya Visiwa vya Cayman
+				KYD
+				$
 			
 			
 				Tenge ya Kazakhstan
 				tenge ya Kazakhstan
 				tenge za Kazakhstan
+				KZT
+				₸
 			
 			
 				Kip ya Laosi
 				kip ya Laosi
 				kip za Laosi
+				LAK
+				₭
 			
 			
 				Pauni ya Lebanon
 				pauni ya Lebanon
 				pauni za Lebanon
+				LBP
+				L£
 			
 			
 				Rupia ya Sri Lanka
 				rupia ya Sri Lanka
 				rupia za Sri Lanka
+				LKR
+				Rs
 			
 			
 				Dola ya Liberia
 				dola ya Liberia
 				dola za Liberia
+				LRD
+				$
 			
 			
 				Loti ya Lesoto
@@ -5164,86 +5310,109 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Litas ya Lithuania
 				Litas ya Lithuania
 				Litas za Lithuania
+				LTL
 			
 			
 				Lats ya Lativia
 				Lats ya Lativia
 				Lats za Lativia
+				LVL
 			
 			
 				Dinari ya Libya
 				dinari ya Libya
 				dinari za Libya
+				LYD
 			
 			
 				Dirham ya Morocco
 				dirham ya Morocco
 				dirham za Morocco
+				MAD
 			
 			
 				Leu ya Moldova
 				leu ya Moldova
 				leu za Moldova
+				MDL
 			
 			
 				Ariari ya Madagascar
 				ariari ya Madagascar
 				ariari za Madagascar
+				MGA
+				Ar
 			
 			
 				Denar ya Macedonia
 				denar ya Macedonia
 				denar za Macedonia
+				MKD
 			
 			
 				Kyat ya Myanmar
 				kyat ya Myanmar
 				kyat za Myanmar
+				MMK
+				K
 			
 			
 				Tugrik ya Mongolia
 				tugrik ya Mongolia
 				tugrik za Mongolia
+				MNT
+				₮
 			
 			
 				Pataca ya Macau
 				pataca ya Macau
 				pataca za Macau
+				MOP
 			
 			
 				Ouguiya ya Mauritania (1973–2017)
 				ouguiya ya Mauritania (1973–2017)
 				ouguiya za Mauritania (1973–2017)
+				MRO
 			
 			
 				Ouguiya ya Mauritania
 				ouguiya ya Mauritania
 				ouguiya za Mauritania
+				MRU
 			
 			
 				Rupia ya Mauritius
 				rupia ya Mauritius
 				rupia za Mauritius
+				MUR
+				Rs
 			
 			
 				Rufiyaa ya Maldives
 				rufiyaa ya Maldives
 				rufiyaa za Maldives
+				MVR
 			
 			
 				Kwacha ya Malawi
 				kwacha ya Malawi
 				kwacha za Malawi
+				MWK
 			
 			
 				Peso ya Mexico
 				peso ya Mexico
 				peso za Mexico
+				MX$
+				$
 			
 			
 				Ringgit ya Malaysia
 				ringgit ya Malaysia
 				ringgit za Malaysia
+				MYR
+				RM
 			
 			
 				Metikali ya Msumbiji (1980–2006)
@@ -5254,121 +5423,159 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Metikali ya Msumbiji
 				Metikali ya Msumbiji
 				Metikali za Msumbiji
+				MZN
 			
 			
 				Dola ya Namibia
 				dola ya Namibia
 				dola za Namibia
+				NAD
+				$
 			
 			
 				Naira ya Nigeria
 				naira ya Nigeria
 				naira za Nigeria
+				NGN
+				₦
 			
 			
 				Cordoba ya Nicaragua
 				cordoba ya Nicaragua
 				cordoba za Nicaragua
+				NIO
+				C$
 			
 			
 				Krone ya Norway
 				krone ya Norway
 				krone za Norway
+				NOK
+				kr
 			
 			
 				Rupia ya Nepal
 				rupia ya Nepal
 				rupia za Nepal
+				NPR
+				Rs
 			
 			
 				Dola ya New Zealand
 				dola ya New Zealand
 				dola za New Zealand
+				NZ$
+				$
 			
 			
 				Rial ya Omani
 				rial ya Omani
 				rial za Omani
+				OMR
 			
 			
 				Balboa ya Panama
 				balboa ya Panama
 				balboa ya Panama
+				PAB
 			
 			
 				Sol ya Peru
 				Sol ya Peru
 				Sol za Peru
+				PEN
 			
 			
 				Kina ya Papua New Guinea
 				kina ya Papua New Guinea
 				kina za Papua New Guinea
+				PGK
 			
 			
 				Peso ya Ufilipino
 				peso ya Ufilipino
 				peso za Ufilipino
+				PHP
+				₱
 			
 			
 				Rupia ya Pakistan
 				rupia ya Pakistan
 				rupia za Pakistan
+				PKR
+				Rs
 			
 			
 				Zloty ya Poland
 				zloty ya Poland
 				zloty za Poland
+				PLN
+				zł
 			
 			
 				Guarani ya Paraguay
 				Guarani ya Paraguay
 				Guarani za Paraguay
+				PYG
+				₲
 			
 			
 				Rial ya Qatar
 				rial ya Qatar
 				rial ya Qatar
+				QAR
 			
 			
 				Leu ya Romania
 				leu ya Romania
 				leu za Romania
+				RON
+				lei
 			
 			
 				Dinar ya Serbia
 				dinar ya Serbia
 				dinar za Serbia
+				RSD
 			
 			
 				Ruble ya Urusi
 				ruble ya Urusi
 				ruble za Urusi
+				RUB
+				₽
 			
 			
 				Faranga ya Rwanda
 				faranga ya Rwanda
 				faranga za Rwanda
+				RWF
+				RF
 			
 			
 				Riyal ya Saudia
 				riyal ya Saudia
 				riyal za Saudia
+				SAR
 			
 			
 				Dola ya Visiwa vya Solomon
 				dola ya Visiwa vya Solomon
 				dola za Visiwa vya Solomon
+				SBD
+				$
 			
 			
 				Rupia ya Ushelisheli
 				rupia ya Ushelisheli
 				rupia za Ushelisheli
+				SCR
 			
 			
 				Pauni ya Sudan
 				pauni ya Sudan
 				pauni za Sudan
+				SDG
 			
 			
 				Pauni ya Sudani (1957–1998)
@@ -5379,97 +5586,127 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Krona ya Uswidi
 				krona ya Uswidi
 				krona za Uswidi
+				SEK
+				kr
 			
 			
 				Dola ya Singapore
 				dola ya Singapore
 				dola za Singapore
+				SGD
+				$
 			
 			
 				Pauni ya St. Helena
 				pauni ya St. Helena
 				pauni za St. Helena
+				SHP
+				£
 			
 			
 				Leone
 				leone
 				leone
+				SLL
 			
 			
 				Shilingi ya Somalia
 				shilingi ya Somalia
 				shilingi za Somalia
+				SOS
 			
 			
 				Dola ya Suriname
 				Dola ya Suriname
 				Dola za Suriname
+				SRD
+				$
 			
 			
 				Pauni ya Sudan Kusini
 				pauni ya Sudan Kusini
 				pauni za Sudan Kusini
+				SSP
+				£
 			
 			
 				Dobra ya Sao Tome na Principe (1977–2017)
 				dobra ya Sao Tome na Principe (1977–2017)
 				dobra za Sao Tome na Principe (1977–2017)
+				STD
 			
 			
 				Dobra ya Sao Tome na Principe
 				dobra ya Sao Tome na Principe
 				dobra za Sao Tome na Principe
+				STN
+				Db
 			
 			
 				Pauni ya Syria
 				pauni ya Syria
 				pauni za Syria
+				SYP
+				£
 			
 			
 				Lilangeni
 				lilangeni
 				lilangeni
+				SZL
 			
 			
 				Baht ya Tailandi
 				baht ya Tailandi
 				baht za Tailandi
 				฿
+				฿
 			
 			
 				Somoni ya Tajikistan
 				somoni ya Tajikistan
 				somoni za Tajikistan
+				TJS
 			
 			
 				Manat ya Turkmenistan
 				manat ya Turkmenistan
 				manat za Turkmenistan
+				TMT
 			
 			
 				Dinari ya Tunisia
 				dinari ya Tunisia
 				dinari za Tunisia
+				TND
 			
 			
 				Paʻanga ya Tonga
 				paʻanga ya Tonga
 				paʻanga za Tonga
+				TOP
+				T$
 			
 			
 				Lira ya Uturuki
 				lira ya Uturuki
 				lira za Uturuki
+				TRY
+				₺
+				TL
 			
 			
 				Dola ya Trinidad na Tobago
 				Dola ya Trinidad na Tobago
 				Dola za Trinidad na Tobago
+				TTD
+				$
 			
 			
 				Dola ya Taiwan
 				dola ya Taiwan
 				dola za Taiwan
+				NT$
 				NT$
 			
 			
@@ -5482,71 +5719,91 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Hryvnia ya Ukraine
 				hryvnia ya Ukraine
 				hryvnia za Ukraine
+				UAH
+				₴
 			
 			
 				Shilingi ya Uganda
 				shilingi ya Uganda
 				shilingi za Uganda
+				UGX
 			
 			
 				Dola ya Marekani
 				dola ya Marekani
 				dola za Marekani
+				US$
+				$
 			
 			
 				Peso ya Uruguay
 				Peso ya Uruguay
 				Peso za Uruguay
+				UYU
+				$
 			
 			
 				Som ya Uzbekistan
 				som ya Uzbekistan
 				som za Uzbekistan
+				UZS
 			
 			
 				Bolivar ya Venezuela (2008–2018)
 				Bolivar ya Venezuela (2008–2018)
 				Bolivar za Venezuela (2008–2018)
+				VEF
+				Bs
 			
 			
 				Bolivar ya Venezuela
 				Bolivar ya Venezuela
 				Bolivar za Venezuela
+				VES
 			
 			
 				Dong ya Vietnam
 				dong ya Vietnam
 				dong za Vietnam
+				₫
+				₫
 			
 			
 				Vatu ya Vanuatu
 				vatu ya Vanuatu
 				vatu za Vanuatu
+				VUV
 			
 			
 				Tala ya Samoa
 				tala ya Samoa
 				tala za Samoa
+				WST
 			
 			
 				Faranga ya Afrika ya Kati CFA
 				faranga ya Afrika ya Kati CFA
 				faranga za Afrika ya Kati CFA
+				FCFA
 			
 			
 				Dola ya Caribbean Mashariki
 				Dola ya Caribbean Mashariki
 				Dola za Caribbean Mashariki
+				EC$
+				$
 			
 			
 				Faranga ya Afrika Magharibi CFA
 				faranga ya Afrika Magharibi CFA
 				faranga za Afrika Magharibi CFA
+				CFA
 			
 			
 				Faranga ya CFP
 				faranga ya CFP
 				faranga za CFP
+				CFPF
 			
 			
 				Sarafu isiyojulikana
@@ -5557,11 +5814,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rial ya Yemen
 				rial ya Yemen
 				rial za Yemen
+				YER
 			
 			
 				Randi ya Afrika Kusini
 				randi ya Afrika Kusini
 				randi za Afrika Kusini
+				ZAR
+				R
 			
 			
 				Kwacha ya Zambia (1968–2012)
@@ -5570,6 +5830,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kwacha ya Zambia
 				kwacha ya Zambia
 				kwacha za Zambia
+				ZMW
+				ZK
 			
 			
 				Dola ya Zimbabwe
@@ -5802,6 +6064,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				karne {0}
 				karne {0}
 			
+			
+				miongo
+				mwongo {0}
+				miongo {0}
+			
 			
 				miaka
 				mwaka {0}
@@ -5914,10 +6181,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				elektrovolti {0}
 				elektrovolti {0}
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				vipimo vya gesi, Marekani
+				kipimo {0} cha gesi, Marekani
+				vipimo {0} vya gesi, Marekani
 			
 			
 				pauni za kani
@@ -5949,6 +6216,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hezi {0}
 				hezi {0}
 			
+			
+				em ya kupiga chapa
+				em {0}
+				em {0}
+			
+			
+				pikseli
+				pikseli {0}
+				pikseli {0}
+			
+			
+				megapikseli
+				megapikseli {0}
+				megapikseli {0}
+			
+			
+				pikseli kwa kila sentimita
+				pikseli {0} kwa kila sentimita
+				pikseli {0} kwa kila sentimita
+			
+			
+				pikseli kwa kila inchi
+				pikseli {0} kwa kila inchi
+				pikseli {0} kwa kila inchi
+			
+			
+				vitone kwa kila sentimita
+				kitone {0} kwa kila sentimita
+				vitone {0} kwa kila sentimita
+			
+			
+				vitone kwa kila inchi
+				kitone {0} kwa kila inchi
+				vitone {0} kwa kila inchi
+			
 			
 				kilomita
 				kilomita {0}
@@ -6044,21 +6346,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pointi {0}
 				pointi {0}
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lux
 				lux {0}
 				lux {0}
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				tani mita
 				tani mita {0}
@@ -6113,21 +6405,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				karati {0}
 				karati {0}
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				gigawati
 				gigawati {0}
@@ -6158,11 +6435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kipimo cha hospawa {0}
 				kipimo cha hospawa {0}
 			
-			
-				hektopaskali
-				hektopaskali {0}
-				hektopaskali {0}
-			
 			
 				milimita za zebaki
 				milimita {0} ya zebaki
@@ -6178,6 +6450,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				inchi {0} ya zebaki
 				inchi {0} za zebaki
 			
+			
+				bari
+				bari {0}
+				bari {0}
+			
 			
 				kipimo cha milibari
 				kipimo cha milibari {0}
@@ -6188,6 +6465,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				kanieneo {0}
 				kanieneo {0}
 			
+			
+				paskali
+				paskali {0}
+				paskali {0}
+			
+			
+				hektopaskali
+				hektopaskali {0}
+				hektopaskali {0}
+			
 			
 				kilopaskali
 				kilopaskali {0}
@@ -6363,11 +6650,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				aunsi {0} ya ujazo
 				aunsi {0} za ujazo
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				vijiko vikubwa
 				kijiko {0} kikubwa
@@ -6517,8 +6799,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				permyriadi
-				{0}‱
-				{0}‱
 			
 			
 				moli
@@ -6605,6 +6885,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				karne {0}
 				karne {0}
 			
+			
+				miongo
+				mwongo {0}
+				miongo {0}
+			
 			
 				miaka
 				mwaka {0}
@@ -6714,23 +6999,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektrovolti
-				{0} eV
-				{0} eV
 			
-			
-				Btu
-				{0} Btu
-				{0} Btu
+			
+				kipimo cha gesi, Marekani
+				kipimo {0} cha gesi, US
+				vipimo {0} vya gesi, US
 			
 			
 				paunikani
-				{0} lbf
-				{0} lbf
 			
 			
 				newtoni
-				{0} N
-				{0} N
 			
 			
 				gigahezi
@@ -6752,6 +7031,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hezi {0}
 				hezi {0}
 			
+			
+				em {0}
+				em {0}
+			
+			
+				pikseli
+				px {0}
+				px {0}
+			
+			
+				MP {0}
+				MP {0}
+			
+			
+				ppcm {0}
+				ppcm {0}
+			
+			
+				ppi {0}
+				ppi {0}
+			
+			
+				dpcm {0}
+				dpcm {0}
+			
+			
+				dpi {0}
+				dpi {0}
+			
 			
 				kilomita
 				km {0}
@@ -6847,21 +7155,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				pointi {0}
 				pointi {0}
 			
-			
-				R☉
-				{0} R☉
-				{0} R☉
-			
 			
 				lux
 				lx {0}
 				lx {0}
 			
-			
-				L☉
-				{0} L☉
-				{0} L☉
-			
 			
 				tani mita
 				tani mita {0}
@@ -6916,21 +7214,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				karati {0}
 				karati {0}
 			
-			
-				Da
-				{0} Da
-				{0} Da
-			
-			
-				M⊕
-				{0} M⊕
-				{0} M⊕
-			
-			
-				M☉
-				{0} M☉
-				{0} M☉
-			
 			
 				gigawati
 				gigawati {0}
@@ -6961,15 +7244,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hektopaskali
-				hPa {0}
-				hPa {0}
-			
 			
 				milimita za zebaki
 				milimita {0} ya zebaki
-				{0} mm Hg
+				mm Hg {0}
 			
 			
 				pauni kwa kila inchi mraba
@@ -6981,6 +7259,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				bari
+				bari {0}
+				bari {0}
+			
 			
 				kipimo cha milibari
 				mbar {0}
@@ -6991,13 +7274,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atm {0}
 				atm {0}
 			
+			
+				Pa {0}
+				Pa {0}
+			
+			
+				hektopaskali
+				hPa {0}
+				hPa {0}
+			
 			
-				kPa
 				kPa {0}
 				kPa {0}
 			
 			
-				MPa
 				MPa {0}
 				MPa {0}
 			
@@ -7041,16 +7331,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				kilomita za ujazo
 				km³ {0}
@@ -7166,11 +7446,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				fl oz {0}
 				fl oz {0}
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				vijiko vikubwa
 				kijiko {0} kikubwa
@@ -7367,10 +7642,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				hp {0}
 				hp {0}
 			
-			
-				hPa {0}
-				hPa {0}
-			
 			
 				{0} inHg
 				{0} inHg
@@ -7379,6 +7650,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mbar {0}
 				mbar {0}
 			
+			
+				hPa {0}
+				hPa {0}
+			
 			
 				kilomita kwa saa
 				km {0}/saa
@@ -7445,10 +7720,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} au {1}
 			{0} au {1}
 		
-		
+		
 			{0}, {1}
 			{0}, {1}
-			{0} na {1}
+			{0} au {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+			{0}, au {1}
+			{0} au {1}
+		
+		
 			{0}, {1}
 		
 		
diff --git a/make/data/cldr/common/main/sw_CD.xml b/make/data/cldr/common/main/sw_CD.xml
index e856bd6accd..6d29e69e878 100644
--- a/make/data/cldr/common/main/sw_CD.xml
+++ b/make/data/cldr/common/main/sw_CD.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sw_KE.xml b/make/data/cldr/common/main/sw_KE.xml
index b53ea806274..c67c2f44d4a 100644
--- a/make/data/cldr/common/main/sw_KE.xml
+++ b/make/data/cldr/common/main/sw_KE.xml
@@ -7,12 +7,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
 		
+			Kiarabu sanifu
 			Kiarabu cha Aljeria
 			Kiasamisi
 			Kicheroki
@@ -43,6 +44,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Kiin’ko
 			Kiodia
 			Kipijini cha Nigeria
+			Kimoldova cha Romania
 			Kikoyraborosenni
 			Kiarabu cha Chadi
 			Kisranantongo
@@ -54,8 +56,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Kiudumurti
 			Kiuiguri
 			Kitamazighati Sanifu cha Moroko
+			Kichina, Kimandarini
+			Kichina cha Kimandarini Rahisi
+			Kichina cha Kimandarini cha Jadi
 		
+		
+			
+			
+			
+			
+			
+			
+			
+			
+		
 		
+			Kusini mwa Jangwa la Sahara
 			Afghanistani
 			Anguila
 			Antaktika
@@ -66,6 +82,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Visiwa vya Kokos (Keeling)
 			Kongo - Kinshasa
 			Ivorikosti
+			Kepuvede
 			Saiprasi
 			Denmaki
 			Keuta na Melilla
@@ -89,10 +106,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moroko
 			Monako
 			Masedonia
-			Masedonia (FYROM)
 			Myama (Burma)
-			Makau SAR China
-			Makau
 			Martiniki
 			Montserati
 			Maldivi
@@ -122,43 +136,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Visiwa vya Virgin vya Uingereza
 			Visiwa vya Virgin vya Marekani
 			Vietnamu
+			Kiinitoni cha kigeni
+			Pseudo-Bidi
 			Mayote
 		
+		
+			Kipindi cha saa (12 dhidi ya 24)
+			Tofauti ya Lugha
+		
+		
+			Kalenda ya Kidangi
+			Kalenda ya Kihabeshi
+			Kalenda ya kihibrania
+			Nambari za Kihabeshi
+			Nambari za Kijiojia
+			Nambari za Kihibrania
+			Nambari za Kimalayalam
+			Nambari za Kimyama
+			Nambari za Kitamili
+		
+		
+			Kipimo
+		
 	
+	
+		[a b c d e f g h i j k l m n o p q r s t u v w x y z]
+	
 	
 		
 			
-				
-					
-						
-							{1} 'saa' {0}
-						
-					
-					
-						
-							{1} 'saa' {0}
-						
-					
-					
-						
-							{1}, {0}
-						
-					
-					
-						
-							{1}, {0}
-						
-					
-				
-			
-			
-				
-					
-						
-							PM
-						
-					
-				
+				
+					
+						
+							EEEE, d MMMM y G
+						
+					
+					
+						
+							d MMMM y G
+						
+					
+					
+						
+							d MMM y G
+						
+					
+					
+						
+							dd/MM/y GGGGG
+						
+					
+				
 				
 					
 						
@@ -183,5 +211,998 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 			
 		
+		
+			
+				
+					Saa ya Ulimwenguni
+				
+			
+			
+				Makwuarie
+			
+			
+				Babadosi
+			
+			
+				Bamuda
+			
+			
+				Kostarika
+			
+			
+				Krismasi
+			
+			
+				Dominika
+			
+			
+				Kanari
+			
+			
+				Guadalupe
+			
+			
+				Bandari ya au-Prince
+			
+			
+				Jamaika
+			
+			
+				Kostanay
+			
+			
+				Kolombo
+			
+			
+				Yangon
+			
+			
+				Makao
+			
+			
+				Matinikiu
+			
+			
+				Maldivi
+			
+			
+				Singapoo
+			
+			
+				Elsalvado
+			
+			
+				Bandari ya Uhispania
+			
+			
+				Beulah, Dakota Kaskazini
+			
+			
+				New Salem, Dakota Kaskazini
+			
+			
+				Center, Dakota Kaskazini
+			
+			
+				Jiji la Ho Chi Minh
+			
+			
+				
+					Saa za Afghanistani
+				
+			
+			
+				
+					Saa za Ajentina
+					Saa za Wastani za Ajentina
+					Saa za Majira Joto za Ajentina
+				
+			
+			
+				
+					Saa za Magharibi mwa Ajentina
+					Saa za Wastani za Magharibi mwa Ajentina
+					Saa za Majira ya Joto za Magharibi mwa Ajentina
+				
+			
+			
+				
+					Saa za Magharibi mwa Austrialia ya Kati
+					Saa za Wastani za Magharibi mwa Australia ya Kati
+					Saa za Mchana za Magharibi mwa Australia ya Kati
+				
+			
+			
+				
+					Saa za Azabajani
+					Saa za Wastani za Azabajani
+					Saa za Majira ya Joto za Azabajani
+				
+			
+			
+				
+					Saa za Bangladeshi
+					Saa za Wastani za Bangladeshi
+					Saa za Majira ya Joto za Bangladeshi
+				
+			
+			
+				
+					Saa za Butani
+				
+			
+			
+				
+					Saa za Brazili
+					Saa za Wastani za Brazili
+					Saa za Majira ya Joto za Brazili
+				
+			
+			
+				
+					Saa za Kepuvede
+					Saa za Wastani za Kepuvede
+					Saa za Majira ya Joto za Kepuvede
+				
+			
+			
+				
+					Saa za Kisiwa cha Krismasi
+				
+			
+			
+				
+					Saa za Kolombia
+					Saa za Wastani za Kolombia
+					Saa za Majira ya Joto za Kolombia
+				
+			
+			
+				
+					Saa za Visiwa vya Cook
+					Saa za Wastani za Visiwa vya Cook
+					Saa za Majira Nusu ya Joto za Visiwa vya Cook
+				
+			
+			
+				
+					Saa za Kuba
+					Saa za Wastani za Kuba
+					Saa za Mchana za Kuba
+				
+			
+			
+				
+					Saa za Kisiwa cha Easter
+					Saa za Wastani za Kisiwa cha Easter
+					Saa za Majira ya Joto za Kisiwa cha Easter
+				
+			
+			
+				
+					Saa za Ekwado
+				
+			
+			
+				
+					Saa za Guiana
+				
+			
+			
+				
+					Saa za Jiojia
+					Saa za Wastani za Jiojia
+					Saa za Majira ya Joto za Jiojia
+				
+			
+			
+				
+					Saa za Wastani za Ghuba
+				
+			
+			
+				
+					Saa za Wastani za India
+				
+			
+			
+				
+					Saa za Irani
+					Saa za Wastani za Irani
+					Saa za Mchana za Irani
+				
+			
+			
+				
+					Saa za Japani
+					Saa za Wastani za Japani
+					Saa za Mchana za Japani
+				
+			
+			
+				
+					Saa za Kazakistani Mashariki
+				
+			
+			
+				
+					Saa za Kazakistani Magharibi
+				
+			
+			
+				
+					Saa za Makwuarie
+				
+			
+			
+				
+					Saa za Malesia
+				
+			
+			
+				
+					Saa za Maldivi
+				
+			
+			
+				
+					Saa za Kaskazini Magharibi mwa Meksiko
+					Saa za Wastani za Kaskazini Magharibi mwa Meksiko
+					Saa za Mchana za Kaskazini Magharibi mwa Meksiko
+				
+			
+			
+				
+					Saa za Ulaanbataar
+					Saa za Wastani za Ulaanbataar
+					Saa za Majira ya Joto za Ulaanbaatar
+				
+			
+			
+				
+					Saa za Myama
+				
+			
+			
+				
+					Saa za Nepali
+				
+			
+			
+				
+					Saa za Kaledonia Mpya
+					Saa za Wastani za Kaledonia Mpya
+					Saa za Majira ya Joto za Kaledonia Mpya
+				
+			
+			
+				
+					Saa za Nyuzilandi
+					Saa za Wastani za Nyuzilandi
+					Saa za Mchana za Nyuzilandi
+				
+			
+			
+				
+					Saa za Pakistani
+					Saa za Wastani za Pakistani
+					Saa za Majira ya Joto za Pakistani
+				
+			
+			
+				
+					Saa za Papua
+				
+			
+			
+				
+					Saa za Paragwai
+					Saa za Wastani za Paragwai
+					Saa za Majira ya Joto za Paragwai
+				
+			
+			
+				
+					Saa za Visiwa vya Finiksi
+				
+			
+			
+				
+					Saa za Wastani za Singapoo
+				
+			
+			
+				
+					Saa za Jojia Kusini
+				
+			
+			
+				
+					Saaza Tajikistani
+				
+			
+			
+				
+					Saa za Turkmenistani
+					Saa za Wastani za Turkmenistani
+					Saa za Majira ya Joto za Turkmenistani
+				
+			
+			
+				
+					Saa za Uruagwai
+					Saa za Wastani za Urugwai
+					Saa za Majira ya Joto za Urugwai
+				
+			
+			
+				
+					Saa za Uzbekistani
+					Saa za wastani za Uzbekistani
+					Saa za Majira ya Joto za Uzbekistani
+				
+			
+		
 	
+	
+		
+			
+				
+					elfu 0;elfu -0
+					elfu 0;elfu -0
+					elfu 00;elfu -00
+					elfu 00
+					elfu 000
+					elfu 000
+					milioni 0
+					milioni 0
+					milioni 00
+					milioni 00
+					milioni 000
+					milioni 000
+					bilioni 0
+					bilioni 0
+					bilioni 00
+					bilioni 00
+					bilioni 000
+					bilioni 000
+					trilioni 0
+					trilioni 0
+					trilioni 00
+					trilioni 00
+					trilioni 000
+					trilioni 000
+				
+			
+			
+				
+					elfu 0
+					elfu 0
+					elfu 00
+					elfu 00
+					elfu 000
+					elfu 000
+					M0
+					M0
+					M00
+					M00
+					M000
+					M000
+					B0
+					B0
+					B00
+					B00
+					B000
+					B000
+					T0
+					T0
+					T00
+					T00
+					T000
+					T000
+				
+			
+		
+		
+			
+				
+					¤ M0;¤-M0
+					¤ M0
+					¤ M00;¤M-M00
+					¤ M00;¤-M00
+					¤ M000;¤M-000
+					¤ M000
+					¤ B0;¤-B0
+					¤ B0;¤-B0
+					¤ B00;¤-B00
+					¤ B00;¤-B00
+					¤ B000;¤-B000
+					¤ B000;¤-B000
+					¤ T0;¤-T0
+					¤ T0
+					¤ T00;¤-T00
+					¤ T00
+					¤ T000;¤-T000
+					¤ T000;¤-T000
+				
+			
+		
+		
+			
+				Diramu ya Falme za Kiarabu
+				diramu ya Falme za Kiarabu
+				diramu za Falme za Kiarabu
+			
+			
+				Afghani ya Afghanistani
+				afghani ya Afghanistani
+				afghani za Afghanistani
+			
+			
+				Gilda ya Antili ya Uholanzi
+				gilda ya Antili ya Uholanzi
+				gilda za Antili ya Uholanzi
+			
+			
+				Peso ya Ajentina
+				peso ya Ajentina
+				peso za Ajentina
+			
+			
+				florin ya Aruba
+				florin ya Aruba
+			
+			
+				Manati ya Azabajani
+				manati ya Azabajani
+				manati za Azabajani
+			
+			
+				Maki ya Bosnia na Hezegovina Inayoweza Kubadilishwa
+				maki ya Bosnia na Hezegovina inayoweza kubadilishwa
+				maki za Bosnia na Hezegovina zinazoweza kubadilishwa
+			
+			
+				Dola ya Babadosi
+				dola ya Babadosi
+				dola za Babadosi
+			
+			
+				Taka ya Bangladeshi
+				taka ya Bangladeshi
+				taka za Bangladeshi
+			
+			
+				Dinari ya Bahareni
+				dinari ya Bahareni
+				dinari za Bahareni
+			
+			
+				Dola ya Bamuda
+				dola ya Bamuda
+				dola za Bamuda
+			
+			
+				boliviano ya Bolivia
+				boliviano za Bolivia
+			
+			
+				Reale ya Brazili
+				reale ya Brazili
+				reale za Brazili
+			
+			
+				Dola ya Bahama
+				dola ya Bahama
+				dola za Bahama
+			
+			
+				Ngultrumi ya Bhutani
+				ngultrumi ya Bhutani
+				ngultrumi za Bhutani
+			
+			
+				Ruble ya Belarusi
+				ruble ya Belarusi
+				ruble za Belarusi
+			
+			
+				Dola ya Kanada
+				dola ya Kanada
+				dola za Kanada
+			
+			
+				peso ya Chile
+				peso za Chile
+			
+			
+				Yuan ya China (huru)
+				yuan ya China (huru)
+				yuan ya China (huru)
+			
+			
+				Yuan ya China
+				yuan ya China
+				yuan za China
+			
+			
+				Peso ya Kolombia
+				peso ya Kolombia
+				peso za Kolombia
+			
+			
+				Colon ya Kostarika
+				colon ya Kostarika
+				colon za Kostarika
+			
+			
+				Peso ya Kuba Inayoweza Kubadilishwa
+				peso ya Kuba inayoweza kubadilishwa
+				peso za Kuba zinazoweza kubadilishwa
+			
+			
+				Peso ya Kuba
+				peso ya Kuba
+				peso za Kuba
+			
+			
+				Eskudo ya Kepuvede
+				eskudo ya Kepuvede
+				eskudo za Kepuvede
+			
+			
+				Koruna ya Cheki
+				koruna ya Cheki
+				koruna za Cheki
+			
+			
+				Faranga ya Jibuti
+				faranga ya Jibuti
+				faranga za Jibuti
+			
+			
+				Kroni ya Denmaki
+				kroni ya Denmaki
+				kroni za Denmaki
+			
+			
+				Peso ya Dominika
+				peso ya Dominika
+				peso za Dominika
+			
+			
+				Dinari ya Aljeria
+				dinari ya Aljeria
+				dinari za Aljeria
+			
+			
+				pauni ya Visiwa vya Falkland
+				pauni za Visiwa vya Falkland
+			
+			
+				Lari ya Jiojia
+				lari ya Jiojia
+				lari za Jiojia
+			
+			
+				Sidi ya Ghana
+				sidi ya Ghana
+				sidi za Ghana
+			
+			
+				Pauni ya Jibrata
+				pauni ya Jibrata
+				pauni za Jibrata
+			
+			
+				dola ya Guyana
+				dola za Guyana
+			
+			
+				Kuna ya Kroeshia
+				kuna ya Kroeshia
+				kuna za Kroeshia
+			
+			
+				Godi ya Haiti
+				godi ya Haiti
+				godi za Haiti
+			
+			
+				Forinti ya Hungaria
+				forinti ya Hungaria
+				forinti za Hungaria
+			
+			
+				Rupia ya Indonesia
+				rupia ya Indonesia
+				rupia za Indonesia
+			
+			
+				Dinari ya Iraki
+				dinari ya Iraki
+				dinari za Iraki
+			
+			
+				Riali ya Irani
+				riali ya Irani
+				riali za Irani
+			
+			
+				Dola ya Jamaika
+				dola ya Jamaika
+				dola za Jamaika
+			
+			
+				Dinari ya Yordani
+				dinari ya Yordani
+				dinari za Yordani
+			
+			
+				Yeni ya Japani
+				yeni ya japani
+				yeni za japani
+			
+			
+				Rieli ya Kambodia
+				rieli ya Kambodia
+				rieli za Kambodia
+			
+			
+				Faranga ya Komoro
+				faranga ya Komoro
+				faranga za Komoro
+			
+			
+				Dinari ya Kuwait
+				dinari ya Kuwait
+				dinari za Kuwait
+			
+			
+				dola ya Visiwa vya Cayman
+				dola za Visiwa vya Cayman
+			
+			
+				Tenge ya Kazakistani
+				tenge ya Kazakistani
+				tenge za Kazakistani
+			
+			
+				Pauni ya Lebanoni
+				pauni ya Lebanoni
+				pauni za Lebanoni
+			
+			
+				Diramu ya Moroko
+				diramu ya Moroko
+				diramu za Moroko
+			
+			
+				Ariari ya Madagaska
+				ariari ya Madagaska
+				Ariari za Madagaska
+			
+			
+				Dinari ya Masedonia
+				dinari ya Masedonia
+				dinari za Masedonia
+			
+			
+				Kiati ya Myama
+				kiati ya Myama
+				kiati za Myama
+			
+			
+				Pataka ya Macau
+				pataka ya Macau
+				pataka za Macau
+			
+			
+				Rufiyaa ya Maldivi
+				rufiyaa ya Maldivi
+				rufiyaa za Maldivi
+			
+			
+				Peso ya Meksiko
+				peso ya Meksiko
+				peso za Meksiko
+			
+			
+				Ringgiti ya Malesia
+				ringgiti ya Malesia
+				ringgiti za Malesia
+			
+			
+				Naira ya Naijeria
+				naira ya Naijeria
+				Naira za Naijeria
+			
+			
+				Cordoba ya Nikaragwa
+				cordoba ya Nikaragwa
+				cordoba za Nikaragwa
+			
+			
+				Kroni ya Norwe
+				kroni ya Norwe
+				kroni za Norwe
+			
+			
+				Rupia ya Nepali
+				rupia ya Nepali
+				rupia za Nepali
+			
+			
+				Dola ya Nyuzilandi
+				dola ya Nyuzilandi
+				dola za Nyuzilandi
+			
+			
+				Riali ya Omani
+				riali ya Omani
+				riali za Omani
+			
+			
+				balboa ya Panama
+				balboa za Panama
+			
+			
+				sol ya Peru
+				sol za Peru
+			
+			
+				Rupia ya Pakistani
+				rupia ya Pakistani
+				rupia za Pakistani
+			
+			
+				Zloti ya Polandi
+				zloti ya Polandi
+				zloti za Polandi
+			
+			
+				Guarani ya Paragwai
+				guarani ya Paragwai
+				guarani za Paragwai
+			
+			
+				Riali ya Katari
+				riali ya Katari
+				riali za Katari
+			
+			
+				Dinari ya Serbia
+				dinari ya Serbia
+				dinari za Serbia
+			
+			
+				Riyali ya Saudia
+				riyali ya Saudia
+				riyali za Saudia
+			
+			
+				Dola ya Visiwa vya Solomoni
+				dola ya Visiwa vya Solomoni
+				dola za Visiwa vya Solomoni
+			
+			
+				Pauni ya Sudani
+				pauni ya Sudani
+				pauni za Sudani
+			
+			
+				Dola ya Singapoo
+				dola ya Singapoo
+				dola za Singapoo
+			
+			
+				Leoni ya Siera Leoni
+				leoni ya Siera Leoni
+				leoni za Siera Leoni
+			
+			
+				dola ya Suriname
+				dola za Suriname
+			
+			
+				Pauni ya Sudani Kusini
+				pauni ya Sudani Kusini
+				pauni za Sudani Kusini
+			
+			
+				Lilangeni ya Uswazi
+				lilangeni ya Uswazi
+				lilangeni za Uswazi
+			
+			
+				Bahti ya Tailandi
+				bahti ya Tailandi
+				bahti za Tailandi
+			
+			
+				Somoni ya Tajikistani
+				somoni ya Tajikistani
+				somoni za Tajikistani
+			
+			
+				Manati ya Turkmenistani
+				manati ya Turkmenistani
+				manati za Turkmenistani
+			
+			
+				Dola ya Trinidadi na Tobago
+				dola ya Trinidadi na Tobago
+				dola za Trinidadi na Tobago
+			
+			
+				Dola ya Taiwani
+				dola ya Taiwani
+				dola za Taiwani
+			
+			
+				Hryvnia ya Ukraini
+				hryvnia ya Ukraini
+				hryvnia za Ukraini
+			
+			
+				$
+			
+			
+				Peso ya Urugwai
+				peso ya Urugwai
+				peso za Urugwai
+			
+			
+				Som ya Uzbekistani
+				som ya Uzbekistani
+				som za Uzbekistani
+			
+			
+				Boliva ya Venezuela
+				boliva ya Venezuele
+				boliva za Venezuela
+			
+			
+				Dong ya Vietnamu
+				dong ya Vietnamu
+				Dong za Vietnamu
+			
+			
+				Faranga ya CFA ya Afrika ya Kati
+				faranga ya CFA ya Afrika ya Kati
+				faranga ya CFA ya Afrika ya Kati
+			
+			
+				Dola ya Karibi Mashariki
+				dola ya Karibi Mashariki
+				dola za Karibi Mashariki
+			
+			
+				Faranga ya CFA ya Afrika Magharibi
+				faranga ya CFA ya Afrika Magharibi
+				faranga za CFA ya Afrika Magharibi
+			
+			
+				Sarafu Isiyojulikana
+			
+			
+				Riali ya Yemeni
+				riali ya Yemeni
+				riali za Yemeni
+			
+		
+	
+	
+		
+			
+				mwongo
+			
+			
+				maikrosekunde
+				maikroseunde {0}
+				maikrosekunde {0}
+			
+			
+				ukubwa wa nafasi ya fonti
+			
+			
+				pikseli {0} kwa kila sekunde
+				pikseli {0} kwa kila sekunde
+			
+			
+				nukta kwa kila sentimita
+				nukta {0} kwa kila sentimita
+				nukta {0} kwa kila sentimita
+			
+			
+				nukta kwa kila inchi
+				nuka {0} kwa kila inchi
+				nukta {0} kwa kila inchi
+			
+			
+				maikromita
+				maikromita {0}
+				maikromita {0}
+			
+			
+				miaka {0} ya mwanga
+				miaka {0} ya mwanga
+			
+			
+				maili {0} ya skandinavia
+				maili {0} za skandinavia
+			
+			
+				nusu vipenyo vya jua
+				nusu kipenyo {0} cha jua
+				nusu vipenyo {0} vya jua
+			
+			
+				baa
+				baa {0}
+				baa {0}
+			
+			
+				Pa {0}
+				Pa {0}
+			
+		
+		
+			
+				cm²
+			
+			
+				maili/gal Imp
+			
+			
+				mwongo
+			
+			
+				pikseli {0}
+				pikseli {0}
+			
+			
+				megapikseli
+			
+			
+				maikromita
+				maikromita {0}
+				maikromita {0}
+			
+			
+				{0} pc
+				kila sekunde {0}
+			
+			
+				kipimo cha astronomia
+			
+			
+				smi {0}
+				smi {0}
+			
+			
+				nusu vipenyo vya jua
+				R☉ {0}
+				R☉ {0}
+			
+			
+				inHg {0}
+				inHg {0}
+			
+			
+				baa
+				baa {0}
+				baa {0}
+			
+		
+		
+			
+				mm{0}
+				mm{0}
+			
+		
+	
+	
+		hati za Mashariki ya Kati
+	
 
diff --git a/make/data/cldr/common/main/sw_TZ.xml b/make/data/cldr/common/main/sw_TZ.xml
index 98f55ef375f..aed97bb03e7 100644
--- a/make/data/cldr/common/main/sw_TZ.xml
+++ b/make/data/cldr/common/main/sw_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/sw_UG.xml b/make/data/cldr/common/main/sw_UG.xml
index 6dfea5465b1..869a9391a89 100644
--- a/make/data/cldr/common/main/sw_UG.xml
+++ b/make/data/cldr/common/main/sw_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ta.xml b/make/data/cldr/common/main/ta.xml
index 3f926bd83a6..4188cde1d0f 100644
--- a/make/data/cldr/common/main/ta.xml
+++ b/make/data/cldr/common/main/ta.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -51,7 +51,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			அவேரிக்
 			அவதி
 			அய்மரா
-			அஸர்பைஜானி
+			அசர்பைஜானி
 			அஸேரி
 			பஷ்கிர்
 			பலூச்சி
@@ -84,6 +84,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			கேடோ
 			கரீப்
 			ஆட்சம்
+			சக்மா
 			செச்சென்
 			செபுவானோ
 			சிகா
@@ -140,9 +141,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ஆஸ்திரேலிய ஆங்கிலம்
 			கனடிய ஆங்கிலம்
 			பிரிட்டிஷ் ஆங்கிலம்
-			ஆங்கிலம் (யூகே)
 			அமெரிக்க ஆங்கிலம்
-			ஆங்கிலம் (யூஎஸ்)
 			மிடில் ஆங்கிலம்
 			எஸ்பரேன்டோ
 			ஸ்பானிஷ்
@@ -534,14 +533,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			யெட்டிஷ்
 			யோருபா
 			காண்டோனீஸ்
+			சீனம், காண்டோனீஸ்
 			ஜுவாங்
 			ஜாபோடெக்
 			ப்லிஸ்ஸிம்பால்ஸ்
 			ஜெனகா
 			ஸ்டாண்டர்ட் மொராக்கன் தமாசைட்
 			சீனம்
+			சீனம், மாண்டரின்
 			எளிதாக்கப்பட்ட சீனம்
+			எளிதாக்கப்பட்ட சீன மாண்டரின்
 			பாரம்பரிய சீனம்
+			பாரம்பரிய சீன மாண்டரின்
 			ஜுலு
 			ஜூனி
 			மொழி உள்ளடக்கம் ஏதுமில்லை
@@ -735,7 +738,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ஆலந்து தீவுகள்
 			அசர்பைஜான்
 			போஸ்னியா & ஹெர்ஸகோவினா
-			பார்படோஸ்
+			பார்படாஸ்
 			பங்களாதேஷ்
 			பெல்ஜியம்
 			புர்கினா ஃபாஸோ
@@ -751,7 +754,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			பிரேசில்
 			பஹாமாஸ்
 			பூடான்
-			பொவேட் தீவுகள்
+			பொவேட் தீவு
 			போட்ஸ்வானா
 			பெலாரஸ்
 			பெலிஸ்
@@ -827,7 +830,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ஹாங்காங்
 			ஹேர்ட் மற்றும் மெக்டொனால்டு தீவுகள்
 			ஹோண்டூராஸ்
-			குரேஷியா
+			குரோஷியா
 			ஹைட்டி
 			ஹங்கேரி
 			கேனரி தீவுகள்
@@ -874,8 +877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			செயின்ட் மார்ட்டீன்
 			மடகாஸ்கர்
 			மார்ஷல் தீவுகள்
-			மாசிடோனியா
-			மாசிடோனியா (ஃபைரோம்)
+			வடக்கு மாசிடோனியா
 			மாலி
 			மியான்மார் (பர்மா)
 			மங்கோலியா
@@ -947,8 +949,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			எல் சால்வடார்
 			சின்ட் மார்டென்
 			சிரியா
-			ஸ்வாஸிலாந்து
-			SZ
+			எஸ்வாட்டீனி
+			எஸ்வாட்டீனி
 			டிரிஸ்டன் டா குன்ஹா
 			டர்க்ஸ் & கைகோஸ் தீவுகள்
 			சாட்
@@ -957,7 +959,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			தாய்லாந்து
 			தஜிகிஸ்தான்
 			டோகேலோ
-			தைமூர்-லெஸ்தே
+			திமோர்-லெஸ்தே
 			கிழக்கு தைமூர்
 			துர்க்மெனிஸ்தான்
 			டுனிசியா
@@ -985,6 +987,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			வனுவாட்டு
 			வாலிஸ் மற்றும் ஃபுடுனா
 			சமோவா
+			போலி உச்சரிப்புகள்
+			போலி பீடி
 			கொசோவோ
 			ஏமன்
 			மயோட்
@@ -1141,26 +1145,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ ஃ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன ஜ ஷ ஸ ஹ ா ி \u0BC0 ு ூ ெ ே ை ொ ோ ௌ \u0BCD]
 		[\u200C\u200D]
 		[அ ஆ இ ஈ உ ஊ எ ஏ ஐ ஒ ஓ ஔ க ங ச ஞ ட ண த ந ப ம ய ர ல வ ழ ள ற ன ஜ ஶ ஷ ஸ ஹ {க\u0BCDஷ}]
-		[\- , . % ‰ + 0௦ 1௧ 2௨ 3௩ 4௪ 5௫ 6௬ 7௭ 8௮ 9௯]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0௦ 1௧ 2௨ 3௩ 4௪ 5௫ 6௬ 7௭ 8௮ 9௯]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		{0}…
+		…{0}
+		{0}…{1}
+		{0} …
+		… {0}
+		{0} … {1}
+		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
+	
+		“
+		”
+		‘
+		’
+	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1178,6 +1212,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							மா11
 							மா12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							மாதம்1
 							மாதம்2
@@ -1208,6 +1256,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							மா11
 							மா12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							மாதம்1
 							மாதம்2
@@ -1314,6 +1376,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1382,6 +1458,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1474,56 +1564,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							a h – a h
 							a h–h
@@ -2047,56 +2090,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
-						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
-						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							a h – a h
 							a h–h
@@ -2260,6 +2256,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2399,6 +2406,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2463,17 +2481,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
 					
 						R.O.C. -க்கு முன்பு
+						R.O.C.
 					
 					
 						ROCக்கு முன்
+						R.O.C.
 					
 					
 						ROCக்கு முன்
+						R.O.C.
 					
 				
 			
@@ -3823,7 +3855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				அக்டோப்
 			
 			
-				கோஸ்டானே
+				கோஸ்டானே
 			
 			
 				கிஸிலோர்டா
@@ -5403,22 +5435,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			tamldec
 			taml
 		
 		1
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5575,418 +5617,554 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ஐக்கிய அரபு எமிரேட்ஸ் திர்ஹாம்
 				ஐக்கிய அரபு எமிரேட்ஸ் திர்ஹாம்
 				ஐக்கிய அரபு எமிரேட்ஸ் திர்ஹாம்கள்
+				AED
 			
 			
 				ஆஃப்கான் ஆஃப்கானி
 				ஆஃப்கான் ஆஃப்கானி
 				ஆஃப்கான் ஆஃப்கானிகள்
+				AFN
 			
 			
 				அல்பேனியன் லெக்
 				அல்பேனியன் லெக்
 				அல்பேனியன் லெகே
+				ALL
 			
 			
 				ஆர்மேனியன் ட்ராம்
 				ஆர்மேனியன் ட்ராம்
 				ஆர்மேனியன் ட்ராம்கள்
+				AMD
 			
 			
 				நெதர்லேண்ட்ஸ் அன்டிலியன் கில்டர்
 				நெதர்லேண்ட்ஸ் அன்டிலியன் கில்டர்
 				நெதர்லேண்ட்ஸ் அன்டிலியன் கில்டர்கள்
+				ANG
 			
 			
 				அங்கோலன் க்வான்ஸா
 				அங்கோலன் க்வான்ஸா
 				அங்கோலன் க்வான்ஸாக்கள்
+				AOA
+				Kz
 			
 			
 				அர்ஜென்டைன் பெசோ
 				அர்ஜென்டைன் பெசோ
 				அர்ஜென்டைன் பெசோக்கள்
+				ARS
+				$
 			
 			
 				ஆஸ்திரேலிய டாலர்
 				ஆஸ்திரேலிய டாலர்
 				ஆஸ்திரேலிய டாலர்கள்
+				A$
+				$
 			
 			
 				அருபன் ஃப்ளோரின்
 				அருபன் ஃப்ளோரின்
 				அருபன் ஃப்ளோரின்
+				AWG
 			
 			
 				அசர்பைஜானி மனத்
 				அஜர்பைசானி மனத்
 				அசர்பைஜானி மனத்கள்
+				AZN
 			
 			
 				போஸ்னியா-ஹெர்ஸேகோவினா கன்வெர்டிபில் மார்க்
 				போஸ்னியா-ஹெர்ஸேகோவினா கன்வெர்டிபில் மார்க்
 				போஸ்னியா-ஹெர்ஸேகோவினா கன்வெர்டிபில் மார்க்குகள்
+				BAM
+				KM
 			
 			
 				பார்பேடியன் டாலர்
 				பார்பேடியன் டாலர்
 				பார்பேடியன் டாலர்கள்
+				BBD
+				$
 			
 			
 				பங்களாதேஷி டாகா
 				பங்களாதேஷி டாகா
 				பங்களாதேஷி டாகாக்கள்
+				BDT
+				৳
 			
 			
 				பல்கேரியன் லேவ்
 				பல்கேரியன் லேவ்
 				பல்கேரியன் லேவா
+				BGN
 			
 			
 				பஹ்ரைனி தினார்
 				பஹ்ரைனி தினார்
 				பஹ்ரைனி தினார்கள்
+				BHD
 			
 			
 				புருண்டியன் ஃப்ராங்க்
 				புருண்டியன் ஃப்ராங்க்
 				புருண்டியன் ஃப்ராங்க்குகள்
+				BIF
 			
 			
 				பெர்முடன் டாலர்
 				பெர்முடன் டாலர்
 				பெர்முடன் டாலர்கள்
+				BMD
+				$
 			
 			
 				புரூனே டாலர்
 				புரூனே டாலர்
 				புரூனே டாலர்கள்
+				BND
+				$
 			
 			
 				பொலிவியன் பொலிவியானோ
 				பொலிவியன் பொலிவியானோ
 				பொலிவியன் பொலிவியானோக்கள்
+				BOB
+				Bs
 			
 			
 				பிரேசிலியன் ரியால்
 				பிரேசிலியன் ரியால்
 				பிரேசிலியன் ரியால்கள்
+				R$
+				R$
 			
 			
 				பஹாமியன் டாலர்
 				பஹாமியன் டாலர்
 				பஹாமியன் டாலர்கள்
+				BSD
+				$
 			
 			
 				பூட்டானீஸ் குல்ட்ரம்
 				பூட்டானீஸ் குல்ட்ரம்
 				பூட்டானீஸ் குல்ட்ரம்கள்
+				BTN
 			
 			
 				போட்ஸ்வானன் புலா
 				போட்ஸ்வானன் புலா
 				போட்ஸ்வானன் புலாக்கள்
+				BWP
+				P
 			
 			
 				பெலருசியன் ரூபிள்
 				பெலருசியன் ரூபிள்
 				பெலருசியன் ரூபிள்கள்
+				BYN
+				р.
 			
 			
 				பெலருசியன் ரூபிள் (2000–2016)
 				பெலருசியன் ரூபிள் (2000–2016)
 				பெலருசியன் ரூபிள்கள் (2000–2016)
+				BYR
 			
 			
 				பெலீஸ் டாலர்
 				பெலீஸ் டாலர்
 				பெலீஸ் டாலர்கள்
+				BZD
+				$
 			
 			
 				கனடியன் டாலர்
 				கனடியன் டாலர்
 				கனடியன் டாலர்கள்
+				CA$
+				$
 			
 			
 				காங்கோலீஸ் ஃப்ராங்க்
 				காங்கோலீஸ் ஃப்ராங்க்
 				காங்கோலீஸ் ஃப்ராங்க்குகள்
+				CDF
 			
 			
 				சுவிஸ் ஃப்ராங்க்
 				சுவிஸ் ஃப்ராங்க்
 				சுவிஸ் ஃப்ராங்குகள்
+				CHF
 			
 			
 				சிலியன் பெசோ
 				சிலியன் பெசோ
 				சிலியன் பெசோக்கள்
+				CLP
+				$
 			
 			
-				CNH
-				CNH
-				CNH
+				சீன யுவான் (ஆஃப்ஷோர்)
+				சீன யுவான் (ஆஃப்ஷோர்)
+				சீன யுவான் (ஆஃப்ஷோர்)
+				CNH
 			
 			
 				சீன யுவான்
 				சீன யுவான்
 				சீன யுவான்
+				CN¥
+				¥
 			
 			
 				கொலம்பியன் பெசோ
 				கொலம்பியன் பெசோ
 				கொலம்பியன் பெசோக்கள்
+				COP
+				$
 			
 			
 				கோஸ்டா ரிகன் கொலோன்
 				கோஸ்டா ரிகன் கொலோன்
 				கோஸ்டா ரிகன் கொலோன்கள்
+				CRC
+				₡
 			
 			
 				கியூபன் கன்வெர்டிபில் பெசோ
 				கியூபன் கன்வெர்டிபில் பெசோ
 				கியூபன் கன்வெர்டிபில் பெசோக்கள்
+				CUC
+				$
 			
 			
 				கியூபன் பெசோ
 				கியூபன் பெசோ
 				கியூபன் பெசோக்கள்
+				CUP
+				$
 			
 			
 				கேப் வெர்டியன் எஸ்குடோ
 				கேப் வெர்டியன் எஸ்குடோ
 				கேப் வெர்டியன் எஸ்குடோக்கள்
+				CVE
 			
 			
 				செக் குடியரசு கொருனா
 				செக் குடியரசு கொருனா
 				செக் குடியரசு கொருனாக்கள்
+				CZK
+				Kč
 			
 			
 				ஜிபவ்டியென் ஃப்ராங்க்
 				ஜிபவ்டியென் ஃப்ராங்க்
 				ஜிபவ்டியென் ஃப்ராங்க்குகள்
+				DJF
 			
 			
 				டேனிஷ் க்ரோன்
 				டேனிஷ் க்ரோன்
 				டேனிஷ் க்ரோனர்
+				DKK
+				kr
 			
 			
 				டொமினிக்கன் பெசோ
 				டொமினிக்கன் பெசோ
 				டொமினிக்கன் பெசோக்கள்
+				DOP
+				$
 			
 			
 				அல்ஜீரியன் தினார்
 				அல்ஜீரியன் தினார்
 				அல்ஜீரியன் தினார்கள்
+				DZD
 			
 			
 				எகிப்திய பவுண்டு
 				எகிப்திய பவுண்டு
 				எகிப்திய பவுண்டுகள்
+				EGP
+				E£
 			
 			
 				எரித்ரியன் நக்ஃபா
 				எரித்ரியன் நக்ஃபா
 				எரித்ரியன் நக்ஃபாக்கள்
+				ERN
 			
 			
 				எத்தியோப்பியன் பிர்
 				எத்தியோப்பியன் பிர்
 				எத்தியோப்பியன் பிர்கள்
+				ETB
 			
 			
 				யூரோ
 				யூரோ
 				யூரோக்கள்
+				€
+				€
 			
 			
 				ஃபிஜியன் டாலர்
 				ஃபிஜியன் டாலர்
 				ஃபிஜியன் டாலர்கள்
+				FJD
+				$
 			
 			
 				ஃபாக்லாந்து தீவுகள் பவுண்டு
 				ஃபாக்லாந்து தீவுகள் பவுண்டு
 				ஃபாக்லாந்து தீவுகள் பவுண்டுகள்
+				FKP
+				£
 			
 			
 				பிரிட்டிஷ் பவுண்டு
 				பிரிட்டிஷ் பவுண்டு
 				பிரிட்டிஷ் பவுண்டுகள்
+				£
+				£
 			
 			
 				ஜார்ஜியன் லாரி
 				ஜார்ஜியன் லாரி
 				ஜார்ஜியன் லாரிகள்
+				GEL
+				₾
 				₾
 			
 			
 				கானயன் சேடி
 				கானயன் சேடி
 				கானயன் சேடிகள்
+				GHS
 			
 			
 				ஜிப்ரால்டர் பவுண்டு
 				ஜிப்ரால்டர் பவுண்டு
 				ஜிப்ரால்டர் பவுண்டுகள்
+				GIP
+				£
 			
 			
 				கேம்பியன் தலாசி
 				கேம்பியன் தலாசி
 				கேம்பியன் தலாசிகள்
+				GMD
 			
 			
 				கினியன் ஃப்ராங்க்
 				கினியன் ஃப்ராங்க்
 				கினியன் ஃப்ராங்குகள்
+				GNF
+				FG
 			
 			
 				குவாதெமாலன் க்யுட்ஸல்
 				குவாதெமாலன் க்யுட்ஸல்
 				குவாதெமாலன் க்யுட்ஸல்கள்
+				GTQ
+				Q
 			
 			
 				கயானீஸ் டாலர்
 				கயானீஸ் டாலர்
 				கயானீஸ் டாலர்கள்
+				GYD
+				$
 			
 			
 				ஹாங்காங் டாலர்
 				ஹாங்காங் டாலர்
 				ஹாங்காங் டாலர்கள்
+				HK$
+				$
 			
 			
 				ஹோன்டூரன் லெம்பீரா
 				ஹோன்டூரன் லெம்பீரா
 				ஹோன்டூரன் லெம்பீராக்கள்
+				HNL
+				L
 			
 			
 				குரோஷியன் குனா
 				குரோஷியன் குனா
 				குரோஷியன் குனாக்கள்
+				HRK
+				kn
 			
 			
 				ஹைட்டியன் கோர்டே
 				ஹைட்டியன் கோர்டே
 				ஹைட்டியன் கோர்டேக்கள்
+				HTG
 			
 			
 				ஹங்கேரியன் ஃபோரின்ட்
 				ஹங்கேரியன் ஃபோரின்ட்
 				ஹங்கேரியன் ஃபோரின்ட்கள்
+				HUF
+				Ft
 			
 			
 				இந்தோனேஷியன் ருபியா
 				இந்தோனேஷியன் ருபியா
 				இந்தோனேஷியன் ருபியாக்கள்
+				IDR
+				Rp
 			
 			
 				இஸ்ரேலி நியூ ஷிகேல்
 				இஸ்ரேலி நியூ ஷிகேல்
 				இஸ்ரேலி நியூ ஷிகேல்கள்
+				₪
+				₪
 			
 			
 				இந்திய ரூபாய்
 				இந்திய ரூபாய்
 				இந்திய ரூபாய்கள்
+				₹
+				₹
 			
 			
 				ஈராக்கி தினார்
 				ஈராக்கி தினார்
 				ஈராக்கி தினார்கள்
+				IQD
 			
 			
 				ஈரானியன் ரியால்
 				ஈரானியன் ரியால்
 				ஈரானியன் ரியால்கள்
+				IRR
 			
 			
 				ஐஸ்லாண்டிக் க்ரோனா
 				ஐஸ்லாண்டிக் க்ரோனா
 				ஐஸ்லாண்டிக் க்ரோனர்
+				ISK
+				kr
 			
 			
 				ஜமைக்கன் டாலர்
 				ஜமைக்கன் டாலர்
 				ஜமைக்கன் டாலர்கள்
+				JMD
+				$
 			
 			
 				ஜோர்டானிய தினார்
 				ஜோர்டானிய தினார்
 				ஜோர்டானிய தினார்கள்
+				JOD
 			
 			
 				ஜப்பானிய யென்
 				ஜப்பானிய யென்
 				ஜப்பானிய யென்
 				¥
+				¥
 			
 			
 				கென்யன் ஷில்லிங்
 				கென்யன் ஷில்லிங்
 				கென்யன் ஷில்லிங்குகள்
+				KES
 			
 			
 				கிர்கிஸ்தானி சோம்
 				கிரிகிஸ்தானி சோம்
 				கிர்கிஸ்தானி சோம்கள்
+				KGS
 			
 			
 				கம்போடியன் ரியெல்
 				கம்போடியன் ரியெல்
 				கம்போடியன் ரியெல்கள்
+				KHR
+				៛
 			
 			
 				கமோரியன் ஃப்ராங்க்
 				கமோரியன் ஃப்ராங்க்
 				கமோரியன் ஃப்ராங்க்குகள்
+				KMF
+				CF
 			
 			
 				வட கொரிய வான்
 				வட கொரிய வான்
 				வட கொரிய வான்
+				KPW
+				₩
 			
 			
 				தென் கொரிய வான்
 				தென் கொரிய வான்
 				தென் கொரிய வான்
+				₩
+				₩
 			
 			
 				குவைத்தி தினார்
 				குவைத்தி தினார்
 				குவைத்தி தினார்கள்
+				KWD
 			
 			
 				கேமன் தீவுகள் டாலர்
 				கேமன் தீவுகள் டாலர்
 				கேமன் தீவுகள் டாலர்கள்
+				KYD
+				$
 			
 			
 				கஸகஸ்தானி டென்கே
 				கஸகஸ்தானி டென்கே
 				கஸகஸ்தானி டென்கேக்கள்
+				KZT
+				₸
 			
 			
 				லவோஷியன் கிப்
 				லவோஷியன் கிப்
 				லவோஷியன் கிப்கள்
+				LAK
+				₭
 			
 			
 				லெபனீஸ் பவுண்டு
 				லெபனீஸ் பவுண்டு
 				லெபனீஸ் பவுண்டுகள்
+				LBP
+				L£
 			
 			
 				இலங்கை ரூபாய்
 				இலங்கை ரூபாய்
 				இலங்கை ரூபாய்கள்
+				LKR
+				Rs
 			
 			
 				லைபீரியன் டாலர்
 				லைபீரியன் டாலர்
 				லைபீரியன் டாலர்கள்
+				LRD
+				$
 			
 			
 				லெசோதோ லோட்டி
@@ -5995,379 +6173,490 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				லிதுவேனியன் லிடஸ்
 				லிதுவேனியன் லிடாஸ்
 				லிதுவேனியன் லிடை
+				LTL
 			
 			
 				லத்வியன் லாட்ஸ்
 				லாத்வியன் லாட்ஸ்
 				லத்வியன் லாட்டி
+				LVL
 			
 			
 				லிபியன் தினார்
 				லிபியன் தினார்
 				லிபியன் தினார்கள்
+				LYD
 			
 			
 				மொராக்கன் திர்ஹாம்
 				மொராக்கன் திர்ஹாம்
 				மொராக்கன் திர்ஹாம்கள்
+				MAD
 			
 			
 				மால்டோவன் லியூ
 				மால்டோவன் லியூ
 				மால்டோவன் லேய்
+				MDL
 			
 			
 				மலகாசி ஏரியரி
 				மலகாசி ஏரியரி
 				மலகாசி ஏரியரிகள்
+				MGA
+				Ar
 			
 			
 				மாசிடோனியன் டேனார்
 				மாசிடோனியன் டேனார்
 				மாசிடோனியன் டேனாரி
+				MKD
 			
 			
 				மியான்மர் கியாத்
 				மியான்மர் கியாத்
 				மியான்மர் கியாத்கள்
+				MMK
+				K
 			
 			
 				மங்கோலியன் டுக்ரிக்
 				மங்கோலியன் டுக்ரிக்
 				மங்கோலியன் டுக்ரிக்குகள்
+				MNT
+				₮
 			
 			
 				மெகனீஸ் படாகா
 				மெகனீஸ் படாகா
 				மெகனீஸ் படாகாக்கள்
+				MOP
 			
 			
 				மொரிஷானியன் ஒகுயா (1973–2017)
 				மொரிஷானியன் ஒகுயா (1973–2017)
 				மொரிஷானியன் ஒகுயாக்கள் (1973–2017)
+				MRO
 			
 			
 				மொரிஷானியன் ஒகுயா
 				மொரிஷானியன் ஒகுயா
 				மொரிஷானியன் ஒகுயாக்கள்
+				MRU
 			
 			
 				மொரீஷியன் ருபீ
 				மொரீஷியன் ருபீ
 				மொரீஷியன் ருபீக்கள்
+				MUR
+				Rs
 			
 			
 				மாலத்தீவு ருஃபியா
 				மாலத்தீவு ருஃபியா
 				மாலத்தீவு ருஃபியாக்கள்
+				MVR
 			
 			
 				மலாவியன் குவாச்சா
 				மலாவியன் குவாச்சா
 				மலாவியன் குவாச்சாக்கள்
+				MWK
 			
 			
 				மெக்ஸிகன் பெசோ
 				மெக்ஸிகன் பெசோ
 				மெக்ஸிகன் பெசோக்கள்
+				MX$
+				$
 			
 			
 				மலேஷியன் ரிங்கிட்
 				மலேஷியன் ரிங்கிட்
 				மலேஷியன் ரிங்கிட்கள்
+				MYR
+				RM
 			
 			
 				மொசாம்பிகன் மெடிகல்
 				மொசாம்பிகன் மெடிகல்
 				மொசாம்பிகன் மெடிகல்கள்
+				MZN
 			
 			
 				நமீபியன் டாலர்
 				நமீபியன் டாலர்
 				நமீபியன் டாலர்கள்
+				NAD
+				$
 			
 			
 				நைஜீரியன் நைரா
 				நைஜீரியன் நைரா
 				நைஜீரியன் நைராக்கள்
+				NGN
+				₦
 			
 			
 				நிகரகுவன் கோர்டோபா
 				நிகரகுவன் கோர்டோபா
 				நிகரகுவன் கோர்டோபாக்கள்
+				NIO
+				C$
 			
 			
 				நார்வேஜியன் க்ரோன்
 				நார்வேஜியன் க்ரோன்
 				நார்வேஜியன் க்ரோனர்
+				NOK
+				kr
 			
 			
 				நேபாளீஸ் ரூபாய்
 				நேபாளீஸ் ரூபாய்
 				நேபாளீஸ் ரூபாய்கள்
+				NPR
+				Rs
 			
 			
 				நியூசிலாந்து டாலர்
 				நியூசிலாந்து டாலர்
 				நியூசிலாந்து டாலர்கள்
+				NZ$
+				$
 			
 			
 				ஓமானி ரியால்
 				ஓமானி ரியால்
 				ஓமானி ரியால்கள்
+				OMR
 			
 			
 				பனாமானியன் பால்போவா
 				பனாமானியன் பால்போவா
 				பனாமானியன் பால்போவாக்கள்
+				PAB
 			
 			
 				பெரூவியன் சோல்
 				பெரூவியன் சோல்
 				பெரூவியன் சோல்கள்
+				PEN
 			
 			
 				பபுவா நியூ கினியன் கினா
 				பபுவா நியூ கினியன் கினா
 				பபுவா நியூ கினியன் கினா
+				PGK
 			
 			
 				பிலிப்பைன் பெசோ
 				பிலிப்பைன் பெசோ
 				பிலிப்பைன் பெசோக்கள்
+				PHP
+				₱
 			
 			
 				பாகிஸ்தானி ரூபாய்
 				பாகிஸ்தானி ரூபாய்
 				பாகிஸ்தானி ரூபாய்கள்
+				PKR
+				Rs
 			
 			
 				போலிஷ் ஸ்லாட்டி
 				போலிஷ் ஸ்லாட்டி
 				போலிஷ் ஸ்லாட்டிகள்
+				PLN
+				zł
 			
 			
 				பராகுவன் குவாரானி
 				பராகுவன் குவாரானி
 				பராகுவன் குவாரானிகள்
+				PYG
+				₲
 			
 			
 				கத்தாரி ரியால்
 				கத்தாரி ரியால்
 				கத்தாரி ரியால்கள்
+				QAR
 			
 			
 				ரோமானியன் லியூ
 				ரோமானியன் லியூ
 				ரோமானியன் லேய்
+				RON
+				lei
 			
 			
 				செர்பியன் தினார்
 				செர்பியன் தினார்
 				செர்பியன் தினார்கள்
+				RSD
 			
 			
 				ரஷியன் ரூபிள்
 				ரஷியன் ரூபிள்
 				ரஷியன் ரூபிள்கள்
+				RUB
+				₽
 			
 			
 				ருவாண்டன் ஃப்ராங்க்
 				ருவாண்டன் ஃப்ராங்க்
 				ருவாண்டன் ஃப்ராங்க்குகள்
+				RWF
+				RF
 			
 			
 				சவுதி ரியால்
 				சவுதி ரியால்
 				சவுதி ரியால்கள்
+				SAR
 			
 			
 				சாலமன் தீவுகள் டாலர்
 				சாலமன் தீவுகள் டாலர்
 				சாலமன் தீவுகள் டாலர்கள்
+				SBD
+				$
 			
 			
 				சிசீலோயிஸ் ருபீ
 				சிசீலோயிஸ் ருபீ
 				சிசீலோயிஸ் ருபீக்கள்
+				SCR
 			
 			
 				சூடானீஸ் பவுண்டு
 				சூடானீஸ் பவுண்டு
 				சூடானீஸ் பவுண்டுகள்
+				SDG
 			
 			
 				ஸ்வீடிஷ் க்ரோனா
 				ஸ்வீடிஷ் க்ரோனா
 				ஸ்வீடிஷ் க்ரோனர்
+				SEK
+				kr
 			
 			
 				சிங்கப்பூர் டாலர்
 				சிங்கப்பூர் டாலர்
 				சிங்கப்பூர் டாலர்கள்
+				SGD
+				$
 			
 			
 				செயின்ட் ஹெலேனா பவுண்டு
 				செயின்ட் ஹெலேனா பவுண்டு
 				செயின்ட் ஹெலேனா பவுண்டுகள்
+				SHP
+				£
 			
 			
 				சியாரா லியோனியன் லியோன்
 				சியாரா லியோனியன் லியோன்
 				சியாரா லியோனியன் லியோன்கள்
+				SLL
 			
 			
 				சோமாலி ஷில்லிங்
 				சோமாலி ஷில்லிங்
 				சோமாலி ஷில்லிங்குகள்
+				SOS
 			
 			
 				சுரினாமீஸ் டாலர்
 				சுரினாமீஸ் டாலர்
 				சுரினாமீஸ் டாலர்கள்
+				SRD
+				$
 			
 			
 				தெற்கு சூடானீஸ் பவுண்டு
 				தெற்கு சூடானீஸ் பவுண்டு
 				தெற்கு சூடானீஸ் பவுண்டுகள்
+				SSP
+				£
 			
 			
 				சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ரா (1977–2017)
 				சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ரா (1977–2017)
 				சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ராக்கள் (1977–2017)
+				STD
 			
 			
 				சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ரா
 				சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ரா
 				சாவ் டோமி மற்றும் பிரின்ஸ்பி டோப்ராக்கள்
+				STN
+				Db
 			
 			
 				சிரியன் பவுண்டு
 				சிரியன் பவுண்டு
 				சிரியன் பவுண்டுகள்
+				SYP
+				£
 			
 			
 				சுவாஸி லிலாங்கனி
 				சுவாஸி லிலாங்கனி
 				சுவாஸி எமாலாங்கனி
+				SZL
 			
 			
 				தாய் பாட்
 				தாய் பாட்
 				தாய் பாட்
 				฿
+				฿
 			
 			
 				தஜிகிஸ்தானி சோமோனி
 				தஜிகிஸ்தானி சோமோனி
 				தஜிகிஸ்தானி சோமோனிகள்
+				TJS
 			
 			
 				துர்க்மெனிஸ்தானி மனத்
 				துர்க்மெனிஸ்தானி மனத்
 				துர்க்மெனிஸ்தானி மனத்
+				TMT
 			
 			
 				துனிஷியன் தினார்
 				துனிஷியன் தினார்
 				துனிஷியன் தினார்கள்
+				TND
 			
 			
 				தொங்கான் பங்கா
 				தொங்கான் பங்கா
 				தொங்கான் பங்கா
+				TOP
+				T$
 			
 			
 				துருக்கிஷ் லீரா
 				துருக்கிஷ் லீரா
 				துருக்கிஷ் லீரா
+				TRY
+				₺
+				TL
 			
 			
 				டிரினிடாட் மற்றும் டோபாகோ டாலர்
 				டிரினிடாட் மற்றும் டோபாகோ டாலர்
 				டிரினிடாட் மற்றும் டோபாகோ டாலர்கள்
+				TTD
+				$
 			
 			
 				புதிய தைவான் டாலர்
 				புதிய தைவான் டாலர்
 				புதிய தைவான் டாலர்கள்
+				NT$
 				NT$
 			
 			
 				தான்சானியன் ஷில்லிங்
 				தான்சானியன் ஷில்லிங்
 				தான்சானியன் ஷில்லிங்குகள்
+				TZS
 			
 			
 				உக்ரைனியன் ஹிரைவ்னியா
 				உக்ரைனியன் ஹிரைவ்னியா
 				உக்ரைனியன் ஹிரைவ்னியாக்கள்
+				UAH
+				₴
 			
 			
 				உகாண்டன் ஷில்லிங்
 				உகாண்டன் ஷில்லிங்
 				உகாண்டன் ஷில்லிங்குகள்
+				UGX
 			
 			
 				அமெரிக்க டாலர்
 				அமெரிக்க டாலர்
 				அமெரிக்க டாலர்கள்
 				$
+				$
 			
 			
 				உருகுவேயன் பெசோ
 				உருகுவேயன் பெசோ
 				உருகுவேயன் பெசோக்கள்
+				UYU
+				$
 			
 			
 				உஸ்பெக்கிஸ்தானி சோம்
 				உஸ்பெக்கிஸ்தானி சோம்
 				உஸ்பெக்கிஸ்தானி சோம்
+				UZS
 			
 			
 				வெனிசுலன் போலிவர் (2008–2018)
 				வெனிசுலன் போலிவர் (2008–2018)
 				வெனிசுலன் போலிவர்கள் (2008–2018)
+				VEF
+				Bs
 			
 			
 				வெனிசுலன் போலிவர்
 				வெனிசுலன் போலிவர்
 				வெனிசுலன் போலிவர்கள்
+				VES
 			
 			
 				வியட்நாமீஸ் டாங்
 				வியட்நாமீஸ் டாங்
 				வியட்நாமீஸ் டாங்
+				₫
+				₫
 			
 			
 				வனுவாட்டு வாட்டு
 				வனுவாட்டு வாட்டு
 				வனுவாட்டு வாட்டுகள்
+				VUV
 			
 			
 				சமோவான் தாலா
 				சமோவான் தாலா
 				சமோவான் தாலா
+				WST
 			
 			
 				மத்திய ஆப்பிரிக்க CFA ஃப்ராங்க்
 				மத்திய ஆப்பிரிக்க CFA ஃப்ராங்க்
 				மத்திய ஆப்பிரிக்க CFA ஃப்ராங்க்குகள்
+				FCFA
 			
 			
 				கிழக்கு கரீபியன் டாலர்
 				கிழக்கு கரீபியன் டாலர்
 				கிழக்கு கரீபியன் டாலர்கள்
+				EC$
+				$
 			
 			
 				மேற்கு ஆப்பிரிக்க CFA ஃப்ராங்க்
 				மேற்கு ஆப்பிரிக்க CFA ஃப்ராங்க்
 				மேற்கு ஆப்பிரிக்க CFA ஃப்ராங்க்குகள்
+				CFA
 			
 			
 				ஃப்ராங்க் (CFP)
 				ஃப்ராங்க் (CFP)
 				ஃப்ராங்குகள் (CFP)
+				CFPF
 			
 			
 				தெரியாத நாணயம்
@@ -6378,11 +6667,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ஏமனி ரியால்
 				ஏமனி ரியால்
 				ஏமனி ரியால்கள்
+				YER
 			
 			
 				தென் ஆப்ரிக்க ராண்ட்
 				தென் ஆப்ரிக்க ராண்ட்
 				தென் ஆப்ரிக்க ராண்ட்
+				ZAR
+				R
 			
 			
 				ஸாம்பியன் குவாசா (1968–2012)
@@ -6391,12 +6683,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ஸாம்பியன் குவாச்சா
 				ஸாம்பியன் குவாச்சா
 				ஸாம்பியன் குவாச்சாக்கள்
+				ZMW
+				ZK
 			
 		
 		
-			~{0}
+			~{0}
 			{0}+
-			≤{0}
+			≤{0}
 			{0}–{1}
 		
 		
@@ -6407,6 +6701,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				{0}/{1}
+			
 			
 				ஜி-ஃபோர்ஸ்
 				{0} ஜி-ஃபோர்ஸ்
@@ -6493,9 +6790,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/சதுர அங்குலம்
 			
 			
-				ட்யூனம்ஸ்
-				{0} ட்யூனம்
-				{0} ட்யூனம்ஸ்
+				ட்யூனம்ஸ்
+				{0} ட்யூனம்
+				{0} ட்யூனம்ஸ்
 			
 			
 				காரட்கள்
@@ -6528,14 +6825,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				மில்லி ஒன்றுக்கு {0}
 			
 			
-				பெர்மிரியட்
-				{0} பெர்மிரியட்
-				{0} பெர்மிரியட்
+				பெர்மிரியட்
+				{0} பெர்மிரியட்
+				{0} பெர்மிரியட்
 			
 			
-				மோல்ஸ்
-				{0} மோல்
-				{0} மோல்ஸ்
+				மோல்ஸ்
+				{0} மோல்
+				{0} மோல்ஸ்
 			
 			
 				லிட்டர்கள்/கிலோமீட்டர்
@@ -6617,6 +6914,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} நூற்றாண்டு
 				{0} நூற்றாண்டுகள்
 			
+			
+				தசாப்தங்கள்
+				{0} தசாப்தம்
+				{0} தசாப்தங்கள்
+			
 			
 				ஆண்டுகள்
 				{0} ஆண்டு
@@ -6725,24 +7027,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கிலோவாட் மணிநேரம்
 			
 			
-				எலக்ட்ரான்வோல்ட்ஸ்
-				{0} எலக்ட்ரான்வோல்ட்
-				{0} எலக்ட்ரான்வோல்ட்ஸ்
+				எலக்ட்ரான்வோல்ட்ஸ்
+				{0} எலக்ட்ரான்வோல்ட்
+				{0} எலக்ட்ரான்வோல்ட்ஸ்
 			
 			
-				பிரிட்டிஷ் வெப்ப அலகுகள்
-				{0} பிரிட்டிஷ் வெப்ப அலகு
-				{0} பிரிட்டிஷ் வெப்ப அலகுகள்
+				பிரிட்டிஷ் வெப்ப அலகுகள்
+				{0} பிரிட்டிஷ் வெப்ப அலகு
+				{0} பிரிட்டிஷ் வெப்ப அலகுகள்
+			
+			
+				அமெரிக்க வெப்ப அலகுகள்
+				{0} அமெரிக்க வெப்ப அலகு
+				{0} அமெரிக்க வெப்ப அலகுகள்
 			
 			
-				பவுண்ட் விசை
-				{0} பவுண்ட் விசை
-				{0} பவுண்ட் விசை
+				பவுண்ட் விசை
+				{0} பவுண்ட் விசை
+				{0} பவுண்ட் விசை
 			
 			
-				நியூட்டன்ஸ்
-				{0} நியூட்டன்
-				{0} நியூட்டன்ஸ்
+				நியூட்டன்ஸ்
+				{0} நியூட்டன்
+				{0} நியூட்டன்ஸ்
 			
 			
 				கிகாஹெர்ட்ஸ்
@@ -6764,6 +7071,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ஹெர்ட்ஸ்
 				{0} ஹெர்ட்ஸ்
 			
+			
+				அச்சுக்கலை எம்
+				{0} எம்
+				{0} எம்கள்
+			
+			
+				பிக்சல்கள்
+				{0} பிக்சல்
+				{0} பிக்சல்கள்
+			
+			
+				மெகாபிக்சல்கள்
+				{0} மெகாபிக்சல்
+				{0} மெகாபிக்சல்கள்
+			
+			
+				பிக்சல்கள்/ சென்டிமீட்டர்
+				{0} பிக்சல்/ சென்டிமீட்டர்
+				{0} பிக்சல்கள்/ சென்டிமீட்டர்
+			
+			
+				பிக்சல்கள்/ அங்குலம்
+				{0} பிக்சல்/ அங்குலம்
+				{0} பிக்சல்கள்/ அங்குலம்
+			
+			
+				புள்ளிகள் / சென்டிமீட்டர்
+				{0} புள்ளி / சென்டிமீட்டர்
+				{0} புள்ளிகள் / சென்டிமீட்டர்
+			
+			
+				புள்ளிகள் / அங்குலம்
+				{0} புள்ளி / அங்குலம்
+				{0} புள்ளிகள் / அங்குலம்
+			
 			
 				கிலோமீட்டர்கள்
 				{0} கிலோமீட்டர்
@@ -6855,14 +7197,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ஸ்கேண்டிநேவியன் மைல்கள்
 			
 			
-				அச்சுப் புள்ளிகள்
-				{0} அச்சுப் புள்ளி
-				{0} அச்சுப் புள்ளிகள்
+				அச்சுப் புள்ளிகள்
+				{0} அச்சுப் புள்ளி
+				{0} அச்சுப் புள்ளிகள்
 			
 			
-				சூரிய ஆரம்
-				{0} சூரிய ஆரம்
-				{0} சூரிய ஆரம்
+				சூரிய ஆரம்
+				{0} சூரிய ஆரம்
+				{0} சூரிய ஆரம்
 			
 			
 				லக்ஸ்
@@ -6870,9 +7212,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} லக்ஸ்
 			
 			
-				சூரிய ஒளிர்வுத்தன்மை
-				{0} சூரிய ஒளிர்வுத்தன்மை
-				{0} சூரிய ஒளிர்வுத்தன்மை
+				சூரிய ஒளிர்வுத்தன்மை
+				{0} சூரிய ஒளிர்வுத்தன்மை
+				{0} சூரிய ஒளிர்வுத்தன்மை
 			
 			
 				மெட்ரிக் டன்
@@ -6934,19 +7276,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கேரட்கள்
 			
 			
-				டால்ட்டன்ஸ்
-				{0} டால்ட்டன்
-				{0} டால்ட்டன்ஸ்
+				டால்ட்டன்ஸ்
+				{0} டால்ட்டன்
+				{0} டால்ட்டன்ஸ்
 			
 			
-				புவித் திணிவுகள்
-				{0} புவித் திணிவு
-				{0} புவித் திணிவுகள்
+				புவித் திணிவுகள்
+				{0} புவித் திணிவு
+				{0} புவித் திணிவுகள்
 			
 			
-				சூரியத் திணிவுகள்
-				{0} சூரியத் திணிவு
-				{0} சூரியத் திணிவுகள்
+				சூரியத் திணிவுகள்
+				{0} சூரியத் திணிவு
+				{0} சூரியத் திணிவுகள்
 			
 			
 				கிகாவாட்ஸ்
@@ -6978,11 +7320,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} குதிரைத்திறன்
 				{0} குதிரைத்திறன்
 			
-			
-				ஹெக்டோபாஸ்கல்
-				{0} ஹெக்டோபாஸ்கல்
-				{0} ஹெக்டோபாஸ்கல்
-			
 			
 				பாதரச மில்லிமீட்டர்கள்
 				{0} பாதரச மில்லிமீட்டர்
@@ -6998,6 +7335,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} பாதரச அங்குலம்
 				{0} பாதரச அங்குலங்கள்
 			
+			
+				பார்கள்
+				{0} பார்
+				{0} பார்கள்
+			
 			
 				மில்லிபார்கள்
 				{0} மில்லிபார்
@@ -7008,15 +7350,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} வளிஅழுத்தம்
 				{0} வளிஅழுத்தங்கள்
 			
+			
+				பாஸ்கல்கள்
+				{0} பாஸ்கல்
+				{0} பாஸ்கல்கள்
+			
+			
+				ஹெக்டோபாஸ்கல்
+				{0} ஹெக்டோபாஸ்கல்
+				{0} ஹெக்டோபாஸ்கல்
+			
 			
-				கிலோபாஸ்கல்ஸ்
-				{0} கிலோபாஸ்கல்
-				{0} கிலோபாஸ்கல்ஸ்
+				கிலோபாஸ்கல்ஸ்
+				{0} கிலோபாஸ்கல்
+				{0} கிலோபாஸ்கல்ஸ்
 			
 			
-				மெகாபாஸ்கல்ஸ்
-				{0} மெகாபாஸ்கல்
-				{0} மெகாபாஸ்கல்ஸ்
+				மெகாபாஸ்கல்ஸ்
+				{0} மெகாபாஸ்கல்
+				{0} மெகாபாஸ்கல்ஸ்
 			
 			
 				கிலோமீட்டர்கள்/மணிநேரம்
@@ -7038,6 +7390,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} நாட்
 				{0} நாட்
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				டிகிரி செல்சியஸ்
 				{0} டிகிரி செல்சியஸ்
@@ -7054,14 +7411,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கெல்வின்
 			
 			
-				பவுண்ட்-அடி
-				{0} பவுண்ட்-அடி
-				{0} பவுண்ட்-அடி
+				பவுண்ட்-அடி
+				{0} பவுண்ட்-அடி
+				{0} பவுண்ட்-அடி
 			
 			
-				நியூட்டன் மீட்டர்கள்
-				{0} நியூட்டன் மீட்டர்
-				{0} நியூட்டன் மீட்டர்கள்
+				நியூட்டன் மீட்டர்கள்
+				{0} நியூட்டன் மீட்டர்
+				{0} நியூட்டன் மீட்டர்கள்
 			
 			
 				கன கிலோமீட்டர்கள்
@@ -7179,9 +7536,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} திரவ அவுன்ஸ்
 			
 			
-				இம்பீரியல் ஃப்ளூயிட் அவுன்ஸ்கள்
-				{0} இம்பீரியல் ஃப்ளூயிட் அவுன்ஸ்
-				{0} இம்பீரியல் ஃப்ளூயிட் அவுன்ஸ்கள்
+				இம்பீரியல் ஃப்ளூயிட் அவுன்ஸ்கள்
+				{0} இம்பீரியல் ஃப்ளூயிட் அவுன்ஸ்
+				{0} இம்பீரியல் ஃப்ளூயிட் அவுன்ஸ்கள்
 			
 			
 				மேஜைக்கரண்டி
@@ -7194,19 +7551,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} தேக்கரண்டி
 			
 			
-				பீப்பாய்கள்
-				{0} பீப்பாய்
-				{0} பீப்பாய்கள்
+				பீப்பாய்கள்
+				{0} பீப்பாய்
+				{0} பீப்பாய்கள்
 			
 			
 				கார்டினல் திசை
-				{0}கி
+				{0}கிழக்கு
 				{0}வ
-				{0}தெ
-				{0}மே
+				{0}தெற்கு
+				{0}மேற்கு
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				ஜி-ஃபோர்ஸ்
 				{0} ஜி.ஃபோ.
@@ -7293,9 +7653,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/அங்.²
 			
 			
-				ட்யூனம்ஸ்
-				{0} ட்யூனம்
-				{0} ட்யூனம்
+				ட்யூனம்ஸ்
+				{0} ட்யூனம்
+				{0} ட்யூனம்
 			
 			
 				கார.
@@ -7319,19 +7679,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				சதவீதம்
+				{0}%
+				{0}%
 			
 			
 				மில்லி ஒன்றுக்கு
+				{0}‰
+				{0}‰
 			
 			
-				பெர்மிரியட்
-				{0}‱
-				{0}‱
+				பெர்மிரியட்
 			
 			
-				மோல்
-				{0} mol
-				{0} mol
+				மோல்
+				{0} மோல்
+				{0} மோல்
 			
 			
 				லி./கி.மீ.
@@ -7353,26 +7715,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} மை./இம். கே.
 				{0} மை./இம். கே.
 			
+			
+				PB
+				{0} PB
+				{0} PB
+			
+			
+				TB
+				{0} TB
+				{0} TB
+			
 			
 				டெ.பி.
+				{0} Tb
+				{0} Tb
 			
 			
 				கி.பைட்
+				{0} GB
+				{0} GB
 			
 			
 				கி.பிட்
+				{0} Gb
+				{0} Gb
 			
 			
 				மெ.பை.
+				{0} MB
+				{0} MB
 			
 			
 				மெ.பிட்.
+				{0} Mb
+				{0} Mb
 			
 			
 				கி.பை.
+				{0} kB
+				{0} kB
 			
 			
 				கிலோ பிட்
+				{0} kb
+				{0} kb
 			
 			
 				பைட்
@@ -7389,6 +7775,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} நூ.
 				{0} நூ.
 			
+			
+				தசாப்தம்
+				{0} தசாப்தம்
+				{0} தசாப்தம்
+			
 			
 				ஆண்டுகள்
 				{0} ஆண்டு
@@ -7458,6 +7849,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ஓம்ஸ்
+				{0} Ω
+				{0} Ω
 			
 			
 				வோ.
@@ -7495,24 +7888,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கி.வா.ம.நே.
 			
 			
-				எலக்ட்ரான்வோல்ட்
-				{0} eV
-				{0} eV
+				எலக்ட்ரான்வோல்ட்
 			
 			
-				பி.டி.யூ
-				{0} பி.டி.யூ
-				{0} பி.டி.யூ
+				பி.டி.யூ
+				{0} பி.டி.யூ
+				{0} பி.டி.யூ
+			
+			
+				யூஎஸ் தெர்ம்
+				{0} யூஎஸ் தெர்ம்
+				{0} யூஎஸ் தெர்ம்
 			
 			
-				பவுண்ட் விசை
-				{0} lbf
-				{0} lbf
+				பவுண்ட் விசை
+				{0} ப.வி
+				{0} ப.வி
 			
 			
-				நியூட்டன்
-				{0} N
-				{0} N
+				நியூட்டன்
+				{0} நியூ
+				{0} நியூ
 			
 			
 				ஜி.ஹெஸ்.
@@ -7534,6 +7930,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ஹெஸ்.
 				{0} ஹெஸ்.
 			
+			
+				எம்
+				{0} எம்
+				{0} எம்
+			
+			
+				பிக்
+				{0} பிக்
+				{0} பிக்
+			
+			
+				எம்.பி
+				{0} எம்.பி
+				{0} எம்.பி
+			
+			
+				பிக். / செ.மீ
+				{0} பிக். / செ.மீ
+				{0} பிக். / செ.மீ
+			
+			
+				பிக். / அங்.
+				{0} பிக். / அங்.
+				{0} பிக். / அங்.
+			
+			
+				பு / செ.மீ
+				{0} பு / செ.மீ
+				{0} பு / செ.மீ
+			
+			
+				பு / அங்.
+				{0} பு / அங்.
+				{0} பு / அங்.
+			
 			
 				கி.மீ.
 				{0} கி.மீ.
@@ -7625,14 +8056,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ஸ்.மை.
 			
 			
-				அ.பு.
-				{0} அ.பு.
-				{0} அ.பு.
+				அ.பு.
+				{0} அ.பு.
+				{0} அ.பு.
 			
 			
-				சூரிய ஆரம்
-				{0} R☉
-				{0} R☉
+				சூரிய ஆரம்
 			
 			
 				லக்ஸ்
@@ -7640,9 +8069,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} லக்.
 			
 			
-				சூரிய ஒளிர்வுத்தன்மை
-				{0} L☉
-				{0} L☉
+				சூரிய ஒளிர்வுத்தன்மை
 			
 			
 				ட.
@@ -7704,19 +8131,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கேர.
 			
 			
-				டால்ட்டன்ஸ்
-				{0} Da
-				{0} Da
+				டால்ட்டன்ஸ்
 			
 			
-				புவித் திணிவுகள்
-				{0} M⊕
-				{0} M⊕
+				புவித் திணிவுகள்
 			
 			
-				சூரியத் திணிவுகள்
-				{0} M☉
-				{0} M☉
+				சூரியத் திணிவுகள்
 			
 			
 				கி.வாட்.
@@ -7748,35 +8169,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கு.தி.
 				{0} கு.தி.
 			
-			
-				ஹெ.பாஸ்.
-				{0} ஹெ.பாஸ்.
-				{0} ஹெ.பாஸ்.
-			
 			
 				பாத. மி.மீ.
 				{0} பாத. மி.மீ.
 				{0} பாத. மி.மீ.
 			
+			
+				psi
+				{0} psi
+				{0} psi
+			
 			
 				பாத. அங்.
 				{0} பாத. அங்.
 				{0} பாத. அங்.
 			
+			
+				பார்
+				{0} பார்
+				{0} பார்கள்
+			
 			
 				மி.பா.
 				{0} மி.பா.
 				{0} மி.பா.
 			
+			
+				atm
+				{0} atm
+				{0} atm
+			
+			
+				பா.
+				{0} பா.
+				{0} பா.
+			
+			
+				ஹெ.பாஸ்.
+				{0} ஹெ.பாஸ்.
+				{0} ஹெ.பாஸ்.
+			
 			
-				கிபா
-				{0} கிபா
-				{0} கிபா
+				கிபா
+				{0} கிபா
+				{0} கிபா
 			
 			
-				மெபா
-				{0} மெபா
-				{0} மெபா
+				மெபா
+				{0} மெபா
+				{0} மெபா
 			
 			
 				கி.மீ./மணிநேரம்
@@ -7798,6 +8239,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} நா.
 				{0} நா.
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				டிகிரி செ.
 				{0}°செ.
@@ -7814,14 +8260,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கெல்.
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				ப.அடி
+				{0} ப.அடி
+				{0} ப.அடி
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				நியூ.மீ
+				{0} நியூ.மீ
+				{0} நியூ.மீ
 			
 			
 				கிமீ³
@@ -7938,11 +8384,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} தி. அவு.
 				{0} தி. அவு.
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				மே.க.
 				{0} மே.க.
@@ -7954,9 +8395,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} தே.க.
 			
 			
-				பீப்பாய்
-				{0} bbl
-				{0} bbl
+				பீப்பாய்
 			
 			
 				திசை
@@ -7967,6 +8406,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				{0} ஜி.ஃபோ.
 				{0} ஜி.ஃபோ.
@@ -8007,6 +8449,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ச.அ.
 				{0} ச.அ.
 			
+			
+				%
+				{0}%
+				{0}%
+			
 			
 				லி./100கி.மீ
 				{0}லி./100கி.மீ
@@ -8160,16 +8607,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} கு.வே.
 				{0} கு.வே.
 			
-			
-				ஹெ.பாஸ்.
-				{0} ஹெ.பா.
-				{0} ஹெ.பா.
-			
 			
 				பாத. மி.மீ.
 				{0} பாத. மி.மீ.
 				{0} பாத. மி.மீ.
 			
+			
+				psi
+				{0} psi
+				{0} psi
+			
 			
 				பா. அங்.
 				{0} பா.அங்.
@@ -8180,6 +8627,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} மி.பா.
 				{0} மி.பா.
 			
+			
+				ஹெ.பாஸ்.
+				{0} ஹெ.பா.
+				{0} ஹெ.பா.
+			
 			
 				கி.மீ./ம.
 				{0}கி.மீ./ம.
@@ -8195,6 +8647,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} மை/ம.நே.
 				{0} மை/ம.நே.
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°செ
 				{0}°செ.
@@ -8243,11 +8700,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			{0}, {1}
+			{0}, {1}
 			{0} மற்றும் {1}
 			{0} மற்றும் {1}
 		
 		
-			{0} அல்லது {1}
+			{0}, {1}
+			{0}, {1}
+			{0} அல்லது {1}
 			{0} அல்லது {1}
 		
 		
@@ -8262,12 +8723,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} மற்றும் {1}
 			{0} மற்றும் {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 		
 			{0} {1}
 			{0} {1}
 			{0} {1}
 			{0} {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
 	
 	
 		
diff --git a/make/data/cldr/common/main/ta_IN.xml b/make/data/cldr/common/main/ta_IN.xml
index b8534b24284..4b08fcbbe89 100644
--- a/make/data/cldr/common/main/ta_IN.xml
+++ b/make/data/cldr/common/main/ta_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ta_LK.xml b/make/data/cldr/common/main/ta_LK.xml
index 462fa16fe18..147856f3702 100644
--- a/make/data/cldr/common/main/ta_LK.xml
+++ b/make/data/cldr/common/main/ta_LK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ta_MY.xml b/make/data/cldr/common/main/ta_MY.xml
index ff799aab5e2..ca1c859bd41 100644
--- a/make/data/cldr/common/main/ta_MY.xml
+++ b/make/data/cldr/common/main/ta_MY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ta_SG.xml b/make/data/cldr/common/main/ta_SG.xml
index 6a0d6ad394d..aeb68688941 100644
--- a/make/data/cldr/common/main/ta_SG.xml
+++ b/make/data/cldr/common/main/ta_SG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/te.xml b/make/data/cldr/common/main/te.xml
index 916828cf700..c5ea64667e0 100644
--- a/make/data/cldr/common/main/te.xml
+++ b/make/data/cldr/common/main/te.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -84,6 +84,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			కేడ్డో
 			కేరిబ్
 			అట్సామ్
+			చక్మా
 			చెచెన్
 			సెబువానో
 			ఛిగా
@@ -532,14 +533,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ఇడ్డిష్
 			యోరుబా
 			కాంటనీస్
+			చైనీస్, కాంటనీస్
 			జువాన్
 			జపోటెక్
 			బ్లిసింబల్స్
 			జెనాగా
 			ప్రామాణిక మొరొకన్ టామజైట్
 			చైనీస్
+			చైనీస్, మాండరిన్
 			సరళీకృత చైనీస్
+			సరళీకృత మాండరిన్ చైనీస్
 			సాంప్రదాయక చైనీస్
+			సాంప్రదాయక మాండరిన్ చైనీస్
 			జూలూ
 			జుని
 			లిపి లేదు
@@ -700,7 +705,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			కరిబ్బియన్
 			తూర్పు ఆసియా
 			దక్షిణ ఆసియా
-			నైరుతి ఆసియా
+			ఆగ్నేయ ఆసియా
 			దక్షిణ యూరోప్
 			ఆస్ట్రేలేసియా
 			మెలనేశియ
@@ -708,7 +713,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			పాలినేషియా
 			ఆసియా
 			మధ్య ఆసియా
-			పడమటి ఆసియా
+			పశ్చిమ ఆసియా
 			యూరోప్
 			తూర్పు యూరోప్
 			ఉత్తర యూరోప్
@@ -821,7 +826,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			గ్వామ్
 			గినియా-బిస్సావ్
 			గయానా
-			హాంకాంగ్ ఎస్ఏఆర్
+			హాంకాంగ్ ఎస్ఏఆర్ చైనా
 			హాంకాంగ్
 			హెర్డ్ దీవి మరియు మెక్‌డొనాల్డ్ దీవులు
 			హోండురాస్
@@ -834,7 +839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ఇజ్రాయెల్
 			ఐల్ ఆఫ్ మాన్
 			భారతదేశం
-			బ్రిటీష్ హిందూ మహాసముద్ర ప్రాంతం
+			బ్రిటిష్ హిందూ మహాసముద్ర ప్రాంతం
 			ఇరాక్
 			ఇరాన్
 			ఐస్లాండ్
@@ -872,8 +877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			సెయింట్ మార్టిన్
 			మడగాస్కర్
 			మార్షల్ దీవులు
-			మేసిడోనియా
-			పూర్వ రిపబ్లిక్ యుగోస్లావ్ మేసిడోనియా
+			ఉత్తర మాసిడోనియా
 			మాలి
 			మయన్మార్
 			మంగోలియా
@@ -945,8 +949,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ఎల్ సాల్వడోర్
 			సింట్ మార్టెన్
 			సిరియా
-			స్వాజిల్యాండ్
-			SZ
+			ఈస్వాటిని
+			స్వాజిల్యాండ్
 			ట్రిస్టన్ డ కన్హా
 			టర్క్స్ మరియు కైకోస్ దీవులు
 			చాద్
@@ -983,6 +987,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			వనాటు
 			వాల్లిస్ మరియు ఫుటునా
 			సమోవా
+			సూడో యాక్సెంట్స్
+			సూడో-బిడి
 			కొసోవో
 			యెమెన్
 			మాయొట్
@@ -1147,8 +1153,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[అ ఆ ఇ ఈ ఉ ఊ ఋ ౠ ఌ ౡ ఎ ఏ ఐ ఒ ఓ ఔ ఁ ం ః క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల వ శ ష స హ ళ \u0C3E \u0C3F \u0C40 ు ూ ృ ౄ \u0C46 \u0C47 \u0C48 \u0C4A \u0C4B \u0C4C \u0C4D \u0C55 \u0C56]
 		[\u200C\u200D ౦ ౧ ౨ ౩ ౪ ౫ ౬ ౭ ౮ ౯]
 		[అ ఆ ఇ ఈ ఉ ఊ ఋ ౠ ఎ ఏ ఐ ఒ ఓ ఔ క ఖ గ ఘ ఙ చ ఛ జ ఝ ఞ ట ఠ డ ఢ ణ త థ ద ధ న ప ఫ బ భ మ య ర ఱ ల వ శ ష స హ ళ]
-		[\- , . % ‰ + 0౦ 1౧ 2౨ 3౩ 4౪ 5౫ 6౬ 7౭ 8౮ 9౯]
-		[\- , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
+		[\- ‑ , . % ‰ + 0౦ 1౧ 2౨ 3౩ 4౪ 5౫ 6౬ 7౭ 8౮ 9౯]
+		[\- ‑ , ; \: ! ? . ' ‘ ’ " “ ” ( ) \[ \] \{ \}]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1156,16 +1162,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		… {0}
 		{0} … {1}
 		?
-		
-			[\--/]
-			[\:∶]
-		
 		
 			[\$﹩＄$]
 			[£₤]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1176,6 +1185,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1194,6 +1216,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							మెస్రా
 							నైసే
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							టౌట్
 							బాబా
@@ -1226,6 +1263,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							మెస్రా
 							నైసే
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							టౌట్
 							బాబా
@@ -1243,6 +1295,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1262,6 +1328,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							నెహస్సె
 							పగుమెన్
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							మెస్క్‌రమ్
 							టెకెమట్
@@ -1294,6 +1375,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							నెహస్సె
 							పగుమెన్
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							మెస్క్‌రమ్
 							టెకెమట్
@@ -1311,6 +1407,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1362,8 +1472,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						B h:mm:ss
 						d
 						ccc
-						B E h:mm
-						B E h:mm:ss
+						B E h:mm
+						B E h:mm:ss
 						E d
 						E h:mm a
 						E HH:mm
@@ -1404,55 +1514,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							B h – B h
-							B h – h
+							B h – B h
+							B h – h
 						
 						
-							B h:mm – B h:mm
-							B h:mm – h:mm
-							B h:mm – h:mm
+							B h:mm – B h:mm
+							B h:mm – h:mm
+							B h:mm – h:mm
 						
 						
 							d – d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1953,54 +2025,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							B h – B h
-							B h – h
+							B h – B h
+							B h – h
 						
 						
-							B h:mm – B h:mm
-							B h:mm – h:mm
-							B h:mm – h:mm
+							B h:mm – B h:mm
+							B h:mm – h:mm
+							B h:mm – h:mm
 						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
-							GGGGG M/y – GGGGG M/y
-							GGGGG M/y – M/y
-							GGGGG M/y – M/y
+							GGGGG M/y – GGGGG M/y
+							GGGGG M/y – M/y
+							GGGGG M/y – M/y
 						
 						
-							GGGGG d/M/y – d/M/y
-							GGGGG d/M/y – GGGGG d/M/y
-							GGGGG d/M/y – d/M/y
-							GGGGG d/M/y – d/M/y
+							GGGGG d/M/y – d/M/y
+							GGGGG d/M/y – GGGGG d/M/y
+							GGGGG d/M/y – d/M/y
+							GGGGG d/M/y – d/M/y
 						
 						
-							GGGGG d/M/y, E – d/M/y, E
-							GGGGG d/M/y, E – GGGGG d/M/y, E
-							GGGGG d/M/y, E – d/M/y, E
-							GGGGG d/M/y, E – d/M/y, E
+							GGGGG d/M/y, E – d/M/y, E
+							GGGGG d/M/y, E – GGGGG d/M/y, E
+							GGGGG d/M/y, E – d/M/y, E
+							GGGGG d/M/y, E – d/M/y, E
 						
 						
-							G MMM y – G MMM y
-							G MMM – MMM y
-							G MMM y – MMM y
+							G MMM y – G MMM y
+							G MMM – MMM y
+							G MMM y – MMM y
 						
 						
-							G d – d MMM, y
-							G d MMM y – G d MMM y
-							G d MMM – d MMM, y
-							G d MMM, y – d MMM, y
+							G d – d MMM, y
+							G d MMM y – G d MMM y
+							G d MMM – d MMM, y
+							G d MMM, y – d MMM, y
 						
 						
-							G y d MMM, E – d MMM, E
-							G d MMM, y, E – G d MMM, y, E
-							G y d MMM, E – d MMM, E
-							G d MMM, y, E – d MMM, y, E
+							G y d MMM, E – d MMM, E
+							G d MMM, y, E – G d MMM, y, E
+							G y d MMM, E – d MMM, E
+							G d MMM, y, E – d MMM, y, E
 						
 						
 							h a – h a
@@ -2113,6 +2181,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							అవ
 							ఇలుల్
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							టిశ్రీ
 							హేష్‌వాన్
@@ -2147,6 +2231,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							అవ
 							ఇలుల్
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							టిశ్రీ
 							హేష్‌వాన్
@@ -2165,6 +2265,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2183,6 +2294,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							మాఘం
 							ఫల్గుణం
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							చైత్రం
 							వైశాఖం
@@ -2213,6 +2338,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							మాఘం
 							ఫల్గుణం
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							చైత్రం
 							వైశాఖం
@@ -2258,6 +2397,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ధుల్-కి.
 							ధుల్-హి.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Muharram
 							Safar
@@ -2288,6 +2441,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ధుల్-కి.
 							ధుల్-హి.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ముహర్రం
 							సఫర్
@@ -2304,6 +2471,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2322,6 +2500,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							బాహ్‌మాన్
 							ఎస్‌ఫాండ్
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ఫావర్డిన్
 							ఊడాబహష్ట్
@@ -2352,6 +2544,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							బాహ్‌మాన్
 							ఎస్‌ఫాండ్
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ఫావర్డిన్
 							ఊడాబహష్ట్
@@ -2368,17 +2574,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
 					
 						R.O.C. పూర్వం
+						R.O.C.
 					
 					
 						R.O.C. పూర్వం
+						R.O.C.
 					
 					
 						R.O.C. పూర్వం
+						R.O.C.
 					
 				
 			
@@ -2409,6 +2629,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				సం.
+				గత సంవ.
+				ఈ సంవ.
+				తదుపరి సంవ.
 				
 					{0} సం.లో
 					{0} సం.ల్లో
@@ -2420,6 +2643,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				సం.
+				గత సం.
+				ఈ సం.
+				తదుపరి సం.
 				
 					{0} సం.లో
 					{0} సం.ల్లో
@@ -2535,7 +2761,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					{0} వారం క్రితం
 					{0} వారాల క్రితం
 				
-				{0}లో వారం
 			
 			
 				వా
@@ -2550,7 +2775,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					{0} వారం క్రితం
 					{0} వారాల క్రితం
 				
-				{0}లో వారం
+				{0} వారం
 			
 			
 				నెలలో వారం
@@ -2976,7 +3201,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				ని
 				
 					{0} నిమి.లో
 					{0} నిమి.లో
@@ -3716,7 +3940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				అక్టోబ్
 			
 			
-				కోస్తానే
+				కోస్తానే
 			
 			
 				క్విజిలోర్డా
@@ -5296,12 +5520,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			telu
 		
 		1
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5310,7 +5540,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5381,6 +5615,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
 			
 				
@@ -5415,7 +5656,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤#,##,##0.00
 				
 				
-					¤#,##,##0.00;(¤#,##,##0.00)
+					¤#,##0.00;(¤#,##0.00)
 				
 			
 			
@@ -5461,279 +5702,330 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				యునైటెడ్ ఆరబ్ ఎమిరేట్స్ దిరామ్
 				యునైటెడ్ ఆరబ్ ఎమిరేట్స్ దిరామ్
 				యునైటెడ్ ఆరబ్ ఎమిరేట్స్ దిరామ్‌లు
+				AED
 			
 			
 				ఆఫ్ఘాన్ ఆఫ్ఘాని
 				ఆఫ్ఘాన్ ఆఫ్ఘాని
 				ఆఫ్ఘాన్ ఆఫ్ఘాని
+				AFN
 			
 			
 				ఆల్బేనియన్ లేక్
 				ఆల్బేనియన్ లేక్
 				ఆల్బేనియన్ లేక్
+				ALL
 			
 			
 				అమెరికన్ డ్రామ్
 				అమెరికన్ డ్రామ్
 				అమెరికన్ డ్రామ్‌లు
+				AMD
 			
 			
 				నెదర్లాండ్స్ యాంటిల్లియన్ గిల్‌డర్
 				నెదర్లాండ్స్ యాంటిల్లియన్ గిల్‌డర్
 				నెదర్లాండ్స్ యాంటిల్లియన్ గిల్‌డర్‌లు
+				ANG
 			
 			
 				అంగోలాన్ క్వాన్‌జా
 				అంగోలాన్ క్వాన్‌జా
 				అంగోలాన్ క్వాన్‌జా‌లు
+				AOA
 				Kz
 			
 			
 				అర్జెంటీనా పెసో
 				అర్జెంటీనా పెసో
 				అర్జెంటీనా పెసోలు
+				ARS
 				$
 			
 			
 				ఆస్ట్రేలియన్ డాలర్
 				ఆస్ట్రేలియన్ డాలర్
 				ఆస్ట్రేలియన్ డాలర్‌లు
+				A$
 				$
 			
 			
 				అరుబన్ ఫ్లోరిన్
 				అరుబన్ ఫ్లోరిన్
 				అరుబన్ ఫ్లోరిన్
+				AWG
 			
 			
 				అజర్బైజాన్ మానట్
 				అజర్బైజాన్ మానట్
 				అజర్బైజాన్ మానట్‌లు
+				AZN
 			
 			
 				బోస్నియా-హెర్జగోవినా మార్పిడి చెయ్యగలిగే మార్క్
 				బోస్నియా-హెర్జగోవినా మార్పిడి చెయ్యగలిగే మార్క్
 				బోస్నియా-హెర్జగోవినా మార్పిడి చెయ్యగలిగే మార్క్‌లు
+				BAM
 				KM
 			
 			
 				బర్బాడియన్ డాలర్
 				బర్బాడియన్ డాలర్
 				బర్బాడియన్ డాలర్‌లు
+				BBD
 				$
 			
 			
 				బాంగ్లాదేశ్ టాకా
 				బాంగ్లాదేశ్ టాకా
 				బాంగ్లాదేశ్ టాకాలు
+				BDT
 				৳
 			
 			
 				బల్గేరియన్ లేవ్
 				బల్గేరియన్ లేవ్
 				బల్గేరియన్ లేవ
+				BGN
 			
 			
 				బహ్రెయిన్ దినార్
 				బహ్రెయిన్ దినార్
 				బహ్రెయిన్ దినార్‌లు
+				BHD
 			
 			
 				బురిండియన్ ఫ్రాంక్
 				బురిండియన్ ఫ్రాంక్
 				బురిండియన్ ఫ్రాంక్‌లు
+				BIF
 			
 			
 				బెర్ముడన్ డాలర్
 				బెర్ముడన్ డాలర్
 				బెర్ముడన్ డాలర్‌లు
+				BMD
 				$
 			
 			
 				బ్రూనై డాలర్
 				బ్రూనై డాలర్
 				బ్రూనై డాలర్‌లు
+				BND
 				$
 			
 			
 				బొలీవియన్ బొలీవియానో
 				బొలీవియన్ బొలీవియానో
 				బొలీవియన్ బొలీవియానోలు
+				BOB
 				Bs
 			
 			
 				బ్రెజిలియన్ రియల్
 				బ్రెజిలియన్ రియల్
 				బ్రెజిలియన్ రియల్‌లు
+				R$
 				R$
 			
 			
 				బహామియన్ డాలర్
 				బహామియన్ డాలర్
 				బహామియన్ డాలర్‌లు
+				BSD
 				$
 			
 			
 				భూటానీయుల గుల్‌ట్రుమ్
 				భూటానీయుల గుల్‌ట్రుమ్
 				భూటానీయుల గుల్‌ట్రుమ్‌లు
+				BTN
 			
 			
 				బోట్స్‌వానా పులా
 				బోట్స్‌వానా పులా
 				బోట్స్‌వానా పులాలు
+				BWP
 				P
 			
 			
 				బెలరూసియన్ రూబల్
 				బెలరూసియన్ రూబల్
 				బెలరూసియన్ రూబల్‌లు
+				BYN
+				р.
 			
 			
 				బెలరూసియన్ రూబల్ (2000–2016)
 				బెలరూసియన్ రూబల్ (2000–2016)
 				బెలరూసియన్ రూబల్‌లు (2000–2016)
+				BYR
 			
 			
 				బెలీజ్ డాలర్
 				బెలీజ్ డాలర్
 				బెలీజ్ డాలర్‌లు
+				BZD
 				$
 			
 			
 				కెనడియన్ డాలర్
 				కెనడియన్ డాలర్
 				కెనడియన్ డాలర్‌లు
+				CA$
 				$
 			
 			
 				కొంగోలిస్ ఫ్రాంక్
 				కొంగోలిస్ ఫ్రాంక్
 				కొంగోలిస్ ఫ్రాంక్‌లు
+				CDF
 			
 			
 				స్విస్ ఫ్రాంక్
 				స్విస్ ఫ్రాంక్
 				స్విస్ ఫ్రాంక్‌లు
+				CHF
 			
 			
 				చిలియన్ పెసో
 				చిలియన్ పెసో
 				చిలియన్ పెసోలు
+				CLP
 				$
 			
 			
 				చైనీస్ యూవాన్ (ఆఫ్‌షోర్)
 				చైనీస్ యూవాన్ (ఆఫ్‌షోర్)
 				చైనీస్ యూవాన్ (ఆఫ్‌షోర్)
+				CNH
 			
 			
 				చైనా దేశ యువాన్
 				చైనా దేశ యువాన్
 				చైనా దేశ యువాన్
+				CN¥
 				¥
 			
 			
 				కొలంబియన్ పెసో
 				కొలంబియన్ పెసో
 				కొలంబియన్ పెసోలు
+				COP
 				$
 			
 			
 				కోస్టా రికన్ కోలోన్
 				కోస్టా రికన్ కోలోన్
 				కోస్టా రికన్ కోలోన్‌లు
+				CRC
 				₡
 			
 			
 				క్యూబన్ కన్వర్టబుల్ పెసో
 				క్యూబన్ కన్వర్టబుల్ పెసో
 				క్యూబన్ కన్వర్టబుల్ పెసోలు
+				CUC
 				$
 			
 			
 				క్యూబన్ పెసో
 				క్యూబన్ పెసో
 				క్యూబన్ పెసోలు
+				CUP
 				$
 			
 			
 				కేప్ వెర్డియన్ ఎస్కుడో
 				కేప్ వెర్డియన్ ఎస్కుడో
 				కేప్ వెర్డియన్ ఎస్కుడోలు
+				CVE
 			
 			
 				చెక్ రిపబ్లిక్ కోరునా
 				చెక్ రిపబ్లిక్ కోరునా
 				చెక్ రిపబ్లిక్ కోరునాలు
+				CZK
 				Kč
 			
 			
 				జిబోటియన్ ఫ్రాంక్
 				జిబోటియన్ ఫ్రాంక్
 				జిబోటియన్ ఫ్రాంక్‌లు
+				DJF
 			
 			
 				డానిష్ క్రోన్
 				డానిష్ క్రోన్
 				డానిష్ క్రోనర్
+				DKK
 				kr
 			
 			
 				డోమినికన్ పెసో
 				డోమినికన్ పెసో
 				డోమినికన్ పెసోలు
+				DOP
 				$
 			
 			
 				అల్జీరియన్ దీనార్
 				అల్జీరియన్ దీనార్
 				అల్జీరియన్ దీనార్‌లు
+				DZD
 			
 			
 				ఈజిప్షియన్ పౌండ్
 				ఈజిప్షియన్ పౌండ్
 				ఈజిప్షియన్ పౌండ్‌లు
+				EGP
 				E£
 			
 			
 				ఎరిట్రీన్ నక్ఫా
 				ఎరిట్రీన్ నక్ఫా
 				ఎరిట్రీన్ నక్ఫా‌లు
+				ERN
 			
 			
 				ఇథియోపియన్ బర్
 				ఇథియోపియన్ బర్
 				ఇథియోపియన్ బర్‌లు
+				ETB
 			
 			
 				యురొ
 				యురొ
 				యురోలు
+				€
 				€
 			
 			
 				ఫీజియన్ డాలర్
 				ఫీజియన్ డాలర్
 				ఫీజియన్ డాలర్‌లు
+				FJD
 				$
 			
 			
 				ఫాక్‌ల్యాండ్ దీవులు పౌండ్
 				ఫాక్‌ల్యాండ్ దీవులు పౌండ్
 				ఫాక్‌ల్యాండ్ దీవులు పౌండ్‌లు
+				FKP
 				£
 			
 			
 				బ్రిటిష్ పౌండ్
 				బ్రిటిష్ పౌండ్
 				బ్రిటిష్ పౌండ్‌లు
+				£
 				£
 			
 			
 				జార్జియన్ లారి
 				జార్జియన్ లారి
 				జార్జియన్ లారీలు
+				GEL
 				₾
 				₾
 			
@@ -5741,189 +6033,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				గానెయన్ సెడి
 				గానెయన్ సెడి
 				గానెయన్ సెడిలు
+				GHS
 			
 			
 				జిబ్రల్‌టూర్ పౌండ్
 				జిబ్రల్‌టూర్ పౌండ్
 				జిబ్రల్‌టూర్ పౌండ్‌లు
+				GIP
 				£
 			
 			
 				గాంబియన్ దలాసి
 				గాంబియన్ దలాసి
 				గాంబియన్ దలాసిలు
+				GMD
 			
 			
 				గ్వినియన్ ఫ్రాంక్
 				గ్వినియన్ ఫ్రాంక్
 				గ్వినియన్ ఫ్రాంక్‌లు
+				GNF
 				FG
 			
 			
 				గ్యుటెమాలన్ క్వెట్‌జల్
 				గ్యుటెమాలన్ క్వెట్‌జల్
 				గ్యుటెమాలన్ క్వెట్‌జల్‌లు
+				GTQ
 				Q
 			
 			
 				గుయనియాస్ డాలర్
 				గుయనియాస్ డాలర్
 				గుయనియాస్ డాలర్‌లు
+				GYD
 				$
 			
 			
 				హాంకాంగ్ డాలర్
 				హాంకాంగ్ డాలర్
 				హాంకాంగ్ డాలర్‌లు
+				HK$
 				$
 			
 			
 				హోండురన్ లెమిపిరా
 				హోండురన్ లెమిపిరా
 				హోండురన్ లెమిపిరాలు
+				HNL
 				L
 			
 			
 				క్రొయేషియన్ క్యూన
 				క్రొయేషియన్ క్యూన
 				క్రొయేషియన్ క్యూనాలు
+				HRK
 				kn
 			
 			
 				హైటియన్ గ్వోర్డే
 				హైటియన్ గ్వోర్డే
 				హైటియన్ గ్వోర్డేలు
+				HTG
 			
 			
 				హంగేరియన్ ఫోరింట్
 				హంగేరియన్ ఫోరింట్
 				హంగేరియన్ ఫోరింట్‌లు
+				HUF
 				Ft
 			
 			
 				ఇండోనేషియా రూపాయి
 				ఇండోనేషియా రూపాయి
 				ఇండోనేషియా రూపాయలు
+				IDR
 				Rp
 			
 			
-				ఐరాయిలి న్యూ షెక్యెల్
-				ఐరాయిలి న్యూ షెక్యెల్
-				ఐరాయిలి న్యూ షెక్యెల్‌లు
+				ఇజ్రాయేలీ న్యూ షెకెల్
+				ఇజ్రాయేలీ న్యూ షెకెల్
+				ఇజ్రాయేలీ న్యూ షెకెల్ లు
+				₪
 				₪
 			
 			
 				రూపాయి
 				రూపాయి
 				రూపాయలు
+				₹
 				₹
 			
 			
 				ఇరాకీ దీనార్
 				ఇరాకీ దీనార్
 				ఇరాకీ దీనార్‌లు
+				IQD
 			
 			
 				ఇరానియన్ రీయల్
 				ఇరానియన్ రీయల్
 				ఇరానియన్ రీయల్‌లు
+				IRR
 			
 			
 				ఐస్లాండిక్ క్రోనా
 				ఐస్లాండిక్ క్రోనా
 				ఐస్లాండిక్ క్రోనర్
+				ISK
 				kr
 			
 			
 				జమైకన్ డాలర్
 				జమైకన్ డాలర్
 				జమైకన్ డాలర్‌లు
+				JMD
 				$
 			
 			
 				జోర్‌డానియన్ దీనార్
 				జోర్‌డానియన్ దీనార్
 				జోర్‌డానియన్ దీనార్‌లు
+				JOD
 			
 			
 				జపాను దేశ యెన్
 				జపాను దేశ యెన్
 				జపాను దేశ యెన్
+				JP¥
 				¥
 			
 			
 				కెన్యాన్ షిల్లింగ్
 				కెన్యాన్ షిల్లింగ్
 				కెన్యాన్ షిల్లింగ్‌లు
+				KES
 			
 			
 				కిర్గిస్థాని సౌమ్
 				కిర్గిస్థాని సౌమ్
 				కిర్గిస్థాని సౌమ్‌లు
+				KGS
 			
 			
 				కాంబోడియన్ రీల్
 				కాంబోడియన్ రీల్
 				కాంబోడియన్ రీల్‌లు
+				KHR
 				៛
 			
 			
 				కొమోరియన్ ఫ్రాంక్
 				కొమోరియన్ ఫ్రాంక్
 				కొమోరియన్ ఫ్రాంక్‌లు
+				KMF
 				CF
 			
 			
 				ఉత్తర కొరియా వోన్
 				ఉత్తర కొరియా వోన్
 				ఉత్తర కొరియా వోన్
+				KPW
 				₩
 			
 			
 				దక్షిణ కొరియా వోన్
 				దక్షిణ కొరియా వోన్
 				దక్షిణ కొరియా వోన్
+				₩
 				₩
 			
 			
 				కువైట్ దీనార్
 				కువైట్ దీనార్
 				కువైట్ దీనార్‌లు
+				KWD
 			
 			
 				కేమాన్ దీవుల డాలర్
 				కేమాన్ దీవుల డాలర్
 				కేమాన్ దీవుల డాలర్‌లు
+				KYD
 				$
 			
 			
 				ఖజికిస్థాన్ టెంగే
 				ఖజికిస్థాన్ టెంగే
 				ఖజికిస్థాన్ టెంగేలు
+				KZT
 				₸
 			
 			
 				లాటియన్ కిప్
 				లాటియన్ కిప్
 				లాటియన్ కిప్‌లు
+				LAK
 				₭
 			
 			
 				లెబనీస్ పౌండ్
 				లెబనీస్ పౌండ్
 				లెబనీస్ పౌండ్‌లు
+				LBP
 				L£
 			
 			
 				శ్రీలంక రూపాయి
 				శ్రీలంక రూపాయి
 				శ్రీలంక రూపాయలు
+				LKR
 				Rs
 			
 			
 				లిబేరియన్ డాలర్
 				లిబేరియన్ డాలర్
 				లిబేరియన్ డాలర్‌లు
+				LRD
 				$
 			
 			
@@ -5933,69 +6258,82 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				లిథోనియన్ లీటాస్
 				లిథోనియన్ లీటాస్
 				లిథోనియన్ లీటై
+				LTL
 			
 			
 				లాత్వియన్ లాట్స్
 				లాత్వియన్ లాట్స్
 				లాత్వియన్ లాటి
+				LVL
 			
 			
 				లిబియన్ దీనార్
 				లిబియన్ దీనార్
 				లిబియన్ దీనార్‌లు
+				LYD
 			
 			
 				మోరోకన్ దిర్హుమ్
 				మోరోకన్ దిర్హుమ్
 				మోరోకన్ దిర్హుమ్‌లు
+				MAD
 			
 			
 				మోల్‌డోవన్ ల్యూ
 				మోల్‌డోవన్ ల్యూ
 				మోల్‌డోవన్ లీ
+				MDL
 			
 			
 				మలగసీ అరియరీ
 				మలగసీ అరియరీ
 				మలగసీ అరియరీలు
+				MGA
 				Ar
 			
 			
 				మెసిడోనియన్ దినార్
 				మెసిడోనియన్ దినార్
 				మెసిడోనియన్ దినారి
+				MKD
 			
 			
 				మయన్మార్ క్యాట్
 				మయన్మార్ క్యాట్
 				మయన్మార్ క్యాట్‌లు
+				MMK
 				K
 			
 			
 				మంగోలియన్ టుగ్రిక్
 				మంగోలియన్ టుగ్రిక్
 				మంగోలియన్ టుగ్రిక్‌లు
+				MNT
 				₮
 			
 			
 				మకనీస్ పటాక
 				మకనీస్ పటాక
 				మకనీస్ పటాకాలు
+				MOP
 			
 			
 				మౌరిటానియన్ ఒగ్యియా (1973–2017)
 				మౌరిటానియన్ ఒగ్యియా (1973–2017)
 				మౌరిటానియన్ ఒగ్యియాలు (1973–2017)
+				MRO
 			
 			
 				మౌరిటానియన్ ఒగ్యియా
 				మౌరిటానియన్ ఒగ్యియా
 				మౌరిటానియన్ ఒగ్యియాలు
+				MRU
 			
 			
 				మారిషన్ రూపాయి
 				మారిషన్ రూపాయి
 				మారిషన్ రూపాయలు
+				MUR
 				Rs
 			
 			
@@ -6007,217 +6345,258 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				మాల్దీవియన్ రుఫియా
 				మాల్దీవియన్ రుఫియా
 				మాల్దీవియన్ రుఫియాలు
+				MVR
 			
 			
 				మలావియన్ క్వాచా
 				మలావియన్ క్వాచా
 				మలావియన్ క్వాచాలు
+				MWK
 			
 			
 				మెక్సికన్ పెసో
 				మెక్సికన్ పెసో
 				మెక్సికన్ పెసోలు
+				MX$
 				$
 			
 			
 				మలేషియా రింగ్గిట్
 				మలేషియా రింగ్గిట్
 				మలేషియా రింగ్గిట్‌లు
+				MYR
 				RM
 			
 			
 				మొజాంబికన్ మెటికల్
 				మొజాంబికన్ మెటికల్
 				మొజాంబికన్ మెటికల్‌లు
+				MZN
 			
 			
 				నమిబియన్ డాలర్
 				నమిబియన్ డాలర్
 				నమిబియన్ డాలర్‌లు
+				NAD
 				$
 			
 			
 				నైజీరియన్ నైరా
 				నైజీరియన్ నైరా
 				నైజీరియన్ నైరాలు
+				NGN
 				₦
 			
 			
 				నికరగ్యుయన్ కొర్‌డుబు
 				నికరగ్యుయన్ కొర్‌డుబు
 				నికరగ్యుయన్ కొర్‌డుబులు
+				NIO
 				C$
 			
 			
 				నార్వేజీయన్ క్రోన్
 				నార్వేజీయన్ క్రోన్
 				నార్వేజీయన్ క్రోనర్
+				NOK
 				kr
 			
 			
 				నేపాలీయుల రూపాయి
 				నేపాలీయుల రూపాయి
 				నేపాలీయుల రూపాయలు
+				NPR
 				Rs
 			
 			
 				న్యూజిలాండ్ డాలర్
 				న్యూజిలాండ్ డాలర్
 				న్యూజిలాండ్ డాలర్‌లు
+				NZ$
 				$
 			
 			
 				ఒమాని రీయల్
 				ఒమాని రీయల్
 				ఒమాని రీయల్‌లు
+				OMR
 			
 			
 				పనామనియన్ బల్బోవ
 				పనామనియన్ బల్బోవ
 				పనామనియన్ బల్బోవాలు
+				PAB
 			
 			
 				పెరువియన్ సోల్
 				పెరువియన్ సోల్
 				పెరువియన్ సోల్‌లు
+				PEN
 			
 			
 				పప్యూ న్యూ గ్యినియన్ కినా
 				పప్యూ న్యూ గ్యినియన్ కినా
 				పప్యూ న్యూ గ్యినియన్ కినా
+				PGK
 			
 			
 				ఫిలిప్పిన్ పెసో
 				ఫిలిప్పిన్ పెసో
 				ఫిలిప్పిన్ పెసోలు
+				PHP
 				₱
 			
 			
 				పాకిస్థాన్ రూపాయి
 				పాకిస్థాన్ రూపాయి
 				పాకిస్థాన్ రూపాయలు
+				PKR
 				Rs
 			
 			
 				పోలిష్ జ్లోటీ
 				పోలిష్ జ్లోటీ
 				పోలిష్ జ్లోటీలు
+				PLN
 				zł
 			
 			
 				పరగ్వాయన్ గ్వారని
 				పరగ్వాయన్ గ్వారని
 				పరగ్వాయన్ గ్వారనీలు
+				PYG
 				₲
 			
 			
 				క్వాటరి రీయల్
 				క్వాటరి రీయల్
 				క్వాటరి రీయల్‌లు
+				QAR
 			
 			
 				రోమానియాన్ లెయు
 				రోమానియాన్ లెయు
 				రోమానియాన్ లీ
+				RON
+				lei
 			
 			
 				సెర్బియన్ దీనార్
 				సెర్బియన్ దీనార్
 				సెర్బియన్ దీనార్‌లు
+				RSD
 			
 			
 				రష్యన్ రూబల్
 				రష్యన్ రూబల్
 				రష్యన్ రూబల్‌లు
+				RUB
 				₽
 			
 			
 				ర్వానడాన్ ఫ్రాంక్
 				ర్వానడాన్ ఫ్రాంక్
 				ర్వానడాన్ ఫ్రాంక్‌లు
+				RWF
 				RF
 			
 			
 				సౌది రియల్
 				సౌది రియల్
 				సౌది రియల్‌లు
+				SAR
 			
 			
 				సోలోమన్ దీవుల డాలర్
 				సోలోమన్ దీవుల డాలర్
 				సోలోమన్ దీవుల డాలర్‌లు
+				SBD
 				$
 			
 			
 				సెయిచెల్లోయిస్ రూపాయి
 				సెయిచెల్లోయిస్ రూపాయి
 				సెయిచెల్లోయిస్ రూపాయలు
+				SCR
 			
 			
 				సుడానీస్ పౌండ్
 				సుడానీస్ పౌండ్
 				సుడానీస్ పౌండ్‌లు
+				SDG
 			
 			
 				స్వీడిష్ క్రోనా
 				స్వీడిష్ క్రోనా
 				స్వీడిష్ క్రోనర్
+				SEK
 				kr
 			
 			
 				సింగపూర్ డాలర్
 				సింగపూర్ డాలర్
 				సింగపూర్ డాలర్‌లు
+				SGD
 				$
 			
 			
 				సెయింట్ హెలెనా పౌండ్
 				సెయింట్ హెలెనా పౌండ్
 				సెయింట్ హెలెనా పౌండ్‌లు
+				SHP
 				£
 			
 			
 				సీయిరు లియోనియన్ లీయోన్
 				సీయిరు లియోనియన్ లీయోన్
 				సీయిరు లియోనియన్ లీయోన్‌లు
+				SLL
 			
 			
 				సొమాలి షిల్లింగ్
 				సొమాలి షిల్లింగ్
 				సొమాలి షిల్లింగ్‌లు
+				SOS
 			
 			
 				సురినామీయుల డాలర్
 				సురినామీయుల డాలర్
 				సురినామీయుల డాలర్‌లు
+				SRD
 				$
 			
 			
 				దక్షిణ సుడానీస్ పౌండ్
 				దక్షిణ సుడానీస్ పౌండ్
 				దక్షిణ సుడానీస్ పౌండ్‌లు
+				SSP
 				£
 			
 			
 				సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రా (1977–2017)
 				సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రా (1977–2017)
 				సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రాలు (1977–2017)
+				STD
 			
 			
 				సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రా
 				సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రా
 				సావో టోమ్ మరియు ప్రిన్సిపి డోబ్రాలు
+				STN
+				Db
 			
 			
 				సిరీయన్ పౌండ్
 				సిరీయన్ పౌండ్
 				సిరీయన్ పౌండ్‌లు
+				SYP
 				£
 			
 			
 				స్వాజి లిలాన్గేని
 				స్వాజి లిలాన్గేని
 				స్వాజి ఎమలాన్గేని
+				SZL
 			
 			
 				థాయ్ బాట్
@@ -6230,27 +6609,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				తజికిస్థాన్ సమోని
 				తజికిస్థాన్ సమోని
 				తజికిస్థాన్ సమోనీలు
+				TJS
 			
 			
 				తుర్క్‌మెనిస్థాని మనాట్
 				తుర్క్‌మెనిస్థాని మనాట్
 				తుర్క్‌మెనిస్థాని మనాట్
+				TMT
 			
 			
 				తునీషియన్ దీనార్
 				తునీషియన్ దీనార్
 				తునీషియన్ దీనార్‌లు
+				TND
 			
 			
 				టోంగాన్ పాంʻగా
 				టోంగాన్ పాంʻగా
 				టోంగాన్ పాంʻగా
+				TOP
 				T$
 			
 			
-				తుర్కిష్ లిరా
-				తుర్కిష్ లిరా
-				తుర్కిష్ లిరా
+				టర్కిస్ లీరా
+				టర్కిస్ లీరా
+				టర్కిస్ లీరా
+				TRY
 				₺
 				TL
 			
@@ -6258,29 +6642,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ట్రినిడాడ్ మరియు టొబాగో డాలర్
 				ట్రినిడాడ్ మరియు టొబాగో డాలర్
 				ట్రినిడాడ్ మరియు టొబాగో డాలర్‌లు
+				TTD
 				$
 			
 			
 				క్రొత్త తైవాన్ డాలర్
 				క్రొత్త తైవాన్ డాలర్
 				కొత్త తైవాన్ డాలర్‌లు
+				NT$
 				NT$
 			
 			
 				టాంజానియన్ షిల్లింగ్
 				టాంజానియన్ షిల్లింగ్
 				టాంజానియన్ షిల్లింగ్‌లు
+				TZS
 			
 			
 				ఉక్రయినియన్ హ్రివ్‌నియా
 				ఉక్రయినియన్ హ్రివ్‌నియా
 				ఉక్రయినియన్ హ్రివ్‌నియాలు
+				UAH
 				₴
 			
 			
 				ఉగాండన్ షిల్లింగ్
 				ఉగాండన్ షిల్లింగ్
 				ఉగాండన్ షిల్లింగ్‌లు
+				UGX
 			
 			
 				అమెరికా డాలర్
@@ -6293,44 +6682,52 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ఉరుగ్వెయన్ పెసో
 				ఉరుగ్వెయన్ పెసో
 				ఉరుగ్వెయన్ పెసోలు
+				UYU
 				$
 			
 			
 				ఉజ్‌బెకిస్తాన్ సౌమ్
 				ఉజ్‌బెకిస్తాన్ సౌమ్
 				ఉజ్‌బెకిస్తాన్ సౌమ్
+				UZS
 			
 			
 				వెనుజులా బోలివర్ (2008–2018)
 				వెనుజులా బోలివర్ (2008–2018)
 				వెనుజులా బోలివర్‌లు (2008–2018)
+				VEF
 				Bs
 			
 			
 				వెనుజులా బోలివర్
 				వెనుజులా బోలివర్
 				వెనుజులా బోలివర్‌లు
+				VES
 			
 			
 				వియత్నామీయుల డాంగ్
 				వియత్నామీయుల డాంగ్
 				వియత్నామీయుల డాంగ్
+				₫
 				₫
 			
 			
 				వనాటు వటు
 				వనాటు వటు
 				వవాటు వటూలు
+				VUV
 			
 			
 				సమోయన్ తాలా
 				సమోయన్ తాలా
 				సమోయన్ తాలా
+				WST
 			
 			
 				సెంట్రల్ ఆఫ్రికన్ సిఎఫ్‌ఎ ఫ్రాంక్
 				సెంట్రల్ ఆఫ్రికన్ సిఎఫ్‌ఎ ఫ్రాంక్
 				సెంట్రల్ ఆఫ్రికన్ సిఎఫ్‌ఎ ఫ్రాంక్‌లు
+				FCFA
 			
 			
 				వెండి
@@ -6342,17 +6739,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				తూర్పు కరీబియన్ డాలర్
 				తూర్పు కరీబియన్ డాలర్
 				తూర్పు కరీబియన్ డాలర్‌లు
+				EC$
 				$
 			
 			
 				పశ్చిమ ఆఫ్రికన్ సిఏఫ్ఏ ఫ్రాంక్
 				పశ్చిమ ఆఫ్రికన్ సిఏఫ్ఏ ఫ్రాంక్
 				పశ్చిమ ఆఫ్రికన్ సిఏఫ్ఏ ఫ్రాంక్‌లు
+				CFA
 			
 			
 				సిఎఫ్‌పి ఫ్రాంక్
 				సిఎఫ్‌పి ఫ్రాంక్
 				సిఎఫ్‌పి ఫ్రాంక్‌లు
+				CFPF
 			
 			
 				ప్లాటినం
@@ -6366,11 +6766,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ఎమునీ రీయల్
 				ఎమునీ రీయల్
 				ఎమునీ రీయల్‌లు
+				YER
 			
 			
 				దక్షిణ ఆఫ్రికా ర్యాండ్
 				దక్షిణ ఆఫ్రికా ర్యాండ్
 				దక్షిణ ఆఫ్రికా ర్యాండ్
+				ZAR
 				R
 			
 			
@@ -6380,11 +6782,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				జాంబియన్ క్వాచా
 				జాంబియన్ క్వాచా
 				జాంబియన్ క్వాచాలు
+				ZMW
 				ZK
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}–{1}
 		
 		
@@ -6398,6 +6803,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				గు-శక్తి
 				{0} గు-శక్తి
@@ -6484,9 +6892,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				చదరపు అంగుళానికి {0}
 			
 			
-				డునామ్
-				{0} డునామ్
-				{0} డునామ్‌లు
+				{0} డునామ్
+				{0} డునామ్‌లు
 			
 			
 				కేరట్లు
@@ -6519,14 +6926,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/మైలుకు
 			
 			
-				పెర్మేరియాడ్
-				{0} పెర్మేరియాడ్
-				{0} పెర్మేరియాడ్
+				పెర్మేరియాడ్
+				{0} పెర్మేరియాడ్
+				{0} పెర్మేరియాడ్
 			
 			
-				మోల్‌లు
-				{0} మోల్
-				{0} మోల్‌లు
+				మోల్‌లు
+				{0} మోల్
+				{0} మోల్‌లు
 			
 			
 				లీటర్లు/కిలోమీటరు
@@ -6549,9 +6956,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} మైళ్లు/ఇంపీరియల్ గ్యాలన్
 			
 			
-				పెటాబైట్లు
-				{0} పెటాబైట్
-				{0} పెటాబైట్లు
+				పెటాబైట్లు
+				{0} పెటాబైట్
+				{0} పెటాబైట్లు
 			
 			
 				టెరాబైట్లు
@@ -6608,6 +7015,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} శతాబ్దం
 				{0} శతాబ్దాలు
 			
+			
+				దశాబ్దాలు
+				{0} దశాబ్దం
+				{0} దశాబ్దాలు
+			
 			
 				సంవత్సరాలు
 				{0} సంవత్సరం
@@ -6716,24 +7128,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} కిలోవాట్-గంటలు
 			
 			
-				ఎలక్ట్రాన్‌వోల్ట్స్
-				{0} ఎలక్ట్రాన్‌వోల్ట్
-				{0} ఎలక్ట్రాన్‌వోల్ట్స్
+				ఎలక్ట్రాన్‌వోల్ట్స్
+				{0} ఎలక్ట్రాన్‌వోల్ట్
+				{0} ఎలక్ట్రాన్‌వోల్ట్స్
 			
 			
-				బ్రిటీష్ థెర్మల్ యూనిట్లు
-				{0} బ్రిటీష్ థెర్మల్ యూనిట్
-				{0} బ్రిటీష్ థెర్మల్ యూనిట్లు
+				బ్రిటీష్ థెర్మల్ యూనిట్లు
+				{0} బ్రిటీష్ థెర్మల్ యూనిట్
+				{0} బ్రిటీష్ థెర్మల్ యూనిట్లు
+			
+			
+				US థెర్మ్‌లు
+				{0} US థెర్మ్‌
+				{0} US థెర్మ్‌లు
 			
 			
-				పౌండ్-ఫోర్స్
-				{0} పౌండ్-ఫోర్స్
-				{0} పౌండ్‌లు-ఫోర్స్
+				పౌండ్-ఫోర్స్
+				{0} పౌండ్-ఫోర్స్
+				{0} పౌండ్‌లు-ఫోర్స్
 			
 			
-				న్యూటన్‌లు
-				{0} న్యూటన్
-				{0} న్యూటన్‌లు
+				న్యూటన్‌లు
+				{0} న్యూటన్
+				{0} న్యూటన్‌లు
 			
 			
 				గిగాహెర్ట్‌జ్
@@ -6755,6 +7172,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} హెర్ట్‌జ్
 				{0} హెర్ట్‌జ్
 			
+			
+				పిక్సెల్స్
+				{0} px
+				{0} పిక్సెల్స్
+			
+			
+				మెగా పిక్సెల్స్
+				{0} మెగా పిక్సెల్స్
+				{0} మెగా పిక్సెల్స్
+			
+			
+				పిక్సెల్స్ ప్రతి సెంటిమీటరుకు
+				{0} పిక్సెల్ ప్రతి సెంటిమీటరుకు
+				{0} పిక్సెల్స్ ప్రతి సెంటిమీటరుకు
+			
+			
+				పిక్సెల్స్ ప్రతి అంగుళానికి
+				{0} పిక్సెల్ ప్రతి అంగుళానికి
+				{0} పిక్సెల్స్ ప్రతి అంగుళానికి
+			
+			
+				బిందువులు ప్రతి సెంటిమీటరుకు
+				{0} బిందువు ప్రతి సెంటిమీటరుకు
+				{0} బిందువులు ప్రతి సెంటిమీటరుకు
+			
+			
+				బిందువులు ప్రతి అంగుళానికి
+				{0} బిందువు ప్రతి అంగుళానికి
+				{0} బిందువులు ప్రతి అంగుళానికి
+			
 			
 				కిలోమీటర్లు
 				{0} కిలోమీటరు
@@ -6856,9 +7303,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} పాయింట్‌లు
 			
 			
-				సౌర అర్ధవ్యాసం
-				{0} సౌర అర్ధవ్యాసం
-				{0} సౌర అర్ధవ్యాసం
+				సౌర అర్ధవ్యాసం
+				{0} సౌర అర్ధవ్యాసం
+				{0} సౌర అర్ధవ్యాసం
 			
 			
 				లక్స్
@@ -6866,9 +7313,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} లక్స్
 			
 			
-				సోలార్ ల్యూమినోసైటైస్
-				{0} సోలార్ ల్యూమినోసిటీ
-				{0} సోలార్ ల్యూమినోసైటైస్
+				సోలార్ ల్యూమినోసైటైస్
+				{0} సోలార్ ల్యూమినోసిటీ
+				{0} సోలార్ ల్యూమినోసైటైస్
 			
 			
 				మెట్రిక్ టన్నులు
@@ -6930,19 +7377,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} క్యారెట్లు
 			
 			
-				డాల్టన్‌లు
-				{0} డాల్టన్
-				{0} డాల్టన్‌లు
+				డాల్టన్‌లు
+				{0} డాల్టన్
+				{0} డాల్టన్‌లు
 			
 			
-				భూమి ద్రవ్యరాశులు
-				{0} భూమి ద్రవ్యరాశి
-				{0} భూమి ద్రవ్యరాశులు
+				భూమి ద్రవ్యరాశులు
+				{0} భూమి ద్రవ్యరాశి
+				{0} భూమి ద్రవ్యరాశులు
 			
 			
-				సౌర ద్రవ్యరాశులు
-				{0} సౌర ద్రవ్యరాశి
-				{0} సౌర ద్రవ్యరాశులు
+				సౌర ద్రవ్యరాశులు
+				{0} సౌర ద్రవ్యరాశి
+				{0} సౌర ద్రవ్యరాశులు
 			
 			
 				గిగావాట్లు
@@ -6974,11 +7421,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} హార్స్‌పవర్
 				{0} హార్స్‌పవర్
 			
-			
-				హెక్టోపాస్కల్‌లు
-				{0} హెక్టోపాస్కల్
-				{0} హెక్టోపాస్కల్‌లు
-			
 			
 				మిల్లీమీటర్ల పాదరసం
 				{0} మిల్లీమీటర్ పాదరసం
@@ -6994,6 +7436,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} అంగుళం పాదరసం
 				{0} అంగుళాల పాదరసం
 			
+			
+				బార్
+				{0} బార్
+				{0} బార్‌లు
+			
 			
 				మిల్లీబార్‌లు
 				{0} మిల్లీబార్
@@ -7004,15 +7451,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} వాతావరణం
 				{0} వాతావరణాలు
 			
+			
+				పాస్కల్‌లు
+				{0} పాస్కల్
+				{0} పాస్కల్‌లు
+			
+			
+				హెక్టోపాస్కల్‌లు
+				{0} హెక్టోపాస్కల్
+				{0} హెక్టోపాస్కల్‌లు
+			
 			
-				కిలోపాస్కెల్స్
-				{0} కిలోపాస్కెల్స్
-				{0} కిలోపాస్కెల్స్
+				కిలోపాస్కెల్స్
+				{0} కిలోపాస్కెల్
+				{0} కిలోపాస్కెల్స్
 			
 			
-				మెగాపాస్కెల్స్
-				{0} మెగాపాస్కెల్స్
-				{0} మెగాపాస్కెల్స్
+				మెగాపాస్కెల్స్
+				{0} మెగాపాస్కెల్
+				{0} మెగాపాస్కెల్స్
 			
 			
 				కిలోమీటర్లు/గంట
@@ -7055,14 +7512,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} కెల్విన్స్
 			
 			
-				పౌండ్-ఫీట్
-				{0} పౌండ్-ఫూట్
-				{0} పౌండ్-ఫీట్
+				పౌండ్-ఫీట్
+				{0} పౌండ్-ఫూట్
+				{0} పౌండ్-ఫీట్
 			
 			
-				న్యూటన్-మీటర్లు
-				{0} న్యూటన్-మీటరు
-				{0} న్యూటన్-మీటర్లు
+				న్యూటన్-మీటర్లు
+				{0} న్యూటన్-మీటరు
+				{0} న్యూటన్-మీటర్లు
 			
 			
 				క్యూబిక్ కిలోమీటర్లు
@@ -7180,9 +7637,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ద్రవరూప ఔన్సులు
 			
 			
-				ఇంపీ. ద్రవ ఔన్సులు
-				{0} ఇంపీ. ద్రవ ఔన్సు
-				{0} ఇంపీ. ద్రవ ఔన్సులు
+				ఇంపీ. ద్రవ ఔన్సులు
+				{0} ఇంపీ. ద్రవ ఔన్సు
+				{0} ఇంపీ. ద్రవ ఔన్సులు
 			
 			
 				టేబుల్ స్పూన్లు
@@ -7195,12 +7652,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} టీ స్పూన్లు
 			
 			
-				బారెల్‌లు
-				{0} బారెల్‌లు
-				{0} బారెల్‌లు
+				బారెల్‌లు
+				{0} బారెల్‌లు
+				{0} బారెల్‌లు
 			
 			
-				కార్డినల్ దిశ
+				కార్డినల్ దిశ
 				{0} తూర్పు
 				{0} ఉత్తరం
 				{0} దక్షిణం
@@ -7211,6 +7668,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				గు-శక్తి
 				{0} గు
@@ -7297,9 +7757,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/అం²
 			
 			
-				డునామ్‌లు
-				{0} డునామ్
-				{0} డునామ్
+				డునామ్‌లు
+				{0} డునామ్
+				{0} డునామ్
 			
 			
 				కేరట్లు
@@ -7332,14 +7792,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				పెర్మేరియాడ్
-				{0}‱
-				{0}‱
+				పెర్మేరియాడ్
 			
 			
-				మోల్
-				{0} mol
-				{0} mol
+				మోల్
+				{0} mol
+				{0} mol
 			
 			
 				లీటర్లు/కి.మీ
@@ -7362,9 +7820,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} మై./గ్యా. ఇంపీరియల్
 			
 			
-				పె.బైట్
-				{0} పీబీ
-				{0} పీబీ
+				పె.బైట్
+				{0} పీబీ
+				{0} పీబీ
 			
 			
 				టె.బైట్
@@ -7421,6 +7879,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} శ
 				{0} శ
 			
+			
+				దశా.
+				{0} దశా.
+				{0} ద.
+			
 			
 				సంవత్సరాలు
 				{0} సం.
@@ -7529,24 +7992,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} కి.వా.గం
 			
 			
-				ఎలక్ట్రాన్‌వోల్ట్
-				{0} eV
-				{0} eV
+				ఎలక్ట్రాన్‌వోల్ట్
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+			
+			
+				US థెర్మ్‌
+				{0} US థెర్మ్‌
+				{0} US థెర్మ్‌లు
 			
 			
-				పౌండ్-ఫోర్స్
-				{0} lbf
-				{0} lbf
+				పౌండ్-ఫోర్స్
 			
 			
-				న్యూటన్
-				{0} N
-				{0} N
+				న్యూటన్
 			
 			
 				గిగా హెడ్జ్
@@ -7568,6 +8028,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} హెర్ట్‌జ్
 				{0} హెర్ట్‌జ్
 			
+			
+				పిక్సెల్స్
+			
+			
+				మెగా పిక్సెల్స్
+				{0} మె. పి.
+				{0} MP
+			
+			
+				పి/సె.మీ.
+				{0} పి/సె.మీ.
+				{0} పి/సె.మీ.
+			
+			
+				పి/అం.
+				{0} పి/అం.
+				{0} పి/అం.
+			
+			
+				బి/సె.మీ.
+				{0} బి/సె.మీ.
+				{0} బి/సె.మీ.
+			
+			
+				బి/అం.
+				{0} బి/అం.
+				{0} బి/అం.
+			
 			
 				కి.మీ.
 				{0} కి.మీ.
@@ -7663,11 +8151,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				పాయింట్‌లు
+				{0} pt
+				{0} pt
 			
 			
-				సౌర అర్ధవ్యాసం
-				{0} R☉
-				{0} R☉
+				సౌర అర్ధవ్యాసం
 			
 			
 				లక్స్
@@ -7675,9 +8163,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ల.
 			
 			
-				సోలార్ ల్యూమినోసైటైస్
-				{0} L☉
-				{0} L☉
+				సోలార్ ల్యూమినోసైటైస్
 			
 			
 				ట
@@ -7739,19 +8225,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} క్యారె.
 			
 			
-				డాల్టన్‌లు
-				{0} Da
-				{0} Da
+				డాల్టన్‌లు
+				{0} Da
+				{0} Da
 			
 			
-				భూమి ద్రవ్యరాశులు
-				{0} M⊕
-				{0} M⊕
+				భూమి ద్రవ్యరాశులు
 			
 			
-				సౌర ద్రవ్యరాశులు
-				{0} M☉
-				{0} M☉
+				సౌర ద్రవ్యరాశులు
 			
 			
 				గి.వా
@@ -7783,11 +8265,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} హా.ప
 				{0} హా.ప
 			
-			
-				హె.పా
-				{0} హె.పా
-				{0} హె.పా
-			
 			
 				మిమీ. పాద
 				{0} మిమీ. పాద
@@ -7803,6 +8280,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} అం.పాద
 				{0} అం.పాద
 			
+			
+				బార్
+				{0} బార్
+				{0} బార్‌లు
+			
 			
 				మి.బార్
 				{0} మి.బార్
@@ -7813,15 +8295,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} వాతావ
 				{0} వాతావ
 			
-			
-				kPa
-				{0} kPa
-				{0} kPa
+			
+				పా
+				{0} పాస్క.
+				{0} పాస్క.
+			
+			
+				హె.పా
+				{0} హె.పా
+				{0} హె.పా
 			
 			
-				MPa
-				{0} MPa
-				{0} MPa
+				MPa
 			
 			
 				కి.మీ/గంట
@@ -7864,14 +8349,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} కె
 			
 			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
+				lbf⋅ft
 			
 			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				N⋅m
+				{0} N⋅m
+				{0} N⋅m
 			
 			
 				కి.మీ³
@@ -7988,11 +8471,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ద్ర.ఔ.
 				{0} ద్ర.ఔ.
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				టే.స్పూ.
 				{0} టే.స్పూ
@@ -8004,12 +8482,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} టీ.స్పూ.
 			
 			
-				బారెల్
-				{0} బారెల్
-				{0} బారెల్
+				బారెల్
+				{0} బారెల్
+				{0} బారెల్
 			
 			
-				దిశ
+				దిశ
 				{0} తూ.
 				{0} ఉ.
 				{0} ద.
@@ -8020,6 +8498,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				{0} గు
 				{0} గు
@@ -8218,11 +8699,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} హా.ప
 				{0} హా.ప
 			
-			
-				హె.పా
-				{0} హె.పా
-				{0} హె.పా
-			
 			
 				మిమీ. పాద
 				{0} మిమీ. పాద
@@ -8243,6 +8719,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} మి.బార్
 				{0} మి.బార్
 			
+			
+				హె.పా
+				{0} హె.పా
+				{0} హె.పా
+			
 			
 				కి.మీ/గం
 				{0}కి.మీ/గం
@@ -8258,6 +8739,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} మై/గం.
 				{0} మై/గం.
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°సెల్సి
 				{0}°సెల్సి
@@ -8265,6 +8751,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				°ఫా
+				{0}°ఫా
+				{0}°ఫా
 			
 			
 				కె
@@ -8285,7 +8773,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}లీ
 			
 			
-				దిశ
+				దిశ
 				{0} తూ.
 				{0} ఉ.
 				{0} ద.
@@ -8315,9 +8803,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} లేదా {1}
 			{0} లేదా {1}
 		
+		
+			{0}, {1}
+		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -8436,7 +8925,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		స్మైలీ
 		స్మైలీ లేదా వ్యక్తి
 		దక్షిణ ఆసియా స్క్రిప్ట్
-		నైరుతి ఆసియా స్క్రిప్ట్
+		ఆగ్నేయ ఆసియా స్క్రిప్ట్
 		అంతరం
 		క్రీడ
 		చిహ్నం
@@ -8452,7 +8941,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		తెల్లని ఖాళీ
 	
 	
-		ఇటాలిక్
+		ఇటాలిక్
 		ఆప్టికల్ పరిమాణం
 		ఏటవాలు
 		వెడల్పు
diff --git a/make/data/cldr/common/main/te_IN.xml b/make/data/cldr/common/main/te_IN.xml
index 36fea8557bc..32eeddebc28 100644
--- a/make/data/cldr/common/main/te_IN.xml
+++ b/make/data/cldr/common/main/te_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/teo.xml b/make/data/cldr/common/main/teo.xml
index 137ade9baa5..7f32f63fcfc 100644
--- a/make/data/cldr/common/main/teo.xml
+++ b/make/data/cldr/common/main/teo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/teo_KE.xml b/make/data/cldr/common/main/teo_KE.xml
index 4e9a85ef96e..31eda92625f 100644
--- a/make/data/cldr/common/main/teo_KE.xml
+++ b/make/data/cldr/common/main/teo_KE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/teo_UG.xml b/make/data/cldr/common/main/teo_UG.xml
index 49faf369a74..2fcb05f3e70 100644
--- a/make/data/cldr/common/main/teo_UG.xml
+++ b/make/data/cldr/common/main/teo_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/tg.xml b/make/data/cldr/common/main/tg.xml
index e3903852cc1..74572a6996d 100644
--- a/make/data/cldr/common/main/tg.xml
+++ b/make/data/cldr/common/main/tg.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -41,16 +41,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			валлӣ
 			даниягӣ
 			немисӣ
+			немисии австриягӣ
+			немисии швейсарии болоӣ
 			сербии поёнӣ
 			дивеҳӣ
 			дзонгха
 			юнонӣ
 			англисӣ
+			англисии австралиягӣ
+			англисии канадагӣ
+			англисии британӣ
 			англисӣ (ШМ)
-			англисӣ (ИМ)
+			англисии америкоӣ
 			эсперанто
 			испанӣ
-			испанӣ (Америкаи Лотинӣ)
+			испании америкоии лотинӣ
+			испании аврупоӣ
+			испании мексикоӣ
 			эстонӣ
 			баскӣ
 			форсӣ
@@ -59,6 +66,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			филиппинӣ
 			фарерӣ
 			франсузӣ
+			франсузии канадагӣ
+			франсузии швейсарӣ
 			фризии ғарбӣ
 			ирландӣ
 			шотландии гэлӣ
@@ -126,6 +135,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			лаҳистонӣ
 			пушту
 			португалӣ
+			португалии бразилиягӣ
+			португалии аврупоӣ
 			кечуа
 			киче
 			ретороманӣ
@@ -170,8 +181,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			идиш
 			йоруба
 			хитоӣ
+			хитоӣ, мандаринӣ
 			хитоии осонфаҳм
+			хитоии мандаринии осонфаҳм
 			хитоии анъанавӣ
+			хитоии мандаринии анъанавӣ
 			Зулу
 		
 		
@@ -259,7 +273,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Ҷазираҳои Фолкленд
 			Штатҳои Федеративии Микронезия
 			Ҷазираҳои Фарер
-			Франсия
+			Фаронса
 			Габон
 			Шоҳигарии Муттаҳида
 			Гренада
@@ -459,14 +473,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 		[а б в г ғ д е ё ж з и ӣ й к қ л м н о п р с т у ӯ ф х ҳ ч ҷ ш ъ э ю я]
 		[ц щ ы ь]
-		[А Б В Г Ғ Д Е Ж З И Й К Қ Л М Н О П Р С Т У Ф Х Ҳ Ч Ҷ Ш Ъ Э Ю Я]
+		[А Б В Г Ғ Д Е Ё Ж З И Ӣ Й К Қ Л М Н О П Р С Т У Ӯ Ф Х Ҳ Ч Ҷ Ш Ъ Э Ю Я]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 	
-	
-		«
-		»
-		«
-		»
-	
 	
 		
 			
@@ -542,6 +552,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
+						
+							MMMM – MMMM'и' y G
+							MMMM'и' y – MMMM'и' y G
+						
 					
 				
 			
@@ -758,13 +772,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
-						
-							пе. чо.
-							па. чо.
-						
 						
-							пе. чо.
-							па. чо.
+							AM
+							PM
 						
 					
 				
@@ -848,19 +858,31 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
+						h B
+						h:mm B
+						h:mm:ss B
 						d
 						ccc
+						E h:mm B
+						E h:mm:ss B
 						d, E
+						E h:mm a
 						E HH:mm
+						E h:mm:ss a
 						E HH:mm:ss
 						y G
 						MMM y G
 						d MMM, y G
 						E, d MMM, y G
+						h a
 						HH
+						h:mm a
 						HH:mm
+						h:mm:ss a
 						HH:mm:ss
+						h:mm:ss a v
 						HH:mm:ss v
+						h:mm a v
 						HH:mm v
 						L
 						dd-MM
@@ -888,9 +910,153 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						{0} – {1}
+						
+							MMMM – MMMM'и' y
+							MMMM'и' y – MMMM'и' y
+						
 					
 				
 			
+			
+				
+					
+						
+							Муҳ.
+							Саф.
+							Раб. I
+							Раб. II
+							Ҷум. I
+							Ҷум. II
+							Раҷ.
+							Ша.
+							Рам.
+							Шав.
+							Дхул-Қ.
+							Дхул-Ҳ.
+						
+						
+							муҳаррам
+							сафар
+							Рабеъ I
+							Рабеъ II
+							ҷимоди-ул-уло
+							ҷимоди-ул-сони
+							раҷаб
+							Шабан
+							Рамадан
+							Шаввал
+							Дхут-Қидаҳ
+							Дхут-Ҳиҷҷаҳ
+						
+					
+					
+						
+							Муҳ.
+							Саф.
+							Раб. I
+							Раб. II
+							Ҷум. I
+							Ҷум. II
+							Раҷ.
+							Ша.
+							Рам.
+							Шав.
+							Дхул-Қ.
+							Дхул-Ҳ.
+						
+						
+							муҳаррам
+							сафар
+							Рабеъ I
+							Рабеъ II
+							ҷимоди-ул-уло
+							ҷимоди-ул-сони
+							раҷаб
+							Шабан
+							Рамадан
+							Шаввал
+							Дхул-Қидаҳ
+							Дхул-Ҳиҷҷаҳ
+						
+					
+				
+				
+					
+						САНА
+					
+				
+				
+					
+						
+							EEEE, d MMMM'и' y G
+						
+					
+					
+						
+							d MMMM'и' y G
+						
+					
+					
+						
+							d MMM y G
+						
+					
+				
+				
+					
+						d MMMM
+						MMMM'и' y G
+					
+				
+			
+			
+				
+					
+						
+							фарвардин
+							урдибиҳишт
+							хурдод
+							тир
+							мурдод
+							шаҳривар
+							меҳр
+							обон
+							озар
+							дей
+							баҳман
+							исфанд
+						
+					
+					
+						
+							фарвардин
+							урдибиҳишт
+							хурдод
+							тир
+							мурдод
+							шаҳривар
+							меҳр
+							обон
+							озар
+							дей
+							баҳман
+							исфанд
+						
+					
+				
+				
+					
+						
+							EEEE, d MMMM'и' y G
+						
+					
+					
+						
+							d MMMM'и' y G
+						
+					
+				
+			
 		
 		
 			
@@ -948,7 +1114,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				рӯзи ҳафта
 			
 			
-				пе. чо./па. чо.
+				AM/PM
 			
 			
 				соат
@@ -1023,7 +1189,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Вақти Уёнуси Ором
+					Вақти Уқёнуси Ором
 					Вақти стандартии Уқёнуси Ором
 					Вақти рӯзонаи Уқёнуси Ором
 				
@@ -1087,6 +1253,38 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					#,##0.###
 				
 			
+			
+				
+					0 ҳазор
+					00 ҳазор
+					000 ҳазор
+					0 миллион
+					00 миллион
+					000 миллион
+					0 миллиард
+					00 миллиард
+					000 миллиард
+					0 триллион
+					00 триллион
+					000 триллион
+				
+			
+			
+				
+					0 ҳзр'.'
+					00 ҳзр'.'
+					000 ҳзр'.'
+					0 млн'.'
+					00 млн'.'
+					000 млн'.'
+					0 млрд'.'
+					00 млрд'.'
+					000 млрд'.'
+					0 трлн'.'
+					00 трлн'.'
+					000 трлн'.'
+				
+			
 		
 		
 			
@@ -1111,6 +1309,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					#,##0.00 ¤
 				
 			
+			
+				
+					0 ҳзр'.' ¤
+					00 ҳзр'.' ¤
+					000 ҳзр'.' ¤
+					0 млн'.' ¤
+					00 млн'.' ¤
+					000 млн'.' ¤
+					0 млрд'.' ¤
+					00 млрд'.' ¤
+					000 млрд'.' ¤
+					0 трлн'.' ¤
+					00 трлн'.' ¤
+					000 трлн'.' ¤
+				
+			
 			{0} {1}
 		
 		
@@ -1196,10 +1410,4 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}, {1}
 		
 	
-	
-		
-			ҳа:ҳ
-			не:н
-		
-	
 
diff --git a/make/data/cldr/common/main/tg_TJ.xml b/make/data/cldr/common/main/tg_TJ.xml
index fc883f18e85..1f636cf0f91 100644
--- a/make/data/cldr/common/main/tg_TJ.xml
+++ b/make/data/cldr/common/main/tg_TJ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/th.xml b/make/data/cldr/common/main/th.xml
index e176fa828a6..f7191c233ef 100644
--- a/make/data/cldr/common/main/th.xml
+++ b/make/data/cldr/common/main/th.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -107,6 +107,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			คาริบ
 			คายูกา
 			แอตแซม
+			จักม่า
 			เชเชน
 			เซบู
 			คีกา
@@ -254,7 +255,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			อินโดนีเซีย
 			อินเตอร์ลิงกิว
 			อิกโบ
-			เสฉวนยิ
+			เสฉวนยี่
 			อีนูเปียก
 			อีโลโก
 			อินกุช
@@ -626,6 +627,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			โยรูบา
 			เหงงกาตุ
 			กวางตุ้ง
+			จีน (กวางตุ้ง)
 			จ้วง
 			ซาโปเตก
 			บลิสซิมโบลส์
@@ -633,6 +635,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			เซนากา
 			ทามาไซต์โมร็อกโกมาตรฐาน
 			จีน
+			จีนกลาง
 			จีนประยุกต์
 			จีนดั้งเดิม
 			ซูลู
@@ -810,7 +813,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 		
 		
 			โลก
@@ -878,7 +881,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			บราซิล
 			บาฮามาส
 			ภูฏาน
-			เกาะบูเวต
+			เกาะบูเว
 			บอตสวานา
 			เบลารุส
 			เบลีซ
@@ -1111,6 +1114,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			วานูอาตู
 			วาลลิสและฟุตูนา
 			ซามัว
+			สำเนียงไม่จริง
+			Bidi ไม่จริง
 			โคโซโว
 			เยเมน
 			มายอต
@@ -1187,28 +1192,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			ปฏิทิน
 			รูปแบบสกุลเงิน
-			ละเว้นการจัดเรียงสัญลักษณ์
-			การจัดเรียงเสียงหนักเบาในลำดับถอยหลัง
-			การเรียงลำดับตัวพิมพ์ใหญ่/ตัวพิมพ์เล็ก
+			ละเว้นการจัดเรียงสัญลักษณ์
+			การจัดเรียงเสียงหนักเบาในลำดับถอยหลัง
+			การเรียงลำดับตัวพิมพ์ใหญ่/ตัวพิมพ์เล็ก
 			การจัดเรียงแบบตรงตามตัวพิมพ์ใหญ่-เล็ก
 			ลำดับการจัดเรียง
-			การจัดเรียงแบบที่เป็นปกติ
-			การจัดเรียงตัวเลข
-			ความแม่นยำในการจัดเรียง
+			การจัดเรียงแบบที่เป็นปกติ
+			การจัดเรียงตัวเลข
+			ความแม่นยำในการจัดเรียง
 			สกุลเงิน
 			วงจรชั่วโมง (เทียบ 12 และ 24)
 			รูปแบบการขึ้นบรรทัดใหม่
 			ระบบการวัด
 			ตัวเลข
-			เขตเวลา
-			ตัวแปรภาษาถิ่น
+			เขตเวลา
+			ตัวแปรภาษาถิ่น
 			ใช้งานส่วนบุคคล
 		
 		
 			ปฏิทินพุทธ
 			ปฏิทินจีน
 			ปฏิทินคอปติก
-			ปฏิทินทันกิ
+			ปฏิทินเกาหลี
 			ปฏิทินเอธิโอเปีย
 			ปฏิทินปีโลกเอธิโอเปีย
 			ปฏิทินเกรกอเรียน
@@ -1343,7 +1348,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			ภาษา: {0}
-			สคริปต์: {0}
+			ตัวอักษร: {0}
 			ภูมิภาค: {0}
 		
 	
@@ -1351,8 +1356,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[ฯ ๆ \u0E4E \u0E4C \u0E47 \u0E48 \u0E49 \u0E4A \u0E4B ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ \u0E4D ะ \u0E31 า ๅ ำ \u0E34 \u0E35 \u0E36 \u0E37 \u0E38 \u0E39 เ แ โ ใ ไ \u0E3A]
 		[\u200B]
 		[ก ข ฃ ค ฅ ฆ ง จ ฉ ช ซ ฌ ญ ฎ ฏ ฐ ฑ ฒ ณ ด ต ถ ท ธ น บ ป ผ ฝ พ ฟ ภ ม ย ร ฤ ล ฦ ว ศ ษ ส ห ฬ อ ฮ]
-		[% , \- . ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[! " # ' ( ) * , \- . / \: @ \[ \] ‐ – — ‘ ’ “ ” … ′ ″]
+		[% , \- . ‑ ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[! " # ' ( ) * , \- . / \: @ \[ \] ‐ ‑ – — ‘ ’ “ ” … ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1582,6 +1587,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1
 							2
@@ -1612,6 +1631,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1
 							2
@@ -1780,6 +1813,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							เมสรา
 							นาซี
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							เทาท์
 							บาบา
@@ -1812,6 +1860,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							เมสรา
 							นาซี
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							เทาท์
 							บาบา
@@ -1847,6 +1910,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1
 							2
@@ -1877,6 +1954,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							1
 							2
@@ -2038,6 +2129,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							เนแฮซ
 							พากูเมน
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							เมสเคอเรม
 							เตเกมท
@@ -2070,6 +2176,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							เนแฮซ
 							พากูเมน
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							เมสเคอเรม
 							เตเกมท
@@ -2112,10 +2233,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
 						h B
 						h:mm B
 						h:mm:ss B
+						d
+						ccc
 						E h:mm B
 						E h:mm:ss B
 						E d
@@ -2123,16 +2266,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E HH:mm
 						E h:mm:ss a
 						E HH:mm:ss
+						G y
 						MMM G y
 						d MMM G y
 						E d MMM G y
 						EEEEที่ d MMM G y
+						h a
+						HH
+						h:mm a
+						HH:mm
+						h:mm:ss a
+						HH:mm:ss
+						L
 						d/M
 						E d/M
+						LLL
 						d MMM
 						E d MMM
 						EEEEที่ d MMM
 						d MMMM
+						mm:ss
+						G y
+						G y
 						M/y G
 						d/M/y GGGGG
 						E d/M/y GGGGG
@@ -2140,28 +2295,85 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						d MMM G y
 						E d MMM G y
 						EEEEที่ d MMM G y
-						MMMM G y
+						MMMM G y
 						QQQ G y
 						QQQQ G y
 					
 					
 						{0} - {1}
 						
-							h B – h B
-							h – h B
+							h – h B
 						
 						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
+							h:mm – h:mm B
+							h:mm – h:mm B
+						
+						
+							d–d
+						
+						
+							MM/GGGGG y – MM/GGGGG y
+							M/y – M/y G
+							M/y – M/y G
+						
+						
+							d/M/y – d/M/y G
+							d/MM/GGGGG y – d/MM/GGGGG y
+							d/M/y – d/M/y G
+							d/M/y – d/M/y G
+						
+						
+							E d/M/y – E d/M/y G
+							E d/MM/GGGGG y – E d/MM/GGGGG y
+							E d/M/y – E d/M/y G
+							E d/M/y – E d/M/y G
+						
+						
+							MMM G y – MMM G y
+							MMM – MMM G y
+							MMM G y – MMM y
+						
+						
+							d – d MMM G y
+							d MMM G y – d MMM G y
+							d MMM – d MMM G y
+							d MMM G y – d MMM y
+						
+						
+							E d MMM – E d MMM G y
+							E d MMM G y – E d MMM G y
+							E d MMM – E d MMM G y
+							E d MMM G y – E d MMM y
+						
+						
+							h a – h a
+							h–h a
 						
 						
 							H–H
 						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
 						
 							H:mm–H:mm v
 							H:mm–H:mm v
 						
+						
+							h a – h a v
+							h–h a v
+						
 						
 							H–H v
 						
@@ -2176,6 +2388,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E d/M – E d/M
 							E d/M – E d/M
 						
+						
+							LLL–LLL
+						
 						
 							d – d MMM
 							d MMM – d MMM
@@ -2188,6 +2403,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							EEEEที่ d – EEEEที่ d MMM
 							EEEEที่ d MMM – EEEEที่ d MMM
 						
+						
+							G y–y
+						
 						
 							M/y – M/y G
 							M/y – M/y G
@@ -2526,7 +2744,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						ก่อน ค.ศ.
-						ก.ส.ศ.
+						ก่อน ส.ศ.
 						ค.ศ.
 						ส.ศ.
 					
@@ -2570,6 +2788,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							H นาฬิกา mm นาที ss วินาที z
 						
 					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
 				
 				
 					
@@ -2655,54 +2883,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
+							MM/GGGGG y – MM/GGGGG y
+							M/y – M/y
+							M/y – M/y
 						
 						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
+							d/M/y – d/M/y
+							d/MM/GGGGG y – d/MM/GGGGG y
+							d/M/y – d/M/y
+							d/M/y – d/M/y
 						
 						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
+							E d/M/y – E d/M/y
+							E d/MM/GGGGG y – E d/MM/GGGGG y
+							E d/M/y – E d/M/y
+							E d/M/y – E d/M/y
 						
 						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
+							MMM G y – MMM G y
+							MMM – MMM G y
+							MMM G y – MMM G y
 						
 						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
+							d – d MMM G y
+							d MMM G y – d MMM G y
+							d MMM – d MMM G y
+							d MMM G y – d MMM y
 						
 						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
+							E d MMM – E d MMM G y
+							E d MMM G y – E d MMM G y
+							E d MMM – E d MMM G y
+							E d MMM y – E d MMM y
 						
 						
 							h a – h a
@@ -2839,6 +3061,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							อัฟ
 							เอลอุล
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ทิชรี
 							เฮวาน
@@ -2873,6 +3111,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							อัฟ
 							เอลอุล
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							ทิชรี
 							เฮวาน
@@ -2936,6 +3190,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							มาฆะ
 							ผลคุณี
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							จิตรา
 							วิสาขา
@@ -2966,6 +3234,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							มาฆะ
 							ผลคุณี
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							จิตรา
 							วิสาขา
@@ -3005,6 +3287,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ซุลกิอฺ.
 							ซุลหิจ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							มุฮะร์รอม
 							ซอฟาร์
@@ -3035,6 +3331,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ซุลกิอฺ.
 							ซุลหิจ.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							มุฮะร์รอม
 							ซอฟาร์
@@ -3083,14 +3393,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 				
 					
+						d
 						E d
+						G y
 						MMM G y
 						d MMM G y
 						E d MMM G y
+						L
 						d/M
 						E, d/M
+						LLL
 						d MMM
 						E d MMM
+						G y
+						G y
 						M/y G
 						d/M/y GGGGG
 						E d/M/y GGGGG
@@ -3367,8 +3683,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 				
 				
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						d
 						E d
+						G y
 						MMM G y
 						d MMM G y
 						E d MMM G y
@@ -3378,11 +3716,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						HH:mm
 						h:mm:ss a
 						HH:mm:ss
+						L
 						d/M
 						E, d/M
+						LLL
 						d MMM
 						E d MMM
 						mm:ss
+						G y
+						G y
 						M/GGGGG y
 						d/M/GGGGG y
 						E d/M/GGGGG y
@@ -3411,6 +3753,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							บาฮ์มาน
 							เอสฟานด์
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ฟาร์วาร์ดิน
 							ออร์ดิเบเฮชต์
@@ -3441,6 +3797,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							บาฮ์มาน
 							เอสฟานด์
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							ฟาร์วาร์ดิน
 							ออร์ดิเบเฮชต์
@@ -3494,6 +3864,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 				
 					
+						d
 						E d
 						ปีGที่ y
 						MMM G y
@@ -3505,8 +3876,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						HH:mm
 						h:mm:ss a
 						HH:mm:ss
+						L
 						d/M
 						E, d/M
+						LLL
 						d MMM
 						E d MMM
 						mm:ss
@@ -4037,7 +4410,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				น.
 				
 					ใน {0} นาที
 				
@@ -4046,7 +4418,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				น.
+				นาที
 				
 					ใน {0} นาที
 				
@@ -4093,9 +4465,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			+HH:mm;-HH:mm
+			GMT{0}
+			GMT
 			เวลา{0}
 			เวลาออมแสง{0}
 			เวลามาตรฐาน{0}
+			{1} ({0})
 			
 				ซานตาอิซาเบล
 			
@@ -4774,7 +5150,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				อัคโทบี
 			
 			
-				คอสตาเนย์
+				คอสตาเนย์
 			
 			
 				ไคซีลอร์ดา
@@ -5056,13 +5432,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ซาราทอฟ
 			
 			
-				แอสตราคาน
+				แอสตราคาน
 			
 			
-				อะลิยานอฟ
+				อะลิยานอฟ
 			
 			
-				คิรอฟ
+				คิรอฟ
 			
 			
 				ซามารา
@@ -5080,7 +5456,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				บาร์เนาว์
 			
 			
-				ตอมสค์
+				ตอมสค์
 			
 			
 				โนโวคุซเนตสค์
@@ -6167,7 +6543,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					เวลาเปียงยาง
+					เวลาเปียงยาง
 				
 			
 			
@@ -6356,19 +6732,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			thai
 		
 		1
 		
+			.
+			,
+			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 พัน
@@ -6446,233 +6834,305 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			
 				เปเซตาอันดอร์รา
+				ADP
 			
 			
 				เดอร์แฮมสหรัฐอาหรับเอมิเรตส์
 				เดอร์แฮมสหรัฐอาหรับเอมิเรตส์
+				AED
 			
 			
 				อัฟกานีอัฟกานิสถาน (1927–2002)
+				AFA
 			
 			
 				อัฟกานิอัฟกานิสถาน
 				อัฟกานิอัฟกานิสถาน
+				AFN
 			
 			
 				เลกแอลเบเนีย
 				เลกแอลเบเนีย
+				ALL
 			
 			
 				แดรมอาร์เมเนีย
 				แดรมอาร์เมเนีย
+				AMD
 			
 			
 				กิลเดอร์เนเธอร์แลนด์แอนทิลลิส
 				กิลเดอร์เนเธอร์แลนด์แอนทิลลิส
+				ANG
 			
 			
 				กวานซาแองโกลา
 				กวานซาแองโกลา
+				AOA
 				Kz
 			
 			
 				กวานซาแองโกลา (1977–1990)
+				AOK
 			
 			
 				นิวกวานซาแองโกลา (1990–2000)
+				AON
 			
 			
 				กวานซารีจัสทาโดแองโกลา (1995–1999)
+				AOR
 			
 			
 				ออสตรัลอาร์เจนตินา
+				ARA
 			
 			
 				เปโซเลย์อาร์เจนตินา (1970–1983)
+				ARL
 			
 			
 				เปโซอาร์เจนตินา (1881–1970)
+				ARM
 			
 			
 				เปโซอาร์เจนตินา (1983–1985)
+				ARP
 			
 			
 				เปโซอาร์เจนตินา
 				เปโซอาร์เจนตินา
+				ARS
+				$
 			
 			
 				ชิลลิงออสเตรีย
+				ATS
 			
 			
 				ดอลลาร์ออสเตรเลีย
 				ดอลลาร์ออสเตรเลีย
 				AU$
+				$
 			
 			
 				ฟลอรินอารูบา
 				ฟลอรินอารูบา
+				AWG
 			
 			
 				มานัตอาเซอร์ไบจาน (1993–2006)
+				AZM
 			
 			
 				มานัตอาเซอร์ไบจาน
 				มานัตอาเซอร์ไบจาน
+				AZN
 			
 			
 				ดีนาร์บอสเนีย-เฮอร์เซโกวีนา
+				BAD
 			
 			
 				มาร์กบอสเนีย-เฮอร์เซโกวีนา
 				มาร์กบอสเนีย-เฮอร์เซโกวีนา
+				BAM
 				KM
 			
 			
 				ดีนาร์ใหม่บอสเนีย-เฮอร์เซโกวีนา (1994–1997)
+				BAN
 			
 			
 				ดอลลาร์บาร์เบโดส
 				ดอลลาร์บาร์เบโดส
+				BBD
+				$
 			
 			
 				ตากาบังกลาเทศ
 				ตากาบังกลาเทศ
+				BDT
 				৳
 			
 			
 				ฟรังก์เบลเยียม (เปลี่ยนแปลงได้)
+				BEC
 			
 			
 				ฟรังก์เบลเยียม
+				BEF
 			
 			
 				ฟรังก์เบลเยียม (การเงิน)
+				BEL
 			
 			
 				ฮาร์ดเลฟบัลแกเรีย
+				BGL
 			
 			
 				โซเชียลลิสต์เลฟบัลแกเรีย
+				BGM
 			
 			
 				เลฟบัลแกเรีย
 				เลฟบัลแกเรีย
+				BGN
 			
 			
 				เลฟบัลเกเรีย (1879–1952)
+				BGO
 			
 			
 				ดีนาร์บาห์เรน
 				ดีนาร์บาห์เรน
+				BHD
 			
 			
 				ฟรังก์บุรุนดี
 				ฟรังก์บุรุนดี
+				BIF
 			
 			
 				ดอลลาร์เบอร์มิวดา
 				ดอลลาร์เบอร์มิวดา
+				BMD
+				$
 			
 			
 				ดอลลาร์บรูไน
 				ดอลลาร์บรูไน
+				BND
+				$
 			
 			
 				โบลิเวียโนโบลิเวีย
 				โบลิเวียโนโบลิเวีย
+				BOB
 				Bs
 			
 			
 				โบลิเวียโนโบลิเวีย (1863–1963)
+				BOL
 			
 			
 				เปโซโบลิเวีย
+				BOP
 			
 			
 				มฟดอลโบลิเวีย
+				BOV
 			
 			
 				ครูเซโรโนโวบราซิล (1967–1986)
+				BRB
 			
 			
 				ครูซาโดบราซิล
+				BRC
 			
 			
 				ครูเซโรบราซิล (1990–1993)
+				BRE
 			
 			
 				เรียลบราซิล
 				เรียลบราซิล
+				R$
 				R$
 			
 			
 				ครูซาโดโนโวบราซิล
+				BRN
 			
 			
 				ครูเซโรบราซิล
+				BRR
 			
 			
 				ครูเซโรบราซิล (1942–1967)
+				BRZ
 			
 			
 				ดอลลาร์บาฮามาส
 				ดอลลาร์บาฮามาส
+				BSD
+				$
 			
 			
 				เอ็งกุลตรัมภูฏาน
 				เอ็งกุลตรัมภูฏาน
+				BTN
 			
 			
 				จ๊าดพม่า
+				BUK
 			
 			
 				ปูลาบอตสวานา
 				ปูลาบอตสวานา
+				BWP
 				P
 			
 			
 				นิวรูเบิลเบลารุส (1994–1999)
+				BYB
 			
 			
 				รูเบิลเบลารุส
 				รูเบิลเบลารุส
+				BYN
 				р.
 			
 			
 				รูเบิลเบลารุส (2000–2016)
 				รูเบิลเบลารุส (2000–2016)
+				BYR
 			
 			
 				ดอลลาร์เบลีซ
 				ดอลลาร์เบลีซ
+				BZD
+				$
 			
 			
 				ดอลลาร์แคนาดา
 				ดอลลาร์แคนาดา
+				CA$
+				$
 			
 			
 				ฟรังก์คองโก
 				ฟรังก์คองโก
+				CDF
 			
 			
 				ยูโรดับเบิลยูไออาร์
+				CHE
 			
 			
 				ฟรังก์สวิส
 				ฟรังก์สวิส
+				CHF
 			
 			
 				ฟรังก์ดับเบิลยูไออาร์
+				CHW
 			
 			
 				เอสคูโดชิลี
+				CLE
 			
 			
 				ฟูเมนโตชิลี
+				CLF
 			
 			
 				เปโซชิลี
 				เปโซชิลี
+				CLP
+				$
 			
 			
 				หยวน
@@ -6682,247 +7142,320 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				หยวนจีน
 				หยวนจีน
+				CN¥
+				¥
 			
 			
 				เปโซโคลอมเบีย
 				เปโซโคลอมเบีย
+				COP
+				$
 			
 			
 				วาเลอร์เรียลโคลอมเบีย
+				COU
 			
 			
 				โกลองคอสตาริกา
 				โกลองคอสตาริกา
+				CRC
 				₡
 			
 			
 				ดีนาร์เซอร์เบียเก่า
+				CSD
 			
 			
 				ฮาร์ดโครูนาเช็กโกสโลวัก
+				CSK
 			
 			
 				เปโซคิวบา (แปลงสภาพ)
 				เปโซคิวบา (แปลงสภาพ)
+				CUC
+				$
 			
 			
 				เปโซคิวบา
 				เปโซคิวบา
+				CUP
+				$
 			
 			
 				เอสคูโดเคปเวิร์ด
 				เอสคูโดเคปเวิร์ด
+				CVE
 			
 			
 				ปอนด์ไซปรัส
+				CYP
 			
 			
 				โครูนาสาธารณรัฐเช็ก
 				โครูนาสาธารณรัฐเช็ก
+				CZK
 				Kč
 			
 			
 				มาร์กเยอรมันตะวันออก
+				DDM
 			
 			
 				มาร์กเยอรมัน
+				DEM
 			
 			
 				ฟรังก์จิบูตี
 				ฟรังก์จิบูตี
+				DJF
 			
 			
 				โครนเดนมาร์ก
 				โครนเดนมาร์ก
+				DKK
 				kr
 			
 			
 				เปโซโดมินิกัน
 				เปโซโดมินิกัน
+				DOP
+				$
 			
 			
 				ดีนาร์แอลจีเรีย
 				ดีนาร์แอลจีเรีย
+				DZD
 			
 			
 				ซูเกรเอกวาดอร์
+				ECS
 			
 			
 				วาเลอร์คอนสแตนต์เอกวาดอร์
+				ECV
 			
 			
 				ครูนเอสโตเนีย
+				EEK
 			
 			
 				ปอนด์อียิปต์
 				ปอนด์อียิปต์
+				EGP
 				E£
 			
 			
 				แนกฟาเอริเทรีย
 				แนกฟาเอริเทรีย
+				ERN
 			
 			
 				เปเซตาสเปน (บัญชีเอ)
+				ESA
 			
 			
 				เปเซตาสเปน (บัญชีที่เปลี่ยนแปลงได้)
+				ESB
 			
 			
 				เปเซตาสเปน
+				ESP
 			
 			
 				เบอรร์เอธิโอเปีย
 				เบอรร์เอธิโอเปีย
+				ETB
 			
 			
 				ยูโร
 				ยูโร
+				€
 				€
 			
 			
 				มาร์กกาฟินแลนด์
+				FIM
 			
 			
 				ดอลลาร์ฟิจิ
 				ดอลลาร์ฟิจิ
+				FJD
+				$
 			
 			
 				ปอนด์หมู่เกาะฟอล์กแลนด์
 				ปอนด์หมู่เกาะฟอล์กแลนด์
+				FKP
+				£
 			
 			
 				ฟรังก์ฝรั่งเศส
+				FRF
 			
 			
 				ปอนด์สเตอร์ลิง (สหราชอาณาจักร)
 				ปอนด์สเตอร์ลิง (สหราชอาณาจักร)
+				£
 				£
 			
 			
 				คูปอนลาริตจอร์เจีย
+				GEK
 			
 			
 				ลารีจอร์เจีย
 				ลารีจอร์เจีย
+				GEL
 				₾
 				₾
 			
 			
 				เซดีกานา (1979–2007)
+				GHC
 			
 			
 				เซดีกานา
 				เซดีกานา
+				GHS
 			
 			
 				ปอนด์ยิบรอลตาร์
 				ปอนด์ยิบรอลตาร์
+				GIP
 				£
 			
 			
 				ดาลาซีแกมเบีย
 				ดาลาซีแกมเบีย
+				GMD
 			
 			
 				ฟรังก์กินี
 				ฟรังก์กินี
+				GNF
 				FG
 			
 			
 				ไซลีกินี
+				GNS
 			
 			
 				เอ็กเวเลอิเควทอเรียลกินี
+				GQE
 			
 			
 				ดรัชมากรีก
+				GRD
 			
 			
 				เควตซัลกัวเตมาลา
 				เควตซัลกัวเตมาลา
+				GTQ
 				Q
 			
 			
 				เอสคูโดกินีโปรตุเกส
+				GWE
 			
 			
 				เปโซกินี-บิสเซา
+				GWP
 			
 			
 				ดอลลาร์กายอานา
 				ดอลลาร์กายอานา
+				GYD
+				$
 			
 			
 				ดอลลาร์ฮ่องกง
 				ดอลลาร์ฮ่องกง
+				HK$
+				$
 			
 			
 				เลมปิราฮอนดูรัส
 				เลมปิราฮอนดูรัส
+				HNL
 				L
 			
 			
 				ดีนาร์โครเอเชีย
+				HRD
 			
 			
 				คูนาโครเอเชีย
 				คูนาโครเอเชีย
+				HRK
 				kn
 			
 			
 				กูร์ดเฮติ
 				กูร์ดเฮติ
+				HTG
 			
 			
 				ฟอรินต์ฮังการี
 				ฟอรินต์ฮังการี
+				HUF
 				Ft
 			
 			
 				รูเปียห์อินโดนีเซีย
 				รูเปียห์อินโดนีเซีย
+				IDR
 				Rp
 			
 			
 				ปอนด์ไอริช
+				IEP
 			
 			
 				ปอนด์อิสราเอล
+				ILP
 			
 			
 				นิวเชเกลอิสราเอล
 				นิวเชเกลอิสราเอล
+				₪
 				₪
 			
 			
 				รูปีอินเดีย
 				รูปีอินเดีย
+				₹
 				₹
 			
 			
 				ดีนาร์อิรัก
 				ดีนาร์อิรัก
+				IQD
 			
 			
 				เรียลอิหร่าน
 				เรียลอิหร่าน
+				IRR
 			
 			
 				โครนาไอซ์แลนด์
 				โครนาไอซ์แลนด์
+				ISK
 				kr
 			
 			
 				ลีราอิตาลี
+				ITL
 			
 			
 				ดอลลาร์จาเมกา
 				ดอลลาร์จาเมกา
+				JMD
+				$
 			
 			
 				ดีนาร์จอร์แดน
 				ดีนาร์จอร์แดน
+				JOD
 			
 			
 				เยนญี่ปุ่น
@@ -6933,404 +7466,510 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				ชิลลิงเคนยา
 				ชิลลิงเคนยา
+				KES
 			
 			
 				ซอมคีร์กีซสถาน
 				ซอมคีร์กีซสถาน
+				KGS
 			
 			
 				เรียลกัมพูชา
 				เรียลกัมพูชา
+				KHR
 				៛
 			
 			
 				ฟรังก์คอโมโรส
 				ฟรังก์คอโมโรส
+				KMF
 				CF
 			
 			
 				วอนเกาหลีเหนือ
 				วอนเกาหลีเหนือ
+				KPW
 				₩
 			
 			
 				ฮวานเกาหลีใต้ (1953–1962)
+				KRH
 			
 			
 				วอนเกาหลีใต้ (1945–1953)
+				KRO
 			
 			
 				วอนเกาหลีใต้
 				วอนเกาหลีใต้
+				₩
 				₩
 			
 			
 				ดีนาร์คูเวต
 				ดีนาร์คูเวต
+				KWD
 			
 			
 				ดอลลาร์หมู่เกาะเคย์แมน
 				ดอลลาร์หมู่เกาะเคย์แมน
+				KYD
+				$
 			
 			
 				เทงเจคาซัคสถาน
 				เทงเจคาซัคสถาน
+				KZT
 				₸
 			
 			
 				กีบลาว
 				กีบลาว
+				LAK
 				₭
 			
 			
 				ปอนด์เลบานอน
 				ปอนด์เลบานอน
+				LBP
 				L£
 			
 			
 				รูปีศรีลังกา
 				รูปีศรีลังกา
+				LKR
 				Rs
 			
 			
 				ดอลลาร์ไลบีเรีย
 				ดอลลาร์ไลบีเรีย
+				LRD
 				$
 			
 			
 				โลตีเลโซโท
+				LSL
 			
 			
 				ลีตัสลิทัวเนีย
 				ลีตัสลิทัวเนีย
+				LTL
 			
 			
 				ทาโลนัสลิทัวเนีย
+				LTT
 			
 			
 				คอนเวอร์ทิเบิลฟรังก์ลักเซมเบิร์ก
+				LUC
 			
 			
 				ฟรังก์ลักเซมเบิร์ก
+				LUF
 			
 			
 				ไฟแนลเชียลฟรังก์ลักเซมเบิร์ก
+				LUL
 			
 			
 				ลัตส์ลัตเวีย
 				ลัตส์ลัตเวีย
+				LVL
 			
 			
 				รูเบิลลัตเวีย
+				LVR
 			
 			
 				ดีนาร์ลิเบีย
 				ดีนาร์ลิเบีย
+				LYD
 			
 			
 				ดีแรห์มโมร็อกโก
 				ดีแรห์มโมร็อกโก
+				MAD
 			
 			
 				ฟรังก์โมร็อกโก
+				MAF
 			
 			
 				ฟรังก์โมนาโก
+				MCF
 			
 			
 				บัตรปันส่วนมอลโดวา
+				MDC
 			
 			
 				ลิวมอลโดวา
 				ลิวมอลโดวา
+				MDL
 			
 			
 				อาเรียรีมาลากาซี
 				อาเรียรีมาลากาซี
+				MGA
 				Ar
 			
 			
 				ฟรังก์มาดากัสการ์
+				MGF
 			
 			
 				ดีนาร์มาซิโดเนีย
 				ดีนาร์มาซิโดเนีย
+				MKD
 			
 			
 				ดีนาร์มาซิโดเนีย (1992–1993)
+				MKN
 			
 			
 				ฟรังก์มาลี
+				MLF
 			
 			
 				จ๊าตพม่า
 				จ๊าตพม่า
+				MMK
 				K
 			
 			
 				ทูกริกมองโกเลีย
 				ทูกริกมองโกเลีย
+				MNT
 				₮
 			
 			
 				ปาตากามาเก๊า
 				ปาตากามาเก๊า
+				MOP
 			
 			
 				อูกียามอริเตเนีย (1973–2017)
 				อูกียามอริเตเนีย (1973–2017)
+				MRO
 			
 			
 				อูกียามอริเตเนีย
 				อูกียามอริเตเนีย
+				MRU
 			
 			
 				ลีรามอลตา
+				MTL
 			
 			
 				ปอนด์มอลตา
+				MTP
 			
 			
 				รูปีมอริเชียส
 				รูปีมอริเชียส
+				MUR
 				Rs
 			
 			
 				รูฟิยามัลดีฟส์
 				รูฟิยามัลดีฟส์
+				MVR
 			
 			
 				ควาชามาลาวี
 				ควาชามาลาวี
+				MWK
 			
 			
 				เปโซเม็กซิโก
 				เปโซเม็กซิโก
+				MX$
+				$
 			
 			
 				เงินเปโซเม็กซิโก (1861–1992)
+				MXP
 			
 			
 				ยูนิแดด ดี อินเวอร์ชั่น เม็กซิโก
+				MXV
 			
 			
 				ริงกิตมาเลเซีย
 				ริงกิตมาเลเซีย
+				MYR
 				RM
 			
 			
 				เอสคูโดโมซัมบิก
+				MZE
 			
 			
 				เมติคัลโมซัมบิกเก่า
+				MZM
 			
 			
 				เมติคัลโมซัมบิก
 				เมติคัลโมซัมบิก
+				MZN
 			
 			
 				ดอลลาร์นามิเบีย
 				ดอลลาร์นามิเบีย
+				NAD
 				$
 			
 			
 				ไนราไนจีเรีย
 				ไนราไนจีเรีย
+				NGN
 				₦
 			
 			
 				คอร์โดบานิการากัว
+				NIC
 			
 			
 				กอร์โดบานิการากัว
 				กอร์โดบานิการากัว
+				NIO
 				C$
 			
 			
 				กิลเดอร์เนเธอร์แลนด์
+				NLG
 			
 			
 				โครนนอร์เวย์
 				โครนนอร์เวย์
+				NOK
 				kr
 			
 			
 				รูปีเนปาล
 				รูปีเนปาล
+				NPR
 				Rs
 			
 			
 				ดอลลาร์นิวซีแลนด์
 				ดอลลาร์นิวซีแลนด์
+				NZ$
+				$
 			
 			
 				เรียลโอมาน
 				เรียลโอมาน
+				OMR
 			
 			
 				บัลบัวปานามา
 				บัลบัวปานามา
+				PAB
 			
 			
 				อินตีเปรู
+				PEI
 			
 			
 				ซอลเปรู
 				ซอลเปรู
+				PEN
 			
 			
 				ซอลเปรู (1863–1965)
 				ซอลเปรู(1863–1965)
+				PES
 			
 			
 				กีนาปาปัวนิวกินี
 				กีนาปาปัวนิวกินี
+				PGK
 			
 			
 				เปโซฟิลิปปินส์
 				เปโซฟิลิปปินส์
+				PHP
 				₱
 			
 			
 				รูปีปากีสถาน
 				รูปีปากีสถาน
+				PKR
 				Rs
 			
 			
 				ซลอตีโปแลนด์
 				ซลอตีโปแลนด์
+				PLN
 				zł
 			
 			
 				ซลอตีโปแลนด์ (1950–1995)
+				PLZ
 			
 			
 				เอสคูโดโปรตุเกส
+				PTE
 			
 			
 				กวารานีปารากวัย
 				กวารานีปารากวัย
+				PYG
 				₲
 			
 			
 				เรียลกาตาร์
 				เรียลกาตาร์
+				QAR
 			
 			
 				ดอลลาร์โรดีเซีย
+				RHD
 			
 			
 				ลิวโรมาเนียเก่า
+				ROL
 			
 			
 				ลิวโรมาเนีย
 				ลิวโรมาเนีย
+				RON
 				lei
 			
 			
 				ดีนาร์เซอร์เบีย
 				ดีนาร์เซอร์เบีย
+				RSD
 			
 			
 				รูเบิลรัสเซีย
 				รูเบิลรัสเซีย
+				RUB
 				₽
 				₽
 			
 			
 				รูเบิลรัสเซีย (1991–1998)
+				RUR
 			
 			
 				ฟรังก์รวันดา
 				ฟรังก์รวันดา
+				RWF
 				RF
 			
 			
 				ริยัลซาอุดีอาระเบีย
 				ริยัลซาอุดีอาระเบีย
+				SAR
 			
 			
 				ดอลลาร์หมู่เกาะโซโลมอน
 				ดอลลาร์หมู่เกาะโซโลมอน
+				SBD
+				$
 			
 			
 				รูปีเซเชลส์
 				รูปีเซเชลส์
+				SCR
 			
 			
 				ดีนาร์ซูดานเก่า
+				SDD
 			
 			
 				ปอนด์ซูดาน
 				ปอนด์ซูดาน
+				SDG
 			
 			
 				ปอนด์ซูดานเก่า
+				SDP
 			
 			
 				โครนาสวีเดน
 				โครนาสวีเดน
+				SEK
 				kr
 			
 			
 				ดอลลาร์สิงคโปร์
 				ดอลลาร์สิงคโปร์
+				SGD
 				$
 			
 			
 				ปอนด์เซนต์เฮเลนา
 				ปอนด์เซนต์เฮเลนา
+				SHP
 				£
 			
 			
 				ทอลาร์สโลวีเนีย
+				SIT
 			
 			
 				โครูนาสโลวัก
+				SKK
 			
 			
 				ลีโอนเซียร์ราลีโอน
 				ลีโอนเซียร์ราลีโอน
+				SLL
 			
 			
 				ชิลลิงโซมาเลีย
 				ชิลลิงโซมาเลีย
+				SOS
 			
 			
 				ดอลลาร์ซูรินาเม
 				ดอลลาร์ซูรินาเม
+				SRD
+				$
 			
 			
 				กิลเดอร์ซูรินาเม
+				SRG
 			
 			
 				ปอนด์ซูดานใต้
 				ปอนด์ซูดานใต้
+				SSP
 				£
 			
 			
 				ดอบราเซาตูเมและปรินซิปี (1977–2017)
 				ดอบราเซาตูเมและปรินซิปี (1977–2017)
+				STD
 			
 			
 				ดอบราเซาตูเมและปรินซิปี
 				ดอบราเซาตูเมและปรินซิปี
 				STN
+				Db
 			
 			
 				รูเบิลโซเวียต
+				SUR
 			
 			
 				โคลอนเอลซัลวาดอร์
+				SVC
 			
 			
 				ปอนด์ซีเรีย
 				ปอนด์ซีเรีย
+				SYP
 				£
 			
 			
 				ลิลันเจนีสวาซิ
 				ลิลันเจนีสวาซิ
+				SZL
 			
 			
 				บาท
@@ -7340,183 +7979,238 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				รูเบิลทาจิกิสถาน
+				TJR
 			
 			
 				โซโมนิทาจิกิสถาน
 				โซโมนิทาจิกิสถาน
+				TJS
 			
 			
 				มานัตเติร์กเมนิสถาน (1993–2009)
+				TMM
 			
 			
 				มานัตเติร์กเมนิสถาน
 				มานัตเติร์กเมนิสถาน
+				TMT
 			
 			
 				ดีนาร์ตูนิเซีย
 				ดีนาร์ตูนิเซีย
+				TND
 			
 			
 				พาแองกาตองกา
 				พาแองกาตองกา
+				TOP
 				T$
 			
 			
 				เอสคูโดติมอร์
+				TPE
 			
 			
 				ลีราตุรกีเก่า
+				TRL
 			
 			
 				ลีราตุรกี
 				ลีราตุรกี
+				TRY
+				₺
+				TL
 			
 			
 				ดอลลาร์ตรินิแดดและโตเบโก
 				ดอลลาร์ตรินิแดดและโตเบโก
+				TTD
+				$
 			
 			
 				ดอลลาร์ไต้หวันใหม่
 				ดอลลาร์ไต้หวันใหม่
+				NT$
 				NT$
 			
 			
 				ชิลลิงแทนซาเนีย
 				ชิลลิงแทนซาเนีย
+				TZS
 			
 			
 				ฮรีฟเนียยูเครน
 				ฮรีฟเนียยูเครน
+				UAH
 				₴
 			
 			
 				คาร์โบวาเนตซ์ยูเครน
+				UAK
 			
 			
 				ชิลลิงยูกันดา (1966–1987)
+				UGS
 			
 			
 				ชิลลิงยูกันดา
 				ชิลลิงยูกันดา
+				UGX
 			
 			
 				ดอลลาร์สหรัฐ
 				ดอลลาร์สหรัฐ
+				US$
 				$
 			
 			
 				ดอลลาร์สหรัฐ (วันถัดไป)
 				ดอลลาร์สหรัฐ (วันถัดไป)
+				USN
 			
 			
 				ดอลลาร์สหรัฐ (วันเดียวกัน)
 				ดอลลาร์สหรัฐ (วันเดียวกัน)
+				USS
 			
 			
 				เปโซเอนยูนิแดดเซสอินเด็กซาแดสอุรุกวัย
+				UYI
 			
 			
 				เปโซอุรุกวัย (1975–1993)
+				UYP
 			
 			
 				เปโซอุรุกวัย
 				เปโซอุรุกวัย
+				UYU
+				$
 			
 			
 				ซอมอุซเบกิสถาน
 				ซอมอุซเบกิสถาน
+				UZS
 			
 			
 				โบลิวาร์เวเนซุเอลา (1871–2008)
+				VEB
 			
 			
 				โบลิวาร์เวเนซุเอลา
 				โบลิวาร์เวเนซุเอลา
+				VEF
 				Bs
 			
 			
 				โบลีวาร์เวเนซุเอลา
 				โบลีวาร์แห่งเวเนซุเอลา
+				VES
 			
 			
 				ดองเวียดนาม
 				ดองเวียดนาม
+				₫
 				₫
 			
 			
 				ดองเวียดนาม (1978–1985)
+				VNN
 			
 			
 				วาตูวานูอาตู
 				วาตูวานูอาตู
+				VUV
 			
 			
 				ทาลาซามัว
 				ทาลาซามัว
+				WST
 			
 			
 				ฟรังก์เซฟาธนาคารรัฐแอฟริกากลาง
 				ฟรังก์เซฟาธนาคารรัฐแอฟริกากลาง
+				FCFA
 			
 			
 				เงิน
+				XAG
 			
 			
 				ทอง
+				XAU
 			
 			
 				หน่วยคอมโพสิตยุโรป
+				XBA
 			
 			
 				หน่วยโมเนทารียุโรป
+				XBB
 			
 			
 				หน่วยบัญชียุโรป [XBC]
+				XBC
 			
 			
 				หน่วยบัญชียุโรป [XBD]
+				XBD
 			
 			
 				ดอลลาร์แคริบเบียนตะวันออก
 				ดอลลาร์แคริบเบียนตะวันออก
+				EC$
+				$
 			
 			
 				สิทธิถอนเงินพิเศษ
+				XDR
 			
 			
 				หน่วยสกุลเงินยุโรป
+				XEU
 			
 			
 				ฟรังก์ทองฝรั่งเศส
+				XFO
 			
 			
 				ฟรังก์ยูไอซีฝรั่งเศส
+				XFU
 			
 			
 				ฟรังก์เซฟาธนาคารกลางรัฐแอฟริกาตะวันตก
 				ฟรังก์เซฟาธนาคารกลางรัฐแอฟริกาตะวันตก
+				CFA
 			
 			
 				พัลเลเดียม
+				XPD
 			
 			
 				ฟรังก์ซีเอฟพี
 				ฟรังก์ซีเอฟพี
+				CFPF
 			
 			
 				แพลตินัม
+				XPT
 			
 			
 				กองทุนไรเน็ต
+				XRE
 			
 			
 				ซูเกร
+				XSU
 			
 			
 				รหัสทดสอบสกุลเงิน
+				XTS
 			
 			
 				หน่วยบัญชี เอดีบี
+				XUA
 			
 			
 				ไม่ทราบชื่อสกุลเงิน
@@ -7525,57 +8219,74 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ดีนาร์เยเมน
+				YDD
 			
 			
 				เรียลเยเมน
 				เรียลเยเมน
+				YER
 			
 			
 				ฮาร์ดดีนาร์ยูโกสลาเวีย
+				YUD
 			
 			
 				โนวิย์ดีนาร์ยูโกสลาเวีย
+				YUM
 			
 			
 				คอนเวอร์ทิเบิลดีนาร์ยูโกสลาเวีย
+				YUN
 			
 			
 				ดีนาร์ปฏิรูปยูโกสลาเวีย (1992–1993)
+				YUR
 			
 			
 				แรนด์แอฟริกาใต้ (การเงิน)
+				ZAL
 			
 			
 				แรนด์แอฟริกาใต้
 				แรนด์แอฟริกาใต้
+				ZAR
 				R
 			
 			
 				ควาชาแซมเบีย (1968–2012)
+				ZMK
 			
 			
 				ควาชาแซมเบีย
 				ควาชาแซมเบีย
+				ZMW
 				ZK
 			
 			
 				นิวแซร์คองโก
+				ZRN
 			
 			
 				แซร์คองโก
+				ZRZ
 			
 			
 				ดอลลาร์ซิมบับเว
+				ZWD
 			
 			
 				ดอลลาร์ซิมบับเว (2009)
+				ZWL
 			
 			
 				ดอลลาร์ซิมบับเว (2008)
+				ZWR
 			
 		
 		
+			~{0}
 			{0}+
+			≤{0}
 			{0}-{1}
 		
 		
@@ -7658,8 +8369,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ต่อตารางนิ้ว
 			
 			
-				ดูนัม
-				{0} ดูนัม
+				ดูนัม
+				{0} ดูนัม
 			
 			
 				กะรัต
@@ -7678,20 +8389,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ส่วนต่อล้าน
 			
 			
-				เปอร์เซ็นต์
-				{0} เปอร์เซ็นต์
+				เปอร์เซ็นต์
+				{0} เปอร์เซ็นต์
 			
 			
-				เปอร์มิลล์
-				{0} เปอร์มิลล์
+				เปอร์มิลล์
+				{0} เปอร์มิลล์
 			
 			
-				เปอร์มีเรียด
-				{0} เปอร์มีเรียด
+				เปอร์มีเรียด
+				{0} เปอร์มีเรียด
 			
 			
-				โมล
-				{0} โมล
+				โมล
+				{0} โมล
 			
 			
 				ลิตรต่อกิโลเมตร
@@ -7710,8 +8421,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ไมล์ต่อแกลลอนอังกฤษ
 			
 			
-				เพตาไบต์
-				{0} เพตะไบต์
+				เพตะไบต์
+				{0} เพตะไบต์
 			
 			
 				เทราไบต์
@@ -7757,6 +8468,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ศตวรรษ
 				{0} ศตวรรษ
 			
+			
+				ทศวรรษ
+				{0} ทศวรรษ
+			
 			
 				ปี
 				{0} ปี
@@ -7845,20 +8560,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} กิโลวัตต์-ชั่วโมง
 			
 			
-				อิเล็กตรอนโวลต์
-				{0} อิเล็กตรอนโวลต์
+				อิเล็กตรอนโวลต์
+				{0} อิเล็กตรอนโวลต์
 			
 			
-				หน่วยความร้อนอังกฤษ
-				{0} หน่วยความร้อนอังกฤษ
+				หน่วยความร้อนอังกฤษ
+				{0} หน่วยความร้อนอังกฤษ
+			
+			
+				เธิร์มสหรัฐฯ
+				{0} เธิร์มสหรัฐฯ
 			
 			
-				แรงปอนด์
-				{0} แรงปอนด์
+				แรงปอนด์
+				{0} แรงปอนด์
 			
 			
-				นิวตัน
-				{0} นิวตัน
+				นิวตัน
+				{0} นิวตัน
 			
 			
 				กิกะเฮิรตซ์
@@ -7876,6 +8595,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				เฮิรตซ์
 				{0} เฮิรตซ์
 			
+			
+				พิกเซล
+				{0} พิกเซล
+			
+			
+				เมกะพิกเซล
+				{0} เมกะพิกเซล
+			
+			
+				พิกเซลต่อเซนติเมตร
+				{0} พิกเซลต่อเซนติเมตร
+			
+			
+				พิกเซลต่อนิ้ว
+				{0} พิกเซลต่อนิ้ว
+			
+			
+				จุดต่อเซนติเมตร
+				{0} จุดต่อเซนติเมตร
+			
+			
+				จุดต่อนิ้ว
+				{0} จุดต่อนิ้ว
+			
 			
 				กิโลเมตร
 				{0} กิโลเมตร
@@ -7954,16 +8697,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} จุด
 			
 			
-				รัศมีวงกลมของดวงอาทิตย์
-				{0} รัศมีวงกลมของดวงอาทิตย์
+				รัศมีวงกลมของดวงอาทิตย์
+				{0} รัศมีวงกลมของดวงอาทิตย์
 			
 			
 				ลักซ์
 				{0} ลักซ์
 			
 			
-				ความสว่างดวงอาทิตย์
-				{0} ความสว่างดวงอาทิตย์
+				ความสว่างดวงอาทิตย์
+				{0} ความสว่างดวงอาทิตย์
 			
 			
 				เมตริกตัน
@@ -8010,16 +8753,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} กะรัต
 			
 			
-				ดัลตัน
-				{0} ดัลตัน
+				ดัลตัน
+				{0} ดัลตัน
 			
 			
-				มวลของโลก
-				{0} มวลของโลก
+				มวลของโลก
+				{0} มวลของโลก
 			
 			
-				มวลดวงอาทิตย์
-				{0} มวลดวงอาทิตย์
+				มวลดวงอาทิตย์
+				{0} มวลดวงอาทิตย์
 			
 			
 				กิกะวัตต์
@@ -8045,10 +8788,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				แรงม้า
 				{0} แรงม้า
 			
-			
-				เฮกโตปาสกาล
-				{0} เฮกโตปาสกาล
-			
 			
 				มิลลิเมตรปรอท
 				{0} มิลลิเมตรปรอท
@@ -8061,6 +8800,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				นิ้วปรอท
 				{0} นิ้วปรอท
 			
+			
+				บาร์
+				{0} บาร์
+			
 			
 				มิลลิบาร์
 				{0} มิลลิบาร์
@@ -8069,13 +8812,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				บรรยากาศ
 				{0} บรรยากาศ
 			
+			
+				ปาสกาล
+				{0} ปาสกาล
+			
+			
+				เฮกโตปาสกาล
+				{0} เฮกโตปาสกาล
+			
 			
-				กิโลปาสกาล
-				{0} กิโลปาสกาล
+				กิโลปาสกาล
+				{0} กิโลปาสกาล
 			
 			
-				เมกะปาสคาล
-				{0} เมกะปาสคาล
+				เมกะปาสคาล
+				{0} เมกะปาสคาล
 			
 			
 				กิโลเมตรต่อชั่วโมง
@@ -8110,12 +8861,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} เคลวิน
 			
 			
-				ปอนด์-ฟุต
-				{0} ปอนด์-ฟุต
+				ปอนด์-ฟุต
+				{0} ปอนด์-ฟุต
 			
 			
-				นิวตันเมตร
-				{0} นิวตันเมตร
+				นิวตันเมตร
+				{0} นิวตันเมตร
 			
 			
 				ลูกบาศก์กิโลเมตร
@@ -8211,8 +8962,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ฟลูอิดออนซ์
 			
 			
-				ออนซ์ของเหลวแบบอังกฤษ
-				{0} ออนซ์ของเหลวแบบอังกฤษ
+				ออนซ์ของเหลวแบบอังกฤษ
+				{0} ออนซ์ของเหลวแบบอังกฤษ
 			
 			
 				ช้อนโต๊ะ
@@ -8223,11 +8974,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ช้อนชา
 			
 			
-				บาร์เรล
-				{0} บาร์เรล
+				บาร์เรล
+				{0} บาร์เรล
 			
 			
-				สี่ทิศหลัก
+				สี่ทิศหลัก
 				{0}ตะวันออก
 				{0}เหนือ
 				{0}ใต้
@@ -8308,8 +9059,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/ตร.นิ้ว
 			
 			
-				ดูนัม
-				{0} ดูนัม
+				ดูนัม
+				{0} ดูนัม
 			
 			
 				กะรัต
@@ -8327,13 +9078,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ส่วน/ล้าน
 				{0} สตล.
 			
+			
+				เปอร์เซ็นต์
+			
+			
+				เปอร์มิลล์
+			
 			
-				เปอร์มีเรียด
-				{0}‱
+				เปอร์มีเรียด
 			
 			
-				โมล
-				{0} mol
+				โมล
+				{0} โมล
 			
 			
 				ลิตร/กม.
@@ -8398,6 +9154,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ศตวรรษ
 				{0} ศตวรรษ
 			
+			
+				ทศวรรษ
+				{0} ทศวรรษ
+			
 			
 				ปี
 				{0} ปี
@@ -8486,20 +9246,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} กว.-ชม.
 			
 			
-				อิเล็กตรอนโวลต์
-				{0} eV
+				อิเล็กตรอนโวลต์
 			
 			
-				บีทียู
-				{0} BTU
+				บีทียู
+				{0} BTU
+			
+			
+				เธิร์ม
+				{0} เธิร์ม
 			
 			
-				แรงปอนด์
-				{0} lbf
+				แรงปอนด์
 			
 			
-				นิวตัน
-				{0} N
+				นิวตัน
 			
 			
 				GHz
@@ -8595,16 +9356,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} จุด
 			
 			
-				รัศมีวงกลมของดวงอาทิตย์
-				{0} R☉
+				รัศมีวงกลมของดวงอาทิตย์
 			
 			
 				ลักซ์
 				{0} ลักซ์
 			
 			
-				ความสว่างดวงอาทิตย์
-				{0} L☉
+				ความสว่างดวงอาทิตย์
 			
 			
 				ต.
@@ -8651,16 +9410,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} กะรัต
 			
 			
-				ดัลตัน
-				{0} Da
+				ดัลตัน
 			
 			
-				มวลของโลก
-				{0} M⊕
+				มวลของโลก
 			
 			
-				มวลดวงอาทิตย์
-				{0} M☉
+				มวลดวงอาทิตย์
 			
 			
 				กิกะวัตต์
@@ -8686,10 +9442,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				แรงม้า
 				{0} แรงม้า
 			
-			
-				เฮกโตปาสกาล
-				{0} เฮกโตปาสกาล
-			
 			
 				มม. ปรอท
 				{0} มม. ปรอท
@@ -8702,20 +9454,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				นิ้วปรอท
 				{0} นิ้วปรอท
 			
+			
+				บาร์
+				{0} บาร์
+			
 			
 				มิลลิบาร์
 				{0} มิลลิบาร์
 			
 			
-				บรรยากาศ
+				บรรยากาศ
+				{0} บรรยากาศ
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				เฮกโตปาสกาล
+				{0} เฮกโตปาสกาล
 			
 			
 				กม./ชั่วโมง
@@ -8749,14 +9502,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-			
 			
 				ลบ.กม.
 				{0} ลบ.กม.
@@ -8850,10 +9595,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ฟลูอิดออนซ์
 				{0} ฟลูอิดออนซ์
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-			
 			
 				ชต.
 				{0} ชต.
@@ -8863,11 +9604,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ชช.
 			
 			
-				บาร์เรล
-				{0} bbl
+				บาร์เรล
 			
 			
-				ทิศหลัก
+				ทิศหลัก
 				{0} ตอ
 				{0} น
 				{0} ต
@@ -8881,6 +9621,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}G
 			
+			
+				{0}°
+			
 			
 				{0}นาที
 			
@@ -9010,16 +9753,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}แรงม้า
 			
-			
-				เฮกโตปาสกาล
-				{0}hPa
-			
 			
 				{0}" Hg
 			
 			
 				{0}มิลลิบาร์
 			
+			
+				เฮกโตปาสกาล
+				{0}hPa
+			
 			
 				กม./ชม.
 				{0}กม./ชม.
@@ -9034,6 +9777,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				°C
 				{0}°C
 			
+			
+				{0}°F
+			
 			
 				{0}ลบ.กม.
 			
@@ -9045,7 +9791,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}ล.
 			
 			
-				ทิศ
+				ทิศ
 				{0} ตอ
 				{0} น
 				{0}ต
@@ -9075,17 +9821,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} หรือ {1}
 			{0} หรือ {1}
 		
+		
+			{0}หรือ{1}
+		
+		
+			{0}หรือ{1}
+		
 		
-			{0} {1}
-			{0} {1}
-			{0} และ{1}
-			{0}และ{1}
+			{0}และ{1}
 		
 		
 			{0} {1}
 			{0} {1}
 			{0} และ{1}
-			{0}และ{1}
 		
 		
 			{0} {1}
diff --git a/make/data/cldr/common/main/th_TH.xml b/make/data/cldr/common/main/th_TH.xml
index e50aebd6dd5..2ed713d97cd 100644
--- a/make/data/cldr/common/main/th_TH.xml
+++ b/make/data/cldr/common/main/th_TH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ti.xml b/make/data/cldr/common/main/ti.xml
index db5360981f4..1235d6736f8 100644
--- a/make/data/cldr/common/main/ti.xml
+++ b/make/data/cldr/common/main/ti.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -416,7 +416,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[\u135F ሀ-ሆ ለ-ቆ ቈ ቊ-ቍ ቐ-ቖ ቘ ቚ-ቝ በ-ኆ ኈ ኊ-ኍ ነ-ኮ ኰ ኲ-ኵ ኸ-ኾ ዀ ዂ-ዅ ወ-ዎ ዐ-ዖ ዘ-ዮ ደ-ዷ ጀ-ጎ ጐ ጒ-ጕ ጠ-ፗ]
 		[᎐ ᎑ ᎒ ᎓ ᎔ ᎕ ᎖ ᎗ ᎘ ᎙ ሇ ⶀ ᎀ ᎁ ᎂ ᎃ ⶁ ⶂ ⶃ ⶄ ቇ ᎄ ᎅ ᎆ ᎇ ⶅ ⶆ ⶇ ኇ ⶈ ⶉ ⶊ ኯ ዏ ⶋ ዯ ⶌ ዸ ዹ ዺ ዻ ዼ ዽ ዾ ዿ ⶍ ⶎ ጏ ጘ ጙ ጚ ጛ ጜ ጝ ጞ ጟ ⶓ ⶔ ⶕ ⶖ ⶏ ⶐ ⶑ ᎈ ᎉ ᎊ ᎋ ᎌ ᎍ ᎎ ᎏ ⶒ ፘ ፙ ፚ ⶠ ⶡ ⶢ ⶣ ⶤ ⶥ ⶦ ⶨ ⶩ ⶪ ⶫ ⶬ ⶭ ⶮ ⶰ ⶱ ⶲ ⶳ ⶴ ⶵ ⶶ ⶸ ⶹ ⶺ ⶻ ⶼ ⶽ ⶾ ⷀ ⷁ ⷂ ⷃ ⷄ ⷅ ⷆ ⷈ ⷉ ⷊ ⷋ ⷌ ⷍ ⷎ ⷐ ⷑ ⷒ ⷓ ⷔ ⷕ ⷖ ⷘ ⷙ ⷚ ⷛ ⷜ ⷝ ⷞ]
 		[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ ቐ ቘ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ዀ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		
diff --git a/make/data/cldr/common/main/ti_ER.xml b/make/data/cldr/common/main/ti_ER.xml
index e7a179d69b5..4d4be0f0a90 100644
--- a/make/data/cldr/common/main/ti_ER.xml
+++ b/make/data/cldr/common/main/ti_ER.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ti_ET.xml b/make/data/cldr/common/main/ti_ET.xml
index bf3dfe76c39..c3ad3309f95 100644
--- a/make/data/cldr/common/main/ti_ET.xml
+++ b/make/data/cldr/common/main/ti_ET.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/tk.xml b/make/data/cldr/common/main/tk.xml
index 88cdab23c22..3f1c7f90454 100644
--- a/make/data/cldr/common/main/tk.xml
+++ b/make/data/cldr/common/main/tk.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -91,7 +91,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			aşaky lužits dili
 			duala dili
 			diwehi dili
-			ýola-Fonyi dili
+			ýola-fonýi dili
 			dzong-ke dili
 			daza dili
 			embu dili
@@ -102,7 +102,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			iňlis dili
 			iňlis dili (Beýik Britaniýa)
 			iňlis dili (Amerika)
-			iňlis dili (ABŞ)
 			esperanto dili
 			ispan dili
 			ispan dili (Ýewropa)
@@ -212,7 +211,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lozi dili
 			demirgazyk luri dili
 			litwa dili
-			luba-Katanga dili
+			luba-katanga dili
 			luba-Lulua dili
 			lunda dili
 			luo dili
@@ -229,7 +228,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			meru dili
 			morisýen dili
 			malagasiý dili
-			makua-Mitto dili
+			makuwa-mito dili
 			meta dili
 			marşall dili
 			maori dili
@@ -317,7 +316,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			sindhi dili
 			demirgazyk saam dili
 			sena dili
-			koýraboro-Senni dili
+			koýraboro-senni dili
 			sango dili
 			tahelhit dili
 			şan dili
@@ -337,7 +336,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			sranan-tongo dili
 			swati dili
 			saho dili
-			günorta Soto dili
+			günorta soto dili
 			sundan dili
 			sukuma dili
 			şwed dili
@@ -368,7 +367,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			tasawak dili
 			taiti dili
 			tuwa dili
-			orta-Atlas tamazight dili
+			orta-atlas tamazight dili
 			udmurt dili
 			uýgur dili
 			ukrain dili
@@ -394,10 +393,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			idiş dili
 			ýoruba dili
 			kanton dili
+			hytaý dili, kantonça
 			standart Marokko tamazight dili
 			hytaý dili
+			hytaý dili, mandarin
 			ýönekeýleşdirilen hytaý dili
+			ýönekeýleşdirilen hytaý diliniň mandarin şiwesi
 			adaty hytaý dili
+			adaty hytaý diliniň mandarin şiwesi
 			zulu dili
 			zuni dili
 			dilçilige degişli mazmun ýok
@@ -645,7 +648,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mýanma (Burma)
 			Mongoliýa
 			Makau AAS Hytaý
-			Makau
+			Makao
 			Demirgazyk Mariana adalary
 			Martinika
 			Mawritaniýa
@@ -712,7 +715,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Salwador
 			Sint-Marten
 			Siriýa
-			Swazilend
+			Eswatini
+			Swazilend
 			Tristan-da-Kunýa
 			Terks we Kaýkos adalary
 			Çad
@@ -851,8 +855,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b ç d e ä f g h i j ž k l m n ň o ö p r s ş t u ü w y ý z]
 		[c q v x]
 		[A B Ç D E Ä F G H I J Ž K L M N Ň O Ö P R S Ş T U Ü W Y Ý Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- – — , ; \: ! ? . … " “ ” ( ) \[ \] \{ \} § @ * #]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ – — , ; \: ! ? . … " “ ” ( ) \[ \] \{ \} § @ * #]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -861,19 +865,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} … {1}
 		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1016,44 +1024,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							h a – h a
 							h–h a
@@ -1535,10 +1505,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG M/y – GGGGG M/y
 							GGGGG M/y – M/y
@@ -1898,7 +1864,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				geçen ýekşenbe
 				şu ýekşenbe
-				indiki çekşenbe
+				indiki ýekşenbe
 				
 					{0} ýekşenbeden
 					{0} ýekşenbe
@@ -2596,11 +2562,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Rejaýna
 			
-			
-				Winipeg
-			
 			
-				Rozulýut
+				Rezolýut
 			
 			
 				Reýni-Riwer
@@ -2642,7 +2605,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Blank-Sablon
 			
 			
-				Sent-Džons
+				Sent-Jons
 			
 			
 				Kokos
@@ -2669,7 +2632,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Rarotonga
 			
 			
-				Pashi adasy
+				Pasha adasy
 			
 			
 				Punta-Arenas
@@ -2749,9 +2712,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				El-Aýun
 			
-			
-				Asmera
-			
 			
 				Kanar adalary
 			
@@ -2818,9 +2778,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Tule
 			
-			
-				Nuk
-			
 			
 				Illokkortoormiut
 			
@@ -2974,6 +2931,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Aktobe
 			
+			
+				Kostanaý
+			
 			
 				Gyzylorda
 			
@@ -3044,7 +3004,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Bamako
 			
 			
-				Rangun
+				Ýangon
 			
 			
 				Howd
@@ -3281,7 +3241,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tomsk
 			
 			
-				Nowokuznetsk
+				Nowokuznesk
 			
 			
 				Krasnoýarsk
@@ -3938,7 +3898,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					Gilberta adalary wagty
+					Gilbert adalary wagty
 				
 			
 			
@@ -4486,6 +4446,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			 
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4493,6 +4455,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			san däl
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 müň
@@ -4804,6 +4771,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Hytaý ýuany (ofşor)
 				hytaý ýuany (ofşor)
 				hytaý ýuany (ofşor)
+				CNH
 			
 			
 				Hytaý ýuany
@@ -5217,6 +5185,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mawritan ugiýasy
 				mawritan ugiýasy
 				mawritan ugiýasy
+				MRU
 			
 			
 				Mawrikiý rupiýasy
@@ -5465,6 +5434,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				San-Tome we Prinsipi dobrasy
 				san-tome we prinsipi dobrasy
 				san-tome we prinsipi dobrasy
+				STN
+				Db
 			
 			
 				Siriýa funty
@@ -5583,6 +5554,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Wenesuela boliwary
 				wenesuela boliwary
 				wenesuela boliwary
+				VES
 			
 			
 				Wýetnam dongy
@@ -5661,8 +5633,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}–{1}
 		
 		
-			{0} gün
-			{0} günler
+			{0} gün
+			{0} günler
 			Sagdan {0}-nj. öwrümden öwrüliň.
 		
 	
@@ -5671,6 +5643,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{1} başyna {0}
 			
+			
+				{0}.{1}
+			
 			
 				erkin düşüş tizlenmesi
 				{0} G
@@ -5757,7 +5732,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0}/inedördül dýuým
 			
 			
-				dunam
 				{0} dunam
 				{0} dunam
 			
@@ -5881,6 +5855,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} asyr
 				{0} asyr
 			
+			
+				onýyllyklar
+				{0} onýyllyk
+				{0} onýyllyk
+			
 			
 				ýyl
 				{0} ýyl
@@ -5998,6 +5977,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Britan ýylylyk birligi
 				{0} Britan ýylylyk birligi
 			
+			
+				ABŞ termleri
+				{0} ABŞ termi
+				{0} ABŞ termi
+			
 			
 				funt-güýçler
 				{0} funt-güýç
@@ -6028,6 +6012,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} gers
 				{0} gers
 			
+			
+				tipografik em
+				{0} em
+				{0} em
+			
+			
+				pikseller
+				{0} piksel
+				{0} piksel
+			
+			
+				megapikseller
+				{0} megapiksel
+				{0} megapiksel
+			
+			
+				santimetr başyna piksel
+				{0} santimetr başyna piksel
+				{0} santimetr başyna piksel
+			
+			
+				dýuým başyna piksel
+				{0} dýuým başyna piksel
+				{0} dýuým başyna piksel
+			
+			
+				santimetr başyna nokat
+				{0} santimetr başyna nokat
+				{0} santimetr başyna nokat
+			
+			
+				dýuým başyna nokat
+				{0} dýuým başyna nokat
+				{0} dýuým başyna nokat
+			
 			
 				kilometr
 				{0} kilometr
@@ -6237,11 +6256,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} at güýji
 				{0} at güýji
 			
-			
-				gektopaskal
-				{0} gektopaskal
-				{0} gektopaskal
-			
 			
 				millimetr simap sütüni
 				{0} millimetr simap sütüni
@@ -6257,6 +6271,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} dýuým simap sütüni
 				{0} dýuým simap sütüni
 			
+			
+				barlar
+				{0} bar
+				{0} bar
+			
 			
 				millibar
 				{0} millibar
@@ -6267,6 +6286,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atmosfera
 				{0} atmosfera
 			
+			
+				paskallar
+				{0} paskal
+				{0} paskal
+			
+			
+				gektopaskal
+				{0} gektopaskal
+				{0} gektopaskal
+			
 			
 				kilopaskal
 				{0} kilopaskal
@@ -6474,6 +6503,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}/{1}
 			
+			
+				{0}.{1}
+			
 			
 				G
 				{0} G
@@ -6684,6 +6716,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} as
 				{0} as
 			
+			
+				oný
+				{0} oný
+				{0} oný
+			
 			
 				ý.
 				{0} ý.
@@ -6801,6 +6838,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Btu
 				{0} Btu
 			
+			
+				ABŞ termi
+				{0} ABŞ termi
+				{0} ABŞ termi
+			
 			
 				funt-güýç
 				{0} lbf
@@ -6831,6 +6873,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} Gs
 				{0} Gs
 			
+			
+				pikseller
+				{0} pks
+				{0} pks
+			
+			
+				megapiksel
+			
+			
+				sbp
+				{0} sbp
+				{0} sbp
+			
+			
+				dbp
+				{0} dbp
+				{0} dbp
+			
+			
+				smbn
+				{0} smbn
+				{0} smbn
+			
+			
+				dbn
+				{0} dbn
+				{0} dbn
+			
 			
 				km
 				{0} km
@@ -7040,11 +7110,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} a.g.
 				{0} a.g.
 			
-			
-				gPa
-				{0} gPa
-				{0} gPa
-			
 			
 				mm sim.süt.
 				{0} mm sim.süt.
@@ -7070,6 +7135,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} atm
 				{0} atm
 			
+			
+				gPa
+				{0} gPa
+				{0} gPa
+			
 			
 				kPa
 				{0} kPa
@@ -7277,6 +7347,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}/{1}
 			
+			
+				{0}.{1}
+			
 			
 				%
 				{0}%
@@ -7405,7 +7478,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -7419,7 +7491,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0}, {1}
 			{0}, {1}
 			{0}, {1}
-			{0} we {1}
 		
 		
 			{0} {1}
diff --git a/make/data/cldr/common/main/tk_TM.xml b/make/data/cldr/common/main/tk_TM.xml
index 2bcc5ae4562..a648998b069 100644
--- a/make/data/cldr/common/main/tk_TM.xml
+++ b/make/data/cldr/common/main/tk_TM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/to.xml b/make/data/cldr/common/main/to.xml
index 4e8daa2e12a..d0c89180c0c 100644
--- a/make/data/cldr/common/main/to.xml
+++ b/make/data/cldr/common/main/to.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -104,6 +104,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lea fakakalipa
 			lea fakakaiuka
 			lea fakaʻatisami
+			lea fakasākima
 			lea fakasese
 			lea fakasepuano
 			lea fakakika
@@ -337,6 +338,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lea lingikala
 			lea fakalau
 			lea fakamongikō
+			lea fakaluisiana
 			lea fakalosi
 			lea fakaluli-tokelau
 			lea fakalituania
@@ -621,6 +623,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lea fakaʻiōlupa
 			lea fakaneʻēngatū
 			lea fakakuangitongi
+			lea fakakuangitongi (Siaina)
 			lea fakasuangi
 			lea fakasapoteki
 			lea fakaʻilonga-pilisi
@@ -628,8 +631,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lea fakasenaka
 			lea fakatamasaiti-moloko
 			lea fakasiaina
+			lea fakasiaina-mānitali
 			lea fakasiaina-fakafaingofua
+			lea fakasiaina-mānitali-fakafaingofua
 			lea fakasiaina-tukufakaholo
+			lea fakasiaina-mānitali-tukufakaholo
 			lea fakasulu
 			lea fakasuni
 			ʻikai ha lea
@@ -667,16 +673,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
 			
 			
 			
+			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -696,6 +705,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -727,10 +737,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -742,6 +754,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -764,7 +777,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
+			
 			
 			
 			
@@ -777,6 +792,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
+			
 			
 			
 			
@@ -804,6 +821,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
 			
 			
 			
@@ -847,6 +865,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ʻEulope fakahahake
 			ʻEulope fakatokelau
 			ʻEulope fakahihifo
+			ʻAfilika fakasahala-tonga
 			ʻAmelika fakalatina
 			Motu ʻAsenisini
 			ʻAnitola
@@ -895,6 +914,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Kongo (Lepupelika)
 			Suisilani
 			Matafonua ʻAivolī
+			Matafonua ʻAivolī
 			ʻOtumotu Kuki
 			Sili
 			Kameluni
@@ -929,6 +949,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Finilani
 			Fisi
 			ʻOtumotu Fokulani
+			ʻOtumotu Malivina
 			Mikolonīsia
 			ʻOtumotu Faloe
 			Falanisē
@@ -1003,8 +1024,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Sā Mātini (fakafalanisē)
 			Matakasika
 			ʻOtumotu Māsolo
-			Masetōnia
-			Masetōnia (FYROM)
+			Masetōnia fakatokelau
 			Māli
 			Mianimā (Pema)
 			Mongokōlia
@@ -1076,7 +1096,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			ʻEle Salavatoa
 			Sā Mātini (fakahōlani)
 			Sīlia
-			Suasilani
+			ʻEsuatini
+			Suasilani
 			Tulisitani ta Kunuha
 			ʻOtumotu Tuki mo Kaikosi
 			Sāti
@@ -1085,7 +1106,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Tailani
 			Tasikitani
 			Tokelau
-			Timoa hahake
+			Timoa fakahahake
+			Timoa fakahahake
 			Tūkimenisitani
 			Tunīsia
 			Tonga
@@ -1111,6 +1133,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Vanuatu
 			ʻUvea mo Futuna
 			Haʻamoa
+			fasiʻalea loi
+			fua-ua loi
 			Kōsovo
 			Iemeni
 			Maiote
@@ -1127,31 +1151,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			lea fakafalanisē fakaonopooni-tōmuʻa
 			fakaako
 			sipelatotonu fokotuʻu 1943
+			mataʻitohi liliu laipeli ʻamelika 1997
 			lea fakafeituʻu fakaʻaluku
 			sipelatotonu ʻoe lea fakapotukali he 1990
+			lea fakafeituʻu fakaʻalanese
 			lea fakaʻāmenia-hahake
 			lea fakaʻāmenia-hihifo
+			lea fakafeituʻu fakaʻasanitē
+			lea fakafeituʻu fakaʻauvēniati
 			motuʻalea fakalatina fakatahataha ki Toake
 			lea fakafeituʻu fakapalanika ʻo Anii
 			lea fakafeituʻu fakapālavenito-pupunga
+			lea fakapilitānia fakafaingofua
+			lea fakafeituʻu fakapisikaea
 			lea fakafeituʻu fakapila mo fakasā-siōsio
 			motuʻalea fakapoholisi
-			lea fakapunavila
+			lea fakafeituʻu fakapunavila
 			sipelatotonu ʻoe lea fakapotukali-palāsili he 1945
 			motuʻalea fakatainikō
 			lea fakasēpia (puʻaki fakaʻekavia)
 			lea fakapilitānia fakonopooni-tōmuʻa
 			fonētiki IPA
 			fonētiki UPA
+			lea fakafeituʻu fakakasikō
 			mataʻitohi liliu fakahepipūnu
+			lea fakafeituʻu fakanoauē-hake
 			lea fakasēpia (puʻaki fakaʻisekavia)
+			lea fakafeituʻu fakatiaue
+			mataʻitohi liliu fakakuangitongi
 			sipelatotonu fakatatau
+			lea fakafeituʻu fakakosivie
 			sipelatotonu fakasīpinga
+			lea fakafeituʻu fakalemosini
+			lea fakafeituʻu fakalangetoki
 			lea fakafeituʻu fakalipovasi ʻo Lesia
 			motuʻalea fakametēliko
 			fasiʻalea taha
 			lea fakafeituʻu fakanitiuka
 			lea fakafeituʻu fakanatisone
+			lea fakafeituʻu fakanisāti
 			lea fakafeituʻu fakangiva
 			lea fakavolapuki fakaonopooni
 			lea fakafeituʻu fakaʻoseako
@@ -1160,17 +1198,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			mataʻitohi liliu fakapīnīni
 			fasiʻalea lahi
 			fakakomipiuta
+			lea fakafeituʻu fakapolevenise
 			sipelatotonu kuo sivi
 			lea fakavolapuki motuʻa
 			lea fakafeituʻu fakalesia
+			lea fakasaho
 			lea fakasikotilani fakasīpinga
+			lea fakafeituʻu fakasikause
 			lea fakafeituʻu fakasolipika
 			lea fakafeituʻu fakasotavenito-pupunga
+			lea fakafeituʻu fakasulimila
+			lea fakafeituʻu fakasulisiliva
 			sipelatotunu fakatalasikievika
 			sipelatotonu fakatahataha
 			sipelatotonu fakatahataha kuo sivi
+			lea fakafeituʻu fakaʻulisitā
 			motuʻalea fonētiki ʻo Unifoni
-			lea fakavalenisia
+			lea fakafeituʻu fakavalenisia
+			lea fakafeituʻu fakavalate
+			lea fakafeituʻu fakavivalo-alapeno
 			mataʻitohi liliu fakauate-kilesi
 		
 		
@@ -1246,6 +1292,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			fika fakaʻītiōpia
 			fika laulahi
 			fika fakaseōsia
+			fika fakakoniti-kunisala
+			fika fakakoniti–masalami
 			fika fakakalisi
 			fika fakakalisi fakalalo
 			fika fakakutalati
@@ -1256,7 +1304,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			fika fakasiaina tukufakaholo
 			fika fakasiaina tukufakaholo fakapaʻanga
 			fika fakahepelū
-			fika fakapahaumongi
+			fika fakamōngi-pahau
+			fika fakamōngi-niakengi
 			fika fakasava
 			fika fakasiapani
 			fika fakasiapani fakapaʻanga
@@ -1286,6 +1335,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			fika fakaʻolisiki
 			fika fakaʻotia
 			fika fakaʻosimania
+			fika fakalohingia-hanifi
 			fika fakaloma
 			fika fakaloma fakalalo
 			fika fakasaulasitā
@@ -1304,6 +1354,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			fika fakatīhuta
 			fika fakavai
 			fika fakavalangi
+			fika fakauāniko
 		
 		
 			fakamita
@@ -1320,8 +1371,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á ā e é ē f h i í ī k l m n {ng} o ó ō p s t u ú ū v ʻ]
 		[à ă â å ä æ b c ç d è ĕ ê ë g ì ĭ î ï j ñ ò ŏ ô ö ø œ q r ù ŭ û ü w x y ÿ z]
 		[A E F H I K L M N {NG} O P S T U V ʻ]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1330,22 +1381,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		{0} … {1}
 		?
 		
-			[\--/]
-			[\:∶]
+			[\--/]
+			[\:∶]
 		
 		
-			[.․。︒﹒．｡]
-			[\$﹩＄$]
-			[£₤]
+			[.․。︒﹒．｡]
+			[\$﹩＄$]
+			[£₤]
 		
 		
-			[\-‒⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
+			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
 		
 		
-			[,٫︐﹐，]
-			[.․﹒．｡]
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1356,6 +1407,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	
 	
 		
+			
+				
+					
+						
+							
+								Kumā
+								Pulupokaʻi
+								Taika
+								Lapisi
+								Talakoni
+								Ngata
+								Hoosi
+								Kosi
+								Ngeli
+								Moataʻane
+								Kulī
+								Puaka
+							
+						
+					
+				
+			
 			
 				
 					
@@ -1417,8 +1490,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMM y G
 						d MMM y G
 						E d MMM y G
-						h a
-						HH
+						h a
+						HH
 						h:mm a
 						H:mm
 						h:mm:ss a
@@ -1459,6 +1532,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y GGGGG – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
 						
 							h a – h a
 							h–h a
@@ -1801,11 +1912,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						KM
+						KM
 						TS
+						TS
 					
 					
 						KM
+						KM
 						TS
+						TS
 					
 				
 				
@@ -1874,13 +1989,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
+						h B
+						h:mm B
+						h:mm:ss B
 						d
 						ccc
-						E h:mm B
-						E h:mm:ss B
+						E h:mm B
+						E h:mm:ss B
 						E d
 						E h:mm a
 						E HH:mm
@@ -1908,7 +2023,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						E d MMM
 						d MMMM
 						E d MMMM
-						'uike' 'hono' W ʻ'o' MMMM
+						'uike' 'hono' W ʻ'o' MMMM
 						mm:ss
 						y
 						M/y
@@ -1921,7 +2036,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						MMMM y
 						y QQQ
 						y QQQQ
-						'uike' 'hono' w ʻ'o' Y
+						'uike' 'hono' w ʻ'o' Y
 					
 					
 						{0} {1}
@@ -1931,6 +2046,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d – d
 						
+						
+							y G – y G
+							y – y G
+						
+						
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
+						
+						
+							d/M/y – d/M/y GGGGG
+							d/M/y GGGGG – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+							d/M/y – d/M/y GGGGG
+						
+						
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y GGGGG – E d/M/y GGGGG
+							E d/M/y – E d/M/y GGGGG
+							E d/M/y– E d/M/y GGGGG
+						
+						
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
+						
+						
+							d – d MMM y G
+							d MMM y G – d MMM y G
+							d MMM – d MMM y G
+							d MMM y – d MMM y G
+						
+						
+							E d MMM – E d MMM y G
+							E d MMM y G – E d MMM y G
+							E d MMM – E d MMM y G
+							E d MMM y – E d MMM y G
+						
 						
 							h a – h a
 							h – h a
@@ -2029,10 +2182,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kuonga
 			
 			
-				kuonga
+				kuonga
 			
 			
-				kuonga
+				kuonga
 			
 			
 				taʻu
@@ -2153,7 +2306,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					uike ʻe {0} kuoʻosi
 				
-				ʻi he uike ʻo e {0}
+				ʻi he uike ʻo e {0}
 			
 			
 				uike
@@ -2166,7 +2319,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					uike ʻe {0} kuoʻosi
 				
-				ʻi he uike ʻo e {0}
+				ʻi he uike ʻo e {0}
 			
 			
 				uike
@@ -2179,7 +2332,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					uike ʻe {0} kuoʻosi
 				
-				ʻi he uike ʻo e {0}
+				ʻi he uike ʻo e {0}
 			
 			
 				uike ʻo e māhina
@@ -2264,10 +2417,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Sāpaté ni
 				Sāpate kahaʻu
 				
-					Ngaahi Sāpate ʻe {0} ʻi he kahaʻu
+					Ngaahi Sāpate ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Sāpate ʻe {0} ʻi he kuohili
+					Ngaahi Sāpate ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2275,10 +2428,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Sāpaté ni
 				Sāpate kahaʻu
 				
-					Sāpate ʻe {0} ʻi he kahaʻu
+					Sāpate ʻe {0} ʻi he kahaʻu
 				
 				
-					Sāpate ʻe {0} ʻi he kuohili
+					Sāpate ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2286,10 +2439,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Sāpaté ni
 				Sāpate kahaʻu
 				
-					Sāpate ʻe {0} ʻi he kahaʻu
+					Sāpate ʻe {0} ʻi he kahaʻu
 				
 				
-					Sāpate ʻe {0} ʻi he kuohili
+					Sāpate ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2297,10 +2450,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mōnité ni
 				Mōnite kahaʻu
 				
-					Ngaahi Mōnite ʻe {0} ʻi he kahaʻu
+					Ngaahi Mōnite ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Mōnite ʻe {0} ʻi he kuohili
+					Ngaahi Mōnite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2308,10 +2461,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mōnité ni
 				Mōnite kahaʻu
 				
-					Mōnite ʻe {0} ʻi he kahaʻu
+					Mōnite ʻe {0} ʻi he kahaʻu
 				
 				
-					Mōnite ʻe {0} ʻi he kuohili
+					Mōnite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2319,10 +2472,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Mōnité ni
 				Mōnite kahaʻu
 				
-					Mōnite ʻe {0} ʻi he kahaʻu
+					Mōnite ʻe {0} ʻi he kahaʻu
 				
 				
-					Mōnite ʻe {0} ʻi he kuohili
+					Mōnite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2330,10 +2483,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tūsité ni
 				Tūsite kahaʻu
 				
-					Ngaahi Tūsite ʻe {0} ʻi he kahaʻu
+					Ngaahi Tūsite ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Tūsite ʻe {0} ʻi he kuohili
+					Ngaahi Tūsite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2341,10 +2494,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tūsité ni
 				Tūsite kahaʻu
 				
-					Tūsite ʻe {0} ʻi he kahaʻu
+					Tūsite ʻe {0} ʻi he kahaʻu
 				
 				
-					Tūsite ʻe {0} ʻi he kuohili
+					Tūsite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2352,10 +2505,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tūsité ni
 				Tūsite kahaʻu
 				
-					Tūsite ʻe {0} ʻi he kahaʻu
+					Tūsite ʻe {0} ʻi he kahaʻu
 				
 				
-					Tūsite ʻe {0} ʻi he kuohili
+					Tūsite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2363,10 +2516,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Pulelulú ni
 				Pulelulu kahaʻu
 				
-					Ngaahi Pulelulu ʻe {0} ʻi he kahaʻu
+					Ngaahi Pulelulu ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Pulelulu ʻe {0} ʻi he kuohili
+					Ngaahi Pulelulu ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2374,10 +2527,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Pulelulú ni
 				Pulelulu kahaʻu
 				
-					Pulelulu ʻe {0} ʻi he kahaʻu
+					Pulelulu ʻe {0} ʻi he kahaʻu
 				
 				
-					Pulelulu ʻe {0} ʻi he kuohili
+					Pulelulu ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2385,10 +2538,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Pulelulú ni
 				Pulelulu kahaʻu
 				
-					Pulelulu ʻe {0} ʻi he kahaʻu
+					Pulelulu ʻe {0} ʻi he kahaʻu
 				
 				
-					Pulelulu ʻe {0} ʻi he kuohili
+					Pulelulu ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2396,10 +2549,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tuʻapulelulú ni
 				Tuʻapulelulu kahaʻu
 				
-					Ngaahi Tuʻapulelulu ʻe {0} ʻi he kahaʻu
+					Ngaahi Tuʻapulelulu ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Tuʻapulelulu ʻe {0} ʻi he kuohili
+					Ngaahi Tuʻapulelulu ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2407,10 +2560,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tuʻapulelulú ni
 				Tuʻapulelulu kahaʻu
 				
-					Tuʻapulelulu ʻe {0} ʻi he kahaʻu
+					Tuʻapulelulu ʻe {0} ʻi he kahaʻu
 				
 				
-					Tuʻapulelulu ʻe {0} ʻi he kuohili
+					Tuʻapulelulu ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2418,10 +2571,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tuʻapulelulú ni
 				Tuʻapulelulu kahaʻu
 				
-					Tuʻapulelulu ʻe {0} ʻi he kahaʻu
+					Tuʻapulelulu ʻe {0} ʻi he kahaʻu
 				
 				
-					Tuʻapulelulu ʻe {0} ʻi he kuohili
+					Tuʻapulelulu ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2429,10 +2582,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Falaité ni
 				Falaite kahaʻu
 				
-					Ngaahi Falaite ʻe {0} ʻi he kahaʻu
+					Ngaahi Falaite ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Falaite ʻe {0} ʻi he kuohili
+					Ngaahi Falaite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2440,10 +2593,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Falaité ni
 				Falaite kahaʻu
 				
-					Falaite ʻe {0} ʻi he kahaʻu
+					Falaite ʻe {0} ʻi he kahaʻu
 				
 				
-					Falaite ʻe {0} ʻi he kuohili
+					Falaite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2451,10 +2604,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Falaité ni
 				Falaite kahaʻu
 				
-					Falaite ʻe {0} ʻi he kahaʻu
+					Falaite ʻe {0} ʻi he kahaʻu
 				
 				
-					Falaite ʻe {0} ʻi he kuohili
+					Falaite ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2462,10 +2615,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tokonakí ni
 				Tokonaki kahaʻu
 				
-					Ngaahi Tokonaki ʻe {0} ʻi he kahaʻu
+					Ngaahi Tokonaki ʻe {0} ʻi he kahaʻu
 				
 				
-					Ngaahi Tokonaki ʻe {0} ʻi he kuohili
+					Ngaahi Tokonaki ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2473,10 +2626,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tokonakí ni
 				Tokonaki kahaʻu
 				
-					Tokonaki ʻe {0} ʻi he kahaʻu
+					Tokonaki ʻe {0} ʻi he kahaʻu
 				
 				
-					Tokonaki ʻe {0} ʻi he kuohili
+					Tokonaki ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2484,10 +2637,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tokonakí ni
 				Tokonaki kahaʻu
 				
-					Tokonaki ʻe {0} ʻi he kahaʻu
+					Tokonaki ʻe {0} ʻi he kahaʻu
 				
 				
-					Tokonaki ʻe {0} ʻi he kuohili
+					Tokonaki ʻe {0} ʻi he kuohili
 				
 			
 			
@@ -2501,7 +2654,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				houa
-				ko e houa ʻeni
+				ko e houa ʻeni
 				
 					ʻi he houa ʻe {0}
 				
@@ -2531,7 +2684,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				miniti
-				ko e miniti ʻeni
+				ko e miniti ʻeni
 				
 					ʻi he miniti ʻe {0}
 				
@@ -2593,10 +2746,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				taimi fakavahe
 			
 			
-				taimi fakavahe
+				taimi fakavahe
 			
 			
-				taimi fakavahe
+				taimi fakavahe
 			
 		
 		
@@ -2615,7 +2768,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					taimi fakaemāmani
+					taimi fakaemāmani
 				
 				
 					UTC
@@ -2886,7 +3039,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Vancouver
 			
 			
-				Fort Nelson
+				Fort Nelson
 			
 			
 				Dawson Creek
@@ -2985,7 +3138,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Lapanui
 			
 			
-				Punta Arenas
+				Punta Arenas
 			
 			
 				Santiago
@@ -3021,7 +3174,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Nicosia
 			
 			
-				Famagusta
+				Famagusta
 			
 			
 				Prague
@@ -3249,10 +3402,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Phnom Penh
 			
 			
-				Enderbury
+				ʻEnitipulī
 			
 			
-				Kiritimati
+				Kilisimasi
 			
 			
 				Talava
@@ -3282,7 +3435,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Oral
 			
 			
-				Atyrau
+				Atyrau
 			
 			
 				Aqtobe
@@ -3345,10 +3498,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Antananarivo
 			
 			
-				Kwajalein
+				Kuasaleni
 			
 			
-				Majuro
+				Masulo
 			
 			
 				Skopje
@@ -3372,7 +3525,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Macau
 			
 			
-				Saipan
+				Saʻipani
 			
 			
 				Martinique
@@ -3489,16 +3642,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Tahisi
 			
 			
-				Marquesas
+				Malikuesa
 			
 			
-				Gambier
+				Kamipiē
 			
 			
-				Port Moresby
+				Taulanga Molesipi
 			
 			
-				Bougainville
+				Pukanivila
 			
 			
 				Manila
@@ -3513,7 +3666,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Miquelon
 			
 			
-				Pitcairn
+				Pitikeni
 			
 			
 				Puerto Rico
@@ -3564,16 +3717,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Volgograd
 			
 			
-				Saratov
+				Saratov
 			
 			
-				Astrakhan
+				Astrakhan
 			
 			
-				Ulyanovsk
+				Ulyanovsk
 			
 			
-				Kirov
+				Kirov
 			
 			
 				Samara
@@ -3588,10 +3741,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Novosibirsk
 			
 			
-				Barnaul
+				Barnaul
 			
 			
-				Tomsk
+				Tomsk
 			
 			
 				Novokuznetsk
@@ -3603,7 +3756,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Irkutsk
 			
 			
-				Chita
+				Chita
 			
 			
 				Yakutsk
@@ -3624,7 +3777,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Magadan
 			
 			
-				Srednekolymsk
+				Srednekolymsk
 			
 			
 				Kamchatka
@@ -3639,7 +3792,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Riyadh
 			
 			
-				Guadalcanal
+				Kuatākanali
 			
 			
 				Mahe
@@ -3759,10 +3912,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Kampala
 			
 			
-				Midway
+				Mitiuai
 			
 			
-				Wake
+				Ueke
 			
 			
 				Adak
@@ -3771,7 +3924,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Nome
 			
 			
-				Johnston
+				Sionesitoni
 			
 			
 				Anchorage
@@ -4678,7 +4831,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				
-					houa fakapiongiangi
+					houa fakapiongiangi
 				
 			
 			
@@ -6636,15 +6789,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					¤ 0a
 					¤ 0m
 					¤ 0k
-					¤ 0M
-					¤ 00M
-					¤ 000M
+					¤ 0M
+					¤ 00M
+					¤ 000M
 					¤ 0P
 					¤ 00P
 					¤ 000P
-					¤ 0T
-					¤ 00T
-					¤ 000T
+					¤ 0T
+					¤ 00T
+					¤ 000T
 				
 			
 			{1} {0}
@@ -6893,28 +7046,55 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			
-				Australian Dollar
-				Australian Dollar
+				Tola fakaʻaositelēlia
+				Tola fakaʻaositelēlia
 				AUD$
+				AU$
 			
 			
 				BRL
 			
+			
+				Tola fakafisi
+				Tola fakafisi
+				F$
+			
 			
 				₾
 			
 			
+				Tola fakanuʻusila
+				Tola fakanuʻusila
 				NZD$
+				NZ$
+			
+			
+				Kina fakapapuaniukini
+				Kina fakapapuaniukini
+			
+			
+				Tola fakaʻotusolomone
+				Tola fakaʻotusolomone
+				S$
 			
 			
 				Paʻanga fakatonga
 				Paʻanga fakatonga
 				T$
+				T$
+			
+			
+				Vatu fakavanuatu
+				Vatu fakavanuatu
 			
 			
 				Tala fakahaʻamoa
 				Tala fakahaʻamoa
 			
+			
+				Falaniki fakapasifika
+				Falaniki fakapasifika
+			
 			
 				Pa’anga Ta’e’ilo
 				Pa’anga Ta’e’ilo
@@ -7142,12 +7322,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				mita sikuea ʻe
 				mita sikuea ʻe {0}
-				{0} ki he mita sikuea
+				{0} he mita sikuea
 			
 			
 				senitimita sikuea
 				senitimita sikuea ʻe {0}
-				{0} ki he senitimita sikuea
+				{0} he senitimita sikuea
 			
 			
 				maile sikuea
@@ -7169,7 +7349,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ʻinisi sikuea
 				ʻinisi sikuea ʻe {0}
-				{0} ki he ʻinisi sikuea
+				{0} he ʻinisi sikuea
+			
+			
+				tunami
+				tunami ʻe {0}
 			
 			
 				kalati
@@ -7188,12 +7372,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				konga ʻe {0} he miliona
 			
 			
-				peseti
-				peseti ʻe {0}
+				peseti
+				peseti ʻe {0}
 			
 			
-				pemili
-				pemili ʻe {0}
+				pemili
+				pemili ʻe {0}
+			
+			
+				pemano
+				pemano ʻe {0}
+			
+			
+				molo
+				molo ʻe {0}
 			
 			
 				lita he kilomita
@@ -7212,8 +7404,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				maile ʻe {0} he kālani fakaʻemipaea
 			
 			
-				petapaiti
-				petapaiti ʻe {0}
+				petapaiti
+				petapaiti ʻe {0}
 			
 			
 				telapaiti
@@ -7256,28 +7448,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				piti ʻe {0}
 			
 			
-				teautaʻu
-				teautaʻu ʻe {0}
+				teautaʻu
+				teautaʻu ʻe {0}
+			
+			
+				honofuluʻitaʻu
+				honofuluʻitaʻu ʻe {0}
 			
 			
 				taʻu
 				taʻu ʻe {0}
-				{0} ki he taʻu
+				{0} he taʻu
 			
 			
 				māhina
 				māhina ʻe {0}
-				{0} ki he māhina
+				{0} he māhina
 			
 			
 				uike
 				uike ʻe {0}
-				{0} ki he uike
+				{0} he uike
 			
 			
 				ʻaho
 				ʻaho ʻe {0}
-				{0} ki he ʻaho
+				{0} he ʻaho
 			
 			
 				houa
@@ -7287,7 +7483,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				miniti
 				miniti ʻe {0}
-				{0} ki he miniti
+				{0} he miniti
 			
 			
 				sekoni
@@ -7346,6 +7542,26 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kilouate-houa
 				kilouate-houa ʻe {0}
 			
+			
+				volotāʻelekitō
+				volotāʻelekitō ʻe {0}
+			
+			
+				ʻiuniti māfana fakapilitānia
+				ʻiuniti māfana fakapilitānia ʻe {0}
+			
+			
+				ʻiuniti māfana fakaʻamelika
+				ʻiuniti māfana fakaʻamelika ʻe {0}
+			
+			
+				pāunimālohi
+				pāunimālohi ʻe {0}
+			
+			
+				Niutoni
+				Niutoni ʻe {0}
+			
 			
 				kikahēti
 				kikahēti ʻe {0}
@@ -7362,15 +7578,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hēti
 				hēti ʻe {0}
 			
+			
+				ʻemi fakataipe
+				ʻemi fakataipe ʻe {0}
+			
+			
+				meʻatā
+				meʻatā ʻe {0}
+			
+			
+				Mekameʻatā
+				Mekameʻatā ʻe {0}
+			
+			
+				meʻatā he senitimita
+				meʻatā ʻe {0} he senitimita
+			
+			
+				meʻatā he ʻinisi
+				meʻatā ʻe {0} he ʻinisi
+			
+			
+				toti he senitimita
+				toti ʻe {0} he senitimita
+			
+			
+				toti he ʻinisi
+				toti ʻe {0} he ʻinisi
+			
 			
 				kilomita
 				kilomita ʻe {0}
-				{0} ki he kilomita
+				{0} he kilomita
 			
 			
 				mita
 				mita ʻe {0}
-				{0} ki he mita
+				{0} he mita
 			
 			
 				tesimita
@@ -7379,7 +7623,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				senitimita
 				senitimita ʻe {0}
-				{0} ki he senitimita
+				{0} he senitimita
 			
 			
 				milimita
@@ -7408,12 +7652,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				fute
 				fute ʻe {0}
-				{0} ki he fute
+				{0} he fute
 			
 			
 				ʻinisi
 				ʻinisi ʻe {0}
-				{0} ki he ʻinise
+				{0} he ʻinisi
 			
 			
 				ngaofesekoni
@@ -7440,17 +7684,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				maile ʻi tahi ʻe {0}
 			
 			
-				smi
-				{0} smi
+				maile fakasikanitinavia
+				maile fakasikanitinavia ʻe {0}
 			
 			
-				pt
-				{0} pt
+				poini
+				poini ʻe {0}
+			
+			
+				lētiasi fakalaʻā
+				lētiasi fakalaʻā ʻe {0}
 			
 			
 				lukisi
 				lukisi ʻe {0}
 			
+			
+				huhulu fakalaʻā
+				huhulu fakalaʻā ʻe {0}
+			
 			
 				toni
 				toni ʻe {0}
@@ -7458,12 +7710,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				kilokalami
 				kilokalami ʻe {0}
-				{0} ki he kilokalami
+				{0} he kilokalami
 			
 			
 				kalami
 				kalami ʻe {0}
-				{0} ki he kalami
+				{0} he kalami
 			
 			
 				milikalami
@@ -7484,12 +7736,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				pāuni
 				pāuni ʻe {0}
-				{0} ki he pāuni
+				{0} he pāuni
 			
 			
 				ʻaunise
 				ʻaunisi ʻe {0}
-				{0} ki he ʻaunise
+				{0} he ʻaunise
 			
 			
 				ʻaunisi koula
@@ -7499,6 +7751,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kalati
 				kalati ʻe {0}
 			
+			
+				talatoni
+				talatoni ʻe {0}
+			
+			
+				mamafa ʻo māmani
+				mamafa ʻo māmani ʻe {0}
+			
+			
+				mamafa ʻo e laʻā
+				mamafa ʻo e laʻā ʻe {0}
+			
 			
 				kikauate
 				kikauate ʻe {0}
@@ -7523,10 +7787,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hoosipaoa
 				hoosipaoa ʻe {0}
 			
-			
-				hēkitopasikale
-				hēkitopasikale ʻe {0}
-			
 			
 				milimita meakuli
 				milimita meakuli ʻe {0}
@@ -7539,13 +7799,33 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ʻinisi meakuli
 				ʻinisi meakuli ʻe {0}
 			
+			
+				pā
+				pā ʻe {0}
+			
 			
 				milipā
 				milipā ʻe {0}
 			
 			
-				ʻatimosifia
-				ʻatimosifia ʻe {0}
+				ʻatimosifia
+				ʻatimosifia ʻe {0}
+			
+			
+				pasikale
+				pasikale ʻe {0}
+			
+			
+				hēkitopasikale
+				hēkitopasikale ʻe {0}
+			
+			
+				kilopasikale
+				kilopasikale ʻe {0}
+			
+			
+				mekapasikale
+				mekapasikale ʻe {0}
 			
 			
 				kilomita he houa
@@ -7560,8 +7840,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				maile he houa ʻe {0}
 			
 			
-				fakapona
-				fakapona ʻe {0}
+				fakapona
+				fakapona ʻe {0}
 			
 			
 				tikili
@@ -7579,6 +7859,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kelevini
 				kelevini ʻe {0}
 			
+			
+				pāunifute
+				pāunifute ʻe {0}
+			
+			
+				Niutonimita
+				Niutonimita ʻe {0}
+			
 			
 				kilomita kiupiki
 				kilomita kiupiki ʻe {0}
@@ -7586,12 +7874,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				mita kiupiki
 				mita kiupiki ʻe {0}
-				{0} ki he mita kiupiki
+				{0} he mita kiupiki
 			
 			
 				senitimita kiupiki
 				senitimita kiupiki ʻe {0}
-				{0} ki he senitimita kiupiki
+				{0} he senitimita kiupiki
 			
 			
 				maile kiupiki
@@ -7620,7 +7908,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				lita
 				lita ʻe {0}
-				{0} ki he lita
+				{0} he lita
 			
 			
 				tesilita
@@ -7635,12 +7923,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mililita ʻe {0}
 			
 			
-				painite fakamita
-				painite fakamita ʻe {0}
+				painite fakamita
+				painite fakamita ʻe {0}
 			
 			
-				ipu fakamita
-				ipu fakamita ʻe {0}
+				ipu fakamita
+				ipu fakamita ʻe {0}
 			
 			
 				ʻeka-fute
@@ -7653,7 +7941,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				kālani
 				kālani ʻe {0}
-				{0} ki he kālani
+				{0} he kālani
 			
 			
 				kālani fakaʻemipaea
@@ -7676,6 +7964,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ʻaunise tafe
 				ʻaunise tafe ʻe {0}
 			
+			
+				ʻaunise fakaʻemipaea
+				ʻaunise fakaʻemipaea ʻe {0}
+			
 			
 				sēpuni tēpile
 				sēpuni tēpile ʻe {0}
@@ -7684,8 +7976,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sēpuni tī
 				sēpuni tī ʻe {0}
 			
+			
+				paelo
+				paelo ʻe {0}
+			
 			
-				fua tefitoʻi
+				fua tefitoʻi
 				hahake ʻe {0}
 				tokelau ʻe {0}
 				tonga ʻe {0}
@@ -7736,17 +8032,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				m²
 				m² ʻe {0}
-				{0} /m²
+				{0}/m²
 			
 			
 				sm²
 				sm² ʻe {0}
-				{0} /sm²
+				{0}/sm²
 			
 			
 				mi²
 				mi² ʻe {0}
-				{0} /mi²
+				{0}/mi²
 			
 			
 				ʻek
@@ -7763,7 +8059,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				in²
 				in² ʻe {0}
-				{0} /in²
+				{0}/in²
+			
+			
+				tunami
+				tunami ʻe {0}
 			
 			
 				kt
@@ -7782,12 +8082,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				khm ʻe {0}
 			
 			
-				%
-				% ʻe {0}
+				%
+				% ʻe {0}
 			
 			
-				‰
-				‰ ʻe {0}
+				‰
+				‰ ʻe {0}
+			
+			
+				‱ ʻe {0}
+			
+			
+				mol
+				mol ʻe {0}
 			
 			
 				l/km
@@ -7806,7 +8113,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mi ʻe {0}/kāʻem
 			
 			
-				PB
+				PB
 				PB ʻe {0}
 			
 			
@@ -7850,28 +8157,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				piti ʻe {0}
 			
 			
-				tt
-				tt ʻe {0}
+				tt
+				tt ʻe {0}
+			
+			
+				ht
+				ht ʻe {0}
 			
 			
 				taʻu
 				taʻu ʻe {0}
-				{0} /t
+				{0} /t
 			
 			
 				mā
 				mā ʻe {0}
-				{0} /mā
+				{0} /mā
 			
 			
 				u
 				u ʻe {0}
-				{0} /u
+				{0} /u
 			
 			
 				ʻa
 				ʻa ʻe {0}
-				{0} /ʻa
+				{0} /ʻa
 			
 			
 				h
@@ -7881,7 +8192,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				m
 				m ʻe {0}
-				{0} /m
+				{0} /m
 			
 			
 				s
@@ -7940,6 +8251,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kWh
 				kWh ʻe {0}
 			
+			
+				eV ʻe {0}
+			
+			
+				imfP
+				imfP ʻe {0}
+			
+			
+				imfA
+				imfA ʻe {0}
+			
+			
+				pāmā
+				pāmā ʻe {0}
+			
+			
+				N ʻe {0}
+			
 			
 				GHz
 				GHz ʻe {0}
@@ -7956,15 +8285,43 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Hz
 				Hz ʻe {0}
 			
+			
+				ʻemi
+				ʻemi ʻe {0}
+			
+			
+				meʻatā
+				meʻatā ʻe {0}
+			
+			
+				Mmeʻatā
+				Mmeʻatā ʻe {0}
+			
+			
+				meʻatā/sm
+				meʻatā ʻe {0}/sm
+			
+			
+				meʻatā/in
+				meʻatā ʻe {0}/in
+			
+			
+				toti/sm
+				toti ʻe {0}/sm
+			
+			
+				toti/in
+				toti ʻe {0}/in
+			
 			
 				km
 				km ʻe {0}
-				{0} /km
+				{0}/km
 			
 			
 				m
 				m ʻe {0}
-				{0} /m
+				{0}/m
 			
 			
 				tm
@@ -7973,7 +8330,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				sm
 				sm ʻe {0}
-				{0} /sm
+				{0} /sm
 			
 			
 				mm
@@ -8002,12 +8359,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				ft
 				ft ʻe {0}
-				{0} /ft
+				{0}/ft
 			
 			
 				in
 				in ʻe {0}
-				{0} /in
+				{0}/in
 			
 			
 				ngs
@@ -8034,17 +8391,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mt ʻe {0}
 			
 			
-				mis
-				{0} smi
+				msi
+				msi ʻe {0}
 			
 			
-				pt
-				{0} pt
+				pn
+				pn ʻe {0}
+			
+			
+				L☉
+				L☉ ʻe {0}
 			
 			
 				lx
 				lx ʻe {0}
 			
+			
+				H☉
+				H☉ ʻe {0}
+			
 			
 				to
 				to ʻe {0}
@@ -8052,12 +8417,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				kk
 				kk ʻe {0}
-				{0} /kk
+				{0}/kk
 			
 			
 				k
 				k ʻe {0}
-				{0} /k
+				{0}/k
 			
 			
 				mk
@@ -8076,14 +8441,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				st ʻe {0}
 			
 			
-				pā
-				pā ʻe {0}
-				{0} /pā
+				pāu
+				pāu ʻe {0}
+				{0}/pāu
 			
 			
 				ʻau
 				ʻau ʻe {0}
-				{0} /ʻau
+				{0}/ʻau
 			
 			
 				ʻau-k
@@ -8093,6 +8458,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kt
 				kt ʻe {0}
 			
+			
+				tlt
+				tlt ʻe {0}
+			
+			
+				mamafa ⊕
+				mamafa ⊕ ʻe {0}
+			
+			
+				mamafa ☉
+				mamafa ☉ ʻe {0}
+			
 			
 				GW
 				GW ʻe {0}
@@ -8117,10 +8494,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hp
 				hp ʻe {0}
 			
-			
-				hPa
-				hPa ʻe {0}
-			
 			
 				mm-Hg
 				mm-Hg ʻe {0}
@@ -8133,13 +8506,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				in-Hg
 				in-Hg ʻe {0}
 			
+			
+				pā
+				pā ʻe {0}
+			
 			
 				mpā
 				mpā ʻe {0}
 			
 			
-				ʻati
-				ʻati ʻe {0}
+				ʻati
+				ʻati ʻe {0}
+			
+			
+				Pā ʻe {0}
+			
+			
+				hPa
+				hPa ʻe {0}
+			
+			
+				kPa ʻe {0}
+			
+			
+				MPa ʻe {0}
 			
 			
 				km/h
@@ -8154,11 +8544,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				mi/h ʻe {0}
 			
 			
-				fp
-				fp ʻe {0}
+				fp
+				fp ʻe {0}
 			
 			
-				°
+				°
 				° ʻe {0}
 			
 			
@@ -8173,6 +8563,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				K
 				K ʻe {0}
 			
+			
+				pā⋅ft
+				pā⋅ft ʻe {0}
+			
+			
+				N⋅m ʻe {0}
+			
 			
 				km³
 				km³ ʻe {0}
@@ -8180,12 +8577,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				m³
 				m³ ʻe {0}
-				{0} /m³
+				{0}/m³
 			
 			
 				sm³
 				sm³ ʻe {0}
-				{0} /sm³
+				{0}/sm³
 			
 			
 				mi³
@@ -8229,12 +8626,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ml ʻe {0}
 			
 			
-				ptm
-				ptm ʻe {0}
+				ptm
+				ptm ʻe {0}
 			
 			
-				ipm
-				ipm ʻe {0}
+				ipm
+				ipm ʻe {0}
 			
 			
 				ʻe-ft
@@ -8247,7 +8644,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				kā
 				kā ʻe {0}
-				{0} /kā
+				{0}/kā
 			
 			
 				kāʻem
@@ -8270,6 +8667,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ʻau-tf
 				ʻau-tf ʻe {0}
 			
+			
+				ʻau-ʻem
+				ʻau-ʻem ʻe {0}
+			
 			
 				sētē
 				sētē ʻe {0}
@@ -8278,8 +8679,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sētī
 				sētī ʻe {0}
 			
+			
+				paelo
+				paelo ʻe {0}
+			
 			
-				fua
+				fua
 				ha ʻe {0}
 				tk ʻe {0}
 				to ʻe {0}
@@ -8359,6 +8764,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} in²
 				{0}/in²
 			
+			
+				tu
+				{0} tu
+			
 			
 				kt
 				{0} kt
@@ -8376,13 +8785,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} khm
 			
 			
-				%
-				{0}%
+				%
+				{0}%
 			
 			
 				‰
 				{0}‰
 			
+			
+				mol
+				{0} mol
+			
 			
 				l/km
 				{0} l/km
@@ -8447,6 +8860,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				tt
 				{0} tt
 			
+			
+				ht
+				{0} ht
+			
 			
 				t
 				{0} t
@@ -8534,6 +8951,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kWh
 				{0} kWh
 			
+			
+				imfP
+				{0} imfP
+			
+			
+				imfA
+				{0} imfA
+			
+			
+				pāmā
+				{0} pāmā
+			
 			
 				GHz
 				{0} GHz
@@ -8550,6 +8979,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Hz
 				{0} Hz
 			
+			
+				ʻemi
+				{0}ʻemi
+			
+			
+				mt
+				{0}mt
+			
+			
+				Mmt
+				{0}Mmt
+			
+			
+				mt/sm
+				{0}mt/sm
+			
+			
+				mt/in
+				{0}mt/in
+			
+			
+				t/sm
+				{0}t/sm
+			
+			
+				t/in
+				{0}t/in
+			
 			
 				km
 				{0} km
@@ -8628,17 +9085,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} mt
 			
 			
-				mis
-				{0} smi
+				msi
+				{0} msi
 			
 			
-				pt
-				{0} pt
+				pn
+				{0} pn
+			
+			
+				L☉
+				{0} L☉
 			
 			
 				lx
 				{0} lx
 			
+			
+				H☉
+				{0} H☉
+			
 			
 				to
 				{0} to
@@ -8670,9 +9135,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				{0} st
 			
 			
-				pā
-				{0} pā
-				{0}/pā
+				pāu
+				{0} pāu
+				{0}/pāu
 			
 			
 				ʻau
@@ -8687,6 +9152,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				kt
 				{0} kt
 			
+			
+				tlt
+				{0} tlt
+			
+			
+				M⊕
+				{0} M⊕
+			
 			
 				GW
 				{0} GW
@@ -8711,10 +9184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-			
 			
 				mm-Hg
 				{0} mm-Hg
@@ -8727,6 +9196,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				in-Hg
 				{0} in-Hg
 			
+			
+				pā
+				{0} pā
+			
 			
 				mpā
 				{0} mpā
@@ -8735,6 +9208,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ʻati
 				{0} ʻati
 			
+			
+				hPa
+				{0} hPa
+			
 			
 				km/h
 				{0} km/h
@@ -8767,6 +9244,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				K
 				{0} K
 			
+			
+				pā⋅ft
+				{0} pā⋅ft
+			
 			
 				km³
 				{0} km³
@@ -8808,7 +9289,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				l
 				{0} l
-				{0} /l
+				{0}/l
 			
 			
 				tl
@@ -8864,6 +9345,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ʻau-tf
 				{0} ʻau-tf
 			
+			
+				ʻau-ʻem
+				{0}ʻau-ʻem
+			
 			
 				sētē
 				{0} sētē
@@ -8872,8 +9357,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				sētī
 				{0} sētī
 			
+			
+				pl
+				{0}pl
+			
 			
-				fua
+				fua
 				{0} ha
 				{0} tk
 				{0} to
@@ -8898,8 +9387,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} mo {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
+			{0}, {1}
+			{0}, {1}
 			{0}, pē {1}
 			{0} pē {1}
 		
@@ -8935,102 +9424,102 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		{0} — kotoa
-		{0}: {1}
-		{0} — hoa
-		{0} — kāpui
-		{0} — toloi
-		{0} — tupuʻa
-		{0} — kehekehe
-		{0} — kehe
-		ngaahi tohinima — {0}
-		kohi ʻe {0}
-		vaʻinga
-		tohinima fakaʻafilika
-		tohinima fakaʻamelika
+		{0} — kotoa
+		{0}: {1}
+		{0} — hoa
+		{0} — kāpui
+		{0} — toloi
+		{0} — tupuʻa
+		{0} — kehekehe
+		{0} — kehe
+		ngaahi tohinima — {0}
+		kohi ʻe {0}
+		vaʻinga
+		tohinima fakaʻafilika
+		tohinima fakaʻamelika
 		manu
-		manu & natula
-		ngahau
+		manu & natula
+		ngahau
 		sino
-		tā puha
-		mataʻitohi maʻae kakai kui
+		tā puha
+		mataʻitohi maʻae kakai kui
 		fale
-		pulu & fetuʻu
-		samo fakakonisinanite
-		fakaʻilonga paʻanga
-		kohi
-		mataʻifika
-		nikonikoʻi
-		fakaʻilonga tongafisi
-		ngahau hifo
-		ngahau hake-hifo
-		tohinima fakaʻēsia-hahake
-		ngaahi ongo
-		tohinima fakaʻeulope
+		pulu & fetuʻu
+		samo fakakonisinanite
+		fakaʻilonga paʻanga
+		kohi
+		mataʻifika
+		nikonikoʻi
+		fakaʻilonga tongafisi
+		ngahau hifo
+		ngahau hake-hifo
+		tohinima fakaʻēsia-hahake
+		ngaahi ongo
+		tohinima fakaʻeulope
 		fakafefine
 		fuka
 		ngaahi fuka
-		inu & kai
-		anga
-		anga & vā hinehina
-		fuo faikeheʻi fakalaulahiloa
-		fuo fakasiomita
-		fuo faikeheʻi fakalaulahi
-		mataʻitohi hana
-		ʻelitoʻi hana
-		hanisa
-		hanisī fakafaingofua
-		hanisī tukufakaholo
+		inu & kai
+		anga
+		anga & vā hinehina
+		fuo faikeheʻi fakalaulahiloa
+		fuo fakasiomita
+		fuo faikeheʻi fakalaulahi
+		mataʻitohi hana
+		ʻelitoʻi hana
+		hanisa
+		hanisī fakafaingofua
+		hanisī tukufakaholo
 		mafu
-		tohinima fakatupuʻanga
-		fakaʻilonga fakakaukau
-		kana fakasiapani
-		kanipuni
-		kanisī
+		tohinima fakatupuʻanga
+		fakaʻilonga fakakaukau
+		kana fakasiapani
+		kanipuni
+		kanisī
 		tatā foʻi kī
-		ngahau hema
-		ngahau hema-mataʻu
-		fakaʻilonga vāofi mataʻitohi
-		ngāueʻaki fakangatangata
+		ngahau hema
+		ngahau hema-mataʻu
+		fakaʻilonga vāofi mataʻitohi
+		ngāueʻaki fakangatangata
 		fakatangata
-		fakaʻilonga matematika
-		tohinima fakahahake-lotoloto
-		kehekehe
-		tohinima fakaonopooni
-		fakaliliu
-		fakaʻilonga fasi
+		fakaʻilonga matematika
+		tohinima fakahahake-lotoloto
+		kehekehe
+		tohinima fakaonopooni
+		fakaliliu
+		fakaʻilonga fasi
 		natula
-		taʻevā
-		fika
-		foʻi meʻa
-		kehe
-		tauhoa
+		taʻevā
+		fika
+		foʻi meʻa
+		kehe
+		tauhoa
 		kakai
-		motuʻalea fakafonētiki
-		foʻi ʻata
+		motuʻalea fakafonētiki
+		foʻi ʻata
 		feituʻu
 		ʻakau
-		fakaʻilonga mālōlō
-		ngahau mataʻu
-		fakaʻilonga sīpinga
-		fuo faikeheʻi iiki
+		fakaʻilonga mālōlō
+		ngahau mataʻu
+		fakaʻilonga sīpinga
+		fuo faikeheʻi iiki
 		malimali
-		malimali & kakai
-		tohinima fakaʻēsia-tonga
-		tohinima fakaʻēsia-tongahahake
-		vā
+		malimali & kakai
+		tohinima fakaʻēsia-tonga
+		tohinima fakaʻēsia-tongahahake
+		vā
 		vāʻinga
-		fakaʻilonga
-		fakaʻilonga tekinikale
-		fakaʻilonga fasiʻalea
+		fakaʻilonga
+		fakaʻilonga tekinikale
+		fakaʻilonga fasiʻalea
 		folau
-		folau & feituʻu
-		ngahau hake
-		fuo faikeheʻi
-		samo fakavauele
+		folau & feituʻu
+		ngahau hake
+		fuo faikeheʻi
+		samo fakavauele
 		ʻea
-		tohinima fakaʻēsia-hihifo
-		vā hinehina
+		tohinima fakaʻēsia-hihifo
+		vā hinehina
 	
 	
 		falala
@@ -9060,6 +9549,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		nounou siʻi
 		koko siʻi
 		lausiʻi siʻi
+		nōmolo
 		fano siʻi
 		fakalōloa siʻi
 		fālahi siʻi
diff --git a/make/data/cldr/common/main/to_TO.xml b/make/data/cldr/common/main/to_TO.xml
index 8e04e91ceab..8a2dec5345f 100644
--- a/make/data/cldr/common/main/to_TO.xml
+++ b/make/data/cldr/common/main/to_TO.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/tr.xml b/make/data/cldr/common/main/tr.xml
index a20614b2ea5..1a848c612a9 100644
--- a/make/data/cldr/common/main/tr.xml
+++ b/make/data/cldr/common/main/tr.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -60,7 +60,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kotava
 			Awadhi
 			Aymara
-			Azerice
+			Azerbaycan dili
 			Azerice
 			Güney Azerice
 			Başkırtça
@@ -108,10 +108,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Carib
 			Kayuga dili
 			Atsam
-			Chakma
+			Chakma
 			Çeçence
 			Sebuano dili
-			Kigaca
+			Kiga
 			Çamorro dili
 			Çibça dili
 			Çağatayca
@@ -250,7 +250,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Hupaca
 			Ermenice
 			Herero dili
-			Interlingua
+			İnterlingua
 			Iban
 			İbibio dili
 			Endonezce
@@ -273,7 +273,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yahudi Farsçası
 			Yahudi Arapçası
 			Yutland Dili
-			Cava Dili
+			Cava dili
 			Gürcüce
 			Karakalpakça
 			Kabiliyece
@@ -316,7 +316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Karelyaca
 			Kurukh dili
 			Keşmir dili
-			Shambala
+			Şambala
 			Bafia
 			Köln lehçesi
 			Kürtçe
@@ -512,7 +512,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Eski İrlandaca
 			Samogitçe
 			Sırp-Hırvat Dili
-			Taşelhit
+			Taşelit
 			Shan dili
 			Çad Arapçası
 			Sinhali dili
@@ -526,7 +526,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Lule Laponcası
 			İnari Laponcası
 			Skolt Laponcası
-			Shona
+			Şona dili
 			Soninke
 			Somalice
 			Sogdiana Dili
@@ -538,7 +538,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Saho
 			Güney Sotho dili
 			Saterland Frizcesi
-			Sunda Dili
+			Sunda dili
 			Sukuma dili
 			Susu
 			Sümerce
@@ -627,6 +627,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Yorubaca
 			Nheengatu
 			Kantonca
+			Çince, Kantonca
 			Zhuangca
 			Zapotek dili
 			Blis Sembolleri
@@ -634,8 +635,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Zenaga dili
 			Standart Fas Tamazigti
 			Çince
+			Çince, Mandarin
 			Basitleştirilmiş Çince
+			Basitleştirilmiş Çince (Mandarin)
 			Geleneksel Çince
+			Geleneksel Çince (Mandarin)
 			Zuluca
 			Zunice
 			Dilbilim içeriği yok
@@ -663,6 +667,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -685,7 +690,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -697,7 +702,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
+			
 			
 			
 			
@@ -729,11 +734,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -888,7 +895,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Kongo - Brazavil
 			Kongo Cumhuriyeti
 			İsviçre
-			Fildişi Sahili
+			Côte d’Ivoire
+			Fildişi Sahili
 			Cook Adaları
 			Şili
 			Kamerun
@@ -1045,7 +1053,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Paraguay
 			Katar
 			Uzak Okyanusya
-			Réunion
+			Reunion
 			Romanya
 			Sırbistan
 			Rusya
@@ -1066,7 +1074,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Somali
 			Surinam
 			Güney Sudan
-			São Tomé ve Príncipe
+			Sao Tome ve Principe
 			El Salvador
 			Sint Maarten
 			Suriye
@@ -1108,6 +1116,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis ve Futuna
 			Samoa
+			Psödo Aksanlar
+			Psödo Bidi
 			Kosova
 			Yemen
 			Mayotte
@@ -1164,7 +1174,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sıralama Gücü
 			Para Birimi
 			Saat Sistemi (12 - 24)
-			Line Break Style
+			Satır Sonu Stili
 			Ölçü Sistemi
 			Rakamlar
 			Saat Dilimi
@@ -1235,11 +1245,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			12 Saat Sistemi (1–12)
 			24 Saat Sistemi (0–23)
 			24 Saat Sistemi (1–24)
-			Loose Line Break Style
-			Normal Line Break Style
-			Strict Line Break Style
-			BGN
-			UNGEGN
+			Serbest Satır Sonu Stili
+			Normal Satır Sonu Stili
+			Katı Satır Sonu Stili
+			US BGN Transliterasyon
+			UN GEGN Transliterasyon
 			Metrik Sistem
 			İngiliz Ölçü Sistemi
 			ABD Ölçü Sistemi
@@ -1264,7 +1274,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Küçük Harf Yunan Rakamları
 			Gücerat Rakamları
 			Gurmukhi Rakamları
-			Çin Rakamları
+			Çin Ondalık Rakamları
 			Basitleştirilmiş Çin Rakamları
 			Finansal Basitleştirilmiş Çin Rakamları
 			Geleneksel Çin Rakamları
@@ -1346,8 +1356,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b c ç d e f g ğ h ı i İ j k l m n o ö p r s ş t u ü v y z]
 		[á à ă â å ä ã ā æ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò ŏ ô ø ō œ q ß ú ù ŭ û ū w x ÿ]
 		[A B C Ç D E F G H I İ J K L M N O Ö P Q R S Ş T U Ü V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1383,6 +1393,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1401,6 +1424,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Mısrî
 							Nesî
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tût
 							Bâbe
@@ -1433,6 +1471,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Mısrî
 							Nesî
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							Tût
 							Bâbe
@@ -1450,6 +1503,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1488,6 +1555,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1593,10 +1674,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG MM.y – GGGGG MM.y
 							GGGGG MM.y – MM.y
@@ -1635,20 +1712,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							h a – h a
 							h–h a
 						
+						
+							HH–HH
+						
 						
 							h:mm a – h:mm a
 							h:mm–h:mm a
 							h:mm–h:mm a
 						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
 						
 							h:mm a – h:mm a v
 							h:mm–h:mm a v
 							h:mm–h:mm a v
 						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
 						
 							h a – h a v
 							h–h a v
 						
+						
+							HH–HH v
+						
 						
 							MM–MM
 						
@@ -2034,6 +2125,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2125,10 +2238,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d
 						
-						
-							G y – G y
-							G y–y
-						
 						
 							GGGGG MM.y – GGGGG MM.y
 							GGGGG MM.y – MM.y
@@ -2326,23 +2435,79 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
+			
+			
+				
+					
+						
+							Chaitra
+							Vaisakha
+							Jyaistha
+							Asadha
+							Sravana
+							Bhadra
+							Asvina
+							Kartika
+							Agrahayana
+							Pausa
+							Magha
+							Phalguna
+						
+					
+				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 			
 			
 				
 					
 						
-							Muhar.
-							Safer
-							R.evvel
-							R.ahir
-							C.evvel
-							C.ahir
-							Recep
-							Şaban
-							Ram.
-							Şevval
-							Zilkade
-							Zilhicce
+							Muhar.
+							Safer
+							R.evvel
+							R.ahir
+							C.evvel
+							C.ahir
+							Recep
+							Şaban
+							Ram.
+							Şevval
+							Zilkade
+							Zilhicce
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
 						
 						
 							Muharrem
@@ -2361,18 +2526,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						
-							Muhar.
-							Safer
-							R.evvel
-							R.ahir
-							C.evvel
-							C.ahir
-							Recep
-							Şaban
-							Ram.
-							Şevval
-							Zilkade
-							Zilhicce
+							Muhar.
+							Safer
+							R.evvel
+							R.ahir
+							C.evvel
+							C.ahir
+							Recep
+							Şaban
+							Ram.
+							Şevval
+							Zilkade
+							Zilhicce
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
 						
 						
 							Muharrem
@@ -2395,7 +2574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Hicri
 					
 					
-						Hicri
+						Hicri
 					
 					
 						Hicri
@@ -2445,6 +2624,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -2527,9 +2717,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				çyr.
-				geçen çyr.
-				bu çyr.
-				gelecek çyr.
+				geçen çyr.
+				bu çyr.
+				gelecek çyr.
 				
 					{0} çyr. sonra
 					{0} çyr. sonra
@@ -2541,9 +2731,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				çyr.
-				geçen çyr.
-				bu çyr.
-				gelecek çyr.
+				geçen çyr.
+				bu çyr.
+				gelecek çyr.
 				
 					{0} çyr. sonra
 					{0} çyr. sonra
@@ -2612,9 +2802,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				hf.
-				geçen hf.
-				bu hf.
-				gelecek hf.
+				geçen hf.
+				bu hf.
+				gelecek hf.
 				
 					{0} hf. sonra
 					{0} hf. sonra
@@ -2627,6 +2817,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				hf.
+				geçen hf.
+				bu hf.
+				gelecek hf.
 				
 					{0} hf. sonra
 					{0} hf. sonra
@@ -3309,7 +3502,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Porto-Novo
 			
 			
-				Saint Barthélemy
+				Saint Barthelemy
 			
 			
 				Bermuda
@@ -3800,6 +3993,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Aktöbe
 			
+			
+				Kostanay
+			
 			
 				Kızılorda
 			
@@ -5390,6 +5586,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -5398,6 +5596,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 bin
@@ -5514,11 +5717,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Andorra Pezetası
 				Andorra Pezetası
 				Andorra Pezetası
+				ADP
 			
 			
 				Birleşik Arap Emirlikleri Dirhemi
 				BAE dirhemi
 				BAE dirhemi
+				AED
 			
 			
 				Afganistan Afganisi (1927–2002)
@@ -5529,6 +5734,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Afganistan Afganisi
 				Afganistan afganisi
 				Afganistan afganisi
+				AFN
 			
 			
 				Arnavutluk Leki (1946–1965)
@@ -5539,21 +5745,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Arnavutluk Leki
 				Arnavutluk leki
 				Arnavutluk leki
+				ALL
 			
 			
 				Ermenistan Dramı
 				Ermenistan dramı
 				Ermenistan dramı
+				AMD
 			
 			
 				Hollanda Antilleri Guldeni
 				Hollanda Antilleri guldeni
 				Hollanda Antilleri guldeni
+				ANG
 			
 			
 				Angola Kvanzası
 				Angola kvanzası
 				Angola kvanzası
+				AOA
 				Kz
 			
 			
@@ -5569,32 +5779,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Arjantin Australi
 				Arjantin Australi
 				Arjantin Australi
+				ARA
 			
 			
 				Arjantin Peso Leyi (1970–1983)
 				Arjantin peso leyi (1970–1983)
 				Arjantin peso leyi (1970–1983)
+				ARL
 			
 			
 				Arjantin Pesosu (1881–1970)
 				Arjantin pesosu (1881–1970)
 				Arjantin pesosu (1881–1970)
+				ARM
 			
 			
 				Arjantin Pezosu (1983–1985)
 				Arjantin Pezosu (1983–1985)
 				Arjantin Pezosu (1983–1985)
+				ARP
 			
 			
 				Arjantin Pesosu
 				Arjantin pesosu
 				Arjantin pesosu
+				ARS
 				$
 			
 			
 				Avusturya Şilini
 				Avusturya Şilini
 				Avusturya Şilini
+				ATS
 			
 			
 				Avustralya Doları
@@ -5607,243 +5823,289 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aruba Florini
 				Aruba florini
 				Aruba florini
+				AWG
 			
 			
 				Azerbaycan Manatı (1993–2006)
 				Azerbaycan Manatı (1993–2006)
 				Azerbaycan Manatı (1993–2006)
+				AZM
 			
 			
 				Azerbaycan Manatı
 				Azerbaycan manatı
 				Azerbaycan manatı
+				AZN
 			
 			
 				Bosna Hersek Dinarı
 				Bosna Hersek Dinarı
 				Bosna Hersek Dinarı
+				BAD
 			
 			
 				Konvertibl Bosna Hersek Markı
 				Konvertibl Bosna Hersek markı
 				Konvertibl Bosna Hersek markı
+				BAM
 				KM
 			
 			
 				Yeni Bosna Hersek Dinarı (1994–1997)
 				Yeni Bosna Hersek dinarı (1994–1997)
 				Yeni Bosna Hersek dinarı (1994–1997)
+				BAN
 			
 			
 				Barbados Doları
 				Barbados doları
 				Barbados doları
+				BBD
 				$
 			
 			
 				Bangladeş Takası
 				Bangladeş takası
 				Bangladeş takası
+				BDT
 				৳
 			
 			
 				Belçika Frangı (konvertibl)
 				Belçika Frangı (konvertibl)
 				Belçika Frangı (konvertibl)
+				BEC
 			
 			
 				Belçika Frangı
 				Belçika Frangı
 				Belçika Frangı
+				BEF
 			
 			
 				Belçika Frangı (finansal)
 				Belçika Frangı (finansal)
 				Belçika Frangı (finansal)
+				BEL
 			
 			
 				Bulgar Levası (Hard)
 				Bulgar Levası (Hard)
 				Bulgar Levası (Hard)
+				BGL
 			
 			
 				Sosyalist Bulgaristan Levası
 				Sosyalist Bulgaristan levası
 				Sosyalist Bulgaristan levası
+				BGM
 			
 			
 				Bulgar Levası
 				Bulgar levası
 				Bulgar levası
+				BGN
 			
 			
 				Bulgar Levası (1879–1952)
 				Bulgar levası (1879–1952)
 				Bulgar levası (1879–1952)
+				BGO
 			
 			
 				Bahreyn Dinarı
 				Bahreyn dinarı
 				Bahreyn dinarı
+				BHD
 			
 			
 				Burundi Frangı
 				Burundi frangı
 				Burundi frangı
+				BIF
 			
 			
 				Bermuda Doları
 				Bermuda doları
 				Bermuda doları
+				BMD
 				$
 			
 			
 				Brunei Doları
 				Brunei doları
 				Brunei doları
+				BND
 				$
 			
 			
 				Bolivya Bolivyanosu
 				Bolivya bolivyanosu
 				Bolivya bolivyanosu
+				BOB
 				Bs
 			
 			
 				Bolivya Bolivyanosu (1863–1963)
 				Bolivya bolivyanosu (1863–1963)
 				Bolivya bolivyanosu (1863–1963)
+				BOL
 			
 			
 				Bolivya Pezosu
 				Bolivya Pezosu
 				Bolivya Pezosu
+				BOP
 			
 			
 				Bolivya Mvdolu
 				Bolivya Mvdolu
 				Bolivya Mvdolu
+				BOV
 			
 			
 				Yeni Brezilya Kruzeirosu (1967–1986)
 				Yeni Brezilya Kruzeirosu (1967–1986)
 				Yeni Brezilya Kruzeirosu (1967–1986)
+				BRB
 			
 			
 				Brezilya Kruzadosu
 				Brezilya Kruzadosu
 				Brezilya Kruzadosu
+				BRC
 			
 			
 				Brezilya Kruzeirosu (1990–1993)
 				Brezilya Kruzeirosu (1990–1993)
 				Brezilya Kruzeirosu (1990–1993)
+				BRE
 			
 			
 				Brezilya Reali
 				Brezilya reali
 				Brezilya reali
+				R$
 				R$
 			
 			
 				Yeni Brezilya Kruzadosu
 				Yeni Brezilya Kruzadosu
 				Yeni Brezilya Kruzadosu
+				BRN
 			
 			
 				Brezilya Kruzeirosu
 				Brezilya Kruzeirosu
 				Brezilya Kruzeirosu
+				BRR
 			
 			
 				Brezilya Kruzeirosu (1942–1967)
 				Brezilya kruzeirosu (1942–1967)
 				Brezilya kruzeirosu (1942–1967)
+				BRZ
 			
 			
 				Bahama Doları
 				Bahama doları
 				Bahama doları
+				BSD
 				$
 			
 			
-				Bhutan Ngultrumu
-				Bhutan ngultrumu
-				Bhutan ngultrumu
+				Butan Ngultrumu
+				Butan ngultrumu
+				Butan ngultrumu
+				BTN
 			
 			
 				Burma Kyatı
 				Burma Kyatı
 				Burma Kyatı
+				BUK
 			
 			
 				Botsvana Pulası
 				Botsvana pulası
 				Botsvana pulası
+				BWP
 				P
 			
 			
 				Yeni Beyaz Rusya Rublesi (1994–1999)
 				Yeni Beyaz Rusya Rublesi (1994–1999)
 				Yeni Beyaz Rusya Rublesi (1994–1999)
+				BYB
 			
 			
 				Belarus Rublesi
 				Belarus rublesi
 				Belarus rublesi
+				BYN
 				р.
 			
 			
 				Beyaz Rusya Rublesi (2000–2016)
 				Beyaz Rusya rublesi (2000–2016)
 				Beyaz Rusya rublesi (2000–2016)
+				BYR
 			
 			
 				Belize Doları
 				Belize doları
 				Belize doları
+				BZD
 				$
 			
 			
 				Kanada Doları
 				Kanada doları
 				Kanada doları
+				CA$
 				$
 			
 			
 				Kongo Frangı
 				Kongo frangı
 				Kongo frangı
+				CDF
 			
 			
 				WIR Avrosu
 				WIR Avrosu
 				WIR Avrosu
+				CHE
 			
 			
 				İsviçre Frangı
 				İsviçre frangı
 				İsviçre frangı
+				CHF
 			
 			
 				WIR Frangı
 				WIR Frangı
 				WIR Frangı
+				CHW
 			
 			
 				Şili Esküdosu
 				Şili esküdosu
 				Şili esküdosu
+				CLE
 			
 			
 				Şili Unidades de Fomento
 				Şili Unidades de Fomento
 				Şili Unidades de Fomento
+				CLF
 			
 			
 				Şili Pesosu
 				Şili pesosu
 				Şili pesosu
+				CLP
 				$
 			
 			
@@ -5861,82 +6123,97 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Çin Yuanı
 				Çin yuanı
 				Çin yuanı
+				CN¥
 				¥
 			
 			
 				Kolombiya Pesosu
 				Kolombiya pesosu
 				Kolombiya pesosu
+				COP
 				$
 			
 			
 				Unidad de Valor Real
 				Unidad de Valor Real
 				Unidad de Valor Real
+				COU
 			
 			
 				Kosta Rika Kolonu
 				Kosta Rika kolonu
 				Kosta Rika kolonu
+				CRC
 				₡
 			
 			
 				Eski Sırbistan Dinarı
 				Eski Sırbistan Dinarı
 				Eski Sırbistan Dinarı
+				CSD
 			
 			
 				Çekoslavak Korunası (Hard)
 				Çekoslavak Korunası (Hard)
 				Çekoslavak Korunası (Hard)
+				CSK
 			
 			
 				Konvertibl Küba Pesosu
 				Konvertibl Küba pesosu
 				Konvertibl Küba pesosu
+				CUC
 				$
 			
 			
 				Küba Pesosu
 				Küba pesosu
 				Küba pesosu
+				CUP
 				$
 			
 			
 				Cape Verde Esküdosu
 				Cape Verde esküdosu
 				Cape Verde esküdosu
+				CVE
 			
 			
 				Güney Kıbrıs Lirası
 				Güney Kıbrıs Lirası
 				Güney Kıbrıs Lirası
+				CYP
 			
 			
-				Çek Cumhuriyeti Korunası
-				Çek Cumhuriyeti korunası
-				Çek Cumhuriyeti korunası
+				Çek Korunası
+				Çek korunası
+				Çek korunası
+				CZK
 				Kč
 			
 			
 				Doğu Alman Markı
 				Doğu Alman Markı
 				Doğu Alman Markı
+				DDM
 			
 			
 				Alman Markı
 				Alman Markı
 				Alman Markı
+				DEM
 			
 			
 				Cibuti Frangı
 				Cibuti frangı
 				Cibuti frangı
+				DJF
 			
 			
 				Danimarka Kronu
 				Danimarka kronu
 				Danimarka kronu
+				DKK
 				kr
 			
 			
@@ -5950,96 +6227,115 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Cezayir Dinarı
 				Cezayir dinarı
 				Cezayir dinarı
+				DZD
 			
 			
 				Ekvador Sukresi
 				Ekvador Sukresi
 				Ekvador Sukresi
+				ECS
 			
 			
 				Ekvador Unidad de Valor Constante (UVC)
 				Ekvador Unidad de Valor Constante (UVC)
 				Ekvador Unidad de Valor Constante (UVC)
+				ECV
 			
 			
 				Estonya Krunu
 				Estonya Krunu
 				Estonya Krunu
+				EEK
 			
 			
 				Mısır Lirası
 				Mısır lirası
 				Mısır lirası
+				EGP
 				E£
 			
 			
 				Eritre Nakfası
 				Eritre nakfası
 				Eritre nakfası
+				ERN
 			
 			
 				İspanyol Pezetası (A hesabı)
 				İspanyol Pezetası (A hesabı)
 				İspanyol Pezetası (A hesabı)
+				ESA
 			
 			
 				İspanyol Pezetası (konvertibl hesap)
 				İspanyol Pezetası (konvertibl hesap)
 				İspanyol Pezetası (konvertibl hesap)
+				ESB
 			
 			
 				İspanyol Pezetası
 				İspanyol Pezetası
 				İspanyol Pezetası
+				ESP
+				₧
 			
 			
 				Etiyopya Birri
 				Etiyopya birri
 				Etiyopya birri
+				ETB
 			
 			
 				Euro
 				Euro
 				Euro
+				€
 				€
 			
 			
 				Fin Markkası
 				Fin Markkası
 				Fin Markkası
+				FIM
 			
 			
 				Fiji Doları
 				Fiji doları
 				Fiji doları
+				FJD
 				$
 			
 			
 				Falkland Adaları Lirası
 				Falkland Adaları lirası
 				Falkland Adaları lirası
+				FKP
 				£
 			
 			
 				Fransız Frangı
 				Fransız Frangı
 				Fransız Frangı
+				FRF
 			
 			
 				İngiliz Sterlini
 				İngiliz sterlini
 				İngiliz sterlini
+				£
 				£
 			
 			
 				Gürcistan Kupon Larisi
 				Gürcistan Kupon Larisi
 				Gürcistan Kupon Larisi
+				GEK
 			
 			
 				Gürcistan Larisi
 				Gürcistan larisi
 				Gürcistan larisi
+				GEL
 				₾
 				₾
 			
@@ -6050,22 +6346,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Gana Sedisi
 				Gana sedisi
 				Gana sedisi
+				GHS
 			
 			
 				Cebelitarık Lirası
 				Cebelitarık lirası
 				Cebelitarık lirası
+				GIP
 				£
 			
 			
 				Gambiya Dalasisi
 				Gambiya dalasisi
 				Gambiya dalasisi
+				GMD
 			
 			
 				Gine Frangı
 				Gine frangı
 				Gine frangı
+				GNF
 				FG
 			
 			
@@ -6078,11 +6378,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Yunan Drahmisi
 				Yunan Drahmisi
 				Yunan Drahmisi
+				GRD
 			
 			
 				Guatemala Quetzalı
 				Guatemala quetzalı
 				Guatemala quetzalı
+				GTQ
 				Q
 			
 			
@@ -6095,57 +6397,67 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Guyana Doları
 				Guyana doları
 				Guyana doları
+				GYD
 				$
 			
 			
 				Hong Kong Doları
 				Hong Kong doları
 				Hong Kong doları
+				HK$
 				$
 			
 			
 				Honduras Lempirası
 				Honduras lempirası
 				Honduras lempirası
+				HNL
 				L
 			
 			
 				Hırvatistan Dinarı
 				Hırvatistan Dinarı
 				Hırvatistan Dinarı
+				HRD
 			
 			
 				Hırvatistan Kunası
 				Hırvatistan kunası
 				Hırvatistan kunası
+				HRK
 				kn
 			
 			
 				Haiti Gurdu
 				Haiti gurdu
 				Haiti gurdu
+				HTG
 			
 			
 				Macar Forinti
 				Macar forinti
 				Macar forinti
+				HUF
 				Ft
 			
 			
-				Endonezya Rupiahı
-				Endonezya rupiahı
-				Endonezya rupiahı
+				Endonezya Rupisi
+				Endonezya rupisi
+				Endonezya rupisi
+				IDR
 				Rp
 			
 			
 				İrlanda Lirası
 				İrlanda Lirası
 				İrlanda Lirası
+				IEP
 			
 			
 				İsrail Lirası
 				İsrail Lirası
 				İsrail Lirası
+				ILP
 			
 			
 				İsrail Şekeli (1980–1985)
@@ -6156,23 +6468,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Yeni İsrail Şekeli
 				Yeni İsrail şekeli
 				Yeni İsrail şekeli
+				₪
 				₪
 			
 			
 				Hindistan Rupisi
 				Hindistan rupisi
 				Hindistan rupisi
+				₹
 				₹
 			
 			
 				Irak Dinarı
 				Irak dinarı
 				Irak dinarı
+				IQD
 			
 			
 				İran Riyali
 				İran riyali
 				İran riyali
+				IRR
 			
 			
 				İzlanda Kronu (1918–1981)
@@ -6183,23 +6499,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				İzlanda Kronu
 				İzlanda kronu
 				İzlanda kronu
+				ISK
 				kr
 			
 			
 				İtalyan Lireti
 				İtalyan Lireti
 				İtalyan Lireti
+				ITL
 			
 			
 				Jamaika Doları
 				Jamaika doları
 				Jamaika doları
+				JMD
 				$
 			
 			
 				Ürdün Dinarı
 				Ürdün dinarı
 				Ürdün dinarı
+				JOD
 			
 			
 				Japon Yeni
@@ -6212,134 +6532,159 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Kenya Şilini
 				Kenya şilini
 				Kenya şilini
+				KES
 			
 			
 				Kırgızistan Somu
 				Kırgızistan somu
 				Kırgızistan somu
+				KGS
 			
 			
 				Kamboçya Rieli
 				Kamboçya rieli
 				Kamboçya rieli
+				KHR
 				៛
 			
 			
 				Komorlar Frangı
 				Komorlar frangı
 				Komorlar frangı
+				KMF
 				CF
 			
 			
 				Kuzey Kore Wonu
 				Kuzey Kore wonu
 				Kuzey Kore wonu
+				KPW
 				₩
 			
 			
 				Güney Kore Hwanı (1953–1962)
 				Güney Kore hwanı (1953–1962)
 				Güney Kore hwanı (1953–1962)
+				KRH
 			
 			
 				Güney Kore Wonu (1945–1953)
 				Güney Kore wonu (1945–1953)
 				Güney Kore wonu (1945–1953)
+				KRO
 			
 			
 				Güney Kore Wonu
 				Güney Kore wonu
 				Güney Kore wonu
+				₩
 				₩
 			
 			
 				Kuveyt Dinarı
 				Kuveyt dinarı
 				Kuveyt dinarı
+				KWD
 			
 			
 				Cayman Adaları Doları
 				Cayman Adaları doları
 				Cayman Adaları doları
+				KYD
 				$
 			
 			
 				Kazakistan Tengesi
 				Kazakistan tengesi
 				Kazakistan tengesi
+				KZT
 				₸
 			
 			
 				Laos Kipi
 				Laos kipi
 				Laos kipi
+				LAK
 				₭
 			
 			
 				Lübnan Lirası
 				Lübnan lirası
 				Lübnan lirası
+				LBP
 				L£
 			
 			
 				Sri Lanka Rupisi
 				Sri Lanka rupisi
 				Sri Lanka rupisi
+				LKR
 				Rs
 			
 			
 				Liberya Doları
 				Liberya doları
 				Liberya doları
+				LRD
 				$
 			
 			
 				Lesotho Lotisi
+				LSL
 			
 			
 				Litvanya Litası
 				Litvanya litası
 				Litvanya litası
+				LTL
 			
 			
 				Litvanya Talonu
 				Litvanya Talonu
 				Litvanya Talonu
+				LTT
 			
 			
 				Konvertibl Lüksemburg Frangı
 				Konvertibl Lüksemburg Frangı
 				Konvertibl Lüksemburg Frangı
+				LUC
 			
 			
 				Lüksemburg Frangı
 				Lüksemburg Frangı
 				Lüksemburg Frangı
+				LUF
 			
 			
 				Finansal Lüksemburg Frangı
 				Finansal Lüksemburg Frangı
 				Finansal Lüksemburg Frangı
+				LUL
 			
 			
 				Letonya Latı
 				Letonya latı
 				Letonya latı
+				LVL
 			
 			
 				Letonya Rublesi
 				Letonya Rublesi
 				Letonya Rublesi
+				LVR
 			
 			
 				Libya Dinarı
 				Libya dinarı
 				Libya dinarı
+				LYD
 			
 			
 				Fas Dirhemi
 				Fas dirhemi
 				Fas dirhemi
+				MAD
 			
 			
 				Fas Frangı
@@ -6348,21 +6693,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Monako Frangı
 				Monako frangı
 				Monako frangı
+				MCF
 			
 			
 				Moldova Kuponu
 				Moldova kuponu
 				Moldova kuponu
+				MDC
 			
 			
 				Moldova Leyi
 				Moldova leyi
 				Moldova leyi
+				MDL
 			
 			
 				Madagaskar Ariarisi
 				Madagaskar ariarisi
 				Madagaskar ariarisi
+				MGA
 				Ar
 			
 			
@@ -6372,11 +6721,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Makedonya Dinarı
 				Makedonya dinarı
 				Makedonya dinarı
+				MKD
 			
 			
 				Makedonya Dinarı (1992–1993)
 				Makedonya dinarı (1992–1993)
 				Makedonya dinarı (1992–1993)
+				MKN
 			
 			
 				Mali Frangı
@@ -6385,43 +6736,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Myanmar Kyatı
 				Myanmar kyatı
 				Myanmar kyatı
+				MMK
 				K
 			
 			
 				Moğolistan Tugriki
 				Moğolistan tugriki
 				Moğolistan tugriki
+				MNT
 				₮
 			
 			
 				Makao Patakası
 				Makao patakası
 				Makao patakası
+				MOP
 			
 			
 				Moritanya Ugiyası (1973–2017)
 				Moritanya ugiyası (1973–2017)
 				Moritanya ugiyası (1973–2017)
+				MRO
 			
 			
 				Moritanya Ugiyası
 				Moritanya ugiyası
 				Moritanya ugiyası
+				MRU
 			
 			
 				Malta Lirası
 				Malta Lirası
 				Malta Lirası
+				MTL
 			
 			
 				Malta Sterlini
 				Malta Sterlini
 				Malta Sterlini
+				MTP
 			
 			
 				Mauritius Rupisi
 				Mauritius rupisi
 				Mauritius rupisi
+				MUR
 				Rs
 			
 			
@@ -6433,32 +6792,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Maldiv Rufiyaası
 				Maldiv rufiyaası
 				Maldiv rufiyaası
+				MVR
 			
 			
 				Malavi Kvaçası
 				Malavi kvaçası
 				Malavi kvaçası
+				MWK
 			
 			
 				Meksika Pesosu
 				Meksika pesosu
 				Meksika pesosu
+				MX$
 				$
 			
 			
 				Gümüş Meksika Pezosu (1861–1992)
 				Gümüş Meksika Pezosu (1861–1992)
 				Gümüş Meksika Pezosu (1861–1992)
+				MXP
 			
 			
 				Meksika Unidad de Inversion (UDI)
 				Meksika Unidad de Inversion (UDI)
 				Meksika Unidad de Inversion (UDI)
+				MXV
 			
 			
 				Malezya Ringgiti
 				Malezya ringgiti
 				Malezya ringgiti
+				MYR
 				RM
 			
 			
@@ -6471,121 +6836,143 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Mozambik Metikali
 				Mozambik metikali
 				Mozambik metikali
+				MZN
 			
 			
 				Namibya Doları
 				Namibya doları
 				Namibya doları
+				NAD
 				$
 			
 			
 				Nijerya Nairası
 				Nijerya nairası
 				Nijerya nairası
+				NGN
 				₦
 			
 			
 				Nikaragua Kordobası (1988–1991)
 				Nikaragua Kordobası (1988–1991)
 				Nikaragua Kordobası (1988–1991)
+				NIC
 			
 			
 				Nikaragua Kordobası
 				Nikaragua kordobası
 				Nikaragua kordobası
+				NIO
 				C$
 			
 			
 				Hollanda Florini
 				Hollanda Florini
 				Hollanda Florini
+				NLG
 			
 			
 				Norveç Kronu
 				Norveç kronu
 				Norveç kronu
+				NOK
 				kr
 			
 			
 				Nepal Rupisi
 				Nepal rupisi
 				Nepal rupisi
+				NPR
 				Rs
 			
 			
 				Yeni Zelanda Doları
 				Yeni Zelanda doları
 				Yeni Zelanda doları
+				NZ$
 				$
 			
 			
 				Umman Riyali
 				Umman riyali
 				Umman riyali
+				OMR
 			
 			
 				Panama Balboası
 				Panama balboası
 				Panama balboası
+				PAB
 			
 			
 				Peru İnti
 				Peru İnti
 				Peru İnti
+				PEI
 			
 			
 				Peru Solü
 				Peru solü
 				Peru solü
+				PEN
 			
 			
 				Peru Solü (1863–1965)
 				Peru Solü (1863–1965)
 				Peru Solü (1863–1965)
+				PES
 			
 			
 				Papua Yeni Gine Kinası
 				Papua Yeni Gine kinası
 				Papua Yeni Gine kinası
+				PGK
 			
 			
 				Filipinler Pesosu
 				Filipinler pesosu
 				Filipinler pesosu
+				PHP
 				₱
 			
 			
 				Pakistan Rupisi
 				Pakistan rupisi
 				Pakistan rupisi
+				PKR
 				Rs
 			
 			
 				Polonya Zlotisi
 				Polonya zlotisi
 				Polonya zlotisi
+				PLN
 				zł
 			
 			
 				Polonya Zlotisi (1950–1995)
 				Polonya Zlotisi (1950–1995)
 				Polonya Zlotisi (1950–1995)
+				PLZ
 			
 			
 				Portekiz Esküdosu
 				Portekiz Esküdosu
 				Portekiz Esküdosu
+				PTE
 			
 			
 				Paraguay Guaranisi
 				Paraguay guaranisi
 				Paraguay guaranisi
+				PYG
 				₲
 			
 			
 				Katar Riyali
 				Katar riyali
 				Katar riyali
+				QAR
 			
 			
 				Rodezya Doları
@@ -6594,50 +6981,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Eski Romen Leyi
 				Eski Romen Leyi
 				Eski Romen Leyi
+				ROL
 			
 			
 				Romen Leyi
 				Romen leyi
 				Romen leyi
+				RON
 				L
 			
 			
 				Sırp Dinarı
 				Sırp dinarı
 				Sırp dinarı
+				RSD
 			
 			
 				Rus Rublesi
 				Rus rublesi
 				Rus rublesi
+				RUB
 				₽
 			
 			
 				Rus Rublesi (1991–1998)
 				Rus Rublesi (1991–1998)
 				Rus Rublesi (1991–1998)
+				RUR
+				р.
 			
 			
 				Ruanda Frangı
 				Ruanda frangı
 				Ruanda frangı
+				RWF
 				RF
 			
 			
 				Suudi Arabistan Riyali
 				Suudi Arabistan riyali
 				Suudi Arabistan riyali
+				SAR
 			
 			
 				Solomon Adaları Doları
 				Solomon Adaları doları
 				Solomon Adaları doları
+				SBD
 				$
 			
 			
 				Seyşeller Rupisi
 				Seyşeller rupisi
 				Seyşeller rupisi
+				SCR
 			
 			
 				Eski Sudan Dinarı
@@ -6646,6 +7043,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Sudan Lirası
 				Sudan lirası
 				Sudan lirası
+				SDG
 			
 			
 				Eski Sudan Lirası
@@ -6654,88 +7052,104 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				İsveç Kronu
 				İsveç kronu
 				İsveç kronu
+				SEK
 				kr
 			
 			
 				Singapur Doları
 				Singapur doları
 				Singapur doları
+				SGD
 				$
 			
 			
 				Saint Helena Lirası
 				Saint Helena lirası
 				Saint Helena lirası
+				SHP
 				£
 			
 			
 				Slovenya Toları
 				Slovenya Toları
 				Slovenya Toları
+				SIT
 			
 			
 				Slovak Korunası
 				Slovak Korunası
 				Slovak Korunası
+				SKK
 			
 			
 				Sierra Leone Leonesi
 				Sierra Leone leonesi
 				Sierra Leone leonesi
+				SLL
 			
 			
 				Somali Şilini
 				Somali şilini
 				Somali şilini
+				SOS
 			
 			
 				Surinam Doları
 				Surinam doları
 				Surinam doları
+				SRD
 				$
 			
 			
 				Surinam Guldeni
 				Surinam Guldeni
 				Surinam Guldeni
+				SRG
 			
 			
 				Güney Sudan Lirası
 				Güney Sudan lirası
 				Güney Sudan lirası
+				SSP
 				£
 			
 			
 				São Tomé ve Príncipe Dobrası (1977–2017)
 				São Tomé ve Príncipe dobrası (1977–2017)
 				São Tomé ve Príncipe dobrası (1977–2017)
+				STD
 			
 			
-				São Tomé ve Príncipe Dobrası
-				São Tomé ve Príncipe dobrası
-				São Tomé ve Príncipe dobrası
+				Sao Tome ve Principe Dobrası
+				Sao Tome ve Principe dobrası
+				Sao Tome ve Principe dobrası
 				STN
+				Db
 			
 			
 				Sovyet Rublesi
 				Sovyet Rublesi
 				Sovyet Rublesi
+				SUR
 			
 			
 				El Salvador Kolonu
 				El Salvador Kolonu
 				El Salvador Kolonu
+				SVC
 			
 			
 				Suriye Lirası
 				Suriye lirası
 				Suriye lirası
+				SYP
 				£
 			
 			
 				Svaziland Lilangenisi
 				Svaziland lilangenisi
 				Svaziland lilangenisi
+				SZL
 			
 			
 				Tayland Bahtı
@@ -6748,42 +7162,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Tacikistan Rublesi
 				Tacikistan Rublesi
 				Tacikistan Rublesi
+				TJR
 			
 			
 				Tacikistan Somonisi
 				Tacikistan somonisi
 				Tacikistan somonisi
+				TJS
 			
 			
 				Türkmenistan Manatı (1993–2009)
 				Türkmenistan Manatı (1993–2009)
 				Türkmenistan Manatı (1993–2009)
+				TMM
 			
 			
 				Türkmenistan Manatı
 				Türkmenistan manatı
 				Türkmenistan manatı
+				TMT
 			
 			
 				Tunus Dinarı
 				Tunus dinarı
 				Tunus dinarı
+				TND
 			
 			
 				Tonga Paʻangası
 				Tonga paʻangası
 				Tonga paʻangası
+				TOP
 				T$
 			
 			
 				Timor Esküdosu
 				Timor Esküdosu
 				Timor Esküdosu
+				TPE
 			
 			
 				Eski Türk Lirası
 				Eski Türk Lirası
 				Eski Türk Lirası
+				TRL
 			
 			
 				¤#,##0.00
@@ -6798,29 +7220,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Trinidad ve Tobago Doları
 				Trinidad ve Tobago doları
 				Trinidad ve Tobago doları
+				TTD
 				$
 			
 			
 				Yeni Tayvan Doları
 				Yeni Tayvan doları
 				Yeni Tayvan doları
+				NT$
 				NT$
 			
 			
 				Tanzanya Şilini
 				Tanzanya şilini
 				Tanzanya şilini
+				TZS
 			
 			
 				Ukrayna Grivnası
 				Ukrayna grivnası
 				Ukrayna grivnası
+				UAH
 				₴
 			
 			
 				Ukrayna Karbovanetz
 				Ukrayna Karbovanetz
 				Ukrayna Karbovanetz
+				UAK
 			
 			
 				Uganda Şilini (1966–1987)
@@ -6829,6 +7256,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Uganda Şilini
 				Uganda şilini
 				Uganda şilini
+				UGX
 			
 			
 				ABD Doları
@@ -6841,42 +7269,50 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ABD Doları (Ertesi gün)
 				ABD Doları (Ertesi gün)
 				ABD Doları (Ertesi gün)
+				USN
 			
 			
 				ABD Doları (Aynı gün)
 				ABD Doları (Aynı gün)
 				ABD Doları (Aynı gün)
+				USS
 			
 			
 				Uruguay Peso en Unidades Indexadas
 				Uruguay Peso en Unidades Indexadas
 				Uruguay Peso en Unidades Indexadas
+				UYI
 			
 			
 				Uruguay Pezosu (1975–1993)
 				Uruguay Pezosu (1975–1993)
 				Uruguay Pezosu (1975–1993)
+				UYP
 			
 			
 				Uruguay Pesosu
 				Uruguay pesosu
 				Uruguay pesosu
+				UYU
 				$
 			
 			
 				Özbekistan Somu
 				Özbekistan somu
 				Özbekistan somu
+				UZS
 			
 			
 				Venezuela Bolivarı (1871–2008)
 				Venezuela Bolivarı (1871–2008)
 				Venezuela Bolivarı (1871–2008)
+				VEB
 			
 			
 				Venezuela Bolivarı (2008–2018)
 				Venezuela bolivarı (2008–2018)
 				Venezuela bolivarı (2008–2018)
+				VEF
 				Bs
 			
 			
@@ -6889,37 +7325,44 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Vietnam Dongu
 				Vietnam dongu
 				Vietnam dongu
+				₫
 				₫
 			
 			
 				Vietnam Dongu (1978–1985)
 				Vietnam dongu (1978–1985)
 				Vietnam dongu (1978–1985)
+				VNN
 			
 			
 				Vanuatu Vatusu
 				Vanuatu vatusu
 				Vanuatu vatusu
+				VUV
 			
 			
 				Samoa Talası
 				Samoa talası
 				Samoa talası
+				WST
 			
 			
-				CFA Frangı BEAC
-				CFA frangı BEAC
-				CFA frangı BEAC
+				Orta Afrika CFA Frangı
+				Orta Afrika CFA frangı
+				Orta Afrika CFA frangı
+				FCFA
 			
 			
 				Gümüş
 				Gümüş
 				Gümüş
+				XAG
 			
 			
 				Altın
 				Altın
 				Altın
+				XAU
 			
 			
 				Birleşik Avrupa Birimi
@@ -6937,6 +7380,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Doğu Karayip Doları
 				Doğu Karayip doları
 				Doğu Karayip doları
+				EC$
 				$
 			
 			
@@ -6946,6 +7390,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Avrupa Para Birimi
 				Avrupa Para Birimi
 				Avrupa Para Birimi
+				XEU
 			
 			
 				Fransız Altın Frangı
@@ -6954,9 +7399,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Fransız UIC-Frangı
 			
 			
-				CFA Frangı BCEAO
-				CFA frangı BCEAO
-				CFA frangı BCEAO
+				Batı Afrika CFA Frangı
+				Batı Afrika CFA frangı
+				Batı Afrika CFA frangı
+				CFA
 			
 			
 				Paladyum
@@ -6965,29 +7411,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				CFP Frangı
 				CFP frangı
 				CFP frangı
+				CFPF
 			
 			
 				Platin
+				XPT
 			
 			
 				RINET Fonları
 				RINET Fonları
 				RINET Fonları
+				XRE
 			
 			
 				Sucre
 				Sucre
 				Sucre
+				XSU
 			
 			
 				Test Para Birimi Kodu
 				Test Para Birimi Kodu
 				Test Para Birimi Kodu
+				XTS
 			
 			
 				ADB Hesap Birimi
 				ADB hesap birimi
 				ADB hesap birimi
+				XUA
 			
 			
 				Bilinmeyen Para Birimi
@@ -6998,31 +7450,37 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Yemen Dinarı
 				Yemen Dinarı
 				Yemen Dinarı
+				YDD
 			
 			
 				Yemen Riyali
 				Yemen riyali
 				Yemen riyali
+				YER
 			
 			
 				Yugoslav Dinarı (Hard)
 				Yugoslav Dinarı (Hard)
 				Yugoslav Dinarı (Hard)
+				YUD
 			
 			
 				Yeni Yugoslav Dinarı
 				Yeni Yugoslav Dinarı
 				Yeni Yugoslav Dinarı
+				YUM
 			
 			
 				Konvertibl Yugoslav Dinarı
 				Konvertibl Yugoslav Dinarı
 				Konvertibl Yugoslav Dinarı
+				YUN
 			
 			
 				İyileştirilmiş Yugoslav Dinarı (1992–1993)
 				İyileştirilmiş Yugoslav dinarı (1992–1993)
 				İyileştirilmiş Yugoslav dinarı (1992–1993)
+				YUR
 			
 			
 				Güney Afrika Randı (finansal)
@@ -7031,15 +7489,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Güney Afrika Randı
 				Güney Afrika randı
 				Güney Afrika randı
+				ZAR
 				R
 			
 			
 				Zambiya Kvaçası (1968–2012)
+				ZMK
 			
 			
 				Zambiya Kvaçası
 				Zambiya kvaçası
 				Zambiya kvaçası
+				ZMW
 				ZK
 			
 			
@@ -7058,6 +7519,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Zimbabve Doları (2008)
 				Zimbabve doları (2008)
 				Zimbabve doları (2008)
+				ZWR
 			
 		
 		
@@ -7188,25 +7650,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} parça/milyon
 			
 			
-				yüzde
-				yüzde {0}
-				yüzde {0}
+				yüzde
+				yüzde {0}
+				yüzde {0}
 			
 			
-				binde
-				binde {0}
-				binde {0}
+				binde
+				binde {0}
+				binde {0}
 			
 			
 				onbinde
 				onbinde {0}
 				onbinde {0}
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				litre/kilometre
 				{0} litre/kilometre
@@ -7265,7 +7722,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				kilobayt
 				{0} kilobayt
-				{0} kilobyte
+				{0} kilobayt
 			
 			
 				kilobit
@@ -7287,6 +7744,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} yüzyıl
 				{0} yüzyıl
 			
+			
+				on yıl
+				{0} on yıl
+				{0} on yıl
+			
 			
 				yıl
 				{0} yıl
@@ -7404,6 +7866,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} İngiliz ısı birimi
 				{0} İngiliz ısı birimi
 			
+			
+				ABD ısı birimi
+				{0} ABD ısı birimi
+				{0} ABD ısı birimi
+			
 			
 				pound kuvvet
 				{0} pound kuvvet
@@ -7434,6 +7901,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hertz
 				{0} hertz
 			
+			
+				tipografik em
+			
+			
+				piksel
+				{0} piksel
+				{0} piksel
+			
+			
+				megapiksel
+				{0} megapiksel
+				{0} megapiksel
+			
+			
+				piksel/santimetre
+				{0} piksel/santimetre
+				{0} piksel/santimetre
+			
+			
+				piksel/inç
+				{0} piksel/inç
+				{0} piksel/inç
+			
+			
+				nokta/santimetre
+				{0} nokta/santimetre
+				{0} nokta/santimetre
+			
+			
+				nokta/inç
+				{0} nokta/inç
+				{0} nokta/inç
+			
 			
 				kilometre
 				{0} kilometre
@@ -7658,11 +8158,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} beygir gücü
 				{0} beygir gücü
 			
-			
-				hektopaskal
-				{0} hektopaskal
-				{0} hektopaskal
-			
 			
 				milimetre cıva
 				{0} milimetre cıva
@@ -7688,6 +8183,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfer
 				{0} atmosfer
 			
+			
+				paskal
+				{0} paskal
+				{0} paskal
+			
+			
+				hektopaskal
+				{0} hektopaskal
+				{0} hektopaskal
+			
 			
 				kilopaskal
 				{0} kilopaskal
@@ -7817,14 +8322,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mililitre
 			
 			
-				mpt
+				metrik pint
 				{0} metrik pint
 				{0} metrik pint
 			
 			
-				mcup
-				{0} mc
-				{0} mc
+				metrik su bardağı
+				{0} metrik su bardağı
+				{0} metrik su bardağı
 			
 			
 				akre fit
@@ -7996,42 +8501,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ayar
 			
 			
-				mg/dL
-				{0} mg/dL
-				{0} mg/dL
+				mg/dl
+				{0} mg/dl
+				{0} mg/dl
 			
 			
-				mmol/L
-				{0} mmol/L
-				{0} mmol/L
+				mmol/l
+				{0} mmol/l
+				{0} mmol/l
 			
 			
 				ppm
 				{0} ppm
 				{0} ppm
 			
+			
+				%
+				%{0}
+				%{0}
+			
+			
+				‰
+				‰{0}
+				‰{0}
+			
 			
 				onbinde
 				‱{0}
 				‱{0}
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				l/km
 				{0} l/km
 				{0} l/km
 			
 			
-				L/100km
-				{0} L/100km
-				{0} L/100km
+				l/100 km
+				{0} l/100 km
+				{0} l/100 km
 			
 			
-				mil/galon
+				mil/gal
 				{0} mpg
 				{0} mpg
 			
@@ -8100,6 +8610,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} yy
 				{0} yy
 			
+			
+				on yıl
+				{0} on yıl
+				{0} on yıl
+			
 			
 				yıl
 				{0} yıl
@@ -8217,15 +8732,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Btu
 				{0} Btu
 			
+			
+				ABD ısı birimi
+				{0} ABD ısı birimi
+				{0} ABD ısı birimi
+			
 			
 				pound kuvvet
-				{0} lbf
-				{0} lbf
+				{0} lbf
+				{0} lbf
 			
 			
 				newton
-				{0} N
-				{0} N
 			
 			
 				GHz
@@ -8247,6 +8765,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				piksel
+			
+			
+				megapiksel
+			
 			
 				km
 				{0} km
@@ -8329,6 +8853,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				furlong
+				{0} fur
+				{0} fur
 			
 			
 				fathom
@@ -8399,6 +8925,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				stone
+				{0} st
+				{0} st
 			
 			
 				libre
@@ -8467,11 +8995,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} bg
 				{0} bg
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -8497,6 +9020,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -8631,9 +9159,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mpt
 			
 			
-				mcup
-				{0} mc
-				{0} mc
+				msub
+				{0} msb
+				{0} msb
 			
 			
 				akre fit
@@ -8642,11 +9170,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				buşel
+				{0} bu
+				{0} bu
 			
 			
-				galon
-				{0} galon
-				{0} galon
+				gal
+				{0} gal
+				{0} gal
 				{0}/gal
 			
 			
@@ -8656,9 +9186,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/İng. gal
 			
 			
-				quart
-				{0} quart
-				{0} quart
+				{0} qt
+				{0} qt
 			
 			
 				pint
@@ -8722,52 +9251,162 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} dev
 				{0} dev
 			
+			
+				{0} rad
+				{0} rad
+			
+			
+				{0}°
+				{0}°
+			
 			
 				açısal dk.
 			
 			
 				açısal sn.
 			
+			
+				km²
+				{0} km²
+				{0} km²
+				{0}/km²
+			
 			
 				hektar
+				{0} ha
+				{0} ha
+			
+			
+				m²
+				{0} m²
+				{0} m²
+				{0}/m²
+			
+			
+				cm²
+				{0} cm²
+				{0} cm²
+				{0}/cm²
+			
+			
+				mi²
+				{0} mi²
+				{0} mi²
+				{0}/mi²
 			
 			
 				akre
+				{0} ac
+				{0} ac
+			
+			
+				yd²
+				{0} yd²
+				{0} yd²
+			
+			
+				ft²
+				{0} ft²
+				{0} ft²
+			
+			
+				in²
+				{0} in²
+				{0} in²
+				{0}/in²
 			
 			
 				ayar
 				{0} ayar
 				{0} ayar
 			
+			
+				mg/dL
+				{0} mg/dL
+				{0} mg/dL
+			
+			
+				mmol/L
+				{0} mmol/L
+				{0} mmol/L
+			
+			
+				ppm
+				{0} ppm
+				{0} ppm
+			
+			
+				%
+				%{0}
+				%{0}
+			
+			
+				‰
+				{0}‰
+				{0}‰
+			
 			
 				l/km
 				{0} l/km
 				{0} l/km
 			
 			
-				L/100km
-				{0} L/100km
-				{0} L/100km
+				l/100km
+				{0} l/100km
+				{0} l/100km
 			
 			
 				{0} mpg
 				{0} mpg
 			
+			
+				TB
+				{0} TB
+				{0} TB
+			
 			
 				Tbit
+				{0} Tb
+				{0} Tb
+			
+			
+				GB
+				{0} GB
+				{0} GB
 			
 			
 				Gbit
+				{0} Gb
+				{0} Gb
+			
+			
+				MB
+				{0} MB
+				{0} MB
 			
 			
 				Mbit
+				{0} Mb
+				{0} Mb
+			
+			
+				kB
+				{0} kB
+				{0} kB
 			
 			
 				kbit
+				{0} kb
+				{0} kb
 			
 			
 				bayt
 			
+			
+				bit
+				{0} bit
+				{0} bit
+			
 			
 				yy
 				{0} yy
@@ -8777,6 +9416,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				yıl
 				{0}y
 				{0}y
+				{0}/y
 			
 			
 				ay
@@ -8831,51 +9471,135 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				amper
+				{0} A
+				{0} A
 			
 			
 				miliamper
+				{0} mA
+				{0} mA
+			
+			
+				ohm
+				{0} Ω
+				{0} Ω
+			
+			
+				volt
+				{0} V
+				{0} V
+			
+			
+				{0} kcal
+				{0} kcal
+			
+			
+				{0} cal
+				{0} cal
 			
 			
 				{0} kcal
 				{0} kcal
 			
+			
+				{0} kJ
+				{0} kJ
+			
+			
+				{0} J
+				{0} J
+			
+			
+				{0} kWh
+				{0} kWh
+			
+			
+				GHz
+				{0} GHz
+				{0} GHz
+			
+			
+				MHz
+				{0} MHz
+				{0} MHz
+			
+			
+				kHz
+				{0} kHz
+				{0} kHz
+			
+			
+				Hz
+				{0} Hz
+				{0} Hz
+			
 			
 				km
 				{0} km
 				{0} km
+				{0}/km
 			
 			
 				metre
 				{0} m
 				{0} m
+				{0}/m
+			
+			
+				dm
+				{0} dm
+				{0} dm
 			
 			
 				cm
 				{0} cm
 				{0} cm
+				{0}/cm
 			
 			
 				mm
 				{0} mm
 				{0} mm
 			
+			
+				{0} µm
+				{0} µm
+			
+			
+				nm
+				{0} nm
+				{0} nm
+			
+			
+				pm
+				{0} pm
+				{0} pm
+			
 			
 				mil
 				{0} mil
 				{0} mil
 			
+			
+				{0} yd
+				{0} yd
+			
 			
 				fit
 				{0}′
 				{0}′
+				{0}/ft
 			
 			
 				inç
 				{0}″
 				{0}″
+				{0}/in
 			
 			
 				parsek
+				{0} pc
+				{0} pc
 			
 			
 				Iy
@@ -8889,26 +9613,59 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				furlong
+				{0} fur
+				{0} fur
 			
 			
 				fathom
 				{0} fth
 				{0} fth
 			
+			
+				nmi
+				{0} nmi
+				{0} nmi
+			
+			
+				smi
+				{0} smi
+				{0} smi
+			
+			
+				{0} pt
+				{0} pt
+			
 			
 				lüks
 				{0} lüks
 				{0} lüks
 			
+			
+				t
+				{0} t
+				{0} t
+			
 			
 				kg
 				{0} kg
 				{0} kg
+				{0}/kg
 			
 			
 				gram
 				{0} g
 				{0} g
+				{0}/g
+			
+			
+				mg
+				{0} mg
+				{0} mg
+			
+			
+				µg
+				{0} µg
+				{0} µg
 			
 			
 				Amerikan tonu
@@ -8917,28 +9674,79 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				stone
+				{0} st
+				{0} st
+			
+			
+				{0} lb
+				{0} lb
+				{0}/lb
+			
+			
+				oz
+				{0} oz
+				{0} oz
+				{0}/oz
 			
 			
 				troy ons
+				{0} oz t
+				{0} oz t
 			
 			
 				karat
 				{0} ct
 				{0} ct
 			
+			
+				{0} GW
+				{0} GW
+			
+			
+				{0} MW
+				{0} MW
+			
+			
+				{0} kW
+				{0} kW
+			
+			
+				{0} W
+				{0} W
+			
+			
+				{0} mW
+				{0} mW
+			
+			
+				{0} bg
+				{0} bg
+			
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
 			
 				lb/in²
 				{0} lb/in²
 				{0} lb/in²
 			
 			
+				inHg
 				{0}" Hg
 				{0}" Hg
 			
 			
+				mbar
 				{0} mb
 				{0} mb
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				km/sa
 				{0} km/sa
@@ -8954,15 +9762,47 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mil/sa
 				{0} mil/sa
 			
+			
+				kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				°C
 				{0}°C
 				{0}°C
 			
+			
+				°F
+				{0}°F
+				{0}°F
+			
 			
+				K
 				{0}°K
 				{0}°K
 			
+			
+				{0} km³
+				{0} km³
+			
+			
+				{0} m³
+				{0} m³
+			
+			
+				{0} cm³
+				{0} cm³
+			
+			
+				{0} mil³
+				{0} mil³
+			
 			
 				{0} yarda³
 				{0} yarda³
@@ -9007,6 +9847,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				buşel
+				{0} bu
+				{0} bu
 			
 			
 				{0} galon
@@ -9068,8 +9910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} veya {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
diff --git a/make/data/cldr/common/main/tr_CY.xml b/make/data/cldr/common/main/tr_CY.xml
index dcc2bb70aa5..4f0c2dcd158 100644
--- a/make/data/cldr/common/main/tr_CY.xml
+++ b/make/data/cldr/common/main/tr_CY.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/tr_TR.xml b/make/data/cldr/common/main/tr_TR.xml
index df4faf2ef39..31a4b2f8183 100644
--- a/make/data/cldr/common/main/tr_TR.xml
+++ b/make/data/cldr/common/main/tr_TR.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/tt.xml b/make/data/cldr/common/main/tt.xml
index 41ac8772c51..e67df2ee093 100644
--- a/make/data/cldr/common/main/tt.xml
+++ b/make/data/cldr/common/main/tt.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -42,14 +42,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			уэльс
 			дания
 			алман
+			югары алман (Швейцария)
 			түбән сорб
 			мальдив
 			дзонг-кха
 			грек
 			инглиз
+			Британия инглизчәсе
+			инглиз (Берләшкән Корольлек)
+			Америка инглизчәсе
+			инглиз (АКШ)
 			эсперанто
 			испан
 			испан (Латин Америкасы)
+			испан (Европа)
 			эстон
 			баск
 			фарсы
@@ -121,6 +127,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			поляк
 			пушту
 			португал
+			португал (Европа)
 			кечуа
 			киче
 			ретороман
@@ -165,8 +172,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			идиш
 			йоруба
 			кытай (тәрҗемә киңәше: аерым алганда, мандарин кытайчасы)
+			мандарин кытайчасы
 			гадиләштерелгән кытай
+			гадиләштерелгән мандарин кытайчасы
 			традицион кытай
+			традицион мандарин кытайчасы
 		
 		
 			
@@ -253,7 +263,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Фарер утраулары
 			Франция
 			Габон
-			Бөекбритания
+			Берләшкән Корольлек
 			Гренада
 			Грузия
 			Француз Гвианасы
@@ -443,8 +453,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
-		[а ә б в г д е ё ж җ з и й к л м н о ө п р с т у ү ф х һ ц ч ш щ ъ ы ь э ю я]
-		[А Ә Б В Г Д Е Ж Җ З И Й К Л М Н О Ө П Р С Т У Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]
+		[а ә б в г д е ё ж җ з и й к л м н ң о ө п р с т у ү ф х һ ц ч ш щ ъ ы ь э ю я]
+		[ғ қ]
+		[А Ә Б В Г Д Е Ё Ж Җ З И Й К Л М Н Ң О Ө П Р С Т У Ү Ф Х Һ Ц Ч Ш Щ Ъ Ы Ь Э Ю Я]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # ′ ″]
 	
 	
 		“
@@ -751,7 +763,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						б.э.к.
-						б.э.
+						б.э.к.
+						милади
+						б.э.
 					
 				
 				
diff --git a/make/data/cldr/common/main/tt_RU.xml b/make/data/cldr/common/main/tt_RU.xml
index d699f0cdc2b..9568e191952 100644
--- a/make/data/cldr/common/main/tt_RU.xml
+++ b/make/data/cldr/common/main/tt_RU.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/twq.xml b/make/data/cldr/common/main/twq.xml
index 92e3211793d..894c19de2e5 100644
--- a/make/data/cldr/common/main/twq.xml
+++ b/make/data/cldr/common/main/twq.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldovi
 			Madagascar
 			Maršal gungey
-			Maacedooni
 			Maali
 			Maynamar
 			Mongooli
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ã b c d e ẽ f g h i j k l m n ɲ ŋ o õ p q r s š t u w x y z ž]
 		[v]
 		[A B C D E F G H I J K L M N O P Q R S T U W X Y Z]
-		[  \- . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/twq_NE.xml b/make/data/cldr/common/main/twq_NE.xml
index 58d5fe94fb7..0ab2bcfb812 100644
--- a/make/data/cldr/common/main/twq_NE.xml
+++ b/make/data/cldr/common/main/twq_NE.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/tzm.xml b/make/data/cldr/common/main/tzm.xml
index 76d0dae3c87..912f1e7bbf0 100644
--- a/make/data/cldr/common/main/tzm.xml
+++ b/make/data/cldr/common/main/tzm.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Mulḍavya
 			Madaɣacqar
 			Tigzirin n Marcal
-			Maqdunya
 			Mali
 			Myanmar
 			Manɣulya
@@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a b c d ḍ e ɛ f g {gʷ} ɣ h ḥ i j k {kʷ} l m n q r ṛ s ṣ t ṭ u w x y z]
 		[o p v]
 		[A B C D Ḍ E Ɛ F G Ɣ H Ḥ I J K L M N Q R Ṛ S Ṣ T Ṭ U W X Y Z]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		“
diff --git a/make/data/cldr/common/main/tzm_MA.xml b/make/data/cldr/common/main/tzm_MA.xml
index 6659ed606e8..9c6d14b10ad 100644
--- a/make/data/cldr/common/main/tzm_MA.xml
+++ b/make/data/cldr/common/main/tzm_MA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ug.xml b/make/data/cldr/common/main/ug.xml
index d433208d575..fd43852cf85 100644
--- a/make/data/cldr/common/main/ug.xml
+++ b/make/data/cldr/common/main/ug.xml
@@ -9,7 +9,7 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 -->
 
 	
-		
+		
 		
 	
 	
@@ -1157,7 +1157,7 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 		[{ئا} {ئه} {ئو} {ئۇ} {ئۆ} {ئۈ} {ئې} {ئى} ا ە ب پ ت ج چ خ د ر ز ژ س ش غ ف ق ك گ ڭ ل م ن ھ و ۇ ۆ ۈ ۋ ې ى ي]
 		[\u200E\u200F ئ]
 		[{ئا} {ئه} {ئو} {ئۇ} {ئۆ} {ئۈ} {ئې} {ئى} ا ە ب پ ت ج چ خ د ر ز ژ س ش غ ف ق ك گ ڭ ل م ن ھ و ۇ ۆ ۈ ۋ ې ى ي]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		»
@@ -4903,11 +4903,6 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 				{0} ئات كۈچى
 				{0} ئات كۈچى
 			
-			
-				يۈز پاسكال
-				{0} يۈز پاسكال
-				{0} يۈز پاسكال
-			
 			
 				ديۇيم سىماب تۈۋرۇكى
 				{0} ديۇيم سىماب تۈۋرۇكى
@@ -4918,6 +4913,11 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 				{0} مىللىبار
 				{0} مىللىبار
 			
+			
+				يۈز پاسكال
+				{0} يۈز پاسكال
+				{0} يۈز پاسكال
+			
 			
 				كىلومېتىر ھەر سائەت
 				{0} كىلومېتىر ھەر سائەت
@@ -5128,11 +5128,6 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 				{0} ئات كۈچى
 				{0} ئات كۈچى
 			
-			
-				يۈز پاسكال
-				{0} ھېكتوپاسكال
-				{0} ھېكتوپاسكال
-			
 			
 				ديۇيم سىماب تۈۋرۇكى
 				{0} inHg
@@ -5143,6 +5138,11 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 				{0} mbar
 				{0} mbar
 			
+			
+				يۈز پاسكال
+				{0} ھېكتوپاسكال
+				{0} ھېكتوپاسكال
+			
 			
 				كىلومېتىر ھەر سائەت
 				{0} سائەت/كىلومېتىر
@@ -5309,10 +5309,6 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 				{0}hp
 				{0}hp
 			
-			
-				{0}hPa
-				{0}hPa
-			
 			
 				{0}" Hg
 				{0}" Hg
@@ -5321,6 +5317,10 @@ Reviewed by Waris Abdukerim Janbaz  of the Uyghur Computer Sci
 				{0}mb
 				{0}mb
 			
+			
+				{0}hPa
+				{0}hPa
+			
 			
 				{0}kph
 				{0}kph
diff --git a/make/data/cldr/common/main/ug_CN.xml b/make/data/cldr/common/main/ug_CN.xml
index 4eb2678ad86..41ccee50957 100644
--- a/make/data/cldr/common/main/ug_CN.xml
+++ b/make/data/cldr/common/main/ug_CN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/uk.xml b/make/data/cldr/common/main/uk.xml
index 3d20706706d..319c7b1f336 100644
--- a/make/data/cldr/common/main/uk.xml
+++ b/make/data/cldr/common/main/uk.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -101,7 +101,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			карібська
 			кайюга
 			атсам
-			чакма
+			чакма
 			чеченська
 			себуанська
 			кіга
@@ -131,7 +131,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			даргінська
 			таіта
 			німецька
-			австрійська німецька
+			австрійська німецька
 			верхньонімецька (Швейцарія)
 			делаварська
 			слейв
@@ -155,18 +155,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			грецька
 			еламська
 			англійська
-			австралійська англійська
-			канадська англійська
-			британська англійська
+			австралійська англійська
+			канадська англійська
+			британська англійська
 			англійська (Брит.)
 			англійська (США)
-			англійська (США)
 			середньоанглійська
 			есперанто
 			іспанська
-			латиноамериканська іспанська
+			латиноамериканська іспанська
 			іспанська (Європа)
-			мексиканська іспанська
+			мексиканська іспанська
 			естонська
 			баскська
 			евондо
@@ -180,8 +179,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			фарерська
 			фон
 			французька
-			канадська французька
-			швейцарська французька
+			канадська французька
+			швейцарська французька
 			кажунська французька
 			середньофранцузька
 			давньофранцузька
@@ -556,17 +555,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			їдиш
 			йоруба
 			кантонська
+			китайська кантонська
 			чжуан
 			сапотекська
 			блісса мова
 			зенага
 			стандартна марокканська берберська
 			китайська
+			китайська мандаринська
 			китайська (спрощене письмо)
+			китайська мандаринська (спрощене письмо)
 			китайська (традиційне письмо)
+			китайська мандаринська (традиційне письмо)
 			зулуська
 			зуньї
-			немає мовного вмісту
+			природномовний текст відсутній
 			зазакі
 		
 		
@@ -729,9 +732,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Східна Африка
 			Північна Африка
 			Центральна Африка
-			Південний регіон Африки
+			Південноафриканський регіон
 			Америка
-			Північна Америка (регіон)
+			Північноамериканський регіон
 			Карибський басейн
 			Східна Азія
 			Південна Азія
@@ -748,7 +751,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Східна Європа
 			Північна Європа
 			Західна Європа
-			Африка на південь від Сахари
+			Африка на південь від Сахари
 			Латинська Америка
 			Острів Вознесіння
 			Андорра
@@ -981,7 +984,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Сінт-Мартен
 			Сирія
 			Есватіні
-			Свазіленд
+			Свазіленд
 			Трістан-да-Кунья
 			Острови Теркс і Кайкос
 			Чад
@@ -1018,8 +1021,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Вануату
 			Уолліс і Футуна
 			Самоа
-			Псевдоакценти
-			Псевдобіді
+			Псевдоакценти
+			Псевдобіді
 			Косово
 			Ємен
 			Майотта
@@ -1066,22 +1069,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			календар
 			грошовий формат
-			ігнорувати сортування за символами
+			ігнорувати сортування за символами
 			зворотне сортування за діакритичними знаками
 			порядок верхнього/нижнього регістру
-			сортування з урахуванням регістру
+			сортування з урахуванням регістру
 			порядок сортування
-			уніфіковане сортування
-			цифрове сортування
-			інтенсивність сортування
+			уніфіковане сортування
+			цифрове сортування
+			інтенсивність сортування
 			валюта
 			формат часу (12 або 24 години)
 			стиль розриву рядка
 			система вимірювання
 			цифри
-			часовий пояс
-			варіант мовного коду
-			особисте використання
+			часовий пояс
+			варіант мовного коду
+			особисте використання
 		
 		
 			буддійський календар
@@ -1150,7 +1153,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			неточний стиль розриву рядка
 			звичайний стиль розриву рядка
 			точний стиль розриву рядка
-			транслітерація BGN США
+			транслітерація РГН США
 			транслітерація ГЕГН ООН
 			мертична система
 			англійська система мір
@@ -1241,25 +1244,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[а б в г ґ д е є ж з и і ї й к л м н о п р с т у ф х ц ч ш щ ь ю я ʼ]
 		[{а\u0301} {е\u0301} ё {є\u0301} {и\u0301} {і\u0301} {ї\u0301} {о\u0301} {у\u0301} ъ ы э {ю\u0301} {я\u0301}]
 		[А Б В Г Ґ Д Е Є Ж З И І Ї Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ю Я]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- – , ; \: ! ? . ' ’ " “ „ « » ( ) \[ \] \{ \} § @ * / \\ №]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ – , ; \: ! ? . ' ’ " “ „ « » ( ) \[ \] \{ \} § @ * / \\ №]
+		{0}…
+		…{0}
+		{0}…{1}
 		{0}…
 		…{0}
 		{0}…{1}
+		?
 		
+			[\--/]
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
+			[.․。︒﹒．｡]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
+			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
+			[,،٫、︐︑﹐﹑，､]
+			[+⁺₊➕﬩﹢＋]
+		
+		
+			[,٫︐﹐，]
+			[.․﹒．｡]
 		
 	
 	
@@ -1350,6 +1361,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+				
 			
 			
 				
@@ -1448,6 +1473,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						ERA0
+						ERA1
+					
+					
+						ERA0
+						ERA1
+					
+					
+						ERA1
+					
+				
 			
 			
 				
@@ -1483,18 +1521,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							{1} 'о' {0}
 						
 					
+					
+						
+							{1} {0}
+						
+					
+					
+						
+							{1} {0}
+						
+					
 					
+						h B
+						h:mm B
+						h:mm:ss B
+						d
+						ccc
+						E h:mm B
+						E h:mm:ss B
 						E, d
+						E h:mm a
+						E HH:mm
+						E h:mm:ss a
+						E HH:mm:ss
 						y G
 						LLL y G
 						d MMM y G
 						E, d MMM y G
+						h a
+						HH
+						h:mm a
+						HH:mm
+						h:mm:ss a
+						HH:mm:ss
+						L
 						dd.MM
 						E, dd.MM
+						LLL
 						d MMM
 						E, d MMM
 						d MMMM
 						E, d MMMM
+						mm:ss
 						y G
 						y G
 						MM.y G
@@ -1508,52 +1576,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						QQQQ y 'р'. G
 					
 					
+						{0} – {1}
 						
-							h B – h B
-							h–h B
+							h B – h B
+							h–h B
 						
 						
-							h:mm B – h:mm B
-							h:mm–h:mm B
-							h:mm–h:mm B
+							h:mm B – h:mm B
+							h:mm–h:mm B
+							h:mm–h:mm B
+						
+						
+							d–d
 						
 						
-							y 'р'. G – y 'р'. G
-							y–y 'рр'. G
+							y 'р'. G – y 'р'. G
+							y–y 'рр'. G
 						
 						
-							MM.y G – MM.y G
-							MM.y – MM.y G
-							MM.y – MM.y G
+							MM.y G – MM.y G
+							MM.y – MM.y G
+							MM.y – MM.y G
 						
 						
-							dd.MM.y – dd.MM.y G
-							dd.MM.y G – dd.MM.y G
-							dd.MM.y – dd.MM.y G
-							dd.MM.y – dd.MM.y G
+							dd.MM.y – dd.MM.y G
+							dd.MM.y G – dd.MM.y G
+							dd.MM.y – dd.MM.y G
+							dd.MM.y – dd.MM.y G
 						
 						
-							ccc, dd.MM.y – ccc, dd.MM.y G
-							ccc, dd.MM.y G – ccc, dd.MM.y G
-							ccc, dd.MM.y – ccc, dd.MM.y G
-							ccc, dd.MM.y – ccc, dd.MM.y G
+							ccc, dd.MM.y – ccc, dd.MM.y G
+							ccc, dd.MM.y G – ccc, dd.MM.y G
+							ccc, dd.MM.y – ccc, dd.MM.y G
+							ccc, dd.MM.y – ccc, dd.MM.y G
 						
 						
-							LLL y 'р'. G – LLL y 'р'. G
-							LLL – LLL y 'р'. G
-							LLL y – LLL y 'рр'. G
+							LLL y 'р'. G – LLL y 'р'. G
+							LLL – LLL y 'р'. G
+							LLL y – LLL y 'рр'. G
 						
 						
-							d–d MMM y 'р'. G
-							d MMM y 'р'. G – d MMM y 'р'. G
-							d MMM – d MMM y 'р'. G
-							d MMM y – d MMM y 'рр'. G
+							d–d MMM y 'р'. G
+							d MMM y 'р'. G – d MMM y 'р'. G
+							d MMM – d MMM y 'р'. G
+							d MMM y – d MMM y 'рр'. G
 						
 						
-							ccc, d MMM – ccc, d MMM y 'р'. G
-							ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G
-							ccc, d MMM – ccc, d MMM y 'р'. G
-							ccc, d MMM y – ccc, d MMM y 'рр'. G
+							ccc, d MMM – ccc, d MMM y 'р'. G
+							ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G
+							ccc, d MMM – ccc, d MMM y 'р'. G
+							ccc, d MMM y – ccc, d MMM y 'рр'. G
+						
+						
+							h a – h a
+							h–h a
+						
+						
+							HH–HH
+						
+						
+							h:mm a – h:mm a
+							h:mm–h:mm a
+							h:mm–h:mm a
+						
+						
+							HH:mm–HH:mm
+							HH:mm–HH:mm
+						
+						
+							h:mm a – h:mm a v
+							h:mm–h:mm a v
+							h:mm–h:mm a v
+						
+						
+							HH:mm–HH:mm v
+							HH:mm–HH:mm v
+						
+						
+							h a – h a v
+							h–h a v
+						
+						
+							HH–HH v
 						
 						
 							M–M
@@ -1566,6 +1670,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, dd.MM – E, dd.MM
 							E, dd.MM – E, dd.MM
 						
+						
+							LLL–LLL
+						
 						
 							d–d MMM
 							d MMM – d MMM
@@ -1898,7 +2005,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 					
 						до н. е.
+						до н. е.
 						н. е.
+						н. е.
 					
 					
 						до н.е.
@@ -1927,6 +2036,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2021,19 +2152,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d–d
 						
 						
-							y 'р'. G – y 'р'. G
-							y–y 'рр'. G
+							y 'р'. G – y 'р'. G
+							y–y 'рр'. G
 						
 						
 							MM.y G – MM.y G
-							MM.y – MM.y G
-							MM.y – MM.y G
+							MM.y – MM.y G
+							MM.y – MM.y G
 						
 						
-							dd.MM.y – dd.MM.y G
+							dd.MM.y – dd.MM.y G
 							dd.MM.y G – dd.MM.y G
-							dd.MM.y – dd.MM.y G
-							dd.MM.y – dd.MM.y G
+							dd.MM.y – dd.MM.y G
+							dd.MM.y – dd.MM.y G
 						
 						
 							ccc, dd.MM.y – ccc, dd.MM.y G
@@ -2042,21 +2173,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							ccc, dd.MM.y – ccc, dd.MM.y G
 						
 						
-							LLL y 'р'. G – LLL y 'р'. G
-							LLL – LLL y 'р'. G
-							LLL y – LLL y 'рр'. G
+							LLL y 'р'. G – LLL y 'р'. G
+							LLL – LLL y 'р'. G
+							LLL y – LLL y 'рр'. G
 						
 						
-							d–d MMM y 'р'. G
-							d MMM y 'р'. G – d MMM y 'р'. G
-							d MMM – d MMM y 'р'. G
-							d MMM y – d MMM y 'рр'. G
+							d–d MMM y 'р'. G
+							d MMM y 'р'. G – d MMM y 'р'. G
+							d MMM – d MMM y 'р'. G
+							d MMM y – d MMM y 'рр'. G
 						
 						
-							ccc, d MMM – ccc, d MMM y 'р'. G
-							ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G
-							ccc, d MMM – ccc, d MMM y 'р'. G
-							ccc, d MMM y – ccc, d MMM y 'рр'. G
+							ccc, d MMM – ccc, d MMM y 'р'. G
+							ccc, d MMM y 'р'. G – ccc, d MMM y 'р'. G
+							ccc, d MMM – ccc, d MMM y 'р'. G
+							ccc, d MMM y – ccc, d MMM y 'рр'. G
 						
 						
 							h a – h a
@@ -2169,6 +2300,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							аб
 							елул
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							тішри
 							марчешван
@@ -2187,6 +2334,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 					
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							7
+							8
+							9
+							10
+							11
+							12
+							13
+						
 						
 							тішри
 							хешван
@@ -2205,6 +2368,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2223,6 +2397,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							маг.
 							фаль.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							чайтра
 							вайсакха
@@ -2253,6 +2441,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							маг.
 							фаль.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							чайтра
 							вайсакха
@@ -2269,6 +2471,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						Saka
+					
+					
+						Saka
+					
+					
+						Saka
+					
+				
 			
 			
 				
@@ -2287,6 +2500,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							зу-ль-к.
 							зу-ль-х.
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							мухаррам
 							сафар
@@ -2317,6 +2544,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							зу-ль-к
 							зу-ль-х
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							мухаррам
 							сафар
@@ -2333,6 +2574,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AH
+					
+					
+						AH
+					
+					
+						AH
+					
+				
 			
 			
 				
@@ -2640,7 +2892,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				рік
-				торік
+				минулого року
 				цього року
 				наступного року
 				
@@ -2659,8 +2911,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				р.
 				торік
-				цього року
-				наступного року
+				цьогоріч
+				наст. року
 				
 					через {0} р.
 					через {0} р.
@@ -2678,7 +2930,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				р
 				торік
 				цього року
-				наступного року
+				наст. р.
 				
 					за {0} р.
 					за {0} р.
@@ -2729,10 +2981,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 			
-				кв.
-				минулого кв.
-				цього кв.
-				наступного кв.
+				кв
+				минулого кв.
+				цього кв.
+				наступного кв.
 				
 					за {0} кв.
 					за {0} кв.
@@ -2766,9 +3018,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				міс.
-				минулого місяця
-				цього місяця
-				наступного місяця
+				минулого місяця
+				цього місяця
+				наступного місяця
 				
 					через {0} міс.
 					через {0} міс.
@@ -2784,9 +3036,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				м
-				минулого місяця
-				цього місяця
-				наступного місяця
+				мин. міс.
+				цього міс.
+				наст. міс.
 				
 					за {0} міс.
 					за {0} міс.
@@ -2821,9 +3073,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				тиж.
-				минулого тижня
-				цього тижня
-				наступного тижня
+				мин. тижня
+				цього тижня
+				наст. тижня
 				
 					через {0} тиж.
 					через {0} тиж.
@@ -4042,7 +4294,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Ґайана
 			
 			
-				Гонконґ
+				Гонконг
 			
 			
 				Теґусіґальпа
@@ -4158,6 +4410,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Актобе
 			
+			
+				Костанай
+			
 			
 				Кизилорда
 			
@@ -4522,7 +4777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Стокгольм
 			
 			
-				Сінґапур
+				Сінгапур
 			
 			
 				Острів Святої Єлени
@@ -5109,7 +5364,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					за часом Французької Гвіани
+					за часом Французької Ґвіани
 				
 			
 			
@@ -5700,19 +5955,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
+		
+			latn
+		
 		1
 		
 			,
 			 
 			;
 			%
+			+
+			-
 			Е
 			×
 			‰
 			∞
 			NaN
+			:
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 тисяча
@@ -5912,6 +6179,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				дирхами ОАЕ
 				дирхамів ОАЕ
 				дирхама ОАЕ
+				AED
 			
 			
 				афгані (1927–2002)
@@ -5922,6 +6190,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				афганські афгані
 				афганських афгані
 				афганського афгані
+				AFN
 			
 			
 				албанський лек
@@ -5929,6 +6198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				албанські леки
 				албанських леків
 				албанського лека
+				ALL
 			
 			
 				вірменський драм
@@ -5936,6 +6206,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				вірменські драми
 				вірменських драмів
 				вірменського драма
+				AMD
 			
 			
 				нідерландський антильський гульден
@@ -5943,6 +6214,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нідерландські антильські гульдени
 				нідерландських антильських гульденів
 				нідерландського антильського гульдена
+				ANG
 			
 			
 				ангольська кванза
@@ -5950,6 +6222,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ангольські кванзи
 				ангольських кванз
 				ангольської кванзи
+				AOA
+				Kz
 			
 			
 				ангольська кванза (1977–1990)
@@ -5988,6 +6262,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				аргентинські песо
 				аргентинських песо
 				аргентинського песо
+				ARS
+				$
 			
 			
 				австрійський шилінг
@@ -5999,6 +6275,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				австралійських доларів
 				австралійського долара
 				AUD
+				$
 			
 			
 				арубський флорин
@@ -6006,6 +6283,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				арубські флорини
 				арубських флоринів
 				арубського флорина
+				AWG
 			
 			
 				азербайджанський манат (1993–2006)
@@ -6020,6 +6298,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				азербайджанські манати
 				азербайджанських манатів
 				азербайджанського маната
+				AZN
 			
 			
 				динар (Боснія і Герцеговина)
@@ -6030,6 +6309,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				конвертовані марки Боснії і Герцеговини
 				конвертованих марок Боснії і Герцеговини
 				конвертованої марки Боснії і Герцеговини
+				BAM
+				KM
 			
 			
 				барбадоський долар
@@ -6037,6 +6318,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				барбадоські долари
 				барбадоських доларів
 				барбадоського долара
+				BBD
+				$
 			
 			
 				бангладеська така
@@ -6044,6 +6327,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бангладеські таки
 				бангладеських так
 				бангладеської таки
+				BDT
+				৳
 			
 			
 				бельгійський франк (конвертований)
@@ -6063,6 +6348,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				болгарські леви
 				болгарських левів
 				болгарського лева
+				BGN
 			
 			
 				бахрейнський динар
@@ -6070,6 +6356,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бахрейнські динари
 				бахрейнських динарів
 				бахрейнського динара
+				BHD
 			
 			
 				бурундійський франк
@@ -6077,6 +6364,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бурундійські франки
 				бурундійських франків
 				бурундійського франка
+				BIF
 			
 			
 				бермудський долар
@@ -6084,6 +6372,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бермудські долари
 				бермудських доларів
 				бермудського долара
+				BMD
+				$
 			
 			
 				брунейський долар
@@ -6091,6 +6381,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				брунейські долари
 				брунейських доларів
 				брунейського долара
+				BND
+				$
 			
 			
 				болівійський болівіано
@@ -6098,6 +6390,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				болівійські болівіано
 				болівійських болівіано
 				болівійського болівіано
+				BOB
+				Bs
 			
 			
 				болівійське песо
@@ -6121,6 +6415,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бразильських реалів
 				бразильського реала
 				BRL
+				R$
 			
 			
 				бразильське нове крузадо
@@ -6134,6 +6429,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				багамські долари
 				багамських доларів
 				багамського долара
+				BSD
+				$
 			
 			
 				бутанський нгултрум
@@ -6141,6 +6438,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				бутанські нгултруми
 				бутанських нгултрумів
 				бутанського нгултрума
+				BTN
 			
 			
 				бірманський кіат
@@ -6151,6 +6449,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ботсванські пули
 				ботсванських пул
 				ботсванської пули
+				BWP
+				P
 			
 			
 				білоруський новий рубль (1994–1999)
@@ -6165,6 +6465,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				білоруські рублі
 				білоруських рублів
 				білоруського рубля
+				BYN
+				р.
 			
 			
 				білоруський рубль (2000–2016)
@@ -6172,6 +6474,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				білоруські рублі (2000–2016)
 				білоруських рублів (2000–2016)
 				білоруського рубля (2000–2016)
+				BYR
 			
 			
 				белізький долар
@@ -6179,6 +6482,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				белізькі долари
 				белізьких доларів
 				белізького долара
+				BZD
+				$
 			
 			
 				канадський долар
@@ -6187,6 +6492,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				канадських доларів
 				канадського долара
 				CAD
+				$
 			
 			
 				конголезький франк
@@ -6194,6 +6500,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				конголезькі франки
 				конголезьких франків
 				конголезького франка
+				CDF
 			
 			
 				євро WIR
@@ -6204,6 +6511,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				швейцарські франки
 				швейцарських франків
 				швейцарського франка
+				CHF
 			
 			
 				франк WIR
@@ -6217,6 +6525,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чилійські песо
 				чилійських песо
 				чилійського песо
+				CLP
+				$
 			
 			
 				китайський офшорний юань
@@ -6224,6 +6534,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				китайські офшорні юані
 				китайських офшорних юанів
 				китайського офшорного юаня
+				CNH
 			
 			
 				китайський юань
@@ -6232,6 +6543,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				китайських юанів
 				китайського юаня
 				CNY
+				¥
 			
 			
 				колумбійський песо
@@ -6239,6 +6551,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				колумбійські песо
 				колумбійських песо
 				колумбійського песо
+				COP
+				$
 			
 			
 				одиниця реальної вартості
@@ -6249,6 +6563,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				костариканські колони
 				костариканських колонів
 				костариканського колона
+				CRC
+				₡
 			
 			
 				старий сербський динар
@@ -6262,6 +6578,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубинські конвертовані песо
 				кубинських конвертованих песо
 				кубинського конвертованого песо
+				CUC
+				$
 			
 			
 				кубинський песо
@@ -6269,6 +6587,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кубинські песо
 				кубинськх песо
 				кубинського песо
+				CUP
+				$
 			
 			
 				ескудо Кабо-Верде
@@ -6276,6 +6596,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ескудо Кабо-Верде
 				ескудо Кабо-Верде
 				ескудо Кабо-Верде
+				CVE
 			
 			
 				кіпрський фунт
@@ -6286,6 +6607,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				чеські крони
 				чеських крон
 				чеської крони
+				CZK
+				Kč
 			
 			
 				марка НДР
@@ -6299,6 +6622,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				джибутійські франки
 				джибутійських франків
 				джибутійського франка
+				DJF
 			
 			
 				данська крона
@@ -6306,6 +6630,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				данські крони
 				данських крон
 				данської крони
+				DKK
+				kr
 			
 			
 				домініканський песо
@@ -6313,6 +6639,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				домініканські песо
 				домініканських песо
 				домініканського песо
+				DOP
+				$
 			
 			
 				алжирський динар
@@ -6320,6 +6648,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				алжирські динари
 				алжирських динарів
 				алжирського динара
+				DZD
 			
 			
 				еквадорський сукре
@@ -6340,6 +6669,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				єгипетські фунти
 				єгипетських фунтів
 				єгипетського фунта
+				EGP
+				E£
 			
 			
 				еритрейська накфа
@@ -6347,6 +6678,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				еритрейські накфи
 				еритрейських накф
 				еритрейської накфи
+				ERN
 			
 			
 				іспанська песета ("А" рахунок)
@@ -6363,6 +6695,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ефіопські бири
 				ефіопських бирів
 				ефіопського бира
+				ETB
 			
 			
 				євро
@@ -6371,6 +6704,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				євро
 				євро
 				EUR
+				€
 			
 			
 				фінляндська марка
@@ -6381,6 +6715,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фіджійські долари
 				фіджійських доларів
 				фіджійського долара
+				FJD
+				$
 			
 			
 				фунт Фолклендських островів
@@ -6388,6 +6724,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фунти Фолклендських островів
 				фунтів Фолклендських островів
 				фунта Фолклендських островів
+				FKP
+				£
 			
 			
 				французький франк
@@ -6399,6 +6737,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				англійських фунтів
 				англійського фунта
 				GBP
+				£
 			
 			
 				грузинський купон
@@ -6413,6 +6752,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				грузинські ларі
 				грузинських ларі
 				грузинського ларі
+				GEL
+				₾
 				₾
 			
 			
@@ -6424,6 +6765,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ганські седі
 				ганських седі
 				ганського седі
+				GHS
 			
 			
 				гібралтарський фунт
@@ -6431,6 +6773,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гібралтарські фунти
 				гібралтарських фунтів
 				гібралтарського фунта
+				GIP
+				£
 			
 			
 				гамбійський даласі
@@ -6438,6 +6782,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гамбійські даласі
 				гамбійських даласі
 				гамбійського даласі
+				GMD
 			
 			
 				гвінейський франк
@@ -6445,6 +6790,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гвінейські франки
 				гвінейських франків
 				гвінейського франка
+				GNF
+				FG
 			
 			
 				гвінейське сілі
@@ -6461,6 +6808,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гватемальські кетсалі
 				гватемальських кетсалів
 				гватемальського кетсаля
+				GTQ
+				Q
 			
 			
 				ескудо португальської гвінеї
@@ -6474,6 +6823,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гаянські долари
 				гаянських доларів
 				гаянського долара
+				GYD
+				$
 			
 			
 				гонконгський долар
@@ -6482,6 +6833,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гонконгських доларів
 				гонконгського долара
 				HKD
+				$
 			
 			
 				гондураська лемпіра
@@ -6489,6 +6841,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гондураські лемпіри
 				гондураських лемпір
 				гондураської лемпіри
+				HNL
+				L
 			
 			
 				хорватський динар
@@ -6499,6 +6853,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				хорватські куни
 				хорватських кун
 				хорватської куни
+				HRK
+				kn
 			
 			
 				гаїтянський гурд
@@ -6506,6 +6862,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гаїтянські гурди
 				гаїтянських гурдів
 				гаїтянського гурда
+				HTG
 			
 			
 				угорський форинт
@@ -6513,6 +6870,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				угорські форинти
 				угорських форинтів
 				угорського форинта
+				HUF
+				Ft
 			
 			
 				індонезійська рупія
@@ -6520,6 +6879,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				індонезійські рупії
 				індонезійських рупій
 				індонезійські рупії
+				IDR
+				Rp
 			
 			
 				ірландський фунт
@@ -6534,6 +6895,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ізраїльських нових шекелів
 				ізраїльського нового шекеля
 				ILS
+				₪
 			
 			
 				індійська рупія
@@ -6542,6 +6904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				індійських рупій
 				індійської рупії
 				INR
+				₹
 			
 			
 				іракський динар
@@ -6549,6 +6912,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				іракські динари
 				іракських динарів
 				іракського динара
+				IQD
 			
 			
 				іранський ріал
@@ -6556,6 +6920,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				іранські ріали
 				іранських ріалів
 				іранського ріала
+				IRR
 			
 			
 				ісландська крона
@@ -6563,6 +6928,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ісландські кроні
 				ісландських крон
 				ісландської крони
+				ISK
+				kr
 			
 			
 				італійська ліра
@@ -6573,6 +6940,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ямайські долари
 				ямайських доларів
 				ямайського долара
+				JMD
+				$
 			
 			
 				йорданський динар
@@ -6580,6 +6949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				йорданські динари
 				йорданських динарів
 				йорданського динара
+				JOD
 			
 			
 				японська єна
@@ -6588,6 +6958,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				японських єн
 				японської єни
 				¥
+				¥
 			
 			
 				кенійський шилінг
@@ -6595,6 +6966,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кенійські шилінги
 				кенійських шилінгів
 				кенійського шилінга
+				KES
 			
 			
 				киргизький сом
@@ -6602,6 +6974,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				киргизькі соми
 				киргизьких сомів
 				киргизького сома
+				KGS
 			
 			
 				камбоджійський рієль
@@ -6609,6 +6982,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				камбоджійські рієлі
 				камбоджійських рієлів
 				камбоджійського рієля
+				KHR
+				៛
 			
 			
 				коморський франк
@@ -6616,6 +6991,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				коморські франки
 				коморських франків
 				коморського франка
+				KMF
+				CF
 			
 			
 				північнокорейський вон
@@ -6623,6 +7000,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				північнокорейські вони
 				північнокорейських вонів
 				північнокорейського вона
+				KPW
+				₩
 			
 			
 				південнокорейський вон
@@ -6631,6 +7010,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				південнокорейських вонів
 				південнокорейського вона
 				KRW
+				₩
 			
 			
 				кувейтський динар
@@ -6638,6 +7018,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кувейтські динари
 				кувейтських динарів
 				кувейтського динара
+				KWD
 			
 			
 				долар Кайманових островів
@@ -6645,6 +7026,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долари Кайманових островів
 				доларів Кайманових островів
 				долара Кайманових островів
+				KYD
+				$
 			
 			
 				казахстанський тенге
@@ -6652,6 +7035,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				казахстанські тенге
 				казахстанських тенге
 				казахстанського тенге
+				KZT
+				₸
 			
 			
 				лаоський кіп
@@ -6659,6 +7044,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				лаоські кіпи
 				лаоських кіпів
 				лаоського кіпа
+				LAK
+				₭
 			
 			
 				ліванський фунт
@@ -6666,6 +7053,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ліванські фунти
 				ліванських фунтів
 				ліванського фунта
+				LBP
+				L£
 			
 			
 				шрі-ланкійська рупія
@@ -6673,6 +7062,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шрі-ланкійські рупії
 				шрі-ланкійських рупій
 				шрі-ланкійської рупії
+				LKR
+				Rs
 			
 			
 				ліберійський долар
@@ -6680,6 +7071,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ліберійські долари
 				ліберійських доларів
 				ліберійського долара
+				LRD
+				$
 			
 			
 				лесотський лоті
@@ -6690,6 +7083,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				литовські літи
 				литовських літів
 				литовського літа
+				LTL
 			
 			
 				литовський талон
@@ -6709,6 +7103,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				латвійські лати
 				латвійських латів
 				латвійського лата
+				LVL
 			
 			
 				латвійський рубль
@@ -6719,6 +7114,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				лівійські динари
 				лівійських динарів
 				лівійського динара
+				LYD
 			
 			
 				марокканський дирхам
@@ -6726,6 +7122,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				марокканські дирхами
 				марокканських дирхамів
 				марокканського дирхама
+				MAD
 			
 			
 				марокканський франк
@@ -6736,6 +7133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				молдовські леї
 				молдовських леїв
 				молдовського лея
+				MDL
 			
 			
 				малагасійський аріарі
@@ -6743,6 +7141,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малагасійські аріарі
 				малагасійських аріарі
 				малагасійського аріарі
+				MGA
+				Ar
 			
 			
 				мадагаскарський франк
@@ -6753,6 +7153,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				македонські денари
 				македонських денарів
 				македонського денара
+				MKD
 			
 			
 				малійський франк
@@ -6763,6 +7164,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кʼяти Мʼянми
 				кʼятів Мʼянми
 				кʼята Мʼянми
+				MMK
+				K
 			
 			
 				монгольський тугрик
@@ -6770,6 +7173,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				монгольські тугрики
 				монгольських тугриків
 				монгольського тугрика
+				MNT
+				₮
 			
 			
 				патака Макао
@@ -6777,6 +7182,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				патаки Макао
 				патак Макао
 				патаки Макао
+				MOP
 			
 			
 				мавританська угія (1973–2017)
@@ -6784,6 +7190,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мавританські угії (1973–2017)
 				мавританських угій (1973–2017)
 				мавританської угії (1973–2017)
+				MRO
 			
 			
 				мавританська угія
@@ -6791,6 +7198,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мавританські угії
 				мавританських угій
 				мавританської угії
+				MRU
 			
 			
 				мальтійська ліра
@@ -6804,6 +7212,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				маврикійські рупії
 				маврикійських рупій
 				маврикійської рупії
+				MUR
+				Rs
 			
 			
 				мальдівська руфія
@@ -6811,6 +7221,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мальдівські руфії
 				мальдівських руфій
 				мальдівської руфії
+				MVR
 			
 			
 				малавійська квача
@@ -6818,6 +7229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малавійські квачі
 				малавійських квач
 				малавійської квачі
+				MWK
 			
 			
 				мексиканський песо
@@ -6826,6 +7238,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мексиканських песо
 				мексиканського песо
 				MXN
+				$
 			
 			
 				мексиканське срібне песо (1861–1992)
@@ -6839,6 +7252,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				малайзійські рингіти
 				малайзійських рингітів
 				малайзійського рингіта
+				MYR
+				RM
 			
 			
 				мозамбіцький ескудо
@@ -6852,6 +7267,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				мозамбіцькі метикали
 				мозамбіцьких метикалів
 				мозамбіцького метикала
+				MZN
 			
 			
 				намібійський долар
@@ -6859,6 +7275,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				намібійські долари
 				намібійських доларів
 				намібійського долара
+				NAD
+				$
 			
 			
 				нігерійська найра
@@ -6866,6 +7284,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нігерійські найри
 				нігерійських найр
 				нігерійської найри
+				NGN
+				₦
 			
 			
 				нікарагуанська кордоба (1988–1991)
@@ -6880,6 +7300,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нікарагуанські кордоби
 				нікарагуанських кордоб
 				нікарагуанської кордоби
+				NIO
+				C$
 			
 			
 				нідерландський гульден
@@ -6890,6 +7312,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				норвезькі крони
 				норвезьких крон
 				норвезької крони
+				NOK
+				kr
 			
 			
 				непальська рупія
@@ -6897,6 +7321,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				непальські рупії
 				непальських рупій
 				непальської рупії
+				NPR
+				Rs
 			
 			
 				новозеландський долар
@@ -6905,6 +7331,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				новозеландських доларів
 				новозеландського долара
 				NZD
+				$
 			
 			
 				оманський ріал
@@ -6912,6 +7339,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				оманські ріали
 				оманських ріалів
 				оманського ріала
+				OMR
 			
 			
 				панамське бальбоа
@@ -6919,6 +7347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				панамські бальбоа
 				панамських бальбоа
 				панамського бальбоа
+				PAB
 			
 			
 				перуанський інті
@@ -6929,6 +7358,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				перуанські нові соли
 				перуанських нових солів
 				перуанського нового сола
+				PEN
 			
 			
 				перуанський сол (1863–1965)
@@ -6944,6 +7374,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				кіни Папуа-Нової Ґвінеї
 				кін Папуа-Нової Ґвінеї
 				кіни Папуа-Нової Ґвінеї
+				PGK
 			
 			
 				філіппінський песо
@@ -6951,6 +7382,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				філіппінські песо
 				філіппінських песо
 				філіппінського песо
+				PHP
+				₱
 			
 			
 				пакистанська рупія
@@ -6958,6 +7391,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				пакистанські рупії
 				пакистанських рупій
 				пакистанської рупії
+				PKR
+				Rs
 			
 			
 				польський злотий
@@ -6965,6 +7400,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				польські злоті
 				польських злотих
 				польського злотого
+				PLN
+				zł
 			
 			
 				польський злотий (1950–1995)
@@ -6978,6 +7415,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				парагвайські гуарані
 				парагвайських гуарані
 				парагвайського гуарані
+				PYG
+				₲
 			
 			
 				катарський ріал
@@ -6985,6 +7424,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				катарські ріали
 				катарських ріалів
 				катарського ріала
+				QAR
 			
 			
 				родезійський долар
@@ -6998,6 +7438,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				румунські леї
 				румунських леїв
 				румунського лея
+				RON
+				lei
 			
 			
 				сербський динар
@@ -7005,6 +7447,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сербські динари
 				сербських динарів
 				сербського динара
+				RSD
 			
 			
 				російський рубль
@@ -7012,6 +7455,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				російські рублі
 				російських рублів
 				російського рубля
+				RUB
+				₽
 			
 			
 				російський рубль (1991–1998)
@@ -7026,6 +7471,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				руандійські франки
 				руандійських франків
 				руандійського франка
+				RWF
+				RF
 			
 			
 				саудівський ріал
@@ -7033,6 +7480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				саудівські ріали
 				саудівських ріалів
 				саудівського ріала
+				SAR
 			
 			
 				долар Соломонових Островів
@@ -7040,6 +7488,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долари Соломонових Островів
 				доларів Соломонових Островів
 				долара Соломонових Островів
+				SBD
+				$
 			
 			
 				сейшельська рупія
@@ -7047,6 +7497,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сейшельські рупії
 				сейшельських рупій
 				сейшельської рупії
+				SCR
 			
 			
 				суданський динар
@@ -7057,6 +7508,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				суданські фунти
 				суданських фунтів
 				суданського фунта
+				SDG
 			
 			
 				старий суданський фунт
@@ -7067,6 +7519,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				шведські крони
 				шведських крон
 				шведської крони
+				SEK
+				kr
 			
 			
 				сінгапурський долар
@@ -7074,6 +7528,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сінгапурські долари
 				сінгапурських доларів
 				сінгапурського долара
+				SGD
+				$
 			
 			
 				фунт острова Святої Єлени
@@ -7081,6 +7537,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				фунти острова Святої Єлени
 				фунтів острова Святої Єлени
 				фунта острова Святої Єлени
+				SHP
+				£
 			
 			
 				словенський толар
@@ -7098,6 +7556,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				леоне Сьєрра-Леоне
 				леоне Сьєрра-Леоне
 				леоне Сьєрра-Леоне
+				SLL
 			
 			
 				сомалійський шилінг
@@ -7105,6 +7564,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сомалійські шилінги
 				сомалійських шилінгів
 				сомалійського шилінга
+				SOS
 			
 			
 				суринамський долар
@@ -7112,6 +7572,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				суринамські долари
 				суринамських доларів
 				суринамського долара
+				SRD
+				$
 			
 			
 				суринамський гульден
@@ -7122,6 +7584,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				південносуданські фунти
 				південносуданських фунтів
 				південносуданського фунта
+				SSP
+				£
 			
 			
 				добра Сан-Томе і Прінсіпі (1977–2017)
@@ -7129,6 +7593,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				добри Сан-Томе і Принсіпі (1977–2017)
 				добр Сан-Томе і Принсіпі (1977–2017)
 				добри Сан-Томе і Прінсіпі (1977–2017)
+				STD
 			
 			
 				добра Сан-Томе і Прінсіпі
@@ -7136,6 +7601,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				добри Сан-Томе і Принсіпі
 				добр Сан-Томе і Принсіпі
 				добри Сан-Томе і Прінсіпі
+				STN
+				Db
 			
 			
 				радянський рубль
@@ -7153,6 +7620,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				сирійські фунти
 				сирійських фунтів
 				сирійського фунта
+				SYP
+				£
 			
 			
 				свазілендський лілангені
@@ -7160,6 +7629,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				свазілендські лілангені
 				свазілендських лілангені
 				свазілендського лілангені
+				SZL
 			
 			
 				таїландський бат
@@ -7167,6 +7637,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				таїландські бати
 				таїландських батів
 				таїландського бата
+				THB
+				฿
 			
 			
 				таджицький рубль
@@ -7177,6 +7649,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				таджицькі сомоні
 				таджицьких сомоні
 				таджицького сомоні
+				TJS
 			
 			
 				туркменський манат (1993–2009)
@@ -7191,6 +7664,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				туркменські манати
 				туркменських манатів
 				туркменського маната
+				TMT
 			
 			
 				туніський динар
@@ -7198,6 +7672,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				туніські динари
 				туніських динарів
 				туніського динара
+				TND
 			
 			
 				тонґанська паанга
@@ -7205,6 +7680,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				тонґанські паанги
 				тонґанських паанг
 				тонґанської паанги
+				TOP
+				T$
 			
 			
 				тіморський ескудо
@@ -7222,6 +7699,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				турецькі ліри
 				турецьких лір
 				турецької ліри
+				TRY
+				₺
+				TL
 			
 			
 				долар Трінідаду і Тобаґо
@@ -7229,6 +7709,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				долари Тринідаду і Тобаго
 				доларів Тринідаду і Тобаго
 				долара Трінідаду і Тобаґо
+				TTD
+				$
 			
 			
 				новий тайванський долар
@@ -7237,7 +7719,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				нових тайванських доларів
 				нового тайванського долара
 				TWD
-				NT$
+				$
 			
 			
 				танзанійський шилінг
@@ -7245,6 +7727,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				танзанійські шилінги
 				танзанійських шилінгів
 				танзанійського шилінга
+				TZS
 			
 			
 				українська гривня
@@ -7253,6 +7736,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				гривень
 				гривні
 				₴
+				₴
 				грн.
 			
 			
@@ -7272,6 +7756,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				угандійські шилінги
 				угандійських шилінгів
 				угандійського шилінга
+				UGX
 			
 			
 				долар США
@@ -7280,6 +7765,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				доларів США
 				долара США
 				USD
+				$
 			
 			
 				долар США (наступного дня)
@@ -7299,6 +7785,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				уругвайські песо
 				уругвайських песо
 				уругвайського песо
+				UYU
+				$
 			
 			
 				узбецький сум
@@ -7306,6 +7794,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				узбецькі суми
 				узбецьких сумів
 				узбецького сума
+				UZS
 			
 			
 				венесуельський болівар (1871–2008)
@@ -7316,6 +7805,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венесуельські болівари (2008–2018)
 				венесуельських боліварів (2008–2018)
 				венесуельського болівара (2008–2018)
+				VEF
+				Bs
 			
 			
 				венесуельський болівар
@@ -7323,6 +7814,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				венесуельські болівари
 				венесуельських боліварів
 				венесуельського болівара
+				VES
 			
 			
 				вʼєтнамський донг
@@ -7331,6 +7823,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				вʼєтнамських донгів
 				вʼєтнамського донга
 				VND
+				₫
 			
 			
 				вануатський вату
@@ -7338,6 +7831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				вануатські вату
 				вануатських вату
 				вануатського вату
+				VUV
 			
 			
 				самоанська тала
@@ -7345,6 +7839,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				самоанські тали
 				самоанських тал
 				самоанської тали
+				WST
 			
 			
 				центральноафриканський франк
@@ -7352,6 +7847,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				центральноафриканські франки
 				центральноафриканських франків
 				центральноафриканського франка
+				FCFA
 			
 			
 				срібло
@@ -7378,6 +7874,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				східнокарибських доларів
 				східнокарибського долара
 				XCD
+				$
 			
 			
 				спеціальні права запозичення
@@ -7401,6 +7898,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				західноафриканські франки
 				західноафриканських франків
 				західноафриканського франка
+				CFA
 			
 			
 				паладій
@@ -7411,6 +7909,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				французькі тихоокеанські франки
 				французьких тихоокеанських франків
 				французького тихоокеанського франка
+				CFPF
 			
 			
 				платина
@@ -7437,6 +7936,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				єменські ріали
 				єменських ріалів
 				єменського ріала
+				YER
 			
 			
 				югославський твердий динар
@@ -7456,6 +7956,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				південноафриканські ранди
 				південноафриканських рандів
 				південноафриканського ранда
+				ZAR
+				R
 			
 			
 				замбійська квача (1968–2012)
@@ -7470,6 +7972,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				замбійські квачі
 				замбійських квач
 				замбійської квачі
+				ZMW
+				ZK
 			
 			
 				заїрський новий заїр
@@ -7636,11 +8140,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} квадратний дюйм
 			
 			
-				дунами
-				{0} дунам
-				{0} дунами
-				{0} дунамів
-				{0} дунама
+				дунами
+				{0} дунам
+				{0} дунами
+				{0} дунамів
+				{0} дунама
 			
 			
 				карати
@@ -7685,18 +8189,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} проміле
 			
 			
-				проміріада
-				{0} проміріада
-				{0} проміріади
-				{0} проміріад
-				{0} проміріади
+				проміріада
+				{0} проміріада
+				{0} проміріади
+				{0} проміріад
+				{0} проміріади
 			
 			
-				молі
-				{0} моль
-				{0} молі
-				{0} молів
-				{0} моля
+				молі
+				{0} моль
+				{0} молі
+				{0} молів
+				{0} моля
 			
 			
 				літри на кілометр
@@ -7731,7 +8235,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} петабайт
 				{0} петабайти
 				{0} петабайтів
-				{0} петабайту
+				{0} петабайта
 			
 			
 				терабайти
@@ -7810,6 +8314,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} століть
 				{0} століття
 			
+			
+				декади
+				{0} декада
+				{0} декади
+				{0} декад
+				{0} декади
+			
 			
 				роки
 				{0} рік
@@ -7958,32 +8469,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кіловат-години
 			
 			
-				електрон-вольти
-				{0} електрон-вольт
-				{0} електрон-вольти
-				{0} електрон-вольтів
-				{0} електрон-вольта
+				електрон-вольти
+				{0} електрон-вольт
+				{0} електрон-вольти
+				{0} електрон-вольтів
+				{0} електрон-вольта
 			
 			
-				одиниці теплові британські
-				{0} одиниця теплова британська
-				{0} одиниці теплові британські
-				{0} одиниць теплових британських
-				{0} одиниці теплової британської
+				одиниці теплові британські
+				{0} одиниця теплова британська
+				{0} одиниці теплові британські
+				{0} одиниць теплових британських
+				{0} одиниці теплової британської
+			
+			
+				американський терм
+				{0} американський терм
+				{0} американських терми
+				{0} американських термів
+				{0} американського терма
 			
 			
-				фунт-сили
-				{0} фунт-сила
-				{0} фунт-сили
-				{0} фунт-сил
-				{0} фунт-сили
+				фунт-сили
+				{0} фунт-сила
+				{0} фунт-сили
+				{0} фунт-сил
+				{0} фунт-сили
 			
 			
-				ньютони
-				{0} ньютон
-				{0} ньютони
-				{0} ньютонів
-				{0} ньютона
+				ньютони
+				{0} ньютон
+				{0} ньютони
+				{0} ньютонів
+				{0} ньютона
 			
 			
 				гігагерци
@@ -8013,6 +8531,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} герців
 				{0} герца
 			
+			
+				мегапікселі
+				{0} мегапіксель
+				{0} Мп
+				{0} Мп
+				{0} мегапікселя
+			
 			
 				кілометри
 				{0} кілометр
@@ -8138,18 +8663,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} скандинавської милі
 			
 			
-				пункти
-				{0} пункт
-				{0} пункти
-				{0} пунктів
-				{0} пункту
+				пункти
+				{0} пункт
+				{0} пункти
+				{0} пунктів
+				{0} пункту
 			
 			
 				радіус Сонця
-				{0} радіус Сонця
-				{0} радіуси Сонця
-				{0} радіусів Сонця
-				{0} радіуса Сонця
+				{0} радіус Сонця
+				{0} радіуси Сонця
+				{0} радіусів Сонця
+				{0} радіуса Сонця
 			
 			
 				люкси
@@ -8159,11 +8684,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} люкса
 			
 			
-				світності Сонця
-				{0} світність Сонця
-				{0} світності Сонця
-				{0} світностей Сонця
-				{0} світності Сонця
+				світності Сонця
+				{0} світність Сонця
+				{0} світності Сонця
+				{0} світностей Сонця
+				{0} світності Сонця
 			
 			
 				метричні тонни
@@ -8247,25 +8772,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} карата
 			
 			
-				дальтони
-				{0} дальтон
-				{0} дальтони
-				{0} дальтонів
-				{0} дальтона
+				дальтони
+				{0} дальтон
+				{0} дальтони
+				{0} дальтонів
+				{0} дальтона
 			
 			
-				маси Землі
-				{0} маса Землі
-				{0} маси Землі
-				{0} мас Землі
-				{0} маси Землі
+				маси Землі
+				{0} маса Землі
+				{0} маси Землі
+				{0} мас Землі
+				{0} маси Землі
 			
 			
-				маси Сонця
-				{0} маса Сонця
-				{0} маси Сонця
-				{0} мас Сонця
-				{0} маси Сонця
+				маси Сонця
+				{0} маса Сонця
+				{0} маси Сонця
+				{0} мас Сонця
+				{0} маси Сонця
 			
 			
 				гігавати
@@ -8309,13 +8834,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кінських сил
 				{0} кінської сили
 			
-			
-				гектопаскалі
-				{0} гектопаскаль
-				{0} гектопаскалі
-				{0} гектопаскалів
-				{0} гектопаскаля
-			
 			
 				міліметри ртутного стовпа
 				{0} міліметр ртутного стовпа
@@ -8337,6 +8855,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} дюймів ртутного стовпа
 				{0} дюйма ртутного стовпа
 			
+			
+				бари
+				{0} бар
+				{0} бари
+				{0} барів
+				{0} бара
+			
 			
 				мілібари
 				{0} мілібар
@@ -8351,19 +8876,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атмосфер
 				{0} атмосфери
 			
+			
+				паскалі
+				{0} паскаль
+				{0} паскалі
+				{0} паскалів
+				{0} паскаля
+			
+			
+				гектопаскалі
+				{0} гектопаскаль
+				{0} гектопаскалі
+				{0} гектопаскалів
+				{0} гектопаскаля
+			
 			
 				кілопаскалі
-				{0} кілопаскаль
-				{0} кілопаскалі
-				{0} кілопаскалів
-				{0} кілопаскаля
+				{0} кілопаскаль
+				{0} кілопаскалі
+				{0} кілопаскалів
+				{0} кілопаскаля
 			
 			
-				мегапаскалі
-				{0} мегапаскаль
-				{0} мегапаскалі
-				{0} мегапаскалів
-				{0} мегапаскаля
+				мегапаскалі
+				{0} мегапаскаль
+				{0} мегапаскалі
+				{0} мегапаскалів
+				{0} мегапаскаля
 			
 			
 				кілометри на годину
@@ -8393,6 +8932,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} вузлів
 				{0} вузла
 			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				градуси Цельсія
 				{0} градус Цельсія
@@ -8415,18 +8961,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кельвіна
 			
 			
-				фунт-фути
-				{0} фунт-фут
-				{0} фунт-фути
-				{0} фунт-футів
-				{0} фунт-фута
+				фунт-фути
+				{0} фунт-фут
+				{0} фунт-фути
+				{0} фунт-футів
+				{0} фунт-фута
 			
 			
-				ньютон-метри
-				{0} ньютон-метр
-				{0} ньютон-метри
-				{0} ньютон-метрів
-				{0} ньютон-метра
+				ньютон-метри
+				{0} ньютон-метр
+				{0} ньютон-метри
+				{0} ньютон-метрів
+				{0} ньютон-метра
 			
 			
 				кубічні кілометри
@@ -8616,11 +9162,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} чайної ложки
 			
 			
-				барелі
-				{0} барель
-				{0} барелі
-				{0} барелів
-				{0} бареля
+				барелі
+				{0} барель
+				{0} барелі
+				{0} барелів
+				{0} бареля
 			
 			
 				сторона світу
@@ -8631,8 +9177,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
+			
+				{0}⋅{1}
+			
 			
 				сили тяжіння
+				{0} g
+				{0} g
+				{0} g
+				{0} g
 			
 			
 				метри/с²
@@ -8657,6 +9213,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				градуси
+				{0}°
+				{0}°
+				{0}°
+				{0}°
 			
 			
 				мінути
@@ -8741,11 +9301,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/дюйм²
 			
 			
-				дунами
-				{0} дунам
-				{0} дунами
-				{0} дунамів
-				{0} дунама
+				дунами
+				{0} дунам
+				{0} дунами
+				{0} дунамів
+				{0} дунама
 			
 			
 				карати
@@ -8770,6 +9330,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				мільйонні долі
+				{0} ppm
+				{0} ppm
+				{0} ppm
+				{0} ppm
 			
 			
 				відсоток
@@ -8786,18 +9350,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				проміріада
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
+				проміріада
 			
 			
-				моль
-				{0} моль
-				{0} моль
-				{0} моль
-				{0} моль
+				моль
+				{0} моль
+				{0} моль
+				{0} моль
+				{0} моль
 			
 			
 				літри/км
@@ -8911,6 +9471,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ст.
 				{0} ст.
 			
+			
+				10-річчя
+				{0} 10-річчя
+				{0} 10-річчя
+				{0} 10-річ
+				{0} 10-річчя
+			
 			
 				р.
 				{0} р.
@@ -9059,32 +9626,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кВт год
 			
 			
-				електрон-вольт
-				{0} еВ
-				{0} еВ
-				{0} еВ
-				{0} еВ
+				електрон-вольт
+				{0} еВ
+				{0} еВ
+				{0} еВ
+				{0} еВ
 			
 			
-				Отб
-				{0} Отб
-				{0} Отб
-				{0} Отб
-				{0} Отб
+				Отб
+				{0} Отб
+				{0} Отб
+				{0} Отб
+				{0} Отб
+			
+			
+				ам. терми
+				{0} ам. терм
+				{0} ам. терми
+				{0} ам. термів
+				{0} ам. терма
 			
 			
 				фунт-сила
-				{0} фнтс
-				{0} фнтс
-				{0} фнтс
-				{0} фнтс
+				{0} фнтс
+				{0} фнтс
+				{0} фнтс
+				{0} фнтс
 			
 			
-				ньютон
-				{0} Н
-				{0} Н
-				{0} Н
-				{0} Н
+				ньютон
+				{0} Н
+				{0} Н
+				{0} Н
+				{0} Н
 			
 			
 				ГГц
@@ -9114,6 +9688,55 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Гц
 				{0} Гц
 			
+			
+				em
+				{0} em
+				{0} em
+				{0} em
+				{0} em
+			
+			
+				px
+				{0} px
+				{0} px
+				{0} px
+				{0} px
+			
+			
+				Мп
+				{0} Мп
+				{0} Мп
+				{0} Мп
+				{0} Мп
+			
+			
+				ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+				{0} ppcm
+			
+			
+				ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+				{0} ppi
+			
+			
+				dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+				{0} dpcm
+			
+			
+				dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+				{0} dpi
+			
 			
 				км
 				{0} км
@@ -9239,18 +9862,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} сканд. милі
 			
 			
-				пт
-				{0} пт
-				{0} пт
-				{0} пт
-				{0} пт
+				пт
+				{0} пт
+				{0} пт
+				{0} пт
+				{0} пт
 			
 			
 				радіус Сонця
-				{0} R☉
-				{0} R☉
-				{0} R☉
-				{0} R☉
 			
 			
 				люкс
@@ -9260,11 +9879,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} лк
 			
 			
-				світність
-				{0} L☉
-				{0} L☉
-				{0} L☉
-				{0} L☉
+				світності Сонця
 			
 			
 				метр. т
@@ -9341,25 +9956,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} кар
 			
 			
-				дальтони
-				{0} Да
-				{0} Да
-				{0} Да
-				{0} Да
+				дальтони
+				{0} Да
+				{0} Да
+				{0} Да
+				{0} Да
 			
 			
-				маси Землі
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
-				{0} M⊕
+				маси Землі
 			
 			
-				маси Сонця
-				{0} M☉
-				{0} M☉
-				{0} M☉
-				{0} M☉
+				маси Сонця
 			
 			
 				ГВт
@@ -9403,13 +10010,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к. с.
 				{0} к. с.
 			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-			
 			
 				мм рт. ст.
 				{0} мм рт. ст.
@@ -9431,6 +10031,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} дюймів рт. ст.
 				{0} дюйма рт. ст.
 			
+			
+				бар
+				{0} бар
+				{0} бар
+				{0} бар
+				{0} бар
+			
 			
 				мбар
 				{0} мбар
@@ -9445,19 +10052,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} атм
 				{0} атм
 			
+			
+				Па
+				{0} Па
+				{0} Па
+				{0} Па
+				{0} Па
+			
+			
+				гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+			
 			
-				кПа
-				{0} кПа
-				{0} кПа
-				{0} кПа
-				{0} кПа
+				кПа
+				{0} кПа
+				{0} кПа
+				{0} кПа
+				{0} кПа
 			
 			
-				МПа
-				{0} МПа
-				{0} МПа
-				{0} МПа
-				{0} МПа
+				МПа
+				{0} МПа
+				{0} МПа
+				{0} МПа
+				{0} МПа
 			
 			
 				км/годину
@@ -9480,11 +10101,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} миль/год
 				{0} милі/год
 			
+			
+				kn
+				{0} kn
+				{0} kn
+				{0} kn
+				{0} kn
+			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+				{0}°
+			
 			
 				градус Цельсія
+				{0}°C
+				{0}°C
+				{0}°C
+				{0}°C
 			
 			
 				градус Фаренгейта
+				{0}°F
+				{0}°F
+				{0}°F
+				{0}°F
 			
 			
 				кельвін
@@ -9495,17 +10138,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				фунт-фут
-				{0} фнт-фт
-				{0} фнт-фт
-				{0} фнт-фт
-				{0} фнт-фт
+				{0} фнт-фт
+				{0} фнт-фт
+				{0} фнт-фт
+				{0} фнт-фт
 			
 			
-				Н·м
-				{0} Н·м
-				{0} Н·м
-				{0} Н·м
-				{0} Н·м
+				Н·м
+				{0} Н·м
+				{0} Н·м
+				{0} Н·м
+				{0} Н·м
 			
 			
 				км³
@@ -9696,10 +10339,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				барель
-				{0} бар.
-				{0} бар.
-				{0} бар.
-				{0} бар.
+				{0} бр.
+				{0} бр.
+				{0} бр.
+				{0} бр.
 			
 			
 				напрямок
@@ -9710,6 +10353,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 		
 		
+			
+				{0}/{1}
+			
 			
 				g-сила
 				{0} G
@@ -9794,13 +10440,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				‱
-				{0}‱
-				{0}‱
-				{0}‱
-				{0}‱
 			
 			
-				моль
 				{0}моль
 				{0}моль
 				{0}моль
@@ -9905,7 +10546,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}еВ
 			
 			
-				Отб
 				{0}Отб
 				{0}Отб
 				{0}Отб
@@ -9934,7 +10574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}/км
 			
 			
-				метр
+				м
 				{0} м
 				{0} м
 				{0} м
@@ -10152,13 +10792,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} к.с.
 				{0} к.с.
 			
-			
-				гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-				{0} гПа
-			
 			
 				ммрс
 				{0}ммрс
@@ -10179,6 +10812,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} мбарів
 				{0} мбара
 			
+			
+				гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+				{0} гПа
+			
 			
 				км/год
 				{0} км/год
@@ -10201,11 +10841,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} милі/год
 			
 			
+				kn
 				{0}kn
 				{0}kn
 				{0}kn
 				{0}kn
 			
+			
+				°
+				{0}°
+				{0}°
+				{0}°
+				{0}°
+			
+			
+				° Цельсія
+				{0}°C
+				{0}°C
+				{0}°C
+				{0}°C
+			
+			
+				{0}°F
+				{0}°F
+				{0}°F
+				{0}°F
+			
 			
 				{0} К
 				{0} К
@@ -10213,14 +10874,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} К
 			
 			
-				фунт-фут
 				{0}фн-фт
 				{0}фн-фт
 				{0}фн-фт
 				{0}фн-фт
 			
 			
-				Н·м
 				{0}Н·м
 				{0}Н·м
 				{0}Н·м
@@ -10286,16 +10945,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			{0}, {1}
+			{0}, {1}
 			{0} і {1}
 			{0} і {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0} або {1}
 			{0} або {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0}, {1}
 			{0}, {1}
 		
@@ -10306,9 +10967,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} і {1}
 		
 		
+			{0}, {1}
+			{0}, {1}
 			{0} і {1}
 			{0} і {1}
 		
+		
+			{0}, {1}
+			{0}, {1}
+		
+		
+			{0}, {1}
+			{0}, {1}
+		
 	
 	
 		
@@ -10330,7 +11001,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		{0} риски
 		{0} рисок
 		{0} риски
-		Заняття
+		активність
 		африканське письмо
 		американське письмо
 		тварина
@@ -10345,7 +11016,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		символ валюти
 		тире чи сполучний знак
 		цифра
-		Дінгбати
+		дінгбати
 		символ віщування
 		стрілка вниз
 		стрілка вниз-вгору
@@ -10396,7 +11067,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		місце
 		рослина
 		пунктуація
-		Стрілки вправо
+		стрілки вправо
 		знак чи символ
 		малі варіанти
 		смайлик
@@ -10412,7 +11083,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		подорож чи місце
 		стрілки вгору
 		варіант
-		Корейські голосні
+		корейські голосні
 		погода
 		західноазійське письмо
 		пробіл
diff --git a/make/data/cldr/common/main/uk_UA.xml b/make/data/cldr/common/main/uk_UA.xml
index c4269a29490..0f8ac584137 100644
--- a/make/data/cldr/common/main/uk_UA.xml
+++ b/make/data/cldr/common/main/uk_UA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/ur.xml b/make/data/cldr/common/main/ur.xml
index b0e88572969..814c48dd18b 100644
--- a/make/data/cldr/common/main/ur.xml
+++ b/make/data/cldr/common/main/ur.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -60,7 +60,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			بینی
 			سکسیکا
 			بمبارا
-			بنگالی
+			بنگلہ
 			تبتی
 			بریٹن
 			بوڈو
@@ -68,7 +68,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			بگینیز
 			بلین
 			کیٹالان
-			چکمہ
+			چکمہ
 			چیچن
 			سیبوآنو
 			چیگا
@@ -109,7 +109,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			آسٹریلیائی انگریزی
 			کینیڈین انگریزی
 			برطانوی انگریزی
-			انگریزی (یو کے)
 			امریکی انگریزی
 			امریکی انگریزی
 			ایسپرانٹو
@@ -425,10 +424,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			یدش
 			یوروبا
 			کینٹونیز
+			چینی، کینٹونیز
 			اسٹینڈرڈ مراقشی تمازیقی
 			چینی
+			چینی، مندارن
 			چینی (آسان کردہ)
+			سادہ مندارن چینی
 			روایتی چینی
+			روایتی مندارن چینی
 			زولو
 			زونی
 			کوئی لسانی مواد نہیں
@@ -740,14 +743,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			صومالیہ
 			سورینام
 			جنوبی سوڈان
-			ساؤ ٹوم اور پرنسپے
+			ساؤ ٹومے اور پرنسپے
 			ال سلواڈور
 			سنٹ مارٹن
 			شام
 			سواتنی
 			سوازی لینڈ
 			ٹرسٹن ڈا کیونہا
-			ترکس اور کیکاؤس جزائر
+			ٹرکس اور کیکوس جزائر
 			چاڈ
 			فرانسیسی جنوبی خطے
 			ٹوگو
@@ -769,7 +772,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			امریکہ سے باہر کے چھوٹے جزائز
 			اقوام متحدہ
 			اقوام متحدہ
-			ریاستہائے متحدہ
+			ریاست ہائے متحدہ امریکہ
 			امریکا
 			یوروگوئے
 			ازبکستان
@@ -782,8 +785,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			وینوآٹو
 			ویلیز اور فیوٹیونا
 			ساموآ
-			بناوٹی لہجے
-			مصنوعی بیڑی
+			بناوٹی لہجے
+			مصنوعی بیڑی
 			کوسووو
 			یمن
 			مایوٹ
@@ -800,9 +803,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			بڑے حروف/ چھوٹے حروف کی ترتیب بندی
 			حروف کے تئیں حساس چھٹائی
 			چھٹائی کی ترتیب
-			معمول کی چھٹائی
-			عددی چھٹائی
-			چھٹائی کی قوت
+			معمول کی چھانٹی
+			عددی چھانٹی
+			چھانٹی کی قوت
 			کرنسی
 			گھنٹہ سائیکل (12 بنام 24)
 			لائن بریک انداز
@@ -843,7 +846,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			روایتی چینی کی چھٹائی کی ترتیب - Big5
 			سابقہ چھٹائی کی ترتیب، مطابقت کیلئے
 			لغت کی چھٹنی کی ترتیب
-			ڈیفالٹ یونیکوڈ کی چھٹنی کی ترتیب
+			ڈیفالٹ یونی کوڈ چھانٹی کی ترتیب
 			یورپی ترتیبی قوانین
 			آسان چینی کی چھٹائی کی ترتیب - GB2312
 			فون بک کی چھٹنی کی ترتیب
@@ -852,7 +855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			دوبارہ تشکیل شدہ چھٹنی کی ترتیب
 			عام-مقصد کی تلاش
 			Hangul Initial Consonant کے لحاظ سے تلاش کریں
-			معیاری چھنٹائی کی ترتیب
+			معیاری چھانٹی کی ترتیب
 			سٹروک کی چھٹنی کی ترتیب
 			روایتی چھٹنی کی ترتیب
 			اساسی-سٹروک کی چھٹنی کی ترتیب
@@ -875,8 +878,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			ڈھیلا لائن بریک انداز
 			عمومی لائن بریک انداز
 			سخت لائن بریک انداز
-			US BGN
-			UN GEGN
+			US BGN ٹرانسلٹریشن
+			UN GEGN ٹرانسلٹریشن
 			میٹرک نظام
 			پیمائش کا امپیریل نظام
 			پیمائش کا امریکی نظام
@@ -923,8 +926,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			میٹرک
-			سلطنت متحدہ
-			ریاستہائے متحدہ
+			برطانیہ
+			ریاست ہائے متحدہ امریکہ
 		
 		
 			زبان:{0}
@@ -941,7 +944,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[ا أ آ ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں و ؤ ہ ۂ ھ ء ی ئ ے ة ه]
 		[؀؁؂؃\u200C\u200D\u200E\u200F \u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0654 \u0656 \u0657 \u0658 \u0670 ۃ ٻ ٺ ټ ٽ ي]
 		[ا ب پ ت ٹ ث ج چ ح خ د ڈ ذ ر ڑ ز ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن و ہ ھ ء ی ے]
-		[\u200E \- , ٫ ٬ . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
+		[\u200E \- ‑ , ٫ ٬ . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]
 		[، ؍ ٫ ٬ ؛ \: ؟ . ۔ ( ) \[ \]]
 		{0}…
 		…{0}
@@ -956,13 +959,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -983,6 +981,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		
+			
+				
+					
+						BE
+					
+					
+						BE
+					
+					
+						BE
+					
+				
+			
 			
 				
 					
@@ -1249,19 +1260,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							M/d/y – M/d/y GGGGG
-							M/d/y GGGGG – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
 						
 						
 							E, M/d/y – E, M/d/y GGGGG
@@ -1270,21 +1281,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							E, M/d/y – E, M/d/y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							MMM d – d, y G
-							MMM d, y G – MMM d, y G
-							MMM d – MMM d, y G
-							MMM d, y – MMM d, y G
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
 						
 						
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y G – E, MMM d, y G
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
 						
 						
 							h a – h a
@@ -1802,42 +1813,42 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d–d
 						
 						
-							y G – y G
-							y – y G
+							y G – y G
+							y – y G
 						
 						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
+							M/y GGGGG – M/y GGGGG
+							M/y – M/y GGGGG
+							M/y – M/y GGGGG
 						
 						
-							M/d/y – M/d/y GGGGG
-							M/d/y GGGGG – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
-							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y GGGGG – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
+							M/d/y – M/d/y GGGGG
 						
 						
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y GGGGG – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
-							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y GGGGG – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
+							E, M/d/y – E, M/d/y GGGGG
 						
 						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
+							MMM y G – MMM y G
+							MMM – MMM y G
+							MMM y – MMM y G
 						
 						
-							MMM d – d, y G
-							MMM d, y G – MMM d, y G
-							MMM d – MMM d, y G
-							MMM d, y – MMM d, y G
+							MMM d – d, y G
+							MMM d, y G – MMM d, y G
+							MMM d – MMM d, y G
+							MMM d, y – MMM d, y G
 						
 						
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y G – E, MMM d, y G
-							E, MMM d – E, MMM d, y G
-							E, MMM d, y – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y G – E, MMM d, y G
+							E, MMM d – E, MMM d, y G
+							E, MMM d, y – E, MMM d, y G
 						
 						
 							h a – h a
@@ -2002,6 +2013,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AM
+					
+					
+						AM
+					
+					
+						AM
+					
+				
 			
 			
 				
@@ -2082,62 +2104,62 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						
-							محرم
-							صفر
-							ربیع الاوّل
-							ربیع الثّانی
-							جمادی الاوّل
-							جمادی الثّانی
-							رجب
-							شعبان
-							رمضان
-							شوال
-							ذوالقعدۃ
-							ذوالحجۃ
+							محرم
+							صفر
+							ربیع الاوّل
+							ربیع الثّانی
+							جمادی الاوّل
+							جمادی الثّانی
+							رجب
+							شعبان
+							رمضان
+							شوال
+							ذوالقعدۃ
+							ذوالحجۃ
 						
 						
-							محرم
-							صفر
-							ر بیع الاول
-							ر بیع الثانی
-							جمادی الاول
-							جمادی الثانی
-							رجب
-							شعبان
-							رمضان
-							شوال
-							ذوالقعدۃ
-							ذوالحجۃ
+							محرم
+							صفر
+							ر بیع الاول
+							ر بیع الثانی
+							جمادی الاول
+							جمادی الثانی
+							رجب
+							شعبان
+							رمضان
+							شوال
+							ذوالقعدۃ
+							ذوالحجۃ
 						
 					
 					
 						
-							محرم
-							صفر
-							ربیع الاوّل
-							ربیع الثّانی
-							جمادی الاوّل
-							جمادی الثّانی
-							رجب
-							شعبان
-							رمضان
-							شوال
-							ذوالقعدۃ
-							ذوالحجۃ
+							محرم
+							صفر
+							ربیع الاوّل
+							ربیع الثّانی
+							جمادی الاوّل
+							جمادی الثّانی
+							رجب
+							شعبان
+							رمضان
+							شوال
+							ذوالقعدۃ
+							ذوالحجۃ
 						
 						
-							محرم
-							صفر
-							ر بیع الاول
-							ر بیع الثانی
-							جمادی الاول
-							جمادی الثانی
-							رجب
-							شعبان
-							رمضان
-							شوال
-							ذوالقعدۃ
-							ذوالحجۃ
+							محرم
+							صفر
+							ر بیع الاول
+							ر بیع الثانی
+							جمادی الاول
+							جمادی الثانی
+							رجب
+							شعبان
+							رمضان
+							شوال
+							ذوالقعدۃ
+							ذوالحجۃ
 						
 					
 				
@@ -2146,7 +2168,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						ہجری
 					
 					
-						ہجری
+						ہجری
 					
 					
 						ہجری
@@ -2216,6 +2238,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						AP
+					
+					
+						AP
+					
+					
+						AP
+					
+				
 			
 			
 				
@@ -2324,8 +2357,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				مہینہ
-				پچھلا مہینہ
-				اس مہینہ
+				گزشتہ ماہ
+				اس ماہ
 				اگلا مہینہ
 				
 					{0} مہینہ میں
@@ -2352,6 +2385,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ماہ
+				گزشتہ ماہ
+				اس ماہ
+				اگلے ماہ
 				
 					{0} ماہ میں
 					{0} ماہ میں
@@ -2363,9 +2399,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				ہفتہ
-				پچھلے ہفتہ
+				گزشتہ ہفتے
 				اس ہفتہ
-				اگلے ہفتہ
+				اگلے ہفتے
 				
 					{0} ہفتہ میں
 					{0} ہفتے میں
@@ -2444,7 +2480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 				
 					{0} دن پہلے
-					{0} دنوں پہلے
+					{0} دن پہلے
 				
 			
 			
@@ -2890,7 +2926,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			GMT
 			{0} وقت
 			{0} ڈے لائٹ ٹائم
-			{0} اسٹینڈرڈ ٹائم
+			{0} معیاری وقت
 			{1} ({0})
 			
 				سانتا ایزابیل
@@ -3267,7 +3303,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ایسٹر
 			
 			
-				پنٹا یریناس
+				پنٹا اریناس
 			
 			
 				سنٹیاگو
@@ -3570,7 +3606,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				اکٹوب
 			
 			
-				کوستانے
+				کوستانے
 			
 			
 				کیزیلورڈا
@@ -4032,10 +4068,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				دار السلام
 			
 			
-				ازگوروڈ
+				ازہوراڈ
 			
 			
-				کیوو
+				کیو
 			
 			
 				زیپوروزائی
@@ -4224,7 +4260,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					امیزون ٹائم
-					ایمیزون سٹینڈرڈ ٹائم
+					ایمیزون کا معیاری وقت
 					امیزون کا موسم گرما کا وقت
 				
 			
@@ -4279,9 +4315,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					ارجنٹینا ٹائم
-					ارجنٹینا سٹینڈرڈ ٹائم
-					ارجنٹینا سمر ٹائم
+					ارجنٹینا کا وقت
+					ارجنٹینا کا معیاری وقت
+					ارجنٹینا کا موسم گرما کا وقت
 				
 			
 			
@@ -4404,7 +4440,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					چین ٹائم
+					چین کا وقت
 					چین سٹینڈرڈ ٹائم
 					چینی ڈے لائٹ ٹائم
 				
@@ -5090,13 +5126,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			arabext
 		
 		1
 		
+			٫
+			٬
 			;
 			%
+			‎+‎
+			‎-‎
 			×۱۰^
 			×
 			‰
@@ -5104,6 +5145,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			.
+			,
+			;
 			%
 			‎+
 			‎-
@@ -5114,7 +5158,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ہزار
@@ -5252,211 +5308,250 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				متحدہ عرب اماراتی درہم
 				متحدہ عرب اماراتی درہم
 				متحدہ عرب اماراتی درہم
+				AED
 			
 			
 				افغان افغانی
 				افغان افغانی
 				افغان افغانی
+				AFN
 			
 			
 				البانیا کا لیک
 				البانیا کا لیک
 				البانیا کا لیک
+				ALL
 			
 			
 				آرمینیائی ڈرم
 				آرمینیائی ڈرم
 				آرمینیائی ڈرم
+				AMD
 			
 			
 				نیدر لینڈز انٹیلیئن گلڈر
 				نیدر لینڈز انٹیلیئن گلڈر
 				نیدر لینڈز انٹیلیئن گلڈر
+				ANG
 			
 			
 				انگولا کا کوانزا
 				انگولا کا کوانزا
 				انگولا کا کوانزا
+				AOA
 				Kz
 			
 			
 				ارجنٹائن پیسہ
 				ارجنٹائن پیسہ
 				ارجنٹائن پیسہ
+				ARS
 				$
 			
 			
 				آسٹریلین ڈالر
 				آسٹریلین ڈالر
 				آسٹریلین ڈالر
+				A$
 				$
 			
 			
 				اروبن فلورِن
 				اروبن فلورِن
 				اروبن فلورِن
+				AWG
 			
 			
 				آذربائجانی منات
 				آذربائجانی منات
 				آذربائجانی منات
+				AZN
 			
 			
 				بوسنیا ہرزیگووینا کا قابل منتقلی نشان
 				بوسنیا ہرزیگووینا کا قابل منتقلی نشان
 				بوسنیا ہرزیگووینا کا قابل منتقلی نشان
+				BAM
 				KM
 			
 			
 				باربیڈین ڈالر
 				باربیڈین ڈالر
 				باربیڈین ڈالر
+				BBD
 				$
 			
 			
 				بنگلہ دیشی ٹکا
 				بنگلہ دیشی ٹکا
 				بنگلہ دیشی ٹکا
+				BDT
 				৳
 			
 			
 				بلغارین لیو
 				بلغارین لیو
 				بلغارین لیو
+				BGN
 			
 			
 				بحرینی دینار
 				بحرینی دینار
 				بحرینی دینار
+				BHD
 			
 			
 				برونڈیئن فرانک
 				برونڈیئن فرانک
 				برونڈیئن فرانک
+				BIF
 			
 			
 				برموڈا ڈالر
 				برموڈا ڈالر
 				برموڈا ڈالر
+				BMD
 				$
 			
 			
 				برونئی ڈالر
 				برونئی ڈالر
 				برونئی ڈالر
+				BND
 				$
 			
 			
 				بولیوین بولیویانو
 				بولیوین بولیویانو
 				بولیوین بولیویانو
+				BOB
 				Bs
 			
 			
 				برازیلی ریئل
 				برازیلی ریئل
 				برازیلی ریئل
+				R$
 				R$
 			
 			
 				بہامانی ڈالر
 				بہامانی ڈالر
 				بہامانی ڈالر
+				BSD
 				$
 			
 			
 				بھوٹانی گُلٹرم
 				بھوٹانی گُلٹرم
 				بھوٹانی گُلٹرم
+				BTN
 			
 			
 				بوتسوانا کا پولا
 				بوتسوانا کا پولا
 				بوتسوانا کا پولا
+				BWP
 				P
 			
 			
 				بیلاروسی روبل
 				بیلاروسی روبل
 				بیلاروسی روبل
+				BYN
+				р.
 			
 			
 				بیلاروسی روبل (۲۰۰۰–۲۰۱۶)
 				بیلاروسی روبل (۲۰۰۰–۲۰۱۶)
 				بیلاروسی روبل (۲۰۰۰–۲۰۱۶)
+				BYR
 			
 			
 				بیلیز ڈالر
 				بیلیز ڈالر
 				بیلیز ڈالرز
+				BZD
 				$
 			
 			
 				کنیڈین ڈالر
 				کنیڈین ڈالر
 				کنیڈین ڈالر
+				CA$
 				$
 			
 			
 				کانگولیز فرانک
 				کانگولیز فرانک
 				کانگولیز فرانک
+				CDF
 			
 			
 				سوئس فرانکس
 				سوئس فرانکس
 				سوئس فرانکس
+				CHF
 			
 			
 				چلّین پیسہ
 				چلّین پیسہ
 				چلّین پیسہ
+				CLP
 				$
 			
 			
 				چینی یوآن (آف شور)
 				چینی یوآن (آف شور)
 				چینی یوآن (آف شور)
+				CNH
 			
 			
 				چینی یوآن
 				چینی یوآن
 				چینی یوآن
+				CN¥
 				¥
 			
 			
 				کولمبین پیسہ
 				کولمبین پیسہ
 				کولمبین پیسہ
+				COP
 				$
 			
 			
 				کوسٹا ریکا کا کولن
 				کوسٹا ریکا کا کولن
 				کوسٹا ریکا کا کولن
+				CRC
 				₡
 			
 			
 				کیوبا کا قابل منتقلی پیسو
 				کیوبا کا قابل منتقلی پیسو
 				کیوبا کا قابل منتقلی پیسو
+				CUC
 				$
 			
 			
 				کیوبا کا پیسو
 				کیوبا کا پیسو
 				کیوبا کا پیسو
+				CUP
 				$
 			
 			
 				کیپ ورڈی کا اسکیوڈو
 				کیپ ورڈی کا اسکیوڈو
 				کیپ ورڈی کا اسکیوڈو
+				CVE
 			
 			
-				جمہوریہ چیک کرونا
-				جمہوریہ چیک کرونا
-				جمہوریہ چیک کروناز
+				چیک کرونا
+				چیک کرونا
+				چیک کروناز
+				CZK
 				Kč
 			
 			
@@ -5466,23 +5561,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				جبوتی فرانک
 				جبوتی فرانک
 				جبوتی فرانک
+				DJF
 			
 			
 				ڈنمارک کرون
 				ڈنمارک کرون
 				ڈنمارک کرون
+				DKK
 				kr
 			
 			
 				ڈومنیکن پیسو
 				ڈومنیکن پیسو
 				ڈومنیکن پیسو
+				DOP
 				$
 			
 			
 				الجیریائی دینار
 				الجیریائی دینار
 				الجیریائی دینار
+				DZD
 			
 			
 				ایسٹونین کرون
@@ -5491,49 +5590,57 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				مصری پاؤنڈ
 				مصری پاؤنڈ
 				مصری پاؤنڈ
+				EGP
 				E£
 			
 			
 				اریٹیریا کا نافکا
 				اریٹیریا کا نافکا
 				اریٹیریا کا نافکا
+				ERN
 			
 			
 				ایتھوپیائی بِرّ
 				ایتھوپیائی بِرّ
 				ایتھوپیائی بِرّ
+				ETB
 			
 			
 				یورو
 				یورو
 				یورو
+				€
 				€
 			
 			
 				فجی کا ڈالر
 				فجی کا ڈالر
 				فجی کا ڈالر
+				FJD
 				$
 			
 			
 				فاکلینڈ آئلینڈز پونڈ
 				فاکلینڈ آئلینڈز پونڈ
 				فاکلینڈ آئلینڈز پونڈ
+				FKP
 				£
 			
 			
 				فرانسیسی فرانک
 			
 			
-				انگلستانی پاونڈ سٹرلنگ
-				انگلستانی پاونڈ سٹرلنگ
-				انگلستانی پاونڈ سٹرلنگ
+				برطانوی پاؤنڈ
+				برطانوی پاؤنڈ
+				برطانوی پاؤنڈ
+				£
 				£
 			
 			
 				جارجیائی لاری
 				جارجیائی لاری
 				جارجیائی لاری
+				GEL
 				₾
 				₾
 			
@@ -5541,189 +5648,222 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				گھانا کا سیڈی
 				گھانا کا سیڈی
 				گھانا کا سیڈی
+				GHS
 			
 			
 				جبل الطارق پونڈ
 				جبل الطارق پونڈ
 				جبل الطارق پونڈ
+				GIP
 				£
 			
 			
 				گامبیا کا ڈلاسی
 				گامبیا کا ڈلاسی
 				گامبیا کا ڈلاسی
+				GMD
 			
 			
 				گنی فرانک
 				گنی فرانک
 				گنی فرانک
+				GNF
 				FG
 			
 			
 				گواٹے مالا کا کوئٹزل
 				گواٹے مالا کا کوئٹزل
 				گواٹے مالا کا کوئٹزل
+				GTQ
 				Q
 			
 			
 				گویانیز ڈالر
 				گویانیز ڈالر
 				گویانیز ڈالر
+				GYD
 				$
 			
 			
 				ھانگ کانگ ڈالر
 				ھانگ کانگ ڈالر
 				ھانگ کانگ ڈالر
+				HK$
 				$
 			
 			
 				ہونڈوران لیمپیرا
 				ہونڈوران لیمپیرا
 				ہونڈوران لیمپیرا
+				HNL
 				L
 			
 			
 				کروشین کونا
 				کروشین کونا
 				کروشین کونا
+				HRK
 				kn
 			
 			
 				ہیتی کا گؤرڈی
 				ہیتی کا گؤرڈی
 				ہیتی کا گؤرڈی
+				HTG
 			
 			
 				ہنگرین فورنٹ
 				ہنگرین فورنٹ
 				ہنگرین فورنٹ
+				HUF
 				Ft
 			
 			
 				انڈونیشین روپیہ
 				انڈونیشین روپیہ
 				انڈونیشین روپیہ
+				IDR
 				Rp
 			
 			
 				اسرائیلی نیا شیکل
 				اسرائیلی نیا شیکل
 				اسرائیلی نیا شیکلز
+				₪
 				₪
 			
 			
 				بھارتی روپیہ
 				بھارتی روپیہ
 				بھارتی روپے
+				₹
 				₹
 			
 			
 				عراقی دینار
 				عراقی دینار
 				عراقی دینار
+				IQD
 			
 			
 				ایرانی ریال
 				ایرانی ریال
 				ایرانی ریال
+				IRR
 			
 			
 				آئس لينڈی کرونا
 				آئس لينڈی کرونا
 				آئس لينڈی کرونوں
+				ISK
 				kr
 			
 			
 				جمائیکن ڈالر
 				جمائیکن ڈالر
 				جمائیکن ڈالر
+				JMD
 				$
 			
 			
 				اردنی دینار
 				اردنی دینار
 				اردنی دینار
+				JOD
 			
 			
 				جاپانی ین
 				جاپانی ین
 				جاپانی ین
+				JP¥
 				¥
 			
 			
 				کینیائی شلنگ
 				کینیائی شلنگ
 				کینیائی شلنگ
+				KES
 			
 			
 				کرغستانی سوم
 				کرغستانی سوم
 				کرغستانی سوم
+				KGS
 			
 			
 				کمبوڈیائی ریئل
 				کمبوڈیائی ریئل
 				کمبوڈیائی ریئل
+				KHR
 				៛
 			
 			
 				کوموریئن فرانک
 				کوموریئن فرانک
 				کوموریئن فرانک
+				KMF
 				CF
 			
 			
 				شمالی کوریائی وون
 				شمالی کوریائی وون
 				شمالی کوریائی وون
+				KPW
 				₩
 			
 			
 				جنوبی کوریائی وون
 				جنوبی کوریائی وون
 				جنوبی کوریائی وون
+				₩
 				₩
 			
 			
 				کویتی دینار
 				کویتی دینار
 				کویتی دینار
+				KWD
 			
 			
 				کیمین آئلینڈز ڈالر
 				کیمین آئلینڈز ڈالر
 				کیمین آئلینڈز ڈالر
+				KYD
 				$
 			
 			
 				قزاخستانی ٹینگ
 				قزاخستانی ٹینگ
 				قزاخستانی ٹینگ
+				KZT
 				₸
 			
 			
 				لاؤشیائی کِپ
 				لاؤشیائی کِپ
 				لاؤشیائی کِپ
+				LAK
 				₭
 			
 			
 				لبنانی پونڈ
 				لبنانی پونڈ
 				لبنانی پونڈ
+				LBP
 				L£
 			
 			
 				سری لنکائی روپیہ
 				سری لنکائی روپیہ
 				سری لنکائی روپیہ
+				LKR
 				Rs
 			
 			
 				لائبریائی ڈالر
 				لائبریائی ڈالر
 				لائبریائی ڈالر
+				LRD
 				$
 			
 			
@@ -5733,158 +5873,187 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				لیتھوینیائی لیٹاس
 				لیتھوینیائی لیٹاس
 				لیتھوینیائی لیٹاس
+				LTL
 			
 			
 				لاتویائی لیٹس
 				لاتویائی لیٹس
 				لاتویائی لیٹس
+				LVL
 			
 			
 				لیبیائی دینار
 				لیبیائی دینار
 				لیبیائی دینار
+				LYD
 			
 			
 				مراکشی درہم
 				مراکشی درہم
 				مراکشی درہم
+				MAD
 			
 			
 				مالدووی لیو
 				مالدووی لیو
 				مالدووی لیو
+				MDL
 			
 			
 				ملاگاسی اریاری
 				ملاگاسی اریاری
 				ملاگاسی اریاری
+				MGA
 				Ar
 			
 			
 				مقدونیائی دینار
 				مقدونیائی دینار
 				مقدونیائی دینار
+				MKD
 			
 			
 				میانمار کیاٹ
 				میانمار کیاٹ
 				میانمار کیاٹ
+				MMK
 				K
 			
 			
 				منگولیائی ٹگرِ
 				منگولیائی ٹگرِ
 				منگولیائی ٹگرِ
+				MNT
 				₮
 			
 			
 				میکانیز پٹاکا
 				میکانیز پٹاکا
 				میکانیز پٹاکا
+				MOP
 			
 			
 				موریطانیائی اوگوئیا (1973–2017)
 				موریطانیائی اوگوئیا (1973–2017)
 				موریطانیائی اوگوئیا (1973–2017)
+				MRO
 			
 			
 				موریطانیائی اوگوئیا
 				موریطانیائی اوگوئیا
 				موریطانیائی اوگوئیا
+				MRU
 			
 			
 				ماریشس کا روپیہ
 				ماریشس کا روپیہ
 				ماریشس کا روپیہ
+				MUR
 				Rs
 			
 			
 				مالدیپ کا روفیہ
 				مالدیپ کا روفیہ
 				مالدیپ کا روفیہ
+				MVR
 			
 			
 				ملاوی کواچا
 				ملاوی کواچا
 				ملاوی کواچا
+				MWK
 			
 			
 				میکسیکی پیسہ
 				میکسیکی پیسہ
 				میکسیکی پیسہ
+				MX$
 				$
 			
 			
 				ملیشیائی رنگِٹ
 				ملیشیائی رنگِٹ
 				ملیشیائی رنگِٹ
+				MYR
 				RM
 			
 			
 				موزامبیقی میٹیکل
 				موزامبیقی میٹیکل
 				موزامبیقی میٹیکلز
+				MZN
 			
 			
 				نامیبیائی ڈالر
 				نامیبیائی ڈالر
 				نامیبیائی ڈالر
+				NAD
 				$
 			
 			
 				نائیجیریائی نائرا
 				نائیجیریائی نائرا
 				نائیجیریائی نائرا
+				NGN
 				₦
 			
 			
 				نکارا گوا کا کورڈوبا
 				نکارا گوا کا کورڈوبا
 				نکارا گوا کا کورڈوبا
+				NIO
 				C$
 			
 			
 				ناروے کرون
 				ناروے کرون
 				ناروے کرون
+				NOK
 				kr
 			
 			
 				نیپالی روپیہ
 				نیپالی روپیہ
 				نیپالی روپیہ
+				NPR
 				Rs
 			
 			
 				نیوزی لینڈ ڈالر
 				نیوزی لینڈ ڈالر
 				نیوزی لینڈ ڈالر
+				NZ$
 				$
 			
 			
 				عمانی ریال
 				عمانی ریال
 				عمانی ریال
+				OMR
 			
 			
 				پنامہ کا بالبوآ
 				پنامہ کا بالبوآ
 				پنامہ کا بالبوآ
+				PAB
 			
 			
-				پیرو نیووسول
-				پیرو نیووسول
-				پیرو نیووسول
+				پیروویئن سول
+				پیروویئن سول
+				پیروویئن سول
+				PEN
 			
 			
 				پاپوآ نیو گنی کا کینا
 				پاپوآ نیو گنی کا کینا
 				پاپوآ نیو گنی کا کینا
+				PGK
 			
 			
 				فلپائینی پیسہ
 				فلپائینی پیسہ
-				فلپائینی پیسہ
+				فلپائنی پیسو
+				PHP
 				₱
 			
 			
@@ -5898,78 +6067,93 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				پولش زلوٹی
 				پولش زلوٹی
 				پولش زلوٹی
+				PLN
 				zł
 			
 			
 				پیراگوئے کا گوآرنی
 				پیراگوئے کا گوآرنی
 				پیراگوئے کا گوآرنی
+				PYG
 				₲
 			
 			
 				قطری ریال
 				قطری ریال
 				قطری ریال
+				QAR
 			
 			
 				رومانیائی لیو
 				رومانیائی لیو
 				رومانیائی لی
+				RON
+				lei
 			
 			
 				سربین دینار
 				سربین دینار
 				سربین دینار
+				RSD
 			
 			
 				روسی روبل
 				روسی روبل
 				روسی روبل
+				RUB
 				₽
 			
 			
 				روانڈا کا فرانک
 				روانڈا کا فرانک
 				روانڈا کا فرانک
+				RWF
 				RF
 			
 			
 				سعودی ریال
 				سعودی ریال
 				سعودی ریال
+				SAR
 			
 			
 				سولومن آئلینڈز ڈالر
 				سولومن آئلینڈز ڈالر
 				سولومن آئلینڈز ڈالر
+				SBD
 				$
 			
 			
 				سشلی کا روپیہ
 				سشلی کا روپیہ
 				سشلی کا روپیہ
+				SCR
 			
 			
 				سوڈانی پاؤنڈ
 				سوڈانی پاؤنڈ
 				سوڈانی پاؤنڈ
+				SDG
 			
 			
 				سویڈن کرونا
 				سویڈن کرونا
 				سویڈن کرونر
+				SEK
 				kr
 			
 			
 				سنگا پور ڈالر
 				سنگا پور ڈالر
 				سنگا پور ڈالر
+				SGD
 				$
 			
 			
 				سینٹ ہیلینا پاؤنڈ
 				سینٹ ہیلینا پاؤنڈ
 				سینٹ ہیلینا پاؤنڈ
+				SHP
 				£
 			
 			
@@ -5982,44 +6166,53 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				سیئرا لیون لیون
 				سیئرا لیون لیون
 				سیئرا لیون لیون
+				SLL
 			
 			
 				صومالی شلنگ
 				صومالی شلنگ
 				صومالی شلنگ
+				SOS
 			
 			
 				سورینامی ڈالر
 				سورینامی ڈالر
 				سورینامی ڈالر
+				SRD
 				$
 			
 			
 				جنوبی سوڈانی پاؤنڈ
 				جنوبی سوڈانی پاؤنڈ
 				جنوبی سوڈانی پاؤنڈز
+				SSP
 				£
 			
 			
 				ساؤ ٹوم اور پرنسپے ڈوبرا (1977–2017)
 				ساؤ ٹوم اور پرنسپے ڈوبرا (1977–2017)
 				ساؤ ٹوم اور پرنسپے ڈوبرا (1977–2017)
+				STD
 			
 			
-				ساؤ ٹوم اور پرنسپے ڈوبرا
-				ساؤ ٹوم اور پرنسپے ڈوبرا
-				ساؤ ٹوم اور پرنسپے ڈوبرا
+				ساؤ ٹومے اور پرنسپے ڈوبرا
+				ساؤ ٹومے اور پرنسپے ڈوبرا
+				ساؤ ٹومے اور پرنسپے ڈوبرا
+				STN
+				Db
 			
 			
 				شامی پونڈ
 				شامی پونڈ
 				شامی پونڈ
+				SYP
 				£
 			
 			
 				سوازی لیلانجینی
 				سوازی لیلانجینی
 				سوازی لیلانجینی
+				SZL
 			
 			
 				تھائی باہت
@@ -6032,27 +6225,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				تاجکستانی سومونی
 				تاجکستانی سومونی
 				تاجکستانی سومونی
+				TJS
 			
 			
 				ترکمانستانی منات
 				ترکمانستانی منات
 				ترکمانستانی منات
+				TMT
 			
 			
 				تیونیسیائی دینار
 				تیونیسیائی دینار
 				تیونیسیائی دینار
+				TND
 			
 			
 				ٹونگن پانگا
 				ٹونگن پانگا
 				ٹونگن پانگا
+				TOP
 				T$
 			
 			
 				ترکی لیرا
 				ترکی لیرا
 				ترکی لیرا
+				TRY
 				₺
 				TL
 			
@@ -6060,29 +6258,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ترینیداد اور ٹوباگو کا ڈالر
 				ترینیداد اور ٹوباگو کا ڈالر
 				ترینیداد اور ٹوباگو کا ڈالر
+				TTD
 				$
 			
 			
 				نیو تائیوان ڈالر
 				نیو تائیوان ڈالر
 				نیو تائیوان ڈالر
+				NT$
 				NT$
 			
 			
 				تنزانیائی شلنگ
 				تنزانیائی شلنگ
 				تنزانیائی شلنگ
+				TZS
 			
 			
 				یوکرینیائی ہریونیا
 				یوکرینیائی ہریونیا
 				یوکرینیائی ہریونیا
+				UAH
 				₴
 			
 			
 				یوگانڈا شلنگ
 				یوگانڈا شلنگ
 				یوگانڈا شلنگ
+				UGX
 			
 			
 				امریکی ڈالر
@@ -6095,12 +6298,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				یوروگویان پیسو
 				یوروگویان پیسو
 				یوروگویان پیسو
+				UYU
 				$
 			
 			
-				ازبکستان سوم
-				ازبکستان سوم
-				ازبکستان سوم
+				ازبکستانی سوم
+				ازبکستانی سوم
+				ازبکستانی سوم
+				UZS
 			
 			
 				وینزویلا بولیور (1871–2008)
@@ -6109,49 +6314,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				وینزویلا بولیور (2008–2018)
 				وینزویلا بولیور (2008–2018)
 				وینزویلا بولیور (2008–2018)
+				VEF
 				Bs
 			
 			
 				وینزویلا بولیور
 				وینزویلا بولیور
 				وینزویلا بولیور
+				VES
 			
 			
 				ویتنامی ڈانگ
 				ویتنامی ڈانگ
 				ویتنامی ڈانگ
+				₫
 				₫
 			
 			
 				وینوواتو واتو
 				وینوواتو واتو
 				وینوواتو واتو
+				VUV
 			
 			
 				ساموآ کا ٹالا
 				ساموآ کا ٹالا
 				ساموآ کا ٹالا
+				WST
 			
 			
 				وسطی افریقی [CFA] فرانک
 				وسطی افریقی [CFA] فرانک
 				وسطی افریقی [CFA] فرانک
+				FCFA
 			
 			
 				مشرقی کریبیا کا ڈالر
 				مشرقی کریبیا کا ڈالر
 				مشرقی کریبیا کا ڈالر
+				EC$
 				$
 			
 			
 				مغربی افریقی [CFA] فرانک
 				مغربی افریقی [CFA] فرانک
 				مغربی افریقی [CFA] فرانک
+				CFA
 			
 			
 				CFP فرانک
 				CFP فرانک
 				CFP فرانکس
+				CFPF
 			
 			
 				نامعلوم کرنسی
@@ -6162,11 +6376,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				یمنی ریال
 				یمنی ریال
 				یمنی ریال
+				YER
 			
 			
 				جنوبی افریقی رانڈ
 				جنوبی افریقی رانڈ
 				جنوبی افریقی رانڈ
+				ZAR
 				R
 			
 			
@@ -6176,11 +6392,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				زامبیائی کواچا
 				زامبیائی کواچا
 				زامبیائی کواچا
+				ZMW
 				ZK
 			
 		
 		
+			~{0}
 			≥{0}
+			≤{0}
 			{0}–{1}
 		
 		
@@ -6315,14 +6534,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} فی ہزار
 			
 			
-				‱
-				{0}‱
-				{0} ‱
+				پرمرئیڈ
+				{0} پرمرئیڈ
+				{0} پرمرئیڈ
 			
 			
-				مولز
-				{0} مول
-				{0} مولز
+				مولز
+				{0} مول
+				{0} مولز
 			
 			
 				لیٹر فی کلومیٹر
@@ -6404,6 +6623,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} صدی
 				{0} صدیاں
 			
+			
+				دہائیاں
+				{0} دہائی
+				{0} دہائیاں
+			
 			
 				سال
 				{0} سال
@@ -6512,24 +6736,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} کلو واٹ آور
 			
 			
-				الیکٹرون وولٹس
-				{0} الیکٹرون وولٹ
-				{0} الیکٹرون وولٹس
+				الیکٹرون وولٹس
+				{0} الیکٹرون وولٹ
+				{0} الیکٹرون وولٹس
 			
 			
-				برطانوی تھرمل اکائیاں
-				{0} برطانوی تھرمل اکائی
-				{0} برطانوی تھرمل اکائیاں
+				برطانوی تھرمل اکائیاں
+				{0} برطانوی تھرمل اکائی
+				{0} برطانوی تھرمل اکائیاں
+			
+			
+				امریکی تھرمز
+				{0} امریکی تھرم
+				{0} امریکی تھرمز
 			
 			
-				پاؤنڈز قوت
-				{0} پاؤنڈ قوت
-				{0} پاؤنڈز قوت
+				پاؤنڈز قوت
+				{0} پاؤنڈ قوت
+				{0} پاؤنڈز قوت
 			
 			
-				نیوٹنز
-				{0} نیوٹن
-				{0} نیوٹنز
+				نیوٹنز
+				{0} نیوٹن
+				{0} نیوٹنز
 			
 			
 				گیگاہرٹز
@@ -6551,6 +6780,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ہرٹز
 				{0} ہرٹز
 			
+			
+				ٹائپوگرافک em
+				{0} em
+				{0} ems
+			
+			
+				پکسلز
+				{0} پکسل
+				{0} پکسلز
+			
+			
+				میگا پکسلز
+				{0} میگا پکسل
+				{0} میگا پکسلز
+			
+			
+				پکسلز فی سینٹی میٹر
+				{0} پکسل فی سینٹی میٹر
+				{0} پکسلز فی سینٹی میٹر
+			
+			
+				پکسلز فی انچ
+				{0} پکسل فی انچ
+				{0} پکسلز فی انچ
+			
+			
+				ڈاٹس فی سینٹی میٹر
+				{0} ڈاٹ فی سینٹی میٹر
+				{0} ڈاٹس فی سینٹی میٹر
+			
+			
+				ڈاٹس فی انچ
+				{0} ڈاٹ فی انچ
+				{0} ڈاٹس فی انچ
+			
 			
 				کلو میٹر
 				{0} کلو میٹر
@@ -6647,9 +6911,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} پوائنٹس
 			
 			
-				شمسی رداس
-				{0} شمسی رداس
-				{0} شمسی رداس
+				شمسی رداس
+				{0} شمسی رداس
+				{0} شمسی رداس
 			
 			
 				lux
@@ -6657,9 +6921,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lux
 			
 			
-				شمسی چمک
-				{0} شمسی چمک
-				{0} شمسی چمک
+				شمسی چمک
+				{0} شمسی چمک
+				{0} شمسی چمک
 			
 			
 				میٹرک ٹن
@@ -6765,11 +7029,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ہارس پاور
 				{0} ہارس پاور
 			
-			
-				ہیکٹو پاسکل
-				{0} ہیکٹو پاسکل
-				{0} ہیکٹو پاسکل
-			
 			
 				ملی میٹر مرکری
 				{0} ملی میٹر مرکری
@@ -6785,6 +7044,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} انچ مرکری
 				{0} انچ مرکری
 			
+			
+				بارز
+				{0} بار
+				{0} بارز
+			
 			
 				ملی بار
 				{0} ملی بار
@@ -6795,6 +7059,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ماحول
 				{0} ماحول
 			
+			
+				پاسکل
+				{0} پاسکل
+				{0} پاسکل
+			
+			
+				ہیکٹو پاسکل
+				{0} ہیکٹو پاسکل
+				{0} ہیکٹو پاسکل
+			
 			
 				کلو پاسکلز
 				{0} کلو پاسکل
@@ -6846,14 +7120,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} کیلون
 			
 			
-				پاؤنڈ فٹ
-				{0} پاؤنڈ فٹ
-				{0} پاؤنڈ فٹ
+				پاؤنڈ فٹ
+				{0} پاؤنڈ فٹ
+				{0} پاؤنڈ فٹ
 			
 			
-				نیوٹن میٹر
-				{0} نیوٹن میٹر
-				{0} نیوٹن میٹر
+				نیوٹن میٹر
+				{0} نیوٹن میٹر
+				{0} نیوٹن میٹر
 			
 			
 				کیوبک کلو میٹر
@@ -6971,9 +7245,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} فلوئڈ اونس
 			
 			
-				اہم سیال اونس
-				{0} اہم سیال اونس
-				{0} اہم سیال اونس
+				امپیریل فلوئڈ اونس
+				{0} امپیریئل فلوئڈ اونس
+				{0} امپیریئل فلوئڈ اونس
 			
 			
 				ٹیبل سپون
@@ -6986,9 +7260,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ٹی سپون
 			
 			
-				بیرلز
-				{0} بیرل
-				{0} بیرلز
+				بیرلز
+				{0} بیرل
+				{0} بیرلز
 			
 			
 				کارڈینل ڈائریکشن
@@ -7123,14 +7397,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‰
 			
 			
-				‱
-				{0}‱
-				{0}‱
+				پرمرئیڈ
 			
 			
-				مول
-				{0} مول
-				{0} مول
+				مول
+				{0} مول
+				{0} مول
 			
 			
 				L/km
@@ -7212,6 +7484,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} صدی
 				{0} صدیاں
 			
+			
+				دہائی
+				{0} دہائی
+				{0} دہائی
+			
 			
 				سال
 				{0} سال
@@ -7320,24 +7597,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kWh
 			
 			
-				الیکٹرون وولٹ
-				{0} eV
-				{0} eV
+				الیکٹرون وولٹ
 			
 			
-				BTU
-				{0} Btu
-				{0} Btu
+				BTU
+			
+			
+				امریکی تھرم
+				{0} امریکی تھرم
+				{0} امریکی تھرمز
 			
 			
-				پاؤنڈ قوت
-				{0} lbf
-				{0} lbf
+				پاؤنڈ قوت
 			
 			
-				نیوٹن
-				{0} N
-				{0} N
+				نیوٹن
 			
 			
 				GHz
@@ -7359,6 +7633,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Hz
 				{0} Hz
 			
+			
+				پکسلز
+			
+			
+				میگا پکسلز
+			
 			
 				کلو میٹر
 				{0} کلو میٹر
@@ -7449,10 +7729,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} smi
 				{0} smi
 			
+			
+				پوائنٹس
+				{0} pt
+				{0} pt
+			
 			
-				شمسی رداس
-				{0} R☉
-				{0} R☉
+				شمسی رداس
 			
 			
 				lux
@@ -7460,9 +7743,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} lx
 			
 			
-				شمسی چمک
-				{0} L☉
-				{0} L☉
+				شمسی چمک
 			
 			
 				t
@@ -7496,6 +7777,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tn
 				{0} tn
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				پاؤنڈ
 				{0} lb
@@ -7563,11 +7849,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				hPa
-				{0} hPa
-				{0} hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -7583,6 +7864,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} inHg
 				{0} inHg
 			
+			
+				بار
+				{0} بار
+				{0} بارز
+			
 			
 				mbar
 				{0} mbar
@@ -7593,6 +7879,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				hPa
+				{0} hPa
+				{0} hPa
+			
 			
 				kPa
 				{0} kPa
@@ -7643,16 +7934,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} K
 				{0} K
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-				{0} N⋅m
-			
 			
 				km³
 				{0} km³
@@ -7768,11 +8049,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 				{0} fl oz
 			
-			
-				Imp. fl oz
-				{0} fl oz Imp.
-				{0} fl oz Imp.
-			
 			
 				tbsp
 				{0} tbsp
@@ -7784,9 +8060,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} tsp
 			
 			
-				بیرل
-				{0} bbl
-				{0} bbl
+				بیرل
 			
 			
 				ڈائریکشن
@@ -7816,10 +8090,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}″
 				{0}″
 			
+			
+				{0} km²
+				{0} km²
+			
 			
 				{0} ہیکٹر
 				{0} ہیکٹر
 			
+			
+				{0} m²
+				{0} m²
+			
 			
 				{0}mi²
 				{0}mi²
@@ -7956,13 +8238,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} گرام
 				{0} فی گرام
 			
+			
+				st
+				{0} st
+				{0} st
+			
 			
 				{0} پونڈ
 				{0} پونڈ
 			
 			
+				oz
 				{0} ونس
 				{0} ونس
+				{0}/oz
 			
 			
 				{0}kW
@@ -7976,9 +8265,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}hp
 				{0}hp
 			
-			
-				{0}hPa
-				{0}hPa
+			
+				mm Hg
+				{0} mm Hg
+				{0} mm Hg
+			
+			
+				psi
+				{0} psi
+				{0} psi
 			
 			
 				″ Hg
@@ -7986,9 +8281,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} انچ مرکری
 			
 			
+				mbar
 				{0}mb
 				{0}mb
 			
+			
+				hPa
+				{0}hPa
+				{0}hPa
+			
 			
 				km/hr
 				{0}kph
@@ -8004,6 +8305,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}mph
 				{0}mph
 			
+			
+				°
+				{0}°
+				{0}°
+			
 			
 				⁰C
 				{0}‎°
@@ -8013,6 +8319,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}‎°F
 				{0}‎°F
 			
+			
+				K
+				{0} K
+				{0} K
+			
 			
 				km³
 				{0}km³
@@ -8060,10 +8371,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} یا {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
+			{0}، {1}
+			{0}، {1}
 		
 		
 			{0}، {1}
@@ -8075,7 +8384,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, {1}
 			{0}, {1}
 			{0}، اور {1}
-			{0} اور {1}
+			{0}، {1}
 		
 		
 			{0}، {1}
diff --git a/make/data/cldr/common/main/ur_IN.xml b/make/data/cldr/common/main/ur_IN.xml
index 893bf3e909e..ac635bfdf2a 100644
--- a/make/data/cldr/common/main/ur_IN.xml
+++ b/make/data/cldr/common/main/ur_IN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
@@ -217,7 +217,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			GMT{0}
 			{0} دن کا وقت
-			{0} معیاری وقت
 			
 				کیمبرج بے
 			
diff --git a/make/data/cldr/common/main/ur_PK.xml b/make/data/cldr/common/main/ur_PK.xml
index 0c504b17662..9efa5146992 100644
--- a/make/data/cldr/common/main/ur_PK.xml
+++ b/make/data/cldr/common/main/ur_PK.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/uz.xml b/make/data/cldr/common/main/uz.xml
index 6040cf767b4..6a9807a116d 100644
--- a/make/data/cldr/common/main/uz.xml
+++ b/make/data/cldr/common/main/uz.xml
@@ -9,7 +9,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 -->
 
 	
-		
+		
 		
 	
 	
@@ -66,6 +66,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			bugi
 			blin
 			katalan
+			chakma
 			chechen
 			sebuan
 			chiga
@@ -415,10 +416,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			idish
 			yoruba
 			kanton
+			xitoy, kanton
 			tamazigxt
 			xitoy
+			xitoy, mandarin
 			xitoy (soddalashgan)
+			xitoy (soddalashtirilgan mandarin)
 			xitoy (an’anaviy)
+			xitoy (an’anaviy mandarin)
 			zulu
 			zuni
 			til tarkibi yo‘q
@@ -734,6 +739,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint-Marten
 			Suriya
 			Svazilend
+			Svazilend
 			Tristan-da-Kunya
 			Turks va Kaykos orollari
 			Chad
@@ -770,6 +776,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Uollis va Futuna
 			Samoa
+			Qalbaki urg‘u
+			Qalbaki Bidi
 			Kosovo
 			Yaman
 			Mayotta
@@ -866,8 +874,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[a b d e f g h i j k l m n o p q r s t u v x y z {oʻ} {gʻ} {sh} {ch} ʼ]
 		[c w]
 		[A B D E F G H I J K L M N O P Q R S T U V X Y Z {Oʻ} {Gʻ} {Sh} {Ch}]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” „ « » ( ) \[ \] \{ \} § @ * / \& # ′ ″]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” „ « » ( ) \[ \] \{ \} § @ * / \& # ′ ″]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1639,22 +1647,94 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				
 					
+						
+							Muh.
+							Saf.
+							Rob. avv.
+							Rob. ox.
+							Jum. avv.
+							Jum. ox.
+							Raj.
+							Sha.
+							Ram.
+							Shav.
+							Zul-q.
+							Zul-h.
+						
 						
 							Muharram
 							Safar
-							Robiʼ ul-avval
-							Robiʼ ul-oxir
+							Robi’ ul-avval
+							Robi’ ul-oxir
 							Jumad ul-avval
 							Jumad ul-oxir
 							Rajab
-							Shaʼbon
+							Sha’bon
 							Ramazon
 							Shavvol
-							Zul-qaʼda
+							Zul-qa’da
+							Zul-hijja
+						
+					
+					
+						
+							Muh.
+							Saf.
+							Rob. avv.
+							Rob. ox.
+							Jum. avv.
+							Jum. ox.
+							Raj.
+							Sha.
+							Ram.
+							Shav.
+							Zul-q.
+							Zul-h.
+						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
+						
+							Muharram
+							Safar
+							Robi’ ul-avval
+							Robi’ ul-oxir
+							Jumad ul-avval
+							Jumad ul-oxir
+							Rajab
+							Sha’bon
+							Ramazon
+							Shavvol
+							Zul-qa’da
 							Zul-hijja
 						
 					
 				
+				
+					
+						Hijriy yil
+					
+				
+				
+					
+						MMM, y (G)
+						d-MMM, y G
+						MMMM, y G
+						QQQ, y (G)
+						QQQQ, y (G)
+					
+				
 			
 		
 		
@@ -1683,7 +1763,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				yil
-				oʻtgan yil
+				o‘ʻtgan yil
 				bu yil
 				keyingi yil
 				
@@ -1697,7 +1777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				yil
-				oʻtgan yil
+				o‘tgan yil
 				bu yil
 				keyingi yil
 				
@@ -1761,6 +1841,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				oy
+				o‘tgan oy
+				bu oy
+				keyingi oy
 				
 					{0} oydan keyin
 					{0} oydan keyin
@@ -1772,6 +1855,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				oy
+				o‘tgan oy
+				bu oy
+				keyingi oy
 				
 					{0} oydan keyin
 					{0} oydan keyin
@@ -1798,6 +1884,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				hafta
+				o‘tgan hafta
+				bu hafta
+				keyingi hafta
 				
 					{0} haftadan keyin
 					{0} haftadan keyin
@@ -1810,6 +1899,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				hafta
+				o‘tgan hafta
+				bu hafta
+				keyingi hafta
 				
 					{0} haftadan keyin
 					{0} haftadan keyin
@@ -2971,6 +3063,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Oqto‘ba
 			
+			
+				Kustanay
+			
 			
 				Qizilo‘rda
 			
@@ -4474,6 +4569,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
+			٫
+			٬
 			٪
 			+
 			-
@@ -4488,6 +4585,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			,
 			 
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -4495,7 +4594,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			son emas
 			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 ming
@@ -4633,743 +4744,980 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Birlashgan Arab Amirliklari dirhami
 				BAA dirhami
 				BAA dirhami
+				AED
 			
 			
 				Afg‘oniston afg‘oniysi
 				Afg‘oniston afg‘oniysi
 				Afg‘oniston afg‘oniysi
+				AFN
 			
 			
 				Albaniya leki
 				Albaniya leki
 				Albaniya leki
+				ALL
 			
 			
 				Armaniston drami
 				Armaniston drami
 				Armaniston drami
+				AMD
 			
 			
 				Niderlandiya antil guldeni
 				Niderlandiya antil guldeni
 				Niderlandiya antil guldeni
+				ANG
 			
 			
 				Angola kvanzasi
 				Angola kvanzasi
 				Angola kvanzasi
+				AOA
+				Kz
 			
 			
 				Argentina pesosi
 				Argentina pesosi
 				Argentina pesosi
+				ARS
+				$
 			
 			
 				Avstraliya dollari
 				Avstraliya dollari
 				Avstraliya dollari
+				A$
+				$
 			
 			
 				Aruba florini
 				Aruba florini
 				Aruba florini
+				AWG
 			
 			
 				Ozarbayjon manati
 				Ozarbayjon manati
 				Ozarbayjon manati
+				AZN
 			
 			
 				Bosniya va Gertsegovina ayirboshlash markasi
 				Bosniya va Gertsegovina ayirboshlash markasi
 				Bosniya va Gertsegovina ayirboshlash markasi
+				BAM
+				KM
 			
 			
 				Barbados dollari
 				Barbados dollari
 				Barbados dollari
+				BBD
+				$
 			
 			
 				Bangladesh takasi
 				Bangladesh takasi
 				Bangladesh takasi
+				BDT
+				৳
 			
 			
 				Bolgariya levi
 				Bolgariya levi
 				Bolgariya levi
+				BGN
 			
 			
 				Bahrayn dinori
 				Bahrayn dinori
 				Bahrayn dinori
+				BHD
 			
 			
 				Burundi franki
 				Burundi franki
 				Burundi franki
+				BIF
 			
 			
 				Bermuda dollari
 				Bermuda dollari
 				Bermuda dollari
+				BMD
+				$
 			
 			
 				Bruney dollari
 				Bruney dollari
 				Bruney dollari
+				BND
+				$
 			
 			
 				Boliviya bolivianosi
 				Boliviya bolivianosi
 				Boliviya bolivianosi
+				BOB
+				Bs
 			
 			
 				Braziliya reali
 				Braziliya reali
 				Braziliya reali
+				R$
+				R$
 			
 			
 				Bagama dollari
 				Bagama dollari
 				Bagama dollari
+				BSD
+				$
 			
 			
 				Butan ngultrumi
 				Butan ngultrumi
 				Butan ngultrumi
+				BTN
 			
 			
 				Botsvana pulasi
 				Botsvana pulasi
 				Botsvana pulasi
+				BWP
+				P
 			
 			
 				Belarus rubli
 				Belarus rubli
 				Belarus rubli
+				BYN
+				р.
 			
 			
 				Belarus rubli (2000–2016)
 				Belarus rubli (2000–2016)
 				Belarus rubli (2000–2016)
+				BYR
 			
 			
 				Beliz dollari
 				Beliz dollari
 				Beliz dollari
+				BZD
+				$
 			
 			
 				Kanada dollari
 				Kanada dollari
 				Kanada dollari
+				CA$
+				$
 			
 			
 				Kongo franki
 				Kongo franki
 				Kongo franki
+				CDF
 			
 			
 				Shveytsariya franki
 				Shveytsariya franki
 				Shveytsariya franki
+				CHF
 			
 			
 				Chili pesosi
 				Chili pesosi
 				Chili pesosi
+				CLP
+				$
 			
 			
 				CNH
 				CNH
 				CNH
+				CNH
 			
 			
 				Xitoy yuani
 				Xitoy yuani
 				Xitoy yuani
+				CN¥
+				¥
 			
 			
 				Kolumbiya pesosi
 				Kolumbiya pesosi
 				Kolumbiya pesosi
+				COP
+				$
 			
 			
 				Kosta-Rika koloni
 				Kosta-Rika koloni
 				Kosta-Rika koloni
+				CRC
+				₡
 			
 			
 				Kuba ayirboshlash pesosi
 				Kuba ayirboshlash pesosi
 				Kuba ayirboshlash pesosi
+				CUC
+				$
 			
 			
 				Kuba pesosi
 				Kuba pesosi
 				Kuba pesosi
+				CUP
+				$
 			
 			
 				Kabo-Verde eskudosi
 				Kabo-Verde eskudosi
 				Kabo-Verde eskudosi
+				CVE
 			
 			
 				Chexiya kronasi
 				Chexiya kronasi
 				Chexiya kronasi
+				CZK
+				Kč
 			
 			
 				Jibuti franki
 				Jibuti franki
 				Jibuti franki
+				DJF
 			
 			
 				Daniya kronasi
 				Daniya kronasi
 				Daniya kronasi
+				DKK
+				kr
 			
 			
 				Dominikana pesosi
 				Dominikana pesosi
 				Dominikana pesosi
+				DOP
+				$
 			
 			
 				Jazoir dinori
 				Jazoir dinori
 				Jazoir dinori
+				DZD
 			
 			
 				Misr funti
 				Misr funti
 				Misr funti
+				EGP
+				E£
 			
 			
 				Eritreya nakfasi
 				Eritreya nakfasi
 				Eritreya nakfasi
+				ERN
 			
 			
 				Efiopiya biri
 				Efiopiya biri
 				Efiopiya biri
+				ETB
 			
 			
 				Yevro
 				yevro
 				yevro
+				€
+				€
 			
 			
 				Fiji dollari
 				Fiji dollari
 				Fiji dollari
+				FJD
+				$
 			
 			
 				Folklend orollari funti
 				Folklend orollari funti
 				Folklend orollari funti
+				FKP
+				£
 			
 			
 				Angliya funt sterlingi
 				Angliya funt sterlingi
 				Angliya funt sterlingi
+				£
+				£
 			
 			
 				Gruziya larisi
 				Gruziya larisi
 				Gruziya larisi
+				GEL
+				₾
 				₾
 			
 			
 				Gana sedisi
 				Gana sedisi
 				Gana sedisi
+				GHS
 			
 			
 				Gibraltar funti
 				Gibraltar funti
 				Gibraltar funti
+				GIP
+				£
 			
 			
 				Gambiya dalasisi
 				Gambiya dalasisi
 				Gambiya dalasisi
+				GMD
 			
 			
 				Gvineya franki
 				Gvineya franki
 				Gvineya franki
+				GNF
+				FG
 			
 			
 				Gvatemala ketsali
 				Gvatemala ketsali
 				Gvatemala ketsali
+				GTQ
+				Q
 			
 			
 				Gayana dollari
 				Gayana dollari
 				Gayana dollari
+				GYD
+				$
 			
 			
 				Gonkong dollari
 				Gonkong dollari
 				Gonkong dollari
+				HK$
+				$
 			
 			
 				Gonduras lempirasi
 				Gonduras lempirasi
 				Gonduras lempirasi
+				HNL
+				L
 			
 			
 				Xorvatiya kunasi
 				Xorvatiya kunasi
 				Xorvatiya kunasi
+				HRK
+				kn
 			
 			
 				Gaiti gurdi
 				Gaiti gurdi
 				Gaiti gurdi
+				HTG
 			
 			
 				Vengriya forinti
 				Vengriya forinti
 				Vengriya forinti
+				HUF
+				Ft
 			
 			
 				Indoneziya rupiyasi
 				Indoneziya rupiyasi
 				Indoneziya rupiyasi
+				IDR
+				Rp
 			
 			
 				Isroil yangi shekeli
 				Isroil yangi shekeli
 				Isroil yangi shekeli
+				₪
+				₪
 			
 			
 				Hindiston rupiyasi
 				Hindiston rupiyasi
 				Hindiston rupiyasi
+				₹
+				₹
 			
 			
 				Iroq dinori
 				Iroq dinori
 				Iroq dinori
+				IQD
 			
 			
 				Eron riyoli
 				Eron riyoli
 				Eron riyoli
+				IRR
 			
 			
 				Islandiya kronasi
 				Islandiya kronasi
 				Islandiya kronasi
+				ISK
+				kr
 			
 			
 				Yamayka dollari
 				Yamayka dollari
 				Yamayka dollari
+				JMD
+				$
 			
 			
 				Iordaniya dinori
 				Yordaniya dinori
 				Iordaniya dinori
+				JOD
 			
 			
 				Yaponiya iyenasi
 				Yaponiya iyenasi
 				Yaponiya iyenasi
+				JP¥
+				¥
 			
 			
 				Keniya shillingi
 				Keniya shillingi
 				Keniya shillingi
+				KES
 			
 			
 				Qirg‘iziston somi
 				Qirg‘iziston somi
 				Qirg‘iziston somi
+				KGS
 			
 			
 				Kambodja rieli
 				Kambodja rieli
 				Kambodja rieli
+				KHR
+				៛
 			
 			
 				Komor orollari franki
 				Komor orollari franki
 				Komor orollari franki
+				KMF
+				CF
 			
 			
 				Shimoliy Koreya voni
 				Shimoliy Koreya voni
 				Shimoliy Koreya voni
+				KPW
+				₩
 			
 			
 				Janubiy Koreya voni
 				Janubiy Koreya voni
 				Janubiy Koreya voni
+				₩
+				₩
 			
 			
 				Kuvayt dinori
 				Kuvayt dinori
 				Kuvayt dinori
+				KWD
 			
 			
 				Kayman orollari dollari
 				Kayman orollari dollari
 				Kayman orollari dollari
+				KYD
+				$
 			
 			
 				Qozog‘iston tengesi
 				Qozog‘iston tengesi
 				Qozog‘iston tengesi
+				KZT
+				₸
 			
 			
 				Laos kipi
 				Laos kipi
 				Laos kipi
+				LAK
+				₭
 			
 			
 				Livan funti
 				Livan funti
 				Livan funti
+				LBP
+				L£
 			
 			
 				Shri-Lanka rupiyasi
 				Shri-Lanka rupiyasi
 				Shri-Lanka rupiyasi
+				LKR
+				Rs
 			
 			
 				Liberiya dollari
 				Liberiya dollari
 				Liberiya dollari
+				LRD
+				$
 			
 			
 				Litva liti
 				Litva liti
 				Litva liti
+				LTL
 			
 			
 				Latviya lati
 				Latviya lati
 				Latviya lati
+				LVL
 			
 			
 				Liviya dinori
 				Liviya dinori
 				Liviya dinori
+				LYD
 			
 			
 				Marokash dirhami
 				Marokash dirhami
 				Marokash dirhami
+				MAD
 			
 			
 				Moldova leyi
 				Moldova leyi
 				Moldova leyi
+				MDL
 			
 			
 				Malagasi ariarisi
 				Malagasi ariarisi
 				Malagasi ariarisi
+				MGA
+				Ar
 			
 			
 				Makedoniya dinori
 				Makedoniya dinori
 				Makedoniya dinori
+				MKD
 			
 			
 				Myanma kyati
 				Myanma kyati
 				Myanma kyati
+				MMK
+				K
 			
 			
 				Mongoliya tugriki
 				Mongoliya tugriki
 				Mongoliya tugriki
+				MNT
+				₮
 			
 			
 				Makao patakasi
 				Makao patakasi
 				Makao patakasi
+				MOP
 			
 			
 				Mavritaniya uqiyasi (1973–2017)
 				Mavritaniya uqiyasi (1973–2017)
 				Mavritaniya uqiyasi (1973–2017)
+				MRO
 			
 			
 				Mavritaniya uqiyasi
 				Mavritaniya uqiyasi
 				Mavritaniya uqiyasi
+				MRU
 			
 			
 				Mavritaniya rupiyasi
 				Mavritaniya rupiyasi
 				Mavritaniya rupiyasi
+				MUR
+				Rs
 			
 			
 				Maldiv rupiyasi
 				Maldiv rupiyasi
 				Maldiv rupiyasi
+				MVR
 			
 			
 				Malavi kvachasi
 				Malavi kvachasi
 				Malavi kvachasi
+				MWK
 			
 			
 				Meksika pesosi
 				Meksika pesosi
 				Meksika pesosi
+				MX$
+				$
 			
 			
 				Malayziya ringgiti
 				Malayziya ringgiti
 				Malayziya ringgiti
+				MYR
+				RM
 			
 			
 				Mozambik metikali
 				Mozambik metikali
 				Mozambik metikali
+				MZN
 			
 			
 				Namibiya dollari
 				Namibiya dollari
 				Namibiya dollari
+				NAD
+				$
 			
 			
 				Nigeriya nayrasi
 				Nigeriya nayrasi
 				Nigeriya nayrasi
+				NGN
+				₦
 			
 			
 				Nikaragua kordobasi
 				Nikaragua kordobasi
 				Nikaragua kordobasi
+				NIO
+				C$
 			
 			
 				Norvegiya kronasi
 				Norvegiya kronasi
 				Norvegiya kronasi
+				NOK
+				kr
 			
 			
 				Nepal rupiyasi
 				Nepal rupiyasi
 				Nepal rupiyasi
+				NPR
+				Rs
 			
 			
 				Yangi Zelandiya dollari
 				Yangi Zelandiya dollari
 				Yangi Zelandiya dollari
+				NZ$
+				$
 			
 			
 				Ummon riyoli
 				Ummon riyoli
 				Ummon riyoli
+				OMR
 			
 			
 				Panama balboasi
 				Panama balboasi
 				Panama balboasi
+				PAB
 			
 			
 				Peru soli
 				Peru soli
 				Peru soli
+				PEN
 			
 			
 				Papua – Yangi Gvineya kinasi
 				Papua – Yangi Gvineya kinasi
 				Papua – Yangi Gvineya kinasi
+				PGK
 			
 			
 				Filippin pesosi
 				Filippin pesosi
 				Filippin pesosi
+				PHP
+				₱
 			
 			
 				Pokiston rupiyasi
 				Pokiston rupiyasi
 				Pokiston rupiyasi
+				PKR
+				Rs
 			
 			
 				Polsha zlotiyi
 				Polsha zlotiyi
 				Polsha zlotiyi
+				PLN
+				zł
 			
 			
 				Paragvay guaranisi
 				Paragvay guaranisi
 				Paragvay guaranisi
+				PYG
+				₲
 			
 			
 				Qatar riyoli
 				Qatar riyoli
 				Qatar riyoli
+				QAR
 			
 			
 				Ruminiya leyi
 				Ruminiya leyi
 				Ruminiya leyi
+				RON
+				lei
 			
 			
 				Serbiya dinori
 				Serbiya dinori
 				Serbiya dinori
+				RSD
 			
 			
 				Rossiya rubli
 				Rossiya rubli
 				Rossiya rubli
+				RUB
+				₽
 			
 			
 				Ruanda franki
 				Ruanda franki
 				Ruanda franki
+				RWF
+				RF
 			
 			
 				Saudiya Arabistoni riyoli
 				Saudiya Arabistoni riyoli
 				Saudiya Arabistoni riyoli
+				SAR
 			
 			
 				Solomon orollari dollari
 				Solomon orollari dollari
 				Solomon orollari dollari
+				SBD
+				$
 			
 			
 				Seyshel rupiyasi
 				Seyshel rupiyasi
 				Seyshel rupiyasi
+				SCR
 			
 			
 				Sudan funti
 				Sudan funti
 				Sudan funti
+				SDG
 			
 			
 				Shvetsiya kronasi
 				Shvetsiya kronasi
 				Shvetsiya kronasi
+				SEK
+				kr
 			
 			
 				Singapur dollari
 				Singapur dollari
 				Singapur dollari
+				SGD
+				$
 			
 			
 				Muqaddas Yelena oroli funti
 				Muqaddas Yelena oroli funti
 				Muqaddas Yelena oroli funti
+				SHP
+				£
 			
 			
 				Syerra-Leone leonesi
 				Syerra-Leone leonesi
 				Syerra-Leone leonesi
+				SLL
 			
 			
 				Somali shillingi
 				Somali shillingi
 				Somali shillingi
+				SOS
 			
 			
 				Surinam dollari
 				Surinam dollari
 				Surinam dollari
+				SRD
+				$
 			
 			
 				Janubiy Sudan funti
 				Janubiy Sudan funti
 				Janubiy Sudan funti
+				SSP
+				£
 			
 			
 				San-Tome va Prinsipi dobrasi (1977–2017)
 				San-Tome va Prinsipi dobrasi (1977–2017)
 				San-Tome va Prinsipi dobrasi (1977–2017)
+				STD
 			
 			
 				San-Tome va Prinsipi dobrasi
 				San-Tome va Prinsipi dobrasi
 				San-Tome va Prinsipi dobrasi
+				STN
 				Db
 			
 			
 				Suriya funti
 				Suriya funti
 				Suriya funti
+				SYP
+				£
 			
 			
 				Svazilend lilangenisi
 				Svazilend lilangenisi
 				Svazilend lilangenisi
+				SZL
 			
 			
 				Tailand bati
 				Tailand bati
 				Tailand bati
+				THB
+				฿
 			
 			
 				Tojikiston somoniysi
 				Tojikiston somoniysi
 				Tojikiston somoniysi
+				TJS
 			
 			
 				Turkmaniston manati
 				Turkmaniston manati
 				Turkmaniston manati
+				TMT
 			
 			
 				Tunis dinori
 				Tunis dinori
 				Tunis dinori
+				TND
 			
 			
 				Tonga paangasi
 				Tonga paangasi
 				Tonga paangasi
+				TOP
+				T$
 			
 			
 				Turk lirasi
 				Turk lirasi
 				Turk lirasi
+				TRY
+				₺
+				TL
 			
 			
 				Trinidad va Tobago dollari
 				Trinidad va Tobago dollari
 				Trinidad va Tobago dollari
+				TTD
+				$
 			
 			
 				Yangi Tayvan dollari
 				Yangi Tayvan dollari
 				Yangi Tayvan dollari
+				NT$
+				$
 			
 			
 				Tanzaniya shillingi
 				Tanzaniya shillingi
 				Tanzaniya shillingi
+				TZS
 			
 			
 				Ukraina grivnasi
 				Ukraina grivnasi
 				Ukraina grivnasi
+				UAH
+				₴
 			
 			
 				Uganda shillingi
 				Uganda shillingi
 				Uganda shillingi
+				UGX
 			
 			
 				AQSH dollari
 				AQSH dollari
 				AQSH dollari
+				US$
+				$
 			
 			
 				Urugvay pesosi
 				Urugvay pesosi
 				Urugvay pesosi
+				UYU
+				$
 			
 			
 				O‘zbekiston so‘mi
@@ -5381,46 +5729,58 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Venesuela bolivari (2008–2018)
 				Venesuela bolivari (2008–2018)
 				Venesuela bolivari (2008–2018)
+				VEF
+				Bs
 			
 			
 				Venesuela bolivari
 				Venesuela bolivari
 				Venesuela bolivari
+				VES
 			
 			
 				Vyetnam dongi
 				Vyetnam dongi
 				Vyetnam dongi
+				₫
+				₫
 			
 			
 				Vanuatu vatusi
 				Vanuatu vatusi
 				Vanuatu vatusi
+				VUV
 			
 			
 				Samoa talasi
 				Samoa talasi
 				Samoa talasi
+				WST
 			
 			
 				Markaziy Afrika CFA franki
 				Markaziy Afrika CFA franki
 				Markaziy Afrika CFA franki
+				FCFA
 			
 			
 				Sharqiy Karib dollari
 				Sharqiy Karib dollari
 				Sharqiy Karib dollari
+				EC$
+				$
 			
 			
 				G‘arbiy Afrika CFA franki
 				G‘arbiy Afrika CFA franki
 				G‘arbiy Afrika CFA franki
+				CFA
 			
 			
 				Fransuz Polineziyasi franki
 				Fransuz Polineziyasi franki
 				Fransuz Polineziyasi franki
+				CFPF
 			
 			
 				Noma’lum valyuta
@@ -5431,16 +5791,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Yaman riyoli
 				Yaman riyoli
 				Yaman riyoli
+				YER
 			
 			
 				Janubiy Afrika rendi
 				Janubiy Afrika rendi
 				Janubiy Afrika rendi
+				ZAR
+				R
 			
 			
 				Zambiya kvachasi
 				Zambiya kvachasi
 				Zambiya kvachasi
+				ZMW
+				ZK
 			
 		
 		
@@ -5545,11 +5910,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} kvadrat dyum
 				{0}/kvadrat duym
 			
-			
-				dunam
-				{0} dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -5585,11 +5945,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} promiriada
 				{0} promiriada
 			
-			
-				mol
-				{0} mol
-				{0} mol
-			
 			
 				litr/kilometr
 				{0} litr/kilometr
@@ -5670,6 +6025,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} asr
 				{0} asr
 			
+			
+				dekada
+				{0} dekada
+				{0} dekada
+			
 			
 				yil
 				{0} yil
@@ -5787,6 +6147,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Britaniya issiqlik birligi
 				{0} Britaniya issiqlik birligi
 			
+			
+				AQSH termi
+				{0} AQSH termi
+				{0} AQSH termi
+			
 			
 				funt-kuch
 				{0} funt-kuch
@@ -5817,6 +6182,39 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} gers
 				{0} gers
 			
+			
+				tipografik em
+			
+			
+				piksel
+				{0} piksel
+				{0} piksel
+			
+			
+				megapiksel
+				{0} megapiksel
+				{0} megapiksel
+			
+			
+				piksel/santimetr
+				{0} piksel/santimetr
+				{0} piksel/santimetr
+			
+			
+				piksel/duym
+				{0} piksel/duym
+				{0} piksel/duym
+			
+			
+				nuqta/santimetr
+				{0} nuqta/santimetr
+				{0} nuqta/santimetr
+			
+			
+				nuqta/duym
+				{0} nuqta/duym
+				{0} nuqta/duym
+			
 			
 				kilometr
 				{0} kilometr
@@ -6026,11 +6424,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} ot kuchi
 				{0} ot kuchi
 			
-			
-				gektopaskal
-				{0} gektopaskal
-				{0} gektopaskal
-			
 			
 				mm simob ustuni
 				{0} mm simob ustuni
@@ -6056,6 +6449,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atmosfera
 				{0} atmosfera
 			
+			
+				paskal
+				{0} paskal
+				{0} paskal
+			
+			
+				gektopaskal
+				{0} gektopaskal
+				{0} gektopaskal
+			
 			
 				kilopaskal
 				{0} kilopaskal
@@ -6263,6 +6666,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				grav. kuchi
 				{0} G
@@ -6350,8 +6756,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dunam
-				{0} dunam
-				{0} dunam
+				{0} dunam
+				{0} dunam
 			
 			
 				karat
@@ -6385,13 +6791,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				promiriada
-				{0}‱
-				{0}‱
+				{0}‱
+				{0}‱
 			
 			
 				mol
-				{0} mol
-				{0} mol
+				{0} mol
+				{0} mol
 			
 			
 				litr/km
@@ -6473,6 +6879,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} asr
 				{0} asr
 			
+			
+				dekada
+				{0} dekada
+				{0} dekada
+			
 			
 				yil
 				{0} yil
@@ -6582,14 +6993,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				elektronvolt
-				{0} eV
-				{0} eV
+				{0} eV
+				{0} eV
 			
 			
 				BTU
 				{0} BTU
 				{0} BTU
 			
+			
+				AQSH termi
+				{0} AQSH termi
+				{0} AQSH termi
+			
 			
 				funt-kuch
 				{0} funt-kuch
@@ -6597,8 +7013,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				nyuton
-				{0} N
-				{0} N
+				{0} N
+				{0} N
 			
 			
 				GGs
@@ -6620,6 +7036,41 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} Gs
 				{0} Gs
 			
+			
+				em
+				{0} em
+				{0} em
+			
+			
+				piksel
+				{0} px
+				{0} px
+			
+			
+				megapiksel
+				{0} MP
+				{0} MP
+			
+			
+				px/sm
+				{0} px/sm
+				{0} px/sm
+			
+			
+				piksel/duym
+				{0} piksel/duym
+				{0} piksel/duym
+			
+			
+				nuqta/sm
+				{0} nuqta/sm
+				{0} nuqta/sm
+			
+			
+				nuqta/duym
+				{0} nuqta/duym
+				{0} nuqta/duym
+			
 			
 				km
 				{0} km
@@ -6717,8 +7168,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				quyosh radiusi
-				{0} R☉
-				{0} R☉
+				{0} R☉
+				{0} R☉
 			
 			
 				lk
@@ -6727,8 +7178,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				quyosh nuri kuchi
-				{0} L☉
-				{0} L☉
+				{0} L☉
+				{0} L☉
 			
 			
 				t
@@ -6786,18 +7237,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				dalton
-				{0} Da
-				{0} Da
+				{0} Da
+				{0} Da
 			
 			
 				Yer massasi
-				{0} M⊕
-				{0} M⊕
+				{0} M⊕
+				{0} M⊕
 			
 			
 				quyosh massasi
-				{0} M☉
-				{0} M☉
+				{0} M☉
+				{0} M☉
 			
 			
 				GVt
@@ -6829,11 +7280,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} o.k.
 				{0} o.k.
 			
-			
-				gPa
-				{0} gPa
-				{0} gPa
-			
 			
 				mm sim.ust
 				{0} mm sim.ust
@@ -6849,6 +7295,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} dy sim.ust
 				{0} dy sim.ust
 			
+			
+				bar
+				{0} bar
+				{0} bar
+			
 			
 				mbar
 				{0} mbar
@@ -6859,15 +7310,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} atm
 				{0} atm
 			
+			
+				Pa
+				{0} Pa
+				{0} Pa
+			
+			
+				gPa
+				{0} gPa
+				{0} gPa
+			
 			
 				kPa
-				{0} kPa
-				{0} kPa
+				{0} kPa
+				{0} kPa
 			
 			
 				MPa
-				{0} MPa
-				{0} MPa
+				{0} MPa
+				{0} MPa
 			
 			
 				km/soat
@@ -6916,8 +7377,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				N⋅m
-				{0} N⋅m
-				{0} N⋅m
+				{0} N⋅m
+				{0} N⋅m
 			
 			
 				km³
@@ -7230,10 +7691,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} hp
 				{0} hp
 			
-			
-				{0} hPa
-				{0} hPa
-			
 			
 				{0} inHg
 				{0} inHg
@@ -7242,6 +7699,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mbar
 				{0} mbar
 			
+			
+				{0} hPa
+				{0} hPa
+			
 			
 				km/soat
 				{0} km/soat
diff --git a/make/data/cldr/common/main/uz_Arab.xml b/make/data/cldr/common/main/uz_Arab.xml
index ecee17f1920..6b8cf45d41c 100644
--- a/make/data/cldr/common/main/uz_Arab.xml
+++ b/make/data/cldr/common/main/uz_Arab.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 			
-			
-			
 			
 			
 			
@@ -589,8 +590,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
-			
+			
 			
 			
 			
@@ -608,40 +608,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
 			
 			
 			
-			
-			
 			
 			
-			
+			
 			
-			
-			
 			
 			
 			
 			
 			
-			
-			
+			
+			
 			
 			
 			
 			
 			
 			
-			
 			
 			
 			
 			
-			
-			
+			
 			
 			
 			
@@ -671,28 +664,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
-			
 			
 			
-			
 			
-			
 			
 			
 			
 			
-			
 			
 			
 			
 			
-			
 			
-			
 			
 			
-			
 			
 			
 			
@@ -700,10 +685,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
-			
 			
 			
 			
@@ -712,9 +695,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
-			
 			
 			
 			
@@ -724,13 +705,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
-			
-			
 			
-			
 			
 			
 			
@@ -756,14 +733,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
 			
 			
-			
 			
-			
+			
 			
 			
 			
@@ -789,9 +764,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Nam Á
 			Đông Nam Á
 			Nam Âu
-			Úc và New Zealand
+			Australasia
 			Melanesia
-			Vùng Micronesian
+			Vùng Micronesia
 			Polynesia
 			Châu Á
 			Trung Á
@@ -880,7 +855,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tây Ban Nha
 			Ethiopia
 			Liên Minh Châu Âu
-			Khu vực đồng Euro
+			Khu vực đồng Euro
 			Phần Lan
 			Fiji
 			Quần đảo Falkland
@@ -892,7 +867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vương quốc Anh
 			Vương quốc Anh
 			Grenada
-			Gruzia
+			Georgia
 			Guiana thuộc Pháp
 			Guernsey
 			Ghana
@@ -1032,6 +1007,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sint Maarten
 			Syria
 			Swaziland
+			Eswatini
 			Tristan da Cunha
 			Quần đảo Turks và Caicos
 			Chad
@@ -1068,8 +1044,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Vanuatu
 			Wallis và Futuna
 			Samoa
-			XA
-			XB
+			Pseudo-Accents
+			Pseudo-Bidi
 			Kosovo
 			Yemen
 			Mayotte
@@ -1085,103 +1061,64 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Tiếng Pháp từ Cuối thời Trung cổ đến 1606
 			Tiếng Pháp Hiện đại Thời kỳ đầu
 			Hàn lâm
-			ABL1943
-			AKUAPEM
 			La Mã hóa ALA-LC, ấn bản năm 1997
 			Phương ngữ Aluku
-			AO1990
-			ARANES
 			Tiếng Armenia Miền Đông
 			Tiếng Armenia Miền Tây
-			ASANTE
-			AUVERN
 			Bảng chữ cái La-tinh Tiếng Turk Hợp nhất
-			BALANKA
-			BARLA
-			BASICENG
 			Phương ngữ San Giorgio/Bila
 			Bảng chữ cái Bohorič
 			Tiếng Boontling
-			CISAUP
-			COLB1945
-			CORNU
-			CREISS
 			Bảng chữ cái Dajnko
-			EKAVSK
 			Tiếng Anh Hiện đại Thời kỳ đầu
 			Ngữ âm học IPA
-			FONKIRSH
-			FONNAPA
 			Ngữ âm học UPA
-			GASCON
-			GRCLASS
-			GRITAL
-			GRMISTR
 			La mã hóa Hepburn
-			HSISTEMO
-			IJEKAVSK
-			IVANCHOV
 			Phép chính tả Chung
-			KOCIEWIE
 			Phép chính tả Chuẩn
-			LEMOSIN
-			LENGADOC
 			Phương ngữ Lipovaz của người Resian
 			Bảng chữ cái Metelko
 			Đơn âm
 			Phương ngữ Ndyuka
 			Phương ngữ Natisone
-			NEWFOUND
-			NICARD
 			Phương ngữ Gniva/Njiva
 			Tiếng Volapük Hiện đại
 			Phương ngữ Oseacco/Osojane
-			OXENDICT
-			PAHAWH2
-			PAHAWH3
-			PAHAWH4
 			Phương ngữ Pamaka
 			La Mã hóa Bính âm
 			Đa âm
 			Máy tính
-			PROVENC
 			Phép chính tả Sửa đổi
 			Tiếng Volapük Cổ điển
 			Tiếng Resian
 			Tiếng Saho
 			Tiếng Anh chuẩn tại Scotland
 			Phương ngữ Liverpool
-			SIMPLE
 			Phương ngữ Stolvizza/Solbica
-			SOTAV
-			SPANGLIS
 			Phép chính tả Taraskievica
 			Phép chính tả Hợp nhất
 			Phép chính tả Sửa đổi Hợp nhất
-			UNIFON
 			Tiếng Valencia
-			VIVARAUP
 			La Mã hóa Wade-Giles
-			XSISTEMO
 		
 		
 			Lịch
 			Định dạng tiền tệ
-			Bỏ qua sắp xếp biểu tượng
-			Sắp xếp dấu trọng âm đảo ngược
-			Sắp xếp chữ hoa/chữ thường
-			Sắp xếp phân biệt chữ hoa/chữ thường
+			Bỏ qua sắp xếp biểu tượng
+			Sắp xếp dấu trọng âm đảo ngược
+			Sắp xếp chữ hoa/chữ thường
+			Sắp xếp phân biệt chữ hoa/chữ thường
 			Thứ tự sắp xếp
-			Sắp xếp theo chuẩn hóa
-			Sắp xếp theo số
-			Cường độ sắp xếp
+			Sắp xếp theo chuẩn hóa
+			Sắp xếp theo số
+			Cường độ sắp xếp
 			Tiền tệ
-			Chu kỳ giờ (12 vs 24)
+			Chu kỳ giờ (12 với 24)
 			Kiểu xuống dòng
 			Hệ thống đo lường
 			Số
-			Múi giờ
-			Biến thể ngôn ngữ
+			Múi giờ
+			Biến thể ngôn ngữ
 			Sử dụng cá nhân
 		
 		
@@ -1241,8 +1178,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Sắp xếp dấu trọng âm/chữ cái/độ rộng/chữ Kana
 			Sắp xếp dấu trọng âm
 			Sắp xếp dấu trọng âm/chữ cái/độ rộng
-			Độ rộng tối đa
-			Nửa độ rộng
+			Độ rộng tối đa
+			Nửa độ rộng
 			Số
 			Hệ thống 12 giờ (0–11)
 			Hệ thống 12 giờ (1–12)
@@ -1271,7 +1208,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			Chữ số Ethiopia
 			Chữ số dùng trong tài chính
 			Chữ số có độ rộng đầy đủ
-			Chữ số Gruzia
+			Chữ số Georgia
 			Chữ số Gong
 			Chữ số Gonm
 			Chữ số Hy Lạp
@@ -1358,25 +1295,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 		[a à ả ã á ạ ă ằ ẳ ẵ ắ ặ â ầ ẩ ẫ ấ ậ b c d đ e è ẻ ẽ é ẹ ê ề ể ễ ế ệ f g h i ì ỉ ĩ í ị j k l m n o ò ỏ õ ó ọ ô ồ ổ ỗ ố ộ ơ ờ ở ỡ ớ ợ p q r s t u ù ủ ũ ú ụ ư ừ ử ữ ứ ự v w x y ỳ ỷ ỹ ý ỵ z]
 		[A Ă Â B C D Đ E Ê F G H I J K L M N O Ô Ơ P Q R S T U Ư V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]
 		
 			[\:∶]
 		
 		
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
 			[\-‒⁻₋−➖﹣－]
 		
 	
+	
+		“
+		”
+		‘
+		’
+	
 	
 		
 			
@@ -1399,55 +1337,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						E, dd-M
 						E, dd MMMM
 					
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
 				
 			
 			
@@ -1752,13 +1641,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						r(U) QQQQ
 					
 					
-						{0} – {1}
-						
-							h B – h B
-							h–h B
-						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -1766,14 +1649,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							d – d
 						
 						
-							h a – h a
 							h – h a
 						
 						
 							HH – HH
 						
 						
-							h:mm a – h:mm a
 							h:mm – h:mm a
 							h:mm – h:mm a
 						
@@ -1782,7 +1663,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							HH:mm – HH:mm
 						
 						
-							h:mm a – h:mm a v
 							h:mm – h:mm a v
 							h:mm – h:mm a v
 						
@@ -1790,70 +1670,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							HH:mm – HH:mm v
 							HH:mm – HH:mm v
 						
-						
-							h a – h a v
-							h–h a v
-						
 						
 							HH – HH v
 						
 						
 							M – M
 						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
-						
-							MM-dd, E – MM-dd, E
-							MM-dd, E – MM-dd, E
-						
 						
 							MMM – MMM
 						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
 						
 							U – U
 						
-						
-							y-MM – y-MM
-							y-MM – y-MM
-						
-						
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-						
-						
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-						
-						
-							U MMM–MMM
-							U MMM – U MMM
-						
-						
-							U MMM d–d
-							U MMM d – MMM d
-							U MMM d – U MMM d
-						
-						
-							U MMM d, E – MMM d, E
-							U MMM d, E – MMM d, E
-							U MMM d, E – U MMM d, E
-						
-						
-							U MMMM–MMMM
-							U MMMM – U MMMM
-						
 					
 				
 			
@@ -1890,21 +1718,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							12
 							13
 						
-						
-							Tout
-							Baba
-							Hator
-							Kiahk
-							Toba
-							Amshir
-							Baramhat
-							Baramouda
-							Bashans
-							Paona
-							Epep
-							Mesra
-							Nasie
-						
 					
 					
 						
@@ -1922,21 +1735,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Mesra
 							Nasie
 						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
-							13
-						
 						
 							Tout
 							Baba
@@ -1954,197 +1752,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						ERA0
-						ERA1
-					
-					
-						ERA0
-						ERA1
-					
-					
-						ERA0
-						ERA1
-					
-				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
 			
 			
 				
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
 					
-						{0} – {1}
 						
-							h B – h B
 							h – h B
 						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							d – d
-						
-						
-							h a – h a
-							h – h a
-						
-						
-							HH – HH
-						
-						
-							h:mm a – h:mm a
-							h:mm – h:mm a
-							h:mm – h:mm a
-						
-						
-							HH:mm – HH:mm
-							HH:mm – HH:mm
-						
-						
-							h:mm a – h:mm a v
-							h:mm – h:mm a v
-							h:mm – h:mm a v
-						
-						
-							HH:mm – HH:mm v
-							HH:mm – HH:mm v
-						
-						
-							h a – h a v
-							h–h a v
-						
-						
-							HH – HH v
-						
-						
-							M – M
-						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
-						
-							MM-dd, E – MM-dd, E
-							MM-dd, E – MM-dd, E
-						
-						
-							MMM – MMM
-						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
-						
-							U – U
-						
-						
-							y-MM – y-MM
-							y-MM – y-MM
-						
-						
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-						
-						
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-						
-						
-							U MMM–MMM
-							U MMM – U MMM
-						
-						
-							U MMM d–d
-							U MMM d – MMM d
-							U MMM d – U MMM d
-						
-						
-							U MMM d, E – MMM d, E
-							U MMM d, E – MMM d, E
-							U MMM d, E – U MMM d, E
-						
-						
-							U MMMM–MMMM
-							U MMMM – U MMMM
-						
 					
 				
 			
@@ -2181,21 +1795,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							12
 							13
 						
-						
-							Meskerem
-							Tekemt
-							Hedar
-							Tahsas
-							Ter
-							Yekatit
-							Megabit
-							Miazia
-							Genbot
-							Sene
-							Hamle
-							Nehasse
-							Pagumen
-						
 					
 					
 						
@@ -2213,21 +1812,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Nehasse
 							Pagumen
 						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
-							13
-						
 						
 							Meskerem
 							Tekemt
@@ -2245,84 +1829,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						ERA0
-						ERA1
-					
-					
-						ERA0
-						ERA1
-					
-					
-						ERA0
-						ERA1
-					
-				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
-			
-			
-				
-					
-						ERA0
-					
-					
-						ERA0
-					
-					
-						ERA0
-					
-				
 			
 			
 				
@@ -2575,6 +2081,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							thg 11
 							thg 12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							tháng 1
 							tháng 2
@@ -2605,6 +2125,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Thg 11
 							Thg 12
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							Tháng 1
 							Tháng 2
@@ -2810,7 +2344,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						Trước CN
-						trước CN
+						trước CN
 						sau CN
 						CN
 					
@@ -2847,6 +2381,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
+				
+					
+						
+							HH:mm:ss zzzz
+						
+					
+					
+						
+							HH:mm:ss z
+						
+					
+					
+						
+							HH:mm:ss
+						
+					
+					
+						
+							HH:mm
+						
+					
+				
 				
 					
 						
@@ -2926,11 +2482,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					
 						{0} - {1}
 						
-							h B – h B
 							h – h B
 						
 						
-							h:mm B – h:mm B
 							h:mm – h:mm B
 							h:mm – h:mm B
 						
@@ -3086,38 +2640,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Av
 							Elul
 						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							7
-							8
-							9
-							10
-							11
-							12
-							13
-						
-						
-							Tishri
-							Heshvan
-							Kislev
-							Tevet
-							Shevat
-							Adar I
-							Adar
-							Adar II
-							Nisan
-							Iyar
-							Sivan
-							Tamuz
-							Av
-							Elul
-						
 					
 					
 						
@@ -3136,22 +2658,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Av
 							Elul
 						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							7
-							8
-							9
-							10
-							11
-							12
-							13
-						
 						
 							Tishri
 							Heshvan
@@ -3170,68 +2676,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						AM
-					
-					
-						AM
-					
-					
-						AM
-					
-				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
 			
 			
 				
@@ -3264,20 +2708,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
-						
-							Chaitra
-							Vaisakha
-							Jyaistha
-							Asadha
-							Sravana
-							Bhadra
-							Asvina
-							Kartika
-							Agrahayana
-							Pausa
-							Magha
-							Phalguna
-						
 					
 					
 						
@@ -3294,20 +2724,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Magha
 							Phalguna
 						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
-						
 						
 							Chaitra
 							Vaisakha
@@ -3324,937 +2740,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						Saka
-					
-					
-						Saka
-					
-					
-						Saka
-					
-				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
 			
 			
-				
-					
-						
-							Muh.
-							Saf.
-							Rab. I
-							Rab. II
-							Jum. I
-							Jum. II
-							Raj.
-							Sha.
-							Ram.
-							Shaw.
-							Dhuʻl-Q.
-							Dhuʻl-H.
-						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
-						
-						
-							Muharram
-							Safar
-							Rabiʻ I
-							Rabiʻ II
-							Jumada I
-							Jumada II
-							Rajab
-							Shaʻban
-							Ramadan
-							Shawwal
-							Dhuʻl-Qiʻdah
-							Dhuʻl-Hijjah
-						
-					
-					
-						
-							Muh.
-							Saf.
-							Rab. I
-							Rab. II
-							Jum. I
-							Jum. II
-							Raj.
-							Sha.
-							Ram.
-							Shaw.
-							Dhuʻl-Q.
-							Dhuʻl-H.
-						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
-						
-						
-							Muharram
-							Safar
-							Rabiʻ I
-							Rabiʻ II
-							Jumada I
-							Jumada II
-							Rajab
-							Shaʻban
-							Ramadan
-							Shawwal
-							Dhuʻl-Qiʻdah
-							Dhuʻl-Hijjah
-						
-					
-				
 				
 					
 						AH
 					
 				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
 			
 			
-				
-					
-						Taika (645–650)
-						Hakuchi (650–671)
-						Hakuhō (672–686)
-						Shuchō (686–701)
-						Taihō (701–704)
-						Keiun (704–708)
-						Wadō (708–715)
-						Reiki (715–717)
-						Yōrō (717–724)
-						Jinki (724–729)
-						Tenpyō (729–749)
-						Tenpyō-kampō (749–749)
-						Tenpyō-shōhō (749–757)
-						Tenpyō-hōji (757–765)
-						Tenpyō-jingo (765–767)
-						Jingo-keiun (767–770)
-						Hōki (770–780)
-						Ten-ō (781–782)
-						Enryaku (782–806)
-						Daidō (806–810)
-						Kōnin (810–824)
-						Tenchō (824–834)
-						Jōwa (834–848)
-						Kajō (848–851)
-						Ninju (851–854)
-						Saikō (854–857)
-						Ten-an (857–859)
-						Jōgan (859–877)
-						Gangyō (877–885)
-						Ninna (885–889)
-						Kanpyō (889–898)
-						Shōtai (898–901)
-						Engi (901–923)
-						Enchō (923–931)
-						Jōhei (931–938)
-						Tengyō (938–947)
-						Tenryaku (947–957)
-						Tentoku (957–961)
-						Ōwa (961–964)
-						Kōhō (964–968)
-						Anna (968–970)
-						Tenroku (970–973)
-						Ten’en (973–976)
-						Jōgen (976–978)
-						Tengen (978–983)
-						Eikan (983–985)
-						Kanna (985–987)
-						Eien (987–989)
-						Eiso (989–990)
-						Shōryaku (990–995)
-						Chōtoku (995–999)
-						Chōhō (999–1004)
-						Kankō (1004–1012)
-						Chōwa (1012–1017)
-						Kannin (1017–1021)
-						Jian (1021–1024)
-						Manju (1024–1028)
-						Chōgen (1028–1037)
-						Chōryaku (1037–1040)
-						Chōkyū (1040–1044)
-						Kantoku (1044–1046)
-						Eishō (1046–1053)
-						Tengi (1053–1058)
-						Kōhei (1058–1065)
-						Jiryaku (1065–1069)
-						Enkyū (1069–1074)
-						Shōho (1074–1077)
-						Shōryaku (1077–1081)
-						Eihō (1081–1084)
-						Ōtoku (1084–1087)
-						Kanji (1087–1094)
-						Kahō (1094–1096)
-						Eichō (1096–1097)
-						Jōtoku (1097–1099)
-						Kōwa (1099–1104)
-						Chōji (1104–1106)
-						Kashō (1106–1108)
-						Tennin (1108–1110)
-						Ten-ei (1110–1113)
-						Eikyū (1113–1118)
-						Gen’ei (1118–1120)
-						Hōan (1120–1124)
-						Tenji (1124–1126)
-						Daiji (1126–1131)
-						Tenshō (1131–1132)
-						Chōshō (1132–1135)
-						Hōen (1135–1141)
-						Eiji (1141–1142)
-						Kōji (1142–1144)
-						Ten’yō (1144–1145)
-						Kyūan (1145–1151)
-						Ninpei (1151–1154)
-						Kyūju (1154–1156)
-						Hōgen (1156–1159)
-						Heiji (1159–1160)
-						Eiryaku (1160–1161)
-						Ōho (1161–1163)
-						Chōkan (1163–1165)
-						Eiman (1165–1166)
-						Nin’an (1166–1169)
-						Kaō (1169–1171)
-						Shōan (1171–1175)
-						Angen (1175–1177)
-						Jishō (1177–1181)
-						Yōwa (1181–1182)
-						Juei (1182–1184)
-						Genryaku (1184–1185)
-						Bunji (1185–1190)
-						Kenkyū (1190–1199)
-						Shōji (1199–1201)
-						Kennin (1201–1204)
-						Genkyū (1204–1206)
-						Ken’ei (1206–1207)
-						Jōgen (1207–1211)
-						Kenryaku (1211–1213)
-						Kenpō (1213–1219)
-						Jōkyū (1219–1222)
-						Jōō (1222–1224)
-						Gennin (1224–1225)
-						Karoku (1225–1227)
-						Antei (1227–1229)
-						Kanki (1229–1232)
-						Jōei (1232–1233)
-						Tenpuku (1233–1234)
-						Bunryaku (1234–1235)
-						Katei (1235–1238)
-						Ryakunin (1238–1239)
-						En’ō (1239–1240)
-						Ninji (1240–1243)
-						Kangen (1243–1247)
-						Hōji (1247–1249)
-						Kenchō (1249–1256)
-						Kōgen (1256–1257)
-						Shōka (1257–1259)
-						Shōgen (1259–1260)
-						Bun’ō (1260–1261)
-						Kōchō (1261–1264)
-						Bun’ei (1264–1275)
-						Kenji (1275–1278)
-						Kōan (1278–1288)
-						Shōō (1288–1293)
-						Einin (1293–1299)
-						Shōan (1299–1302)
-						Kengen (1302–1303)
-						Kagen (1303–1306)
-						Tokuji (1306–1308)
-						Enkyō (1308–1311)
-						Ōchō (1311–1312)
-						Shōwa (1312–1317)
-						Bunpō (1317–1319)
-						Genō (1319–1321)
-						Genkō (1321–1324)
-						Shōchū (1324–1326)
-						Karyaku (1326–1329)
-						Gentoku (1329–1331)
-						Genkō (1331–1334)
-						Kenmu (1334–1336)
-						Engen (1336–1340)
-						Kōkoku (1340–1346)
-						Shōhei (1346–1370)
-						Kentoku (1370–1372)
-						Bunchū (1372–1375)
-						Tenju (1375–1379)
-						Kōryaku (1379–1381)
-						Kōwa (1381–1384)
-						Genchū (1384–1392)
-						Meitoku (1384–1387)
-						Kakei (1387–1389)
-						Kōō (1389–1390)
-						Meitoku (1390–1394)
-						Ōei (1394–1428)
-						Shōchō (1428–1429)
-						Eikyō (1429–1441)
-						Kakitsu (1441–1444)
-						Bun’an (1444–1449)
-						Hōtoku (1449–1452)
-						Kyōtoku (1452–1455)
-						Kōshō (1455–1457)
-						Chōroku (1457–1460)
-						Kanshō (1460–1466)
-						Bunshō (1466–1467)
-						Ōnin (1467–1469)
-						Bunmei (1469–1487)
-						Chōkyō (1487–1489)
-						Entoku (1489–1492)
-						Meiō (1492–1501)
-						Bunki (1501–1504)
-						Eishō (1504–1521)
-						Taiei (1521–1528)
-						Kyōroku (1528–1532)
-						Tenbun (1532–1555)
-						Kōji (1555–1558)
-						Eiroku (1558–1570)
-						Genki (1570–1573)
-						Tenshō (1573–1592)
-						Bunroku (1592–1596)
-						Keichō (1596–1615)
-						Genna (1615–1624)
-						Kan’ei (1624–1644)
-						Shōho (1644–1648)
-						Keian (1648–1652)
-						Jōō (1652–1655)
-						Meireki (1655–1658)
-						Manji (1658–1661)
-						Kanbun (1661–1673)
-						Enpō (1673–1681)
-						Tenna (1681–1684)
-						Jōkyō (1684–1688)
-						Genroku (1688–1704)
-						Hōei (1704–1711)
-						Shōtoku (1711–1716)
-						Kyōhō (1716–1736)
-						Genbun (1736–1741)
-						Kanpō (1741–1744)
-						Enkyō (1744–1748)
-						Kan’en (1748–1751)
-						Hōreki (1751–1764)
-						Meiwa (1764–1772)
-						An’ei (1772–1781)
-						Tenmei (1781–1789)
-						Kansei (1789–1801)
-						Kyōwa (1801–1804)
-						Bunka (1804–1818)
-						Bunsei (1818–1830)
-						Tenpō (1830–1844)
-						Kōka (1844–1848)
-						Kaei (1848–1854)
-						Ansei (1854–1860)
-						Man’en (1860–1861)
-						Bunkyū (1861–1864)
-						Genji (1864–1865)
-						Keiō (1865–1868)
-						Meiji
-						Taishō
-						Shōwa
-						Heisei
-						Reiwa
-					
-					
-						Taika (645–650)
-						Hakuchi (650–671)
-						Hakuhō (672–686)
-						Shuchō (686–701)
-						Taihō (701–704)
-						Keiun (704–708)
-						Wadō (708–715)
-						Reiki (715–717)
-						Yōrō (717–724)
-						Jinki (724–729)
-						Tenpyō (729–749)
-						Tenpyō-kampō (749–749)
-						Tenpyō-shōhō (749–757)
-						Tenpyō-hōji (757–765)
-						Tenpyō-jingo (765–767)
-						Jingo-keiun (767–770)
-						Hōki (770–780)
-						Ten-ō (781–782)
-						Enryaku (782–806)
-						Daidō (806–810)
-						Kōnin (810–824)
-						Tenchō (824–834)
-						Jōwa (834–848)
-						Kajō (848–851)
-						Ninju (851–854)
-						Saikō (854–857)
-						Ten-an (857–859)
-						Jōgan (859–877)
-						Gangyō (877–885)
-						Ninna (885–889)
-						Kanpyō (889–898)
-						Shōtai (898–901)
-						Engi (901–923)
-						Enchō (923–931)
-						Jōhei (931–938)
-						Tengyō (938–947)
-						Tenryaku (947–957)
-						Tentoku (957–961)
-						Ōwa (961–964)
-						Kōhō (964–968)
-						Anna (968–970)
-						Tenroku (970–973)
-						Ten’en (973–976)
-						Jōgen (976–978)
-						Tengen (978–983)
-						Eikan (983–985)
-						Kanna (985–987)
-						Eien (987–989)
-						Eiso (989–990)
-						Shōryaku (990–995)
-						Chōtoku (995–999)
-						Chōhō (999–1004)
-						Kankō (1004–1012)
-						Chōwa (1012–1017)
-						Kannin (1017–1021)
-						Jian (1021–1024)
-						Manju (1024–1028)
-						Chōgen (1028–1037)
-						Chōryaku (1037–1040)
-						Chōkyū (1040–1044)
-						Kantoku (1044–1046)
-						Eishō (1046–1053)
-						Tengi (1053–1058)
-						Kōhei (1058–1065)
-						Jiryaku (1065–1069)
-						Enkyū (1069–1074)
-						Shōho (1074–1077)
-						Shōryaku (1077–1081)
-						Eihō (1081–1084)
-						Ōtoku (1084–1087)
-						Kanji (1087–1094)
-						Kahō (1094–1096)
-						Eichō (1096–1097)
-						Jōtoku (1097–1099)
-						Kōwa (1099–1104)
-						Chōji (1104–1106)
-						Kashō (1106–1108)
-						Tennin (1108–1110)
-						Ten-ei (1110–1113)
-						Eikyū (1113–1118)
-						Gen’ei (1118–1120)
-						Hōan (1120–1124)
-						Tenji (1124–1126)
-						Daiji (1126–1131)
-						Tenshō (1131–1132)
-						Chōshō (1132–1135)
-						Hōen (1135–1141)
-						Eiji (1141–1142)
-						Kōji (1142–1144)
-						Ten’yō (1144–1145)
-						Kyūan (1145–1151)
-						Ninpei (1151–1154)
-						Kyūju (1154–1156)
-						Hōgen (1156–1159)
-						Heiji (1159–1160)
-						Eiryaku (1160–1161)
-						Ōho (1161–1163)
-						Chōkan (1163–1165)
-						Eiman (1165–1166)
-						Nin’an (1166–1169)
-						Kaō (1169–1171)
-						Shōan (1171–1175)
-						Angen (1175–1177)
-						Jishō (1177–1181)
-						Yōwa (1181–1182)
-						Juei (1182–1184)
-						Genryaku (1184–1185)
-						Bunji (1185–1190)
-						Kenkyū (1190–1199)
-						Shōji (1199–1201)
-						Kennin (1201–1204)
-						Genkyū (1204–1206)
-						Ken’ei (1206–1207)
-						Jōgen (1207–1211)
-						Kenryaku (1211–1213)
-						Kenpō (1213–1219)
-						Jōkyū (1219–1222)
-						Jōō (1222–1224)
-						Gennin (1224–1225)
-						Karoku (1225–1227)
-						Antei (1227–1229)
-						Kanki (1229–1232)
-						Jōei (1232–1233)
-						Tenpuku (1233–1234)
-						Bunryaku (1234–1235)
-						Katei (1235–1238)
-						Ryakunin (1238–1239)
-						En’ō (1239–1240)
-						Ninji (1240–1243)
-						Kangen (1243–1247)
-						Hōji (1247–1249)
-						Kenchō (1249–1256)
-						Kōgen (1256–1257)
-						Shōka (1257–1259)
-						Shōgen (1259–1260)
-						Bun’ō (1260–1261)
-						Kōchō (1261–1264)
-						Bun’ei (1264–1275)
-						Kenji (1275–1278)
-						Kōan (1278–1288)
-						Shōō (1288–1293)
-						Einin (1293–1299)
-						Shōan (1299–1302)
-						Kengen (1302–1303)
-						Kagen (1303–1306)
-						Tokuji (1306–1308)
-						Enkyō (1308–1311)
-						Ōchō (1311–1312)
-						Shōwa (1312–1317)
-						Bunpō (1317–1319)
-						Genō (1319–1321)
-						Genkō (1321–1324)
-						Shōchū (1324–1326)
-						Karyaku (1326–1329)
-						Gentoku (1329–1331)
-						Genkō (1331–1334)
-						Kenmu (1334–1336)
-						Engen (1336–1340)
-						Kōkoku (1340–1346)
-						Shōhei (1346–1370)
-						Kentoku (1370–1372)
-						Bunchū (1372–1375)
-						Tenju (1375–1379)
-						Kōryaku (1379–1381)
-						Kōwa (1381–1384)
-						Genchū (1384–1392)
-						Meitoku (1384–1387)
-						Kakei (1387–1389)
-						Kōō (1389–1390)
-						Meitoku (1390–1394)
-						Ōei (1394–1428)
-						Shōchō (1428–1429)
-						Eikyō (1429–1441)
-						Kakitsu (1441–1444)
-						Bun’an (1444–1449)
-						Hōtoku (1449–1452)
-						Kyōtoku (1452–1455)
-						Kōshō (1455–1457)
-						Chōroku (1457–1460)
-						Kanshō (1460–1466)
-						Bunshō (1466–1467)
-						Ōnin (1467–1469)
-						Bunmei (1469–1487)
-						Chōkyō (1487–1489)
-						Entoku (1489–1492)
-						Meiō (1492–1501)
-						Bunki (1501–1504)
-						Eishō (1504–1521)
-						Taiei (1521–1528)
-						Kyōroku (1528–1532)
-						Tenbun (1532–1555)
-						Kōji (1555–1558)
-						Eiroku (1558–1570)
-						Genki (1570–1573)
-						Tenshō (1573–1592)
-						Bunroku (1592–1596)
-						Keichō (1596–1615)
-						Genna (1615–1624)
-						Kan’ei (1624–1644)
-						Shōho (1644–1648)
-						Keian (1648–1652)
-						Jōō (1652–1655)
-						Meireki (1655–1658)
-						Manji (1658–1661)
-						Kanbun (1661–1673)
-						Enpō (1673–1681)
-						Tenna (1681–1684)
-						Jōkyō (1684–1688)
-						Genroku (1688–1704)
-						Hōei (1704–1711)
-						Shōtoku (1711–1716)
-						Kyōhō (1716–1736)
-						Genbun (1736–1741)
-						Kanpō (1741–1744)
-						Enkyō (1744–1748)
-						Kan’en (1748–1751)
-						Hōreki (1751–1764)
-						Meiwa (1764–1772)
-						An’ei (1772–1781)
-						Tenmei (1781–1789)
-						Kansei (1789–1801)
-						Kyōwa (1801–1804)
-						Bunka (1804–1818)
-						Bunsei (1818–1830)
-						Tenpō (1830–1844)
-						Kōka (1844–1848)
-						Kaei (1848–1854)
-						Ansei (1854–1860)
-						Man’en (1860–1861)
-						Bunkyū (1861–1864)
-						Genji (1864–1865)
-						Keiō (1865–1868)
-						Meiji
-						Taishō
-						Shōwa
-						Heisei
-						Reiwa
-					
-					
-						Taika (645–650)
-						Hakuchi (650–671)
-						Hakuhō (672–686)
-						Shuchō (686–701)
-						Taihō (701–704)
-						Keiun (704–708)
-						Wadō (708–715)
-						Reiki (715–717)
-						Yōrō (717–724)
-						Jinki (724–729)
-						Tenpyō (729–749)
-						Tenpyō-kampō (749–749)
-						Tenpyō-shōhō (749–757)
-						Tenpyō-hōji (757–765)
-						Tenpyō-jingo (765–767)
-						Jingo-keiun (767–770)
-						Hōki (770–780)
-						Ten-ō (781–782)
-						Enryaku (782–806)
-						Daidō (806–810)
-						Kōnin (810–824)
-						Tenchō (824–834)
-						Jōwa (834–848)
-						Kajō (848–851)
-						Ninju (851–854)
-						Saikō (854–857)
-						Ten-an (857–859)
-						Jōgan (859–877)
-						Gangyō (877–885)
-						Ninna (885–889)
-						Kanpyō (889–898)
-						Shōtai (898–901)
-						Engi (901–923)
-						Enchō (923–931)
-						Jōhei (931–938)
-						Tengyō (938–947)
-						Tenryaku (947–957)
-						Tentoku (957–961)
-						Ōwa (961–964)
-						Kōhō (964–968)
-						Anna (968–970)
-						Tenroku (970–973)
-						Ten’en (973–976)
-						Jōgen (976–978)
-						Tengen (978–983)
-						Eikan (983–985)
-						Kanna (985–987)
-						Eien (987–989)
-						Eiso (989–990)
-						Shōryaku (990–995)
-						Chōtoku (995–999)
-						Chōhō (999–1004)
-						Kankō (1004–1012)
-						Chōwa (1012–1017)
-						Kannin (1017–1021)
-						Jian (1021–1024)
-						Manju (1024–1028)
-						Chōgen (1028–1037)
-						Chōryaku (1037–1040)
-						Chōkyū (1040–1044)
-						Kantoku (1044–1046)
-						Eishō (1046–1053)
-						Tengi (1053–1058)
-						Kōhei (1058–1065)
-						Jiryaku (1065–1069)
-						Enkyū (1069–1074)
-						Shōho (1074–1077)
-						Shōryaku (1077–1081)
-						Eihō (1081–1084)
-						Ōtoku (1084–1087)
-						Kanji (1087–1094)
-						Kahō (1094–1096)
-						Eichō (1096–1097)
-						Jōtoku (1097–1099)
-						Kōwa (1099–1104)
-						Chōji (1104–1106)
-						Kashō (1106–1108)
-						Tennin (1108–1110)
-						Ten-ei (1110–1113)
-						Eikyū (1113–1118)
-						Gen’ei (1118–1120)
-						Hōan (1120–1124)
-						Tenji (1124–1126)
-						Daiji (1126–1131)
-						Tenshō (1131–1132)
-						Chōshō (1132–1135)
-						Hōen (1135–1141)
-						Eiji (1141–1142)
-						Kōji (1142–1144)
-						Ten’yō (1144–1145)
-						Kyūan (1145–1151)
-						Ninpei (1151–1154)
-						Kyūju (1154–1156)
-						Hōgen (1156–1159)
-						Heiji (1159–1160)
-						Eiryaku (1160–1161)
-						Ōho (1161–1163)
-						Chōkan (1163–1165)
-						Eiman (1165–1166)
-						Nin’an (1166–1169)
-						Kaō (1169–1171)
-						Shōan (1171–1175)
-						Angen (1175–1177)
-						Jishō (1177–1181)
-						Yōwa (1181–1182)
-						Juei (1182–1184)
-						Genryaku (1184–1185)
-						Bunji (1185–1190)
-						Kenkyū (1190–1199)
-						Shōji (1199–1201)
-						Kennin (1201–1204)
-						Genkyū (1204–1206)
-						Ken’ei (1206–1207)
-						Jōgen (1207–1211)
-						Kenryaku (1211–1213)
-						Kenpō (1213–1219)
-						Jōkyū (1219–1222)
-						Jōō (1222–1224)
-						Gennin (1224–1225)
-						Karoku (1225–1227)
-						Antei (1227–1229)
-						Kanki (1229–1232)
-						Jōei (1232–1233)
-						Tenpuku (1233–1234)
-						Bunryaku (1234–1235)
-						Katei (1235–1238)
-						Ryakunin (1238–1239)
-						En’ō (1239–1240)
-						Ninji (1240–1243)
-						Kangen (1243–1247)
-						Hōji (1247–1249)
-						Kenchō (1249–1256)
-						Kōgen (1256–1257)
-						Shōka (1257–1259)
-						Shōgen (1259–1260)
-						Bun’ō (1260–1261)
-						Kōchō (1261–1264)
-						Bun’ei (1264–1275)
-						Kenji (1275–1278)
-						Kōan (1278–1288)
-						Shōō (1288–1293)
-						Einin (1293–1299)
-						Shōan (1299–1302)
-						Kengen (1302–1303)
-						Kagen (1303–1306)
-						Tokuji (1306–1308)
-						Enkyō (1308–1311)
-						Ōchō (1311–1312)
-						Shōwa (1312–1317)
-						Bunpō (1317–1319)
-						Genō (1319–1321)
-						Genkō (1321–1324)
-						Shōchū (1324–1326)
-						Karyaku (1326–1329)
-						Gentoku (1329–1331)
-						Genkō (1331–1334)
-						Kenmu (1334–1336)
-						Engen (1336–1340)
-						Kōkoku (1340–1346)
-						Shōhei (1346–1370)
-						Kentoku (1370–1372)
-						Bunchū (1372–1375)
-						Tenju (1375–1379)
-						Kōryaku (1379–1381)
-						Kōwa (1381–1384)
-						Genchū (1384–1392)
-						Meitoku (1384–1387)
-						Kakei (1387–1389)
-						Kōō (1389–1390)
-						Meitoku (1390–1394)
-						Ōei (1394–1428)
-						Shōchō (1428–1429)
-						Eikyō (1429–1441)
-						Kakitsu (1441–1444)
-						Bun’an (1444–1449)
-						Hōtoku (1449–1452)
-						Kyōtoku (1452–1455)
-						Kōshō (1455–1457)
-						Chōroku (1457–1460)
-						Kanshō (1460–1466)
-						Bunshō (1466–1467)
-						Ōnin (1467–1469)
-						Bunmei (1469–1487)
-						Chōkyō (1487–1489)
-						Entoku (1489–1492)
-						Meiō (1492–1501)
-						Bunki (1501–1504)
-						Eishō (1504–1521)
-						Taiei (1521–1528)
-						Kyōroku (1528–1532)
-						Tenbun (1532–1555)
-						Kōji (1555–1558)
-						Eiroku (1558–1570)
-						Genki (1570–1573)
-						Tenshō (1573–1592)
-						Bunroku (1592–1596)
-						Keichō (1596–1615)
-						Genna (1615–1624)
-						Kan’ei (1624–1644)
-						Shōho (1644–1648)
-						Keian (1648–1652)
-						Jōō (1652–1655)
-						Meireki (1655–1658)
-						Manji (1658–1661)
-						Kanbun (1661–1673)
-						Enpō (1673–1681)
-						Tenna (1681–1684)
-						Jōkyō (1684–1688)
-						Genroku (1688–1704)
-						Hōei (1704–1711)
-						Shōtoku (1711–1716)
-						Kyōhō (1716–1736)
-						Genbun (1736–1741)
-						Kanpō (1741–1744)
-						Enkyō (1744–1748)
-						Kan’en (1748–1751)
-						Hōreki (1751–1764)
-						Meiwa (1764–1772)
-						An’ei (1772–1781)
-						Tenmei (1781–1789)
-						Kansei (1789–1801)
-						Kyōwa (1801–1804)
-						Bunka (1804–1818)
-						Bunsei (1818–1830)
-						Tenpō (1830–1844)
-						Kōka (1844–1848)
-						Kaei (1848–1854)
-						Ansei (1854–1860)
-						Man’en (1860–1861)
-						Bunkyū (1861–1864)
-						Genji (1864–1865)
-						Keiō (1865–1868)
-						M
-						T
-						S
-						H
-						R
-					
-				
 				
 					
 						
@@ -4277,57 +2771,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
 			
 			
 				
@@ -4360,20 +2803,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11
 							12
 						
-						
-							Farvardin
-							Ordibehesht
-							Khordad
-							Tir
-							Mordad
-							Shahrivar
-							Mehr
-							Aban
-							Azar
-							Dey
-							Bahman
-							Esfand
-						
 					
 					
 						
@@ -4390,20 +2819,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							Bahman
 							Esfand
 						
-						
-							1
-							2
-							3
-							4
-							5
-							6
-							7
-							8
-							9
-							10
-							11
-							12
-						
 						
 							Farvardin
 							Ordibehesht
@@ -4420,68 +2835,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						AP
-					
-					
-						AP
-					
-					
-						AP
-					
-				
-				
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
-				
 			
 			
 				
@@ -4503,55 +2856,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						dd-M
 						E, dd-M
 					
-					
-						
-							h B – h B
-							h – h B
-						
-						
-							h:mm B – h:mm B
-							h:mm – h:mm B
-							h:mm – h:mm B
-						
-						
-							y G – y G
-							y – y G
-						
-						
-							M/y GGGGG – M/y GGGGG
-							M/y – M/y GGGGG
-							M/y – M/y GGGGG
-						
-						
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y GGGGG – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-							dd-MM-y – dd-MM-y GGGGG
-						
-						
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y GGGGG – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-							E, dd-MM-y – E, dd-MM-y GGGGG
-						
-						
-							MMM y G – MMM y G
-							MMM – MMM y G
-							MMM y – MMM y G
-						
-						
-							d – d MMM y G
-							d MMM y G – d MMM y G
-							d MMM – d MMM y G
-							d MMM y – d MMM y G
-						
-						
-							E, d MMM – E, d MMM y G
-							E, d MMM y G – E, d MMM y G
-							E, d MMM – E, d MMM y G
-							E, d MMM y – E, d MMM y G
-						
-					
 				
 			
 		
@@ -5141,9 +3445,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					Giờ Phối hợp Quốc tế
 				
-				
-					UTC
-				
 			
 			
 				Thành phố Không xác định
@@ -5812,7 +4113,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Aqtobe
 			
 			
-				Qostanay
+				Kostanay
 			
 			
 				Qyzylorda
@@ -6841,9 +5142,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				
-					Giờ Gruzia
-					Giờ Chuẩn Gruzia
-					Giờ Mùa Hè Gruzia
+					Giờ Georgia
+					Giờ Chuẩn Georgia
+					Giờ Mùa Hè Georgia
 				
 			
 			
@@ -7430,39 +5731,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	
 	
 		1
-		
-			٫
-			٬
-			؛
-			٪؜
-			؜+
-			؜-
-			اس
-			×
-			؉
-			∞
-			NaN
-			:
-		
-		
-			٫
-			٬
-			؛
-			٪
-			‎+‎
-			‎-‎
-			×۱۰^
-			×
-			؉
-			∞
-			NaN
-			٫
-		
 		
 			,
 			.
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -7470,6 +5745,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0 nghìn
@@ -7510,13 +5790,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
-		
-			
-				
-					#,##0%
-				
-			
-		
 		
 			
 				
@@ -7524,16 +5797,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 			
 		
-		
-			
-				
-					#,##0.00 ¤
-				
-				
-					#,##0.00 ¤
-				
-			
-		
 		
 			
 				
@@ -7568,6 +5831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dirham UAE
 				Dirham UAE
+				AED
 			
 			
 				Đồng Afghani của Afghanistan (1927–2002)
@@ -7575,26 +5839,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Afghani Afghanistan
 				Afghani Afghanistan
-			
-			
-				ALK
-				ALK
+				AFN
 			
 			
 				Lek Albania
 				Lek Albania
+				ALL
 			
 			
 				Dram Armenia
 				Dram Armenia
+				AMD
 			
 			
 				Guilder Antille Hà Lan
 				Guilder Antille Hà Lan
+				ANG
 			
 			
 				Kwanza Angola
 				Kwanza Angola
+				AOA
 			
 			
 				Đồng Kwanza của Angola (1977–1991)
@@ -7620,6 +5885,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Argentina
 				Peso Argentina
+				ARS
 				$
 			
 			
@@ -7633,6 +5899,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Florin Aruba
 				Florin Aruba
+				AWG
 			
 			
 				Đồng Manat của Azerbaijan (1993–2006)
@@ -7640,6 +5907,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Manat Azerbaijan
 				Manat Azerbaijan
+				AZN
 			
 			
 				Đồng Dinar của Bosnia-Herzegovina (1992–1994)
@@ -7647,6 +5915,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Mark Bosnia-Herzegovina có thể chuyển đổi
 				Mark Bosnia-Herzegovina có thể chuyển đổi
+				BAM
 			
 			
 				Đồng Dinar Mới của Bosnia-Herzegovina (1994–1997)
@@ -7654,11 +5923,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Barbados
 				Đô la Barbados
+				BBD
 				$
 			
 			
 				Taka Bangladesh
 				Taka Bangladesh
+				BDT
 			
 			
 				Đồng Franc Bỉ (có thể chuyển đổi)
@@ -7678,6 +5949,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lev Bulgaria
 				Lev Bulgaria
+				BGN
 			
 			
 				Đồng Lev của Bun-ga-ri (1879–1952)
@@ -7685,23 +5957,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dinar Bahrain
 				Dinar Bahrain
+				BHD
 			
 			
 				Franc Burundi
 				Franc Burundi
+				BIF
 			
 			
 				Đô la Bermuda
 				Đô la Bermuda
+				BMD
 				$
 			
 			
 				Đô la Brunei
 				Đô la Brunei
+				BND
 			
 			
 				Boliviano Bolivia
 				Boliviano Bolivia
+				BOB
 			
 			
 				Đồng Boliviano của Bolivia (1863–1963)
@@ -7737,11 +6014,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Bahamas
 				Đô la Bahamas
+				BSD
 				$
 			
 			
 				Ngultrum Bhutan
 				Ngultrum Bhutan
+				BTN
 			
 			
 				Đồng Kyat Miến Điện
@@ -7749,6 +6028,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pula Botswana
 				Pula Botswana
+				BWP
 			
 			
 				Đồng Rúp Mới của Belarus (1994–1999)
@@ -7766,16 +6046,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Belize
 				Đô la Belize
+				BZD
 				$
 			
 			
 				Đô la Canada
 				Đô la Canada
+				CA$
 				$
 			
 			
 				Franc Congo
 				Franc Congo
+				CDF
 			
 			
 				Đồng Euro WIR
@@ -7783,6 +6066,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc Thụy sĩ
 				Franc Thụy sĩ
+				CHF
 			
 			
 				Đồng France WIR
@@ -7796,16 +6080,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Chile
 				Peso Chile
+				CLP
 			
 			
 				Nhân dân tệ (hải ngoại)
 				Nhân dân tệ (hải ngoại)
 				CNH
 			
-			
-				CNX
-				CNX
-			
 			
 				Nhân dân tệ
 				Nhân dân tệ
@@ -7813,6 +6094,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Colombia
 				Peso Colombia
+				COP
 			
 			
 				Đơn vị Giá trị Thực của Colombia
@@ -7820,6 +6102,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Colón Costa Rica
 				Colón Costa Rica
+				CRC
 				₡
 			
 			
@@ -7831,16 +6114,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Cuba có thể chuyển đổi
 				Peso Cuba có thể chuyển đổi
+				CUC
 				$
 			
 			
 				Peso Cuba
 				Peso Cuba
+				CUP
 				$
 			
 			
 				Escudo Cape Verde
 				Escudo Cape Verde
+				CVE
 			
 			
 				Đồng Bảng Síp
@@ -7848,6 +6134,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Koruna Cộng hòa Séc
 				Koruna Cộng hòa Séc
+				CZK
 			
 			
 				Đồng Mark Đông Đức
@@ -7858,19 +6145,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Franc Djibouti
 				Franc Djibouti
+				DJF
 			
 			
 				Krone Đan Mạch
 				Krone Đan Mạch
+				DKK
 			
 			
 				Peso Dominica
 				Peso Dominica
+				DOP
 				$
 			
 			
 				Dinar Algeria
 				Dinar Algeria
+				DZD
 			
 			
 				Đồng Scure Ecuador
@@ -7884,10 +6175,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bảng Ai Cập
 				Bảng Ai Cập
+				EGP
 			
 			
 				Nakfa Eritrea
 				Nakfa Eritrea
+				ERN
 			
 			
 				Đồng Peseta Tây Ban Nha (Tài khoản)
@@ -7897,11 +6190,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				Đồng Peseta Tây Ban Nha
-				₧
 			
 			
 				Birr Ethiopia
 				Birr Ethiopia
+				ETB
 			
 			
 				Euro
@@ -7913,10 +6206,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Fiji
 				Đô la Fiji
+				FJD
 			
 			
 				Bảng Quần đảo Falkland
 				Bảng Quần đảo Falkland
+				FKP
 			
 			
 				Franc Pháp
@@ -7929,8 +6224,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Đồng Kupon Larit của Georgia
 			
 			
-				Lari Gruzia
-				Lari Gruzia
+				Lari Georgia
+				Lari Georgia
+				GEL
 				₾
 			
 			
@@ -7939,18 +6235,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Cedi Ghana
 				Cedi Ghana
+				GHS
 			
 			
 				Bảng Gibraltar
 				Bảng Gibraltar
+				GIP
 			
 			
 				Dalasi Gambia
 				Dalasi Gambia
+				GMD
 			
 			
 				Franc Guinea
 				Franc Guinea
+				GNF
 			
 			
 				Syli Guinea
@@ -7964,6 +6264,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Quetzal Guatemala
 				Quetzal Guatemala
+				GTQ
 				Q
 			
 			
@@ -7975,6 +6276,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Guyana
 				Đô la Guyana
+				GYD
 			
 			
 				Đô la Hồng Kông
@@ -7983,6 +6285,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lempira Honduras
 				Lempira Honduras
+				HNL
 				L
 			
 			
@@ -7991,18 +6294,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kuna Croatia
 				Kuna Croatia
+				HRK
 			
 			
 				Gourde Haiti
 				Gourde Haiti
+				HTG
 			
 			
 				Forint Hungary
 				forint Hungary
+				HUF
 			
 			
 				Rupiah Indonesia
 				Rupiah Indonesia
+				IDR
 			
 			
 				Pao Ai-len
@@ -8010,10 +6317,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Pao Ixraen
 			
-			
-				ILR
-				ILR
-			
 			
 				Sheqel Israel mới
 				Sheqel Israel mới
@@ -8023,20 +6326,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				Rupee Ấn Độ
 			
 			
-				Dinar I-rắc
-				Dinar I-rắc
+				Dinar Iraq
+				Dinar Iraq
+				IQD
 			
 			
 				Rial Iran
 				Rial Iran
-			
-			
-				ISJ
-				ISJ
+				IRR
 			
 			
 				Króna Iceland
 				króna Iceland
+				ISK
 			
 			
 				Lia Ý
@@ -8044,11 +6346,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Jamaica
 				Đô la Jamaica
+				JMD
 				$
 			
 			
 				Dinar Jordan
 				Dinar Jordan
+				JOD
 			
 			
 				Yên Nhật
@@ -8057,22 +6361,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Shilling Kenya
 				Shilling Kenya
+				KES
 			
 			
 				Som Kyrgyzstan
 				Som Kyrgyzstan
+				KGS
 			
 			
 				Riel Campuchia
 				Riel Campuchia
+				KHR
 			
 			
 				Franc Comoros
 				Franc Comoros
+				KMF
 			
 			
 				Won Triều Tiên
 				Won Triều Tiên
+				KPW
 			
 			
 				Đồng Hwan Hàn Quốc (1953–1962)
@@ -8087,31 +6396,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dinar Kuwait
 				Dinar Kuwait
+				KWD
 			
 			
 				Đô la Quần đảo Cayman
 				Đô la Quần đảo Cayman
+				KYD
 				$
 			
 			
 				Tenge Kazakhstan
 				Tenge Kazakhstan
+				KZT
 			
 			
 				Kip Lào
 				Kip Lào
+				LAK
 			
 			
 				Bảng Li-băng
 				Bảng Li-băng
+				LBP
 			
 			
 				Rupee Sri Lanka
 				Rupee Sri Lanka
+				LKR
 			
 			
 				Đô la Liberia
 				Đô la Liberia
+				LRD
 			
 			
 				Ioti Lesotho
@@ -8119,7 +6435,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Litas Lít-va
 				litas Lít-va
-				Lt
 			
 			
 				Đồng Talonas Litva
@@ -8136,7 +6451,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lats Latvia
 				lats Lativia
-				Ls
 			
 			
 				Đồng Rúp Latvia
@@ -8144,10 +6458,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Dinar Libi
 				Dinar Libi
+				LYD
 			
 			
 				Dirham Ma-rốc
 				Dirham Ma-rốc
+				MAD
 			
 			
 				Đồng Franc Ma-rốc
@@ -8161,10 +6477,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Leu Moldova
 				Leu Moldova
+				MDL
 			
 			
 				Ariary Malagasy
 				Ariary Malagasy
+				MGA
 			
 			
 				Đồng Franc Magalasy
@@ -8172,6 +6490,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Denar Macedonia
 				Denar Macedonia
+				MKD
 			
 			
 				Đồng Denar Macedonia (1992–1993)
@@ -8182,14 +6501,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kyat Myanma
 				Kyat Myanma
+				MMK
 			
 			
 				Tugrik Mông Cổ
 				Tugrik Mông Cổ
+				MNT
 			
 			
 				Pataca Ma Cao
 				Pataca Ma Cao
+				MOP
 			
 			
 				Ouguiya Mauritania (1973–2017)
@@ -8198,6 +6520,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ouguiya Mauritania
 				Ouguiya Mauritania
+				MRU
 			
 			
 				Lia xứ Man-tơ
@@ -8208,22 +6531,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rupee Mauritius
 				Rupee Mauritius
-			
-			
-				MVP
-				MVP
+				MUR
 			
 			
 				Rufiyaa Maldives
 				Rufiyaa Maldives
+				MVR
 			
 			
 				Kwacha Malawi
 				Kwacha Malawi
+				MWK
 			
 			
 				Peso Mexico
 				Peso Mexico
+				MX$
 				$
 			
 			
@@ -8235,6 +6558,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Ringgit Malaysia
 				Ringgit Malaysia
+				MYR
 			
 			
 				Escudo Mozambique
@@ -8245,14 +6569,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Metical Mozambique
 				Metical Mozambique
+				MZN
 			
 			
 				Đô la Namibia
 				Đô la Namibia
+				NAD
 			
 			
 				Naira Nigeria
 				Naira Nigeria
+				NGN
 			
 			
 				Đồng Córdoba Nicaragua (1988–1991)
@@ -8260,6 +6587,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Córdoba Nicaragua
 				Córdoba Nicaragua
+				NIO
 				C$
 			
 			
@@ -8268,10 +6596,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Krone Na Uy
 				Krone Na Uy
+				NOK
 			
 			
 				Rupee Nepal
 				Rupee Nepal
+				NPR
 			
 			
 				Đô la New Zealand
@@ -8280,10 +6610,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rial Oman
 				Rial Oman
+				OMR
 			
 			
 				Balboa Panama
 				Balboa Panama
+				PAB
 			
 			
 				Đồng Inti Peru
@@ -8291,25 +6623,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Sol Peru
 				Sol Peru
+				PEN
 			
 			
 				Đồng Sol Peru (1863–1965)
 			
 			
-				Kina Papua New Guinean
-				Kina Papua New Guinean
+				Kina Papua New Guinea
+				Kina Papua New Guinea
+				PGK
 			
 			
 				Peso Philipin
 				Peso Philipin
+				PHP
 			
 			
 				Rupee Pakistan
 				Rupee Pakistan
+				PKR
 			
 			
 				Zloty Ba Lan
 				Zloty Ba Lan
+				PLN
 			
 			
 				Đồng Zloty Ba Lan (1950–1995)
@@ -8320,10 +6657,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Guarani Paraguay
 				Guarani Paraguay
+				PYG
 			
 			
 				Rial Qatar
 				Rial Qatar
+				QAR
 			
 			
 				Đồng Đô la Rhode
@@ -8334,34 +6673,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Leu Romania
 				Leu Romania
+				RON
 			
 			
 				Dinar Serbia
 				Dinar Serbia
+				RSD
 			
 			
 				Rúp Nga
 				Rúp Nga
+				RUB
 			
 			
 				Đồng Rúp Nga (1991–1998)
-				р.
 			
 			
 				Franc Rwanda
 				Franc Rwanda
+				RWF
 			
 			
 				Riyal Ả Rập Xê-út
 				Riyal Ả Rập Xê-út
+				SAR
 			
 			
 				Đô la quần đảo Solomon
 				Đô la quần đảo Solomon
+				SBD
 			
 			
 				Rupee Seychelles
 				Rupee Seychelles
+				SCR
 			
 			
 				Đồng Dinar Sudan (1992–2007)
@@ -8369,6 +6714,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bảng Sudan
 				Bảng Sudan
+				SDG
 			
 			
 				Đồng Bảng Sudan (1957–1998)
@@ -8376,14 +6722,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Krona Thụy Điển
 				Krona Thụy Điển
+				SEK
 			
 			
 				Đô la Singapore
 				Đô la Singapore
+				SGD
 			
 			
 				Bảng St. Helena
 				bảng St. Helena
+				SHP
 			
 			
 				Tôla Xlôvênia
@@ -8394,14 +6743,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Leone Sierra Leone
 				Leone Sierra Leone
+				SLL
 			
 			
 				Schilling Somali
 				Schilling Somali
+				SOS
 			
 			
 				Đô la Suriname
 				Đô la Suriname
+				SRD
 			
 			
 				Đồng Guilder Surinam
@@ -8409,6 +6761,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bảng Nam Sudan
 				Bảng Nam Sudan
+				SSP
 			
 			
 				Dobra São Tomé và Príncipe (1977–2017)
@@ -8428,10 +6781,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bảng Syria
 				Bảng Syria
+				SYP
 			
 			
 				Lilangeni Swaziland
 				Lilangeni Swaziland
+				SZL
 			
 			
 				Bạt Thái Lan
@@ -8444,6 +6799,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Somoni Tajikistan
 				Somoni Tajikistan
+				TJS
 			
 			
 				Đồng Manat Turkmenistan (1993–2009)
@@ -8451,14 +6807,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Manat Turkmenistan
 				Manat Turkmenistan
+				TMT
 			
 			
 				Dinar Tunisia
 				Dinar Tunisia
+				TND
 			
 			
 				Paʻanga Tonga
 				Paʻanga Tonga
+				TOP
 			
 			
 				Đồng Escudo Timor
@@ -8470,10 +6829,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Lia Thổ Nhĩ Kỳ
 				Lia Thổ Nhĩ Kỳ
+				TRY
 			
 			
 				Đô la Trinidad và Tobago
 				Đô la Trinidad và Tobago
+				TTD
 				$
 			
 			
@@ -8484,10 +6845,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Shilling Tanzania
 				Shilling Tanzania
+				TZS
 			
 			
-				Hryvnia Ucraina
+				Hryvnia Ukraina
 				Hryvnia Ucraina
+				UAH
 			
 			
 				Đồng Karbovanets Ucraina
@@ -8498,10 +6861,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Shilling Uganda
 				Shilling Uganda
+				UGX
 			
 			
 				Đô la Mỹ
 				Đô la Mỹ
+				US$
 				$
 			
 			
@@ -8519,14 +6884,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Peso Uruguay
 				Peso Uruguay
-			
-			
-				UYW
-				UYW
+				UYU
 			
 			
 				Som Uzbekistan
 				Som Uzbekistan
+				UZS
 			
 			
 				Đồng bolívar của Venezuela (1871–2008)
@@ -8538,6 +6901,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Bolívar Venezuela
 				Bolívar Venezuela
+				VES
 			
 			
 				Đồng Việt Nam
@@ -8549,10 +6913,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Vatu Vanuatu
 				Vatu Vanuatu
+				VUV
 			
 			
 				Tala Samoa
 				Tala Samoa
+				WST
 			
 			
 				Franc CFA Trung Phi
@@ -8579,6 +6945,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Đô la Đông Caribê
 				Đô la Đông Caribê
+				EC$
 				$
 			
 			
@@ -8610,17 +6977,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Quỹ RINET
 			
-			
-				XSU
-				XSU
-			
 			
 				Mã Tiền tệ Kiểm tra
 			
-			
-				XUA
-				XUA
-			
 			
 				Tiền tệ chưa biết
 				(tiền tệ chưa biết)
@@ -8632,6 +6991,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rial Yemen
 				Rial Yemen
+				YER
 			
 			
 				Đồng Dinar Nam Tư Xu (1966–1990)
@@ -8651,6 +7011,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Rand Nam Phi
 				Rand Nam Phi
+				ZAR
 			
 			
 				Đồng kwacha của Zambia (1968–2012)
@@ -8658,6 +7019,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Kwacha Zambia
 				Kwacha Zambia
+				ZMW
 			
 			
 				Đồng Zaire Mới (1993–1998)
@@ -8750,10 +7112,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				inch vuông
 				{0} inch vuông
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				karat
 				{0} karat
@@ -8786,6 +7144,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				dặm/gallon
 				{0} dặm/gallon
 			
+			
+				dặm/galông Anh
+			
 			
 				petabyte
 			
@@ -8825,6 +7186,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				thế kỷ
 				{0} thế kỷ
 			
+			
+				thập kỷ
+				{0} thập kỷ
+			
 			
 				năm
 				{0} năm
@@ -8881,6 +7246,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} mili ampe
 			
 			
+				ohm
 				{0} ohm
 			
 			
@@ -8919,6 +7285,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				đơn vị nhiệt Anh
 				{0} đơn vị nhiệt Anh
 			
+			
+				đơn vị nhiệt Mỹ
+				{0} đơn vị nhiệt Mỹ
+			
 			
 				pound lực
 				{0} pound lực
@@ -8927,6 +7297,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				newton
 				{0} newton
 			
+			
+				pixel
+				{0} pixel
+			
+			
+				megapixel
+				{0} megapixel
+			
+			
+				pixel/xentimét
+				{0} pixel/xentimét
+			
+			
+				pixel/inch
+				{0} pixel/inch
+			
+			
+				chấm/xentimét
+				{0} chấm/xentimét
+			
+			
+				chấm/inch
+				{0} chấm/inch
+			
 			
 				kilômét
 				{0} kilômét
@@ -8984,13 +7378,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				năm ánh sáng
 				{0} năm ánh sáng
 			
-			
-				fur
-				{0} fur
-			
-			
-				fm
-				{0} fth
+			
+				đơn vị thiên văn
+				{0} đơn vị thiên văn
 			
 			
 				hải lý
@@ -9017,8 +7407,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} độ sáng của mặt trời
 			
 			
-				MT
-				{0} MT
+				tấn hệ mét
+				{0} tấn hệ mét
 			
 			
 				kilôgam
@@ -9041,14 +7431,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				tấn
 				{0} tấn
 			
-			
-				st
-				{0} st
-			
 			
 				pao
 				{0} pao
 			
+			
+				aoxơ
+				{0} aoxơ
+				{0}/aoxơ
+			
+			
+				troi ao-xơ
+				{0} troi ao-xơ
+			
 			
 				carat
 				{0} carat
@@ -9089,9 +7484,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mã lực
 				{0} mã lực
 			
-			
-				héctô pascal
-				{0} héctô pascal
+			
+				milimét thủy ngân
+				{0} milimét thủy ngân
+			
+			
+				pound/inch vuông
+				{0} pound/inch vuông
 			
 			
 				inch thủy ngân
@@ -9104,13 +7503,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} átmốtphe
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				héctô pascal
+				{0} héctô pascal
 			
 			
 				kilômét/giờ
@@ -9208,10 +7603,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				cup khối
 				{0} cup khối
 			
-			
-				bu
-				{0} bu
-			
 			
 				gallon
 				{0} gallon
@@ -9227,15 +7618,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} quart
 			
 			
-				pint
-				{0} pint
+				panh
+				{0} panh
 			
 			
 				{0} cup
 			
 			
-				fl oz
-				{0} fl oz
+				aoxơ chất lỏng
+				{0} aoxơ chất lỏng
 			
 			
 				Aoxơ chất lỏng theo hệ đo lường Anh
@@ -9266,7 +7657,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				lực g
 			
 			
-				rev
+				vòng
+				{0} vòng
 			
 			
 				độ
@@ -9290,10 +7682,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mẫu
 				{0} mẫu
 			
-			
-				dunam
-				{0} dunam
-			
 			
 				mg/dL
 			
@@ -9335,6 +7723,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				thế kỷ
 				{0} thế kỷ
 			
+			
+				thập kỷ
+				{0} thập kỷ
+			
 			
 				năm
 				{0} năm
@@ -9402,6 +7794,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				BTU
 				{0} Btu
 			
+			
+				therm Mỹ
+				{0} therm Mỹ
+			
 			
 				pound-lực
 				{0} lbf
@@ -9422,6 +7818,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				Hz
 			
+			
+				megapixel
+			
 			
 				km
 			
@@ -9454,14 +7853,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				au
 			
-			
-				fur
-				{0} fur
-			
-			
-				fm
-				{0} fth
-			
 			
 				nmi
 			
@@ -9495,10 +7886,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				µg
 			
-			
-				st
-				{0} st
-			
 			
 				pao
 			
@@ -9506,17 +7893,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				oz
 				{0} oz
 			
+			
+				ozt
+				{0} ozt
+			
+			
+				cara
+				{0} CT
+			
 			
 				dalton
 				{0} Da
 			
 			
 				Trọng lượng trái đất
-				{0} M⊕
 			
 			
 				trọng lượng mặt trời
-				{0} M☉
 			
 			
 				GW
@@ -9536,9 +7929,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				hp
 			
-			
-				hPa
-			
 			
 				mm Hg
 				{0} mm Hg
@@ -9556,13 +7946,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				atm
 				{0} atm
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				hPa
 			
 			
 				kn
@@ -9616,14 +8001,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				mcup
 			
-			
-				bu
-				{0} bu
-			
 			
 				gal
 				{0} gal
-				{0}/gal
+				{0}/gal Mỹ
 			
 			
 				gal Anh
@@ -9638,8 +8019,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0} fl oz
 			
 			
-				Oz
-				{0} fl oz Imp.
+				fl oz Anh
+				{0} fl oz Anh
 			
 			
 				thìa xúp
@@ -9675,18 +8056,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0} mẫu
 			
-			
-				dunam
-				{0} dunam
-			
-			
-				phần vạn
-				{0}‱
-			
-			
-				mol
-				{0} mol
-			
 			
 				L/100km
 				{0}L/100km
@@ -9723,22 +8092,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				mili giây
 				{0}miligiây
 			
-			
-				electronvôn
-				{0} eV
-			
-			
-				BTU
-				{0} Btu
-			
-			
-				pound-lực
-				{0} lbf
-			
-			
-				newton
-				{0} N
-			
 			
 				km
 				{0}km
@@ -9773,22 +8126,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}ly
 			
-			
-				fur
-				{0} fur
-			
-			
-				fm
-				{0} fth
-			
-			
-				bán kính mặt trời
-				{0} R☉
-			
-			
-				độ sáng của mặt trời
-				{0} L☉
-			
 			
 				kg
 				{0}kg
@@ -9797,28 +8134,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				g
 				{0}g
 			
-			
-				st
-				{0} st
-			
 			
 				{0}lb
 			
 			
 				{0}oz
 			
-			
-				dalton
-				{0} Da
-			
-			
-				Trọng lượng trái đất
-				{0} M⊕
-			
-			
-				trọng lượng mặt trời
-				{0} M☉
-			
 			
 				{0}kW
 			
@@ -9828,22 +8149,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}hp
 			
-			
-				{0}hPa
-			
 			
 				{0}" Hg
 			
 			
 				{0}mb
 			
-			
-				kPa
-				{0} kPa
-			
-			
-				MPa
-				{0} MPa
+			
+				{0}hPa
 			
 			
 				{0}km/h
@@ -9857,14 +8170,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				°C
 			
-			
-				lbf⋅ft
-				{0} lbf⋅ft
-			
-			
-				N⋅m
-				{0} N⋅m
-			
 			
 				{0}km³
 			
@@ -9875,18 +8180,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				l
 				{0}L
 			
-			
-				bu
-				{0} bu
-			
 			
-				Oz
 				{0} fl ozIm
 			
-			
-				thùng
-				{0} thùng
-			
 			
 				hướng
 				{0}Đ
@@ -9913,8 +8209,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0} và {1}
 		
 		
-			{0} hoặc {1}
-			{0} hoặc {1}
+			{0} hoặc {1}
+			{0} hoặc {1}
 		
 		
 			{0}, {1}
@@ -9923,8 +8219,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}, {1}
 		
 		
-			{0}, {1}
-			{0}, {1}
 			{0} và {1}
 			{0} và {1}
 		
diff --git a/make/data/cldr/common/main/vi_VN.xml b/make/data/cldr/common/main/vi_VN.xml
index 1a84c6be689..1c015edd825 100644
--- a/make/data/cldr/common/main/vi_VN.xml
+++ b/make/data/cldr/common/main/vi_VN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/vo.xml b/make/data/cldr/common/main/vo.xml
index 25e206cbd9d..55013f1ad1e 100644
--- a/make/data/cldr/common/main/vo.xml
+++ b/make/data/cldr/common/main/vo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -52,7 +52,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a ä b c d e f g h i j k l m n o ö p r s t u ü v x y z]
 		[q w]
 		[A Ä B C D E F G H I J K L M N O Ö P R S T U Ü V X Y Z]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] \{ \} § @ * / \& #]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” « » ( ) \[ \] \{ \} § @ * / \& #]
 		{0}…
 		… {0}
 		{0} … {1}
diff --git a/make/data/cldr/common/main/vo_001.xml b/make/data/cldr/common/main/vo_001.xml
index de4cdce08e0..325ff4681f9 100644
--- a/make/data/cldr/common/main/vo_001.xml
+++ b/make/data/cldr/common/main/vo_001.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/vun.xml b/make/data/cldr/common/main/vun.xml
index 0bc8ab66c87..5752ac64bc4 100644
--- a/make/data/cldr/common/main/vun.xml
+++ b/make/data/cldr/common/main/vun.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Moldova
 			Bukini
 			Visiwa vya Marshal
-			Masedonia
 			Mali
 			Myama
 			Mongolia
diff --git a/make/data/cldr/common/main/vun_TZ.xml b/make/data/cldr/common/main/vun_TZ.xml
index b7110516106..736162e1493 100644
--- a/make/data/cldr/common/main/vun_TZ.xml
+++ b/make/data/cldr/common/main/vun_TZ.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/wae.xml b/make/data/cldr/common/main/wae.xml
index d52f8cf3c26..5ea5f0f427b 100644
--- a/make/data/cldr/common/main/wae.xml
+++ b/make/data/cldr/common/main/wae.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -374,8 +374,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			St. Martin
 			Madagaskar
 			Maršalinslä
-			Mazedonie
-			Mazedonie (EJR)
 			Mali
 			Burma
 			Mongolei
@@ -506,7 +504,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á ä ã b c č d e é f g h i í j k l m n o ó ö õ p q r s š t u ú ü ũ v w x y z]
 		[à ă â å ā æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò ŏ ô ø ō œ ß ù ŭ û ū ÿ]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‑ , ’ % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/wae_CH.xml b/make/data/cldr/common/main/wae_CH.xml
index d253e9e8359..93caece86cb 100644
--- a/make/data/cldr/common/main/wae_CH.xml
+++ b/make/data/cldr/common/main/wae_CH.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/wo.xml b/make/data/cldr/common/main/wo.xml
index b104dd4a1f8..eda6f37f980 100644
--- a/make/data/cldr/common/main/wo.xml
+++ b/make/data/cldr/common/main/wo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -224,7 +224,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Repiblik Sàntar Afrik
 			Réewum Kongo
 			Siwis
-			Kodiwaar (Côte d’Ivoire)
+			Kodiwaar
 			Duni Kuuk
 			Sili
 			Kamerun
diff --git a/make/data/cldr/common/main/wo_SN.xml b/make/data/cldr/common/main/wo_SN.xml
index a988e5516c6..c48f979c982 100644
--- a/make/data/cldr/common/main/wo_SN.xml
+++ b/make/data/cldr/common/main/wo_SN.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/xh.xml b/make/data/cldr/common/main/xh.xml
index fc43dcf4877..25798e0d7c3 100644
--- a/make/data/cldr/common/main/xh.xml
+++ b/make/data/cldr/common/main/xh.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
diff --git a/make/data/cldr/common/main/xh_ZA.xml b/make/data/cldr/common/main/xh_ZA.xml
index 101d62d1043..31c1509762f 100644
--- a/make/data/cldr/common/main/xh_ZA.xml
+++ b/make/data/cldr/common/main/xh_ZA.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/xog.xml b/make/data/cldr/common/main/xog.xml
index 6937ecfa360..b47181c9c86 100644
--- a/make/data/cldr/common/main/xog.xml
+++ b/make/data/cldr/common/main/xog.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Molodova
 			Madagasika
 			Bizinga bya Mariso
-			Masedoniya
 			Mali
 			Myanima
 			Mongoliya
diff --git a/make/data/cldr/common/main/xog_UG.xml b/make/data/cldr/common/main/xog_UG.xml
index 425982107b2..140f083cbdd 100644
--- a/make/data/cldr/common/main/xog_UG.xml
+++ b/make/data/cldr/common/main/xog_UG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/yav.xml b/make/data/cldr/common/main/yav.xml
index 29061a3c1e1..f77d36d728f 100644
--- a/make/data/cldr/common/main/yav.xml
+++ b/make/data/cldr/common/main/yav.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			moltafí
 			matakaskáal
 			ílmalasáal
-			masetuán
 			malí
 			miaŋmáal
 			mongolí
@@ -288,7 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à â ǎ ā b c d e é è ɛ {ɛ\u0301} {ɛ\u0300} f h i í ì î ī k l m {mb} n {ny} ŋ {ŋg} o ó ò ô ǒ ō ɔ {ɔ\u0301} {ɔ\u0300} p s t u ú ù û ǔ ū v w y]
 		[g j q r x z]
 		[A B C D E Ɛ F H I K L M N Ŋ O Ɔ P S T U V W Y]
-		[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]
 	
 	
 		«
diff --git a/make/data/cldr/common/main/yav_CM.xml b/make/data/cldr/common/main/yav_CM.xml
index 11e98094aed..f54983a102a 100644
--- a/make/data/cldr/common/main/yav_CM.xml
+++ b/make/data/cldr/common/main/yav_CM.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/yi.xml b/make/data/cldr/common/main/yi.xml
index e5d78008126..d19767f6352 100644
--- a/make/data/cldr/common/main/yi.xml
+++ b/make/data/cldr/common/main/yi.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -48,7 +48,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			זשאלא־פֿאני
 			גריכיש
 			ענגליש
-			ענגליש (GB)
 			ענגליש (US)
 			מיטל ענגליש
 			עספּעראַנטא
@@ -314,7 +313,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			מאנטענעגרא
 			מאַדאַגאַסקאַר
 			מאַרשאַל אינזלען
-			מאַקעדאניע
 			מאַלי
 			מיאַנמאַר
 			מאנגאליי
@@ -426,8 +424,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[א {א\u05B7} {א\u05B8} ב {ב\u05BF} ג ד {דזש} ה ו {ו\u05BC} {וו} {וי} ז {זש} ח ט {טש} י {י\u05B4} {יי} {ײ\u05B7} {כ\u05BC} כ ך ל מ ם נ ן ס ע {פ\u05BC} {פ\u05BF} ף צ ץ ק ר ש {ש\u05C2} {ת\u05BC} ת]
 		[\u200E\u200F]
 		[\u05C2 \u05BC \u05BF א ב ג ד ה ו ז ח ט י כ ל מ נ ס ע פ צ ק ר ש ת]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . ׳ ' " ( ) \[ \] / ״ ־]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
+		[\- ‐ ‑ – — , ; \: ! ? . ׳ ' " ( ) \[ \] / ״ ־]
 	
 	
 		”
diff --git a/make/data/cldr/common/main/yi_001.xml b/make/data/cldr/common/main/yi_001.xml
index 1fa8422e792..1e2e19f01fd 100644
--- a/make/data/cldr/common/main/yi_001.xml
+++ b/make/data/cldr/common/main/yi_001.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/yo.xml b/make/data/cldr/common/main/yo.xml
index b683222955d..841628f4fdd 100644
--- a/make/data/cldr/common/main/yo.xml
+++ b/make/data/cldr/common/main/yo.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -20,7 +20,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Èdè Afrikani
 			Èdè Akani
 			Èdè Amariki
-			Èdè Arabiki
+			Èdè Árábìkì
 			Ti Assam
 			Èdè Azerbaijani
 			Èdè Belarusi
@@ -32,30 +32,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Èdè seeki
 			Èdè Welshi
 			Èdè Ilẹ̀ Denmark
-			Èdè Ilẹ̀ Jámánì
-			Èdè Ilẹ̀ Jámánì orílẹ̀-èdè Ọ́síríà )
+			Èdè Jámánì
+			Èdè Jámánì (Ọ́síríà )
 			Èdè Ilẹ̀ Jámánì (Orílẹ́ède swítsàlandì)
 			Èdè Giriki
 			Èdè Gẹ̀ẹ́sì
 			Èdè Gẹ̀ẹ́sì (órílẹ̀-èdè Ọsirélíà)
 			Èdè Gẹ̀ẹ́sì (Orílẹ̀-èdè Kánádà)
 			Èdè òyìnbó Gẹ̀ẹ́sì
-			Èdè Gẹ̀ẹ́sì (GB)
-			Èdè Gẹ̀ẹ́sì (US)
 			Èdè Esperanto
 			Èdè Sípáníìṣì
-			Èdè Sípáníìṣì (orílẹ̀-èdè Látìn-Amẹ́ríkà)
+			Èdè Sípáníìṣì (orílẹ̀-èdè Látìn-Amẹ́ríkà) ( Èdè Sípáníìshì (Látìn-Amẹ́ríkà)
 			Èdè Sípáníìṣì (orílẹ̀-èdè Yúróòpù)
 			Èdè Sípáníìṣì (orílẹ̀-èdè Mẹ́síkò)
 			Èdè Estonia
 			Èdè Baski
 			Èdè Pasia
+			Èdè Fúlàní
 			Èdè Finisi
 			Èdè Filipino
 			Èdè Faroesi
 			Èdè Faransé
 			Èdè Faransé (orílẹ̀-èdè Kánádà)
-			Èdè Faransé (orílẹ̀-èdè swítsàlandì)
+			Èdè Faranṣé (Súwísàlaǹdì)
 			Èdè Frisia
 			Èdè Ireland
 			Èdè Gaelik ti Ilu Scotland
@@ -64,22 +63,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Èdè Gujarati
 			Èdè Hausa
 			Èdè Heberu
-			Èdè Hindi
+			Èdè Híńdì
 			Èdè Kroatia
 			Èdè Hungaria
 			Èdè Ile Armenia
 			Èdè pipo
-			Èdè Indonasia
+			Èdè Indonéṣíà
 			Iru Èdè
-			Èdè Ibo
+			Èdè Yíbò
 			Èdè Icelandic
-			Èdè ilẹ̀ Ítálì
-			Èdè ilẹ̀ Japan
+			Èdè Ítálì
+			Èdè Jàpáànù
 			Èdè Javanasi
 			Èdè Georgia
 			Èdè kameri
 			Èdè Kannada
-			Èdè Koria
+			Èdè Kòríà
 			Èdè Latini
 			Èdè Lithuania
 			Èdè Latvianu
@@ -89,16 +88,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Èdè Malta
 			Èdè Bumiisi
 			Èdè Nepali
-			Èdè Duki
+			Èdè Dọ́ọ̀ṣì
 			Èdè Norway
 			Èdè Occitani
 			Èdè Punjabi
-			Èdè Ilẹ̀ Polandi
+			Èdè Póláǹdì
 			Èdè Pọtogí
 			Èdè Pọtogí (Orilẹ̀-èdè Bràsíl)
 			Èdè Pọtogí (orílẹ̀-èdè Yúróòpù)
 			Èdè Romania
-			Èdè Rọsià
+			Èdè Rọ́ṣíà
 			Èdè Ruwanda
 			Èdè awon ara Indo
 			Èdè Sindhi
@@ -129,6 +128,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Èdè Yiddishi
 			Èdè Yorùbá
 			Èdè Mandarin tí wọ́n ń sọ lórílẹ̀-èdè Ṣáínà
+			Ṣáídà, Mandrínì
+			Èdè Ìbílẹ̀ Ṣáínà
 			Èdè Ṣulu
 		
 		
@@ -138,11 +139,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 			
+			
+			
 			
 			
-			
+			
 		
 		
+			Àríwá Amẹ́ríkà
+			Gúúṣù Amẹ́ríkà
+			Ìwọ̀ oorùn Afíríkà
+			Ààrin Gbùgbùn Àmẹ́ríkà
+			Ìlà Oorùn Áfíríkà
+			Ààrín gbùngbùn Afíríkà
+			Apágúúsù Áfíríkà
+			Apáàríwá Amẹ́ríkà
+			Káríbíànù
+			Ìlà Òòrùn Eṣíà
+			Gúúṣù Eṣíà
+			Gúúṣù ìlà òòrùn Éṣíà
+			Gúúṣù Yúróòpù
+			Ọṣirélaṣíà
+			Mẹlanéṣíà
+			Agbègbè Maikironéṣíà
+			Polineṣíà
+			Ààrin Gbùngbùn Éṣíà
+			Ìwọ̀ Òòrùn Eṣíà
+			Ìlà Òrùn Yúrópù
+			Northern Europe
+			Ìwọ̀ Òòrùn Yúrópù
+			Látín Amẹ́ríkà
 			Orílẹ́ède Ààndórà
 			Orílẹ́ède Ẹmirate ti Awọn Arabu
 			Orílẹ́ède Àfùgànístánì
@@ -200,9 +226,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílẹ́ède Ekuádò
 			Orílẹ́ède Esitonia
 			Orílẹ́ède Égípítì
+			Ìwọ̀òòrùn Sàhárà
 			Orílẹ́ède Eritira
 			Orílẹ́ède Sipani
 			Orílẹ́ède Etopia
+			Ìṣọ̀kan Yúròpù
 			Orílẹ́ède Filandi
 			Orílẹ́ède Fiji
 			Orílẹ́ède Etikun Fakalandi
@@ -268,10 +296,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílẹ́ède Modofia
 			Orílẹ́ède Madasika
 			Orílẹ́ède Etikun Máṣali
-			Orílẹ́ède Masidonia
+			Àríwá Macedonia
 			Orílẹ́ède Mali
 			Orílẹ́ède Manamari
 			Orílẹ́ède Mogolia
+			Màkáò
 			Orílẹ́ède Etikun Guusu Mariana
 			Orílẹ́ède Matinikuwi
 			Orílẹ́ède Maritania
@@ -306,8 +335,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílẹ́ède Pẹẹri ati mikuloni
 			Orílẹ́ède Pikarini
 			Orílẹ́ède Pọto Riko
-			Orílẹ́ède Iwọorun Pakisitian ati Gaṣa
-			Orílẹ́ède Pọtugi
+			Agbègbè Palẹsítíànù
+			Palẹsitín
+			Orílẹ́ède Pọ́túgà
 			Orílẹ́ède Paalu
 			Orílẹ́ède Paraguye
 			Orílẹ́ède Kota
@@ -329,18 +359,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílẹ́ède Sẹnẹga
 			Orílẹ́ède Somalia
 			Orílẹ́ède Surinami
-			Gúúsù Sudan
+			Gúúsù Sudan
 			Orílẹ́ède Sao tomi ati piriiṣipi
 			Orílẹ́ède Ẹẹsáfádò
 			Orílẹ́ède Siria
 			Orílẹ́ède Saṣiland
+			Síwásìlandì
 			Orílẹ́ède Tọọki ati Etikun Kakọsi
 			Orílẹ́ède ṣààdì
+			Agbègbè Gúúsù Faranṣé
 			Orílẹ́ède Togo
 			Orílẹ́ède Tailandi
 			Orílẹ́ède Takisitani
 			Orílẹ́ède Tokelau
 			Orílẹ́ède ÌlàOòrùn Tímọ̀
+			Ìlà Òòrùn Tímọ̀
 			Orílẹ́ède Tọọkimenisita
 			Orílẹ́ède Tuniṣia
 			Orílẹ́ède Tonga
@@ -348,9 +381,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílẹ́ède Tirinida ati Tobaga
 			Orílẹ́ède Tufalu
 			Orílẹ́ède Taiwani
-			Orílẹ́ède Tanṣania
+			Orílẹ́ède Tàǹsáníà
 			Orílẹ́ède Ukarini
 			Orílẹ́ède Uganda
+			Ìṣọ̀kan àgbáyé
 			Orílẹ̀-èdè Amẹrikà
 			Orílẹ́ède Nruguayi
 			Orílẹ́ède Nṣibẹkisitani
@@ -363,15 +397,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílẹ́ède Faniatu
 			Orílẹ́ède Wali ati futuna
 			Orílẹ́ède Samọ
+			Kòsófò
 			Orílẹ́ède yemeni
 			Orílẹ́ède Mayote
-			Orílẹ́ède Ariwa Afirika
+			Gúúṣù Áfíríkà
 			Orílẹ́ède ṣamibia
 			Orílẹ́ède ṣimibabe
 			Àgbègbè àìmọ̀
 		
 		
 			Kàlẹ́ńdà Gregory
+			Kàlẹ́ńdà ISO-8601
 			Ìlànà Onírúurú Ètò
 			Díjíítì Ìwọ̀ Oòrùn
 		
@@ -382,7 +418,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 		
 			Èdè: {0}
-			ọ̀nà ìgbàkọ̀wé: {0}
+			Ìṣọwọ́kọ̀wé: {0}
 			Àgbègbè: {0}
 		
 	
@@ -390,8 +426,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[a á à b d e é è ẹ {ẹ\u0301} {ẹ\u0300} f g {gb} h i í ì j k l m n o ó ò ọ {ọ\u0301} {ọ\u0300} p r s ṣ t u ú ù w y]
 		[c q v x z]
 		[A B D E F G H I J K L M N O P R S T U W Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) @ * / \& # † ‡ ′ ″]
+		[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) @ * / \& # † ‡ ′ ″]
 	
 	
 		“
@@ -427,12 +462,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 					
 						
-							{1} {0}
+							{1} 'ní' {0}
 						
 					
 					
 						
-							{1} {0}
+							{1} 'ní' {0}
 						
 					
 					
@@ -604,15 +639,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						
-							Àìk
-							Aj
-							Ìsẹ́g
-							Ọjọ́r
-							Ọjọ́b
-							Ẹt
-							Àbám
-						
 						
 							À
 							A
@@ -644,12 +670,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
-						
-							Ìdámẹ́rin kíní
-							Ìdámẹ́rin Kejì
-							Ìdámẹ́rin Kẹta
-							Ìdámẹ́rin Kẹrin
-						
 						
 							kíní
 							Kejì
@@ -664,12 +684,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						
-							Ìdámẹ́rin kíní
-							Ìdámẹ́rin Kejì
-							Ìdámẹ́rin Kẹta
-							Ìdámẹ́rin Kẹrin
-						
 						
 							kí
 							Ke
@@ -723,7 +737,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					
 					
 						BCE
-						CE
+						BCE
+						AD
+						CE
 					
 				
 				
@@ -792,13 +808,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						h B
-						h:mm B
-						h:mm:ss B
 						d
 						ccc
-						E h:mm B
-						E h:mm:ss B
 						E, d
 						E h:mm a
 						E HH:mm
@@ -945,22 +956,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Ọdún
-				ọ́dún tó kọjá
-				ọ́dún yìí
-				ọ́dún tó ń bọ̀
-			
-			
-				Ọdún
-			
-			
-				Ọdún
+				Èṣín
+				Ọdúnǹí
+				Àmọ́dún
 			
 			
 				Ìdá mẹ́rin
 			
-			
-				Ìdá mẹ́rin
-			
 			
 				Ìdá mẹ́rin
 			
@@ -970,11 +972,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				oṣù yìí
 				óṣù tó ń bọ̀,
 			
-			
-				Osù
-			
 			
-				Osù
+				Oṣù
 			
 			
 				Ọ̀sẹ̀
@@ -983,10 +982,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ọ́sẹ̀ tó ń bọ̀
 			
 			
-				Ọ̀sẹ̀
-			
-			
-				Ọ̀sẹ̀
+				ọ̀ṣẹ̀ {0}
 			
 			
 				Ọjọ́
@@ -996,18 +992,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Ọ̀la
 				òtúùnla
 			
-			
-				Ọjọ́
-				Àná
-				Òní
-				Ọ̀la
-			
-			
-				Ọjọ́
-				Àná
-				Òní
-				Ọ̀la
-			
 			
 				Ọjọ́ tó wà láàárín ọ̀sẹ̀
 			
@@ -1022,21 +1006,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Wákàtí
 			
-			
-				Wákàtí
-			
-			
-				Wákàtí
-			
 			
 				Ìsẹ́jú
 			
-			
-				Ìsẹ́jú
-			
-			
-				Ìsẹ́jú
-			
 			
 				Ìsẹ́jú Ààyá
 			
@@ -1054,7 +1026,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			+HH:mm;-HH:mm
 			WAT{0}
 			WAT
-			{0} Ìgbà
+			Ìgbà {0}
 			{0} Àkókò ojúmọmọ
 			{0} Ìlànà Àkókò
 			{1} ({0})
@@ -1066,9 +1038,57 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ìlú Àìmọ̀
 			
-			
-				Lagos
+			
+				
+					British Summer Time
+				
 			
+			
+				
+					Irish Standard Time
+				
+			
+			
+				
+					Afghanistan Time
+				
+			
+			
+				
+					Central Africa Time
+				
+			
+			
+				
+					East Africa Time
+				
+			
+			
+				
+					South Africa Standard Time
+				
+			
+			
+				
+					West Africa Time
+					West Africa Standard Time
+					West Africa Summer Time
+				
+			
+			
+				
+					Alaska Time
+					Alaska Standard Time
+					Alaska Daylight Time
+				
+			
+			
+				
+					Amazon Time
+					Amazon Standard Time
+					Amazon Summer Time
+				
+			
 			
 				
 					àkókò àárín gbùngbùn
@@ -1097,6 +1117,41 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Àkókò Ìyálẹta Pàsífíìkì
 				
 			
+			
+				
+					Apia Time
+					Apia Standard Time
+					Apia Daylight Time
+				
+			
+			
+				
+					Arabian Time
+					Arabian Standard Time
+					Arabian Daylight Time
+				
+			
+			
+				
+					Argentina Time
+					Argentina Standard Time
+					Argentina Summer Time
+				
+			
+			
+				
+					Western Argentina Time
+					Western Argentina Standard Time
+					Western Argentina Summer Time
+				
+			
+			
+				
+					Armenia Time
+					Armenia Standard Time
+					Armenia Summer Time
+				
+			
 			
 				
 					Àkókò Àtìláńtíìkì
@@ -1104,6 +1159,156 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Àkókò Ìyálẹta Àtìláńtíìkì
 				
 			
+			
+				
+					Central Australia Time
+					Australian Central Standard Time
+					Australian Central Daylight Time
+				
+			
+			
+				
+					Australian Central Western Time
+					Australian Central Western Standard Time
+					Australian Central Western Daylight Time
+				
+			
+			
+				
+					Eastern Australia Time
+					Australian Eastern Standard Time
+					Australian Eastern Daylight Time
+				
+			
+			
+				
+					Western Australia Time
+					Australian Western Standard Time
+					Australian Western Daylight Time
+				
+			
+			
+				
+					Azerbaijan Time
+					Azerbaijan Standard Time
+					Azerbaijan Summer Time
+				
+			
+			
+				
+					Azores Time
+					Azores Standard Time
+					Azores Summer Time
+				
+			
+			
+				
+					Bangladesh Time
+					Bangladesh Standard Time
+					Bangladesh Summer Time
+				
+			
+			
+				
+					Bhutan Time
+				
+			
+			
+				
+					Bolivia Time
+				
+			
+			
+				
+					Brasilia Time
+					Brasilia Standard Time
+					Brasilia Summer Time
+				
+			
+			
+				
+					Brunei Darussalam Time
+				
+			
+			
+				
+					Cape Verde Time
+					Cape Verde Standard Time
+					Cape Verde Summer Time
+				
+			
+			
+				
+					Chamorro Standard Time
+				
+			
+			
+				
+					Chatham Time
+					Chatham Standard Time
+					Chatham Daylight Time
+				
+			
+			
+				
+					Chile Time
+					Chile Standard Time
+					Chile Summer Time
+				
+			
+			
+				
+					Choibalsan Time
+					Choibalsan Standard Time
+					Choibalsan Summer Time
+				
+			
+			
+				
+					Christmas Island Time
+				
+			
+			
+				
+					Cocos Islands Time
+				
+			
+			
+				
+					Colombia Time
+					Colombia Standard Time
+					Colombia Summer Time
+				
+			
+			
+				
+					Cook Islands Time
+					Cook Islands Standard Time
+					Cook Islands Half Summer Time
+				
+			
+			
+				
+					Davis Time
+				
+			
+			
+				
+					Dumont-d’Urville Time
+				
+			
+			
+				
+					Easter Island Time
+					Easter Island Standard Time
+					Easter Island Summer Time
+				
+			
+			
+				
+					Ecuador Time
+				
+			
 			
 				
 					Àkókò Àárin Europe
@@ -1118,6 +1323,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Àkókò Sọmà Ìha Ìlà Oòrùn Europe
 				
 			
+			
+				
+					Further-eastern European Time
+				
+			
 			
 				
 					Àkókò Ìwọ Oòrùn Europe
@@ -1125,18 +1335,518 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Àkókò Sọmà Ìhà Ìwọ Oòrùn Europe
 				
 			
+			
+				
+					Falkland Islands Time
+					Falkland Islands Standard Time
+					Falkland Islands Summer Time
+				
+			
+			
+				
+					Fiji Time
+					Fiji Standard Time
+					Fiji Summer Time
+				
+			
+			
+				
+					French Guiana Time
+				
+			
+			
+				
+					French Southern & Antarctic Time
+				
+			
+			
+				
+					Galapagos Time
+				
+			
+			
+				
+					Gambier Time
+				
+			
+			
+				
+					Georgia Time
+					Georgia Standard Time
+					Georgia Summer Time
+				
+			
+			
+				
+					Gilbert Islands Time
+				
+			
 			
 				
 					Greenwich Mean Time
 				
 			
+			
+				
+					Gulf Standard Time [translation hint: translate as just "Gulf Time"]
+				
+			
+			
+				
+					Guyana Time
+				
+			
+			
+				
+					Hong Kong Time
+					Hong Kong Standard Time
+					Hong Kong Summer Time
+				
+			
+			
+				
+					Hovd Time
+					Hovd Standard Time
+					Hovd Summer Time
+				
+			
+			
+				
+					India Standard Time
+				
+			
+			
+				
+					Indian Ocean Time
+				
+			
+			
+				
+					Eastern Indonesia Time
+				
+			
+			
+				
+					Iran Time
+					Iran Standard Time
+					Iran Daylight Time
+				
+			
+			
+				
+					Irkutsk Time
+					Irkutsk Standard Time
+					Irkutsk Summer Time
+				
+			
+			
+				
+					Israel Time
+					Israel Standard Time
+					Israel Daylight Time
+				
+			
+			
+				
+					Japan Time
+					Japan Standard Time
+					Japan Daylight Time
+				
+			
+			
+				
+					East Kazakhstan Time
+				
+			
+			
+				
+					West Kazakhstan Time
+				
+			
+			
+				
+					Korean Time
+					Korean Standard Time
+					Korean Daylight Time
+				
+			
+			
+				
+					Kosrae Time
+				
+			
+			
+				
+					Krasnoyarsk Time
+					Krasnoyarsk Standard Time
+					Krasnoyarsk Summer Time
+				
+			
+			
+				
+					Kyrgyzstan Time
+				
+			
+			
+				
+					Line Islands Time
+				
+			
+			
+				
+					Lord Howe Time
+					Lord Howe Standard Time
+					Lord Howe Daylight Time
+				
+			
+			
+				
+					Macquarie Island Time
+				
+			
+			
+				
+					Magadan Time
+					Magadan Standard Time
+					Magadan Summer Time
+				
+			
+			
+				
+					Malaysia Time
+				
+			
+			
+				
+					Maldives Time
+				
+			
+			
+				
+					Marquesas Time
+				
+			
+			
+				
+					Marshall Islands Time
+				
+			
+			
+				
+					Mauritius Time
+					Mauritius Standard Time
+					Mauritius Summer Time
+				
+			
+			
+				
+					Mawson Time
+				
+			
+			
+				
+					Ulaanbaatar Time
+					Ulaanbaatar Standard Time
+					Ulaanbaatar Summer Time
+				
+			
+			
+				
+					Moscow Time
+					Moscow Standard Time
+					Moscow Summer Time
+				
+			
+			
+				
+					Myanmar Time
+				
+			
+			
+				
+					Nauru Time
+				
+			
+			
+				
+					Nepal Time
+				
+			
+			
+				
+					New Caledonia Time
+					New Caledonia Standard Time
+					New Caledonia Summer Time
+				
+			
+			
+				
+					New Zealand Time
+					New Zealand Standard Time
+					New Zealand Daylight Time
+				
+			
+			
+				
+					Niue Time
+				
+			
+			
+				
+					Norfolk Island Time
+				
+			
+			
+				
+					Fernando de Noronha Time
+					Fernando de Noronha Standard Time
+					Fernando de Noronha Summer Time
+				
+			
+			
+				
+					Novosibirsk Time
+					Novosibirsk Standard Time
+					Novosibirsk Summer Time
+				
+			
+			
+				
+					Omsk Time
+					Omsk Standard Time
+					Omsk Summer Time
+				
+			
+			
+				
+					Pakistan Time
+					Pakistan Standard Time
+					Pakistan Summer Time
+				
+			
+			
+				
+					Palau Time
+				
+			
+			
+				
+					Papua New Guinea Time
+				
+			
+			
+				
+					Paraguay Time
+					Paraguay Standard Time
+					Paraguay Summer Time
+				
+			
+			
+				
+					Peru Time
+					Peru Standard Time
+					Peru Summer Time
+				
+			
+			
+				
+					Philippine Time
+					Philippine Standard Time
+					Philippine Summer Time
+				
+			
+			
+				
+					Phoenix Islands Time
+				
+			
+			
+				
+					Pitcairn Time
+				
+			
+			
+				
+					Ponape Time
+				
+			
+			
+				
+					Pyongyang Time
+				
+			
+			
+				
+					Réunion Time
+				
+			
+			
+				
+					Rothera Time
+				
+			
+			
+				
+					Sakhalin Time
+					Sakhalin Standard Time
+					Sakhalin Summer Time
+				
+			
+			
+				
+					Samoa Time
+					Samoa Standard Time
+					Samoa Daylight Time
+				
+			
+			
+				
+					Seychelles Time
+				
+			
+			
+				
+					Singapore Standard Time
+				
+			
+			
+				
+					Solomon Islands Time
+				
+			
+			
+				
+					South Georgia Time
+				
+			
+			
+				
+					Suriname Time
+				
+			
+			
+				
+					Syowa Time
+				
+			
+			
+				
+					Tahiti Time
+				
+			
+			
+				
+					Taipei Time
+					Taipei Standard Time
+					Taipei Daylight Time
+				
+			
+			
+				
+					Tajikistan Time
+				
+			
+			
+				
+					Tokelau Time
+				
+			
+			
+				
+					Tonga Time
+					Tonga Standard Time
+					Tonga Summer Time
+				
+			
+			
+				
+					Chuuk Time
+				
+			
+			
+				
+					Turkmenistan Time
+					Turkmenistan Standard Time
+					Turkmenistan Summer Time
+				
+			
+			
+				
+					Tuvalu Time
+				
+			
+			
+				
+					Uruguay Time
+					Uruguay Standard Time
+					Uruguay Summer Time
+				
+			
+			
+				
+					Uzbekistan Time
+					Uzbekistan Standard Time
+					Uzbekistan Summer Time
+				
+			
+			
+				
+					Vanuatu Time
+					Vanuatu Standard Time
+					Vanuatu Summer Time
+				
+			
+			
+				
+					Venezuela Time
+				
+			
+			
+				
+					Vladivostok Time
+					Vladivostok Standard Time
+					Vladivostok Summer Time
+				
+			
+			
+				
+					Volgograd Time
+					Volgograd Standard Time
+					Volgograd Summer Time
+				
+			
+			
+				
+					Vostok Time
+				
+			
+			
+				
+					Wake Island Time
+				
+			
+			
+				
+					Wallis & Futuna Time
+				
+			
+			
+				
+					Yakutsk Time
+					Yakutsk Standard Time
+					Yakutsk Summer Time
+				
+			
+			
+				
+					Yekaterinburg Time
+					Yekaterinburg Standard Time
+					Yekaterinburg Summer Time
+				
+			
 		
 	
 	
-		latn
-		
-			latn
-		
 		1
 		
 			.
@@ -1217,8 +1927,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Owó ti Orílẹ̀-èdè Brazil
 				Awon owó ti Orílẹ̀-èdè Brazil
-				R$
-				R$
 			
 			
 				Pula ti Orílẹ́ède Bọ̀tìsúwánà
@@ -1234,8 +1942,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Reminibi ti Orílẹ́ède ṣáínà
-				CN¥
-				¥
 			
 			
 				Kabofediano ti Orílẹ́ède Esuodo
@@ -1248,6 +1954,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				pọọn ti Orílẹ́ède Egipiti
+				pọ́nùn
 			
 			
 				Nakifa ti Orílẹ́ède Eriteriani
@@ -1258,13 +1965,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				owó Yúrò
 				Awon owó Yúrò
-				€
-				€
 			
 			
 				Pọ́n-ùn ti Orilẹ̀-èdè Gẹ̀ẹ́sì
-				£
-				£
 			
 			
 				ṣidi ti Orílẹ́ède Gana
@@ -1277,13 +1980,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Rupi ti Orílẹ́ède Indina
-				₹
-				₹
 			
 			
 				Yeni ti Orílẹ́ède Japani
-				JP¥
-				¥
 			
 			
 				ṣiili ti Orílẹ́ède Kenya
@@ -1291,6 +1990,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Faransi ti Orílẹ́ède ṣomoriani
 			
+			
+				₩
+			
 			
 				Dọla ti Orílẹ́ède Liberia
 			
@@ -1326,13 +2028,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Náìrà ti Orílẹ̀-èdè Nàìjíríà
+				Náírà Nàìjíríà
 				₦
 			
 			
 				Owó ruble ti ilẹ̀ Rọ́ṣíà
 				Owó ruble ti ilẹ̀ Rọ́ṣíà
 				₽
-				₽
 			
 			
 				Faransi ti Orílẹ́ède Ruwanda
@@ -1380,7 +2082,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Dọ́là
 				Dọ́là ti Orílẹ̀-Èdè Amẹ́ríkà
 				$
-				$
 			
 			
 				Faransi ti Orílẹ́ède BEKA
@@ -1409,8 +2110,128 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			≥{0}
 			{0}–{1}
 		
+		
+			Àwọn ọjọ́ {0}
+			Mú {0} apá ọ̀tún
+		
 	
 	
+		
+			
+				ọ̀rúndún
+				ọ̀rúndún {0}
+			
+			
+				ẹ̀wádùn
+				ẹ̀wádùn {0}
+			
+			
+				ọ̀dún
+				{0} ọd
+				{0} ọd
+			
+			
+				oṣù
+				{0} oṣù
+				{0}/oṣù
+			
+			
+				ọṣ
+				{0} ọṣ
+				{0}/ọṣ
+			
+			
+				ọjọ́
+				ọj {0}
+				{0}/ọj
+			
+			
+				wkt
+				{0} wkt
+				{0}/wkt
+			
+			
+				ìṣ
+				{0} ìṣ
+				{0}/ìṣ
+			
+			
+				ìṣ àáy
+				{0}ìṣ àáy
+				{0}/ìṣ àáy
+			
+		
+		
+			
+				ẹ̀wádùn
+				ẹ̀wádún {0}
+			
+			
+				ọd
+				{0} ọd
+				{0}/ọd
+			
+			
+				oṣù
+				{0} oṣù
+				{0}/oṣù
+			
+			
+				ọṣ
+				{0} ọṣ
+				{0}/ọṣẹ̀
+			
+			
+				ọjọ́
+				{0} ọj
+				{0}/ọj
+			
+			
+				wkt
+				{0} wkt
+				{0}/wkt
+			
+			
+				ìṣ
+				{0} ìṣ
+				{0}/ìṣ
+			
+			
+				ìṣ àáy
+				{0} ìṣ àáy
+				{0} ìṣ àáy
+			
+		
+		
+			
+				ọd
+				{0} ọd
+			
+			
+				oṣù
+				{0} oṣù
+			
+			
+				ọṣẹ́
+				{0} ọṣ
+			
+			
+				ọjọ́
+				ọj {0}
+			
+			
+				wkt
+				{0} wkt
+			
+			
+				ìṣ
+				{0}/ìṣ
+			
+			
+				ìṣ àáy
+				{0} ìṣ àáy
+			
+		
 		
 			h:mm
 		
diff --git a/make/data/cldr/common/main/yo_BJ.xml b/make/data/cldr/common/main/yo_BJ.xml
index 2a665bfeb3d..b6ce9fdd0ae 100644
--- a/make/data/cldr/common/main/yo_BJ.xml
+++ b/make/data/cldr/common/main/yo_BJ.xml
@@ -7,143 +7,65 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
 	
-		
-			{0} ({1})
-			{0}, {1}
-			{0}: {1}
-		
 		
-			Èdè Afrikani
-			Èdè Akani
-			Èdè Amariki
-			Èdè Arabiki
-			Ti Assam
-			Èdè Azerbaijani
-			Èdè Belarusi
-			Èdè Bugaria
-			Èdè Bengali
-			Èdè Bretoni
-			Èdè Bosnia
-			Èdè Catala
-			Èdè seeki
-			Èdè Welshi
 			Èdè Ilɛ̀ Denmark
-			Èdè Ilɛ̀ Jámánì
-			Èdè Ilɛ̀ Jámánì orílɛ̀-èdè Ɔ́síríà )
+			Èdè Jámánì (Ɔ́síríà )
 			Èdè Ilɛ̀ Jámánì (Orílɛ́ède swítsàlandì)
-			Èdè Giriki
 			Èdè Gɛ̀ɛ́sì
 			Èdè Gɛ̀ɛ́sì (órílɛ̀-èdè Ɔsirélíà)
 			Èdè Gɛ̀ɛ́sì (Orílɛ̀-èdè Kánádà)
 			Èdè òyìnbó Gɛ̀ɛ́sì
-			Èdè Gɛ̀ɛ́sì (GB)
-			Èdè Gɛ̀ɛ́sì (US)
-			Èdè Esperanto
 			Èdè Sípáníìshì
-			Èdè Sípáníìshì (orílɛ̀-èdè Látìn-Amɛ́ríkà)
+			Èdè Sípáníìshì (orílɛ̀-èdè Látìn-Amɛ́ríkà) ( Èdè Sípáníìshì (Látìn-Amɛ́ríkà)
 			Èdè Sípáníìshì (orílɛ̀-èdè Yúróòpù)
 			Èdè Sípáníìshì (orílɛ̀-èdè Mɛ́síkò)
-			Èdè Estonia
-			Èdè Baski
-			Èdè Pasia
-			Èdè Finisi
-			Èdè Filipino
-			Èdè Faroesi
-			Èdè Faransé
 			Èdè Faransé (orílɛ̀-èdè Kánádà)
-			Èdè Faransé (orílɛ̀-èdè swítsàlandì)
-			Èdè Frisia
-			Èdè Ireland
-			Èdè Gaelik ti Ilu Scotland
-			Èdè Galicia
-			Èdè Guarani
-			Èdè Gujarati
-			Èdè Hausa
-			Èdè Heberu
-			Èdè Hindi
-			Èdè Kroatia
-			Èdè Hungaria
-			Èdè Ile Armenia
-			Èdè pipo
-			Èdè Indonasia
-			Iru Èdè
-			Èdè Ibo
-			Èdè Icelandic
-			Èdè ilɛ̀ Ítálì
-			Èdè ilɛ̀ Japan
-			Èdè Javanasi
-			Èdè Georgia
-			Èdè kameri
-			Èdè Kannada
-			Èdè Koria
-			Èdè Latini
-			Èdè Lithuania
-			Èdè Latvianu
-			Èdè Macedonia
-			Èdè marathi
-			Èdè Malaya
-			Èdè Malta
-			Èdè Bumiisi
-			Èdè Nepali
-			Èdè Duki
-			Èdè Norway
-			Èdè Occitani
-			Èdè Punjabi
-			Èdè Ilɛ̀ Polandi
+			Èdè Faranshé (Súwísàlaǹdì)
+			Èdè Indonéshíà
+			Èdè Dɔ́ɔ̀shì
 			Èdè Pɔtogí
 			Èdè Pɔtogí (Orilɛ̀-èdè Bràsíl)
 			Èdè Pɔtogí (orílɛ̀-èdè Yúróòpù)
-			Èdè Romania
-			Èdè Rɔsià
-			Èdè Ruwanda
-			Èdè awon ara Indo
-			Èdè Sindhi
-			Èdè Serbo-Croatiani
-			Èdè Sinhalese
-			Èdè Slovaki
-			Èdè Slovenia
-			Èdè ara Somalia
-			Èdè Albania
-			Èdè Serbia
-			Èdè Sesoto
-			Èdè Sudani
-			Èdè Suwidiisi
-			Èdè Swahili
-			Èdè Tamili
-			Èdè Telugu
-			Èdè Tai
-			Èdè Tigrinya
-			Èdè Turkmen
-			Èdè Klingoni
+			Èdè Rɔ́shíà
 			Èdè Tɔɔkisi
-			Èdè Ukania
 			Èdè àìmɔ̀
-			Èdè Udu
-			Èdè Uzbek
-			Èdè Jetinamu
-			Èdè Xhosa
-			Èdè Yiddishi
-			Èdè Yorùbá
 			Èdè Mandarin tí wɔ́n ń sɔ lórílɛ̀-èdè Sháínà
+			Sháídà, Mandrínì
+			Èdè Ìbílɛ̀ Sháínà
 			Èdè Shulu
 		
 		
-			
 			
 			
 			
 			
 			
-			
 			
-			
+			
 		
 		
+			Àríwá Amɛ́ríkà
+			Gúúshù Amɛ́ríkà
+			Ìwɔ̀ oorùn Afíríkà
+			Ààrin Gbùgbùn Àmɛ́ríkà
+			Apáàríwá Amɛ́ríkà
+			Ìlà Òòrùn Eshíà
+			Gúúshù Eshíà
+			Gúúshù ìlà òòrùn Éshíà
+			Gúúshù Yúróòpù
+			Ɔshirélashíà
+			Mɛlanéshíà
+			Agbègbè Maikironéshíà
+			Polineshíà
+			Ààrin Gbùngbùn Éshíà
+			Ìwɔ̀ Òòrùn Eshíà
+			Ìwɔ̀ Òòrùn Yúrópù
+			Látín Amɛ́ríkà
 			Orílɛ́ède Ààndórà
 			Orílɛ́ède Ɛmirate ti Awɔn Arabu
 			Orílɛ́ède Àfùgànístánì
@@ -201,9 +123,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ́ède Ekuádò
 			Orílɛ́ède Esitonia
 			Orílɛ́ède Égípítì
+			Ìwɔ̀òòrùn Sàhárà
 			Orílɛ́ède Eritira
 			Orílɛ́ède Sipani
 			Orílɛ́ède Etopia
+			Ìshɔ̀kan Yúròpù
 			Orílɛ́ède Filandi
 			Orílɛ́ède Fiji
 			Orílɛ́ède Etikun Fakalandi
@@ -269,7 +193,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ́ède Modofia
 			Orílɛ́ède Madasika
 			Orílɛ́ède Etikun Máshali
-			Orílɛ́ède Masidonia
 			Orílɛ́ède Mali
 			Orílɛ́ède Manamari
 			Orílɛ́ède Mogolia
@@ -307,8 +230,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ́ède Pɛɛri ati mikuloni
 			Orílɛ́ède Pikarini
 			Orílɛ́ède Pɔto Riko
-			Orílɛ́ède Iwɔorun Pakisitian ati Gasha
-			Orílɛ́ède Pɔtugi
+			Agbègbè Palɛsítíànù
+			Palɛsitín
+			Orílɛ́ède Pɔ́túgà
 			Orílɛ́ède Paalu
 			Orílɛ́ède Paraguye
 			Orílɛ́ède Kota
@@ -330,18 +254,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ́ède Sɛnɛga
 			Orílɛ́ède Somalia
 			Orílɛ́ède Surinami
-			Gúúsù Sudan
 			Orílɛ́ède Sao tomi ati piriishipi
 			Orílɛ́ède Ɛɛsáfádò
 			Orílɛ́ède Siria
 			Orílɛ́ède Sashiland
 			Orílɛ́ède Tɔɔki ati Etikun Kakɔsi
 			Orílɛ́ède shààdì
+			Agbègbè Gúúsù Faranshé
 			Orílɛ́ède Togo
 			Orílɛ́ède Tailandi
 			Orílɛ́ède Takisitani
 			Orílɛ́ède Tokelau
 			Orílɛ́ède ÌlàOòrùn Tímɔ̀
+			Ìlà Òòrùn Tímɔ̀
 			Orílɛ́ède Tɔɔkimenisita
 			Orílɛ́ède Tunishia
 			Orílɛ́ède Tonga
@@ -349,13 +274,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ́ède Tirinida ati Tobaga
 			Orílɛ́ède Tufalu
 			Orílɛ́ède Taiwani
-			Orílɛ́ède Tanshania
+			Orílɛ́ède Tàǹsáníà
 			Orílɛ́ède Ukarini
 			Orílɛ́ède Uganda
+			Ìshɔ̀kan àgbáyé
 			Orílɛ̀-èdè Amɛrikà
 			Orílɛ́ède Nruguayi
 			Orílɛ́ède Nshibɛkisitani
-			Ìlú Vatican
 			Orílɛ́ède Fisɛnnti ati Genadina
 			Orílɛ́ède Fɛnɛshuɛla
 			Orílɛ́ède Etíkun Fágínì ti ìlú Bírítísì
@@ -366,14 +291,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ́ède Samɔ
 			Orílɛ́ède yemeni
 			Orílɛ́ède Mayote
-			Orílɛ́ède Ariwa Afirika
+			Gúúshù Áfíríkà
 			Orílɛ́ède shamibia
 			Orílɛ́ède shimibabe
 			Àgbègbè àìmɔ̀
 		
 		
 			Kàlɛ́ńdà Gregory
-			Ìlànà Onírúurú Ètò
+			Kàlɛ́ńdà ISO-8601
 			Díjíítì Ìwɔ̀ Oòrùn
 		
 		
@@ -382,98 +307,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			Orílɛ̀-Èdè Amɛ́ríkà
 		
 		
-			Èdè: {0}
-			ɔ̀nà ìgbàkɔ̀wé: {0}
-			Àgbègbè: {0}
+			Ìshɔwɔ́kɔ̀wé: {0}
 		
 	
 	
 		[a á à b d e é è ɛ {ɛ\u0301} {ɛ\u0300} f g {gb} h i í ì j k l m n o ó ò ɔ {ɔ\u0301} {ɔ\u0300} p r s {sh} t u ú ù w y]
-		[c q v x z]
-		[A B D E F G H I J K L M N O P R S T U W Y]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]
-		[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) @ * / \& # † ‡ ′ ″]
 	
-	
-		“
-		”
-		‘
-		’
-	
 	
 		
-			
-				
-					
-						
-							EEEE, d MM y G
-						
-					
-					
-						
-							d MM y G
-						
-					
-					
-						
-							d MM y G
-						
-					
-					
-						
-							dd/MM/y G
-						
-					
-				
-				
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						d
-						h:mm a
-						HH:mm
-						HH:mm:ss
-						L
-						M/d
-						E, M/d
-						LLL
-						MMM d
-						E, MMM d
-						MMMM d
-						E, MMMM d
-						mm:ss
-						y
-						M/y
-						E, M/d/y
-						MMM y
-						E, MMM d, y
-						MMMM y
-						QQQ y
-						QQQQ y
-					
-					
-						{0} – {1}
-					
-				
-			
 			
 				
 					
@@ -605,15 +446,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						
-							Àìk
-							Aj
-							Ìsɛ́g
-							Ɔjɔ́r
-							Ɔjɔ́b
-							Ɛt
-							Àbám
-						
 						
 							À
 							A
@@ -645,12 +477,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				
 				
 					
-						
-							Ìdámɛ́rin kíní
-							Ìdámɛ́rin Kejì
-							Ìdámɛ́rin Kɛta
-							Ìdámɛ́rin Kɛrin
-						
 						
 							kíní
 							Kejì
@@ -665,12 +491,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 					
-						
-							Ìdámɛ́rin kíní
-							Ìdámɛ́rin Kejì
-							Ìdámɛ́rin Kɛta
-							Ìdámɛ́rin Kɛrin
-						
 						
 							kí
 							Ke
@@ -678,10 +498,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							Kɛr
 						
 						
-							Ìdámɛ́rin kíní
-							Ìdámɛ́rin Kejì
 							Ìdámɛ́rin Kɛta
-							Ìdámɛ́rin Kɛrin
 						
 					
 				
@@ -715,267 +532,28 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 					
 				
-				
-					
-						Saju Kristi
-						BCE
-						Lehin Kristi
-						CE
-					
-					
-						BCE
-						CE
-					
-				
-				
-					
-						
-							EEEE, d MMM y
-						
-					
-					
-						
-							d MMM y
-						
-					
-					
-						
-							d MM y
-						
-					
-					
-						
-							d/M/y
-						
-					
-				
-				
-					
-						
-							HH:mm:ss zzzz
-						
-					
-					
-						
-							H:mm:ss z
-						
-					
-					
-						
-							H:m:s
-						
-					
-					
-						
-							H:m
-						
-					
-				
-				
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						h B
-						h:mm B
-						h:mm:ss B
-						d
-						ccc
-						E h:mm B
-						E h:mm:ss B
-						E, d
-						E h:mm a
-						E HH:mm
-						E h:mm:ss a
-						E HH:mm:ss
-						G y
-						G y MMM
-						G y MMM d
-						G y MMM d, E
-						h a
-						HH
-						h:mm a
-						HH:mm
-						h:mm:ss a
-						HH:mm:ss
-						h:mm:ss a v
-						HH:mm:ss v
-						h:mm a v
-						HH:mm v
-						L
-						d/M
-						E, d/M
-						LLL
-						d MMM
-						d MMM, E
-						d MMMM
-						d, MMMM E
-						mm:ss
-						y
-						M/y
-						d/M/y
-						d/M/y, E
-						MMM y
-						d MMM y
-						E, d MMM , y
-						MMMM y
-						QQQ y
-						QQQQ y
-					
-					
-						{0} {1}
-					
-					
-						{0} – {1}
-						
-							d–d
-						
-						
-							h a – h a
-							h–h a
-						
-						
-							HH–HH
-						
-						
-							h:mm a – h:mm a
-							h:mm–h:mm a
-							h:mm–h:mm a
-						
-						
-							HH:mm–HH:mm
-							HH:mm–HH:mm
-						
-						
-							h:mm a – h:mm a v
-							h:mm–h:mm a v
-							h:mm–h:mm a v
-						
-						
-							HH:mm–HH:mm v
-							HH:mm–HH:mm v
-						
-						
-							h a – h a v
-							h–h a v
-						
-						
-							HH–HH v
-						
-						
-							MM–MM
-						
-						
-							MM-dd – MM-dd
-							MM-dd – MM-dd
-						
-						
-							MM-dd, E – MM-dd, E
-							MM-dd, E – MM-dd, E
-						
-						
-							LLL–LLL
-						
-						
-							MMM d–d
-							MMM d – MMM d
-						
-						
-							MMM d, E – MMM d, E
-							MMM d, E – MMM d, E
-						
-						
-							y–y
-						
-						
-							MM-y – MM-y
-							y-MM – y-MM
-						
-						
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-							y-MM-dd – y-MM-dd
-						
-						
-							E, dd-MM-y – E dd-MM-y, E
-							y-MM-dd, E – y-MM-dd, E
-							y-MM-dd, E – y-MM-dd, E
-						
-						
-							y MMM–MMM
-							y MMM – y MMM
-						
-						
-							MMM d–d y
-							MMM d – MMM d y
-							y MMM d – y MMM d
-						
-						
-							MMM d, E – MMM d, E y
-							MMM d, E – MMM d, E y
-							y MMM d y, E – MMM d, E y
-						
-						
-							MMMM–MMMM y
-							MMMM – y MMMM y
-						
-					
-				
 			
 		
 		
-			
-				Ìgbà
-			
 			
 				Ɔdún
-				ɔ́dún tó kɔjá
-				ɔ́dún yìí
-				ɔ́dún tó ń bɔ̀
-			
-			
-				Ɔdún
-			
-			
-				Ɔdún
+				Èshín
+				Ɔdúnǹí
+				Àmɔ́dún
 			
 			
 				Ìdá mɛ́rin
 			
-			
-				Ìdá mɛ́rin
-			
 			
 				Ìdá mɛ́rin
 			
 			
-				Osù
 				óshù tó kɔjá
 				oshù yìí
 				óshù tó ń bɔ̀,
 			
-			
-				Osù
-			
 			
-				Osù
+				Oshù
 			
 			
 				Ɔ̀sɛ̀
@@ -984,10 +562,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				ɔ́sɛ̀ tó ń bɔ̀
 			
 			
-				Ɔ̀sɛ̀
-			
-			
-				Ɔ̀sɛ̀
+				ɔ̀shɛ̀ {0}
 			
 			
 				Ɔjɔ́
@@ -995,19 +570,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Àná
 				Òní
 				Ɔ̀la
-				òtúùnla
-			
-			
-				Ɔjɔ́
-				Àná
-				Òní
-				Ɔ̀la
-			
-			
-				Ɔjɔ́
-				Àná
-				Òní
-				Ɔ̀la
 			
 			
 				Ɔjɔ́ tó wà láàárín ɔ̀sɛ̀
@@ -1020,24 +582,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Àárɔ̀/ɔ̀sán
 			
-			
-				Wákàtí
-			
-			
-				Wákàtí
-			
-			
-				Wákàtí
-			
 			
 				Ìsɛ́jú
 			
-			
-				Ìsɛ́jú
-			
-			
-				Ìsɛ́jú
-			
 			
 				Ìsɛ́jú Ààyá
 			
@@ -1047,18 +594,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ìsɛ́jú Ààyá
 			
-			
-				Agbègbè àkókò
-			
 		
 		
-			+HH:mm;-HH:mm
-			WAT{0}
-			WAT
-			{0} Ìgbà
 			{0} Àkókò ojúmɔmɔ
-			{0} Ìlànà Àkókò
-			{1} ({0})
 			
 				
 					Àpapɔ̀ Àkókò Àgbáyé
@@ -1067,9 +605,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Ìlú Àìmɔ̀
 			
-			
-				Lagos
-			
 			
 				
 					àkókò àárín gbùngbùn
@@ -1126,79 +661,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					Àkókò Sɔmà Ìhà Ìwɔ Oòrùn Europe
 				
 			
-			
-				
-					Greenwich Mean Time
-				
-			
 		
 	
 	
-		latn
-		
-			latn
-		
-		1
-		
-			.
-			,
-			%
-			+
-			-
-			E
-			×
-			‰
-			∞
-			NaN
-		
-		
-			
-				
-					#,##0.###
-				
-			
-		
-		
-			
-				
-					#E0
-				
-			
-		
-		
-			
-				
-					#,##0%
-				
-			
-		
-		
-			
-				
-					¤#,##0.00
-				
-				
-					¤#,##0.00;(¤#,##0.00)
-				
-			
-			
-				
-					¤0K
-					¤00K
-					¤000K
-					¤0M
-					¤00M
-					¤000M
-					¤0G
-					¤00G
-					¤000G
-					¤0T
-					¤00T
-					¤000T
-				
-			
-			{0} {1}
-		
 		
 			
 				Diami ti Awon Orílɛ́ède Arabu
@@ -1218,8 +683,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Owó ti Orílɛ̀-èdè Brazil
 				Awon owó ti Orílɛ̀-èdè Brazil
-				R$
-				R$
 			
 			
 				Pula ti Orílɛ́ède Bɔ̀tìsúwánà
@@ -1235,8 +698,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Reminibi ti Orílɛ́ède sháínà
-				CN¥
-				¥
 			
 			
 				Kabofediano ti Orílɛ́ède Esuodo
@@ -1249,6 +710,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				pɔɔn ti Orílɛ́ède Egipiti
+				pɔ́nùn
 			
 			
 				Nakifa ti Orílɛ́ède Eriteriani
@@ -1256,16 +718,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Biri ti Orílɛ́ède Eutopia
 			
-			
-				owó Yúrò
-				Awon owó Yúrò
-				€
-				€
-			
 			
 				Pɔ́n-ùn ti Orilɛ̀-èdè Gɛ̀ɛ́sì
-				£
-				£
 			
 			
 				shidi ti Orílɛ́ède Gana
@@ -1278,13 +732,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Rupi ti Orílɛ́ède Indina
-				₹
-				₹
 			
 			
 				Yeni ti Orílɛ́ède Japani
-				JP¥
-				¥
 			
 			
 				shiili ti Orílɛ́ède Kenya
@@ -1327,13 +777,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 			
 				Náìrà ti Orílɛ̀-èdè Nàìjíríà
-				₦
 			
 			
 				Owó ruble ti ilɛ̀ Rɔ́shíà
 				Owó ruble ti ilɛ̀ Rɔ́shíà
-				₽
-				₽
 			
 			
 				Faransi ti Orílɛ́ède Ruwanda
@@ -1353,9 +800,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Pɔɔun ti Orílɛ́ède ̣Elena
 			
-			
-				Lioni
-			
 			
 				Sile ti Orílɛ́ède Somali
 			
@@ -1365,9 +809,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Dobira ti Orílɛ́ède Sao tome Ati Pirisipe
 			
-			
-				Lilangeni
-			
 			
 				Dina ti Orílɛ́ède Tunisia
 			
@@ -1380,8 +821,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				Dɔ́là
 				Dɔ́là ti Orílɛ̀-Èdè Amɛ́ríkà
-				$
-				$
 			
 			
 				Faransi ti Orílɛ́ède BEKA
@@ -1406,30 +845,115 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				Dɔla ti Orílɛ́ède Siibabuwe
 			
 		
-		
-			≥{0}
-			{0}–{1}
-		
+		
+			Àwɔn ɔjɔ́ {0}
+			Mú {0} apá ɔ̀tún
+		
 	
 	
-		
-			h:mm
-		
-		
-			h:mm:ss
-		
-		
-			m:ss
-		
+		
+			
+				ɔ̀rúndún
+				ɔ̀rúndún {0}
+			
+			
+				ɛ̀wádùn
+				ɛ̀wádùn {0}
+			
+			
+				ɔ̀dún
+				{0} ɔd
+				{0} ɔd
+			
+			
+				oshù
+				{0} oshù
+				{0}/oshù
+			
+			
+				ɔsh
+				{0} ɔsh
+				{0}/ɔsh
+			
+			
+				ɔjɔ́
+				ɔj {0}
+				{0}/ɔj
+			
+			
+				ìsh
+				{0} ìsh
+				{0}/ìsh
+			
+			
+				ìsh àáy
+				{0}ìsh àáy
+				{0}/ìsh àáy
+			
+		
+		
+			
+				ɛ̀wádùn
+				ɛ̀wádún {0}
+			
+			
+				ɔd
+				{0} ɔd
+				{0}/ɔd
+			
+			
+				oshù
+				{0} oshù
+				{0}/oshù
+			
+			
+				ɔsh
+				{0} ɔsh
+				{0}/ɔshɛ̀
+			
+			
+				ɔjɔ́
+				{0} ɔj
+				{0}/ɔj
+			
+			
+				ìsh
+				{0} ìsh
+				{0}/ìsh
+			
+			
+				ìsh àáy
+				{0} ìsh àáy
+				{0} ìsh àáy
+			
+		
+		
+			
+				ɔd
+				{0} ɔd
+			
+			
+				oshù
+				{0} oshù
+			
+			
+				ɔshɛ́
+				{0} ɔsh
+			
+			
+				ɔjɔ́
+				ɔj {0}
+			
+			
+				ìsh
+				{0}/ìsh
+			
+			
+				ìsh àáy
+				{0} ìsh àáy
+			
+		
 	
-	
-		
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-			{0}, {1}
-		
-	
 	
 		
 			Bɛ́ɛ̀ni :N
diff --git a/make/data/cldr/common/main/yo_NG.xml b/make/data/cldr/common/main/yo_NG.xml
index 26d18c2da10..637fa11f706 100644
--- a/make/data/cldr/common/main/yo_NG.xml
+++ b/make/data/cldr/common/main/yo_NG.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 	
diff --git a/make/data/cldr/common/main/yue.xml b/make/data/cldr/common/main/yue.xml
index 27c5fe73166..37e49c1c2d4 100644
--- a/make/data/cldr/common/main/yue.xml
+++ b/make/data/cldr/common/main/yue.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 	
 	
@@ -608,6 +608,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			約魯巴文
 			奈恩加圖文
 			粵語
+			中文 (粵語)
 			壯文
 			薩波特克文
 			布列斯符號
@@ -615,8 +616,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			澤納加文
 			標準摩洛哥塔馬塞特文
 			中文
+			中文 (普通話)
 			簡體中文
+			簡體中文 (普通話)
 			繁體中文
+			繁體中文 (普通話)
 			祖魯文
 			祖尼文
 			無語言內容
@@ -870,6 +874,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			剛果共和國
 			瑞士
 			象牙海岸
+			象牙海岸
 			庫克群島
 			智利
 			喀麥隆
@@ -1052,6 +1057,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			荷屬聖馬丁
 			敘利亞
 			史瓦濟蘭
+			斯威士蘭
 			特里斯坦達庫尼亞群島
 			土克斯及開科斯群島
 			查德
@@ -1061,6 +1067,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			塔吉克
 			托克勞群島
 			東帝汶
+			東帝汶
 			土庫曼
 			突尼西亞
 			東加
@@ -1087,6 +1094,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			瓦利斯同富圖納群島
 			薩摩亞
 			偽口音
+			偽 Bidi
 			科索沃
 			葉門
 			馬約特
@@ -1157,22 +1165,22 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 			曆法
 			貨幣格式
-			略過符號排序
-			反向重音排序
-			大寫/小寫排列
-			區分大小寫排序
+			略過符號排序
+			反向重音排序
+			大寫/小寫排列
+			區分大小寫排序
 			排序
-			正規化排序
-			數字排序
-			排序強度
+			正規化排序
+			數字排序
+			排序強度
 			貨幣
 			時間週期（12 小時制與 24 小時制）
 			換行樣式
 			度量單位系統
 			數字
-			時區
-			區域變異
-			專用區
+			時區
+			區域變異
+			專用區
 		
 		
 			佛曆
@@ -1321,8 +1329,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		[一 丁 七 丈-不 丑 且 世 丘 丙 丟 並 中 串 丸 丹 主 乃 久 么 之 乎 乏 乖 乘 乙 九 也 乾 亂 了 予 事 二 于 云 互 五 井 些 亞 亡 交-亦 亨 享 京 亮 人 什 仁 仇 今 介 仍 仔 他 付 仙 代-以 仰 仲 件 任 份 企 伊 伍 伐 休 伙 伯 估 伴 伸 似 伽 但 佈 佉 位-住 佔 何 余 佛 作 你 佩 佳 使 來 例 供 依 侯 侵 便 係-俄 俊 俗 保 俠 信 修 俱 俾 個 倍 們 倒 候 倚 借 倫 值 假 偉 偏 做 停 健 側-偷 傑 備 傢 傣 傲 傳 傷 傻 傾 僅 像 僑 僧 價 儀 億 儒 儘 優 允 元-充 兇-光 克 免 兒 兔 入 內-兩 八-兮 共 兵-典 兼 冊 再 冒 冠 冬 冰 冷 准 凌 凝 凡 凰 凱 出 函 刀 分 切 刊 列 初 判 別 利 刪 到 制 刷 刺 刻 則 剌 前 剛 剩 剪 副 割 創 劃 劇 劉 劍 力 功 加 助-劫 勁 勇 勉 勒 動 務 勝 勞 勢 勤 勵 勸 勿 包 匈 化 北 匹 區 十 千 升 午 半 卒-協 南 博 卜 卡 卯-危 即 卷 卻 厄 厘 厚 原 厭 厲 去 參 又 及 友 反 叔 取 受 口-另 只-叭 可 台 史 右 司 吃 各 合-吊 同-后 吐-吒 君 吝-吠 否 吧 含 吳 吵 吸 吹 吾 呀 呂 呆 告 呢 周 味 呵 呼 命 和 咖 咦 咧 咪 咬 咱 哀 品 哇-哉 哎 員 哥 哦 哩 哪 哭 哲 唉 唐 唔 唬 售 唯 唱 唷 唸 商 啊 問 啟 啡 啥 啦 啪 喀 喂 善 喇 喊 喔 喜 喝 喬 單 喵 嗎 嗚 嗨 嗯 嘆 嘉 嘗 嘛 嘴 嘻 嘿 器 噴 嚇 嚴 囉 四 回 因 困 固 圈 國 圍 園 圓 圖 團 圜 土 在 圭 地 圾 址 均 坎 坐 坡 坤 坦 坪 垂 垃 型 埃 城 埔 域 執 培 基 堂 堅 堆 堡 堪 報 場 塊 塔 塗 塞 填 塵 境 增 墨 墮 壁 壇 壓 壘 壞 壢 士 壬 壯 壽 夏 夕 外 多 夜 夠 夢 夥 大 天-夫 央 失 夷 夸 夾 奇-奉 奎 奏 契 奔 套 奧 奪 奮 女 奴 奶 她 好 如 妙 妝 妥 妨 妮 妳 妹 妻 姆 姊 始 姐 姑 姓 委 姿 威 娃 娘 娛 婁 婆 婚 婦 媒 媽 嫌 嫩 子 孔 字 存 孝 孟 季 孤 孩 孫 學 它 宅 宇-安 宋 完 宏 宗-宜 客-室 宮 害 家 容 宿 寂 寄-密 富 寒 寞 察 寢 實-審 寫 寬 寮 寵 寶 封 射 將 專 尊 尋 對-小 少 尖 尚 尤 就 尺 尼 尾 局 屁 居 屆 屋 屏 展 屠 層 屬 山 岡 岩 岸 峰 島 峽 崇 崙 崴 嵐 嶺 川 州 巡 工-巨 巫 差 己-巴 巷 市 布 希 帕 帖 帛 帝 帥 師 席 帳 帶 常 帽 幅 幕 幣 幫 干-年 幸 幹 幻-幾 庇 床 序 底 店 庚 府 度 座 庫 庭 康 庸 廉 廖 廠 廢 廣 廳 延 廷 建 弄 式 引 弗 弘 弟 弦 弱 張 強 彈 彊 彌 彎 彝 彞 形 彥 彩 彬 彭 彰 影 役 彼 往 征 待 很 律 後 徐-徒 得 從 復 微 徵 德 徹 心 必 忌 忍 志-忙 忠 快 念 忽 怎 怒 怕 怖 思 怡 急 性 怨 怪 恆 恐 恢 恥 恨 恩 恭 息 恰 悅 悉 悔 悟 悠 您 悲 悶 情 惑 惜 惠 惡 惱 想 惹 愁 愈 愉 意 愚 愛 感 慈 態 慕 慘 慢 慣 慧 慮 慰 慶 慾 憂 憐 憑 憲 憶 憾 懂 應 懶 懷 懼 戀 戈 戊 戌 成-戒 或 截 戰 戲 戴 戶 房-扁 扇 手 才 扎 打 托 扣 扥 扭 扯 批 找-技 抄 把 抓 投 抗 折 披 抬 抱 抵 抹 抽 拆 拉 拋 拍 拏 拒 拔 拖 招 拜 括 拳 拼 拾 拿 持 指 按 挑 挖 挪 振 挺 捐 捕 捨 捲 捷 掃 授 掉 掌 排 掛 採 探 接 控 推 措 描 提 插 揚 換 握 揮 援 損 搖 搜 搞 搬 搭 搶 摘 摩 摸 撐 撒 撞 撣 撥 播 撾 撿 擁 擇 擊 擋 操 擎 擔 據 擠 擦 擬 擴 擺 擾 攝 支 收 改 攻 放 政 故 效 敍 敏 救 敗-教 敝 敢 散 敦 敬 整 敵 數 文 斐 斗 料 斯 新 斷 方 於 施 旁 旅 旋 族 旗 既 日 旦 早 旭 旺 昂 昆 昇 昌 明 昏 易 星 映 春 昨 昭 是 時 晉 晒 晚 晨 普 景 晴 晶 智 暑 暖 暗 暫 暴 曆 曉 曰 曲 更 書 曼 曾-最 會 月 有 朋 服 朗 望 朝 期 木 未-札 朱 朵 杉 李 材 村 杜 束 杯-東 松 板 析 林 果 枝 架 柏 某 染 柔 查 柬 柯 柳 柴 校 核 根 格 桃 案 桌 桑 梁 梅 條 梨 梯 械 梵 棄 棉 棋 棒 棚 森 椅 植 椰 楊 楓 楚 業 極 概 榜 榮 構 槍 樂 樓 標 樞 模 樣 樹 橋 機 橫 檀 檔 檢 欄 權 次 欣 欲 欺 欽 款 歉 歌 歐 歡-武 歲 歷 歸 死 殊 殘 段 殺 殼 毀 毅 母 每 毒 比 毛 毫 氏 民 氣 水 永 求 汗 汝 江-污 汪 汶 決 汽 沃 沈 沉 沒 沖 沙 河 油 治 沿 況 泉 泊 法 泡 波 泥 注 泰 泳 洋 洗 洛 洞 洩 洪 洲 活 洽 派 流 浦 浩 浪 浮 海 涇-涉 涯 液 涵 涼 淑 淚 淡 淨 深 混 淺 清 減 渡 測 港 游 湖 湯 源 準 溝 溪 溫 滄 滅 滋 滑 滴 滾 滿 漂 漏 演 漠 漢 漫 漲 漸 潔 潘 潛 潮 澤 澳 激 濃 濟 濤 濫 濱 瀏 灌 灣 火 灰 災 炎 炮 炸 為 烈 烏 烤 無 焦 然 煙 煞 照 煩 熊 熟 熱 燃 燈 燒 營 爆 爐 爛 爪 爬 爭 爵 父 爸 爺 爽 爾 牆-版 牌 牙 牛 牠 牧 物 牲 特 牽 犧 犯 狀 狂 狐 狗 狠 狼 猛 猜 猴 猶 獄 獅 獎 獨 獲 獸 獻 玄 率 玉 王 玩 玫 玲 玻 珊 珍 珠 珥 班 現 球 理 琉 琪 琴 瑙 瑜 瑞 瑟 瑤 瑪 瑰 環 瓜 瓦 瓶 甘 甚 甜 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 疏 疑 疼 病 痕 痛 痴 瘋 療 癡 癸 登-百 的 皆 皇 皮 盃 益 盛 盜 盟 盡 監 盤 盧 目 盲 直 相 盼 盾 省 眉 看 真 眠 眼 眾 睛 睡 督 瞧 瞭 矛 矣 知 短 石 砂 砍 研 砲 破 硬 碎 碗 碟 碧 碩 碰 確 碼 磁 磨 磯 礎 礙 示 社 祕 祖 祚 祛 祝 神 祥 票 祿 禁 禍-福 禪 禮 秀 私 秋 科 秒 秘 租 秤 秦 移 稅 程 稍 種 稱 稿 穆 穌 積 穩 究 穹 空 穿 突 窗 窩 窮 窶 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 简 算 管 箭 箱 節 範 篇 築 簡 簫 簽 簿 籃 籌 籍 籤 米 粉 粗 粵 精 糊 糕 糟 系 糾 紀 約 紅 納 紐 純 紙-紛 素 索 紫 累 細 紹 終 組 結 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縛 縣 縮 縱 總 績 繁 繆 織 繞 繪 繳 繼 續 缸 缺 罕 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 翁 習 翔 翰 翹 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 聖 聚 聞 聯 聰 聲 職 聽 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 舍 舒 舞 舟 航 般 船 艦 良 色 艾 芝 芬 花 芳 若 苦 英 茅 茫 茲 茶 草 荒 荷 荼 莉 莊 莎 莫 菜 菩 華 菲 萄 萊 萬 落 葉 著 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 藍 藏 藝 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛇 蛋 蛙 蜂 蜜 蝶 融 螢 蟲 蟹 蠍 蠻 血 行 術 街 衛 衝 衡 衣 表 袋 被 裁 裂 裕 補 裝 裡 製 複 褲 西 要 覆 見 規 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訥 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 認 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 講 謝 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 豐 象 豪 豬 貌 貓 貝 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 贏 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 距 跟 跡 路 跳 踏 踢 蹟 蹤 躍 身 躲 車 軌 軍 軒 軟 較 載 輔 輕 輛 輝 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯-農 迅 迎 近 返 迦 迪 迫 述 迴 迷 追 退 送 逃 逆 透 逐 途 這-逛 逝 速 造 逢 連 週 進 逸 逼 遇 遊 運 遍 過 道-違 遙 遜 遠 適 遭 遮 遲 遷 選 遺 避-邁 還 邊 邏 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 酉 配 酒 酷 酸 醉 醒 醜 醫 采 釋-量 金 針 釣 鈴 鉢 銀 銅 銖 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 鍋 鍵 鍾 鎊 鎖 鎮 鏡 鐘 鐵 鑑 長 門 閃 閉 開 閏 閒 間 閣 閱 闆 闊 闍 闐 關 闡 防 阻 阿 陀 附 降 限 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雉 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 霍 霧 露 霸 霹 靂 靈 青 靖 靜 非 靠 面 革 靼 鞋 韃 韋 韓 音 韻 響 頁 頂 項 順 須 預 頑 頓 頗 領 頞 頭 頻 顆 題 額 顏 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 餐 餘 館 首 香 馬 駐 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆 鬥 鬧 鬱 鬼 魁 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 鵝 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 龍 龜]
 		[乍 仂 伏 佐 侶 僳 兆 兌 兹 凸 别 券 勳 卑 卞 占 叶 嘅 堤 墎 壤 奥 孜 峇 嶼 巽 栗 楔 涅 渾 澎 灘 燦 狄 琳 瑚 甫 碑 礁 纜 艇 芒 苗 茨 蓬 蚩 蜀 裘 謬 酋 隴 雀 髪]
 		[一 丁 丈 不 且 丞 並 串 乘 乾 亂 亭 傀 僎 僵 儐 償 儳 儷 儻 叢 嚴 囌 囑 廳]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]
-		[‾ ﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \- － ﹣ ‐ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ " ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨ \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]
+		[‾ ﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \- － ﹣ ‐ ‑ – ︲ — ﹘ ︱ , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ " ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨ \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ † ‡ ‧ ′ ″ ‵ 〃 ※]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1330,30 +1338,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		… {0}
 		{0} … {1}
 		？
-		
-			[\--/]
-			[\:∶︓﹕：]
-		
-		
-			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
-			[\$﹩＄]
-			[£₤￡]
-			[¥￥]
-			[₩￦]
-			[₨₹{Rp}{Rs}]
-		
-		
-			[\-‐‒–⁻₋−➖﹣－]
-			[,،٫、︐︑﹐﹑，､]
-			[+⁺₊➕﬩﹢＋]
-		
-		
-			[,٫︐﹐，]
-			[.․﹒．｡]
-		
 	
 	
 		「
@@ -2891,6 +2875,44 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						
 							d日至d日
 						
+						
+							Gy年至Gy年
+							Gy年至y年
+						
+						
+							GGGGGy年M月至y年M月
+							GGGGGy年M月至y年M月
+							GGGGGy年M月至y年M月
+						
+						
+							GGGGGy年M月dd日至y年M月dd日
+							GGGGGy年M月dd日y年M月dd日
+							GGGGGy年M月dd日至y年M月dd日
+							GGGGGy年M月dd日至y年M月dd日
+						
+						
+							GGGGGy年M月dd日E至y年M月dd日E
+							GGGGGy年M月dd日E至GGGGGy年M月dd日E
+							GGGGGy年M月dd日E至y年M月dd日E
+							GGGGGy年M月dd日E至y年M月dd日E
+						
+						
+							Gy年MMM至Gy年MMM
+							G y年MMM至MMM
+							Gy年MMM至y年MMM
+						
+						
+							Gy年MMMd至d日
+							Gy年MMMd日至Gy年MMMd日
+							Gy年MMMd日至MMMd日
+							Gy年MMMd日至y年MMMd日
+						
+						
+							Gy年MMMd日E至MMMd日E
+							Gy 年MMMd日E至Gy年MMMd日E
+							Gy年MMMd日E至MMMd日E
+							Gy年MMMd日E至y年MMMd日E
+						
 						
 							ah時至ah時
 							ah時至h時
@@ -5067,6 +5089,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				阿克托比
 			
+			
+				科斯塔奈
+			
 			
 				克孜勒奧爾達
 			
@@ -6647,13 +6672,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		
 	
 	
+		latn
 		
 			hanidec
 			hant
 			hantfin
 		
+		1
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -6661,8 +6692,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			非數值
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -6670,7 +6705,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			非數值
 			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0
@@ -6775,6 +6822,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				阿拉伯聯合大公國迪爾汗
 				阿拉伯聯合大公國迪爾汗
+				AED
 			
 			
 				阿富汗尼 (1927–2002)
@@ -6784,6 +6832,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				阿富汗尼
 				阿富汗尼
+				AFN
 			
 			
 				阿爾巴尼亞列克 (1946–1965)
@@ -6793,18 +6842,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				阿爾巴尼亞列克
 				阿爾巴尼亞列克
+				ALL
 			
 			
 				亞美尼亞德拉姆
 				亞美尼亞德拉姆
+				AMD
 			
 			
 				荷屬安地列斯盾
 				荷屬安地列斯盾
+				ANG
 			
 			
 				安哥拉寬扎
 				安哥拉寬扎
+				AOA
+				Kz
 			
 			
 				安哥拉寬扎 (1977–1990)
@@ -6844,6 +6898,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				阿根廷披索
 				阿根廷披索
+				ARS
+				$
 			
 			
 				奧地利先令
@@ -6854,10 +6910,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				澳幣
 				澳幣
 				AU$
+				$
 			
 			
 				阿路巴盾
 				阿路巴盾
+				AWG
 			
 			
 				亞塞拜然馬納特 (1993–2006)
@@ -6867,6 +6925,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				亞塞拜然馬納特
 				亞塞拜然馬納特
+				AZN
 			
 			
 				波士尼亞-赫塞哥維納第納爾
@@ -6876,6 +6935,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				波士尼亞-赫塞哥維納可轉換馬克
 				波士尼亞-赫塞哥維納可轉換馬克
+				BAM
+				KM
 			
 			
 				波士尼亞-赫塞哥維納新第納爾
@@ -6885,10 +6946,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				巴貝多元
 				巴貝多元
+				BBD
+				$
 			
 			
 				孟加拉塔卡
 				孟加拉塔卡
+				BDT
+				৳
 			
 			
 				比利時法郎（可轉換）
@@ -6918,6 +6983,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				保加利亞新列弗
 				保加利亞新列弗
+				BGN
 			
 			
 				保加利亞列弗 (1879–1952)
@@ -6927,22 +6993,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				巴林第納爾
 				巴林第納爾
+				BHD
 			
 			
 				蒲隆地法郎
 				蒲隆地法郎
+				BIF
 			
 			
 				百慕達幣
 				百慕達幣
+				BMD
+				$
 			
 			
 				汶萊元
 				汶萊元
+				BND
+				$
 			
 			
 				玻利維亞諾
 				玻利維亞諾
+				BOB
+				Bs
 			
 			
 				玻利維亞玻利維亞諾 (1863–1963)
@@ -6977,6 +7051,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				巴西里拉
 				巴西里拉
+				R$
+				R$
 			
 			
 				巴西克如爾達農瓦
@@ -6996,10 +7072,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				巴哈馬元
 				巴哈馬元
+				BSD
+				$
 			
 			
 				不丹那特倫
 				不丹那特倫
+				BTN
 			
 			
 				緬甸基雅特
@@ -7009,6 +7088,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				波札那普拉
 				波札那普拉
+				BWP
+				P
 			
 			
 				白俄羅斯新盧布 (1994–1999)
@@ -7024,18 +7105,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				白俄羅斯盧布 (2000–2016)
 				白俄羅斯盧布 (2000–2016)
+				BYR
 			
 			
 				貝里斯元
 				貝里斯元
+				BZD
+				$
 			
 			
 				加幣
 				加幣
+				CA$
+				$
 			
 			
 				剛果法郎
 				剛果法郎
+				CDF
 			
 			
 				歐元 (WIR)
@@ -7045,6 +7132,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				瑞士法郎
 				瑞士法郎
+				CHF
 			
 			
 				法郎 (WIR)
@@ -7064,10 +7152,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				智利披索
 				智利披索
+				CLP
+				$
 			
 			
 				人民幣 (離岸)
 				人民幣 (離岸)
+				CNH
 			
 			
 				CNX
@@ -7075,10 +7166,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				人民幣
 				人民幣
+				CN¥
+				¥
 			
 			
 				哥倫比亞披索
 				哥倫比亞披索
+				COP
+				$
 			
 			
 				哥倫比亞幣 (COU)
@@ -7088,6 +7183,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				哥斯大黎加科朗
 				哥斯大黎加科朗
+				CRC
+				₡
 			
 			
 				舊塞爾維亞第納爾
@@ -7102,14 +7199,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				古巴可轉換披索
 				古巴可轉換披索
+				CUC
+				$
 			
 			
 				古巴披索
 				古巴披索
+				CUP
+				$
 			
 			
 				維德角埃斯庫多
 				維德角埃斯庫多
+				CVE
 			
 			
 				賽普勒斯鎊
@@ -7119,6 +7221,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				捷克克朗
 				捷克克朗
+				CZK
+				Kč
 			
 			
 				東德奧斯特馬克
@@ -7133,18 +7237,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				吉布地法郎
 				吉布地法郎
+				DJF
 			
 			
 				丹麥克朗
 				丹麥克朗
+				DKK
+				kr
 			
 			
 				多明尼加披索
 				多明尼加披索
+				DOP
+				$
 			
 			
 				阿爾及利亞第納爾
 				阿爾及利亞第納爾
+				DZD
 			
 			
 				厄瓜多蘇克雷
@@ -7164,10 +7274,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				埃及鎊
 				埃及鎊
+				EGP
+				E£
 			
 			
 				厄立特里亞納克法
 				厄立特里亞納克法
+				ERN
 			
 			
 				西班牙比塞塔（會計單位）
@@ -7188,10 +7301,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				衣索比亞比爾
 				衣索比亞比爾
+				ETB
 			
 			
 				歐元
 				歐元
+				€
+				€
 			
 			
 				芬蘭馬克
@@ -7201,10 +7317,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				斐濟元
 				斐濟元
+				FJD
+				$
 			
 			
 				福克蘭群島鎊
 				福克蘭群島鎊
+				FKP
+				£
 			
 			
 				法國法郎
@@ -7214,6 +7334,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				英鎊
 				英鎊
+				£
+				£
 			
 			
 				喬治亞庫旁拉里
@@ -7223,6 +7345,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				喬治亞拉里
 				喬治亞拉里
+				GEL
+				₾
 				₾
 			
 			
@@ -7233,18 +7357,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				迦納塞地
 				迦納塞地
+				GHS
 			
 			
 				直布羅陀鎊
 				直布羅陀鎊
+				GIP
+				£
 			
 			
 				甘比亞達拉西
 				甘比亞達拉西
+				GMD
 			
 			
 				幾內亞法郎
 				幾內亞法郎
+				GNF
+				FG
 			
 			
 				幾內亞西里
@@ -7264,6 +7394,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				瓜地馬拉格查爾
 				瓜地馬拉格查爾
+				GTQ
+				Q
 			
 			
 				葡屬幾內亞埃斯庫多
@@ -7278,14 +7410,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				圭亞那元
 				圭亞那元
+				GYD
+				$
 			
 			
 				港幣
 				港幣
+				HK$
+				$
 			
 			
 				洪都拉斯倫皮拉
 				洪都拉斯倫皮拉
+				HNL
+				L
 			
 			
 				克羅埃西亞第納爾
@@ -7295,18 +7433,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				克羅埃西亞庫納
 				克羅埃西亞庫納
+				HRK
+				kn
 			
 			
 				海地古德
 				海地古德
+				HTG
 			
 			
 				匈牙利福林
 				匈牙利福林
+				HUF
+				Ft
 			
 			
 				印尼盾
 				印尼盾
+				IDR
+				Rp
 			
 			
 				愛爾蘭鎊
@@ -7326,18 +7471,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				以色列新謝克爾
 				以色列新謝克爾
+				₪
+				₪
 			
 			
 				印度盧比
 				印度盧比
+				₹
+				₹
 			
 			
 				伊拉克第納爾
 				伊拉克第納爾
+				IQD
 			
 			
 				伊朗里亞爾
 				伊朗里亞爾
+				IRR
 			
 			
 				冰島克朗 (1918–1981)
@@ -7347,6 +7498,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				冰島克朗
 				冰島克朗
+				ISK
+				kr
 			
 			
 				義大利里拉
@@ -7356,35 +7509,47 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				牙買加元
 				牙買加元
+				JMD
+				$
 			
 			
 				約旦第納爾
 				約旦第納爾
+				JOD
 			
 			
 				日圓
 				日圓
 				¥
+				¥
 			
 			
 				肯尼亞先令
 				肯尼亞先令
+				KES
 			
 			
 				吉爾吉斯索姆
 				吉爾吉斯索姆
+				KGS
 			
 			
 				柬埔寨瑞爾
 				柬埔寨瑞爾
+				KHR
+				៛
 			
 			
 				科摩羅法郎
 				科摩羅法郎
+				KMF
+				CF
 			
 			
 				北韓圓
 				北韓圓
+				KPW
+				₩
 			
 			
 				南韓圜
@@ -7400,34 +7565,48 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				韓圓
 				韓圓
 				￦
+				₩
 			
 			
 				科威特第納爾
 				科威特第納爾
+				KWD
 			
 			
 				開曼群島元
 				開曼群島元
+				KYD
+				$
 			
 			
 				卡扎克斯坦坦吉
 				卡扎克斯坦坦吉
+				KZT
+				₸
 			
 			
 				寮國基普
 				寮國基普
+				LAK
+				₭
 			
 			
 				黎巴嫩鎊
 				黎巴嫩鎊
+				LBP
+				L£
 			
 			
 				斯里蘭卡盧比
 				斯里蘭卡盧比
+				LKR
+				Rs
 			
 			
 				賴比瑞亞元
 				賴比瑞亞元
+				LRD
+				$
 			
 			
 				賴索托洛蒂
@@ -7472,10 +7651,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				利比亞第納爾
 				利比亞第納爾
+				LYD
 			
 			
 				摩洛哥迪拉姆
 				摩洛哥迪拉姆
+				MAD
 			
 			
 				摩洛哥法郎
@@ -7495,10 +7676,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				摩杜雲列伊
 				摩杜雲列伊
+				MDL
 			
 			
 				馬達加斯加阿里亞里
 				馬達加斯加阿里亞里
+				MGA
+				Ar
 			
 			
 				馬達加斯加法郎
@@ -7508,6 +7692,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				馬其頓第納爾
 				馬其頓第納爾
+				MKD
 			
 			
 				馬其頓第納爾 (1992–1993)
@@ -7522,18 +7707,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				緬甸元
 				緬甸元
+				MMK
+				K
 			
 			
 				蒙古圖格里克
 				蒙古圖格里克
+				MNT
+				₮
 			
 			
 				澳門元
 				澳門元
+				MOP
 			
 			
 				茅利塔尼亞烏吉亞 (1973–2017)
 				茅利塔尼亞烏吉亞 (1973–2017)
+				MRO
 			
 			
 				茅利塔尼亞烏吉亞
@@ -7552,6 +7743,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				模里西斯盧比
 				模里西斯盧比
+				MUR
+				Rs
 			
 			
 				馬爾地夫盧比
@@ -7561,14 +7754,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				馬爾地夫盧非亞
 				馬爾地夫盧非亞
+				MVR
 			
 			
 				馬拉維克瓦查
 				馬拉維克瓦查
+				MWK
 			
 			
 				墨西哥披索
 				墨西哥披索
+				MX$
+				$
 			
 			
 				墨西哥銀披索 (1861–1992)
@@ -7583,6 +7780,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				馬來西亞令吉
 				馬來西亞令吉
+				MYR
+				RM
 			
 			
 				莫三比克埃斯庫多
@@ -7597,14 +7796,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				莫三比克梅蒂卡爾
 				莫三比克梅蒂卡爾
+				MZN
 			
 			
 				納米比亞元
 				納米比亞元
+				NAD
+				$
 			
 			
 				奈及利亞奈拉
 				奈及利亞奈拉
+				NGN
+				₦
 			
 			
 				尼加拉瓜科多巴
@@ -7614,6 +7818,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				尼加拉瓜金科多巴
 				尼加拉瓜金科多巴
+				NIO
+				C$
 			
 			
 				荷蘭盾
@@ -7623,22 +7829,30 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				挪威克朗
 				挪威克朗
+				NOK
+				kr
 			
 			
 				尼泊爾盧比
 				尼泊爾盧比
+				NPR
+				Rs
 			
 			
 				紐西蘭幣
 				紐西蘭幣
+				NZ$
+				$
 			
 			
 				阿曼里亞爾
 				阿曼里亞爾
+				OMR
 			
 			
 				巴拿馬巴波亞
 				巴拿馬巴波亞
+				PAB
 			
 			
 				祕魯因蒂
@@ -7648,6 +7862,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				秘魯太陽幣
 				秘魯太陽幣
+				PEN
 			
 			
 				秘魯索爾 (1863–1965)
@@ -7657,18 +7872,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				巴布亞紐幾內亞基那
 				巴布亞紐幾內亞基那
+				PGK
 			
 			
 				菲律賓披索
 				菲律賓披索
+				PHP
+				₱
 			
 			
 				巴基斯坦盧比
 				巴基斯坦盧比
+				PKR
+				Rs
 			
 			
 				波蘭茲羅提
 				波蘭茲羅提
+				PLN
+				zł
 			
 			
 				波蘭茲羅提 (1950–1995)
@@ -7683,10 +7905,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				巴拉圭瓜拉尼
 				巴拉圭瓜拉尼
+				PYG
+				₲
 			
 			
 				卡達里亞爾
 				卡達里亞爾
+				QAR
 			
 			
 				羅德西亞元
@@ -7701,14 +7926,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				羅馬尼亞列伊
 				羅馬尼亞列伊
+				RON
+				lei
 			
 			
 				塞爾維亞戴納
 				塞爾維亞戴納
+				RSD
 			
 			
 				俄羅斯盧布
 				俄羅斯盧布
+				RUB
+				₽
 			
 			
 				俄羅斯盧布 (1991–1998)
@@ -7719,18 +7949,24 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				盧安達法郎
 				盧安達法郎
+				RWF
+				RF
 			
 			
 				沙烏地里亞爾
 				沙烏地里亞爾
+				SAR
 			
 			
 				索羅門群島元
 				索羅門群島元
+				SBD
+				$
 			
 			
 				塞席爾盧比
 				塞席爾盧比
+				SCR
 			
 			
 				蘇丹第納爾
@@ -7740,6 +7976,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				蘇丹鎊
 				蘇丹鎊
+				SDG
 			
 			
 				舊蘇丹鎊
@@ -7749,14 +7986,20 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				瑞典克朗
 				瑞典克朗
+				SEK
+				kr
 			
 			
 				新加坡幣
 				新加坡幣
+				SGD
+				$
 			
 			
 				聖赫勒拿鎊
 				聖赫勒拿鎊
+				SHP
+				£
 			
 			
 				斯洛維尼亞托勒
@@ -7771,14 +8014,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				獅子山利昂
 				獅子山利昂
+				SLL
 			
 			
 				索馬利亞先令
 				索馬利亞先令
+				SOS
 			
 			
 				蘇利南元
 				蘇利南元
+				SRD
+				$
 			
 			
 				蘇利南基爾
@@ -7788,10 +8035,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				南蘇丹鎊
 				南蘇丹鎊
+				SSP
+				£
 			
 			
 				聖多美島和普林西比島多布拉 (1977–2017)
 				聖多美島和普林西比島多布拉 (1977–2017)
+				STD
 			
 			
 				聖多美島和普林西比島多布拉
@@ -7811,14 +8061,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				敘利亞鎊
 				敘利亞鎊
+				SYP
+				£
 			
 			
 				史瓦濟蘭里朗吉尼
 				史瓦濟蘭里朗吉尼
+				SZL
 			
 			
 				泰銖
 				泰銖
+				THB
+				฿
 			
 			
 				塔吉克盧布
@@ -7828,6 +8083,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				塔吉克索莫尼
 				塔吉克索莫尼
+				TJS
 			
 			
 				土庫曼馬納特 (1993–2009)
@@ -7837,14 +8093,18 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				土庫曼馬納特
 				土庫曼馬納特
+				TMT
 			
 			
 				突尼西亞第納爾
 				突尼西亞第納爾
+				TND
 			
 			
 				東加潘加
 				東加潘加
+				TOP
+				T$
 			
 			
 				帝汶埃斯庫多
@@ -7859,22 +8119,32 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				新土耳其里拉
 				新土耳其里拉
+				TRY
+				₺
+				TL
 			
 			
 				千里達及托巴哥元
 				千里達及托巴哥元
+				TTD
+				$
 			
 			
 				新台幣
 				新台幣
+				NT$
+				$
 			
 			
 				坦尚尼亞先令
 				坦尚尼亞先令
+				TZS
 			
 			
 				烏克蘭格里夫納
 				烏克蘭格里夫納
+				UAH
+				₴
 			
 			
 				烏克蘭卡本瓦那茲
@@ -7889,10 +8159,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				烏干達先令
 				烏干達先令
+				UGX
 			
 			
 				美元
 				美元
+				US$
+				$
 			
 			
 				美元（次日）
@@ -7917,10 +8190,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				烏拉圭披索
 				烏拉圭披索
+				UYU
+				$
 			
 			
 				烏茲別克索姆
 				烏茲別克索姆
+				UZS
 			
 			
 				委內瑞拉玻利瓦 (1871–2008)
@@ -7930,14 +8206,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				委內瑞拉玻利瓦 (VEF)
 				委內瑞拉玻利瓦 (VEF)
+				VEF
+				Bs
 			
 			
 				委內瑞拉玻利瓦
 				委內瑞拉玻利瓦
+				VES
 			
 			
 				越南盾
 				越南盾
+				₫
+				₫
 			
 			
 				越南盾 (1978–1985)
@@ -7947,14 +8228,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				萬那杜瓦圖
 				萬那杜瓦圖
+				VUV
 			
 			
 				西薩摩亞塔拉
 				西薩摩亞塔拉
+				WST
 			
 			
 				法郎 (CFA–BEAC)
 				法郎 (CFA–BEAC)
+				FCFA
 			
 			
 				白銀
@@ -7989,6 +8273,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				格瑞那達元
 				格瑞那達元
+				EC$
+				$
 			
 			
 				特殊提款權
@@ -8013,6 +8299,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				法郎 (CFA–BCEAO)
 				法郎 (CFA–BCEAO)
+				CFA
 			
 			
 				帕拉狄昂
@@ -8022,6 +8309,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				法郎 (CFP)
 				法郎 (CFP)
+				CFPF
 			
 			
 				白金
@@ -8061,6 +8349,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				葉門里亞爾
 				葉門里亞爾
+				YER
 			
 			
 				南斯拉夫第納爾硬幣
@@ -8090,6 +8379,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				南非蘭特
 				南非蘭特
+				ZAR
+				R
 			
 			
 				尚比亞克瓦查 (1968–2012)
@@ -8099,6 +8390,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				尚比亞克瓦查
 				尚比亞克瓦查
+				ZMW
+				ZK
 			
 			
 				薩伊新扎伊爾
@@ -8311,6 +8604,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				世紀
 				{0} 個世紀
 			
+			
+				十年
+				{0} 個十年
+			
 			
 				年
 				{0} 年
@@ -8406,6 +8703,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				英制熱量單位
 				{0} 英制熱量單位
 			
+			
+				美制熱量單位
+				{0} 美制熱量單位
+			
 			
 				磅力
 				{0} 磅力
@@ -8430,6 +8731,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				赫茲
 				{0} 赫茲
 			
+			
+				字體 em
+				{0} em
+			
+			
+				像素
+				{0} 像素
+			
+			
+				百萬像素
+				{0} 百萬像素
+			
+			
+				每厘米像素
+				{0} 像素/厘米
+			
+			
+				每吋像素
+				{0} 像素/吋
+			
+			
+				每厘米點數
+				{0} 點/厘米
+			
+			
+				每吋點數
+				{0} 點/吋
+			
 			
 				公里
 				{0} 公里
@@ -8611,10 +8940,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				匹
 				{0} 匹
 			
-			
-				百帕
-				{0} 百帕
-			
 			
 				毫米汞柱
 				{0} 毫米汞柱
@@ -8627,6 +8952,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				英吋汞柱
 				{0} 英吋汞柱
 			
+			
+				巴
+				{0} 巴
+			
 			
 				毫巴
 				{0} 毫巴
@@ -8635,6 +8964,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				atm
 				{0} atm
 			
+			
+				帕斯卡
+				{0} 帕斯卡
+			
+			
+				百帕
+				{0} 百帕
+			
 			
 				千帕
 				{0} 千帕
@@ -8977,6 +9314,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				世紀
 				{0} 世紀
 			
+			
+				十年
+				{0} 個十年
+			
 			
 				年
 				{0} 年
@@ -9072,6 +9413,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				英制熱量單位
 				{0} 英制熱量單位
 			
+			
+				美制熱量單位
+				{0} 美制熱量單位
+			
 			
 				磅力
 				{0} 磅力
@@ -9096,6 +9441,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				赫茲
 				{0} 赫茲
 			
+			
+				em
+				{0} em
+			
+			
+				像素
+				{0} 像素
+			
+			
+				百萬像素
+				{0} 百萬像素
+			
+			
+				每厘米像素
+				{0} 像素/厘米
+			
+			
+				每吋像素
+				{0} 像素/吋
+			
+			
+				每厘米點數
+				{0} 點/厘米
+			
+			
+				每吋點數
+				{0} 點/吋
+			
 			
 				公里
 				{0} 公里
@@ -9277,10 +9650,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				匹
 				{0} 匹
 			
-			
-				百帕
-				{0} 百帕
-			
 			
 				毫米汞柱
 				{0} 毫米汞柱
@@ -9293,6 +9662,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				英吋汞柱
 				{0} 英吋汞柱
 			
+			
+				巴
+				{0} 巴
+			
 			
 				毫巴
 				{0} 毫巴
@@ -9301,6 +9674,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				atm
 				{0} atm
 			
+			
+				帕斯卡
+				{0} 帕斯卡
+			
+			
+				百帕
+				{0} 百帕
+			
 			
 				千帕
 				{0} 千帕
@@ -9763,9 +10144,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}匹
 			
-			
-				{0}百帕
-			
 			
 				{0}mmHg
 			
@@ -9778,6 +10156,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			
 				{0}毫巴
 			
+			
+				{0}百帕
+			
 			
 				公里/小時
 				{0}公里/小時
@@ -9898,12 +10279,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			{0} 或 {1}
 			{0} 或 {1}
 		
-		
-			{0}、{1}
-			{0}、{1}
-			{0}同{1}
-			{0}同{1}
-		
 		
 			{0}、{1}
 			{0}、{1}
diff --git a/make/data/cldr/common/main/yue_Hans.xml b/make/data/cldr/common/main/yue_Hans.xml
index ecff03a242f..e2c14aa19f9 100644
--- a/make/data/cldr/common/main/yue_Hans.xml
+++ b/make/data/cldr/common/main/yue_Hans.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+		
 		
 		
 			
+			
+			
 			
 			
 			
@@ -615,6 +621,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -650,6 +657,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
@@ -660,10 +668,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
+			
 			
 			
 			
 			
+			
 			
 			
 			
@@ -688,7 +698,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 			
-			
 			
 			
 			
@@ -1016,7 +1025,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			塔吉克斯坦
 			托克劳
 			东帝汶
-			TL
 			土库曼斯坦
 			突尼斯
 			汤加
@@ -1140,21 +1148,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 			日历
 			货币格式
-			忽略符号排序
-			对重音进行逆向排序
-			大写/小写字母排序
-			区分大小写的排序
+			忽略符号排序
+			对重音进行逆向排序
+			大写/小写字母排序
+			区分大小写的排序
 			排序
-			规范化排序
-			数字排序
-			排序强度
+			规范化排序
+			数字排序
+			排序强度
 			货币
 			小时制（12或24）
 			换行符样式
 			度量衡制
 			数字
-			时区
-			语言区域别名
+			时区
+			语言区域别名
 			专用
 		
 		
@@ -1324,8 +1332,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		[一 丁 七 万-与 丑 专 且 世 丘-业 东 丝 丢 两 严 丧 个 中 丰 串 临 丸-主 丽 举 乃 久 么 义 之-乐 乔 乖 乘 乙 九 也-乡 书 买 乱 乾 了 予 争 事 二 于 亏 云 互 五 井 亚 些 亡 交-亨 享 京 亮 亲 人 亿-仁 仅 仇 今 介 仍 从 仔 他 付 仙 代-以 仪 们 仰 仲 件 价 任 份 仿 企 伊 伍 伏-休 众-会 伟 传 伤 伦 伯 估 伴 伸 似 伽 但 位-佑 体 何 余 佛 作 你 佤 佩 佳 使 例 供 依 侠 侦-侨 侬 侯 侵 便 促 俄 俊 俗 保 信 俩 修 俱 俾 倍 倒 候 倚 借 倦 值 倾 假 偌 偏 做 停 健 偶 偷 储 催 傲 傻 像 僧 儒 儿 允 元-兆 先 光 克 免 兑 兔 党 入 全 八-兮 兰 共 关-兹 养-兽 内 冈 册 再 冒 写 军 农 冠 冬 冰 冲 决 况 冷 准 凌 减 凝 几 凡 凤 凭 凯 凰 出 击 函 刀 分 切 刊 刑 划 列-创 初 判 利 别 到 制-券 刺 刻 剂 前 剑 剧 剩 剪 副 割 力 劝-务 劣 动-劫 励-劳 势 勇 勉 勋 勒 勤 勾 勿 包 匆 匈 化 北 匙 匹-医 十 千 升 午 半 华 协 卒 卓 单-南 博 占-卢 卫 卯-危 即 却 卷 厂 厄-历 厉 压-厍 厚 原 去 县 参 又-反 发 叔 取-叙 口-另 只-叭 可 台 史 右 叶-叹 吃 各 合-吊 同-后 吐 向 吓 吗 君 吝 吟 否 吧 含 听 启 吵 吸 吹 吻 吾 呀 呆 呈 告 呐 员 呜 呢 呦 周 味 呵 呼 命 和 咖 咦-咨 咪 咬 咯 咱 哀 品 哇-哉 响 哎 哟 哥 哦 哩 哪 哭 哲 唉 唐 唤 唬 售 唯 唱 唷 商 啊 啡 啥 啦 啪 喀 喂 善 喇 喊 喏 喔 喜 喝 喵 喷 喻 嗒 嗨 嗯 嘉 嘛 嘴 嘻 嘿 器 四 回 因 团 园 困 围 固 国 图 圆 圈 土 圣 在 圭 地 圳 场 圾 址 均 坎 坐 坑 块 坚-坜 坡 坤 坦 坪 垂 垃 型 垒 埃 埋 城 埔 域 培 基 堂 堆 堕 堡 堪 塑 塔 塞 填 境 增 墨 壁 壤 士 壬 壮 声 处 备 复 夏 夕 外 多 夜 够 夥 大 天-夫 央 失 头 夷-夺 奇-奉 奋 奏 契 奔 奖 套 奥 女 奴 奶 她 好 如 妇 妈 妖 妙 妥 妨 妮 妹 妻 姆 姊 始 姐 姑 姓 委 姿 威 娃 娄 娘 娜 娟 娱 婆 婚 媒 嫁 嫌 嫩 子 孔 孕 字-孙 孜 孝 孟 季 孤 学 孩 宁 它 宇-安 宋 完 宏 宗-实 审-室 宪 害 宴 家 容 宽-宿 寂 寄-寇 富 寒 寝-察 寡 寨 寸 对 寻 导 寿 封 射 将 尊 小 少 尔 尖 尘 尚 尝 尤 就 尺 尼-尾 局-层 居 屋 屏 展 属 屠 山 岁 岂 岗 岘 岚 岛 岳 岸 峡 峰 崇 崩 崴 川 州 巡 工-巨 巫 差 己-巴 巷 币-布 帅 师 希 帐 帕 帖 帝 带 席 帮 常 帽 幅 幕 干-年 并 幸 幻-幽 广 庆 床 序 库-底 店 庙 庚 府 庞 废 度 座 庭 康 庸 廉 廖 延 廷 建 开 异-弄 弊 式 引 弗 弘 弟 张 弥 弦 弯 弱 弹 强 归 当 录 彝 形 彩 彬 彭 彰 影 彷 役 彻 彼 往 征 径 待 很 律 後 徐 徒 得 循 微 徵 德 心 必 忆 忌 忍 志-忙 忠 忧 快 念 忽 怀 态 怎 怒 怕 怖 思 怡 急 性 怨 怪 总 恋 恐 恢 恨 恩 恭 息 恰 恶 恼 悄 悉 悔 悟 悠 患 您 悲 情 惑 惜 惠 惧 惨 惯 想 惹 愁 愈 愉 意 愚 感 愧 慈 慎 慕 慢 慧 慰 憾 懂 懒 戈 戊 戌 戏-戒 或 战 截 戴 户 房-扁 扇 手 才 扎 扑 打 托 扣 执 扩 扫-扯 批 找-技 抄 把 抑 抓 投 抗 折 抢 护 报 披 抬 抱 抵 抹 抽 担 拆 拉 拍 拒 拔 拖 拘 招 拜 拟 拥 拦 拨 择 括 拳 拷 拼 拾 拿 持 指 按 挑 挖 挝 挡 挤 挥 挪 振 挺 捉 捐 捕 损 捡 换 据 捷 授 掉 掌 排 探 接 控-措 掸 描 提 插 握 援 搜 搞 搬 搭 摄 摆 摊 摔 摘 摩 摸 撒 撞 播 操 擎 擦 支 收 改 攻 放 政 故 效 敌 敏 救 教 敝 敢 散 敦 敬 数 敲 整 文 斋 斐 斗 料 斜 斥 断 斯 新 方 於 施 旁 旅 旋 族 旗 无 既 日-早 旭 时 旺 昂 昆 昌 明 昏 易 星 映 春 昨 昭 是 显 晃 晋 晒 晓 晚 晨 普 景 晴 晶 智 暂 暑 暖 暗 暮 暴 曰 曲 更 曹 曼 曾-最 月 有 朋 服 朗 望 朝 期 木 未-札 术 朱 朵 机 杀 杂 权 杉 李 材 村 杜 束 条 来 杨 杯 杰 松 板 极 构 析 林 果 枝 枢 枪 枫 架 柏 某 染 柔 查 柬 柯 柳 柴 标 栋 栏 树 校 样-根 格 桃 框 案 桌 桑 档 桥 梁 梅 梦 梯 械 梵 检 棉 棋 棒 棚 森 椅 植 椰 楚 楼 概 榜 模 樱 檀 欠-欣 欧 欲 欺 款 歉 歌 止-武 歪 死 殊 残 段 毅 母 每 毒 比 毕 毛 毫 氏 民 气 氛 水 永 求 汇 汉 汗 汝 江-污 汤 汪 汶 汽 沃 沈 沉 沙 沟 没 沧 河 油 治 沿 泉 泊 法 泛 泡-泣 泥 注 泰 泳 泽 洋 洗 洛 洞 津 洪 洲 活 洽 派 流 浅 测 济 浏 浑 浓 浙 浦 浩 浪 浮 浴 海 涅 消 涉 涛 涨 涯 液 涵 淋 淑 淘 淡 深 混 添 清 渐 渡 渣 温 港 渴 游 湖 湾 源 溜 溪 滋 滑 满 滥 滨 滴 漂 漏 演 漠 漫 潘 潜 潮 澎 澳 激 灌 火 灭 灯 灰 灵 灿 炉 炎 炮 炸 点 烂 烈 烤 烦 烧 热 焦 然 煌 煞 照 煮 熊 熟 燃 燕 爆 爪 爬 爱 爵-爸 爽 片 版 牌 牙 牛 牡 牢 牧 物 牲 牵 特 牺 犯 状 犹 狂 狐 狗 狠 独 狮 狱 狼 猛 猜 猪 献 猴 玄 率 玉 王 玛 玩 玫 环 现 玲 玻 珀 珊 珍 珠 班 球 理 琊 琪 琳 琴 琼 瑙 瑜 瑞 瑟 瑰 瑶 璃 瓜 瓦 瓶 甘 甚 甜 生 用 田-申 电 男 甸 画 畅 界 留 略 番 疆 疏 疑 疗 疯 疲 疼 疾 病 痕 痛 痴 癸 登 白 百 的 皆 皇 皮 盈 益 监 盒 盖 盘 盛 盟 目 直 相 盼 盾 省 眉 看 真 眠 眼 着 睛 睡 督 瞧 矛 矣 知 短 石 矶 码 砂 砍 研 破 础 硕 硬 确 碍 碎 碗 碟 碧 碰 磁 磅 磨 示 礼 社 祖 祚 祝 神 祥 票 祯 祸 禁 禅 福 离 秀 私 秋 种 科 秒 秘 租 秤 秦 秩 积 称 移 稀 程 稍 税 稣 稳 稿 穆 究 穷 穹 空 穿 突 窗 窝 立 站 竞-章 童 端 竹 笑 笔 笛 符 笨 第 等 筋 筑 答 策 筹 签 简 算 管 箭 箱 篇 篮 簿 籍 米 类 粉 粒 粗 粤 粹 精 糊 糕 糖 糟 系 素 索 紧 紫 累 繁 红 约 级 纪 纯 纲 纳 纵 纷 纸 纽 线 练 组 细-终 绍 经 结 绕 绘 给 络 绝 统 继 绩 绪 续 维 绵 综 绿 缅 缓 编 缘 缠 缩 缴 缶 缸 缺 罐 网 罕 罗 罚 罢 罪 置 署 羊 美 羞 群 羯 羽 翁 翅 翔 翘 翠 翰 翻 翼 耀 老 考 者 而 耍 耐 耗 耳 耶 聊 职 联 聘 聚 聪 肉 肖 肚 股 肤 肥 肩 肯 育 胁 胆 背 胎 胖 胜 胞 胡 胶 胸 能 脆 脑 脱 脸 腊 腐 腓 腰 腹 腾 腿 臂 臣 自 臭 至 致 舌 舍 舒 舞 舟 航 般 舰 船 良 色 艺 艾 节 芒 芝 芦 芬 芭 花 芳 苍 苏 苗 若 苦 英 茂 范 茨 茫 茶 草 荐 荒 荣 药 荷 莉 莎 莪 莫 莱 莲 获 菜 菩 菲 萄 萍 萤 营 萧 萨 落 著 葛 葡 蒂 蒋 蒙 蓉 蓝 蓬 蔑 蔡 薄 薪 藉 藏 藤 虎 虑 虫 虹 虽 虾 蚁 蛇 蛋 蛙 蛮 蜂 蜜 蝶 融 蟹 蠢 血 行 街 衡 衣 补 表 袋 被 袭 裁 裂 装 裕 裤 西 要 覆 见 观 规 视 览 觉 角 解 言 誉 誓 警 计 订 认 讨 让 训-记 讲 讷 许 论 设 访 证 评 识 诉 词 译 试 诗 诚 话 诞 询 该 详 语 误 说 请 诸 诺 读 课 谁 调 谅 谈 谊 谋 谓 谜 谢 谨 谱 谷 豆 象 豪 貌 贝-负 贡-败 货-贪 购 贯 贱 贴 贵 贸-贺 贼 贾 资 赋 赌 赏 赐 赔 赖 赚 赛 赞 赠 赢 赤 赫 走 赵 起 趁 超 越 趋 趣 足 跃 跌 跑 距 跟 路 跳 踏 踢 踩 身 躲 车 轨 轩 转 轮-轰 轻 载 较 辅 辆 辈 辉 辑 输 辛 辞 辨 辩 辰 辱 边 达 迁 迅 过 迈 迎 运 近 返 还 这 进-迟 迦 迪 迫 述 迷 追 退-逃 逆 选 逊 透 逐 递 途 通 逛 逝 速 造 逢 逸 逻 逼 遇 遍 道 遗 遭 遮 遵 避 邀 邓 那 邦 邪 邮 邱 邻 郎 郑 部 郭 都 鄂 酉 酋 配 酒 酷 酸 醉 醒 采 释 里-量 金 针 钓 钟 钢 钦 钱 钻 铁 铃 铜 铢 铭 银 铺 链 销 锁 锅 锋 错 锡 锦 键 锺 镇 镜 镭 长 门 闪 闭 问 闰 闲 间 闷 闹 闻 阁 阅 阐 阔 队 阮 防-阶 阻 阿 陀 附-陆 陈 降 限 院 除 险 陪 陵-陷 隆 随 隐 隔 障 难 雄-集 雉 雨 雪 雯 雳 零 雷 雾 需 震 霍 霖 露 霸 霹 青 靖 静 非 靠 面 革 靼 鞋 鞑 韦 韩 音 页 顶 项-须 顽-顿 预 领 颇 频 颗 题 额 风 飘 飙 飞 食 餐 饭 饮 饰 饱 饼 馆 首 香 馨 马 驱 驶 驻 驾 验 骑 骗 骚 骤 骨 高 鬼 魂 魅 魔 鱼 鲁 鲜 鸟 鸡 鸣 鸭 鸿 鹅 鹤 鹰 鹿 麦 麻 黄 黎 黑 默 鼓 鼠 鼻 齐 齿 龄 龙 龟]
 		[乒 乓 仂 仓 伞 侣 傈 傣 僳 冥 凉 刨 匕 卑 卞 厘 厦 厨 吕 呣 唇 啤 啮 喱 嗅 噘 噢 坝 堤 墟 奎 妆 婴 媚 宅 寺 尬 尴 屑 屿 巽 巾 弓 彗 惊 戟 扔 扰 扳 抛 挂 捂 摇 撅 撤 杆 杖 柜 柱 栗 栽 桶 棍 棕 棺 楔 楠 榈 槟 橙 洒 浆 涌 淇 滕 滚 滩 灾 烛 烟 焰 煎 犬 猫 瑚 瓢 甫 皱 盆 盔 盲 眨 眯 瞌 矿 碑 祈 祭 祷 禄 稻 竿 笼 筒 篷 粟 粮 纠 纬 缆 缎 耸 脚 舔 舵 艇 艮 芽 苜 苞 菇 菱 葫 葵 蒸 蓿 蔽 薯 蘑 蚂 蛛 蜗 蜘 蜡 蝎 蝴 螃 裹 谍 谬 豚 账 跤 踪 躬 轴 辐 迹 郁 鄙 酢 钉 钥 钮 钯 铂 铅 铛 锄 锑 锚 锤 镑 闺 阱 隧 雕 霾 靴 靶 鞠 颠 馏 驼 骆 髦 魁 鲤 鲸 鳄 鸽]
 		[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-		[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]
-		[﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \- － ﹣ ‐ – — ︱ ― , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ " ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ 〖 〗 ‖ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨ \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ ′ ″ ‵ 〃 ※]
+		[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9 〇 一 七 三 九 二 五 八 六 四]
+		[﹉﹊﹋﹌ _ ＿ ﹍﹎﹏ ︳︴ \- － ﹣ ‐ ‑ – — ︱ ― , ， ﹐ 、 ﹑ ; ； ﹔ \: ： ﹕ ! ！ ﹗ ? ？ ﹖ . ． ﹒ ‥ ︰ … 。 · ＇ ‘ ’ " ＂ “ ” 〝 〞 ( （ ﹙ ︵ ) ） ﹚ ︶ \[ ［ \] ］ \{ ｛ ﹛ ︷ \} ｝ ﹜ ︸ 〈 ︿ 〉 ﹀ 《 ︽ 》 ︾ 「 ﹁ 」 ﹂ 『 ﹃ 』 ﹄ 【 ︻ 】 ︼ 〔 ﹝ ︹ 〕 ﹞ ︺ 〖 〗 ‖ § @ ＠ ﹫ * ＊ ﹡ / ／ \\ ＼ ﹨ \& ＆ ﹠ # ＃ ﹟ % ％ ﹪ ‰ ′ ″ ‵ 〃 ※]
 		{0}…
 		…{0}
 		{0}…{1}
@@ -1339,13 +1347,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		
 			[.․。︒﹒．｡]
-			['ʼ՚᾽᾿’＇]
-			[%٪﹪％]
-			[؉‰]
 			[\$﹩＄$]
 			[£₤]
-			[¥￥]
-			[₩￦]
 			[₨₹{Rp}{Rs}]
 		
 		
@@ -1439,44 +1442,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d至d日
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							ah时至ah时
 							ah时至h时
@@ -2097,12 +2062,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						科普特历
 					
 					
-						科普特历前
-						科普特历
+						科普特历前
+						科普特历
 					
 					
-						科普特历前
-						科普特历
+						科普特历前
+						科普特历
 					
 				
 				
@@ -2112,57 +2077,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						
-							Bh时至Bh时
-							Bh时至h时
-						
-						
-							Bh:mm至Bh:mm
-							Bh:mm至h:mm
-							Bh:mm至h:mm
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-					
-				
 			
 			
 				
@@ -2403,39 +2317,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 					
 				
-				
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							{1} {0}
-						
-					
-					
-						
-							Bh至Bh时
-							Bh至h时
-						
-						
-							Bh:mm至Bh:mm
-							Bh:mm至h:mm
-							Bh:mm至h:mm
-						
-					
-				
 			
 			
 				
@@ -2539,6 +2420,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						埃塞俄比亚历前
 						埃塞俄比亚历
 					
+					
+						埃历前
+						埃历
+					
+					
+						埃历前
+						埃历
+					
 				
 				
 					
@@ -2656,44 +2545,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d至d日
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							ah时至ah时
 							ah时至h时
@@ -2793,6 +2644,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11月
 							12月
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							一月
 							二月
@@ -2823,6 +2688,20 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							11月
 							12月
 						
+						
+							1
+							2
+							3
+							4
+							5
+							6
+							7
+							8
+							9
+							10
+							11
+							12
+						
 						
 							一月
 							二月
@@ -3034,21 +2913,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					
 						公元前
-						BCE
 						公元
-						CE
 					
 					
 						公元前
-						BCE
 						公元
-						CE
 					
 					
 						公元前
-						BCE
 						公元
-						CE
 					
 				
 				
@@ -3183,44 +3056,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						
 							d–d日
 						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
 						
 							ah时至ah时
 							ah时至h时
@@ -4520,36 +4355,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						弘安(1278–1288)
 						正应(1288–1293)
 						永仁(1293–1299)
-						正安(1299–1302)
-						乾元(1302–1303)
-						嘉元(1303–1306)
-						德治(1306–1308)
-						延庆(1308–1311)
-						应长(1311–1312)
-						正和(1312–1317)
-						文保(1317–1319)
-						元应(1319–1321)
-						元亨(1321–1324)
-						正中(1324–1326)
-						嘉历(1326–1329)
-						元德(1329–1331)
-						元弘(1331–1334)
-						建武(1334–1336)
-						延元(1336–1340)
-						兴国(1340–1346)
-						正平(1346–1370)
-						建德(1370–1372)
-						文中(1372–1375)
-						天授(1375–1379)
+						正安(1299–1302)
+						乾元(1302–1303)
+						嘉元(1303–1306)
+						德治(1306–1308)
+						延庆(1308–1311)
+						应长(1311–1312)
+						正和(1312–1317)
+						文保(1317–1319)
+						元应(1319–1321)
+						元亨(1321–1324)
+						正中(1324–1326)
+						嘉历(1326–1329)
+						元德(1329–1331)
+						元弘(1331–1334)
+						建武(1334–1336)
+						延元(1336–1340)
+						兴国(1340–1346)
+						正平(1346–1370)
+						建德(1370–1372)
+						文中(1372–1375)
+						天授(1375–1379)
 						康历(1379–1381)
 						弘和(1381–1384)
 						元中(1384–1392)
 						明德(1384–1387)
-						M
-						T
-						S
-						H
-						R
 					
 				
 				
@@ -4628,55 +4458,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						Gy年第Q季度
 						Gy年QQQQ
 					
-					
-						
-							Bh时至Bh时
-							Bh时至h时
-						
-						
-							Bh:mm至Bh:mm
-							Bh:mm至h:mm
-							Bh:mm至h:mm
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-							G y MMM d – y MMM d
-						
-						
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – G y MMM d, E
-							G y MMM d, E – MMM d, E
-							G y MMM d, E – y MMM d, E
-						
-					
 				
 			
 			
@@ -4781,50 +4562,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						波斯历
 					
 				
-				
-					
-						
-							Bh时至Bh时
-							Bh时至h时
-						
-						
-							Bh:mm至Bh:mm
-							Bh:mm至h:mm
-							Bh:mm至h:mm
-						
-						
-							G y – G y
-							G y–y
-						
-						
-							GGGGG y-MM – GGGGG y-MM
-							GGGGG y-MM – y-MM
-							GGGGG y-MM – y-MM
-						
-						
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – GGGGG y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-							GGGGG y-MM-dd – y-MM-dd
-						
-						
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – GGGGG y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-							GGGGG y-MM-dd, E – y-MM-dd, E
-						
-						
-							G y MMM – G y MMM
-							G y MMM–MMM
-							G y MMM – y MMM
-						
-						
-							G y MMM d–d
-							G y MMM d – G y MMM d
-							G y MMM d – MMM d
-						
-					
-				
 			
 			
 				
@@ -5580,9 +5317,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				
 					协调世界时
 				
-				
-					UTC
-				
 			
 			
 				未知城市
@@ -5990,7 +5724,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				布拉格
 			
 			
-				布辛根
+				比辛根
 			
 			
 				柏林
@@ -6170,7 +5904,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				耶路撒冷
 			
 			
-				曼岛
+				马恩岛
 			
 			
 				加尔各答
@@ -6251,7 +5985,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				阿克托别
 			
 			
-				库斯塔奈
+				库斯塔奈
 			
 			
 				克孜洛尔达
@@ -6551,7 +6285,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				鄂木斯克
 			
 			
-				诺沃西比尔斯克
+				新西伯利亚
 			
 			
 				巴尔瑙尔
@@ -7833,6 +7567,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 	
 	
+		latn
 		
 			hanidec
 			hans
@@ -7840,12 +7575,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		
 		1
 		
-			٪؜
-			؜+
-			؜-
+			٫
+			٬
+			؛
+			اس
+			×
+			؉
+			∞
+			NaN
+			:
+		
+		
+			٫
+			٬
+			؛
+			٪
+			‎+‎
+			‎-‎
+			×۱۰^
+			×
+			؉
+			∞
+			NaN
+			٫
 		
 		
+			.
+			,
 			%
+			+
+			-
 			E
 			×
 			‰
@@ -7853,15 +7612,32 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			NaN
 		
 		
+			.
+			,
 			;
 			%
+			+
+			-
 			E
 			×
 			‰
 			∞
 			NaN
+			:
 		
+		
+			
+				
+					#,##0.###
+				
+			
+		
 		
+			
+				
+					#,##0.###
+				
+			
 			
 				
 					0
@@ -7873,9 +7649,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					00亿
 					000亿
 					0000亿
-					0兆
-					00兆
-					000兆
+					0万亿
+					00万亿
+					000万亿
 				
 			
 			
@@ -7889,9 +7665,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					00亿
 					000亿
 					0000亿
-					0兆
-					00兆
-					000兆
+					0万亿
+					00万亿
+					000万亿
 				
 			
 		
@@ -8067,7 +7843,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤#,##0.00
 				
 				
-					¤#,##0.00;(¤#,##0.00)
+					¤#,##0.00;(¤#,##0.00)
 				
 			
 			{0}{1}
@@ -8169,9 +7945,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					¤00亿
 					¤000亿
 					¤0000亿
-					¤0兆
-					¤00兆
-					¤000兆
+					¤0万亿
+					¤00万亿
+					¤000万亿
 				
 			
 			{0}{1}
@@ -8427,6 +8203,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				阿联酋迪拉姆
 				阿联酋迪拉姆
+				AED
 			
 			
 				阿富汗尼 (1927–2002)
@@ -8435,6 +8212,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				阿富汗尼
 				阿富汗尼
+				AFN
 			
 			
 				阿尔巴尼亚列克(1946–1965)
@@ -8443,56 +8221,69 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				阿尔巴尼亚列克
 				阿尔巴尼亚列克
+				ALL
 			
 			
 				亚美尼亚德拉姆
 				亚美尼亚德拉姆
+				AMD
 			
 			
 				荷属安的列斯盾
 				荷属安的列斯盾
+				ANG
 			
 			
 				安哥拉宽扎
 				安哥拉宽扎
+				AOA
 				Kz
 			
 			
 				安哥拉宽扎 (1977–1990)
 				安哥拉宽扎 (1977–1990)
+				AOK
 			
 			
 				安哥拉新宽扎 (1990–2000)
 				安哥拉新宽扎 (1990–2000)
+				AON
 			
 			
 				安哥拉重新调整宽扎 (1995–1999)
 				安哥拉重新调整宽扎 (1995–1999)
+				AOR
 			
 			
 				阿根廷奥斯特拉尔
 				阿根廷奥斯特拉尔
+				ARA
 			
 			
 				阿根廷法定比索 (1970–1983)
 				阿根廷法定比索 (1970–1983)
+				ARL
 			
 			
 				阿根廷比索 (1881–1970)
 				阿根廷比索 (1881–1970)
+				ARM
 			
 			
 				阿根廷比索 (1983–1985)
 				阿根廷比索 (1983–1985)
+				ARP
 			
 			
 				阿根廷比索
 				阿根廷比索
+				ARS
 				$
 			
 			
 				奥地利先令
 				奥地利先令
+				ATS
 			
 			
 				澳大利亚元
@@ -8503,14 +8294,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				阿鲁巴弗罗林
 				阿鲁巴弗罗林
+				AWG
 			
 			
 				阿塞拜疆马纳特 (1993–2006)
 				阿塞拜疆马纳特 (1993–2006)
+				AZM
 			
 			
 				阿塞拜疆马纳特
 				阿塞拜疆马纳特
+				AZN
 			
 			
 				波士尼亚-赫塞哥维纳第纳尔 (1992–1994)
@@ -8520,6 +8314,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				波斯尼亚-黑塞哥维那可兑换马克
 				波斯尼亚-黑塞哥维那可兑换马克
+				BAM
 				KM
 			
 			
@@ -8530,24 +8325,29 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				巴巴多斯元
 				巴巴多斯元
+				BBD
 				$
 			
 			
 				孟加拉塔卡
 				孟加拉塔卡
+				BDT
 				৳
 			
 			
 				比利时法郎（可兑换）
 				比利时法郎（可兑换）
+				BEC
 			
 			
 				比利时法郎
 				比利时法郎
+				BEF
 			
 			
 				比利时法郎（金融）
 				比利时法郎（金融）
+				BEL
 			
 			
 				保加利亚硬列弗
@@ -8562,6 +8362,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				保加利亚列弗
 				保加利亚新列弗
+				BGN
 			
 			
 				保加利亚列弗 (1879–1952)
@@ -8571,14 +8372,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				巴林第纳尔
 				巴林第纳尔
+				BHD
 			
 			
 				布隆迪法郎
 				布隆迪法郎
+				BIF
 			
 			
 				百慕大元
 				百慕大元
+				BMD
 				$
 			
 			
@@ -8590,57 +8394,70 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				玻利维亚诺
 				玻利维亚诺
+				BOB
 				Bs
 			
 			
 				玻利维亚诺 (1863–1963)
 				玻利维亚诺 (1863–1963)
+				BOL
 			
 			
 				玻利维亚比索
 				玻利维亚比索
+				BOP
 			
 			
 				玻利维亚 Mvdol（资金）
 				玻利维亚 Mvdol（资金）
+				BOV
 			
 			
 				巴西新克鲁赛罗 (1967–1986)
 				巴西新克鲁赛罗 (1967–1986)
+				BRB
 			
 			
 				巴西克鲁扎多 (1986–1989)
 				巴西克鲁扎多 (1986–1989)
+				BRC
 			
 			
 				巴西克鲁塞罗 (1990–1993)
 				巴西克鲁塞罗 (1990–1993)
+				BRE
 			
 			
 				巴西雷亚尔
 				巴西雷亚尔
+				R$
 				R$
 			
 			
 				巴西新克鲁扎多 (1989–1990)
 				巴西新克鲁扎多 (1989–1990)
+				BRN
 			
 			
 				巴西克鲁塞罗 (1993–1994)
 				巴西克鲁塞罗 (1993–1994)
+				BRR
 			
 			
 				巴西克鲁塞罗 (1942–1967)
 				巴西克鲁塞罗 (1942–1967)
+				BRZ
 			
 			
 				巴哈马元
 				巴哈马元
+				BSD
 				$
 			
 			
 				不丹努尔特鲁姆
 				不丹努尔特鲁姆
+				BTN
 			
 			
 				缅元
@@ -8649,6 +8466,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				博茨瓦纳普拉
 				博茨瓦纳普拉
+				BWP
 				P
 			
 			
@@ -8659,49 +8477,60 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				白俄罗斯卢布
 				白俄罗斯卢布
+				BYN
 				р.
 			
 			
 				白俄罗斯卢布 (2000–2016)
 				白俄罗斯卢布 (2000–2016)
+				BYR
 			
 			
 				伯利兹元
 				伯利兹元
+				BZD
 				$
 			
 			
 				加拿大元
 				加拿大元
+				CA$
 				$
 			
 			
 				刚果法郎
 				刚果法郎
+				CDF
 			
 			
 				欧元 (WIR)
 				欧元 (WIR)
+				CHE
 			
 			
 				瑞士法郎
 				瑞士法郎
+				CHF
 			
 			
 				法郎 (WIR)
 				法郎 (WIR)
+				CHW
 			
 			
 				智利埃斯库多
 				智利埃斯库多
+				CLE
 			
 			
 				智利（资金）
 				智利（资金）
+				CLF
 			
 			
 				智利比索
 				智利比索
+				CLP
 				$
 			
 			
@@ -8709,24 +8538,31 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				人民币（离岸）
 				CNH
 			
+			
+				中国人民银行元
+				中国人民银行元
+			
 			
 				人民币
 				人民币
-				￥
+				¥
 				¥
 			
 			
 				哥伦比亚比索
 				哥伦比亚比索
+				COP
 				$
 			
 			
 				哥伦比亚币
 				哥伦比亚币
+				COU
 			
 			
 				哥斯达黎加科朗
 				哥斯达黎加科朗
+				CRC
 				₡
 			
 			
@@ -8742,72 +8578,88 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				古巴可兑换比索
 				古巴可兑换比索
+				CUC
 				$
 			
 			
 				古巴比索
 				古巴比索
+				CUP
 				$
 			
 			
 				佛得角埃斯库多
 				佛得角埃斯库多
+				CVE
 			
 			
 				塞浦路斯镑
 				塞浦路斯镑
+				CYP
 			
 			
 				捷克克朗
 				捷克克朗
+				CZK
 				Kč
 			
 			
 				东德奥斯特马克
 				东德奥斯特马克
+				DDM
 			
 			
 				德国马克
 				德国马克
+				DEM
 			
 			
 				吉布提法郎
 				吉布提法郎
+				DJF
 			
 			
 				丹麦克朗
 				丹麦克朗
+				DKK
 				kr
 			
 			
 				多米尼加比索
 				多米尼加比索
+				DOP
 				$
 			
 			
 				阿尔及利亚第纳尔
 				阿尔及利亚第纳尔
+				DZD
 			
 			
 				厄瓜多尔苏克雷
 				厄瓜多尔苏克雷
+				ECS
 			
 			
 				厄瓜多尔 (UVC)
 				厄瓜多尔 (UVC)
+				ECV
 			
 			
 				爱沙尼亚克朗
 				爱沙尼亚克朗
+				EEK
 			
 			
 				埃及镑
 				埃及镑
+				EGP
 				E£
 			
 			
 				厄立特里亚纳克法
 				厄立特里亚纳克法
+				ERN
 			
 			
 				西班牙比塞塔（帐户 A）
@@ -8828,74 +8680,90 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				埃塞俄比亚比尔
 				埃塞俄比亚比尔
+				ETB
 			
 			
 				欧元
 				欧元
+				€
 				€
 			
 			
 				芬兰马克
 				芬兰马克
+				FIM
 			
 			
 				斐济元
 				斐济元
+				FJD
 				$
 			
 			
 				福克兰群岛镑
 				福克兰群岛镑
+				FKP
 				£
 			
 			
 				法国法郎
 				法国法郎
+				FRF
 			
 			
 				英镑
 				英镑
+				£
 				£
 			
 			
 				乔治亚库蓬拉瑞特
 				乔治亚库蓬拉瑞特
+				GEK
 			
 			
 				格鲁吉亚拉里
 				格鲁吉亚拉里
+				GEL
 				₾
 				₾
 			
 			
 				加纳塞第
 				加纳塞第
+				GHC
 			
 			
 				加纳塞地
 				加纳塞地
+				GHS
 			
 			
 				直布罗陀镑
 				直布罗陀镑
+				GIP
 				£
 			
 			
 				冈比亚达拉西
 				冈比亚达拉西
+				GMD
 			
 			
 				几内亚法郎
 				几内亚法郎
+				GNF
 				FG
 			
 			
 				几内亚西里
 				几内亚西里
+				GNS
 			
 			
 				赤道几内亚埃奎勒
 				赤道几内亚埃奎勒
+				GQE
 			
 			
 				希腊德拉克马
@@ -8905,29 +8773,35 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				危地马拉格查尔
 				危地马拉格查尔
+				GTQ
 				Q
 			
 			
 				葡萄牙几内亚埃斯库多
 				葡萄牙几内亚埃斯库多
+				GWE
 			
 			
 				几内亚比绍比索
 				几内亚比绍比索
+				GWP
 			
 			
 				圭亚那元
 				圭亚那元
+				GYD
 				$
 			
 			
 				港元
 				港元
+				HK$
 				$
 			
 			
 				洪都拉斯伦皮拉
 				洪都拉斯伦皮拉
+				HNL
 				L
 			
 			
@@ -8938,15 +8812,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				克罗地亚库纳
 				克罗地亚库纳
+				HRK
 				kn
 			
 			
 				海地古德
 				海地古德
+				HTG
 			
 			
 				匈牙利福林
 				匈牙利福林
+				HUF
 				Ft
 			
 			
@@ -8958,10 +8835,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				爱尔兰镑
 				爱尔兰镑
+				IEP
 			
 			
 				以色列镑
 				以色列镑
+				ILP
 			
 			
 				以色列谢克尔(1980–1985)
@@ -8971,20 +8850,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				以色列新谢克尔
 				以色列新谢克尔
+				₪
 				₪
 			
 			
 				印度卢比
 				印度卢比
+				₹
 				₹
 			
 			
 				伊拉克第纳尔
 				伊拉克第纳尔
+				IQD
 			
 			
 				伊朗里亚尔
 				伊朗里亚尔
+				IRR
 			
 			
 				冰岛克朗(1918–1981)
@@ -8994,6 +8877,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				冰岛克朗
 				冰岛克朗
+				ISK
 				kr
 			
 			
@@ -9004,38 +8888,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				牙买加元
 				牙买加元
+				JMD
 				$
 			
 			
 				约旦第纳尔
 				约旦第纳尔
+				JOD
 			
 			
 				日元
 				日元
+				JP¥
 				¥
 			
 			
 				肯尼亚先令
 				肯尼亚先令
+				KES
 			
 			
 				吉尔吉斯斯坦索姆
 				吉尔吉斯斯坦索姆
+				KGS
 			
 			
 				柬埔寨瑞尔
 				柬埔寨瑞尔
+				KHR
 				៛
 			
 			
 				科摩罗法郎
 				科摩罗法郎
+				KMF
 				CF
 			
 			
 				朝鲜元
 				朝鲜元
+				KPW
 				₩
 			
 			
@@ -9055,86 +8947,103 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				科威特第纳尔
 				科威特第纳尔
+				KWD
 			
 			
 				开曼元
 				开曼元
+				KYD
 				$
 			
 			
 				哈萨克斯坦坚戈
 				哈萨克斯坦坚戈
+				KZT
 				₸
 			
 			
 				老挝基普
 				老挝基普
+				LAK
 				₭
 			
 			
 				黎巴嫩镑
 				黎巴嫩镑
+				LBP
 				L£
 			
 			
 				斯里兰卡卢比
 				斯里兰卡卢比
+				LKR
 				Rs
 			
 			
 				利比里亚元
 				利比里亚元
+				LRD
 				$
 			
 			
 				莱索托洛蒂
 				莱索托洛蒂
+				LSL
 			
 			
 				立陶宛立特
 				立陶宛立特
-				Lt
+				LTL
 			
 			
 				立陶宛塔咯呐司
 				立陶宛塔咯呐司
+				LTT
 			
 			
 				卢森堡可兑换法郎
 				卢森堡可兑换法郎
+				LUC
 			
 			
 				卢森堡法郎
 				卢森堡法郎
+				LUF
 			
 			
 				卢森堡金融法郎
 				卢森堡金融法郎
+				LUL
 			
 			
 				拉脱维亚拉特
 				拉脱维亚拉特
-				Ls
+				LVL
 			
 			
 				拉脱维亚卢布
 				拉脱维亚卢布
+				LVR
 			
 			
 				利比亚第纳尔
 				利比亚第纳尔
+				LYD
 			
 			
 				摩洛哥迪拉姆
 				摩洛哥迪拉姆
+				MAD
 			
 			
 				摩洛哥法郎
 				摩洛哥法郎
+				MAF
 			
 			
 				摩纳哥法郎
 				摩纳哥法郎
+				MCF
 			
 			
 				摩尔多瓦库邦
@@ -9144,19 +9053,23 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				摩尔多瓦列伊
 				摩尔多瓦列伊
+				MDL
 			
 			
 				马达加斯加阿里亚里
 				马达加斯加阿里亚里
+				MGA
 				Ar
 			
 			
 				马达加斯加法郎
 				马达加斯加法郎
+				MGF
 			
 			
 				马其顿第纳尔
 				马其顿第纳尔
+				MKD
 			
 			
 				马其顿第纳尔 (1992–1993)
@@ -9166,28 +9079,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				马里法郎
 				马里法郎
+				MLF
 			
 			
 				缅甸元
 				缅甸元
+				MMK
 				K
 			
 			
 				蒙古图格里克
 				蒙古图格里克
+				MNT
 				₮
 			
 			
 				澳门币
 				澳门元
+				MOP
 			
 			
 				毛里塔尼亚乌吉亚 (1973–2017)
 				毛里塔尼亚乌吉亚 (1973–2017)
+				MRO
 			
 			
 				毛里塔尼亚乌吉亚
 				毛里塔尼亚乌吉亚
+				MRU
 			
 			
 				马耳他里拉
@@ -9202,24 +9121,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				毛里求斯卢比
 				毛里求斯卢比
+				MUR
 				Rs
 			
 			
 				马尔代夫卢比(1947–1981)
 				马尔代夫卢比(1947–1981)
-				MVP
 			
 			
 				马尔代夫卢菲亚
 				马尔代夫卢菲亚
+				MVR
 			
 			
 				马拉维克瓦查
 				马拉维克瓦查
+				MWK
 			
 			
 				墨西哥比索
 				墨西哥比索
+				MX$
 				$
 			
 			
@@ -9235,28 +9157,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				马来西亚林吉特
 				马来西亚林吉特
+				MYR
 				RM
 			
 			
 				莫桑比克埃斯库多
 				莫桑比克埃斯库多
+				MZE
 			
 			
 				旧莫桑比克美提卡
 				旧莫桑比克美提卡
+				MZM
 			
 			
 				莫桑比克美提卡
 				莫桑比克美提卡
+				MZN
 			
 			
 				纳米比亚元
 				纳米比亚元
+				NAD
 				$
 			
 			
 				尼日利亚奈拉
 				尼日利亚奈拉
+				NGN
 				₦
 			
 			
@@ -9267,64 +9195,78 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				尼加拉瓜科多巴
 				尼加拉瓜金科多巴
+				NIO
 				C$
 			
 			
 				荷兰盾
 				荷兰盾
+				NLG
 			
 			
 				挪威克朗
 				挪威克朗
+				NOK
 				kr
 			
 			
 				尼泊尔卢比
 				尼泊尔卢比
+				NPR
 				Rs
 			
 			
 				新西兰元
 				新西兰元
+				NZ$
 				$
 			
 			
 				阿曼里亚尔
 				阿曼里亚尔
+				OMR
 			
 			
 				巴拿马巴波亚
 				巴拿马巴波亚
+				PAB
 			
 			
 				秘鲁印第
 				秘鲁印第
+				PEI
 			
 			
 				秘鲁索尔
 				秘鲁索尔
+				PEN
 			
 			
 				秘鲁索尔 (1863–1965)
 				秘鲁索尔 (1863–1965)
+				PES
 			
 			
 				巴布亚新几内亚基那
 				巴布亚新几内亚基那
+				PGK
 			
 			
 				菲律宾比索
 				菲律宾比索
+				PHP
 				₱
 			
 			
 				巴基斯坦卢比
 				巴基斯坦卢比
+				PKR
 				Rs
 			
 			
 				波兰兹罗提
 				波兰兹罗提
+				PLN
 				zł
 			
 			
@@ -9340,15 +9282,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				巴拉圭瓜拉尼
 				巴拉圭瓜拉尼
+				PYG
 				₲
 			
 			
 				卡塔尔里亚尔
 				卡塔尔里亚尔
+				QAR
 			
 			
 				罗得西亚元
 				罗得西亚元
+				RHD
 			
 			
 				旧罗马尼亚列伊
@@ -9358,14 +9303,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				罗马尼亚列伊
 				罗马尼亚列伊
+				RON
+				lei
 			
 			
 				塞尔维亚第纳尔
 				塞尔维亚第纳尔
+				RSD
 			
 			
 				俄罗斯卢布
 				俄罗斯卢布
+				RUB
 				₽
 			
 			
@@ -9377,46 +9326,56 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				卢旺达法郎
 				卢旺达法郎
+				RWF
 				RF
 			
 			
 				沙特里亚尔
 				沙特里亚尔
+				SAR
 			
 			
 				所罗门群岛元
 				所罗门群岛元
+				SBD
 				$
 			
 			
 				塞舌尔卢比
 				塞舌尔卢比
+				SCR
 			
 			
 				苏丹第纳尔 (1992–2007)
 				苏丹第纳尔 (1992–2007)
+				SDD
 			
 			
 				苏丹镑
 				苏丹镑
+				SDG
 			
 			
 				旧苏丹镑
 				旧苏丹镑
+				SDP
 			
 			
 				瑞典克朗
 				瑞典克朗
+				SEK
 				kr
 			
 			
 				新加坡元
 				新加坡元
+				SGD
 				$
 			
 			
 				圣赫勒拿群岛磅
 				圣赫勒拿群岛磅
+				SHP
 				£
 			
 			
@@ -9432,32 +9391,40 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				塞拉利昂利昂
 				塞拉利昂利昂
+				SLL
 			
 			
 				索马里先令
 				索马里先令
+				SOS
 			
 			
 				苏里南元
 				苏里南元
+				SRD
 				$
 			
 			
 				苏里南盾
 				苏里南盾
+				SRG
 			
 			
 				南苏丹镑
 				南苏丹镑
+				SSP
 				£
 			
 			
 				圣多美和普林西比多布拉 (1977–2017)
 				圣多美和普林西比多布拉 (1977–2017)
+				STD
 			
 			
 				圣多美和普林西比多布拉
 				圣多美和普林西比多布拉
+				STN
+				Db
 			
 			
 				苏联卢布
@@ -9472,40 +9439,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				叙利亚镑
 				叙利亚镑
+				SYP
 				£
 			
 			
 				斯威士兰里兰吉尼
 				斯威士兰里兰吉尼
+				SZL
 			
 			
 				泰铢
 				泰铢
+				THB
 				฿
 			
 			
 				塔吉克斯坦卢布
 				塔吉克斯坦卢布
+				TJR
 			
 			
 				塔吉克斯坦索莫尼
 				塔吉克斯坦索莫尼
+				TJS
 			
 			
 				土库曼斯坦马纳特 (1993–2009)
 				土库曼斯坦马纳特 (1993–2009)
+				TMM
 			
 			
 				土库曼斯坦马纳特
 				土库曼斯坦马纳特
+				TMT
 			
 			
 				突尼斯第纳尔
 				突尼斯第纳尔
+				TND
 			
 			
 				汤加潘加
 				汤加潘加
+				TOP
 				T$
 			
 			
@@ -9515,30 +9491,36 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				土耳其里拉 (1922–2005)
 				土耳其里拉 (1922–2005)
+				TRL
 			
 			
 				土耳其里拉
 				土耳其里拉
+				TRY
 				₺
 				TL
 			
 			
 				特立尼达和多巴哥元
 				特立尼达和多巴哥元
+				TTD
 				$
 			
 			
 				新台币
 				新台币
+				NT$
 				NT$
 			
 			
 				坦桑尼亚先令
 				坦桑尼亚先令
+				TZS
 			
 			
 				乌克兰格里夫纳
 				乌克兰格里夫纳
+				UAH
 				₴
 			
 			
@@ -9549,14 +9531,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				乌干达先令 (1966–1987)
 				乌干达先令 (1966–1987)
+				UGS
 			
 			
 				乌干达先令
 				乌干达先令
+				UGX
 			
 			
 				美元
 				美元
+				US$
 				$
 			
 			
@@ -9572,41 +9557,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				乌拉圭比索（索引单位）
 				乌拉圭比索（索引单位）
+				UYI
 			
 			
 				乌拉圭比索 (1975–1993)
 				乌拉圭比索 (1975–1993)
+				UYP
 			
 			
 				乌拉圭比索
 				乌拉圭比索
+				UYU
 				$
 			
 			
 				乌拉圭票面工资指数单位
 				乌拉圭票面工资指数单位
-				UYW
 			
 			
 				乌兹别克斯坦苏姆
 				乌兹别克斯坦苏姆
+				UZS
 			
 			
 				委内瑞拉玻利瓦尔 (1871–2008)
 				委内瑞拉玻利瓦尔 (1871–2008)
+				VEB
 			
 			
 				委内瑞拉玻利瓦尔 (2008–2018)
 				委内瑞拉玻利瓦尔 (2008–2018)
+				VEF
 				Bs
 			
 			
 				委内瑞拉玻利瓦尔
 				委内瑞拉玻利瓦尔
+				VES
 			
 			
 				越南盾
 				越南盾
+				₫
 				₫
 			
 			
@@ -9616,14 +9608,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				瓦努阿图瓦图
 				瓦努阿图瓦图
+				VUV
 			
 			
 				萨摩亚塔拉
 				萨摩亚塔拉
+				WST
 			
 			
 				中非法郎
 				中非法郎
+				FCFA
 			
 			
 				银
@@ -9652,6 +9647,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				东加勒比元
 				东加勒比元
+				EC$
 				$
 			
 			
@@ -9661,6 +9657,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				欧洲货币单位
 				欧洲货币单位
+				XEU
 			
 			
 				法国金法郎
@@ -9673,6 +9670,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				西非法郎
 				西非法郎
+				CFA
 			
 			
 				钯
@@ -9681,6 +9679,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				太平洋法郎
 				太平洋法郎
+				CFPF
 			
 			
 				铂
@@ -9693,7 +9692,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				苏克雷
 				苏克雷
-				XSU
 			
 			
 				测试货币代码
@@ -9702,7 +9700,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				非洲开发银行记账单位
 				非洲开发银行记账单位
-				XUA
 			
 			
 				未知货币
@@ -9712,10 +9709,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				也门第纳尔
 				也门第纳尔
+				YDD
 			
 			
 				也门里亚尔
 				也门里亚尔
+				YER
 			
 			
 				南斯拉夫硬第纳尔 (1966–1990)
@@ -9740,40 +9739,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				南非兰特 (金融)
 				南非兰特 (金融)
+				ZAL
 			
 			
 				南非兰特
 				南非兰特
+				ZAR
 				R
 			
 			
 				赞比亚克瓦查 (1968–2012)
 				赞比亚克瓦查 (1968–2012)
+				ZMK
 			
 			
 				赞比亚克瓦查
 				赞比亚克瓦查
+				ZMW
 				ZK
 			
 			
 				新扎伊尔 (1993–1998)
 				新扎伊尔 (1993–1998)
+				ZRN
 			
 			
 				扎伊尔 (1971–1993)
 				扎伊尔 (1971–1993)
+				ZRZ
 			
 			
 				津巴布韦元 (1980–2008)
 				津巴布韦元 (1980–2008)
+				ZWD
 			
 			
 				津巴布韦元 (2009)
 				津巴布韦元 (2009)
+				ZWL
 			
 			
 				津巴布韦元 (2008)
 				津巴布韦元 (2008)
+				ZWR
 			
 		
 		
@@ -9960,6 +9968,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				每{1}{0}
 			
+			
+				{0}⋅{1}
+			
 			
 				G力
 				{0}G力
@@ -10049,9 +10060,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ppm
 				百万分之{0}
 			
-			
-				‱
-				{0}‱
+			
+				%
+				{0}%
+			
+			
+				‰
+				{0}‰
 			
 			
 				摩尔
@@ -10074,8 +10089,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				每英制加仑{0}英里
 			
 			
-				拍字节
-				{0}拍字节
+				拍字节
+				{0}拍字节
 			
 			
 				太字节
@@ -10121,6 +10136,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				个世纪
 				{0}个世纪
 			
+			
+				年代
+				{0}年代
+			
 			
 				年
 				{0}年
@@ -10216,6 +10235,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				英热单位
 				{0}英热单位
 			
+			
+				美制克卡
+				{0}美制克卡
+			
 			
 				磅力
 				{0}磅力
@@ -10240,6 +10263,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				赫兹
 				{0}赫兹
 			
+			
+				版式
+				{0}版式
+			
+			
+				像素
+				{0}像素
+			
+			
+				百万像素
+				{0}百万像素
+			
+			
+				像素每厘米
+				{0}像素每厘米
+			
+			
+				像素每英寸
+				{0}像素每英寸
+			
+			
+				点每厘米
+				{0}点每厘米
+			
+			
+				点每英寸
+				{0}点每英寸
+			
 			
 				公里
 				{0}公里
@@ -10364,8 +10415,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}吨
 			
 			
-				英石
-				{0}英石
+				英石
+				{0}英石
 			
 			
 				磅
@@ -10421,10 +10472,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				马力
 				{0}马力
 			
-			
-				百帕斯卡
-				{0}百帕斯卡
-			
 			
 				毫米汞柱
 				{0}毫米汞柱
@@ -10437,13 +10484,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				英寸汞柱
 				{0}英寸汞柱
 			
+			
+				巴
+				{0}巴
+			
 			
 				毫巴
 				{0}毫巴
 			
 			
-				标准大气压
-				{0}个标准大气压
+				标准大气压
+				{0}个标准大气压
+			
+			
+				帕斯卡
+				{0}帕斯卡
+			
+			
+				百帕斯卡
+				{0}百帕斯卡
 			
 			
 				千帕斯卡
@@ -10607,7 +10666,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}桶
 			
 			
-				主方向
+				主方向
 				东经{0}
 				北纬{0}
 				南纬{0}
@@ -10618,6 +10677,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				G力
 				{0}G
@@ -10707,9 +10769,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				ppm
 				{0}ppm
 			
-			
-				‱
-				{0}‱
+			
+				%
+				{0}%
+			
+			
+				‰
+				{0}‰
 			
 			
 				摩尔
@@ -10731,6 +10797,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				英里/英制加仑
 				{0}英里/英制加仑
 			
+			
+				PB
+				{0} PB
+			
 			
 				太字节
 				{0}太字节
@@ -10775,6 +10845,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				世纪
 				{0}个世纪
 			
+			
+				年代
+				{0}年代
+			
 			
 				年
 				{0}年
@@ -10870,6 +10944,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				英热单位
 				{0}英热单位
 			
+			
+				美制克卡
+				{0}美制克卡
+			
 			
 				磅力
 				{0}磅力
@@ -11018,8 +11096,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}吨
 			
 			
-				英石
-				{0}英石
+				英石
+				{0}英石
 			
 			
 				磅
@@ -11075,10 +11153,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				马力
 				{0}马力
 			
-			
-				百帕
-				{0}百帕
-			
 			
 				毫米汞柱
 				{0}毫米汞柱
@@ -11091,13 +11165,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				英寸汞柱
 				{0}英寸汞柱
 			
+			
+				巴
+				{0}巴
+			
 			
 				毫巴
 				{0}毫巴
 			
 			
-				大气压
-				{0}个大气压
+				大气压
+				{0}个大气压
+			
+			
+				帕
+				{0}帕
+			
+			
+				百帕
+				{0}百帕
 			
 			
 				千帕
@@ -11261,7 +11347,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}桶
 			
 			
-				方向
+				方向
 				东经{0}
 				北纬{0}
 				南纬{0}
@@ -11272,6 +11358,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}/{1}
 			
+			
+				{0}⋅{1}
+			
 			
 				G力
 				{0}G
@@ -11330,17 +11419,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}平方英寸
 				{0}/平方英寸
 			
-			
-				杜纳亩
-				{0}杜纳亩
-			
-			
-				‱
-				{0}‱
-			
-			
-				摩尔
-				{0}摩尔
+			
+				%
+				{0}%
 			
 			
 				升/100千米
@@ -11350,6 +11431,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				世纪
 				{0}个世纪
 			
+			
+				年代
+				{0}年代
+			
 			
 				年
 				{0}年
@@ -11409,21 +11494,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				焦耳
 				{0}焦耳
 			
-			
-				电子伏
-				{0}电子伏
-			
-			
-				英热单位
-				{0}英热单位
-			
-			
-				磅力
-				{0}磅力
-			
-			
-				牛
-				{0}牛
+			
+				美制克卡
+				{0}美制克卡
 			
 			
 				公里
@@ -11504,15 +11577,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 			
 				斯堪的纳维亚英里
-				{0}smi
-			
-			
-				太阳半径
-				{0}太阳半径
-			
-			
-				太阳光度
-				{0}太阳光度
+				{0}smi
 			
 			
 				千克
@@ -11523,8 +11588,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				{0}克
 			
 			
-				英石
-				{0}英石
+				英石
+				{0}英石
 			
 			
 				{0}磅
@@ -11532,18 +11597,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}盎司
 			
-			
-				道尔顿
-				{0}道尔顿
-			
-			
-				地球质量
-				{0}地球质量
-			
-			
-				太阳质量
-				{0}太阳质量
-			
 			
 				{0}kW
 			
@@ -11553,22 +11606,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}hp
 			
-			
-				{0}hPa
-			
 			
 				{0}" Hg
 			
 			
 				{0}mb
 			
-			
-				千帕
-				{0}千帕
-			
-			
-				兆帕
-				{0}兆帕
+			
+				{0}hPa
 			
 			
 				公里/小时
@@ -11593,14 +11638,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			
 				{0}°F
 			
-			
-				磅英尺
-				{0}磅英尺
-			
-			
-				牛米
-				{0}牛米
-			
 			
 				立方千米
 				{0}km³
@@ -11698,9 +11735,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				液盎司
 				{0}液盎司
 			
-			
-				英制液盎司
-			
 			
 				汤匙
 				{0}汤匙
@@ -11709,12 +11743,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				茶匙
 				{0}茶匙
 			
-			
-				桶
-				{0}桶
-			
 			
-				方向
+				方向
 				{0}E
 				{0}N
 				{0}S
@@ -11744,12 +11774,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			{0}或{1}
 			{0}或{1}
 		
-		
-			{0}、{1}
-			{0}、{1}
-			{0}和{1}
-			{0}和{1}
-		
 		
 			{0}、{1}
 			{0}、{1}
diff --git a/make/data/cldr/common/main/zh_Hans.xml b/make/data/cldr/common/main/zh_Hans.xml
index e4833c49f79..1289889edfe 100644
--- a/make/data/cldr/common/main/zh_Hans.xml
+++ b/make/data/cldr/common/main/zh_Hans.xml
@@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 
 	
-		
+